diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..33cb509e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,11 @@
+.project
+.classpath
+.idea/
+*.iml
+target/
+logs/
+log/
+test-output/
+hexid.txt
+
+.vscode/
\ No newline at end of file
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
new file mode 100644
index 00000000..eebc3c18
Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
new file mode 100644
index 00000000..e364bfe9
--- /dev/null
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -0,0 +1,4 @@
+wrapperVersion=3.3.4
+distributionType=script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..04cfa2c1
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs
new file mode 100644
index 00000000..8963047b
--- /dev/null
+++ b/.settings/org.eclipse.jdt.apt.core.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
+org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..3a5c6da3
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,525 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.annotationPath.allLocations=disabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.notowning=org.eclipse.jdt.annotation.NotOwning
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Owning
+org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=25
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.APILeak=warning
+org.eclipse.jdt.core.compiler.problem.annotatedTypeArgumentToUnannotated=info
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleOwningContract=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.insufficientResourceAnalysis=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.suppressWarningsNotFullyAnalysed=info
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentType=warning
+org.eclipse.jdt.core.compiler.problem.unlikelyCollectionMethodArgumentTypeStrict=disabled
+org.eclipse.jdt.core.compiler.problem.unlikelyEqualsArgumentType=info
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unstableAutoModuleName=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLambdaParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.processAnnotations=enabled
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=25
+org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
+org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=true
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns=false
+org.eclipse.jdt.core.formatter.align_with_spaces=false
+org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package=49
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter=0
+org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type=49
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+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_assertion_message=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=4
+org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=49
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=49
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon=0
+org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+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_permitted_types_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_record_components=0
+org.eclipse.jdt.core.formatter.alignment_for_relational_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=85
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=84
+org.eclipse.jdt.core.formatter.alignment_for_shift_operator=0
+org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_type_annotations=0
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch=0
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case_after_arrow=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_record_constructor=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_record_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=false
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.indent_tag_description=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.javadoc_do_not_separate_block_tags=false
+org.eclipse.jdt.core.formatter.comment.line_length=300
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_not_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
+org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_line_comments=false
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_code_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_method_body_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line=one_line_never
+org.eclipse.jdt.core.formatter.lineSplit=320
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.text_block_indentation=0
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_before_relational_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_shift_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true
+org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator=false
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000..6a5a2714
--- /dev/null
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,147 @@
+cleanup.add_all=true
+cleanup.add_default_serial_version_id=false
+cleanup.add_generated_serial_version_id=true
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=true
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=true
+cleanup.also_simplify_lambda=true
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=true
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.array_with_curly=false
+cleanup.arrays_fill=false
+cleanup.bitwise_conditional_expression=false
+cleanup.boolean_literal=true
+cleanup.boolean_value_rather_than_comparison=true
+cleanup.break_loop=false
+cleanup.collection_cloning=false
+cleanup.comparing_on_criteria=false
+cleanup.comparison_statement=true
+cleanup.controlflow_merge=false
+cleanup.convert_functional_interfaces=true
+cleanup.convert_to_enhanced_for_loop=true
+cleanup.convert_to_enhanced_for_loop_if_loop_var_used=true
+cleanup.convert_to_switch_expressions=true
+cleanup.correct_indentation=false
+cleanup.do_while_rather_than_while=true
+cleanup.double_negation=true
+cleanup.else_if=false
+cleanup.embedded_if=false
+cleanup.evaluate_nullable=false
+cleanup.extract_increment=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.hash=false
+cleanup.if_condition=true
+cleanup.insert_inferred_type_arguments=false
+cleanup.instanceof=true
+cleanup.instanceof_keyword=true
+cleanup.invert_equals=false
+cleanup.join=true
+cleanup.lazy_logical_operator=true
+cleanup.make_local_variable_final=false
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.map_cloning=false
+cleanup.merge_conditional_blocks=false
+cleanup.multi_catch=false
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=false
+cleanup.no_string_creation=true
+cleanup.no_super=true
+cleanup.number_suffix=false
+cleanup.objects_equals=false
+cleanup.one_if_rather_than_duplicate_blocks_that_fall_through=false
+cleanup.operand_factorization=false
+cleanup.organize_imports=true
+cleanup.overridden_assignment=false
+cleanup.overridden_assignment_move_decl=true
+cleanup.plain_replacement=true
+cleanup.precompile_regex=true
+cleanup.primitive_comparison=true
+cleanup.primitive_parsing=true
+cleanup.primitive_rather_than_wrapper=true
+cleanup.primitive_serialization=true
+cleanup.pull_out_if_from_if_else=true
+cleanup.pull_up_assignment=false
+cleanup.push_down_negation=false
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.reduce_indentation=false
+cleanup.redundant_comparator=true
+cleanup.redundant_falling_through_block_end=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_modifiers=true
+cleanup.remove_redundant_semicolons=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=false
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=true
+cleanup.remove_unnecessary_array_creation=false
+cleanup.remove_unnecessary_casts=true
+cleanup.remove_unnecessary_nls_tags=true
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=true
+cleanup.remove_unused_method_parameters=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=true
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.return_expression=false
+cleanup.simplify_lambda_expression_and_method_ref=true
+cleanup.single_used_field=false
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.standard_comparison=false
+cleanup.static_inner_class=true
+cleanup.strictly_equal_or_different=false
+cleanup.stringbuffer_to_stringbuilder=true
+cleanup.stringbuilder=true
+cleanup.stringbuilder_for_local_vars=true
+cleanup.stringconcat_stringbuffer_stringbuilder=false
+cleanup.stringconcat_to_textblock=false
+cleanup.substring=true
+cleanup.switch=false
+cleanup.system_property=false
+cleanup.system_property_boolean=false
+cleanup.system_property_file_encoding=false
+cleanup.system_property_file_separator=false
+cleanup.system_property_line_separator=false
+cleanup.system_property_path_separator=false
+cleanup.ternary_operator=false
+cleanup.try_with_resource=false
+cleanup.unlooped_while=false
+cleanup.unreachable_block=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_autoboxing=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_directly_map_method=true
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_string_is_blank=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_unboxing=false
+cleanup.use_var=false
+cleanup.useless_continue=false
+cleanup.useless_return=false
+cleanup.valueof_rather_than_instantiation=true
+cleanup_profile=_L2J Clean Up v0.5
+cleanup_settings_version=2
+eclipse.preferences.version=1
+formatter_profile=_L2J Formatter v0.9
+formatter_settings_version=23
+org.eclipse.jdt.ui.text.custom_code_templates=
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000..14b697b7
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 00000000..61b142f0
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,636 @@
+# GNU GENERAL PUBLIC LICENSE
+Version 3, 29 June 2007
+
+Copyright (C) 2007 [Free Software Foundation, Inc.](http://fsf.org/)
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+## Preamble
+
+The GNU General Public License is a free, copyleft license for software and
+other kinds of works.
+
+The licenses for most software and other practical works are designed to take
+away your freedom to share and change the works. By contrast, the GNU General
+Public License is intended to guarantee your freedom to share and change all
+versions of a program--to make sure it remains free software for all its users.
+We, the Free Software Foundation, use the GNU General Public License for most
+of our software; it applies also to any other work released this way by its
+authors. You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for them if you wish), that you
+receive source code or can get it if you want it, that you can change the
+software or use pieces of it in new free programs, and that you know you can do
+these things.
+
+To protect your rights, we need to prevent others from denying you these rights
+or asking you to surrender the rights. Therefore, you have certain
+responsibilities if you distribute copies of the software, or if you modify it:
+responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must pass on to the recipients the same freedoms that you received.
+You must make sure that they, too, receive or can get the source code. And you
+must show them these terms so they know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+
+  1. assert copyright on the software, and
+  2. offer you this License giving you legal permission to copy, distribute
+     and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains that
+there is no warranty for this free software. For both users' and authors' sake,
+the GPL requires that modified versions be marked as changed, so that their
+problems will not be attributed erroneously to authors of previous versions.
+
+Some devices are designed to deny users access to install or run modified
+versions of the software inside them, although the manufacturer can do so. This
+is fundamentally incompatible with the aim of protecting users' freedom to
+change the software. The systematic pattern of such abuse occurs in the area of
+products for individuals to use, which is precisely where it is most
+unacceptable. Therefore, we have designed this version of the GPL to prohibit
+the practice for those products. If such problems arise substantially in other
+domains, we stand ready to extend this provision to those domains in future
+versions of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents. States
+should not allow patents to restrict development and use of software on
+general-purpose computers, but in those that do, we wish to avoid the special
+danger that patents applied to a free program could make it effectively
+proprietary. To prevent this, the GPL assures that patents cannot be used to
+render the program non-free.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+## TERMS AND CONDITIONS
+
+### 0. Definitions.
+
+*This License* refers to version 3 of the GNU General Public License.
+
+*Copyright* also means copyright-like laws that apply to other kinds of works,
+such as semiconductor masks.
+
+*The Program* refers to any copyrightable work licensed under this License.
+Each licensee is addressed as *you*. *Licensees* and *recipients* may be
+individuals or organizations.
+
+To *modify* a work means to copy from or adapt all or part of the work in a
+fashion requiring copyright permission, other than the making of an exact copy.
+The resulting work is called a *modified version* of the earlier work or a work
+*based on* the earlier work.
+
+A *covered work* means either the unmodified Program or a work based on the
+Program.
+
+To *propagate* a work means to do anything with it that, without permission,
+would make you directly or secondarily liable for infringement under applicable
+copyright law, except executing it on a computer or modifying a private copy.
+Propagation includes copying, distribution (with or without modification),
+making available to the public, and in some countries other activities as well.
+
+To *convey* a work means any kind of propagation that enables other parties to
+make or receive copies. Mere interaction with a user through a computer
+network, with no transfer of a copy, is not conveying.
+
+An interactive user interface displays *Appropriate Legal Notices* to the
+extent that it includes a convenient and prominently visible feature that
+
+  1. displays an appropriate copyright notice, and
+  2. tells the user that there is no warranty for the work (except to the
+     extent that warranties are provided), that licensees may convey the work
+     under this License, and how to view a copy of this License.
+
+If the interface presents a list of user commands or options, such as a menu, a
+prominent item in the list meets this criterion.
+
+### 1. Source Code.
+
+The *source code* for a work means the preferred form of the work for making
+modifications to it. *Object code* means any non-source form of a work.
+
+A *Standard Interface* means an interface that either is an official standard
+defined by a recognized standards body, or, in the case of interfaces specified
+for a particular programming language, one that is widely used among developers
+working in that language.
+
+The *System Libraries* of an executable work include anything, other than the
+work as a whole, that (a) is included in the normal form of packaging a Major
+Component, but which is not part of that Major Component, and (b) serves only
+to enable use of the work with that Major Component, or to implement a Standard
+Interface for which an implementation is available to the public in source code
+form. A *Major Component*, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system (if any) on
+which the executable work runs, or a compiler used to produce the work, or an
+object code interpreter used to run it.
+
+The *Corresponding Source* for a work in object code form means all the source
+code needed to generate, install, and (for an executable work) run the object
+code and to modify the work, including scripts to control those activities.
+However, it does not include the work's System Libraries, or general-purpose
+tools or generally available free programs which are used unmodified in
+performing those activities but which are not part of the work. For example,
+Corresponding Source includes interface definition files associated with source
+files for the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require, such as
+by intimate data communication or control flow between those subprograms and
+other parts of the work.
+
+The Corresponding Source need not include anything that users can regenerate
+automatically from other parts of the Corresponding Source.
+
+The Corresponding Source for a work in source code form is that same work.
+
+### 2. Basic Permissions.
+
+All rights granted under this License are granted for the term of copyright on
+the Program, and are irrevocable provided the stated conditions are met. This
+License explicitly affirms your unlimited permission to run the unmodified
+Program. The output from running a covered work is covered by this License only
+if the output, given its content, constitutes a covered work. This License
+acknowledges your rights of fair use or other equivalent, as provided by
+copyright law.
+
+You may make, run and propagate covered works that you do not convey, without
+conditions so long as your license otherwise remains in force. You may convey
+covered works to others for the sole purpose of having them make modifications
+exclusively for you, or provide you with facilities for running those works,
+provided that you comply with the terms of this License in conveying all
+material for which you do not control copyright. Those thus making or running
+the covered works for you must do so exclusively on your behalf, under your
+direction and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes it
+unnecessary.
+
+### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+No covered work shall be deemed part of an effective technological measure
+under any applicable law fulfilling obligations under article 11 of the WIPO
+copyright treaty adopted on 20 December 1996, or similar laws prohibiting or
+restricting circumvention of such measures.
+
+When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention is
+effected by exercising rights under this License with respect to the covered
+work, and you disclaim any intention to limit operation or modification of the
+work as a means of enforcing, against the work's users, your or third parties'
+legal rights to forbid circumvention of technological measures.
+
+### 4. Conveying Verbatim Copies.
+
+You may convey verbatim copies of the Program's source code as you receive it,
+in any medium, provided that you conspicuously and appropriately publish on
+each copy an appropriate copyright notice; keep intact all notices stating that
+this License and any non-permissive terms added in accord with section 7 apply
+to the code; keep intact all notices of the absence of any warranty; and give
+all recipients a copy of this License along with the Program.
+
+You may charge any price or no price for each copy that you convey, and you may
+offer support or warranty protection for a fee.
+
+### 5. Conveying Modified Source Versions.
+
+You may convey a work based on the Program, or the modifications to produce it
+from the Program, in the form of source code under the terms of section 4,
+provided that you also meet all of these conditions:
+
+  - a) The work must carry prominent notices stating that you modified it, and
+    giving a relevant date.
+  - b) The work must carry prominent notices stating that it is released under
+    this License and any conditions added under section 7. This requirement
+    modifies the requirement in section 4 to *keep intact all notices*.
+  - c) You must license the entire work, as a whole, under this License to
+    anyone who comes into possession of a copy. This License will therefore
+    apply, along with any applicable section 7 additional terms, to the whole
+    of the work, and all its parts, regardless of how they are packaged. This
+    License gives no permission to license the work in any other way, but it
+    does not invalidate such permission if you have separately received it.
+  - d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your work need
+    not make them do so.
+
+A compilation of a covered work with other separate and independent works,
+which are not by their nature extensions of the covered work, and which are not
+combined with it such as to form a larger program, in or on a volume of a
+storage or distribution medium, is called an *aggregate* if the compilation and
+its resulting copyright are not used to limit the access or legal rights of the
+compilation's users beyond what the individual works permit. Inclusion of a
+covered work in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+### 6. Conveying Non-Source Forms.
+
+You may convey a covered work in object code form under the terms of sections 4
+and 5, provided that you also convey the machine-readable Corresponding Source
+under the terms of this License, in one of these ways:
+
+  - a) Convey the object code in, or embodied in, a physical product (including
+    a physical distribution medium), accompanied by the Corresponding Source
+    fixed on a durable physical medium customarily used for software
+    interchange.
+  - b) Convey the object code in, or embodied in, a physical product (including
+    a physical distribution medium), accompanied by a written offer, valid for
+    at least three years and valid for as long as you offer spare parts or
+    customer support for that product model, to give anyone who possesses the
+    object code either
+    1. a copy of the Corresponding Source for all the software in the product
+       that is covered by this License, on a durable physical medium
+       customarily used for software interchange, for a price no more than your
+       reasonable cost of physically performing this conveying of source, or
+    2. access to copy the Corresponding Source from a network server at no
+       charge.
+  - c) Convey individual copies of the object code with a copy of the written
+    offer to provide the Corresponding Source. This alternative is allowed only
+    occasionally and noncommercially, and only if you received the object code
+    with such an offer, in accord with subsection 6b.
+  - d) Convey the object code by offering access from a designated place
+    (gratis or for a charge), and offer equivalent access to the Corresponding
+    Source in the same way through the same place at no further charge. You
+    need not require recipients to copy the Corresponding Source along with the
+    object code. If the place to copy the object code is a network server, the
+    Corresponding Source may be on a different server operated by you or a
+    third party) that supports equivalent copying facilities, provided you
+    maintain clear directions next to the object code saying where to find the
+    Corresponding Source. Regardless of what server hosts the Corresponding
+    Source, you remain obligated to ensure that it is available for as long as
+    needed to satisfy these requirements.
+  - e) Convey the object code using peer-to-peer transmission, provided you
+    inform other peers where the object code and Corresponding Source of the
+    work are being offered to the general public at no charge under subsection
+    6d.
+
+A separable portion of the object code, whose source code is excluded from the
+Corresponding Source as a System Library, need not be included in conveying the
+object code work.
+
+A *User Product* is either
+
+  1. a *consumer product*, which means any tangible personal property which is
+     normally used for personal, family, or household purposes, or
+  2. anything designed or sold for incorporation into a dwelling.
+
+In determining whether a product is a consumer product, doubtful cases shall be
+resolved in favor of coverage. For a particular product received by a
+particular user, *normally used* refers to a typical or common use of that
+class of product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected to use,
+the product. A product is a consumer product regardless of whether the product
+has substantial commercial, industrial or non-consumer uses, unless such uses
+represent the only significant mode of use of the product.
+
+*Installation Information* for a User Product means any methods, procedures,
+authorization keys, or other information required to install and execute
+modified versions of a covered work in that User Product from a modified
+version of its Corresponding Source. The information must suffice to ensure
+that the continued functioning of the modified object code is in no case
+prevented or interfered with solely because modification has been made.
+
+If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as part of a
+transaction in which the right of possession and use of the User Product is
+transferred to the recipient in perpetuity or for a fixed term (regardless of
+how the transaction is characterized), the Corresponding Source conveyed under
+this section must be accompanied by the Installation Information. But this
+requirement does not apply if neither you nor any third party retains the
+ability to install modified object code on the User Product (for example, the
+work has been installed in ROM).
+
+The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates for a
+work that has been modified or installed by the recipient, or for the User
+Product in which it has been modified or installed. Access to a network may be
+denied when the modification itself materially and adversely affects the
+operation of the network or violates the rules and protocols for communication
+across the network.
+
+Corresponding Source conveyed, and Installation Information provided, in accord
+with this section must be in a format that is publicly documented (and with an
+implementation available to the public in source code form), and must require
+no special password or key for unpacking, reading or copying.
+
+### 7. Additional Terms.
+
+*Additional permissions* are terms that supplement the terms of this License by
+making exceptions from one or more of its conditions. Additional permissions
+that are applicable to the entire Program shall be treated as though they were
+included in this License, to the extent that they are valid under applicable
+law. If additional permissions apply only to part of the Program, that part may
+be used separately under those permissions, but the entire Program remains
+governed by this License without regard to the additional permissions.
+
+When you convey a copy of a covered work, you may at your option remove any
+additional permissions from that copy, or from any part of it. (Additional
+permissions may be written to require their own removal in certain cases when
+you modify the work.) You may place additional permissions on material, added
+by you to a covered work, for which you have or can give appropriate copyright
+permission.
+
+Notwithstanding any other provision of this License, for material you add to a
+covered work, you may (if authorized by the copyright holders of that material)
+supplement the terms of this License with terms:
+
+  - a) Disclaiming warranty or limiting liability differently from the terms of
+    sections 15 and 16 of this License; or
+  - b) Requiring preservation of specified reasonable legal notices or author
+    attributions in that material or in the Appropriate Legal Notices displayed
+    by works containing it; or
+  - c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in reasonable
+    ways as different from the original version; or
+  - d) Limiting the use for publicity purposes of names of licensors or authors
+    of the material; or
+  - e) Declining to grant rights under trademark law for use of some trade
+    names, trademarks, or service marks; or
+  - f) Requiring indemnification of licensors and authors of that material by
+    anyone who conveys the material (or modified versions of it) with
+    contractual assumptions of liability to the recipient, for any liability
+    that these contractual assumptions directly impose on those licensors and
+    authors.
+
+All other non-permissive additional terms are considered *further restrictions*
+within the meaning of section 10. If the Program as you received it, or any
+part of it, contains a notice stating that it is governed by this License along
+with a term that is a further restriction, you may remove that term. If a
+license document contains a further restriction but permits relicensing or
+conveying under this License, you may add to a covered work material governed
+by the terms of that license document, provided that the further restriction
+does not survive such relicensing or conveying.
+
+If you add terms to a covered work in accord with this section, you must place,
+in the relevant source files, a statement of the additional terms that apply to
+those files, or a notice indicating where to find the applicable terms.
+
+Additional terms, permissive or non-permissive, may be stated in the form of a
+separately written license, or stated as exceptions; the above requirements
+apply either way.
+
+### 8. Termination.
+
+You may not propagate or modify a covered work except as expressly provided
+under this License. Any attempt otherwise to propagate or modify it is void,
+and will automatically terminate your rights under this License (including any
+patent licenses granted under the third paragraph of section 11).
+
+However, if you cease all violation of this License, then your license from a
+particular copyright holder is reinstated
+
+  - a) provisionally, unless and until the copyright holder explicitly and
+    finally terminates your license, and
+  - b) permanently, if the copyright holder fails to notify you of the
+    violation by some reasonable means prior to 60 days after the cessation.
+
+Moreover, your license from a particular copyright holder is reinstated
+permanently if the copyright holder notifies you of the violation by some
+reasonable means, this is the first time you have received notice of violation
+of this License (for any work) from that copyright holder, and you cure the
+violation prior to 30 days after your receipt of the notice.
+
+Termination of your rights under this section does not terminate the licenses
+of parties who have received copies or rights from you under this License. If
+your rights have been terminated and not permanently reinstated, you do not
+qualify to receive new licenses for the same material under section 10.
+
+### 9. Acceptance Not Required for Having Copies.
+
+You are not required to accept this License in order to receive or run a copy
+of the Program. Ancillary propagation of a covered work occurring solely as a
+consequence of using peer-to-peer transmission to receive a copy likewise does
+not require acceptance. However, nothing other than this License grants you
+permission to propagate or modify any covered work. These actions infringe
+copyright if you do not accept this License. Therefore, by modifying or
+propagating a covered work, you indicate your acceptance of this License to do
+so.
+
+### 10. Automatic Licensing of Downstream Recipients.
+
+Each time you convey a covered work, the recipient automatically receives a
+license from the original licensors, to run, modify and propagate that work,
+subject to this License. You are not responsible for enforcing compliance by
+third parties with this License.
+
+An *entity transaction* is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered work
+results from an entity transaction, each party to that transaction who receives
+a copy of the work also receives whatever licenses to the work the party's
+predecessor in interest had or could give under the previous paragraph, plus a
+right to possession of the Corresponding Source of the work from the
+predecessor in interest, if the predecessor has it or can get it with
+reasonable efforts.
+
+You may not impose any further restrictions on the exercise of the rights
+granted or affirmed under this License. For example, you may not impose a
+license fee, royalty, or other charge for exercise of rights granted under this
+License, and you may not initiate litigation (including a cross-claim or
+counterclaim in a lawsuit) alleging that any patent claim is infringed by
+making, using, selling, offering for sale, or importing the Program or any
+portion of it.
+
+### 11. Patents.
+
+A *contributor* is a copyright holder who authorizes use under this License of
+the Program or a work on which the Program is based. The work thus licensed is
+called the contributor's *contributor version*.
+
+A contributor's *essential patent claims* are all patent claims owned or
+controlled by the contributor, whether already acquired or hereafter acquired,
+that would be infringed by some manner, permitted by this License, of making,
+using, or selling its contributor version, but do not include claims that would
+be infringed only as a consequence of further modification of the contributor
+version. For purposes of this definition, *control* includes the right to grant
+patent sublicenses in a manner consistent with the requirements of this
+License.
+
+Each contributor grants you a non-exclusive, worldwide, royalty-free patent
+license under the contributor's essential patent claims, to make, use, sell,
+offer for sale, import and otherwise run, modify and propagate the contents of
+its contributor version.
+
+In the following three paragraphs, a *patent license* is any express agreement
+or commitment, however denominated, not to enforce a patent (such as an express
+permission to practice a patent or covenant not to sue for patent
+infringement). To *grant* such a patent license to a party means to make such
+an agreement or commitment not to enforce a patent against the party.
+
+If you convey a covered work, knowingly relying on a patent license, and the
+Corresponding Source of the work is not available for anyone to copy, free of
+charge and under the terms of this License, through a publicly available
+network server or other readily accessible means, then you must either
+
+  1. cause the Corresponding Source to be so available, or
+  2. arrange to deprive yourself of the benefit of the patent license for this
+     particular work, or
+  3. arrange, in a manner consistent with the requirements of this License, to
+     extend the patent license to downstream recipients.
+
+*Knowingly relying* means you have actual knowledge that, but for the patent
+license, your conveying the covered work in a country, or your recipient's use
+of the covered work in a country, would infringe one or more identifiable
+patents in that country that you have reason to believe are valid.
+
+If, pursuant to or in connection with a single transaction or arrangement, you
+convey, or propagate by procuring conveyance of, a covered work, and grant a
+patent license to some of the parties receiving the covered work authorizing
+them to use, propagate, modify or convey a specific copy of the covered work,
+then the patent license you grant is automatically extended to all recipients
+of the covered work and works based on it.
+
+A patent license is *discriminatory* if it does not include within the scope of
+its coverage, prohibits the exercise of, or is conditioned on the non-exercise
+of one or more of the rights that are specifically granted under this License.
+You may not convey a covered work if you are a party to an arrangement with a
+third party that is in the business of distributing software, under which you
+make payment to the third party based on the extent of your activity of
+conveying the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory patent
+license
+
+  - a) in connection with copies of the covered work conveyed by you (or copies
+    made from those copies), or
+  - b) primarily for and in connection with specific products or compilations
+    that contain the covered work, unless you entered into that arrangement, or
+    that patent license was granted, prior to 28 March 2007.
+
+Nothing in this License shall be construed as excluding or limiting any implied
+license or other defenses to infringement that may otherwise be available to
+you under applicable patent law.
+
+### 12. No Surrender of Others' Freedom.
+
+If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not excuse
+you from the conditions of this License. If you cannot convey a covered work so
+as to satisfy simultaneously your obligations under this License and any other
+pertinent obligations, then as a consequence you may not convey it at all. For
+example, if you agree to terms that obligate you to collect a royalty for
+further conveying from those to whom you convey the Program, the only way you
+could satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.
+
+### 13. Use with the GNU Affero General Public License.
+
+Notwithstanding any other provision of this License, you have permission to
+link or combine any covered work with a work licensed under version 3 of the
+GNU Affero General Public License into a single combined work, and to convey
+the resulting work. The terms of this License will continue to apply to the
+part which is the covered work, but the special requirements of the GNU Affero
+General Public License, section 13, concerning interaction through a network
+will apply to the combination as such.
+
+### 14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of the GNU
+General Public License from time to time. Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+that a certain numbered version of the GNU General Public License *or any later
+version* applies to it, you have the option of following the terms and
+conditions either of that numbered version or of any later version published by
+the Free Software Foundation. If the Program does not specify a version number
+of the GNU General Public License, you may choose any version ever published by
+the Free Software Foundation.
+
+If the Program specifies that a proxy can decide which future versions of the
+GNU General Public License can be used, that proxy's public statement of
+acceptance of a version permanently authorizes you to choose that version for
+the Program.
+
+Later license versions may give you additional or different permissions.
+However, no additional obligations are imposed on any author or copyright
+holder as a result of your choosing to follow a later version.
+
+### 15. Disclaimer of Warranty.
+
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE
+LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER
+PARTIES PROVIDE THE PROGRAM *AS IS* WITHOUT WARRANTY OF ANY KIND, EITHER
+EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE
+QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.
+
+### 16. Limitation of Liability.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY
+COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS
+PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
+INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY
+HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+### 17. Interpretation of Sections 15 and 16.
+
+If the disclaimer of warranty and limitation of liability provided above cannot
+be given local legal effect according to their terms, reviewing courts shall
+apply local law that most closely approximates an absolute waiver of all civil
+liability in connection with the Program, unless a warranty or assumption of
+liability accompanies a copy of the Program in return for a fee.
+
+## END OF TERMS AND CONDITIONS ###
+
+### How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach
+them to the start of each source file to most effectively state the exclusion
+of warranty; and each file should have at least the *copyright* line and a
+pointer to where the full notice is found.
+
+	<one line to give the program's name and a brief idea of what it does.>
+	Copyright (C) <year>  <name of author>
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice like
+this when it starts in an interactive mode:
+
+	<program>  Copyright (C) <year>  <name of author>
+	This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+	This is free software, and you are welcome to redistribute it
+	under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w` and `show c` should show the appropriate
+parts of the General Public License. Of course, your program's commands might
+be different; for a GUI interface, you would use an *about box*.
+
+You should also get your employer (if you work as a programmer) or school, if
+any, to sign a *copyright disclaimer* for the program, if necessary. For more
+information on this, and how to apply and follow the GNU GPL, see
+[http://www.gnu.org/licenses/](http://www.gnu.org/licenses/).
+
+The GNU General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may consider
+it more useful to permit linking proprietary applications with the library. If
+this is what you want to do, use the GNU Lesser General Public License instead
+of this License. But first, please read
+[http://www.gnu.org/philosophy/why-not-lgpl.html](http://www.gnu.org/philosophy/why-not-lgpl.html).
\ No newline at end of file
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
new file mode 100644
index 00000000..8037cb4a
--- /dev/null
+++ b/bitbucket-pipelines.yml
@@ -0,0 +1,22 @@
+image: eclipse-temurin:25-jdk-ubi10-minimal
+
+pipelines:
+   default:
+   -  step:
+         caches:
+         - maven
+         script:
+         - /bin/sh mvnw clean install
+         artifacts:
+         - target/*.zip
+   -  step:
+         deployment: Production
+         script:
+         -  pipe: atlassian/ftp-deploy:0.7.1
+            variables:
+               USER: $FTP_USER
+               PASSWORD: $FTP_PASSWORD
+               SERVER: $FTP_HOST
+               REMOTE_PATH: $FTP_REMOTE_PATH
+               LOCAL_PATH: target/
+               SET_ARGS: "ftp:ssl-allow yes ftp:ssl-force yes ftp:ssl-protect-data yes ssl:verify-certificate false"
\ No newline at end of file
diff --git a/mvnw b/mvnw
new file mode 100644
index 00000000..53c0e1cd
--- /dev/null
+++ b/mvnw
@@ -0,0 +1,338 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.4
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ]; then
+
+  if [ -f /usr/local/etc/mavenrc ]; then
+    . /usr/local/etc/mavenrc
+  fi
+
+  if [ -f /etc/mavenrc ]; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ]; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false
+darwin=false
+mingw=false
+case "$(uname)" in
+CYGWIN*) cygwin=true ;;
+MINGW*) mingw=true ;;
+Darwin*)
+  darwin=true
+  # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+  # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+  if [ -z "$JAVA_HOME" ]; then
+    if [ -x "/usr/libexec/java_home" ]; then
+      JAVA_HOME="$(/usr/libexec/java_home)"
+      export JAVA_HOME
+    else
+      JAVA_HOME="/Library/Java/Home"
+      export JAVA_HOME
+    fi
+  fi
+  ;;
+esac
+
+if [ -z "$JAVA_HOME" ]; then
+  if [ -r /etc/gentoo-release ]; then
+    JAVA_HOME=$(java-config --jre-home)
+  fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] \
+    && JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] \
+    && CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw; then
+  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] \
+    && JAVA_HOME="$(
+      cd "$JAVA_HOME" || (
+        echo "cannot cd into $JAVA_HOME." >&2
+        exit 1
+      )
+      pwd
+    )"
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="$(which javac)"
+  if [ -n "$javaExecutable" ] && ! [ "$(expr "$javaExecutable" : '\([^ ]*\)')" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=$(which readlink)
+    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
+      if $darwin; then
+        javaHome="$(dirname "$javaExecutable")"
+        javaExecutable="$(cd "$javaHome" && pwd -P)/javac"
+      else
+        javaExecutable="$(readlink -f "$javaExecutable")"
+      fi
+      javaHome="$(dirname "$javaExecutable")"
+      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ]; then
+  if [ -n "$JAVA_HOME" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="$(
+      \unset -f command 2>/dev/null
+      \command -v java
+    )"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ]; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  echo "Warning: JAVA_HOME environment variable is not set." >&2
+fi
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+  if [ -z "$1" ]; then
+    echo "Path not specified to find_maven_basedir" >&2
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ]; do
+    if [ -d "$wdir"/.mvn ]; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=$(
+        cd "$wdir/.." || exit 1
+        pwd
+      )
+    fi
+    # end of workaround
+  done
+  printf '%s' "$(
+    cd "$basedir" || exit 1
+    pwd
+  )"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    # Remove \r in case we run on Windows within Git Bash
+    # and check out the repository with auto CRLF management
+    # enabled. Otherwise, we may read lines that are delimited with
+    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
+    # splitting rules.
+    tr -s '\r\n' ' ' <"$1"
+  fi
+}
+
+log() {
+  if [ "$MVNW_VERBOSE" = true ]; then
+    printf '%s\n' "$1"
+  fi
+}
+
+BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
+if [ -z "$BASE_DIR" ]; then
+  exit 1
+fi
+
+MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+export MAVEN_PROJECTBASEDIR
+log "$MAVEN_PROJECTBASEDIR"
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
+if [ -r "$wrapperJarPath" ]; then
+  log "Found $wrapperJarPath"
+else
+  log "Couldn't find $wrapperJarPath, downloading it ..."
+
+  if [ -n "$MVNW_REPOURL" ]; then
+    wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+  else
+    wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+  fi
+  while IFS="=" read -r key value; do
+    case "$key" in wrapperUrl)
+      wrapperUrl=$(trim "${value-}")
+      break
+      ;;
+    esac
+  done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+  log "Downloading from: $wrapperUrl"
+
+  if $cygwin; then
+    wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
+  fi
+
+  if command -v wget >/dev/null; then
+    log "Found wget ... using wget"
+    [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      wget ${QUIET:+"$QUIET"} "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+    else
+      wget ${QUIET:+"$QUIET"} --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
+    fi
+  elif command -v curl >/dev/null; then
+    log "Found curl ... using curl"
+    [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
+    if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+      curl ${QUIET:+"$QUIET"} -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+    else
+      curl ${QUIET:+"$QUIET"} --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
+    fi
+  else
+    log "Falling back to using Java to download"
+    javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
+    javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
+    # For Cygwin, switch paths to Windows format before running javac
+    if $cygwin; then
+      javaSource=$(cygpath --path --windows "$javaSource")
+      javaClass=$(cygpath --path --windows "$javaClass")
+    fi
+    if [ -e "$javaSource" ]; then
+      if [ ! -e "$javaClass" ]; then
+        log " - Compiling MavenWrapperDownloader.java ..."
+        ("$JAVA_HOME/bin/javac" "$javaSource")
+      fi
+      if [ -e "$javaClass" ]; then
+        log " - Running MavenWrapperDownloader.java ..."
+        ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
+      fi
+    fi
+  fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+# If specified, validate the SHA-256 sum of the Maven wrapper jar file
+wrapperSha256Sum=""
+while IFS="=" read -r key value; do
+  case "$key" in wrapperSha256Sum)
+    wrapperSha256Sum=$(trim "${value-}")
+    break
+    ;;
+  esac
+done <"$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
+if [ -n "$wrapperSha256Sum" ]; then
+  wrapperSha256Result=false
+  if command -v sha256sum >/dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c - >/dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c >/dev/null 2>&1; then
+      wrapperSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $wrapperSha256Result = false ]; then
+    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
+    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
+    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$JAVA_HOME" ] \
+    && JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
+  [ -n "$CLASSPATH" ] \
+    && CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
+  [ -n "$MAVEN_PROJECTBASEDIR" ] \
+    && MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
+fi
+
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*"
+export MAVEN_CMD_LINE_ARGS
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+# shellcheck disable=SC2086 # safe args
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  $MAVEN_DEBUG_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
new file mode 100644
index 00000000..c453424c
--- /dev/null
+++ b/mvnw.cmd
@@ -0,0 +1,206 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
+if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo. >&2
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo. >&2
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo. >&2
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo. >&2
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %WRAPPER_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
+SET WRAPPER_SHA_256_SUM=""
+FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
+    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
+)
+IF NOT %WRAPPER_SHA_256_SUM%=="" (
+    powershell -Command "&{"^
+       "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^
+       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
+       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
+       "  Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
+       "  Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
+       "  Write-Error 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
+       "  exit 1;"^
+       "}"^
+       "}"
+    if ERRORLEVEL 1 goto error
+)
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% ^
+  %JVM_CONFIG_MAVEN_PROPS% ^
+  %MAVEN_OPTS% ^
+  %MAVEN_DEBUG_OPTS% ^
+  -classpath %WRAPPER_JAR% ^
+  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
+  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
+if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%"=="on" pause
+
+if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
+
+cmd /C exit /B %ERROR_CODE%
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..a8fea876
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,203 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.l2jserver</groupId>
+	<artifactId>l2j-server-game</artifactId>
+	<version>2.6.3.0-SNAPSHOT</version>
+	<name>L2J Game Server</name>
+	<properties>
+		<maven.compiler.source>25</maven.compiler.source>
+		<maven.compiler.target>25</maven.compiler.target>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<!-- External -->
+		<slf4j.version>2.0.17</slf4j.version>
+		<log4j.version>2.25.3</log4j.version>
+		<InMemoryJavaCompiler.version>1.3.0</InMemoryJavaCompiler.version>
+		<gson.version>2.13.2</gson.version>
+		<owner.version>1.0.12</owner.version>
+		<jda.version>5.3.0</jda.version>
+		<!-- L2J -->
+		<l2j-server-commons.version>2.6.9.0</l2j-server-commons.version>
+		<l2j-server-geo-driver.version>2.6.5.0</l2j-server-geo-driver.version>
+		<!-- Test -->
+		<junit-jupiter.version>6.0.1</junit-jupiter.version>
+		<mockito.version>5.21.0</mockito.version>
+		<assertj-core.version>3.27.6</assertj-core.version>
+		<!-- Plugins -->
+		<dependency-check-maven.level>8</dependency-check-maven.level>
+		<dependency-check-maven.version>12.1.9</dependency-check-maven.version>
+		<maven-assembly-plugin.version>3.8.0</maven-assembly-plugin.version>
+		<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+		<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+		<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
+	</properties>
+	<repositories>
+		<repository>
+			<id>jitpack.io</id>
+			<url>https://jitpack.io</url>
+		</repository>
+	</repositories>
+	<build>
+		<finalName>l2jserver</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>${maven-surefire-plugin.version}</version>
+				<configuration>
+					<argLine>-Xshare:off -javaagent:"${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar"</argLine>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
+				<configuration>
+					<proc>full</proc>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>${maven-jar-plugin.version}</version>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>libs/</classpathPrefix>
+							<mainClass>com.l2jserver.gameserver.GameServer</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>${maven-assembly-plugin.version}</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>${project.artifactId}-${project.version}</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/main/assembly/zip.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j2-impl</artifactId>
+			<version>${log4j.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mdkt.compiler</groupId>
+			<artifactId>InMemoryJavaCompiler</artifactId>
+			<version>${InMemoryJavaCompiler.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>${gson.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.aeonbits.owner</groupId>
+			<artifactId>owner-java8</artifactId>
+			<version>${owner.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>net.dv8tion</groupId>
+			<artifactId>JDA</artifactId>
+			<version>${jda.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.google.protobuf</groupId>
+					<artifactId>protobuf-java</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- L2J -->
+		<dependency>
+			<groupId>org.bitbucket.l2jserver</groupId>
+			<artifactId>l2j-server-commons</artifactId>
+			<version>${l2j-server-commons.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.bitbucket.l2jserver</groupId>
+			<artifactId>l2j-server-geo-driver</artifactId>
+			<version>${l2j-server-geo-driver.version}</version>
+		</dependency>
+		<!-- Test -->
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<version>${junit-jupiter.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<version>${mockito.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${assertj-core.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>ci</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.owasp</groupId>
+						<artifactId>dependency-check-maven</artifactId>
+						<version>${dependency-check-maven.version}</version>
+						<configuration>
+							<failBuildOnCVSS>${dependency-check-maven.level}</failBuildOnCVSS>
+							<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
+							<nvdApiKey>${env.NVD_API_KEY}</nvdApiKey>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file
diff --git a/src/main/assembly/zip.xml b/src/main/assembly/zip.xml
new file mode 100644
index 00000000..cda9313b
--- /dev/null
+++ b/src/main/assembly/zip.xml
@@ -0,0 +1,43 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+	<id>zip</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<files>
+		<file>
+			<source>${project.build.directory}/l2jserver.jar</source>
+			<outputDirectory>.</outputDirectory>
+		</file>
+		<file>
+			<source>src/main/resources/GameServer_loop.sh</source>
+			<outputDirectory>.</outputDirectory>
+		</file>
+		<file>
+			<source>src/main/resources/startGameServer.bat</source>
+			<outputDirectory>.</outputDirectory>
+		</file>
+		<file>
+			<source>src/main/resources/startGameServer.sh</source>
+			<outputDirectory>.</outputDirectory>
+		</file>
+	</files>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/resources/</directory>
+			<includes>
+				<include>config/*</include>
+			</includes>
+			<outputDirectory>.</outputDirectory>
+		</fileSet>
+	</fileSets>
+	<dependencySets>
+		<dependencySet>
+			<outputDirectory>libs</outputDirectory>
+			<excludes>
+				<exclude>${project.groupId}:${project.artifactId}:jar:*</exclude>
+			</excludes>
+		</dependencySet>
+	</dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/Custom.java b/src/main/java/com/l2jserver/gameserver/Custom.java
new file mode 100644
index 00000000..6c0d29cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/Custom.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+
+/**
+ * Custom.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+@Documented
+@Retention(RUNTIME)
+public @interface Custom {
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/FortUpdater.java b/src/main/java/com/l2jserver/gameserver/FortUpdater.java
new file mode 100644
index 00000000..45f9335c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/FortUpdater.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.fortress;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+
+/**
+ * Class managing periodical events with castle.
+ * @author Vice
+ * @since 2008
+ */
+public class FortUpdater implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(FortUpdater.class);
+	private final L2Clan _clan;
+	private final Fort _fort;
+	private int _runCount;
+	private final UpdaterType _updaterType;
+	
+	public enum UpdaterType {
+		MAX_OWN_TIME, // gives fort back to NPC clan
+		PERIODIC_UPDATE // raise blood oath/supply level
+	}
+	
+	public FortUpdater(Fort fort, L2Clan clan, int runCount, UpdaterType ut) {
+		_fort = fort;
+		_clan = clan;
+		_runCount = runCount;
+		_updaterType = ut;
+	}
+	
+	@Override
+	public void run() {
+		try {
+			switch (_updaterType) {
+				case PERIODIC_UPDATE -> {
+					_runCount++;
+					if ((_fort.getOwnerClan() == null) || (_fort.getOwnerClan() != _clan)) {
+						return;
+					}
+					
+					_fort.getOwnerClan().increaseBloodOathCount();
+					
+					if (_fort.getFortState() == 2) {
+						if (_clan.getWarehouse().getAdena() >= fortress().getFeeForCastle()) {
+							_clan.getWarehouse().destroyItemByItemId("FS_fee_for_Castle", Inventory.ADENA_ID, fortress().getFeeForCastle(), null, null);
+							_fort.getContractedCastle().addToTreasuryNoTax(fortress().getFeeForCastle());
+							_fort.raiseSupplyLvL();
+						} else {
+							_fort.setFortState(1, 0);
+						}
+					}
+					_fort.saveFortVariables();
+				}
+				case MAX_OWN_TIME -> {
+					if ((_fort.getOwnerClan() == null) || (_fort.getOwnerClan() != _clan)) {
+						return;
+					}
+					if (_fort.getOwnedTime() > (fortress().getMaxKeepTime() * 3600)) {
+						_fort.removeOwner(true);
+						_fort.setFortState(0, 0);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("There has been a problem updating forts!", e);
+		}
+	}
+	
+	public int getRunCount() {
+		return _runCount;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/GameServer.java b/src/main/java/com/l2jserver/gameserver/GameServer.java
new file mode 100644
index 00000000..4775e870
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/GameServer.java
@@ -0,0 +1,538 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.database;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+import static com.l2jserver.gameserver.config.Configuration.hexId;
+import static com.l2jserver.gameserver.config.Configuration.mmo;
+import static com.l2jserver.gameserver.config.Configuration.server;
+import static com.l2jserver.gameserver.config.Configuration.telnet;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.awt.Toolkit;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.UPnPService;
+import com.l2jserver.commons.dao.ServerNameDAO;
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.IPv4Filter;
+import com.l2jserver.commons.util.Util;
+import com.l2jserver.gameserver.bbs.service.ForumsBBSManager;
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.sql.impl.CharSummonTable;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.data.sql.impl.NpcBufferTable;
+import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
+import com.l2jserver.gameserver.data.sql.impl.SummonSkillsTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.data.xml.impl.ArmorSetsData;
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
+import com.l2jserver.gameserver.data.xml.impl.CategoryData;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemGroupsData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemHPBonusData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemOptionsData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.data.xml.impl.FishData;
+import com.l2jserver.gameserver.data.xml.impl.FishingMonstersData;
+import com.l2jserver.gameserver.data.xml.impl.FishingRodsData;
+import com.l2jserver.gameserver.data.xml.impl.HennaData;
+import com.l2jserver.gameserver.data.xml.impl.HitConditionBonusData;
+import com.l2jserver.gameserver.data.xml.impl.InitialEquipmentData;
+import com.l2jserver.gameserver.data.xml.impl.InitialShortcutData;
+import com.l2jserver.gameserver.data.xml.impl.KarmaData;
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.OptionData;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.data.xml.impl.PlayerCreationPointData;
+import com.l2jserver.gameserver.data.xml.impl.PlayerTemplateData;
+import com.l2jserver.gameserver.data.xml.impl.PlayerXpPercentLostData;
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+import com.l2jserver.gameserver.data.xml.impl.SiegeScheduleData;
+import com.l2jserver.gameserver.data.xml.impl.SkillLearnData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.data.xml.impl.StaticObjectData;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
+import com.l2jserver.gameserver.data.xml.impl.UIData;
+import com.l2jserver.gameserver.datatables.AugmentationData;
+import com.l2jserver.gameserver.datatables.BotReportTable;
+import com.l2jserver.gameserver.datatables.EventDroplist;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.handler.EffectHandler;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.AirShipManager;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.instancemanager.AuctionManager;
+import com.l2jserver.gameserver.instancemanager.BoatManager;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.CoupleManager;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
+import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
+import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
+import com.l2jserver.gameserver.instancemanager.GrandBossManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.ItemAuctionManager;
+import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.instancemanager.MercTicketManager;
+import com.l2jserver.gameserver.instancemanager.PetitionManager;
+import com.l2jserver.gameserver.instancemanager.PunishmentManager;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
+import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.AutoSpawnHandler;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.model.entity.TvTManager;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.L2GamePacketHandler;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.pathfinding.PathFinding;
+import com.l2jserver.gameserver.script.faenor.FaenorScriptEngine;
+import com.l2jserver.gameserver.scripting.ScriptEngineManager;
+import com.l2jserver.gameserver.status.Status;
+import com.l2jserver.gameserver.taskmanager.KnownListUpdateTaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.util.DeadLockDetector;
+import com.l2jserver.mmocore.SelectorConfig;
+import com.l2jserver.mmocore.SelectorThread;
+
+public final class GameServer {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(GameServer.class);
+	
+	private static final String DATAPACK = "-dp";
+	
+	private static final String SCRIPT = "-s";
+	
+	private static final String GEODATA = "-gd";
+	
+	private final SelectorThread<L2GameClient> _selectorThread;
+	
+	private final L2GamePacketHandler _gamePacketHandler;
+	
+	private final DeadLockDetector _deadDetectThread;
+	
+	public static GameServer gameServer;
+	
+	public static final Calendar dateTimeServerStarted = Calendar.getInstance();
+	
+	public GameServer() throws Exception {
+		
+		final var serverLoadStart = startTimedSection("Database");
+		ConnectionFactory.builder() //
+			.withUrl(database().getURL()) //
+			.withUser(database().getUser()) //
+			.withPassword(database().getPassword()) //
+			.withMaxIdleTime(database().getMaxIdleTime()) //
+			.withMaxPoolSize(database().getMaxConnections()) //
+			.build();
+		
+		DAOFactory.getInstance();
+		
+		if (!IdFactory.getInstance().isInitialized()) {
+			LOG.error("Could not read object IDs from database. Please check your configuration.");
+			throw new Exception("Could not initialize the Id factory!");
+		}
+		endTimedSection("Database", serverLoadStart);
+		
+		ThreadPoolManager.getInstance();
+		EventDispatcher.getInstance();
+		ScriptEngineManager.getInstance();
+		
+		final var worldStart = startTimedSection("World");
+		GameTimeController.init();
+		InstanceManager.getInstance();
+		L2World.getInstance();
+		MapRegionManager.getInstance();
+		AnnouncementsTable.getInstance();
+		GlobalVariablesManager.getInstance();
+		endTimedSection("World", worldStart);
+		
+		final var dataStart = startTimedSection("Data");
+		CategoryData.getInstance();
+		SecondaryAuthData.getInstance();
+		endTimedSection("Data", dataStart);
+		
+		final var effectsStart = startTimedSection("Effects");
+		EffectHandler.getInstance().executeScript();
+		endTimedSection("Effects", effectsStart);
+		
+		final var esgStart = startTimedSection("Enchant Skill Groups");
+		EnchantSkillGroupsData.getInstance();
+		endTimedSection("Enchant Skill Groups", esgStart);
+		
+		final var skillTreesStart = startTimedSection("Skill Trees");
+		SkillTreesData.getInstance();
+		endTimedSection("Skill Trees", skillTreesStart);
+		
+		final var skillsStart = startTimedSection("Skills");
+		SkillData.getInstance();
+		SummonSkillsTable.getInstance();
+		endTimedSection("Skills", skillsStart);
+		
+		final var itemsStart = startTimedSection("Items");
+		ItemTable.getInstance();
+		EnchantItemGroupsData.getInstance();
+		EnchantItemData.getInstance();
+		EnchantItemOptionsData.getInstance();
+		OptionData.getInstance();
+		EnchantItemHPBonusData.getInstance();
+		MultisellData.getInstance();
+		RecipeData.getInstance();
+		ArmorSetsData.getInstance();
+		FishData.getInstance();
+		FishingMonstersData.getInstance();
+		FishingRodsData.getInstance();
+		HennaData.getInstance();
+		endTimedSection("Items", itemsStart);
+		
+		final var charactersStart = startTimedSection("Characters");
+		ClassListData.getInstance();
+		InitialEquipmentData.getInstance();
+		InitialShortcutData.getInstance();
+		ExperienceData.getInstance();
+		PlayerXpPercentLostData.getInstance();
+		KarmaData.getInstance();
+		HitConditionBonusData.getInstance();
+		PlayerTemplateData.getInstance();
+		PlayerCreationPointData.getInstance();
+		CharNameTable.getInstance();
+		AdminData.getInstance();
+		RaidBossPointsManager.getInstance();
+		PetDataTable.getInstance();
+		CharSummonTable.getInstance().init();
+		endTimedSection("Characters", charactersStart);
+		
+		final var bbsStart = startTimedSection("BBS");
+		if (general().enableCommunityBoard()) {
+			ForumsBBSManager.getInstance().load();
+		}
+		endTimedSection("BBS", bbsStart);
+		
+		final var clansStart = startTimedSection("Clans");
+		ClanTable.getInstance();
+		ClanHallSiegeManager.getInstance();
+		ClanHallManager.getInstance();
+		AuctionManager.getInstance();
+		endTimedSection("Clans", clansStart);
+		
+		final var geodataStart = startTimedSection("Geodata");
+		GeoData.getInstance();
+		if (geodata().getPathFinding() > 0) {
+			PathFinding.getInstance();
+		}
+		endTimedSection("Geodata", geodataStart);
+		
+		final var npcsStart = startTimedSection("NPCs");
+		SkillLearnData.getInstance();
+		NpcData.getInstance();
+		WalkingManager.getInstance();
+		StaticObjectData.getInstance();
+		ZoneManager.getInstance();
+		DoorData.getInstance();
+		CastleManager.getInstance().loadInstances();
+		NpcBufferTable.getInstance();
+		GrandBossManager.getInstance().initZones();
+		EventDroplist.getInstance();
+		endTimedSection("NPCs", npcsStart);
+		
+		final var auctionStart = startTimedSection("Auction Manager");
+		ItemAuctionManager.getInstance();
+		endTimedSection("Auction Manager", auctionStart);
+		
+		final var olympiadStart = startTimedSection("Olympiad");
+		Olympiad.getInstance();
+		Hero.getInstance();
+		endTimedSection("Olympiad", olympiadStart);
+		
+		final var sevenSignsStart = startTimedSection("Seven Signs");
+		SevenSigns.getInstance();
+		endTimedSection("Seven Signs", sevenSignsStart);
+		
+		// Call to load caches
+		final var cacheStart = startTimedSection("Cache");
+		HtmCache.getInstance();
+		CrestTable.getInstance();
+		UIData.getInstance();
+		PartyMatchWaitingList.getInstance();
+		PartyMatchRoomList.getInstance();
+		PetitionManager.getInstance();
+		AugmentationData.getInstance();
+		CursedWeaponsManager.getInstance();
+		TransformData.getInstance();
+		BotReportTable.getInstance();
+		QuestManager.getInstance();
+		BoatManager.getInstance();
+		AirShipManager.getInstance();
+		GraciaSeedsManager.getInstance();
+		endTimedSection("Cache", cacheStart);
+		
+		final var handlersStart = startTimedSection("Handlers");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/handlers/MasterHandler.java");
+		endTimedSection("Handlers", handlersStart);
+		
+		final var aiStart = startTimedSection("AI");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/ai/AILoader.java");
+		endTimedSection("AI", aiStart);
+		
+		final var instancesStart = startTimedSection("Instances");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/instances/InstanceLoader.java");
+		endTimedSection("Instances", instancesStart);
+		
+		final var graciaStart = startTimedSection("Gracia");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/gracia/GraciaLoader.java");
+		endTimedSection("Gracia", graciaStart);
+		
+		final var hellboundStart = startTimedSection("Hellbound");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/hellbound/HellboundLoader.java");
+		endTimedSection("Hellbound", hellboundStart);
+		
+		final var questsStart = startTimedSection("Quests");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/quests/QuestLoader.java");
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/quests/TerritoryWarScripts/TerritoryWarSuperClass.java");
+		endTimedSection("Quests", questsStart);
+		
+		final var scriptsStart = startTimedSection("Scripts");
+		ScriptEngineManager.getInstance().executeScriptList(new File(server().getDatapackRoot(), "data/scripts.cfg"));
+		endTimedSection("Scripts", scriptsStart);
+		
+		final var buyListStart = startTimedSection("BuyLists");
+		BuyListData.getInstance().load();
+		endTimedSection("BuyLists", buyListStart);
+		
+		final var spawnsStart = startTimedSection("Spawns");
+		SpawnTable.getInstance().load();
+		DayNightSpawnManager.getInstance().trim().notifyChangeMode();
+		FourSepulchersManager.getInstance().init();
+		DimensionalRiftManager.getInstance();
+		RaidBossSpawnManager.getInstance();
+		endTimedSection("Spawns", spawnsStart);
+		
+		final var siegeStart = startTimedSection("Siege");
+		SiegeManager.getInstance().getSieges();
+		CastleManager.getInstance().activateInstances();
+		FortManager.getInstance().loadInstances();
+		FortManager.getInstance().activateInstances();
+		FortSiegeManager.getInstance();
+		SiegeScheduleData.getInstance();
+		TerritoryWarManager.getInstance();
+		CastleManorManager.getInstance();
+		MercTicketManager.getInstance();
+		endTimedSection("Siege", siegeStart);
+		
+		final var otherStart = startTimedSection("Other");
+		if (general().saveDroppedItem()) {
+			ItemsOnGroundManager.getInstance();
+		}
+		
+		if ((general().getAutoDestroyDroppedItemAfter() > 0) || (general().getAutoDestroyHerbTime() > 0)) {
+			ItemsAutoDestroy.getInstance();
+		}
+		
+		MonsterRace.getInstance();
+		SevenSigns.getInstance().spawnSevenSignsNPC();
+		SevenSignsFestival.getInstance();
+		AutoSpawnHandler.getInstance();
+		FaenorScriptEngine.getInstance();
+		
+		if (customs().allowWedding()) {
+			CoupleManager.getInstance();
+		}
+		
+		TaskManager.getInstance();
+		
+		AntiFeedManager.getInstance().registerEvent(AntiFeedManager.GAME_ID);
+		
+		if (general().allowMail()) {
+			MailManager.getInstance();
+		}
+		
+		PunishmentManager.getInstance();
+		
+		Runtime.getRuntime().addShutdownHook(Shutdown.getInstance());
+		
+		LOG.info("Free Object Ids remaining {}.", IdFactory.getInstance().size());
+		
+		TvTManager.getInstance();
+		KnownListUpdateTaskManager.getInstance();
+		
+		if ((customs().offlineTradeEnable() || customs().offlineCraftEnable()) && customs().restoreOffliners()) {
+			OfflineTradersTable.getInstance().restoreOfflineTraders();
+		}
+		
+		// Multilingual Support
+		if (customs().multiLangEnable()) {
+			if (customs().multiLangSystemMessageEnable()) {
+				SystemMessageId.reloadLocalisations();
+			}
+			if (customs().multiLangNpcStringEnable()) {
+				NpcStringId.reloadLocalisations();
+			}
+		}
+		
+		endTimedSection("Other", otherStart);
+		
+		if (general().deadLockDetector()) {
+			_deadDetectThread = new DeadLockDetector();
+			_deadDetectThread.setDaemon(true);
+			_deadDetectThread.start();
+		} else {
+			_deadDetectThread = null;
+		}
+		System.gc();
+		// maxMemory is the upper limit the jvm can use, totalMemory the size of
+		// the current allocation pool, freeMemory the unused memory in the allocation pool
+		long freeMem = ((Runtime.getRuntime().maxMemory() - Runtime.getRuntime().totalMemory()) + Runtime.getRuntime().freeMemory()) / 1048576;
+		long totalMem = Runtime.getRuntime().maxMemory() / 1048576;
+		LOG.info("Started, free memory {} Mb of {} Mb", freeMem, totalMem);
+		Toolkit.getDefaultToolkit().beep();
+		LoginServerThread.getInstance().start();
+		
+		final SelectorConfig sc = new SelectorConfig();
+		sc.MAX_READ_PER_PASS = mmo().getMaxReadPerPass();
+		sc.MAX_SEND_PER_PASS = mmo().getMaxSendPerPass();
+		sc.SLEEP_TIME = mmo().getSleepTime();
+		sc.HELPER_BUFFER_COUNT = mmo().getHelperBufferCount();
+		sc.TCP_NODELAY = mmo().isTcpNoDelay();
+		
+		_gamePacketHandler = new L2GamePacketHandler();
+		_selectorThread = new SelectorThread<>(sc, _gamePacketHandler, _gamePacketHandler, _gamePacketHandler, new IPv4Filter());
+		
+		InetAddress bindAddress = null;
+		if (!server().getHost().equals("*")) {
+			try {
+				bindAddress = InetAddress.getByName(server().getHost());
+			} catch (UnknownHostException ex) {
+				LOG.warn("Bind address is invalid, using all available IPs!", ex);
+			}
+		}
+		
+		try {
+			_selectorThread.openServerSocket(bindAddress, server().getPort());
+			_selectorThread.start();
+			LOG.info("Now listening on {}:{}", server().getHost(), server().getPort());
+		} catch (IOException ex) {
+			LOG.error("Failed to open server socket!", ex);
+			System.exit(1);
+		}
+		
+		if (server().enableUPnP()) {
+			startTimedSection("UPnP");
+			UPnPService.getInstance().load(server().getPort(), "L2J Game Server");
+		}
+		
+		if (telnet().isEnabled()) {
+			new Status(telnet().getPort(), telnet().getPassword()).start();
+		} else {
+			LOG.info("Telnet server is currently disabled.");
+		}
+		
+		LOG.info("Maximum numbers of connected players {}.", server().getMaxOnlineUsers());
+		LOG.info("Server {} loaded in {} seconds.", ServerNameDAO.getServer(hexId().getServerID()), MILLISECONDS.toSeconds(System.currentTimeMillis() - serverLoadStart));
+	}
+	
+	public static void main(String[] args) throws Exception {
+		final String datapackRoot = Util.parseArg(args, DATAPACK, true);
+		if (datapackRoot != null) {
+			server().setProperty("DatapackRoot", datapackRoot);
+		}
+		
+		final String scriptRoot = Util.parseArg(args, SCRIPT, true);
+		if (scriptRoot != null) {
+			server().setProperty("ScriptRoot", scriptRoot);
+		}
+		
+		final String geodata = Util.parseArg(args, GEODATA, true);
+		if (geodata != null) {
+			geodata().setProperty("GeoDataPath", geodata);
+		}
+		
+		gameServer = new GameServer();
+	}
+	
+	public long getUsedMemoryMB() {
+		return (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1048576;
+	}
+	
+	public SelectorThread<L2GameClient> getSelectorThread() {
+		return _selectorThread;
+	}
+	
+	public L2GamePacketHandler getL2GamePacketHandler() {
+		return _gamePacketHandler;
+	}
+	
+	public DeadLockDetector getDeadLockDetectorThread() {
+		return _deadDetectThread;
+	}
+	
+	public static long startTimedSection(String sectionName) {
+		final var sBuilder = new StringBuilder("=[ " + sectionName + " ]");
+		while (sBuilder.length() < 61) {
+			sBuilder.insert(0, "-");
+		}
+		LOG.info(sBuilder.toString());
+		
+		return System.currentTimeMillis();
+	}
+	
+	private static void endTimedSection(String sectionName, long startTime) {
+		LOG.info("[ {} loaded in {}ms ]", sectionName, System.currentTimeMillis() - startTime);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/GameTimeController.java b/src/main/java/com/l2jserver/gameserver/GameTimeController.java
new file mode 100644
index 00000000..eb868e69
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/GameTimeController.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import java.util.Calendar;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Game Time controller class.
+ * @author Forsaiken
+ */
+public final class GameTimeController extends Thread {
+	private static final Logger LOG = LoggerFactory.getLogger(GameTimeController.class);
+	
+	public static final int TICKS_PER_SECOND = 10; // not able to change this without checking through code
+	public static final int MILLIS_IN_TICK = 1000 / TICKS_PER_SECOND;
+	public static final int IG_DAYS_PER_DAY = 6;
+	public static final int MILLIS_PER_IG_DAY = (3600000 * 24) / IG_DAYS_PER_DAY;
+	public static final int SECONDS_PER_IG_DAY = MILLIS_PER_IG_DAY / 1000;
+	public static final int MINUTES_PER_IG_DAY = SECONDS_PER_IG_DAY / 60;
+	public static final int TICKS_PER_IG_DAY = SECONDS_PER_IG_DAY * TICKS_PER_SECOND;
+	public static final int TICKS_PER_IG_HOUR = TICKS_PER_IG_DAY / 24;
+	public static final int TICKS_PER_IG_MINUTE = TICKS_PER_IG_HOUR / 60;
+	public static final int TICKS_SUN_STATE_CHANGE = TICKS_PER_IG_DAY / 4;
+	
+	private static GameTimeController _instance;
+	
+	private final Set<L2Character> _movingObjects = ConcurrentHashMap.newKeySet();
+	private final long _referenceTime;
+	
+	private GameTimeController() {
+		super("GameTimeController");
+		super.setDaemon(true);
+		super.setPriority(MAX_PRIORITY);
+		
+		final Calendar c = Calendar.getInstance();
+		c.set(Calendar.HOUR_OF_DAY, 0);
+		c.set(Calendar.MINUTE, 0);
+		c.set(Calendar.SECOND, 0);
+		c.set(Calendar.MILLISECOND, 0);
+		_referenceTime = c.getTimeInMillis();
+		
+		super.start();
+	}
+	
+	public static void init() {
+		_instance = new GameTimeController();
+	}
+	
+	public int getGameTime() {
+		return (getGameTicks() % TICKS_PER_IG_DAY) / TICKS_PER_IG_MINUTE;
+	}
+	
+	public int getGameHour() {
+		return getGameTime() / 60;
+	}
+	
+	public int getGameMinute() {
+		return getGameTime() % 60;
+	}
+	
+	public boolean isNight() {
+		return getGameHour() < 6;
+	}
+	
+	/**
+	 * The true GameTime tick. Directly taken from current time. This represents the tick of the time.
+	 * @return
+	 */
+	public int getGameTicks() {
+		return (int) ((System.currentTimeMillis() - _referenceTime) / MILLIS_IN_TICK);
+	}
+	
+	/**
+	 * Add a L2Character to movingObjects of GameTimeController.
+	 * @param cha The L2Character to add to movingObjects of GameTimeController
+	 */
+	public void registerMovingObject(final L2Character cha) {
+		if (cha == null) {
+			return;
+		}
+		
+		_movingObjects.add(cha);
+	}
+	
+	/**
+	 * Move all L2Characters contained in movingObjects of GameTimeController.<BR>
+	 * <B><U> Concept</U> :</B><BR>
+	 * All L2Character in movement are identified in <B>movingObjects</B> of GameTimeController.<BR>
+	 * <B><U> Actions</U> :</B><BR>
+	 * <ul>
+	 * <li>Update the position of each L2Character</li>
+	 * <li>If movement is finished, the L2Character is removed from movingObjects</li>
+	 * <li>Create a task to update the _knownObject and _knowPlayers of each L2Character that finished its movement and of their already known L2Object then notify AI with EVT_ARRIVED</li>
+	 * </ul>
+	 */
+	private void moveObjects() {
+		_movingObjects.removeIf(L2Character::updatePosition);
+	}
+	
+	public void stopTimer() {
+		super.interrupt();
+		LOG.info("Stopping {}", getClass().getSimpleName());
+	}
+	
+	@Override
+	public void run() {
+		LOG.debug("{}: Started.", getClass().getSimpleName());
+		
+		long nextTickTime, sleepTime;
+		boolean isNight = isNight();
+		
+		if (isNight) {
+			ThreadPoolManager.getInstance().executeAi(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
+		}
+		
+		while (true) {
+			nextTickTime = System.currentTimeMillis() + MILLIS_IN_TICK;
+			
+			try {
+				moveObjects();
+			} catch (final Throwable e) {
+				LOG.warn("Unable to move objects!", e);
+			}
+			
+			sleepTime = nextTickTime - System.currentTimeMillis();
+			if (sleepTime > 0) {
+				try {
+					Thread.sleep(sleepTime);
+				} catch (final InterruptedException e) {
+					
+				}
+			}
+			
+			if (isNight() != isNight) {
+				isNight = !isNight;
+				
+				ThreadPoolManager.getInstance().executeAi(() -> DayNightSpawnManager.getInstance().notifyChangeMode());
+			}
+		}
+	}
+	
+	public static GameTimeController getInstance() {
+		return _instance;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/GeoData.java b/src/main/java/com/l2jserver/gameserver/GeoData.java
new file mode 100644
index 00000000..97edad23
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/GeoData.java
@@ -0,0 +1,582 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.util.GeoUtils;
+import com.l2jserver.gameserver.util.LinePointIterator;
+import com.l2jserver.gameserver.util.LinePointIterator3D;
+import com.l2jserver.geodriver.Cell;
+import com.l2jserver.geodriver.GeoDriver;
+
+/**
+ * Geodata.
+ * @author -Nemesiss-
+ * @author HorridoJoho
+ */
+public class GeoData {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(GeoData.class);
+	
+	private static final String FILE_NAME_FORMAT = "%d_%d.l2j";
+	
+	private static final int ELEVATED_SEE_OVER_DISTANCE = 2;
+	
+	private static final int MAX_SEE_OVER_HEIGHT = 48;
+	
+	private static final int SPAWN_Z_DELTA_LIMIT = 100;
+	
+	private static final Map<String, Boolean> GEODATA_REGIONS = new HashMap<>();
+	
+	private final GeoDriver _driver = new GeoDriver();
+	
+	protected GeoData() {
+		loadGeodataRegions();
+		
+		int loadedRegions = 0;
+		try {
+			for (int regionX = L2World.TILE_X_MIN; regionX <= L2World.TILE_X_MAX; regionX++) {
+				for (int regionY = L2World.TILE_Y_MIN; regionY <= L2World.TILE_Y_MAX; regionY++) {
+					final Path geoFilePath = geodata().getGeoDataPath().toPath().resolve(String.format(FILE_NAME_FORMAT, regionX, regionY));
+					final Boolean loadFile = GEODATA_REGIONS.get(regionX + "_" + regionY);
+					if (loadFile != null) {
+						if (loadFile) {
+							LOG.info("Loading {}...", geoFilePath.getFileName());
+							_driver.loadRegion(geoFilePath, regionX, regionY);
+							loadedRegions++;
+						}
+					} else if (geodata().tryLoadUnspecifiedRegions() && Files.exists(geoFilePath)) {
+						try {
+							LOG.info("Loading {}...", geoFilePath.getFileName());
+							_driver.loadRegion(geoFilePath, regionX, regionY);
+							loadedRegions++;
+						} catch (Exception ex) {
+							LOG.warn("Failed to load {}!", geoFilePath.getFileName(), ex);
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Failed to load geodata!", ex);
+			System.exit(1);
+		}
+		
+		LOG.info("Loaded {} regions.", loadedRegions);
+	}
+	
+	private static void loadGeodataRegions() {
+		for (int regionX = L2World.TILE_X_MIN; regionX <= L2World.TILE_X_MAX; regionX++) {
+			for (int regionY = L2World.TILE_Y_MIN; regionY <= L2World.TILE_Y_MAX; regionY++) {
+				String key = regionX + "_" + regionY;
+				if (geodata().getIncludedRegions().contains(regionX + "_" + regionY)) {
+					GEODATA_REGIONS.put(key, true);
+				} else if (geodata().getExcludedRegions().contains(regionX + "_" + regionY)) {
+					GEODATA_REGIONS.put(key, false);
+				}
+			}
+		}
+	}
+	
+	public boolean hasGeoPos(int geoX, int geoY) {
+		return _driver.hasGeoPos(geoX, geoY);
+	}
+	
+	public boolean checkNearestNswe(int geoX, int geoY, int worldZ, int nswe) {
+		return _driver.checkNearestNswe(geoX, geoY, worldZ, nswe);
+	}
+	
+	public boolean checkNearestNsweAntiCornerCut(int geoX, int geoY, int worldZ, int nswe) {
+		boolean can = true;
+		if ((nswe & Cell.NSWE_NORTH_EAST) == Cell.NSWE_NORTH_EAST) {
+			// can = canEnterNeighbors(prevX, prevY - 1, prevGeoZ, Direction.EAST) && canEnterNeighbors(prevX + 1, prevY, prevGeoZ, Direction.NORTH);
+			can = checkNearestNswe(geoX, geoY - 1, worldZ, Cell.NSWE_EAST) && checkNearestNswe(geoX + 1, geoY, worldZ, Cell.NSWE_NORTH);
+		}
+		
+		if (can && ((nswe & Cell.NSWE_NORTH_WEST) == Cell.NSWE_NORTH_WEST)) {
+			// can = canEnterNeighbors(prevX, prevY - 1, prevGeoZ, Direction.WEST) && canEnterNeighbors(prevX - 1, prevY, prevGeoZ, Direction.NORTH);
+			can = checkNearestNswe(geoX, geoY - 1, worldZ, Cell.NSWE_WEST) && checkNearestNswe(geoX - 1, geoY, worldZ, Cell.NSWE_NORTH);
+		}
+		
+		if (can && ((nswe & Cell.NSWE_SOUTH_EAST) == Cell.NSWE_SOUTH_EAST)) {
+			// can = canEnterNeighbors(prevX, prevY + 1, prevGeoZ, Direction.EAST) && canEnterNeighbors(prevX + 1, prevY, prevGeoZ, Direction.SOUTH);
+			can = checkNearestNswe(geoX, geoY + 1, worldZ, Cell.NSWE_EAST) && checkNearestNswe(geoX + 1, geoY, worldZ, Cell.NSWE_SOUTH);
+		}
+		
+		if (can && ((nswe & Cell.NSWE_SOUTH_WEST) == Cell.NSWE_SOUTH_WEST)) {
+			// can = canEnterNeighbors(prevX, prevY + 1, prevGeoZ, Direction.WEST) && canEnterNeighbors(prevX - 1, prevY, prevGeoZ, Direction.SOUTH);
+			can = checkNearestNswe(geoX, geoY + 1, worldZ, Cell.NSWE_WEST) && checkNearestNswe(geoX - 1, geoY, worldZ, Cell.NSWE_SOUTH);
+		}
+		
+		return can && checkNearestNswe(geoX, geoY, worldZ, nswe);
+	}
+	
+	public int getNearestZ(int geoX, int geoY, int worldZ) {
+		return _driver.getNearestZ(geoX, geoY, worldZ);
+	}
+	
+	public int getNextLowerZ(int geoX, int geoY, int worldZ) {
+		return _driver.getNextLowerZ(geoX, geoY, worldZ);
+	}
+	
+	public int getNextHigherZ(int geoX, int geoY, int worldZ) {
+		return _driver.getNextHigherZ(geoX, geoY, worldZ);
+	}
+	
+	public int getGeoX(int worldX) {
+		return _driver.getGeoX(worldX);
+	}
+	
+	public int getGeoY(int worldY) {
+		return _driver.getGeoY(worldY);
+	}
+	
+	public int getWorldX(int geoX) {
+		return _driver.getWorldX(geoX);
+	}
+	
+	public int getWorldY(int geoY) {
+		return _driver.getWorldY(geoY);
+	}
+	
+	// ///////////////////
+	// L2J METHODS
+	/**
+	 * Gets the height.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the z coordinate
+	 * @return the height
+	 */
+	public int getHeight(int x, int y, int z) {
+		return getNearestZ(getGeoX(x), getGeoY(y), z);
+	}
+	
+	/**
+	 * Gets the spawn height.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the the z coordinate
+	 * @return the spawn height
+	 */
+	public int getSpawnHeight(int x, int y, int z) {
+		final int geoX = getGeoX(x);
+		final int geoY = getGeoY(y);
+		
+		if (!hasGeoPos(geoX, geoY)) {
+			return z;
+		}
+		
+		int nextLowerZ = getNextLowerZ(geoX, geoY, z + 20);
+		return Math.abs(nextLowerZ - z) <= SPAWN_Z_DELTA_LIMIT ? nextLowerZ : z;
+	}
+	
+	/**
+	 * Gets the spawn height.
+	 * @param location the location
+	 * @return the spawn height
+	 */
+	public int getSpawnHeight(Location location) {
+		return getSpawnHeight(location.getX(), location.getY(), location.getZ());
+	}
+	
+	/**
+	 * Can see target. Doors as target always return true. Checks doors between.
+	 * @param cha the character
+	 * @param target the target
+	 * @return {@code true} if the character can see the target (LOS), {@code false} otherwise
+	 */
+	public boolean canSeeTarget(L2Object cha, L2Object target) {
+		if (target == null) {
+			return false;
+		}
+		if (target.isDoor()) {
+			return true;
+		}
+		return canSeeTarget(cha.getX(), cha.getY(), cha.getZ(), cha.getInstanceId(), target.getX(), target.getY(), target.getZ(), target.getInstanceId());
+	}
+	
+	/**
+	 * Can see target. Checks doors between.
+	 * @param cha the character
+	 * @param worldPosition the world position
+	 * @return {@code true} if the character can see the target at the given world position, {@code false} otherwise
+	 */
+	public boolean canSeeTarget(L2Object cha, ILocational worldPosition) {
+		return canSeeTarget(cha.getX(), cha.getY(), cha.getZ(), cha.getInstanceId(), worldPosition.getX(), worldPosition.getY(), worldPosition.getZ());
+	}
+	
+	/**
+	 * Can see target. Checks doors between.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the z coordinate
+	 * @param instanceId
+	 * @param tx the target's x coordinate
+	 * @param ty the target's y coordinate
+	 * @param tz the target's z coordinate
+	 * @param tInstanceId the target's instanceId
+	 * @return
+	 */
+	public boolean canSeeTarget(int x, int y, int z, int instanceId, int tx, int ty, int tz, int tInstanceId) {
+		if ((instanceId != tInstanceId)) {
+			return false;
+		}
+		return canSeeTarget(x, y, z, instanceId, tx, ty, tz);
+	}
+	
+	/**
+	 * Can see target. Checks doors between.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the z coordinate
+	 * @param instanceId
+	 * @param tx the target's x coordinate
+	 * @param ty the target's y coordinate
+	 * @param tz the target's z coordinate
+	 * @return {@code true} if there is line of sight between the given coordinate sets, {@code false} otherwise
+	 */
+	public boolean canSeeTarget(int x, int y, int z, int instanceId, int tx, int ty, int tz) {
+		if (DoorData.getInstance().checkIfDoorsBetween(x, y, z, tx, ty, tz, instanceId, true)) {
+			return false;
+		}
+		return canSeeTarget(x, y, z, tx, ty, tz);
+	}
+	
+	private int getLosGeoZ(int prevX, int prevY, int prevGeoZ, int curX, int curY, int nswe) {
+		if ((((nswe & Cell.NSWE_NORTH) != 0) && ((nswe & Cell.NSWE_SOUTH) != 0)) || (((nswe & Cell.NSWE_WEST) != 0) && ((nswe & Cell.NSWE_EAST) != 0))) {
+			throw new RuntimeException("Multiple directions!");
+		}
+		
+		if (checkNearestNsweAntiCornerCut(prevX, prevY, prevGeoZ, nswe)) {
+			return getNearestZ(curX, curY, prevGeoZ);
+		}
+		return getNextHigherZ(curX, curY, prevGeoZ);
+	}
+	
+	/**
+	 * Can see target. Does not check doors between.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the z coordinate
+	 * @param tx the target's x coordinate
+	 * @param ty the target's y coordinate
+	 * @param tz the target's z coordinate
+	 * @return {@code true} if there is line of sight between the given coordinate sets, {@code false} otherwise
+	 */
+	public boolean canSeeTarget(int x, int y, int z, int tx, int ty, int tz) {
+		int geoX = getGeoX(x);
+		int geoY = getGeoY(y);
+		int tGeoX = getGeoX(tx);
+		int tGeoY = getGeoY(ty);
+		
+		z = getNearestZ(geoX, geoY, z);
+		tz = getNearestZ(tGeoX, tGeoY, tz);
+		
+		// fast path
+		if ((geoX == tGeoX) && (geoY == tGeoY)) {
+			if (hasGeoPos(tGeoX, tGeoY)) {
+				return z == tz;
+			}
+			
+			return true;
+		}
+		
+		if (tz > z) {
+			int tmp = tx;
+			tx = x;
+			x = tmp;
+			
+			tmp = ty;
+			ty = y;
+			y = tmp;
+			
+			tmp = tz;
+			tz = z;
+			z = tmp;
+			
+			tmp = tGeoX;
+			tGeoX = geoX;
+			geoX = tmp;
+			
+			tmp = tGeoY;
+			tGeoY = geoY;
+			geoY = tmp;
+		}
+		
+		LinePointIterator3D pointIter = new LinePointIterator3D(geoX, geoY, z, tGeoX, tGeoY, tz);
+		// first point is guaranteed to be available, skip it, we can always see our own position
+		pointIter.next();
+		int prevX = pointIter.x();
+		int prevY = pointIter.y();
+		int prevZ = pointIter.z();
+		int prevGeoZ = prevZ;
+		int ptIndex = 0;
+		while (pointIter.next()) {
+			int curX = pointIter.x();
+			int curY = pointIter.y();
+			
+			if ((curX == prevX) && (curY == prevY)) {
+				continue;
+			}
+			
+			int beeCurZ = pointIter.z();
+			int curGeoZ = prevGeoZ;
+			
+			// check if the position has geodata
+			if (hasGeoPos(curX, curY)) {
+				int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY);
+				curGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, curX, curY, nswe);
+				int maxHeight;
+				if (ptIndex < ELEVATED_SEE_OVER_DISTANCE) {
+					maxHeight = z + MAX_SEE_OVER_HEIGHT;
+				} else {
+					maxHeight = beeCurZ + MAX_SEE_OVER_HEIGHT;
+				}
+				
+				boolean canSeeThrough = false;
+				if (curGeoZ <= maxHeight) {
+					if ((nswe & Cell.NSWE_NORTH_EAST) == Cell.NSWE_NORTH_EAST) {
+						int northGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY - 1, Cell.NSWE_EAST);
+						int eastGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX + 1, prevY, Cell.NSWE_NORTH);
+						canSeeThrough = (northGeoZ <= maxHeight) && (eastGeoZ <= maxHeight) && (northGeoZ <= getNearestZ(prevX, prevY - 1, beeCurZ)) && (eastGeoZ <= getNearestZ(prevX + 1, prevY, beeCurZ));
+					} else if ((nswe & Cell.NSWE_NORTH_WEST) == Cell.NSWE_NORTH_WEST) {
+						int northGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY - 1, Cell.NSWE_WEST);
+						int westGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX - 1, prevY, Cell.NSWE_NORTH);
+						canSeeThrough = (northGeoZ <= maxHeight) && (westGeoZ <= maxHeight) && (northGeoZ <= getNearestZ(prevX, prevY - 1, beeCurZ)) && (westGeoZ <= getNearestZ(prevX - 1, prevY, beeCurZ));
+					} else if ((nswe & Cell.NSWE_SOUTH_EAST) == Cell.NSWE_SOUTH_EAST) {
+						int southGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY + 1, Cell.NSWE_EAST);
+						int eastGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX + 1, prevY, Cell.NSWE_SOUTH);
+						canSeeThrough = (southGeoZ <= maxHeight) && (eastGeoZ <= maxHeight) && (southGeoZ <= getNearestZ(prevX, prevY + 1, beeCurZ)) && (eastGeoZ <= getNearestZ(prevX + 1, prevY, beeCurZ));
+					} else if ((nswe & Cell.NSWE_SOUTH_WEST) == Cell.NSWE_SOUTH_WEST) {
+						int southGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX, prevY + 1, Cell.NSWE_WEST);
+						int westGeoZ = getLosGeoZ(prevX, prevY, prevGeoZ, prevX - 1, prevY, Cell.NSWE_SOUTH);
+						canSeeThrough = (southGeoZ <= maxHeight) && (westGeoZ <= maxHeight) && (southGeoZ <= getNearestZ(prevX, prevY + 1, beeCurZ)) && (westGeoZ <= getNearestZ(prevX - 1, prevY, beeCurZ));
+					} else {
+						canSeeThrough = true;
+					}
+				}
+				
+				if (!canSeeThrough) {
+					return false;
+				}
+			}
+			
+			prevX = curX;
+			prevY = curY;
+			prevGeoZ = curGeoZ;
+			++ptIndex;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Verifies if the is a path between origin's location and destination, if not returns the closest location.
+	 * @param origin the origin
+	 * @param destination the destination
+	 * @return the destination if there is a path or the closes location
+	 */
+	public Location moveCheck(ILocational origin, ILocational destination) {
+		return moveCheck(origin.getX(), origin.getY(), origin.getZ(), destination.getX(), destination.getY(), destination.getZ(), origin.getInstanceId());
+	}
+	
+	/**
+	 * Move check.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the z coordinate
+	 * @param tx the target's x coordinate
+	 * @param ty the target's y coordinate
+	 * @param tz the target's z coordinate
+	 * @param instanceId the instance id
+	 * @return the last Location (x,y,z) where player can walk - just before wall
+	 */
+	public Location moveCheck(int x, int y, int z, int tx, int ty, int tz, int instanceId) {
+		int geoX = getGeoX(x);
+		int geoY = getGeoY(y);
+		z = getNearestZ(geoX, geoY, z);
+		int tGeoX = getGeoX(tx);
+		int tGeoY = getGeoY(ty);
+		tz = getNearestZ(tGeoX, tGeoY, tz);
+		
+		if (DoorData.getInstance().checkIfDoorsBetween(x, y, z, tx, ty, tz, instanceId, false)) {
+			return new Location(x, y, getHeight(x, y, z));
+		}
+		
+		LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
+		// first point is guaranteed to be available
+		pointIter.next();
+		int prevX = pointIter.x();
+		int prevY = pointIter.y();
+		int prevZ = z;
+		
+		while (pointIter.next()) {
+			int curX = pointIter.x();
+			int curY = pointIter.y();
+			int curZ = getNearestZ(curX, curY, prevZ);
+			
+			if (hasGeoPos(prevX, prevY)) {
+				int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY);
+				if (!checkNearestNsweAntiCornerCut(prevX, prevY, prevZ, nswe)) {
+					// can't move, return previous location
+					return new Location(getWorldX(prevX), getWorldY(prevY), prevZ);
+				}
+			}
+			
+			prevX = curX;
+			prevY = curY;
+			prevZ = curZ;
+		}
+		
+		if (hasGeoPos(prevX, prevY) && (prevZ != tz)) {
+			// different floors, return start location
+			return new Location(x, y, z);
+		}
+		
+		return new Location(tx, ty, tz);
+	}
+	
+	/**
+	 * Checks if its possible to move from one location to another.
+	 * @param fromX the X coordinate to start checking from
+	 * @param fromY the Y coordinate to start checking from
+	 * @param fromZ the Z coordinate to start checking from
+	 * @param toX the X coordinate to end checking at
+	 * @param toY the Y coordinate to end checking at
+	 * @param toZ the Z coordinate to end checking at
+	 * @param instanceId the instance ID
+	 * @return {@code true} if the character at start coordinates can move to end coordinates, {@code false} otherwise
+	 */
+	public boolean canMove(int fromX, int fromY, int fromZ, int toX, int toY, int toZ, int instanceId) {
+		int geoX = getGeoX(fromX);
+		int geoY = getGeoY(fromY);
+		fromZ = getNearestZ(geoX, geoY, fromZ);
+		int tGeoX = getGeoX(toX);
+		int tGeoY = getGeoY(toY);
+		toZ = getNearestZ(tGeoX, tGeoY, toZ);
+		
+		if (DoorData.getInstance().checkIfDoorsBetween(fromX, fromY, fromZ, toX, toY, toZ, instanceId, false)) {
+			return false;
+		}
+		
+		LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
+		// first point is guaranteed to be available
+		pointIter.next();
+		int prevX = pointIter.x();
+		int prevY = pointIter.y();
+		int prevZ = fromZ;
+		
+		while (pointIter.next()) {
+			int curX = pointIter.x();
+			int curY = pointIter.y();
+			int curZ = getNearestZ(curX, curY, prevZ);
+			
+			if (hasGeoPos(prevX, prevY)) {
+				int nswe = GeoUtils.computeNswe(prevX, prevY, curX, curY);
+				if (!checkNearestNsweAntiCornerCut(prevX, prevY, prevZ, nswe)) {
+					return false;
+				}
+			}
+			
+			prevX = curX;
+			prevY = curY;
+			prevZ = curZ;
+		}
+		
+		// different floors
+		return !hasGeoPos(prevX, prevY) || (prevZ == toZ);
+	}
+	
+	public int traceTerrainZ(int x, int y, int z, int tx, int ty) {
+		int geoX = getGeoX(x);
+		int geoY = getGeoY(y);
+		z = getNearestZ(geoX, geoY, z);
+		int tGeoX = getGeoX(tx);
+		int tGeoY = getGeoY(ty);
+		
+		LinePointIterator pointIter = new LinePointIterator(geoX, geoY, tGeoX, tGeoY);
+		// first point is guaranteed to be available
+		pointIter.next();
+		int prevZ = z;
+		
+		while (pointIter.next()) {
+			int curX = pointIter.x();
+			int curY = pointIter.y();
+			int curZ = getNearestZ(curX, curY, prevZ);
+			
+			prevZ = curZ;
+		}
+		
+		return prevZ;
+	}
+	
+	/**
+	 * Checks if its possible to move from one location to another.
+	 * @param from the {@code ILocational} to start checking from
+	 * @param toX the X coordinate to end checking at
+	 * @param toY the Y coordinate to end checking at
+	 * @param toZ the Z coordinate to end checking at
+	 * @return {@code true} if the character at start coordinates can move to end coordinates, {@code false} otherwise
+	 */
+	public boolean canMove(ILocational from, int toX, int toY, int toZ) {
+		return canMove(from.getX(), from.getY(), from.getZ(), toX, toY, toZ, from.getInstanceId());
+	}
+	
+	/**
+	 * Checks if its possible to move from one location to another.
+	 * @param from the {@code ILocational} to start checking from
+	 * @param to the {@code ILocational} to end checking at
+	 * @return {@code true} if the character at start coordinates can move to end coordinates, {@code false} otherwise
+	 */
+	public boolean canMove(ILocational from, ILocational to) {
+		return canMove(from, to.getX(), to.getY(), to.getZ());
+	}
+	
+	/**
+	 * Checks the specified position for available geodata.
+	 * @param x the X coordinate
+	 * @param y the Y coordinate
+	 * @return {@code true} if there is geodata for the given coordinates, {@code false} otherwise
+	 */
+	public boolean hasGeo(int x, int y) {
+		return hasGeoPos(getGeoX(x), getGeoY(y));
+	}
+	
+	public static GeoData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final GeoData INSTANCE = new GeoData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/InstanceListManager.java b/src/main/java/com/l2jserver/gameserver/InstanceListManager.java
new file mode 100644
index 00000000..4bda3405
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/InstanceListManager.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+/**
+ * Interface for managers of list of instances.
+ * @author fordfrog
+ */
+public interface InstanceListManager {
+	/**
+	 * Loads instances with their data from persistent format.<br>
+	 * This method has no side effect as calling methods of another instance manager.
+	 */
+	void loadInstances();
+	
+	/**
+	 * For each loaded instance, updates references to related instances.
+	 */
+	void updateReferences();
+	
+	/**
+	 * Activates instances so their setup is performed.
+	 */
+	void activateInstances();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ItemsAutoDestroy.java b/src/main/java/com/l2jserver/gameserver/ItemsAutoDestroy.java
new file mode 100644
index 00000000..3280b043
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ItemsAutoDestroy.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class ItemsAutoDestroy {
+	private final Map<Integer, L2ItemInstance> _items = new ConcurrentHashMap<>();
+	
+	protected ItemsAutoDestroy() {
+		ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this::removeItems, 5000, 5000);
+	}
+	
+	public static ItemsAutoDestroy getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	public synchronized void addItem(L2ItemInstance item) {
+		item.setDropTime(System.currentTimeMillis());
+		_items.put(item.getObjectId(), item);
+	}
+	
+	public synchronized void removeItems() {
+		final long curtime = System.currentTimeMillis();
+		for (L2ItemInstance item : _items.values()) {
+			if (item == null) {
+				continue;
+			}
+			
+			if ((item.getDropTime() == 0) || (item.getItemLocation() != ItemLocation.VOID)) {
+				_items.remove(item.getObjectId());
+			} else {
+				if (item.getItem().getAutoDestroyTime() > 0) {
+					if ((curtime - item.getDropTime()) > item.getItem().getAutoDestroyTime()) {
+						L2World.getInstance().removeVisibleObject(item, item.getWorldRegion());
+						L2World.getInstance().removeObject(item);
+						_items.remove(item.getObjectId());
+						if (general().saveDroppedItem()) {
+							ItemsOnGroundManager.getInstance().removeObject(item);
+						}
+					}
+				} else if (item.getItem().hasExImmediateEffect()) {
+					if ((curtime - item.getDropTime()) > general().getAutoDestroyHerbTime()) {
+						L2World.getInstance().removeVisibleObject(item, item.getWorldRegion());
+						L2World.getInstance().removeObject(item);
+						_items.remove(item.getObjectId());
+						if (general().saveDroppedItem()) {
+							ItemsOnGroundManager.getInstance().removeObject(item);
+						}
+					}
+				} else {
+					final long sleep = ((general().getAutoDestroyDroppedItemAfter() == 0) ? 3600000 : general().getAutoDestroyDroppedItemAfter() * 1000);
+					
+					if ((curtime - item.getDropTime()) > sleep) {
+						L2World.getInstance().removeVisibleObject(item, item.getWorldRegion());
+						L2World.getInstance().removeObject(item);
+						_items.remove(item.getObjectId());
+						if (general().saveDroppedItem()) {
+							ItemsOnGroundManager.getInstance().removeObject(item);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	private static class SingletonHolder {
+		protected static final ItemsAutoDestroy _instance = new ItemsAutoDestroy();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/LoginServerThread.java b/src/main/java/com/l2jserver/gameserver/LoginServerThread.java
new file mode 100644
index 00000000..9d57791c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/LoginServerThread.java
@@ -0,0 +1,705 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.hexId;
+import static com.l2jserver.gameserver.config.Configuration.ip;
+import static com.l2jserver.gameserver.config.Configuration.server;
+import static java.nio.file.StandardOpenOption.CREATE;
+import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
+
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.nio.file.Files;
+import java.security.GeneralSecurityException;
+import java.security.KeyFactory;
+import java.security.interfaces.RSAPublicKey;
+import java.security.spec.RSAKeyGenParameterSpec;
+import java.security.spec.RSAPublicKeySpec;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.network.BaseSendablePacket;
+import com.l2jserver.commons.security.crypt.NewCrypt;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.commons.util.Util;
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.config.HexIdConfiguration;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.gameserverpackets.AuthRequest;
+import com.l2jserver.gameserver.network.gameserverpackets.BlowFishKey;
+import com.l2jserver.gameserver.network.gameserverpackets.ChangeAccessLevel;
+import com.l2jserver.gameserver.network.gameserverpackets.ChangePassword;
+import com.l2jserver.gameserver.network.gameserverpackets.PlayerAuthRequest;
+import com.l2jserver.gameserver.network.gameserverpackets.PlayerInGame;
+import com.l2jserver.gameserver.network.gameserverpackets.PlayerLogout;
+import com.l2jserver.gameserver.network.gameserverpackets.PlayerTracert;
+import com.l2jserver.gameserver.network.gameserverpackets.ReplyCharacters;
+import com.l2jserver.gameserver.network.gameserverpackets.SendMail;
+import com.l2jserver.gameserver.network.gameserverpackets.ServerStatus;
+import com.l2jserver.gameserver.network.gameserverpackets.TempBan;
+import com.l2jserver.gameserver.network.loginserverpackets.AuthResponse;
+import com.l2jserver.gameserver.network.loginserverpackets.ChangePasswordResponse;
+import com.l2jserver.gameserver.network.loginserverpackets.InitLS;
+import com.l2jserver.gameserver.network.loginserverpackets.KickPlayer;
+import com.l2jserver.gameserver.network.loginserverpackets.LoginServerFail;
+import com.l2jserver.gameserver.network.loginserverpackets.PlayerAuthResponse;
+import com.l2jserver.gameserver.network.loginserverpackets.RequestCharacters;
+import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
+import com.l2jserver.gameserver.network.serverpackets.LoginFail;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class LoginServerThread extends Thread {
+	
+	protected static final Logger LOG = LoggerFactory.getLogger(LoginServerThread.class);
+	
+	protected static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	private static final int TEENAGER = 15;
+	
+	private static final int ADULT = 18;
+	
+	private final String _hostname;
+	private final int _port;
+	private final int _gamePort;
+	private Socket _loginSocket;
+	private OutputStream _out;
+	
+	/**
+	 * The BlowFish engine used to encrypt packets<br>
+	 * It is first initialized with a unified key:<br>
+	 * "_;v.]05-31!|+-%xT!^[$\00"<br>
+	 * <br>
+	 * and then after handshake, with a new key sent by<br>
+	 * login server during the handshake. This new key is stored<br>
+	 * in blowfishKey
+	 */
+	private NewCrypt _blowfish;
+	private final byte[] _hexID;
+	private final boolean _acceptAlternate;
+	private final int _requestID;
+	private final boolean _reserveHost;
+	private int _maxPlayer;
+	private final List<WaitingClient> _waitingClients;
+	private final Map<String, L2GameClient> _accountsInGameServer = new ConcurrentHashMap<>();
+	private int _status;
+	private String _serverName;
+	private final List<String> _subnets;
+	private final List<String> _hosts;
+	
+	protected LoginServerThread() {
+		super("LoginServerThread");
+		_port = server().getLoginPort();
+		_gamePort = server().getPort();
+		_hostname = server().getLoginHost();
+		if (hexId().getHexID() == null) {
+			_hexID = Util.generateHex(16);
+			_requestID = server().getRequestServerId();
+			hexId().setProperty("ServerID", String.valueOf(_requestID));
+		} else {
+			_hexID = hexId().getHexID().toByteArray();
+			_requestID = hexId().getServerID();
+		}
+		_acceptAlternate = server().acceptAlternateId();
+		_reserveHost = server().reserveHostOnLogin();
+		_subnets = ip().getSubnets();
+		_hosts = ip().getHosts();
+		_waitingClients = new CopyOnWriteArrayList<>();
+		_maxPlayer = server().getMaxOnlineUsers();
+	}
+	
+	@Override
+	public void run() {
+		while (!isInterrupted()) {
+			int lengthHi;
+			int lengthLo;
+			int length;
+			boolean checksumOk;
+			try {
+				// Connection
+				LOG.info("Connecting to login server on {}:{}", _hostname, _port);
+				_loginSocket = new Socket(_hostname, _port);
+				InputStream in = _loginSocket.getInputStream();
+				_out = new BufferedOutputStream(_loginSocket.getOutputStream());
+				
+				// init Blowfish
+				byte[] blowfishKey = Util.generateHex(40);
+				// Protect the new blowfish key what cannot begin with zero
+				if (blowfishKey[0] == 0) {
+					blowfishKey[0] = (byte) Rnd.get(32, 64);
+				}
+				_blowfish = new NewCrypt("_;v.]05-31!|+-%xT!^[$\00");
+				while (!isInterrupted()) {
+					lengthLo = in.read();
+					lengthHi = in.read();
+					length = (lengthHi * 256) + lengthLo;
+					
+					if (lengthHi < 0) {
+						LOG.info("LoginServerThread: Login terminated the connection.");
+						break;
+					}
+					
+					byte[] incoming = new byte[length - 2];
+					
+					int receivedBytes = 0;
+					int newBytes = 0;
+					int left = length - 2;
+					while ((newBytes != -1) && (receivedBytes < (length - 2))) {
+						newBytes = in.read(incoming, receivedBytes, left);
+						receivedBytes = receivedBytes + newBytes;
+						left -= newBytes;
+					}
+					
+					if (receivedBytes != (length - 2)) {
+						LOG.warn("Incomplete Packet is sent to the server, closing connection.(LS)");
+						break;
+					}
+					
+					// decrypt if we have a key
+					_blowfish.decrypt(incoming, 0, incoming.length);
+					checksumOk = NewCrypt.verifyChecksum(incoming);
+					
+					if (!checksumOk) {
+						LOG.warn("Incorrect packet checksum, ignoring packet (LS)");
+						break;
+					}
+					
+					int packetType = incoming[0] & 0xff;
+					// send the blowfish key through the rsa encryption
+					// now, only accept packet with the new encryption
+					// login will close the connection here
+					switch (packetType) {
+						case 0x00 -> {
+							InitLS init = new InitLS(incoming);
+							RSAPublicKey publicKey;
+							try {
+								KeyFactory kfac = KeyFactory.getInstance("RSA");
+								BigInteger modulus = new BigInteger(init.getRSAKey());
+								RSAPublicKeySpec kspec1 = new RSAPublicKeySpec(modulus, RSAKeyGenParameterSpec.F4);
+								publicKey = (RSAPublicKey) kfac.generatePublic(kspec1);
+							} catch (GeneralSecurityException e) {
+								LOG.warn("Trouble while init the public key send by login");
+								break;
+							}
+							sendPacket(new BlowFishKey(blowfishKey, publicKey));
+							_blowfish = new NewCrypt(blowfishKey);
+							sendPacket(new AuthRequest(_requestID, _acceptAlternate, _hexID, _gamePort, _reserveHost, _maxPlayer, _subnets, _hosts));
+						}
+						case 0x01 -> {
+							LoginServerFail lsf = new LoginServerFail(incoming);
+							LOG.info("Damn! Registration Failed: {}", lsf.getReasonString());
+						}
+						case 0x02 -> {
+							AuthResponse aresp = new AuthResponse(incoming);
+							int serverID = aresp.getServerId();
+							_serverName = aresp.getServerName();
+							saveHexid(serverID, hexToString(_hexID));
+							LOG.info("Registered on login as Server {}: {}", serverID, _serverName);
+							ServerStatus st = new ServerStatus();
+							if (general().getServerListBrackets()) {
+								st.addAttribute(ServerStatus.SERVER_LIST_SQUARE_BRACKET, ServerStatus.ON);
+							} else {
+								st.addAttribute(ServerStatus.SERVER_LIST_SQUARE_BRACKET, ServerStatus.OFF);
+							}
+							st.addAttribute(ServerStatus.SERVER_TYPE, general().getServerListType());
+							if (general().serverGMOnly()) {
+								st.addAttribute(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_GM_ONLY);
+							} else {
+								st.addAttribute(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_AUTO);
+							}
+							if (general().getServerListAge() == TEENAGER) {
+								st.addAttribute(ServerStatus.SERVER_AGE, ServerStatus.SERVER_AGE_15);
+							} else if (general().getServerListAge() == ADULT) {
+								st.addAttribute(ServerStatus.SERVER_AGE, ServerStatus.SERVER_AGE_18);
+							} else {
+								st.addAttribute(ServerStatus.SERVER_AGE, ServerStatus.SERVER_AGE_ALL);
+							}
+							sendPacket(st);
+							if (L2World.getInstance().getAllPlayersCount() > 0) {
+								final List<String> playerList = new ArrayList<>();
+								for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+									playerList.add(player.getAccountName());
+								}
+								sendPacket(new PlayerInGame(playerList));
+							}
+						}
+						case 0x03 -> {
+							PlayerAuthResponse par = new PlayerAuthResponse(incoming);
+							String account = par.getAccount();
+							WaitingClient wcToRemove = null;
+							synchronized (_waitingClients) {
+								for (WaitingClient wc : _waitingClients) {
+									if (wc.account.equals(account)) {
+										wcToRemove = wc;
+									}
+								}
+							}
+							if (wcToRemove != null) {
+								if (par.isAuthed()) {
+									PlayerInGame pig = new PlayerInGame(par.getAccount());
+									sendPacket(pig);
+									wcToRemove.gameClient.setState(GameClientState.AUTHED);
+									wcToRemove.gameClient.setSessionId(wcToRemove.session);
+									CharSelectionInfo cl = new CharSelectionInfo(wcToRemove.account, wcToRemove.gameClient.getSessionId().playOkID1);
+									wcToRemove.gameClient.getConnection().sendPacket(cl);
+									wcToRemove.gameClient.setCharSelection(cl.getCharInfo());
+								} else {
+									LOG.warn("Session key is not correct. Closing connection for account {}.", wcToRemove.account);
+									// wcToRemove.gameClient.getConnection().sendPacket(new LoginFail(LoginFail.SYSTEM_ERROR_LOGIN_LATER));
+									wcToRemove.gameClient.close(new LoginFail(LoginFail.SYSTEM_ERROR_LOGIN_LATER));
+									_accountsInGameServer.remove(wcToRemove.account);
+								}
+								_waitingClients.remove(wcToRemove);
+							}
+						}
+						case 0x04 -> {
+							KickPlayer kp = new KickPlayer(incoming);
+							doKickPlayer(kp.getAccount());
+						}
+						case 0x05 -> {
+							RequestCharacters rc = new RequestCharacters(incoming);
+							getCharsOnServer(rc.getAccount());
+						}
+						case 0x06 -> new ChangePasswordResponse(incoming);
+					}
+				}
+			} catch (UnknownHostException e) {
+				LOG.warn("Unknown host!", e);
+			} catch (SocketException e) {
+				LOG.warn("LoginServer not avaible, trying to reconnect...");
+			} catch (IOException e) {
+				LOG.warn("Disconnected from Login, Trying to reconnect!", e);
+			} finally {
+				try {
+					_loginSocket.close();
+					if (isInterrupted()) {
+						return;
+					}
+				} catch (Exception e) {
+				}
+			}
+			
+			try {
+				Thread.sleep(5000); // 5 seconds tempo.
+			} catch (InterruptedException e) {
+				return; // never swallow an interrupt!
+			}
+		}
+	}
+	
+	/**
+	 * Adds the waiting client and send request.
+	 * @param acc the account
+	 * @param client the game client
+	 * @param key the session key
+	 */
+	public void addWaitingClientAndSendRequest(String acc, L2GameClient client, SessionKey key) {
+		WaitingClient wc = new WaitingClient(acc, client, key);
+		synchronized (_waitingClients) {
+			_waitingClients.add(wc);
+		}
+		PlayerAuthRequest par = new PlayerAuthRequest(acc, key);
+		try {
+			sendPacket(par);
+		} catch (IOException e) {
+			LOG.warn("Error while sending player auth request!");
+		}
+	}
+	
+	/**
+	 * Removes the waiting client.
+	 * @param client the client
+	 */
+	public void removeWaitingClient(L2GameClient client) {
+		WaitingClient toRemove = null;
+		synchronized (_waitingClients) {
+			for (WaitingClient c : _waitingClients) {
+				if (c.gameClient == client) {
+					toRemove = c;
+				}
+			}
+			if (toRemove != null) {
+				_waitingClients.remove(toRemove);
+			}
+		}
+	}
+	
+	/**
+	 * Send logout for the given account.
+	 * @param account the account
+	 */
+	public void sendLogout(String account) {
+		if (account == null) {
+			return;
+		}
+		PlayerLogout pl = new PlayerLogout(account);
+		try {
+			sendPacket(pl);
+		} catch (IOException e) {
+			LOG.warn("Error while sending logout packet to login!");
+		} finally {
+			_accountsInGameServer.remove(account);
+		}
+	}
+	
+	/**
+	 * Adds the game server login.
+	 * @param account the account
+	 * @param client the client
+	 * @return {@code true} if account was not already logged in, {@code false} otherwise
+	 */
+	public boolean addGameServerLogin(String account, L2GameClient client) {
+		return _accountsInGameServer.putIfAbsent(account, client) == null;
+	}
+	
+	/**
+	 * Send access level.
+	 * @param account the account
+	 * @param level the access level
+	 */
+	public void sendAccessLevel(String account, int level) {
+		ChangeAccessLevel cal = new ChangeAccessLevel(account, level);
+		try {
+			sendPacket(cal);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Send client tracert.
+	 * @param account the account
+	 * @param address the address
+	 */
+	public void sendClientTracert(String account, String[] address) {
+		PlayerTracert ptc = new PlayerTracert(account, address[0], address[1], address[2], address[3], address[4]);
+		try {
+			sendPacket(ptc);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Send mail.
+	 * @param account the account
+	 * @param mailId the mail id
+	 * @param args the args
+	 */
+	public void sendMail(String account, String mailId, String... args) {
+		SendMail sem = new SendMail(account, mailId, args);
+		try {
+			sendPacket(sem);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Send temp ban.
+	 * @param account the account
+	 * @param ip the ip
+	 * @param time the time
+	 */
+	public void sendTempBan(String account, String ip, long time) {
+		TempBan tbn = new TempBan(account, ip, time);
+		try {
+			sendPacket(tbn);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Hex to string.
+	 * @param hex the hex value
+	 * @return the hex value as string
+	 */
+	private String hexToString(byte[] hex) {
+		return new BigInteger(hex).toString(16);
+	}
+	
+	/**
+	 * Kick player for the given account.
+	 * @param account the account
+	 */
+	public void doKickPlayer(String account) {
+		L2GameClient client = _accountsInGameServer.get(account);
+		if (client != null) {
+			LOG_ACCOUNTING.warn("Kicked by login: {}", client);
+			client.setAdditionalClosePacket(SystemMessage.getSystemMessage(SystemMessageId.ANOTHER_LOGIN_WITH_ACCOUNT));
+			client.closeNow();
+		}
+	}
+	
+	/**
+	 * Gets the chars on server.
+	 * @param account the account
+	 */
+	private void getCharsOnServer(String account) {
+		
+		int chars = 0;
+		List<Long> charToDel = new ArrayList<>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT deletetime FROM characters WHERE account_name=?")) {
+			ps.setString(1, account);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					chars++;
+					long delTime = rs.getLong("deletetime");
+					if (delTime != 0) {
+						charToDel.add(delTime);
+					}
+				}
+			}
+		} catch (SQLException e) {
+			LOG.warn("Exception: getCharsOnServer!", e);
+		}
+		
+		ReplyCharacters rec = new ReplyCharacters(account, chars, charToDel);
+		try {
+			sendPacket(rec);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Send packet.
+	 * @param sl the sendable packet
+	 * @throws IOException Signals that an I/O exception has occurred.
+	 */
+	private void sendPacket(BaseSendablePacket sl) throws IOException {
+		byte[] data = sl.getContent();
+		NewCrypt.appendChecksum(data);
+		_blowfish.crypt(data, 0, data.length);
+		
+		int len = data.length + 2;
+		synchronized (_out) // avoids tow threads writing in the mean time
+		{
+			_out.write(len & 0xff);
+			_out.write((len >> 8) & 0xff);
+			_out.write(data);
+			_out.flush();
+		}
+	}
+	
+	/**
+	 * Sets the max player.
+	 * @param maxPlayer The maxPlayer to set.
+	 */
+	public void setMaxPlayer(int maxPlayer) {
+		sendServerStatus(ServerStatus.MAX_PLAYERS, maxPlayer);
+		_maxPlayer = maxPlayer;
+	}
+	
+	/**
+	 * Gets the max player.
+	 * @return Returns the maxPlayer.
+	 */
+	public int getMaxPlayer() {
+		return _maxPlayer;
+	}
+	
+	/**
+	 * Send server status.
+	 * @param id the id
+	 * @param value the value
+	 */
+	public void sendServerStatus(int id, int value) {
+		ServerStatus ss = new ServerStatus();
+		ss.addAttribute(id, value);
+		try {
+			sendPacket(ss);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Send Server Type Config to LS.
+	 */
+	public void sendServerType() {
+		ServerStatus ss = new ServerStatus();
+		ss.addAttribute(ServerStatus.SERVER_TYPE, general().getServerListType());
+		try {
+			sendPacket(ss);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Send change password.
+	 * @param accountName the account name
+	 * @param charName the char name
+	 * @param oldpass the old pass
+	 * @param newpass the new pass
+	 */
+	public void sendChangePassword(String accountName, String charName, String oldpass, String newpass) {
+		ChangePassword cp = new ChangePassword(accountName, charName, oldpass, newpass);
+		try {
+			sendPacket(cp);
+		} catch (IOException e) {
+		}
+	}
+	
+	/**
+	 * Gets the status string.
+	 * @return the status string
+	 */
+	public String getStatusString() {
+		return ServerStatus.STATUS_STRING[_status];
+	}
+	
+	/**
+	 * Gets the server name.
+	 * @return the server name.
+	 */
+	public String getServerName() {
+		return _serverName;
+	}
+	
+	/**
+	 * Sets the server status.
+	 * @param status the new server status
+	 */
+	public void setServerStatus(int status) {
+		switch (status) {
+			case ServerStatus.STATUS_AUTO -> {
+				sendServerStatus(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_AUTO);
+				_status = status;
+			}
+			case ServerStatus.STATUS_DOWN -> {
+				sendServerStatus(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_DOWN);
+				_status = status;
+			}
+			case ServerStatus.STATUS_FULL -> {
+				sendServerStatus(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_FULL);
+				_status = status;
+			}
+			case ServerStatus.STATUS_GM_ONLY -> {
+				sendServerStatus(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_GM_ONLY);
+				_status = status;
+			}
+			case ServerStatus.STATUS_GOOD -> {
+				sendServerStatus(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_GOOD);
+				_status = status;
+			}
+			case ServerStatus.STATUS_NORMAL -> {
+				sendServerStatus(ServerStatus.SERVER_LIST_STATUS, ServerStatus.STATUS_NORMAL);
+				_status = status;
+			}
+			default -> throw new IllegalArgumentException("Status does not exists:" + status);
+		}
+	}
+	
+	public L2GameClient getClient(String name) {
+		return name != null ? _accountsInGameServer.get(name) : null;
+	}
+	
+	public static class SessionKey {
+		public int playOkID1;
+		public int playOkID2;
+		public int loginOkID1;
+		public int loginOkID2;
+		
+		/**
+		 * Instantiates a new session key.
+		 * @param loginOK1 the login o k1
+		 * @param loginOK2 the login o k2
+		 * @param playOK1 the play o k1
+		 * @param playOK2 the play o k2
+		 */
+		public SessionKey(int loginOK1, int loginOK2, int playOK1, int playOK2) {
+			playOkID1 = playOK1;
+			playOkID2 = playOK2;
+			loginOkID1 = loginOK1;
+			loginOkID2 = loginOK2;
+		}
+		
+		@Override
+		public String toString() {
+			return "PlayOk: " + playOkID1 + " " + playOkID2 + " LoginOk:" + loginOkID1 + " " + loginOkID2;
+		}
+	}
+	
+	private static class WaitingClient {
+		public String account;
+		public L2GameClient gameClient;
+		public SessionKey session;
+		
+		/**
+		 * Instantiates a new waiting client.
+		 * @param acc the acc
+		 * @param client the client
+		 * @param key the key
+		 */
+		public WaitingClient(String acc, L2GameClient client, SessionKey key) {
+			account = acc;
+			gameClient = client;
+			session = key;
+		}
+	}
+	
+	/**
+	 * Save hexadecimal ID of the server in the L2Properties file.
+	 * @param serverId the ID of the server whose hexId to save
+	 * @param hexId the hexadecimal ID to store
+	 */
+	public static void saveHexid(int serverId, String hexId) {
+		final var hexIdFilePath = Configuration.getCustomOrDefaultPath(HexIdConfiguration.FILENAME);
+		hexId().setProperty(HexIdConfiguration.SERVERID_KEY, String.valueOf(serverId));
+		hexId().setProperty(HexIdConfiguration.HEXID_KEY, hexId);
+		
+		try {
+			Files.createDirectories(hexIdFilePath.getParent());
+			try (var out = Files.newOutputStream(hexIdFilePath, CREATE, TRUNCATE_EXISTING)) {
+				hexId().store(out, "the hexID to auth into login");
+				LOG.info("Saved {}.", hexIdFilePath);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Failed to save {}.", hexIdFilePath, ex);
+		}
+	}
+	
+	/**
+	 * Gets the single instance of LoginServerThread.
+	 * @return single instance of LoginServerThread
+	 */
+	public static LoginServerThread getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final LoginServerThread _instance = new LoginServerThread();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/MonsterRace.java b/src/main/java/com/l2jserver/gameserver/MonsterRace.java
new file mode 100644
index 00000000..344654a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/MonsterRace.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+public class MonsterRace {
+	protected static final Logger LOG = LoggerFactory.getLogger(MonsterRace.class);
+	
+	private final L2Npc[] _monsters;
+	private int[][] _speeds;
+	private final int[] _first, _second;
+	
+	protected MonsterRace() {
+		_monsters = new L2Npc[8];
+		_speeds = new int[8][20];
+		_first = new int[2];
+		_second = new int[2];
+	}
+	
+	public static MonsterRace getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	public void newRace() {
+		int random;
+		
+		for (int i = 0; i < 8; i++) {
+			int id = 31003;
+			random = Rnd.get(24);
+			while (true) {
+				for (int j = i - 1; j >= 0; j--) {
+					if (_monsters[j].getTemplate().getId() == (id + random)) {
+						random = Rnd.get(24);
+					}
+				}
+				break;
+			}
+			try {
+				final var objectId = IdFactory.getInstance().getNextId();
+				final var template = NpcData.getInstance().getTemplate(id + random);
+				final var constructor = Class.forName("com.l2jserver.gameserver.model.actor.instance." + template.getType() + "Instance").getConstructors()[0];
+				_monsters[i] = (L2Npc) constructor.newInstance(objectId, template);
+			} catch (Exception e) {
+				LOG.warn("Unable to create monster!", e);
+			}
+		}
+		newSpeeds();
+	}
+	
+	public void newSpeeds() {
+		_speeds = new int[8][20];
+		int total;
+		_first[1] = 0;
+		_second[1] = 0;
+		for (int i = 0; i < 8; i++) {
+			total = 0;
+			for (int j = 0; j < 20; j++) {
+				if (j == 19) {
+					_speeds[i][j] = 100;
+				} else {
+					_speeds[i][j] = Rnd.get(60) + 65;
+				}
+				total += _speeds[i][j];
+			}
+			if (total >= _first[1]) {
+				_second[0] = _first[0];
+				_second[1] = _first[1];
+				_first[0] = 8 - i;
+				_first[1] = total;
+			} else if (total >= _second[1]) {
+				_second[0] = 8 - i;
+				_second[1] = total;
+			}
+		}
+	}
+	
+	/**
+	 * @return Returns the monsters.
+	 */
+	public L2Npc[] getMonsters() {
+		return _monsters;
+	}
+	
+	/**
+	 * @return Returns the speeds.
+	 */
+	public int[][] getSpeeds() {
+		return _speeds;
+	}
+	
+	public int getFirstPlace() {
+		return _first[0];
+	}
+	
+	public int getSecondPlace() {
+		return _second[0];
+	}
+	
+	private static class SingletonHolder {
+		protected static final MonsterRace _instance = new MonsterRace();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/RecipeController.java b/src/main/java/com/l2jserver/gameserver/RecipeController.java
new file mode 100644
index 00000000..d9384204
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/RecipeController.java
@@ -0,0 +1,664 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.StatType;
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.L2RecipeInstance;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.L2RecipeStatInstance;
+import com.l2jserver.gameserver.model.TempItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.RecipeBookItemList;
+import com.l2jserver.gameserver.network.serverpackets.RecipeItemMakeInfo;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopItemInfo;
+import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+public class RecipeController {
+	protected static final Map<Integer, RecipeItemMaker> _activeMakers = new ConcurrentHashMap<>();
+	
+	protected RecipeController() {
+		// Prevent external initialization.
+	}
+	
+	public void requestBookOpen(L2PcInstance player, boolean isDwarvenCraft) {
+		// Check if player is trying to alter recipe book while engaged in manufacturing.
+		if (!_activeMakers.containsKey(player.getObjectId())) {
+			RecipeBookItemList response = new RecipeBookItemList(isDwarvenCraft, player.getMaxMp());
+			response.addRecipes(isDwarvenCraft ? player.getDwarvenRecipeBook() : player.getCommonRecipeBook());
+			player.sendPacket(response);
+			return;
+		}
+		player.sendPacket(SystemMessageId.CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING);
+	}
+	
+	public void requestMakeItemAbort(L2PcInstance player) {
+		_activeMakers.remove(player.getObjectId()); // TODO: anything else here?
+	}
+	
+	public void requestManufactureItem(L2PcInstance manufacturer, int recipeListId, L2PcInstance player) {
+		final L2RecipeList recipeList = RecipeData.getInstance().getValidRecipeList(player, recipeListId);
+		if (recipeList == null) {
+			return;
+		}
+		
+		List<L2RecipeList> dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook());
+		List<L2RecipeList> commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook());
+		
+		if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) {
+			Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.");
+			return;
+		}
+		
+		// Check if manufacturer is under manufacturing store or private store.
+		if (character().alternativeCrafting() && _activeMakers.containsKey(manufacturer.getObjectId())) {
+			player.sendPacket(SystemMessageId.CLOSE_STORE_WINDOW_AND_TRY_AGAIN);
+			return;
+		}
+		
+		final RecipeItemMaker maker = new RecipeItemMaker(manufacturer, recipeList, player);
+		if (maker._isValid) {
+			if (character().alternativeCrafting()) {
+				_activeMakers.put(manufacturer.getObjectId(), maker);
+				ThreadPoolManager.getInstance().scheduleGeneral(maker, 100);
+			} else {
+				maker.run();
+			}
+		}
+	}
+	
+	public void requestMakeItem(L2PcInstance player, int recipeListId) {
+		// Check if player is trying to operate a private store or private workshop while engaged in combat.
+		if (player.isInCombat() || player.isInDuel()) {
+			player.sendPacket(SystemMessageId.CANT_OPERATE_PRIVATE_STORE_DURING_COMBAT);
+			return;
+		}
+		
+		final L2RecipeList recipeList = RecipeData.getInstance().getValidRecipeList(player, recipeListId);
+		if (recipeList == null) {
+			return;
+		}
+		
+		List<L2RecipeList> dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook());
+		List<L2RecipeList> commonRecipes = Arrays.asList(player.getCommonRecipeBook());
+		
+		if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList)) {
+			Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.");
+			return;
+		}
+		
+		// Check if player is busy (possible if alt game creation is enabled)
+		if (character().alternativeCrafting() && _activeMakers.containsKey(player.getObjectId())) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1);
+			sm.addItemName(recipeList.getItemId());
+			sm.addString("You are busy creating.");
+			player.sendPacket(sm);
+			return;
+		}
+		
+		final RecipeItemMaker maker = new RecipeItemMaker(player, recipeList, player);
+		if (maker._isValid) {
+			if (character().alternativeCrafting()) {
+				_activeMakers.put(player.getObjectId(), maker);
+				ThreadPoolManager.getInstance().scheduleGeneral(maker, 100);
+			} else {
+				maker.run();
+			}
+		}
+	}
+	
+	private static class RecipeItemMaker implements Runnable {
+		
+		private static final Logger LOG = LoggerFactory.getLogger(RecipeItemMaker.class);
+		
+		protected boolean _isValid;
+		protected List<TempItem> _items = null;
+		protected final L2RecipeList _recipeList;
+		protected final L2PcInstance _player; // "crafter"
+		protected final L2PcInstance _target; // "customer"
+		protected final Skill _skill;
+		protected final int _skillId;
+		protected final int _skillLevel;
+		protected int _creationPasses = 1;
+		protected int _itemGrab;
+		protected int _exp = -1;
+		protected int _sp = -1;
+		protected long _price;
+		protected int _totalItems;
+		protected int _delay;
+		
+		public RecipeItemMaker(L2PcInstance pPlayer, L2RecipeList pRecipeList, L2PcInstance pTarget) {
+			_player = pPlayer;
+			_target = pTarget;
+			_recipeList = pRecipeList;
+			
+			_isValid = false;
+			_skillId = _recipeList.isDwarvenRecipe() ? CommonSkill.CREATE_DWARVEN.getId() : CommonSkill.CREATE_COMMON.getId();
+			_skillLevel = _player.getSkillLevel(_skillId);
+			_skill = _player.getKnownSkill(_skillId);
+			
+			_player.isInCraftMode(true);
+			
+			if (_player.isAlikeDead()) {
+				_player.sendPacket(ActionFailed.STATIC_PACKET);
+				abort();
+				return;
+			}
+			
+			if (_target.isAlikeDead()) {
+				_target.sendPacket(ActionFailed.STATIC_PACKET);
+				abort();
+				return;
+			}
+			
+			if (_target.isProcessingTransaction()) {
+				_target.sendPacket(ActionFailed.STATIC_PACKET);
+				abort();
+				return;
+			}
+			
+			if (_player.isProcessingTransaction()) {
+				_player.sendPacket(ActionFailed.STATIC_PACKET);
+				abort();
+				return;
+			}
+			
+			// validate recipe list
+			if (_recipeList.getRecipes().length == 0) {
+				_player.sendPacket(ActionFailed.STATIC_PACKET);
+				abort();
+				return;
+			}
+			
+			// validate skill level
+			if (_recipeList.getLevel() > _skillLevel) {
+				_player.sendPacket(ActionFailed.STATIC_PACKET);
+				abort();
+				return;
+			}
+			
+			// check that customer can afford to pay for creation services
+			if (_player != _target) {
+				final L2ManufactureItem item = _player.getManufactureItems().get(_recipeList.getId());
+				if (item != null) {
+					_price = item.getCost();
+					if (_target.getAdena() < _price) // check price
+					{
+						_target.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+						abort();
+						return;
+					}
+				}
+			}
+			
+			// make temporary items
+			_items = listItems(false);
+			if (_items == null) {
+				abort();
+				return;
+			}
+			
+			for (TempItem i : _items) {
+				_totalItems += i.getQuantity();
+			}
+			
+			// initial statUse checks
+			if (!calculateStatUse(false, false)) {
+				abort();
+				return;
+			}
+			
+			// initial AltStatChange checks
+			if (character().alternativeCrafting()) {
+				calculateAltStatChange();
+			}
+			
+			updateMakeInfo(true);
+			updateCurMp();
+			updateCurLoad();
+			
+			_player.isInCraftMode(false);
+			_isValid = true;
+		}
+		
+		@Override
+		public void run() {
+			if (!character().crafting()) {
+				_target.sendMessage("Item creation is currently disabled.");
+				abort();
+				return;
+			}
+			
+			if (_player == null) {
+				LOG.warn("Cannot perform craft, player is null!");
+				abort();
+				return;
+			}
+			
+			if (_target == null) {
+				LOG.warn("Cannot perform craft, target is null!");
+				abort();
+				return;
+			}
+			
+			if (!_player.isOnline()) {
+				LOG.warn("Cannot perform craft, player is not online!");
+				abort();
+				return;
+			}
+			
+			if (!_target.isOnline()) {
+				LOG.warn("Cannot perform craft, target is not online!");
+				abort();
+				return;
+			}
+			
+			if (character().alternativeCrafting() && !_activeMakers.containsKey(_player.getObjectId())) {
+				if (_target != _player) {
+					_target.sendMessage("Manufacture aborted!");
+					_player.sendMessage("Manufacture aborted!");
+				} else {
+					_player.sendMessage("Item creation aborted!");
+				}
+				
+				abort();
+				return;
+			}
+			
+			if (character().alternativeCrafting() && !_items.isEmpty()) {
+				
+				if (!calculateStatUse(true, true)) {
+					return; // check stat use
+				}
+				updateCurMp(); // update craft window mp bar
+				
+				grabSomeItems(); // grab (equip) some more items with a nice msg to player
+				
+				// if still not empty, schedule another pass
+				if (!_items.isEmpty()) {
+					_delay = (int) (character().getCraftingSpeed() * _player.getMReuseRate(_skill) * GameTimeController.TICKS_PER_SECOND * GameTimeController.MILLIS_IN_TICK);
+					
+					// FIXME: please fix this packet to show crafting animation (somebody)
+					_player.broadcastPacket(new MagicSkillUse(_player, _skillId, _skillLevel, _delay, 0));
+					
+					_player.sendPacket(new SetupGauge(0, _delay));
+					ThreadPoolManager.getInstance().scheduleGeneral(this, 100 + _delay);
+				} else {
+					// for alt mode, sleep delay msec before finishing
+					_player.sendPacket(new SetupGauge(0, _delay));
+					
+					try {
+						Thread.sleep(_delay);
+					} catch (InterruptedException e) {
+					} finally {
+						finishCrafting();
+					}
+				}
+			} // for old craft mode just finish
+			else {
+				finishCrafting();
+			}
+		}
+		
+		private void finishCrafting() {
+			if (!character().alternativeCrafting()) {
+				calculateStatUse(false, true);
+			}
+			
+			// first take adena for manufacture
+			if ((_target != _player) && (_price > 0)) // customer must pay for services
+			{
+				// attempt to pay for item
+				L2ItemInstance adenatransfer = _target.transferItem("PayManufacture", _target.getInventory().getAdenaInstance().getObjectId(), _price, _player.getInventory(), _player);
+				
+				if (adenatransfer == null) {
+					_target.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+					abort();
+					return;
+				}
+			}
+			
+			_items = listItems(true); // this line actually takes materials from inventory
+			if (_items == null) {
+				// handle possible cheaters here
+				// (they click craft then try to get rid of items in order to get free craft)
+			} else if (Rnd.get(100) < _recipeList.getSuccessRate()) {
+				rewardPlayer(); // and immediately puts created item in its place
+				updateMakeInfo(true);
+			} else {
+				if (_target != _player) {
+					SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CREATION_OF_S2_FOR_C1_AT_S3_ADENA_FAILED);
+					msg.addString(_target.getName());
+					msg.addItemName(_recipeList.getItemId());
+					msg.addLong(_price);
+					_player.sendPacket(msg);
+					
+					msg = SystemMessage.getSystemMessage(SystemMessageId.C1_FAILED_TO_CREATE_S2_FOR_S3_ADENA);
+					msg.addString(_player.getName());
+					msg.addItemName(_recipeList.getItemId());
+					msg.addLong(_price);
+					_target.sendPacket(msg);
+				} else {
+					_target.sendPacket(SystemMessageId.ITEM_MIXING_FAILED);
+				}
+				updateMakeInfo(false);
+			}
+			// update load and mana bar of craft window
+			updateCurMp();
+			updateCurLoad();
+			_activeMakers.remove(_player.getObjectId());
+			_player.isInCraftMode(false);
+			_target.sendPacket(new ItemList(_target, false));
+		}
+		
+		private void updateMakeInfo(boolean success) {
+			if (_target == _player) {
+				_target.sendPacket(new RecipeItemMakeInfo(_recipeList.getId(), _target, success));
+			} else {
+				_target.sendPacket(new RecipeShopItemInfo(_player, _recipeList.getId()));
+			}
+		}
+		
+		private void updateCurLoad() {
+			StatusUpdate su = new StatusUpdate(_target);
+			su.addAttribute(StatusUpdate.CUR_LOAD, _target.getCurrentLoad());
+			_target.sendPacket(su);
+		}
+		
+		private void updateCurMp() {
+			StatusUpdate su = new StatusUpdate(_target);
+			su.addAttribute(StatusUpdate.CUR_MP, (int) _target.getCurrentMp());
+			_target.sendPacket(su);
+		}
+		
+		private void grabSomeItems() {
+			int grabItems = _itemGrab;
+			while ((grabItems > 0) && !_items.isEmpty()) {
+				TempItem item = _items.get(0);
+				
+				int count = item.getQuantity();
+				if (count >= grabItems) {
+					count = grabItems;
+				}
+				
+				item.setQuantity(item.getQuantity() - count);
+				if (item.getQuantity() <= 0) {
+					_items.remove(0);
+				} else {
+					_items.set(0, item);
+				}
+				
+				grabItems -= count;
+				
+				if (_target == _player) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_EQUIPPED); // you equipped ...
+					sm.addLong(count);
+					sm.addItemName(item.getItemId());
+					_player.sendPacket(sm);
+				} else {
+					_target.sendMessage("Manufacturer " + _player.getName() + " used " + count + " " + item.getItemName());
+				}
+			}
+		}
+		
+		// AltStatChange parameters make their effect here
+		private void calculateAltStatChange() {
+			_itemGrab = _skillLevel;
+			
+			for (L2RecipeStatInstance altStatChange : _recipeList.getAltStatChange()) {
+				if (altStatChange.getType() == StatType.XP) {
+					_exp = altStatChange.getValue();
+				} else if (altStatChange.getType() == StatType.SP) {
+					_sp = altStatChange.getValue();
+				} else if (altStatChange.getType() == StatType.GIM) {
+					_itemGrab *= altStatChange.getValue();
+				}
+			}
+			// determine number of creation passes needed
+			_creationPasses = (_totalItems / _itemGrab) + ((_totalItems % _itemGrab) != 0 ? 1 : 0);
+			if (_creationPasses < 1) {
+				_creationPasses = 1;
+			}
+		}
+		
+		// StatUse
+		private boolean calculateStatUse(boolean isWait, boolean isReduce) {
+			boolean ret = true;
+			for (L2RecipeStatInstance statUse : _recipeList.getStatUse()) {
+				double modifiedValue = statUse.getValue() / _creationPasses;
+				if (statUse.getType() == StatType.HP) {
+					// we do not want to kill the player, so its CurrentHP must be greater than the reduce value
+					if (_player.getCurrentHp() <= modifiedValue) {
+						// rest (wait for HP)
+						if (character().alternativeCrafting() && isWait) {
+							_player.sendPacket(new SetupGauge(0, _delay));
+							ThreadPoolManager.getInstance().scheduleGeneral(this, 100 + _delay);
+						} else {
+							_target.sendPacket(SystemMessageId.NOT_ENOUGH_HP);
+							abort();
+						}
+						ret = false;
+					} else if (isReduce) {
+						_player.reduceCurrentHp(modifiedValue, _player, _skill);
+					}
+				} else if (statUse.getType() == StatType.MP) {
+					if (_player.getCurrentMp() < modifiedValue) {
+						// rest (wait for MP)
+						if (character().alternativeCrafting() && isWait) {
+							_player.sendPacket(new SetupGauge(0, _delay));
+							ThreadPoolManager.getInstance().scheduleGeneral(this, 100 + _delay);
+						} else {
+							_target.sendPacket(SystemMessageId.NOT_ENOUGH_MP);
+							abort();
+						}
+						ret = false;
+					} else if (isReduce) {
+						_player.reduceCurrentMp(modifiedValue);
+					}
+				} else {
+					// there is an unknown StatUse value
+					_target.sendMessage("Recipe error!!!, please tell this to your GM.");
+					ret = false;
+					abort();
+				}
+			}
+			return ret;
+		}
+		
+		private List<TempItem> listItems(boolean remove) {
+			L2RecipeInstance[] recipes = _recipeList.getRecipes();
+			Inventory inv = _target.getInventory();
+			List<TempItem> materials = new ArrayList<>();
+			SystemMessage sm;
+			
+			for (L2RecipeInstance recipe : recipes) {
+				if (recipe.getQuantity() > 0) {
+					L2ItemInstance item = inv.getItemByItemId(recipe.getItemId());
+					long itemQuantityAmount = item == null ? 0 : item.getCount();
+					
+					// check materials
+					if (itemQuantityAmount < recipe.getQuantity()) {
+						sm = SystemMessage.getSystemMessage(SystemMessageId.MISSING_S2_S1_TO_CREATE);
+						sm.addItemName(recipe.getItemId());
+						sm.addLong(recipe.getQuantity() - itemQuantityAmount);
+						_target.sendPacket(sm);
+						
+						abort();
+						return null;
+					}
+					
+					// make new temporary object, just for counting purposes
+					materials.add(new TempItem(item, recipe.getQuantity()));
+				}
+			}
+			
+			if (remove) {
+				for (TempItem tmp : materials) {
+					inv.destroyItemByItemId("Manufacture", tmp.getItemId(), tmp.getQuantity(), _target, _player);
+					
+					if (tmp.getQuantity() > 1) {
+						sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+						sm.addItemName(tmp.getItemId());
+						sm.addLong(tmp.getQuantity());
+						_target.sendPacket(sm);
+					} else {
+						sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+						sm.addItemName(tmp.getItemId());
+						_target.sendPacket(sm);
+					}
+				}
+			}
+			return materials;
+		}
+		
+		private void abort() {
+			updateMakeInfo(false);
+			_player.isInCraftMode(false);
+			_activeMakers.remove(_player.getObjectId());
+		}
+		
+		private void rewardPlayer() {
+			int rareProdId = _recipeList.getRareItemId();
+			int itemId = _recipeList.getItemId();
+			int itemCount = _recipeList.getCount();
+			L2Item template = ItemTable.getInstance().getTemplate(itemId);
+			
+			// check that the current recipe has a rare production or not
+			if ((rareProdId != -1) && ((rareProdId == itemId) || character().craftMasterwork())) {
+				if (Rnd.get(100) < _recipeList.getRarity()) {
+					itemId = rareProdId;
+					itemCount = _recipeList.getRareCount();
+				}
+			}
+			
+			_target.getInventory().addItem("Manufacture", itemId, itemCount, _target, _player);
+			
+			// inform customer of earned item
+			SystemMessage sm;
+			if (_target != _player) {
+				// inform manufacturer of earned profit
+				if (itemCount == 1) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CREATED_FOR_C1_FOR_S3_ADENA);
+					sm.addString(_target.getName());
+					sm.addItemName(itemId);
+					sm.addLong(_price);
+					_player.sendPacket(sm);
+					
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CREATED_S2_FOR_S3_ADENA);
+					sm.addString(_player.getName());
+					sm.addItemName(itemId);
+					sm.addLong(_price);
+					_target.sendPacket(sm);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S3_S_CREATED_FOR_C1_FOR_S4_ADENA);
+					sm.addString(_target.getName());
+					sm.addInt(itemCount);
+					sm.addItemName(itemId);
+					sm.addLong(_price);
+					_player.sendPacket(sm);
+					
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CREATED_S2_S3_S_FOR_S4_ADENA);
+					sm.addString(_player.getName());
+					sm.addInt(itemCount);
+					sm.addItemName(itemId);
+					sm.addLong(_price);
+					_target.sendPacket(sm);
+				}
+			}
+			
+			if (itemCount > 1) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+				sm.addItemName(itemId);
+				sm.addLong(itemCount);
+				_target.sendPacket(sm);
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
+				sm.addItemName(itemId);
+				_target.sendPacket(sm);
+			}
+			
+			if (character().alternativeCrafting()) {
+				int recipeLevel = _recipeList.getLevel();
+				if (_exp < 0) {
+					_exp = template.getReferencePrice() * itemCount;
+					_exp /= recipeLevel;
+				}
+				if (_sp < 0) {
+					_sp = _exp / 10;
+				}
+				if (itemId == rareProdId) {
+					_exp *= character().getCraftingRareXpRate();
+					_sp *= character().getCraftingRareSpRate();
+				}
+				
+				if (_exp < 0) {
+					_exp = 0;
+				}
+				if (_sp < 0) {
+					_sp = 0;
+				}
+				
+				for (int i = _skillLevel; i > recipeLevel; i--) {
+					_exp /= 4;
+					_sp /= 4;
+				}
+				
+				// Added multiplication of Creation speed with XP/SP gain slower crafting -> more XP,
+				// faster crafting -> less XP you can use ALT_GAME_CREATION_XP_RATE/SP to modify XP/SP gained (default = 1)
+				_player.addExpAndSp((long) (_exp * character().getCraftingXpRate() * character().getCraftingSpeed()), //
+					(int) (_sp * character().getCraftingSpRate() * character().getCraftingSpeed()));
+			}
+			updateMakeInfo(true); // success
+		}
+	}
+	
+	public static RecipeController getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final RecipeController _instance = new RecipeController();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/SevenSigns.java b/src/main/java/com/l2jserver/gameserver/SevenSigns.java
new file mode 100644
index 00000000..4ad4a72c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/SevenSigns.java
@@ -0,0 +1,1392 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.config.Configuration.sevenSigns;
+import static com.l2jserver.gameserver.network.SystemMessageId.COMPETITION_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_OBTAINED_AVARICE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_OBTAINED_GNOSIS;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_OBTAINED_STRIFE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DAWN_WON;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_OBTAINED_AVARICE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_OBTAINED_GNOSIS;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_OBTAINED_STRIFE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DUSK_WON;
+import static com.l2jserver.gameserver.network.SystemMessageId.PREPARATIONS_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.QUEST_EVENT_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.QUEST_EVENT_PERIOD_ENDED;
+import static com.l2jserver.gameserver.network.SystemMessageId.RESULTS_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.SEAL_OF_STRIFE_FORBIDS_SUMMONING;
+import static com.l2jserver.gameserver.network.SystemMessageId.SEAL_VALIDATION_PERIOD_BEGUN;
+import static com.l2jserver.gameserver.network.SystemMessageId.SEAL_VALIDATION_PERIOD_ENDED;
+import static com.l2jserver.gameserver.network.SystemMessageId.VALIDATION_PERIOD_BEGUN;
+
+import java.sql.SQLException;
+import java.util.Calendar;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.AutoSpawnHandler;
+import com.l2jserver.gameserver.model.AutoSpawnHandler.AutoSpawnInstance;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SSQInfo;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * Seven Signs engine.
+ * @author Tempy
+ */
+public class SevenSigns {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SevenSigns.class);
+	
+	public static final String SEVEN_SIGNS_HTML_PATH = "data/html/seven_signs/";
+	
+	public static final int CABAL_NULL = 0;
+	public static final int CABAL_DUSK = 1;
+	public static final int CABAL_DAWN = 2;
+	
+	public static final int SEAL_NULL = 0;
+	public static final int SEAL_AVARICE = 1;
+	public static final int SEAL_GNOSIS = 2;
+	public static final int SEAL_STRIFE = 3;
+	
+	public static final int PERIOD_COMP_RECRUITING = 0;
+	public static final int PERIOD_COMPETITION = 1;
+	public static final int PERIOD_COMP_RESULTS = 2;
+	public static final int PERIOD_SEAL_VALIDATION = 3;
+	
+	public static final int PERIOD_START_HOUR = 18;
+	public static final int PERIOD_START_MINS = 0;
+	public static final int PERIOD_START_DAY = Calendar.MONDAY;
+	
+	// The quest event and seal validation periods last for approximately one week
+	// with a 15 minutes "interval" period sandwiched between them.
+	public static final int PERIOD_MINOR_LENGTH = 900000;
+	public static final int PERIOD_MAJOR_LENGTH = 604800000 - PERIOD_MINOR_LENGTH;
+	
+	public static final int RECORD_SEVEN_SIGNS_ID = 5707;
+	public static final int RECORD_SEVEN_SIGNS_COST = 500;
+	
+	// NPC Related Constants \\
+	public static final int ORATOR_NPC_ID = 31094;
+	public static final int PREACHER_NPC_ID = 31093;
+	public static final int MAMMON_MERCHANT_ID = 31113;
+	public static final int MAMMON_BLACKSMITH_ID = 31126;
+	public static final int MAMMON_MARKETEER_ID = 31092;
+	public static final int LILITH_NPC_ID = 25283;
+	public static final int ANAKIM_NPC_ID = 25286;
+	public static final int CREST_OF_DAWN_ID = 31170;
+	public static final int CREST_OF_DUSK_ID = 31171;
+	
+	// Seal Stone Related Constants
+	public static final int SEAL_STONE_BLUE_ID = 6360;
+	public static final int SEAL_STONE_GREEN_ID = 6361;
+	public static final int SEAL_STONE_RED_ID = 6362;
+	
+	public static final int[] SEAL_STONE_IDS = {
+		SEAL_STONE_BLUE_ID,
+		SEAL_STONE_GREEN_ID,
+		SEAL_STONE_RED_ID
+	};
+	
+	public static final int SEAL_STONE_BLUE_VALUE = 3;
+	public static final int SEAL_STONE_GREEN_VALUE = 5;
+	public static final int SEAL_STONE_RED_VALUE = 10;
+	
+	public static final int BLUE_CONTRIB_POINTS = 3;
+	public static final int GREEN_CONTRIB_POINTS = 5;
+	public static final int RED_CONTRIB_POINTS = 10;
+	
+	private final Calendar _nextPeriodChange = Calendar.getInstance();
+	
+	protected int _activePeriod;
+	protected int _currentCycle;
+	protected double _dawnStoneScore;
+	protected double _duskStoneScore;
+	protected int _dawnFestivalScore;
+	protected int _duskFestivalScore;
+	protected int _compWinner;
+	protected int _previousWinner;
+	protected Calendar _lastSave = Calendar.getInstance();
+	
+	protected Map<Integer, StatsSet> _signsPlayerData = new LinkedHashMap<>();
+	private final Map<Integer, Integer> _signsSealOwners = new LinkedHashMap<>();
+	private final Map<Integer, Integer> _signsDuskSealTotals = new LinkedHashMap<>();
+	private final Map<Integer, Integer> _signsDawnSealTotals = new LinkedHashMap<>();
+	
+	private static final String LOAD_DATA = "SELECT charId, cabal, seal, position, paid_type, red_stones, green_stones, blue_stones, ancient_adena_amount, contribution_score FROM seven_signs";
+	
+	private static final String LOAD_STATUS = "SELECT * FROM seven_signs_status WHERE id=0";
+	
+	private static final String INSERT_PLAYER = "INSERT INTO seven_signs (charId, cabal, seal, position, paid_type) VALUES (?,?,?,?,?)";
+	
+	private static final String UPDATE_PLAYER = "UPDATE seven_signs SET cabal=?, seal=?, position=?, paid_type=?, red_stones=?, green_stones=?, blue_stones=?, ancient_adena_amount=?, contribution_score=? WHERE charId=?";
+	
+	private static final String UPDATE_STATUS = "UPDATE seven_signs_status SET current_cycle=?, active_period=?, previous_winner=?, " + "dawn_stone_score=?, dawn_festival_score=?, dusk_stone_score=?, dusk_festival_score=?, "
+		+ "avarice_owner=?, gnosis_owner=?, strife_owner=?, avarice_dawn_score=?, gnosis_dawn_score=?, " + "strife_dawn_score=?, avarice_dusk_score=?, gnosis_dusk_score=?, strife_dusk_score=?, " + "festival_cycle=?, accumulated_bonus0=?, accumulated_bonus1=?, accumulated_bonus2=?,"
+		+ "accumulated_bonus3=?, accumulated_bonus4=?, date=? WHERE id=0";
+	
+	protected SevenSigns() {
+		try {
+			restoreSevenSignsData();
+		} catch (Exception ex) {
+			LOG.error("Failed to load configuration!", ex);
+		}
+		
+		LOG.info("Currently in the {} period.", getCurrentPeriodName());
+		
+		initializeSeals();
+		
+		if (isSealValidationPeriod()) {
+			if (getCabalHighestScore() == CABAL_NULL) {
+				LOG.info("The competition ended with a tie last week.");
+			} else {
+				LOG.info("The {} were victorious last week.", getCabalName(getCabalHighestScore()));
+			}
+		} else if (getCabalHighestScore() == CABAL_NULL) {
+			LOG.info("The competition, if the current trend continues, will end in a tie this week.");
+		} else {
+			LOG.info("The {} are in the lead this week.", getCabalName(getCabalHighestScore()));
+		}
+		
+		long milliToChange = 0;
+		if (isNextPeriodChangeInPast()) {
+			LOG.info("Next period change was in the past (server was offline), changing periods now!");
+		} else {
+			setCalendarForNextPeriodChange();
+			milliToChange = getMilliToPeriodChange();
+		}
+		
+		// Schedule a time for the next period change.
+		SevenSignsPeriodChange sspc = new SevenSignsPeriodChange();
+		ThreadPoolManager.getInstance().scheduleGeneral(sspc, milliToChange);
+		
+		// Thanks to http://rainbow.arch.scriptmania.com/scripts/timezone_countdown.html for help with this.
+		double numSecs = (milliToChange / 1000) % 60;
+		double countDown = ((milliToChange / 1000.0) - numSecs) / 60;
+		int numMins = (int) Math.floor(countDown % 60);
+		countDown = (countDown - numMins) / 60;
+		int numHours = (int) Math.floor(countDown % 24);
+		int numDays = (int) Math.floor((countDown - numHours) / 24);
+		
+		LOG.info("Next period begins in {} days, {} hours and {} mins.", numDays, numHours, numMins);
+		
+	}
+	
+	private boolean isNextPeriodChangeInPast() {
+		Calendar lastPeriodChange = Calendar.getInstance();
+		switch (getCurrentPeriod()) {
+			case PERIOD_SEAL_VALIDATION, PERIOD_COMPETITION -> {
+				lastPeriodChange.set(Calendar.DAY_OF_WEEK, PERIOD_START_DAY);
+				lastPeriodChange.set(Calendar.HOUR_OF_DAY, PERIOD_START_HOUR);
+				lastPeriodChange.set(Calendar.MINUTE, PERIOD_START_MINS);
+				lastPeriodChange.set(Calendar.SECOND, 0);
+				// if we hit next week, just turn back 1 week
+				if (Calendar.getInstance().before(lastPeriodChange)) {
+					lastPeriodChange.add(Calendar.HOUR, -24 * 7);
+				}
+			}
+			// because of the short duration of this period, just check it from last save
+			case PERIOD_COMP_RECRUITING, PERIOD_COMP_RESULTS -> lastPeriodChange.setTimeInMillis(_lastSave.getTimeInMillis() + PERIOD_MINOR_LENGTH);
+		}
+		
+		// because of previous "date" column usage, check only if it already contains usable data for us
+		return (_lastSave.getTimeInMillis() > 7) && _lastSave.before(lastPeriodChange);
+	}
+	
+	/**
+	 * Registers all random spawns and auto-chats for Seven Signs NPCs, along with spawns for the Preachers of Doom and Orators of Revelations at the beginning of the Seal Validation period.
+	 */
+	public void spawnSevenSignsNPC() {
+		final AutoSpawnInstance merchantSpawn = AutoSpawnHandler.getInstance().getAutoSpawnInstance(MAMMON_MERCHANT_ID, false);
+		final AutoSpawnInstance blacksmithSpawn = AutoSpawnHandler.getInstance().getAutoSpawnInstance(MAMMON_BLACKSMITH_ID, false);
+		final AutoSpawnInstance lilithSpawn = AutoSpawnHandler.getInstance().getAutoSpawnInstance(LILITH_NPC_ID, false);
+		final AutoSpawnInstance anakimSpawn = AutoSpawnHandler.getInstance().getAutoSpawnInstance(ANAKIM_NPC_ID, false);
+		final List<AutoSpawnInstance> crestOfDawnSpawns = AutoSpawnHandler.getInstance().getAutoSpawnInstances(CREST_OF_DAWN_ID);
+		final List<AutoSpawnInstance> crestOfDuskSpawns = AutoSpawnHandler.getInstance().getAutoSpawnInstances(CREST_OF_DUSK_ID);
+		final List<AutoSpawnInstance> oratorSpawns = AutoSpawnHandler.getInstance().getAutoSpawnInstances(ORATOR_NPC_ID);
+		final List<AutoSpawnInstance> preacherSpawns = AutoSpawnHandler.getInstance().getAutoSpawnInstances(PREACHER_NPC_ID);
+		final List<AutoSpawnInstance> marketeerSpawns = AutoSpawnHandler.getInstance().getAutoSpawnInstances(MAMMON_MARKETEER_ID);
+		
+		if (isSealValidationPeriod() || isCompResultsPeriod()) {
+			for (AutoSpawnInstance spawnInst : marketeerSpawns) {
+				AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, true);
+			}
+			
+			if ((getSealOwner(SEAL_GNOSIS) == getCabalHighestScore()) && (getSealOwner(SEAL_GNOSIS) != CABAL_NULL)) {
+				if (!npc().announceMammonSpawn()) {
+					blacksmithSpawn.setBroadcast(false);
+				}
+				
+				if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(blacksmithSpawn.getObjectId(), true).isSpawnActive()) {
+					AutoSpawnHandler.getInstance().setSpawnActive(blacksmithSpawn, true);
+				}
+				
+				for (AutoSpawnInstance spawnInst : oratorSpawns) {
+					if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(spawnInst.getObjectId(), true).isSpawnActive()) {
+						AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, true);
+					}
+				}
+				
+				for (AutoSpawnInstance spawnInst : preacherSpawns) {
+					if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(spawnInst.getObjectId(), true).isSpawnActive()) {
+						AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, true);
+					}
+				}
+			} else {
+				AutoSpawnHandler.getInstance().setSpawnActive(blacksmithSpawn, false);
+				
+				for (AutoSpawnInstance spawnInst : oratorSpawns) {
+					AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, false);
+				}
+				
+				for (AutoSpawnInstance spawnInst : preacherSpawns) {
+					AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, false);
+				}
+			}
+			
+			if ((getSealOwner(SEAL_AVARICE) == getCabalHighestScore()) && (getSealOwner(SEAL_AVARICE) != CABAL_NULL)) {
+				if (!npc().announceMammonSpawn()) {
+					merchantSpawn.setBroadcast(false);
+				}
+				
+				if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(merchantSpawn.getObjectId(), true).isSpawnActive()) {
+					AutoSpawnHandler.getInstance().setSpawnActive(merchantSpawn, true);
+				}
+				
+				switch (getCabalHighestScore()) {
+					case CABAL_DAWN -> {
+						if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(lilithSpawn.getObjectId(), true).isSpawnActive()) {
+							AutoSpawnHandler.getInstance().setSpawnActive(lilithSpawn, true);
+						}
+						AutoSpawnHandler.getInstance().setSpawnActive(anakimSpawn, false);
+						for (AutoSpawnInstance dawnCrest : crestOfDawnSpawns) {
+							if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(dawnCrest.getObjectId(), true).isSpawnActive()) {
+								AutoSpawnHandler.getInstance().setSpawnActive(dawnCrest, true);
+							}
+						}
+						for (AutoSpawnInstance duskCrest : crestOfDuskSpawns) {
+							AutoSpawnHandler.getInstance().setSpawnActive(duskCrest, false);
+						}
+					}
+					case CABAL_DUSK -> {
+						if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(anakimSpawn.getObjectId(), true).isSpawnActive()) {
+							AutoSpawnHandler.getInstance().setSpawnActive(anakimSpawn, true);
+						}
+						AutoSpawnHandler.getInstance().setSpawnActive(lilithSpawn, false);
+						for (AutoSpawnInstance duskCrest : crestOfDuskSpawns) {
+							if (!AutoSpawnHandler.getInstance().getAutoSpawnInstance(duskCrest.getObjectId(), true).isSpawnActive()) {
+								AutoSpawnHandler.getInstance().setSpawnActive(duskCrest, true);
+							}
+						}
+						for (AutoSpawnInstance dawnCrest : crestOfDawnSpawns) {
+							AutoSpawnHandler.getInstance().setSpawnActive(dawnCrest, false);
+						}
+					}
+				}
+			} else {
+				AutoSpawnHandler.getInstance().setSpawnActive(merchantSpawn, false);
+				AutoSpawnHandler.getInstance().setSpawnActive(lilithSpawn, false);
+				AutoSpawnHandler.getInstance().setSpawnActive(anakimSpawn, false);
+				for (AutoSpawnInstance dawnCrest : crestOfDawnSpawns) {
+					AutoSpawnHandler.getInstance().setSpawnActive(dawnCrest, false);
+				}
+				for (AutoSpawnInstance duskCrest : crestOfDuskSpawns) {
+					AutoSpawnHandler.getInstance().setSpawnActive(duskCrest, false);
+				}
+			}
+		} else {
+			AutoSpawnHandler.getInstance().setSpawnActive(merchantSpawn, false);
+			AutoSpawnHandler.getInstance().setSpawnActive(blacksmithSpawn, false);
+			AutoSpawnHandler.getInstance().setSpawnActive(lilithSpawn, false);
+			AutoSpawnHandler.getInstance().setSpawnActive(anakimSpawn, false);
+			for (AutoSpawnInstance dawnCrest : crestOfDawnSpawns) {
+				AutoSpawnHandler.getInstance().setSpawnActive(dawnCrest, false);
+			}
+			for (AutoSpawnInstance duskCrest : crestOfDuskSpawns) {
+				AutoSpawnHandler.getInstance().setSpawnActive(duskCrest, false);
+			}
+			for (AutoSpawnInstance spawnInst : oratorSpawns) {
+				AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, false);
+			}
+			
+			for (AutoSpawnInstance spawnInst : preacherSpawns) {
+				AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, false);
+			}
+			
+			for (AutoSpawnInstance spawnInst : marketeerSpawns) {
+				AutoSpawnHandler.getInstance().setSpawnActive(spawnInst, false);
+			}
+		}
+	}
+	
+	public static String getCabalShortName(int cabal) {
+		return switch (cabal) {
+			case CABAL_DAWN -> "dawn";
+			case CABAL_DUSK -> "dusk";
+			default -> "No Cabal";
+		};
+		
+	}
+	
+	public static String getCabalName(int cabal) {
+		return switch (cabal) {
+			case CABAL_DAWN -> "Lords of Dawn";
+			case CABAL_DUSK -> "Revolutionaries of Dusk";
+			default -> "No Cabal";
+		};
+	}
+	
+	public static String getSealName(int seal, boolean shortName) {
+		String sealName = (!shortName) ? "Seal of " : "";
+		
+		switch (seal) {
+			case SEAL_AVARICE -> sealName += "Avarice";
+			case SEAL_GNOSIS -> sealName += "Gnosis";
+			case SEAL_STRIFE -> sealName += "Strife";
+		}
+		return sealName;
+	}
+	
+	public final int getCurrentCycle() {
+		return _currentCycle;
+	}
+	
+	public final int getCurrentPeriod() {
+		return _activePeriod;
+	}
+	
+	private int getDaysToPeriodChange() {
+		int numDays = _nextPeriodChange.get(Calendar.DAY_OF_WEEK) - PERIOD_START_DAY;
+		if (numDays < 0) {
+			return -numDays;
+		}
+		return 7 - numDays;
+	}
+	
+	public final long getMilliToPeriodChange() {
+		return (_nextPeriodChange.getTimeInMillis() - System.currentTimeMillis());
+	}
+	
+	protected void setCalendarForNextPeriodChange() {
+		// Calculate the number of days until the next period
+		// A period starts at 18:00 pm (local time), like on official servers.
+		// Otherwise...
+		switch (getCurrentPeriod()) {
+			case PERIOD_SEAL_VALIDATION, PERIOD_COMPETITION -> {
+				int daysToChange = getDaysToPeriodChange();
+				if (daysToChange == 7) {
+					if (_nextPeriodChange.get(Calendar.HOUR_OF_DAY) < PERIOD_START_HOUR) {
+						daysToChange = 0;
+					} else if ((_nextPeriodChange.get(Calendar.HOUR_OF_DAY) == PERIOD_START_HOUR) && (_nextPeriodChange.get(Calendar.MINUTE) < PERIOD_START_MINS)) {
+						daysToChange = 0;
+					}
+				}
+				if (daysToChange > 0) {
+					_nextPeriodChange.add(Calendar.DATE, daysToChange);
+				}
+				_nextPeriodChange.set(Calendar.HOUR_OF_DAY, PERIOD_START_HOUR);
+				_nextPeriodChange.set(Calendar.MINUTE, PERIOD_START_MINS);
+			}
+			case PERIOD_COMP_RECRUITING, PERIOD_COMP_RESULTS -> _nextPeriodChange.add(Calendar.MILLISECOND, PERIOD_MINOR_LENGTH);
+		}
+		LOG.info("Next period change set to {}.", _nextPeriodChange.getTime());
+	}
+	
+	public final String getCurrentPeriodName() {
+		return switch (_activePeriod) {
+			case PERIOD_COMP_RECRUITING -> "Quest Event Initialization";
+			case PERIOD_COMPETITION -> "Competition (Quest Event)";
+			case PERIOD_COMP_RESULTS -> "Quest Event Results";
+			case PERIOD_SEAL_VALIDATION -> "Seal Validation";
+			default -> null;
+		};
+	}
+	
+	/**
+	 * @return {@code true} if it's competition period, {@code false} otherwise
+	 */
+	public final boolean isCompetitionPeriod() {
+		return (_activePeriod == PERIOD_COMPETITION);
+	}
+	
+	public final boolean isSealValidationPeriod() {
+		return (_activePeriod == PERIOD_SEAL_VALIDATION);
+	}
+	
+	public final boolean isCompResultsPeriod() {
+		return (_activePeriod == PERIOD_COMP_RESULTS);
+	}
+	
+	public final boolean isInitializationPeriod() {
+		return (_activePeriod == PERIOD_COMP_RECRUITING);
+	}
+	
+	public boolean isJoinableToDawn(L2PcInstance player) {
+		return (player.getClan() != null) && (player.getClan().getCastleId() > 0);
+	}
+	
+	/**
+	 * returns true if the given date is in Seal Validation or in Quest Event Results period
+	 * @param date
+	 * @return
+	 */
+	public boolean isDateInSealValidPeriod(Calendar date) {
+		long nextPeriodChange = getMilliToPeriodChange();
+		long nextQuestStart = 0;
+		long nextValidStart = 0;
+		long tillDate = date.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+		while (((2 * PERIOD_MAJOR_LENGTH) + (2 * PERIOD_MINOR_LENGTH)) < tillDate) {
+			tillDate -= ((2 * PERIOD_MAJOR_LENGTH) + (2 * PERIOD_MINOR_LENGTH));
+		}
+		while (tillDate < 0) {
+			tillDate += ((2 * PERIOD_MAJOR_LENGTH) + (2 * PERIOD_MINOR_LENGTH));
+		}
+		
+		switch (getCurrentPeriod()) {
+			case PERIOD_COMP_RECRUITING -> {
+				nextValidStart = nextPeriodChange + PERIOD_MAJOR_LENGTH;
+				nextQuestStart = nextValidStart + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH;
+			}
+			case PERIOD_COMPETITION -> {
+				nextValidStart = nextPeriodChange;
+				nextQuestStart = nextPeriodChange + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH;
+			}
+			case PERIOD_COMP_RESULTS -> {
+				nextQuestStart = nextPeriodChange + PERIOD_MAJOR_LENGTH;
+				nextValidStart = nextQuestStart + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH;
+			}
+			case PERIOD_SEAL_VALIDATION -> {
+				nextQuestStart = nextPeriodChange;
+				nextValidStart = nextPeriodChange + PERIOD_MAJOR_LENGTH + PERIOD_MINOR_LENGTH;
+			}
+		}
+		
+		return ((nextQuestStart >= tillDate) || (tillDate >= nextValidStart)) && ((nextValidStart >= nextQuestStart) || ((tillDate >= nextValidStart) && (nextQuestStart >= tillDate)));
+	}
+	
+	public final int getCurrentScore(int cabal) {
+		double totalStoneScore = _dawnStoneScore + _duskStoneScore;
+		return switch (cabal) {
+			case CABAL_NULL -> 0;
+			case CABAL_DAWN -> Math.round((float) (_dawnStoneScore / ((float) totalStoneScore == 0 ? 1 : totalStoneScore)) * 500) + _dawnFestivalScore;
+			case CABAL_DUSK -> Math.round((float) (_duskStoneScore / ((float) totalStoneScore == 0 ? 1 : totalStoneScore)) * 500) + _duskFestivalScore;
+			default -> 0;
+		};
+	}
+	
+	public final double getCurrentStoneScore(int cabal) {
+		return switch (cabal) {
+			case CABAL_NULL -> 0;
+			case CABAL_DAWN -> _dawnStoneScore;
+			case CABAL_DUSK -> _duskStoneScore;
+			default -> 0;
+		};
+	}
+	
+	public final int getCurrentFestivalScore(int cabal) {
+		return switch (cabal) {
+			case CABAL_NULL -> 0;
+			case CABAL_DAWN -> _dawnFestivalScore;
+			case CABAL_DUSK -> _duskFestivalScore;
+			default -> 0;
+		};
+	}
+	
+	public final int getCabalHighestScore() {
+		if (getCurrentScore(CABAL_DUSK) == getCurrentScore(CABAL_DAWN)) {
+			return CABAL_NULL;
+		} else if (getCurrentScore(CABAL_DUSK) > getCurrentScore(CABAL_DAWN)) {
+			return CABAL_DUSK;
+		} else {
+			return CABAL_DAWN;
+		}
+	}
+	
+	public final int getSealOwner(int seal) {
+		return _signsSealOwners.get(seal);
+	}
+	
+	public final int getSealProportion(int seal, int cabal) {
+		if (cabal == CABAL_NULL) {
+			return 0;
+		} else if (cabal == CABAL_DUSK) {
+			return _signsDuskSealTotals.get(seal);
+		} else {
+			return _signsDawnSealTotals.get(seal);
+		}
+	}
+	
+	public final int getTotalMembers(int cabal) {
+		int cabalMembers = 0;
+		String cabalName = getCabalShortName(cabal);
+		
+		for (StatsSet sevenDat : _signsPlayerData.values()) {
+			if (sevenDat.getString("cabal").equals(cabalName)) {
+				cabalMembers++;
+			}
+		}
+		
+		return cabalMembers;
+	}
+	
+	public int getPlayerStoneContrib(int objectId) {
+		final StatsSet currPlayer = _signsPlayerData.get(objectId);
+		if (currPlayer == null) {
+			return 0;
+		}
+		
+		int stoneCount = 0;
+		stoneCount += currPlayer.getInt("red_stones");
+		stoneCount += currPlayer.getInt("green_stones");
+		stoneCount += currPlayer.getInt("blue_stones");
+		
+		return stoneCount;
+	}
+	
+	public int getDepositedSSQItemCount(L2PcInstance player, int stoneId) {
+		final StatsSet currPlayer = _signsPlayerData.get(player.getObjectId());
+		if (currPlayer == null) {
+			return 0;
+		}
+		
+		return switch (stoneId) {
+			case SEAL_STONE_BLUE_ID -> currPlayer.getInt("blue_stones");
+			case SEAL_STONE_GREEN_ID -> currPlayer.getInt("green_stones");
+			case SEAL_STONE_RED_ID -> currPlayer.getInt("red_stones");
+			default -> 0;
+		};
+	}
+	
+	public int deleteDepositedSSQItemAndGiveRewards(L2PcInstance player, int stoneId, int amount) {
+		StatsSet currPlayer = _signsPlayerData.get(player.getObjectId());
+		
+		int rewardAmount = amount * switch (stoneId) {
+			case SEAL_STONE_BLUE_ID -> SEAL_STONE_BLUE_VALUE;
+			case SEAL_STONE_GREEN_ID -> SEAL_STONE_GREEN_VALUE;
+			case SEAL_STONE_RED_ID -> SEAL_STONE_RED_VALUE;
+			default -> 0;
+		};
+		
+		player.addAncientAdena("SevenSigns", rewardAmount, player, true);
+		
+		currPlayer.set("red_stones", 0);
+		currPlayer.set("green_stones", 0);
+		currPlayer.set("blue_stones", 0);
+		
+		_signsPlayerData.put(player.getObjectId(), currPlayer);
+		if (!sevenSigns().sevenSignsLazyUpdate()) {
+			saveSevenSignsData(player.getObjectId());
+			saveSevenSignsStatus();
+		}
+		
+		return rewardAmount;
+	}
+	
+	public int getPlayerContribScore(int objectId) {
+		final StatsSet currPlayer = _signsPlayerData.get(objectId);
+		if (currPlayer == null) {
+			return 0;
+		}
+		
+		return currPlayer.getInt("contribution_score");
+	}
+	
+	public int getPlayerAdenaCollect(int objectId) {
+		final StatsSet currPlayer = _signsPlayerData.get(objectId);
+		if (currPlayer == null) {
+			return 0;
+		}
+		
+		return currPlayer.getInt("ancient_adena_amount");
+	}
+	
+	public int getPlayerSeal(int objectId) {
+		final StatsSet currPlayer = _signsPlayerData.get(objectId);
+		if (currPlayer == null) {
+			return SEAL_NULL;
+		}
+		
+		return currPlayer.getInt("seal");
+	}
+	
+	public int getPlayerCabal(int objectId) {
+		final StatsSet currPlayer = _signsPlayerData.get(objectId);
+		if (currPlayer == null) {
+			return CABAL_NULL;
+		}
+		
+		String playerCabal = currPlayer.getString("cabal");
+		if (playerCabal.equalsIgnoreCase("dawn")) {
+			return CABAL_DAWN;
+		} else if (playerCabal.equalsIgnoreCase("dusk")) {
+			return CABAL_DUSK;
+		} else {
+			return CABAL_NULL;
+		}
+	}
+	
+	public int getSSQPrevWinner() {
+		return _previousWinner;
+	}
+	
+	/**
+	 * Restores all Seven Signs data and settings, usually called at server startup.
+	 */
+	protected void restoreSevenSignsData() {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			try (var s = con.createStatement();
+				var rs = s.executeQuery(LOAD_DATA)) {
+				while (rs.next()) {
+					var charObjId = rs.getInt("charId");
+					var sevenDat = new StatsSet();
+					sevenDat.set("charId", charObjId);
+					sevenDat.set("cabal", rs.getString("cabal"));
+					sevenDat.set("seal", rs.getInt("seal"));
+					sevenDat.set("position", rs.getInt("position"));
+					sevenDat.set("paid_type", rs.getInt("paid_type"));
+					sevenDat.set("red_stones", rs.getInt("red_stones"));
+					sevenDat.set("green_stones", rs.getInt("green_stones"));
+					sevenDat.set("blue_stones", rs.getInt("blue_stones"));
+					sevenDat.set("ancient_adena_amount", rs.getDouble("ancient_adena_amount"));
+					sevenDat.set("contribution_score", rs.getDouble("contribution_score"));
+					_signsPlayerData.put(charObjId, sevenDat);
+				}
+			}
+			
+			try (var s = con.createStatement();
+				var rs = s.executeQuery(LOAD_STATUS)) {
+				
+				while (rs.next()) {
+					_currentCycle = rs.getInt("current_cycle");
+					_activePeriod = rs.getInt("active_period");
+					_previousWinner = rs.getInt("previous_winner");
+					
+					_dawnStoneScore = rs.getDouble("dawn_stone_score");
+					_dawnFestivalScore = rs.getInt("dawn_festival_score");
+					_duskStoneScore = rs.getDouble("dusk_stone_score");
+					_duskFestivalScore = rs.getInt("dusk_festival_score");
+					
+					_signsSealOwners.put(SEAL_AVARICE, rs.getInt("avarice_owner"));
+					_signsSealOwners.put(SEAL_GNOSIS, rs.getInt("gnosis_owner"));
+					_signsSealOwners.put(SEAL_STRIFE, rs.getInt("strife_owner"));
+					
+					_signsDawnSealTotals.put(SEAL_AVARICE, rs.getInt("avarice_dawn_score"));
+					_signsDawnSealTotals.put(SEAL_GNOSIS, rs.getInt("gnosis_dawn_score"));
+					_signsDawnSealTotals.put(SEAL_STRIFE, rs.getInt("strife_dawn_score"));
+					_signsDuskSealTotals.put(SEAL_AVARICE, rs.getInt("avarice_dusk_score"));
+					_signsDuskSealTotals.put(SEAL_GNOSIS, rs.getInt("gnosis_dusk_score"));
+					_signsDuskSealTotals.put(SEAL_STRIFE, rs.getInt("strife_dusk_score"));
+					
+					_lastSave.setTimeInMillis(rs.getLong("date"));
+				}
+			}
+		} catch (SQLException ex) {
+			LOG.warn("Unable to load Seven Signs data from database!", ex);
+		}
+	}
+	
+	/**
+	 * Saves all Seven Signs player data.<br>
+	 * Should be called on period change and shutdown only.
+	 */
+	public void saveSevenSignsData() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_PLAYER)) {
+			for (StatsSet sevenDat : _signsPlayerData.values()) {
+				ps.setString(1, sevenDat.getString("cabal"));
+				ps.setInt(2, sevenDat.getInt("seal"));
+				ps.setInt(3, sevenDat.getInt("position"));
+				ps.setInt(4, sevenDat.getInt("paid_type"));
+				
+				ps.setInt(5, sevenDat.getInt("red_stones"));
+				ps.setInt(6, sevenDat.getInt("green_stones"));
+				ps.setInt(7, sevenDat.getInt("blue_stones"));
+				ps.setDouble(8, sevenDat.getDouble("ancient_adena_amount"));
+				ps.setDouble(9, sevenDat.getDouble("contribution_score"));
+				ps.setInt(10, sevenDat.getInt("charId"));
+				ps.addBatch();
+			}
+			ps.executeBatch();
+		} catch (SQLException ex) {
+			LOG.warn("Unable to save data to database!", ex);
+		}
+	}
+	
+	public final void saveSevenSignsData(int objectId) {
+		StatsSet sevenDat = _signsPlayerData.get(objectId);
+		if (sevenDat == null) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_PLAYER)) {
+			ps.setString(1, sevenDat.getString("cabal"));
+			ps.setInt(2, sevenDat.getInt("seal"));
+			ps.setInt(3, sevenDat.getInt("position"));
+			ps.setInt(4, sevenDat.getInt("paid_type"));
+			
+			ps.setInt(5, sevenDat.getInt("red_stones"));
+			ps.setInt(6, sevenDat.getInt("green_stones"));
+			ps.setInt(7, sevenDat.getInt("blue_stones"));
+			ps.setDouble(8, sevenDat.getDouble("ancient_adena_amount"));
+			ps.setDouble(9, sevenDat.getDouble("contribution_score"));
+			ps.setInt(10, sevenDat.getInt("charId"));
+			ps.execute();
+		} catch (SQLException ex) {
+			LOG.error("Unable to save data to database!", ex);
+		}
+	}
+	
+	public final void saveSevenSignsStatus() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_STATUS)) {
+			ps.setInt(1, _currentCycle);
+			ps.setInt(2, _activePeriod);
+			ps.setInt(3, _previousWinner);
+			ps.setDouble(4, _dawnStoneScore);
+			ps.setInt(5, _dawnFestivalScore);
+			ps.setDouble(6, _duskStoneScore);
+			ps.setInt(7, _duskFestivalScore);
+			ps.setInt(8, _signsSealOwners.get(SEAL_AVARICE));
+			ps.setInt(9, _signsSealOwners.get(SEAL_GNOSIS));
+			ps.setInt(10, _signsSealOwners.get(SEAL_STRIFE));
+			ps.setInt(11, _signsDawnSealTotals.get(SEAL_AVARICE));
+			ps.setInt(12, _signsDawnSealTotals.get(SEAL_GNOSIS));
+			ps.setInt(13, _signsDawnSealTotals.get(SEAL_STRIFE));
+			ps.setInt(14, _signsDuskSealTotals.get(SEAL_AVARICE));
+			ps.setInt(15, _signsDuskSealTotals.get(SEAL_GNOSIS));
+			ps.setInt(16, _signsDuskSealTotals.get(SEAL_STRIFE));
+			ps.setInt(17, SevenSignsFestival.getInstance().getCurrentFestivalCycle());
+			
+			for (int i = 0; i < SevenSignsFestival.FESTIVAL_COUNT; i++) {
+				ps.setInt(18 + i, SevenSignsFestival.getInstance().getAccumulatedBonus(i));
+			}
+			_lastSave = Calendar.getInstance();
+			ps.setLong(18 + SevenSignsFestival.FESTIVAL_COUNT, _lastSave.getTimeInMillis());
+			ps.execute();
+		} catch (SQLException ex) {
+			LOG.warn("Unable to save data to database!", ex);
+		}
+	}
+	
+	/**
+	 * Used to reset the cabal details of all players, and update the database.<BR>
+	 * Primarily used when beginning a new cycle, and should otherwise never be called.
+	 */
+	protected void resetPlayerData() {
+		// Reset each player's contribution data as well as seal and cabal.
+		for (StatsSet sevenDat : _signsPlayerData.values()) {
+			// Reset the player's cabal and seal information
+			sevenDat.set("cabal", "");
+			sevenDat.set("seal", SEAL_NULL);
+			sevenDat.set("position", 0);
+			sevenDat.set("paid_type", 0);
+			sevenDat.set("contribution_score", 0);
+		}
+	}
+	
+	/**
+	 * Used to specify cabal-related details for the specified player.<br>
+	 * This method checks to see if the player has registered before and will update the database if necessary.
+	 * @param player
+	 * @param chosenCabal
+	 * @param chosenSeal
+	 * @param position
+	 * @param score
+	 * @param paidType
+	 * @return the cabal ID the player has joined.
+	 */
+	public int addSSQMember(L2PcInstance player, int chosenCabal, int chosenSeal, int position, int score, int paidType) {
+		StatsSet currPlayerData = _signsPlayerData.get(player.getObjectId());
+		
+		if (currPlayerData != null) {
+			// If the seal validation period has passed,
+			// cabal information was removed and so "re-register" player
+			currPlayerData.set("cabal", getCabalShortName(chosenCabal));
+			currPlayerData.set("seal", chosenSeal);
+			currPlayerData.set("position", position);
+			currPlayerData.set("paid_type", paidType);
+			currPlayerData.set("contribution_score", score);
+			
+			_signsPlayerData.put(player.getObjectId(), currPlayerData);
+		} else {
+			currPlayerData = new StatsSet();
+			currPlayerData.set("charId", player.getObjectId());
+			currPlayerData.set("cabal", getCabalShortName(chosenCabal));
+			currPlayerData.set("seal", chosenSeal);
+			currPlayerData.set("position", position);
+			currPlayerData.set("paid_type", paidType);
+			currPlayerData.set("red_stones", 0);
+			currPlayerData.set("green_stones", 0);
+			currPlayerData.set("blue_stones", 0);
+			currPlayerData.set("ancient_adena_amount", 0);
+			currPlayerData.set("contribution_score", 0);
+			
+			_signsPlayerData.put(player.getObjectId(), currPlayerData);
+			
+			// Update data in database, as we have a new player signing up.
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(INSERT_PLAYER)) {
+				ps.setInt(1, player.getObjectId());
+				ps.setString(2, getCabalShortName(chosenCabal));
+				ps.setInt(3, chosenSeal);
+				ps.setInt(4, position);
+				ps.setInt(5, paidType);
+				ps.execute();
+			} catch (SQLException ex) {
+				LOG.warn("Failed to save data!", ex);
+			}
+		}
+		
+		// Increasing Seal total score for the player chosen Seal.
+		if ("dawn".equals(currPlayerData.getString("cabal"))) {
+			_signsDawnSealTotals.put(chosenSeal, _signsDawnSealTotals.get(chosenSeal) + 1);
+		} else {
+			_signsDuskSealTotals.put(chosenSeal, _signsDuskSealTotals.get(chosenSeal) + 1);
+		}
+		
+		if (!sevenSigns().sevenSignsLazyUpdate()) {
+			saveSevenSignsStatus();
+		}
+		
+		return chosenCabal;
+	}
+	
+	/**
+	 * Returns the amount of ancient adena the specified player can claim, if any.<BR>
+	 * If removeReward = True, all the ancient adena owed to them is removed, then DB is updated.
+	 * @param objectId
+	 * @param removeReward
+	 * @return
+	 */
+	public int getAncientAdenaReward(int objectId, boolean removeReward) {
+		StatsSet currPlayer = _signsPlayerData.get(objectId);
+		int rewardAmount = currPlayer.getInt("ancient_adena_amount");
+		
+		currPlayer.set("red_stones", 0);
+		currPlayer.set("green_stones", 0);
+		currPlayer.set("blue_stones", 0);
+		currPlayer.set("ancient_adena_amount", 0);
+		
+		if (removeReward) {
+			_signsPlayerData.put(objectId, currPlayer);
+			if (!sevenSigns().sevenSignsLazyUpdate()) {
+				saveSevenSignsData(objectId);
+				saveSevenSignsStatus();
+			}
+		}
+		
+		return rewardAmount;
+	}
+	
+	/**
+	 * Used to add the specified player's seal stone contribution points to the current total for their cabal.<br>
+	 * Returns the point score the contribution was worth.<br>
+	 * Each stone count <B>must be</B> broken down and specified by the stone's color.
+	 * @param blueCount
+	 * @param greenCount
+	 * @param redCount
+	 * @return
+	 */
+	public long depositSSQItem(L2PcInstance player, long blueCount, long greenCount, long redCount) {
+		StatsSet currPlayer = _signsPlayerData.get(player.getObjectId());
+		
+		long contribScore = calcContributionScore(blueCount, greenCount, redCount);
+		long totalAncientAdena = currPlayer.getLong("ancient_adena_amount") + calcAncientAdenaReward(blueCount, greenCount, redCount);
+		long totalContribScore = currPlayer.getLong("contribution_score") + contribScore;
+		
+		if (totalContribScore > sevenSigns().getMaxPlayerContrib()) {
+			return -1;
+		}
+		
+		currPlayer.set("red_stones", currPlayer.getInt("red_stones") + redCount);
+		currPlayer.set("green_stones", currPlayer.getInt("green_stones") + greenCount);
+		currPlayer.set("blue_stones", currPlayer.getInt("blue_stones") + blueCount);
+		currPlayer.set("ancient_adena_amount", totalAncientAdena);
+		currPlayer.set("contribution_score", totalContribScore);
+		_signsPlayerData.put(player.getObjectId(), currPlayer);
+		
+		switch (getPlayerCabal(player.getObjectId())) {
+			case CABAL_DAWN -> _dawnStoneScore += contribScore;
+			case CABAL_DUSK -> _duskStoneScore += contribScore;
+		}
+		
+		if (!sevenSigns().sevenSignsLazyUpdate()) {
+			saveSevenSignsData(player.getObjectId());
+			saveSevenSignsStatus();
+		}
+		
+		return contribScore;
+	}
+	
+	public static long calcContributionScore(long blueCount, long greenCount, long redCount) {
+		long contrib = blueCount * BLUE_CONTRIB_POINTS;
+		contrib += greenCount * GREEN_CONTRIB_POINTS;
+		contrib += redCount * RED_CONTRIB_POINTS;
+		
+		return contrib;
+	}
+	
+	public static long calcAncientAdenaReward(long blueCount, long greenCount, long redCount) {
+		long reward = blueCount * SEAL_STONE_BLUE_VALUE;
+		reward += greenCount * SEAL_STONE_GREEN_VALUE;
+		reward += redCount * SEAL_STONE_RED_VALUE;
+		
+		return reward;
+	}
+	
+	/**
+	 * Adds the specified number of festival points to the specified cabal.<br>
+	 * Remember, the same number of points are <b>deducted from the rival cabal</b> to maintain proportionality.
+	 * @param cabal
+	 * @param amount
+	 */
+	public void addFestivalScore(int cabal, int amount) {
+		if (cabal == CABAL_DUSK) {
+			_duskFestivalScore += amount;
+			
+			// To prevent negative scores!
+			if (_dawnFestivalScore >= amount) {
+				_dawnFestivalScore -= amount;
+			}
+		} else {
+			_dawnFestivalScore += amount;
+			
+			if (_duskFestivalScore >= amount) {
+				_duskFestivalScore -= amount;
+			}
+		}
+	}
+	
+	/**
+	 * Send info on the current Seven Signs period to the specified player.
+	 * @param player
+	 */
+	public void sendCurrentPeriodMsg(L2PcInstance player) {
+		SystemMessage sm = switch (getCurrentPeriod()) {
+			case PERIOD_COMP_RECRUITING -> SystemMessage.getSystemMessage(PREPARATIONS_PERIOD_BEGUN);
+			case PERIOD_COMPETITION -> SystemMessage.getSystemMessage(COMPETITION_PERIOD_BEGUN);
+			case PERIOD_COMP_RESULTS -> SystemMessage.getSystemMessage(RESULTS_PERIOD_BEGUN);
+			case PERIOD_SEAL_VALIDATION -> SystemMessage.getSystemMessage(VALIDATION_PERIOD_BEGUN);
+			default -> null;
+		};
+		player.sendPacket(sm);
+	}
+	
+	/**
+	 * Sends the built-in system message specified by sysMsgId to all online players.
+	 * @param sysMsgId
+	 */
+	public void sendMessageToAll(SystemMessageId sysMsgId) {
+		Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(sysMsgId));
+	}
+	
+	/**
+	 * Used to initialize the seals for each cabal.<bR>
+	 * (Used at startup or at beginning of a new cycle).<br>
+	 * This method should be called after <b>resetSeals()</b> and <b>calcNewSealOwners()</b> on a new cycle.
+	 */
+	protected void initializeSeals() {
+		for (Entry<Integer, Integer> e : _signsSealOwners.entrySet()) {
+			if (e.getValue() != CABAL_NULL) {
+				if (isSealValidationPeriod()) {
+					LOG.info("The {} have won the {}.", getCabalName(e.getValue()), getSealName(e.getKey(), false));
+				} else {
+					LOG.info("The {} is currently owned by {}.", getSealName(e.getKey(), false), getCabalName(e.getValue()));
+				}
+			} else {
+				LOG.info("The {} remains unclaimed.", getSealName(e.getKey(), false));
+			}
+		}
+	}
+	
+	/**
+	 * Only really used at the beginning of a new cycle, this method resets all seal-related data.
+	 */
+	protected void resetSeals() {
+		_signsDawnSealTotals.put(SEAL_AVARICE, 0);
+		_signsDawnSealTotals.put(SEAL_GNOSIS, 0);
+		_signsDawnSealTotals.put(SEAL_STRIFE, 0);
+		_signsDuskSealTotals.put(SEAL_AVARICE, 0);
+		_signsDuskSealTotals.put(SEAL_GNOSIS, 0);
+		_signsDuskSealTotals.put(SEAL_STRIFE, 0);
+	}
+	
+	/**
+	 * Calculates the ownership of the three Seals of the Seven Signs, based on various criterion. <BR>
+	 * <BR>
+	 * Should only ever called at the beginning of a new cycle.
+	 */
+	protected void calcNewSealOwners() {
+		for (Integer currSeal : _signsDawnSealTotals.keySet()) {
+			int prevSealOwner = _signsSealOwners.get(currSeal);
+			int newSealOwner = CABAL_NULL;
+			int dawnProportion = getSealProportion(currSeal, CABAL_DAWN);
+			int totalDawnMembers = getTotalMembers(CABAL_DAWN) == 0 ? 1 : getTotalMembers(CABAL_DAWN);
+			int dawnPercent = Math.round(((float) dawnProportion / (float) totalDawnMembers) * 100);
+			int duskProportion = getSealProportion(currSeal, CABAL_DUSK);
+			int totalDuskMembers = getTotalMembers(CABAL_DUSK) == 0 ? 1 : getTotalMembers(CABAL_DUSK);
+			int duskPercent = Math.round(((float) duskProportion / (float) totalDuskMembers) * 100);
+			
+			// If a Seal was already closed or owned by the opponent and the new winner wants to assume ownership of the Seal, 35% or more of the members of the Cabal must have chosen the Seal.
+			// If they chose less than 35%, they cannot own the Seal.
+			// If the Seal was owned by the winner in the previous Seven Signs, they can retain that seal if 10% or more members have chosen it.
+			// If they want to possess a new Seal, at least 35% of the members of the Cabal must have chosen the new Seal.
+			switch (prevSealOwner) {
+				case CABAL_NULL:
+					switch (getCabalHighestScore()) {
+						case CABAL_NULL:
+							newSealOwner = CABAL_NULL;
+							break;
+						case CABAL_DAWN:
+							if (dawnPercent >= 35) {
+								newSealOwner = CABAL_DAWN;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+						case CABAL_DUSK:
+							if (duskPercent >= 35) {
+								newSealOwner = CABAL_DUSK;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+					}
+					break;
+				case CABAL_DAWN:
+					switch (getCabalHighestScore()) {
+						case CABAL_NULL:
+							if (dawnPercent >= 10) {
+								newSealOwner = CABAL_DAWN;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+						case CABAL_DAWN:
+							if (dawnPercent >= 10) {
+								newSealOwner = CABAL_DAWN;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+						case CABAL_DUSK:
+							if (duskPercent >= 35) {
+								newSealOwner = CABAL_DUSK;
+							} else if (dawnPercent >= 10) {
+								newSealOwner = CABAL_DAWN;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+					}
+					break;
+				case CABAL_DUSK:
+					switch (getCabalHighestScore()) {
+						case CABAL_NULL:
+							if (duskPercent >= 10) {
+								newSealOwner = CABAL_DUSK;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+						case CABAL_DAWN:
+							if (dawnPercent >= 35) {
+								newSealOwner = CABAL_DAWN;
+							} else if (duskPercent >= 10) {
+								newSealOwner = CABAL_DUSK;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+						case CABAL_DUSK:
+							if (duskPercent >= 10) {
+								newSealOwner = CABAL_DUSK;
+							} else {
+								newSealOwner = CABAL_NULL;
+							}
+							break;
+					}
+					break;
+			}
+			
+			_signsSealOwners.put(currSeal, newSealOwner);
+			
+			// Alert all online players to new seal status.
+			switch (currSeal) {
+				case SEAL_AVARICE:
+					if (newSealOwner == CABAL_DAWN) {
+						sendMessageToAll(DAWN_OBTAINED_AVARICE);
+					} else if (newSealOwner == CABAL_DUSK) {
+						sendMessageToAll(DUSK_OBTAINED_AVARICE);
+					}
+					break;
+				case SEAL_GNOSIS:
+					if (newSealOwner == CABAL_DAWN) {
+						sendMessageToAll(DAWN_OBTAINED_GNOSIS);
+					} else if (newSealOwner == CABAL_DUSK) {
+						sendMessageToAll(DUSK_OBTAINED_GNOSIS);
+					}
+					break;
+				case SEAL_STRIFE:
+					if (newSealOwner == CABAL_DAWN) {
+						sendMessageToAll(DAWN_OBTAINED_STRIFE);
+					} else if (newSealOwner == CABAL_DUSK) {
+						sendMessageToAll(DUSK_OBTAINED_STRIFE);
+					}
+					
+					CastleManager.getInstance().validateTaxes(newSealOwner);
+					break;
+			}
+		}
+	}
+	
+	/**
+	 * This method is called to remove all players from catacombs and necropolises, who belong to the losing cabal.<br>
+	 * Should only ever called at the beginning of Seal Validation.
+	 * @param compWinner
+	 */
+	protected void teleLosingCabalFromDungeons(String compWinner) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			StatsSet currPlayer = _signsPlayerData.get(player.getObjectId());
+			
+			if (isSealValidationPeriod() || isCompResultsPeriod()) {
+				if (!player.isGM() && player.isIn7sDungeon() && ((currPlayer == null) || !currPlayer.getString("cabal").equals(compWinner))) {
+					player.teleToLocation(TeleportWhereType.TOWN);
+					player.setIsIn7sDungeon(false);
+				}
+			} else {
+				if (!player.isGM() && player.isIn7sDungeon() && ((currPlayer == null) || !currPlayer.getString("cabal").isEmpty())) {
+					player.teleToLocation(TeleportWhereType.TOWN);
+					player.setIsIn7sDungeon(false);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * The primary controller of period change of the Seven Signs system.<br>
+	 * This runs all related tasks depending on the period that is about to begin.
+	 * @author Tempy
+	 */
+	protected class SevenSignsPeriodChange implements Runnable {
+		@Override
+		public void run() {
+			// Remember the period check here refers to the period just ENDED!
+			final int periodEnded = getCurrentPeriod();
+			_activePeriod++;
+			
+			switch (periodEnded) {
+				case PERIOD_COMP_RECRUITING: // Initialization
+					
+					// Start the Festival of Darkness cycle.
+					SevenSignsFestival.getInstance().startFestivalManager();
+					
+					// Send message that Competition has begun.
+					sendMessageToAll(QUEST_EVENT_PERIOD_BEGUN);
+					break;
+				case PERIOD_COMPETITION: // Results Calculation
+					
+					// Send message that Competition has ended.
+					sendMessageToAll(QUEST_EVENT_PERIOD_ENDED);
+					
+					int compWinner = getCabalHighestScore();
+					
+					// Schedule a stop of the festival engine and reward highest ranking members from cycle
+					SevenSignsFestival.getInstance().getFestivalManagerSchedule().cancel(false);
+					SevenSignsFestival.getInstance().rewardHighestRanked();
+					
+					calcNewSealOwners();
+					
+					switch (compWinner) {
+						case CABAL_DAWN -> sendMessageToAll(DAWN_WON);
+						case CABAL_DUSK -> sendMessageToAll(DUSK_WON);
+					}
+					
+					_previousWinner = compWinner;
+					// Reset Castle ticket buy count
+					List<Castle> castles = CastleManager.getInstance().getCastles();
+					for (Castle castle : castles) {
+						castle.setTicketBuyCount(0);
+					}
+					break;
+				case PERIOD_COMP_RESULTS: // Seal Validation
+					
+					// Perform initial Seal Validation set up.
+					initializeSeals();
+					
+					// Buff/Debuff members of the event when Seal of Strife captured.
+					giveCPMult(getSealOwner(SEAL_STRIFE));
+					
+					// Send message that Seal Validation has begun.
+					sendMessageToAll(SEAL_VALIDATION_PERIOD_BEGUN);
+					
+					LOG.info("The {} have won the competition with {} points!", getCabalName(_previousWinner), getCurrentScore(_previousWinner));
+					break;
+				case PERIOD_SEAL_VALIDATION: // Reset for New Cycle
+					
+					// Ensure a cycle restart when this period ends.
+					_activePeriod = PERIOD_COMP_RECRUITING;
+					
+					// Send message that Seal Validation has ended.
+					sendMessageToAll(SEAL_VALIDATION_PERIOD_ENDED);
+					// Clear Seal of Strife influence.
+					removeCPMult();
+					// Reset all data
+					resetPlayerData();
+					resetSeals();
+					
+					_currentCycle++;
+					// Reset all Festival-related data and remove any unused blood offerings.
+					// NOTE: A full update of Festival data in the database is also performed.
+					SevenSignsFestival.getInstance().resetFestivalData(false);
+					
+					_dawnStoneScore = 0;
+					_duskStoneScore = 0;
+					
+					_dawnFestivalScore = 0;
+					_duskFestivalScore = 0;
+					break;
+			}
+			
+			// Make sure all Seven Signs data is saved for future use.
+			saveSevenSignsData();
+			saveSevenSignsStatus();
+			
+			teleLosingCabalFromDungeons(getCabalShortName(getCabalHighestScore()));
+			
+			SSQInfo ss = new SSQInfo();
+			
+			Broadcast.toAllOnlinePlayers(ss);
+			spawnSevenSignsNPC();
+			
+			LOG.info("The {} period has begun!", getCurrentPeriodName());
+			
+			setCalendarForNextPeriodChange();
+			
+			SevenSignsPeriodChange sspc = new SevenSignsPeriodChange();
+			ThreadPoolManager.getInstance().scheduleGeneral(sspc, getMilliToPeriodChange());
+		}
+	}
+	
+	public boolean checkIsDawnPostingTicket(int itemId) {
+		// TODO: I think it should be some kind of a list in the datapack for compare.
+		if ((itemId > 6114) && (itemId < 6175)) {
+			return true;
+		}
+		if ((itemId > 6801) && (itemId < 6812)) {
+			return true;
+		}
+		if ((itemId > 7997) && (itemId < 8008)) {
+			return true;
+		}
+		if ((itemId > 7940) && (itemId < 7951)) {
+			return true;
+		}
+		if ((itemId > 6294) && (itemId < 6307)) {
+			return true;
+		}
+		if ((itemId > 6831) && (itemId < 6834)) {
+			return true;
+		}
+		if ((itemId > 8027) && (itemId < 8030)) {
+			return true;
+		}
+		return (itemId > 7970) && (itemId < 7973);
+	}
+	
+	public boolean checkIsRookiePostingTicket(int itemId) {
+		// TODO: I think it should be some kind of a list in the datapack for compare.
+		if ((itemId > 6174) && (itemId < 6295)) {
+			return true;
+		}
+		if ((itemId > 6811) && (itemId < 6832)) {
+			return true;
+		}
+		if ((itemId > 7950) && (itemId < 7971)) {
+			return true;
+		}
+		return (itemId > 8007) && (itemId < 8028);
+	}
+	
+	public void giveCPMult(int strifeOwner) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			// Gives "Victor of War" passive skill to all online characters with Cabal, which controls Seal of Strife
+			int cabal = getPlayerCabal(player.getObjectId());
+			if (cabal != SevenSigns.CABAL_NULL) {
+				if (cabal == strifeOwner) {
+					player.addSkill(CommonSkill.THE_VICTOR_OF_WAR.getSkill());
+				} else {
+					// Gives "The Vanquished of War" passive skill to all online characters with Cabal, which does not control Seal of Strife
+					player.addSkill(CommonSkill.THE_VANQUISHED_OF_WAR.getSkill());
+				}
+			}
+		}
+	}
+	
+	public void removeCPMult() {
+		// Remove SevenSigns' buffs/debuffs.
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			player.removeSkill(CommonSkill.THE_VICTOR_OF_WAR.getSkill());
+			player.removeSkill(CommonSkill.THE_VANQUISHED_OF_WAR.getSkill());
+		}
+	}
+	
+	public boolean checkSummonConditions(L2PcInstance activeChar) {
+		if (activeChar == null) {
+			return true;
+		}
+		// Golems cannot be summoned by Dusk when the Seal of Strife is controlled by the Dawn
+		if (isSealValidationPeriod()) {
+			if (getSealOwner(SEAL_STRIFE) == CABAL_DAWN) {
+				if (getPlayerCabal(activeChar.getObjectId()) == CABAL_DUSK) {
+					activeChar.sendPacket(SEAL_OF_STRIFE_FORBIDS_SUMMONING);
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	public static SevenSigns getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SevenSigns INSTANCE = new SevenSigns();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/SevenSignsFestival.java b/src/main/java/com/l2jserver/gameserver/SevenSignsFestival.java
new file mode 100644
index 00000000..088ba2c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/SevenSignsFestival.java
@@ -0,0 +1,2117 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.clan;
+import static com.l2jserver.gameserver.config.Configuration.sevenSigns;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2Party.messageType;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.SpawnListener;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Seven Signs Festival of Darkness Engine.<br>
+ * TODO:<br>
+ * <ul>
+ * <li>Archer mobs should target healer characters over other party members.</li>
+ * <li>Added 29 Sep: Players that leave a party during the Seven Signs Festival will now take damage and cannot be healed.</li>
+ * </ul>
+ * @author Tempy
+ */
+public class SevenSignsFestival implements SpawnListener {
+	protected static final Logger LOG = LoggerFactory.getLogger(SevenSignsFestival.class);
+	
+	private static final String GET_CLAN_NAME = "SELECT clan_name FROM clan_data WHERE clan_id = (SELECT clanid FROM characters WHERE char_name = ?)";
+	
+	/**
+	 * These length settings are important! :)<br>
+	 * All times are relative to the ELAPSED time (in ms) since a festival begins.<br>
+	 * Festival manager start is the time after the server starts to begin the first festival cycle.<br>
+	 * The cycle length should ideally be at least 2x longer than the festival length.<br>
+	 * This allows ample time for players to sign-up to participate in the festival.<br>
+	 * The intermission is the time between the festival participants being moved to the "arenas" and the spawning of the first set of mobs.<br>
+	 * The monster swarm time is the time before the monsters swarm to the center of the arena, after they are spawned.<br>
+	 * The chest spawn time is for when the bonus festival chests spawn, usually towards the end of the festival.
+	 */
+	public static final long FESTIVAL_SIGNUP_TIME = sevenSigns().getFestivalCycleLength() - sevenSigns().getFestivalLength() - 60000;
+	
+	// Key Constants \\
+	private static final int FESTIVAL_MAX_OFFSET_X = 230;
+	private static final int FESTIVAL_MAX_OFFSET_Y = 230;
+	private static final int FESTIVAL_DEFAULT_RESPAWN = 60; // Specify in seconds!
+	
+	public static final int FESTIVAL_COUNT = 5; // do not change without correcting db and SevenSigns itself !
+	public static final int FESTIVAL_LEVEL_MAX_31 = 0;
+	public static final int FESTIVAL_LEVEL_MAX_42 = 1;
+	public static final int FESTIVAL_LEVEL_MAX_53 = 2;
+	public static final int FESTIVAL_LEVEL_MAX_64 = 3;
+	public static final int FESTIVAL_LEVEL_MAX_NONE = 4;
+	// 500 maximum possible score
+	public static final int[] FESTIVAL_LEVEL_SCORES = {
+		60,
+		70,
+		100,
+		120,
+		150
+	};
+	
+	public static final int FESTIVAL_OFFERING_ID = 5901;
+	public static final int FESTIVAL_OFFERING_VALUE = 5;
+	
+	/**
+	 * The following contains all the necessary spawn data for:<br>
+	 * <ul>
+	 * <li>Player Start Locations
+	 * <li>
+	 * <li>Witches
+	 * <li>
+	 * <li>Monsters
+	 * <li>
+	 * <li>Chests</li>
+	 * </ul>
+	 * All data is given by: X, Y, Z (coords), Heading, NPC ID (if necessary).<br>
+	 * This may be moved externally in time, but the data should not change.<br>
+	 */
+	// @formatter:off
+	public static final int[][] FESTIVAL_DAWN_PLAYER_SPAWNS =
+	{
+		{ -79187, 113186, -4895, 0 }, // 31 and below
+		{ -75918, 110137, -4895, 0 }, // 42 and below
+		{ -73835, 111969, -4895, 0 }, // 53 and below
+		{ -76170, 113804, -4895, 0 }, // 64 and below
+		{ -78927, 109528, -4895, 0 } // No level limit
+	};
+	
+	public static final int[][] FESTIVAL_DUSK_PLAYER_SPAWNS =
+	{
+		{ -77200, 88966, -5151, 0 }, // 31 and below
+		{ -76941, 85307, -5151, 0 }, // 42 and below
+		{ -74855, 87135, -5151, 0 }, // 53 and below
+		{ -80208, 88222, -5151, 0 }, // 64 and below
+		{ -79954, 84697, -5151, 0 } // No level limit
+	};
+	
+	protected static final int[][] FESTIVAL_DAWN_WITCH_SPAWNS =
+	{
+		{ -79183, 113052, -4891, 0, 31132 }, // 31 and below
+		{ -75916, 110270, -4891, 0, 31133 }, // 42 and below
+		{ -73979, 111970, -4891, 0, 31134 }, // 53 and below
+		{ -76174, 113663, -4891, 0, 31135 }, // 64 and below
+		{ -78930, 109664, -4891, 0, 31136 } // No level limit
+	};
+	
+	protected static final int[][] FESTIVAL_DUSK_WITCH_SPAWNS =
+	{
+		{ -77199, 88830, -5147, 0, 31142 }, // 31 and below
+		{ -76942, 85438, -5147, 0, 31143 }, // 42 and below
+		{ -74990, 87135, -5147, 0, 31144 }, // 53 and below
+		{ -80207, 88222, -5147, 0, 31145 }, // 64 and below
+		{ -79952, 84833, -5147, 0, 31146 } // No level limit
+	};
+	
+	protected static final int[][][] FESTIVAL_DAWN_PRIMARY_SPAWNS =
+	{
+		{
+			/* Level 31 and Below - Offering of the Branded */
+			{ -78537, 113839, -4895, -1, 18009 },
+			{ -78466, 113852, -4895, -1, 18010 },
+			{ -78509, 113899, -4895, -1, 18010 },
+			
+			{ -78481, 112557, -4895, -1, 18009 },
+			{ -78559, 112504, -4895, -1, 18010 },
+			{ -78489, 112494, -4895, -1, 18010 },
+			
+			{ -79803, 112543, -4895, -1, 18012 },
+			{ -79854, 112492, -4895, -1, 18013 },
+			{ -79886, 112557, -4895, -1, 18014 },
+			
+			{ -79821, 113811, -4895, -1, 18015 },
+			{ -79857, 113896, -4895, -1, 18017 },
+			{ -79878, 113816, -4895, -1, 18018 },
+			
+			// Archers and Marksmen \\
+			{ -79190, 113660, -4895, -1, 18011 },
+			{ -78710, 113188, -4895, -1, 18011 },
+			{ -79190, 112730, -4895, -1, 18016 },
+			{ -79656, 113188, -4895, -1, 18016 }
+		},
+		{
+			/* Level 42 and Below - Apostate Offering */
+			{ -76558, 110784, -4895, -1, 18019 },
+			{ -76607, 110815, -4895, -1, 18020 }, // South West
+			{ -76559, 110820, -4895, -1, 18020 },
+			
+			{ -75277, 110792, -4895, -1, 18019 },
+			{ -75225, 110801, -4895, -1, 18020 }, // South East
+			{ -75262, 110832, -4895, -1, 18020 },
+			
+			{ -75249, 109441, -4895, -1, 18022 },
+			{ -75278, 109495, -4895, -1, 18023 }, // North East
+			{ -75223, 109489, -4895, -1, 18024 },
+			
+			{ -76556, 109490, -4895, -1, 18025 },
+			{ -76607, 109469, -4895, -1, 18027 }, // North West
+			{ -76561, 109450, -4895, -1, 18028 },
+			// Archers and Marksmen \\
+			{ -76399, 110144, -4895, -1, 18021 },
+			{ -75912, 110606, -4895, -1, 18021 },
+			{ -75444, 110144, -4895, -1, 18026 },
+			{ -75930, 109665, -4895, -1, 18026 }
+		},
+		{
+			/* Level 53 and Below - Witch's Offering */
+			{ -73184, 111319, -4895, -1, 18029 },
+			{ -73135, 111294, -4895, -1, 18030 }, // South West
+			{ -73185, 111281, -4895, -1, 18030 },
+			
+			{ -74477, 111321, -4895, -1, 18029 },
+			{ -74523, 111293, -4895, -1, 18030 }, // South East
+			{ -74481, 111280, -4895, -1, 18030 },
+			
+			{ -74489, 112604, -4895, -1, 18032 },
+			{ -74491, 112660, -4895, -1, 18033 }, // North East
+			{ -74527, 112629, -4895, -1, 18034 },
+			
+			{ -73197, 112621, -4895, -1, 18035 },
+			{ -73142, 112631, -4895, -1, 18037 }, // North West
+			{ -73182, 112656, -4895, -1, 18038 },
+			
+			// Archers and Marksmen \\
+			{ -73834, 112430, -4895, -1, 18031 },
+			{ -74299, 111959, -4895, -1, 18031 },
+			{ -73841, 111491, -4895, -1, 18036 },
+			{ -73363, 111959, -4895, -1, 18036 }
+		},
+		{
+			/* Level 64 and Below - Dark Omen Offering */
+			{ -75543, 114461, -4895, -1, 18039 },
+			{ -75514, 114493, -4895, -1, 18040 }, // South West
+			{ -75488, 114456, -4895, -1, 18040 },
+			
+			{ -75521, 113158, -4895, -1, 18039 },
+			{ -75504, 113110, -4895, -1, 18040 }, // South East
+			{ -75489, 113142, -4895, -1, 18040 },
+			
+			{ -76809, 113143, -4895, -1, 18042 },
+			{ -76860, 113138, -4895, -1, 18043 }, // North East
+			{ -76831, 113112, -4895, -1, 18044 },
+			
+			{ -76831, 114441, -4895, -1, 18045 },
+			{ -76840, 114490, -4895, -1, 18047 }, // North West
+			{ -76864, 114455, -4895, -1, 18048 },
+			
+			// Archers and Marksmen \\
+			{ -75703, 113797, -4895, -1, 18041 },
+			{ -76180, 114263, -4895, -1, 18041 },
+			{ -76639, 113797, -4895, -1, 18046 },
+			{ -76180, 113337, -4895, -1, 18046 }
+		},
+		{
+			/* No Level Limit - Offering of Forbidden Path */
+			{ -79576, 108881, -4895, -1, 18049 },
+			{ -79592, 108835, -4895, -1, 18050 }, // South West
+			{ -79614, 108871, -4895, -1, 18050 },
+			
+			{ -79586, 110171, -4895, -1, 18049 },
+			{ -79589, 110216, -4895, -1, 18050 }, // South East
+			{ -79620, 110177, -4895, -1, 18050 },
+			
+			{ -78825, 110182, -4895, -1, 18052 },
+			{ -78238, 110182, -4895, -1, 18053 }, // North East
+			{ -78266, 110218, -4895, -1, 18054 },
+			
+			{ -78275, 108883, -4895, -1, 18055 },
+			{ -78267, 108839, -4895, -1, 18057 }, // North West
+			{ -78241, 108871, -4895, -1, 18058 },
+			
+			// Archers and Marksmen \\
+			{ -79394, 109538, -4895, -1, 18051 },
+			{ -78929, 109992, -4895, -1, 18051 },
+			{ -78454, 109538, -4895, -1, 18056 },
+			{ -78929, 109053, -4895, -1, 18056 }
+		}
+	};
+	
+	protected static final int[][][] FESTIVAL_DUSK_PRIMARY_SPAWNS =
+	{
+		{
+			/* Level 31 and Below - Offering of the Branded */
+			{ -76542, 89653, -5151, -1, 18009 },
+			{ -76509, 89637, -5151, -1, 18010 },
+			{ -76548, 89614, -5151, -1, 18010 },
+			
+			{ -76539, 88326, -5151, -1, 18009 },
+			{ -76512, 88289, -5151, -1, 18010 },
+			{ -76546, 88287, -5151, -1, 18010 },
+			
+			{ -77879, 88308, -5151, -1, 18012 },
+			{ -77886, 88310, -5151, -1, 18013 },
+			{ -77879, 88278, -5151, -1, 18014 },
+			
+			{ -77857, 89605, -5151, -1, 18015 },
+			{ -77858, 89658, -5151, -1, 18017 },
+			{ -77891, 89633, -5151, -1, 18018 },
+			
+			// Archers and Marksmen \\
+			{ -76728, 88962, -5151, -1, 18011 },
+			{ -77194, 88494, -5151, -1, 18011 },
+			{ -77660, 88896, -5151, -1, 18016 },
+			{ -77195, 89438, -5151, -1, 18016 }
+		},
+		{
+			/* Level 42 and Below - Apostate's Offering */
+			{ -77585, 84650, -5151, -1, 18019 },
+			{ -77628, 84643, -5151, -1, 18020 },
+			{ -77607, 84613, -5151, -1, 18020 },
+			
+			{ -76603, 85946, -5151, -1, 18019 },
+			{ -77606, 85994, -5151, -1, 18020 },
+			{ -77638, 85959, -5151, -1, 18020 },
+			
+			{ -76301, 85960, -5151, -1, 18022 },
+			{ -76257, 85972, -5151, -1, 18023 },
+			{ -76286, 85992, -5151, -1, 18024 },
+			
+			{ -76281, 84667, -5151, -1, 18025 },
+			{ -76291, 84611, -5151, -1, 18027 },
+			{ -76257, 84616, -5151, -1, 18028 },
+			
+			// Archers and Marksmen \\
+			{ -77419, 85307, -5151, -1, 18021 },
+			{ -76952, 85768, -5151, -1, 18021 },
+			{ -76477, 85312, -5151, -1, 18026 },
+			{ -76942, 84832, -5151, -1, 18026 }
+		},
+		{
+			/* Level 53 and Below - Witch's Offering */
+			{ -74211, 86494, -5151, -1, 18029 },
+			{ -74200, 86449, -5151, -1, 18030 },
+			{ -74167, 86464, -5151, -1, 18030 },
+			
+			{ -75495, 86482, -5151, -1, 18029 },
+			{ -75540, 86473, -5151, -1, 18030 },
+			{ -75509, 86445, -5151, -1, 18030 },
+			
+			{ -75509, 87775, -5151, -1, 18032 },
+			{ -75518, 87826, -5151, -1, 18033 },
+			{ -75542, 87780, -5151, -1, 18034 },
+			
+			{ -74214, 87789, -5151, -1, 18035 },
+			{ -74169, 87801, -5151, -1, 18037 },
+			{ -74198, 87827, -5151, -1, 18038 },
+			
+			// Archers and Marksmen \\
+			{ -75324, 87135, -5151, -1, 18031 },
+			{ -74852, 87606, -5151, -1, 18031 },
+			{ -74388, 87146, -5151, -1, 18036 },
+			{ -74856, 86663, -5151, -1, 18036 }
+		},
+		{
+			/* Level 64 and Below - Dark Omen Offering */
+			{ -79560, 89007, -5151, -1, 18039 },
+			{ -79521, 89016, -5151, -1, 18040 },
+			{ -79544, 89047, -5151, -1, 18040 },
+			
+			{ -79552, 87717, -5151, -1, 18039 },
+			{ -79552, 87673, -5151, -1, 18040 },
+			{ -79510, 87702, -5151, -1, 18040 },
+			
+			{ -80866, 87719, -5151, -1, 18042 },
+			{ -80897, 87689, -5151, -1, 18043 },
+			{ -80850, 87685, -5151, -1, 18044 },
+			
+			{ -80848, 89013, -5151, -1, 18045 },
+			{ -80887, 89051, -5151, -1, 18047 },
+			{ -80891, 89004, -5151, -1, 18048 },
+			
+			// Archers and Marksmen \\
+			{ -80205, 87895, -5151, -1, 18041 },
+			{ -80674, 88350, -5151, -1, 18041 },
+			{ -80209, 88833, -5151, -1, 18046 },
+			{ -79743, 88364, -5151, -1, 18046 }
+		},
+		{
+			/* No Level Limit - Offering of Forbidden Path */
+			{ -80624, 84060, -5151, -1, 18049 },
+			{ -80621, 84007, -5151, -1, 18050 },
+			{ -80590, 84039, -5151, -1, 18050 },
+			
+			{ -80605, 85349, -5151, -1, 18049 },
+			{ -80639, 85363, -5151, -1, 18050 },
+			{ -80611, 85385, -5151, -1, 18050 },
+			
+			{ -79311, 85353, -5151, -1, 18052 },
+			{ -79277, 85384, -5151, -1, 18053 },
+			{ -79273, 85539, -5151, -1, 18054 },
+			
+			{ -79297, 84054, -5151, -1, 18055 },
+			{ -79285, 84006, -5151, -1, 18057 },
+			{ -79260, 84040, -5151, -1, 18058 },
+			
+			// Archers and Marksmen \\
+			{ -79945, 85171, -5151, -1, 18051 },
+			{ -79489, 84707, -5151, -1, 18051 },
+			{ -79952, 84222, -5151, -1, 18056 },
+			{ -80423, 84703, -5151, -1, 18056 }
+		}
+	};
+	
+	protected static final int[][][] FESTIVAL_DAWN_SECONDARY_SPAWNS =
+	{
+		{
+			/* 31 and Below */
+			{ -78757, 112834, -4895, -1, 18016 },
+			{ -78581, 112834, -4895, -1, 18016 },
+			{ -78822, 112526, -4895, -1, 18011 },
+			
+			{ -78822, 113702, -4895, -1, 18011 },
+			{ -78822, 113874, -4895, -1, 18011 },
+			{ -79524, 113546, -4895, -1, 18011 },
+			
+			{ -79693, 113546, -4895, -1, 18011 },
+			{ -79858, 113546, -4895, -1, 18011 },
+			{ -79545, 112757, -4895, -1, 18016 },
+			{ -79545, 112586, -4895, -1, 18016 },
+		},
+		{
+			/* 42 and Below */
+			{ -75565, 110580, -4895, -1, 18026 },
+			{ -75565, 110740, -4895, -1, 18026 },
+			{ -75577, 109776, -4895, -1, 18021 },
+			
+			{ -75413, 109776, -4895, -1, 18021 },
+			{ -75237, 109776, -4895, -1, 18021 },
+			{ -76274, 109468, -4895, -1, 18021 },
+			
+			{ -76274, 109635, -4895, -1, 18021 },
+			{ -76274, 109795, -4895, -1, 18021 },
+			{ -76351, 110500, -4895, -1, 18056 },
+			{ -76528, 110500, -4895, -1, 18056 },
+		},
+		{
+			/* 53 and Below */
+			{ -74191, 111527, -4895, -1, 18036 },
+			{ -74191, 111362, -4895, -1, 18036 },
+			{ -73495, 111611, -4895, -1, 18031 },
+			
+			{ -73327, 111611, -4895, -1, 18031 },
+			{ -73154, 111611, -4895, -1, 18031 },
+			{ -73473, 112301, -4895, -1, 18031 },
+			
+			{ -73473, 112475, -4895, -1, 18031 },
+			{ -73473, 112649, -4895, -1, 18031 },
+			{ -74270, 112326, -4895, -1, 18036 },
+			{ -74443, 112326, -4895, -1, 18036 },
+		},
+		{
+			/* 64 and Below */
+			{ -75738, 113439, -4895, -1, 18046 },
+			{ -75571, 113439, -4895, -1, 18046 },
+			{ -75824, 114141, -4895, -1, 18041 },
+			
+			{ -75824, 114309, -4895, -1, 18041 },
+			{ -75824, 114477, -4895, -1, 18041 },
+			{ -76513, 114158, -4895, -1, 18041 },
+			
+			{ -76683, 114158, -4895, -1, 18041 },
+			{ -76857, 114158, -4895, -1, 18041 },
+			{ -76535, 113357, -4895, -1, 18056 },
+			{ -76535, 113190, -4895, -1, 18056 },
+		},
+		{
+			/* No Level Limit */
+			{ -79350, 109894, -4895, -1, 18056 },
+			{ -79534, 109894, -4895, -1, 18056 },
+			{ -79285, 109187, -4895, -1, 18051 },
+			
+			{ -79285, 109019, -4895, -1, 18051 },
+			{ -79285, 108860, -4895, -1, 18051 },
+			{ -78587, 109172, -4895, -1, 18051 },
+			
+			{ -78415, 109172, -4895, -1, 18051 },
+			{ -78249, 109172, -4895, -1, 18051 },
+			{ -78575, 109961, -4895, -1, 18056 },
+			{ -78575, 110130, -4895, -1, 18056 },
+		}
+	};
+	
+	protected static final int[][][] FESTIVAL_DUSK_SECONDARY_SPAWNS =
+	{
+		{
+			/* 31 and Below */
+			{ -76844, 89304, -5151, -1, 18011 },
+			{ -76844, 89479, -5151, -1, 18011 },
+			{ -76844, 89649, -5151, -1, 18011 },
+			
+			{ -77544, 89326, -5151, -1, 18011 },
+			{ -77716, 89326, -5151, -1, 18011 },
+			{ -77881, 89326, -5151, -1, 18011 },
+			
+			{ -77561, 88530, -5151, -1, 18016 },
+			{ -77561, 88364, -5151, -1, 18016 },
+			{ -76762, 88615, -5151, -1, 18016 },
+			{ -76594, 88615, -5151, -1, 18016 },
+		},
+		{
+			/* 42 and Below */
+			{ -77307, 84969, -5151, -1, 18021 },
+			{ -77307, 84795, -5151, -1, 18021 },
+			{ -77307, 84623, -5151, -1, 18021 },
+			
+			{ -76614, 84944, -5151, -1, 18021 },
+			{ -76433, 84944, -5151, -1, 18021 },
+			{ -76251, 84944, -5151, -1, 18021 },
+			
+			{ -76594, 85745, -5151, -1, 18026 },
+			{ -76594, 85910, -5151, -1, 18026 },
+			{ -77384, 85660, -5151, -1, 18026 },
+			{ -77555, 85660, -5151, -1, 18026 },
+		},
+		{
+			/* 53 and Below */
+			{ -74517, 86782, -5151, -1, 18031 },
+			{ -74344, 86782, -5151, -1, 18031 },
+			{ -74185, 86782, -5151, -1, 18031 },
+			
+			{ -74496, 87464, -5151, -1, 18031 },
+			{ -74496, 87636, -5151, -1, 18031 },
+			{ -74496, 87815, -5151, -1, 18031 },
+			
+			{ -75298, 87497, -5151, -1, 18036 },
+			{ -75460, 87497, -5151, -1, 18036 },
+			{ -75219, 86712, -5151, -1, 18036 },
+			{ -75219, 86531, -5151, -1, 18036 },
+		},
+		{
+			/* 64 and Below */
+			{ -79851, 88703, -5151, -1, 18041 },
+			{ -79851, 88868, -5151, -1, 18041 },
+			{ -79851, 89040, -5151, -1, 18041 },
+			
+			{ -80548, 88722, -5151, -1, 18041 },
+			{ -80711, 88722, -5151, -1, 18041 },
+			{ -80883, 88722, -5151, -1, 18041 },
+			
+			{ -80565, 87916, -5151, -1, 18046 },
+			{ -80565, 87752, -5151, -1, 18046 },
+			{ -79779, 87996, -5151, -1, 18046 },
+			{ -79613, 87996, -5151, -1, 18046 },
+		},
+		{
+			/* No Level Limit */
+			{ -79271, 84330, -5151, -1, 18051 },
+			{ -79448, 84330, -5151, -1, 18051 },
+			{ -79601, 84330, -5151, -1, 18051 },
+			
+			{ -80311, 84367, -5151, -1, 18051 },
+			{ -80311, 84196, -5151, -1, 18051 },
+			{ -80311, 84015, -5151, -1, 18051 },
+			
+			{ -80556, 85049, -5151, -1, 18056 },
+			{ -80384, 85049, -5151, -1, 18056 },
+			{ -79598, 85127, -5151, -1, 18056 },
+			{ -79598, 85303, -5151, -1, 18056 },
+		}
+	};
+	
+	protected static final int[][][] FESTIVAL_DAWN_CHEST_SPAWNS =
+	{
+		{
+			/* Level 31 and Below */
+			{ -78999, 112957, -4927, -1, 18109 },
+			{ -79153, 112873, -4927, -1, 18109 },
+			{ -79256, 112873, -4927, -1, 18109 },
+			
+			{ -79368, 112957, -4927, -1, 18109 },
+			{ -79481, 113124, -4927, -1, 18109 },
+			{ -79481, 113275, -4927, -1, 18109 },
+			
+			{ -79364, 113398, -4927, -1, 18109 },
+			{ -79213, 113500, -4927, -1, 18109 },
+			{ -79099, 113500, -4927, -1, 18109 },
+			
+			{ -78960, 113398, -4927, -1, 18109 },
+			{ -78882, 113235, -4927, -1, 18109 },
+			{ -78882, 113099, -4927, -1, 18109 },
+		},
+		{
+			/* Level 42 and Below */
+			{ -76119, 110383, -4927, -1, 18110 },
+			{ -75980, 110442, -4927, -1, 18110 },
+			{ -75848, 110442, -4927, -1, 18110 },
+			
+			{ -75720, 110383, -4927, -1, 18110 },
+			{ -75625, 110195, -4927, -1, 18110 },
+			{ -75625, 110063, -4927, -1, 18110 },
+			
+			{ -75722, 109908, -4927, -1, 18110 },
+			{ -75863, 109832, -4927, -1, 18110 },
+			{ -75989, 109832, -4927, -1, 18110 },
+			
+			{ -76130, 109908, -4927, -1, 18110 },
+			{ -76230, 110079, -4927, -1, 18110 },
+			{ -76230, 110215, -4927, -1, 18110 },
+		},
+		{
+			/* Level 53 and Below */
+			{ -74055, 111781, -4927, -1, 18111 },
+			{ -74144, 111938, -4927, -1, 18111 },
+			{ -74144, 112075, -4927, -1, 18111 },
+			
+			{ -74055, 112173, -4927, -1, 18111 },
+			{ -73885, 112289, -4927, -1, 18111 },
+			{ -73756, 112289, -4927, -1, 18111 },
+			
+			{ -73574, 112141, -4927, -1, 18111 },
+			{ -73511, 112040, -4927, -1, 18111 },
+			{ -73511, 111912, -4927, -1, 18111 },
+			
+			{ -73574, 111772, -4927, -1, 18111 },
+			{ -73767, 111669, -4927, -1, 18111 },
+			{ -73899, 111669, -4927, -1, 18111 },
+		},
+		{
+			/* Level 64 and Below */
+			{ -76008, 113566, -4927, -1, 18112 },
+			{ -76159, 113485, -4927, -1, 18112 },
+			{ -76267, 113485, -4927, -1, 18112 },
+			
+			{ -76386, 113566, -4927, -1, 18112 },
+			{ -76482, 113748, -4927, -1, 18112 },
+			{ -76482, 113885, -4927, -1, 18112 },
+			
+			{ -76371, 114029, -4927, -1, 18112 },
+			{ -76220, 114118, -4927, -1, 18112 },
+			{ -76092, 114118, -4927, -1, 18112 },
+			
+			{ -75975, 114029, -4927, -1, 18112 },
+			{ -75861, 113851, -4927, -1, 18112 },
+			{ -75861, 113713, -4927, -1, 18112 },
+		},
+		{
+			/* No Level Limit */
+			{ -79100, 109782, -4927, -1, 18113 },
+			{ -78962, 109853, -4927, -1, 18113 },
+			{ -78851, 109853, -4927, -1, 18113 },
+			
+			{ -78721, 109782, -4927, -1, 18113 },
+			{ -78615, 109596, -4927, -1, 18113 },
+			{ -78615, 109453, -4927, -1, 18113 },
+			
+			{ -78746, 109300, -4927, -1, 18113 },
+			{ -78881, 109203, -4927, -1, 18113 },
+			{ -79027, 109203, -4927, -1, 18113 },
+			
+			{ -79159, 109300, -4927, -1, 18113 },
+			{ -79240, 109480, -4927, -1, 18113 },
+			{ -79240, 109615, -4927, -1, 18113 },
+		}
+	};
+	
+	protected static final int[][][] FESTIVAL_DUSK_CHEST_SPAWNS =
+	{
+		{
+			/* Level 31 and Below */
+			{ -77016, 88726, -5183, -1, 18114 },
+			{ -77136, 88646, -5183, -1, 18114 },
+			{ -77247, 88646, -5183, -1, 18114 },
+			
+			{ -77380, 88726, -5183, -1, 18114 },
+			{ -77512, 88883, -5183, -1, 18114 },
+			{ -77512, 89053, -5183, -1, 18114 },
+			
+			{ -77378, 89287, -5183, -1, 18114 },
+			{ -77254, 89238, -5183, -1, 18114 },
+			{ -77095, 89238, -5183, -1, 18114 },
+			
+			{ -76996, 89287, -5183, -1, 18114 },
+			{ -76901, 89025, -5183, -1, 18114 },
+			{ -76901, 88891, -5183, -1, 18114 },
+		},
+		{
+			/* Level 42 and Below */
+			{ -77128, 85553, -5183, -1, 18115 },
+			{ -77036, 85594, -5183, -1, 18115 },
+			{ -76919, 85594, -5183, -1, 18115 },
+			
+			{ -76755, 85553, -5183, -1, 18115 },
+			{ -76635, 85392, -5183, -1, 18115 },
+			{ -76635, 85216, -5183, -1, 18115 },
+			
+			{ -76761, 85025, -5183, -1, 18115 },
+			{ -76908, 85004, -5183, -1, 18115 },
+			{ -77041, 85004, -5183, -1, 18115 },
+			
+			{ -77138, 85025, -5183, -1, 18115 },
+			{ -77268, 85219, -5183, -1, 18115 },
+			{ -77268, 85410, -5183, -1, 18115 },
+		},
+		{
+			/* Level 53 and Below */
+			{ -75150, 87303, -5183, -1, 18116 },
+			{ -75150, 87175, -5183, -1, 18116 },
+			{ -75150, 87175, -5183, -1, 18116 },
+			
+			{ -75150, 87303, -5183, -1, 18116 },
+			{ -74943, 87433, -5183, -1, 18116 },
+			{ -74767, 87433, -5183, -1, 18116 },
+			
+			{ -74556, 87306, -5183, -1, 18116 },
+			{ -74556, 87184, -5183, -1, 18116 },
+			{ -74556, 87184, -5183, -1, 18116 },
+			
+			{ -74556, 87306, -5183, -1, 18116 },
+			{ -74757, 86830, -5183, -1, 18116 },
+			{ -74927, 86830, -5183, -1, 18116 },
+		},
+		{
+			/* Level 64 and Below */
+			{ -80010, 88128, -5183, -1, 18117 },
+			{ -80113, 88066, -5183, -1, 18117 },
+			{ -80220, 88066, -5183, -1, 18117 },
+			
+			{ -80359, 88128, -5183, -1, 18117 },
+			{ -80467, 88267, -5183, -1, 18117 },
+			{ -80467, 88436, -5183, -1, 18117 },
+			
+			{ -80381, 88639, -5183, -1, 18117 },
+			{ -80278, 88577, -5183, -1, 18117 },
+			{ -80142, 88577, -5183, -1, 18117 },
+			
+			{ -80028, 88639, -5183, -1, 18117 },
+			{ -79915, 88466, -5183, -1, 18117 },
+			{ -79915, 88322, -5183, -1, 18117 },
+		},
+		{
+			/* No Level Limit */
+			{ -80153, 84947, -5183, -1, 18118 },
+			{ -80003, 84962, -5183, -1, 18118 },
+			{ -79848, 84962, -5183, -1, 18118 },
+			
+			{ -79742, 84947, -5183, -1, 18118 },
+			{ -79668, 84772, -5183, -1, 18118 },
+			{ -79668, 84619, -5183, -1, 18118 },
+			
+			{ -79772, 84471, -5183, -1, 18118 },
+			{ -79888, 84414, -5183, -1, 18118 },
+			{ -80023, 84414, -5183, -1, 18118 },
+			
+			{ -80166, 84471, -5183, -1, 18118 },
+			{ -80253, 84600, -5183, -1, 18118 },
+			{ -80253, 84780, -5183, -1, 18118 },
+		}
+	};
+	// @formatter:on
+	
+	private FestivalManager _managerInstance;
+	protected ScheduledFuture<?> _managerScheduledTask;
+	
+	protected int _signsCycle = SevenSigns.getInstance().getCurrentCycle();
+	protected int _festivalCycle;
+	protected long _nextFestivalCycleStart;
+	protected long _nextFestivalStart;
+	protected boolean _festivalInitialized;
+	protected boolean _festivalInProgress;
+	protected List<Integer> _accumulatedBonuses = new ArrayList<>(); // The total bonus available (in Ancient Adena)
+	
+	boolean _noPartyRegister;
+	private L2Npc _dawnChatGuide;
+	private L2Npc _duskChatGuide;
+	
+	protected Map<Integer, List<Integer>> _dawnFestivalParticipants = new HashMap<>();
+	protected Map<Integer, List<Integer>> _duskFestivalParticipants = new HashMap<>();
+	
+	protected Map<Integer, List<Integer>> _dawnPreviousParticipants = new HashMap<>();
+	protected Map<Integer, List<Integer>> _duskPreviousParticipants = new HashMap<>();
+	
+	private final Map<Integer, Long> _dawnFestivalScores = new HashMap<>();
+	private final Map<Integer, Long> _duskFestivalScores = new HashMap<>();
+	
+	/**
+	 * _festivalData is essentially an instance of the seven_signs_festival table and should be treated as such. Data is initially accessed by the related Seven Signs cycle, with _signsCycle representing data for the current round of Festivals. The actual table data is stored as a series of StatsSet
+	 * constructs. These are accessed by the use of an offset based on the number of festivals, thus: offset = FESTIVAL_COUNT + festivalId (Data for Dawn is always accessed by offset > FESTIVAL_COUNT)
+	 */
+	private final Map<Integer, Map<Integer, StatsSet>> _festivalData = new HashMap<>();
+	
+	protected SevenSignsFestival() {
+		restoreFestivalData();
+		
+		if (SevenSigns.getInstance().isSealValidationPeriod()) {
+			LOG.info("Initialization bypassed due to Seal Validation in effect.");
+			return;
+		}
+		
+		L2Spawn.addSpawnListener(this);
+		startFestivalManager();
+	}
+	
+	public static SevenSignsFestival getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	/**
+	 * Returns the associated name (level range) to a given festival ID.
+	 * @param festivalID
+	 * @return String festivalName
+	 */
+	public static String getFestivalName(int festivalID) {
+		return switch (festivalID) {
+			case FESTIVAL_LEVEL_MAX_31 -> "Level 31 or lower";
+			case FESTIVAL_LEVEL_MAX_42 -> "Level 42 or lower";
+			case FESTIVAL_LEVEL_MAX_53 -> "Level 53 or lower";
+			case FESTIVAL_LEVEL_MAX_64 -> "Level 64 or lower";
+			default -> "No Level Limit";
+		};
+	}
+	
+	/**
+	 * Returns the maximum allowed player level for the given festival type.
+	 * @param festivalId
+	 * @return int maxLevel
+	 */
+	public static int getMaxLevelForFestival(int festivalId) {
+		return switch (festivalId) {
+			case SevenSignsFestival.FESTIVAL_LEVEL_MAX_31 -> 31;
+			case SevenSignsFestival.FESTIVAL_LEVEL_MAX_42 -> 42;
+			case SevenSignsFestival.FESTIVAL_LEVEL_MAX_53 -> 53;
+			case SevenSignsFestival.FESTIVAL_LEVEL_MAX_64 -> 64;
+			default -> character().getMaxPlayerLevel();
+		};
+	}
+	
+	/**
+	 * Returns true if the monster ID given is of an archer/marksman type.
+	 * @param npcId
+	 * @return boolean isArcher
+	 */
+	protected static boolean isFestivalArcher(int npcId) {
+		if ((npcId < 18009) || (npcId > 18108)) {
+			return false;
+		}
+		
+		int identifier = npcId % 10;
+		return ((identifier == 4) || (identifier == 9));
+	}
+	
+	/**
+	 * Returns true if the monster ID given is a festival chest.
+	 * @param npcId
+	 * @return boolean isChest
+	 */
+	protected static boolean isFestivalChest(int npcId) {
+		return ((npcId < 18109) || (npcId > 18118));
+	}
+	
+	/**
+	 * Primarily used to terminate the Festival Manager, when the Seven Signs period changes.
+	 * @return ScheduledFuture festManagerScheduler
+	 */
+	protected final ScheduledFuture<?> getFestivalManagerSchedule() {
+		if (_managerScheduledTask == null) {
+			startFestivalManager();
+		}
+		
+		return _managerScheduledTask;
+	}
+	
+	/**
+	 * Used to start the Festival Manager, if the current period is not Seal Validation.
+	 */
+	protected void startFestivalManager() {
+		// Start the Festival Manager for the first time after the server has started
+		// at the specified time, then invoke it automatically after every cycle.
+		if (_managerInstance != null) {
+			return; // already started
+		}
+		_managerInstance = new FestivalManager();
+		
+		setNextFestivalStart(sevenSigns().getFestivalManagerStart() + FESTIVAL_SIGNUP_TIME);
+		_managerScheduledTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(_managerInstance, sevenSigns().getFestivalManagerStart(), sevenSigns().getFestivalCycleLength());
+		
+		LOG.info("The first Festival of Darkness cycle begins in {} minute(s).", MILLISECONDS.toMinutes(sevenSigns().getFestivalManagerStart()));
+	}
+	
+	/**
+	 * Restores saved festival data, basic settings from the properties file and past high score data from the database.
+	 */
+	protected void restoreFestivalData() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT festivalId, cabal, cycle, date, score, members " + "FROM seven_signs_festival")) {
+			while (rs.next()) {
+				int festivalCycle = rs.getInt("cycle");
+				int festivalId = rs.getInt("festivalId");
+				String cabal = rs.getString("cabal");
+				
+				StatsSet festivalDat = new StatsSet();
+				festivalDat.set("festivalId", festivalId);
+				festivalDat.set("cabal", cabal);
+				festivalDat.set("cycle", festivalCycle);
+				festivalDat.set("date", rs.getString("date"));
+				festivalDat.set("score", rs.getInt("score"));
+				festivalDat.set("members", rs.getString("members"));
+				
+				if (cabal.equals("dawn")) {
+					festivalId += FESTIVAL_COUNT;
+				}
+				
+				final Map<Integer, StatsSet> tempData = _festivalData.getOrDefault(festivalCycle, new HashMap<>());
+				tempData.put(festivalId, festivalDat);
+				_festivalData.put(festivalCycle, tempData);
+			}
+		} catch (SQLException e) {
+			LOG.error("Failed to load configuration!", e);
+		}
+		
+		StringBuilder query = new StringBuilder();
+		query.append("SELECT festival_cycle, ");
+		
+		for (int i = 0; i < (FESTIVAL_COUNT - 1); i++) {
+			query.append("accumulated_bonus");
+			query.append(i);
+			query.append(", ");
+		}
+		
+		query.append("accumulated_bonus");
+		query.append(FESTIVAL_COUNT - 1);
+		query.append(' ');
+		query.append("FROM seven_signs_status WHERE id=0");
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(query.toString())) {
+			while (rs.next()) {
+				_festivalCycle = rs.getInt("festival_cycle");
+				
+				for (int i = 0; i < FESTIVAL_COUNT; i++) {
+					_accumulatedBonuses.add(i, rs.getInt("accumulated_bonus" + i));
+				}
+			}
+		} catch (SQLException e) {
+			LOG.error("Failed to load configuration!", e);
+		}
+	}
+	
+	/**
+	 * Stores current festival data, basic settings to the properties file and past high score data to the database. If updateSettings = true, then all Seven Signs data is updated in the database.
+	 * @param updateSettings
+	 */
+	public void saveFestivalData(boolean updateSettings) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var psInsert = con.prepareStatement("REPLACE INTO seven_signs_festival (festivalId, cabal, cycle, date, score, members) VALUES (?,?,?,?,?,?)")) {
+			for (Map<Integer, StatsSet> currCycleData : _festivalData.values()) {
+				for (StatsSet festivalDat : currCycleData.values()) {
+					psInsert.setInt(1, festivalDat.getInt("festivalId"));
+					psInsert.setString(2, festivalDat.getString("cabal"));
+					psInsert.setInt(3, festivalDat.getInt("cycle"));
+					psInsert.setLong(4, Long.parseLong(festivalDat.getString("date")));
+					psInsert.setInt(5, festivalDat.getInt("score"));
+					psInsert.setString(6, festivalDat.getString("members"));
+					psInsert.addBatch();
+				}
+			}
+			psInsert.executeBatch();
+		} catch (SQLException e) {
+			LOG.error("Failed to save configuration!", e);
+		}
+		
+		// Updates Seven Signs DB data also, so call only if really necessary.
+		if (updateSettings) {
+			SevenSigns.getInstance().saveSevenSignsStatus();
+		}
+	}
+	
+	/**
+	 * If a clan member is a member of the highest-ranked party in the Festival of Darkness, 100 points are added per member
+	 */
+	protected void rewardHighestRanked() {
+		String[] partyMembers;
+		StatsSet overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_31);
+		if (overallData != null) {
+			partyMembers = overallData.getString("members").split(",");
+			for (String partyMemberName : partyMembers) {
+				addReputationPointsForPartyMemberClan(partyMemberName);
+			}
+		}
+		
+		overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_42);
+		if (overallData != null) {
+			partyMembers = overallData.getString("members").split(",");
+			for (String partyMemberName : partyMembers) {
+				addReputationPointsForPartyMemberClan(partyMemberName);
+			}
+		}
+		
+		overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_53);
+		if (overallData != null) {
+			partyMembers = overallData.getString("members").split(",");
+			for (String partyMemberName : partyMembers) {
+				addReputationPointsForPartyMemberClan(partyMemberName);
+			}
+		}
+		
+		overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_64);
+		if (overallData != null) {
+			partyMembers = overallData.getString("members").split(",");
+			for (String partyMemberName : partyMembers) {
+				addReputationPointsForPartyMemberClan(partyMemberName);
+			}
+		}
+		
+		overallData = getOverallHighestScoreData(FESTIVAL_LEVEL_MAX_NONE);
+		if (overallData != null) {
+			partyMembers = overallData.getString("members").split(",");
+			for (String partyMemberName : partyMembers) {
+				addReputationPointsForPartyMemberClan(partyMemberName);
+			}
+		}
+	}
+	
+	private void addReputationPointsForPartyMemberClan(String partyMemberName) {
+		L2PcInstance player = L2World.getInstance().getPlayer(partyMemberName);
+		if (player != null) {
+			if (player.getClan() != null) {
+				player.getClan().addReputationScore(clan().getFestivalOfDarknessWin(), true);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION);
+				sm.addString(partyMemberName);
+				sm.addInt(clan().getFestivalOfDarknessWin());
+				player.getClan().broadcastToOnlineMembers(sm);
+			}
+		} else {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(GET_CLAN_NAME)) {
+				ps.setString(1, partyMemberName);
+				try (var rs = ps.executeQuery()) {
+					if (rs.next()) {
+						String clanName = rs.getString("clan_name");
+						if (clanName != null) {
+							L2Clan clan = ClanTable.getInstance().getClanByName(clanName);
+							if (clan != null) {
+								clan.addReputationScore(clan().getFestivalOfDarknessWin(), true);
+								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION);
+								sm.addString(partyMemberName);
+								sm.addInt(clan().getFestivalOfDarknessWin());
+								clan.broadcastToOnlineMembers(sm);
+							}
+						}
+					}
+				}
+			} catch (Exception e) {
+				LOG.warn("Could not get clan name of {}!", partyMemberName, e);
+			}
+		}
+	}
+	
+	/**
+	 * Used to reset all festival data at the beginning of a new quest event period.
+	 * @param updateSettings
+	 */
+	protected void resetFestivalData(boolean updateSettings) {
+		_festivalCycle = 0;
+		_signsCycle = SevenSigns.getInstance().getCurrentCycle();
+		
+		// Set all accumulated bonuses back to 0.
+		for (int i = 0; i < FESTIVAL_COUNT; i++) {
+			_accumulatedBonuses.set(i, 0);
+		}
+		
+		_dawnFestivalParticipants.clear();
+		_dawnPreviousParticipants.clear();
+		_dawnFestivalScores.clear();
+		
+		_duskFestivalParticipants.clear();
+		_duskPreviousParticipants.clear();
+		_duskFestivalScores.clear();
+		
+		// Set up a new data set for the current cycle of festivals
+		Map<Integer, StatsSet> newData = new HashMap<>();
+		
+		for (int i = 0; i < (FESTIVAL_COUNT * 2); i++) {
+			int festivalId = i;
+			
+			if (i >= FESTIVAL_COUNT) {
+				festivalId -= FESTIVAL_COUNT;
+			}
+			
+			// Create a new StatsSet with "default" data for Dusk
+			StatsSet tempStats = new StatsSet();
+			tempStats.set("festivalId", festivalId);
+			tempStats.set("cycle", _signsCycle);
+			tempStats.set("date", "0");
+			tempStats.set("score", 0);
+			tempStats.set("members", "");
+			
+			if (i >= FESTIVAL_COUNT) {
+				tempStats.set("cabal", SevenSigns.getCabalShortName(SevenSigns.CABAL_DAWN));
+			} else {
+				tempStats.set("cabal", SevenSigns.getCabalShortName(SevenSigns.CABAL_DUSK));
+			}
+			
+			newData.put(i, tempStats);
+		}
+		
+		// Add the newly created cycle data to the existing festival data, and
+		// subsequently save it to the database.
+		_festivalData.put(_signsCycle, newData);
+		
+		saveFestivalData(updateSettings);
+		
+		// Remove any unused blood offerings from online players.
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			final L2ItemInstance bloodOfferings = player.getInventory().getItemByItemId(FESTIVAL_OFFERING_ID);
+			if (bloodOfferings != null) {
+				player.destroyItem("SevenSigns", bloodOfferings, null, false);
+			}
+		}
+		
+		LOG.info("Reinitialized engine for next competition period.");
+	}
+	
+	public final int getCurrentFestivalCycle() {
+		return _festivalCycle;
+	}
+	
+	public final boolean isFestivalInitialized() {
+		return _festivalInitialized;
+	}
+	
+	public final boolean isFestivalInProgress() {
+		return _festivalInProgress;
+	}
+	
+	public void setNextCycleStart() {
+		_nextFestivalCycleStart = System.currentTimeMillis() + sevenSigns().getFestivalCycleLength();
+	}
+	
+	public void setNextFestivalStart(long milliFromNow) {
+		_nextFestivalStart = System.currentTimeMillis() + milliFromNow;
+	}
+	
+	public final long getMinsToNextCycle() {
+		if (SevenSigns.getInstance().isSealValidationPeriod()) {
+			return -1;
+		}
+		
+		return (_nextFestivalCycleStart - System.currentTimeMillis()) / 60000;
+	}
+	
+	public final int getMinsToNextFestival() {
+		if (SevenSigns.getInstance().isSealValidationPeriod()) {
+			return -1;
+		}
+		
+		return (int) (((_nextFestivalStart - System.currentTimeMillis()) / 60000) + 1);
+	}
+	
+	public final String getTimeToNextFestivalStr() {
+		if (SevenSigns.getInstance().isSealValidationPeriod()) {
+			return "<font color=\"FF0000\">This is the Seal Validation period. Festivals will resume next week.</font>";
+		}
+		
+		return "<font color=\"FF0000\">The next festival will begin in " + getMinsToNextFestival() + " minute(s).</font>";
+	}
+	
+	/**
+	 * Returns the current festival ID and oracle ID that the specified player is in, but will return the default of {-1, -1} if the player is not found as a participant.
+	 * @param player
+	 * @return int[] playerFestivalInfo
+	 */
+	public final int[] getFestivalForPlayer(L2PcInstance player) {
+		int[] playerFestivalInfo = {
+			-1,
+			-1
+		};
+		int festivalId = 0;
+		
+		while (festivalId < FESTIVAL_COUNT) {
+			List<Integer> participants = _dawnFestivalParticipants.get(festivalId);
+			
+			// If there are no participants in this festival, move on to the next.
+			if ((participants != null) && participants.contains(player.getObjectId())) {
+				playerFestivalInfo[0] = SevenSigns.CABAL_DAWN;
+				playerFestivalInfo[1] = festivalId;
+				
+				return playerFestivalInfo;
+			}
+			
+			participants = _duskFestivalParticipants.get(++festivalId);
+			
+			if ((participants != null) && participants.contains(player.getObjectId())) {
+				playerFestivalInfo[0] = SevenSigns.CABAL_DUSK;
+				playerFestivalInfo[1] = festivalId;
+				
+				return playerFestivalInfo;
+			}
+			
+			festivalId++;
+		}
+		
+		// Return default data if the player is not found as a participant.
+		return playerFestivalInfo;
+	}
+	
+	public final boolean isParticipant(L2PcInstance player) {
+		if (SevenSigns.getInstance().isSealValidationPeriod()) {
+			return false;
+		}
+		
+		if (_managerInstance == null) {
+			return false;
+		}
+		
+		for (List<Integer> participants : _dawnFestivalParticipants.values()) {
+			if ((participants != null) && participants.contains(player.getObjectId())) {
+				return true;
+			}
+		}
+		
+		for (List<Integer> participants : _duskFestivalParticipants.values()) {
+			if ((participants != null) && participants.contains(player.getObjectId())) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public final List<Integer> getParticipants(int oracle, int festivalId) {
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			return _dawnFestivalParticipants.get(festivalId);
+		}
+		
+		return _duskFestivalParticipants.get(festivalId);
+	}
+	
+	public final List<Integer> getPreviousParticipants(int oracle, int festivalId) {
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			return _dawnPreviousParticipants.get(festivalId);
+		}
+		
+		return _duskPreviousParticipants.get(festivalId);
+	}
+	
+	public void setParticipants(int oracle, int festivalId, L2Party festivalParty) {
+		List<Integer> participants = null;
+		
+		if (festivalParty != null) {
+			participants = new ArrayList<>(festivalParty.getMemberCount());
+			for (L2PcInstance player : festivalParty.getMembers()) {
+				if (player == null) {
+					continue;
+				}
+				participants.add(player.getObjectId());
+			}
+		}
+		
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			_dawnFestivalParticipants.put(festivalId, participants);
+		} else {
+			_duskFestivalParticipants.put(festivalId, participants);
+		}
+	}
+	
+	public void updateParticipants(L2PcInstance player, L2Party festivalParty) {
+		if (!isParticipant(player)) {
+			return;
+		}
+		
+		final int[] playerFestInfo = getFestivalForPlayer(player);
+		final int oracle = playerFestInfo[0];
+		final int festivalId = playerFestInfo[1];
+		
+		if (festivalId > -1) {
+			if (_festivalInitialized) {
+				L2DarknessFestival festivalInst = _managerInstance.getFestivalInstance(oracle, festivalId);
+				
+				if (festivalParty == null) {
+					for (int partyMemberObjId : getParticipants(oracle, festivalId)) {
+						L2PcInstance partyMember = L2World.getInstance().getPlayer(partyMemberObjId);
+						if (partyMember == null) {
+							continue;
+						}
+						
+						festivalInst.relocatePlayer(partyMember, true);
+					}
+				} else {
+					festivalInst.relocatePlayer(player, true);
+				}
+			}
+			
+			setParticipants(oracle, festivalId, festivalParty);
+			
+			// Check on disconnect if min player in party
+			if ((festivalParty != null) && (festivalParty.getMemberCount() < sevenSigns().getFestivalMinPlayer())) {
+				updateParticipants(player, null); // under minimum count
+				festivalParty.removePartyMember(player, messageType.Expelled);
+			}
+		}
+	}
+	
+	public final long getFinalScore(int oracle, int festivalId) {
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			return _dawnFestivalScores.get(festivalId);
+		}
+		
+		return _duskFestivalScores.get(festivalId);
+	}
+	
+	public final int getHighestScore(int oracle, int festivalId) {
+		return getHighestScoreData(oracle, festivalId).getInt("score");
+	}
+	
+	/**
+	 * Returns a stats set containing the highest score <b>this cycle</b> for the the specified cabal and associated festival ID.
+	 * @param oracle
+	 * @param festivalId
+	 * @return StatsSet festivalDat
+	 */
+	public final StatsSet getHighestScoreData(int oracle, int festivalId) {
+		int offsetId = festivalId;
+		
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			offsetId += 5;
+		}
+		
+		// Attempt to retrieve existing score data (if found), otherwise create a
+		// new blank data set and display a console warning.
+		StatsSet currData;
+		
+		try {
+			currData = _festivalData.get(_signsCycle).get(offsetId);
+		} catch (Exception e) {
+			currData = new StatsSet();
+			currData.set("score", 0);
+			currData.set("members", "");
+		}
+		
+		return currData;
+	}
+	
+	/**
+	 * Returns a stats set containing the highest ever recorded score data for the specified festival.
+	 * @param festivalId
+	 * @return StatsSet result
+	 */
+	public final StatsSet getOverallHighestScoreData(int festivalId) {
+		StatsSet result = null;
+		int highestScore = 0;
+		
+		for (Map<Integer, StatsSet> currCycleData : _festivalData.values()) {
+			for (StatsSet currFestData : currCycleData.values()) {
+				int currFestID = currFestData.getInt("festivalId");
+				int festivalScore = currFestData.getInt("score");
+				
+				if (currFestID != festivalId) {
+					continue;
+				}
+				
+				if (festivalScore > highestScore) {
+					highestScore = festivalScore;
+					result = currFestData;
+				}
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * Set the final score details for the last participants of the specified festival data. Returns <b>true</b> if the score is higher than that previously recorded <b>this cycle</b>.
+	 * @param player
+	 * @param oracle
+	 * @param festivalId
+	 * @param offeringScore
+	 * @return boolean isHighestScore
+	 */
+	public boolean setFinalScore(L2PcInstance player, int oracle, int festivalId, long offeringScore) {
+		List<String> partyMembers;
+		
+		int currDawnHighScore = getHighestScore(SevenSigns.CABAL_DAWN, festivalId);
+		int currDuskHighScore = getHighestScore(SevenSigns.CABAL_DUSK, festivalId);
+		
+		int thisCabalHighScore;
+		int otherCabalHighScore;
+		
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			thisCabalHighScore = currDawnHighScore;
+			otherCabalHighScore = currDuskHighScore;
+			
+			_dawnFestivalScores.put(festivalId, offeringScore);
+		} else {
+			thisCabalHighScore = currDuskHighScore;
+			otherCabalHighScore = currDawnHighScore;
+			
+			_duskFestivalScores.put(festivalId, offeringScore);
+		}
+		
+		StatsSet currFestData = getHighestScoreData(oracle, festivalId);
+		
+		// Check if this is the highest score for this level range so far for the player's cabal.
+		if (offeringScore > thisCabalHighScore) {
+			// If the current score is greater than that for the other cabal,
+			// then they already have the points from this festival.
+			if (thisCabalHighScore > otherCabalHighScore) {
+				return false;
+			}
+			
+			List<Integer> prevParticipants = getPreviousParticipants(oracle, festivalId);
+			partyMembers = new ArrayList<>(prevParticipants.size());
+			
+			// Record a string list of the party members involved.
+			for (Integer partyMember : prevParticipants) {
+				partyMembers.add(CharNameTable.getInstance().getNameById(partyMember));
+			}
+			
+			// Update the highest scores and party list.
+			currFestData.set("date", String.valueOf(System.currentTimeMillis()));
+			currFestData.set("score", offeringScore);
+			currFestData.set("members", Util.implodeString(partyMembers, ","));
+			
+			// Only add the score to the cabal's overall if it's higher than the other cabal's score.
+			if (offeringScore > otherCabalHighScore) {
+				int contribPoints = FESTIVAL_LEVEL_SCORES[festivalId];
+				
+				// Give this cabal the festival points, while deducting them from the other.
+				SevenSigns.getInstance().addFestivalScore(oracle, contribPoints);
+			}
+			
+			saveFestivalData(true);
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public final int getAccumulatedBonus(int festivalId) {
+		return _accumulatedBonuses.get(festivalId);
+	}
+	
+	public final int getTotalAccumulatedBonus() {
+		int totalAccumBonus = 0;
+		
+		for (int accumBonus : _accumulatedBonuses) {
+			totalAccumBonus += accumBonus;
+		}
+		
+		return totalAccumBonus;
+	}
+	
+	public void addAccumulatedBonus(int festivalId, int stoneType, int stoneAmount) {
+		int eachStoneBonus = switch (stoneType) {
+			case SevenSigns.SEAL_STONE_BLUE_ID -> SevenSigns.SEAL_STONE_BLUE_VALUE;
+			case SevenSigns.SEAL_STONE_GREEN_ID -> SevenSigns.SEAL_STONE_GREEN_VALUE;
+			case SevenSigns.SEAL_STONE_RED_ID -> SevenSigns.SEAL_STONE_RED_VALUE;
+			default -> 0;
+		};
+		int newTotalBonus = _accumulatedBonuses.get(festivalId) + (stoneAmount * eachStoneBonus);
+		_accumulatedBonuses.set(festivalId, newTotalBonus);
+	}
+	
+	/**
+	 * Calculate and return the proportion of the accumulated bonus for the festival where the player was in the winning party, if the winning party's cabal won the event. The accumulated bonus is then updated, with the player's share deducted.
+	 * @param player
+	 * @return playerBonus (the share of the bonus for the party)
+	 */
+	public final int distribAccumulatedBonus(L2PcInstance player) {
+		int playerBonus = 0;
+		String playerName = player.getName();
+		int playerCabal = SevenSigns.getInstance().getPlayerCabal(player.getObjectId());
+		
+		if (playerCabal != SevenSigns.getInstance().getCabalHighestScore()) {
+			return 0;
+		}
+		
+		final Map<Integer, StatsSet> festivalDataMap = _festivalData.get(_signsCycle);
+		if (festivalDataMap != null) {
+			for (StatsSet festivalData : festivalDataMap.values()) {
+				if (festivalData.getString("members").contains(playerName)) {
+					int festivalId = festivalData.getInt("festivalId");
+					int numPartyMembers = festivalData.getString("members").split(",").length;
+					int totalAccumBonus = _accumulatedBonuses.get(festivalId);
+					
+					playerBonus = totalAccumBonus / numPartyMembers;
+					_accumulatedBonuses.set(festivalId, totalAccumBonus - playerBonus);
+					break;
+				}
+			}
+		}
+		
+		return playerBonus;
+	}
+	
+	/**
+	 * Used to send a "shout" message to all players currently present in an Oracle.<br>
+	 * Primarily used for Festival Guide and Witch related speech.
+	 * @param senderName
+	 * @param npcString
+	 */
+	public void sendMessageToAll(String senderName, NpcStringId npcString) {
+		if ((_dawnChatGuide == null) || (_duskChatGuide == null)) {
+			return;
+		}
+		
+		sendMessageToAll(senderName, npcString, _dawnChatGuide);
+		sendMessageToAll(senderName, npcString, _duskChatGuide);
+	}
+	
+	/**
+	 * @param senderName
+	 * @param npcString
+	 * @param npc
+	 */
+	public void sendMessageToAll(String senderName, NpcStringId npcString, L2Npc npc) {
+		CreatureSay cs = new CreatureSay(npc.getObjectId(), Say2.NPC_SHOUT, senderName, npcString);
+		if (npcString.getParamCount() == 1) {
+			cs.addStringParameter(String.valueOf(getMinsToNextFestival()));
+		}
+		
+		npc.broadcastPacket(cs);
+	}
+	
+	/**
+	 * Basically a wrapper-call to signal to increase the challenge of the specified festival.
+	 * @param oracle
+	 * @param festivalId
+	 * @return boolean isChalIncreased
+	 */
+	public final boolean increaseChallenge(int oracle, int festivalId) {
+		L2DarknessFestival festivalInst = _managerInstance.getFestivalInstance(oracle, festivalId);
+		
+		return festivalInst.increaseChallenge();
+	}
+	
+	/**
+	 * Used with the SpawnListener, to update the required "chat guide" instances, for use with announcements in the oracles.
+	 * @param npc
+	 */
+	@Override
+	public void npcSpawned(L2Npc npc) {
+		if (npc == null) {
+			return;
+		}
+		
+		int npcId = npc.getId();
+		
+		// If the spawned NPC ID matches the ones we need, assign their instances.
+		if (npcId == 31127) {
+			_dawnChatGuide = npc;
+		}
+		
+		if (npcId == 31137) {
+			_duskChatGuide = npc;
+		}
+	}
+	
+	/**
+	 * The FestivalManager class is the main runner of all the festivals. It is used for easier integration and management of all running festivals.
+	 * @author Tempy
+	 */
+	private class FestivalManager implements Runnable {
+		protected Map<Integer, L2DarknessFestival> _festivalInstances;
+		
+		public FestivalManager() {
+			_festivalInstances = new HashMap<>();
+			
+			// Increment the cycle counter.
+			_festivalCycle++;
+			
+			// Set the next start timers.
+			setNextCycleStart();
+			setNextFestivalStart(sevenSigns().getFestivalCycleLength() - FESTIVAL_SIGNUP_TIME);
+		}
+		
+		@Override
+		public synchronized void run() {
+			try {
+				// The manager shouldn't be running if Seal Validation is in effect.
+				if (SevenSigns.getInstance().isSealValidationPeriod()) {
+					return;
+				}
+				
+				// If the next period is due to start before the end of this
+				// festival cycle, then don't run it.
+				if (SevenSigns.getInstance().getMilliToPeriodChange() < sevenSigns().getFestivalCycleLength()) {
+					return;
+				} else if (getMinsToNextFestival() == 2) {
+					sendMessageToAll("Festival Guide", NpcStringId.THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW);
+				}
+				
+				// Stand by until the allowed signup period has elapsed.
+				try {
+					wait(FESTIVAL_SIGNUP_TIME);
+				} catch (InterruptedException e) {
+				}
+				
+				// Clear past participants, they can no longer register their score if not done so already.
+				_dawnPreviousParticipants.clear();
+				_duskPreviousParticipants.clear();
+				
+				// Get rid of random monsters that avoided deletion after last festival
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.unspawnMobs();
+				}
+				
+				// Start only if participants signed up
+				_noPartyRegister = true;
+				
+				while (_noPartyRegister) {
+					if ((_duskFestivalParticipants.isEmpty() && _dawnFestivalParticipants.isEmpty())) {
+						try {
+							setNextCycleStart();
+							setNextFestivalStart(sevenSigns().getFestivalCycleLength() - FESTIVAL_SIGNUP_TIME);
+							wait(sevenSigns().getFestivalCycleLength() - FESTIVAL_SIGNUP_TIME);
+							for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+								if (!festivalInst._npcInsts.isEmpty()) {
+									festivalInst.unspawnMobs();
+								}
+							}
+						} catch (InterruptedException e) {
+						}
+					} else {
+						_noPartyRegister = false;
+					}
+				}
+				
+				/* INITIATION */
+				// Set the festival timer to 0, as it is just beginning.
+				long elapsedTime;
+				
+				// Create the instances for the festivals in both Oracles,
+				// but only if they have participants signed up for them.
+				for (int i = 0; i < FESTIVAL_COUNT; i++) {
+					if (_duskFestivalParticipants.get(i) != null) {
+						_festivalInstances.put(10 + i, new L2DarknessFestival(SevenSigns.CABAL_DUSK, i));
+					}
+					
+					if (_dawnFestivalParticipants.get(i) != null) {
+						_festivalInstances.put(20 + i, new L2DarknessFestival(SevenSigns.CABAL_DAWN, i));
+					}
+				}
+				
+				// Prevent future signups while festival is in progress.
+				_festivalInitialized = true;
+				
+				setNextFestivalStart(sevenSigns().getFestivalCycleLength());
+				sendMessageToAll("Festival Guide", NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING);
+				
+				// Stand by for a short length of time before starting the festival.
+				try {
+					wait(sevenSigns().getFestivalFirstSpawn());
+				} catch (InterruptedException e) {
+				}
+				
+				elapsedTime = sevenSigns().getFestivalFirstSpawn();
+				
+				// Participants can now opt to increase the challenge, if desired.
+				_festivalInProgress = true;
+				
+				/* PROPAGATION */
+				// Sequentially set all festivals to begin, spawn the Festival Witch and notify participants.
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.festivalStart();
+					festivalInst.sendMessageToParticipants(NpcStringId.THE_MAIN_EVENT_IS_NOW_STARTING);
+				}
+				
+				// After a short time period, move all idle spawns to the center of the arena.
+				try {
+					wait(sevenSigns().getFestivalFirstSwarm() - sevenSigns().getFestivalFirstSpawn());
+				} catch (InterruptedException e) {
+				}
+				
+				elapsedTime += sevenSigns().getFestivalFirstSwarm() - sevenSigns().getFestivalFirstSpawn();
+				
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.moveMonstersToCenter();
+				}
+				
+				// Stand by until the time comes for the second spawn.
+				try {
+					wait(sevenSigns().getFestivalSecondSpawn() - sevenSigns().getFestivalFirstSwarm());
+				} catch (InterruptedException e) {
+				}
+				
+				// Spawn an extra set of monsters (archers) on the free platforms with
+				// a faster respawn when killed.
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN / 2, 2);
+					
+					long end = (sevenSigns().getFestivalLength() - sevenSigns().getFestivalSecondSpawn()) / 60000;
+					if (end == 2) {
+						festivalInst.sendMessageToParticipants(NpcStringId.THE_FESTIVAL_OF_DARKNESS_WILL_END_IN_TWO_MINUTES);
+					} else {
+						festivalInst.sendMessageToParticipants("The Festival of Darkness will end in " + end + " minute(s).");
+					}
+				}
+				
+				elapsedTime += sevenSigns().getFestivalSecondSpawn() - sevenSigns().getFestivalFirstSwarm();
+				
+				// After another short time period, again move all idle spawns to the center of the arena.
+				try {
+					wait(sevenSigns().getFestivalSecondSwarm() - sevenSigns().getFestivalSecondSpawn());
+				} catch (InterruptedException e) {
+				}
+				
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.moveMonstersToCenter();
+				}
+				
+				elapsedTime += sevenSigns().getFestivalSecondSwarm() - sevenSigns().getFestivalSecondSpawn();
+				
+				// Stand by until the time comes for the chests to be spawned.
+				try {
+					wait(sevenSigns().getFestivalChestSpawn() - sevenSigns().getFestivalSecondSwarm());
+				} catch (InterruptedException e) {
+				}
+				
+				// Spawn the festival chests, which enable the team to gain greater rewards
+				// for each chest they kill.
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 3);
+					festivalInst.sendMessageToParticipants("The chests have spawned! Be quick, the festival will end soon."); // FIXME What is the correct npcString?
+				}
+				
+				elapsedTime += sevenSigns().getFestivalChestSpawn() - sevenSigns().getFestivalSecondSwarm();
+				
+				// Stand by and wait until it's time to end the festival.
+				try {
+					wait(sevenSigns().getFestivalLength() - elapsedTime);
+				} catch (InterruptedException e) {
+				}
+				
+				// Participants can no longer opt to increase the challenge, as the festival will soon close.
+				_festivalInProgress = false;
+				
+				/* TERMINATION */
+				// Sequentially begin the ending sequence for all running festivals.
+				for (L2DarknessFestival festivalInst : _festivalInstances.values()) {
+					festivalInst.festivalEnd();
+				}
+				
+				// Clear the participants list for the next round of signups.
+				_dawnFestivalParticipants.clear();
+				_duskFestivalParticipants.clear();
+				
+				// Allow signups for the next festival cycle.
+				_festivalInitialized = false;
+				
+				sendMessageToAll("Festival Witch", NpcStringId.THAT_WILL_DO_ILL_MOVE_YOU_TO_THE_OUTSIDE_SOON);
+			} catch (Exception e) {
+				LOG.warn("Could not run festival task!", e);
+			}
+		}
+		
+		/**
+		 * Returns the running instance of a festival for the given Oracle and festivalID. <BR>
+		 * A <B>null</B> value is returned if there are no participants in that festival.
+		 * @param oracle
+		 * @param festivalId
+		 * @return L2DarknessFestival festivalInst
+		 */
+		public final L2DarknessFestival getFestivalInstance(int oracle, int festivalId) {
+			if (!isFestivalInitialized()) {
+				return null;
+			}
+			
+			/*
+			 * Compute the offset if a Dusk instance is required. ID: 0 1 2 3 4 Dusk 1:1011121314 Dawn 2:2021222324
+			 */
+			
+			festivalId += (oracle == SevenSigns.CABAL_DUSK) ? 10 : 20;
+			return _festivalInstances.get(festivalId);
+		}
+	}
+	
+	/**
+	 * Each running festival is represented by an L2DarknessFestival class. It contains all the spawn information and data for the running festival. All festivals are managed by the FestivalManager class, which must be initialized first.
+	 * @author Tempy
+	 */
+	private class L2DarknessFestival {
+		protected final int _cabal;
+		protected final int _levelRange;
+		protected boolean _challengeIncreased;
+		
+		private final FestivalSpawn _startLocation;
+		private final FestivalSpawn _witchSpawn;
+		
+		private L2Npc _witchInst;
+		List<L2FestivalMonsterInstance> _npcInsts = new ArrayList<>();
+		
+		private List<Integer> _participants;
+		private final Map<Integer, FestivalSpawn> _originalLocations = new ConcurrentHashMap<>();
+		
+		protected L2DarknessFestival(int cabal, int levelRange) {
+			_cabal = cabal;
+			_levelRange = levelRange;
+			
+			if (cabal == SevenSigns.CABAL_DAWN) {
+				_participants = _dawnFestivalParticipants.get(levelRange);
+				_witchSpawn = new FestivalSpawn(FESTIVAL_DAWN_WITCH_SPAWNS[levelRange]);
+				_startLocation = new FestivalSpawn(FESTIVAL_DAWN_PLAYER_SPAWNS[levelRange]);
+			} else {
+				_participants = _duskFestivalParticipants.get(levelRange);
+				_witchSpawn = new FestivalSpawn(FESTIVAL_DUSK_WITCH_SPAWNS[levelRange]);
+				_startLocation = new FestivalSpawn(FESTIVAL_DUSK_PLAYER_SPAWNS[levelRange]);
+			}
+			
+			// FOR TESTING!
+			if (_participants == null) {
+				_participants = new ArrayList<>();
+			}
+			
+			festivalInit();
+		}
+		
+		protected void festivalInit() {
+			boolean isPositive;
+			
+			// Teleport all players to arena and notify them.
+			if ((_participants != null) && !_participants.isEmpty()) {
+				try {
+					for (int participantObjId : _participants) {
+						L2PcInstance participant = L2World.getInstance().getPlayer(participantObjId);
+						if (participant == null) {
+							continue;
+						}
+						
+						_originalLocations.put(participantObjId, new FestivalSpawn(participant.getX(), participant.getY(), participant.getZ(), participant.getHeading()));
+						
+						// Randomize the spawn point around the specific centerpoint for each player.
+						int x = _startLocation._x;
+						int y = _startLocation._y;
+						
+						isPositive = (Rnd.nextInt(2) == 1);
+						
+						if (isPositive) {
+							x += Rnd.nextInt(FESTIVAL_MAX_OFFSET_X);
+							y += Rnd.nextInt(FESTIVAL_MAX_OFFSET_Y);
+						} else {
+							x -= Rnd.nextInt(FESTIVAL_MAX_OFFSET_X);
+							y -= Rnd.nextInt(FESTIVAL_MAX_OFFSET_Y);
+						}
+						
+						participant.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+						participant.teleToLocation(new Location(x, y, _startLocation._z), true);
+						
+						// Remove all buffs from all participants on entry. Works like the skill Cancel.
+						participant.stopAllEffectsExceptThoseThatLastThroughDeath();
+						
+						// Remove any stray blood offerings in inventory
+						L2ItemInstance bloodOfferings = participant.getInventory().getItemByItemId(FESTIVAL_OFFERING_ID);
+						if (bloodOfferings != null) {
+							participant.destroyItem("SevenSigns", bloodOfferings, null, true);
+						}
+					}
+				} catch (NullPointerException e) {
+					// deleteMe handling should teleport party out in case of disconnect
+				}
+			}
+			
+			// Spawn the festival witch for this arena
+			try {
+				L2Spawn npcSpawn = new L2Spawn(_witchSpawn._npcId);
+				
+				npcSpawn.setX(_witchSpawn._x);
+				npcSpawn.setY(_witchSpawn._y);
+				npcSpawn.setZ(_witchSpawn._z);
+				npcSpawn.setHeading(_witchSpawn._heading);
+				npcSpawn.setAmount(1);
+				npcSpawn.setRespawnDelay(1);
+				
+				// Needed as doSpawn() is required to be called also for the NpcInstance it returns.
+				npcSpawn.startRespawn();
+				
+				SpawnTable.getInstance().addNewSpawn(npcSpawn, false);
+				_witchInst = npcSpawn.doSpawn();
+			} catch (Exception e) {
+				LOG.warn("Error while spawning Festival Witch ID {}!", _witchSpawn._npcId, e);
+			}
+			
+			// Make it appear as though the Witch has appeared there.
+			MagicSkillUse msu = new MagicSkillUse(_witchInst, _witchInst, 2003, 1, 1, 0);
+			_witchInst.broadcastPacket(msu);
+			
+			// And another one...:D
+			msu = new MagicSkillUse(_witchInst, _witchInst, 2133, 1, 1, 0);
+			_witchInst.broadcastPacket(msu);
+			
+			// Send a message to all participants from the witch.
+			sendMessageToParticipants(NpcStringId.THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW);
+		}
+		
+		protected void festivalStart() {
+			spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 0);
+		}
+		
+		protected void moveMonstersToCenter() {
+			boolean isPositive;
+			
+			for (L2FestivalMonsterInstance festivalMob : _npcInsts) {
+				if (festivalMob.isDead()) {
+					continue;
+				}
+				
+				// Only move monsters that are idle or doing their usual functions.
+				CtrlIntention currIntention = festivalMob.getAI().getIntention();
+				
+				if ((currIntention != CtrlIntention.AI_INTENTION_IDLE) && (currIntention != CtrlIntention.AI_INTENTION_ACTIVE)) {
+					continue;
+				}
+				
+				int x = _startLocation._x;
+				int y = _startLocation._y;
+				
+				/*
+				 * Random X and Y coords around the player start location, up to half of the maximum allowed offset are generated to prevent the mobs from all moving to the exact same place.
+				 */
+				isPositive = (Rnd.nextInt(2) == 1);
+				
+				if (isPositive) {
+					x += Rnd.nextInt(FESTIVAL_MAX_OFFSET_X);
+					y += Rnd.nextInt(FESTIVAL_MAX_OFFSET_Y);
+				} else {
+					x -= Rnd.nextInt(FESTIVAL_MAX_OFFSET_X);
+					y -= Rnd.nextInt(FESTIVAL_MAX_OFFSET_Y);
+				}
+				
+				festivalMob.setRunning();
+				festivalMob.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(x, y, _startLocation._z, Rnd.nextInt(65536)));
+			}
+		}
+		
+		/**
+		 * Used to spawn monsters unique to the festival. <BR>
+		 * Valid SpawnTypes:<BR>
+		 * 0 - All Primary Monsters (starting monsters) <BR>
+		 * 1 - Same as 0, but without archers/marksmen. (used for challenge increase) <BR>
+		 * 2 - Secondary Monsters (archers) <BR>
+		 * 3 - Festival Chests
+		 * @param respawnDelay
+		 * @param spawnType
+		 */
+		protected void spawnFestivalMonsters(int respawnDelay, int spawnType) {
+			int[][] _npcSpawns = switch (spawnType) {
+				case 0, 1 -> (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_PRIMARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_PRIMARY_SPAWNS[_levelRange];
+				case 2 -> (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_SECONDARY_SPAWNS[_levelRange] : FESTIVAL_DUSK_SECONDARY_SPAWNS[_levelRange];
+				case 3 -> (_cabal == SevenSigns.CABAL_DAWN) ? FESTIVAL_DAWN_CHEST_SPAWNS[_levelRange] : FESTIVAL_DUSK_CHEST_SPAWNS[_levelRange];
+				default -> new int[0][0];
+			};
+			
+			for (int[] _npcSpawn : _npcSpawns) {
+				FestivalSpawn currSpawn = new FestivalSpawn(_npcSpawn);
+				
+				// Only spawn archers/marksmen if specified to do so.
+				if ((spawnType == 1) && isFestivalArcher(currSpawn._npcId)) {
+					continue;
+				}
+				
+				try {
+					L2Spawn npcSpawn = new L2Spawn(currSpawn._npcId);
+					
+					npcSpawn.setX(currSpawn._x);
+					npcSpawn.setY(currSpawn._y);
+					npcSpawn.setZ(currSpawn._z);
+					npcSpawn.setHeading(Rnd.nextInt(65536));
+					npcSpawn.setAmount(1);
+					npcSpawn.setRespawnDelay(respawnDelay);
+					
+					// Needed as doSpawn() is required to be called also for the NpcInstance it returns.
+					npcSpawn.startRespawn();
+					
+					SpawnTable.getInstance().addNewSpawn(npcSpawn, false);
+					L2FestivalMonsterInstance festivalMob = (L2FestivalMonsterInstance) npcSpawn.doSpawn();
+					
+					// Set the offering bonus to 2x or 5x the amount per kill,
+					// if this spawn is part of an increased challenge or is a festival chest.
+					if (spawnType == 1) {
+						festivalMob.setOfferingBonus(2);
+					} else if (spawnType == 3) {
+						festivalMob.setOfferingBonus(5);
+					}
+					
+					_npcInsts.add(festivalMob);
+				} catch (Exception e) {
+					LOG.warn("Error while spawning NPC ID {}!", currSpawn._npcId, e);
+				}
+			}
+		}
+		
+		protected boolean increaseChallenge() {
+			if (_challengeIncreased) {
+				return false;
+			}
+			
+			// Set this flag to true to make sure that this can only be done once.
+			_challengeIncreased = true;
+			
+			// Spawn more festival monsters, but this time with a twist.
+			spawnFestivalMonsters(FESTIVAL_DEFAULT_RESPAWN, 1);
+			return true;
+		}
+		
+		public void sendMessageToParticipants(NpcStringId npcStringId) {
+			if ((_participants != null) && !_participants.isEmpty()) {
+				_witchInst.broadcastPacket(new CreatureSay(_witchInst.getObjectId(), Say2.NPC_ALL, "Festival Witch", npcStringId));
+			}
+		}
+		
+		public void sendMessageToParticipants(String npcString) {
+			if ((_participants != null) && !_participants.isEmpty()) {
+				_witchInst.broadcastPacket(new CreatureSay(_witchInst.getObjectId(), Say2.NPC_ALL, "Festival Witch", npcString));
+			}
+		}
+		
+		protected void festivalEnd() {
+			if ((_participants != null) && !_participants.isEmpty()) {
+				for (int participantObjId : _participants) {
+					try {
+						L2PcInstance participant = L2World.getInstance().getPlayer(participantObjId);
+						if (participant == null) {
+							continue;
+						}
+						
+						relocatePlayer(participant, false);
+						participant.sendMessage("The festival has ended. Your party leader must now register your score before the next festival takes place.");
+					} catch (NullPointerException e) {
+					}
+				}
+				
+				if (_cabal == SevenSigns.CABAL_DAWN) {
+					_dawnPreviousParticipants.put(_levelRange, _participants);
+				} else {
+					_duskPreviousParticipants.put(_levelRange, _participants);
+				}
+			}
+			_participants = null;
+			
+			unspawnMobs();
+		}
+		
+		protected void unspawnMobs() {
+			// Delete all the NPCs in the current festival arena.
+			if (_witchInst != null) {
+				_witchInst.getSpawn().stopRespawn();
+				_witchInst.deleteMe();
+				SpawnTable.getInstance().deleteSpawn(_witchInst.getSpawn(), false);
+			}
+			
+			for (L2FestivalMonsterInstance monsterInst : _npcInsts) {
+				if (monsterInst != null) {
+					monsterInst.getSpawn().stopRespawn();
+					monsterInst.deleteMe();
+					SpawnTable.getInstance().deleteSpawn(monsterInst.getSpawn(), false);
+				}
+			}
+		}
+		
+		public void relocatePlayer(L2PcInstance participant, boolean isRemoving) {
+			try {
+				FestivalSpawn origPosition = _originalLocations.get(participant.getObjectId());
+				
+				if (isRemoving) {
+					_originalLocations.remove(participant.getObjectId());
+				}
+				
+				participant.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				participant.teleToLocation(new Location(origPosition._x, origPosition._y, origPosition._z), true);
+				participant.sendMessage("You have been removed from the festival arena.");
+			} catch (Exception e) {
+				// If an exception occurs, just move the player to the nearest town.
+				try {
+					participant.teleToLocation(TeleportWhereType.TOWN);
+					participant.sendMessage("You have been removed from the festival arena.");
+				} catch (NullPointerException e2) {
+				}
+			}
+		}
+	}
+	
+	private static class FestivalSpawn {
+		protected final int _x;
+		protected final int _y;
+		protected final int _z;
+		protected final int _heading;
+		protected final int _npcId;
+		
+		protected FestivalSpawn(int x, int y, int z, int heading) {
+			_x = x;
+			_y = y;
+			_z = z;
+			
+			// Generate a random heading if no positive one given.
+			_heading = (heading < 0) ? Rnd.nextInt(65536) : heading;
+			
+			_npcId = -1;
+		}
+		
+		protected FestivalSpawn(int[] spawnData) {
+			_x = spawnData[0];
+			_y = spawnData[1];
+			_z = spawnData[2];
+			
+			_heading = (spawnData[3] < 0) ? Rnd.nextInt(65536) : spawnData[3];
+			
+			if (spawnData.length > 4) {
+				_npcId = spawnData[4];
+			} else {
+				_npcId = -1;
+			}
+		}
+	}
+	
+	private static class SingletonHolder {
+		protected static final SevenSignsFestival _instance = new SevenSignsFestival();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/Shutdown.java b/src/main/java/com/l2jserver/gameserver/Shutdown.java
new file mode 100644
index 00000000..2a8468cf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/Shutdown.java
@@ -0,0 +1,517 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.UPnPService;
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
+import com.l2jserver.gameserver.datatables.BotReportTable;
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
+import com.l2jserver.gameserver.instancemanager.GrandBossManager;
+import com.l2jserver.gameserver.instancemanager.ItemAuctionManager;
+import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.gameserverpackets.ServerStatus;
+import com.l2jserver.gameserver.network.serverpackets.ServerClose;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * This class provides the functions for shutting down and restarting the server.<br>
+ * It closes all open client connections and saves all data.
+ * @since 2005/03/27 15:29:09
+ */
+public class Shutdown extends Thread {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Shutdown.class);
+	
+	private static Shutdown _counterInstance = null;
+	
+	private int _secondsShut;
+	private int _shutdownMode;
+	private static final int SIGTERM = 0;
+	private static final int GM_SHUTDOWN = 1;
+	private static final int GM_RESTART = 2;
+	private static final int ABORT = 3;
+	private static final String[] MODE_TEXT = {
+		"SIGTERM",
+		"shutting down",
+		"restarting",
+		"aborting"
+	};
+	
+	/**
+	 * This function starts a shutdown count down from Telnet (Copied from Function startShutdown())
+	 * @param seconds seconds until shutdown
+	 */
+	private void SendServerQuit(int seconds) {
+		SystemMessage sysm = SystemMessage.getSystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECONDS);
+		sysm.addInt(seconds);
+		Broadcast.toAllOnlinePlayers(sysm);
+	}
+	
+	public void startTelnetShutdown(String IP, int seconds, boolean restart) {
+		LOG.warn("IP: {} issued shutdown command. {} in {} seconds!", IP, MODE_TEXT[_shutdownMode], seconds);
+		
+		if (restart) {
+			_shutdownMode = GM_RESTART;
+		} else {
+			_shutdownMode = GM_SHUTDOWN;
+		}
+		
+		switch (seconds) {
+			case 540:
+			case 480:
+			case 420:
+			case 360:
+			case 300:
+			case 240:
+			case 180:
+			case 120:
+			case 60:
+			case 30:
+			case 10:
+			case 5:
+			case 4:
+			case 3:
+			case 2:
+			case 1:
+				break;
+			default:
+				SendServerQuit(seconds);
+		}
+		
+		if (_counterInstance != null) {
+			_counterInstance._abort();
+		}
+		_counterInstance = new Shutdown(seconds, restart);
+		_counterInstance.start();
+	}
+	
+	/**
+	 * This function aborts a running countdown
+	 * @param IP IP Which Issued shutdown command
+	 */
+	public void telnetAbort(String IP) {
+		LOG.warn("IP: {} issued shutdown ABORT. {} has been stopped!", IP, MODE_TEXT[_shutdownMode]);
+		
+		if (_counterInstance != null) {
+			_counterInstance._abort();
+			Broadcast.toAllOnlinePlayers("Server aborts " + MODE_TEXT[_shutdownMode] + " and continues normal operation!", false);
+		}
+	}
+	
+	/**
+	 * Default constructor is only used internal to create the shutdown-hook instance
+	 */
+	protected Shutdown() {
+		_secondsShut = -1;
+		_shutdownMode = SIGTERM;
+	}
+	
+	/**
+	 * This creates a countdown instance of Shutdown.
+	 * @param seconds how many seconds until shutdown
+	 * @param restart true is the server shall restart after shutdown
+	 */
+	public Shutdown(int seconds, boolean restart) {
+		if (seconds < 0) {
+			seconds = 0;
+		}
+		_secondsShut = seconds;
+		if (restart) {
+			_shutdownMode = GM_RESTART;
+		} else {
+			_shutdownMode = GM_SHUTDOWN;
+		}
+	}
+	
+	/**
+	 * This function is called, when a new thread starts if this thread is the thread of getInstance, then this is the shutdown hook and we save all data and disconnect all clients.<br>
+	 * After this thread ends, the server will completely exit if this is not the thread of getInstance, then this is a countdown thread.<br>
+	 * We start the countdown, and when we finished it, and it was not aborted, we tell the shutdown-hook why we call exit, and then call exit when the exit status of the server is 1, startServer.sh / startServer.bat will restart the server.
+	 */
+	@Override
+	public void run() {
+		if (this == getInstance()) {
+			TimeCounter tc = new TimeCounter();
+			TimeCounter tc1 = new TimeCounter();
+			
+			try {
+				UPnPService.getInstance().removeAllPorts();
+				LOG.info("UPnP Service: All ports mappings deleted ({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			} catch (Exception e) {
+				LOG.warn("Error while removing UPnP port mappings!", e);
+			}
+			
+			try {
+				if ((customs().offlineTradeEnable() || customs().offlineCraftEnable()) && customs().restoreOffliners()) {
+					OfflineTradersTable.getInstance().storeOffliners();
+					LOG.info("Offline Traders Table: Offline shops stored({}ms).", tc.getEstimatedTimeAndRestartCounter());
+				}
+			} catch (Exception e) {
+				LOG.warn("Error saving offline shops!", e);
+			}
+			
+			try {
+				disconnectAllCharacters();
+				LOG.info("All players disconnected and saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			} catch (Exception e) {
+				// ignore
+			}
+			
+			// ensure all services are stopped
+			try {
+				GameTimeController.getInstance().stopTimer();
+				LOG.info("Game Time Controller: Timer stopped({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			} catch (Exception e) {
+				// ignore
+			}
+			
+			// stop all thread pools
+			try {
+				ThreadPoolManager.getInstance().shutdown();
+				LOG.info("Thread Pool Manager: Manager has been shut down({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			} catch (Exception e) {
+				// ignore
+			}
+			
+			try {
+				LoginServerThread.getInstance().interrupt();
+				LOG.info("Login Server Thread: Thread interrupted({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			} catch (Exception e) {
+				// ignore
+			}
+			
+			// last bye bye, save all data and quit this server
+			saveData();
+			tc.restartCounter();
+			
+			// saveData sends messages to exit players, so shutdown selector after it
+			try {
+				GameServer.gameServer.getSelectorThread().shutdown();
+				LOG.info("Game Server: Selector thread has been shut down({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			} catch (Exception e) {
+				// ignore
+			}
+			
+			// commit data, last chance
+			ConnectionFactory.getInstance().close();
+			LOG.info("ConnectionFactory: Database connection has been shutdown({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			
+			// server will quit, when this function ends.
+			if (getInstance()._shutdownMode == GM_RESTART) {
+				Runtime.getRuntime().halt(2);
+			} else {
+				Runtime.getRuntime().halt(0);
+			}
+			
+			LOG.info("The server has been successfully shut down in {}seconds.", TimeUnit.MILLISECONDS.toSeconds(tc1.getEstimatedTime()));
+		} else {
+			// gm shutdown: send warnings and then call exit to start shutdown sequence
+			countdown();
+			// last point where logging is operational :(
+			LOG.warn("GM shutdown countdown is over. {} NOW!", MODE_TEXT[_shutdownMode]);
+			switch (_shutdownMode) {
+				case GM_SHUTDOWN -> {
+					getInstance().setMode(GM_SHUTDOWN);
+					System.exit(0);
+				}
+				case GM_RESTART -> {
+					getInstance().setMode(GM_RESTART);
+					System.exit(2);
+				}
+				case ABORT -> LoginServerThread.getInstance().setServerStatus(ServerStatus.STATUS_AUTO);
+			}
+		}
+	}
+	
+	/**
+	 * This functions starts a shutdown countdown.
+	 * @param activeChar GM who issued the shutdown command
+	 * @param seconds seconds until shutdown
+	 * @param restart true if the server will restart after shutdown
+	 */
+	public void startShutdown(L2PcInstance activeChar, int seconds, boolean restart) {
+		if (restart) {
+			_shutdownMode = GM_RESTART;
+		} else {
+			_shutdownMode = GM_SHUTDOWN;
+		}
+		
+		LOG.warn("GM: {}({}) issued shutdown command. {} in {} seconds!", activeChar.getName(), activeChar.getObjectId(), MODE_TEXT[_shutdownMode], seconds);
+		
+		if (_shutdownMode > 0) {
+			switch (seconds) {
+				case 540:
+				case 480:
+				case 420:
+				case 360:
+				case 300:
+				case 240:
+				case 180:
+				case 120:
+				case 60:
+				case 30:
+				case 10:
+				case 5:
+				case 4:
+				case 3:
+				case 2:
+				case 1:
+					break;
+				default:
+					SendServerQuit(seconds);
+			}
+		}
+		
+		if (_counterInstance != null) {
+			_counterInstance._abort();
+		}
+		
+		// the main instance should only run for shutdown hook, so we start a new instance
+		_counterInstance = new Shutdown(seconds, restart);
+		_counterInstance.start();
+	}
+	
+	/**
+	 * This function aborts a running countdown.
+	 * @param activeChar GM who issued the abort command
+	 */
+	public void abort(L2PcInstance activeChar) {
+		LOG.warn("GM: {}({}) issued shutdown ABORT. {} has been stopped!", activeChar.getName(), activeChar.getObjectId(), MODE_TEXT[_shutdownMode]);
+		if (_counterInstance != null) {
+			_counterInstance._abort();
+			Broadcast.toAllOnlinePlayers("Server aborts " + MODE_TEXT[_shutdownMode] + " and continues normal operation!", false);
+		}
+	}
+	
+	/**
+	 * Set the shutdown mode.
+	 * @param mode what mode shall be set
+	 */
+	private void setMode(int mode) {
+		_shutdownMode = mode;
+	}
+	
+	/**
+	 * Set shutdown mode to ABORT.
+	 */
+	private void _abort() {
+		_shutdownMode = ABORT;
+	}
+	
+	/**
+	 * This counts the countdown and reports it to all players countdown is aborted if mode changes to ABORT.
+	 */
+	private void countdown() {
+		try {
+			while (_secondsShut > 0) {
+				switch (_secondsShut) {
+					case 540 -> SendServerQuit(540);
+					case 480 -> SendServerQuit(480);
+					case 420 -> SendServerQuit(420);
+					case 360 -> SendServerQuit(360);
+					case 300 -> SendServerQuit(300);
+					case 240 -> SendServerQuit(240);
+					case 180 -> SendServerQuit(180);
+					case 120 -> SendServerQuit(120);
+					case 60 -> {
+						LoginServerThread.getInstance().setServerStatus(ServerStatus.STATUS_DOWN); // avoids new players from logging in
+						SendServerQuit(60);
+					}
+					case 30 -> SendServerQuit(30);
+					case 10 -> SendServerQuit(10);
+					case 5 -> SendServerQuit(5);
+					case 4 -> SendServerQuit(4);
+					case 3 -> SendServerQuit(3);
+					case 2 -> SendServerQuit(2);
+					case 1 -> SendServerQuit(1);
+				}
+				
+				_secondsShut--;
+				
+				int delay = 1000; // milliseconds
+				Thread.sleep(delay);
+				
+				if (_shutdownMode == ABORT) {
+					break;
+				}
+			}
+		} catch (InterruptedException e) {
+			// this will never happen
+		}
+	}
+	
+	/**
+	 * This sends a last bye bye, disconnects all players and saves data.
+	 */
+	private void saveData() {
+		switch (_shutdownMode) {
+			case SIGTERM -> LOG.info("SIGTERM received. Shutting down NOW!");
+			case GM_SHUTDOWN -> LOG.info("GM shutdown received. Shutting down NOW!");
+			case GM_RESTART -> LOG.info("GM restart received. Restarting NOW!");
+		}
+		
+		TimeCounter tc = new TimeCounter();
+		// Seven Signs data is now saved along with Festival data.
+		if (!SevenSigns.getInstance().isSealValidationPeriod()) {
+			SevenSignsFestival.getInstance().saveFestivalData(false);
+			LOG.info("SevenSignsFestival: Festival data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		}
+		
+		// Save Seven Signs data before closing. :)
+		SevenSigns.getInstance().saveSevenSignsData();
+		LOG.info("SevenSigns: Seven Signs data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		SevenSigns.getInstance().saveSevenSignsStatus();
+		LOG.info("SevenSigns: Seven Signs status saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		
+		// Save all raidboss and GrandBoss status ^_^
+		RaidBossSpawnManager.getInstance().cleanUp();
+		LOG.info("RaidBossSpawnManager: All raidboss info saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		GrandBossManager.getInstance().cleanUp();
+		LOG.info("GrandBossManager: All Grand Boss info saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		ItemAuctionManager.getInstance().shutdown();
+		LOG.info("Item Auction Manager: All tasks stopped({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		Olympiad.getInstance().saveOlympiadStatus();
+		LOG.info("Olympiad System: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		Hero.getInstance().shutdown();
+		LOG.info("Hero System: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		ClanTable.getInstance().storeClanScore();
+		LOG.info("Clan System: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		
+		// Save Cursed Weapons data before closing.
+		CursedWeaponsManager.getInstance().saveData();
+		LOG.info("Cursed Weapons Manager: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		
+		// Save all manor data
+		if (!general().manorSaveAllActions()) {
+			CastleManorManager.getInstance().storeMe();
+			LOG.info("Castle Manor Manager: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		}
+		
+		ClanHallSiegeManager.getInstance().onServerShutDown();
+		LOG.info("CHSiegeManager: Siegable hall attacker lists saved!");
+		
+		// Save all global (non-player specific) Quest data that needs to persist after reboot
+		QuestManager.getInstance().save();
+		LOG.info("Quest Manager: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		
+		// Save all global variables data
+		GlobalVariablesManager.getInstance().storeMe();
+		LOG.info("Global Variables Manager: Variables saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		
+		// Save items on ground before closing
+		if (general().saveDroppedItem()) {
+			ItemsOnGroundManager.getInstance().saveInDb();
+			LOG.info("Items On Ground Manager: Data saved({}ms).", tc.getEstimatedTimeAndRestartCounter());
+			ItemsOnGroundManager.getInstance().cleanUp();
+			LOG.info("Items On Ground Manager: Cleaned up({}ms).", tc.getEstimatedTimeAndRestartCounter());
+		}
+		
+		// Save bot reports to database
+		if (general().enableBotReportButton()) {
+			BotReportTable.getInstance().saveReportedCharData();
+			LOG.info("Bot Report Table: Successfully saved reports to database!");
+		}
+		
+		try {
+			Thread.sleep(5000);
+		} catch (InterruptedException e) {
+			// never happens :p
+		}
+	}
+	
+	/**
+	 * This disconnects all clients from the server.
+	 */
+	private void disconnectAllCharacters() {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			// Logout Character
+			try {
+				L2GameClient client = player.getClient();
+				if ((client != null) && !client.isDetached()) {
+					client.close(ServerClose.STATIC_PACKET);
+					client.setActiveChar(null);
+					player.setClient(null);
+				}
+				player.deleteMe();
+			} catch (Exception e) {
+				LOG.warn("Failed logout char {}", player, e);
+			}
+		}
+	}
+	
+	/**
+	 * A simple class used to track down the estimated time of method executions.<br>
+	 * Once this class is created, it saves the start time, and when you want to get the estimated time, use the getEstimatedTime() method.
+	 */
+	private static final class TimeCounter {
+		private long _startTime;
+		
+		protected TimeCounter() {
+			restartCounter();
+		}
+		
+		protected void restartCounter() {
+			_startTime = System.currentTimeMillis();
+		}
+		
+		protected long getEstimatedTimeAndRestartCounter() {
+			final long toReturn = System.currentTimeMillis() - _startTime;
+			restartCounter();
+			return toReturn;
+		}
+		
+		protected long getEstimatedTime() {
+			return System.currentTimeMillis() - _startTime;
+		}
+	}
+	
+	/**
+	 * Get the shutdown-hook instance the shutdown-hook instance is created by the first call of this function, but it has to be registered externally.<br>
+	 * @return instance of Shutdown, to be used as shutdown hook
+	 */
+	public static Shutdown getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final Shutdown _instance = new Shutdown();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ThreadPoolManager.java b/src/main/java/com/l2jserver/gameserver/ThreadPoolManager.java
new file mode 100644
index 00000000..9f94c56e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ThreadPoolManager.java
@@ -0,0 +1,630 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * <p>
+ * This class is made to handle all the ThreadPools used in L2J.
+ * </p>
+ * <p>
+ * Scheduled Tasks can either be sent to a {@link #_generalScheduledThreadPool "general"} or {@link #_effectsScheduledThreadPool "effects"} {@link ScheduledThreadPoolExecutor ScheduledThreadPool}: The "effects" one is used for every effects (skills, hp/mp regen ...) while the "general" one is used
+ * for everything else that needs to be scheduled.<br>
+ * There also is an {@link #_aiScheduledThreadPool "ai"} {@link ScheduledThreadPoolExecutor ScheduledThreadPool} used for AI Tasks.
+ * </p>
+ * <p>
+ * Tasks can be sent to {@link ScheduledThreadPoolExecutor ScheduledThreadPool} either with:
+ * <ul>
+ * <li>{@link #scheduleEffect(Runnable, long, TimeUnit)} and {@link #scheduleEffect(Runnable, long)} : for effects Tasks that needs to be executed only once.</li>
+ * <li>{@link #scheduleGeneral(Runnable, long, TimeUnit)} and {@link #scheduleGeneral(Runnable, long)} : for scheduled Tasks that needs to be executed once.</li>
+ * <li>{@link #scheduleAi(Runnable, long, TimeUnit)} and {@link #scheduleAi(Runnable, long)} : for AI Tasks that needs to be executed once</li>
+ * </ul>
+ * or
+ * <ul>
+ * <li>{@link #scheduleEffectAtFixedRate(Runnable, long, long, TimeUnit)} and {@link #scheduleEffectAtFixedRate(Runnable, long, long)} : for effects Tasks that needs to be executed periodically.</li>
+ * <li>{@link #scheduleGeneralAtFixedRate(Runnable, long, long, TimeUnit)} and {@link #scheduleGeneralAtFixedRate(Runnable, long, long)} : for scheduled Tasks that needs to be executed periodically.</li>
+ * <li>{@link #scheduleAiAtFixedRate(Runnable, long, long, TimeUnit)} and {@link #scheduleAiAtFixedRate(Runnable, long, long)} : for AI Tasks that needs to be executed periodically</li>
+ * </ul>
+ * </p>
+ * <p>
+ * For all Tasks that should be executed with no delay asynchronously in a ThreadPool there also are usual {@link ThreadPoolExecutor ThreadPools} that can grow/shrink according to their load.:
+ * <ul>
+ * <li>{@link #_generalPacketsThreadPool GeneralPackets} where most packets handler are executed.</li>
+ * <li>{@link #_ioPacketsThreadPool I/O Packets} where all the i/o packets are executed.</li>
+ * <li>There will be an AI ThreadPool where AI events should be executed</li>
+ * <li>A general ThreadPool where everything else that needs to run asynchronously with no delay should be executed ({@link com.l2jserver.gameserver.model.actor.knownlist KnownList} updates, SQL updates/inserts...)?</li>
+ * </ul>
+ * </p>
+ * @author -Wooden-
+ */
+public class ThreadPoolManager {
+	protected static final Logger LOG = LoggerFactory.getLogger(ThreadPoolManager.class);
+	
+	private static final class RunnableWrapper implements Runnable {
+		private final Runnable _r;
+		
+		public RunnableWrapper(final Runnable r) {
+			_r = r;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_r.run();
+			} catch (final Throwable e) {
+				final Thread t = Thread.currentThread();
+				final UncaughtExceptionHandler h = t.getUncaughtExceptionHandler();
+				if (h != null) {
+					h.uncaughtException(t, e);
+				}
+			}
+		}
+	}
+	
+	private final ScheduledThreadPoolExecutor _effectsScheduledThreadPool;
+	private final ScheduledThreadPoolExecutor _generalScheduledThreadPool;
+	private final ScheduledThreadPoolExecutor _aiScheduledThreadPool;
+	private final ScheduledThreadPoolExecutor _eventScheduledThreadPool;
+	private final ThreadPoolExecutor _generalPacketsThreadPool;
+	private final ThreadPoolExecutor _ioPacketsThreadPool;
+	private final ThreadPoolExecutor _generalThreadPool;
+	private final ThreadPoolExecutor _eventThreadPool;
+	
+	private boolean _shutdown;
+	
+	public static ThreadPoolManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	protected ThreadPoolManager() {
+		_effectsScheduledThreadPool = new ScheduledThreadPoolExecutor(general().getThreadPoolSizeEffects(), new PriorityThreadFactory("EffectsSTPool", Thread.NORM_PRIORITY));
+		_generalScheduledThreadPool = new ScheduledThreadPoolExecutor(general().getThreadPoolSizeGeneral(), new PriorityThreadFactory("GeneralSTPool", Thread.NORM_PRIORITY));
+		_eventScheduledThreadPool = new ScheduledThreadPoolExecutor(general().getThreadPoolSizeEvents(), new PriorityThreadFactory("EventSTPool", Thread.NORM_PRIORITY));
+		_ioPacketsThreadPool = new ThreadPoolExecutor(general().getUrgentPacketThreadCoreSize(), Integer.MAX_VALUE, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new PriorityThreadFactory("I/O Packet Pool", Thread.NORM_PRIORITY + 1));
+		_generalPacketsThreadPool = new ThreadPoolExecutor(general().getGeneralPacketThreadCoreSize(), general().getGeneralPacketThreadCoreSize() + 2, 15L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new PriorityThreadFactory("Normal Packet Pool", Thread.NORM_PRIORITY + 1));
+		_generalThreadPool = new ThreadPoolExecutor(general().getGeneralThreadCoreSize(), general().getGeneralThreadCoreSize() + 2, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new PriorityThreadFactory("General Pool", Thread.NORM_PRIORITY));
+		_aiScheduledThreadPool = new ScheduledThreadPoolExecutor(general().getAiMaxThread(), new PriorityThreadFactory("AISTPool", Thread.NORM_PRIORITY));
+		_eventThreadPool = new ThreadPoolExecutor(general().getEventsMaxThread(), general().getEventsMaxThread() + 2, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>(), new PriorityThreadFactory("Event Pool", Thread.NORM_PRIORITY));
+		
+		scheduleGeneralAtFixedRate(new PurgeTask(_effectsScheduledThreadPool, _generalScheduledThreadPool, _aiScheduledThreadPool, _eventThreadPool), 10, 5, TimeUnit.MINUTES);
+	}
+	
+	/**
+	 * Schedules an effect task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in the given time unit
+	 * @param unit the time unit of the delay parameter
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEffect(Runnable task, long delay, TimeUnit unit) {
+		try {
+			return _effectsScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
+		} catch (RejectedExecutionException e) {
+			return null;
+		}
+	}
+	
+	/**
+	 * Schedules an effect task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEffect(Runnable task, long delay) {
+		return scheduleEffect(task, delay, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Schedules an effect task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in the given time unit
+	 * @param period the period between executions in the given time unit
+	 * @param unit the time unit of the initialDelay and period parameters
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEffectAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit) {
+		try {
+			return _effectsScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules an effect task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in milliseconds
+	 * @param period the period between executions in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEffectAtFixedRate(Runnable task, long initialDelay, long period) {
+		return scheduleEffectAtFixedRate(task, initialDelay, period, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Schedules a general task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in the given time unit
+	 * @param unit the time unit of the delay parameter
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleGeneral(Runnable task, long delay, TimeUnit unit) {
+		try {
+			return _generalScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules a general task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleGeneral(Runnable task, long delay) {
+		return scheduleGeneral(task, delay, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Schedules a general task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in the given time unit
+	 * @param period the period between executions in the given time unit
+	 * @param unit the time unit of the initialDelay and period parameters
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleGeneralAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit) {
+		try {
+			return _generalScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules a event task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in the given time unit
+	 * @param unit the time unit of the delay parameter
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEvent(Runnable task, long delay, TimeUnit unit) {
+		try {
+			return _eventScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules a event task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEvent(Runnable task, long delay) {
+		return scheduleEvent(task, delay, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Schedules a event task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in the given time unit
+	 * @param period the period between executions in the given time unit
+	 * @param unit the time unit of the initialDelay and period parameters
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleEventAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit) {
+		try {
+			return _eventScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules a general task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in milliseconds
+	 * @param period the period between executions in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleGeneralAtFixedRate(Runnable task, long initialDelay, long period) {
+		return scheduleGeneralAtFixedRate(task, initialDelay, period, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Schedules an AI task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in the given time unit
+	 * @param unit the time unit of the delay parameter
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleAi(Runnable task, long delay, TimeUnit unit) {
+		try {
+			return _aiScheduledThreadPool.schedule(new RunnableWrapper(task), delay, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules an AI task to be executed after the given delay.
+	 * @param task the task to execute
+	 * @param delay the delay in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleAi(Runnable task, long delay) {
+		return scheduleAi(task, delay, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Schedules a general task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in the given time unit
+	 * @param period the period between executions in the given time unit
+	 * @param unit the time unit of the initialDelay and period parameters
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleAiAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit) {
+		try {
+			return _aiScheduledThreadPool.scheduleAtFixedRate(new RunnableWrapper(task), initialDelay, period, unit);
+		} catch (RejectedExecutionException e) {
+			return null; /* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Schedules a general task to be executed at fixed rate.
+	 * @param task the task to execute
+	 * @param initialDelay the initial delay in milliseconds
+	 * @param period the period between executions in milliseconds
+	 * @return a ScheduledFuture representing pending completion of the task, and whose get() method will throw an exception upon cancellation
+	 */
+	public ScheduledFuture<?> scheduleAiAtFixedRate(Runnable task, long initialDelay, long period) {
+		return scheduleAiAtFixedRate(task, initialDelay, period, TimeUnit.MILLISECONDS);
+	}
+	
+	/**
+	 * Executes a packet task sometime in future in another thread.
+	 * @param task the task to execute
+	 */
+	public void executePacket(Runnable task) {
+		try {
+			_generalPacketsThreadPool.execute(task);
+		} catch (RejectedExecutionException e) {
+			/* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Executes an IO packet task sometime in future in another thread.
+	 * @param task the task to execute
+	 */
+	public void executeIOPacket(Runnable task) {
+		try {
+			_ioPacketsThreadPool.execute(task);
+		} catch (RejectedExecutionException e) {
+			/* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Executes a general task sometime in future in another thread.
+	 * @param task the task to execute
+	 */
+	public void executeGeneral(Runnable task) {
+		try {
+			_generalThreadPool.execute(new RunnableWrapper(task));
+		} catch (RejectedExecutionException e) {
+			/* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Executes an AI task sometime in future in another thread.
+	 * @param task the task to execute
+	 */
+	public void executeAi(Runnable task) {
+		try {
+			_aiScheduledThreadPool.execute(new RunnableWrapper(task));
+		} catch (RejectedExecutionException e) {
+			/* shutdown, ignore */
+		}
+	}
+	
+	/**
+	 * Executes an Event task sometime in future in another thread.
+	 * @param task the task to execute
+	 */
+	public void executeEvent(Runnable task) {
+		try {
+			_eventThreadPool.execute(new RunnableWrapper(task));
+		} catch (RejectedExecutionException e) {
+			/* shutdown, ignore */
+		}
+	}
+	
+	public String[] getStats() {
+		return new String[] {
+			"STP:",
+			" + Effects:",
+			" |- ActiveThreads:   " + _effectsScheduledThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _effectsScheduledThreadPool.getCorePoolSize(),
+			" |- PoolSize:        " + _effectsScheduledThreadPool.getPoolSize(),
+			" |- MaximumPoolSize: " + _effectsScheduledThreadPool.getMaximumPoolSize(),
+			" |- CompletedTasks:  " + _effectsScheduledThreadPool.getCompletedTaskCount(),
+			" |- ScheduledTasks:  " + _effectsScheduledThreadPool.getQueue().size(),
+			" | -------",
+			" + General:",
+			" |- ActiveThreads:   " + _generalScheduledThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _generalScheduledThreadPool.getCorePoolSize(),
+			" |- PoolSize:        " + _generalScheduledThreadPool.getPoolSize(),
+			" |- MaximumPoolSize: " + _generalScheduledThreadPool.getMaximumPoolSize(),
+			" |- CompletedTasks:  " + _generalScheduledThreadPool.getCompletedTaskCount(),
+			" |- ScheduledTasks:  " + _generalScheduledThreadPool.getQueue().size(),
+			" | -------",
+			" + AI:",
+			" |- ActiveThreads:   " + _aiScheduledThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _aiScheduledThreadPool.getCorePoolSize(),
+			" |- PoolSize:        " + _aiScheduledThreadPool.getPoolSize(),
+			" |- MaximumPoolSize: " + _aiScheduledThreadPool.getMaximumPoolSize(),
+			" |- CompletedTasks:  " + _aiScheduledThreadPool.getCompletedTaskCount(),
+			" |- ScheduledTasks:  " + _aiScheduledThreadPool.getQueue().size(),
+			" | -------",
+			" + Event:",
+			" |- ActiveThreads:   " + _eventScheduledThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _eventScheduledThreadPool.getCorePoolSize(),
+			" |- PoolSize:        " + _eventScheduledThreadPool.getPoolSize(),
+			" |- MaximumPoolSize: " + _eventScheduledThreadPool.getMaximumPoolSize(),
+			" |- CompletedTasks:  " + _eventScheduledThreadPool.getCompletedTaskCount(),
+			" |- ScheduledTasks:  " + _eventScheduledThreadPool.getQueue().size(),
+			"TP:",
+			" + Packets:",
+			" |- ActiveThreads:   " + _generalPacketsThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _generalPacketsThreadPool.getCorePoolSize(),
+			" |- MaximumPoolSize: " + _generalPacketsThreadPool.getMaximumPoolSize(),
+			" |- LargestPoolSize: " + _generalPacketsThreadPool.getLargestPoolSize(),
+			" |- PoolSize:        " + _generalPacketsThreadPool.getPoolSize(),
+			" |- CompletedTasks:  " + _generalPacketsThreadPool.getCompletedTaskCount(),
+			" |- QueuedTasks:     " + _generalPacketsThreadPool.getQueue().size(),
+			" | -------",
+			" + I/O Packets:",
+			" |- ActiveThreads:   " + _ioPacketsThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _ioPacketsThreadPool.getCorePoolSize(),
+			" |- MaximumPoolSize: " + _ioPacketsThreadPool.getMaximumPoolSize(),
+			" |- LargestPoolSize: " + _ioPacketsThreadPool.getLargestPoolSize(),
+			" |- PoolSize:        " + _ioPacketsThreadPool.getPoolSize(),
+			" |- CompletedTasks:  " + _ioPacketsThreadPool.getCompletedTaskCount(),
+			" |- QueuedTasks:     " + _ioPacketsThreadPool.getQueue().size(),
+			" | -------",
+			" + General Tasks:",
+			" |- ActiveThreads:   " + _generalThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _generalThreadPool.getCorePoolSize(),
+			" |- MaximumPoolSize: " + _generalThreadPool.getMaximumPoolSize(),
+			" |- LargestPoolSize: " + _generalThreadPool.getLargestPoolSize(),
+			" |- PoolSize:        " + _generalThreadPool.getPoolSize(),
+			" |- CompletedTasks:  " + _generalThreadPool.getCompletedTaskCount(),
+			" |- QueuedTasks:     " + _generalThreadPool.getQueue().size(),
+			" | -------",
+			" + Event Tasks:",
+			" |- ActiveThreads:   " + _eventThreadPool.getActiveCount(),
+			" |- getCorePoolSize: " + _eventThreadPool.getCorePoolSize(),
+			" |- MaximumPoolSize: " + _eventThreadPool.getMaximumPoolSize(),
+			" |- LargestPoolSize: " + _eventThreadPool.getLargestPoolSize(),
+			" |- PoolSize:        " + _eventThreadPool.getPoolSize(),
+			" |- CompletedTasks:  " + _eventThreadPool.getCompletedTaskCount(),
+			" |- QueuedTasks:     " + _eventThreadPool.getQueue().size(),
+			" | -------"
+		};
+	}
+	
+	private static class PriorityThreadFactory implements ThreadFactory {
+		private final int _priority;
+		private final String _name;
+		private final AtomicInteger _threadNumber = new AtomicInteger(1);
+		private final ThreadGroup _group;
+		
+		public PriorityThreadFactory(String name, int priority) {
+			_priority = priority;
+			_name = name;
+			_group = new ThreadGroup(_name);
+		}
+		
+		@Override
+		public Thread newThread(Runnable r) {
+			Thread t = new Thread(_group, r, _name + "-" + _threadNumber.getAndIncrement());
+			t.setPriority(_priority);
+			return t;
+		}
+		
+		public ThreadGroup getGroup() {
+			return _group;
+		}
+	}
+	
+	public void shutdown() {
+		_shutdown = true;
+		try {
+			_effectsScheduledThreadPool.awaitTermination(1, TimeUnit.SECONDS);
+			_generalScheduledThreadPool.awaitTermination(1, TimeUnit.SECONDS);
+			_generalPacketsThreadPool.awaitTermination(1, TimeUnit.SECONDS);
+			_ioPacketsThreadPool.awaitTermination(1, TimeUnit.SECONDS);
+			_generalThreadPool.awaitTermination(1, TimeUnit.SECONDS);
+			_eventThreadPool.awaitTermination(1, TimeUnit.SECONDS);
+			_effectsScheduledThreadPool.shutdown();
+			_generalScheduledThreadPool.shutdown();
+			_generalPacketsThreadPool.shutdown();
+			_ioPacketsThreadPool.shutdown();
+			_generalThreadPool.shutdown();
+			_eventThreadPool.shutdown();
+			LOG.info("All ThreadPools are now stopped");
+			
+		} catch (InterruptedException e) {
+			LOG.warn("There has been a problem shutting down the thread pool manager!", e);
+		}
+	}
+	
+	public boolean isShutdown() {
+		return _shutdown;
+	}
+	
+	public void purge() {
+		_effectsScheduledThreadPool.purge();
+		_generalScheduledThreadPool.purge();
+		_aiScheduledThreadPool.purge();
+		_eventScheduledThreadPool.purge();
+		_ioPacketsThreadPool.purge();
+		_generalPacketsThreadPool.purge();
+		_generalThreadPool.purge();
+		_eventThreadPool.purge();
+	}
+	
+	public String getPacketStats() {
+		final StringBuilder sb = new StringBuilder(1000);
+		ThreadFactory tf = _generalPacketsThreadPool.getThreadFactory();
+		if (tf instanceof PriorityThreadFactory ptf) {
+			int count = ptf.getGroup().activeCount();
+			Thread[] threads = new Thread[count + 2];
+			ptf.getGroup().enumerate(threads);
+			StringUtil.append(sb, "General Packet Thread Pool:" + Configuration.EOL + "Tasks in the queue: ", String.valueOf(_generalPacketsThreadPool.getQueue().size()), Configuration.EOL + "Showing threads stack trace:" + Configuration.EOL + "There should be ", String.valueOf(count), " Threads"
+				+ Configuration.EOL);
+			for (Thread t : threads) {
+				if (t == null) {
+					continue;
+				}
+				
+				StringUtil.append(sb, t.getName(), Configuration.EOL);
+				for (StackTraceElement ste : t.getStackTrace()) {
+					StringUtil.append(sb, ste.toString(), Configuration.EOL);
+				}
+			}
+		}
+		
+		sb.append("Packet Tp stack traces printed.");
+		sb.append(Configuration.EOL);
+		return sb.toString();
+	}
+	
+	public String getIOPacketStats() {
+		final StringBuilder sb = new StringBuilder(1000);
+		ThreadFactory tf = _ioPacketsThreadPool.getThreadFactory();
+		
+		if (tf instanceof PriorityThreadFactory ptf) {
+			int count = ptf.getGroup().activeCount();
+			Thread[] threads = new Thread[count + 2];
+			ptf.getGroup().enumerate(threads);
+			StringUtil.append(sb, "I/O Packet Thread Pool:" + Configuration.EOL + "Tasks in the queue: ", String.valueOf(_ioPacketsThreadPool.getQueue().size()), Configuration.EOL + "Showing threads stack trace:" + Configuration.EOL + "There should be ", String.valueOf(count), " Threads"
+				+ Configuration.EOL);
+			
+			for (Thread t : threads) {
+				if (t == null) {
+					continue;
+				}
+				
+				StringUtil.append(sb, t.getName(), Configuration.EOL);
+				
+				for (StackTraceElement ste : t.getStackTrace()) {
+					StringUtil.append(sb, ste.toString(), Configuration.EOL);
+				}
+			}
+		}
+		
+		sb.append("Packet Tp stack traces printed.");
+		sb.append(Configuration.EOL);
+		return sb.toString();
+	}
+	
+	public String getGeneralStats() {
+		final StringBuilder sb = new StringBuilder(1000);
+		ThreadFactory tf = _generalThreadPool.getThreadFactory();
+		
+		if (tf instanceof PriorityThreadFactory ptf) {
+			int count = ptf.getGroup().activeCount();
+			Thread[] threads = new Thread[count + 2];
+			ptf.getGroup().enumerate(threads);
+			StringUtil.append(sb, "General Thread Pool:" + Configuration.EOL + "Tasks in the queue: ", String.valueOf(_generalThreadPool.getQueue().size()), Configuration.EOL + "Showing threads stack trace:" + Configuration.EOL + "There should be ", String.valueOf(count), " Threads"
+				+ Configuration.EOL);
+			
+			for (Thread t : threads) {
+				if (t == null) {
+					continue;
+				}
+				
+				StringUtil.append(sb, t.getName(), Configuration.EOL);
+				
+				for (StackTraceElement ste : t.getStackTrace()) {
+					StringUtil.append(sb, ste.toString(), Configuration.EOL);
+				}
+			}
+		}
+		
+		sb.append("Packet Tp stack traces printed.");
+		sb.append(Configuration.EOL);
+		return sb.toString();
+	}
+	
+	protected static class PurgeTask implements Runnable {
+		private final ScheduledThreadPoolExecutor _effectsScheduled;
+		
+		private final ScheduledThreadPoolExecutor _generalScheduled;
+		
+		private final ScheduledThreadPoolExecutor _aiScheduled;
+		
+		private final ThreadPoolExecutor _eventScheduled;
+		
+		PurgeTask(ScheduledThreadPoolExecutor effectsScheduledThreadPool, ScheduledThreadPoolExecutor generalScheduledThreadPool, //
+			ScheduledThreadPoolExecutor aiScheduledThreadPool, ThreadPoolExecutor eventScheduledThreadPool) {
+			_effectsScheduled = effectsScheduledThreadPool;
+			_generalScheduled = generalScheduledThreadPool;
+			_aiScheduled = aiScheduledThreadPool;
+			_eventScheduled = eventScheduledThreadPool;
+		}
+		
+		@Override
+		public void run() {
+			_effectsScheduled.purge();
+			_generalScheduled.purge();
+			_aiScheduled.purge();
+			_eventScheduled.purge();
+		}
+	}
+	
+	private static class SingletonHolder {
+		protected static final ThreadPoolManager _instance = new ThreadPoolManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/agathion/Agathion.java b/src/main/java/com/l2jserver/gameserver/agathion/Agathion.java
new file mode 100644
index 00000000..16b4e4ef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/agathion/Agathion.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.agathion;
+
+/**
+ * Agathion.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public record Agathion(int npcId, int id, int itemId, int energy, int maxEnergy) {
+}
diff --git a/src/main/java/com/l2jserver/gameserver/agathion/repository/AgathionRepository.java b/src/main/java/com/l2jserver/gameserver/agathion/repository/AgathionRepository.java
new file mode 100644
index 00000000..270c4468
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/agathion/repository/AgathionRepository.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.agathion.repository;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+import com.l2jserver.gameserver.agathion.Agathion;
+
+/**
+ * Agathion repository.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class AgathionRepository {
+	private static final Logger LOG = LoggerFactory.getLogger(AgathionRepository.class);
+	private static final Gson GSON = new Gson();
+	private static final Type TYPE_LIST_AGATHION = new TypeToken<List<Agathion>>() {
+	}.getType();
+	
+	private final Map<Integer, Agathion> agathions = new HashMap<>();
+	private final Map<Integer, Integer> itemIdToNpcId = new HashMap<>();
+	
+	private AgathionRepository() {
+		load();
+	}
+	
+	private void load() {
+		agathions.clear();
+		itemIdToNpcId.clear();
+		final var file = new File(server().getDatapackRoot(), "data/stats/agathions.json");
+		try (var reader = new JsonReader(new FileReader(file))) {
+			final List<Agathion> loaded = GSON.fromJson(reader, TYPE_LIST_AGATHION);
+			if (loaded != null) {
+				for (var a : loaded) {
+					agathions.put(a.npcId(), a);
+					itemIdToNpcId.put(a.itemId(), a.npcId());
+				}
+			}
+		} catch (FileNotFoundException ex) {
+			LOG.warn("data/stats/agathions.json not found!", ex);
+		} catch (IOException ex) {
+			LOG.warn("Failed to load agathions.json: ", ex);
+		}
+	}
+	
+	public Agathion getByNpcId(int npcId) {
+		return agathions.get(npcId);
+	}
+	
+	public Agathion getByItemId(int itemId) {
+		final var npcId = itemIdToNpcId.get(itemId);
+		return (npcId != null) ? agathions.get(npcId) : null;
+	}
+	
+	public static AgathionRepository getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		static final AgathionRepository INSTANCE = new AgathionRepository();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/AbstractAI.java b/src/main/java/com/l2jserver/gameserver/ai/AbstractAI.java
new file mode 100644
index 00000000..04da324f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/AbstractAI.java
@@ -0,0 +1,717 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.AutoAttackStart;
+import com.l2jserver.gameserver.network.serverpackets.AutoAttackStop;
+import com.l2jserver.gameserver.network.serverpackets.Die;
+import com.l2jserver.gameserver.network.serverpackets.MoveToLocation;
+import com.l2jserver.gameserver.network.serverpackets.MoveToPawn;
+import com.l2jserver.gameserver.network.serverpackets.StopMove;
+import com.l2jserver.gameserver.network.serverpackets.StopRotation;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * Mother class of all objects AI in the world.<br>
+ * AbstractAI :<br>
+ * <li>L2CharacterAI</li>
+ */
+public abstract class AbstractAI implements Ctrl {
+	protected static final Logger LOG = LoggerFactory.getLogger(AbstractAI.class);
+	
+	private NextAction _nextAction;
+	
+	public NextAction getNextAction() {
+		return _nextAction;
+	}
+	
+	public void setNextAction(NextAction nextAction) {
+		_nextAction = nextAction;
+	}
+	
+	private class FollowTask implements Runnable {
+		protected int _range = 70;
+		
+		public FollowTask() {
+		}
+		
+		public FollowTask(int range) {
+			_range = range;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				if (_followTask == null) {
+					return;
+				}
+				
+				L2Character followTarget = _followTarget; // copy to prevent NPE
+				if (followTarget == null) {
+					if (_actor instanceof L2Summon) {
+						((L2Summon) _actor).setFollowStatus(false);
+					}
+					setIntention(AI_INTENTION_IDLE);
+					return;
+				}
+				
+				if (!_actor.isInsideRadius(followTarget, _range, true, false)) {
+					if (!_actor.isInsideRadius(followTarget, 3000, true, false)) {
+						// if the target is too far (maybe also teleported)
+						if (_actor instanceof L2Summon) {
+							((L2Summon) _actor).setFollowStatus(false);
+						}
+						
+						setIntention(AI_INTENTION_IDLE);
+						return;
+					}
+					
+					moveToPawn(followTarget, _range);
+				}
+			} catch (Exception e) {
+				LOG.warn("{}: There has been a problem running the follow task!", getClass().getSimpleName(), e);
+			}
+		}
+	}
+	
+	/** The character that this AI manages */
+	protected final L2Character _actor;
+	
+	/** Current long-term intention */
+	protected CtrlIntention _intention = AI_INTENTION_IDLE;
+	/** Current long-term intention parameter */
+	protected Object _intentionArg0 = null;
+	/** Current long-term intention parameter */
+	protected Object _intentionArg1 = null;
+	
+	/** Flags about client's state, in order to know which messages to send */
+	protected volatile boolean _clientMoving;
+	/** Flags about client's state, in order to know which messages to send */
+	protected volatile boolean _clientAutoAttacking;
+	/** Flags about client's state, in order to know which messages to send */
+	protected int _clientMovingToPawnOffset;
+	
+	/** Different targets this AI maintains */
+	private L2Object _target;
+	private L2Character _castTarget;
+	protected L2Character _attackTarget;
+	protected L2Character _followTarget;
+	
+	/** The skill we are currently casting by INTENTION_CAST */
+	protected Skill _skill;
+	
+	/** Different internal state flags */
+	private int _moveToPawnTimeout;
+	
+	protected Future<?> _followTask = null;
+	private static final int FOLLOW_INTERVAL = 1000;
+	private static final int ATTACK_FOLLOW_INTERVAL = 500;
+	
+	/**
+	 * Constructor of AbstractAI.
+	 * @param creature the creature
+	 */
+	protected AbstractAI(L2Character creature) {
+		_actor = creature;
+	}
+	
+	/**
+	 * @return the L2Character managed by this Accessor AI.
+	 */
+	@Override
+	public L2Character getActor() {
+		return _actor;
+	}
+	
+	/**
+	 * @return the current Intention.
+	 */
+	@Override
+	public CtrlIntention getIntention() {
+		return _intention;
+	}
+	
+	protected void setCastTarget(L2Character target) {
+		_castTarget = target;
+	}
+	
+	/**
+	 * @return the current cast target.
+	 */
+	public L2Character getCastTarget() {
+		return _castTarget;
+	}
+	
+	protected void setAttackTarget(L2Character target) {
+		_attackTarget = target;
+	}
+	
+	/**
+	 * @return current attack target.
+	 */
+	@Override
+	public L2Character getAttackTarget() {
+		return _attackTarget;
+	}
+	
+	/**
+	 * Set the Intention of this AbstractAI.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method is USED by AI classes</B></FONT><B><U><br>
+	 * Overridden in </U> : </B><BR>
+	 * <B>L2AttackableAI</B> : Create an AI Task executed every 1s (if necessary)<BR>
+	 * <B>L2PlayerAI</B> : Stores the current AI intention parameters to later restore it if necessary.
+	 * @param intention The new Intention to set to the AI
+	 * @param arg0 The first parameter of the Intention
+	 * @param arg1 The second parameter of the Intention
+	 */
+	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		_intention = intention;
+		_intentionArg0 = arg0;
+		_intentionArg1 = arg1;
+	}
+	
+	/**
+	 * Launch the L2CharacterAI onIntention method corresponding to the new Intention.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Stop the FOLLOW mode if necessary</B></FONT>
+	 * @param intention The new Intention to set to the AI
+	 */
+	@Override
+	public final void setIntention(CtrlIntention intention) {
+		setIntention(intention, null, null);
+	}
+	
+	/**
+	 * Launch the L2CharacterAI onIntention method corresponding to the new Intention.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Stop the FOLLOW mode if necessary</B></FONT>
+	 * @param intention The new Intention to set to the AI
+	 * @param arg0 The first parameter of the Intention (optional target)
+	 */
+	@Override
+	public final void setIntention(CtrlIntention intention, Object arg0) {
+		setIntention(intention, arg0, null);
+	}
+	
+	@Override
+	public final void setIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		// Stop the follow mode if necessary
+		if ((intention != AI_INTENTION_FOLLOW) && (intention != AI_INTENTION_ATTACK)) {
+			stopFollow();
+		}
+		
+		// Launch the onIntention method of the L2CharacterAI corresponding to the new Intention
+		switch (intention) {
+			case AI_INTENTION_IDLE -> onIntentionIdle();
+			case AI_INTENTION_ACTIVE -> onIntentionActive();
+			case AI_INTENTION_REST -> onIntentionRest();
+			case AI_INTENTION_ATTACK -> onIntentionAttack((L2Character) arg0);
+			case AI_INTENTION_CAST -> onIntentionCast((Skill) arg0, (L2Object) arg1);
+			case AI_INTENTION_MOVE_TO -> onIntentionMoveTo((Location) arg0);
+			case AI_INTENTION_FOLLOW -> onIntentionFollow((L2Character) arg0);
+			case AI_INTENTION_PICK_UP -> onIntentionPickUp((L2Object) arg0);
+			case AI_INTENTION_INTERACT -> onIntentionInteract((L2Object) arg0);
+		}
+		
+		// If do move or follow intention drop next action.
+		if ((_nextAction != null) && _nextAction.getIntentions().contains(intention)) {
+			_nextAction = null;
+		}
+	}
+	
+	/**
+	 * Launch the L2CharacterAI onEvt method corresponding to the Event.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : The current general intention won't be change (ex : If the character attack and is stunned, he will attack again after the stunned period)</B></FONT>
+	 * @param evt The event whose the AI must be notified
+	 */
+	@Override
+	public final void notifyEvent(CtrlEvent evt) {
+		notifyEvent(evt, null, null);
+	}
+	
+	/**
+	 * Launch the L2CharacterAI onEvt method corresponding to the Event. <FONT COLOR=#FF0000><B> <U>Caution</U> : The current general intention won't be change (ex : If the character attack and is stunned, he will attack again after the stunned period)</B></FONT>
+	 * @param evt The event whose the AI must be notified
+	 * @param arg0 The first parameter of the Event (optional target)
+	 */
+	@Override
+	public final void notifyEvent(CtrlEvent evt, Object arg0) {
+		notifyEvent(evt, arg0, null);
+	}
+	
+	/**
+	 * Launch the L2CharacterAI onEvt method corresponding to the Event. <FONT COLOR=#FF0000><B> <U>Caution</U> : The current general intention won't be change (ex : If the character attack and is stunned, he will attack again after the stunned period)</B></FONT>
+	 * @param evt The event whose the AI must be notified
+	 */
+	@Override
+	public final void notifyEvent(CtrlEvent evt, Object... args) {
+		if ((!_actor.isVisible() && !_actor.isTeleporting()) || !_actor.hasAI()) {
+			return;
+		}
+		
+		switch (evt) {
+			case EVT_THINK:
+				onEvtThink();
+				break;
+			case EVT_ATTACKED:
+				onEvtAttacked((L2Character) args[0]);
+				break;
+			case EVT_AGGRESSION:
+				onEvtAggression((L2Character) args[0], ((Number) args[1]).intValue());
+				break;
+			case EVT_STUNNED:
+				onEvtStunned((L2Character) args[0]);
+				break;
+			case EVT_SLEEPING:
+				onEvtSleeping((L2Character) args[0]);
+				break;
+			case EVT_ROOTED:
+				onEvtRooted((L2Character) args[0]);
+				break;
+			case EVT_CONFUSED:
+				onEvtConfused((L2Character) args[0]);
+				break;
+			case EVT_MUTED:
+				onEvtMuted((L2Character) args[0]);
+				break;
+			case EVT_EVADED:
+				onEvtEvaded((L2Character) args[0]);
+				break;
+			case EVT_READY_TO_ACT:
+				if (!_actor.isCastingNow() && !_actor.isCastingSimultaneouslyNow()) {
+					onEvtReadyToAct();
+				}
+				break;
+			case EVT_USER_CMD:
+				onEvtUserCmd(args[0], args[1]);
+				break;
+			case EVT_ARRIVED:
+				// happens e.g. from stopmove but we don't process it if we're casting
+				if (!_actor.isCastingNow() && !_actor.isCastingSimultaneouslyNow()) {
+					onEvtArrived();
+				}
+				break;
+			case EVT_ARRIVED_REVALIDATE:
+				// this is disregarded if the char is not moving any more
+				if (_actor.isMoving()) {
+					onEvtArrivedRevalidate();
+				}
+				break;
+			case EVT_ARRIVED_BLOCKED:
+				onEvtArrivedBlocked((Location) args[0]);
+				break;
+			case EVT_FORGET_OBJECT:
+				onEvtForgetObject((L2Object) args[0]);
+				break;
+			case EVT_CANCEL:
+				onEvtCancel();
+				break;
+			case EVT_DEAD:
+				onEvtDead();
+				break;
+			case EVT_FAKE_DEATH:
+				onEvtFakeDeath();
+				break;
+			case EVT_FINISH_CASTING:
+				onEvtFinishCasting();
+				break;
+			case EVT_AFRAID: {
+				onEvtAfraid((L2Character) args[0], (Boolean) args[1]);
+				break;
+			}
+		}
+		
+		// Do next action.
+		if ((_nextAction != null) && _nextAction.getEvents().contains(evt)) {
+			_nextAction.doAction();
+		}
+	}
+	
+	protected abstract void onIntentionIdle();
+	
+	protected abstract void onIntentionActive();
+	
+	protected abstract void onIntentionRest();
+	
+	protected abstract void onIntentionAttack(L2Character target);
+	
+	protected abstract void onIntentionCast(Skill skill, L2Object target);
+	
+	protected abstract void onIntentionMoveTo(Location destination);
+	
+	protected abstract void onIntentionFollow(L2Character target);
+	
+	protected abstract void onIntentionPickUp(L2Object item);
+	
+	protected abstract void onIntentionInteract(L2Object object);
+	
+	protected abstract void onEvtThink();
+	
+	protected abstract void onEvtAttacked(L2Character attacker);
+	
+	protected abstract void onEvtAggression(L2Character target, long aggro);
+	
+	protected abstract void onEvtStunned(L2Character attacker);
+	
+	protected abstract void onEvtSleeping(L2Character attacker);
+	
+	protected abstract void onEvtRooted(L2Character attacker);
+	
+	protected abstract void onEvtConfused(L2Character attacker);
+	
+	protected abstract void onEvtMuted(L2Character attacker);
+	
+	protected abstract void onEvtEvaded(L2Character attacker);
+	
+	protected abstract void onEvtReadyToAct();
+	
+	protected abstract void onEvtUserCmd(Object arg0, Object arg1);
+	
+	protected abstract void onEvtArrived();
+	
+	protected abstract void onEvtArrivedRevalidate();
+	
+	protected abstract void onEvtArrivedBlocked(Location blocked_at_pos);
+	
+	protected abstract void onEvtForgetObject(L2Object object);
+	
+	protected abstract void onEvtCancel();
+	
+	protected abstract void onEvtDead();
+	
+	protected abstract void onEvtFakeDeath();
+	
+	protected abstract void onEvtFinishCasting();
+	
+	protected abstract void onEvtAfraid(L2Character effector, boolean start);
+	
+	/**
+	 * Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor. <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 */
+	protected void clientActionFailed() {
+		if (_actor instanceof L2PcInstance) {
+			_actor.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	/**
+	 * Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn <I>(broadcast)</I>.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 * @param pawn
+	 * @param offset
+	 */
+	protected void moveToPawn(L2Object pawn, int offset) {
+		// Check if actor can move
+		if (!_actor.isMovementDisabled()) {
+			if (offset < 10) {
+				offset = 10;
+			}
+			
+			// prevent possible extra calls to this function (there is none?),
+			// also don't send movetopawn packets too often
+			boolean sendPacket = true;
+			if (_clientMoving && (_target == pawn)) {
+				if (_clientMovingToPawnOffset == offset) {
+					if (GameTimeController.getInstance().getGameTicks() < _moveToPawnTimeout) {
+						return;
+					}
+					sendPacket = false;
+				} else if (_actor.isOnGeodataPath()) {
+					// minimum time to calculate new route is 2 seconds
+					if (GameTimeController.getInstance().getGameTicks() < (_moveToPawnTimeout + 10)) {
+						return;
+					}
+				}
+			}
+			
+			// Set AI movement data
+			_clientMoving = true;
+			_clientMovingToPawnOffset = offset;
+			_target = pawn;
+			_moveToPawnTimeout = GameTimeController.getInstance().getGameTicks();
+			_moveToPawnTimeout += 1000 / GameTimeController.MILLIS_IN_TICK;
+			
+			if (pawn == null) {
+				return;
+			}
+			
+			// Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController
+			_actor.moveToLocation(pawn.getX(), pawn.getY(), pawn.getZ(), offset);
+			
+			if (!_actor.isMoving()) {
+				clientActionFailed();
+				return;
+			}
+			
+			// Send a Server->Client packet MoveToPawn/CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers
+			if (pawn instanceof L2Character) {
+				if (_actor.isOnGeodataPath()) {
+					_actor.broadcastPacket(new MoveToLocation(_actor));
+					_clientMovingToPawnOffset = 0;
+				} else if (sendPacket) {
+					_actor.broadcastPacket(new MoveToPawn(_actor, (L2Character) pawn, offset));
+				}
+			} else {
+				_actor.broadcastPacket(new MoveToLocation(_actor));
+			}
+		} else {
+			clientActionFailed();
+		}
+	}
+	
+	/**
+	 * Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation <I>(broadcast)</I>.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 * @param x
+	 * @param y
+	 * @param z
+	 */
+	protected void moveTo(int x, int y, int z) {
+		// Chek if actor can move
+		if (!_actor.isMovementDisabled()) {
+			// Set AI movement data
+			_clientMoving = true;
+			_clientMovingToPawnOffset = 0;
+			
+			// Calculate movement data for a move to location action and add the actor to movingObjects of GameTimeController
+			_actor.moveToLocation(x, y, z, 0);
+			
+			// Send a Server->Client packet CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers
+			_actor.broadcastPacket(new MoveToLocation(_actor));
+			
+		} else {
+			clientActionFailed();
+		}
+	}
+	
+	/**
+	 * Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation <I>(broadcast)</I>.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 * @param loc
+	 */
+	protected void clientStopMoving(Location loc) {
+		// Stop movement of the L2Character
+		if (_actor.isMoving()) {
+			_actor.stopMove(loc);
+		}
+		
+		_clientMovingToPawnOffset = 0;
+		
+		if (_clientMoving || (loc != null)) {
+			_clientMoving = false;
+			
+			// Send a Server->Client packet StopMove to the actor and all L2PcInstance in its _knownPlayers
+			_actor.broadcastPacket(new StopMove(_actor));
+			
+			if (loc != null) {
+				// Send a Server->Client packet StopRotation to the actor and all L2PcInstance in its _knownPlayers
+				_actor.broadcastPacket(new StopRotation(_actor.getObjectId(), loc.getHeading(), 0));
+			}
+		}
+	}
+	
+	/**
+	 * Client has already arrived to target, no need to force StopMove packet.
+	 */
+	protected void clientStoppedMoving() {
+		if (_clientMovingToPawnOffset > 0) // movetoPawn needs to be stopped
+		{
+			_clientMovingToPawnOffset = 0;
+			_actor.broadcastPacket(new StopMove(_actor));
+		}
+		_clientMoving = false;
+	}
+	
+	public boolean isAutoAttacking() {
+		return _clientAutoAttacking;
+	}
+	
+	public void setAutoAttacking(boolean isAutoAttacking) {
+		if (_actor instanceof L2Summon summon) {
+			if (summon.getOwner() != null) {
+				summon.getOwner().getAI().setAutoAttacking(isAutoAttacking);
+			}
+			return;
+		}
+		_clientAutoAttacking = isAutoAttacking;
+	}
+	
+	/**
+	 * Start the actor Auto Attack client side by sending Server->Client packet AutoAttackStart <I>(broadcast)</I>.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 */
+	public void clientStartAutoAttack() {
+		if (_actor instanceof L2Summon summon) {
+			if (summon.getOwner() != null) {
+				summon.getOwner().getAI().clientStartAutoAttack();
+			}
+			return;
+		}
+		if (!isAutoAttacking()) {
+			if (_actor.isPlayer() && _actor.hasSummon()) {
+				_actor.getSummon().broadcastPacket(new AutoAttackStart(_actor.getSummon().getObjectId()));
+			}
+			// Send a Server->Client packet AutoAttackStart to the actor and all L2PcInstance in its _knownPlayers
+			_actor.broadcastPacket(new AutoAttackStart(_actor.getObjectId()));
+			setAutoAttacking(true);
+		}
+		AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
+	}
+	
+	/**
+	 * Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop <I>(broadcast)</I>.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 */
+	public void clientStopAutoAttack() {
+		if (_actor instanceof L2Summon summon) {
+			if (summon.getOwner() != null) {
+				summon.getOwner().getAI().clientStopAutoAttack();
+			}
+			return;
+		}
+		if (_actor instanceof L2PcInstance) {
+			if (!AttackStanceTaskManager.getInstance().hasAttackStanceTask(_actor) && isAutoAttacking()) {
+				AttackStanceTaskManager.getInstance().addAttackStanceTask(_actor);
+			}
+		} else if (isAutoAttacking()) {
+			_actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId()));
+			setAutoAttacking(false);
+		}
+	}
+	
+	/**
+	 * Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die <I>(broadcast)</I>.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 */
+	protected void clientNotifyDead() {
+		// Send a Server->Client packet Die to the actor and all L2PcInstance in its _knownPlayers
+		Die msg = new Die(_actor);
+		_actor.broadcastPacket(msg);
+		
+		// Init AI
+		_intention = AI_INTENTION_IDLE;
+		_target = null;
+		_castTarget = null;
+		_attackTarget = null;
+		
+		// Cancel the follow task if necessary
+		stopFollow();
+	}
+	
+	/**
+	 * Update the state of this actor client side by sending Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance player.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : Low level function, used by AI subclasses</B></FONT>
+	 * @param player The L2PcInstance to notify with state of this L2Character
+	 */
+	public void describeStateToPlayer(L2PcInstance player) {
+		if (getActor().isVisibleFor(player)) {
+			if (_clientMoving) {
+				if ((_clientMovingToPawnOffset != 0) && (_followTarget != null)) {
+					// Send a Server->Client packet MoveToPawn to the actor and all L2PcInstance in its _knownPlayers
+					player.sendPacket(new MoveToPawn(_actor, _followTarget, _clientMovingToPawnOffset));
+				} else {
+					// Send a Server->Client packet CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers
+					player.sendPacket(new MoveToLocation(_actor));
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Create and Launch an AI Follow Task to execute every 1s.
+	 * @param target The L2Character to follow
+	 */
+	public synchronized void startFollow(L2Character target) {
+		if (_followTask != null) {
+			_followTask.cancel(false);
+			_followTask = null;
+		}
+		
+		// Create and Launch an AI Follow Task to execute every 1s
+		_followTarget = target;
+		_followTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FollowTask(), 5, FOLLOW_INTERVAL);
+	}
+	
+	/**
+	 * Create and Launch an AI Follow Task to execute every 0.5s, following at specified range.
+	 * @param target The L2Character to follow
+	 * @param range
+	 */
+	public synchronized void startFollow(L2Character target, int range) {
+		if (_followTask != null) {
+			_followTask.cancel(false);
+			_followTask = null;
+		}
+		
+		_followTarget = target;
+		_followTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FollowTask(range), 5, ATTACK_FOLLOW_INTERVAL);
+	}
+	
+	/**
+	 * Stop an AI Follow Task.
+	 */
+	public synchronized void stopFollow() {
+		if (_followTask != null) {
+			// Stop the Follow Task
+			_followTask.cancel(false);
+			_followTask = null;
+		}
+		_followTarget = null;
+	}
+	
+	protected L2Character getFollowTarget() {
+		return _followTarget;
+	}
+	
+	protected L2Object getTarget() {
+		return _target;
+	}
+	
+	protected void setTarget(L2Object target) {
+		_target = target;
+	}
+	
+	/**
+	 * Stop all Ai tasks and futures.
+	 */
+	public void stopAITask() {
+		stopFollow();
+	}
+	
+	@Override
+	public String toString() {
+		return "Actor: " + _actor;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/Ctrl.java b/src/main/java/com/l2jserver/gameserver/ai/Ctrl.java
new file mode 100644
index 00000000..f3010e4b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/Ctrl.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Interface of AI and client state.<br>
+ * To correctly send messages to client we need it's state.<br>
+ * For example, if we've sent 'StartAutoAttack' message, we need to send 'StopAutoAttack' message before any other action.<br>
+ * Or if we've sent 'MoveToPawn', we need to send 'StopMove' when the movement of a character is canceled (by Root spell or any other reason).<br>
+ * Thus, we need to know the state of client, i.e. which messages we've sent and how the client will show the scene.<br>
+ * Close to this task is the task of AI.<br>
+ * If a player's character is attacking a mob, his ATTACK may be interrupted by an event, that temporary disables attacking.<br>
+ * But when the possibility to ATTACK will be enabled, the character must continue the ATTACK.<br>
+ * For mobs, it may be more complex, since we want them to decide when to use magic, or when to follow the player for physical combat, or when to escape, to help another mob, etc.<br>
+ * This interface is hiding complexity of server<->client interaction and multiple states of a character.<br>
+ * It allows to set a desired, simple "wish" of a character, and the implementation of this interface will take care about the rest.<br>
+ * The goal of a character may be like "ATTACK", "random walk" and so on.<br>
+ * To reach the goal implementation will split it into several small actions, several steps (possibly repeatable).<br>
+ * Like "run to target" then "hit it", then if target is not dead - repeat.<br>
+ * This flow of simpler steps may be interrupted by incoming events.<br>
+ * Like a character's movement was disabled (by Root spell, for instance).<br>
+ * Depending on character's ability AI may choose to wait, or to use magic ATTACK and so on.<br>
+ * Additionally, incoming events are compared with client's state of the character,<br>
+ * and required network messages are sent to client's, i.e. if we have incoming event that character's movement was disabled, it causes changing if its behavior,<br>
+ * and if client's state for the character is "moving" we send messages to clients to stop the avatar/mob.
+ */
+public interface Ctrl {
+	/**
+	 * Gets the actor.
+	 * @return the actor
+	 */
+	L2Character getActor();
+	
+	/**
+	 * Gets the intention.
+	 * @return the intention
+	 */
+	CtrlIntention getIntention();
+	
+	/**
+	 * Gets the attack target.
+	 * @return the attack target
+	 */
+	L2Character getAttackTarget();
+	
+	/**
+	 * Set general state/intention for AI, with optional data.
+	 * @param intention the new intention
+	 */
+	void setIntention(CtrlIntention intention);
+	
+	/**
+	 * Sets the intention.
+	 * @param intention the intention
+	 * @param arg0 the arg0
+	 */
+	void setIntention(CtrlIntention intention, Object arg0);
+	
+	/**
+	 * Sets the intention.
+	 * @param intention the intention
+	 * @param arg0 the arg0
+	 * @param arg1 the arg1
+	 */
+	void setIntention(CtrlIntention intention, Object arg0, Object arg1);
+	
+	/**
+	 * Event, that notifies about previous step result, or user command, that does not change current general intention.
+	 * @param evt the event
+	 */
+	void notifyEvent(CtrlEvent evt);
+	
+	/**
+	 * Notify an event.
+	 * @param evt the event
+	 * @param arg0 the arg0
+	 */
+	void notifyEvent(CtrlEvent evt, Object arg0);
+	
+	/**
+	 * Notify an event.
+	 * @param evt the event
+	 * @param args the args
+	 */
+	void notifyEvent(CtrlEvent evt, Object... args);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/CtrlEvent.java b/src/main/java/com/l2jserver/gameserver/ai/CtrlEvent.java
new file mode 100644
index 00000000..6ab28856
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/CtrlEvent.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+/**
+ * This class contains an enum of each possible event that can happen on an AI character.
+ */
+public enum CtrlEvent {
+	/**
+	 * Something has changed, usually a previous step has being completed or maybe was completed, the AI must think on next action.
+	 */
+	EVT_THINK,
+	/**
+	 * The actor was attacked. This event comes each time a physical or magical<br>
+	 * attack was done on the actor. NPC may start attack in response, or ignore<br>
+	 * this event if they already attack someone, or change target and so on.
+	 */
+	EVT_ATTACKED,
+	/** Increase/decrease aggression towards a target, or reduce global aggression if target is null */
+	EVT_AGGRESSION,
+	/** Actor is in stun state */
+	EVT_STUNNED,
+	/** Actor starts/stops sleeping */
+	EVT_SLEEPING,
+	/** Actor is in rooted state (cannot move) */
+	EVT_ROOTED,
+	/** Actor evaded hit **/
+	EVT_EVADED,
+	/**
+	 * An event that previous action was completed. The action may be an attempt to physically/magically hit an enemy, or an action that discarded attack attempt has finished.
+	 */
+	EVT_READY_TO_ACT,
+	/**
+	 * User's command, like using a combat magic or changing weapon, etc. The command is not intended to change final goal
+	 */
+	EVT_USER_CMD,
+	/**
+	 * The actor arrived to assigned location, or it's a time to modify movement destination (follow, interact, random move and others intentions).
+	 */
+	EVT_ARRIVED,
+	/**
+	 * The actor arrived to an intermediate point, and needs to revalidate destination. This is sent when follow/move to pawn if destination is far away.
+	 */
+	EVT_ARRIVED_REVALIDATE,
+	/** The actor cannot move anymore. */
+	EVT_ARRIVED_BLOCKED,
+	/** Forgets an object (if it's used as attack target, follow target and so on */
+	EVT_FORGET_OBJECT,
+	/**
+	 * Attempt to cancel current step execution, but not change the intention.<br>
+	 * For example, the actor was put into a stun, so it's current attack<br>
+	 * or movement has to be canceled. But after the stun state expired,<br>
+	 * the actor may try to attack again. Another usage for CANCEL is a user's<br>
+	 * attempt to cancel a cast/bow attack and so on.
+	 */
+	EVT_CANCEL,
+	/** The character is dead */
+	EVT_DEAD,
+	/** The character looks like dead */
+	EVT_FAKE_DEATH,
+	/** The character attack anyone randomly **/
+	EVT_CONFUSED,
+	/** The character cannot cast spells anymore **/
+	EVT_MUTED,
+	/** The character flee in random directions **/
+	EVT_AFRAID,
+	/** The character finish casting **/
+	EVT_FINISH_CASTING,
+	/** The character betrayed its master */
+	EVT_BETRAYED
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/CtrlIntention.java b/src/main/java/com/l2jserver/gameserver/ai/CtrlIntention.java
new file mode 100644
index 00000000..85dec884
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/CtrlIntention.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+/**
+ * Enumeration of generic intentions of an NPC/PC, an intention may require several steps to be completed.
+ */
+public enum CtrlIntention {
+	/** Do nothing, disconnect AI of NPC if no players around */
+	AI_INTENTION_IDLE,
+	/** Alerted state without goal : scan attackable targets, random walk, etc */
+	AI_INTENTION_ACTIVE,
+	/** Rest (sit until attacked) */
+	AI_INTENTION_REST,
+	/** Attack target (cast combat magic, go to target, combat), may be ignored, if target is locked on another character or a peaceful zone and so on. */
+	AI_INTENTION_ATTACK,
+	/** Cast a spell, depending on the spell - may start or stop attacking */
+	AI_INTENTION_CAST,
+	/** Just move to another location */
+	AI_INTENTION_MOVE_TO,
+	/** Like move, but check target's movement and follow it */
+	AI_INTENTION_FOLLOW,
+	/** PickUp and item, (got to item, pickup it, become idle */
+	AI_INTENTION_PICK_UP,
+	/** Move to target, then interact */
+	AI_INTENTION_INTERACT
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/FearTask.java b/src/main/java/com/l2jserver/gameserver/ai/FearTask.java
new file mode 100644
index 00000000..cb7ffbd2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/FearTask.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Fear task.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class FearTask implements Runnable {
+	
+	protected static final int FEAR_TICKS = 5;
+	
+	private final L2AttackableAI ai;
+	
+	private final L2Character effector;
+	
+	private boolean start;
+	
+	public FearTask(L2AttackableAI ai, L2Character effector, boolean start) {
+		this.ai = ai;
+		this.effector = effector;
+		this.start = start;
+	}
+	
+	@Override
+	public void run() {
+		ai.setFearTime(ai.getFearTime() - FEAR_TICKS);
+		ai.onEvtAfraid(effector, start);
+		start = false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2AirShipAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2AirShipAI.java
new file mode 100644
index 00000000..f0ee4368
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2AirShipAI.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationAirShip;
+import com.l2jserver.gameserver.network.serverpackets.ExStopMoveAirShip;
+
+/**
+ * @author DS
+ */
+public class L2AirShipAI extends L2VehicleAI {
+	public L2AirShipAI(L2AirShipInstance creature) {
+		super(creature);
+	}
+	
+	@Override
+	protected void moveTo(int x, int y, int z) {
+		if (!_actor.isMovementDisabled()) {
+			_clientMoving = true;
+			_actor.moveToLocation(x, y, z, 0);
+			_actor.broadcastPacket(new ExMoveToLocationAirShip(getActor()));
+		}
+	}
+	
+	@Override
+	protected void clientStopMoving(Location loc) {
+		if (_actor.isMoving()) {
+			_actor.stopMove(loc);
+		}
+		
+		if (_clientMoving || (loc != null)) {
+			_clientMoving = false;
+			_actor.broadcastPacket(new ExStopMoveAirShip(getActor()));
+		}
+	}
+	
+	@Override
+	public void describeStateToPlayer(L2PcInstance player) {
+		if (_clientMoving) {
+			player.sendPacket(new ExMoveToLocationAirShip(getActor()));
+		}
+	}
+	
+	@Override
+	public L2AirShipInstance getActor() {
+		return (L2AirShipInstance) _actor;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2AttackableAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2AttackableAI.java
new file mode 100644
index 00000000..3a3d69d0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2AttackableAI.java
@@ -0,0 +1,1967 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.GameTimeController.TICKS_PER_SECOND;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_MOVE_TO;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.TerritoryTable;
+import com.l2jserver.gameserver.enums.AISkillScope;
+import com.l2jserver.gameserver.enums.AIType;
+import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FriendlyMobInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2GuardInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableHate;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.FactionCall;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Attackable creatures AI.
+ * @author Zoey76
+ */
+public class L2AttackableAI extends L2CharacterAI {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(L2AttackableAI.class);
+	
+	private static final int FEAR_TICKS = 5;
+	
+	private static final int RANDOM_WALK_RATE = 30;
+	
+	private static final int MAX_ATTACK_TIMEOUT = 120 * TICKS_PER_SECOND;
+	
+	/** The L2Attackable AI task executed every 1s (call onEvtThink method). */
+	private Future<?> _aiTask;
+	/** The delay after which the attacked is stopped. */
+	private int _attackTimeout;
+	/** The L2Attackable aggro counter. */
+	private int _globalAggro;
+	/** The flag used to indicate that a thinking action is in progress, to prevent recursive thinking. */
+	private boolean _thinking;
+	private int _chaosTime = 0;
+	private int _lastBuffTick;
+	// Fear parameters
+	private int _fearTime;
+	private Future<?> _fearTask = null;
+	
+	/**
+	 * Constructor of L2AttackableAI.
+	 * @param creature the creature
+	 */
+	public L2AttackableAI(L2Attackable creature) {
+		super(creature);
+		_attackTimeout = Integer.MAX_VALUE;
+		_globalAggro = -10; // 10 seconds timeout of ATTACK after respawn
+	}
+	
+	/**
+	 * <B><U> Actor is a L2GuardInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk or a Door</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The L2PcInstance target has karma (=PK)</li>
+	 * <li>The L2MonsterInstance target is aggressive</li>
+	 * </ul>
+	 * <B><U> Actor is a L2SiegeGuardInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk or a Door</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>A siege is in progress</li>
+	 * <li>The L2PcInstance target isn't a Defender</li>
+	 * </ul>
+	 * <B><U> Actor is a L2FriendlyMobInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk, a Door or another L2Npc</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The L2PcInstance target has karma (=PK)</li>
+	 * </ul>
+	 * <B><U> Actor is a L2MonsterInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk, a Door or another L2Npc</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The actor is Aggressive</li>
+	 * </ul>
+	 * @param target The targeted L2Object
+	 * @return True if the target is autoattackable (depends on the actor type).
+	 */
+	private boolean autoAttackCondition(L2Character target) {
+		if (target == null) {
+			return false;
+		}
+		
+		// Check if the target isn't invulnerable
+		if (target.isInvul()) {
+			// However EffectInvincible requires to check GMs specially
+			if (target.isPlayer() && target.isGM()) {
+				return false;
+			}
+			if (target.isSummon() && ((L2Summon) target).getOwner().isGM()) {
+				return false;
+			}
+		}
+		
+		// Check if the target isn't a Folk or a Door
+		if (target.isDoor()) {
+			return false;
+		}
+		
+		// Check if the target isn't dead, is in the Aggro range and is at the same height
+		final var actor = getActor();
+		if (target.isAlikeDead() || ((target.isPlayable()) && !actor.isInsideRadius(target, actor.getAggroRange(), true, false))) {
+			return false;
+		}
+		
+		// Check if the target is a L2Playable
+		if (target.isPlayable()) {
+			// Check if the AI isn't a Raid Boss, can See Silent Moving players and the target isn't in silent move mode
+			if (!(actor.isRaid()) && !(actor.canSeeThroughSilentMove()) && ((L2Playable) target).isSilentMovingAffected()) {
+				return false;
+			}
+		}
+		
+		// Gets the player if there is any.
+		final var player = target.getActingPlayer();
+		if (player != null) {
+			// Don't take the aggro if the GM has the access level below or equal to GM_DONT_TAKE_AGGRO
+			if (player.isGM() && !player.getAccessLevel().canTakeAggro()) {
+				return false;
+			}
+			
+			// check if the target is within the grace period for JUST getting up from fake death
+			if (player.isRecentFakeDeath()) {
+				return false;
+			}
+			
+			if (player.isInParty() && player.getParty().isInDimensionalRift()) {
+				var riftType = player.getParty().getDimensionalRift().getType();
+				var riftRoom = player.getParty().getDimensionalRift().getCurrentRoom();
+				
+				if ((actor instanceof L2RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(actor.getX(), actor.getY(), actor.getZ())) {
+					return false;
+				}
+			}
+		}
+		
+		// Check if the actor is a L2GuardInstance
+		if (actor instanceof L2GuardInstance) {
+			// Check if the L2PcInstance target has karma (=PK)
+			if ((player != null) && (player.getKarma() > 0)) {
+				return GeoData.getInstance().canSeeTarget(actor, player); // Los Check
+			}
+			// Check if the L2MonsterInstance target is aggressive
+			if ((target instanceof L2MonsterInstance monster) && npc().guardAttackAggroMob()) {
+				return (monster.isAggressive() && GeoData.getInstance().canSeeTarget(actor, target));
+			}
+			
+			return false;
+		} else if (actor instanceof L2FriendlyMobInstance) {
+			// Check if the target isn't another L2Npc
+			if (target instanceof L2Npc) {
+				return false;
+			}
+			
+			// Check if the L2PcInstance target has karma (=PK)
+			if ((target instanceof L2PcInstance targetPlayer) && (targetPlayer.getKarma() > 0)) {
+				return GeoData.getInstance().canSeeTarget(actor, target); // Los Check
+			}
+			return false;
+		} else {
+			if (target instanceof L2Attackable attackable) {
+				if (!target.isAutoAttackable(actor)) {
+					return false;
+				}
+				
+				if (actor.isChaos() && actor.isInsideRadius(target, actor.getAggroRange(), false, false)) {
+					if (attackable.isInMyClan(actor)) {
+						return false;
+					}
+					// Los Check
+					return GeoData.getInstance().canSeeTarget(actor, target);
+				}
+			}
+			
+			if (target instanceof L2Npc) {
+				return false;
+			}
+			
+			// depending on config, do not allow mobs to attack _new_ players in peace zones,
+			// unless they are already following those players from outside the peace zone.
+			if (!npc().mobAggroInPeaceZone() && target.isInsideZone(ZoneId.PEACE)) {
+				return false;
+			}
+			
+			if (actor.isChampion() && customs().championPassive()) {
+				return false;
+			}
+			
+			// Check if the actor is Aggressive
+			return (actor.isAggressive() && GeoData.getInstance().canSeeTarget(actor, target));
+		}
+	}
+	
+	public void startAITask() {
+		// If not idle - create an AI task (schedule onEvtThink repeatedly)
+		if ((_aiTask == null) && (_actor.isInActiveRegion())) {
+			_aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this::onEvtThink, 1000, 1000);
+		}
+	}
+	
+	@Override
+	public void stopAITask() {
+		if (_aiTask != null) {
+			_aiTask.cancel(false);
+			_aiTask = null;
+		}
+		super.stopAITask();
+	}
+	
+	/**
+	 * Set the Intention of this L2CharacterAI and create an AI Task executed every 1s (call onEvtThink method) for this L2Attackable.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</B></FONT>
+	 * @param intention The new Intention to set to the AI
+	 * @param arg0 The first parameter of the Intention
+	 * @param arg1 The second parameter of the Intention
+	 */
+	@Override
+	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		if ((intention == AI_INTENTION_IDLE) || (intention == AI_INTENTION_ACTIVE)) {
+			// Check if actor is not dead
+			final var actor = getActor();
+			if (!actor.isAlikeDead()) {
+				// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
+				if (!actor.getKnownList().getKnownPlayers().isEmpty()) {
+					intention = AI_INTENTION_ACTIVE;
+				} else {
+					if (actor.getSpawn() != null) {
+						final var loc = actor.getSpawn().getLocation(actor);
+						final int range = npc().getMaxDriftRange();
+						
+						if (!actor.isInsideRadius(loc, range + range, true, false)) {
+							intention = AI_INTENTION_ACTIVE;
+						}
+					}
+				}
+			}
+			
+			if (intention == AI_INTENTION_IDLE) {
+				// Set the Intention of this L2AttackableAI to AI_INTENTION_IDLE
+				super.changeIntention(AI_INTENTION_IDLE, null, null);
+				
+				// Stop AI task and detach AI from NPC
+				stopAITask();
+				
+				// Cancel the AI
+				_actor.detachAI();
+				
+				return;
+			}
+		}
+		
+		// Set the Intention of this L2AttackableAI to intention
+		super.changeIntention(intention, arg0, arg1);
+		
+		// If not idle - create an AI task (schedule onEvtThink repeatedly)
+		startAITask();
+	}
+	
+	/**
+	 * Manage the Attack Intention : Stop current Attack (if necessary), Calculate attack timeout, Start a new Attack and Launch Think Event.
+	 * @param target The L2Character to attack
+	 */
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+		// Calculate the attack timeout
+		final var currentTick = GameTimeController.getInstance().getGameTicks();
+		_attackTimeout = MAX_ATTACK_TIMEOUT + currentTick;
+		
+		// self and buffs
+		if ((_lastBuffTick + (3 * TICKS_PER_SECOND)) < currentTick) {
+			for (var buff : getActor().getTemplate().getAISkills(AISkillScope.BUFF)) {
+				if (checkSkillCastConditions(getActor(), buff)) {
+					if (!_actor.isAffectedBySkill(buff.getId())) {
+						_actor.setTarget(_actor);
+						_actor.doCast(buff);
+						_actor.setTarget(target);
+						LOG.debug("{} used buff skill {} on {}", this, buff, _actor);
+						break;
+					}
+				}
+			}
+			_lastBuffTick = currentTick;
+		}
+		
+		// Manage the Attack Intention : Stop current Attack (if necessary), Start a new Attack and Launch Think Event
+		super.onIntentionAttack(target);
+	}
+	
+	@Override
+	protected void onEvtAfraid(L2Character effector, boolean start) {
+		if ((_fearTime > 0) && (_fearTask == null)) {
+			_fearTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FearTask(this, effector, start), 0, FEAR_TICKS, TimeUnit.SECONDS);
+			_actor.startAbnormalVisualEffect(true, AbnormalVisualEffect.TURN_FLEE);
+		} else {
+			super.onEvtAfraid(effector, start);
+			
+			if ((_actor.isDead() || (_fearTime <= 0)) && (_fearTask != null)) {
+				_fearTask.cancel(true);
+				_fearTask = null;
+				_actor.stopAbnormalVisualEffect(true, AbnormalVisualEffect.TURN_FLEE);
+				
+				final L2Character mostHated = getActor().getMostHated();
+				if (mostHated != null) {
+					setIntention(AI_INTENTION_ATTACK, mostHated);
+				} else {
+					setIntention(AI_INTENTION_ACTIVE);
+				}
+				onEvtThink();
+			}
+		}
+	}
+	
+	protected void thinkCast() {
+		if (checkTargetLost(getCastTarget())) {
+			setCastTarget(null);
+			return;
+		}
+		if (maybeMoveToPawn(getCastTarget(), _actor.getMagicalAttackRange(_skill))) {
+			return;
+		}
+		clientStopMoving(null);
+		setIntention(AI_INTENTION_ACTIVE);
+		_actor.doCast(_skill);
+	}
+	
+	/**
+	 * Manage AI standard thinks of a L2Attackable (called by onEvtThink). <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Update every 1s the _globalAggro counter to come close to 0</li>
+	 * <li>If the actor is Aggressive and can attack, add all autoAttackable L2Character in its Aggro Range to its _aggroList, chose a target and order to attack it</li>
+	 * <li>If the actor is a L2GuardInstance that can't attack, order to it to return to its home location</li>
+	 * <li>If the actor is a L2MonsterInstance that can't attack, order to it to random walk (1/100)</li>
+	 * </ul>
+	 */
+	protected void thinkActive() {
+		final var actor = getActor();
+		
+		// Update every 1s the _globalAggro counter to come close to 0
+		if (_globalAggro != 0) {
+			if (_globalAggro < 0) {
+				_globalAggro++;
+			} else {
+				_globalAggro--;
+			}
+		}
+		
+		// Add all autoAttackable L2Character in L2Attackable Aggro Range to its _aggroList with 0 damage and 1 hate
+		// A L2Attackable isn't aggressive during 10s after its spawn because _globalAggro is set to -10
+		if (_globalAggro >= 0) {
+			// Get all visible objects inside its Aggro Range
+			for (var obj : actor.getKnownList().getKnownObjects().values()) {
+				if (!(obj instanceof L2Character target) || (obj instanceof L2StaticObjectInstance)) {
+					continue;
+				}
+				
+				// Check to see if this is a festival mob spawn.
+				// If it is, then check to see if the aggro trigger is a festival participant...if so, move to attack it.
+				if ((actor instanceof L2FestivalMonsterInstance) && (obj instanceof L2PcInstance targetPlayer)) {
+					if (!(targetPlayer.isFestivalParticipant())) {
+						continue;
+					}
+				}
+				
+				// For each L2Character check if the target is autoattackable, check aggression
+				if (autoAttackCondition(target)) {
+					if (target.isPlayable()) {
+						final var term = EventDispatcher.getInstance().notifyEvent(new AttackableHate(getActor(), target.getActingPlayer(), target.isSummon()), getActor(), TerminateReturn.class);
+						if ((term != null) && term.terminate()) {
+							continue;
+						}
+					}
+					
+					// Get the hate level of the L2Attackable against this L2Character target contained in _aggroList
+					var hating = actor.getHating(target);
+					
+					// Add the attacker to the L2Attackable _aggroList with 0 damage and 1 hate
+					if (hating == 0) {
+						actor.addDamageHate(target, 0, 0);
+					}
+				}
+			}
+			
+			// Chose a target from its aggroList
+			final var hated = actor.isConfused() ? getAttackTarget() : actor.getMostHated();
+			// Order to the L2Attackable to attack the target
+			if ((hated != null) && !actor.isCoreAIDisabled()) {
+				// Get the hate level of the L2Attackable against this L2Character target contained in _aggroList
+				final var aggro = actor.getHating(hated);
+				if ((aggro + _globalAggro) > 0) {
+					// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+					if (!actor.isRunning()) {
+						actor.setRunning();
+					}
+					
+					// Set the AI Intention to AI_INTENTION_ATTACK
+					setIntention(AI_INTENTION_ATTACK, hated);
+				}
+				return;
+			}
+		}
+		
+		// Chance to forget attackers after some time
+		if ((actor.getCurrentHp() == actor.getMaxHp()) && (actor.getCurrentMp() == actor.getMaxMp()) && !actor.getAttackByList().isEmpty() && (Rnd.nextInt(500) == 0)) {
+			actor.clearAggroList();
+			actor.getAttackByList().clear();
+			if (actor instanceof L2MonsterInstance monster) {
+				if (monster.hasMinions()) {
+					monster.getMinionList().deleteReusedMinions();
+				}
+			}
+		}
+		
+		// Check if the mob should not return to spawn point
+		if (!actor.canReturnToSpawnPoint()) {
+			return;
+		}
+		
+		// Check if the actor is a L2GuardInstance
+		if ((actor instanceof L2GuardInstance) && !actor.isWalker()) {
+			// Order to the L2GuardInstance to return to its home location because there's no target to attack
+			actor.returnHome();
+		}
+		
+		// If this is a festival monster, then it remains in the same location.
+		if (actor instanceof L2FestivalMonsterInstance) {
+			return;
+		}
+		
+		// Minions following leader
+		final var leader = actor.getLeader();
+		if ((leader != null) && !leader.isAlikeDead()) {
+			final int offset;
+			final var minRadius = 30;
+			
+			if (actor.isRaidMinion()) {
+				offset = 500; // for Raids - need correction
+			} else {
+				offset = 200; // for normal minions - need correction :)
+			}
+			
+			if (leader.isRunning()) {
+				actor.setRunning();
+			} else {
+				actor.setWalking();
+			}
+			
+			if (actor.calculateDistance(leader, false, true) > (offset * offset)) {
+				int x1, y1, z1;
+				x1 = Rnd.get(minRadius * 2, offset * 2); // x
+				y1 = Rnd.get(x1, offset * 2); // distance
+				y1 = (int) Math.sqrt((y1 * y1) - (x1 * x1)); // y
+				if (x1 > (offset + minRadius)) {
+					x1 = (leader.getX() + x1) - offset;
+				} else {
+					x1 = (leader.getX() - x1) + minRadius;
+				}
+				if (y1 > (offset + minRadius)) {
+					y1 = (leader.getY() + y1) - offset;
+				} else {
+					y1 = (leader.getY() - y1) + minRadius;
+				}
+				
+				z1 = leader.getZ();
+				// Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation (broadcast)
+				moveTo(x1, y1, z1);
+			} else if (Rnd.nextInt(RANDOM_WALK_RATE) == 0) {
+				for (var sk : actor.getTemplate().getAISkills(AISkillScope.BUFF)) {
+					if (cast(sk)) {
+						return;
+					}
+				}
+			}
+		}
+		// Order to the L2MonsterInstance to random walk (1/100)
+		else if ((actor.getSpawn() != null) && (Rnd.nextInt(RANDOM_WALK_RATE) == 0) && !actor.isNoRndWalk()) {
+			var x1 = 0;
+			var y1 = 0;
+			var z1 = 0;
+			final int range = npc().getMaxDriftRange();
+			
+			if (actor.isWalker()) {
+				return;
+			}
+			
+			for (var sk : actor.getTemplate().getAISkills(AISkillScope.BUFF)) {
+				if (cast(sk)) {
+					return;
+				}
+			}
+			
+			// If me with random coord in territory - old method (for backward compatibility)
+			if ((actor.getSpawn().getX() == 0) && (actor.getSpawn().getY() == 0) && (actor.getSpawn().getSpawnTerritory() == null)) {
+				// Calculate a destination point in the spawn area
+				final var location = TerritoryTable.getInstance().getRandomPoint(actor.getSpawn().getLocationId());
+				if (location != null) {
+					x1 = location.getX();
+					y1 = location.getY();
+					z1 = location.getZ();
+				}
+				
+				// Calculate the distance between the current position of the L2Character and the target (x,y)
+				var distance2 = actor.calculateDistance(x1, y1, 0, false, true);
+				
+				if (distance2 > ((range + range) * (range + range))) {
+					actor.setisReturningToSpawnPoint(true);
+					var delay = (float) Math.sqrt(distance2) / range;
+					x1 = actor.getX() + (int) ((x1 - actor.getX()) / delay);
+					y1 = actor.getY() + (int) ((y1 - actor.getY()) / delay);
+				}
+				
+				// If me with random fixed coord, don't move (unless needs to return to spawnpoint)
+				if (!actor.isReturningToSpawnPoint() && (TerritoryTable.getInstance().getProcMax(actor.getSpawn().getLocationId()) > 0)) {
+					return;
+				}
+			} else {
+				x1 = actor.getSpawn().getX(actor);
+				y1 = actor.getSpawn().getY(actor);
+				z1 = actor.getSpawn().getZ(actor);
+				
+				if (!actor.isInsideRadius(x1, y1, 0, range, false, false)) {
+					actor.setisReturningToSpawnPoint(true);
+				} else {
+					var deltaX = Rnd.nextInt(range * 2); // x
+					var deltaY = Rnd.get(deltaX, range * 2); // distance
+					deltaY = (int) Math.sqrt((deltaY * deltaY) - (deltaX * deltaX)); // y
+					x1 = (deltaX + x1) - range;
+					y1 = (deltaY + y1) - range;
+					z1 = actor.getZ();
+				}
+			}
+			// Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation (broadcast)
+			final var moveLoc = GeoData.getInstance().moveCheck(actor.getX(), actor.getY(), actor.getZ(), x1, y1, z1, actor.getInstanceId());
+			
+			moveTo(moveLoc.getX(), moveLoc.getY(), moveLoc.getZ());
+		}
+	}
+	
+	/**
+	 * Manage AI attack thinks of a L2Attackable (called by onEvtThink).<br>
+	 * <b><u>Actions</u>:</b>
+	 * <ul>
+	 * <li>Update the attack timeout if actor is running</li>
+	 * <li>If target is dead or timeout is expired, stop this attack and set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>Call all L2Object of its Faction inside the Faction Range</li>
+	 * <li>Chose a target and order to attack it with magic skill or physical attack</li>
+	 * </ul>
+	 */
+	protected void thinkAttack() {
+		final var actor = getActor();
+		if (actor.isCastingNow() || actor.isAttackingNow()) {
+			return;
+		}
+		
+		if (actor.isCoreAIDisabled()) {
+			return;
+		}
+		
+		if (actor.isOutOfControl()) {
+			return;
+		}
+		
+		final var mostHated = actor.getMostHated();
+		if (mostHated == null) {
+			setIntention(AI_INTENTION_ACTIVE);
+			return;
+		}
+		
+		setAttackTarget(mostHated);
+		actor.setTarget(mostHated);
+		
+		// Immobilize condition
+		if (actor.isMovementDisabled()) {
+			movementDisable();
+			return;
+		}
+		
+		// Check if target is dead or if timeout is expired to stop this attack
+		final var originalAttackTarget = getAttackTarget();
+		if ((originalAttackTarget == null) || originalAttackTarget.isAlikeDead() || (_attackTimeout < GameTimeController.getInstance().getGameTicks())) {
+			// Stop hating this target after the attack timeout or if target is dead
+			actor.stopHating(originalAttackTarget);
+			
+			// Set the AI Intention to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE);
+			
+			actor.setWalking();
+			return;
+		}
+		
+		if (actor.isSevenNpc()) {
+			final var target = originalAttackTarget.getActingPlayer();
+			if (SevenSigns.getInstance().isSealValidationPeriod() || SevenSigns.getInstance().isCompResultsPeriod()) {
+				if (!target.isGM() && target.isIn7sDungeon() && (SevenSigns.getInstance().getPlayerCabal(target.getObjectId()) != SevenSigns.getInstance().getCabalHighestScore())) {
+					target.teleToLocation(TeleportWhereType.TOWN);
+					target.setIsIn7sDungeon(false);
+					target.sendMessage("You have been teleported to the nearest town due to the beginning of the Seal Validation period.");
+				}
+			} else {
+				if (!target.isGM() && target.isIn7sDungeon() && (SevenSigns.getInstance().getPlayerCabal(target.getObjectId()) == SevenSigns.CABAL_NULL)) {
+					target.teleToLocation(TeleportWhereType.TOWN);
+					target.setIsIn7sDungeon(false);
+					target.sendMessage("You have been teleported to the nearest town because you have not signed for any cabal.");
+				}
+			}
+		}
+		
+		final var collision = actor.getTemplate().getCollisionRadius();
+		
+		// Handle all L2Object of its Faction inside the Faction Range
+		
+		final var clans = getActor().getTemplate().getClans();
+		if ((clans != null) && !clans.isEmpty()) {
+			final var factionRange = actor.getTemplate().getClanHelpRange() + collision;
+			// Go through all L2Object that belong to its faction
+			try {
+				for (var obj : actor.getKnownList().getKnownCharactersInRadius(factionRange)) {
+					if (obj instanceof L2Npc called) {
+						if (!getActor().getTemplate().isClan(called.getTemplate().getClans())) {
+							continue;
+						}
+						
+						// Check if the L2Object is inside the Faction Range of the actor
+						if (called.hasAI()) {
+							if ((Math.abs(originalAttackTarget.getZ() - called.getZ()) < 600) && actor.getAttackByList().contains(originalAttackTarget) && ((called.getAI()._intention == AI_INTENTION_IDLE) || (called.getAI()._intention == AI_INTENTION_ACTIVE))
+								&& (called.getInstanceId() == actor.getInstanceId())) {
+								if (originalAttackTarget.isPlayable()) {
+									if (originalAttackTarget.isInParty() && originalAttackTarget.getParty().isInDimensionalRift()) {
+										var riftType = originalAttackTarget.getParty().getDimensionalRift().getType();
+										var riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom();
+										
+										if ((actor instanceof L2RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(actor.getX(), actor.getY(), actor.getZ())) {
+											continue;
+										}
+									}
+									
+									// By default, when a faction member calls for help, attack the caller's attacker.
+									// Notify the AI with EVT_AGGRESSION
+									called.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, originalAttackTarget, 1);
+									EventDispatcher.getInstance().notifyEventAsync(new FactionCall(called, getActor(), originalAttackTarget.getActingPlayer(), originalAttackTarget.isSummon()), called);
+								} else if ((called instanceof L2Attackable attackable) && (getAttackTarget() != null) && (called.getAI()._intention != AI_INTENTION_ATTACK)) {
+									attackable.addDamageHate(getAttackTarget(), 0, actor.getHating(getAttackTarget()));
+									called.getAI().setIntention(AI_INTENTION_ATTACK, getAttackTarget());
+								}
+							}
+						}
+					}
+				}
+			} catch (NullPointerException e) {
+				LOG.warn("{}: There has been a problem trying to think the attack!", getClass().getSimpleName(), e);
+			}
+		}
+		
+		// Initialize data
+		final var combinedCollision = collision + mostHated.getTemplate().getCollisionRadius();
+		
+		final var aiSuicideSkills = actor.getTemplate().getAISkills(AISkillScope.SUICIDE);
+		if (!aiSuicideSkills.isEmpty() && ((int) ((actor.getCurrentHp() / actor.getMaxHp()) * 100) < 30)) {
+			final var skill = aiSuicideSkills.get(Rnd.get(aiSuicideSkills.size()));
+			if (Util.checkIfInRange(skill.getAffectRange(), getActor(), mostHated, false) && actor.hasSkillChance()) {
+				if (cast(skill)) {
+					LOG.debug("{} used suicide skill {}", this, skill);
+					return;
+				}
+			}
+		}
+		
+		// ------------------------------------------------------
+		// In case many mobs are trying to hit from same place, move a bit, circling around the target
+		// Note from Gnacik:
+		// On l2js because of that sometimes mobs don't attack player only running
+		// around player without any sense, so decrease chance for now
+		if (!actor.isMovementDisabled() && (Rnd.nextInt(100) <= 3)) {
+			for (var nearby : actor.getKnownList().getKnownObjects().values()) {
+				if ((nearby instanceof L2Attackable) && actor.isInsideRadius(nearby, collision, false, false) && (nearby != mostHated)) {
+					var newX = combinedCollision + Rnd.get(40);
+					if (Rnd.nextBoolean()) {
+						newX = mostHated.getX() + newX;
+					} else {
+						newX = mostHated.getX() - newX;
+					}
+					var newY = combinedCollision + Rnd.get(40);
+					if (Rnd.nextBoolean()) {
+						newY = mostHated.getY() + newY;
+					} else {
+						newY = mostHated.getY() - newY;
+					}
+					
+					if (!actor.isInsideRadius(newX, newY, 0, collision, false, false)) {
+						var newZ = actor.getZ() + 30;
+						if (GeoData.getInstance().canMove(actor.getX(), actor.getY(), actor.getZ(), newX, newY, newZ, actor.getInstanceId())) {
+							moveTo(newX, newY, newZ);
+						}
+					}
+					return;
+				}
+			}
+		}
+		// Calculate Archer movement
+		if (!actor.isMovementDisabled() && (actor.getTemplate().getBaseAttackRange() >= 700)) {
+			if (Rnd.get(100) <= 15) {
+				var distance2 = actor.calculateDistance(mostHated, false, true);
+				if (Math.sqrt(distance2) <= (60 + combinedCollision)) {
+					var posX = actor.getX();
+					var posY = actor.getY();
+					var posZ = actor.getZ() + 30;
+					
+					if (originalAttackTarget.getX() < posX) {
+						posX = posX + 300;
+					} else {
+						posX = posX - 300;
+					}
+					
+					if (originalAttackTarget.getY() < posY) {
+						posY = posY + 300;
+					} else {
+						posY = posY - 300;
+					}
+					
+					if (GeoData.getInstance().canMove(actor.getX(), actor.getY(), actor.getZ(), posX, posY, posZ, actor.getInstanceId())) {
+						setIntention(AI_INTENTION_MOVE_TO, new Location(posX, posY, posZ, 0));
+					}
+					return;
+				}
+			}
+		}
+		
+		// BOSS/Raid Minion Target Reconsider
+		if (actor.isRaid() || actor.isRaidMinion()) {
+			_chaosTime++;
+			if (actor instanceof L2RaidBossInstance) {
+				if (!((L2MonsterInstance) actor).hasMinions()) {
+					if (_chaosTime > npc().getRaidChaosTime()) {
+						if (Rnd.get(100) <= (100 - ((actor.getCurrentHp() * 100) / actor.getMaxHp()))) {
+							aggroReconsider();
+							_chaosTime = 0;
+							return;
+						}
+					}
+				} else {
+					if (_chaosTime > npc().getRaidChaosTime()) {
+						if (Rnd.get(100) <= (100 - ((actor.getCurrentHp() * 200) / actor.getMaxHp()))) {
+							aggroReconsider();
+							_chaosTime = 0;
+							return;
+						}
+					}
+				}
+			} else if (actor instanceof L2GrandBossInstance) {
+				if (_chaosTime > npc().getGrandChaosTime()) {
+					var chaosRate = 100 - ((actor.getCurrentHp() * 300) / actor.getMaxHp());
+					if (((chaosRate <= 10) && (Rnd.get(100) <= 10)) || ((chaosRate > 10) && (Rnd.get(100) <= chaosRate))) {
+						aggroReconsider();
+						_chaosTime = 0;
+						return;
+					}
+				}
+			} else {
+				if (_chaosTime > npc().getMinionChaosTime()) {
+					if (Rnd.get(100) <= (100 - ((actor.getCurrentHp() * 200) / actor.getMaxHp()))) {
+						aggroReconsider();
+						_chaosTime = 0;
+						return;
+					}
+				}
+			}
+		}
+		
+		final var generalSkills = actor.getTemplate().getAISkills(AISkillScope.GENERAL);
+		if (!generalSkills.isEmpty()) {
+			// Heal Condition
+			final var aiHealSkills = actor.getTemplate().getAISkills(AISkillScope.HEAL);
+			if (!aiHealSkills.isEmpty()) {
+				var percentage = (actor.getCurrentHp() / actor.getMaxHp()) * 100;
+				if (actor.isMinion()) {
+					final var leader = actor.getLeader();
+					if ((leader != null) && !leader.isDead() && (Rnd.get(100) > ((leader.getCurrentHp() / leader.getMaxHp()) * 100))) {
+						for (var healSkill : aiHealSkills) {
+							if (healSkill.getTargetType() == TargetType.SELF) {
+								continue;
+							}
+							
+							if (!checkSkillCastConditions(actor, healSkill)) {
+								continue;
+							}
+							
+							if (!Util.checkIfInRange((healSkill.getCastRange() + collision + leader.getTemplate().getCollisionRadius()), actor, leader, false) && !isParty(healSkill) && !actor.isMovementDisabled()) {
+								moveToPawn(leader, healSkill.getCastRange() + collision + leader.getTemplate().getCollisionRadius());
+								return;
+							}
+							
+							if (GeoData.getInstance().canSeeTarget(actor, leader)) {
+								clientStopMoving(null);
+								final var target = actor.getTarget();
+								actor.setTarget(leader);
+								actor.doCast(healSkill);
+								actor.setTarget(target);
+								LOG.debug("{} used heal skill {} on leader {}", this, healSkill, leader);
+								return;
+							}
+						}
+					}
+				}
+				
+				if (Rnd.get(100) < ((100 - percentage) / 3)) {
+					for (var sk : aiHealSkills) {
+						if (!checkSkillCastConditions(actor, sk)) {
+							continue;
+						}
+						
+						clientStopMoving(null);
+						final var target = actor.getTarget();
+						actor.setTarget(actor);
+						actor.doCast(sk);
+						actor.setTarget(target);
+						LOG.debug("{} used heal skill {} on itself", this, sk);
+						return;
+					}
+				}
+				
+				for (var sk : aiHealSkills) {
+					if (!checkSkillCastConditions(actor, sk)) {
+						continue;
+					}
+					
+					if (sk.getTargetType() == TargetType.ONE) {
+						for (var obj : actor.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + collision)) {
+							if (!(obj instanceof L2Attackable targets) || obj.isDead()) {
+								continue;
+							}
+							
+							if (!targets.isInMyClan(actor)) {
+								continue;
+							}
+							
+							percentage = (targets.getCurrentHp() / targets.getMaxHp()) * 100;
+							if (Rnd.get(100) < ((100 - percentage) / 10)) {
+								if (GeoData.getInstance().canSeeTarget(actor, targets)) {
+									clientStopMoving(null);
+									final var target = actor.getTarget();
+									actor.setTarget(obj);
+									actor.doCast(sk);
+									actor.setTarget(target);
+									LOG.debug("{} used heal skill {} on {}", this, sk, obj);
+									return;
+								}
+							}
+						}
+					}
+					
+					if (isParty(sk)) {
+						clientStopMoving(null);
+						actor.doCast(sk);
+						return;
+					}
+				}
+			}
+			
+			// Res Skill Condition
+			final var aiResSkills = actor.getTemplate().getAISkills(AISkillScope.RES);
+			if (!aiResSkills.isEmpty()) {
+				if (actor.isMinion()) {
+					final var leader = actor.getLeader();
+					if ((leader != null) && leader.isDead()) {
+						for (var sk : aiResSkills) {
+							if (sk.getTargetType() == TargetType.SELF) {
+								continue;
+							}
+							
+							if (!checkSkillCastConditions(actor, sk)) {
+								continue;
+							}
+							
+							if (!Util.checkIfInRange((sk.getCastRange() + collision + leader.getTemplate().getCollisionRadius()), actor, leader, false) && !isParty(sk) && !actor.isMovementDisabled()) {
+								moveToPawn(leader, sk.getCastRange() + collision + leader.getTemplate().getCollisionRadius());
+								return;
+							}
+							
+							if (GeoData.getInstance().canSeeTarget(actor, leader)) {
+								clientStopMoving(null);
+								final var target = actor.getTarget();
+								actor.setTarget(leader);
+								actor.doCast(sk);
+								actor.setTarget(target);
+								LOG.debug("{} used resurrection skill {} on leader {}", this, sk, leader);
+								return;
+							}
+						}
+					}
+				}
+				
+				for (var sk : aiResSkills) {
+					if (!checkSkillCastConditions(actor, sk)) {
+						continue;
+					}
+					if (sk.getTargetType() == TargetType.ONE) {
+						for (var obj : actor.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + collision)) {
+							if (!(obj instanceof L2Attackable targets) || !obj.isDead()) {
+								continue;
+							}
+							
+							if (!actor.isInMyClan(targets)) {
+								continue;
+							}
+							if (Rnd.get(100) < 10) {
+								if (GeoData.getInstance().canSeeTarget(actor, targets)) {
+									clientStopMoving(null);
+									final var target = actor.getTarget();
+									actor.setTarget(obj);
+									actor.doCast(sk);
+									actor.setTarget(target);
+									LOG.debug("{} used heal skill {} on clan member {}", this, sk, obj);
+									return;
+								}
+							}
+						}
+					}
+					
+					if (isParty(sk)) {
+						clientStopMoving(null);
+						final var target = actor.getTarget();
+						actor.setTarget(actor);
+						actor.doCast(sk);
+						actor.setTarget(target);
+						LOG.debug("{} used heal skill {} on party", this, sk);
+						return;
+					}
+				}
+			}
+			
+			// Short Range Skill Condition
+			final var aiShortRangeSkills = actor.getTemplate().getAISkills(AISkillScope.SHORT_RANGE);
+			if (!aiShortRangeSkills.isEmpty()) {
+				for (var shortSkill : aiShortRangeSkills) {
+					if (!checkSkillCastConditions(actor, shortSkill)) {
+						continue;
+					}
+					
+					final var skill = aiShortRangeSkills.get(Rnd.get(aiShortRangeSkills.size()));
+					if (Util.checkIfInRange(skill.getCastRange(), getActor(), mostHated, false) && actor.hasSkillChance()) {
+						if (GeoData.getInstance().canSeeTarget(actor, mostHated)) {
+							clientStopMoving(null);
+							actor.doCast(skill);
+							LOG.debug("{} used short range skill {} on {}", this, skill, actor.getTarget());
+							return;
+						}
+					}
+				}
+			}
+			
+			// Long Range Skill Condition
+			final var aiLongRangeSkills = actor.getTemplate().getAISkills(AISkillScope.LONG_RANGE);
+			if (!aiLongRangeSkills.isEmpty()) {
+				for (var longSkill : aiLongRangeSkills) {
+					if (!checkSkillCastConditions(actor, longSkill)) {
+						continue;
+					}
+					
+					final var skill = aiLongRangeSkills.get(Rnd.get(aiLongRangeSkills.size()));
+					if (Util.checkIfInRange(skill.getCastRange(), getActor(), mostHated, false) && actor.hasSkillChance()) {
+						if (GeoData.getInstance().canSeeTarget(actor, mostHated)) {
+							clientStopMoving(null);
+							actor.doCast(skill);
+							LOG.debug("{} used long range skill {} on {}", this, skill, actor.getTarget());
+							return;
+						}
+					}
+				}
+			}
+		}
+		
+		var dist = actor.calculateDistance(mostHated, false, false);
+		var dist2 = (int) dist - collision;
+		var range = actor.getPhysicalAttackRange() + combinedCollision;
+		if (actor.getTemplate().getBaseAttackRange() >= 700) {
+			range = actor.getTemplate().getBaseAttackRange(); // Base Bow Range NPC
+		}
+		
+		if (mostHated.isMoving()) {
+			range = range + 50;
+			if (actor.isMoving()) {
+				range = range + 50;
+			}
+		}
+		
+		// Starts melee attack
+		if ((dist2 > range) || !GeoData.getInstance().canSeeTarget(actor, mostHated)) {
+			if (actor.isMovementDisabled()) {
+				targetReconsider();
+			} else {
+				final var target = getAttackTarget();
+				if (target != null) {
+					if (target.isMoving()) {
+						range -= 100;
+					}
+					moveToPawn(target, Math.max(range, 5));
+				}
+			}
+			return;
+		}
+		
+		clientStopMoving(null);
+		// Attacks target
+		_actor.doAttack(getAttackTarget());
+	}
+	
+	private boolean cast(Skill sk) {
+		final var actor = getActor();
+		if (!checkSkillCastConditions(actor, sk)) {
+			return false;
+		}
+		
+		if (getAttackTarget() == null) {
+			if (actor.getMostHated() != null) {
+				setAttackTarget(actor.getMostHated());
+			}
+		}
+		
+		final var attackTarget = getAttackTarget();
+		if (attackTarget == null) {
+			return false;
+		}
+		
+		var dist = actor.calculateDistance(attackTarget, false, false);
+		var dist2 = dist - attackTarget.getTemplate().getCollisionRadius();
+		double range = actor.getPhysicalAttackRange() + actor.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius();
+		double srange = sk.getCastRange() + actor.getTemplate().getCollisionRadius();
+		if (attackTarget.isMoving()) {
+			dist2 = dist2 - 30;
+		}
+		
+		if (sk.isContinuous()) {
+			if (!sk.isDebuff()) {
+				if (!actor.isAffectedBySkill(sk.getId())) {
+					clientStopMoving(null);
+					actor.setTarget(actor);
+					actor.doCast(sk);
+					_actor.setTarget(attackTarget);
+					return true;
+				}
+				// If actor already have buff, start looking at others same faction mob to cast
+				if (sk.getTargetType() == TargetType.SELF) {
+					return false;
+				}
+				if (sk.getTargetType() == TargetType.ONE) {
+					var target = effectTargetReconsider(sk, true);
+					if (target != null) {
+						clientStopMoving(null);
+						actor.setTarget(target);
+						actor.doCast(sk);
+						actor.setTarget(attackTarget);
+						return true;
+					}
+				}
+				if (canParty(sk)) {
+					clientStopMoving(null);
+					actor.setTarget(actor);
+					actor.doCast(sk);
+					actor.setTarget(attackTarget);
+					return true;
+				}
+			} else {
+				if (GeoData.getInstance().canSeeTarget(actor, attackTarget) && !canAOE(sk) && !attackTarget.isDead() && (dist2 <= srange)) {
+					if (!attackTarget.isAffectedBySkill(sk.getId())) {
+						clientStopMoving(null);
+						actor.doCast(sk);
+						return true;
+					}
+				} else if (canAOE(sk)) {
+					// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance on living targets.
+				} else if (sk.getTargetType() == TargetType.ONE) {
+					var target = effectTargetReconsider(sk, false);
+					if (target != null) {
+						clientStopMoving(null);
+						actor.doCast(sk);
+						return true;
+					}
+				}
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.DISPEL)) {
+			if (sk.getTargetType() == TargetType.ONE) {
+				if ((attackTarget.getEffectList().getFirstEffect(L2EffectType.BUFF) != null) && GeoData.getInstance().canSeeTarget(actor, attackTarget) && !attackTarget.isDead() && (dist2 <= srange)) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+				var target = effectTargetReconsider(sk, false);
+				if (target != null) {
+					clientStopMoving(null);
+					actor.setTarget(target);
+					actor.doCast(sk);
+					actor.setTarget(attackTarget);
+					return true;
+				}
+			} else if (canAOE(sk)) {
+				// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance on living targets.
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.HP)) {
+			var percentage = (actor.getCurrentHp() / actor.getMaxHp()) * 100;
+			if (actor.isMinion() && (sk.getTargetType() != TargetType.SELF)) {
+				L2Character leader = actor.getLeader();
+				if ((leader != null) && !leader.isDead() && (Rnd.get(100) > ((leader.getCurrentHp() / leader.getMaxHp()) * 100))) {
+					if (!Util.checkIfInRange((sk.getCastRange() + actor.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), actor, leader, false) && !isParty(sk) && !actor.isMovementDisabled()) {
+						moveToPawn(leader, sk.getCastRange() + actor.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius());
+					}
+					if (GeoData.getInstance().canSeeTarget(actor, leader)) {
+						clientStopMoving(null);
+						actor.setTarget(leader);
+						actor.doCast(sk);
+						actor.setTarget(attackTarget);
+						return true;
+					}
+				}
+			}
+			
+			if (Rnd.get(100) < ((100 - percentage) / 3)) {
+				clientStopMoving(null);
+				actor.setTarget(actor);
+				actor.doCast(sk);
+				actor.setTarget(attackTarget);
+				return true;
+			}
+			
+			if (sk.getTargetType() == TargetType.ONE) {
+				for (var obj : actor.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + actor.getTemplate().getCollisionRadius())) {
+					if (!(obj instanceof L2Attackable targets) || obj.isDead()) {
+						continue;
+					}
+					
+					if (!actor.isInMyClan(targets)) {
+						continue;
+					}
+					
+					percentage = (targets.getCurrentHp() / targets.getMaxHp()) * 100;
+					if (Rnd.get(100) < ((100 - percentage) / 10)) {
+						if (GeoData.getInstance().canSeeTarget(actor, targets)) {
+							clientStopMoving(null);
+							actor.setTarget(obj);
+							actor.doCast(sk);
+							actor.setTarget(attackTarget);
+							return true;
+						}
+					}
+				}
+			}
+			if (isParty(sk)) {
+				for (var obj : actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange() + actor.getTemplate().getCollisionRadius())) {
+					if (!(obj instanceof L2Attackable targets)) {
+						continue;
+					}
+					
+					if (targets.isInMyClan(actor)) {
+						if ((obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) {
+							clientStopMoving(null);
+							actor.setTarget(actor);
+							actor.doCast(sk);
+							actor.setTarget(attackTarget);
+							return true;
+						}
+					}
+				}
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.MAGICAL_ATTACK, L2EffectType.HP_DRAIN)) {
+			if (!canAura(sk)) {
+				if (GeoData.getInstance().canSeeTarget(actor, attackTarget) && !attackTarget.isDead() && (dist2 <= srange)) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+				
+				var target = skillTargetReconsider(sk);
+				if (target != null) {
+					clientStopMoving(null);
+					actor.setTarget(target);
+					actor.doCast(sk);
+					actor.setTarget(attackTarget);
+					return true;
+				}
+			} else {
+				clientStopMoving(null);
+				actor.doCast(sk);
+				return true;
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.SLEEP)) {
+			if (sk.getTargetType() == TargetType.ONE) {
+				if (!attackTarget.isDead() && (dist2 <= srange)) {
+					if ((dist2 > range) || attackTarget.isMoving()) {
+						if (!attackTarget.isAffectedBySkill(sk.getId())) {
+							clientStopMoving(null);
+							actor.doCast(sk);
+							return true;
+						}
+					}
+				}
+				
+				var target = effectTargetReconsider(sk, false);
+				if (target != null) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+			} else if (canAOE(sk)) {
+				// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance on living targets.
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT, L2EffectType.MUTE, L2EffectType.FEAR)) {
+			if (GeoData.getInstance().canSeeTarget(actor, attackTarget) && !canAOE(sk) && (dist2 <= srange)) {
+				if (!attackTarget.isAffectedBySkill(sk.getId())) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+			} else if (canAOE(sk)) {
+				// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance on living targets.
+			} else if (sk.getTargetType() == TargetType.ONE) {
+				var target = effectTargetReconsider(sk, false);
+				if (target != null) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.DMG_OVER_TIME)) {
+			if (GeoData.getInstance().canSeeTarget(actor, attackTarget) && !canAOE(sk) && !attackTarget.isDead() && (dist2 <= srange)) {
+				if (!attackTarget.isAffectedBySkill(sk.getId())) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+			} else if (canAOE(sk)) {
+				// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance on living targets.
+			} else if (sk.getTargetType() == TargetType.ONE) {
+				var target = effectTargetReconsider(sk, false);
+				if (target != null) {
+					clientStopMoving(null);
+					actor.doCast(sk);
+					return true;
+				}
+			}
+		}
+		
+		if (sk.hasEffectType(L2EffectType.RESURRECTION)) {
+			if (!isParty(sk)) {
+				if (actor.isMinion() && (sk.getTargetType() != TargetType.SELF)) {
+					L2Character leader = actor.getLeader();
+					if (leader != null) {
+						if (leader.isDead()) {
+							if (!Util.checkIfInRange((sk.getCastRange() + actor.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius()), actor, leader, false) && !isParty(sk) && !actor.isMovementDisabled()) {
+								moveToPawn(leader, sk.getCastRange() + actor.getTemplate().getCollisionRadius() + leader.getTemplate().getCollisionRadius());
+							}
+						}
+						if (GeoData.getInstance().canSeeTarget(actor, leader)) {
+							clientStopMoving(null);
+							actor.setTarget(leader);
+							actor.doCast(sk);
+							actor.setTarget(attackTarget);
+							return true;
+						}
+					}
+				}
+				
+				for (var obj : actor.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + actor.getTemplate().getCollisionRadius())) {
+					if (!(obj instanceof L2Attackable targets) || !obj.isDead()) {
+						continue;
+					}
+					
+					if (!actor.isInMyClan(targets)) {
+						continue;
+					}
+					
+					if (Rnd.get(100) < 10) {
+						if (GeoData.getInstance().canSeeTarget(actor, targets)) {
+							clientStopMoving(null);
+							actor.setTarget(obj);
+							actor.doCast(sk);
+							actor.setTarget(attackTarget);
+							return true;
+						}
+					}
+				}
+			} else if (isParty(sk)) {
+				for (var obj : actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange() + actor.getTemplate().getCollisionRadius())) {
+					if (!(obj instanceof L2Attackable targets)) {
+						continue;
+					}
+					
+					if (actor.isInMyClan(targets)) {
+						if ((obj.getCurrentHp() < obj.getMaxHp()) && (Rnd.get(100) <= 20)) {
+							clientStopMoving(null);
+							actor.setTarget(actor);
+							actor.doCast(sk);
+							actor.setTarget(attackTarget);
+							return true;
+						}
+					}
+				}
+			}
+		}
+		
+		if (!canAura(sk)) {
+			if (GeoData.getInstance().canSeeTarget(actor, attackTarget) && !attackTarget.isDead() && (dist2 <= srange)) {
+				clientStopMoving(null);
+				actor.doCast(sk);
+				return true;
+			}
+			
+			var target = skillTargetReconsider(sk);
+			if (target != null) {
+				clientStopMoving(null);
+				actor.setTarget(target);
+				actor.doCast(sk);
+				actor.setTarget(attackTarget);
+				return true;
+			}
+		} else {
+			clientStopMoving(null);
+			actor.doCast(sk);
+			return true;
+		}
+		return false;
+	}
+	
+	private void movementDisable() {
+		final var target = getAttackTarget();
+		if (target == null) {
+			return;
+		}
+		
+		final var actor = getActor();
+		if (actor.getTarget() == null) {
+			actor.setTarget(target);
+		}
+		
+		final var dist = actor.calculateDistance(target, false, false);
+		final var range = actor.getPhysicalAttackRange() + actor.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius();
+		// TODO(Zoey76): Review this "magic changes".
+		final var random = Rnd.get(100);
+		if (!target.isImmobilized() && (random < 15)) {
+			if (tryCast(actor, target, AISkillScope.IMMOBILIZE, dist)) {
+				return;
+			}
+		}
+		
+		if (random < 20) {
+			if (tryCast(actor, target, AISkillScope.COT, dist)) {
+				return;
+			}
+		}
+		
+		if (random < 30) {
+			if (tryCast(actor, target, AISkillScope.DEBUFF, dist)) {
+				return;
+			}
+		}
+		
+		if (random < 40) {
+			if (tryCast(actor, target, AISkillScope.NEGATIVE, dist)) {
+				return;
+			}
+		}
+		
+		if (actor.isMovementDisabled() || (actor.getAiType() == AIType.MAGE) || (actor.getAiType() == AIType.HEALER)) {
+			if (tryCast(actor, target, AISkillScope.ATTACK, dist)) {
+				return;
+			}
+		}
+		
+		if (tryCast(actor, target, AISkillScope.UNIVERSAL, dist)) {
+			return;
+		}
+		
+		// If cannot cast, try to attack.
+		if ((dist <= range) && GeoData.getInstance().canSeeTarget(actor, target)) {
+			_actor.doAttack(target);
+			return;
+		}
+		
+		// If cannot cast nor attack, find a new target.
+		targetReconsider();
+	}
+	
+	private boolean tryCast(L2Attackable me, L2Character target, AISkillScope aiSkillScope, double dist) {
+		for (var sk : me.getTemplate().getAISkills(aiSkillScope)) {
+			if (!checkSkillCastConditions(me, sk) || (((sk.getCastRange() + target.getTemplate().getCollisionRadius()) <= dist) && !canAura(sk))) {
+				continue;
+			}
+			
+			if (!GeoData.getInstance().canSeeTarget(me, target)) {
+				continue;
+			}
+			
+			clientStopMoving(null);
+			me.doCast(sk);
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * @param caster the caster
+	 * @param skill the skill to check.
+	 * @return {@code true} if the skill is available for casting {@code false} otherwise.
+	 */
+	private static boolean checkSkillCastConditions(L2Attackable caster, Skill skill) {
+		if (skill == null) {
+			return false;
+		}
+		
+		if (caster.isCastingNow() && !skill.isSimultaneousCast()) {
+			return false;
+		}
+		// Not enough MP.
+		if (skill.getMpConsume2() >= caster.getCurrentMp()) {
+			return false;
+		}
+		// Character is in "skill disabled" mode.
+		if (caster.isSkillDisabled(skill)) {
+			return false;
+		}
+		// If is a static skill and magic skill and character is muted or is a physical skill muted and character is physically muted.
+		return skill.isStatic() || ((!skill.isMagic() || !caster.isMuted()) && !caster.isPhysicalMuted());
+	}
+	
+	private L2Character effectTargetReconsider(Skill sk, boolean positive) {
+		if (sk == null) {
+			return null;
+		}
+		final var actor = getActor();
+		if (!sk.hasEffectType(L2EffectType.DISPEL)) {
+			if (!positive) {
+				double dist;
+				double dist2;
+				var range = 0;
+				
+				for (var creature : actor.getAttackByList()) {
+					if ((creature == null) || creature.isDead() || !GeoData.getInstance().canSeeTarget(actor, creature) || (creature == getAttackTarget())) {
+						continue;
+					}
+					try {
+						actor.setTarget(getAttackTarget());
+						dist = actor.calculateDistance(creature, false, false);
+						dist2 = dist - actor.getTemplate().getCollisionRadius();
+						range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + creature.getTemplate().getCollisionRadius();
+						if (creature.isMoving()) {
+							dist2 = dist2 - 70;
+						}
+					} catch (NullPointerException e) {
+						continue;
+					}
+					if (dist2 <= range) {
+						if (!getAttackTarget().isAffectedBySkill(sk.getId())) {
+							return creature;
+						}
+					}
+				}
+				
+				// ----------------------------------------------------------------------
+				// If there is nearby Target with aggro, start going on random target that is attackable
+				for (var creature : actor.getKnownList().getKnownCharactersInRadius(range)) {
+					if (creature.isDead() || !GeoData.getInstance().canSeeTarget(actor, creature)) {
+						continue;
+					}
+					try {
+						actor.setTarget(getAttackTarget());
+						dist = actor.calculateDistance(creature, false, false);
+						dist2 = dist;
+						range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + creature.getTemplate().getCollisionRadius();
+						if (creature.isMoving()) {
+							dist2 = dist2 - 70;
+						}
+					} catch (NullPointerException e) {
+						continue;
+					}
+					
+					if ((creature instanceof L2PcInstance) || (creature instanceof L2Summon)) {
+						if (dist2 <= range) {
+							if (!getAttackTarget().isAffectedBySkill(sk.getId())) {
+								return creature;
+							}
+						}
+					}
+				}
+			} else {
+				double dist;
+				double dist2;
+				var range = 0;
+				for (var obj : actor.getKnownList().getKnownCharactersInRadius(range)) {
+					if (!(obj instanceof L2Attackable targets) || obj.isDead() || !GeoData.getInstance().canSeeTarget(actor, obj)) {
+						continue;
+					}
+					
+					if (targets.isInMyClan(actor)) {
+						continue;
+					}
+					
+					try {
+						actor.setTarget(getAttackTarget());
+						dist = actor.calculateDistance(obj, false, false);
+						dist2 = dist - actor.getTemplate().getCollisionRadius();
+						range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + obj.getTemplate().getCollisionRadius();
+						if (obj.isMoving()) {
+							dist2 = dist2 - 70;
+						}
+					} catch (NullPointerException e) {
+						continue;
+					}
+					if (dist2 <= range) {
+						if (!obj.isAffectedBySkill(sk.getId())) {
+							return obj;
+						}
+					}
+				}
+			}
+		} else {
+			double dist;
+			double dist2;
+			int range;
+			range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius();
+			for (var obj : actor.getKnownList().getKnownCharactersInRadius(range)) {
+				if ((obj == null) || obj.isDead() || !GeoData.getInstance().canSeeTarget(actor, obj)) {
+					continue;
+				}
+				try {
+					actor.setTarget(getAttackTarget());
+					dist = actor.calculateDistance(obj, false, false);
+					dist2 = dist - actor.getTemplate().getCollisionRadius();
+					range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + obj.getTemplate().getCollisionRadius();
+					if (obj.isMoving()) {
+						dist2 = dist2 - 70;
+					}
+				} catch (NullPointerException e) {
+					continue;
+				}
+				
+				if ((obj instanceof L2PcInstance) || (obj instanceof L2Summon)) {
+					if (dist2 <= range) {
+						if (getAttackTarget().getEffectList().getFirstEffect(L2EffectType.BUFF) != null) {
+							return obj;
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	private L2Character skillTargetReconsider(Skill sk) {
+		double dist;
+		double dist2;
+		int range;
+		final var actor = getActor();
+		if (actor.getHateList() != null) {
+			for (var obj : actor.getHateList()) {
+				if ((obj == null) || !GeoData.getInstance().canSeeTarget(actor, obj) || obj.isDead()) {
+					continue;
+				}
+				try {
+					actor.setTarget(getAttackTarget());
+					dist = actor.calculateDistance(obj, false, false);
+					dist2 = dist - actor.getTemplate().getCollisionRadius();
+					range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius();
+					// if(obj.isMoving())
+					// dist2 = dist2 - 40;
+				} catch (NullPointerException e) {
+					continue;
+				}
+				if (dist2 <= range) {
+					return obj;
+				}
+			}
+		}
+		
+		if (!(actor instanceof L2GuardInstance)) {
+			for (var target : actor.getKnownList().getKnownObjects().values()) {
+				try {
+					actor.setTarget(getAttackTarget());
+					dist = actor.calculateDistance(target, false, false);
+					dist2 = dist;
+					range = sk.getCastRange() + actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius();
+					// if(obj.isMoving())
+					// dist2 = dist2 - 40;
+				} catch (NullPointerException e) {
+					continue;
+				}
+				
+				if (!(target instanceof L2Character obj)) {
+					continue;
+				}
+				
+				if (!GeoData.getInstance().canSeeTarget(actor, obj) || (dist2 > range)) {
+					continue;
+				}
+				
+				if (obj instanceof L2PcInstance) {
+					return obj;
+				}
+				
+				if (obj instanceof L2Attackable attackable) {
+					if (actor.isChaos()) {
+						if (attackable.isInMyClan(actor)) {
+							continue;
+						}
+						return obj;
+					}
+				}
+				
+				if (obj instanceof L2Summon) {
+					return obj;
+				}
+			}
+		}
+		return null;
+	}
+	
+	private void targetReconsider() {
+		double dist;
+		double dist2;
+		int range;
+		final var actor = getActor();
+		final var mostHated = actor.getMostHated();
+		if (actor.getHateList() != null) {
+			for (var obj : actor.getHateList()) {
+				if ((obj == null) || !GeoData.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != mostHated) || (obj == actor)) {
+					continue;
+				}
+				try {
+					dist = actor.calculateDistance(obj, false, false);
+					dist2 = dist - actor.getTemplate().getCollisionRadius();
+					range = actor.getPhysicalAttackRange() + actor.getTemplate().getCollisionRadius() + obj.getTemplate().getCollisionRadius();
+					if (obj.isMoving()) {
+						dist2 = dist2 - 70;
+					}
+				} catch (NullPointerException e) {
+					continue;
+				}
+				
+				if (dist2 <= range) {
+					actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+					actor.setTarget(obj);
+					setAttackTarget(obj);
+					return;
+				}
+			}
+		}
+		if (!(actor instanceof L2GuardInstance)) {
+			for (var target : actor.getKnownList().getKnownObjects().values()) {
+				if (!(target instanceof L2Character obj)) {
+					continue;
+				}
+				
+				if (!GeoData.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != mostHated) || (obj == actor) || (obj == getAttackTarget())) {
+					continue;
+				}
+				
+				if (obj instanceof L2PcInstance) {
+					actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+					actor.setTarget(obj);
+					setAttackTarget(obj);
+				} else if (obj instanceof L2Attackable attackable) {
+					if (actor.isChaos()) {
+						if (attackable.isInMyClan(actor)) {
+							continue;
+						}
+						
+						actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+						actor.setTarget(obj);
+						setAttackTarget(obj);
+					}
+				} else if (obj instanceof L2Summon) {
+					actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+					actor.setTarget(obj);
+					setAttackTarget(obj);
+				}
+			}
+		}
+	}
+	
+	private void aggroReconsider() {
+		final var actor = getActor();
+		final var mostHated = actor.getMostHated();
+		if (actor.getHateList() != null) {
+			var rand = Rnd.get(actor.getHateList().size());
+			var count = 0;
+			for (var creature : actor.getHateList()) {
+				if (count < rand) {
+					count++;
+					continue;
+				}
+				
+				if ((creature == null) || !GeoData.getInstance().canSeeTarget(actor, creature) || creature.isDead() || (creature == getAttackTarget()) || (creature == actor)) {
+					continue;
+				}
+				
+				try {
+					actor.setTarget(getAttackTarget());
+				} catch (NullPointerException e) {
+					continue;
+				}
+				if (mostHated != null) {
+					actor.addDamageHate(creature, 0, actor.getHating(mostHated));
+				} else {
+					actor.addDamageHate(creature, 0, 2000);
+				}
+				actor.setTarget(creature);
+				setAttackTarget(creature);
+				return;
+			}
+		}
+		
+		if (!(actor instanceof L2GuardInstance)) {
+			for (var target : actor.getKnownList().getKnownObjects().values()) {
+				if (!(target instanceof L2Character obj)) {
+					continue;
+				}
+				
+				if (!GeoData.getInstance().canSeeTarget(actor, obj) || obj.isDead() || (obj != mostHated) || (obj == actor)) {
+					continue;
+				}
+				
+				if (obj instanceof L2PcInstance) {
+					actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+					actor.setTarget(obj);
+					setAttackTarget(obj);
+				} else if (obj instanceof L2Attackable attackable) {
+					if (actor.isChaos()) {
+						if (attackable.isInMyClan(actor)) {
+							continue;
+						}
+						
+						actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+						actor.setTarget(obj);
+						setAttackTarget(obj);
+					}
+				} else if (obj instanceof L2Summon) {
+					actor.addDamageHate(obj, 0, actor.getHating(mostHated));
+					actor.setTarget(obj);
+					setAttackTarget(obj);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Manage AI thinking actions of a L2Attackable.
+	 */
+	@Override
+	protected void onEvtThink() {
+		// Check if the actor can't use skills and if a thinking action isn't already in progress
+		if (_thinking || getActor().isAllSkillsDisabled() || (_fearTime > 0)) {
+			return;
+		}
+		
+		// Start thinking action
+		_thinking = true;
+		
+		try {
+			// Manage AI thinks of a L2Attackable
+			switch (getIntention()) {
+				case AI_INTENTION_ACTIVE -> thinkActive();
+				case AI_INTENTION_ATTACK -> thinkAttack();
+				case AI_INTENTION_CAST -> thinkCast();
+			}
+		} catch (Exception e) {
+			LOG.warn("{}: {} - onEvtThink() for {} failed!", getClass().getSimpleName(), this, getIntention(), e);
+		} finally {
+			// Stop thinking action
+			_thinking = false;
+		}
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Attacked.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Init the attack : Calculate the attack timeout, Set the _globalAggro to 0, Add the attacker to the actor _aggroList</li>
+	 * <li>Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance</li>
+	 * <li>Set the Intention to AI_INTENTION_ATTACK</li>
+	 * </ul>
+	 * @param attacker The L2Character that attacks the actor
+	 */
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+		final var actor = getActor();
+		if (attacker == actor) {
+			return;
+		}
+		
+		// Calculate the attack timeout
+		_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+		
+		// Set the _globalAggro to 0 to permit attack even just after spawn
+		if (_globalAggro < 0) {
+			_globalAggro = 0;
+		}
+		
+		// Add the attacker to the _aggroList of the actor
+		actor.addDamageHate(attacker, 0, 1);
+		
+		// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+		if (!actor.isRunning()) {
+			actor.setRunning();
+		}
+		
+		// Set the Intention to AI_INTENTION_ATTACK
+		if (_fearTime <= 0) {
+			if (getIntention() != AI_INTENTION_ATTACK) {
+				setIntention(AI_INTENTION_ATTACK, attacker);
+			} else if (actor.getMostHated() != getAttackTarget()) {
+				setIntention(AI_INTENTION_ATTACK, attacker);
+			}
+		}
+		
+		if (actor instanceof L2MonsterInstance master) {
+			if (master.hasMinions()) {
+				master.getMinionList().onAssist(actor, attacker);
+			}
+			
+			master = master.getLeader();
+			if ((master != null) && master.hasMinions()) {
+				master.getMinionList().onAssist(actor, attacker);
+			}
+		}
+		
+		super.onEvtAttacked(attacker);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Aggression.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Add the target to the actor _aggroList or update hate if already present</li>
+	 * <li>Set the actor Intention to AI_INTENTION_ATTACK (if actor is L2GuardInstance check if it isn't too far from its home location)</li>
+	 * </ul>
+	 * @param aggro The value of hate to add to the actor against the target
+	 */
+	@Override
+	protected void onEvtAggression(L2Character target, long aggro) {
+		final var actor = getActor();
+		if (actor.isDead()) {
+			return;
+		}
+		
+		if (target != null) {
+			// Add the target to the actor _aggroList or update hate if already present
+			actor.addDamageHate(target, 0, aggro);
+			
+			// Set the actor AI Intention to AI_INTENTION_ATTACK
+			if ((_fearTime <= 0) && (getIntention() != AI_INTENTION_ATTACK)) {
+				// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+				if (!actor.isRunning()) {
+					actor.setRunning();
+				}
+				
+				setIntention(AI_INTENTION_ATTACK, target);
+			}
+			
+			if (actor instanceof L2MonsterInstance master) {
+				if (master.hasMinions()) {
+					master.getMinionList().onAssist(actor, target);
+				}
+				
+				master = master.getLeader();
+				if ((master != null) && master.hasMinions()) {
+					master.getMinionList().onAssist(actor, target);
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void onIntentionActive() {
+		// Cancel attack timeout
+		_attackTimeout = Integer.MAX_VALUE;
+		super.onIntentionActive();
+	}
+	
+	public void setGlobalAggro(int value) {
+		_globalAggro = value;
+	}
+	
+	@Override
+	public final L2Attackable getActor() {
+		return (L2Attackable) _actor;
+	}
+	
+	public int getFearTime() {
+		return _fearTime;
+	}
+	
+	public void setFearTime(int fearTime) {
+		_fearTime = fearTime;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2BoatAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2BoatAI.java
new file mode 100644
index 00000000..7c8dc4bd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2BoatAI.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.VehicleDeparture;
+import com.l2jserver.gameserver.network.serverpackets.VehicleInfo;
+import com.l2jserver.gameserver.network.serverpackets.VehicleStarted;
+
+/**
+ * @author DS
+ */
+public class L2BoatAI extends L2VehicleAI {
+	public L2BoatAI(L2BoatInstance creature) {
+		super(creature);
+	}
+	
+	@Override
+	protected void moveTo(int x, int y, int z) {
+		if (!_actor.isMovementDisabled()) {
+			if (!_clientMoving) {
+				_actor.broadcastPacket(new VehicleStarted(getActor(), 1));
+			}
+			
+			_clientMoving = true;
+			_actor.moveToLocation(x, y, z, 0);
+			_actor.broadcastPacket(new VehicleDeparture(getActor()));
+		}
+	}
+	
+	@Override
+	protected void clientStopMoving(Location loc) {
+		if (_actor.isMoving()) {
+			_actor.stopMove(loc);
+		}
+		
+		if (_clientMoving || (loc != null)) {
+			_clientMoving = false;
+			_actor.broadcastPacket(new VehicleStarted(getActor(), 0));
+			_actor.broadcastPacket(new VehicleInfo(getActor()));
+		}
+	}
+	
+	@Override
+	public void describeStateToPlayer(L2PcInstance player) {
+		if (_clientMoving) {
+			player.sendPacket(new VehicleDeparture(getActor()));
+		}
+	}
+	
+	@Override
+	public L2BoatInstance getActor() {
+		return (L2BoatInstance) _actor;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2CharacterAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2CharacterAI.java
new file mode 100644
index 00000000..cd1d3a9c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2CharacterAI.java
@@ -0,0 +1,1312 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_CAST;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_INTERACT;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_MOVE_TO;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_PICK_UP;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_REST;
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.PARTY;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveFinished;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.AutoAttackStop;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Creatures AI.
+ */
+public class L2CharacterAI extends AbstractAI {
+	public static class IntentionCommand {
+		protected final CtrlIntention _crtlIntention;
+		protected final Object _arg0, _arg1;
+		
+		protected IntentionCommand(CtrlIntention pIntention, Object pArg0, Object pArg1) {
+			_crtlIntention = pIntention;
+			_arg0 = pArg0;
+			_arg1 = pArg1;
+		}
+		
+		public CtrlIntention getCtrlIntention() {
+			return _crtlIntention;
+		}
+	}
+	
+	protected static final int FEAR_RANGE = 500;
+	
+	/**
+	 * Cast Task
+	 * @author Zoey76
+	 */
+	public static class CastTask implements Runnable {
+		private final L2Character _activeChar;
+		private final L2Object _target;
+		private final Skill _skill;
+		
+		public CastTask(L2Character actor, Skill skill, L2Object target) {
+			_activeChar = actor;
+			_target = target;
+			_skill = skill;
+		}
+		
+		@Override
+		public void run() {
+			if (_activeChar.isAttackingNow()) {
+				_activeChar.abortAttack();
+			}
+			_activeChar.getAI().changeIntentionToCast(_skill, _target);
+		}
+	}
+	
+	/**
+	 * Constructor of L2CharacterAI.
+	 * @param creature the creature
+	 */
+	public L2CharacterAI(L2Character creature) {
+		super(creature);
+	}
+	
+	public IntentionCommand getNextIntention() {
+		return null;
+	}
+	
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+		if ((attacker instanceof L2Attackable) && !attacker.isCoreAIDisabled()) {
+			clientStartAutoAttack();
+		}
+	}
+	
+	/**
+	 * Manage the Idle Intention : Stop Attack, Movement and Stand Up the actor.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Set the AI Intention to AI_INTENTION_IDLE</li>
+	 * <li>Init cast and attack target</li>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Stand up the actor server side AND client side by sending Server->Client packet ChangeWaitType (broadcast)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionIdle() {
+		// Set the AI Intention to AI_INTENTION_IDLE
+		changeIntention(AI_INTENTION_IDLE, null, null);
+		
+		// Init cast and attack target
+		setCastTarget(null);
+		setAttackTarget(null);
+		
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(null);
+		
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		clientStopAutoAttack();
+		
+	}
+	
+	/**
+	 * Manage the Active Intention : Stop Attack, Movement and Launch Think Event.<br>
+	 * <B><U> Actions</U> : <I>if the Intention is not already Active</I></B>
+	 * <ul>
+	 * <li>Set the AI Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>Init cast and attack target</li>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Launch the Think Event</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionActive() {
+		// Check if the Intention is not already Active
+		if (getIntention() != AI_INTENTION_ACTIVE) {
+			// Set the AI Intention to AI_INTENTION_ACTIVE
+			changeIntention(AI_INTENTION_ACTIVE, null, null);
+			
+			// Init cast and attack target
+			setCastTarget(null);
+			setAttackTarget(null);
+			
+			// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+			clientStopMoving(null);
+			
+			// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+			clientStopAutoAttack();
+			
+			// Also enable random animations for this L2Character if allowed
+			// This is only for mobs - town npcs are handled in their constructor
+			if (_actor instanceof L2Attackable attackable) {
+				attackable.startRandomAnimationTimer();
+			}
+			
+			// Launch the Think Event
+			onEvtThink();
+		}
+	}
+	
+	/**
+	 * Manage the Rest Intention.<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Set the AI Intention to AI_INTENTION_IDLE</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionRest() {
+		// Set the AI Intention to AI_INTENTION_IDLE
+		setIntention(AI_INTENTION_IDLE);
+	}
+	
+	/**
+	 * Manage the Attack Intention : Stop current Attack (if necessary), Start a new Attack and Launch Think Event.<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_ATTACK</li>
+	 * <li>Set or change the AI attack target</li>
+	 * <li>Start the actor Auto Attack client side by sending Server->Client packet AutoAttackStart (broadcast)</li>
+	 * <li>Launch the Think Event</li>
+	 * </ul>
+	 * <B><U> Overridden in</U> :</B>
+	 * <ul>
+	 * <li>L2AttackableAI : Calculate attack timeout</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+		if (target == null) {
+			clientActionFailed();
+			return;
+		}
+		
+		if (getIntention() == AI_INTENTION_REST) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAfraid()) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			if (_actor.isPlayer()) {
+				((L2PlayerAI) this).saveNextIntention(AI_INTENTION_ATTACK, target, null);
+			}
+			return;
+		}
+		
+		// Check if the Intention is already AI_INTENTION_ATTACK
+		if (getIntention() == AI_INTENTION_ATTACK) {
+			// Check if the AI already targets the L2Character
+			if (getAttackTarget() != target) {
+				// Set the AI attack target (change target)
+				setAttackTarget(target);
+				
+				stopFollow();
+				
+				// Launch the Think Event
+				notifyEvent(CtrlEvent.EVT_THINK);
+				
+			} else {
+				clientActionFailed(); // else client freezes until cancel target
+			}
+		} else {
+			// Set the Intention of this AbstractAI to AI_INTENTION_ATTACK
+			changeIntention(AI_INTENTION_ATTACK, target, null);
+			
+			// Set the AI attack target
+			setAttackTarget(target);
+			
+			stopFollow();
+			
+			// Launch the Think Event
+			notifyEvent(CtrlEvent.EVT_THINK);
+		}
+	}
+	
+	/**
+	 * Manage the Cast Intention : Stop current Attack, Init the AI in order to cast and Launch Think Event.<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Set the AI cast target</li>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor</li>
+	 * <li>Set the AI skill used by INTENTION_CAST</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_CAST</li>
+	 * <li>Launch the Think Event</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionCast(Skill skill, L2Object target) {
+		if ((getIntention() == AI_INTENTION_REST) && skill.isMagic()) {
+			clientActionFailed();
+			_actor.setIsCastingNow(false);
+			return;
+		}
+		
+		if (_actor.isAttackingNow()) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new CastTask(_actor, skill, target), MILLISECONDS.convert(_actor.getAttackEndTime() - System.nanoTime(), NANOSECONDS));
+		} else {
+			changeIntentionToCast(skill, target);
+		}
+	}
+	
+	protected void changeIntentionToCast(Skill skill, L2Object target) {
+		// Set the AI cast target
+		setCastTarget((L2Character) target);
+		// Set the AI skill used by INTENTION_CAST
+		_skill = skill;
+		// Change the Intention of this AbstractAI to AI_INTENTION_CAST
+		changeIntention(AI_INTENTION_CAST, skill, target);
+		
+		// Launch the Think Event
+		notifyEvent(CtrlEvent.EVT_THINK);
+	}
+	
+	/**
+	 * Manage the Move To Intention : Stop current Attack and Launch a Move to Location Task.<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack server side AND client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_MOVE_TO</li>
+	 * <li>Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation (broadcast)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionMoveTo(Location loc) {
+		if (getIntention() == AI_INTENTION_REST) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow()) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		// Set the Intention of this AbstractAI to AI_INTENTION_MOVE_TO
+		changeIntention(AI_INTENTION_MOVE_TO, loc, null);
+		
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		clientStopAutoAttack();
+		
+		// Abort the attack of the L2Character and send Server->Client ActionFailed packet
+		_actor.abortAttack();
+		
+		// Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation (broadcast)
+		moveTo(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	/**
+	 * Manage the Follow Intention : Stop current Attack and Launch a Follow Task.<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack server side AND client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_FOLLOW</li>
+	 * <li>Create and Launch an AI Follow Task to execute every 1s</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionFollow(L2Character target) {
+		if (getIntention() == AI_INTENTION_REST) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow()) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		if (_actor.isMovementDisabled()) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		// Dead actors can`t follow
+		if (_actor.isDead()) {
+			clientActionFailed();
+			return;
+		}
+		
+		// do not follow yourself
+		if (_actor == target) {
+			clientActionFailed();
+			return;
+		}
+		
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		clientStopAutoAttack();
+		
+		// Set the Intention of this AbstractAI to AI_INTENTION_FOLLOW
+		changeIntention(AI_INTENTION_FOLLOW, target, null);
+		
+		// Create and Launch an AI Follow Task to execute every 1s
+		startFollow(target);
+	}
+	
+	/**
+	 * Manage the PickUp Intention : Set the pick up target and Launch a Move To Pawn Task (offset=20).<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Set the AI pick up target</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_PICK_UP</li>
+	 * <li>Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionPickUp(L2Object object) {
+		if (getIntention() == AI_INTENTION_REST) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow()) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			if (_actor.isPlayer()) {
+				((L2PlayerAI) this).saveNextIntention(AI_INTENTION_PICK_UP, object, null);
+			}
+			return;
+		}
+		
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		clientStopAutoAttack();
+		
+		if ((object instanceof L2ItemInstance) && (((L2ItemInstance) object).getItemLocation() != ItemLocation.VOID)) {
+			return;
+		}
+		
+		// Set the Intention of this AbstractAI to AI_INTENTION_PICK_UP
+		changeIntention(AI_INTENTION_PICK_UP, object, null);
+		
+		// Set the AI pick up target
+		setTarget(object);
+		if ((object.getX() == 0) && (object.getY() == 0)) // TODO: Find the drop&spawn bug
+		{
+			LOG.warn("Object in coords 0,0 - using a temporary fix");
+			object.setXYZ(getActor().getX(), getActor().getY(), getActor().getZ() + 5);
+		}
+		
+		// Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)
+		moveToPawn(object, 20);
+	}
+	
+	/**
+	 * Manage the Interact Intention : Set the interact target and Launch a Move To Pawn Task (offset=60).<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Set the AI interact target</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_INTERACT</li>
+	 * <li>Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionInteract(L2Object object) {
+		if (getIntention() == AI_INTENTION_REST) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow()) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			if (_actor.isPlayer()) {
+				((L2PlayerAI) this).saveNextIntention(AI_INTENTION_INTERACT, object, null);
+			}
+			return;
+		}
+		
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		clientStopAutoAttack();
+		
+		if (getIntention() != AI_INTENTION_INTERACT) {
+			// Set the Intention of this AbstractAI to AI_INTENTION_INTERACT
+			changeIntention(AI_INTENTION_INTERACT, object, null);
+			
+			// Set the AI interact target
+			setTarget(object);
+			
+			// Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)
+			moveToPawn(object, 60);
+		}
+	}
+	
+	/**
+	 * Do nothing.
+	 */
+	@Override
+	protected void onEvtThink() {
+		// do nothing
+	}
+	
+	/**
+	 * Do nothing.
+	 */
+	@Override
+	protected void onEvtAggression(L2Character target, long aggro) {
+		// do nothing
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Stunned then onAttacked Event.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Break an attack and send Server->Client ActionFailed packet and a System Message to the L2Character</li>
+	 * <li>Break a cast and send Server->Client ActionFailed packet and a System Message to the L2Character</li>
+	 * <li>Launch actions corresponding to the Event onAttacked (only for L2AttackableAI after the stunning period)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtStunned(L2Character attacker) {
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		_actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId()));
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(_actor)) {
+			AttackStanceTaskManager.getInstance().removeAttackStanceTask(_actor);
+		}
+		
+		// Stop Server AutoAttack also
+		setAutoAttacking(false);
+		
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(null);
+		
+		// Launch actions corresponding to the Event onAttacked (only for L2AttackableAI after the stunning period)
+		onEvtAttacked(attacker);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Sleeping.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Break an attack and send Server->Client ActionFailed packet and a System Message to the L2Character</li>
+	 * <li>Break a cast and send Server->Client ActionFailed packet and a System Message to the L2Character</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtSleeping(L2Character attacker) {
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		_actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId()));
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(_actor)) {
+			AttackStanceTaskManager.getInstance().removeAttackStanceTask(_actor);
+		}
+		
+		// stop Server AutoAttack also
+		setAutoAttacking(false);
+		
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(null);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Rooted.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Launch actions corresponding to the Event onAttacked</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtRooted(L2Character attacker) {
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		// _actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId()));
+		// if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(_actor))
+		// AttackStanceTaskManager.getInstance().removeAttackStanceTask(_actor);
+		
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(null);
+		
+		// Launch actions corresponding to the Event onAttacked
+		onEvtAttacked(attacker);
+		
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Confused.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Launch actions corresponding to the Event onAttacked</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtConfused(L2Character attacker) {
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(null);
+		
+		// Launch actions corresponding to the Event onAttacked
+		onEvtAttacked(attacker);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Muted.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Break a cast and send Server->Client ActionFailed packet and a System Message to the L2Character</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtMuted(L2Character attacker) {
+		// Break a cast and send Server->Client ActionFailed packet and a System Message to the L2Character
+		onEvtAttacked(attacker);
+	}
+	
+	/**
+	 * Do nothing.
+	 */
+	@Override
+	protected void onEvtEvaded(L2Character attacker) {
+		// do nothing
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event ReadyToAct.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtReadyToAct() {
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+	}
+	
+	/**
+	 * Do nothing.
+	 */
+	@Override
+	protected void onEvtUserCmd(Object arg0, Object arg1) {
+		// do nothing
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Arrived.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtArrived() {
+		_actor.revalidateZone(true);
+		
+		if (_actor.moveToNextRoutePoint()) {
+			return;
+		}
+		
+		if (_actor instanceof L2Attackable attackable) {
+			attackable.setisReturningToSpawnPoint(false);
+		}
+		clientStoppedMoving();
+		
+		if (_actor instanceof L2Npc npc) {
+			WalkingManager.getInstance().onArrived(npc); // Walking Manager support
+			
+			// Notify to scripts
+			EventDispatcher.getInstance().notifyEventAsync(new NpcMoveFinished(npc), npc);
+		}
+		
+		// If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE
+		if (getIntention() == AI_INTENTION_MOVE_TO) {
+			setIntention(AI_INTENTION_ACTIVE);
+		}
+		
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event ArrivedRevalidate.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtArrivedRevalidate() {
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event ArrivedBlocked.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtArrivedBlocked(Location blocked_at_loc) {
+		// If the Intention was AI_INTENTION_MOVE_TO, set the Intention to AI_INTENTION_ACTIVE
+		if ((getIntention() == AI_INTENTION_MOVE_TO) || (getIntention() == AI_INTENTION_CAST)) {
+			setIntention(AI_INTENTION_ACTIVE);
+		}
+		
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(blocked_at_loc);
+		
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event ForgetObject.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>If the object was targeted and the Intention was AI_INTENTION_INTERACT or AI_INTENTION_PICK_UP, set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>If the object was targeted to attack, stop the auto-attack, cancel target and set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>If the object was targeted to cast, cancel target and set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>If the object was targeted to follow, stop the movement, cancel AI Follow Task and set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>If the targeted object was the actor , cancel AI target, stop AI Follow Task, stop the movement and set the Intention to AI_INTENTION_IDLE</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtForgetObject(L2Object object) {
+		// If the object was targeted and the Intention was AI_INTENTION_INTERACT or AI_INTENTION_PICK_UP, set the Intention to AI_INTENTION_ACTIVE
+		if (getTarget() == object) {
+			setTarget(null);
+			
+			if ((getIntention() == AI_INTENTION_INTERACT) || (getIntention() == AI_INTENTION_PICK_UP)) {
+				setIntention(AI_INTENTION_ACTIVE);
+			}
+		}
+		
+		// Check if the object was targeted to attack
+		if (getAttackTarget() == object) {
+			// Cancel attack target
+			setAttackTarget(null);
+			
+			// Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE);
+		}
+		
+		// Check if the object was targeted to cast
+		if (getCastTarget() == object) {
+			// Cancel cast target
+			setCastTarget(null);
+			
+			// Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE);
+		}
+		
+		// Check if the object was targeted to follow
+		if (getFollowTarget() == object) {
+			// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+			clientStopMoving(null);
+			
+			// Stop an AI Follow Task
+			stopFollow();
+			
+			// Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE);
+		}
+		
+		// Check if the targeted object was the actor
+		if (_actor == object) {
+			// Cancel AI target
+			setTarget(null);
+			setAttackTarget(null);
+			setCastTarget(null);
+			
+			// Stop an AI Follow Task
+			stopFollow();
+			
+			// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+			clientStopMoving(null);
+			
+			// Set the Intention of this AbstractAI to AI_INTENTION_IDLE
+			changeIntention(AI_INTENTION_IDLE, null, null);
+		}
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Cancel.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop an AI Follow Task</li>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtCancel() {
+		_actor.abortCast();
+		
+		// Stop an AI Follow Task
+		stopFollow();
+		
+		if (!AttackStanceTaskManager.getInstance().hasAttackStanceTask(_actor)) {
+			_actor.broadcastPacket(new AutoAttackStop(_actor.getObjectId()));
+		}
+		
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Dead.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop an AI Follow Task</li>
+	 * <li>Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtDead() {
+		// Stop an AI Tasks
+		stopAITask();
+		
+		// Kill the actor client side by sending Server->Client packet AutoAttackStop, StopMove/StopRotation, Die (broadcast)
+		clientNotifyDead();
+		
+		if (!(_actor instanceof L2Playable)) {
+			_actor.setWalking();
+		}
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Fake Death.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop an AI Follow Task</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtFakeDeath() {
+		// Stop an AI Follow Task
+		stopFollow();
+		
+		// Stop the actor movement and send Server->Client packet StopMove/StopRotation (broadcast)
+		clientStopMoving(null);
+		
+		// Init AI
+		_intention = AI_INTENTION_IDLE;
+		setTarget(null);
+		setCastTarget(null);
+		setAttackTarget(null);
+	}
+	
+	/**
+	 * Do nothing.
+	 */
+	@Override
+	protected void onEvtFinishCasting() {
+		// do nothing
+	}
+	
+	@Override
+	protected void onEvtAfraid(L2Character effector, boolean start) {
+		double radians = Math.toRadians(Util.calculateAngleFrom(effector, _actor));
+		
+		int posX = (int) (_actor.getX() + (FEAR_RANGE * Math.cos(radians)));
+		int posY = (int) (_actor.getY() + (FEAR_RANGE * Math.sin(radians)));
+		int posZ = _actor.getZ();
+		
+		if (!_actor.isPet()) {
+			_actor.setRunning();
+		}
+		
+		// If pathfinding enabled the creature will go to the destination or it will go to the nearest obstacle.
+		final Location destination;
+		if (geodata().getPathFinding() > 0) {
+			destination = GeoData.getInstance().moveCheck(_actor.getX(), _actor.getY(), _actor.getZ(), posX, posY, posZ, _actor.getInstanceId());
+		} else {
+			destination = new Location(posX, posY, posZ, _actor.getInstanceId());
+		}
+		setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
+	}
+	
+	protected boolean maybeMoveToPosition(ILocational worldPosition, int offset) {
+		if (worldPosition == null) {
+			LOG.warn("maybeMoveToPosition: worldPosition == NULL!");
+			return false;
+		}
+		
+		if (offset < 0) {
+			return false; // skill radius -1
+		}
+		
+		if (!_actor.isInsideRadius(worldPosition, offset + _actor.getTemplate().getCollisionRadius(), false, false)) {
+			if (_actor.isMovementDisabled()) {
+				return true;
+			}
+			
+			if (!_actor.isRunning() && !(this instanceof L2PlayerAI) && !(this instanceof L2SummonAI)) {
+				_actor.setRunning();
+			}
+			
+			stopFollow();
+			
+			int x = _actor.getX();
+			int y = _actor.getY();
+			
+			double dx = worldPosition.getX() - x;
+			double dy = worldPosition.getY() - y;
+			
+			double dist = Math.hypot(dx, dy);
+			
+			double sin = dy / dist;
+			double cos = dx / dist;
+			
+			dist -= offset - 5;
+			
+			x += (int) (dist * cos);
+			y += (int) (dist * sin);
+			
+			moveTo(x, y, worldPosition.getZ());
+			return true;
+		}
+		
+		if (getFollowTarget() != null) {
+			stopFollow();
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Manage the Move to Pawn action in function of the distance and of the Interact area.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Get the distance between the current position of the L2Character and the target (x,y)</li>
+	 * <li>If the distance > offset+20, move the actor (by running) to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)</li>
+	 * <li>If the distance <= offset+20, Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * </ul>
+	 * <B><U> Example of use </U> :</B>
+	 * <ul>
+	 * <li>L2PLayerAI, L2SummonAI</li>
+	 * </ul>
+	 * @param target The targeted L2Object
+	 * @param offset The Interact area radius
+	 * @return True if a movement must be done
+	 */
+	protected boolean maybeMoveToPawn(L2Object target, int offset) {
+		// Get the distance between the current position of the L2Character and the target (x,y)
+		if (target == null) {
+			LOG.warn("maybeMoveToPawn: target == NULL!");
+			return false;
+		}
+		if (offset < 0) {
+			return false; // skill radius -1
+		}
+		
+		offset += _actor.getTemplate().getCollisionRadius();
+		if (target instanceof L2Character creature) {
+			offset += creature.getTemplate().getCollisionRadius();
+		}
+		
+		final boolean needToMove;
+		
+		if (target.isDoor()) {
+			L2DoorInstance dor = (L2DoorInstance) target;
+			int xPoint = 0;
+			int yPoint = 0;
+			for (int i : dor.getTemplate().getNodeX()) {
+				xPoint += i;
+			}
+			for (int i : dor.getTemplate().getNodeY()) {
+				yPoint += i;
+			}
+			xPoint /= 4;
+			yPoint /= 4;
+			needToMove = !_actor.isInsideRadius(xPoint, yPoint, dor.getTemplate().getNodeZ(), offset, false, false);
+		} else {
+			needToMove = !_actor.isInsideRadius(target, offset, false, false);
+		}
+		
+		if (needToMove) {
+			// Caller should be L2Playable and thinkAttack/thinkCast/thinkInteract/thinkPickUp
+			if (getFollowTarget() != null) {
+				// allow larger hit range when the target is moving (check is run only once per second)
+				if (!_actor.isInsideRadius(target, offset + 100, false, false)) {
+					return true;
+				}
+				stopFollow();
+				return false;
+			}
+			
+			if (_actor.isMovementDisabled()) {
+				// If player is trying attack target but he cannot move to attack target
+				// change his intention to idle
+				if (_actor.getAI().getIntention() == CtrlIntention.AI_INTENTION_ATTACK) {
+					_actor.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				}
+				
+				return true;
+			}
+			
+			// while flying there is no move to cast
+			if ((_actor.getAI().getIntention() == CtrlIntention.AI_INTENTION_CAST) && (_actor instanceof L2PcInstance) && _actor.isTransformed()) {
+				if (!_actor.getTransformation().isCombat()) {
+					_actor.sendPacket(SystemMessageId.DIST_TOO_FAR_CASTING_STOPPED);
+					_actor.sendPacket(ActionFailed.STATIC_PACKET);
+					return true;
+				}
+			}
+			
+			// If not running, set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+			if (!_actor.isRunning() && !(this instanceof L2PlayerAI) && !(this instanceof L2SummonAI)) {
+				_actor.setRunning();
+			}
+			
+			stopFollow();
+			if ((target instanceof L2Character creature) && !(target instanceof L2DoorInstance)) {
+				if (creature.isMoving()) {
+					offset -= 100;
+				}
+				if (offset < 5) {
+					offset = 5;
+				}
+				
+				startFollow((L2Character) target, offset);
+			} else {
+				// Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)
+				moveToPawn(target, offset);
+			}
+			return true;
+		}
+		
+		if (getFollowTarget() != null) {
+			stopFollow();
+		}
+		
+		// Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)
+		// clientStopMoving(null);
+		return false;
+	}
+	
+	/**
+	 * Modify current Intention and actions if the target is lost or dead.<br>
+	 * <B><U> Actions</U> : <I>If the target is lost or dead</I></B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE</li>
+	 * </ul>
+	 * <B><U> Example of use </U> :</B>
+	 * <ul>
+	 * <li>L2PLayerAI, L2SummonAI</li>
+	 * </ul>
+	 * @param target The targeted L2Object
+	 * @return True if the target is lost or dead (false if fake death)
+	 */
+	protected boolean checkTargetLostOrDead(L2Character target) {
+		if ((target == null) || target.isAlikeDead()) {
+			// check if player is fake death
+			if ((target instanceof L2PcInstance) && ((L2PcInstance) target).isFakeDeath()) {
+				target.stopFakeDeath(true);
+				return false;
+			}
+			
+			// Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE);
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Modify current Intention and actions if the target is lost.<br>
+	 * <B><U> Actions</U> : <I>If the target is lost</I></B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Stop the actor movement server side AND client side by sending Server->Client packet StopMove/StopRotation (broadcast)</li>
+	 * <li>Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE</li>
+	 * </ul>
+	 * <B><U> Example of use </U> :</B>
+	 * <ul>
+	 * <li>L2PLayerAI, L2SummonAI</li>
+	 * </ul>
+	 * @param target The targeted L2Object
+	 * @return True if the target is lost
+	 */
+	protected boolean checkTargetLost(L2Object target) {
+		// check if player is fake death
+		if (target instanceof L2PcInstance targetPlayer) {
+			if (targetPlayer.isFakeDeath()) {
+				targetPlayer.stopFakeDeath(true);
+				return false;
+			}
+		}
+		if (target == null) {
+			// Set the Intention of this AbstractAI to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE);
+			return true;
+		}
+		if ((_actor != null) && (_skill != null) && _skill.isBad() && (_skill.getAffectRange() > 0) && !GeoData.getInstance().canSeeTarget(_actor, target)) {
+			setIntention(AI_INTENTION_ACTIVE);
+			return true;
+		}
+		return false;
+	}
+	
+	protected class SelfAnalysis {
+		public boolean isMage = false;
+		public boolean isBalanced;
+		public boolean isArcher = false;
+		public boolean isHealer = false;
+		public boolean isFighter = false;
+		public boolean cannotMoveOnLand = false;
+		public List<Skill> generalSkills = new ArrayList<>();
+		public List<Skill> buffSkills = new ArrayList<>();
+		public List<Skill> debuffSkills = new ArrayList<>();
+		public int lastDebuffTick = 0;
+		public List<Skill> cancelSkills = new ArrayList<>();
+		public List<Skill> healSkills = new ArrayList<>();
+		public List<Skill> generalDisablers = new ArrayList<>();
+		public List<Skill> sleepSkills = new ArrayList<>();
+		public List<Skill> rootSkills = new ArrayList<>();
+		public List<Skill> muteSkills = new ArrayList<>();
+		public List<Skill> resurrectSkills = new ArrayList<>();
+		public boolean hasHealOrResurrect = false;
+		public boolean hasLongRangeSkills = false;
+		public boolean hasLongRangeDamageSkills = false;
+		public int maxCastRange = 0;
+		
+		public SelfAnalysis() {
+		}
+		
+		public void init() {
+			switch (((L2NpcTemplate) _actor.getTemplate()).getAIType()) {
+				case MAGE -> isMage = true;
+				case CORPSE, BALANCED -> isBalanced = true;
+				case ARCHER -> isArcher = true;
+				case HEALER -> isHealer = true;
+				default -> isFighter = true;
+			}
+			// water movement analysis
+			if (_actor.isNpc()) {
+				switch (_actor.getId()) {
+					case 20314, 20849 -> cannotMoveOnLand = true;
+					default -> cannotMoveOnLand = false;
+				}
+			}
+			// skill analysis
+			for (Skill sk : _actor.getAllSkills()) {
+				if (sk.isPassive()) {
+					continue;
+				}
+				int castRange = sk.getCastRange();
+				boolean hasLongRangeDamageSkill = false;
+				
+				if (sk.isContinuous()) {
+					if (!sk.isDebuff()) {
+						buffSkills.add(sk);
+					} else {
+						debuffSkills.add(sk);
+					}
+					continue;
+				}
+				
+				if (sk.hasEffectType(L2EffectType.DISPEL)) {
+					cancelSkills.add(sk);
+				} else if (sk.hasEffectType(L2EffectType.HP)) {
+					healSkills.add(sk);
+					hasHealOrResurrect = true;
+				} else if (sk.hasEffectType(L2EffectType.SLEEP)) {
+					sleepSkills.add(sk);
+				} else if (sk.hasEffectType(L2EffectType.STUN)) {
+					// hardcoding petrification until improvements are made to
+					// EffectTemplate... petrification is totally different for
+					// AI than paralyze
+					switch (sk.getId()) {
+						case 367, 4111, 4383, 4616, 4578 -> sleepSkills.add(sk);
+						default -> generalDisablers.add(sk);
+					}
+				} else if (sk.hasEffectType(L2EffectType.ROOT)) {
+					rootSkills.add(sk);
+				} else if (sk.hasEffectType(L2EffectType.FEAR)) {
+					debuffSkills.add(sk);
+				} else if (sk.hasEffectType(L2EffectType.MUTE)) {
+					muteSkills.add(sk);
+				} else if (sk.hasEffectType(L2EffectType.RESURRECTION)) {
+					resurrectSkills.add(sk);
+					hasHealOrResurrect = true;
+				} else {
+					generalSkills.add(sk);
+					hasLongRangeDamageSkill = true;
+				}
+				
+				if (castRange > 70) {
+					hasLongRangeSkills = true;
+					if (hasLongRangeDamageSkill) {
+						hasLongRangeDamageSkills = true;
+					}
+				}
+				if (castRange > maxCastRange) {
+					maxCastRange = castRange;
+				}
+				
+			}
+			// Because of missing skills, some mages/balanced cannot play like mages
+			if (!hasLongRangeDamageSkills && isMage) {
+				isBalanced = true;
+				isMage = false;
+				isFighter = false;
+			}
+			if (!hasLongRangeSkills && (isMage || isBalanced)) {
+				isBalanced = false;
+				isMage = false;
+				isFighter = true;
+			}
+			if (generalSkills.isEmpty() && isMage) {
+				isBalanced = true;
+				isMage = false;
+			}
+		}
+	}
+	
+	protected class TargetAnalysis {
+		public L2Character character;
+		public boolean isMage;
+		public boolean isBalanced;
+		public boolean isArcher;
+		public boolean isFighter;
+		public boolean isCanceled;
+		public boolean isSlower;
+		public boolean isMagicResistant;
+		
+		public TargetAnalysis() {
+		}
+		
+		public void update(L2Character target) {
+			// update status once in 4 seconds
+			if ((target == character) && (Rnd.nextInt(100) > 25)) {
+				return;
+			}
+			character = target;
+			if (target == null) {
+				return;
+			}
+			isMage = false;
+			isBalanced = false;
+			isArcher = false;
+			isFighter = false;
+			isCanceled = false;
+			
+			if (target.getMAtk(null, null) > (1.5 * target.getPAtk(null))) {
+				isMage = true;
+			} else if (((target.getPAtk(null) * 0.8) < target.getMAtk(null, null)) || ((target.getMAtk(null, null) * 0.8) > target.getPAtk(null))) {
+				isBalanced = true;
+			} else {
+				L2Weapon weapon = target.getActiveWeaponItem();
+				if ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW))) {
+					isArcher = true;
+				} else {
+					isFighter = true;
+				}
+			}
+			
+			isSlower = target.getRunSpeed() < (_actor.getRunSpeed() - 3);
+			
+			isMagicResistant = (target.getMDef(null, null) * 1.2) > _actor.getMAtk(null, null);
+			
+			if (target.getBuffCount() < 4) {
+				isCanceled = true;
+			}
+		}
+	}
+	
+	@Deprecated
+	public boolean canAura(Skill sk) {
+		// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance.
+		return false;
+	}
+	
+	@Deprecated
+	public boolean canAOE(Skill sk) {
+		// TODO(Zoey76): Handle scope RANGE skills, include Geodata check and distance.
+		return false;
+	}
+	
+	public boolean canParty(Skill sk) {
+		if (isParty(sk)) {
+			int count = 0;
+			int ccount = 0;
+			final var actors = ((L2Npc) _actor);
+			for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange())) {
+				if (!(target instanceof L2Attackable targets) || !GeoData.getInstance().canSeeTarget(_actor, target)) {
+					continue;
+				}
+				if (targets.isInMyClan(actors)) {
+					count++;
+					if (target.isAffectedBySkill(sk.getId())) {
+						ccount++;
+					}
+				}
+			}
+			if (ccount < count) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isParty(Skill sk) {
+		return sk.getAffectScope() == PARTY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java
new file mode 100644
index 00000000..93f29145
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.MobGroup;
+import com.l2jserver.gameserver.model.MobGroupTable;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * AI for controllable mobs
+ * @author littlecrow
+ */
+public final class L2ControllableMobAI extends L2AttackableAI {
+	public static final int AI_IDLE = 1;
+	public static final int AI_NORMAL = 2;
+	public static final int AI_FORCE_ATTACK = 3;
+	public static final int AI_FOLLOW = 4;
+	public static final int AI_CAST = 5;
+	public static final int AI_ATTACK_GROUP = 6;
+	
+	private int _alternateAI;
+	
+	private boolean _isThinking; // to prevent thinking recursively
+	private boolean _isNotMoving;
+	
+	private L2Character _forcedTarget;
+	private MobGroup _targetGroup;
+	
+	public L2ControllableMobAI(L2ControllableMobInstance creature) {
+		super(creature);
+		setAlternateAI(AI_IDLE);
+	}
+	
+	protected void thinkFollow() {
+		L2Attackable me = (L2Attackable) _actor;
+		
+		if (!Util.checkIfInRange(MobGroupTable.FOLLOW_RANGE, me, getForcedTarget(), true)) {
+			int signX = (Rnd.nextInt(2) == 0) ? -1 : 1;
+			int signY = (Rnd.nextInt(2) == 0) ? -1 : 1;
+			int randX = Rnd.nextInt(MobGroupTable.FOLLOW_RANGE);
+			int randY = Rnd.nextInt(MobGroupTable.FOLLOW_RANGE);
+			
+			moveTo(getForcedTarget().getX() + (signX * randX), getForcedTarget().getY() + (signY * randY), getForcedTarget().getZ());
+		}
+	}
+	
+	@Override
+	protected void onEvtThink() {
+		if (_isThinking) {
+			return;
+		}
+		
+		_isThinking = true;
+		
+		try {
+			switch (getAlternateAI()) {
+				case AI_IDLE:
+					if (getIntention() != CtrlIntention.AI_INTENTION_ACTIVE) {
+						setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					}
+					break;
+				case AI_FOLLOW:
+					thinkFollow();
+					break;
+				case AI_CAST:
+					thinkCast();
+					break;
+				case AI_FORCE_ATTACK:
+					thinkForceAttack();
+					break;
+				case AI_ATTACK_GROUP:
+					thinkAttackGroup();
+					break;
+				default:
+					if (getIntention() == AI_INTENTION_ACTIVE) {
+						thinkActive();
+					} else if (getIntention() == AI_INTENTION_ATTACK) {
+						thinkAttack();
+					}
+					break;
+			}
+		} finally {
+			_isThinking = false;
+		}
+	}
+	
+	@Override
+	protected void thinkCast() {
+		final var attackTarget = getAttackTarget();
+		if ((attackTarget == null) || attackTarget.isAlikeDead()) {
+			setAttackTarget(findNextRndTarget());
+			clientStopMoving(null);
+			
+			if (attackTarget == null) {
+				return;
+			}
+		}
+		
+		final var actor = getActor();
+		actor.setTarget(attackTarget);
+		
+		if (!_actor.isMuted()) {
+			int max_range = 0;
+			// check distant skills
+			
+			for (Skill sk : _actor.getAllSkills()) {
+				if (Util.checkIfInRange(sk.getCastRange(), _actor, attackTarget, true) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk))) {
+					_actor.doCast(sk);
+					return;
+				}
+				
+				max_range = Math.max(max_range, sk.getCastRange());
+			}
+			
+			if (!isNotMoving()) {
+				moveToPawn(attackTarget, max_range);
+			}
+		}
+	}
+	
+	protected void thinkAttackGroup() {
+		L2Character target = getForcedTarget();
+		if ((target == null) || target.isAlikeDead()) {
+			// try to get next group target
+			setForcedTarget(findNextGroupTarget());
+			clientStopMoving(null);
+		}
+		
+		if (target == null) {
+			return;
+		}
+		
+		_actor.setTarget(target);
+		// as a response, we put the target in a forced attack mode
+		L2ControllableMobInstance theTarget = (L2ControllableMobInstance) target;
+		L2ControllableMobAI ctrlAi = (L2ControllableMobAI) theTarget.getAI();
+		ctrlAi.forceAttack(_actor);
+		
+		double dist2 = _actor.calculateDistance(target, false, true);
+		int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius();
+		int max_range = range;
+		
+		if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) {
+			// check distant skills
+			for (Skill sk : _actor.getAllSkills()) {
+				int castRange = sk.getCastRange();
+				
+				if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk))) {
+					_actor.doCast(sk);
+					return;
+				}
+				
+				max_range = Math.max(max_range, castRange);
+			}
+			
+			if (!isNotMoving()) {
+				moveToPawn(target, range);
+			}
+			
+			return;
+		}
+		_actor.doAttack(target);
+	}
+	
+	protected void thinkForceAttack() {
+		if ((getForcedTarget() == null) || getForcedTarget().isAlikeDead()) {
+			clientStopMoving(null);
+			setIntention(AI_INTENTION_ACTIVE);
+			setAlternateAI(AI_IDLE);
+		}
+		
+		_actor.setTarget(getForcedTarget());
+		double dist2 = _actor.calculateDistance(getForcedTarget(), false, true);
+		int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getForcedTarget().getTemplate().getCollisionRadius();
+		int max_range = range;
+		
+		if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) {
+			// check distant skills
+			for (Skill sk : _actor.getAllSkills()) {
+				int castRange = sk.getCastRange();
+				
+				if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk))) {
+					_actor.doCast(sk);
+					return;
+				}
+				
+				max_range = Math.max(max_range, castRange);
+			}
+			
+			if (!isNotMoving()) {
+				moveToPawn(getForcedTarget(), _actor.getPhysicalAttackRange()/* range */);
+			}
+			
+			return;
+		}
+		
+		_actor.doAttack(getForcedTarget());
+	}
+	
+	@Override
+	protected void thinkAttack() {
+		if ((getAttackTarget() == null) || getAttackTarget().isAlikeDead()) {
+			if (getAttackTarget() != null) {
+				// stop hating
+				L2Attackable npc = (L2Attackable) _actor;
+				npc.stopHating(getAttackTarget());
+			}
+			
+			setIntention(AI_INTENTION_ACTIVE);
+		} else {
+			// notify aggression
+			if (((L2Npc) _actor).getTemplate().getClans() != null) {
+				Collection<L2Object> objs = _actor.getKnownList().getKnownObjects().values();
+				for (L2Object obj : objs) {
+					if (!(obj instanceof L2Npc npc)) {
+						continue;
+					}
+					
+					if (!npc.isInMyClan((L2Npc) _actor)) {
+						continue;
+					}
+					
+					if (_actor.isInsideRadius(npc, npc.getTemplate().getClanHelpRange(), false, true) && (Math.abs(getAttackTarget().getZ() - npc.getZ()) < 200)) {
+						npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, getAttackTarget(), 1);
+					}
+				}
+			}
+			
+			_actor.setTarget(getAttackTarget());
+			double dist2 = _actor.calculateDistance(getAttackTarget(), false, true);
+			int range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + getAttackTarget().getTemplate().getCollisionRadius();
+			int max_range = range;
+			
+			if (!_actor.isMuted() && (dist2 > ((range + 20) * (range + 20)))) {
+				// check distant skills
+				for (Skill sk : _actor.getAllSkills()) {
+					int castRange = sk.getCastRange();
+					
+					if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume2(sk))) {
+						_actor.doCast(sk);
+						return;
+					}
+					
+					max_range = Math.max(max_range, castRange);
+				}
+				
+				moveToPawn(getAttackTarget(), range);
+				return;
+			}
+			
+			// Force mobs to attack anybody if confused.
+			L2Character hated;
+			
+			if (_actor.isConfused()) {
+				hated = findNextRndTarget();
+			} else {
+				hated = getAttackTarget();
+			}
+			
+			if (hated == null) {
+				setIntention(AI_INTENTION_ACTIVE);
+				return;
+			}
+			
+			if (hated != getAttackTarget()) {
+				setAttackTarget(hated);
+			}
+			
+			if (!_actor.isMuted() && (Rnd.nextInt(5) == 3)) {
+				for (Skill sk : _actor.getAllSkills()) {
+					int castRange = sk.getCastRange();
+					
+					if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() < _actor.getStat().getMpConsume2(sk))) {
+						_actor.doCast(sk);
+						return;
+					}
+				}
+			}
+			
+			_actor.doAttack(getAttackTarget());
+		}
+	}
+	
+	@Override
+	protected void thinkActive() {
+		setAttackTarget(findNextRndTarget());
+		L2Character hated;
+		
+		if (_actor.isConfused()) {
+			hated = findNextRndTarget();
+		} else {
+			hated = getAttackTarget();
+		}
+		
+		if (hated != null) {
+			_actor.setRunning();
+			setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated);
+		}
+	}
+	
+	private boolean checkAutoAttackCondition(L2Character target) {
+		if ((target == null) || (target instanceof L2NpcInstance) || (target instanceof L2DoorInstance)) {
+			return false;
+		}
+		
+		// TODO(Zoey76)[#112]: This check must change if summon fall in L2Npc hierarchy.
+		if (target.isNpc()) {
+			return false;
+		}
+		
+		// Check if the target isn't invulnerable
+		if (target.isInvul() || target.isAlikeDead()) {
+			return false;
+		}
+		
+		// Spawn protection (only against mobs)
+		if (target.isPlayer() && ((L2PcInstance) target).isSpawnProtected()) {
+			return false;
+		}
+		
+		final var actor = getActor();
+		if (!_actor.isInsideRadius(target, actor.getAggroRange(), false, false) || (Math.abs(_actor.getZ() - target.getZ()) > 100)) {
+			return false;
+		}
+		
+		// Check if the target is a L2Playable
+		if (target.isPlayable()) {
+			// Check if the target isn't in silent move mode
+			if (((L2Playable) target).isSilentMovingAffected()) {
+				return false;
+			}
+		}
+		return actor.isAggressive();
+	}
+	
+	private L2Character findNextRndTarget() {
+		final var potentialTarget = _actor.getKnownList().getKnownCharactersInRadius(getActor().getAggroRange()).stream().filter(this::checkAutoAttackCondition).collect(Collectors.toList());
+		if (potentialTarget.isEmpty()) {
+			return null;
+		}
+		return potentialTarget.get(Rnd.nextInt(potentialTarget.size()));
+	}
+	
+	private L2ControllableMobInstance findNextGroupTarget() {
+		return getGroupTarget().getRandomMob();
+	}
+	
+	public int getAlternateAI() {
+		return _alternateAI;
+	}
+	
+	public void setAlternateAI(int alternateAI) {
+		_alternateAI = alternateAI;
+	}
+	
+	public void forceAttack(L2Character target) {
+		setAlternateAI(AI_FORCE_ATTACK);
+		setForcedTarget(target);
+	}
+	
+	public void forceAttackGroup(MobGroup group) {
+		setForcedTarget(null);
+		setGroupTarget(group);
+		setAlternateAI(AI_ATTACK_GROUP);
+	}
+	
+	public void stop() {
+		setAlternateAI(AI_IDLE);
+		clientStopMoving(null);
+	}
+	
+	public void move(int x, int y, int z) {
+		moveTo(x, y, z);
+	}
+	
+	public void follow(L2Character target) {
+		setAlternateAI(AI_FOLLOW);
+		setForcedTarget(target);
+	}
+	
+	public boolean isNotMoving() {
+		return _isNotMoving;
+	}
+	
+	public void setNotMoving(boolean isNotMoving) {
+		_isNotMoving = isNotMoving;
+	}
+	
+	private L2Character getForcedTarget() {
+		return _forcedTarget;
+	}
+	
+	private MobGroup getGroupTarget() {
+		return _targetGroup;
+	}
+	
+	private void setForcedTarget(L2Character forcedTarget) {
+		_forcedTarget = forcedTarget;
+	}
+	
+	private void setGroupTarget(MobGroup targetGroup) {
+		_targetGroup = targetGroup;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2DoorAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2DoorAI.java
new file mode 100644
index 00000000..b77fa00e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2DoorAI.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author mkizub
+ */
+public class L2DoorAI extends L2CharacterAI {
+	public L2DoorAI(L2DoorInstance creature) {
+		super(creature);
+	}
+	
+	@Override
+	protected void onIntentionIdle() {
+	}
+	
+	@Override
+	protected void onIntentionActive() {
+	}
+	
+	@Override
+	protected void onIntentionRest() {
+	}
+	
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+	}
+	
+	@Override
+	protected void onIntentionCast(Skill skill, L2Object target) {
+	}
+	
+	@Override
+	protected void onIntentionMoveTo(Location destination) {
+	}
+	
+	@Override
+	protected void onIntentionFollow(L2Character target) {
+	}
+	
+	@Override
+	protected void onIntentionPickUp(L2Object item) {
+	}
+	
+	@Override
+	protected void onIntentionInteract(L2Object object) {
+	}
+	
+	@Override
+	protected void onEvtThink() {
+	}
+	
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+		ThreadPoolManager.getInstance().executeGeneral(new onEventAttackedDoorTask((L2DoorInstance) _actor, attacker));
+	}
+	
+	@Override
+	protected void onEvtAggression(L2Character target, long aggro) {
+	}
+	
+	@Override
+	protected void onEvtStunned(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtSleeping(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtRooted(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtReadyToAct() {
+	}
+	
+	@Override
+	protected void onEvtUserCmd(Object arg0, Object arg1) {
+	}
+	
+	@Override
+	protected void onEvtArrived() {
+	}
+	
+	@Override
+	protected void onEvtArrivedRevalidate() {
+	}
+	
+	@Override
+	protected void onEvtArrivedBlocked(Location blocked_at_loc) {
+	}
+	
+	@Override
+	protected void onEvtForgetObject(L2Object object) {
+	}
+	
+	@Override
+	protected void onEvtCancel() {
+	}
+	
+	@Override
+	protected void onEvtDead() {
+	}
+	
+	private class onEventAttackedDoorTask implements Runnable {
+		private final L2DoorInstance _door;
+		private final L2Character _attacker;
+		
+		public onEventAttackedDoorTask(L2DoorInstance door, L2Character attacker) {
+			_door = door;
+			_attacker = attacker;
+		}
+		
+		@Override
+		public void run() {
+			for (L2DefenderInstance guard : _door.getKnownDefenders()) {
+				if (_actor.isInsideRadius(guard, guard.getTemplate().getClanHelpRange(), false, true) && (Math.abs(_attacker.getZ() - guard.getZ()) < 200)) {
+					guard.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, _attacker, 15);
+				}
+			}
+		}
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java
new file mode 100644
index 00000000..27211acc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java
@@ -0,0 +1,806 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+
+import java.util.Collection;
+import java.util.concurrent.Future;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Fort siege guards AI.
+ */
+public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable {
+	private static final int MAX_ATTACK_TIMEOUT = 30 * GameTimeController.TICKS_PER_SECOND; // 30s converted to ticks
+	
+	/** The L2Attackable AI task executed every 1s (call onEvtThink method) */
+	private Future<?> _aiTask;
+	
+	/** For attack AI, analysis of mob and its targets */
+	private final SelfAnalysis _selfAnalysis = new SelfAnalysis();
+	
+	/** The delay after which the attacked is stopped */
+	private int _attackTimeout;
+	
+	/** The L2Attackable aggro counter */
+	private int _globalAggro;
+	
+	/** The flag used to indicate that a thinking action is in progress */
+	private boolean _thinking; // to prevent recursive thinking
+	
+	private final int _attackRange;
+	
+	/**
+	 * Constructor of L2AttackableAI.
+	 * @param creature the creature
+	 */
+	public L2FortSiegeGuardAI(L2DefenderInstance creature) {
+		super(creature);
+		_selfAnalysis.init();
+		_attackTimeout = Integer.MAX_VALUE;
+		_globalAggro = -10; // 10 seconds timeout of ATTACK after respawn
+		_attackRange = _actor.getPhysicalAttackRange();
+	}
+	
+	@Override
+	public void run() {
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+	}
+	
+	/**
+	 * <B><U> Actor is a L2GuardInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk or a Door</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The L2PcInstance target has karma (=PK)</li>
+	 * <li>The L2MonsterInstance target is aggressive</li>
+	 * </ul>
+	 * <B><U> Actor is a L2SiegeGuardInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk or a Door</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>A siege is in progress</li>
+	 * <li>The L2PcInstance target isn't a Defender</li>
+	 * </ul>
+	 * <B><U> Actor is a L2FriendlyMobInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk, a Door or another L2NpcInstance</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The L2PcInstance target has karma (=PK)</li>
+	 * </ul>
+	 * <B><U> Actor is a L2MonsterInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk, a Door or another L2NpcInstance</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The actor is Aggressive</li>
+	 * </ul>
+	 * @param target The targeted L2Object
+	 * @return True if the target is autoattackable (depends on the actor type).
+	 */
+	private boolean autoAttackCondition(L2Character target) {
+		// Check if the target isn't another guard, folk or a door
+		if ((target == null) || (target instanceof L2DefenderInstance) || (target instanceof L2NpcInstance) || (target instanceof L2DoorInstance) || target.isAlikeDead() || (target instanceof L2FortCommanderInstance) || (target instanceof L2Playable)) {
+			L2PcInstance player = null;
+			if (target instanceof L2PcInstance) {
+				player = ((L2PcInstance) target);
+			} else if (target instanceof L2Summon) {
+				player = ((L2Summon) target).getOwner();
+			}
+			if ((player == null) || ((player.getClan() != null) && (player.getClan().getFortId() == ((L2Npc) _actor).getFort().getResidenceId()))) {
+				return false;
+			}
+		}
+		
+		// Check if the target isn't invulnerable
+		if (target.isInvul()) {
+			// However EffectInvincible requires to check GMs specially
+			if (target.isPlayer() && target.isGM()) {
+				return false;
+			}
+			if (target.isSummon() && ((L2Summon) target).getOwner().isGM()) {
+				return false;
+			}
+		}
+		
+		// Get the owner if the target is a summon
+		if (target instanceof L2Summon) {
+			L2PcInstance owner = ((L2Summon) target).getOwner();
+			if (_actor.isInsideRadius(owner, 1000, true, false)) {
+				target = owner;
+			}
+		}
+		
+		// Check if the target is a L2PcInstance
+		if (target instanceof L2Playable playable) {
+			// Check if the target isn't in silent move mode AND too far (>100)
+			if (playable.isSilentMovingAffected() && !_actor.isInsideRadius(target, 250, false, false)) {
+				return false;
+			}
+		}
+		// Los Check Here
+		return (_actor.isAutoAttackable(target) && GeoData.getInstance().canSeeTarget(_actor, target));
+		
+	}
+	
+	/**
+	 * Set the Intention of this L2CharacterAI and create an AI Task executed every 1s (call onEvtThink method) for this L2Attackable.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</B></FONT>
+	 * @param intention The new Intention to set to the AI
+	 * @param arg0 The first parameter of the Intention
+	 * @param arg1 The second parameter of the Intention
+	 */
+	@Override
+	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		LOG.debug("{}: changeIntention({}, {}, {})", getClass().getSimpleName(), intention, arg0, arg1);
+		
+		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
+		{
+			// Check if actor is not dead
+			if (!_actor.isAlikeDead()) {
+				L2Attackable npc = (L2Attackable) _actor;
+				
+				// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
+				if (!npc.getKnownList().getKnownPlayers().isEmpty()) {
+					intention = AI_INTENTION_ACTIVE;
+				} else {
+					intention = AI_INTENTION_IDLE;
+				}
+			}
+			
+			if (intention == AI_INTENTION_IDLE) {
+				// Set the Intention of this L2AttackableAI to AI_INTENTION_IDLE
+				super.changeIntention(AI_INTENTION_IDLE, null, null);
+				
+				// Stop AI task and detach AI from NPC
+				if (_aiTask != null) {
+					_aiTask.cancel(true);
+					_aiTask = null;
+				}
+				
+				// Cancel the AI
+				_actor.detachAI();
+				
+				return;
+			}
+		}
+		
+		// Set the Intention of this L2AttackableAI to intention
+		super.changeIntention(intention, arg0, arg1);
+		
+		// If not idle - create an AI task (schedule onEvtThink repeatedly)
+		if ((_aiTask == null) && (_actor.isInActiveRegion())) {
+			_aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 1000, 1000);
+		}
+	}
+	
+	/**
+	 * Manage the Attack Intention : Stop current Attack (if necessary), Calculate attack timeout, Start a new Attack and Launch Think Event.
+	 * @param target The L2Character to attack
+	 */
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+		// Calculate the attack timeout
+		_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+		
+		// Manage the Attack Intention : Stop current Attack (if necessary), Start a new Attack and Launch Think Event
+		// if (_actor.getTarget() != null)
+		super.onIntentionAttack(target);
+	}
+	
+	/**
+	 * Manage AI standard thinks of a L2Attackable (called by onEvtThink).<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Update every 1s the _globalAggro counter to come close to 0</li>
+	 * <li>If the actor is Aggressive and can attack, add all autoAttackable L2Character in its Aggro Range to its _aggroList, chose a target and order to attack it</li>
+	 * <li>If the actor can't attack, order to it to return to its home location</li>
+	 * </ul>
+	 */
+	private void thinkActive() {
+		L2Attackable npc = (L2Attackable) _actor;
+		
+		// Update every 1s the _globalAggro counter to come close to 0
+		if (_globalAggro != 0) {
+			if (_globalAggro < 0) {
+				_globalAggro++;
+			} else {
+				_globalAggro--;
+			}
+		}
+		
+		// Add all autoAttackable L2Character in L2Attackable Aggro Range to its _aggroList with 0 damage and 1 hate
+		// A L2Attackable isn't aggressive during 10s after its spawn because _globalAggro is set to -10
+		if (_globalAggro >= 0) {
+			for (L2Character target : npc.getKnownList().getKnownCharactersInRadius(_attackRange)) {
+				if (target == null) {
+					continue;
+				}
+				if (autoAttackCondition(target)) // check aggression
+				{
+					// Get the hate level of the L2Attackable against this L2Character target contained in _aggroList
+					long hating = npc.getHating(target);
+					
+					// Add the attacker to the L2Attackable _aggroList with 0 damage and 1 hate
+					if (hating == 0) {
+						npc.addDamageHate(target, 0, 1);
+					}
+				}
+			}
+			
+			// Chose a target from its aggroList
+			L2Character hated;
+			if (_actor.isConfused()) {
+				hated = getAttackTarget(); // Force mobs to attack anybody if confused
+			} else {
+				hated = npc.getMostHated();
+				// _mostHatedAnalysis.Update(hated);
+			}
+			
+			// Order to the L2Attackable to attack the target
+			if (hated != null) {
+				// Get the hate level of the L2Attackable against this L2Character target contained in _aggroList
+				long aggro = npc.getHating(hated);
+				if ((aggro + _globalAggro) > 0) {
+					// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+					if (!_actor.isRunning()) {
+						_actor.setRunning();
+					}
+					
+					// Set the AI Intention to AI_INTENTION_ATTACK
+					setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated, null);
+				}
+				
+				return;
+			}
+			
+		}
+		// Order to the L2SiegeGuardInstance to return to its home location because there's no target to attack
+		if (_actor.getWalkSpeed() >= 0) {
+			if (_actor instanceof L2DefenderInstance defender) {
+				defender.returnHome();
+			} else {
+				((L2FortCommanderInstance) _actor).returnHome();
+			}
+		}
+	}
+	
+	/**
+	 * Manage AI attack thinks of a L2Attackable (called by onEvtThink).<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Update the attack timeout if actor is running</li>
+	 * <li>If target is dead or timeout is expired, stop this attack and set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>Call all L2Object of its Faction inside the Faction Range</li>
+	 * <li>Chose a target and order to attack it with magic skill or physical attack</li>
+	 * </ul>
+	 * TODO: Manage casting rules to healer mobs (like Ant Nurses)
+	 */
+	private void thinkAttack() {
+		LOG.debug("{}: thinkAttack(); timeout={}", getClass().getSimpleName(), (_attackTimeout - GameTimeController.getInstance().getGameTicks()));
+		
+		if (_attackTimeout < GameTimeController.getInstance().getGameTicks()) {
+			// Check if the actor is running
+			if (_actor.isRunning()) {
+				// Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others L2PcInstance
+				_actor.setWalking();
+				
+				// Calculate a new attack timeout
+				_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+			}
+		}
+		
+		L2Character attackTarget = getAttackTarget();
+		// Check if target is dead or if timeout is expired to stop this attack
+		if ((attackTarget == null) || attackTarget.isAlikeDead() || (_attackTimeout < GameTimeController.getInstance().getGameTicks())) {
+			// Stop hating this target after the attack timeout or if target is dead
+			if (attackTarget != null) {
+				L2Attackable npc = (L2Attackable) _actor;
+				npc.stopHating(attackTarget);
+			}
+			
+			// Cancel target and timeout
+			_attackTimeout = Integer.MAX_VALUE;
+			setAttackTarget(null);
+			
+			// Set the AI Intention to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE, null, null);
+			
+			_actor.setWalking();
+			return;
+		}
+		
+		factionNotifyAndSupport();
+		attackPrepare();
+	}
+	
+	private void factionNotifyAndSupport() {
+		L2Character target = getAttackTarget();
+		// Call all L2Object of its Faction inside the Faction Range
+		if ((((L2Npc) _actor).getTemplate().getClans() == null) || (target == null)) {
+			return;
+		}
+		
+		if (target.isInvul()) {
+			return; // speeding it up for siege guards
+		}
+		
+		// Go through all L2Character that belong to its faction
+		// for (L2Character cha : _actor.getKnownList().getKnownCharactersInRadius(((L2NpcInstance) _actor).getFactionRange()+_actor.getTemplate().collisionRadius))
+		for (L2Character cha : _actor.getKnownList().getKnownCharactersInRadius(1000)) {
+			if (cha == null) {
+				continue;
+			}
+			
+			if (!(cha instanceof L2Npc npc)) {
+				if (_selfAnalysis.hasHealOrResurrect && (cha instanceof L2PcInstance) && ((L2Npc) _actor).getFort().getSiege().checkIsDefender(cha.getClan())) {
+					// heal friends
+					if (!_actor.isAttackingDisabled() && (cha.getCurrentHp() < (cha.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2.0)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2.0)) && cha.isInCombat()) {
+						for (Skill sk : _selfAnalysis.healSkills) {
+							if (_actor.getCurrentMp() < sk.getMpConsume2()) {
+								continue;
+							}
+							if (_actor.isSkillDisabled(sk)) {
+								continue;
+							}
+							if (!Util.checkIfInRange(sk.getCastRange(), _actor, cha, true)) {
+								continue;
+							}
+							
+							int chance = 5;
+							if (chance >= Rnd.get(100)) {
+								continue;
+							}
+							if (!GeoData.getInstance().canSeeTarget(_actor, cha)) {
+								break;
+							}
+							
+							L2Object oldTarget = _actor.getTarget();
+							_actor.setTarget(cha);
+							clientStopMoving(null);
+							_actor.doCast(sk);
+							_actor.setTarget(oldTarget);
+							return;
+						}
+					}
+				}
+				continue;
+			}
+			
+			if (!npc.isInMyClan((L2Npc) _actor)) {
+				continue;
+			}
+			
+			if (npc.getAI() != null) // TODO: possibly check not needed
+			{
+				if (!npc.isDead() && (Math.abs(target.getZ() - npc.getZ()) < 600)
+				// && _actor.getAttackByList().contains(getAttackTarget())
+					&& ((npc.getAI()._intention == CtrlIntention.AI_INTENTION_IDLE) || (npc.getAI()._intention == CtrlIntention.AI_INTENTION_ACTIVE))
+					// limiting aggro for siege guards
+					&& target.isInsideRadius(npc, 1500, true, false) && GeoData.getInstance().canSeeTarget(npc, target)) {
+					// Notify the L2Object AI with EVT_AGGRESSION
+					npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, getAttackTarget(), 1);
+					return;
+				}
+				// heal friends
+				if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2.0)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2.0)) && npc.isInCombat()) {
+					for (Skill sk : _selfAnalysis.healSkills) {
+						if (_actor.getCurrentMp() < sk.getMpConsume2()) {
+							continue;
+						}
+						if (_actor.isSkillDisabled(sk)) {
+							continue;
+						}
+						if (!Util.checkIfInRange(sk.getCastRange(), _actor, npc, true)) {
+							continue;
+						}
+						
+						int chance = 4;
+						if (chance >= Rnd.get(100)) {
+							continue;
+						}
+						if (!GeoData.getInstance().canSeeTarget(_actor, npc)) {
+							break;
+						}
+						
+						L2Object OldTarget = _actor.getTarget();
+						_actor.setTarget(npc);
+						clientStopMoving(null);
+						_actor.doCast(sk);
+						_actor.setTarget(OldTarget);
+						return;
+					}
+				}
+			}
+		}
+	}
+	
+	private void attackPrepare() {
+		// Get all information needed to choose between physical or magical attack
+		Collection<Skill> skills;
+		double dist_2;
+		int range;
+		L2DefenderInstance sGuard;
+		if (_actor instanceof L2FortCommanderInstance) {
+			sGuard = (L2FortCommanderInstance) _actor;
+		} else {
+			sGuard = (L2DefenderInstance) _actor;
+		}
+		L2Character attackTarget = getAttackTarget();
+		
+		try {
+			_actor.setTarget(attackTarget);
+			skills = _actor.getAllSkills();
+			dist_2 = _actor.calculateDistance(attackTarget, false, true);
+			range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius();
+			if (attackTarget.isMoving()) {
+				range += 50;
+			}
+		} catch (NullPointerException e) {
+			LOG.warn("{}: Attack target is NULL.", getClass().getSimpleName());
+			_actor.setTarget(null);
+			setIntention(AI_INTENTION_IDLE, null, null);
+			return;
+		}
+		
+		// never attack defenders
+		if ((attackTarget instanceof L2PcInstance) && sGuard.getFort().getSiege().checkIsDefender(attackTarget.getClan())) {
+			// Cancel the target
+			sGuard.stopHating(attackTarget);
+			_actor.setTarget(null);
+			setIntention(AI_INTENTION_IDLE, null, null);
+			return;
+		}
+		
+		if (!GeoData.getInstance().canSeeTarget(_actor, attackTarget)) {
+			// Siege guards differ from normal mobs currently:
+			// If target cannot seen, don't attack any more
+			sGuard.stopHating(attackTarget);
+			_actor.setTarget(null);
+			setIntention(AI_INTENTION_IDLE, null, null);
+			return;
+		}
+		
+		// Check if the actor isn't muted and if it is far from target
+		if (!_actor.isMuted() && (dist_2 > (range * range))) {
+			// check for long ranged skills and heal/buff skills
+			for (Skill sk : skills) {
+				int castRange = sk.getCastRange();
+				
+				if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !sk.isPassive()) {
+					
+					L2Object OldTarget = _actor.getTarget();
+					if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP))) {
+						boolean useSkillSelf = true;
+						if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) {
+							useSkillSelf = false;
+							break;
+						}
+						
+						if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) {
+							useSkillSelf = false;
+						}
+						
+						if (useSkillSelf) {
+							_actor.setTarget(_actor);
+						}
+					}
+					
+					clientStopMoving(null);
+					_actor.doCast(sk);
+					_actor.setTarget(OldTarget);
+					return;
+				}
+			}
+			
+			// Check if the L2SiegeGuardInstance is attacking, knows the target and can't run
+			if (!(_actor.isAttackingNow()) && (_actor.getRunSpeed() == 0) && (_actor.getKnownList().knowsObject(attackTarget))) {
+				// Cancel the target
+				_actor.getKnownList().removeKnownObject(attackTarget);
+				_actor.setTarget(null);
+				setIntention(AI_INTENTION_IDLE, null, null);
+			} else {
+				double dx = _actor.getX() - attackTarget.getX();
+				double dy = _actor.getY() - attackTarget.getY();
+				double dz = _actor.getZ() - attackTarget.getZ();
+				double homeX = attackTarget.getX() - sGuard.getSpawn().getX();
+				double homeY = attackTarget.getY() - sGuard.getSpawn().getY();
+				
+				// Check if the L2SiegeGuardInstance isn't too far from it's home location
+				if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) // 1800 * 1800
+					&& (_actor.getKnownList().knowsObject(attackTarget))) {
+					// Cancel the target
+					_actor.getKnownList().removeKnownObject(attackTarget);
+					_actor.setTarget(null);
+					setIntention(AI_INTENTION_IDLE, null, null);
+				} else
+				// Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)
+				{
+					// Temporary hack for preventing guards jumping off towers,
+					// before replacing this with effective geodata checks and AI modification
+					if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct
+					{
+						if (_selfAnalysis.isMage) {
+							range = _selfAnalysis.maxCastRange - 50;
+						}
+						if (_actor.getWalkSpeed() <= 0) {
+							return;
+						}
+						if (attackTarget.isMoving()) {
+							moveToPawn(attackTarget, range - 70);
+						} else {
+							moveToPawn(attackTarget, range);
+						}
+					}
+				}
+			}
+		}
+		// Else, if the actor is muted and far from target, just "move to pawn"
+		else if (_actor.isMuted() && (dist_2 > (range * range))) {
+			// Temporary hack for preventing guards jumping off towers,
+			// before replacing this with effective geodata checks and AI modification
+			double dz = _actor.getZ() - attackTarget.getZ();
+			if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct
+			{
+				if (_selfAnalysis.isMage) {
+					range = _selfAnalysis.maxCastRange - 50;
+				}
+				if (_actor.getWalkSpeed() <= 0) {
+					return;
+				}
+				if (attackTarget.isMoving()) {
+					moveToPawn(attackTarget, range - 70);
+				} else {
+					moveToPawn(attackTarget, range);
+				}
+			}
+		}
+		// Else, if this is close enough to attack
+		else if (dist_2 <= (range * range)) {
+			// Force mobs to attack anybody if confused
+			L2Character hated;
+			if (_actor.isConfused()) {
+				hated = attackTarget;
+			} else {
+				hated = ((L2Attackable) _actor).getMostHated();
+			}
+			
+			if (hated == null) {
+				setIntention(AI_INTENTION_ACTIVE, null, null);
+				return;
+			}
+			if (hated != attackTarget) {
+				attackTarget = hated;
+			}
+			
+			_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+			
+			// check for close combat skills && heal/buff skills
+			if (!_actor.isMuted() && (Rnd.nextInt(100) <= 5)) {
+				for (Skill sk : skills) {
+					int castRange = sk.getCastRange();
+					
+					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !_actor.isSkillDisabled(sk)) {
+						L2Object OldTarget = _actor.getTarget();
+						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP))) {
+							boolean useSkillSelf = true;
+							if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) {
+								useSkillSelf = false;
+								break;
+							}
+							
+							if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) {
+								useSkillSelf = false;
+							}
+							
+							if (useSkillSelf) {
+								_actor.setTarget(_actor);
+							}
+						}
+						
+						clientStopMoving(null);
+						_actor.doCast(sk);
+						_actor.setTarget(OldTarget);
+						return;
+					}
+				}
+			}
+			// Finally, do the physical attack itself
+			_actor.doAttack(attackTarget);
+		}
+	}
+	
+	/**
+	 * Manage AI thinking actions of a L2Attackable.
+	 */
+	@Override
+	protected void onEvtThink() {
+		// if(getIntention() != AI_INTENTION_IDLE && (!_actor.isVisible() || !_actor.hasAI() || !_actor.isKnownPlayers()))
+		// setIntention(AI_INTENTION_IDLE);
+		
+		// Check if the actor can't use skills and if a thinking action isn't already in progress
+		if (_thinking || _actor.isCastingNow() || _actor.isAllSkillsDisabled()) {
+			return;
+		}
+		
+		// Start thinking action
+		_thinking = true;
+		
+		try {
+			// Manage AI thinks of a L2Attackable
+			if (getIntention() == AI_INTENTION_ACTIVE) {
+				thinkActive();
+			} else if (getIntention() == AI_INTENTION_ATTACK) {
+				thinkAttack();
+			}
+		} finally {
+			// Stop thinking action
+			_thinking = false;
+		}
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Attacked.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Init the attack : Calculate the attack timeout, Set the _globalAggro to 0, Add the attacker to the actor _aggroList</li>
+	 * <li>Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance</li>
+	 * <li>Set the Intention to AI_INTENTION_ATTACK</li>
+	 * </ul>
+	 * @param attacker The L2Character that attacks the actor
+	 */
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+		// Calculate the attack timeout
+		_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+		
+		// Set the _globalAggro to 0 to permit attack even just after spawn
+		if (_globalAggro < 0) {
+			_globalAggro = 0;
+		}
+		
+		// Add the attacker to the _aggroList of the actor
+		((L2Attackable) _actor).addDamageHate(attacker, 0, 1);
+		
+		// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+		if (!_actor.isRunning()) {
+			_actor.setRunning();
+		}
+		
+		// Set the Intention to AI_INTENTION_ATTACK
+		if (getIntention() != AI_INTENTION_ATTACK) {
+			setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker, null);
+		}
+		
+		super.onEvtAttacked(attacker);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Aggression.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Add the target to the actor _aggroList or update hate if already present</li>
+	 * <li>Set the actor Intention to AI_INTENTION_ATTACK (if actor is L2GuardInstance check if it isn't too far from its home location)</li>
+	 * </ul>
+	 * @param aggro The value of hate to add to the actor against the target
+	 */
+	@Override
+	protected void onEvtAggression(L2Character target, long aggro) {
+		if (_actor == null) {
+			return;
+		}
+		L2Attackable me = (L2Attackable) _actor;
+		
+		if (target != null) {
+			// Add the target to the actor _aggroList or update hate if already present
+			me.addDamageHate(target, 0, aggro);
+			
+			// Get the hate of the actor against the target
+			aggro = me.getHating(target);
+			
+			if (aggro <= 0) {
+				if (me.getMostHated() == null) {
+					_globalAggro = -25;
+					me.clearAggroList();
+					setIntention(AI_INTENTION_IDLE, null, null);
+				}
+				return;
+			}
+			
+			// Set the actor AI Intention to AI_INTENTION_ATTACK
+			if (getIntention() != CtrlIntention.AI_INTENTION_ATTACK) {
+				// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+				if (!_actor.isRunning()) {
+					_actor.setRunning();
+				}
+				
+				L2DefenderInstance sGuard;
+				if (_actor instanceof L2FortCommanderInstance) {
+					sGuard = (L2FortCommanderInstance) _actor;
+				} else {
+					sGuard = (L2DefenderInstance) _actor;
+				}
+				double homeX = target.getX() - sGuard.getSpawn().getX();
+				double homeY = target.getY() - sGuard.getSpawn().getY();
+				
+				// Check if the L2SiegeGuardInstance is not too far from its home location
+				if (((homeX * homeX) + (homeY * homeY)) < 3240000) {
+					setIntention(CtrlIntention.AI_INTENTION_ATTACK, target, null);
+				}
+			}
+		} else {
+			// currently only for setting lower general aggro
+			if (aggro >= 0) {
+				return;
+			}
+			
+			L2Character mostHated = me.getMostHated();
+			if (mostHated == null) {
+				_globalAggro = -25;
+				return;
+			}
+			
+			for (var attacker : me.getAggroList().keySet()) {
+				me.addDamageHate(attacker, 0, aggro);
+			}
+			
+			aggro = me.getHating(mostHated);
+			if (aggro <= 0) {
+				_globalAggro = -25;
+				me.clearAggroList();
+				setIntention(AI_INTENTION_IDLE, null, null);
+			}
+		}
+	}
+	
+	@Override
+	public void stopAITask() {
+		if (_aiTask != null) {
+			_aiTask.cancel(false);
+			_aiTask = null;
+		}
+		_actor.detachAI();
+		super.stopAITask();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2PlayableAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2PlayableAI.java
new file mode 100644
index 00000000..fd470675
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2PlayableAI.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Playable creatures AI.
+ * @author JIV
+ */
+public abstract class L2PlayableAI extends L2CharacterAI {
+	
+	public L2PlayableAI(L2Playable creature) {
+		super(creature);
+	}
+	
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+		if (target instanceof L2Playable) {
+			if (target.getActingPlayer().isProtectionBlessingAffected() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getKarma() > 0) && !(target.isInsideZone(ZoneId.PVP))) {
+				// If attacker have karma and have level >= 10 than his target and target have
+				// Newbie Protection Buff,
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				return;
+			}
+			
+			if (_actor.getActingPlayer().isProtectionBlessingAffected() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getKarma() > 0) && !(target.isInsideZone(ZoneId.PVP))) {
+				// If target have karma and have level >= 10 than his target and actor have
+				// Newbie Protection Buff,
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				return;
+			}
+			
+			if (target.getActingPlayer().isCursedWeaponEquipped() && (_actor.getActingPlayer().getLevel() <= 20)) {
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				return;
+			}
+			
+			if (_actor.getActingPlayer().isCursedWeaponEquipped() && (target.getActingPlayer().getLevel() <= 20)) {
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				return;
+			}
+		}
+		
+		super.onIntentionAttack(target);
+	}
+	
+	@Override
+	protected void onIntentionCast(Skill skill, L2Object target) {
+		if ((target instanceof L2Playable) && skill.isBad()) {
+			if (target.getActingPlayer().isProtectionBlessingAffected() && ((_actor.getActingPlayer().getLevel() - target.getActingPlayer().getLevel()) >= 10) && (_actor.getActingPlayer().getKarma() > 0) && !target.isInsideZone(ZoneId.PVP)) {
+				// If attacker have karma and have level >= 10 than his target and target have
+				// Newbie Protection Buff,
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				_actor.setIsCastingNow(false);
+				return;
+			}
+			
+			if (_actor.getActingPlayer().isProtectionBlessingAffected() && ((target.getActingPlayer().getLevel() - _actor.getActingPlayer().getLevel()) >= 10) && (target.getActingPlayer().getKarma() > 0) && !target.isInsideZone(ZoneId.PVP)) {
+				// If target have karma and have level >= 10 than his target and actor have
+				// Newbie Protection Buff,
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				_actor.setIsCastingNow(false);
+				return;
+			}
+			
+			if (target.getActingPlayer().isCursedWeaponEquipped() && ((_actor.getActingPlayer().getLevel() <= 20) || (target.getActingPlayer().getLevel() <= 20))) {
+				_actor.getActingPlayer().sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+				clientActionFailed();
+				_actor.setIsCastingNow(false);
+				return;
+			}
+		}
+		super.onIntentionCast(skill, target);
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2PlayerAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2PlayerAI.java
new file mode 100644
index 00000000..0a8b9c15
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2PlayerAI.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_CAST;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_INTERACT;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_MOVE_TO;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_PICK_UP;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_REST;
+
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class L2PlayerAI extends L2PlayableAI {
+	private boolean _thinking; // to prevent recursive thinking
+	
+	private IntentionCommand _nextIntention = null;
+	
+	public L2PlayerAI(L2PcInstance creature) {
+		super(creature);
+	}
+	
+	void saveNextIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		_nextIntention = new IntentionCommand(intention, arg0, arg1);
+	}
+	
+	@Override
+	public IntentionCommand getNextIntention() {
+		return _nextIntention;
+	}
+	
+	/**
+	 * Saves the current Intention for this L2PlayerAI if necessary and calls changeIntention in AbstractAI.
+	 * @param intention The new Intention to set to the AI
+	 * @param arg0 The first parameter of the Intention
+	 * @param arg1 The second parameter of the Intention
+	 */
+	@Override
+	protected synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		// Forget next if it's not cast or it's cast and skill is toggle.
+		if ((intention != AI_INTENTION_CAST) || ((arg0 != null) && !((Skill) arg0).isToggle())) {
+			_nextIntention = null;
+			super.changeIntention(intention, arg0, arg1);
+			return;
+		}
+		
+		// do nothing if next intention is same as current one.
+		if ((intention == _intention) && (arg0 == _intentionArg0) && (arg1 == _intentionArg1)) {
+			super.changeIntention(intention, arg0, arg1);
+			return;
+		}
+		
+		// save current intention so it can be used after cast
+		saveNextIntention(_intention, _intentionArg0, _intentionArg1);
+		super.changeIntention(intention, arg0, arg1);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event ReadyToAct.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtReadyToAct() {
+		// Launch actions corresponding to the Event Think
+		if (_nextIntention != null) {
+			setIntention(_nextIntention._crtlIntention, _nextIntention._arg0, _nextIntention._arg1);
+			_nextIntention = null;
+		}
+		super.onEvtReadyToAct();
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Cancel.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Stop an AI Follow Task</li>
+	 * <li>Launch actions corresponding to the Event Think</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onEvtCancel() {
+		_nextIntention = null;
+		super.onEvtCancel();
+	}
+	
+	/**
+	 * Finalize the casting of a skill. This method overrides L2CharacterAI method.<br>
+	 * <B>What it does:</B><br>
+	 * Check if actual intention is set to CAST and, if so, retrieves latest intention before the actual CAST and set it as the current intention for the player.
+	 */
+	@Override
+	protected void onEvtFinishCasting() {
+		if (getIntention() == AI_INTENTION_CAST) {
+			// run interrupted or next intention
+			
+			IntentionCommand nextIntention = _nextIntention;
+			if (nextIntention != null) {
+				if (nextIntention._crtlIntention != AI_INTENTION_CAST) // previous state shouldn't be casting
+				{
+					setIntention(nextIntention._crtlIntention, nextIntention._arg0, nextIntention._arg1);
+				} else {
+					setIntention(AI_INTENTION_IDLE);
+				}
+			} else {
+				// set intention to idle if skill doesn't change intention.
+				setIntention(AI_INTENTION_IDLE);
+			}
+		}
+	}
+	
+	@Override
+	protected void onIntentionRest() {
+		if (getIntention() != AI_INTENTION_REST) {
+			changeIntention(AI_INTENTION_REST, null, null);
+			setTarget(null);
+			if (getAttackTarget() != null) {
+				setAttackTarget(null);
+			}
+			clientStopMoving(null);
+		}
+	}
+	
+	@Override
+	protected void onIntentionActive() {
+		setIntention(AI_INTENTION_IDLE);
+	}
+	
+	/**
+	 * Manage the Move To Intention : Stop current Attack and Launch a Move to Location Task.<br>
+	 * <B><U> Actions</U> : </B>
+	 * <ul>
+	 * <li>Stop the actor auto-attack server side AND client side by sending Server->Client packet AutoAttackStop (broadcast)</li>
+	 * <li>Set the Intention of this AI to AI_INTENTION_MOVE_TO</li>
+	 * <li>Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation (broadcast)</li>
+	 * </ul>
+	 */
+	@Override
+	protected void onIntentionMoveTo(Location loc) {
+		if (getIntention() == AI_INTENTION_REST) {
+			// Cancel action client side by sending Server->Client packet ActionFailed to the L2PcInstance actor
+			clientActionFailed();
+			return;
+		}
+		if (_actor.getActingPlayer().getDuelState() == DuelState.DEAD) {
+			clientActionFailed();
+			_actor.getActingPlayer().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_MOVE_FROZEN));
+			return;
+		}
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow() || _actor.isAttackingNow()) {
+			clientActionFailed();
+			saveNextIntention(AI_INTENTION_MOVE_TO, loc, null);
+			return;
+		}
+		
+		// Stop the actor auto-attack client side by sending Server->Client packet AutoAttackStop (broadcast)
+		clientStopAutoAttack();
+		
+		// Set the Intention of this AbstractAI to AI_INTENTION_MOVE_TO
+		changeIntention(AI_INTENTION_MOVE_TO, loc, null);
+		
+		// Abort the attack of the L2Character and send Server->Client ActionFailed packet
+		_actor.abortAttack();
+		
+		// Move the actor to Location (x,y,z) server side AND client side by sending Server->Client packet CharMoveToLocation (broadcast)
+		moveTo(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	@Override
+	protected void clientNotifyDead() {
+		_clientMovingToPawnOffset = 0;
+		_clientMoving = false;
+		
+		super.clientNotifyDead();
+	}
+	
+	private void thinkAttack() {
+		L2Character target = getAttackTarget();
+		if (target == null) {
+			return;
+		}
+		if (checkTargetLostOrDead(target)) {
+			// Notify the target
+			setAttackTarget(null);
+			return;
+		}
+		if (maybeMoveToPawn(target, _actor.getPhysicalAttackRange())) {
+			return;
+		}
+		
+		clientStopMoving(null);
+		_actor.doAttack(target);
+	}
+	
+	private void thinkCast() {
+		L2Character target = getCastTarget();
+		if ((_skill.getTargetType() == TargetType.GROUND) && (_actor instanceof L2PcInstance)) {
+			if (maybeMoveToPosition(((L2PcInstance) _actor).getCurrentSkillWorldPosition(), _actor.getMagicalAttackRange(_skill))) {
+				_actor.setIsCastingNow(false);
+				return;
+			}
+		} else {
+			if (checkTargetLost(target)) {
+				if (_skill.isBad() && (getAttackTarget() != null)) {
+					// Notify the target
+					setCastTarget(null);
+				}
+				_actor.setIsCastingNow(false);
+				return;
+			}
+			if ((target != null) && maybeMoveToPawn(target, _actor.getMagicalAttackRange(_skill))) {
+				_actor.setIsCastingNow(false);
+				return;
+			}
+		}
+		
+		if ((_skill.getHitTime() > 50) && !_skill.isSimultaneousCast()) {
+			clientStopMoving(null);
+		}
+		
+		_actor.doCast(_skill);
+	}
+	
+	private void thinkPickUp() {
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow()) {
+			return;
+		}
+		L2Object target = getTarget();
+		if (checkTargetLost(target)) {
+			return;
+		}
+		if (maybeMoveToPawn(target, 36)) {
+			return;
+		}
+		setIntention(AI_INTENTION_IDLE);
+		_actor.getActingPlayer().doPickupItem(target);
+	}
+	
+	private void thinkInteract() {
+		if (_actor.isAllSkillsDisabled() || _actor.isCastingNow()) {
+			return;
+		}
+		L2Object target = getTarget();
+		if (checkTargetLost(target)) {
+			return;
+		}
+		if (maybeMoveToPawn(target, 36)) {
+			return;
+		}
+		if (!(target instanceof L2StaticObjectInstance)) {
+			_actor.getActingPlayer().doInteract((L2Character) target);
+		}
+		setIntention(AI_INTENTION_IDLE);
+	}
+	
+	@Override
+	protected void onEvtThink() {
+		if (_thinking && (getIntention() != AI_INTENTION_CAST)) {
+			return;
+		}
+		
+		_thinking = true;
+		try {
+			if (getIntention() == AI_INTENTION_ATTACK) {
+				thinkAttack();
+			} else if (getIntention() == AI_INTENTION_CAST) {
+				thinkCast();
+			} else if (getIntention() == AI_INTENTION_PICK_UP) {
+				thinkPickUp();
+			} else if (getIntention() == AI_INTENTION_INTERACT) {
+				thinkInteract();
+			}
+		} finally {
+			_thinking = false;
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java
new file mode 100644
index 00000000..0dabaf63
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java
@@ -0,0 +1,784 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+
+import java.util.Collection;
+import java.util.concurrent.Future;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Siege guard AI.
+ */
+public class L2SiegeGuardAI extends L2CharacterAI implements Runnable {
+	private static final int MAX_ATTACK_TIMEOUT = 30 * GameTimeController.TICKS_PER_SECOND; // 30s converted to ticks
+	
+	/** The L2Attackable AI task executed every 1s (call onEvtThink method) */
+	private Future<?> _aiTask;
+	
+	/** For attack AI, analysis of mob and its targets */
+	private final SelfAnalysis _selfAnalysis = new SelfAnalysis();
+	// private TargetAnalysis _mostHatedAnalysis = new TargetAnalysis();
+	
+	/** The delay after which the attacked is stopped */
+	private int _attackTimeout;
+	
+	/** The L2Attackable aggro counter */
+	private int _globalAggro;
+	
+	/** The flag used to indicate that a thinking action is in progress */
+	private boolean _thinking; // to prevent recursive thinking
+	
+	private final int _attackRange;
+	
+	/**
+	 * Constructor of L2AttackableAI.
+	 * @param creature the creature
+	 */
+	public L2SiegeGuardAI(L2DefenderInstance creature) {
+		super(creature);
+		_selfAnalysis.init();
+		_attackTimeout = Integer.MAX_VALUE;
+		_globalAggro = -10; // 10 seconds timeout of ATTACK after respawn
+		_attackRange = _actor.getPhysicalAttackRange();
+	}
+	
+	@Override
+	public void run() {
+		// Launch actions corresponding to the Event Think
+		onEvtThink();
+		
+	}
+	
+	/**
+	 * <B><U> Actor is a L2GuardInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk or a Door</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The L2PcInstance target has karma (=PK)</li>
+	 * <li>The L2MonsterInstance target is aggressive</li>
+	 * </ul>
+	 * <B><U> Actor is a L2SiegeGuardInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk or a Door</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>A siege is in progress</li>
+	 * <li>The L2PcInstance target isn't a Defender</li>
+	 * </ul>
+	 * <B><U> Actor is a L2FriendlyMobInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk, a Door or another L2NpcInstance</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The L2PcInstance target has karma (=PK)</li>
+	 * </ul>
+	 * <B><U> Actor is a L2MonsterInstance</U> :</B>
+	 * <ul>
+	 * <li>The target isn't a Folk, a Door or another L2NpcInstance</li>
+	 * <li>The target isn't dead, isn't invulnerable, isn't in silent moving mode AND too far (>100)</li>
+	 * <li>The target is in the actor Aggro range and is at the same height</li>
+	 * <li>The actor is Aggressive</li>
+	 * </ul>
+	 * @param target The targeted L2Object
+	 * @return True if the target is autoattackable (depends on the actor type).
+	 */
+	protected boolean autoAttackCondition(L2Character target) {
+		// Check if the target isn't another guard, folk or a door
+		if ((target == null) || (target instanceof L2DefenderInstance) || (target instanceof L2NpcInstance) || (target instanceof L2DoorInstance) || target.isAlikeDead()) {
+			return false;
+		}
+		
+		// Check if the target isn't invulnerable
+		if (target.isInvul()) {
+			// However EffectInvincible requires to check GMs specially
+			if (target.isPlayer() && target.isGM()) {
+				return false;
+			}
+			if (target.isSummon() && ((L2Summon) target).getOwner().isGM()) {
+				return false;
+			}
+		}
+		
+		// Get the owner if the target is a summon
+		if (target instanceof L2Summon summon) {
+			L2PcInstance owner = summon.getOwner();
+			if (_actor.isInsideRadius(owner, 1000, true, false)) {
+				target = owner;
+			}
+		}
+		
+		// Check if the target is a L2PcInstance
+		if (target instanceof L2Playable playable) {
+			// Check if the target isn't in silent move mode AND too far (>100)
+			if (playable.isSilentMovingAffected() && !_actor.isInsideRadius(target, 250, false, false)) {
+				return false;
+			}
+		}
+		// Los Check Here
+		return (_actor.isAutoAttackable(target) && GeoData.getInstance().canSeeTarget(_actor, target));
+		
+	}
+	
+	/**
+	 * Set the Intention of this L2CharacterAI and create an AI Task executed every 1s (call onEvtThink method) for this L2Attackable.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : If actor _knowPlayer isn't EMPTY, AI_INTENTION_IDLE will be change in AI_INTENTION_ACTIVE</B></FONT>
+	 * @param intention The new Intention to set to the AI
+	 * @param arg0 The first parameter of the Intention
+	 * @param arg1 The second parameter of the Intention
+	 */
+	@Override
+	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		LOG.debug("{}: changeIntention({}, {}, {})", getClass().getSimpleName(), intention, arg0, arg1);
+		
+		if (intention == AI_INTENTION_IDLE /* || intention == AI_INTENTION_ACTIVE */) // active becomes idle if only a summon is present
+		{
+			// Check if actor is not dead
+			if (!_actor.isAlikeDead()) {
+				L2Attackable npc = (L2Attackable) _actor;
+				
+				// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
+				if (!npc.getKnownList().getKnownPlayers().isEmpty()) {
+					intention = AI_INTENTION_ACTIVE;
+				} else {
+					intention = AI_INTENTION_IDLE;
+				}
+			}
+			
+			if (intention == AI_INTENTION_IDLE) {
+				// Set the Intention of this L2AttackableAI to AI_INTENTION_IDLE
+				super.changeIntention(AI_INTENTION_IDLE, null, null);
+				
+				// Stop AI task and detach AI from NPC
+				if (_aiTask != null) {
+					_aiTask.cancel(true);
+					_aiTask = null;
+				}
+				
+				// Cancel the AI
+				_actor.detachAI();
+				
+				return;
+			}
+		}
+		
+		// Set the Intention of this L2AttackableAI to intention
+		super.changeIntention(intention, arg0, arg1);
+		
+		// If not idle - create an AI task (schedule onEvtThink repeatedly)
+		if ((_aiTask == null) && (_actor.isInActiveRegion())) {
+			_aiTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 1000, 1000);
+		}
+	}
+	
+	/**
+	 * Manage the Attack Intention : Stop current Attack (if necessary), Calculate attack timeout, Start a new Attack and Launch Think Event.
+	 * @param target The L2Character to attack
+	 */
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+		// Calculate the attack timeout
+		_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+		
+		// Manage the Attack Intention : Stop current Attack (if necessary), Start a new Attack and Launch Think Event
+		// if (_actor.getTarget() != null)
+		super.onIntentionAttack(target);
+	}
+	
+	/**
+	 * Manage AI standard thinks of a L2Attackable (called by onEvtThink).<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Update every 1s the _globalAggro counter to come close to 0</li>
+	 * <li>If the actor is Aggressive and can attack, add all autoAttackable L2Character in its Aggro Range to its _aggroList, chose a target and order to attack it</li>
+	 * <li>If the actor can't attack, order to it to return to its home location</li>
+	 * </ul>
+	 */
+	private void thinkActive() {
+		L2Attackable npc = (L2Attackable) _actor;
+		
+		// Update every 1s the _globalAggro counter to come close to 0
+		if (_globalAggro != 0) {
+			if (_globalAggro < 0) {
+				_globalAggro++;
+			} else {
+				_globalAggro--;
+			}
+		}
+		
+		// Add all autoAttackable L2Character in L2Attackable Aggro Range to its _aggroList with 0 damage and 1 hate
+		// A L2Attackable isn't aggressive during 10s after its spawn because _globalAggro is set to -10
+		if (_globalAggro >= 0) {
+			for (L2Character target : npc.getKnownList().getKnownCharactersInRadius(_attackRange)) {
+				if (target == null) {
+					continue;
+				}
+				if (autoAttackCondition(target)) // check aggression
+				{
+					// Get the hate level of the L2Attackable against this L2Character target contained in _aggroList
+					long hating = npc.getHating(target);
+					
+					// Add the attacker to the L2Attackable _aggroList with 0 damage and 1 hate
+					if (hating == 0) {
+						npc.addDamageHate(target, 0, 1);
+					}
+				}
+			}
+			
+			// Chose a target from its aggroList
+			L2Character hated;
+			if (_actor.isConfused()) {
+				hated = getAttackTarget(); // Force mobs to attack anybody if confused
+			} else {
+				hated = npc.getMostHated();
+				// _mostHatedAnalysis.Update(hated);
+			}
+			
+			// Order to the L2Attackable to attack the target
+			if (hated != null) {
+				// Get the hate level of the L2Attackable against this L2Character target contained in _aggroList
+				long aggro = npc.getHating(hated);
+				
+				if ((aggro + _globalAggro) > 0) {
+					// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+					if (!_actor.isRunning()) {
+						_actor.setRunning();
+					}
+					
+					// Set the AI Intention to AI_INTENTION_ATTACK
+					setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated, null);
+				}
+				
+				return;
+			}
+			
+		}
+		// Order to the L2DefenderInstance to return to its home location because there's no target to attack
+		((L2DefenderInstance) _actor).returnHome();
+	}
+	
+	/**
+	 * Manage AI attack thinks of a L2Attackable (called by onEvtThink).<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Update the attack timeout if actor is running</li>
+	 * <li>If target is dead or timeout is expired, stop this attack and set the Intention to AI_INTENTION_ACTIVE</li>
+	 * <li>Call all L2Object of its Faction inside the Faction Range</li>
+	 * <li>Chose a target and order to attack it with magic skill or physical attack</li>
+	 * </ul>
+	 * TODO: Manage casting rules to healer mobs (like Ant Nurses)
+	 */
+	private void thinkAttack() {
+		LOG.debug("{}: thinkAttack(); timeout={}", getClass().getSimpleName(), (_attackTimeout - GameTimeController.getInstance().getGameTicks()));
+		
+		if (_attackTimeout < GameTimeController.getInstance().getGameTicks()) {
+			// Check if the actor is running
+			if (_actor.isRunning()) {
+				// Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others L2PcInstance
+				_actor.setWalking();
+				
+				// Calculate a new attack timeout
+				_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+			}
+		}
+		
+		L2Character attackTarget = getAttackTarget();
+		// Check if target is dead or if timeout is expired to stop this attack
+		if ((attackTarget == null) || attackTarget.isAlikeDead() || (_attackTimeout < GameTimeController.getInstance().getGameTicks())) {
+			// Stop hating this target after the attack timeout or if target is dead
+			if (attackTarget != null) {
+				L2Attackable npc = (L2Attackable) _actor;
+				npc.stopHating(attackTarget);
+			}
+			
+			// Cancel target and timeout
+			_attackTimeout = Integer.MAX_VALUE;
+			setAttackTarget(null);
+			
+			// Set the AI Intention to AI_INTENTION_ACTIVE
+			setIntention(AI_INTENTION_ACTIVE, null, null);
+			
+			_actor.setWalking();
+			return;
+		}
+		
+		factionNotifyAndSupport();
+		attackPrepare();
+	}
+	
+	private void factionNotifyAndSupport() {
+		L2Character target = getAttackTarget();
+		final var siegeGuard = (L2Npc) _actor;
+		// Call all L2Object of its Faction inside the Faction Range
+		if ((siegeGuard.getTemplate().getClans() == null) || (target == null)) {
+			return;
+		}
+		
+		if (target.isInvul()) {
+			return; // speeding it up for siege guards
+		}
+		
+		// Go through all L2Character that belong to its faction
+		for (var cha : _actor.getKnownList().getKnownCharactersInRadius(1000)) {
+			if (cha == null) {
+				continue;
+			}
+			
+			if (!(cha instanceof L2Npc npc)) {
+				if (_selfAnalysis.hasHealOrResurrect && (cha instanceof L2PcInstance) && (siegeGuard.getCastle().getSiege().checkIsDefender(cha.getClan()))) {
+					// heal friends
+					if (!_actor.isAttackingDisabled() && (cha.getCurrentHp() < (cha.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2.0)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2.0)) && cha.isInCombat()) {
+						for (Skill sk : _selfAnalysis.healSkills) {
+							if (_actor.getCurrentMp() < sk.getMpConsume2()) {
+								continue;
+							}
+							if (_actor.isSkillDisabled(sk)) {
+								continue;
+							}
+							if (!Util.checkIfInRange(sk.getCastRange(), _actor, cha, true)) {
+								continue;
+							}
+							
+							int chance = 5;
+							if (chance >= Rnd.get(100)) {
+								continue;
+							}
+							if (!GeoData.getInstance().canSeeTarget(_actor, cha)) {
+								break;
+							}
+							
+							L2Object OldTarget = _actor.getTarget();
+							_actor.setTarget(cha);
+							clientStopMoving(null);
+							_actor.doCast(sk);
+							_actor.setTarget(OldTarget);
+							return;
+						}
+					}
+				}
+				continue;
+			}
+			
+			if (!npc.isInMyClan(siegeGuard)) {
+				continue;
+			}
+			
+			if (npc.getAI() != null) // TODO: possibly check not needed
+			{
+				if (!npc.isDead() && (Math.abs(target.getZ() - npc.getZ()) < 600)
+				// && _actor.getAttackByList().contains(getAttackTarget())
+					&& ((npc.getAI()._intention == CtrlIntention.AI_INTENTION_IDLE) || (npc.getAI()._intention == CtrlIntention.AI_INTENTION_ACTIVE))
+					// limiting aggro for siege guards
+					&& target.isInsideRadius(npc, 1500, true, false) && GeoData.getInstance().canSeeTarget(npc, target)) {
+					// Notify the L2Object AI with EVT_AGGRESSION
+					npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, getAttackTarget(), 1);
+					return;
+				}
+				// heal friends
+				if (_selfAnalysis.hasHealOrResurrect && !_actor.isAttackingDisabled() && (npc.getCurrentHp() < (npc.getMaxHp() * 0.6)) && (_actor.getCurrentHp() > (_actor.getMaxHp() / 2.0)) && (_actor.getCurrentMp() > (_actor.getMaxMp() / 2.0)) && npc.isInCombat()) {
+					for (Skill sk : _selfAnalysis.healSkills) {
+						if (_actor.getCurrentMp() < sk.getMpConsume2()) {
+							continue;
+						}
+						if (_actor.isSkillDisabled(sk)) {
+							continue;
+						}
+						if (!Util.checkIfInRange(sk.getCastRange(), _actor, npc, true)) {
+							continue;
+						}
+						
+						int chance = 4;
+						if (chance >= Rnd.get(100)) {
+							continue;
+						}
+						if (!GeoData.getInstance().canSeeTarget(_actor, npc)) {
+							break;
+						}
+						
+						L2Object OldTarget = _actor.getTarget();
+						_actor.setTarget(npc);
+						clientStopMoving(null);
+						_actor.doCast(sk);
+						_actor.setTarget(OldTarget);
+						return;
+					}
+				}
+			}
+		}
+	}
+	
+	private void attackPrepare() {
+		// Get all information needed to choose between physical or magical attack
+		Collection<Skill> skills;
+		double dist_2;
+		int range;
+		L2DefenderInstance sGuard = (L2DefenderInstance) _actor;
+		L2Character attackTarget = getAttackTarget();
+		
+		try {
+			_actor.setTarget(attackTarget);
+			skills = _actor.getAllSkills();
+			dist_2 = _actor.calculateDistance(attackTarget, false, true);
+			range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius();
+			if (attackTarget.isMoving()) {
+				range += 50;
+			}
+		} catch (NullPointerException e) {
+			_actor.setTarget(null);
+			setIntention(AI_INTENTION_IDLE, null, null);
+			return;
+		}
+		
+		// never attack defenders
+		if (attackTarget instanceof L2PcInstance) {
+			if ((sGuard.getConquerableHall() == null) && sGuard.getCastle().getSiege().checkIsDefender(attackTarget.getClan())) {
+				// Cancel the target
+				sGuard.stopHating(attackTarget);
+				_actor.setTarget(null);
+				setIntention(AI_INTENTION_IDLE, null, null);
+				return;
+			}
+		}
+		
+		if (!GeoData.getInstance().canSeeTarget(_actor, attackTarget)) {
+			// Siege guards differ from normal mobs currently:
+			// If target cannot seen, don't attack any more
+			sGuard.stopHating(attackTarget);
+			_actor.setTarget(null);
+			setIntention(AI_INTENTION_IDLE, null, null);
+			return;
+		}
+		
+		// Check if the actor isn't muted and if it is far from target
+		if (!_actor.isMuted() && (dist_2 > (range * range))) {
+			// check for long ranged skills and heal/buff skills
+			for (Skill sk : skills) {
+				int castRange = sk.getCastRange();
+				
+				if ((dist_2 <= (castRange * castRange)) && (castRange > 70) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !sk.isPassive()) {
+					
+					L2Object OldTarget = _actor.getTarget();
+					if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP))) {
+						boolean useSkillSelf = true;
+						if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) {
+							useSkillSelf = false;
+							break;
+						}
+						
+						if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) {
+							useSkillSelf = false;
+						}
+						
+						if (useSkillSelf) {
+							_actor.setTarget(_actor);
+						}
+					}
+					
+					clientStopMoving(null);
+					_actor.doCast(sk);
+					_actor.setTarget(OldTarget);
+					return;
+				}
+			}
+			
+			// Check if the L2SiegeGuardInstance is attacking, knows the target and can't run
+			if (!(_actor.isAttackingNow()) && (_actor.getRunSpeed() == 0) && (_actor.getKnownList().knowsObject(attackTarget))) {
+				// Cancel the target
+				_actor.getKnownList().removeKnownObject(attackTarget);
+				_actor.setTarget(null);
+				setIntention(AI_INTENTION_IDLE, null, null);
+			} else {
+				double dx = _actor.getX() - attackTarget.getX();
+				double dy = _actor.getY() - attackTarget.getY();
+				double dz = _actor.getZ() - attackTarget.getZ();
+				double homeX = attackTarget.getX() - sGuard.getSpawn().getX();
+				double homeY = attackTarget.getY() - sGuard.getSpawn().getY();
+				
+				// Check if the L2SiegeGuardInstance isn't too far from it's home location
+				if ((((dx * dx) + (dy * dy)) > 10000) && (((homeX * homeX) + (homeY * homeY)) > 3240000) // 1800 * 1800
+					&& (_actor.getKnownList().knowsObject(attackTarget))) {
+					// Cancel the target
+					_actor.getKnownList().removeKnownObject(attackTarget);
+					_actor.setTarget(null);
+					setIntention(AI_INTENTION_IDLE, null, null);
+				} else
+				// Move the actor to Pawn server side AND client side by sending Server->Client packet MoveToPawn (broadcast)
+				{
+					// Temporary hack for preventing guards jumping off towers,
+					// before replacing this with effective geodata checks and AI modification
+					if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct
+					{
+						if (_selfAnalysis.isHealer) {
+							return;
+						}
+						if (_selfAnalysis.isMage) {
+							range = _selfAnalysis.maxCastRange - 50;
+						}
+						if (attackTarget.isMoving()) {
+							moveToPawn(attackTarget, range - 70);
+						} else {
+							moveToPawn(attackTarget, range);
+						}
+					}
+				}
+			}
+		}
+		// Else, if the actor is muted and far from target, just "move to pawn"
+		else if (_actor.isMuted() && (dist_2 > (range * range)) && !_selfAnalysis.isHealer) {
+			// Temporary hack for preventing guards jumping off towers,
+			// before replacing this with effective geodata checks and AI modification
+			double dz = _actor.getZ() - attackTarget.getZ();
+			if ((dz * dz) < (170 * 170)) // normally 130 if guard z coordinates correct
+			{
+				if (_selfAnalysis.isMage) {
+					range = _selfAnalysis.maxCastRange - 50;
+				}
+				if (attackTarget.isMoving()) {
+					moveToPawn(attackTarget, range - 70);
+				} else {
+					moveToPawn(attackTarget, range);
+				}
+			}
+		}
+		// Else, if this is close enough to attack
+		else if (dist_2 <= (range * range)) {
+			// Force mobs to attack anybody if confused
+			L2Character hated;
+			if (_actor.isConfused()) {
+				hated = attackTarget;
+			} else {
+				hated = ((L2Attackable) _actor).getMostHated();
+			}
+			
+			if (hated == null) {
+				setIntention(AI_INTENTION_ACTIVE, null, null);
+				return;
+			}
+			if (hated != attackTarget) {
+				attackTarget = hated;
+			}
+			
+			_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+			
+			// check for close combat skills && heal/buff skills
+			if (!_actor.isMuted() && (Rnd.nextInt(100) <= 5)) {
+				for (Skill sk : skills) {
+					int castRange = sk.getCastRange();
+					
+					if (((castRange * castRange) >= dist_2) && !sk.isPassive() && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume2(sk)) && !_actor.isSkillDisabled(sk)) {
+						L2Object OldTarget = _actor.getTarget();
+						if ((sk.isContinuous() && !sk.isDebuff()) || (sk.hasEffectType(L2EffectType.HP))) {
+							boolean useSkillSelf = true;
+							if ((sk.hasEffectType(L2EffectType.HP)) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5))) {
+								useSkillSelf = false;
+								break;
+							}
+							
+							if ((sk.isContinuous() && !sk.isDebuff()) && _actor.isAffectedBySkill(sk.getId())) {
+								useSkillSelf = false;
+							}
+							
+							if (useSkillSelf) {
+								_actor.setTarget(_actor);
+							}
+						}
+						
+						clientStopMoving(null);
+						_actor.doCast(sk);
+						_actor.setTarget(OldTarget);
+						return;
+					}
+				}
+			}
+			// Finally, do the physical attack itself
+			if (!_selfAnalysis.isHealer) {
+				_actor.doAttack(attackTarget);
+			}
+		}
+	}
+	
+	/**
+	 * Manage AI thinking actions of a L2Attackable.
+	 */
+	@Override
+	protected void onEvtThink() {
+		// if(getIntention() != AI_INTENTION_IDLE && (!_actor.isVisible() || !_actor.hasAI() || !_actor.isKnownPlayers()))
+		// setIntention(AI_INTENTION_IDLE);
+		
+		// Check if the thinking action is already in progress
+		if (_thinking || _actor.isCastingNow() || _actor.isAllSkillsDisabled()) {
+			return;
+		}
+		
+		// Start thinking action
+		_thinking = true;
+		
+		try {
+			// Manage AI thinks of a L2Attackable
+			if (getIntention() == AI_INTENTION_ACTIVE) {
+				thinkActive();
+			} else if (getIntention() == AI_INTENTION_ATTACK) {
+				thinkAttack();
+			}
+		} finally {
+			// Stop thinking action
+			_thinking = false;
+		}
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Attacked.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Init the attack : Calculate the attack timeout, Set the _globalAggro to 0, Add the attacker to the actor _aggroList</li>
+	 * <li>Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance</li>
+	 * <li>Set the Intention to AI_INTENTION_ATTACK</li>
+	 * </ul>
+	 * @param attacker The L2Character that attacks the actor
+	 */
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+		// Calculate the attack timeout
+		_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeController.getInstance().getGameTicks();
+		
+		// Set the _globalAggro to 0 to permit attack even just after spawn
+		if (_globalAggro < 0) {
+			_globalAggro = 0;
+		}
+		
+		// Add the attacker to the _aggroList of the actor
+		((L2Attackable) _actor).addDamageHate(attacker, 0, 1);
+		
+		// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+		if (!_actor.isRunning()) {
+			_actor.setRunning();
+		}
+		
+		// Set the Intention to AI_INTENTION_ATTACK
+		if (getIntention() != AI_INTENTION_ATTACK) {
+			setIntention(CtrlIntention.AI_INTENTION_ATTACK, attacker, null);
+		}
+		
+		super.onEvtAttacked(attacker);
+	}
+	
+	/**
+	 * Launch actions corresponding to the Event Aggression.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Add the target to the actor _aggroList or update hate if already present</li>
+	 * <li>Set the actor Intention to AI_INTENTION_ATTACK (if actor is L2GuardInstance check if it isn't too far from its home location)</li>
+	 * </ul>
+	 * @param aggro The value of hate to add to the actor against the target
+	 */
+	@Override
+	protected void onEvtAggression(L2Character target, long aggro) {
+		if (_actor == null) {
+			return;
+		}
+		L2Attackable me = (L2Attackable) _actor;
+		
+		if (target != null) {
+			// Add the target to the actor _aggroList or update hate if already present
+			me.addDamageHate(target, 0, aggro);
+			
+			// Get the hate of the actor against the target
+			aggro = me.getHating(target);
+			
+			if (aggro <= 0) {
+				if (me.getMostHated() == null) {
+					_globalAggro = -25;
+					me.clearAggroList();
+					setIntention(AI_INTENTION_IDLE, null, null);
+				}
+				return;
+			}
+			
+			// Set the actor AI Intention to AI_INTENTION_ATTACK
+			if (getIntention() != CtrlIntention.AI_INTENTION_ATTACK) {
+				// Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance
+				if (!_actor.isRunning()) {
+					_actor.setRunning();
+				}
+				
+				L2DefenderInstance sGuard = (L2DefenderInstance) _actor;
+				double homeX = target.getX() - sGuard.getSpawn().getX();
+				double homeY = target.getY() - sGuard.getSpawn().getY();
+				
+				// Check if the L2SiegeGuardInstance is not too far from its home location
+				if (((homeX * homeX) + (homeY * homeY)) < 3240000) {
+					setIntention(CtrlIntention.AI_INTENTION_ATTACK, target, null);
+				}
+			}
+		} else {
+			// currently only for setting lower general aggro
+			if (aggro >= 0) {
+				return;
+			}
+			
+			L2Character mostHated = me.getMostHated();
+			if (mostHated == null) {
+				_globalAggro = -25;
+				return;
+			}
+			
+			for (L2Character aggroed : me.getAggroList().keySet()) {
+				me.addDamageHate(aggroed, 0, aggro);
+			}
+			
+			aggro = me.getHating(mostHated);
+			if (aggro <= 0) {
+				_globalAggro = -25;
+				me.clearAggroList();
+				setIntention(AI_INTENTION_IDLE, null, null);
+			}
+		}
+	}
+	
+	@Override
+	public void stopAITask() {
+		if (_aiTask != null) {
+			_aiTask.cancel(false);
+			_aiTask = null;
+		}
+		_actor.detachAI();
+		super.stopAITask();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2SpecialSiegeGuardAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2SpecialSiegeGuardAI.java
new file mode 100644
index 00000000..5831a3e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2SpecialSiegeGuardAI.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+
+/**
+ * @author BiggBoss
+ */
+public final class L2SpecialSiegeGuardAI extends L2SiegeGuardAI {
+	private final List<Integer> _allied = new ArrayList<>();
+	
+	public L2SpecialSiegeGuardAI(L2DefenderInstance creature) {
+		super(creature);
+	}
+	
+	public List<Integer> getAlly() {
+		return _allied;
+	}
+	
+	@Override
+	protected boolean autoAttackCondition(L2Character target) {
+		if (_allied.contains(target.getObjectId())) {
+			return false;
+		}
+		
+		return super.autoAttackCondition(target);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2SummonAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2SummonAI.java
new file mode 100644
index 00000000..72d06745
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2SummonAI.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+
+import java.util.concurrent.Future;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.pathfinding.PathFinding;
+
+public class L2SummonAI extends L2PlayableAI implements Runnable {
+	private static final int AVOID_RADIUS = 70;
+	
+	private volatile boolean _thinking; // to prevent recursive thinking
+	private volatile boolean _startFollow = ((L2Summon) _actor).getFollowStatus();
+	private L2Character _lastAttack = null;
+	
+	private volatile boolean _startAvoid = false;
+	private Future<?> _avoidTask = null;
+	
+	public L2SummonAI(L2Summon creature) {
+		super(creature);
+	}
+	
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+		if ((geodata().getPathFinding() > 0) && //
+			(PathFinding.getInstance().findPath(_actor.getX(), _actor.getY(), _actor.getZ(), target.getX(), target.getY(), target.getZ(), _actor.getInstanceId(), true) == null)) {
+			return;
+		}
+		super.onIntentionAttack(target);
+	}
+	
+	@Override
+	protected void onIntentionIdle() {
+		stopFollow();
+		_startFollow = false;
+		onIntentionActive();
+	}
+	
+	@Override
+	protected void onIntentionActive() {
+		L2Summon summon = (L2Summon) _actor;
+		if (_startFollow) {
+			setIntention(AI_INTENTION_FOLLOW, summon.getOwner());
+		} else {
+			super.onIntentionActive();
+		}
+	}
+	
+	@Override
+	synchronized void changeIntention(CtrlIntention intention, Object arg0, Object arg1) {
+		switch (intention) {
+			case AI_INTENTION_ACTIVE, AI_INTENTION_FOLLOW -> startAvoidTask();
+			default -> stopAvoidTask();
+		}
+		super.changeIntention(intention, arg0, arg1);
+	}
+	
+	private void thinkAttack() {
+		if (checkTargetLostOrDead(getAttackTarget())) {
+			setAttackTarget(null);
+			return;
+		}
+		if (maybeMoveToPawn(getAttackTarget(), _actor.getPhysicalAttackRange())) {
+			return;
+		}
+		clientStopMoving(null);
+		_actor.doAttack(getAttackTarget());
+	}
+	
+	private void thinkCast() {
+		L2Summon summon = (L2Summon) _actor;
+		if (checkTargetLost(getCastTarget())) {
+			setCastTarget(null);
+			return;
+		}
+		boolean val = _startFollow;
+		if (maybeMoveToPawn(getCastTarget(), _actor.getMagicalAttackRange(_skill))) {
+			return;
+		}
+		clientStopMoving(null);
+		summon.setFollowStatus(false);
+		setIntention(AI_INTENTION_IDLE);
+		_startFollow = val;
+		_actor.doCast(_skill);
+	}
+	
+	private void thinkPickUp() {
+		if (checkTargetLost(getTarget())) {
+			return;
+		}
+		if (maybeMoveToPawn(getTarget(), 36)) {
+			return;
+		}
+		setIntention(AI_INTENTION_IDLE);
+		((L2Summon) _actor).doPickupItem(getTarget());
+	}
+	
+	private void thinkInteract() {
+		if (checkTargetLost(getTarget())) {
+			return;
+		}
+		if (maybeMoveToPawn(getTarget(), 36)) {
+			return;
+		}
+		setIntention(AI_INTENTION_IDLE);
+	}
+	
+	@Override
+	protected void onEvtThink() {
+		if (_thinking || _actor.isCastingNow() || _actor.isAllSkillsDisabled()) {
+			return;
+		}
+		_thinking = true;
+		try {
+			switch (getIntention()) {
+				case AI_INTENTION_ATTACK -> thinkAttack();
+				case AI_INTENTION_CAST -> thinkCast();
+				case AI_INTENTION_PICK_UP -> thinkPickUp();
+				case AI_INTENTION_INTERACT -> thinkInteract();
+			}
+		} finally {
+			_thinking = false;
+		}
+	}
+	
+	@Override
+	protected void onEvtFinishCasting() {
+		if (_lastAttack == null) {
+			((L2Summon) _actor).setFollowStatus(_startFollow);
+		} else {
+			setIntention(CtrlIntention.AI_INTENTION_ATTACK, _lastAttack);
+			_lastAttack = null;
+		}
+	}
+	
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+		super.onEvtAttacked(attacker);
+		
+		avoidAttack(attacker);
+	}
+	
+	@Override
+	protected void onEvtEvaded(L2Character attacker) {
+		super.onEvtEvaded(attacker);
+		
+		avoidAttack(attacker);
+	}
+	
+	private void avoidAttack(L2Character attacker) {
+		// trying to avoid if summon near owner
+		if ((((L2Summon) _actor).getOwner() != null) && (((L2Summon) _actor).getOwner() != attacker) && ((L2Summon) _actor).getOwner().isInsideRadius(_actor, 2 * AVOID_RADIUS, true, false)) {
+			_startAvoid = true;
+		}
+	}
+	
+	@Override
+	public void run() {
+		if (_startAvoid) {
+			_startAvoid = false;
+			
+			if (!_clientMoving && !_actor.isDead() && !_actor.isMovementDisabled()) {
+				final int ownerX = ((L2Summon) _actor).getOwner().getX();
+				final int ownerY = ((L2Summon) _actor).getOwner().getY();
+				final double angle = Math.toRadians(Rnd.get(-90, 90)) + Math.atan2(ownerY - _actor.getY(), ownerX - _actor.getX());
+				
+				final int targetX = ownerX + (int) (AVOID_RADIUS * Math.cos(angle));
+				final int targetY = ownerY + (int) (AVOID_RADIUS * Math.sin(angle));
+				if (GeoData.getInstance().canMove(_actor.getX(), _actor.getY(), _actor.getZ(), targetX, targetY, _actor.getZ(), _actor.getInstanceId())) {
+					moveTo(targetX, targetY, _actor.getZ());
+				}
+			}
+		}
+	}
+	
+	public void notifyFollowStatusChange() {
+		_startFollow = !_startFollow;
+		switch (getIntention()) {
+			case AI_INTENTION_ACTIVE, AI_INTENTION_FOLLOW, AI_INTENTION_IDLE, AI_INTENTION_MOVE_TO, AI_INTENTION_PICK_UP -> ((L2Summon) _actor).setFollowStatus(_startFollow);
+		}
+	}
+	
+	public void setStartFollowController(boolean val) {
+		_startFollow = val;
+	}
+	
+	@Override
+	protected void onIntentionCast(Skill skill, L2Object target) {
+		if (getIntention() == AI_INTENTION_ATTACK) {
+			_lastAttack = getAttackTarget();
+		} else {
+			_lastAttack = null;
+		}
+		super.onIntentionCast(skill, target);
+	}
+	
+	private void startAvoidTask() {
+		if (_avoidTask == null) {
+			_avoidTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(this, 100, 100);
+		}
+	}
+	
+	private void stopAvoidTask() {
+		if (_avoidTask != null) {
+			_avoidTask.cancel(false);
+			_avoidTask = null;
+		}
+	}
+	
+	@Override
+	public void stopAITask() {
+		stopAvoidTask();
+		super.stopAITask();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/ai/L2VehicleAI.java b/src/main/java/com/l2jserver/gameserver/ai/L2VehicleAI.java
new file mode 100644
index 00000000..c98ffa8c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/L2VehicleAI.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Vehicle;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author DS
+ */
+public abstract class L2VehicleAI extends L2CharacterAI {
+	
+	public L2VehicleAI(L2Vehicle creature) {
+		super(creature);
+	}
+	
+	@Override
+	protected void onIntentionAttack(L2Character target) {
+	}
+	
+	@Override
+	protected void onIntentionCast(Skill skill, L2Object target) {
+	}
+	
+	@Override
+	protected void onIntentionFollow(L2Character target) {
+	}
+	
+	@Override
+	protected void onIntentionPickUp(L2Object item) {
+	}
+	
+	@Override
+	protected void onIntentionInteract(L2Object object) {
+	}
+	
+	@Override
+	protected void onEvtAttacked(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtAggression(L2Character target, long aggro) {
+	}
+	
+	@Override
+	protected void onEvtStunned(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtSleeping(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtRooted(L2Character attacker) {
+	}
+	
+	@Override
+	protected void onEvtForgetObject(L2Object object) {
+	}
+	
+	@Override
+	protected void onEvtCancel() {
+	}
+	
+	@Override
+	protected void onEvtDead() {
+	}
+	
+	@Override
+	protected void onEvtFakeDeath() {
+	}
+	
+	@Override
+	protected void onEvtFinishCasting() {
+	}
+	
+	@Override
+	protected void clientActionFailed() {
+	}
+	
+	@Override
+	protected void moveToPawn(L2Object pawn, int offset) {
+	}
+	
+	@Override
+	protected void clientStoppedMoving() {
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/ai/NextAction.java b/src/main/java/com/l2jserver/gameserver/ai/NextAction.java
new file mode 100644
index 00000000..d6d88ed6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/ai/NextAction.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.ai;
+
+import java.util.List;
+
+/**
+ * Class for AI action after some event.<br>
+ * Has 2 lists for "work" and "break".
+ * @author Yaroslav
+ * @author Zoey76
+ */
+public class NextAction {
+	public interface NextActionCallback {
+		void doWork();
+	}
+	
+	private final List<CtrlEvent> _events;
+	private final List<CtrlIntention> _intentions;
+	private final NextActionCallback _callback;
+	
+	public NextAction(CtrlEvent event, CtrlIntention intention, NextActionCallback callback) {
+		_events = List.of(event);
+		_intentions = List.of(intention);
+		_callback = callback;
+	}
+	
+	public void doAction() {
+		_callback.doWork();
+	}
+	
+	public List<CtrlEvent> getEvents() {
+		return _events;
+	}
+	
+	public List<CtrlIntention> getIntentions() {
+		return _intentions;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/model/Forum.java b/src/main/java/com/l2jserver/gameserver/bbs/model/Forum.java
new file mode 100644
index 00000000..96ffaaed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/model/Forum.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.model;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Forum.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public final class Forum {
+	
+	private int id;
+	private String name;
+	private ForumType type;
+	private int post;
+	private ForumVisibility visibility;
+	private final Forum parent;
+	private int ownerId;
+	private final Map<String, Forum> children = new ConcurrentHashMap<>();
+	private final Map<Integer, Topic> topics = new ConcurrentHashMap<>();
+	
+	public Forum(int id, String name, Forum parent, ForumType type, ForumVisibility visibility, int ownerId) {
+		this.name = name;
+		this.id = id;
+		this.type = type;
+		post = 0;
+		this.visibility = visibility;
+		this.parent = parent;
+		this.ownerId = ownerId;
+	}
+	
+	public int getTopicSize() {
+		return topics.size();
+	}
+	
+	public Topic getTopic(int topicId) {
+		return topics.get(topicId);
+	}
+	
+	public void addTopic(Topic t) {
+		topics.put(t.getId(), t);
+	}
+	
+	public void removeTopic(int topicId) {
+		topics.remove(topicId);
+	}
+	
+	public Forum getChildByName(String name) {
+		return children.get(name);
+	}
+	
+	public void addChild(Forum child) {
+		children.put(child.getName(), child);
+	}
+	
+	public int getId() {
+		return id;
+	}
+	
+	public void setId(int id) {
+		this.id = id;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public void setName(String name) {
+		this.name = name;
+	}
+	
+	public ForumType getType() {
+		return type;
+	}
+	
+	public void setType(ForumType type) {
+		this.type = type;
+	}
+	
+	public int getPost() {
+		return post;
+	}
+	
+	public void setPost(int post) {
+		this.post = post;
+	}
+	
+	public ForumVisibility getVisibility() {
+		return visibility;
+	}
+	
+	public void setVisibility(ForumVisibility visibility) {
+		this.visibility = visibility;
+	}
+	
+	public int getOwnerId() {
+		return ownerId;
+	}
+	
+	public void setOwnerId(int ownerId) {
+		this.ownerId = ownerId;
+	}
+	
+	public Forum getParent() {
+		return parent;
+	}
+	
+	public Map<String, Forum> getChildren() {
+		return children;
+	}
+	
+	public Map<Integer, Topic> getTopics() {
+		return topics;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/model/ForumType.java b/src/main/java/com/l2jserver/gameserver/bbs/model/ForumType.java
new file mode 100644
index 00000000..17c155d8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/model/ForumType.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.model;
+
+/**
+ * Forum Type.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public enum ForumType {
+	ROOT,
+	NORMAL,
+	CLAN,
+	MEMO,
+	MAIL
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/model/ForumVisibility.java b/src/main/java/com/l2jserver/gameserver/bbs/model/ForumVisibility.java
new file mode 100644
index 00000000..1f70c2fa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/model/ForumVisibility.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.model;
+
+/**
+ * Forum Visibility.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public enum ForumVisibility {
+	INVISIBLE,
+	ALL,
+	CLAN_MEMBER_ONLY,
+	OWNER_ONLY
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/model/Post.java b/src/main/java/com/l2jserver/gameserver/bbs/model/Post.java
new file mode 100644
index 00000000..82252690
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/model/Post.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.model;
+
+/**
+ * Post.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class Post {
+	
+	private int id;
+	
+	private String ownerName;
+	
+	private int ownerId;
+	
+	private long date;
+	
+	private int topicId;
+	
+	private int forumId;
+	
+	private String txt;
+	
+	public Post(int id, String ownerName, int ownerId, long date, int topicId, int forumId, String txt) {
+		this.id = id;
+		this.ownerName = ownerName;
+		this.ownerId = ownerId;
+		this.date = date;
+		this.topicId = topicId;
+		this.forumId = forumId;
+		this.txt = txt;
+	}
+	
+	public int getId() {
+		return id;
+	}
+	
+	public void setId(int id) {
+		this.id = id;
+	}
+	
+	public String getOwnerName() {
+		return ownerName;
+	}
+	
+	public void setOwnerName(String ownerName) {
+		this.ownerName = ownerName;
+	}
+	
+	public int getOwnerId() {
+		return ownerId;
+	}
+	
+	public void setOwnerId(int ownerId) {
+		this.ownerId = ownerId;
+	}
+	
+	public long getDate() {
+		return date;
+	}
+	
+	public void setDate(long date) {
+		this.date = date;
+	}
+	
+	public int getTopicId() {
+		return topicId;
+	}
+	
+	public void setTopicId(int topicId) {
+		this.topicId = topicId;
+	}
+	
+	public int getForumId() {
+		return forumId;
+	}
+	
+	public void setForumId(int forumId) {
+		this.forumId = forumId;
+	}
+	
+	public String getTxt() {
+		return txt;
+	}
+	
+	public void setTxt(String txt) {
+		this.txt = txt;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/model/Topic.java b/src/main/java/com/l2jserver/gameserver/bbs/model/Topic.java
new file mode 100644
index 00000000..5cd41ae9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/model/Topic.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.model;
+
+/**
+ * Topic.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class Topic {
+	
+	private final int id;
+	
+	private final int forumId;
+	
+	private final String name;
+	
+	private final long date;
+	
+	private final String ownerName;
+	
+	private final int ownerId;
+	
+	private final TopicType type;
+	
+	private final int reply;
+	
+	public Topic(int id, int forumId, String name, long date, String ownerName, int ownerId, TopicType type, int reply) {
+		this.id = id;
+		this.forumId = forumId;
+		this.name = name;
+		this.date = date;
+		this.ownerName = ownerName;
+		this.ownerId = ownerId;
+		this.type = type;
+		this.reply = reply;
+	}
+	
+	public int getId() {
+		return id;
+	}
+	
+	public int getForumId() {
+		return forumId;
+	}
+	
+	public String getName() {
+		return name;
+	}
+	
+	public long getDate() {
+		return date;
+	}
+	
+	public String getOwnerName() {
+		return ownerName;
+	}
+	
+	public int getOwnerId() {
+		return ownerId;
+	}
+	
+	public TopicType getType() {
+		return type;
+	}
+	
+	public int getReply() {
+		return reply;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/model/TopicType.java b/src/main/java/com/l2jserver/gameserver/bbs/model/TopicType.java
new file mode 100644
index 00000000..6ce33dd7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/model/TopicType.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.model;
+
+/**
+ * TopicType.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public enum TopicType {
+	NORMAL,
+	MEMO
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/repository/ForumRepository.java b/src/main/java/com/l2jserver/gameserver/bbs/repository/ForumRepository.java
new file mode 100644
index 00000000..665ec9e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/repository/ForumRepository.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.repository;
+
+import java.util.Map;
+
+import com.l2jserver.gameserver.bbs.model.Forum;
+
+/**
+ * Forum repository.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public interface ForumRepository {
+	
+	Map<String, Forum> getForums();
+	
+	void save(Forum forum);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/repository/PostRepository.java b/src/main/java/com/l2jserver/gameserver/bbs/repository/PostRepository.java
new file mode 100644
index 00000000..df65b070
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/repository/PostRepository.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.repository;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.bbs.model.Post;
+import com.l2jserver.gameserver.bbs.model.Topic;
+
+/**
+ * Post repository.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public interface PostRepository {
+	
+	void delete(Topic topic);
+	
+	void update(Post post);
+	
+	List<Post> load(Topic topic);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/repository/TopicRepository.java b/src/main/java/com/l2jserver/gameserver/bbs/repository/TopicRepository.java
new file mode 100644
index 00000000..c3c8628d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/repository/TopicRepository.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.repository;
+
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.model.Topic;
+
+/**
+ * Topic repository.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public interface TopicRepository {
+	
+	void load(Forum forum);
+	
+	void save(Topic topic);
+	
+	void delete(Topic topic, Forum forum);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/ForumRepositoryMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/ForumRepositoryMySQLImpl.java
new file mode 100644
index 00000000..d2e24991
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/ForumRepositoryMySQLImpl.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.repository.impl;
+
+import static java.sql.Statement.RETURN_GENERATED_KEYS;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.model.ForumType;
+import com.l2jserver.gameserver.bbs.model.ForumVisibility;
+import com.l2jserver.gameserver.bbs.repository.ForumRepository;
+import com.l2jserver.gameserver.bbs.service.ForumsBBSManager;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+
+/**
+ * Forum repository MySQL implementation.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ForumRepositoryMySQLImpl implements ForumRepository {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ForumRepositoryMySQLImpl.class);
+	
+	private static final String SELECT_FORUMS = "SELECT forum_id, forum_name, forum_post, forum_type, forum_perm, forum_owner_id FROM forums WHERE forum_type = 0";
+	
+	private static final String SELECT_FORUM_CHILDREN = "SELECT forum_id, forum_name, forum_post, forum_type, forum_perm, forum_owner_id FROM forums WHERE forum_parent=?";
+	
+	private static final String INSERT_FORUM = "INSERT INTO forums (forum_name, forum_parent, forum_post, forum_type, forum_perm, forum_owner_id) VALUES (?,?,?,?,?,?)";
+	
+	@Override
+	public Map<String, Forum> getForums() {
+		final var forums = new HashMap<String, Forum>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(SELECT_FORUMS)) {
+			while (rs.next()) {
+				final var forum = new Forum(rs.getInt("forum_id"), //
+					rs.getString("forum_name"), //
+					null, //
+					ForumType.values()[rs.getInt("forum_type")], //
+					ForumVisibility.values()[rs.getInt("forum_perm")], //
+					rs.getInt("forum_owner_id"));
+				forums.put(forum.getName(), forum);
+				
+				// Load topic
+				DAOFactory.getInstance().getTopicRepository().load(forum);
+				
+				// Load children
+				loadChildren(forum);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Data error on Forum (root)!", ex);
+		}
+		return forums;
+	}
+	
+	private void loadChildren(Forum parent) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_FORUM_CHILDREN)) {
+			ps.setInt(1, parent.getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					ForumsBBSManager.getInstance().load(rs.getInt("forum_id"), //
+						rs.getString("forum_name"), //
+						parent, //
+						ForumType.values()[rs.getInt("forum_type")], //
+						ForumVisibility.values()[rs.getInt("forum_perm")], //
+						rs.getInt("forum_owner_id"));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Error loading child forums for forum Id {}!", parent.getId(), ex);
+		}
+	}
+	
+	@Override
+	public void save(Forum forum) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_FORUM, RETURN_GENERATED_KEYS)) {
+			ps.setString(1, forum.getName());
+			ps.setInt(2, forum.getParent().getId());
+			ps.setInt(3, forum.getPost());
+			ps.setInt(4, forum.getType().ordinal());
+			ps.setInt(5, forum.getVisibility().ordinal());
+			ps.setInt(6, forum.getOwnerId());
+			ps.executeUpdate();
+			
+			try (var rs = ps.getGeneratedKeys()) {
+				if (rs.next()) {
+					forum.setId(rs.getInt(1));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Error saving forum Id {} in database!", forum.getId(), ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/PostRepositoryMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/PostRepositoryMySQLImpl.java
new file mode 100644
index 00000000..476c7432
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/PostRepositoryMySQLImpl.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.repository.impl;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.bbs.model.Post;
+import com.l2jserver.gameserver.bbs.model.Topic;
+import com.l2jserver.gameserver.bbs.repository.PostRepository;
+
+/**
+ * Post repository MySQL implementation.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class PostRepositoryMySQLImpl implements PostRepository {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PostRepositoryMySQLImpl.class);
+	
+	private static final String INSERT_POST = "INSERT INTO posts (post_id,post_owner_name,post_ownerid,post_date,post_topic_id,post_forum_id,post_txt) values (?,?,?,?,?,?,?)";
+	
+	private static final String DELETE_POST = "DELETE FROM posts WHERE post_forum_id=? AND post_topic_id=?";
+	
+	private static final String SELECT_POSTS = "SELECT * FROM posts WHERE post_forum_id=? AND post_topic_id=? ORDER BY post_id";
+	
+	private static final String UPDATE_POST = "UPDATE posts SET post_txt=? WHERE post_id=? AND post_topic_id=? AND post_forum_id=?";
+	
+	public void save(Post cp) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_POST)) {
+			ps.setInt(1, cp.getId());
+			ps.setString(2, cp.getOwnerName());
+			ps.setInt(3, cp.getOwnerId());
+			ps.setLong(4, cp.getDate());
+			ps.setInt(5, cp.getTopicId());
+			ps.setInt(6, cp.getForumId());
+			ps.setString(7, cp.getTxt());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Could not save post Id {} in database!", cp.getId(), ex);
+		}
+	}
+	
+	@Override
+	public void delete(Topic topic) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_POST)) {
+			ps.setInt(1, topic.getForumId());
+			ps.setInt(2, topic.getId());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Unable to delete post for topic Id {} in forum Id {} from database!", topic.getForumId(), topic.getId(), ex);
+		}
+	}
+	
+	@Override
+	public List<Post> load(Topic topic) {
+		final var posts = new LinkedList<Post>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_POSTS)) {
+			ps.setInt(1, topic.getForumId());
+			ps.setInt(2, topic.getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final Post cp = new Post(rs.getInt("post_id"), rs.getString("post_owner_name"), rs.getInt("post_ownerid"), //
+						rs.getLong("post_date"), rs.getInt("post_topic_id"), rs.getInt("post_forum_id"), rs.getString("post_txt"));
+					posts.add(cp);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Unable to get post from topic Id {} in forum Id {} from database!", topic.getForumId(), topic.getId(), ex);
+		}
+		return posts;
+	}
+	
+	@Override
+	public void update(Post cp) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_POST)) {
+			ps.setString(1, cp.getTxt());
+			ps.setInt(2, cp.getId());
+			ps.setInt(3, cp.getTopicId());
+			ps.setInt(4, cp.getForumId());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Unable to store post Id {} in database!", cp.getId(), ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/TopicRepositoryMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/TopicRepositoryMySQLImpl.java
new file mode 100644
index 00000000..c5c11d40
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/repository/impl/TopicRepositoryMySQLImpl.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.repository.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.model.Topic;
+import com.l2jserver.gameserver.bbs.model.TopicType;
+import com.l2jserver.gameserver.bbs.repository.TopicRepository;
+import com.l2jserver.gameserver.bbs.service.TopicBBSManager;
+
+/**
+ * Topic Repository MySQL implementation.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class TopicRepositoryMySQLImpl implements TopicRepository {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TopicRepositoryMySQLImpl.class);
+	
+	private static final String SELECT_TOPICS = "SELECT * FROM topic WHERE topic_forum_id=? ORDER BY topic_id DESC";
+	
+	private static final String DELETE_TOPIC = "DELETE FROM topic WHERE topic_id=? AND topic_forum_id=?";
+	
+	private static final String INSERT_TOPIC = "INSERT INTO topic (topic_id,topic_forum_id,topic_name,topic_date,topic_ownername,topic_ownerid,topic_type,topic_reply) values (?,?,?,?,?,?,?,?)";
+	
+	@Override
+	public void load(Forum forum) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_TOPICS)) {
+			ps.setInt(1, forum.getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final var topic = new Topic(rs.getInt("topic_id"), //
+						rs.getInt("topic_forum_id"), rs.getString("topic_name"), rs.getLong("topic_date"), //
+						rs.getString("topic_ownername"), rs.getInt("topic_ownerid"), TopicType.values()[rs.getInt("topic_type")], //
+						rs.getInt("topic_reply"));
+					
+					TopicBBSManager.getInstance().addTopic(topic);
+					
+					forum.getTopics().put(topic.getId(), topic);
+					if (topic.getId() > TopicBBSManager.getInstance().getMaxId(forum)) {
+						TopicBBSManager.getInstance().setMaxId(topic.getId(), forum);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not get from database topics for forum Id {}!", forum.getId(), ex);
+		}
+	}
+	
+	@Override
+	public void save(Topic topic) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_TOPIC)) {
+			ps.setInt(1, topic.getId());
+			ps.setInt(2, topic.getForumId());
+			ps.setString(3, topic.getName());
+			ps.setLong(4, topic.getDate());
+			ps.setString(5, topic.getOwnerName());
+			ps.setInt(6, topic.getOwnerId());
+			ps.setInt(7, topic.getType().ordinal());
+			ps.setInt(8, topic.getReply());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Error while saving new Topic to database!", e);
+		}
+	}
+	
+	@Override
+	public void delete(Topic topic, Forum forum) {
+		TopicBBSManager.getInstance().delTopic(topic);
+		forum.removeTopic(topic.getId());
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_TOPIC)) {
+			ps.setInt(1, topic.getId());
+			ps.setInt(2, forum.getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Error while deleting topic ID {} from database!", topic.getId(), e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/service/BaseBBSManager.java b/src/main/java/com/l2jserver/gameserver/bbs/service/BaseBBSManager.java
new file mode 100644
index 00000000..4ea399d1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/service/BaseBBSManager.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ShowBoard;
+
+public abstract class BaseBBSManager {
+	public abstract void parsecmd(String command, L2PcInstance activeChar);
+	
+	public abstract void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar);
+	
+	protected void send1001(String html, L2PcInstance player) {
+		if (html.length() < 8192) {
+			player.sendPacket(new ShowBoard(html, "1001"));
+		}
+	}
+	
+	protected void send1002(L2PcInstance player) {
+		send1002(player, " ", " ", "0");
+	}
+	
+	protected void send1002(L2PcInstance activeChar, String string, String string2, String string3) {
+		List<String> arg = new ArrayList<>();
+		arg.add("0");
+		arg.add("0");
+		arg.add("0");
+		arg.add("0");
+		arg.add("0");
+		arg.add("0");
+		arg.add(activeChar.getName());
+		arg.add(Integer.toString(activeChar.getObjectId()));
+		arg.add(activeChar.getAccountName());
+		arg.add("9");
+		arg.add(string2); // subject?
+		arg.add(string2); // subject?
+		arg.add(string); // text
+		arg.add(string3); // date?
+		arg.add(string3); // date?
+		arg.add("0");
+		arg.add("0");
+		activeChar.sendPacket(new ShowBoard(arg));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/service/ForumsBBSManager.java b/src/main/java/com/l2jserver/gameserver/bbs/service/ForumsBBSManager.java
new file mode 100644
index 00000000..a4da2552
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/service/ForumsBBSManager.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.service;
+
+import static com.l2jserver.gameserver.bbs.model.ForumType.CLAN;
+import static com.l2jserver.gameserver.bbs.model.ForumVisibility.CLAN_MEMBER_ONLY;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.model.ForumType;
+import com.l2jserver.gameserver.bbs.model.ForumVisibility;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.model.L2Clan;
+
+/**
+ * Forums BBS Manager.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ForumsBBSManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ForumsBBSManager.class);
+	
+	private static final Map<String, Forum> FORUMS_BY_NAME = new ConcurrentHashMap<>();
+	
+	private static final Map<Integer, Forum> FORUMS_BY_ID = new ConcurrentHashMap<>();
+	
+	protected ForumsBBSManager() {
+		// Do nothing.
+	}
+	
+	public void load() {
+		FORUMS_BY_NAME.putAll(DAOFactory.getInstance().getForumRepository().getForums());
+		FORUMS_BY_ID.putAll(FORUMS_BY_NAME.values().stream().collect(Collectors.toMap(Forum::getId, f -> f)));
+		LOG.info("Loaded {} forums.", FORUMS_BY_NAME.size());
+	}
+	
+	public Forum getForumByName(String name) {
+		return FORUMS_BY_NAME.get(name);
+	}
+	
+	public Forum getForumById(Integer id) {
+		return FORUMS_BY_ID.get(id);
+	}
+	
+	public Forum create(String name, Forum parent, ForumType type, ForumVisibility visibility, int ownerId) {
+		final var forum = new Forum(0, name, parent, type, visibility, ownerId);
+		parent.addChild(forum);
+		
+		DAOFactory.getInstance().getForumRepository().save(forum);
+		
+		FORUMS_BY_NAME.put(forum.getName(), forum);
+		FORUMS_BY_ID.put(forum.getId(), forum);
+		return forum;
+	}
+	
+	public Forum load(int id, String name, Forum parent, ForumType type, ForumVisibility visibility, int ownerId) {
+		final var forum = new Forum(id, name, parent, type, visibility, ownerId);
+		parent.addChild(forum);
+		FORUMS_BY_NAME.put(forum.getName(), forum);
+		FORUMS_BY_ID.put(forum.getId(), forum);
+		return forum;
+	}
+	
+	public void onClanLevel(L2Clan clan) {
+		if ((clan.getLevel() >= 2) && general().enableCommunityBoard()) {
+			final var clanRootForum = ForumsBBSManager.getInstance().getForumByName("ClanRoot");
+			if (clanRootForum != null) {
+				var forum = clanRootForum.getChildByName(clan.getName());
+				if (forum == null) {
+					ForumsBBSManager.getInstance().create(clan.getName(), clanRootForum, CLAN, CLAN_MEMBER_ONLY, clan.getId());
+				}
+			}
+		}
+	}
+	
+	public static ForumsBBSManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ForumsBBSManager INSTANCE = new ForumsBBSManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/service/PostBBSManager.java b/src/main/java/com/l2jserver/gameserver/bbs/service/PostBBSManager.java
new file mode 100644
index 00000000..ca6f95da
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/service/PostBBSManager.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.service;
+
+import java.text.DateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.model.ForumType;
+import com.l2jserver.gameserver.bbs.model.Post;
+import com.l2jserver.gameserver.bbs.model.Topic;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.handler.CommunityBoardHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Post BBS Manager.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class PostBBSManager extends BaseBBSManager {
+	
+	private final Map<Topic, List<Post>> _postByTopic = new ConcurrentHashMap<>();
+	
+	protected PostBBSManager() {
+		// Do nothing.
+	}
+	
+	public List<Post> getGPostByTopic(Topic topic) {
+		var posts = _postByTopic.get(topic);
+		if (posts == null) {
+			posts = DAOFactory.getInstance().getPostRepository().load(topic);
+			_postByTopic.put(topic, posts);
+		}
+		return posts;
+	}
+	
+	public void delPostByTopic(Topic t) {
+		_postByTopic.remove(t);
+	}
+	
+	public void addPostByTopic(Topic topic, List<Post> posts) {
+		_postByTopic.putIfAbsent(topic, posts);
+	}
+	
+	@Override
+	public void parsecmd(String command, L2PcInstance activeChar) {
+		if (command.startsWith("_bbsposts;read;")) {
+			final var st = new StringTokenizer(command, ";");
+			st.nextToken();
+			st.nextToken();
+			final var forumId = Integer.parseInt(st.nextToken());
+			final var topicId = Integer.parseInt(st.nextToken());
+			final var index = st.hasMoreTokens() ? Integer.parseInt(st.nextToken()) : 1;
+			
+			final var forum = ForumsBBSManager.getInstance().getForumById(forumId);
+			final var topic = TopicBBSManager.getInstance().getTopicById(topicId);
+			showPost(topic, forum, activeChar, index);
+		} else if (command.startsWith("_bbsposts;edit;")) {
+			final var st = new StringTokenizer(command, ";");
+			st.nextToken();
+			st.nextToken();
+			final var forumId = Integer.parseInt(st.nextToken());
+			final var topicId = Integer.parseInt(st.nextToken());
+			final var postId = Integer.parseInt(st.nextToken());
+			
+			final var forum = ForumsBBSManager.getInstance().getForumById(forumId);
+			final var topic = TopicBBSManager.getInstance().getTopicById(topicId);
+			showEditPost(topic, forum, activeChar, postId);
+		} else {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the command: " + command + " is not implemented yet</center><br><br></body></html>", activeChar);
+		}
+	}
+	
+	private void showEditPost(Topic topic, Forum forum, L2PcInstance activeChar, int idp) {
+		if (topic == null) {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>Error: This topic does not exist!</center></body></html>", activeChar);
+		} else {
+			final List<Post> p = getGPostByTopic(topic);
+			if ((forum == null) || (p == null)) {
+				CommunityBoardHandler.separateAndSend("<html><body><br><br><center>Error: This forum or post does not exist!</center></body></html>", activeChar);
+			} else {
+				showHtmlEditPost(topic, activeChar, forum, p);
+			}
+		}
+	}
+	
+	private void showPost(Topic topic, Forum forum, L2PcInstance activeChar, int ind) {
+		if ((forum == null) || (topic == null)) {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>Error: This forum is not implemented yet!</center></body></html>", activeChar);
+		} else if (forum.getType() == ForumType.MEMO) {
+			showMemoPost(topic, activeChar, forum);
+		} else {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>The forum: " + forum.getName() + " is not implemented yet!</center></body></html>", activeChar);
+		}
+	}
+	
+	private void showHtmlEditPost(Topic topic, L2PcInstance activeChar, Forum forum, List<Post> posts) {
+		final String html = StringUtil.concat("<html><body><br><br><table border=0 width=610><tr><td width=10></td><td width=600 align=left><a action=\"bypass _bbshome\">HOME</a>&nbsp;>&nbsp;<a action=\"bypass _bbsmemo\">", forum
+			.getName(), " Form</a></td></tr></table><img src=\"L2UI.squareblank\" width=\"1\" height=\"10\"><center><table border=0 cellspacing=0 cellpadding=0><tr><td width=610><img src=\"sek.cbui355\" width=\"610\" height=\"1\"><br1><img src=\"sek.cbui355\" width=\"610\" height=\"1\"></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=20></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&$413;</td><td FIXWIDTH=540>", topic
+				.getName(), "</td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29 valign=top>&$427;</td><td align=center FIXWIDTH=540><MultiEdit var =\"Content\" width=535 height=313></td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&nbsp;</td><td align=center FIXWIDTH=70><button value=\"&$140;\" action=\"Write Post ", String
+					.valueOf(forum.getId()), ";", String.valueOf(topic
+						.getId()), ";0 _ Content Content Content\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td><td align=center FIXWIDTH=70><button value = \"&$141;\" action=\"bypass _bbsmemo\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"> </td><td align=center FIXWIDTH=400>&nbsp;</td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table></center></body></html>");
+		send1001(html, activeChar);
+		send1002(activeChar, posts.get(0).getTxt(), topic.getName(), DateFormat.getInstance().format(new Date(topic.getDate())));
+	}
+	
+	private void showMemoPost(Topic topic, L2PcInstance activeChar, Forum forum) {
+		final var posts = getGPostByTopic(topic);
+		Locale locale = Locale.getDefault();
+		DateFormat dateFormat = DateFormat.getDateInstance(DateFormat.FULL, locale);
+		
+		String mes = posts.get(0).getTxt().replace(">", "&gt;");
+		mes = mes.replace("<", "&lt;");
+		// TODO(Zoey76): Replace this with a template.
+		final String html = StringUtil
+			.concat("<html><body><br><br><table border=0 width=610><tr><td width=10></td><td width=600 align=left><a action=\"bypass _bbshome\">HOME</a>&nbsp;>&nbsp;<a action=\"bypass _bbsmemo\">Memo Form</a></td></tr></table><img src=\"L2UI.squareblank\" width=\"1\" height=\"10\"><center><table border=0 cellspacing=0 cellpadding=0 bgcolor=333333><tr><td height=10></td></tr><tr><td fixWIDTH=55 align=right valign=top>&$413; : &nbsp;</td><td fixWIDTH=380 valign=top>", topic
+				.getName(), "</td><td fixwidth=5></td><td fixwidth=50></td><td fixWIDTH=120></td></tr><tr><td height=10></td></tr><tr><td align=right><font color=\"AAAAAA\" >&$417; : &nbsp;</font></td><td><font color=\"AAAAAA\">", topic.getOwnerName()
+					+ "</font></td><td></td><td><font color=\"AAAAAA\">&$418; :</font></td><td><font color=\"AAAAAA\">", dateFormat.format(posts.get(0)
+						.getDate()), "</font></td></tr><tr><td height=10></td></tr></table><br><table border=0 cellspacing=0 cellpadding=0><tr><td fixwidth=5></td><td FIXWIDTH=600 align=left>", mes, "</td><td fixqqwidth=5></td></tr></table><br><img src=\"L2UI.squareblank\" width=\"1\" height=\"5\"><img src=\"L2UI.squaregray\" width=\"610\" height=\"1\"><img src=\"L2UI.squareblank\" width=\"1\" height=\"5\"><table border=0 cellspacing=0 cellpadding=0 FIXWIDTH=610><tr><td width=50><button value=\"&$422;\" action=\"bypass _bbsmemo\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"></td><td width=560 align=right><table border=0 cellspacing=0><tr><td FIXWIDTH=300></td><td><button value = \"&$424;\" action=\"bypass _bbsposts;edit;", String
+							.valueOf(forum.getId()), ";", String.valueOf(topic.getId()), ";0\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td>&nbsp;<td><button value = \"&$425;\" action=\"bypass _bbstopics;del;", String.valueOf(forum.getId()), ";", String
+								.valueOf(topic.getId()), "\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td>&nbsp;<td><button value = \"&$421;\" action=\"bypass _bbstopics;crea;", String
+									.valueOf(forum.getId()), "\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td>&nbsp;</tr></table></td></tr></table><br><br><br></center></body></html>");
+		CommunityBoardHandler.separateAndSend(html, activeChar);
+	}
+	
+	@Override
+	public void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar) {
+		StringTokenizer st = new StringTokenizer(ar1, ";");
+		int idf = Integer.parseInt(st.nextToken());
+		int idt = Integer.parseInt(st.nextToken());
+		int idp = Integer.parseInt(st.nextToken());
+		
+		Forum f = ForumsBBSManager.getInstance().getForumById(idf);
+		if (f == null) {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + idf + " does not exist !</center><br><br></body></html>", activeChar);
+		} else {
+			Topic t = f.getTopic(idt);
+			if (t == null) {
+				CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the topic: " + idt + " does not exist !</center><br><br></body></html>", activeChar);
+			} else {
+				final var posts = getGPostByTopic(t);
+				if (!posts.isEmpty()) {
+					final Post post = posts.get(idp);
+					if (post == null) {
+						CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the post: " + idp + " does not exist !</center><br><br></body></html>", activeChar);
+					} else {
+						post.setTxt(ar4);
+						DAOFactory.getInstance().getPostRepository().update(post);
+						parsecmd("_bbsposts;read;" + f.getId() + ";" + t.getId(), activeChar);
+					}
+				}
+			}
+		}
+	}
+	
+	public static PostBBSManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PostBBSManager INSTANCE = new PostBBSManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/bbs/service/TopicBBSManager.java b/src/main/java/com/l2jserver/gameserver/bbs/service/TopicBBSManager.java
new file mode 100644
index 00000000..0c3cf554
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/bbs/service/TopicBBSManager.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.bbs.service;
+
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.model.ForumType;
+import com.l2jserver.gameserver.bbs.model.Post;
+import com.l2jserver.gameserver.bbs.model.Topic;
+import com.l2jserver.gameserver.bbs.model.TopicType;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.handler.CommunityBoardHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Topic BBS Manager.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class TopicBBSManager extends BaseBBSManager {
+	
+	private final List<Topic> table = new CopyOnWriteArrayList<>();
+	
+	private final Map<Forum, Integer> maxId = new HashMap<>();
+	
+	protected TopicBBSManager() {
+		// Do nothing.
+	}
+	
+	public void addTopic(Topic topic) {
+		table.add(topic);
+	}
+	
+	public void delTopic(Topic topic) {
+		table.remove(topic);
+	}
+	
+	public void setMaxId(int id, Forum forum) {
+		maxId.put(forum, id);
+	}
+	
+	public int getMaxId(Forum f) {
+		var i = maxId.get(f);
+		if (i == null) {
+			return 0;
+		}
+		return i;
+	}
+	
+	public Topic getTopicById(int id) {
+		for (var topic : table) {
+			if (topic.getId() == id) {
+				return topic;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar) {
+		if (ar1.equals("crea")) {
+			final var forum = ForumsBBSManager.getInstance().getForumById(Integer.parseInt(ar2));
+			if (forum == null) {
+				CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + ar2 + " is not implemented yet</center><br><br></body></html>", activeChar);
+				return;
+			}
+			
+			final var id = TopicBBSManager.getInstance().getMaxId(forum) + 1;
+			final var date = Calendar.getInstance().getTimeInMillis();
+			final var topic = new Topic(id, Integer.parseInt(ar2), ar5, date, activeChar.getName(), activeChar.getObjectId(), TopicType.MEMO, 0);
+			
+			TopicBBSManager.getInstance().addTopic(topic);
+			
+			DAOFactory.getInstance().getTopicRepository().save(topic);
+			
+			forum.addTopic(topic);
+			TopicBBSManager.getInstance().setMaxId(topic.getId(), forum);
+			
+			final var posts = new LinkedList<Post>();
+			posts.add(new Post(0, activeChar.getName(), activeChar.getObjectId(), Calendar.getInstance().getTimeInMillis(), topic.getId(), forum.getId(), ar4));
+			PostBBSManager.getInstance().addPostByTopic(topic, posts);
+			parsecmd("_bbsmemo", activeChar);
+		} else if (ar1.equals("del")) {
+			final var forum = ForumsBBSManager.getInstance().getForumById(Integer.parseInt(ar2));
+			if (forum == null) {
+				CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + ar2 + " does not exist !</center><br><br></body></html>", activeChar);
+				return;
+			}
+			
+			final var topic = forum.getTopic(Integer.parseInt(ar3));
+			if (topic == null) {
+				CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the topic: " + ar3 + " does not exist !</center><br><br></body></html>", activeChar);
+				return;
+			}
+			
+			final var posts = PostBBSManager.getInstance().getGPostByTopic(topic);
+			if (!posts.isEmpty()) {
+				PostBBSManager.getInstance().delPostByTopic(topic);
+				DAOFactory.getInstance().getPostRepository().delete(topic);
+			}
+			
+			DAOFactory.getInstance().getTopicRepository().delete(topic, forum);
+			
+			parsecmd("_bbsmemo", activeChar);
+		} else {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the command: " + ar1 + " is not implemented yet</center><br><br></body></html>", activeChar);
+		}
+	}
+	
+	@Override
+	public void parsecmd(String command, L2PcInstance activeChar) {
+		if (command.equals("_bbsmemo")) {
+			showTopics(activeChar.getMemo(), activeChar, 1, activeChar.getMemo().getId());
+		} else if (command.startsWith("_bbstopics;read")) {
+			StringTokenizer st = new StringTokenizer(command, ";");
+			st.nextToken();
+			st.nextToken();
+			int idf = Integer.parseInt(st.nextToken());
+			String index = null;
+			if (st.hasMoreTokens()) {
+				index = st.nextToken();
+			}
+			int ind;
+			if (index == null) {
+				ind = 1;
+			} else {
+				ind = Integer.parseInt(index);
+			}
+			showTopics(ForumsBBSManager.getInstance().getForumById(idf), activeChar, ind, idf);
+		} else if (command.startsWith("_bbstopics;crea")) {
+			StringTokenizer st = new StringTokenizer(command, ";");
+			st.nextToken();
+			st.nextToken();
+			int idf = Integer.parseInt(st.nextToken());
+			showNewTopic(ForumsBBSManager.getInstance().getForumById(idf), activeChar, idf);
+		} else if (command.startsWith("_bbstopics;del")) {
+			StringTokenizer st = new StringTokenizer(command, ";");
+			st.nextToken();
+			st.nextToken();
+			int idf = Integer.parseInt(st.nextToken());
+			int idt = Integer.parseInt(st.nextToken());
+			Forum f = ForumsBBSManager.getInstance().getForumById(idf);
+			if (f == null) {
+				CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + idf + " does not exist !</center><br><br></body></html>", activeChar);
+			} else {
+				Topic t = f.getTopic(idt);
+				if (t == null) {
+					CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the topic: " + idt + " does not exist !</center><br><br></body></html>", activeChar);
+				} else {
+					final var p = PostBBSManager.getInstance().getGPostByTopic(t);
+					if (p != null) {
+						PostBBSManager.getInstance().delPostByTopic(t);
+						DAOFactory.getInstance().getPostRepository().delete(t);
+					}
+					
+					DAOFactory.getInstance().getTopicRepository().delete(t, f);
+					
+					parsecmd("_bbsmemo", activeChar);
+				}
+			}
+		} else {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the command: " + command + " is not implemented yet</center><br><br></body></html>", activeChar);
+		}
+	}
+	
+	private void showNewTopic(Forum forum, L2PcInstance activeChar, int idf) {
+		if (forum == null) {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + idf + " is not implemented yet</center><br><br></body></html>", activeChar);
+		} else if (forum.getType() == ForumType.MEMO) {
+			showMemoNewTopics(forum, activeChar);
+		} else {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + forum.getName() + " is not implemented yet</center><br><br></body></html>", activeChar);
+		}
+	}
+	
+	private void showMemoNewTopics(Forum forum, L2PcInstance activeChar) {
+		final String html = StringUtil
+			.concat("<html><body><br><br><table border=0 width=610><tr><td width=10></td><td width=600 align=left><a action=\"bypass _bbshome\">HOME</a>&nbsp;>&nbsp;<a action=\"bypass _bbsmemo\">Memo Form</a></td></tr></table><img src=\"L2UI.squareblank\" width=\"1\" height=\"10\"><center><table border=0 cellspacing=0 cellpadding=0><tr><td width=610><img src=\"sek.cbui355\" width=\"610\" height=\"1\"><br1><img src=\"sek.cbui355\" width=\"610\" height=\"1\"></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=20></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&$413;</td><td FIXWIDTH=540><edit var = \"Title\" width=540 height=13></td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29 valign=top>&$427;</td><td align=center FIXWIDTH=540><MultiEdit var =\"Content\" width=535 height=313></td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr></table><table fixwidth=610 border=0 cellspacing=0 cellpadding=0><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=1></td><td align=center FIXWIDTH=60 height=29>&nbsp;</td><td align=center FIXWIDTH=70><button value=\"&$140;\" action=\"Write Topic crea ", String
+				.valueOf(forum
+					.getId()), " Title Content Title\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td><td align=center FIXWIDTH=70><button value = \"&$141;\" action=\"bypass _bbsmemo\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"> </td><td align=center FIXWIDTH=400>&nbsp;</td><td><img src=\"l2ui.mini_logo\" width=5 height=1></td></tr></table></center></body></html>");
+		send1001(html, activeChar);
+		send1002(activeChar);
+	}
+	
+	private void showTopics(Forum forum, L2PcInstance activeChar, int index, int idf) {
+		if (forum == null) {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + idf + " is not implemented yet</center><br><br></body></html>", activeChar);
+		} else if (forum.getType() == ForumType.MEMO) {
+			showMemoTopics(forum, activeChar, index);
+		} else {
+			CommunityBoardHandler.separateAndSend("<html><body><br><br><center>the forum: " + forum.getName() + " is not implemented yet</center><br><br></body></html>", activeChar);
+		}
+	}
+	
+	private void showMemoTopics(Forum forum, L2PcInstance activeChar, int index) {
+		final StringBuilder html = StringUtil
+			.startAppend(2000, "<html><body><br><br><table border=0 width=610><tr><td width=10></td><td width=600 align=left><a action=\"bypass _bbshome\">HOME</a>&nbsp;>&nbsp;<a action=\"bypass _bbsmemo\">Memo Form</a></td></tr></table><img src=\"L2UI.squareblank\" width=\"1\" height=\"10\"><center><table border=0 cellspacing=0 cellpadding=2 bgcolor=888888 width=610><tr><td FIXWIDTH=5></td><td FIXWIDTH=415 align=center>&$413;</td><td FIXWIDTH=120 align=center></td><td FIXWIDTH=70 align=center>&$418;</td></tr></table>");
+		final DateFormat dateFormat = DateFormat.getInstance();
+		
+		for (int i = 0, j = getMaxId(forum) + 1; i < (12 * index); j--) {
+			if (j < 0) {
+				break;
+			}
+			Topic t = forum.getTopic(j);
+			if (t != null) {
+				if (i++ >= (12 * (index - 1))) {
+					StringUtil.append(html, "<table border=0 cellspacing=0 cellpadding=5 WIDTH=610><tr><td FIXWIDTH=5></td><td FIXWIDTH=415><a action=\"bypass _bbsposts;read;", String.valueOf(forum.getId()), ";", String.valueOf(t.getId()), "\">", t
+						.getName(), "</a></td><td FIXWIDTH=120 align=center></td><td FIXWIDTH=70 align=center>", dateFormat.format(new Date(t.getDate())), "</td></tr></table><img src=\"L2UI.Squaregray\" width=\"610\" height=\"1\">");
+				}
+			}
+		}
+		
+		html.append("<br><table width=610 cellspace=0 cellpadding=0><tr><td width=50><button value=\"&$422;\" action=\"bypass _bbsmemo\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"></td><td width=510 align=center><table border=0><tr>");
+		
+		if (index == 1) {
+			html.append("<td><button action=\"\" back=\"l2ui_ch3.prev1_down\" fore=\"l2ui_ch3.prev1\" width=16 height=16 ></td>");
+		} else {
+			StringUtil.append(html, "<td><button action=\"bypass _bbstopics;read;", String.valueOf(forum.getId()), ";", String.valueOf(index - 1), "\" back=\"l2ui_ch3.prev1_down\" fore=\"l2ui_ch3.prev1\" width=16 height=16 ></td>");
+		}
+		
+		int nbp;
+		nbp = forum.getTopicSize() / 8;
+		if ((nbp * 8) != ClanTable.getInstance().getClanCount()) {
+			nbp++;
+		}
+		for (int i = 1; i <= nbp; i++) {
+			if (i == index) {
+				StringUtil.append(html, "<td> ", String.valueOf(i), " </td>");
+			} else {
+				StringUtil.append(html, "<td><a action=\"bypass _bbstopics;read;", String.valueOf(forum.getId()), ";", String.valueOf(i), "\"> ", String.valueOf(i), " </a></td>");
+			}
+		}
+		if (index == nbp) {
+			html.append("<td><button action=\"\" back=\"l2ui_ch3.next1_down\" fore=\"l2ui_ch3.next1\" width=16 height=16 ></td>");
+		} else {
+			StringUtil.append(html, "<td><button action=\"bypass _bbstopics;read;", String.valueOf(forum.getId()), ";", String.valueOf(index + 1), "\" back=\"l2ui_ch3.next1_down\" fore=\"l2ui_ch3.next1\" width=16 height=16 ></td>");
+		}
+		
+		StringUtil.append(html, "</tr></table> </td> <td align=right><button value = \"&$421;\" action=\"bypass _bbstopics;crea;", String.valueOf(forum.getId()), //
+			"\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\" ></td></tr><tr><td><img src=\"l2ui.mini_logo\" width=5 height=10></td></tr><tr> <td></td><td align=center><table border=0><tr><td></td><td><edit var = \"Search\" width=130 height=11></td><td><button value=\"&$420;\" action=\"Write 5 -2 0 Search _ _\" back=\"l2ui_ch3.smallbutton2_down\" width=65 height=20 fore=\"l2ui_ch3.smallbutton2\"> </td> </tr></table> </td></tr></table><br><br><br></center></body></html>");
+		CommunityBoardHandler.separateAndSend(html.toString(), activeChar);
+	}
+	
+	public static TopicBBSManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final TopicBBSManager _instance = new TopicBBSManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/cache/HtmCache.java b/src/main/java/com/l2jserver/gameserver/cache/HtmCache.java
new file mode 100644
index 00000000..d0a92d1b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/cache/HtmCache.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.cache;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.util.file.filter.HTMLFilter;
+
+/**
+ * HTML Cache.
+ * @author Layane
+ * @author Zoey76
+ */
+public class HtmCache {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(HtmCache.class);
+	
+	private static final HTMLFilter HTML_FILTER = new HTMLFilter();
+	
+	private static final Map<String, String> HTML_CACHE = general().lazyCache() ? new ConcurrentHashMap<>() : new HashMap<>();
+	
+	private int _loadedFiles;
+	
+	private long _bytesBuffLen;
+	
+	protected HtmCache() {
+		reload();
+	}
+	
+	public void reload() {
+		reload(server().getDatapackRoot());
+	}
+	
+	public void reload(File f) {
+		if (!general().lazyCache()) {
+			LOG.info("Html cache start...");
+			parseDir(f);
+			LOG.info(String.format("%.3f", getMemoryUsage()) + " megabytes on " + getLoadedFiles() + " files loaded.");
+		} else {
+			HTML_CACHE.clear();
+			_loadedFiles = 0;
+			_bytesBuffLen = 0;
+			LOG.info("Running lazy cache.");
+		}
+	}
+	
+	public void reloadPath(File f) {
+		parseDir(f);
+		LOG.info("Reloaded specified path.");
+	}
+	
+	public double getMemoryUsage() {
+		return ((float) _bytesBuffLen / 1048576);
+	}
+	
+	public int getLoadedFiles() {
+		return _loadedFiles;
+	}
+	
+	private void parseDir(File dir) {
+		final File[] files = dir.listFiles();
+		if (files != null) {
+			for (File file : files) {
+				if (!file.isDirectory()) {
+					loadFile(file);
+				} else {
+					parseDir(file);
+				}
+			}
+		}
+	}
+	
+	public String loadFile(File file) {
+		if (!HTML_FILTER.accept(file)) {
+			return null;
+		}
+		
+		String content = null;
+		try (var fis = new FileInputStream(file);
+			var bis = new BufferedInputStream(fis)) {
+			final int bytes = bis.available();
+			byte[] raw = new byte[bytes];
+			
+			bis.read(raw);
+			content = new String(raw, UTF_8);
+			content = content.replaceAll("(?s)<!--.*?-->", ""); // Remove html comments
+			
+			String oldContent = HTML_CACHE.put(file.getCanonicalPath(), content);
+			if (oldContent == null) {
+				_bytesBuffLen += bytes;
+				_loadedFiles++;
+			} else {
+				_bytesBuffLen = (_bytesBuffLen - oldContent.length()) + bytes;
+			}
+		} catch (Exception e) {
+			LOG.warn("Problem with htm file {}!", file, e);
+		}
+		return content;
+	}
+	
+	public String getHtm(String prefix, String path) {
+		final var newPath = Objects.requireNonNullElse(prefix, "") + path;
+		var content = HTML_CACHE.get(newPath);
+		if (general().lazyCache() && (content == null)) {
+			content = loadFile(new File(server().getDatapackRoot(), newPath));
+			if (content == null) {
+				content = loadFile(new File(server().getScriptRoot(), newPath));
+			}
+			
+			// If multilanguage content is not present, try default location.
+			if ((prefix != null) && (content == null)) {
+				content = loadFile(new File(server().getDatapackRoot(), path));
+				if (content == null) {
+					content = loadFile(new File(server().getScriptRoot(), path));
+				}
+			}
+		}
+		return content;
+	}
+	
+	public boolean contains(String path) {
+		return HTML_CACHE.containsKey(path);
+	}
+	
+	/**
+	 * @param path The path to the HTM
+	 * @return {@code true} if the path targets a HTM or HTML file, {@code false} otherwise.
+	 */
+	public boolean isLoadable(String path) {
+		return HTML_FILTER.accept(new File(server().getDatapackRoot(), path));
+	}
+	
+	public static HtmCache getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final HtmCache INSTANCE = new HtmCache();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java b/src/main/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java
new file mode 100644
index 00000000..a49d0f59
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.cache;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author -Nemesiss-
+ */
+public class WarehouseCacheManager {
+	
+	protected final Map<L2PcInstance, Long> _cachedWh = new ConcurrentHashMap<>();
+	
+	protected WarehouseCacheManager() {
+		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new CacheScheduler(), 120000, 60000);
+	}
+	
+	public void addCacheTask(L2PcInstance pc) {
+		_cachedWh.put(pc, System.currentTimeMillis());
+	}
+	
+	public void remCacheTask(L2PcInstance pc) {
+		_cachedWh.remove(pc);
+	}
+	
+	public class CacheScheduler implements Runnable {
+		@Override
+		public void run() {
+			long cTime = System.currentTimeMillis();
+			for (L2PcInstance pc : _cachedWh.keySet()) {
+				if ((cTime - _cachedWh.get(pc)) > general().getWarehouseCacheTime()) {
+					pc.clearWarehouse();
+					_cachedWh.remove(pc);
+				}
+			}
+		}
+	}
+	
+	public static WarehouseCacheManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final WarehouseCacheManager _instance = new WarehouseCacheManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/BufferServiceConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/BufferServiceConfiguration.java
new file mode 100644
index 00000000..d752b41e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/BufferServiceConfiguration.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.Seconds2MillisecondsConverter;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * Buffer Service Configuration.
+ * @author HorridoJoho
+ * @version 2.6.2.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/bufferservice.properties",
+	"file:./config/bufferservice.properties",
+	"classpath:config/bufferservice.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface BufferServiceConfiguration extends Reloadable {
+	
+	@Key("Enable")
+	boolean enable();
+	
+	@Key("HealCooldown")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getHealCooldown();
+	
+	@Key("MaxUniqueLists")
+	int getMaxUniqueLists();
+	
+	@Key("Debug")
+	boolean getDebug();
+	
+	@Key("ForbidInZones")
+	ZoneId[] getForbidInZones();
+	
+	@Key("ForbidInEvents")
+	boolean getForbidInEvents();
+	
+	@Key("ForbidInDuel")
+	boolean getForbidInDuel();
+	
+	@Key("ForbidInFight")
+	boolean getForbidInFight();
+	
+	@Key("ForbidInPvp")
+	boolean getForbidInPvp();
+	
+	@Key("ForbidForChaoticPlayers")
+	boolean getForbidForChaoticPlayers();
+	
+	@Key("VoicedEnable")
+	boolean getVoicedEnable();
+	
+	@Key("VoicedCommand")
+	String getVoicedCommand();
+	
+	@Key("VoicedName")
+	String getVoicedName();
+	
+	@Key("VoicedRequiredItem")
+	int getVoicedRequiredItem();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/CastleConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/CastleConfiguration.java
new file mode 100644
index 00000000..5e53d463
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/CastleConfiguration.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Castle Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/castle.properties",
+	"file:./config/castle.properties",
+	"classpath:config/castle.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 1, unit = HOURS, type = ASYNC)
+public interface CastleConfiguration extends Reloadable {
+	
+	@Key("SiegeHourList")
+	List<Integer> getSiegeHourList();
+	
+	@Key("FunctionFeeDay7")
+	long getFunctionFeeDay7();
+	
+	@Key("TeleportFunctionFeeLvl11")
+	int getTeleportFunctionFeeLvl11();
+	
+	@Key("TeleportFunctionFeeLvl12")
+	int getTeleportFunctionFeeLvl12();
+	
+	@Key("SupportFeeLvl15")
+	int getSupportFeeLvl15();
+	
+	@Key("SupportFeeLvl18")
+	int getSupportFeeLvl18();
+	
+	@Key("MpRegenerationFeeLvl18")
+	int getMpRegenerationFeeLvl18();
+	
+	@Key("MpRegenerationFeeLvl20")
+	int getMpRegenerationFeeLvl20();
+	
+	@Key("HpRegenerationFeeLvl25")
+	int getHpRegenerationFeeLvl25();
+	
+	@Key("HpRegenerationFeeLvl30")
+	int getHpRegenerationFeeLvl30();
+	
+	@Key("ExpRegenerationFeeLvl19")
+	int getExpRegenerationFeeLvl19();
+	
+	@Key("ExpRegenerationFeeLvl20")
+	int getExpRegenerationFeeLvl20();
+	
+	@Key("OuterDoorUpgradePriceLvl2")
+	int getOuterDoorUpgradePriceLvl2();
+	
+	@Key("OuterDoorUpgradePriceLvl3")
+	int getOuterDoorUpgradePriceLvl3();
+	
+	@Key("OuterDoorUpgradePriceLvl5")
+	int getOuterDoorUpgradePriceLvl5();
+	
+	@Key("InnerDoorUpgradePriceLvl2")
+	int getInnerDoorUpgradePriceLvl2();
+	
+	@Key("InnerDoorUpgradePriceLvl3")
+	int getInnerDoorUpgradePriceLvl3();
+	
+	@Key("InnerDoorUpgradePriceLvl5")
+	int getInnerDoorUpgradePriceLvl5();
+	
+	@Key("WallUpgradePriceLvl2")
+	int getWallUpgradePriceLvl2();
+	
+	@Key("WallUpgradePriceLvl3")
+	int getWallUpgradePriceLvl3();
+	
+	@Key("WallUpgradePriceLvl5")
+	int getWallUpgradePriceLvl5();
+	
+	@Key("TrapUpgradePriceLvl1")
+	int getTrapUpgradePriceLvl1();
+	
+	@Key("TrapUpgradePriceLvl2")
+	int getTrapUpgradePriceLvl2();
+	
+	@Key("TrapUpgradePriceLvl3")
+	int getTrapUpgradePriceLvl3();
+	
+	@Key("TrapUpgradePriceLvl4")
+	int getTrapUpgradePriceLvl4();
+	
+	@Key("AllowRideWyvernAlways")
+	boolean allowRideWyvernAlways();
+	
+	@Key("AllowRideWyvernDuringSiege")
+	boolean allowRideWyvernDuringSiege();
+	
+	@Key("MpBuffFree")
+	boolean mpBuffFree();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/CharacterConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/CharacterConfiguration.java
new file mode 100644
index 00000000..9c983f20
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/CharacterConfiguration.java
@@ -0,0 +1,663 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.ClassMasterSetting;
+import com.l2jserver.gameserver.config.converter.ClassMasterSettingConverter;
+import com.l2jserver.gameserver.config.converter.Days2MillisecondsConverter;
+import com.l2jserver.gameserver.config.converter.MapIntegerIntegerConverter;
+import com.l2jserver.gameserver.config.converter.PatternConverter;
+import com.l2jserver.gameserver.config.converter.Seconds2MillisecondsConverter;
+
+/**
+ * Character Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/character.properties",
+	"file:./config/character.properties",
+	"classpath:config/character.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 5, unit = MINUTES, type = ASYNC)
+public interface CharacterConfiguration extends Reloadable {
+	
+	// Statistics
+	@Key("Delevel")
+	boolean delevel();
+	
+	@Key("DecreaseSkillOnDelevel")
+	boolean decreaseSkillOnDelevel();
+	
+	@Key("WeightLimit")
+	int getWeightLimit();
+	
+	@Key("RunSpeedBoost")
+	int getRunSpeedBoost();
+	
+	@Key("DeathPenaltyChance")
+	int getDeathPenaltyChance();
+	
+	@Key("RespawnRestoreCP")
+	double getRespawnRestoreCP();
+	
+	@Key("RespawnRestoreHP")
+	double getRespawnRestoreHP();
+	
+	@Key("RespawnRestoreMP")
+	double getRespawnRestoreMP();
+	
+	@Key("HpRegenMultiplier")
+	double getHpRegenMultiplier();
+	
+	@Key("MpRegenMultiplier")
+	double getMpRegenMultiplier();
+	
+	@Key("CpRegenMultiplier")
+	double getCpRegenMultiplier();
+	
+	// Skills & Effects
+	
+	@Key("ModifySkillDuration")
+	boolean modifySkillDuration();
+	
+	@Key("SkillDuration")
+	@ConverterClass(MapIntegerIntegerConverter.class)
+	Map<Integer, Integer> getSkillDuration();
+	
+	@Key("ModifySkillReuse")
+	boolean modifySkillReuse();
+	
+	@Key("SkillReuse")
+	@ConverterClass(MapIntegerIntegerConverter.class)
+	Map<Integer, Integer> getSkillReuse();
+	
+	@Key("AutoLearnSkills")
+	boolean autoLearnSkills();
+	
+	@Key("AutoLearnForgottenScrollSkills")
+	boolean autoLearnForgottenScrollSkills();
+	
+	@Key("AutoLootHerbs")
+	boolean autoLootHerbs();
+	
+	@Key("MaxBuffAmount")
+	int getMaxBuffAmount();
+	
+	@Key("MaxTriggeredBuffAmount")
+	int getMaxTriggeredBuffAmount();
+	
+	@Key("MaxDanceAmount")
+	int getMaxDanceAmount();
+	
+	@Key("DanceCancelBuff")
+	boolean danceCancelBuff();
+	
+	@Key("DanceConsumeAdditionalMP")
+	boolean danceConsumeAdditionalMP();
+	
+	@Key("StoreDances")
+	boolean storeDances();
+	
+	@Key("AutoLearnDivineInspiration")
+	boolean autoLearnDivineInspiration();
+	
+	@Key("CancelByHit")
+	String cancelByHit();
+	
+	default boolean cancelBow() {
+		return cancelByHit().equalsIgnoreCase("all") || cancelByHit().equalsIgnoreCase("bow");
+	}
+	
+	default boolean cancelCast() {
+		return cancelByHit().equalsIgnoreCase("all") || cancelByHit().equalsIgnoreCase("cast");
+	}
+	
+	@Key("MagicFailures")
+	boolean magicFailures();
+	
+	@Key("PlayerFakeDeathUpProtection")
+	int getPlayerFakeDeathUpProtection();
+	
+	@Key("StoreSkillCooltime")
+	boolean storeSkillCooltime();
+	
+	@Key("SubclassStoreSkillCooltime")
+	boolean subclassStoreSkillCooltime();
+	
+	@Key("ShieldBlocks")
+	boolean shieldBlocks();
+	
+	@Key("PerfectShieldBlockRate")
+	int getPerfectShieldBlockRate();
+	
+	@Key("EffectTickRatio")
+	int getEffectTickRatio();
+	
+	// Class, Sub-class and skill learning
+	
+	@Key("AllowClassMasters")
+	boolean allowClassMasters();
+	
+	@Key("ConfigClassMaster")
+	@ConverterClass(ClassMasterSettingConverter.class)
+	ClassMasterSetting getClassMaster();
+	
+	@Key("AllowEntireTree")
+	boolean allowEntireTree();
+	
+	@Key("AlternateClassMaster")
+	boolean alternateClassMaster();
+	
+	@Key("LifeCrystalNeeded")
+	boolean lifeCrystalNeeded();
+	
+	@Key("EnchantSkillSpBookNeeded")
+	boolean enchantSkillSpBookNeeded();
+	
+	@Key("DivineInspirationSpBookNeeded")
+	boolean divineInspirationSpBookNeeded();
+	
+	@Key("SkillLearn")
+	boolean skillLearn();
+	
+	@Key("SubclassWithoutQuests")
+	boolean subclassWithoutQuests();
+	
+	@Key("SubclassEverywhere")
+	boolean subclassEverywhere();
+	
+	@Key("TransformationWithoutQuest")
+	boolean transformationWithoutQuest();
+	
+	@Key("FeeDeleteTransferSkills")
+	int getFeeDeleteTransferSkills();
+	
+	@Key("FeeDeleteSubClassSkills")
+	int getFeeDeleteSubClassSkills();
+	
+	// Summons
+	
+	@Key("SummonStoreSkillCooltime")
+	boolean summonStoreSkillCooltime();
+	
+	@Key("RestoreServitorOnReconnect")
+	boolean restoreServitorOnReconnect();
+	
+	@Key("RestorePetOnReconnect")
+	boolean restorePetOnReconnect();
+	
+	// Limits
+	
+	@Key("MaxExpBonus")
+	double getMaxExpBonus();
+	
+	@Key("MaxSpBonus")
+	double getMaxSpBonus();
+	
+	@Key("MaxRunSpeed")
+	int getMaxRunSpeed();
+	
+	@Key("MaxPCritRate")
+	int getMaxPCritRate();
+	
+	@Key("MaxMCritRate")
+	int getMaxMCritRate();
+	
+	@Key("MaxPAtkSpeed")
+	int getMaxPAtkSpeed();
+	
+	@Key("MaxMAtkSpeed")
+	int getMaxMAtkSpeed();
+	
+	@Key("MaxEvasion")
+	int getMaxEvasion();
+	
+	@Key("MinAbnormalStateSuccessRate")
+	int getMinAbnormalStateSuccessRate();
+	
+	@Key("MaxAbnormalStateSuccessRate")
+	int getMaxAbnormalStateSuccessRate();
+	
+	@Key("MaxPlayerLevel")
+	int getMaxPlayerLevel();
+	
+	@Key("MaxPetLevel")
+	int getMaxPetLevel();
+	
+	@Key("MaxSubclass")
+	int getMaxSubclass();
+	
+	@Key("BaseSubclassLevel")
+	int getBaseSubclassLevel();
+	
+	@Key("MaxSubclassLevel")
+	int getMaxSubclassLevel();
+	
+	@Key("MaxPvtStoreSellSlotsDwarf")
+	int getMaxPvtStoreSellSlotsDwarf();
+	
+	@Key("MaxPvtStoreSellSlotsOther")
+	int getMaxPvtStoreSellSlotsOther();
+	
+	@Key("MaxPvtStoreBuySlotsDwarf")
+	int getMaxPvtStoreBuySlotsDwarf();
+	
+	@Key("MaxPvtStoreBuySlotsOther")
+	int getMaxPvtStoreBuySlotsOther();
+	
+	@Key("MaximumSlotsForNoDwarf")
+	int getMaximumSlotsForNoDwarf();
+	
+	@Key("MaximumSlotsForDwarf")
+	int getMaximumSlotsForDwarf();
+	
+	@Key("MaximumSlotsForGMPlayer")
+	int getMaximumSlotsForGMPlayer();
+	
+	@Key("MaximumSlotsForQuestItems")
+	int getMaximumSlotsForQuestItems();
+	
+	@Key("MaximumWarehouseSlotsForDwarf")
+	int getMaximumWarehouseSlotsForDwarf();
+	
+	@Key("MaximumWarehouseSlotsForNoDwarf")
+	int getMaximumWarehouseSlotsForNoDwarf();
+	
+	@Key("MaximumWarehouseSlotsForClan")
+	int getMaximumWarehouseSlotsForClan();
+	
+	@Key("MaximumFreightSlots")
+	int getMaximumFreightSlots();
+	
+	@Key("FreightPrice")
+	int getFreightPrice();
+	
+	@Key("NpcTalkBlockingTime")
+	int getNpcTalkBlockingTime();
+	
+	@Key("FriendListLimit")
+	int getFriendListLimit();
+	
+	@Key("BlockListLimit")
+	int getBlockListLimit();
+	
+	// Enchanting
+	
+	@Key("EnchantChanceElementStone")
+	int getEnchantChanceElementStone();
+	
+	@Key("EnchantChanceElementCrystal")
+	int getEnchantChanceElementCrystal();
+	
+	@Key("EnchantChanceElementJewel")
+	int getEnchantChanceElementJewel();
+	
+	@Key("EnchantChanceElementEnergy")
+	int getEnchantChanceElementEnergy();
+	
+	@Key("EnchantBlacklist")
+	Set<Integer> getEnchantBlacklist();
+	
+	// Augmenting
+	
+	@Key("AugmentationNGSkillChance")
+	int getAugmentationNGSkillChance();
+	
+	@Key("AugmentationMidSkillChance")
+	int getAugmentationMidSkillChance();
+	
+	@Key("AugmentationHighSkillChance")
+	int getAugmentationHighSkillChance();
+	
+	@Key("AugmentationTopSkillChance")
+	int getAugmentationTopSkillChance();
+	
+	@Key("AugmentationAccSkillChance")
+	int getAugmentationAccSkillChance();
+	
+	@Key("AugmentationBaseStatChance")
+	int getAugmentationBaseStatChance();
+	
+	@Key("AugmentationNGGlowChance")
+	int getAugmentationNGGlowChance();
+	
+	@Key("AugmentationMidGlowChance")
+	int getAugmentationMidGlowChance();
+	
+	@Key("AugmentationHighGlowChance")
+	int getAugmentationHighGlowChance();
+	
+	@Key("AugmentationTopGlowChance")
+	int getAugmentationTopGlowChance();
+	
+	@Key("RetailLikeAugmentation")
+	boolean retailLikeAugmentation();
+	
+	@Key("RetailLikeAugmentationNoGradeChance")
+	List<Integer> getRetailLikeAugmentationNoGradeChance();
+	
+	@Key("RetailLikeAugmentationMidGradeChance")
+	List<Integer> getRetailLikeAugmentationMidGradeChance();
+	
+	@Key("RetailLikeAugmentationHighGradeChance")
+	List<Integer> getRetailLikeAugmentationHighGradeChance();
+	
+	@Key("RetailLikeAugmentationTopGradeChance")
+	List<Integer> getRetailLikeAugmentationTopGradeChance();
+	
+	@Key("RetailLikeAugmentationAccessory")
+	boolean retailLikeAugmentationAccessory();
+	
+	@Key("AugmentationBlacklist")
+	Set<Integer> getAugmentationBlacklist();
+	
+	@Key("AllowAugmentPvPItems")
+	boolean allowAugmentPvPItems();
+	
+	// Karma
+	
+	@Key("KarmaPlayerCanBeKilledInPeaceZone")
+	boolean karmaPlayerCanBeKilledInPeaceZone();
+	
+	@Key("KarmaPlayerCanUseGK")
+	boolean karmaPlayerCanUseGK();
+	
+	@Key("KarmaPlayerCanTeleport")
+	boolean karmaPlayerCanTeleport();
+	
+	@Key("KarmaPlayerCanShop")
+	boolean karmaPlayerCanShop();
+	
+	@Key("KarmaPlayerCanTrade")
+	boolean karmaPlayerCanTrade();
+	
+	@Key("KarmaPlayerCanUseWareHouse")
+	boolean karmaPlayerCanUseWareHouse();
+	
+	// Fame
+	
+	@Key("MaxPersonalFamePoints")
+	int getMaxPersonalFamePoints();
+	
+	@Key("FortressZoneFameTaskFrequency")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getFortressZoneFameTaskFrequency();
+	
+	@Key("FortressZoneFameAcquirePoints")
+	int getFortressZoneFameAcquirePoints();
+	
+	@Key("CastleZoneFameTaskFrequency")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getCastleZoneFameTaskFrequency();
+	
+	@Key("CastleZoneFameAcquirePoints")
+	int getCastleZoneFameAcquirePoints();
+	
+	@Key("FameForDeadPlayers")
+	boolean fameForDeadPlayers();
+	
+	// Crafting
+	
+	@Key("Crafting")
+	boolean crafting();
+	
+	@Key("CraftMasterwork")
+	boolean craftMasterwork();
+	
+	@Key("DwarfRecipeLimit")
+	int getDwarfRecipeLimit();
+	
+	@Key("CommonRecipeLimit")
+	int getCommonRecipeLimit();
+	
+	@Key("AlternativeCrafting")
+	boolean alternativeCrafting();
+	
+	@Key("CraftingSpeed")
+	double getCraftingSpeed();
+	
+	@Key("CraftingXpRate")
+	double getCraftingXpRate();
+	
+	@Key("CraftingSpRate")
+	double getCraftingSpRate();
+	
+	@Key("CraftingRareXpRate")
+	double getCraftingRareXpRate();
+	
+	@Key("CraftingRareSpRate")
+	double getCraftingRareSpRate();
+	
+	@Key("BlacksmithUseRecipes")
+	boolean blacksmithUseRecipes();
+	
+	@Key("StoreRecipeShopList")
+	boolean storeRecipeShopList();
+	
+	// Clan
+	
+	@Key("ClanLeaderDateChange")
+	int getClanLeaderDateChange();
+	
+	@Key("ClanLeaderHourChange")
+	String getClanLeaderHourChange();
+	
+	@Key("ClanLeaderInstantActivation")
+	boolean clanLeaderInstantActivation();
+	
+	@Key("DaysBeforeJoinAClan")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysBeforeJoinAClan();
+	
+	@Key("DaysBeforeCreateAClan")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysBeforeCreateAClan();
+	
+	@Key("DaysToPassToDissolveAClan")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysToPassToDissolveAClan();
+	
+	@Key("DaysBeforeJoiningAllianceAfterLeaving")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysBeforeJoiningAllianceAfterLeaving();
+	
+	@Key("DaysBeforeJoinAllyWhenDismissed")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysBeforeJoinAllyWhenDismissed();
+	
+	@Key("DaysBeforeAcceptNewClanWhenDismissed")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysBeforeAcceptNewClanWhenDismissed();
+	
+	@Key("DaysBeforeCreateNewAllyWhenDissolved")
+	@ConverterClass(Days2MillisecondsConverter.class)
+	long getDaysBeforeCreateNewAllyWhenDissolved();
+	
+	@Key("MaxNumOfClansInAlly")
+	int getMaxNumOfClansInAlly();
+	
+	@Key("MembersCanWithdrawFromClanWH")
+	boolean membersCanWithdrawFromClanWH();
+	
+	@Key("RemoveCastleCirclets")
+	boolean removeCastleCirclets();
+	
+	@Key("ClanMembersForWar")
+	int getClanMembersForWar();
+	
+	// Party
+	
+	@Key("PartyRange")
+	int getPartyRange();
+	
+	@Key("PartyRange2")
+	int getPartyRange2();
+	
+	@Key("PartyEvenlyDistributeAllStackableItems")
+	boolean getPartyEvenlyDistributeAllStackableItems();
+	
+	@Key("PartyEvenlyDistributeAllOtherItems")
+	boolean getPartyEvenlyDistributeAllOtherItems();
+	
+	@Key("PartyEvenlyDistributeItems")
+	List<Integer> getPartyEvenlyDistributeItems();
+	
+	@Key("LeavePartyLeader")
+	boolean leavePartyLeader();
+	
+	// Initial
+	
+	@Key("InitialEquipmentEvent")
+	boolean initialEquipmentEvent();
+	
+	@Key("StartingAdena")
+	int getStartingAdena();
+	
+	@Key("StartingLevel")
+	int getStartingLevel();
+	
+	@Key("StartingSP")
+	int getStartingSP();
+	
+	// Other
+	
+	@Key("MaxAdena")
+	long getMaxAdena();
+	
+	@Key("AutoLoot")
+	boolean autoLoot();
+	
+	@Key("AutoLootRaids")
+	boolean autoLootRaids();
+	
+	@Key("RaidLootRightsInterval")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getRaidLootRightsInterval();
+	
+	@Key("RaidLootRightsCCSize")
+	int getRaidLootRightsCCSize();
+	
+	@Key("UnstuckInterval")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getUnstuckInterval();
+	
+	@Key("TeleportWatchdogTimeout")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getTeleportWatchdogTimeout();
+	
+	@Key("PlayerSpawnProtection")
+	int getPlayerSpawnProtection();
+	
+	@Key("PlayerSpawnProtectionAllowedItems")
+	Set<Integer> getPlayerSpawnProtectionAllowedItems();
+	
+	@Key("PlayerTeleportProtection")
+	int getPlayerTeleportProtection();
+	
+	@Key("RandomRespawnInTown")
+	boolean randomRespawnInTown();
+	
+	@Key("OffsetOnTeleport")
+	boolean offsetOnTeleport();
+	
+	@Key("MaxOffsetOnTeleport")
+	int getMaxOffsetOnTeleport();
+	
+	@Key("PetitioningAllowed")
+	boolean petitioningAllowed();
+	
+	@Key("MaxPetitionsPerPlayer")
+	int getMaxPetitionsPerPlayer();
+	
+	@Key("MaxPetitionsPending")
+	int getMaxPetitionsPending();
+	
+	@Key("FreeTeleporting")
+	boolean freeTeleporting();
+	
+	@Key("DeleteCharAfterDays")
+	int getDeleteCharAfterDays();
+	
+	@Key("ExponentXp")
+	int getExponentXp();
+	
+	@Key("ExponentSp")
+	int getExponentSp();
+	
+	@Key("PartyXpCutoffMethod")
+	String getPartyXpCutoffMethod();
+	
+	@Key("PartyXpCutoffPercent")
+	double getPartyXpCutoffPercent();
+	
+	@Key("PartyXpCutoffLevel")
+	int getPartyXpCutoffLevel();
+	
+	@Key("PartyXpCutoffGaps")
+	@ConverterClass(MapIntegerIntegerConverter.class)
+	Map<Integer, Integer> getPartyXpCutoffGaps();
+	
+	@Key("PartyXpCutoffGapPercent")
+	List<Integer> getPartyXpCutoffGapPercent();
+	
+	@Key("Tutorial")
+	boolean tutorial();
+	
+	@Key("ExpertisePenalty")
+	boolean expertisePenalty();
+	
+	@Key("StoreUISettings")
+	boolean storeUISettings();
+	
+	@Key("SilenceModeExclude")
+	boolean silenceModeExclude();
+	
+	@Key("ValidateTriggerSkills")
+	boolean validateTriggerSkills();
+	
+	@Key("PlayerNameTemplate")
+	@ConverterClass(PatternConverter.class)
+	Pattern getPlayerNameTemplate();
+	
+	@Key("PetNameTemplate")
+	@ConverterClass(PatternConverter.class)
+	Pattern getPetNameTemplate();
+	
+	@Key("ForbiddenNames")
+	Set<String> getForbiddenNames();
+	
+	@Key("CharMaxNumber")
+	int getCharMaxNumber();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/ClanConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/ClanConfiguration.java
new file mode 100644
index 00000000..3f770e3e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/ClanConfiguration.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.regex.Pattern;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.PatternConverter;
+
+/**
+ * Clan Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/clan.properties",
+	"file:./config/clan.properties",
+	"classpath:config/clan.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface ClanConfiguration extends Reloadable {
+	
+	@Key("ClanNameTemplate")
+	@ConverterClass(PatternConverter.class)
+	Pattern getClanNameTemplate();
+	
+	@Key("TakeFortPoints")
+	int getTakeFortPoints();
+	
+	@Key("TakeCastlePoints")
+	int getTakeCastlePoints();
+	
+	@Key("CastleDefendedPoints")
+	int getCastleDefendedPoints();
+	
+	@Key("FestivalOfDarknessWin")
+	int getFestivalOfDarknessWin();
+	
+	@Key("HeroPoints")
+	int getHeroPoints();
+	
+	@Key("CompleteAcademyMinPoints")
+	int getCompleteAcademyMinPoints();
+	
+	@Key("CompleteAcademyMaxPoints")
+	int getCompleteAcademyMaxPoints();
+	
+	@Key("KillBallistaPoints")
+	int getKillBallistaPoints();
+	
+	@Key("BloodAlliancePoints")
+	int getBloodAlliancePoints();
+	
+	@Key("BloodOathPoints")
+	int getBloodOathPoints();
+	
+	@Key("KnightsEpaulettePoints")
+	int getKnightsEpaulettePoints();
+	
+	@Key("1stRaidRankingPoints")
+	int get1stRaidRankingPoints();
+	
+	@Key("2ndRaidRankingPoints")
+	int get2ndRaidRankingPoints();
+	
+	@Key("3rdRaidRankingPoints")
+	int get3rdRaidRankingPoints();
+	
+	@Key("4thRaidRankingPoints")
+	int get4thRaidRankingPoints();
+	
+	@Key("5thRaidRankingPoints")
+	int get5thRaidRankingPoints();
+	
+	@Key("6thRaidRankingPoints")
+	int get6thRaidRankingPoints();
+	
+	@Key("7thRaidRankingPoints")
+	int get7thRaidRankingPoints();
+	
+	@Key("8thRaidRankingPoints")
+	int get8thRaidRankingPoints();
+	
+	@Key("9thRaidRankingPoints")
+	int get9thRaidRankingPoints();
+	
+	@Key("10thRaidRankingPoints")
+	int get10thRaidRankingPoints();
+	
+	@Key("UpTo50thRaidRankingPoints")
+	int getUpTo50thRaidRankingPoints();
+	
+	@Key("UpTo100thRaidRankingPoints")
+	int getUpTo100thRaidRankingPoints();
+	
+	@Key("ReputationScorePerKill")
+	int getReputationScorePerKill();
+	
+	@Key("LoseFortPoints")
+	int getLoseFortPoints();
+	
+	@Key("LoseCastlePoints")
+	int getLoseCastlePoints();
+	
+	@Key("CreateRoyalGuardCost")
+	int getCreateRoyalGuardCost();
+	
+	@Key("CreateKnightUnitCost")
+	int getCreateKnightUnitCost();
+	
+	// TODO(Zoey76): Implement ReinforceKnightUnitCost configuration.
+	@Key("ReinforceKnightUnitCost")
+	int getReinforceKnightUnitCost();
+	
+	@Key("ClanLevel6Cost")
+	int getClanLevel6Cost();
+	
+	@Key("ClanLevel7Cost")
+	int getClanLevel7Cost();
+	
+	@Key("ClanLevel8Cost")
+	int getClanLevel8Cost();
+	
+	@Key("ClanLevel9Cost")
+	int getClanLevel9Cost();
+	
+	@Key("ClanLevel10Cost")
+	int getClanLevel10Cost();
+	
+	@Key("ClanLevel11Cost")
+	int getClanLevel11Cost();
+	
+	@Key("ClanLevel6Requirement")
+	int getClanLevel6Requirement();
+	
+	@Key("ClanLevel7Requirement")
+	int getClanLevel7Requirement();
+	
+	@Key("ClanLevel8Requirement")
+	int getClanLevel8Requirement();
+	
+	@Key("ClanLevel9Requirement")
+	int getClanLevel9Requirement();
+	
+	@Key("ClanLevel10Requirement")
+	int getClanLevel10Requirement();
+	
+	@Key("ClanLevel11Requirement")
+	int getClanLevel11Requirement();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/ClanHallConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/ClanHallConfiguration.java
new file mode 100644
index 00000000..99701e59
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/ClanHallConfiguration.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Clan Hall Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/clanhall.properties",
+	"file:./config/clanhall.properties",
+	"classpath:config/clanhall.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface ClanHallConfiguration extends Reloadable {
+	
+	@Key("FunctionFeeDay1")
+	long getFunctionFeeDay1();
+	
+	@Key("FunctionFeeDay2")
+	long getFunctionFeeDay2();
+	
+	@Key("FunctionFeeDay3")
+	long getFunctionFeeDay3();
+	
+	@Key("FunctionFeeDay7")
+	long getFunctionFeeDay7();
+	
+	@Key("TeleportFunctionFeeLvl1")
+	int getTeleportFunctionFeeLvl1();
+	
+	@Key("TeleportFunctionFeeLvl2")
+	int getTeleportFunctionFeeLvl2();
+	
+	@Key("TeleportFunctionFeeLvl11")
+	int getTeleportFunctionFeeLvl11();
+	
+	@Key("TeleportFunctionFeeLvl12")
+	int getTeleportFunctionFeeLvl12();
+	
+	@Key("SupportFeeLvl1")
+	int getSupportFeeLvl1();
+	
+	@Key("SupportFeeLvl2")
+	int getSupportFeeLvl2();
+	
+	@Key("SupportFeeLvl3")
+	int getSupportFeeLvl3();
+	
+	@Key("SupportFeeLvl4")
+	int getSupportFeeLvl4();
+	
+	@Key("SupportFeeLvl5")
+	int getSupportFeeLvl5();
+	
+	@Key("SupportFeeLvl7")
+	int getSupportFeeLvl7();
+	
+	@Key("SupportFeeLvl8")
+	int getSupportFeeLvl8();
+	
+	@Key("SupportFeeLvl15")
+	int getSupportFeeLvl15();
+	
+	@Key("SupportFeeLvl18")
+	int getSupportFeeLvl18();
+	
+	@Key("MpRegenerationFeeLvl1")
+	int getMpRegenerationFeeLvl1();
+	
+	@Key("MpRegenerationFeeLvl3")
+	int getMpRegenerationFeeLvl3();
+	
+	@Key("MpRegenerationFeeLvl5")
+	int getMpRegenerationFeeLvl5();
+	
+	@Key("MpRegenerationFeeLvl6")
+	int getMpRegenerationFeeLvl6();
+	
+	@Key("MpRegenerationFeeLvl8")
+	int getMpRegenerationFeeLvl8();
+	
+	@Key("MpRegenerationFeeLvl18")
+	int getMpRegenerationFeeLvl18();
+	
+	@Key("MpRegenerationFeeLvl20")
+	int getMpRegenerationFeeLvl20();
+	
+	@Key("HpRegenerationFeeLvl2")
+	int getHpRegenerationFeeLvl2();
+	
+	@Key("HpRegenerationFeeLvl4")
+	int getHpRegenerationFeeLvl4();
+	
+	@Key("HpRegenerationFeeLvl5")
+	int getHpRegenerationFeeLvl5();
+	
+	@Key("HpRegenerationFeeLvl6")
+	int getHpRegenerationFeeLvl6();
+	
+	@Key("HpRegenerationFeeLvl7")
+	int getHpRegenerationFeeLvl7();
+	
+	@Key("HpRegenerationFeeLvl8")
+	int getHpRegenerationFeeLvl8();
+	
+	@Key("HpRegenerationFeeLvl9")
+	int getHpRegenerationFeeLvl9();
+	
+	@Key("HpRegenerationFeeLvl10")
+	int getHpRegenerationFeeLvl10();
+	
+	@Key("HpRegenerationFeeLvl12")
+	int getHpRegenerationFeeLvl12();
+	
+	@Key("HpRegenerationFeeLvl13")
+	int getHpRegenerationFeeLvl13();
+	
+	@Key("HpRegenerationFeeLvl15")
+	int getHpRegenerationFeeLvl15();
+	
+	@Key("HpRegenerationFeeLvl25")
+	int getHpRegenerationFeeLvl25();
+	
+	@Key("HpRegenerationFeeLvl30")
+	int getHpRegenerationFeeLvl30();
+	
+	@Key("ExpRegenerationFeeLvl1")
+	int getExpRegenerationFeeLvl1();
+	
+	@Key("ExpRegenerationFeeLvl3")
+	int getExpRegenerationFeeLvl3();
+	
+	@Key("ExpRegenerationFeeLvl5")
+	int getExpRegenerationFeeLvl5();
+	
+	@Key("ExpRegenerationFeeLvl6")
+	int getExpRegenerationFeeLvl6();
+	
+	@Key("ExpRegenerationFeeLvl7")
+	int getExpRegenerationFeeLvl7();
+	
+	@Key("ExpRegenerationFeeLvl8")
+	int getExpRegenerationFeeLvl8();
+	
+	@Key("ExpRegenerationFeeLvl10")
+	int getExpRegenerationFeeLvl10();
+	
+	@Key("ExpRegenerationFeeLvl19")
+	int getExpRegenerationFeeLvl19();
+	
+	@Key("ExpRegenerationFeeLvl20")
+	int getExpRegenerationFeeLvl20();
+	
+	@Key("ItemCreationFunctionFeeLvl1")
+	int getItemCreationFunctionFeeLvl1();
+	
+	@Key("ItemCreationFunctionFeeLvl2")
+	int getItemCreationFunctionFeeLvl2();
+	
+	@Key("ItemCreationFunctionFeeLvl3")
+	int getItemCreationFunctionFeeLvl3();
+	
+	@Key("ItemCreationFunctionFeeLvl11")
+	int getItemCreationFunctionFeeLvl11();
+	
+	@Key("ItemCreationFunctionFeeLvl12")
+	int getItemCreationFunctionFeeLvl12();
+	
+	@Key("ItemCreationFunctionFeeLvl13")
+	int getItemCreationFunctionFeeLvl13();
+	
+	@Key("CurtainFunctionFeeLvl1")
+	int getCurtainFunctionFeeLvl1();
+	
+	@Key("CurtainFunctionFeeLvl2")
+	int getCurtainFunctionFeeLvl2();
+	
+	@Key("FrontPlatformFunctionFeeLvl1")
+	int getFrontPlatformFunctionFeeLvl1();
+	
+	@Key("FrontPlatformFunctionFeeLvl2")
+	int getFrontPlatformFunctionFeeLvl2();
+	
+	@Key("BroadCastFunctionFeeLvl1")
+	int getBroadCastFunctionFeeLvl1();
+	
+	@Key("BroadCastFunctionFeeLvl2")
+	int getBroadCastFunctionFeeLvl2();
+	
+	@Key("MpBuffFree")
+	boolean mpBuffFree();
+	
+	@Key("MinClanLevel")
+	int getMinClanLevel();
+	
+	@Key("MaxAttackers")
+	int getMaxAttackers();
+	
+	// TODO(Zoey76): Implement MaxFlagsPerClan configuration.
+	@Key("MaxFlagsPerClan")
+	int getMaxFlagsPerClan();
+	
+	@Key("EnableFame")
+	boolean enableFame();
+	
+	@Key("FameAmount")
+	int getFameAmount();
+	
+	@Key("FameFrequency")
+	int getFameFrequency();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/Configuration.java b/src/main/java/com/l2jserver/gameserver/config/Configuration.java
new file mode 100644
index 00000000..16d7f222
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/Configuration.java
@@ -0,0 +1,249 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import java.nio.file.Path;
+
+import org.aeonbits.owner.ConfigFactory;
+
+/**
+ * Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class Configuration {
+	
+	public static final String DEFAULT_PATH = "config/";
+	
+	public static final String CUSTOM_SUBPATH = "custom/game/config/";
+	
+	public static final String EOL = System.lineSeparator();
+	
+	private static final IPConfigData ipConfigData = new IPConfigData();
+	
+	private static final ServerConfiguration server = ConfigFactory.create(ServerConfiguration.class);
+	
+	private static final HexIdConfiguration hexId = ConfigFactory.create(HexIdConfiguration.class);
+	
+	private static final DatabaseConfiguration database = ConfigFactory.create(DatabaseConfiguration.class);
+	
+	private static final MMOConfiguration mmo = ConfigFactory.create(MMOConfiguration.class);
+	
+	private static final TelnetConfiguration telnet = ConfigFactory.create(TelnetConfiguration.class);
+	
+	private static final GeneralConfiguration general = ConfigFactory.create(GeneralConfiguration.class);
+	
+	private static final GeodataConfiguration geodata = ConfigFactory.create(GeodataConfiguration.class);
+	
+	private static final CharacterConfiguration character = ConfigFactory.create(CharacterConfiguration.class);
+	
+	private static final CastleConfiguration castle = ConfigFactory.create(CastleConfiguration.class);
+	
+	private static final ClanConfiguration clan = ConfigFactory.create(ClanConfiguration.class);
+	
+	private static final ClanHallConfiguration clanhall = ConfigFactory.create(ClanHallConfiguration.class);
+	
+	private static final FortressConfiguration fortress = ConfigFactory.create(FortressConfiguration.class);
+	
+	private static final SevenSignsConfiguration sevenSigns = ConfigFactory.create(SevenSignsConfiguration.class);
+	
+	private static final TvTConfiguration tvt = ConfigFactory.create(TvTConfiguration.class);
+	
+	private static final NPCConfiguration npc = ConfigFactory.create(NPCConfiguration.class);
+	
+	private static final OlympiadConfiguration olympiad = ConfigFactory.create(OlympiadConfiguration.class);
+	
+	private static final SiegeConfiguration siege = ConfigFactory.create(SiegeConfiguration.class);
+	
+	private static final TerritoryWarConfiguration territoryWar = ConfigFactory.create(TerritoryWarConfiguration.class);
+	
+	private static final FortSiegeConfiguration fortSiege = ConfigFactory.create(FortSiegeConfiguration.class);
+	
+	private static final GrandBossConfiguration grandBoss = ConfigFactory.create(GrandBossConfiguration.class);
+	
+	private static final GraciaSeedsConfiguration graciaSeeds = ConfigFactory.create(GraciaSeedsConfiguration.class);
+	
+	private static final RatesConfiguration rates = ConfigFactory.create(RatesConfiguration.class);
+	
+	private static final VitalityConfiguration vitality = ConfigFactory.create(VitalityConfiguration.class);
+	
+	private static final PvPConfiguration pvp = ConfigFactory.create(PvPConfiguration.class);
+	
+	private static final CustomsConfiguration customs = ConfigFactory.create(CustomsConfiguration.class);
+	
+	private static final HuntingSystemConfiguration hunting = ConfigFactory.create(HuntingSystemConfiguration.class);
+	
+	private static final FloodProtectorConfiguration floodProtector = ConfigFactory.create(FloodProtectorConfiguration.class);
+	
+	private static final BufferServiceConfiguration bufferService = ConfigFactory.create(BufferServiceConfiguration.class);
+	
+	private static final TeleporterServiceConfiguration teleporterService = ConfigFactory.create(TeleporterServiceConfiguration.class);
+	
+	private static final DiscordConfiguration discord = ConfigFactory.create(DiscordConfiguration.class);
+	
+	private Configuration() {
+		// Do nothing.
+	}
+	
+	public static ServerConfiguration server() {
+		return server;
+	}
+	
+	public static HexIdConfiguration hexId() {
+		return hexId;
+	}
+	
+	public static DatabaseConfiguration database() {
+		return database;
+	}
+	
+	public static MMOConfiguration mmo() {
+		return mmo;
+	}
+	
+	public static TelnetConfiguration telnet() {
+		return telnet;
+	}
+	
+	public static GeneralConfiguration general() {
+		return general;
+	}
+	
+	public static GeodataConfiguration geodata() {
+		return geodata;
+	}
+	
+	public static CharacterConfiguration character() {
+		return character;
+	}
+	
+	public static CastleConfiguration castle() {
+		return castle;
+	}
+	
+	public static ClanConfiguration clan() {
+		return clan;
+	}
+	
+	public static ClanHallConfiguration clanhall() {
+		return clanhall;
+	}
+	
+	public static FortressConfiguration fortress() {
+		return fortress;
+	}
+	
+	public static SevenSignsConfiguration sevenSigns() {
+		return sevenSigns;
+	}
+	
+	public static TvTConfiguration tvt() {
+		return tvt;
+	}
+	
+	public static NPCConfiguration npc() {
+		return npc;
+	}
+	
+	public static OlympiadConfiguration olympiad() {
+		return olympiad;
+	}
+	
+	public static SiegeConfiguration siege() {
+		return siege;
+	}
+	
+	public static TerritoryWarConfiguration territoryWar() {
+		return territoryWar;
+	}
+	
+	public static FortSiegeConfiguration fortSiege() {
+		return fortSiege;
+	}
+	
+	public static GrandBossConfiguration grandBoss() {
+		return grandBoss;
+	}
+	
+	public static GraciaSeedsConfiguration graciaSeeds() {
+		return graciaSeeds;
+	}
+	
+	public static RatesConfiguration rates() {
+		return rates;
+	}
+	
+	public static VitalityConfiguration vitality() {
+		return vitality;
+	}
+	
+	public static PvPConfiguration pvp() {
+		return pvp;
+	}
+	
+	public static CustomsConfiguration customs() {
+		return customs;
+	}
+	
+	public static HuntingSystemConfiguration hunting() {
+		return hunting;
+	}
+	
+	public static FloodProtectorConfiguration floodProtector() {
+		return floodProtector;
+	}
+	
+	public static IPConfigData ip() {
+		return ipConfigData;
+	}
+	
+	public static BufferServiceConfiguration bufferService() {
+		return bufferService;
+	}
+	
+	public static TeleporterServiceConfiguration teleporterService() {
+		return teleporterService;
+	}
+	
+	public static DiscordConfiguration discord() {
+		return discord;
+	}
+	
+	public static String getDefaultPath(String filename) {
+		return DEFAULT_PATH + filename;
+	}
+	
+	public static String getCustomSubpath(String filename) {
+		return CUSTOM_SUBPATH + filename;
+	}
+	
+	/**
+	 * Returns either the custom or default path of the config file.<br>
+	 * When the L2J_HOME variable is defined, the custom path to the config file is returned. If not, the default path to the config file is returned.
+	 * @param filename the filename
+	 * @return either the custom or default path to the config file
+	 */
+	public static Path getCustomOrDefaultPath(String filename) {
+		var l2jHome = server().getL2jHome();
+		if (l2jHome == null) {
+			return Path.of(getDefaultPath(filename));
+		}
+		return Path.of(l2jHome, getCustomSubpath(filename));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/CustomsConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/CustomsConfiguration.java
new file mode 100644
index 00000000..9c92c443
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/CustomsConfiguration.java
@@ -0,0 +1,310 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.ColorConverter;
+import com.l2jserver.gameserver.config.converter.IPLimitConverter;
+import com.l2jserver.gameserver.config.converter.Seconds2MillisecondsConverter;
+
+/**
+ * Customs Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/customs.properties",
+	"file:./config/customs.properties",
+	"classpath:config/customs.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface CustomsConfiguration extends Reloadable {
+	
+	@Key("ChampionEnable")
+	boolean championEnable();
+	
+	@Key("ChampionPassive")
+	boolean championPassive();
+	
+	@Key("ChampionFrequency")
+	int getChampionFrequency();
+	
+	@Key("ChampionTitle")
+	String getChampionTitle();
+	
+	@Key("ChampionMinLevel")
+	int getChampionMinLevel();
+	
+	@Key("ChampionMaxLevel")
+	int getChampionMaxLevel();
+	
+	@Key("ChampionHp")
+	int getChampionHp();
+	
+	@Key("ChampionHpRegen")
+	double getChampionHpRegen();
+	
+	@Key("ChampionRewardsExpSp")
+	double getChampionRewardsExpSp();
+	
+	@Key("ChampionRewardsChance")
+	double getChampionRewardsChance();
+	
+	@Key("ChampionRewardsAmount")
+	double getChampionRewardsAmount();
+	
+	@Key("ChampionAdenasRewardsChance")
+	double getChampionAdenasRewardsChance();
+	
+	@Key("ChampionAdenasRewardsAmount")
+	double getChampionAdenasRewardsAmount();
+	
+	@Key("ChampionAtk")
+	float getChampionAtk();
+	
+	@Key("ChampionSpdAtk")
+	float getChampionSpdAtk();
+	
+	@Key("ChampionRewardItemID")
+	int getChampionRewardItemID();
+	
+	@Key("ChampionRewardItemQty")
+	int getChampionRewardItemQty();
+	
+	@Key("ChampionRewardLowerLvlItemChance")
+	int getChampionRewardLowerLvlItemChance();
+	
+	@Key("ChampionRewardHigherLvlItemChance")
+	int getChampionRewardHigherLvlItemChance();
+	
+	@Key("ChampionEnableVitality")
+	boolean championEnableVitality();
+	
+	@Key("ChampionEnableInInstances")
+	boolean championEnableInInstances();
+	
+	@Key("AllowWedding")
+	boolean allowWedding();
+	
+	@Key("WeddingPrice")
+	int getWeddingPrice();
+	
+	@Key("WeddingPunishInfidelity")
+	boolean weddingPunishInfidelity();
+	
+	// TODO(Zoey76): Implement WeddingTeleport configuration.
+	@Key("WeddingTeleport")
+	boolean weddingTeleport();
+	
+	@Key("WeddingTeleportPrice")
+	int getWeddingTeleportPrice();
+	
+	@Key("WeddingTeleportDuration")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getWeddingTeleportDuration();
+	
+	@Key("WeddingAllowSameSex")
+	boolean weddingAllowSameSex();
+	
+	@Key("WeddingFormalWear")
+	boolean weddingFormalWear();
+	
+	@Key("WeddingDivorceCosts")
+	int getWeddingDivorceCosts();
+	
+	@Key("BankingEnabled")
+	boolean bankingEnabled();
+	
+	@Key("BankingGoldbarCount")
+	int getBankingGoldbarCount();
+	
+	@Key("BankingAdenaCount")
+	int getBankingAdenaCount();
+	
+	@Key("EnableWarehouseSortingClan")
+	boolean enableWarehouseSortingClan();
+	
+	@Key("EnableWarehouseSortingPrivate")
+	boolean enableWarehouseSortingPrivate();
+	
+	@Key("OfflineTradeEnable")
+	boolean offlineTradeEnable();
+	
+	@Key("OfflineCraftEnable")
+	boolean offlineCraftEnable();
+	
+	@Key("OfflineModeInPeaceZone")
+	boolean offlineModeInPeaceZone();
+	
+	@Key("OfflineModeNoDamage")
+	boolean offlineModeNoDamage();
+	
+	@Key("OfflineSetNameColor")
+	boolean offlineSetNameColor();
+	
+	@Key("OfflineNameColor")
+	@ConverterClass(ColorConverter.class)
+	int getOfflineNameColor();
+	
+	@Key("OfflineFame")
+	boolean offlineFame();
+	
+	@Key("RestoreOffliners")
+	boolean restoreOffliners();
+	
+	@Key("OfflineMaxDays")
+	int getOfflineMaxDays();
+	
+	@Key("OfflineDisconnectFinished")
+	boolean offlineDisconnectFinished();
+	
+	@Key("EnableManaPotionSupport")
+	boolean enableManaPotionSupport();
+	
+	@Key("DisplayServerTime")
+	boolean displayServerTime();
+	
+	@Key("ScreenWelcomeMessageEnable")
+	boolean screenWelcomeMessageEnable();
+	
+	@Key("ScreenWelcomeMessageText")
+	String getScreenWelcomeMessageText();
+	
+	@Key("ScreenWelcomeMessageTime")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getScreenWelcomeMessageTime();
+	
+	@Key("AntiFeedEnable")
+	boolean antiFeedEnable();
+	
+	@Key("AntiFeedDualbox")
+	boolean antiFeedDualbox();
+	
+	@Key("AntiFeedDisconnectedAsDualbox")
+	boolean antiFeedDisconnectedAsDualbox();
+	
+	@Key("AntiFeedInterval")
+	int getAntiFeedInterval();
+	
+	@Key("AnnouncePkPvP")
+	boolean announcePkPvP();
+	
+	@Key("AnnouncePkPvPNormalMessage")
+	boolean announcePkPvPNormalMessage();
+	
+	@Key("AnnouncePkMsg")
+	String getAnnouncePkMsg();
+	
+	@Key("AnnouncePvpMsg")
+	String getAnnouncePvpMsg();
+	
+	@Key("ChatAdmin")
+	boolean chatAdmin();
+	
+	@Key("HellboundStatus")
+	boolean hellboundStatus();
+	
+	@Key("AutoLootVoiceEnable")
+	boolean autoLootVoiceCommand();
+	
+	@Key("AutoLootVoiceRestore")
+	boolean autoLootVoiceRestore();
+	
+	@Key("AutoLootItemsVoiceRestore")
+	boolean autoLootItemsVoiceRestore();
+	
+	@Key("AutoLootHerbsVoiceRestore")
+	boolean autoLootHerbsVoiceRestore();
+	
+	@Key("AutoLootHerbsList")
+	Set<Integer> getAutoLootHerbsList();
+	
+	@Key("AutoLootItemsList")
+	Set<Integer> getAutoLootItemsList();
+	
+	@Key("MultiLangEnable")
+	boolean multiLangEnable();
+	
+	@Key("MultiLangDefault")
+	String getMultiLangDefault();
+	
+	@Key("MultiLangAllowed")
+	Set<String> getMultiLangAllowed();
+	
+	@Key("MultiLangHandler")
+	boolean multiLangHandler();
+	
+	@Key("MultiLangSystemMessageEnable")
+	boolean multiLangSystemMessageEnable();
+	
+	@Key("MultiLangSystemMessageAllowed")
+	Set<String> getMultiLangSystemMessageAllowed();
+	
+	@Key("MultiLangNpcStringEnable")
+	boolean multiLangNpcStringEnable();
+	
+	@Key("MultiLangNpcStringAllowed")
+	Set<String> getMultiLangNpcStringAllowed();
+	
+	@Key("L2WalkerProtection")
+	boolean l2WalkerProtection();
+	
+	@Key("DebugHandler")
+	boolean debugHandler();
+	
+	@Key("DualboxCheckMaxPlayersPerIP")
+	int getDualboxCheckMaxPlayersPerIP();
+	
+	@Key("DualboxCheckMaxOlympiadParticipantsPerIP")
+	int getDualboxCheckMaxOlympiadParticipantsPerIP();
+	
+	@Key("DualboxCheckMaxL2EventParticipantsPerIP")
+	int getDualboxCheckMaxL2EventParticipantsPerIP();
+	
+	@Key("DualboxCheckWhitelist")
+	@ConverterClass(IPLimitConverter.class)
+	Map<Integer, Integer> getDualboxCheckWhitelist();
+	
+	@Key("AllowChangePassword")
+	boolean allowChangePassword();
+	
+	@Key("AllowXpHandler")
+	boolean allowXpHandler();
+	
+	@Key("AllowCastleHandler")
+	boolean allowCastleHandler();
+	
+	@Key("AllowClanHandler")
+	boolean allowClanHandler();
+	
+	@Key("AllowStatHandler")
+	boolean allowStatHandler();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/DatabaseConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/DatabaseConfiguration.java
new file mode 100644
index 00000000..57d5308f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/DatabaseConfiguration.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Database Configuration.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/database.properties",
+	"file:./config/database.properties",
+	"classpath:config/database.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface DatabaseConfiguration extends Reloadable {
+	
+	@Key("URL")
+	String getURL();
+	
+	@Key("User")
+	String getUser();
+	
+	@Key("Password")
+	String getPassword();
+	
+	@Key("MaxConnections")
+	int getMaxConnections();
+	
+	@Key("MaxIdleTime")
+	int getMaxIdleTime();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/DiscordConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/DiscordConfiguration.java
new file mode 100644
index 00000000..a4455bb4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/DiscordConfiguration.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Mutable;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Discord Configuration.
+ * @author Stalitsa
+ * @version 2.6.2.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/discord.properties",
+	"file:./config/discord.properties",
+	"classpath:config/discord.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface DiscordConfiguration extends Mutable, Reloadable {
+	
+	@Key("BotEnable")
+	boolean enableBot();
+	
+	@Key("BotPrefix")
+	String getPrefix();
+	
+	@Key("BotToken")
+	String getBotToken();
+	
+	@Key("ServerId")
+	String getServerId();
+	
+	@Key("GameMasterId")
+	String getGameMasterId();
+	
+	@Key("ConsoleLogChannelId")
+	String getConsoleLogChannelId();
+	
+	@Key("GameChatChannelId")
+	String getGameChatChannelId();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/FloodProtectorConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/FloodProtectorConfiguration.java
new file mode 100644
index 00000000..edbde206
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/FloodProtectorConfiguration.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Accessible;
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Flood Protector Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/floodprotector.properties",
+	"file:./config/floodprotector.properties",
+	"classpath:config/floodprotector.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface FloodProtectorConfiguration extends Accessible, Reloadable {
+	
+	// TODO(Zoey76): Implement all these configurations.
+	
+	@Key("UseItemInterval")
+	int getUseItemInterval();
+	
+	@Key("UseItemLogFlooding")
+	boolean useItemLogFlooding();
+	
+	@Key("UseItemPunishmentLimit")
+	int getUseItemPunishmentLimit();
+	
+	@Key("UseItemPunishmentType")
+	String getUseItemPunishmentType();
+	
+	@Key("UseItemPunishmentTime")
+	int getUseItemPunishmentTime();
+	
+	@Key("RollDiceInterval")
+	int getRollDiceInterval();
+	
+	@Key("RollDiceLogFlooding")
+	boolean rollDiceLogFlooding();
+	
+	@Key("RollDicePunishmentLimit")
+	int getRollDicePunishmentLimit();
+	
+	@Key("RollDicePunishmentType")
+	String getRollDicePunishmentType();
+	
+	@Key("RollDicePunishmentTime")
+	int getRollDicePunishmentTime();
+	
+	@Key("FireworkInterval")
+	int getFireworkInterval();
+	
+	@Key("FireworkLogFlooding")
+	boolean fireworkLogFlooding();
+	
+	@Key("FireworkPunishmentLimit")
+	int getFireworkPunishmentLimit();
+	
+	@Key("FireworkPunishmentType")
+	String getFireworkPunishmentType();
+	
+	@Key("FireworkPunishmentTime")
+	int getFireworkPunishmentTime();
+	
+	@Key("ItemPetSummonInterval")
+	int geItemPetSummonInterval();
+	
+	@Key("ItemPetSummonLogFlooding")
+	boolean itemPetSummonLogFlooding();
+	
+	@Key("ItemPetSummonPunishmentLimit")
+	int getItemPetSummonPunishmentLimit();
+	
+	@Key("ItemPetSummonPunishmentType")
+	String getItemPetSummonPunishmentType();
+	
+	@Key("ItemPetSummonPunishmentTime")
+	int getItemPetSummonPunishmentTime();
+	
+	@Key("HeroVoiceInterval")
+	int getHeroVoiceInterval();
+	
+	@Key("HeroVoiceLogFlooding")
+	boolean heroVoiceLogFlooding();
+	
+	@Key("HeroVoicePunishmentLimit")
+	int getHeroVoicePunishmentLimit();
+	
+	@Key("HeroVoicePunishmentType")
+	String getHeroVoicePunishmentType();
+	
+	@Key("HeroVoicePunishmentTime")
+	int getHeroVoicePunishmentTime();
+	
+	@Key("GlobalChatInterval")
+	int getGlobalChatInterval();
+	
+	@Key("GlobalChatLogFlooding")
+	boolean globalChatLogFlooding();
+	
+	@Key("GlobalChatPunishmentLimit")
+	int getGlobalChatPunishmentLimit();
+	
+	@Key("GlobalChatPunishmentType")
+	String getGlobalChatPunishmentType();
+	
+	@Key("GlobalChatPunishmentTime")
+	int getGlobalChatPunishmentTime();
+	
+	@Key("SubclassInterval")
+	int getSubclassInterval();
+	
+	@Key("SubclassLogFlooding")
+	boolean subclassLogFlooding();
+	
+	@Key("SubclassPunishmentLimit")
+	int getSubclassPunishmentLimit();
+	
+	@Key("SubclassPunishmentType")
+	String getSubclassPunishmentType();
+	
+	@Key("SubclassPunishmentTime")
+	int getSubclassPunishmentTime();
+	
+	@Key("DropItemInterval")
+	int getDropItemInterval();
+	
+	@Key("DropItemLogFlooding")
+	boolean dropItemLogFlooding();
+	
+	@Key("DropItemPunishmentLimit")
+	int getDropItemPunishmentLimit();
+	
+	@Key("DropItemPunishmentType")
+	String getDropItemPunishmentType();
+	
+	@Key("DropItemPunishmentTime")
+	int getDropItemPunishmentTime();
+	
+	@Key("ServerBypassInterval")
+	int getServerBypassInterval();
+	
+	@Key("ServerBypassLogFlooding")
+	boolean serverBypassLogFlooding();
+	
+	@Key("ServerBypassPunishmentLimit")
+	int getServerBypassPunishmentLimit();
+	
+	@Key("ServerBypassPunishmentType")
+	String getServerBypassPunishmentType();
+	
+	@Key("ServerBypassPunishmentTime")
+	int getServerBypassPunishmentTime();
+	
+	@Key("MultiSellInterval")
+	int getMultiSellInterval();
+	
+	@Key("MultiSellLogFlooding")
+	boolean multiSellLogFlooding();
+	
+	@Key("MultiSellPunishmentLimit")
+	int getMultiSellPunishmentLimit();
+	
+	@Key("MultiSellPunishmentType")
+	String getMultiSellPunishmentType();
+	
+	@Key("MultiSellPunishmentTime")
+	int getMultiSellPunishmentTime();
+	
+	@Key("TransactionInterval")
+	int getTransactionInterval();
+	
+	@Key("TransactionLogFlooding")
+	boolean transactionLogFlooding();
+	
+	@Key("TransactionPunishmentLimit")
+	int getTransactionPunishmentLimit();
+	
+	@Key("TransactionPunishmentType")
+	String getTransactionPunishmentType();
+	
+	@Key("TransactionPunishmentTime")
+	int getTransactionPunishmentTime();
+	
+	@Key("ManufactureInterval")
+	int getManufactureInterval();
+	
+	@Key("ManufactureLogFlooding")
+	boolean manufactureLogFlooding();
+	
+	@Key("ManufacturePunishmentLimit")
+	int getManufacturePunishmentLimit();
+	
+	@Key("ManufacturePunishmentType")
+	String getManufacturePunishmentType();
+	
+	@Key("ManufacturePunishmentTime")
+	int getManufacturePunishmentTime();
+	
+	@Key("ManorInterval")
+	int getManorInterval();
+	
+	@Key("ManorLogFlooding")
+	boolean manorLogFlooding();
+	
+	@Key("ManorPunishmentLimit")
+	int getManorPunishmentLimit();
+	
+	@Key("ManorPunishmentType")
+	String getManorPunishmentType();
+	
+	@Key("ManorPunishmentTime")
+	int getManorPunishmentTime();
+	
+	@Key("SendMailInterval")
+	int getSendMailInterval();
+	
+	@Key("SendMailLogFlooding")
+	boolean sendMailLogFlooding();
+	
+	@Key("SendMailPunishmentLimit")
+	int getSendMailPunishmentLimit();
+	
+	@Key("SendMailPunishmentType")
+	String getSendMailPunishmentType();
+	
+	@Key("SendMailPunishmentTime")
+	int getSendMailPunishmentTime();
+	
+	@Key("CharacterSelectInterval")
+	int getCharacterSelectInterval();
+	
+	@Key("CharacterSelectLogFlooding")
+	boolean characterSelectLogFlooding();
+	
+	@Key("CharacterSelectPunishmentLimit")
+	int getCharacterSelectPunishmentLimit();
+	
+	@Key("CharacterSelectPunishmentType")
+	String getCharacterSelectPunishmentType();
+	
+	@Key("CharacterSelectPunishmentTime")
+	int getCharacterSelectPunishmentTime();
+	
+	@Key("ItemAuctionInterval")
+	int getItemAuctionInterval();
+	
+	@Key("ItemAuctionLogFlooding")
+	boolean itemAuctionLogFlooding();
+	
+	@Key("ItemAuctionPunishmentLimit")
+	int getItemAuctionPunishmentLimit();
+	
+	@Key("ItemAuctionPunishmentType")
+	String getItemAuctionPunishmentType();
+	
+	@Key("ItemAuctionPunishmentTime")
+	int getItemAuctionPunishmentTime();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/FortSiegeConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/FortSiegeConfiguration.java
new file mode 100644
index 00000000..e67ac10b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/FortSiegeConfiguration.java
@@ -0,0 +1,478 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Accessible;
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.Minutes2MillisecondsConverter;
+
+/**
+ * Fort Siege Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/fortsiege.properties",
+	"file:./config/fortsiege.properties",
+	"classpath:config/fortsiege.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface FortSiegeConfiguration extends Accessible, Reloadable {
+	
+	@Key("SiegeLength")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getSiegeLength();
+	
+	@Key("SuspiciousMerchantRespawnDelay")
+	int getSuspiciousMerchantRespawnDelay();
+	
+	@Key("CountDownLength")
+	int getCountDownLength();
+	
+	@Key("MaxFlags")
+	int getMaxFlags();
+	
+	@Key("SiegeClanMinLevel")
+	int getSiegeClanMinLevel();
+	
+	@Key("AttackerMaxClans")
+	int getAttackerMaxClans();
+	
+	@Key("JustToTerritory")
+	boolean justToTerritory();
+	
+	// TODO(Zoey76): Most, if not all, of this configurations are not used.
+	
+	@Key("ShantyCommander1")
+	String getShantyCommander1();
+	
+	@Key("ShantyCommander2")
+	String getShantyCommander2();
+	
+	@Key("ShantyCommander3")
+	String getShantyCommander3();
+	
+	@Key("ShantyFlag1")
+	String getShantyFlag1();
+	
+	@Key("ShantyFlag2")
+	String getShantyFlag2();
+	
+	@Key("ShantyFlag3")
+	String getShantyFlag3();
+	
+	@Key("SouthernCommander1")
+	String getSouthernCommander1();
+	
+	@Key("SouthernCommander2")
+	String getSouthernCommander2();
+	
+	@Key("SouthernCommander3")
+	String getSouthernCommander3();
+	
+	@Key("SouthernCommander4")
+	String getSouthernCommander4();
+	
+	@Key("SouthernFlag1")
+	String getSouthernFlag1();
+	
+	@Key("SouthernFlag2")
+	String getSouthernFlag2();
+	
+	@Key("SouthernFlag3")
+	String getSouthernFlag3();
+	
+	@Key("HiveCommander1")
+	String getHiveCommander1();
+	
+	@Key("HiveCommander2")
+	String getHiveCommander2();
+	
+	@Key("HiveCommander3")
+	String getHiveCommander3();
+	
+	@Key("HiveFlag1")
+	String getHiveFlag1();
+	
+	@Key("HiveFlag2")
+	String getHiveFlag2();
+	
+	@Key("HiveFlag3")
+	String getHiveFlag3();
+	
+	@Key("ValleyCommander1")
+	String getValleyCommander1();
+	
+	@Key("ValleyCommander2")
+	String getValleyCommander2();
+	
+	@Key("ValleyCommander3")
+	String getValleyCommander3();
+	
+	@Key("ValleyCommander4")
+	String getValleyCommander4();
+	
+	@Key("ValleyFlag1")
+	String getValleyFlag1();
+	
+	@Key("ValleyFlag2")
+	String getValleyFlag2();
+	
+	@Key("ValleyFlag3")
+	String getValleyFlag3();
+	
+	@Key("IvoryCommander1")
+	String getIvoryCommander1();
+	
+	@Key("IvoryCommander2")
+	String getIvoryCommander2();
+	
+	@Key("IvoryCommander3")
+	String getIvoryCommander3();
+	
+	@Key("IvoryFlag1")
+	String getIvoryFlag1();
+	
+	@Key("IvoryFlag2")
+	String getIvoryFlag2();
+	
+	@Key("IvoryFlag3")
+	String getIvoryFlag3();
+	
+	@Key("NarsellCommander1")
+	String getNarsellCommander1();
+	
+	@Key("NarsellCommander2")
+	String getNarsellCommander2();
+	
+	@Key("NarsellCommander3")
+	String getNarsellCommander3();
+	
+	@Key("NarsellFlag1")
+	String getNarsellFlag1();
+	
+	@Key("NarsellFlag2")
+	String getNarsellFlag2();
+	
+	@Key("NarsellFlag3")
+	String getNarsellFlag3();
+	
+	@Key("BayouCommander1")
+	String getBayouCommander1();
+	
+	@Key("BayouCommander2")
+	String getBayouCommander2();
+	
+	@Key("BayouCommander3")
+	String getBayouCommander3();
+	
+	@Key("BayouCommander4")
+	String getBayouCommander4();
+	
+	@Key("BayouFlag1")
+	String getBayouFlag1();
+	
+	@Key("BayouFlag2")
+	String getBayouFlag2();
+	
+	@Key("BayouFlag3")
+	String getBayouFlag3();
+	
+	@Key("WhiteSandsCommander1")
+	String getWhiteSandsCommander1();
+	
+	@Key("WhiteSandsCommander2")
+	String getWhiteSandsCommander2();
+	
+	@Key("WhiteSandsCommander3")
+	String getWhiteSandsCommander3();
+	
+	@Key("WhiteSandsFlag1")
+	String getWhiteSandsFlag1();
+	
+	@Key("WhiteSandsFlag2")
+	String getWhiteSandsFlag2();
+	
+	@Key("WhiteSandsFlag3")
+	String getWhiteSandsFlag3();
+	
+	@Key("BorderlandCommander1")
+	String getBorderlandCommander1();
+	
+	@Key("BorderlandCommander2")
+	String getBorderlandCommander2();
+	
+	@Key("BorderlandCommander3")
+	String getBorderlandCommander3();
+	
+	@Key("BorderlandCommander4")
+	String getBorderlandCommander4();
+	
+	@Key("BorderlandFlag1")
+	String getBorderlandFlag1();
+	
+	@Key("BorderlandFlag2")
+	String getBorderlandFlag2();
+	
+	@Key("BorderlandFlag3")
+	String getBorderlandFlag3();
+	
+	@Key("SwampCommander1")
+	String getSwampCommander1();
+	
+	@Key("SwampCommander2")
+	String getSwampCommander2();
+	
+	@Key("SwampCommander3")
+	String getSwampCommander3();
+	
+	@Key("SwampCommander4")
+	String getSwampCommander4();
+	
+	@Key("SwampFlag1")
+	String getSwampFlag1();
+	
+	@Key("SwampFlag2")
+	String getSwampFlag2();
+	
+	@Key("SwampFlag3")
+	String getSwampFlag3();
+	
+	@Key("ArchaicCommander1")
+	String getArchaicCommander1();
+	
+	@Key("ArchaicCommander2")
+	String getArchaicCommander2();
+	
+	@Key("ArchaicCommander3")
+	String getArchaicCommander3();
+	
+	@Key("ArchaicFlag1")
+	String getArchaicFlag1();
+	
+	@Key("ArchaicFlag2")
+	String getArchaicFlag2();
+	
+	@Key("ArchaicFlag3")
+	String getArchaicFlag3();
+	
+	@Key("FloranCommander1")
+	String getFloranCommander1();
+	
+	@Key("FloranCommander2")
+	String getFloranCommander2();
+	
+	@Key("FloranCommander3")
+	String getFloranCommander3();
+	
+	@Key("FloranCommander4")
+	String getFloranCommander4();
+	
+	@Key("FloranFlag1")
+	String getFloranFlag1();
+	
+	@Key("FloranFlag2")
+	String getFloranFlag2();
+	
+	@Key("FloranFlag3")
+	String getFloranFlag3();
+	
+	@Key("CloudMountainCommander1")
+	String getCloudMountainCommander1();
+	
+	@Key("CloudMountainCommander2")
+	String getCloudMountainCommander2();
+	
+	@Key("CloudMountainCommander3")
+	String getCloudMountainCommander3();
+	
+	@Key("CloudMountainCommander4")
+	String getCloudMountainCommander4();
+	
+	@Key("CloudMountainFlag1")
+	String getCloudMountainFlag1();
+	
+	@Key("CloudMountainFlag2")
+	String getCloudMountainFlag2();
+	
+	@Key("CloudMountainFlag3")
+	String getCloudMountainFlag3();
+	
+	@Key("TanorCommander1")
+	String getTanorCommander1();
+	
+	@Key("TanorCommander2")
+	String getTanorCommander2();
+	
+	@Key("TanorCommander3")
+	String getTanorCommander3();
+	
+	@Key("TanorFlag1")
+	String getTanorFlag1();
+	
+	@Key("TanorFlag2")
+	String getTanorFlag2();
+	
+	@Key("TanorFlag3")
+	String getTanorFlag3();
+	
+	@Key("DragonspineCommander1")
+	String getDragonspineCommander1();
+	
+	@Key("DragonspineCommander2")
+	String getDragonspineCommander2();
+	
+	@Key("DragonspineCommander3")
+	String getDragonspineCommander3();
+	
+	@Key("DragonspineFlag1")
+	String getDragonspineFlag1();
+	
+	@Key("DragonspineFlag2")
+	String getDragonspineFlag2();
+	
+	@Key("DragonspineFlag3")
+	String getDragonspineFlag3();
+	
+	@Key("AntharasCommander1")
+	String getAntharasCommander1();
+	
+	@Key("AntharasCommander2")
+	String getAntharasCommander2();
+	
+	@Key("AntharasCommander3")
+	String getAntharasCommander3();
+	
+	@Key("AntharasCommander4")
+	String getAntharasCommander4();
+	
+	@Key("AntharasFlag1")
+	String getAntharasFlag1();
+	
+	@Key("AntharasFlag2")
+	String getAntharasFlag2();
+	
+	@Key("AntharasFlag3")
+	String getAntharasFlag3();
+	
+	@Key("WesternCommander1")
+	String getWesternCommander1();
+	
+	@Key("WesternCommander2")
+	String getWesternCommander2();
+	
+	@Key("WesternCommander3")
+	String getWesternCommander3();
+	
+	@Key("WesternCommander4")
+	String getWesternCommander4();
+	
+	@Key("WesternFlag1")
+	String getWesternFlag1();
+	
+	@Key("WesternFlag2")
+	String getWesternFlag2();
+	
+	@Key("WesternFlag3")
+	String getWesternFlag3();
+	
+	@Key("HuntersCommander1")
+	String getHuntersCommander1();
+	
+	@Key("HuntersCommander2")
+	String getHuntersCommander2();
+	
+	@Key("HuntersCommander3")
+	String getHuntersCommander3();
+	
+	@Key("HuntersCommander4")
+	String getHuntersCommander4();
+	
+	@Key("HuntersFlag1")
+	String getHuntersFlag1();
+	
+	@Key("HuntersFlag2")
+	String getHuntersFlag2();
+	
+	@Key("HuntersFlag3")
+	String getHuntersFlag3();
+	
+	@Key("AaruCommander1")
+	String getAaruCommander1();
+	
+	@Key("AaruCommander2")
+	String getAaruCommander2();
+	
+	@Key("AaruCommander3")
+	String getAaruCommander3();
+	
+	@Key("AaruFlag1")
+	String getAaruFlag1();
+	
+	@Key("AaruFlag2")
+	String getAaruFlag2();
+	
+	@Key("AaruFlag3")
+	String getAaruFlag3();
+	
+	@Key("DemonCommander1")
+	String getDemonCommander1();
+	
+	@Key("DemonCommander2")
+	String getDemonCommander2();
+	
+	@Key("DemonCommander3")
+	String getDemonCommander3();
+	
+	@Key("DemonFlag1")
+	String getDemonFlag1();
+	
+	@Key("DemonFlag2")
+	String getDemonFlag2();
+	
+	@Key("DemonFlag3")
+	String getDemonFlag3();
+	
+	@Key("MonasticCommander1")
+	String getMonasticCommander1();
+	
+	@Key("MonasticCommander2")
+	String getMonasticCommander2();
+	
+	@Key("MonasticCommander3")
+	String getMonasticCommander3();
+	
+	@Key("MonasticFlag1")
+	String getMonasticFlag1();
+	
+	@Key("MonasticFlag2")
+	String getMonasticFlag2();
+	
+	@Key("MonasticFlag3")
+	String getMonasticFlag3();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/FortressConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/FortressConfiguration.java
new file mode 100644
index 00000000..e6d269ab
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/FortressConfiguration.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.Minutes2MillisecondsConverter;
+
+/**
+ * Fortress Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/fortress.properties",
+	"file:./config/fortress.properties",
+	"classpath:config/fortress.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface FortressConfiguration extends Reloadable {
+	
+	@Key("FunctionFeeDay7")
+	long getFunctionFeeDay7();
+	
+	@Key("TeleportFunctionFeeLvl11")
+	int getTeleportFunctionFeeLvl11();
+	
+	@Key("TeleportFunctionFeeLvl12")
+	int getTeleportFunctionFeeLvl12();
+	
+	@Key("SupportFeeLvl15")
+	int getSupportFeeLvl15();
+	
+	@Key("SupportFeeLvl18")
+	int getSupportFeeLvl18();
+	
+	@Key("MpRegenerationFeeLvl18")
+	int getMpRegenerationFeeLvl18();
+	
+	@Key("MpRegenerationFeeLvl20")
+	int getMpRegenerationFeeLvl20();
+	
+	@Key("HpRegenerationFeeLvl25")
+	int getHpRegenerationFeeLvl25();
+	
+	@Key("HpRegenerationFeeLvl30")
+	int getHpRegenerationFeeLvl30();
+	
+	@Key("ExpRegenerationFeeLvl19")
+	int getExpRegenerationFeeLvl19();
+	
+	@Key("ExpRegenerationFeeLvl20")
+	int getExpRegenerationFeeLvl20();
+	
+	@Key("PeriodicUpdateFrequency")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getPeriodicUpdateFrequency();
+	
+	@Key("BloodOathCount")
+	int getBloodOathCount();
+	
+	@Key("MaxSupplyLevel")
+	int getMaxSupplyLevel();
+	
+	@Key("FeeForCastle")
+	int getFeeForCastle();
+	
+	@Key("MaxKeepTime")
+	int getMaxKeepTime();
+	
+	@Key("MpBuffFree")
+	boolean mpBuffFree();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/GeneralConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/GeneralConfiguration.java
new file mode 100644
index 00000000..65345be4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/GeneralConfiguration.java
@@ -0,0 +1,650 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.Set;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Mutable;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.Minutes2MillisecondsConverter;
+import com.l2jserver.gameserver.config.converter.Seconds2MillisecondsConverter;
+import com.l2jserver.gameserver.config.converter.ServerListTypeConverter;
+import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
+
+/**
+ * General Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/general.properties",
+	"file:./config/general.properties",
+	"classpath:config/general.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface GeneralConfiguration extends Mutable, Reloadable {
+	
+	@Key("EverybodyHasAdminRights")
+	boolean everybodyHasAdminRights();
+	
+	@Key("ServerListBrackets")
+	boolean getServerListBrackets();
+	
+	@Key("ServerListType")
+	@ConverterClass(ServerListTypeConverter.class)
+	int getServerListType();
+	
+	@Key("ServerListAge")
+	int getServerListAge();
+	
+	@Key("ServerGMOnly")
+	boolean serverGMOnly();
+	
+	@Key("GMHeroAura")
+	boolean gmHeroAura();
+	
+	@Key("GMStartupInvulnerable")
+	boolean gmStartupInvulnerable();
+	
+	@Key("GMStartupInvisible")
+	boolean gmStartupInvisible();
+	
+	@Key("GMStartupSilence")
+	boolean gmStartupSilence();
+	
+	@Key("GMStartupAutoList")
+	boolean gmStartupAutoList();
+	
+	@Key("GMStartupDietMode")
+	boolean gmStartupDietMode();
+	
+	@Key("GMItemRestriction")
+	boolean gmItemRestriction();
+	
+	@Key("GMSkillRestriction")
+	boolean gmSkillRestriction();
+	
+	@Key("GMTradeRestrictedItems")
+	boolean gmTradeRestrictedItems();
+	
+	@Key("GMRestartFighting")
+	boolean gmRestartFighting();
+	
+	@Key("GMShowAnnouncerName")
+	boolean gmShowAnnouncerName();
+	
+	// TODO(Zoey76): Implement GMShowCritAnnouncerName configuration.
+	@Key("GMShowCritAnnouncerName")
+	boolean gmShowCritAnnouncerName();
+	
+	@Key("GMGiveSpecialSkills")
+	boolean gmGiveSpecialSkills();
+	
+	@Key("GMGiveSpecialAuraSkills")
+	boolean gmGiveSpecialAuraSkills();
+	
+	@Key("GameGuardEnforce")
+	boolean gameGuardEnforce();
+	
+	// TODO(Zoey76): Implement GameGuardProhibitAction configuration.
+	@Key("GameGuardProhibitAction")
+	boolean gameGuardProhibitAction();
+	
+	@Key("LogChat")
+	boolean logChat();
+	
+	// TODO(Zoey76): Implement LogAutoAnnouncements configuration.
+	@Key("LogAutoAnnouncements")
+	boolean logAutoAnnouncements();
+	
+	@Key("LogItems")
+	boolean logItems();
+	
+	@Key("LogItemsSmallLog")
+	boolean logItemsSmallLog();
+	
+	@Key("LogItemEnchants")
+	boolean logItemEnchants();
+	
+	@Key("LogSkillEnchants")
+	boolean logSkillEnchants();
+	
+	@Key("GMAudit")
+	boolean gmAudit();
+	
+	@Key("SkillCheckEnable")
+	boolean skillCheckEnable();
+	
+	@Key("SkillCheckRemove")
+	boolean skillCheckRemove();
+	
+	@Key("SkillCheckGM")
+	boolean skillCheckGM();
+	
+	@Key("ThreadPoolSizeEffects")
+	int getThreadPoolSizeEffects();
+	
+	@Key("ThreadPoolSizeGeneral")
+	int getThreadPoolSizeGeneral();
+	
+	@Key("ThreadPoolSizeEvents")
+	int getThreadPoolSizeEvents();
+	
+	@Key("UrgentPacketThreadCoreSize")
+	int getUrgentPacketThreadCoreSize();
+	
+	@Key("GeneralPacketThreadCoreSize")
+	int getGeneralPacketThreadCoreSize();
+	
+	@Key("GeneralThreadCoreSize")
+	int getGeneralThreadCoreSize();
+	
+	@Key("AiMaxThread")
+	int getAiMaxThread();
+	
+	@Key("EventsMaxThread")
+	int getEventsMaxThread();
+	
+	@Key("DeadLockDetector")
+	boolean deadLockDetector();
+	
+	@Key("DeadLockCheckInterval")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getDeadLockCheckInterval();
+	
+	@Key("RestartOnDeadlock")
+	boolean restartOnDeadlock();
+	
+	@Key("ClientPacketQueueSize")
+	int getClientPacketQueueSize();
+	
+	@Key("ClientPacketQueueMaxBurstSize")
+	int getClientPacketQueueMaxBurstSize();
+	
+	@Key("ClientPacketQueueMaxPacketsPerSecond")
+	int getClientPacketQueueMaxPacketsPerSecond();
+	
+	@Key("ClientPacketQueueMeasureInterval")
+	int getClientPacketQueueMeasureInterval();
+	
+	@Key("ClientPacketQueueMaxAveragePacketsPerSecond")
+	int getClientPacketQueueMaxAveragePacketsPerSecond();
+	
+	@Key("ClientPacketQueueMaxFloodsPerMin")
+	int getClientPacketQueueMaxFloodsPerMin();
+	
+	@Key("ClientPacketQueueMaxOverflowsPerMin")
+	int getClientPacketQueueMaxOverflowsPerMin();
+	
+	@Key("ClientPacketQueueMaxUnderflowsPerMin")
+	int getClientPacketQueueMaxUnderflowsPerMin();
+	
+	@Key("ClientPacketQueueMaxUnknownPerMin")
+	int getClientPacketQueueMaxUnknownPerMin();
+	
+	@Key("AllowDiscardItem")
+	boolean allowDiscardItem();
+	
+	@Key("AutoDestroyDroppedItemAfter")
+	int getAutoDestroyDroppedItemAfter();
+	
+	@Key("AutoDestroyHerbTime")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getAutoDestroyHerbTime();
+	
+	@Key("ProtectedItems")
+	Set<Integer> getProtectedItems();
+	
+	@Key("DatabaseCleanUp")
+	boolean databaseCleanUp();
+	
+	// TODO(Zoey76): Implement ConnectionCloseTime configuration.
+	@Key("ConnectionCloseTime")
+	long getConnectionCloseTime();
+	
+	@Key("CharacterDataStoreInterval")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getCharacterDataStoreInterval();
+	
+	@Key("LazyItemsUpdate")
+	boolean lazyItemsUpdate();
+	
+	@Key("UpdateItemsOnCharStore")
+	boolean updateItemsOnCharStore();
+	
+	@Key("DestroyPlayerDroppedItem")
+	boolean destroyPlayerDroppedItem();
+	
+	@Key("DestroyEquipableItem")
+	boolean destroyEquipableItem();
+	
+	@Key("SaveDroppedItem")
+	boolean saveDroppedItem();
+	
+	@Key("EmptyDroppedItemTableAfterLoad")
+	boolean emptyDroppedItemTableAfterLoad();
+	
+	@Key("SaveDroppedItemInterval")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getSaveDroppedItemInterval();
+	
+	@Key("ClearDroppedItemTable")
+	boolean clearDroppedItemTable();
+	
+	@Key("AutoDeleteInvalidQuestData")
+	boolean autoDeleteInvalidQuestData();
+	
+	@Key("PreciseDropCalculation")
+	boolean preciseDropCalculation();
+	
+	@Key("PreciseDropMultipleGroupRolls")
+	boolean preciseDropMultipleGroupRolls();
+	
+	@Key("PreciseDropMultipleRollsAggregateDrops")
+	boolean preciseDropMultipleRollsAggregateDrops();
+	
+	@Key("MultipleItemDrop")
+	boolean multipleItemDrop();
+	
+	@Key("ForceInventoryUpdate")
+	boolean forceInventoryUpdate();
+	
+	@Key("LazyCache")
+	boolean lazyCache();
+	
+	@Key("CacheCharNames")
+	boolean cacheCharNames();
+	
+	@Key("MinNPCAnimation")
+	int getMinNPCAnimation();
+	
+	@Key("MaxNPCAnimation")
+	int getMaxNPCAnimation();
+	
+	@Key("MinMonsterAnimation")
+	int getMinMonsterAnimation();
+	
+	@Key("MaxMonsterAnimation")
+	int getMaxMonsterAnimation();
+	
+	@Key("MoveBasedKnownList")
+	boolean moveBasedKnownList();
+	
+	@Key("KnownListUpdateInterval")
+	long getKnownListUpdateInterval();
+	
+	@Key("CheckKnownList")
+	boolean checkKnownList();
+	
+	@Key("GridsAlwaysOn")
+	boolean gridsAlwaysOn();
+	
+	@Key("GridNeighborTurnOnTime")
+	int getGridNeighborTurnOnTime();
+	
+	@Key("GridNeighborTurnOffTime")
+	int getGridNeighborTurnOffTime();
+	
+	@Key("EnableFallingDamage")
+	boolean enableFallingDamage();
+	
+	@Key("PeaceZoneMode")
+	int getPeaceZoneMode();
+	
+	@Key("GlobalChat")
+	String getGlobalChat();
+	
+	@Key("TradeChat")
+	String getTradeChat();
+	
+	@Key("AllowWarehouse")
+	boolean allowWarehouse();
+	
+	@Key("WarehouseCache")
+	boolean warehouseCache();
+	
+	@Key("WarehouseCacheTime")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getWarehouseCacheTime();
+	
+	@Key("AllowRefund")
+	boolean allowRefund();
+	
+	@Key("AllowMail")
+	boolean allowMail();
+	
+	@Key("AllowAttachments")
+	boolean allowAttachments();
+	
+	@Key("AllowWear")
+	boolean allowWear();
+	
+	@Key("WearDelay")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getWearDelay();
+	
+	@Key("WearPrice")
+	int getWearPrice();
+	
+	@Key("RestorePlayerInstance")
+	boolean restorePlayerInstance();
+	
+	@Key("AllowSummonInInstance")
+	boolean allowSummonInInstance();
+	
+	@Key("EjectDeadPlayerTime")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getEjectDeadPlayerTime();
+	
+	@Key("InstanceFinishTime")
+	int getInstanceFinishTime();
+	
+	// TODO(Zoey76): Implement AllowRace configuration.
+	@Key("AllowRace")
+	boolean allowRace();
+	
+	@Key("AllowWater")
+	boolean allowWater();
+	
+	@Key("AllowRentPet")
+	boolean allowRentPet();
+	
+	@Key("AllowFishing")
+	boolean allowFishing();
+	
+	@Key("AllowBoat")
+	boolean allowBoat();
+	
+	@Key("BoatBroadcastRadius")
+	int getBoatBroadcastRadius();
+	
+	@Key("AllowCursedWeapons")
+	boolean allowCursedWeapons();
+	
+	@Key("AllowPetWalkers")
+	boolean allowPetWalkers();
+	
+	@Key("ShowServerNews")
+	boolean showServerNews();
+	
+	@Key("EnableCommunityBoard")
+	boolean enableCommunityBoard();
+	
+	@Key("BBSDefault")
+	String getBBSDefault();
+	
+	@Key("UseChatFilter")
+	boolean useChatFilter();
+	
+	@Key("ChatFilterChars")
+	String getChatFilterChars();
+	
+	@Key("ChatFilter")
+	Set<String> getChatFilter();
+	
+	@Key("BanChatChannels")
+	Set<Integer> getBanChatChannels();
+	
+	@Key("AllowManor")
+	boolean allowManor();
+	
+	@Key("ManorRefreshTime")
+	int getManorRefreshTime();
+	
+	@Key("ManorRefreshMin")
+	int getManorRefreshMin();
+	
+	@Key("ManorApproveTime")
+	int getManorApproveTime();
+	
+	@Key("ManorApproveMin")
+	int getManorApproveMin();
+	
+	@Key("ManorMaintenanceMin")
+	int getManorMaintenanceMin();
+	
+	@Key("ManorSaveAllActions")
+	boolean manorSaveAllActions();
+	
+	@Key("ManorSavePeriodRate")
+	int getManorSavePeriodRate();
+	
+	@Key("AllowLottery")
+	boolean allowLottery();
+	
+	@Key("LotteryPrize")
+	long getLotteryPrize();
+	
+	@Key("LotteryTicketPrice")
+	long getLotteryTicketPrice();
+	
+	@Key("Lottery5NumberRate")
+	float getLottery5NumberRate();
+	
+	@Key("Lottery4NumberRate")
+	float getLottery4NumberRate();
+	
+	@Key("Lottery3NumberRate")
+	float getLottery3NumberRate();
+	
+	@Key("Lottery2and1NumberPrize")
+	long getLottery2and1NumberPrize();
+	
+	@Key("ItemAuctionEnabled")
+	boolean itemAuctionEnabled();
+	
+	@Key("ItemAuctionExpiredAfter")
+	int getItemAuctionExpiredAfter();
+	
+	@Key("ItemAuctionTimeExtendsOnBid")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getItemAuctionTimeExtendsOnBid();
+	
+	// TODO(Zoey76): Implement RiftMinPartySize configuration.
+	@Key("RiftMinPartySize")
+	int getRiftMinPartySize();
+	
+	@Key("MaxRiftJumps")
+	int getMaxRiftJumps();
+	
+	@Key("RiftSpawnDelay")
+	int getRiftSpawnDelay();
+	
+	@Key("AutoJumpsDelayMin")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getAutoJumpsDelayMin();
+	
+	@Key("AutoJumpsDelayMax")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getAutoJumpsDelayMax();
+	
+	@Key("BossRoomTimeMultiply")
+	float getBossRoomTimeMultiply();
+	
+	// TODO(Zoey76): Implement RecruitCost configuration.
+	@Key("RecruitCost")
+	int getRecruitCost();
+	
+	// TODO(Zoey76): Implement SoldierCost configuration.
+	@Key("SoldierCost")
+	int getSoldierCost();
+	
+	// TODO(Zoey76): Implement OfficerCost configuration.
+	@Key("OfficerCost")
+	int getOfficerCost();
+	
+	// TODO(Zoey76): Implement CaptainCost configuration.
+	@Key("CaptainCost")
+	int getCaptainCost();
+	
+	// TODO(Zoey76): Implement CommanderCost configuration.
+	@Key("CommanderCost")
+	int getCommanderCost();
+	
+	// TODO(Zoey76): Implement HeroCost configuration.
+	@Key("HeroCost")
+	int getHeroCost();
+	
+	@Key("TimeOfAttack")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getTimeOfAttack();
+	
+	// TODO(Zoey76): Implement TimeOfCoolDown configuration.
+	@Key("TimeOfCoolDown")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getTimeOfCoolDown();
+	
+	@Key("TimeOfEntry")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getTimeOfEntry();
+	
+	@Key("TimeOfWarmUp")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getTimeOfWarmUp();
+	
+	// TODO(Zoey76): Move this four sepulchers to own configuration file.
+	@Key("NumberOfNecessaryPartyMembers")
+	int getNumberOfNecessaryPartyMembers();
+	
+	@Key("DefaultPunish")
+	IllegalActionPunishmentType getDefaultPunish();
+	
+	@Key("DefaultPunishParam")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getDefaultPunishParam();
+	
+	@Key("OnlyGMItemsFree")
+	boolean onlyGMItemsFree();
+	
+	@Key("JailIsPvp")
+	boolean jailIsPvp();
+	
+	@Key("JailDisableChat")
+	boolean jailDisableChat();
+	
+	@Key("JailDisableTransaction")
+	boolean jailDisableTransaction();
+	
+	@Key("NormalEnchantCostMultipiler")
+	int getNormalEnchantCostMultipiler();
+	
+	@Key("SafeEnchantCostMultipiler")
+	int getSafeEnchantCostMultipiler();
+	
+	@Key("CustomSpawnlistTable")
+	boolean customSpawnlistTable();
+	
+	@Key("SaveGmSpawnOnCustom")
+	boolean saveGmSpawnOnCustom();
+	
+	@Key("CustomNpcData")
+	boolean customNpcData();
+	
+	@Key("CustomTeleportTable")
+	boolean customTeleportTable();
+	
+	@Key("CustomNpcBufferTables")
+	boolean customNpcBufferTables();
+	
+	@Key("CustomSkillsLoad")
+	boolean customSkillsLoad();
+	
+	@Key("CustomItemsLoad")
+	boolean customItemsLoad();
+	
+	@Key("CustomMultisellLoad")
+	boolean customMultisellLoad();
+	
+	@Key("CustomBuyListLoad")
+	boolean customBuyListLoad();
+	
+	@Key("BirthdayGift")
+	int getBirthdayGift();
+	
+	@Key("BirthdayMailSubject")
+	String getBirthdayMailSubject();
+	
+	@Key("BirthdayMailText")
+	String getBirthdayMailText();
+	
+	@Key("EnableBlockCheckerEvent")
+	boolean enableBlockCheckerEvent();
+	
+	@Key("BlockCheckerMinTeamMembers")
+	int getBlockCheckerMinTeamMembers();
+	
+	@Key("HBCEFairPlay")
+	boolean isHBCEFairPlay();
+	
+	@Key("HellboundWithoutQuest")
+	boolean hellboundWithoutQuest();
+	
+	@Key("EnableBotReportButton")
+	boolean enableBotReportButton();
+	
+	@Key("BotReportPointsResetHour")
+	String getBotReportPointsResetHour();
+	
+	@Key("BotReportDelay")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getBotReportDelay();
+	
+	@Key("AllowReportsFromSameClanMembers")
+	boolean allowReportsFromSameClanMembers();
+	
+	@Key("Debug")
+	boolean debug();
+	
+	@Key("InstanceDebug")
+	boolean instanceDebug();
+	
+	@Key("HtmlActionCacheDebug")
+	boolean htmlActionCacheDebug();
+	
+	@Key("PacketHandlerDebug")
+	boolean packetHandlerDebug();
+	
+	@Key("Developer")
+	boolean developer();
+	
+	@Key("NoHandlers")
+	boolean noHandlers();
+	
+	@Key("NoQuests")
+	boolean noQuests();
+	
+	@Key("NoSpawns")
+	boolean noSpawns();
+	
+	@Key("ShowQuestsLoadInLogs")
+	boolean showQuestsLoadInLogs();
+	
+	// TODO(Zoey76): Implement ShowScriptsLoadInLogs configuration.
+	@Key("ShowScriptsLoadInLogs")
+	boolean showScriptsLoadInLogs();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/GeodataConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/GeodataConfiguration.java
new file mode 100644
index 00000000..f2c6eca2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/GeodataConfiguration.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.io.File;
+import java.util.List;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Mutable;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Geodata Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/geodata.properties",
+	"file:./config/geodata.properties",
+	"classpath:config/geodata.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface GeodataConfiguration extends Mutable, Reloadable {
+	
+	/**
+	 * Pathfinding options:
+	 * <ul>
+	 * <li>0 = Disabled</li>
+	 * <li>1 = Enabled using path node files</li>
+	 * <li>2 = Enabled using geodata cells at runtime</li>
+	 * </ul>
+	 * @return
+	 */
+	@Key("PathFinding")
+	int getPathFinding();
+	
+	@Key("PathnodePath")
+	File getPathnodePath();
+	
+	@Key("PathFindBuffers")
+	String getPathFindBuffers();
+	
+	@Key("LowWeight")
+	float getLowWeight();
+	
+	@Key("MediumWeight")
+	float getMediumWeight();
+	
+	@Key("HighWeight")
+	float getHighWeight();
+	
+	@Key("AdvancedDiagonalStrategy")
+	boolean advancedDiagonalStrategy();
+	
+	@Key("DiagonalWeight")
+	float getDiagonalWeight();
+	
+	@Key("MaxPostfilterPasses")
+	int getMaxPostfilterPasses();
+	
+	@Key("DebugPath")
+	boolean debugPath();
+	
+	@Key("ForceGeoData")
+	boolean forceGeoData();
+	
+	@Key("CoordSynchronize")
+	int getCoordSynchronize();
+	
+	@Key("GeoDataPath")
+	File getGeoDataPath();
+	
+	@Key("TryLoadUnspecifiedRegions")
+	boolean tryLoadUnspecifiedRegions();
+	
+	@Separator(";")
+	@Key("IncludedRegions")
+	List<String> getIncludedRegions();
+	
+	@Separator(";")
+	@Key("ExcludedRegions")
+	List<String> getExcludedRegions();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/GraciaSeedsConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/GraciaSeedsConfiguration.java
new file mode 100644
index 00000000..89062416
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/GraciaSeedsConfiguration.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.Minutes2MillisecondsConverter;
+
+/**
+ * Gracia Seeds Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/graciaseeds.properties",
+	"file:./config/graciaseeds.properties",
+	"classpath:config/graciaseeds.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface GraciaSeedsConfiguration extends Reloadable {
+	
+	@Key("TiatKillCountForNextState")
+	int getTiatKillCountForNextState();
+	
+	@Key("Stage2Length")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getStage2Length();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/GrandBossConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/GrandBossConfiguration.java
new file mode 100644
index 00000000..270ce749
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/GrandBossConfiguration.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.Hours2MillisecondsConverter;
+import com.l2jserver.gameserver.config.converter.Minutes2MillisecondsConverter;
+
+/**
+ * Grand Boss Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/grandboss.properties",
+	"file:./config/grandboss.properties",
+	"classpath:config/grandboss.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface GrandBossConfiguration extends Reloadable {
+	
+	@Key("AntharasWaitTime")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getAntharasWaitTime();
+	
+	@Key("IntervalOfAntharasSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfAntharasSpawn();
+	
+	@Key("RandomOfAntharasSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfAntharasSpawn();
+	
+	@Key("ValakasWaitTime")
+	@ConverterClass(Minutes2MillisecondsConverter.class)
+	long getValakasWaitTime();
+	
+	@Key("IntervalOfValakasSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfValakasSpawn();
+	
+	@Key("RandomOfValakasSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfValakasSpawn();
+	
+	@Key("IntervalOfBaiumSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfBaiumSpawn();
+	
+	@Key("RandomOfBaiumSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfBaiumSpawn();
+	
+	@Key("IntervalOfCoreSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfCoreSpawn();
+	
+	@Key("RandomOfCoreSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfCoreSpawn();
+	
+	@Key("IntervalOfOrfenSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfOrfenSpawn();
+	
+	@Key("RandomOfOrfenSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfOrfenSpawn();
+	
+	@Key("IntervalOfQueenAntSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfQueenAntSpawn();
+	
+	@Key("RandomOfQueenAntSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfQueenAntSpawn();
+	
+	@Key("IntervalOfBelethSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getIntervalOfBelethSpawn();
+	
+	@Key("RandomOfBelethSpawn")
+	@ConverterClass(Hours2MillisecondsConverter.class)
+	long getRandomOfBelethSpawn();
+	
+	@Key("BelethMinPlayers")
+	int getBelethMinPlayers();
+	
+	// TODO(Zoey76): Implement AllowZakenWithoutParty configuration.
+	@Key("AllowZakenWithoutParty")
+	boolean getAllowZakenWithoutParty();
+	
+	// TODO(Zoey76): Implement ZakenMinPlayers configuration.
+	@Key("ZakenMinPlayers")
+	List<Integer> getZakenMinPlayers();
+	
+	// TODO(Zoey76): Implement ZakenMaxPlayers configuration.
+	@Key("ZakenMaxPlayers")
+	List<Integer> getZakenMaxPlayers();
+	
+	// TODO(Zoey76): Implement ZakenMinPlayerLevel configuration.
+	@Key("ZakenMinPlayerLevel")
+	List<Integer> getZakenMinPlayerLevel();
+	
+	// TODO(Zoey76): Implement ZakenCanBeRevealedByAOESpells configuration.
+	@Key("ZakenCanBeRevealedByAOESpells")
+	boolean getZakenCanBeRevealedByAoeSPells();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/HexIdConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/HexIdConfiguration.java
new file mode 100644
index 00000000..853f70cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/HexIdConfiguration.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.math.BigInteger;
+
+import org.aeonbits.owner.Accessible;
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Mutable;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.HexIdConverter;
+
+/**
+ * Hex Id Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/" + Configuration.CUSTOM_SUBPATH + HexIdConfiguration.FILENAME,
+	"file:" + Configuration.DEFAULT_PATH + HexIdConfiguration.FILENAME,
+	"classpath:" + Configuration.DEFAULT_PATH + HexIdConfiguration.FILENAME
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface HexIdConfiguration extends Mutable, Reloadable, Accessible {
+	String FILENAME = "hexid.txt";
+	
+	String SERVERID_KEY = "ServerID";
+	String HEXID_KEY = "HexID";
+	
+	@Key(SERVERID_KEY)
+	int getServerID();
+	
+	@Key(HEXID_KEY)
+	@ConverterClass(HexIdConverter.class)
+	BigInteger getHexID();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/HuntingSystemConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/HuntingSystemConfiguration.java
new file mode 100644
index 00000000..5357e5cf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/HuntingSystemConfiguration.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Hunting System Configuration.
+ * @author Maneco2
+ * @version 2.6.3.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/huntingsystem.properties",
+	"file:./config/huntingsystem.properties",
+	"classpath:config/huntingsystem.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface HuntingSystemConfiguration extends Reloadable {
+	@Key("NevitEnable")
+	boolean getNevitEnable();
+	
+	@Key("NevitBlessingMaxPoints")
+	int getNevitBlessingMaxPoints();
+	
+	@Key("NevitBonusMaxTime")
+	int getHuntingBonusMaxTime();
+	
+	@Key("NevitRegularPoints")
+	int getNevitRegularPoints();
+	
+	@Key("NevitRegularPoints2")
+	int getNevitRegularPoints2();
+	
+	@Key("NevitNormalPoints")
+	int getNevitNormalPoints();
+	
+	@Key("NevitLevelAcquirePoints")
+	int getNevitLevelAcquirePoints();
+	
+	@Key("NevitLevelAcquirePoints2")
+	int getNevitLevelAcquirePoints2();
+	
+	@Key("NevitDecreaseVitalityAcquirePoints")
+	int getNevitDecreaseVitalityAcquirePoints();
+	
+	@Key("NevitBonusEffectTime")
+	int getNevitBlessingEffetcTime();
+	
+	@Key("HuntingSystemLimit")
+	boolean getHuntingBonusLimit();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/IPConfigData.java b/src/main/java/com/l2jserver/gameserver/config/IPConfigData.java
new file mode 100644
index 00000000..0390964f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/IPConfigData.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static com.l2jserver.gameserver.GameServer.startTimedSection;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Inet6Address;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * IP Config Data.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class IPConfigData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(IPConfigData.class);
+	
+	private static final String IP_CONFIG_FILE = "./config/ipconfig.xml";
+	
+	private final List<String> _subnets = new ArrayList<>(5);
+	
+	private final List<String> _hosts = new ArrayList<>(5);
+	
+	public IPConfigData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		startTimedSection("Network Configuration");
+		final File f = new File(IP_CONFIG_FILE);
+		if (f.exists()) {
+			LOG.info("Using existing ipconfig.xml.");
+			parseFile(new File(IP_CONFIG_FILE));
+		} else {
+			LOG.info("Using automatic network configuration.");
+			autoIpConfig();
+		}
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (var n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("gameserver".equalsIgnoreCase(n.getNodeName())) {
+				for (var d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("define".equalsIgnoreCase(d.getNodeName())) {
+						final var attrs = d.getAttributes();
+						_subnets.add(attrs.getNamedItem("subnet").getNodeValue());
+						_hosts.add(attrs.getNamedItem("address").getNodeValue());
+						
+						if (_hosts.size() != _subnets.size()) {
+							LOG.warn("Failed to load {} file - subnets does not match server addresses.", IP_CONFIG_FILE);
+						}
+					}
+				}
+				
+				final var att = n.getAttributes().getNamedItem("address");
+				if (att == null) {
+					LOG.warn("Failed to load {} file - default server address is missing.", IP_CONFIG_FILE);
+					_hosts.add("127.0.0.1");
+				} else {
+					_hosts.add(att.getNodeValue());
+				}
+				_subnets.add("0.0.0.0/0");
+			}
+		}
+	}
+	
+	protected void autoIpConfig() {
+		String externalIp;
+		try {
+			final var autoIp = URI.create("http://ip1.dynupdate.no-ip.com:8245/").toURL();
+			try (var in = new BufferedReader(new InputStreamReader(autoIp.openStream()))) {
+				externalIp = in.readLine();
+			}
+		} catch (IOException ex) {
+			LOG.warn("Failed to connect to ip1.dynupdate.no-ip.com:8245 please check your internet connection using 127.0.0.1!");
+			externalIp = "127.0.0.1";
+		}
+		
+		try {
+			final var niList = NetworkInterface.getNetworkInterfaces();
+			while (niList.hasMoreElements()) {
+				final var ni = niList.nextElement();
+				if (!ni.isUp() || ni.isVirtual()) {
+					continue;
+				}
+				
+				if (!ni.isLoopback() && ((ni.getHardwareAddress() == null) || (ni.getHardwareAddress().length != 6))) {
+					continue;
+				}
+				
+				for (InterfaceAddress ia : ni.getInterfaceAddresses()) {
+					if (ia.getAddress() instanceof Inet6Address) {
+						continue;
+					}
+					
+					final String hostAddress = ia.getAddress().getHostAddress();
+					final int subnetPrefixLength = ia.getNetworkPrefixLength();
+					final int subnetMaskInt = subnetPrefixLength == 0 ? 0 : -1 << (32 - subnetPrefixLength);
+					final int hostAddressInt = Arrays.stream(hostAddress.split("\\.")).mapToInt(Integer::parseInt).reduce((r, e) -> (r << 8) + e).orElse(0);
+					final int subnetAddressInt = hostAddressInt & subnetMaskInt;
+					final String subnetAddress = ((subnetAddressInt >> 24) & 0xFF) + "." + ((subnetAddressInt >> 16) & 0xFF) + "." + ((subnetAddressInt >> 8) & 0xFF) + "." + (subnetAddressInt & 0xFF);
+					final String subnet = subnetAddress + '/' + subnetPrefixLength;
+					if (!_subnets.contains(subnet) && !subnet.equals("0.0.0.0/0")) {
+						_subnets.add(subnet);
+						_hosts.add(hostAddress);
+						LOG.info("Adding new subnet: " + subnet + " address: " + hostAddress);
+					}
+				}
+			}
+			
+			// External host and subnet
+			_hosts.add(externalIp);
+			_subnets.add("0.0.0.0/0");
+			LOG.info("Adding new subnet: 0.0.0.0/0 address: {}", externalIp);
+		} catch (SocketException e) {
+			LOG.error("Configuration failed please manually configure ipconfig.xml", e);
+			System.exit(0);
+		}
+	}
+	
+	public List<String> getSubnets() {
+		if (_subnets.isEmpty()) {
+			return List.of("0.0.0.0/0");
+		}
+		return _subnets;
+	}
+	
+	public List<String> getHosts() {
+		if (_hosts.isEmpty()) {
+			return List.of("127.0.0.1");
+		}
+		return _hosts;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/MMOConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/MMOConfiguration.java
new file mode 100644
index 00000000..7e1972ce
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/MMOConfiguration.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * MMO Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/mmo.properties",
+	"file:./config/mmo.properties",
+	"classpath:config/mmo.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface MMOConfiguration extends Reloadable {
+	
+	@Key("SleepTime")
+	int getSleepTime();
+	
+	@Key("MaxSendPerPass")
+	int getMaxSendPerPass();
+	
+	@Key("MaxReadPerPass")
+	int getMaxReadPerPass();
+	
+	@Key("HelperBufferCount")
+	int getHelperBufferCount();
+	
+	@Key("TcpNoDelay")
+	boolean isTcpNoDelay();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/NPCConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/NPCConfiguration.java
new file mode 100644
index 00000000..051d7bd6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/NPCConfiguration.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.MapIntegerIntegerConverter;
+
+/**
+ * NPC Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/npc.properties",
+	"file:./config/npc.properties",
+	"classpath:config/npc.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface NPCConfiguration extends Reloadable {
+	
+	@Key("AnnounceMammonSpawn")
+	boolean announceMammonSpawn();
+	
+	@Key("MobAggroInPeaceZone")
+	boolean mobAggroInPeaceZone();
+	
+	@Key("AttackableNpcs")
+	boolean attackableNpcs();
+	
+	@Key("ViewNpc")
+	boolean viewNpc();
+	
+	@Key("MaxDriftRange")
+	int getMaxDriftRange();
+	
+	@Key("ShowNpcLevel")
+	boolean showNpcLevel();
+	
+	@Key("ShowCrestWithoutQuest")
+	boolean showCrestWithoutQuest();
+	
+	@Key("RandomEnchantEffect")
+	boolean randomEnchantEffect();
+	
+	@Key("MinNPCLevelForDmgPenalty")
+	int getMinNPCLevelForDmgPenalty();
+	
+	@Key("DmgPenaltyForLvLDifferences")
+	List<Double> getDmgPenaltyForLvLDifferences();
+	
+	@Key("CritDmgPenaltyForLvLDifferences")
+	List<Double> getCritDmgPenaltyForLvLDifferences();
+	
+	@Key("SkillDmgPenaltyForLvLDifferences")
+	List<Double> getSkillDmgPenaltyForLvLDifferences();
+	
+	// TODO(Zoey76): Implement MinNPCLevelForMagicPenalty configuration.
+	@Key("MinNPCLevelForMagicPenalty")
+	int getMinNPCLevelForMagicPenalty();
+	
+	@Key("SkillChancePenaltyForLvLDifferences")
+	List<Double> getSkillChancePenaltyForLvLDifferences();
+	
+	// Monsters
+	
+	// TODO(Zoey76): Implement DecayTimeTask configuration.
+	@Key("DecayTimeTask")
+	int getDecayTimeTask();
+	
+	@Key("DefaultCorpseTime")
+	int getDefaultCorpseTime();
+	
+	@Key("SpoiledCorpseExtendTime")
+	int getSpoiledCorpseExtendTime();
+	
+	@Key("CorpseConsumeSkillAllowedTimeBeforeDecay")
+	int getCorpseConsumeSkillAllowedTimeBeforeDecay();
+	
+	// Guards
+	
+	@Key("GuardAttackAggroMob")
+	boolean guardAttackAggroMob();
+	
+	// Pets
+	
+	// TODO(Zoey76): Implement AllowWyvernUpgrader configuration.
+	@Key("AllowWyvernUpgrader")
+	int allowWyvernUpgrader();
+	
+	@Key("PetRentNPCs")
+	Set<Integer> getPetRentNPCs();
+	
+	@Key("MaximumSlotsForPet")
+	int getMaximumSlotsForPet();
+	
+	@Key("PetHpRegenMultiplier")
+	double getPetHpRegenMultiplier();
+	
+	@Key("PetMpRegenMultiplier")
+	double getPetMpRegenMultiplier();
+	
+	// Raid Bosses
+	
+	@Key("RaidHpRegenMultiplier")
+	double getRaidHpRegenMultiplier();
+	
+	@Key("RaidMpRegenMultiplier")
+	double getRaidMpRegenMultiplier();
+	
+	@Key("RaidPDefenceMultiplier")
+	double getRaidPDefenceMultiplier();
+	
+	@Key("RaidMDefenceMultiplier")
+	double getRaidMDefenceMultiplier();
+	
+	@Key("RaidPAttackMultiplier")
+	double getRaidPAttackMultiplier();
+	
+	@Key("RaidMAttackMultiplier")
+	double getRaidMAttackMultiplier();
+	
+	@Key("RaidMinRespawnMultiplier")
+	double getRaidMinRespawnMultiplier();
+	
+	@Key("RaidMaxRespawnMultiplier")
+	double getRaidMaxRespawnMultiplier();
+	
+	@Key("RaidMinionRespawnTime")
+	long getRaidMinionRespawnTime();
+	
+	@Key("CustomMinionsRespawnTime")
+	@ConverterClass(MapIntegerIntegerConverter.class)
+	Map<Integer, Integer> getCustomMinionsRespawnTime();
+	
+	@Key("RaidCurse")
+	boolean raidCurse();
+	
+	@Key("RaidChaosTime")
+	int getRaidChaosTime();
+	
+	@Key("GrandChaosTime")
+	int getGrandChaosTime();
+	
+	@Key("MinionChaosTime")
+	int getMinionChaosTime();
+	
+	// Drops
+	
+	@Key("UseDeepBlueDropRules")
+	boolean useDeepBlueDropRules();
+	
+	@Key("UseDeepBlueDropRulesRaid")
+	boolean useDeepBlueDropRulesRaid();
+	
+	@Key("DropAdenaMinLevelDifference")
+	int getDropAdenaMinLevelDifference();
+	
+	@Key("DropAdenaMaxLevelDifference")
+	int getDropAdenaMaxLevelDifference();
+	
+	@Key("DropAdenaMinLevelGapChance")
+	int getDropAdenaMinLevelGapChance();
+	
+	@Key("DropItemMinLevelDifference")
+	int getDropItemMinLevelDifference();
+	
+	@Key("DropItemMaxLevelDifference")
+	int getDropItemMaxLevelDifference();
+	
+	@Key("DropItemMinLevelGapChance")
+	int getDropItemMinLevelGapChance();
+	
+	@Key("MaxAggroRange")
+	int getMaxAggroRange();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/OlympiadConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/OlympiadConfiguration.java
new file mode 100644
index 00000000..a5c07e76
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/OlympiadConfiguration.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+import java.util.Set;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.ItemHolderConverter;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * Olympiad Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/olympiad.properties",
+	"file:./config/olympiad.properties",
+	"classpath:config/olympiad.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface OlympiadConfiguration extends Reloadable {
+	
+	@Key("StartHour")
+	int getStartHour();
+	
+	@Key("StartMinute")
+	int getStartMinute();
+	
+	@Key("MaxBuffs")
+	int getMaxBuffs();
+	
+	// TODO(Zoey76): Check if this should be in minutes or other time unit.
+	@Key("CompetitionPeriod")
+	int getCompetitionPeriod();
+	
+	@Key("BattlePeriod")
+	int getBattlePeriod();
+	
+	// TODO(Zoey76): Check if this should be in minutes or other time unit.
+	@Key("WeeklyPeriod")
+	int getWeeklyPeriod();
+	
+	// TODO(Zoey76): Check if this should be in minutes or other time unit.
+	@Key("ValidationPeriod")
+	int getValidationPeriod();
+	
+	@Key("StartPoints")
+	int getStartPoints();
+	
+	@Key("WeeklyPoints")
+	int getWeeklyPoints();
+	
+	@Key("ClassedParticipants")
+	int getClassedParticipants();
+	
+	@Key("NonClassedParticipants")
+	int getNonClassedParticipants();
+	
+	@Key("TeamsParticipants")
+	int getTeamsParticipants();
+	
+	@Key("RegistrationDisplayNumber")
+	int getRegistrationDisplayNumber();
+	
+	@Separator(";")
+	@Key("ClassedReward")
+	@ConverterClass(ItemHolderConverter.class)
+	List<ItemHolder> getClassedReward();
+	
+	@Separator(";")
+	@Key("NonClassedReward")
+	@ConverterClass(ItemHolderConverter.class)
+	List<ItemHolder> getNonClassedReward();
+	
+	@Separator(";")
+	@Key("TeamReward")
+	@ConverterClass(ItemHolderConverter.class)
+	List<ItemHolder> getTeamReward();
+	
+	@Key("CompetitionRewardItem")
+	int getCompetitionRewardItem();
+	
+	@Key("MinMatchesForPoints")
+	int getMinMatchesForPoints();
+	
+	@Key("GPPerPoint")
+	int getGPPerPoint();
+	
+	@Key("HeroPoints")
+	int getHeroPoints();
+	
+	@Key("Rank1Points")
+	int getRank1Points();
+	
+	@Key("Rank2Points")
+	int getRank2Points();
+	
+	@Key("Rank3Points")
+	int getRank3Points();
+	
+	@Key("Rank4Points")
+	int getRank4Points();
+	
+	@Key("Rank5Points")
+	int getRank5Points();
+	
+	@Key("MaxPoints")
+	int getMaxPoints();
+	
+	@Key("ShowMonthlyWinners")
+	boolean showMonthlyWinners();
+	
+	@Key("AnnounceGames")
+	boolean announceGames();
+	
+	@Key("RestrictedItems")
+	Set<Integer> getRestrictedItems();
+	
+	@Key("EnchantLimit")
+	int getEnchantLimit();
+	
+	@Key("LogFights")
+	boolean logFights();
+	
+	@Key("WaitTime")
+	int getWaitTime();
+	
+	@Key("DividerClassed")
+	int getDividerClassed();
+	
+	@Key("DividerNonClassed")
+	int getDividerNonClassed();
+	
+	@Key("MaxWeeklyMatches")
+	int getMaxWeeklyMatches();
+	
+	@Key("MaxWeeklyMatchesNonClassed")
+	int getMaxWeeklyMatchesNonClassed();
+	
+	@Key("MaxWeeklyMatchesClassed")
+	int getMaxWeeklyMatchesClassed();
+	
+	@Key("MaxWeeklyMatchesTeam")
+	int getMaxWeeklyMatchesTeam();
+	
+	// TODO(Zoey76): Change this so the check doesn't depend on a null value.
+	@Key("CurrentCycle")
+	Integer getCurrentCycle();
+	
+	@Key("Period")
+	int getPeriod();
+	
+	// TODO(Zoey76): Check if this should be in minutes or other time unit.
+	@Key("OlympiadEnd")
+	long getOlympiadEnd();
+	
+	@Key("ValidationEnd")
+	long getValidationEnd();
+	
+	@Key("NextWeeklyChange")
+	long getNextWeeklyChange();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/PvPConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/PvPConfiguration.java
new file mode 100644
index 00000000..4a2adf42
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/PvPConfiguration.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.Set;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * PvP Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/pvp.properties",
+	"file:./config/pvp.properties",
+	"classpath:config/pvp.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface PvPConfiguration extends Reloadable {
+	
+	@Key("CanGMDropEquipment")
+	boolean canGMDropEquipment();
+	
+	@Key("PetItems")
+	Set<Integer> getPetItems();
+	
+	@Key("NonDroppableItems")
+	Set<Integer> getNonDroppableItems();
+	
+	@Key("MinimumPKRequiredToDrop")
+	int getMinimumPKRequiredToDrop();
+	
+	@Key("AwardPKKillPVPPoint")
+	boolean awardPKKillPVPPoint();
+	
+	@Key("PvPVsNormalTime")
+	int getPvPVsNormalTime();
+	
+	@Key("PvPVsPvPTime")
+	int getPvPVsPvPTime();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/RatesConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/RatesConfiguration.java
new file mode 100644
index 00000000..8991f67c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/RatesConfiguration.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.Map;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.MapIntegerFloatConverter;
+
+/**
+ * Rates Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/rates.properties",
+	"file:./config/rates.properties",
+	"classpath:config/rates.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface RatesConfiguration extends Reloadable {
+	
+	@Key("DeathDropAmountMultiplier")
+	double getDeathDropAmountMultiplier();
+	
+	@Key("CorpseDropAmountMultiplier")
+	double getCorpseDropAmountMultiplier();
+	
+	@Key("HerbDropAmountMultiplier")
+	double getHerbDropAmountMultiplier();
+	
+	@Key("RaidDropAmountMultiplier")
+	double getRaidDropAmountMultiplier();
+	
+	@Key("DeathDropChanceMultiplier")
+	double getDeathDropChanceMultiplier();
+	
+	@Key("CorpseDropChanceMultiplier")
+	double getCorpseDropChanceMultiplier();
+	
+	@Key("HerbDropChanceMultiplier")
+	double getHerbDropChanceMultiplier();
+	
+	@Key("RaidDropChanceMultiplier")
+	double getRaidDropChanceMultiplier();
+	
+	@Key("DropAmountMultiplierByItemId")
+	@ConverterClass(MapIntegerFloatConverter.class)
+	Map<Integer, Float> getDropAmountMultiplierByItemId();
+	
+	@Key("DropChanceMultiplierByItemId")
+	@ConverterClass(MapIntegerFloatConverter.class)
+	Map<Integer, Float> getDropChanceMultiplierByItemId();
+	
+	@Key("RateXp")
+	float getRateXp();
+	
+	@Key("RateSp")
+	float getRateSp();
+	
+	@Key("RatePartyXp")
+	float getRatePartyXp();
+	
+	@Key("RatePartySp")
+	float getRatePartySp();
+	
+	// TODO(Zoey76): Should this be int instead of float?
+	@Key("RateDropManor")
+	int getRateDropManor();
+	
+	@Key("RateKarmaLost")
+	double getRateKarmaLost();
+	
+	@Key("RateKarmaExpLost")
+	double getRateKarmaExpLost();
+	
+	@Key("RateSiegeGuardsPrice")
+	double getRateSiegeGuardsPrice();
+	
+	@Key("RateExtractable")
+	float getRateExtractable();
+	
+	@Key("RateHellboundTrustIncrease")
+	float getRateHellboundTrustIncrease();
+	
+	@Key("RateHellboundTrustDecrease")
+	float getRateHellboundTrustDecrease();
+	
+	@Key("QuestDropChanceMultiplier")
+	float getQuestDropChanceMultiplier();
+	
+	@Key("QuestDropAmountMultiplier")
+	float getQuestDropAmountMultiplier();
+	
+	@Key("RateQuestRewardXP")
+	float getRateQuestRewardXP();
+	
+	@Key("RateQuestRewardSP")
+	float getRateQuestRewardSP();
+	
+	@Key("RateQuestRewardAdena")
+	float getRateQuestRewardAdena();
+	
+	@Key("UseQuestRewardMultipliers")
+	boolean useQuestRewardMultipliers();
+	
+	@Key("RateQuestReward")
+	float getRateQuestReward();
+	
+	@Key("RateQuestRewardPotion")
+	float getRateQuestRewardPotion();
+	
+	@Key("RateQuestRewardScroll")
+	float getRateQuestRewardScroll();
+	
+	@Key("RateQuestRewardRecipe")
+	float getRateQuestRewardRecipe();
+	
+	@Key("RateQuestRewardMaterial")
+	float getRateQuestRewardMaterial();
+	
+	@Key("PlayerDropLimit")
+	int getPlayerDropLimit();
+	
+	@Key("PlayerRateDrop")
+	int getPlayerRateDrop();
+	
+	@Key("PlayerRateDropItem")
+	int getPlayerRateDropItem();
+	
+	@Key("PlayerRateDropEquip")
+	int getPlayerRateDropEquip();
+	
+	@Key("PlayerRateDropEquipWeapon")
+	int getPlayerRateDropEquipWeapon();
+	
+	@Key("KarmaDropLimit")
+	int getKarmaDropLimit();
+	
+	@Key("KarmaRateDrop")
+	int getKarmaRateDrop();
+	
+	@Key("KarmaRateDropItem")
+	int getKarmaRateDropItem();
+	
+	@Key("KarmaRateDropEquip")
+	int getKarmaRateDropEquip();
+	
+	@Key("KarmaRateDropEquipWeapon")
+	int getKarmaRateDropEquipWeapon();
+	
+	@Key("PetXpRate")
+	double getPetXpRate();
+	
+	// TODO(Zoey76): Should PetFoodRate be float?
+	@Key("PetFoodRate")
+	int getPetFoodRate();
+	
+	@Key("SinEaterXpRate")
+	double getSinEaterXpRate();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/ServerConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/ServerConfiguration.java
new file mode 100644
index 00000000..68c5b766
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/ServerConfiguration.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.io.File;
+import java.util.Set;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Mutable;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.FileConverter;
+import com.l2jserver.gameserver.idfactory.IdFactoryType;
+
+/**
+ * Server Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/server.properties",
+	"file:./config/server.properties",
+	"classpath:config/server.properties",
+	"system:properties",
+	"system:env"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface ServerConfiguration extends Mutable, Reloadable {
+	
+	@Key("EnableUPnP")
+	boolean enableUPnP();
+	
+	@Key("LoginHost")
+	String getLoginHost();
+	
+	@Key("LoginPort")
+	int getLoginPort();
+	
+	@Key("Host")
+	String getHost();
+	
+	@Key("Port")
+	int getPort();
+	
+	@Key("RequestServerId")
+	int getRequestServerId();
+	
+	@Key("AcceptAlternateId")
+	boolean acceptAlternateId();
+	
+	@Key("ReserveHostOnLogin")
+	boolean reserveHostOnLogin();
+	
+	@Key("DatapackRoot")
+	@ConverterClass(FileConverter.class)
+	File getDatapackRoot();
+	
+	@Key("ScriptRoot")
+	File getScriptRoot();
+	
+	@Key("MaxOnlineUsers")
+	int getMaxOnlineUsers();
+	
+	@Key("AllowedProtocolRevisions")
+	Set<Integer> getAllowedProtocolRevisions();
+	
+	@Key("IdFactory")
+	IdFactoryType getIdFactory();
+	
+	@Key("BadIdChecking")
+	boolean badIdChecking();
+	
+	@Key("L2J_HOME")
+	String getL2jHome();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/SevenSignsConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/SevenSignsConfiguration.java
new file mode 100644
index 00000000..2d845114
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/SevenSignsConfiguration.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Seven Signs Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/sevensigns.properties",
+	"file:./config/sevensigns.properties",
+	"classpath:config/sevensigns.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface SevenSignsConfiguration extends Reloadable {
+	
+	// TODO(Zoey76): Implement RequireClanCastle configuration.
+	@Key("RequireClanCastle")
+	boolean requireClanCastle();
+	
+	// TODO(Zoey76): Implement CastleForDawn configuration.
+	@Key("CastleForDawn")
+	boolean castleForDawn();
+	
+	// TODO(Zoey76): Implement CastleForDusk configuration.
+	@Key("CastleForDusk")
+	boolean castleForDusk();
+	
+	@Key("FestivalMinPlayer")
+	int getFestivalMinPlayer();
+	
+	@Key("MaxPlayerContrib")
+	int getMaxPlayerContrib();
+	
+	// TODO(Zoey76): Convert to milliseconds.
+	@Key("FestivalManagerStart")
+	int getFestivalManagerStart();
+	
+	@Key("FestivalLength")
+	int getFestivalLength();
+	
+	@Key("FestivalCycleLength")
+	int getFestivalCycleLength();
+	
+	@Key("FestivalFirstSpawn")
+	int getFestivalFirstSpawn();
+	
+	@Key("FestivalFirstSwarm")
+	int getFestivalFirstSwarm();
+	
+	@Key("FestivalSecondSpawn")
+	int getFestivalSecondSpawn();
+	
+	@Key("FestivalSecondSwarm")
+	int getFestivalSecondSwarm();
+	
+	@Key("FestivalChestSpawn")
+	int getFestivalChestSpawn();
+	
+	@Key("DawnGatesPdefMult")
+	double getDawnGatesPdefMult();
+	
+	@Key("DuskGatesPdefMult")
+	double getDuskGatesPdefMult();
+	
+	@Key("DawnGatesMdefMult")
+	double getDawnGatesMdefMult();
+	
+	@Key("DuskGatesMdefMult")
+	double getDuskGatesMdefMult();
+	
+	@Key("StrictSevenSigns")
+	boolean strictSevenSigns();
+	
+	@Key("SevenSignsLazyUpdate")
+	boolean sevenSignsLazyUpdate();
+	
+	@Key("SevenSignsDawnTicketQuantity")
+	int getSevenSignsDawnTicketQuantity();
+	
+	@Key("SevenSignsDawnTicketPrice")
+	int getSevenSignsDawnTicketPrice();
+	
+	@Key("SevenSignsDawnTicketBundle")
+	int getSevenSignsDawnTicketBundle();
+	
+	@Key("SevenSignsManorsAgreementId")
+	int getSevenSignsManorsAgreementId();
+	
+	@Key("SevenSignsJoinDawnFee")
+	int getSevenSignsJoinDawnFee();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/SiegeConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/SiegeConfiguration.java
new file mode 100644
index 00000000..650e8acb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/SiegeConfiguration.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.ControlTowerConverter;
+import com.l2jserver.gameserver.config.converter.FlameTowerConverter;
+import com.l2jserver.gameserver.model.TowerSpawn;
+
+/**
+ * Siege Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/siege.properties",
+	"file:./config/siege.properties",
+	"classpath:config/siege.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface SiegeConfiguration extends Reloadable {
+	
+	@Key("SiegeLength")
+	int getSiegeLength();
+	
+	@Key("MaxFlags")
+	int getMaxFlags();
+	
+	@Key("ClanMinLevel")
+	int getClanMinLevel();
+	
+	@Key("AttackerMaxClans")
+	int getAttackerMaxClans();
+	
+	@Key("DefenderMaxClans")
+	int getDefenderMaxClans();
+	
+	@Key("AttackerRespawn")
+	int getAttackerRespawn();
+	
+	@Key("BloodAllianceReward")
+	int getBloodAllianceReward();
+	
+	@Key("GludioFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getGludioFlameTower1();
+	
+	@Key("GludioFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getGludioFlameTower2();
+	
+	@Key("GludioControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGludioControlTower1();
+	
+	@Key("GludioControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGludioControlTower2();
+	
+	@Key("GludioControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGludioControlTower3();
+	
+	@Key("GludioMaxMercenaries")
+	int getGludioMaxMercenaries();
+	
+	@Key("GiranFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getGiranFlameTower1();
+	
+	@Key("GiranFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getGiranFlameTower2();
+	
+	@Key("GiranControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGiranControlTower1();
+	
+	@Key("GiranControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGiranControlTower2();
+	
+	@Key("GiranControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGiranControlTower3();
+	
+	@Key("GiranMaxMercenaries")
+	int getGiranMaxMercenaries();
+	
+	@Key("DionFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getDionFlameTower1();
+	
+	@Key("DionFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getDionFlameTower2();
+	
+	@Key("DionControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getDionControlTower1();
+	
+	@Key("DionControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getDionControlTower2();
+	
+	@Key("DionControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getDionControlTower3();
+	
+	@Key("DionMaxMercenaries")
+	int getDionMaxMercenaries();
+	
+	@Key("OrenFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getOrenFlameTower1();
+	
+	@Key("OrenFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getOrenFlameTower2();
+	
+	@Key("OrenControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getOrenControlTower1();
+	
+	@Key("OrenControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getOrenControlTower2();
+	
+	@Key("OrenControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getOrenControlTower3();
+	
+	@Key("OrenMaxMercenaries")
+	int getOrenMaxMercenaries();
+	
+	@Key("AdenFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getAdenFlameTower1();
+	
+	@Key("AdenFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn AdenFlameTower2();
+	
+	@Key("AdenControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getAdenControlTower1();
+	
+	@Key("AdenControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getAdenControlTower2();
+	
+	@Key("AdenControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getAdenControlTower3();
+	
+	@Key("AdenMaxMercenaries")
+	int getAdenMaxMercenaries();
+	
+	@Key("InnadrilFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getInnadrilFlameTower1();
+	
+	@Key("InnadrilFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getInnadrilFlameTower2();
+	
+	@Key("InnadrilControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getInnadrilControlTower1();
+	
+	@Key("InnadrilControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getInnadrilControlTower2();
+	
+	@Key("InnadrilControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getInnadrilControlTower3();
+	
+	@Key("InnadrilMaxMercenaries")
+	int getInnadrilMaxMercenaries();
+	
+	@Key("GoddardFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getGoddardFlameTower1();
+	
+	@Key("GoddardFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getGoddardFlameTower2();
+	
+	@Key("GoddardControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGoddardControlTower1();
+	
+	@Key("GoddardControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGoddardControlTower2();
+	
+	@Key("GoddardControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getGoddardControlTower3();
+	
+	@Key("GoddardMaxMercenaries")
+	int getGoddardMaxMercenaries();
+	
+	@Key("RuneFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getRuneFlameTower1();
+	
+	@Key("RuneFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getRuneFlameTower2();
+	
+	@Key("RuneControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getRuneControlTower1();
+	
+	@Key("RuneControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getRuneControlTower2();
+	
+	@Key("RuneControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getRuneControlTower3();
+	
+	@Key("RuneMaxMercenaries")
+	int getRuneMaxMercenaries();
+	
+	@Key("SchuttgartFlameTower1")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getSchuttgartFlameTower1();
+	
+	@Key("SchuttgartFlameTower2")
+	@ConverterClass(FlameTowerConverter.class)
+	TowerSpawn getSchuttgartFlameTower2();
+	
+	@Key("SchuttgartControlTower1")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getSchuttgartControlTower1();
+	
+	@Key("SchuttgartControlTower2")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getSchuttgartControlTower2();
+	
+	@Key("SchuttgartControlTower3")
+	@ConverterClass(ControlTowerConverter.class)
+	TowerSpawn getSchuttgartControlTower3();
+	
+	@Key("SchuttgartMaxMercenaries")
+	int getSchuttgartMaxMercenaries();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/TeleporterServiceConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/TeleporterServiceConfiguration.java
new file mode 100644
index 00000000..037e5d74
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/TeleporterServiceConfiguration.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * Teleporter Service Configuration.
+ * @author HorridoJoho
+ * @version 2.6.2.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/teleporterservice.properties",
+	"file:./config/teleporterservice.properties",
+	"classpath:config/teleporterservice.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface TeleporterServiceConfiguration extends Reloadable {
+	
+	@Key("Enable")
+	boolean enable();
+	
+	@Key("Debug")
+	boolean getDebug();
+	
+	@Key("ForbidInZones")
+	ZoneId[] getForbidInZones();
+	
+	@Key("ForbidInEvents")
+	boolean getForbidInEvents();
+	
+	@Key("ForbidInDuel")
+	boolean getForbidInDuel();
+	
+	@Key("ForbidInFight")
+	boolean getForbidInFight();
+	
+	@Key("ForbidInPvp")
+	boolean getForbidInPvp();
+	
+	@Key("ForbidForChaoticPlayers")
+	boolean getForbidForChaoticPlayers();
+	
+	@Key("VoicedEnable")
+	boolean getVoicedEnable();
+	
+	@Key("VoicedCommand")
+	String getVoicedCommand();
+	
+	@Key("VoicedName")
+	String getVoicedName();
+	
+	@Key("VoicedRequiredItem")
+	int getVoicedRequiredItem();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/TelnetConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/TelnetConfiguration.java
new file mode 100644
index 00000000..14ef0861
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/TelnetConfiguration.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Telnet Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/telnet.properties",
+	"file:./config/telnet.properties",
+	"classpath:config/telnet.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface TelnetConfiguration extends Reloadable {
+	
+	@Key("EnableTelnet")
+	boolean isEnabled();
+	
+	@Key("Port")
+	int getPort();
+	
+	@Key("Password")
+	String getPassword();
+	
+	@Key("Hosts")
+	List<String> getHosts();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/TerritoryWarConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/TerritoryWarConfiguration.java
new file mode 100644
index 00000000..d87c80aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/TerritoryWarConfiguration.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Territory War Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/territorywar.properties",
+	"file:./config/territorywar.properties",
+	"classpath:config/territorywar.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface TerritoryWarConfiguration extends Reloadable {
+	
+	// TODO(Zoey76): Convert this to milliseconds.
+	@Key("WarLength")
+	long getWarLength();
+	
+	// TODO(Zoey76): Implement ClanMinLevel configuration.
+	@Key("ClanMinLevel")
+	int getClanMinLevel();
+	
+	@Key("PlayerMinLevel")
+	int getPlayerMinLevel();
+	
+	// TODO(Zoey76): Implement DefenderMaxClans configuration.
+	@Key("DefenderMaxClans")
+	int getDefenderMaxClans();
+	
+	// TODO(Zoey76): Implement DefenderMaxPlayers configuration.
+	@Key("DefenderMaxPlayers")
+	int getDefenderMaxPlayers();
+	
+	@Key("PlayerWithWardCanBeKilledInPeaceZone")
+	boolean playerWithWardCanBeKilledInPeaceZone();
+	
+	@Key("SpawnWardsWhenTWIsNotInProgress")
+	boolean spawnWardsWhenTWIsNotInProgress();
+	
+	@Key("ReturnWardsWhenTWStarts")
+	boolean returnWardsWhenTWStarts();
+	
+	@Key("MinTerritoryBadgeForNobless")
+	int getMinTerritoryBadgeForNobless();
+	
+	@Key("MinTerritoryBadgeForStriders")
+	int getMinTerritoryBadgeForStriders();
+	
+	@Key("MinTerritoryBadgeForBigStrider")
+	int getMinTerritoryBadgeForBigStrider();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/TvTConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/TvTConfiguration.java
new file mode 100644
index 00000000..a9758ee6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/TvTConfiguration.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import java.util.List;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+import com.l2jserver.gameserver.config.converter.ItemHolderConverter;
+import com.l2jserver.gameserver.config.converter.LocationConverter;
+import com.l2jserver.gameserver.config.converter.Seconds2MillisecondsConverter;
+import com.l2jserver.gameserver.config.converter.SkillHolderConverter;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+/**
+ * TvT Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/tvt.properties",
+	"file:./config/tvt.properties",
+	"classpath:config/tvt.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface TvTConfiguration extends Reloadable {
+	
+	@Key("Enabled")
+	boolean enabled();
+	
+	@Key("Instanced")
+	boolean instanced();
+	
+	@Key("InstanceFile")
+	String getInstanceFile();
+	
+	@Key("Interval")
+	List<String> getInterval();
+	
+	// TODO(Zoey76): Convert to milliseconds.
+	@Key("ParticipationTime")
+	int getParticipationTime();
+	
+	// TODO(Zoey76): Convert to milliseconds.
+	@Key("RunningTime")
+	int getRunningTime();
+	
+	@Key("ParticipationNpcId")
+	int getParticipationNpcId();
+	
+	@Key("ParticipationFee")
+	@ConverterClass(ItemHolderConverter.class)
+	ItemHolder getParticipationFee();
+	
+	@Key("ParticipationNpcLoc")
+	@ConverterClass(LocationConverter.class)
+	Location getParticipationNpcLoc();
+	
+	@Key("MinPlayersInTeams")
+	int getMinPlayersInTeams();
+	
+	@Key("MaxPlayersInTeams")
+	int getMaxPlayersInTeams();
+	
+	@Key("MinPlayerLevel")
+	int getMinPlayerLevel();
+	
+	@Key("MaxPlayerLevel")
+	int getMaxPlayerLevel();
+	
+	@Key("RespawnTeleportDelay")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getRespawnTeleportDelay();
+	
+	@Key("StartLeaveTeleportDelay")
+	@ConverterClass(Seconds2MillisecondsConverter.class)
+	long getStartLeaveTeleportDelay();
+	
+	@Key("Team1Name")
+	String getTeam1Name();
+	
+	@Key("Team1Loc")
+	@ConverterClass(LocationConverter.class)
+	Location getTeam1Loc();
+	
+	@Key("Team2Name")
+	String getTeam2Name();
+	
+	@Key("Team2Loc")
+	@ConverterClass(LocationConverter.class)
+	Location getTeam2Loc();
+	
+	@Separator(";")
+	@Key("Reward")
+	@ConverterClass(ItemHolderConverter.class)
+	List<ItemHolder> getReward();
+	
+	@Key("AllowTargetTeamMember")
+	boolean allowTargetTeamMember();
+	
+	@Key("AllowScroll")
+	boolean allowScroll();
+	
+	@Key("AllowPotion")
+	boolean allowPotion();
+	
+	// TODO(Zoey76): Implement AllowSummonByItem configuration.
+	@Key("AllowSummonByItem")
+	boolean allowSummonByItem();
+	
+	@Key("DoorsToOpen")
+	List<Integer> getDoorsToOpen();
+	
+	@Key("DoorsToClose")
+	List<Integer> getDoorsToClose();
+	
+	@Key("RewardTeamTie")
+	boolean rewardTeamTie();
+	
+	@Key("EffectsRemoval")
+	int getEffectsRemoval();
+	
+	@Separator(";")
+	@Key("FighterBuffs")
+	@ConverterClass(SkillHolderConverter.class)
+	List<SkillHolder> getFighterBuffs();
+	
+	@Separator(";")
+	@Key("MageBuffs")
+	@ConverterClass(SkillHolderConverter.class)
+	List<SkillHolder> getMageBuffs();
+	
+	@Key("MaxParticipantsPerIP")
+	int getMaxParticipantsPerIP();
+	
+	@Key("AllowVoicedInfoCommand")
+	boolean allowVoicedInfoCommand();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/VitalityConfiguration.java b/src/main/java/com/l2jserver/gameserver/config/VitalityConfiguration.java
new file mode 100644
index 00000000..e44bcecd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/VitalityConfiguration.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.aeonbits.owner.Config.HotReloadType.ASYNC;
+import static org.aeonbits.owner.Config.LoadType.MERGE;
+
+import org.aeonbits.owner.Config.HotReload;
+import org.aeonbits.owner.Config.LoadPolicy;
+import org.aeonbits.owner.Config.Sources;
+import org.aeonbits.owner.Reloadable;
+
+/**
+ * Vitality Configuration.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+@Sources({
+	"file:${L2J_HOME}/custom/game/config/vitality.properties",
+	"file:./config/vitality.properties",
+	"classpath:config/vitality.properties"
+})
+@LoadPolicy(MERGE)
+@HotReload(value = 20, unit = MINUTES, type = ASYNC)
+public interface VitalityConfiguration extends Reloadable {
+	
+	@Key("Enabled")
+	boolean enabled();
+	
+	@Key("RecoverVitalityOnReconnect")
+	boolean recoverVitalityOnReconnect();
+	
+	@Key("StartingVitalityPoints")
+	int getStartingVitalityPoints();
+	
+	@Key("RateVitalityLevel1")
+	float getRateVitalityLevel1();
+	
+	@Key("RateVitalityLevel2")
+	float getRateVitalityLevel2();
+	
+	@Key("RateVitalityLevel3")
+	float getRateVitalityLevel3();
+	
+	@Key("RateVitalityLevel4")
+	float getRateVitalityLevel4();
+	
+	@Key("RateVitalityGain")
+	float getRateVitalityGain();
+	
+	@Key("RateVitalityLost")
+	float getRateVitalityLost();
+	
+	@Key("RateRecoveryPeaceZone")
+	float getRateRecoveryPeaceZone();
+	
+	@Key("RateRecoveryOnReconnect")
+	float getRateRecoveryOnReconnect();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ClassMasterSetting.java b/src/main/java/com/l2jserver/gameserver/config/converter/ClassMasterSetting.java
new file mode 100644
index 00000000..1ee1f6a5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ClassMasterSetting.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * Class Master Setting.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ClassMasterSetting {
+	
+	private final Map<Integer, List<ItemHolder>> claimItems = new HashMap<>(3);
+	
+	private final Map<Integer, List<ItemHolder>> rewardItems = new HashMap<>(3);
+	
+	private final Map<Integer, Boolean> allowedClassChange = new HashMap<>(3);
+	
+	public void addClaimItems(Integer job, List<ItemHolder> items) {
+		claimItems.put(job, items);
+	}
+	
+	public void addRewardItems(Integer job, List<ItemHolder> items) {
+		rewardItems.put(job, items);
+	}
+	
+	public void addAllowedClassChange(Integer job) {
+		allowedClassChange.put(job, true);
+	}
+	
+	public boolean isAllowed(int job) {
+		return allowedClassChange.getOrDefault(job, false);
+	}
+	
+	public List<ItemHolder> getRewardItems(int job) {
+		return rewardItems.getOrDefault(job, Collections.emptyList());
+	}
+	
+	public List<ItemHolder> getRequireItems(int job) {
+		return claimItems.getOrDefault(job, Collections.emptyList());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ClassMasterSettingConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/ClassMasterSettingConverter.java
new file mode 100644
index 00000000..fac6c29f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ClassMasterSettingConverter.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.aeonbits.owner.Converter;
+
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * Class Master Setting converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ClassMasterSettingConverter implements Converter<ClassMasterSetting> {
+	
+	@Override
+	public ClassMasterSetting convert(Method method, String input) {
+		final var classMasterSetting = new ClassMasterSetting();
+		input = input.trim();
+		if (input.isEmpty()) {
+			return classMasterSetting;
+		}
+		
+		final StringTokenizer st = new StringTokenizer(input, ";");
+		while (st.hasMoreTokens()) {
+			// get allowed class change
+			final int job = Integer.parseInt(st.nextToken());
+			classMasterSetting.addAllowedClassChange(job);
+			
+			final List<ItemHolder> requiredItems = new ArrayList<>();
+			// parse items needed for class change
+			if (st.hasMoreTokens()) {
+				final StringTokenizer st2 = new StringTokenizer(st.nextToken(), "[],");
+				while (st2.hasMoreTokens()) {
+					final StringTokenizer st3 = new StringTokenizer(st2.nextToken(), "()");
+					final int itemId = Integer.parseInt(st3.nextToken());
+					final int quantity = Integer.parseInt(st3.nextToken());
+					requiredItems.add(new ItemHolder(itemId, quantity));
+				}
+			}
+			classMasterSetting.addClaimItems(job, requiredItems);
+			
+			final List<ItemHolder> rewardItems = new ArrayList<>();
+			// parse gifts after class change
+			if (st.hasMoreTokens()) {
+				final StringTokenizer st2 = new StringTokenizer(st.nextToken(), "[],");
+				while (st2.hasMoreTokens()) {
+					final StringTokenizer st3 = new StringTokenizer(st2.nextToken(), "()");
+					final int itemId = Integer.parseInt(st3.nextToken());
+					final int quantity = Integer.parseInt(st3.nextToken());
+					rewardItems.add(new ItemHolder(itemId, quantity));
+				}
+			}
+			classMasterSetting.addRewardItems(job, rewardItems);
+		}
+		return classMasterSetting;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ColorConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/ColorConverter.java
new file mode 100644
index 00000000..1c8ee9cd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ColorConverter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Color Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ColorConverter implements Converter<Integer> {
+	
+	private static final Integer DEFAULT_COLOR = Integer.decode("0x808080");
+	
+	@Override
+	public Integer convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return DEFAULT_COLOR;
+		}
+		return Integer.decode("0x" + input);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ControlTowerConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/ControlTowerConverter.java
new file mode 100644
index 00000000..433cfbb5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ControlTowerConverter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.util.StringTokenizer;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TowerSpawn;
+
+/**
+ * Control Tower Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ControlTowerConverter implements Converter<TowerSpawn> {
+	
+	@Override
+	public TowerSpawn convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		
+		final StringTokenizer st = new StringTokenizer(input, ",");
+		final int x = Integer.parseInt(st.nextToken());
+		final int y = Integer.parseInt(st.nextToken());
+		final int z = Integer.parseInt(st.nextToken());
+		final int npcId = Integer.parseInt(st.nextToken());
+		
+		return new TowerSpawn(npcId, new Location(x, y, z));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/Days2MillisecondsConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/Days2MillisecondsConverter.java
new file mode 100644
index 00000000..18f8732d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/Days2MillisecondsConverter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static java.util.concurrent.TimeUnit.DAYS;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Days to Milliseconds converter.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class Days2MillisecondsConverter implements Converter<Long> {
+	
+	@Override
+	public Long convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return 0L;
+		}
+		return DAYS.toMillis(Long.parseLong(input));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/FileConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/FileConverter.java
new file mode 100644
index 00000000..f4279712
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/FileConverter.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * File Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class FileConverter implements Converter<File> {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FileConverter.class);
+	
+	@Override
+	public File convert(Method method, String input) {
+		try {
+			return new File(input.replace('\\', '/')).getCanonicalFile();
+		} catch (Exception ex) {
+			LOG.warn("Error setting script root!", ex);
+			return new File(".");
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/FlameTowerConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/FlameTowerConverter.java
new file mode 100644
index 00000000..24f34ef9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/FlameTowerConverter.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TowerSpawn;
+
+/**
+ * Flame Tower Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class FlameTowerConverter implements Converter<TowerSpawn> {
+	
+	@Override
+	public TowerSpawn convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		
+		final StringTokenizer st = new StringTokenizer(input, ",");
+		final int x = Integer.parseInt(st.nextToken());
+		final int y = Integer.parseInt(st.nextToken());
+		final int z = Integer.parseInt(st.nextToken());
+		final int npcId = Integer.parseInt(st.nextToken());
+		final List<Integer> zones = new LinkedList<>();
+		while (st.hasMoreTokens()) {
+			zones.add(Integer.parseInt(st.nextToken()));
+		}
+		
+		return new TowerSpawn(npcId, new Location(x, y, z), zones);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/HexIdConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/HexIdConverter.java
new file mode 100644
index 00000000..cd7956d1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/HexIdConverter.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Hex Id Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class HexIdConverter implements Converter<BigInteger> {
+	
+	@Override
+	public BigInteger convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		return new BigInteger(input, 16);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/Hours2MillisecondsConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/Hours2MillisecondsConverter.java
new file mode 100644
index 00000000..bb2e8933
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/Hours2MillisecondsConverter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static java.util.concurrent.TimeUnit.HOURS;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Hours to Milliseconds converter.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class Hours2MillisecondsConverter implements Converter<Long> {
+	
+	@Override
+	public Long convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return 0L;
+		}
+		return HOURS.toMillis(Long.parseLong(input));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/IPLimitConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/IPLimitConverter.java
new file mode 100644
index 00000000..66d85e35
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/IPLimitConverter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * IP-Limit Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class IPLimitConverter implements Converter<Map<Integer, Integer>> {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(IPLimitConverter.class);
+	
+	@Override
+	public Map<Integer, Integer> convert(Method method, String input) {
+		final var map = new HashMap<Integer, Integer>();
+		if (Strings.isBlank(input)) {
+			return map;
+		}
+		
+		final var tokens = input.replace(" ", "").split(";");
+		for (var token : tokens) {
+			final var splitToken = token.split(",");
+			try {
+				map.put(InetAddress.getByName(splitToken[0]).hashCode(), Integer.valueOf(splitToken[1]));
+			} catch (Exception ex) {
+				LOG.warn("Invalid DualboxCheckWhitelist IP {} or limit {}!", splitToken[0], splitToken[1], ex);
+			}
+		}
+		return map;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ItemChanceHolderConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/ItemChanceHolderConverter.java
new file mode 100644
index 00000000..d32f18a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ItemChanceHolderConverter.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
+
+/**
+ * Item Chance Holder Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ItemChanceHolderConverter implements Converter<ItemChanceHolder> {
+	
+	@Override
+	public ItemChanceHolder convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		
+		final var tokens = input.replace(" ", "").split(",");
+		return new ItemChanceHolder(Integer.parseInt(tokens[0]), Float.parseFloat(tokens[1]));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ItemHolderConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/ItemHolderConverter.java
new file mode 100644
index 00000000..43f59c78
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ItemHolderConverter.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * Item Holder Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ItemHolderConverter implements Converter<ItemHolder> {
+	
+	@Override
+	public ItemHolder convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		
+		final var tokens = input.replace(" ", "").split(",");
+		return new ItemHolder(Integer.parseInt(tokens[0]), Long.parseLong(tokens[1]));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/LocationConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/LocationConverter.java
new file mode 100644
index 00000000..6b58a370
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/LocationConverter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * Location Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class LocationConverter implements Converter<Location> {
+	
+	@Override
+	public Location convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		
+		final var tokens = input.replace(" ", "").split(",");
+		final var location = new Location(Integer.parseInt(tokens[0]), Integer.parseInt(tokens[1]), Integer.parseInt(tokens[2]));
+		if (tokens.length >= 4) {
+			location.setHeading(Integer.parseInt(tokens[3]));
+		}
+		if (tokens.length == 5) {
+			location.setInstanceId(Integer.parseInt(tokens[4]));
+		}
+		return location;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/MapIntegerFloatConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/MapIntegerFloatConverter.java
new file mode 100644
index 00000000..bda1de9e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/MapIntegerFloatConverter.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Map Integer-Float Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class MapIntegerFloatConverter implements Converter<Map<Integer, Float>> {
+	
+	@Override
+	public Map<Integer, Float> convert(Method method, String input) {
+		final var map = new HashMap<Integer, Float>();
+		if (Strings.isBlank(input)) {
+			return map;
+		}
+		
+		final var tokens = input.replace(" ", "").split(";");
+		for (var token : tokens) {
+			final var splitToken = token.split(",");
+			map.put(Integer.valueOf(splitToken[0]), Float.valueOf(splitToken[1]));
+		}
+		return map;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/MapIntegerIntegerConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/MapIntegerIntegerConverter.java
new file mode 100644
index 00000000..1e3cafa3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/MapIntegerIntegerConverter.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Map Integer-Integer Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class MapIntegerIntegerConverter implements Converter<Map<Integer, Integer>> {
+	
+	@Override
+	public Map<Integer, Integer> convert(Method method, String input) {
+		final var map = new HashMap<Integer, Integer>();
+		if (Strings.isBlank(input)) {
+			return map;
+		}
+		
+		final var tokens = input.replace(" ", "").split(";");
+		for (var token : tokens) {
+			final var splitToken = token.split(",");
+			map.put(Integer.valueOf(splitToken[0]), Integer.valueOf(splitToken[1]));
+		}
+		return map;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/Minutes2MillisecondsConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/Minutes2MillisecondsConverter.java
new file mode 100644
index 00000000..0aa69430
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/Minutes2MillisecondsConverter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Minutes to Milliseconds Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class Minutes2MillisecondsConverter implements Converter<Long> {
+	
+	@Override
+	public Long convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return 0L;
+		}
+		return MINUTES.toMillis(Long.parseLong(input));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/PatternConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/PatternConverter.java
new file mode 100644
index 00000000..ba3bf5b4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/PatternConverter.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+import java.util.regex.Pattern;
+
+import org.aeonbits.owner.Converter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Pattern Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class PatternConverter implements Converter<Pattern> {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PatternConverter.class);
+	
+	private static final Pattern DEFAULT_PATTERN = Pattern.compile("[a-zA-Z0-9]*");
+	
+	@Override
+	public Pattern convert(Method method, String input) {
+		try {
+			return Pattern.compile(input);
+		} catch (Exception ex) {
+			LOG.error("Error creating pattern {}!", input, ex);
+			return DEFAULT_PATTERN;
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/Seconds2MillisecondsConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/Seconds2MillisecondsConverter.java
new file mode 100644
index 00000000..f481b349
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/Seconds2MillisecondsConverter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Seconds to Milliseconds Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class Seconds2MillisecondsConverter implements Converter<Long> {
+	
+	@Override
+	public Long convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return 0L;
+		}
+		return SECONDS.toMillis(Long.parseLong(input));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/ServerListTypeConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/ServerListTypeConverter.java
new file mode 100644
index 00000000..5779a58f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/ServerListTypeConverter.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+/**
+ * Server List Type Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class ServerListTypeConverter implements Converter<Integer> {
+	
+	@Override
+	public Integer convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return 1;
+		}
+		return getServerTypeId(input.split(","));
+	}
+	
+	public static int getServerTypeId(String[] serverTypes) {
+		int typeId = 0;
+		for (String serverType : serverTypes) {
+			switch (serverType.trim().toLowerCase()) {
+				case "normal" -> typeId |= 0x01;
+				case "relax" -> typeId |= 0x02;
+				case "test" -> typeId |= 0x04;
+				case "nolabel" -> typeId |= 0x08;
+				case "restricted" -> typeId |= 0x10;
+				case "event" -> typeId |= 0x20;
+				case "free" -> typeId |= 0x40;
+			}
+		}
+		return typeId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/config/converter/SkillHolderConverter.java b/src/main/java/com/l2jserver/gameserver/config/converter/SkillHolderConverter.java
new file mode 100644
index 00000000..8257eada
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/config/converter/SkillHolderConverter.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import java.lang.reflect.Method;
+
+import org.aeonbits.owner.Converter;
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+/**
+ * Skill Holder Converter.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public class SkillHolderConverter implements Converter<SkillHolder> {
+	
+	@Override
+	public SkillHolder convert(Method method, String input) {
+		if (Strings.isBlank(input)) {
+			return null;
+		}
+		
+		final var tokens = input.replace(" ", "").split(",");
+		return new SkillHolder(Integer.parseInt(tokens[0]), Integer.parseInt(tokens[1]));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/custom/AutoLootExtension.java b/src/main/java/com/l2jserver/gameserver/custom/AutoLootExtension.java
new file mode 100644
index 00000000..e2ea815a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/custom/AutoLootExtension.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.custom;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Auto Loot Extension.
+ * @author Maneco2
+ * @version 2.6.2.0
+ */
+public class AutoLootExtension {
+	public static void onLogin(L2PcInstance player) {
+		if (customs().autoLootVoiceRestore()) {
+			if (player.getVariables().hasVariable("AutoLoot")) {
+				player.setAutoLoot(true);
+			}
+		} else if (!customs().autoLootVoiceRestore()) {
+			if (player.getVariables().hasVariable("AutoLoot")) {
+				player.getVariables().remove("AutoLoot");
+			}
+		}
+		
+		if (customs().autoLootItemsVoiceRestore()) {
+			if (player.getVariables().hasVariable("AutoLootItems")) {
+				player.setAutoLootItem(true);
+			}
+		} else if (!customs().autoLootItemsVoiceRestore()) {
+			if (player.getVariables().hasVariable("AutoLootItems")) {
+				player.getVariables().remove("AutoLootItems");
+			}
+		}
+		
+		if (customs().autoLootHerbsVoiceRestore()) {
+			if (player.getVariables().hasVariable("AutoLootHerbs")) {
+				player.setAutoLootHerbs(true);
+			}
+		} else if (!customs().autoLootHerbsVoiceRestore()) {
+			if (player.getVariables().hasVariable("AutoLootHerbs")) {
+				player.getVariables().remove("AutoLootHerbs");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/dao/ClanDAO.java b/src/main/java/com/l2jserver/gameserver/dao/ClanDAO.java
new file mode 100644
index 00000000..8c4ffc92
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/ClanDAO.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import java.util.Map;
+
+/**
+ * Clan DAO interface.
+ * @author Zoey76
+ */
+public interface ClanDAO {
+	
+	/**
+	 * Gets the clan privileges.
+	 * @param clanId the clan Id
+	 * @return the ranks and privileges
+	 */
+	Map<Integer, Integer> getPrivileges(int clanId);
+	
+	/**
+	 * Stores the clan privileges.
+	 * @param clanId the clan Id
+	 * @param rank the rank
+	 * @param privileges the privileges
+	 */
+	void storePrivileges(int clanId, int rank, int privileges);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/FriendDAO.java b/src/main/java/com/l2jserver/gameserver/dao/FriendDAO.java
new file mode 100644
index 00000000..e6e19931
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/FriendDAO.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Friend DAO interface.
+ * @author Zoey76
+ */
+public interface FriendDAO {
+	void load(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/HennaDAO.java b/src/main/java/com/l2jserver/gameserver/dao/HennaDAO.java
new file mode 100644
index 00000000..4c223e53
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/HennaDAO.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * Henna DAO interface.
+ * @author Zoey76
+ */
+public interface HennaDAO {
+	/**
+	 * Restores all hennas for the player.
+	 * @param player the player
+	 */
+	void load(L2PcInstance player);
+	
+	void insert(L2PcInstance player, L2Henna henna, int index);
+	
+	void delete(L2PcInstance player, int slot);
+	
+	void deleteAll(L2PcInstance player, int classIndex);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/ItemDAO.java b/src/main/java/com/l2jserver/gameserver/dao/ItemDAO.java
new file mode 100644
index 00000000..6807cc46
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/ItemDAO.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Item DAO interface.
+ * @author Zoey76
+ */
+public interface ItemDAO {
+	/**
+	 * Loads pet's inventory from database.
+	 * @param player the player
+	 */
+	void loadPetInventory(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/ItemReuseDAO.java b/src/main/java/com/l2jserver/gameserver/dao/ItemReuseDAO.java
new file mode 100644
index 00000000..b6d1fb1b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/ItemReuseDAO.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Item Reuse DAO interface.
+ * @author Zoey76
+ */
+public interface ItemReuseDAO {
+	/**
+	 * Restores the item reuse for the given player.
+	 * @param player the player
+	 */
+	void load(L2PcInstance player);
+	
+	/**
+	 * Inserts the item reuse for the given player.
+	 * @param player the player
+	 */
+	void insert(L2PcInstance player);
+	
+	/**
+	 * Deletes the item reuse from the player.
+	 * @param player the player
+	 */
+	void delete(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/PetDAO.java b/src/main/java/com/l2jserver/gameserver/dao/PetDAO.java
new file mode 100644
index 00000000..ea037f40
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/PetDAO.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Pet DAO interface.
+ * @author Zoey76
+ */
+public interface PetDAO {
+	void updateFood(L2PcInstance player, int petId);
+	
+	/**
+	 * Deletes a pet by item object ID.
+	 * @param pet the pet
+	 */
+	void delete(L2PetInstance pet);
+	
+	/**
+	 * Restores a pet from the database.
+	 * @param control the summoning item
+	 * @param template the NPC template
+	 * @param owner the owner
+	 * @return the pet
+	 */
+	L2PetInstance load(L2ItemInstance control, L2NpcTemplate template, L2PcInstance owner);
+	
+	/**
+	 * Stores a pet into the database.
+	 * @param pet the pet
+	 */
+	void insert(L2PetInstance pet);
+	
+	/**
+	 * Updates a pet in the database.
+	 * @param pet the pet
+	 */
+	void update(L2PetInstance pet);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/PetSkillSaveDAO.java b/src/main/java/com/l2jserver/gameserver/dao/PetSkillSaveDAO.java
new file mode 100644
index 00000000..1347c6e1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/PetSkillSaveDAO.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+
+/**
+ * Pet Skill Save interface.
+ * @author Zoey76
+ */
+public interface PetSkillSaveDAO {
+	/**
+	 * Stores the pet skills in the database.
+	 * @param pet the pets
+	 * @param storeEffects if {@code true} effects will be stored
+	 */
+	void insert(L2PetInstance pet, boolean storeEffects);
+	
+	/**
+	 * Restores the pet skills from the database.
+	 * @param pet the pet
+	 */
+	void load(L2PetInstance pet);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/PlayerDAO.java b/src/main/java/com/l2jserver/gameserver/dao/PlayerDAO.java
new file mode 100644
index 00000000..5f8ee65a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/PlayerDAO.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Player DAO interface.
+ * @author Zoey76
+ */
+public interface PlayerDAO {
+	void storeCharBase(L2PcInstance player);
+	
+	/**
+	 * Create a new player in the characters table of the database.
+	 * @param player the player
+	 * @return {@code true} if the player was inserted into the database
+	 */
+	boolean insert(L2PcInstance player);
+	
+	/**
+	 * Updates the database with online status and last access of the player (called when login and logout).
+	 * @param player the player
+	 */
+	void updateOnlineStatus(L2PcInstance player);
+	
+	/**
+	 * Restores a player from the database.
+	 * @param objectId the player's object ID
+	 * @return the player
+	 */
+	L2PcInstance load(int objectId);
+	
+	/**
+	 * Retrieve the name and ID of the other characters assigned to this account.
+	 * @param player the player
+	 */
+	void loadCharacters(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/PlayerSkillSaveDAO.java b/src/main/java/com/l2jserver/gameserver/dao/PlayerSkillSaveDAO.java
new file mode 100644
index 00000000..3c7872eb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/PlayerSkillSaveDAO.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Player Skill Save DAO interface.
+ * @author Zoey76
+ */
+public interface PlayerSkillSaveDAO {
+	/**
+	 * Deletes the player skills from the database.
+	 * @param player the player
+	 */
+	void delete(L2PcInstance player);
+	
+	/**
+	 * Deletes the player skills from the database for a given class index.
+	 * @param player the player
+	 * @param classIndex the class index
+	 */
+	void delete(L2PcInstance player, int classIndex);
+	
+	/**
+	 * Stores the player skills in the database.
+	 * @param player the player
+	 * @param storeEffects if {@code true} effects will be stored
+	 */
+	void insert(L2PcInstance player, boolean storeEffects);
+	
+	/**
+	 * Restores the player skills from the database.
+	 * @param player the player
+	 */
+	void load(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/PremiumItemDAO.java b/src/main/java/com/l2jserver/gameserver/dao/PremiumItemDAO.java
new file mode 100644
index 00000000..4fa7d63e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/PremiumItemDAO.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Premium Item DAO interface.
+ * @author Zoey76
+ */
+public interface PremiumItemDAO {
+	void load(L2PcInstance player);
+	
+	void update(L2PcInstance player, int itemNum, long newCount);
+	
+	void delete(L2PcInstance player, int itemNum);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/RecipeBookDAO.java b/src/main/java/com/l2jserver/gameserver/dao/RecipeBookDAO.java
new file mode 100644
index 00000000..a0658198
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/RecipeBookDAO.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Recipe Book DAO interface.
+ * @author Zoey76
+ */
+public interface RecipeBookDAO {
+	void insert(L2PcInstance player, int recipeId, boolean isDwarf);
+	
+	/**
+	 * Restore recipe book data for this L2PcInstance.
+	 * @param player the player
+	 * @param loadCommon if {@code true} the common recipes boom is loaded
+	 */
+	void load(L2PcInstance player, boolean loadCommon);
+	
+	void delete(L2PcInstance player, int recipeId, boolean isDwarf);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/RecipeShopListDAO.java b/src/main/java/com/l2jserver/gameserver/dao/RecipeShopListDAO.java
new file mode 100644
index 00000000..79a1023d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/RecipeShopListDAO.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Recipe Shop List DAO interface.
+ * @author Zoey76
+ */
+public interface RecipeShopListDAO {
+	void load(L2PcInstance player);
+	
+	void delete(L2PcInstance player);
+	
+	void insert(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/RecommendationBonusDAO.java b/src/main/java/com/l2jserver/gameserver/dao/RecommendationBonusDAO.java
new file mode 100644
index 00000000..197e89aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/RecommendationBonusDAO.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Recommendation Bonus DAO interface.
+ * @author Zoey76
+ */
+public interface RecommendationBonusDAO {
+	void load(L2PcInstance player);
+	
+	void insert(L2PcInstance player, int recomTime);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/ServitorSkillSaveDAO.java b/src/main/java/com/l2jserver/gameserver/dao/ServitorSkillSaveDAO.java
new file mode 100644
index 00000000..fa99e1d7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/ServitorSkillSaveDAO.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+
+/**
+ * Servitor Skill Save DAO interface.
+ * @author Zoey76
+ */
+public interface ServitorSkillSaveDAO {
+	/**
+	 * Stores the servitor skills in the database.
+	 * @param servitor the servitor
+	 * @param storeEffects if {@code true} effects will be stored
+	 */
+	void insert(L2ServitorInstance servitor, boolean storeEffects);
+	
+	/**
+	 * Restores the servitor skills from the database.
+	 * @param servitor the servitor.
+	 */
+	void load(L2ServitorInstance servitor);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/ShortcutDAO.java b/src/main/java/com/l2jserver/gameserver/dao/ShortcutDAO.java
new file mode 100644
index 00000000..81497495
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/ShortcutDAO.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Shortcut DAO interface.
+ * @author Zoey76
+ */
+public interface ShortcutDAO {
+	boolean delete(L2PcInstance player, int classIndex);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/SkillDAO.java b/src/main/java/com/l2jserver/gameserver/dao/SkillDAO.java
new file mode 100644
index 00000000..8ba37d60
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/SkillDAO.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Skill DAO interface.
+ * @author Zoey76
+ */
+public interface SkillDAO {
+	void insert(L2PcInstance player, int classIndex, Skill skill);
+	
+	void update(L2PcInstance player, int classIndex, Skill newSkill, Skill oldSkill);
+	
+	void delete(L2PcInstance player, Skill skill);
+	
+	/**
+	 * Adds or updates player's skills in the database.
+	 * @param player the player
+	 * @param newClassIndex if newClassIndex > -1, the skills will be stored for that class index, not the current one
+	 * @param newSkills the list of skills to store
+	 */
+	void insert(L2PcInstance player, int newClassIndex, List<Skill> newSkills);
+	
+	/**
+	 * Retrieves all skills from the database.
+	 * @param player the player
+	 */
+	void load(L2PcInstance player);
+	
+	void deleteAll(L2PcInstance player, int classIndex);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/SubclassDAO.java b/src/main/java/com/l2jserver/gameserver/dao/SubclassDAO.java
new file mode 100644
index 00000000..4e5bde03
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/SubclassDAO.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.SubClass;
+
+/**
+ * Subclass DAO interface.
+ * @author Zoey76
+ */
+public interface SubclassDAO {
+	void update(L2PcInstance player);
+	
+	/**
+	 * Store the basic info about this new subclass.
+	 * @param player the player
+	 * @param newClass the new subclass
+	 * @return {@code true} if the subclass is added to the database
+	 */
+	boolean insert(L2PcInstance player, SubClass newClass);
+	
+	void delete(L2PcInstance player, int classIndex);
+	
+	/**
+	 * Restores the player subclass data.
+	 * @param player the player
+	 */
+	void load(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/TeleportBookmarkDAO.java b/src/main/java/com/l2jserver/gameserver/dao/TeleportBookmarkDAO.java
new file mode 100644
index 00000000..9fee7bb5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/TeleportBookmarkDAO.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Teleport Bookmark DAO interface.
+ * @author Zoey76
+ */
+public interface TeleportBookmarkDAO {
+	void delete(L2PcInstance player, int id);
+	
+	void insert(L2PcInstance player, int id, int x, int y, int z, int icon, String tag, String name);
+	
+	void update(L2PcInstance player, int id, int icon, String tag, String name);
+	
+	void load(L2PcInstance player);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/factory/IDAOFactory.java b/src/main/java/com/l2jserver/gameserver/dao/factory/IDAOFactory.java
new file mode 100644
index 00000000..edacedd9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/factory/IDAOFactory.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.factory;
+
+import com.l2jserver.gameserver.bbs.repository.ForumRepository;
+import com.l2jserver.gameserver.bbs.repository.PostRepository;
+import com.l2jserver.gameserver.bbs.repository.TopicRepository;
+import com.l2jserver.gameserver.dao.ClanDAO;
+import com.l2jserver.gameserver.dao.FriendDAO;
+import com.l2jserver.gameserver.dao.HennaDAO;
+import com.l2jserver.gameserver.dao.ItemDAO;
+import com.l2jserver.gameserver.dao.ItemReuseDAO;
+import com.l2jserver.gameserver.dao.PetDAO;
+import com.l2jserver.gameserver.dao.PetSkillSaveDAO;
+import com.l2jserver.gameserver.dao.PlayerDAO;
+import com.l2jserver.gameserver.dao.PlayerSkillSaveDAO;
+import com.l2jserver.gameserver.dao.PremiumItemDAO;
+import com.l2jserver.gameserver.dao.RecipeBookDAO;
+import com.l2jserver.gameserver.dao.RecipeShopListDAO;
+import com.l2jserver.gameserver.dao.RecommendationBonusDAO;
+import com.l2jserver.gameserver.dao.ServitorSkillSaveDAO;
+import com.l2jserver.gameserver.dao.ShortcutDAO;
+import com.l2jserver.gameserver.dao.SkillDAO;
+import com.l2jserver.gameserver.dao.SubclassDAO;
+import com.l2jserver.gameserver.dao.TeleportBookmarkDAO;
+
+/**
+ * DAO Factory interface.
+ * @author Zoey76
+ */
+public interface IDAOFactory {
+	FriendDAO getFriendDAO();
+	
+	HennaDAO getHennaDAO();
+	
+	ItemDAO getItemDAO();
+	
+	ItemReuseDAO getItemReuseDAO();
+	
+	PetDAO getPetDAO();
+	
+	PetSkillSaveDAO getPetSkillSaveDAO();
+	
+	PlayerDAO getPlayerDAO();
+	
+	PlayerSkillSaveDAO getPlayerSkillSaveDAO();
+	
+	PremiumItemDAO getPremiumItemDAO();
+	
+	RecipeBookDAO getRecipeBookDAO();
+	
+	RecipeShopListDAO getRecipeShopListDAO();
+	
+	RecommendationBonusDAO getRecommendationBonusDAO();
+	
+	ServitorSkillSaveDAO getServitorSkillSaveDAO();
+	
+	ShortcutDAO getShortcutDAO();
+	
+	SkillDAO getSkillDAO();
+	
+	SubclassDAO getSubclassDAO();
+	
+	TeleportBookmarkDAO getTeleportBookmarkDAO();
+	
+	ClanDAO getClanDAO();
+	
+	ForumRepository getForumRepository();
+	
+	TopicRepository getTopicRepository();
+	
+	PostRepository getPostRepository();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/factory/impl/DAOFactory.java b/src/main/java/com/l2jserver/gameserver/dao/factory/impl/DAOFactory.java
new file mode 100644
index 00000000..d4cef254
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/factory/impl/DAOFactory.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.factory.impl;
+
+import com.l2jserver.gameserver.bbs.repository.ForumRepository;
+import com.l2jserver.gameserver.bbs.repository.PostRepository;
+import com.l2jserver.gameserver.bbs.repository.TopicRepository;
+import com.l2jserver.gameserver.bbs.repository.impl.ForumRepositoryMySQLImpl;
+import com.l2jserver.gameserver.bbs.repository.impl.PostRepositoryMySQLImpl;
+import com.l2jserver.gameserver.bbs.repository.impl.TopicRepositoryMySQLImpl;
+import com.l2jserver.gameserver.dao.ClanDAO;
+import com.l2jserver.gameserver.dao.FriendDAO;
+import com.l2jserver.gameserver.dao.HennaDAO;
+import com.l2jserver.gameserver.dao.ItemDAO;
+import com.l2jserver.gameserver.dao.ItemReuseDAO;
+import com.l2jserver.gameserver.dao.PetDAO;
+import com.l2jserver.gameserver.dao.PetSkillSaveDAO;
+import com.l2jserver.gameserver.dao.PlayerDAO;
+import com.l2jserver.gameserver.dao.PlayerSkillSaveDAO;
+import com.l2jserver.gameserver.dao.PremiumItemDAO;
+import com.l2jserver.gameserver.dao.RecipeBookDAO;
+import com.l2jserver.gameserver.dao.RecipeShopListDAO;
+import com.l2jserver.gameserver.dao.RecommendationBonusDAO;
+import com.l2jserver.gameserver.dao.ServitorSkillSaveDAO;
+import com.l2jserver.gameserver.dao.ShortcutDAO;
+import com.l2jserver.gameserver.dao.SkillDAO;
+import com.l2jserver.gameserver.dao.SubclassDAO;
+import com.l2jserver.gameserver.dao.TeleportBookmarkDAO;
+import com.l2jserver.gameserver.dao.factory.IDAOFactory;
+import com.l2jserver.gameserver.dao.impl.mysql.ClanDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.FriendDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.HennaDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.ItemDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.ItemReuseDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.PetDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.PetSkillSaveDAOMySQL;
+import com.l2jserver.gameserver.dao.impl.mysql.PlayerDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.PlayerSkillSaveDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.PremiumItemDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.RecipeBookDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.RecipeShopListDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.RecommendationBonusDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.ServitorSkillSaveDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.ShortcutDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.SkillDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.SubclassDAOMySQLImpl;
+import com.l2jserver.gameserver.dao.impl.mysql.TeleportBookmarkDAOMySQLImpl;
+
+/**
+ * MySQL DAO Factory implementation.
+ * @author Zoey76
+ */
+public enum DAOFactory implements IDAOFactory {
+	INSTANCE;
+	
+	private final FriendDAO friendDAO = new FriendDAOMySQLImpl();
+	private final HennaDAO hennaDAO = new HennaDAOMySQLImpl();
+	private final ItemDAO itemDAO = new ItemDAOMySQLImpl();
+	private final ItemReuseDAO itemReuseDAO = new ItemReuseDAOMySQLImpl();
+	private final PetDAO petDAO = new PetDAOMySQLImpl();
+	private final PetSkillSaveDAO petSkillSaveDAO = new PetSkillSaveDAOMySQL();
+	private final PlayerDAO playerDAO = new PlayerDAOMySQLImpl();
+	private final PlayerSkillSaveDAO playerSkillSaveDAO = new PlayerSkillSaveDAOMySQLImpl();
+	private final PremiumItemDAO premiumItemDAO = new PremiumItemDAOMySQLImpl();
+	private final RecipeBookDAO recipeBookDAO = new RecipeBookDAOMySQLImpl();
+	private final RecipeShopListDAO recipeShopListDAO = new RecipeShopListDAOMySQLImpl();
+	private final RecommendationBonusDAO recommendationBonusDAO = new RecommendationBonusDAOMySQLImpl();
+	private final ServitorSkillSaveDAO servitorSkillSaveDAO = new ServitorSkillSaveDAOMySQLImpl();
+	private final ShortcutDAO shortcutDAO = new ShortcutDAOMySQLImpl();
+	private final SkillDAO skillDAO = new SkillDAOMySQLImpl();
+	private final SubclassDAO subclassDAO = new SubclassDAOMySQLImpl();
+	private final TeleportBookmarkDAO teleportBookmarkDAO = new TeleportBookmarkDAOMySQLImpl();
+	private final ClanDAO clanDAO = new ClanDAOMySQLImpl();
+	private final ForumRepository forumRepository = new ForumRepositoryMySQLImpl();
+	private final TopicRepository topicRepository = new TopicRepositoryMySQLImpl();
+	private final PostRepository postRepository = new PostRepositoryMySQLImpl();
+	
+	public static DAOFactory getInstance() {
+		return INSTANCE;
+	}
+	
+	@Override
+	public FriendDAO getFriendDAO() {
+		return friendDAO;
+	}
+	
+	@Override
+	public HennaDAO getHennaDAO() {
+		return hennaDAO;
+	}
+	
+	@Override
+	public ItemDAO getItemDAO() {
+		return itemDAO;
+	}
+	
+	@Override
+	public ItemReuseDAO getItemReuseDAO() {
+		return itemReuseDAO;
+	}
+	
+	@Override
+	public PetDAO getPetDAO() {
+		return petDAO;
+	}
+	
+	@Override
+	public PetSkillSaveDAO getPetSkillSaveDAO() {
+		return petSkillSaveDAO;
+	}
+	
+	@Override
+	public PlayerDAO getPlayerDAO() {
+		return playerDAO;
+	}
+	
+	@Override
+	public PlayerSkillSaveDAO getPlayerSkillSaveDAO() {
+		return playerSkillSaveDAO;
+	}
+	
+	@Override
+	public PremiumItemDAO getPremiumItemDAO() {
+		return premiumItemDAO;
+	}
+	
+	@Override
+	public RecipeBookDAO getRecipeBookDAO() {
+		return recipeBookDAO;
+	}
+	
+	@Override
+	public RecipeShopListDAO getRecipeShopListDAO() {
+		return recipeShopListDAO;
+	}
+	
+	@Override
+	public RecommendationBonusDAO getRecommendationBonusDAO() {
+		return recommendationBonusDAO;
+	}
+	
+	@Override
+	public ServitorSkillSaveDAO getServitorSkillSaveDAO() {
+		return servitorSkillSaveDAO;
+	}
+	
+	@Override
+	public ShortcutDAO getShortcutDAO() {
+		return shortcutDAO;
+	}
+	
+	@Override
+	public SkillDAO getSkillDAO() {
+		return skillDAO;
+	}
+	
+	@Override
+	public SubclassDAO getSubclassDAO() {
+		return subclassDAO;
+	}
+	
+	@Override
+	public TeleportBookmarkDAO getTeleportBookmarkDAO() {
+		return teleportBookmarkDAO;
+	}
+	
+	@Override
+	public ClanDAO getClanDAO() {
+		return clanDAO;
+	}
+	
+	@Override
+	public ForumRepository getForumRepository() {
+		return forumRepository;
+	}
+	
+	@Override
+	public TopicRepository getTopicRepository() {
+		return topicRepository;
+	}
+	
+	@Override
+	public PostRepository getPostRepository() {
+		return postRepository;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ClanDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ClanDAOMySQLImpl.java
new file mode 100644
index 00000000..64157265
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ClanDAOMySQLImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.ClanDAO;
+
+/**
+ * Clan DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class ClanDAOMySQLImpl implements ClanDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ClanDAOMySQLImpl.class);
+	
+	private static final String SELECT_CLAN_PRIVILEGES = "SELECT `privs`, `rank`, `party` FROM `clan_privs` WHERE clan_id=?";
+	
+	private static final String INSERT_CLAN_PRIVILEGES = "INSERT INTO `clan_privs` (`clan_id`, `rank`, `party`, `privs`) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE `privs`=?";
+	
+	@Override
+	public Map<Integer, Integer> getPrivileges(int clanId) {
+		final var result = new HashMap<Integer, Integer>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_CLAN_PRIVILEGES)) {
+			ps.setInt(1, clanId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final int rank = rs.getInt("rank");
+					if (rank == -1) {
+						continue;
+					}
+					result.put(rank, rs.getInt("privs"));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Unable to restore clan privileges for clan Id {}!", clanId, ex);
+		}
+		return result;
+	}
+	
+	@Override
+	public void storePrivileges(int clanId, int rank, int privileges) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_CLAN_PRIVILEGES)) {
+			ps.setInt(1, clanId);
+			ps.setInt(2, rank);
+			ps.setInt(3, 0);
+			ps.setInt(4, privileges);
+			ps.setInt(5, privileges);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Unable to store clan privileges for clan Id {}!", clanId, ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/FriendDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/FriendDAOMySQLImpl.java
new file mode 100644
index 00000000..b8716571
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/FriendDAOMySQLImpl.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import java.sql.ResultSet;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.FriendDAO;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Friend DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class FriendDAOMySQLImpl implements FriendDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FriendDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT friendId FROM character_friends WHERE charId=? AND relation=0 AND friendId<>charId";
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			try (ResultSet rs = ps.executeQuery()) {
+				while (rs.next()) {
+					player.addFriend(rs.getInt("friendId"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Error found in {} FriendList: ", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/HennaDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/HennaDAOMySQLImpl.java
new file mode 100644
index 00000000..dcc60955
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/HennaDAOMySQLImpl.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.HennaDAO;
+import com.l2jserver.gameserver.data.xml.impl.HennaData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * Henna DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class HennaDAOMySQLImpl implements HennaDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(HennaDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT slot,symbol_id FROM character_hennas WHERE charId=? AND class_index=?";
+	
+	private static final String INSERT = "INSERT INTO character_hennas (charId,symbol_id,slot,class_index) VALUES (?,?,?,?)";
+	
+	private static final String DELETE_ONE = "DELETE FROM character_hennas WHERE charId=? AND slot=? AND class_index=?";
+	
+	private static final String DELETE_ALL = "DELETE FROM character_hennas WHERE charId=? AND class_index=?";
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, player.getClassIndex());
+			try (var rs = ps.executeQuery()) {
+				final L2Henna[] henna = new L2Henna[3];
+				while (rs.next()) {
+					int slot = rs.getInt("slot");
+					if ((slot < 1) || (slot > 3)) {
+						continue;
+					}
+					
+					int symbolId = rs.getInt("symbol_id");
+					if (symbolId == 0) {
+						continue;
+					}
+					henna[slot - 1] = HennaData.getInstance().getHenna(symbolId);
+				}
+				player.setHenna(henna);
+			}
+		} catch (Exception ex) {
+			LOG.error("Failed restoring character {} hennas!", player, ex);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player, L2Henna henna, int slot) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, henna.getDyeId());
+			ps.setInt(3, slot);
+			ps.setInt(4, player.getClassIndex());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Failed saving character henna!", ex);
+		}
+	}
+	
+	@Override
+	public void delete(L2PcInstance player, int slot) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_ONE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, slot);
+			ps.setInt(3, player.getClassIndex());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Failed removing character henna!", ex);
+		}
+	}
+	
+	@Override
+	public void deleteAll(L2PcInstance player, int classIndex) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_ALL)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, classIndex);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Failed removing character henna!", ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ItemDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ItemDAOMySQLImpl.java
new file mode 100644
index 00000000..b38741fd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ItemDAOMySQLImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.ItemDAO;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Item DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class ItemDAOMySQLImpl implements ItemDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ItemDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT object_id FROM `items` WHERE `owner_id`=? AND (`loc`='PET' OR `loc`='PET_EQUIP') LIMIT 1;";
+	
+	@Override
+	public void loadPetInventory(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				player.setPetInvItems(rs.next() && (rs.getInt("object_id") > 0));
+			}
+		} catch (Exception e) {
+			LOG.error("Could not check Items in Pet Inventory for {}, {}", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ItemReuseDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ItemReuseDAOMySQLImpl.java
new file mode 100644
index 00000000..d719b138
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ItemReuseDAOMySQLImpl.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.ItemReuseDAO;
+import com.l2jserver.gameserver.model.TimeStamp;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExUseSharedGroupItem;
+
+/**
+ * Item Reuse DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class ItemReuseDAOMySQLImpl implements ItemReuseDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ItemReuseDAOMySQLImpl.class);
+	
+	private static final String INSERT = "INSERT INTO character_item_reuse_save (charId,itemId,itemObjId,reuseDelay,systime) VALUES (?,?,?,?,?)";
+	
+	private static final String SELECT = "SELECT charId,itemId,itemObjId,reuseDelay,systime FROM character_item_reuse_save WHERE charId=?";
+	
+	private static final String DELETE = "DELETE FROM character_item_reuse_save WHERE charId=?";
+	
+	@Override
+	public void delete(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not delete player's {} item reuse data!", player, e);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player) {
+		delete(player);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			final var itemReuseTimeStamps = player.getItemReuseTimeStamps();
+			if (itemReuseTimeStamps != null) {
+				for (TimeStamp ts : itemReuseTimeStamps.values()) {
+					if ((ts != null) && ts.hasNotPassed()) {
+						ps.setInt(1, player.getObjectId());
+						ps.setInt(2, ts.getItemId());
+						ps.setInt(3, ts.getItemObjectId());
+						ps.setLong(4, ts.getReuse());
+						ps.setLong(5, ts.getStamp());
+						ps.addBatch();
+					}
+				}
+				ps.executeBatch();
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not store player's {} item reuse data!", player, e);
+		}
+	}
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final int itemId = rs.getInt("itemId");
+					final long reuseDelay = rs.getLong("reuseDelay");
+					final long systime = rs.getLong("systime");
+					boolean isInInventory = true;
+					
+					// Using item Id
+					L2ItemInstance item = player.getInventory().getItemByItemId(itemId);
+					if (item == null) {
+						item = player.getWarehouse().getItemByItemId(itemId);
+						isInInventory = false;
+					}
+					
+					if ((item != null) && (item.getId() == itemId) && (item.getReuseDelay() > 0)) {
+						long remainingTime = systime - System.currentTimeMillis();
+						// Hardcoded to 10 seconds.
+						if (remainingTime > 10) {
+							player.addTimeStampItem(item, reuseDelay, systime);
+							
+							if (isInInventory && item.isEtcItem()) {
+								final int group = item.getSharedReuseGroup();
+								if (group > 0) {
+									player.sendPacket(new ExUseSharedGroupItem(itemId, group, (int) remainingTime, (int) reuseDelay));
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			// Deletes item reuse.
+			delete(player);
+		} catch (Exception e) {
+			LOG.error("Could not restore {} Item Reuse data: {}", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetDAOMySQLImpl.java
new file mode 100644
index 00000000..f2e2e234
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetDAOMySQLImpl.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.PetDAO;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Pet DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class PetDAOMySQLImpl implements PetDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PetDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT item_obj_id, name, level, curHp, curMp, exp, sp, fed FROM pets WHERE item_obj_id=?";
+	
+	private static final String UPDATE_FOOD = "UPDATE pets SET fed=? WHERE item_obj_id=?";
+	
+	private static final String DELETE = "DELETE FROM pets WHERE item_obj_id=?";
+	
+	private static final String INSERT = "INSERT INTO pets (name,level,curHp,curMp,exp,sp,fed,ownerId,restore,item_obj_id) VALUES (?,?,?,?,?,?,?,?,?,?)";
+	
+	private static final String UPDATE = "UPDATE pets SET name=?,level=?,curHp=?,curMp=?,exp=?,sp=?,fed=?,ownerId=?,restore=? WHERE item_obj_id=?";
+	
+	@Override
+	public void updateFood(L2PcInstance player, int petId) {
+		if ((player.getControlItemId() != 0) && (petId != 0)) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(UPDATE_FOOD)) {
+				ps.setInt(1, player.getCurrentFeed());
+				ps.setInt(2, player.getControlItemId());
+				ps.executeUpdate();
+				player.setControlItemId(0);
+			} catch (Exception e) {
+				LOG.error("Failed to store Pet [NpcId: {}] data {}", petId, e);
+			}
+		}
+	}
+	
+	@Override
+	public void delete(L2PetInstance pet) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, pet.getControlObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Failed to delete pet {}!", pet, e);
+		}
+	}
+	
+	@Override
+	public L2PetInstance load(L2ItemInstance control, L2NpcTemplate template, L2PcInstance owner) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, control.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				final var objectId = IdFactory.getInstance().getNextId();
+				if (!rs.next()) {
+					return new L2PetInstance(objectId, template, owner, control);
+				}
+				
+				final var pet = new L2PetInstance(objectId, template, owner, control, rs.getByte("level"));
+				pet.setRespawned(true);
+				pet.setName(rs.getString("name"));
+				
+				long exp = rs.getLong("exp");
+				final var info = PetDataTable.getInstance().getPetLevelData(pet.getId(), pet.getLevel());
+				// DS: update experience based by level
+				// Avoiding pet delevels due to exp per level values changed.
+				if ((info != null) && (exp < info.getPetMaxExp())) {
+					exp = info.getPetMaxExp();
+				}
+				
+				pet.setExp(exp);
+				pet.setSp(rs.getInt("sp"));
+				
+				pet.getStatus().setCurrentHp(rs.getInt("curHp"));
+				pet.getStatus().setCurrentMp(rs.getInt("curMp"));
+				pet.getStatus().setCurrentCp(pet.getMaxCp());
+				if (rs.getDouble("curHp") < 1) {
+					pet.setIsDead(true);
+					pet.stopHpMpRegeneration();
+				}
+				
+				pet.setCurrentFed(rs.getInt("fed"));
+				return pet;
+			}
+		} catch (Exception e) {
+			LOG.error("Could not restore pet data for owner: {}, {}", owner, e);
+		}
+		return null;
+	}
+	
+	@Override
+	public void insert(L2PetInstance pet) {
+		insertOrUpdate(pet, INSERT);
+	}
+	
+	@Override
+	public void update(L2PetInstance pet) {
+		insertOrUpdate(pet, UPDATE);
+	}
+	
+	private static void insertOrUpdate(L2PetInstance pet, String query) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(query)) {
+			ps.setString(1, pet.getName());
+			ps.setInt(2, pet.getLevel());
+			ps.setDouble(3, pet.getStatus().getCurrentHp());
+			ps.setDouble(4, pet.getStatus().getCurrentMp());
+			ps.setLong(5, pet.getExp());
+			ps.setInt(6, pet.getSp());
+			ps.setInt(7, pet.getCurrentFed());
+			ps.setInt(8, pet.getOwner().getObjectId());
+			ps.setBoolean(9, pet.isRestoreSummon()); // True restores pet on login
+			ps.setInt(10, pet.getControlObjectId());
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.error("Failed to store pet {} data!", pet, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetSkillSaveDAOMySQL.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetSkillSaveDAOMySQL.java
new file mode 100644
index 00000000..ecb63bb7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PetSkillSaveDAOMySQL.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.PetSkillSaveDAO;
+import com.l2jserver.gameserver.data.sql.impl.SummonEffectsTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.EffectScope;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Pet Skill Save MySQL implementation.
+ * @author Zoey76
+ */
+public class PetSkillSaveDAOMySQL implements PetSkillSaveDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PetSkillSaveDAOMySQL.class);
+	
+	private static final String ADD_SKILL_SAVE = "INSERT INTO character_pet_skills_save (petObjItemId,skill_id,skill_level,remaining_time,buff_index) VALUES (?,?,?,?,?)";
+	
+	private static final String RESTORE_SKILL_SAVE = "SELECT petObjItemId,skill_id,skill_level,remaining_time,buff_index FROM character_pet_skills_save WHERE petObjItemId=? ORDER BY buff_index";
+	
+	private static final String DELETE_SKILL_SAVE = "DELETE FROM character_pet_skills_save WHERE petObjItemId=?";
+	
+	@Override
+	public void insert(L2PetInstance pet, boolean storeEffects) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement(DELETE_SKILL_SAVE);
+			var ps2 = con.prepareStatement(ADD_SKILL_SAVE)) {
+			// Delete all current stored effects for summon to avoid dupe
+			ps1.setInt(1, pet.getControlObjectId());
+			ps1.execute();
+			
+			int buff_index = 0;
+			
+			final List<Integer> storedSkills = new LinkedList<>();
+			
+			// Store all effect data along with calculated remaining
+			if (storeEffects) {
+				for (BuffInfo info : pet.getEffectList().getEffects()) {
+					if (info == null) {
+						continue;
+					}
+					
+					final Skill skill = info.getSkill();
+					// Do not save heals.
+					if (skill.getAbnormalType() == AbnormalType.LIFE_FORCE_OTHERS) {
+						continue;
+					}
+					
+					if (skill.isToggle()) {
+						continue;
+					}
+					
+					// Dances and songs are not kept in retail.
+					if (skill.isDance() && !character().storeDances()) {
+						continue;
+					}
+					
+					if (storedSkills.contains(skill.getReuseHashCode())) {
+						continue;
+					}
+					
+					storedSkills.add(skill.getReuseHashCode());
+					
+					ps2.setInt(1, pet.getControlObjectId());
+					ps2.setInt(2, skill.getId());
+					ps2.setInt(3, skill.getLevel());
+					ps2.setInt(4, info.getTime());
+					ps2.setInt(5, ++buff_index);
+					ps2.execute();
+					
+					SummonEffectsTable.getInstance().addPetEffect(pet.getControlObjectId(), skill, info.getTime());
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not store pet effect data!", e);
+		}
+	}
+	
+	@Override
+	public void load(L2PetInstance pet) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement(RESTORE_SKILL_SAVE);
+			var ps2 = con.prepareStatement(DELETE_SKILL_SAVE)) {
+			if (!SummonEffectsTable.getInstance().containsPetId(pet.getControlObjectId())) {
+				ps1.setInt(1, pet.getControlObjectId());
+				try (var rs = ps1.executeQuery()) {
+					while (rs.next()) {
+						int effectCurTime = rs.getInt("remaining_time");
+						
+						final Skill skill = SkillData.getInstance().getSkill(rs.getInt("skill_id"), rs.getInt("skill_level"));
+						if (skill == null) {
+							continue;
+						}
+						
+						if (skill.hasEffects(EffectScope.GENERAL)) {
+							SummonEffectsTable.getInstance().addPetEffect(pet.getControlObjectId(), skill, effectCurTime);
+						}
+					}
+				}
+			}
+			
+			ps2.setInt(1, pet.getControlObjectId());
+			ps2.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Could not restore {} active effect data!", pet, e);
+		}
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PlayerDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PlayerDAOMySQLImpl.java
new file mode 100644
index 00000000..d3c67346
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PlayerDAOMySQLImpl.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.sql.Timestamp;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.PlayerDAO;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.enums.Sex;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.appearance.PcAppearance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.SubClass;
+import com.l2jserver.gameserver.model.entity.Hero;
+
+/**
+ * Player DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class PlayerDAOMySQLImpl implements PlayerDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerDAOMySQLImpl.class);
+	
+	private static final String INSERT = "INSERT INTO characters (account_name,charId,char_name,level,maxHp,curHp,maxCp,curCp,maxMp,curMp,face,hairStyle,hairColor,sex,exp,sp,karma,fame,pvpkills,pkkills,clanid,race,classid,deletetime,cancraft,title,title_color,accesslevel,online,isin7sdungeon,clan_privs,wantspeace,base_class,newbie,nobless,power_grade,createDate) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+	
+	private static final String SELECT = "SELECT * FROM characters WHERE charId=?";
+	
+	private static final String UPDATE = "UPDATE characters SET level=?,maxHp=?,curHp=?,maxCp=?,curCp=?,maxMp=?,curMp=?,face=?,hairStyle=?,hairColor=?,sex=?,heading=?,x=?,y=?,z=?,exp=?,expBeforeDeath=?,sp=?,karma=?,fame=?,pvpkills=?,pkkills=?,clanid=?,race=?,classid=?,deletetime=?,title=?,title_color=?,accesslevel=?,online=?,isin7sdungeon=?,clan_privs=?,wantspeace=?,base_class=?,onlinetime=?,newbie=?,nobless=?,power_grade=?,subpledge=?,lvl_joined_academy=?,apprentice=?,sponsor=?,clan_join_expiry_time=?,clan_create_expiry_time=?,char_name=?,death_penalty_level=?,bookmarkslot=?,vitality_points=?,hunting_bonus=?,nevit_blessing_points=?,nevit_blessing_time=?,language=? WHERE charId=?";
+	
+	private static final String UPDATE_ONLINE = "UPDATE characters SET online=?, lastAccess=? WHERE charId=?";
+	
+	private static final String SELECT_CHARACTERS = "SELECT charId, char_name FROM characters WHERE account_name=? AND charId<>?";
+	
+	@Override
+	public L2PcInstance load(int objectId) {
+		L2PcInstance player = null;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			// Retrieve the L2PcInstance from the characters table of the database
+			ps.setInt(1, objectId);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					final int activeClassId = rs.getInt("classid");
+					final boolean female = rs.getInt("sex") != Sex.MALE.ordinal();
+					PcAppearance app = new PcAppearance(rs.getByte("face"), rs.getByte("hairColor"), rs.getByte("hairStyle"), female);
+					
+					player = new L2PcInstance(objectId, activeClassId, rs.getString("account_name"), app);
+					player.setName(rs.getString("char_name"));
+					player.setLastAccess(rs.getLong("lastAccess"));
+					player.setExp(rs.getLong("exp"));
+					player.setExpBeforeDeath(rs.getLong("expBeforeDeath"));
+					player.setLevel(rs.getInt("level"));
+					player.setSp(rs.getInt("sp"));
+					player.setWantsPeace(rs.getInt("wantspeace"));
+					player.setHeading(rs.getInt("heading"));
+					player.setKarma(rs.getInt("karma"));
+					player.setFame(rs.getInt("fame"));
+					player.setPvpKills(rs.getInt("pvpkills"));
+					player.setPkKills(rs.getInt("pkkills"));
+					player.setOnlineTime(rs.getLong("onlinetime"));
+					player.setNewbie(rs.getInt("newbie"));
+					player.setNoble(rs.getInt("nobless") == 1);
+					
+					player.setClanJoinExpiryTime(rs.getLong("clan_join_expiry_time"));
+					if (player.getClanJoinExpiryTime() < System.currentTimeMillis()) {
+						player.setClanJoinExpiryTime(0);
+					}
+					player.setClanCreateExpiryTime(rs.getLong("clan_create_expiry_time"));
+					if (player.getClanCreateExpiryTime() < System.currentTimeMillis()) {
+						player.setClanCreateExpiryTime(0);
+					}
+					
+					player.setPowerGrade(rs.getInt("power_grade"));
+					player.setPledgeType(rs.getInt("subpledge"));
+					// player.setApprentice(rs.getInt("apprentice"));
+					
+					player.setDeleteTimer(rs.getLong("deletetime"));
+					player.setTitle(rs.getString("title"));
+					player.setAccessLevel(rs.getInt("accesslevel"));
+					player.getAppearance().setTitleColor(rs.getInt("title_color"));
+					player.setFistsWeaponItem(player.findFistsWeaponItem(activeClassId));
+					player.setUptime(System.currentTimeMillis());
+					
+					player.setCurrentCp(rs.getDouble("curCp"));
+					player.setCurrentHp(rs.getDouble("curHp"));
+					player.setCurrentMp(rs.getDouble("curMp"));
+					player.setClassIndex(0);
+					player.setBaseClass(rs.getInt("base_class"));
+					
+					// Restore Subclass Data (cannot be done earlier in function)
+					DAOFactory.getInstance().getSubclassDAO().load(player);
+					
+					if (activeClassId != player.getBaseClass()) {
+						for (SubClass subClass : player.getSubClasses().values()) {
+							if (subClass.getClassId() == activeClassId) {
+								player.setClassIndex(subClass.getClassIndex());
+							}
+						}
+					}
+					
+					if ((player.getClassIndex() == 0) && (activeClassId != player.getBaseClass())) {
+						// Subclass in use but doesn't exist in DB -
+						// a possible restart-while-modify-subclass cheat has been attempted.
+						// Switching to use base class
+						player.setClassId(player.getBaseClass());
+						LOG.warn("{} reverted to base class. Possibly has tried a relogin exploit while subclassing.", player);
+					} else {
+						player.setActiveClass(activeClassId);
+					}
+					
+					player.setApprentice(rs.getInt("apprentice"));
+					player.setSponsor(rs.getInt("sponsor"));
+					player.setLvlJoinedAcademy(rs.getInt("lvl_joined_academy"));
+					player.setIsIn7sDungeon(rs.getInt("isin7sdungeon") == 1);
+					
+					CursedWeaponsManager.getInstance().checkPlayer(player);
+					
+					player.setDeathPenaltyBuffLevel(rs.getInt("death_penalty_level"));
+					
+					player.setVitalityPoints(rs.getInt("vitality_points"), true);
+					
+					player.getHuntingSystem().setHuntingBonusTime(rs.getInt("hunting_bonus"));
+					
+					player.getHuntingSystem().setNevitBlessingPoints(rs.getInt("nevit_blessing_points"));
+					
+					player.getHuntingSystem().setNevitBlessingTime(rs.getInt("nevit_blessing_time"));
+					
+					// Set the x,y,z position of the L2PcInstance and make it invisible
+					player.setXYZInvisible(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"));
+					
+					// Set Teleport Bookmark Slot
+					player.setBookMarkSlot(rs.getInt("BookmarkSlot"));
+					
+					// character creation Time
+					player.getCreateDate().setTimeInMillis(rs.getTimestamp("createDate").getTime());
+					
+					// Language
+					player.setLang(rs.getString("language"));
+					
+					// Set Hero status if it applies
+					player.setHero(Hero.getInstance().isHero(objectId));
+					
+					player.setClan(ClanTable.getInstance().getClan(rs.getInt("clanid")));
+					
+					if (player.getClan() != null) {
+						if (player.getClan().getLeaderId() != player.getObjectId()) {
+							if (player.getPowerGrade() == 0) {
+								player.setPowerGrade(5);
+							}
+							player.setClanPrivileges(player.getClan().getRankPrivs(player.getPowerGrade()));
+						} else {
+							player.getClanPrivileges().setAll();
+							player.setPowerGrade(1);
+						}
+						player.setPledgeClass(L2ClanMember.calculatePledgeClass(player));
+					} else {
+						if (player.isNoble()) {
+							player.setPledgeClass(5);
+						}
+						
+						if (player.isHero()) {
+							player.setPledgeClass(8);
+						}
+						
+						player.getClanPrivileges().clear();
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Failed loading character!", ex);
+		}
+		return player;
+	}
+	
+	@Override
+	public void loadCharacters(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var stmt = con.prepareStatement(SELECT_CHARACTERS)) {
+			stmt.setString(1, player.getAccountName());
+			stmt.setInt(2, player.getObjectId());
+			try (var rs = stmt.executeQuery()) {
+				while (rs.next()) {
+					player.getAccountChars().put(rs.getInt("charId"), rs.getString("char_name"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Failed to load {} characters.", player, e);
+		}
+	}
+	
+	@Override
+	public boolean insert(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setString(1, player.getAccountName());
+			ps.setInt(2, player.getObjectId());
+			ps.setString(3, player.getName());
+			ps.setInt(4, player.getBaseLevel());
+			ps.setInt(5, player.getMaxHp());
+			ps.setDouble(6, player.getCurrentHp());
+			ps.setInt(7, player.getMaxCp());
+			ps.setDouble(8, player.getCurrentCp());
+			ps.setInt(9, player.getMaxMp());
+			ps.setDouble(10, player.getCurrentMp());
+			ps.setInt(11, player.getAppearance().getFace());
+			ps.setInt(12, player.getAppearance().getHairStyle());
+			ps.setInt(13, player.getAppearance().getHairColor());
+			ps.setInt(14, player.getAppearance().getSex() ? 1 : 0);
+			ps.setLong(15, player.getBaseExp());
+			ps.setInt(16, player.getBaseSp());
+			ps.setInt(17, player.getKarma());
+			ps.setInt(18, player.getFame());
+			ps.setInt(19, player.getPvpKills());
+			ps.setInt(20, player.getPkKills());
+			ps.setInt(21, player.getClanId());
+			ps.setInt(22, player.getRace().ordinal());
+			ps.setInt(23, player.getClassId().getId());
+			ps.setLong(24, player.getDeleteTimer());
+			ps.setInt(25, player.hasDwarvenCraft() ? 1 : 0);
+			ps.setString(26, player.getTitle());
+			ps.setInt(27, player.getAppearance().getTitleColor());
+			ps.setInt(28, player.getAccessLevel().getLevel());
+			ps.setInt(29, player.isOnlineInt());
+			ps.setInt(30, player.isIn7sDungeon() ? 1 : 0);
+			ps.setInt(31, player.getClanPrivileges().getBitmask());
+			ps.setInt(32, player.getWantsPeace());
+			ps.setInt(33, player.getBaseClass());
+			ps.setInt(34, player.getNewbie());
+			ps.setInt(35, player.isNoble() ? 1 : 0);
+			ps.setLong(36, 0);
+			ps.setTimestamp(37, new Timestamp(player.getCreateDate().getTimeInMillis()));
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.error("Could not insert player data!", ex);
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public void storeCharBase(L2PcInstance player) {
+		long totalOnlineTime = player.getOnlineTime();
+		if (player.getOnlineBeginTime() > 0) {
+			totalOnlineTime += MILLISECONDS.toSeconds(System.currentTimeMillis() - player.getOnlineBeginTime());
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE)) {
+			ps.setInt(1, player.getBaseLevel());
+			ps.setInt(2, player.getMaxHp());
+			ps.setDouble(3, player.getCurrentHp());
+			ps.setInt(4, player.getMaxCp());
+			ps.setDouble(5, player.getCurrentCp());
+			ps.setInt(6, player.getMaxMp());
+			ps.setDouble(7, player.getCurrentMp());
+			ps.setInt(8, player.getAppearance().getFace());
+			ps.setInt(9, player.getAppearance().getHairStyle());
+			ps.setInt(10, player.getAppearance().getHairColor());
+			ps.setInt(11, player.getAppearance().getSex() ? 1 : 0);
+			ps.setInt(12, player.getHeading());
+			ps.setInt(13, player.inObserverMode() ? player.getLastLocation().getX() : player.getX());
+			ps.setInt(14, player.inObserverMode() ? player.getLastLocation().getY() : player.getY());
+			ps.setInt(15, player.inObserverMode() ? player.getLastLocation().getZ() : player.getZ());
+			ps.setLong(16, player.getBaseExp());
+			ps.setLong(17, player.getExpBeforeDeath());
+			ps.setInt(18, player.getBaseSp());
+			ps.setInt(19, player.getKarma());
+			ps.setInt(20, player.getFame());
+			ps.setInt(21, player.getPvpKills());
+			ps.setInt(22, player.getPkKills());
+			ps.setInt(23, player.getClanId());
+			ps.setInt(24, player.getRace().ordinal());
+			ps.setInt(25, player.getClassId().getId());
+			ps.setLong(26, player.getDeleteTimer());
+			ps.setString(27, player.getTitle());
+			ps.setInt(28, player.getAppearance().getTitleColor());
+			ps.setInt(29, player.getAccessLevel().getLevel());
+			ps.setInt(30, player.isOnlineInt());
+			ps.setInt(31, player.isIn7sDungeon() ? 1 : 0);
+			ps.setInt(32, player.getClanPrivileges().getBitmask());
+			ps.setInt(33, player.getWantsPeace());
+			ps.setInt(34, player.getBaseClass());
+			ps.setLong(35, totalOnlineTime);
+			ps.setInt(36, player.getNewbie());
+			ps.setInt(37, player.isNoble() ? 1 : 0);
+			ps.setInt(38, player.getPowerGrade());
+			ps.setInt(39, player.getPledgeType());
+			ps.setInt(40, player.getLvlJoinedAcademy());
+			ps.setLong(41, player.getApprentice());
+			ps.setLong(42, player.getSponsor());
+			ps.setLong(43, player.getClanJoinExpiryTime());
+			ps.setLong(44, player.getClanCreateExpiryTime());
+			ps.setString(45, player.getName());
+			ps.setLong(46, player.getDeathPenaltyBuffLevel());
+			ps.setInt(47, player.getBookMarkSlot());
+			ps.setInt(48, player.getVitalityPoints());
+			ps.setInt(49, player.getHuntingSystem().getHuntingBonusTime());
+			ps.setInt(50, player.getHuntingSystem().getNevitBlessingPoints());
+			ps.setInt(51, player.getHuntingSystem().getNevitBlessingTime());
+			ps.setString(52, player.getLang());
+			ps.setInt(53, player.getObjectId());
+			
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Could not store {} base data!", player, ex);
+		}
+	}
+	
+	@Override
+	public void updateOnlineStatus(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_ONLINE)) {
+			ps.setInt(1, player.isOnlineInt());
+			ps.setLong(2, System.currentTimeMillis());
+			ps.setInt(3, player.getObjectId());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Failed updating player online status!", ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PlayerSkillSaveDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PlayerSkillSaveDAOMySQLImpl.java
new file mode 100644
index 00000000..bc6fd62c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PlayerSkillSaveDAOMySQLImpl.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.PlayerSkillSaveDAO;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.TimeStamp;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Player Skill Save DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class PlayerSkillSaveDAOMySQLImpl implements PlayerSkillSaveDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerSkillSaveDAOMySQLImpl.class);
+	
+	private static final String INSERT = "INSERT INTO character_skills_save (charId,skill_id,skill_level,remaining_time,reuse_delay,systime,restore_type,class_index,buff_index) VALUES (?,?,?,?,?,?,?,?,?)";
+	
+	private static final String SELECT = "SELECT skill_id,skill_level,remaining_time, reuse_delay, systime, restore_type FROM character_skills_save WHERE charId=? AND class_index=? ORDER BY buff_index";
+	
+	private static final String DELETE = "DELETE FROM character_skills_save WHERE charId=? AND class_index=?";
+	
+	@Override
+	public void delete(L2PcInstance player, int classIndex) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, classIndex);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Could not delete all effect data for player {}!", player, ex);
+		}
+	}
+	
+	@Override
+	public void delete(L2PcInstance player) {
+		delete(player, player.getClassIndex());
+	}
+	
+	@Override
+	public void insert(L2PcInstance player, boolean storeEffects) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			int buff_index = 0;
+			final List<Integer> storedSkills = new ArrayList<>();
+			
+			// Store all effect data along with calculated remaining
+			// reuse delays for matching skills. 'restore_type'= 0.
+			if (storeEffects) {
+				for (BuffInfo info : player.getEffectList().getEffects()) {
+					if (info == null) {
+						continue;
+					}
+					
+					final Skill skill = info.getSkill();
+					// Do not save heals.
+					if (skill.getAbnormalType() == AbnormalType.LIFE_FORCE_OTHERS) {
+						continue;
+					}
+					
+					if (skill.isToggle()) {
+						continue;
+					}
+					
+					// Dances and songs are not kept in retail.
+					if (skill.isDance() && !character().storeDances()) {
+						continue;
+					}
+					
+					if (storedSkills.contains(skill.getReuseHashCode())) {
+						continue;
+					}
+					
+					storedSkills.add(skill.getReuseHashCode());
+					
+					ps.setInt(1, player.getObjectId());
+					ps.setInt(2, skill.getId());
+					ps.setInt(3, skill.getLevel());
+					ps.setInt(4, info.getTime());
+					
+					final TimeStamp t = player.getSkillReuseTimeStamp(skill.getReuseHashCode());
+					ps.setLong(5, (t != null) && t.hasNotPassed() ? t.getReuse() : 0);
+					ps.setLong(6, (t != null) && t.hasNotPassed() ? t.getStamp() : 0);
+					
+					ps.setInt(7, 0); // Store type 0, active buffs/debuffs.
+					ps.setInt(8, player.getClassIndex());
+					ps.setInt(9, ++buff_index);
+					ps.execute();
+				}
+			}
+			
+			// Skills under reuse.
+			final Map<Integer, TimeStamp> reuseTimeStamps = player.getSkillReuseTimeStamps();
+			if (reuseTimeStamps != null) {
+				for (Entry<Integer, TimeStamp> ts : reuseTimeStamps.entrySet()) {
+					final int hash = ts.getKey();
+					if (storedSkills.contains(hash)) {
+						continue;
+					}
+					
+					final TimeStamp t = ts.getValue();
+					if ((t != null) && t.hasNotPassed()) {
+						storedSkills.add(hash);
+						
+						ps.setInt(1, player.getObjectId());
+						ps.setInt(2, t.getSkillId());
+						ps.setInt(3, t.getSkillLvl());
+						ps.setInt(4, -1);
+						ps.setLong(5, t.getReuse());
+						ps.setLong(6, t.getStamp());
+						ps.setInt(7, 1); // Restore type 1, skill reuse.
+						ps.setInt(8, player.getClassIndex());
+						ps.setInt(9, ++buff_index);
+						ps.execute();
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Could not store {} effect data!", player, e);
+		}
+	}
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, player.getClassIndex());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int remainingTime = rs.getInt("remaining_time");
+					long reuseDelay = rs.getLong("reuse_delay");
+					long systime = rs.getLong("systime");
+					int restoreType = rs.getInt("restore_type");
+					
+					final Skill skill = SkillData.getInstance().getSkill(rs.getInt("skill_id"), rs.getInt("skill_level"));
+					if (skill == null) {
+						continue;
+					}
+					
+					final long time = systime - System.currentTimeMillis();
+					if (time > 10) {
+						player.disableSkill(skill, time);
+						player.addTimeStamp(skill, reuseDelay, systime);
+					}
+					
+					// Restore Type 1 The remaining skills lost effect upon logout but were still under a high reuse delay.
+					if (restoreType > 0) {
+						continue;
+					}
+					
+					// Restore Type 0 These skill were still in effect on the character upon logout.
+					// Some of which were self casted and might still have had a long reuse delay which also is restored.
+					skill.applyEffects(player, player, false, remainingTime);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Could not restore {} active effect data!", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PremiumItemDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PremiumItemDAOMySQLImpl.java
new file mode 100644
index 00000000..ce85ea41
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/PremiumItemDAOMySQLImpl.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.PremiumItemDAO;
+import com.l2jserver.gameserver.model.L2PremiumItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Premium Item DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class PremiumItemDAOMySQLImpl implements PremiumItemDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PremiumItemDAOMySQLImpl.class);
+	
+	private static final String GET_PREMIUM_ITEMS = "SELECT itemNum, itemId, itemCount, itemSender FROM character_premium_items WHERE charId=?";
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(GET_PREMIUM_ITEMS)) {
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int itemNum = rs.getInt("itemNum");
+					int itemId = rs.getInt("itemId");
+					long itemCount = rs.getLong("itemCount");
+					String itemSender = rs.getString("itemSender");
+					player.getPremiumItemList().put(itemNum, new L2PremiumItem(itemId, itemCount, itemSender));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Could not restore premium items!", ex);
+		}
+	}
+	
+	@Override
+	public void update(L2PcInstance player, int itemNum, long newCount) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE character_premium_items SET itemCount=? WHERE charId=? AND itemNum=? ")) {
+			ps.setLong(1, newCount);
+			ps.setInt(2, player.getObjectId());
+			ps.setInt(3, itemNum);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Could not update premium items!", ex);
+		}
+	}
+	
+	@Override
+	public void delete(L2PcInstance player, int itemNum) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_premium_items WHERE charId=? AND itemNum=? ")) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, itemNum);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Could not delete premium item!" + ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecipeBookDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecipeBookDAOMySQLImpl.java
new file mode 100644
index 00000000..8d8a6e2a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecipeBookDAOMySQLImpl.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.RecipeBookDAO;
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Recipe Book DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class RecipeBookDAOMySQLImpl implements RecipeBookDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RecipeBookDAOMySQLImpl.class);
+	
+	private static final String INSERT = "INSERT INTO character_recipebook (charId, id, classIndex, type) values(?,?,?,?)";
+	
+	private static final String DELETE = "DELETE FROM character_recipebook WHERE charId=? AND id=? AND classIndex=?";
+	
+	private static final String SELECT_COMMON = "SELECT id, type, classIndex FROM character_recipebook WHERE charId=?";
+	
+	private static final String SELECT = "SELECT id FROM character_recipebook WHERE charId=? AND classIndex=? AND type = 1";
+	
+	@Override
+	public void insert(L2PcInstance player, int recipeId, boolean isDwarf) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, recipeId);
+			ps.setInt(3, isDwarf ? player.getClassIndex() : 0);
+			ps.setInt(4, isDwarf ? 1 : 0);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Error inserting recipe Id {} from player {}!", recipeId, player, ex);
+		}
+	}
+	
+	@Override
+	public void delete(L2PcInstance player, int recipeId, boolean isDwarf) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, recipeId);
+			ps.setInt(3, isDwarf ? player.getClassIndex() : 0);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Error deleting recipe Id {} from player {}!", recipeId, player, ex);
+		}
+	}
+	
+	@Override
+	public void load(L2PcInstance player, boolean loadCommon) {
+		// TODO(Zoey76): Split into two methods.
+		final String sql = loadCommon ? SELECT_COMMON : SELECT;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(sql)) {
+			ps.setInt(1, player.getObjectId());
+			if (!loadCommon) {
+				ps.setInt(2, player.getClassIndex());
+			}
+			
+			try (var rs = ps.executeQuery()) {
+				// TODO(Zoey76): Why only dwarven is cleared?
+				player.getDwarvenRecipeBookClear();
+				
+				final RecipeData rd = RecipeData.getInstance();
+				while (rs.next()) {
+					final L2RecipeList recipe = rd.getRecipeList(rs.getInt("id"));
+					if (loadCommon) {
+						if (rs.getInt(2) == 1) {
+							if (rs.getInt(3) == player.getClassIndex()) {
+								player.registerDwarvenRecipeList(recipe, false);
+							}
+						} else {
+							player.registerCommonRecipeList(recipe, false);
+						}
+					} else {
+						player.registerDwarvenRecipeList(recipe, false);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Could not restore recipe book data!", ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecipeShopListDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecipeShopListDAOMySQLImpl.java
new file mode 100644
index 00000000..4e99eb84
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecipeShopListDAOMySQLImpl.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.RecipeShopListDAO;
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Recipe Shop List DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class RecipeShopListDAOMySQLImpl implements RecipeShopListDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RecipeShopListDAOMySQLImpl.class);
+	
+	private static final String DELETE = "DELETE FROM character_recipeshoplist WHERE charId=?";
+	
+	private static final String INSERT = "REPLACE INTO character_recipeshoplist (`charId`, `recipeId`, `price`, `index`) VALUES (?, ?, ?, ?)";
+	
+	private static final String SELECT = "SELECT * FROM character_recipeshoplist WHERE charId=? ORDER BY `index`";
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			player.getManufactureItems().clear();
+			
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					player.getManufactureItems().put(rs.getInt("recipeId"), new L2ManufactureItem(rs.getInt("recipeId"), rs.getLong("price")));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Could not restore recipe shop list data for {}, {}", player, e);
+		}
+	}
+	
+	@Override
+	public void delete(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Could not store recipe shop for {}, {}", player, e);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player) {
+		if (!player.hasManufactureShop()) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			int i = 1;
+			for (L2ManufactureItem item : player.getManufactureItems().values()) {
+				ps.setInt(1, player.getObjectId());
+				ps.setInt(2, item.getRecipeId());
+				ps.setLong(3, item.getCost());
+				ps.setInt(4, i++);
+				ps.addBatch();
+			}
+			ps.executeBatch();
+		} catch (Exception e) {
+			LOG.error("Could not store recipe shop for {}, {}", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecommendationBonusDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecommendationBonusDAOMySQLImpl.java
new file mode 100644
index 00000000..758e9e41
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/RecommendationBonusDAOMySQLImpl.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.RecommendationBonusDAO;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Recommendation Bonus DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class RecommendationBonusDAOMySQLImpl implements RecommendationBonusDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RecommendationBonusDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT rec_have,rec_left,time_left FROM character_reco_bonus WHERE charId=? LIMIT 1";
+	
+	private static final String INSERT = "INSERT INTO character_reco_bonus (charId,rec_have,rec_left,time_left) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE rec_have=?, rec_left=?, time_left=?";
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					player.getRecSystem().setHave(rs.getInt("rec_have"));
+					player.getRecSystem().setLeft(rs.getInt("rec_left"));
+					player.getRecSystem().setBonusTime(rs.getInt("time_left"));
+				} else {
+					player.getRecSystem().setBonusTime(3600);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Could not restore Recommendations for {}, {}", player, e);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player, int recomTime) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, player.getRecSystem().getHave());
+			ps.setInt(3, player.getRecSystem().getLeft());
+			ps.setLong(4, recomTime);
+			// Update part
+			ps.setInt(5, player.getRecSystem().getHave());
+			ps.setInt(6, player.getRecSystem().getLeft());
+			ps.setLong(7, recomTime);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Could not update Recommendations for player: {}", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ServitorSkillSaveDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ServitorSkillSaveDAOMySQLImpl.java
new file mode 100644
index 00000000..0925e057
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ServitorSkillSaveDAOMySQLImpl.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.ServitorSkillSaveDAO;
+import com.l2jserver.gameserver.data.sql.impl.SummonEffectsTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.EffectScope;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Servitor Skill Save DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class ServitorSkillSaveDAOMySQLImpl implements ServitorSkillSaveDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ServitorSkillSaveDAOMySQLImpl.class);
+	
+	private static final String ADD_SKILL_SAVE = "INSERT INTO character_summon_skills_save (ownerId,ownerClassIndex,summonSkillId,skill_id,skill_level,remaining_time,buff_index) VALUES (?,?,?,?,?,?,?)";
+	
+	private static final String RESTORE_SKILL_SAVE = "SELECT skill_id,skill_level,remaining_time,buff_index FROM character_summon_skills_save WHERE ownerId=? AND ownerClassIndex=? AND summonSkillId=? ORDER BY buff_index";
+	
+	private static final String DELETE_SKILL_SAVE = "DELETE FROM character_summon_skills_save WHERE ownerId=? AND ownerClassIndex=? AND summonSkillId=?";
+	
+	@Override
+	public void insert(L2ServitorInstance servitor, boolean storeEffects) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_SKILL_SAVE)) {
+			con.setAutoCommit(false);
+			// Delete all current stored effects for summon to avoid dupe
+			ps.setInt(1, servitor.getOwner().getObjectId());
+			ps.setInt(2, servitor.getOwner().getClassIndex());
+			ps.setInt(3, servitor.getReferenceSkill());
+			ps.execute();
+			
+			int buff_index = 0;
+			
+			final List<Integer> storedSkills = new LinkedList<>();
+			
+			// Store all effect data along with calculated remaining
+			if (storeEffects) {
+				try (var ps2 = con.prepareStatement(ADD_SKILL_SAVE)) {
+					for (BuffInfo info : servitor.getEffectList().getEffects()) {
+						if (info == null) {
+							continue;
+						}
+						
+						final Skill skill = info.getSkill();
+						// Do not save heals.
+						if (skill.getAbnormalType() == AbnormalType.LIFE_FORCE_OTHERS) {
+							continue;
+						}
+						
+						if (skill.isToggle()) {
+							continue;
+						}
+						
+						// Dances and songs are not kept in retail.
+						if (skill.isDance() && !character().storeDances()) {
+							continue;
+						}
+						
+						if (storedSkills.contains(skill.getReuseHashCode())) {
+							continue;
+						}
+						
+						storedSkills.add(skill.getReuseHashCode());
+						
+						ps2.setInt(1, servitor.getOwner().getObjectId());
+						ps2.setInt(2, servitor.getOwner().getClassIndex());
+						ps2.setInt(3, servitor.getReferenceSkill());
+						ps2.setInt(4, skill.getId());
+						ps2.setInt(5, skill.getLevel());
+						ps2.setInt(6, info.getTime());
+						ps2.setInt(7, ++buff_index);
+						ps2.addBatch();
+						
+						SummonEffectsTable.getInstance().addServitorEffect(servitor.getOwner(), servitor.getReferenceSkill(), skill, info.getTime());
+					}
+					ps2.executeBatch();
+				}
+			}
+			con.commit();
+		} catch (Exception e) {
+			LOG.error("Could not store summon effect data for owner {},  class index {}, skill {}!", servitor.getOwner().getObjectId(), servitor.getOwner().getClassIndex(), servitor.getReferenceSkill(), e);
+		}
+	}
+	
+	@Override
+	public void load(L2ServitorInstance servitor) {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			if (!SummonEffectsTable.getInstance().containsSkill(servitor.getOwner(), servitor.getReferenceSkill())) {
+				try (var ps = con.prepareStatement(RESTORE_SKILL_SAVE)) {
+					ps.setInt(1, servitor.getOwner().getObjectId());
+					ps.setInt(2, servitor.getOwner().getClassIndex());
+					ps.setInt(3, servitor.getReferenceSkill());
+					try (var rs = ps.executeQuery()) {
+						while (rs.next()) {
+							int effectCurTime = rs.getInt("remaining_time");
+							
+							final Skill skill = SkillData.getInstance().getSkill(rs.getInt("skill_id"), rs.getInt("skill_level"));
+							if (skill == null) {
+								continue;
+							}
+							
+							if (skill.hasEffects(EffectScope.GENERAL)) {
+								SummonEffectsTable.getInstance().addServitorEffect(servitor.getOwner(), servitor.getReferenceSkill(), skill, effectCurTime);
+							}
+						}
+					}
+				}
+			}
+			
+			try (var ps = con.prepareStatement(DELETE_SKILL_SAVE)) {
+				ps.setInt(1, servitor.getOwner().getObjectId());
+				ps.setInt(2, servitor.getOwner().getClassIndex());
+				ps.setInt(3, servitor.getReferenceSkill());
+				ps.executeUpdate();
+			}
+		} catch (Exception e) {
+			LOG.error("Could not restore {} active effect data!", servitor, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ShortcutDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ShortcutDAOMySQLImpl.java
new file mode 100644
index 00000000..380c42f9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/ShortcutDAOMySQLImpl.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.ShortcutDAO;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Shortcut DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class ShortcutDAOMySQLImpl implements ShortcutDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ShortcutDAOMySQLImpl.class);
+	
+	private static final String DELETE = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?";
+	
+	@Override
+	public boolean delete(L2PcInstance player, int classIndex) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, classIndex);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Could not modify sub class for {} to class index {}, {}", player, classIndex, e);
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/SkillDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/SkillDAOMySQLImpl.java
new file mode 100644
index 00000000..75e64eee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/SkillDAOMySQLImpl.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.SkillDAO;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Skill DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class SkillDAOMySQLImpl implements SkillDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SkillDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT skill_id,skill_level FROM character_skills WHERE charId=? AND class_index=?";
+	
+	private static final String INSERT = "INSERT INTO character_skills (charId,skill_id,skill_level,class_index) VALUES (?,?,?,?)";
+	
+	private static final String UPDATE = "UPDATE character_skills SET skill_level=? WHERE skill_id=? AND charId=? AND class_index=?";
+	
+	private static final String REPLACE = "REPLACE INTO character_skills (charId,skill_id,skill_level,class_index) VALUES (?,?,?,?)";
+	
+	private static final String DELETE_ONE = "DELETE FROM character_skills WHERE skill_id=? AND charId=? AND class_index=?";
+	
+	private static final String DELETE_ALL = "DELETE FROM character_skills WHERE charId=? AND class_index=?";
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, player.getClassIndex());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final int id = rs.getInt("skill_id");
+					final int level = rs.getInt("skill_level");
+					
+					// Create a L2Skill object for each record
+					final Skill skill = SkillData.getInstance().getSkill(id, level);
+					
+					if (skill == null) {
+						LOG.warn("Skipped null skill Id: {}, Level: {} while restoring player skills for {}", id, level, this);
+						continue;
+					}
+					
+					// Add the L2Skill object to the L2Character _skills and its Func objects to the calculator set of the L2Character
+					player.addSkill(skill);
+					
+					if (general().skillCheckEnable() && (!player.canOverrideCond(PcCondOverride.SKILL_CONDITIONS) || general().skillCheckGM())) {
+						if (!SkillTreesData.getInstance().isSkillAllowed(player, skill)) {
+							Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " has invalid skill " + skill.getName() + " (" + skill.getId() + "/" + skill.getLevel() + "), class:"
+								+ ClassListData.getInstance().getClass(player.getClassId()).getClassName(), IllegalActionPunishmentType.BROADCAST);
+							if (general().skillCheckRemove()) {
+								player.removeSkill(skill);
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Could not restore {} skills!", player, ex);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player, int classIndex, Skill skill) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, skill.getId());
+			ps.setInt(3, skill.getLevel());
+			ps.setInt(4, classIndex);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Error could not store char skills!", ex);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player, int newClassIndex, List<Skill> newSkills) {
+		if (newSkills.isEmpty()) {
+			return;
+		}
+		
+		final int classIndex = (newClassIndex > -1) ? newClassIndex : player.getClassIndex();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(REPLACE)) {
+			con.setAutoCommit(false);
+			for (final Skill addSkill : newSkills) {
+				
+				ps.setInt(1, player.getObjectId());
+				ps.setInt(2, addSkill.getId());
+				ps.setInt(3, addSkill.getLevel());
+				ps.setInt(4, classIndex);
+				ps.addBatch();
+			}
+			ps.executeBatch();
+			con.commit();
+		} catch (Exception ex) {
+			LOG.error("Error could not store {} skills!", player, ex);
+		}
+	}
+	
+	@Override
+	public void update(L2PcInstance player, int classIndex, Skill newSkill, Skill oldSkill) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE)) {
+			ps.setInt(1, newSkill.getLevel());
+			ps.setInt(2, oldSkill.getId());
+			ps.setInt(3, player.getObjectId());
+			ps.setInt(4, classIndex);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Error could not store char skills!", ex);
+		}
+	}
+	
+	@Override
+	public void delete(L2PcInstance player, Skill skill) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_ONE)) {
+			ps.setInt(1, skill.getId());
+			ps.setInt(2, player.getObjectId());
+			ps.setInt(3, player.getClassIndex());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Error could not delete skill!", ex);
+		}
+	}
+	
+	@Override
+	public void deleteAll(L2PcInstance player, int classIndex) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_ALL)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, classIndex);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Error could not delete skill!", ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/SubclassDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/SubclassDAOMySQLImpl.java
new file mode 100644
index 00000000..0f781110
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/SubclassDAOMySQLImpl.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.SubclassDAO;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.SubClass;
+
+/**
+ * Subclass DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class SubclassDAOMySQLImpl implements SubclassDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SubclassDAOMySQLImpl.class);
+	
+	private static final String SELECT = "SELECT class_id,exp,sp,level,class_index FROM character_subclasses WHERE charId=? ORDER BY class_index";
+	
+	private static final String INSERT = "INSERT INTO character_subclasses (charId,class_id,exp,sp,level,class_index) VALUES (?,?,?,?,?,?)";
+	
+	private static final String UPDATE = "UPDATE character_subclasses SET exp=?,sp=?,level=?,class_id=? WHERE charId=? AND class_index =?";
+	
+	private static final String DELETE = "DELETE FROM character_subclasses WHERE charId=? AND class_index=?";
+	
+	@Override
+	public void update(L2PcInstance player) {
+		if (player.getTotalSubClasses() <= 0) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE)) {
+			for (SubClass subClass : player.getSubClasses().values()) {
+				ps.setLong(1, subClass.getExp());
+				ps.setInt(2, subClass.getSp());
+				ps.setInt(3, subClass.getLevel());
+				ps.setInt(4, subClass.getClassId());
+				ps.setInt(5, player.getObjectId());
+				ps.setInt(6, subClass.getClassIndex());
+				ps.addBatch();
+			}
+			ps.executeBatch();
+		} catch (Exception e) {
+			LOG.error("Could not store sub class data for {} : {}", player, e);
+		}
+	}
+	
+	@Override
+	public boolean insert(L2PcInstance player, SubClass newClass) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, newClass.getClassId());
+			ps.setLong(3, newClass.getExp());
+			ps.setInt(4, newClass.getSp());
+			ps.setInt(5, newClass.getLevel());
+			ps.setInt(6, newClass.getClassIndex());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Could not add character sub class for {}, {}", player, e);
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public void delete(L2PcInstance player, int classIndex) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, classIndex);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Could not delete subclass for {} to class index {}, {}", player, classIndex, e);
+		}
+	}
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final SubClass subClass = new SubClass(player);
+					subClass.setClassId(rs.getInt("class_id"));
+					subClass.setExp(rs.getLong("exp"));
+					subClass.setLevel(rs.getInt("level"));
+					subClass.setSp(rs.getInt("sp"));
+					subClass.setClassIndex(rs.getInt("class_index"));
+					
+					// Enforce the correct indexing of _subClasses against their class indexes.
+					player.getSubClasses().put(subClass.getClassIndex(), subClass);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Could not restore classes for {}, {}", player, e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/TeleportBookmarkDAOMySQLImpl.java b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/TeleportBookmarkDAOMySQLImpl.java
new file mode 100644
index 00000000..3ac44ec0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/dao/impl/mysql/TeleportBookmarkDAOMySQLImpl.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.dao.impl.mysql;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.dao.TeleportBookmarkDAO;
+import com.l2jserver.gameserver.model.TeleportBookmark;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Teleport Bookmark DAO MySQL implementation.
+ * @author Zoey76
+ */
+public class TeleportBookmarkDAOMySQLImpl implements TeleportBookmarkDAO {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TeleportBookmarkDAOMySQLImpl.class);
+	
+	private static final String INSERT = "INSERT INTO character_tpbookmark (charId,Id,x,y,z,icon,tag,name) values (?,?,?,?,?,?,?,?)";
+	
+	private static final String UPDATE = "UPDATE character_tpbookmark SET icon=?,tag=?,name=? where charId=? AND Id=?";
+	
+	private static final String SELECT = "SELECT Id,x,y,z,icon,tag,name FROM character_tpbookmark WHERE charId=?";
+	
+	private static final String DELETE = "DELETE FROM character_tpbookmark WHERE charId=? AND Id=?";
+	
+	@Override
+	public void delete(L2PcInstance player, int id) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, id);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Could not delete character teleport bookmark data!", ex);
+		}
+	}
+	
+	@Override
+	public void insert(L2PcInstance player, int id, int x, int y, int z, int icon, String tag, String name) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT)) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, id);
+			ps.setInt(3, x);
+			ps.setInt(4, y);
+			ps.setInt(5, z);
+			ps.setInt(6, icon);
+			ps.setString(7, tag);
+			ps.setString(8, name);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("Could not insert character teleport bookmark data!", ex);
+		}
+	}
+	
+	@Override
+	public void update(L2PcInstance player, int id, int icon, String tag, String name) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE)) {
+			ps.setInt(1, icon);
+			ps.setString(2, tag);
+			ps.setString(3, name);
+			ps.setInt(4, player.getObjectId());
+			ps.setInt(5, id);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Could not update character teleport bookmark data!", ex);
+		}
+	}
+	
+	@Override
+	public void load(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT)) {
+			ps.setInt(1, player.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					player.getTpbookmarks().put(rs.getInt("Id"), new TeleportBookmark(rs.getInt("Id"), rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("icon"), rs.getString("tag"), rs.getString("name")));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Failed restoring character teleport bookmark!", ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/json/ExperienceData.java b/src/main/java/com/l2jserver/gameserver/data/json/ExperienceData.java
new file mode 100644
index 00000000..5881833e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/json/ExperienceData.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.json;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.google.gson.stream.JsonReader;
+
+/**
+ * @author Zealar
+ * @since 2.6.0.0
+ */
+public final class ExperienceData {
+	private static final Logger LOG = LoggerFactory.getLogger(ExperienceData.class);
+	
+	private static final Gson GSON = new Gson();
+	private static final Type TYPE_MAP_INTEGER_LONG = new TypeToken<Map<Integer, Long>>() {
+	}.getType();
+	private final Map<Integer, Long> _expTable = new HashMap<>();
+	
+	ExperienceData() {
+		load();
+	}
+	
+	public void load() {
+		_expTable.clear();
+		try (JsonReader reader = new JsonReader(new FileReader(new File(server().getDatapackRoot(), "data/stats/expData.json")))) {
+			_expTable.putAll(GSON.fromJson(reader, TYPE_MAP_INTEGER_LONG));
+		} catch (FileNotFoundException ex) {
+			LOG.warn("data/stats/expData.json not found!", ex);
+		} catch (IOException ex) {
+			LOG.warn("Failed to load expData.json for: ", ex);
+		}
+	}
+	
+	/**
+	 * Gets the exp for level.
+	 * @param level the level required.
+	 * @return the experience points required to reach the given level.
+	 */
+	public long getExpForLevel(int level) {
+		return _expTable.get(level);
+	}
+	
+	public float getPercentFromCurrentLevel(long exp, int level) {
+		long expPerLevel = getExpForLevel(level);
+		long expPerLevel2 = getExpForLevel(level + 1);
+		return (float) (exp - expPerLevel) / (expPerLevel2 - expPerLevel);
+	}
+	
+	/**
+	 * Gets the single instance of ExperienceTable.
+	 * @return single instance of ExperienceTable
+	 */
+	public static ExperienceData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		static final ExperienceData _instance = new ExperienceData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/AnnouncementsTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/AnnouncementsTable.java
new file mode 100644
index 00000000..f1c2fc92
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/AnnouncementsTable.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.announce.Announcement;
+import com.l2jserver.gameserver.model.announce.AnnouncementType;
+import com.l2jserver.gameserver.model.announce.AutoAnnouncement;
+import com.l2jserver.gameserver.model.announce.IAnnouncement;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+
+/**
+ * Loads announcements from database.
+ * @author UnAfraid
+ */
+public final class AnnouncementsTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AnnouncementsTable.class);
+	
+	private final Map<Integer, IAnnouncement> _announcements = new ConcurrentSkipListMap<>();
+	
+	protected AnnouncementsTable() {
+		load();
+	}
+	
+	private void load() {
+		_announcements.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.createStatement();
+			var rs = st.executeQuery("SELECT `id`, `type`, `initial`, `delay`, `repeat`, `author`, `content` FROM announcements")) {
+			while (rs.next()) {
+				final AnnouncementType type = AnnouncementType.findById(rs.getInt("type"));
+				final var author = rs.getString("author");
+				final var content = rs.getString("content");
+				final Announcement announce;
+				switch (type) {
+					case NORMAL, CRITICAL -> announce = new Announcement(rs.getInt("id"), type, content, author);
+					case AUTO_NORMAL, AUTO_CRITICAL -> announce = new AutoAnnouncement(type, content, author, rs.getLong("initial"), rs.getLong("delay"), rs.getInt("repeat"));
+					default -> {
+						continue;
+					}
+				}
+				_announcements.put(announce.getId(), announce);
+			}
+		} catch (Exception e) {
+			LOG.warn("Failed loading announcements:", e);
+		}
+	}
+	
+	/**
+	 * Sending all announcements to the player
+	 * @param player
+	 */
+	public void showAnnouncements(L2PcInstance player) {
+		sendAnnouncements(player, AnnouncementType.NORMAL);
+		sendAnnouncements(player, AnnouncementType.CRITICAL);
+		sendAnnouncements(player, AnnouncementType.EVENT);
+	}
+	
+	/**
+	 * Sends all announcements to the player by the specified type
+	 * @param player
+	 * @param type
+	 */
+	public void sendAnnouncements(L2PcInstance player, AnnouncementType type) {
+		for (IAnnouncement announce : _announcements.values()) {
+			if (announce.isValid() && (announce.getType() == type)) {
+				player.sendPacket(new CreatureSay(0, //
+					type == AnnouncementType.CRITICAL ? Say2.CRITICAL_ANNOUNCE : Say2.ANNOUNCEMENT, //
+					player.getName(), announce.getContent()));
+			}
+		}
+	}
+	
+	/**
+	 * Adds announcement
+	 * @param announce
+	 */
+	public void addAnnouncement(IAnnouncement announce) {
+		if (announce.storeMe()) {
+			_announcements.put(announce.getId(), announce);
+		}
+	}
+	
+	/**
+	 * Removes announcement by id
+	 * @param id
+	 * @return {@code true} if announcement exists and was deleted successfully, {@code false} otherwise.
+	 */
+	public boolean deleteAnnouncement(int id) {
+		final IAnnouncement announce = _announcements.remove(id);
+		return (announce != null) && announce.deleteMe();
+	}
+	
+	/**
+	 * @param id
+	 * @return {@link IAnnouncement} by id
+	 */
+	public IAnnouncement getAnnounce(int id) {
+		return _announcements.get(id);
+	}
+	
+	/**
+	 * @return {@link Collection} containing all announcements
+	 */
+	public Collection<IAnnouncement> getAllAnnouncements() {
+		return _announcements.values();
+	}
+	
+	/**
+	 * @return Single instance of {@link AnnouncementsTable}
+	 */
+	public static AnnouncementsTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AnnouncementsTable _instance = new AnnouncementsTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/CharNameTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/CharNameTable.java
new file mode 100644
index 00000000..985a7bb4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/CharNameTable.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Loads name and access level for all players.
+ * @since 2005/03/27
+ */
+public class CharNameTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CharNameTable.class);
+	
+	private final Map<Integer, String> _chars = new ConcurrentHashMap<>();
+	
+	private final Map<Integer, Integer> _accessLevels = new ConcurrentHashMap<>();
+	
+	protected CharNameTable() {
+		if (general().cacheCharNames()) {
+			loadAll();
+		}
+	}
+	
+	public final void addName(L2PcInstance player) {
+		if (player != null) {
+			addName(player.getObjectId(), player.getName());
+			_accessLevels.put(player.getObjectId(), player.getAccessLevel().getLevel());
+		}
+	}
+	
+	private void addName(int objectId, String name) {
+		if (name != null) {
+			if (!name.equals(_chars.get(objectId))) {
+				_chars.put(objectId, name);
+			}
+		}
+	}
+	
+	public final void removeName(int objId) {
+		_chars.remove(objId);
+		_accessLevels.remove(objId);
+	}
+	
+	public final int getIdByName(String name) {
+		if ((name == null) || name.isEmpty()) {
+			return -1;
+		}
+		
+		for (Entry<Integer, String> entry : _chars.entrySet()) {
+			if (entry.getValue().equalsIgnoreCase(name)) {
+				return entry.getKey();
+			}
+		}
+		
+		if (general().cacheCharNames()) {
+			return -1;
+		}
+		
+		int id = -1;
+		int accessLevel = 0;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT charId,accesslevel FROM characters WHERE char_name=?")) {
+			ps.setString(1, name);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					id = rs.getInt(1);
+					accessLevel = rs.getInt(2);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not check existing char name!", ex);
+		}
+		
+		if (id > 0) {
+			_chars.put(id, name);
+			_accessLevels.put(id, accessLevel);
+			return id;
+		}
+		
+		return -1; // not found
+	}
+	
+	public final String getNameById(int id) {
+		if (id <= 0) {
+			return null;
+		}
+		
+		String name = _chars.get(id);
+		if (name != null) {
+			return name;
+		}
+		
+		if (general().cacheCharNames()) {
+			return null;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT char_name,accesslevel FROM characters WHERE charId=?")) {
+			ps.setInt(1, id);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					name = rs.getString(1);
+					_chars.put(id, name);
+					_accessLevels.put(id, rs.getInt(2));
+					return name;
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not check existing char id!", ex);
+		}
+		
+		return null; // not found
+	}
+	
+	public final int getAccessLevelById(int objectId) {
+		if (getNameById(objectId) != null) {
+			return _accessLevels.get(objectId);
+		}
+		
+		return 0;
+	}
+	
+	public boolean doesCharNameExist(String name) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT account_name FROM characters WHERE char_name=?")) {
+			ps.setString(1, name);
+			try (var rs = ps.executeQuery()) {
+				return rs.next();
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not check existing player name!", ex);
+		}
+		return false;
+	}
+	
+	public int getAccountCharacterCount(String account) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT COUNT(char_name) FROM characters WHERE account_name=?")) {
+			ps.setString(1, account);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					return rs.getInt(1);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not check existing char count!", ex);
+		}
+		return 0;
+	}
+	
+	private void loadAll() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT charId, char_name, accesslevel FROM characters")) {
+			while (rs.next()) {
+				final int id = rs.getInt(1);
+				_chars.put(id, rs.getString(2));
+				_accessLevels.put(id, rs.getInt(3));
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not load char name!", ex);
+		}
+		LOG.info("Loaded {} char names.", _chars.size());
+	}
+	
+	public static CharNameTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CharNameTable INSTANCE = new CharNameTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java
new file mode 100644
index 00000000..d2da1841
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/CharSummonTable.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2PetData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.PetItemList;
+
+/**
+ * @author Nyaran
+ */
+public class CharSummonTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CharSummonTable.class);
+	
+	private static final Map<Integer, Integer> _pets = new ConcurrentHashMap<>();
+	
+	private static final Map<Integer, Integer> _servitors = new ConcurrentHashMap<>();
+	
+	// SQL
+	private static final String INIT_PET = "SELECT ownerId, item_obj_id FROM pets WHERE restore=TRUE";
+	
+	private static final String INIT_SUMMONS = "SELECT ownerId, summonSkillId FROM character_summons";
+	
+	private static final String LOAD_SUMMON = "SELECT curHp, curMp, time FROM character_summons WHERE ownerId = ? AND summonSkillId = ?";
+	
+	private static final String REMOVE_SUMMON = "DELETE FROM character_summons WHERE ownerId = ?";
+	
+	private static final String SAVE_SUMMON = "REPLACE INTO character_summons (ownerId,summonSkillId,curHp,curMp,time) VALUES (?,?,?,?,?)";
+	
+	public Map<Integer, Integer> getPets() {
+		return _pets;
+	}
+	
+	public Map<Integer, Integer> getServitors() {
+		return _servitors;
+	}
+	
+	public void init() {
+		if (character().restoreServitorOnReconnect()) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var s = con.createStatement();
+				var rs = s.executeQuery(INIT_SUMMONS)) {
+				while (rs.next()) {
+					_servitors.put(rs.getInt("ownerId"), rs.getInt("summonSkillId"));
+				}
+			} catch (Exception e) {
+				LOG.warn("Error while loading saved servitor!", e);
+			}
+		}
+		
+		if (character().restorePetOnReconnect()) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var s = con.createStatement();
+				var rs = s.executeQuery(INIT_PET)) {
+				while (rs.next()) {
+					_pets.put(rs.getInt("ownerId"), rs.getInt("item_obj_id"));
+				}
+			} catch (Exception e) {
+				LOG.warn("Error while loading saved pet!", e);
+			}
+		}
+	}
+	
+	public void removeServitor(L2PcInstance activeChar) {
+		_servitors.remove(activeChar.getObjectId());
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(REMOVE_SUMMON)) {
+			ps.setInt(1, activeChar.getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Summon cannot be removed!", e);
+		}
+	}
+	
+	public void restorePet(L2PcInstance activeChar) {
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_pets.get(activeChar.getObjectId()));
+		if (item == null) {
+			LOG.warn("Null pet summoning item for player {}!", activeChar);
+			return;
+		}
+		final L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(item.getId());
+		if (petData == null) {
+			LOG.warn("Null pet data for: {} and summoning item {}!", activeChar, item);
+			return;
+		}
+		final L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(petData.getNpcId());
+		if (npcTemplate == null) {
+			LOG.warn("Null pet NPC template for player {} and pet ID {}!", activeChar, petData.getNpcId());
+			return;
+		}
+		
+		final L2PetInstance pet = L2PetInstance.spawnPet(npcTemplate, activeChar, item);
+		if (pet == null) {
+			LOG.warn("Null pet instance for player {} and pet NPC template {}!", activeChar, npcTemplate);
+			return;
+		}
+		
+		pet.setShowSummonAnimation(true);
+		pet.setTitle(activeChar.getName());
+		
+		if (!pet.isRespawned()) {
+			pet.setCurrentHp(pet.getMaxHp());
+			pet.setCurrentMp(pet.getMaxMp());
+			pet.setExp(pet.getExpForThisLevel());
+			pet.setCurrentFed(pet.getMaxFed());
+		}
+		
+		pet.setRunning();
+		
+		if (!pet.isRespawned()) {
+			pet.storeMe();
+		}
+		
+		item.setEnchantLevel(pet.getLevel());
+		activeChar.setPet(pet);
+		pet.spawnMe(activeChar.getX() + 50, activeChar.getY() + 100, activeChar.getZ());
+		pet.startFeed();
+		pet.setFollowStatus(true);
+		pet.getOwner().sendPacket(new PetItemList(pet.getInventory().getItems()));
+		pet.broadcastStatusUpdate();
+	}
+	
+	public void restoreServitor(L2PcInstance activeChar) {
+		int skillId = _servitors.get(activeChar.getObjectId());
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(LOAD_SUMMON)) {
+			ps.setInt(1, activeChar.getObjectId());
+			ps.setInt(2, skillId);
+			try (var rs = ps.executeQuery()) {
+				Skill skill;
+				
+				while (rs.next()) {
+					int curHp = rs.getInt("curHp");
+					int curMp = rs.getInt("curMp");
+					int time = rs.getInt("time");
+					
+					skill = SkillData.getInstance().getSkill(skillId, activeChar.getSkillLevel(skillId));
+					if (skill == null) {
+						removeServitor(activeChar);
+						return;
+					}
+					
+					skill.applyEffects(activeChar, activeChar);
+					if (activeChar.hasServitor()) {
+						final L2ServitorInstance summon = (L2ServitorInstance) activeChar.getSummon();
+						summon.setCurrentHp(curHp);
+						summon.setCurrentMp(curMp);
+						summon.setLifeTimeRemaining(time);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Servitor cannot be restored!", e);
+		}
+	}
+	
+	public void saveSummon(L2ServitorInstance summon) {
+		if ((summon == null) || (summon.getLifeTimeRemaining() <= 0)) {
+			return;
+		}
+		
+		_servitors.put(summon.getOwner().getObjectId(), summon.getReferenceSkill());
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SAVE_SUMMON)) {
+			ps.setInt(1, summon.getOwner().getObjectId());
+			ps.setInt(2, summon.getReferenceSkill());
+			ps.setInt(3, (int) Math.round(summon.getCurrentHp()));
+			ps.setInt(4, (int) Math.round(summon.getCurrentMp()));
+			ps.setInt(5, summon.getLifeTimeRemaining());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Failed to store summon {} from {}!", summon, summon.getOwner(), e);
+		}
+	}
+	
+	public static CharSummonTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CharSummonTable _instance = new CharSummonTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java
new file mode 100644
index 00000000..084cfe18
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/ClanTable.java
@@ -0,0 +1,461 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.AuctionManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Auction;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.FortSiege;
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanCreate;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanDestroy;
+import com.l2jserver.gameserver.model.events.impl.clan.ClanWarFinish;
+import com.l2jserver.gameserver.model.events.impl.clan.ClanWarStart;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListAll;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.EnumIntBitmask;
+
+/**
+ * Clan Table.
+ */
+public class ClanTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ClanTable.class);
+	
+	public static final int CLAN_NAME_MAX_LENGTH = 16;
+	
+	private final Map<Integer, L2Clan> _clans = new ConcurrentHashMap<>();
+	
+	protected ClanTable() {
+		L2Clan clan;
+		// Count the clans
+		int clanCount = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT clan_id FROM clan_data")) {
+			while (rs.next()) {
+				int clanId = rs.getInt("clan_id");
+				_clans.put(clanId, new L2Clan(clanId));
+				clan = getClan(clanId);
+				if (clan.getDissolvingExpiryTime() != 0) {
+					scheduleRemoveClan(clan.getId());
+				}
+				clanCount++;
+			}
+		} catch (Exception ex) {
+			LOG.error("There has been an error restoring clans from database!", ex);
+		}
+		LOG.info("Restored {} clans from the database.", clanCount);
+		allianceCheck();
+		restorewars();
+	}
+	
+	/**
+	 * Gets the clans.
+	 * @return the clans
+	 */
+	public Collection<L2Clan> getClans() {
+		return _clans.values();
+	}
+	
+	/**
+	 * Gets the clan count.
+	 * @return the clan count
+	 */
+	public int getClanCount() {
+		return _clans.size();
+	}
+	
+	public L2Clan getClan(int clanId) {
+		return _clans.get(clanId);
+	}
+	
+	public L2Clan getClanByName(String clanName) {
+		return getClans().stream().filter(c -> c.getName().equalsIgnoreCase(clanName)).findFirst().orElse(null);
+	}
+	
+	/**
+	 * Creates a new clan and store clan info to database
+	 * @param player
+	 * @param clanName
+	 * @return NULL if clan with same name already exists
+	 */
+	public L2Clan createClan(L2PcInstance player, String clanName) {
+		if (null == player) {
+			return null;
+		}
+		
+		if (general().debug()) {
+			LOG.info("{} requested a clan creation.", player);
+		}
+		
+		if (10 > player.getLevel()) {
+			player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN);
+			return null;
+		}
+		if (0 != player.getClanId()) {
+			player.sendPacket(SystemMessageId.FAILED_TO_CREATE_CLAN);
+			return null;
+		}
+		if (System.currentTimeMillis() < player.getClanCreateExpiryTime()) {
+			player.sendPacket(SystemMessageId.YOU_MUST_WAIT_XX_DAYS_BEFORE_CREATING_A_NEW_CLAN);
+			return null;
+		}
+		if (clanName.length() < 2) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT);
+			return null;
+		}
+		if (clanName.length() > CLAN_NAME_MAX_LENGTH) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_TOO_LONG);
+			return null;
+		}
+		
+		if (null != getClanByName(clanName)) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
+			sm.addString(clanName);
+			player.sendPacket(sm);
+			return null;
+		}
+		
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var clan = new L2Clan(objectId, clanName);
+		final var leader = new L2ClanMember(clan, player);
+		clan.setLeader(leader);
+		leader.setPlayerInstance(player);
+		clan.store();
+		player.setClan(clan);
+		player.setPledgeClass(L2ClanMember.calculatePledgeClass(player));
+		player.setClanPrivileges(new EnumIntBitmask<>(ClanPrivilege.class, true));
+		
+		_clans.put(clan.getId(), clan);
+		
+		// should be update packet only
+		player.sendPacket(new PledgeShowInfoUpdate(clan));
+		player.sendPacket(new PledgeShowMemberListAll(clan, player));
+		player.sendPacket(new UserInfo(player));
+		player.sendPacket(new ExBrExtraUserInfo(player));
+		player.sendPacket(new PledgeShowMemberListUpdate(player));
+		player.sendPacket(SystemMessageId.CLAN_CREATED);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanCreate(player, clan));
+		return clan;
+	}
+	
+	public synchronized void destroyClan(int clanId) {
+		L2Clan clan = getClan(clanId);
+		if (clan == null) {
+			return;
+		}
+		
+		clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_HAS_DISPERSED));
+		int castleId = clan.getCastleId();
+		if (castleId == 0) {
+			for (Siege siege : SiegeManager.getInstance().getSieges()) {
+				siege.removeSiegeClan(clan);
+			}
+		}
+		
+		int fortId = clan.getFortId();
+		if (fortId == 0) {
+			for (FortSiege siege : FortSiegeManager.getInstance().getSieges()) {
+				siege.removeAttacker(clan);
+			}
+		}
+		
+		int hallId = clan.getHideoutId();
+		if (hallId == 0) {
+			for (SiegableHall hall : ClanHallSiegeManager.getInstance().getConquerableHalls().values()) {
+				hall.removeAttacker(clan);
+			}
+		}
+		
+		Auction auction = AuctionManager.getInstance().getAuction(clan.getAuctionBidAt());
+		if (auction != null) {
+			auction.cancelBid(clan.getId());
+		}
+		
+		L2ClanMember leaderMember = clan.getLeader();
+		if (leaderMember == null) {
+			clan.getWarehouse().destroyAllItems("ClanRemove", null, null);
+		} else {
+			clan.getWarehouse().destroyAllItems("ClanRemove", clan.getLeader().getPlayerInstance(), null);
+		}
+		
+		for (L2ClanMember member : clan.getMembers()) {
+			clan.removeClanMember(member.getObjectId(), 0);
+		}
+		
+		_clans.remove(clanId);
+		IdFactory.getInstance().releaseId(clanId);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			try (var ps = con.prepareStatement("DELETE FROM clan_data WHERE clan_id=?")) {
+				ps.setInt(1, clanId);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM clan_privs WHERE clan_id=?")) {
+				ps.setInt(1, clanId);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM clan_skills WHERE clan_id=?")) {
+				ps.setInt(1, clanId);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM clan_subpledges WHERE clan_id=?")) {
+				ps.setInt(1, clanId);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM clan_wars WHERE clan1=? OR clan2=?")) {
+				ps.setInt(1, clanId);
+				ps.setInt(2, clanId);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM clan_notices WHERE clan_id=?")) {
+				ps.setInt(1, clanId);
+				ps.execute();
+			}
+			
+			if (castleId != 0) {
+				try (var ps = con.prepareStatement("UPDATE castle SET taxPercent = 0 WHERE id = ?")) {
+					ps.setInt(1, castleId);
+					ps.execute();
+				}
+			}
+			
+			if (fortId != 0) {
+				Fort fort = FortManager.getInstance().getFortById(fortId);
+				if (fort != null) {
+					L2Clan owner = fort.getOwnerClan();
+					if (clan == owner) {
+						fort.removeOwner(true);
+					}
+				}
+			}
+			
+			if (hallId != 0) {
+				SiegableHall hall = ClanHallSiegeManager.getInstance().getSiegableHall(hallId);
+				if ((hall != null) && (hall.getOwnerId() == clanId)) {
+					hall.free();
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("There has been an error deleting a clan from database!", ex);
+		}
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanDestroy(leaderMember, clan));
+	}
+	
+	public void scheduleRemoveClan(final int clanId) {
+		ThreadPoolManager.getInstance().scheduleGeneral(() -> {
+			if (getClan(clanId) == null) {
+				return;
+			}
+			if (getClan(clanId).getDissolvingExpiryTime() != 0) {
+				destroyClan(clanId);
+			}
+		}, Math.max(getClan(clanId).getDissolvingExpiryTime() - System.currentTimeMillis(), 300000));
+	}
+	
+	public boolean isAllyExists(String allyName) {
+		for (L2Clan clan : getClans()) {
+			if ((clan.getAllyName() != null) && clan.getAllyName().equalsIgnoreCase(allyName)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public void storeclanswars(int clanId1, int clanId2) {
+		final L2Clan clan1 = getClan(clanId1);
+		final L2Clan clan2 = getClan(clanId2);
+		
+		EventDispatcher.getInstance().notifyEventAsync(new ClanWarStart(clan1, clan2));
+		
+		clan1.setEnemyClan(clan2);
+		clan2.setAttackerClan(clan1);
+		clan1.broadcastClanStatus();
+		clan2.broadcastClanStatus();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("REPLACE INTO clan_wars (clan1, clan2, wantspeace1, wantspeace2) VALUES(?,?,?,?)")) {
+			ps.setInt(1, clanId1);
+			ps.setInt(2, clanId2);
+			ps.setInt(3, 0);
+			ps.setInt(4, 0);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("There has been an error saving clan wars data!", ex);
+		}
+		
+		// SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.WAR_WITH_THE_S1_CLAN_HAS_BEGUN);
+		//
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_WAR_DECLARED_AGAINST_S1_IF_KILLED_LOSE_LOW_EXP);
+		msg.addString(clan2.getName());
+		clan1.broadcastToOnlineMembers(msg);
+		// msg = SystemMessage.getSystemMessage(SystemMessageId.WAR_WITH_THE_S1_CLAN_HAS_BEGUN);
+		// msg.addString(clan1.getName());
+		// clan2.broadcastToOnlineMembers(msg);
+		// clan1 declared clan war.
+		msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_DECLARED_WAR);
+		msg.addString(clan1.getName());
+		clan2.broadcastToOnlineMembers(msg);
+	}
+	
+	public void deleteclanswars(int clanId1, int clanId2) {
+		L2Clan clan1 = getClan(clanId1);
+		L2Clan clan2 = getClan(clanId2);
+		
+		EventDispatcher.getInstance().notifyEventAsync(new ClanWarFinish(clan1, clan2));
+		
+		clan1.deleteEnemyClan(clan2);
+		clan2.deleteAttackerClan(clan1);
+		clan1.broadcastClanStatus();
+		clan2.broadcastClanStatus();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM clan_wars WHERE clan1=? AND clan2=?")) {
+			ps.setInt(1, clanId1);
+			ps.setInt(2, clanId2);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("There has been an error removing clan wars data!", ex);
+		}
+		
+		// SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.WAR_WITH_THE_S1_CLAN_HAS_ENDED);
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.WAR_AGAINST_S1_HAS_STOPPED);
+		msg.addString(clan2.getName());
+		clan1.broadcastToOnlineMembers(msg);
+		msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_HAS_DECIDED_TO_STOP);
+		msg.addString(clan1.getName());
+		clan2.broadcastToOnlineMembers(msg);
+	}
+	
+	public void checkSurrender(L2Clan clan1, L2Clan clan2) {
+		int count = 0;
+		for (L2ClanMember player : clan1.getMembers()) {
+			if ((player != null) && (player.getPlayerInstance().getWantsPeace() == 1)) {
+				count++;
+			}
+		}
+		if (count == (clan1.getMembers().length - 1)) {
+			clan1.deleteEnemyClan(clan2);
+			clan2.deleteEnemyClan(clan1);
+			deleteclanswars(clan1.getId(), clan2.getId());
+		}
+	}
+	
+	private void restorewars() {
+		L2Clan clan1, clan2;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.createStatement();
+			var rs = statement.executeQuery("SELECT clan1, clan2 FROM clan_wars")) {
+			while (rs.next()) {
+				clan1 = getClan(rs.getInt("clan1"));
+				clan2 = getClan(rs.getInt("clan2"));
+				if ((clan1 != null) && (clan2 != null)) {
+					clan1.setEnemyClan(rs.getInt("clan2"));
+					clan2.setAttackerClan(rs.getInt("clan1"));
+				} else {
+					LOG.warn("While restoring clan wars on of the clans [{}, {}] is null!", clan1, clan2);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("There has been an error restoring clan wars data!", ex);
+		}
+	}
+	
+	/**
+	 * Check for nonexistent alliances
+	 */
+	private void allianceCheck() {
+		for (L2Clan clan : _clans.values()) {
+			int allyId = clan.getAllyId();
+			if ((allyId != 0) && (clan.getId() != allyId)) {
+				if (!_clans.containsKey(allyId)) {
+					clan.setAllyId(0);
+					clan.setAllyName(null);
+					clan.changeAllyCrest(0, true);
+					clan.updateClanInDB();
+					LOG.info("Removed alliance from clan {}.", clan);
+				}
+			}
+		}
+	}
+	
+	public List<L2Clan> getClanAllies(int allianceId) {
+		final List<L2Clan> clanAllies = new ArrayList<>();
+		if (allianceId != 0) {
+			for (L2Clan clan : _clans.values()) {
+				if ((clan != null) && (clan.getAllyId() == allianceId)) {
+					clanAllies.add(clan);
+				}
+			}
+		}
+		return clanAllies;
+	}
+	
+	public void storeClanScore() {
+		for (L2Clan clan : _clans.values()) {
+			clan.updateClanScoreInDB();
+		}
+	}
+	
+	public static ClanTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ClanTable _instance = new ClanTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java
new file mode 100644
index 00000000..d7d6eb89
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/CrestTable.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static java.sql.ResultSet.CONCUR_UPDATABLE;
+import static java.sql.ResultSet.TYPE_FORWARD_ONLY;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Crest;
+import com.l2jserver.gameserver.model.L2Crest.CrestType;
+
+/**
+ * Loads and saves crests from database.
+ * @author NosBit
+ */
+public final class CrestTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CrestTable.class);
+	
+	private final Map<Integer, L2Crest> _crests = new ConcurrentHashMap<>();
+	
+	private final AtomicInteger _nextId = new AtomicInteger(1);
+	
+	protected CrestTable() {
+		load();
+	}
+	
+	public synchronized void load() {
+		_crests.clear();
+		Set<Integer> crestsInUse = new HashSet<>();
+		for (L2Clan clan : ClanTable.getInstance().getClans()) {
+			if (clan.getCrestId() != 0) {
+				crestsInUse.add(clan.getCrestId());
+			}
+			
+			if (clan.getCrestLargeId() != 0) {
+				crestsInUse.add(clan.getCrestLargeId());
+			}
+			
+			if (clan.getAllyCrestId() != 0) {
+				crestsInUse.add(clan.getAllyCrestId());
+			}
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.createStatement(TYPE_FORWARD_ONLY, CONCUR_UPDATABLE);
+			var rs = statement.executeQuery("SELECT `crest_id`, `data`, `type` FROM `crests` ORDER BY `crest_id` DESC")) {
+			while (rs.next()) {
+				int id = rs.getInt("crest_id");
+				
+				if (_nextId.get() <= id) {
+					_nextId.set(id + 1);
+				}
+				
+				// delete all unused crests except the last one we don't want to reuse
+				// a crest id because client will display wrong crest if its reused
+				if (!crestsInUse.contains(id) && (id != (_nextId.get() - 1))) {
+					rs.deleteRow();
+					continue;
+				}
+				
+				byte[] data = rs.getBytes("data");
+				CrestType crestType = CrestType.getById(rs.getInt("type"));
+				if (crestType != null) {
+					_crests.put(id, new L2Crest(id, data, crestType));
+				} else {
+					LOG.warn("Unknown crest type {} found in database!", rs.getInt("type"));
+				}
+			}
+			
+		} catch (Exception ex) {
+			LOG.warn("There was an error while loading crests from database!", ex);
+		}
+		
+		LOG.info("Loaded {} crests.", _crests.size());
+		
+		for (L2Clan clan : ClanTable.getInstance().getClans()) {
+			if (clan.getCrestId() != 0) {
+				if (getCrest(clan.getCrestId()) == null) {
+					LOG.info("Removing non-existent crest Id {} for clan {}.", clan.getCrestId(), clan.getName());
+					clan.setCrestId(0);
+					clan.changeClanCrest(0);
+				}
+			}
+			
+			if (clan.getCrestLargeId() != 0) {
+				if (getCrest(clan.getCrestLargeId()) == null) {
+					LOG.info("Removing non-existent large crest Id {} for clan {}.", clan.getCrestId(), clan.getName());
+					clan.setCrestLargeId(0);
+					clan.changeLargeCrest(0);
+				}
+			}
+			
+			if (clan.getAllyCrestId() != 0) {
+				if (getCrest(clan.getAllyCrestId()) == null) {
+					LOG.info("Removing non-existent ally crest Id {} for clan {}.", clan.getCrestId(), clan.getName());
+					clan.setAllyCrestId(0);
+					clan.changeAllyCrest(0, true);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @param crestId The crest id
+	 * @return {@code L2Crest} if crest is found, {@code null} if crest was not found.
+	 */
+	public L2Crest getCrest(int crestId) {
+		return _crests.get(crestId);
+	}
+	
+	/**
+	 * Creates a {@code L2Crest} object and inserts it in database and cache.
+	 * @param data
+	 * @param crestType
+	 * @return {@code L2Crest} on success, {@code null} on failure.
+	 */
+	public L2Crest createCrest(byte[] data, CrestType crestType) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement("INSERT INTO `crests`(`crest_id`, `data`, `type`) VALUES(?, ?, ?)")) {
+			final L2Crest crest = new L2Crest(getNextId(), data, crestType);
+			statement.setInt(1, crest.getId());
+			statement.setBytes(2, crest.getData());
+			statement.setInt(3, crest.getType().getId());
+			statement.executeUpdate();
+			_crests.put(crest.getId(), crest);
+			return crest;
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while saving crest in database!", ex);
+		}
+		return null;
+	}
+	
+	/**
+	 * Removes crest from database and cache.
+	 * @param crestId the id of crest to be removed.
+	 */
+	public void removeCrest(int crestId) {
+		_crests.remove(crestId);
+		
+		// avoid removing last crest id we don't want to lose index...
+		// because client will display wrong crest if its reused
+		if (crestId == (_nextId.get() - 1)) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement("DELETE FROM `crests` WHERE `crest_id` = ?")) {
+			statement.setInt(1, crestId);
+			statement.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("There has been an  error while deleting crest from database!", ex);
+		}
+	}
+	
+	public int getNextId() {
+		return _nextId.getAndIncrement();
+	}
+	
+	public static CrestTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CrestTable INSTANCE = new CrestTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java
new file mode 100644
index 00000000..e6469c8f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/NpcBufferTable.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+public class NpcBufferTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(NpcBufferTable.class);
+	
+	private final Map<Integer, NpcBufferSkills> _buffers = new HashMap<>();
+	
+	public static class NpcBufferData {
+		private final SkillHolder _skill;
+		private final ItemHolder _fee;
+		
+		protected NpcBufferData(int skillId, int skillLevel, int feeId, int feeAmount) {
+			_skill = new SkillHolder(skillId, skillLevel);
+			_fee = new ItemHolder(feeId, feeAmount);
+		}
+		
+		public SkillHolder getSkill() {
+			return _skill;
+		}
+		
+		public ItemHolder getFee() {
+			return _fee;
+		}
+	}
+	
+	private static class NpcBufferSkills {
+		private final Map<Integer, NpcBufferData> _skills = new HashMap<>();
+		
+		public void addSkill(int skillId, int skillLevel, int skillFeeId, int skillFeeAmount, int buffGroup) {
+			_skills.put(buffGroup, new NpcBufferData(skillId, skillLevel, skillFeeId, skillFeeAmount));
+		}
+		
+		public NpcBufferData getSkillGroupInfo(int buffGroup) {
+			return _skills.get(buffGroup);
+		}
+	}
+	
+	protected NpcBufferTable() {
+		int skillCount = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.createStatement();
+			var rs = st.executeQuery("SELECT `npc_id`,`skill_id`,`skill_level`,`skill_fee_id`,`skill_fee_amount`,`buff_group` FROM `npc_buffer` ORDER BY `npc_id`")) {
+			int lastNpcId = 0;
+			NpcBufferSkills skills = null;
+			
+			while (rs.next()) {
+				int npcId = rs.getInt("npc_id");
+				int skillId = rs.getInt("skill_id");
+				int skillLevel = rs.getInt("skill_level");
+				int skillFeeId = rs.getInt("skill_fee_id");
+				int skillFeeAmount = rs.getInt("skill_fee_amount");
+				int buffGroup = rs.getInt("buff_group");
+				
+				if (npcId != lastNpcId) {
+					if (lastNpcId != 0) {
+						_buffers.put(lastNpcId, skills);
+					}
+					
+					skills = new NpcBufferSkills();
+					skills.addSkill(skillId, skillLevel, skillFeeId, skillFeeAmount, buffGroup);
+				} else if (skills != null) {
+					skills.addSkill(skillId, skillLevel, skillFeeId, skillFeeAmount, buffGroup);
+				}
+				
+				lastNpcId = npcId;
+				skillCount++;
+			}
+			
+			if (lastNpcId != 0) {
+				_buffers.put(lastNpcId, skills);
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error reading npc_buffer table!", ex);
+		}
+		
+		if (general().customNpcBufferTables()) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var st = con.createStatement();
+				var rs = st.executeQuery("SELECT `npc_id`,`skill_id`,`skill_level`,`skill_fee_id`,`skill_fee_amount`,`buff_group` FROM `custom_npc_buffer` ORDER BY `npc_id`")) {
+				int lastNpcId = 0;
+				NpcBufferSkills skills = null;
+				while (rs.next()) {
+					int npcId = rs.getInt("npc_id");
+					int skillId = rs.getInt("skill_id");
+					int skillLevel = rs.getInt("skill_level");
+					int skillFeeId = rs.getInt("skill_fee_id");
+					int skillFeeAmount = rs.getInt("skill_fee_amount");
+					int buffGroup = rs.getInt("buff_group");
+					
+					if (npcId != lastNpcId) {
+						if (lastNpcId != 0) {
+							_buffers.put(lastNpcId, skills);
+						}
+						
+						skills = new NpcBufferSkills();
+						skills.addSkill(skillId, skillLevel, skillFeeId, skillFeeAmount, buffGroup);
+					} else if (skills != null) {
+						skills.addSkill(skillId, skillLevel, skillFeeId, skillFeeAmount, buffGroup);
+					}
+					lastNpcId = npcId;
+					skillCount++;
+				}
+				
+				if (lastNpcId != 0) {
+					_buffers.put(lastNpcId, skills);
+				}
+			} catch (Exception ex) {
+				LOG.warn("There has been an error reading custom_npc_buffer table!", ex);
+			}
+		}
+		LOG.info("Loaded {} buffers and {} skills.", _buffers.size(), skillCount);
+	}
+	
+	public NpcBufferData getSkillInfo(int npcId, int buffGroup) {
+		final NpcBufferSkills skills = _buffers.get(npcId);
+		if (skills != null) {
+			return skills.getSkillGroupInfo(buffGroup);
+		}
+		return null;
+	}
+	
+	public static NpcBufferTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final NpcBufferTable _instance = new NpcBufferTable();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java
new file mode 100644
index 00000000..9d8c205b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/OfflineTradersTable.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.enums.PrivateStoreType.NONE;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
+
+public class OfflineTradersTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(OfflineTradersTable.class);
+	
+	private static final String SAVE_OFFLINE_STATUS = "INSERT INTO character_offline_trade (`charId`,`time`,`type`,`title`) VALUES (?,?,?,?)";
+	
+	private static final String SAVE_ITEMS = "INSERT INTO character_offline_trade_items (`charId`,`item`,`count`,`price`) VALUES (?,?,?,?)";
+	
+	private static final String CLEAR_OFFLINE_TABLE = "DELETE FROM character_offline_trade";
+	
+	private static final String CLEAR_OFFLINE_TABLE_ITEMS = "DELETE FROM character_offline_trade_items";
+	
+	private static final String LOAD_OFFLINE_STATUS = "SELECT * FROM character_offline_trade";
+	
+	private static final String LOAD_OFFLINE_ITEMS = "SELECT * FROM character_offline_trade_items WHERE charId = ?";
+	
+	public void storeOffliners() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var stm1 = con.prepareStatement(CLEAR_OFFLINE_TABLE);
+			var stm2 = con.prepareStatement(CLEAR_OFFLINE_TABLE_ITEMS);
+			var stm3 = con.prepareStatement(SAVE_OFFLINE_STATUS);
+			var stm_items = con.prepareStatement(SAVE_ITEMS)) {
+			stm1.execute();
+			stm2.execute();
+			con.setAutoCommit(false); // avoid halfway done
+			
+			for (L2PcInstance pc : L2World.getInstance().getPlayers()) {
+				try {
+					if ((pc.getPrivateStoreType() != NONE) && pc.isInOfflineMode()) {
+						stm3.setInt(1, pc.getObjectId());
+						stm3.setLong(2, pc.getOfflineStartTime());
+						stm3.setInt(3, pc.getPrivateStoreType().getId());
+						String title = null;
+						
+						switch (pc.getPrivateStoreType()) {
+							case BUY -> {
+								if (!customs().offlineTradeEnable()) {
+									continue;
+								}
+								title = pc.getBuyList().getTitle();
+								for (TradeItem i : pc.getBuyList().getItems()) {
+									stm_items.setInt(1, pc.getObjectId());
+									stm_items.setInt(2, i.getItem().getId());
+									stm_items.setLong(3, i.getCount());
+									stm_items.setLong(4, i.getPrice());
+									stm_items.executeUpdate();
+									stm_items.clearParameters();
+								}
+							}
+							case SELL, PACKAGE_SELL -> {
+								if (!customs().offlineTradeEnable()) {
+									continue;
+								}
+								title = pc.getSellList().getTitle();
+								for (TradeItem i : pc.getSellList().getItems()) {
+									stm_items.setInt(1, pc.getObjectId());
+									stm_items.setInt(2, i.getObjectId());
+									stm_items.setLong(3, i.getCount());
+									stm_items.setLong(4, i.getPrice());
+									stm_items.executeUpdate();
+									stm_items.clearParameters();
+								}
+							}
+							case MANUFACTURE -> {
+								if (!customs().offlineCraftEnable()) {
+									continue;
+								}
+								title = pc.getStoreName();
+								for (L2ManufactureItem i : pc.getManufactureItems().values()) {
+									stm_items.setInt(1, pc.getObjectId());
+									stm_items.setInt(2, i.getRecipeId());
+									stm_items.setLong(3, 0);
+									stm_items.setLong(4, i.getCost());
+									stm_items.executeUpdate();
+									stm_items.clearParameters();
+								}
+							}
+						}
+						stm3.setString(4, title);
+						stm3.executeUpdate();
+						stm3.clearParameters();
+						con.commit(); // flush
+					}
+				} catch (Exception ex) {
+					LOG.warn("There has been an error while saving offline trader {}!", pc, ex);
+				}
+			}
+			LOG.info("Offline traders stored.");
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while saving offline traders!", ex);
+		}
+	}
+	
+	public void restoreOfflineTraders() {
+		LOG.info("Loading offline traders...");
+		int nTraders = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var stm = con.createStatement();
+			var rs = stm.executeQuery(LOAD_OFFLINE_STATUS)) {
+			while (rs.next()) {
+				long time = rs.getLong("time");
+				if (customs().getOfflineMaxDays() > 0) {
+					Calendar cal = Calendar.getInstance();
+					cal.setTimeInMillis(time);
+					cal.add(Calendar.DAY_OF_YEAR, customs().getOfflineMaxDays());
+					if (cal.getTimeInMillis() <= System.currentTimeMillis()) {
+						continue;
+					}
+				}
+				
+				final var type = PrivateStoreType.findById(rs.getInt("type"));
+				if (type == null) {
+					LOG.warn("PrivateStoreType with Id {} could not be found!", rs.getInt("type"));
+					continue;
+				}
+				
+				if (type == NONE) {
+					continue;
+				}
+				
+				L2PcInstance player = null;
+				
+				try {
+					L2GameClient client = new L2GameClient(null);
+					client.setDetached(true);
+					player = L2PcInstance.load(rs.getInt("charId"));
+					client.setActiveChar(player);
+					player.setOnlineStatus(true, false);
+					client.setAccountName(player.getAccountNamePlayer());
+					L2World.getInstance().addPlayerToWorld(player);
+					client.setState(GameClientState.IN_GAME);
+					player.setClient(client);
+					player.setOfflineStartTime(time);
+					player.spawnMe(player.getX(), player.getY(), player.getZ());
+					LoginServerThread.getInstance().addGameServerLogin(player.getAccountName(), client);
+					try (var stm_items = con.prepareStatement(LOAD_OFFLINE_ITEMS)) {
+						stm_items.setInt(1, player.getObjectId());
+						try (var items = stm_items.executeQuery()) {
+							switch (type) {
+								case BUY -> {
+									while (items.next()) {
+										if (player.getBuyList().addItemByItemId(items.getInt(2), items.getLong(3), items.getLong(4)) == null) {
+											throw new NullPointerException();
+										}
+									}
+									player.getBuyList().setTitle(rs.getString("title"));
+								}
+								case SELL, PACKAGE_SELL -> {
+									while (items.next()) {
+										if (player.getSellList().addItem(items.getInt(2), items.getLong(3), items.getLong(4)) == null) {
+											throw new NullPointerException();
+										}
+									}
+									player.getSellList().setTitle(rs.getString("title"));
+									player.getSellList().setPackaged(type == PrivateStoreType.PACKAGE_SELL);
+								}
+								case MANUFACTURE -> {
+									while (items.next()) {
+										player.getManufactureItems().put(items.getInt(2), new L2ManufactureItem(items.getInt(2), items.getLong(4)));
+									}
+									player.setStoreName(rs.getString("title"));
+								}
+							}
+						}
+					}
+					player.sitDown();
+					if (customs().offlineSetNameColor()) {
+						player.getAppearance().setNameColor(customs().getOfflineNameColor());
+					}
+					player.setPrivateStoreType(type);
+					player.setOnlineStatus(true, true);
+					player.restoreEffects();
+					player.broadcastUserInfo();
+					nTraders++;
+				} catch (Exception ex) {
+					LOG.warn("There has been an error loading trader {}!", player, ex);
+					if (player != null) {
+						player.deleteMe();
+					}
+				}
+			}
+			
+			LOG.info("Loaded  {} offline trader(s).", nTraders);
+			
+			try (var stm1 = con.createStatement()) {
+				stm1.execute(CLEAR_OFFLINE_TABLE);
+				stm1.execute(CLEAR_OFFLINE_TABLE_ITEMS);
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while loading offline traders!", ex);
+		}
+	}
+	
+	public static OfflineTradersTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final OfflineTradersTable INSTANCE = new OfflineTradersTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java
new file mode 100644
index 00000000..3f68ba7c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/PetNameTable.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+
+public class PetNameTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PetNameTable.class);
+	
+	public boolean doesPetNameExist(String name) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT name FROM pets WHERE name=?")) {
+			ps.setString(1, name);
+			try (var rs = ps.executeQuery()) {
+				return rs.next();
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not check existing pet name!", ex);
+		}
+		return false;
+	}
+	
+	public boolean isValidPetName(String name) {
+		return character().getPetNameTemplate().matcher(name).matches();
+	}
+	
+	public static PetNameTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PetNameTable INSTANCE = new PetNameTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/SummonEffectsTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/SummonEffectsTable.java
new file mode 100644
index 00000000..af0c40d2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/SummonEffectsTable.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author Nyaran
+ */
+public class SummonEffectsTable {
+	/** Servitors **/
+	// Map tree
+	// -> key: charObjectId, value: classIndex Map
+	// --> key: classIndex, value: servitors Map
+	// ---> key: servitorSkillId, value: Effects list
+	private final Map<Integer, Map<Integer, Map<Integer, Map<Integer, SummonEffect>>>> _servitorEffects = new ConcurrentHashMap<>();
+	/** Pets **/
+	// key: petItemObjectId, value: Effects list
+	private final Map<Integer, Map<Integer, SummonEffect>> _petEffects = new ConcurrentHashMap<>();
+	
+	private Map<Integer, Map<Integer, SummonEffect>> getServitorEffects(L2PcInstance owner) {
+		final var servitorMap = _servitorEffects.get(owner.getObjectId());
+		return servitorMap == null ? null : servitorMap.get(owner.getClassIndex());
+	}
+	
+	private Map<Integer, SummonEffect> getServitorEffects(L2PcInstance owner, int referenceSkill) {
+		final var servitorEffects = getServitorEffects(owner);
+		return servitorEffects == null ? null : servitorEffects.get(referenceSkill);
+	}
+	
+	private void removeEffects(Map<Integer, SummonEffect> map, int skillId) {
+		if (map != null) {
+			map.remove(skillId);
+		}
+	}
+	
+	private void applyEffects(L2Summon summon, Map<Integer, SummonEffect> map) {
+		if (map == null) {
+			return;
+		}
+		for (var se : map.values()) {
+			if (se != null) {
+				se.getSkill().applyEffects(summon, summon, false, se.getEffectCurTime());
+			}
+		}
+	}
+	
+	public boolean containsSkill(L2PcInstance owner, int referenceSkill) {
+		final var servitorEffects = getServitorEffects(owner);
+		return (servitorEffects != null) && servitorEffects.containsKey(referenceSkill);
+	}
+	
+	public void clearServitorEffects(L2PcInstance owner, int referenceSkill) {
+		final var servitorEffects = getServitorEffects(owner, referenceSkill);
+		if (servitorEffects != null) {
+			servitorEffects.clear();
+		}
+	}
+	
+	public void addServitorEffect(L2PcInstance owner, int referenceSkill, Skill skill, int effectCurTime) {
+		_servitorEffects.computeIfAbsent(owner.getObjectId(), _ -> new ConcurrentHashMap<>()) //
+			.computeIfAbsent(owner.getClassIndex(), _ -> new ConcurrentHashMap<>()) //
+			.computeIfAbsent(referenceSkill, _ -> new ConcurrentHashMap<>()) //
+			.put(skill.getId(), new SummonEffect(skill, effectCurTime));
+	}
+	
+	public void removeServitorEffects(L2PcInstance owner, int referenceSkill, int skillId) {
+		removeEffects(getServitorEffects(owner, referenceSkill), skillId);
+	}
+	
+	public void applyServitorEffects(L2ServitorInstance servitor, L2PcInstance owner, int referenceSkill) {
+		applyEffects(servitor, getServitorEffects(owner, referenceSkill));
+	}
+	
+	public void addPetEffect(int controlObjectId, Skill skill, int effectCurTime) {
+		_petEffects.computeIfAbsent(controlObjectId, _ -> new ConcurrentHashMap<>()).put(skill.getId(), new SummonEffect(skill, effectCurTime));
+	}
+	
+	public boolean containsPetId(int controlObjectId) {
+		return _petEffects.containsKey(controlObjectId);
+	}
+	
+	public void applyPetEffects(L2PetInstance l2PetInstance, int controlObjectId) {
+		applyEffects(l2PetInstance, _petEffects.get(controlObjectId));
+	}
+	
+	public void clearPetEffects(int controlObjectId) {
+		final var effects = _petEffects.get(controlObjectId);
+		if (effects != null) {
+			effects.clear();
+		}
+	}
+	
+	public void removePetEffects(int controlObjectId, int skillId) {
+		removeEffects(_petEffects.get(controlObjectId), skillId);
+	}
+	
+	private static class SummonEffect {
+		private final Skill _skill;
+		private final int _effectCurTime;
+		
+		public SummonEffect(Skill skill, int effectCurTime) {
+			_skill = skill;
+			_effectCurTime = effectCurTime;
+		}
+		
+		public Skill getSkill() {
+			return _skill;
+		}
+		
+		public int getEffectCurTime() {
+			return _effectCurTime;
+		}
+	}
+	
+	public static SummonEffectsTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SummonEffectsTable INSTANCE = new SummonEffectsTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java
new file mode 100644
index 00000000..84df1618
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/SummonSkillsTable.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+public class SummonSkillsTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SummonSkillsTable.class);
+	
+	private final Map<Integer, Map<Integer, L2PetSkillLearn>> _skillTrees = new HashMap<>();
+	
+	protected SummonSkillsTable() {
+		load();
+	}
+	
+	public void load() {
+		_skillTrees.clear();
+		int count = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT templateId, minLvl, skillId, skillLvl FROM pets_skills")) {
+			while (rs.next()) {
+				final int npcId = rs.getInt("templateId");
+				final var skillTree = _skillTrees.computeIfAbsent(npcId, _ -> new HashMap<>());
+				
+				int id = rs.getInt("skillId");
+				int lvl = rs.getInt("skillLvl");
+				skillTree.put(SkillData.getSkillHashCode(id, lvl + 1), new L2PetSkillLearn(id, lvl, rs.getInt("minLvl")));
+				count++;
+			}
+		} catch (Exception ex) {
+			LOG.error("Error while loading pet skill tree!", ex);
+		}
+		LOG.info("Loaded {} summon skills.", count);
+	}
+	
+	public int getAvailableLevel(L2Summon cha, int skillId) {
+		int lvl = 0;
+		if (!_skillTrees.containsKey(cha.getId())) {
+			LOG.warn("Pet Id {} does not have any skills assigned!", cha.getId());
+			return lvl;
+		}
+		Collection<L2PetSkillLearn> skills = _skillTrees.get(cha.getId()).values();
+		for (L2PetSkillLearn temp : skills) {
+			if (temp.getId() != skillId) {
+				continue;
+			}
+			if (temp.getLevel() == 0) {
+				if (cha.getLevel() < 70) {
+					lvl = (cha.getLevel() / 10);
+					if (lvl <= 0) {
+						lvl = 1;
+					}
+				} else {
+					lvl = (7 + ((cha.getLevel() - 70) / 5));
+				}
+				
+				// formula usable for skill that have 10 or more skill levels
+				int maxLvl = SkillData.getInstance().getMaxLevel(temp.getId());
+				if (lvl > maxLvl) {
+					lvl = maxLvl;
+				}
+				break;
+			} else if (temp.getMinLevel() <= cha.getLevel()) {
+				if (temp.getLevel() > lvl) {
+					lvl = temp.getLevel();
+				}
+			}
+		}
+		return lvl;
+	}
+	
+	public List<Integer> getAvailableSkills(L2Summon cha) {
+		List<Integer> skillIds = new ArrayList<>();
+		if (!_skillTrees.containsKey(cha.getId())) {
+			LOG.warn("Pet Id {} does not have any skills assigned!", cha.getId());
+			return skillIds;
+		}
+		Collection<L2PetSkillLearn> skills = _skillTrees.get(cha.getId()).values();
+		for (L2PetSkillLearn temp : skills) {
+			if (skillIds.contains(temp.getId())) {
+				continue;
+			}
+			skillIds.add(temp.getId());
+		}
+		return skillIds;
+	}
+	
+	public static final class L2PetSkillLearn {
+		private final int _id;
+		private final int _level;
+		private final int _minLevel;
+		
+		public L2PetSkillLearn(int id, int lvl, int minLvl) {
+			_id = id;
+			_level = lvl;
+			_minLevel = minLvl;
+		}
+		
+		public int getId() {
+			return _id;
+		}
+		
+		public int getLevel() {
+			return _level;
+		}
+		
+		public int getMinLevel() {
+			return _minLevel;
+		}
+	}
+	
+	public static SummonSkillsTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SummonSkillsTable _instance = new SummonSkillsTable();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java b/src/main/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java
new file mode 100644
index 00000000..79c3c1f5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/sql/impl/TerritoryTable.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.sql.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2Territory;
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * @author MrBalancer
+ */
+public class TerritoryTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TerritoryTable.class);
+	
+	private static final Map<Integer, L2Territory> _territory = new HashMap<>();
+	
+	protected TerritoryTable() {
+		load();
+	}
+	
+	/**
+	 * Gets the random point.
+	 * @param terr the territory Id?
+	 * @return the random point
+	 */
+	public Location getRandomPoint(int terr) {
+		return _territory.get(terr).getRandomPoint();
+	}
+	
+	/**
+	 * Gets the proc max.
+	 * @param terr the territory Id?
+	 * @return the proc max
+	 */
+	public int getProcMax(int terr) {
+		return _territory.get(terr).getProcMax();
+	}
+	
+	/**
+	 * Load the data from database.
+	 */
+	public void load() {
+		_territory.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var stmt = con.createStatement();
+			var rs = stmt.executeQuery("SELECT * FROM locations WHERE loc_id>0")) {
+			while (rs.next()) {
+				int terrId = rs.getInt("loc_id");
+				L2Territory terr = _territory.get(terrId);
+				if (terr == null) {
+					terr = new L2Territory(terrId);
+					_territory.put(terrId, terr);
+				}
+				terr.add(rs.getInt("loc_x"), rs.getInt("loc_y"), rs.getInt("loc_zmin"), rs.getInt("loc_zmax"), rs.getInt("proc"));
+			}
+			LOG.info("Loaded {} territories from database.", _territory.size());
+		} catch (Exception ex) {
+			LOG.error("Failed to load territories from database!", ex);
+		}
+	}
+	
+	public static TerritoryTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final TerritoryTable INSTANCE = new TerritoryTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java
new file mode 100644
index 00000000..42947bcd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/AdminData.java
@@ -0,0 +1,303 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.L2AccessLevel;
+import com.l2jserver.gameserver.model.L2AdminCommandAccessRight;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads administrator access levels and commands.
+ * @author UnAfraid
+ */
+public final class AdminData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AdminData.class);
+	
+	private final Map<Integer, L2AccessLevel> _accessLevels = new HashMap<>();
+	
+	private final Map<String, L2AdminCommandAccessRight> _adminCommandAccessRights = new HashMap<>();
+	
+	private final Map<L2PcInstance, Boolean> _gmList = new ConcurrentHashMap<>();
+	
+	private int _highestLevel = 0;
+	
+	protected AdminData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_accessLevels.clear();
+		_adminCommandAccessRights.clear();
+		parseDatapackFile("config/accessLevels.xml");
+		LOG.info("Loaded {} access levels.", _accessLevels.size());
+		parseDatapackFile("config/adminCommands.xml");
+		LOG.info("Loaded {} access commands.", _adminCommandAccessRights.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		NamedNodeMap attrs;
+		Node attr;
+		StatsSet set;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("access".equalsIgnoreCase(d.getNodeName())) {
+						set = new StatsSet();
+						attrs = d.getAttributes();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							attr = attrs.item(i);
+							set.set(attr.getNodeName(), attr.getNodeValue());
+						}
+						final L2AccessLevel level = new L2AccessLevel(set);
+						if (level.getLevel() > _highestLevel) {
+							_highestLevel = level.getLevel();
+						}
+						_accessLevels.put(level.getLevel(), level);
+					} else if ("admin".equalsIgnoreCase(d.getNodeName())) {
+						set = new StatsSet();
+						attrs = d.getAttributes();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							attr = attrs.item(i);
+							set.set(attr.getNodeName(), attr.getNodeValue());
+						}
+						final L2AdminCommandAccessRight command = new L2AdminCommandAccessRight(set);
+						_adminCommandAccessRights.put(command.getAdminCommand(), command);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Returns the access level by characterAccessLevel.
+	 * @param accessLevelNum as int
+	 * @return the access level instance by char access level
+	 */
+	public L2AccessLevel getAccessLevel(int accessLevelNum) {
+		if (accessLevelNum < 0) {
+			return _accessLevels.get(-1);
+		} else if (!_accessLevels.containsKey(accessLevelNum)) {
+			_accessLevels.put(accessLevelNum, new L2AccessLevel());
+		}
+		return _accessLevels.get(accessLevelNum);
+	}
+	
+	/**
+	 * Gets the master access level.
+	 * @return the master access level
+	 */
+	public L2AccessLevel getMasterAccessLevel() {
+		return _accessLevels.get(_highestLevel);
+	}
+	
+	/**
+	 * Checks for access level.
+	 * @param id the id
+	 * @return {@code true}, if successful, {@code false} otherwise
+	 */
+	public boolean hasAccessLevel(int id) {
+		return _accessLevels.containsKey(id);
+	}
+	
+	/**
+	 * Checks for access.
+	 * @param adminCommand the admin command
+	 * @param accessLevel the access level
+	 * @return {@code true}, if successful, {@code false} otherwise
+	 */
+	public boolean hasAccess(String adminCommand, L2AccessLevel accessLevel) {
+		L2AdminCommandAccessRight acar = _adminCommandAccessRights.get(adminCommand);
+		if (acar == null) {
+			// Trying to avoid the spam for next time when the gm would try to use the same command
+			if ((accessLevel.getLevel() > 0) && (accessLevel.getLevel() == _highestLevel)) {
+				acar = new L2AdminCommandAccessRight(adminCommand, true, accessLevel.getLevel());
+				_adminCommandAccessRights.put(adminCommand, acar);
+				LOG.info("No rights defined for admin command {} auto setting access level {}!", adminCommand, accessLevel.getLevel());
+			} else {
+				LOG.info("No rights defined for admin command {}!", adminCommand);
+				return false;
+			}
+		}
+		return acar.hasAccess(accessLevel);
+	}
+	
+	/**
+	 * Require confirm.
+	 * @param command the command
+	 * @return {@code true}, if the command require confirmation, {@code false} otherwise
+	 */
+	public boolean requireConfirm(String command) {
+		final L2AdminCommandAccessRight acar = _adminCommandAccessRights.get(command);
+		if (acar == null) {
+			LOG.info("No rights defined for admin command {}.", command);
+			return false;
+		}
+		return acar.getRequireConfirm();
+	}
+	
+	/**
+	 * Gets the all GMs.
+	 * @param includeHidden the include hidden
+	 * @return the all GMs
+	 */
+	public List<L2PcInstance> getAllGms(boolean includeHidden) {
+		final List<L2PcInstance> tmpGmList = new ArrayList<>();
+		for (Entry<L2PcInstance, Boolean> entry : _gmList.entrySet()) {
+			if (includeHidden || !entry.getValue()) {
+				tmpGmList.add(entry.getKey());
+			}
+		}
+		return tmpGmList;
+	}
+	
+	/**
+	 * Gets the all GM names.
+	 * @param includeHidden the include hidden
+	 * @return the all GM names
+	 */
+	public List<String> getAllGmNames(boolean includeHidden) {
+		final List<String> tmpGmList = new ArrayList<>();
+		for (Entry<L2PcInstance, Boolean> entry : _gmList.entrySet()) {
+			if (!entry.getValue()) {
+				tmpGmList.add(entry.getKey().getName());
+			} else if (includeHidden) {
+				tmpGmList.add(entry.getKey().getName() + " (invis)");
+			}
+		}
+		return tmpGmList;
+	}
+	
+	/**
+	 * Add a L2PcInstance player to the Set _gmList.
+	 * @param player the player
+	 * @param hidden the hidden
+	 */
+	public void addGm(L2PcInstance player, boolean hidden) {
+		_gmList.put(player, hidden);
+	}
+	
+	/**
+	 * Delete a GM.
+	 * @param player the player
+	 */
+	public void deleteGm(L2PcInstance player) {
+		_gmList.remove(player);
+	}
+	
+	/**
+	 * GM will be displayed on clients GM list.
+	 * @param player the player
+	 */
+	public void showGm(L2PcInstance player) {
+		if (_gmList.containsKey(player)) {
+			_gmList.put(player, false);
+		}
+	}
+	
+	/**
+	 * GM will no longer be displayed on clients GM list.
+	 * @param player the player
+	 */
+	public void hideGm(L2PcInstance player) {
+		if (_gmList.containsKey(player)) {
+			_gmList.put(player, true);
+		}
+	}
+	
+	/**
+	 * Checks if is GM online.
+	 * @param includeHidden the include hidden
+	 * @return true, if is GM online
+	 */
+	public boolean isGmOnline(boolean includeHidden) {
+		for (Entry<L2PcInstance, Boolean> entry : _gmList.entrySet()) {
+			if (includeHidden || !entry.getValue()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Send list to player.
+	 * @param player the player
+	 */
+	public void sendListToPlayer(L2PcInstance player) {
+		if (isGmOnline(player.isGM())) {
+			player.sendPacket(SystemMessageId.GM_LIST);
+			
+			for (String name : getAllGmNames(player.isGM())) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.GM_C1);
+				sm.addString(name);
+				player.sendPacket(sm);
+			}
+		} else {
+			player.sendPacket(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW);
+		}
+	}
+	
+	/**
+	 * Broadcast to GMs.
+	 * @param packet the packet
+	 */
+	public void broadcastToGMs(L2GameServerPacket packet) {
+		for (L2PcInstance gm : getAllGms(true)) {
+			gm.sendPacket(packet);
+		}
+	}
+	
+	/**
+	 * Broadcast message to GMs.
+	 * @param message the message
+	 */
+	public void broadcastMessageToGMs(String message) {
+		for (L2PcInstance gm : getAllGms(true)) {
+			gm.sendMessage(message);
+		}
+	}
+	
+	public static AdminData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AdminData INSTANCE = new AdminData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java
new file mode 100644
index 00000000..1e95558b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/ArmorSetsData.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.L2ArmorSet;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads armor set bonuses.
+ * @author godson
+ * @author Luno
+ * @author UnAfraid
+ */
+public final class ArmorSetsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ArmorSetsData.class);
+	
+	private final Map<Integer, L2ArmorSet> _armorSets = new HashMap<>();
+	
+	protected ArmorSetsData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_armorSets.clear();
+		parseDatapackDirectory("data/stats/armorsets", false);
+		LOG.info("Loaded {} armor sets.", _armorSets.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("set".equalsIgnoreCase(d.getNodeName())) {
+						final L2ArmorSet set = new L2ArmorSet();
+						for (Node a = d.getFirstChild(); a != null; a = a.getNextSibling()) {
+							final NamedNodeMap attrs = a.getAttributes();
+							switch (a.getNodeName()) {
+								case "chest" -> set.addChest(parseInteger(attrs, "id"));
+								case "feet" -> set.addFeet(parseInteger(attrs, "id"));
+								case "gloves" -> set.addGloves(parseInteger(attrs, "id"));
+								case "head" -> set.addHead(parseInteger(attrs, "id"));
+								case "legs" -> set.addLegs(parseInteger(attrs, "id"));
+								case "shield" -> set.addShield(parseInteger(attrs, "id"));
+								case "skill" -> set.addSkill(new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+								case "shield_skill" -> set.addShieldSkill(new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+								case "enchant6skill" -> set.addEnchant6Skill(new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+								case "con" -> set.addCon(parseInteger(attrs, "val"));
+								case "dex" -> set.addDex(parseInteger(attrs, "val"));
+								case "str" -> set.addStr(parseInteger(attrs, "val"));
+								case "men" -> set.addMen(parseInteger(attrs, "val"));
+								case "wit" -> set.addWit(parseInteger(attrs, "val"));
+								case "int" -> set.addInt(parseInteger(attrs, "val"));
+							}
+						}
+						_armorSets.put(set.getChestId(), set);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Checks if is armor set.
+	 * @param chestId the chest Id to verify.
+	 * @return {@code true} if the chest Id belongs to a registered armor set, {@code false} otherwise.
+	 */
+	public boolean isArmorSet(int chestId) {
+		return _armorSets.containsKey(chestId);
+	}
+	
+	/**
+	 * Gets the sets the.
+	 * @param chestId the chest Id identifying the armor set.
+	 * @return the armor set associated to the give chest Id.
+	 */
+	public L2ArmorSet getSet(int chestId) {
+		return _armorSets.get(chestId);
+	}
+	
+	public static ArmorSetsData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ArmorSetsData INSTANCE = new ArmorSetsData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java
new file mode 100644
index 00000000..6d5d7683
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/BuyListData.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.buylist.Product;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.util.IXmlReader;
+import com.l2jserver.gameserver.util.file.filter.NumericNameFilter;
+
+/**
+ * Loads buy lists for NPCs.
+ * @author NosBit
+ */
+public final class BuyListData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(BuyListData.class);
+	
+	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
+	
+	private final Map<Integer, L2BuyList> _buyLists = new HashMap<>();
+	
+	@Override
+	public synchronized void load() {
+		parseDatapackDirectory("data/buylists", false);
+		if (general().customBuyListLoad()) {
+			parseDatapackDirectory("data/buylists/custom", false);
+		}
+		
+		LOG.info("Loaded {} buy lists.", _buyLists.size());
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.createStatement();
+			var rs = statement.executeQuery("SELECT * FROM `buylists`")) {
+			while (rs.next()) {
+				int buyListId = rs.getInt("buylist_id");
+				int itemId = rs.getInt("item_id");
+				long count = rs.getLong("count");
+				long nextRestockTime = rs.getLong("next_restock_time");
+				final L2BuyList buyList = getBuyList(buyListId);
+				if (buyList == null) {
+					LOG.warn("Buy list {} found in database but not loaded from XML!", buyListId);
+					continue;
+				}
+				final Product product = buyList.getProductByItemId(itemId);
+				if (product == null) {
+					LOG.warn("Item Id {} found in database but not loaded from XML {}!", itemId, buyListId);
+					continue;
+				}
+				if (count < product.getMaxCount()) {
+					product.setCount(count);
+					product.restartRestockTask(nextRestockTime);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Failed to load buy list data from database.", ex);
+		}
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f) {
+		try {
+			final int buyListId = Integer.parseInt(f.getName().replaceAll(".xml", ""));
+			
+			for (Node node = doc.getFirstChild(); node != null; node = node.getNextSibling()) {
+				if ("list".equalsIgnoreCase(node.getNodeName())) {
+					final L2BuyList buyList = new L2BuyList(buyListId);
+					for (Node list_node = node.getFirstChild(); list_node != null; list_node = list_node.getNextSibling()) {
+						if ("item".equalsIgnoreCase(list_node.getNodeName())) {
+							long price = -1;
+							long restockDelay = -1;
+							long count = -1;
+							NamedNodeMap attrs = list_node.getAttributes();
+							Node attr = attrs.getNamedItem("id");
+							int itemId = Integer.parseInt(attr.getNodeValue());
+							attr = attrs.getNamedItem("price");
+							if (attr != null) {
+								price = Long.parseLong(attr.getNodeValue());
+							}
+							attr = attrs.getNamedItem("restock_delay");
+							if (attr != null) {
+								restockDelay = Long.parseLong(attr.getNodeValue());
+							}
+							attr = attrs.getNamedItem("count");
+							if (attr != null) {
+								count = Long.parseLong(attr.getNodeValue());
+							}
+							final L2Item item = ItemTable.getInstance().getTemplate(itemId);
+							if (item != null) {
+								buyList.addProduct(new Product(buyList.getListId(), item, price, 0, restockDelay, count));
+							} else {
+								LOG.warn("Item not found. BuyList: {} Item ID: {} File: {}", buyList.getListId(), itemId, f.getName());
+							}
+						} else if ("npcs".equalsIgnoreCase(list_node.getNodeName())) {
+							for (Node npcs_node = list_node.getFirstChild(); npcs_node != null; npcs_node = npcs_node.getNextSibling()) {
+								if ("npc".equalsIgnoreCase(npcs_node.getNodeName())) {
+									int npcId = Integer.parseInt(npcs_node.getTextContent());
+									buyList.addAllowedNpc(npcId);
+								}
+							}
+						}
+					}
+					_buyLists.put(buyList.getListId(), buyList);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Failed to load buy list data from XML {}!", f.getName(), ex);
+		}
+	}
+	
+	@Override
+	public FileFilter getCurrentFileFilter() {
+		return NUMERIC_FILTER;
+	}
+	
+	public L2BuyList getBuyList(int listId) {
+		return _buyLists.get(listId);
+	}
+	
+	public void addBuyList(L2BuyList buyList) {
+		_buyLists.put(buyList.getListId(), buyList);
+	}
+	
+	public static BuyListData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final BuyListData INSTANCE = new BuyListData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/CategoryData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/CategoryData.java
new file mode 100644
index 00000000..c633b4f2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/CategoryData.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads the category data with Class or NPC IDs.
+ * @author NosBit
+ * @author xban1x
+ */
+public final class CategoryData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CategoryData.class);
+	
+	private final Map<CategoryType, Set<Integer>> _categories = new HashMap<>();
+	
+	protected CategoryData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_categories.clear();
+		parseDatapackFile("data/categoryData.xml");
+		LOG.info("Loaded {} Categories.", _categories.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node node = doc.getFirstChild(); node != null; node = node.getNextSibling()) {
+			if ("list".equalsIgnoreCase(node.getNodeName())) {
+				for (Node list_node = node.getFirstChild(); list_node != null; list_node = list_node.getNextSibling()) {
+					if ("category".equalsIgnoreCase(list_node.getNodeName())) {
+						final NamedNodeMap attrs = list_node.getAttributes();
+						final CategoryType categoryType = CategoryType.findByName(attrs.getNamedItem("name").getNodeValue());
+						if (categoryType == null) {
+							LOG.warn("Can't find category by name :{}", attrs.getNamedItem("name").getNodeValue());
+							continue;
+						}
+						
+						final Set<Integer> ids = new HashSet<>();
+						for (Node category_node = list_node.getFirstChild(); category_node != null; category_node = category_node.getNextSibling()) {
+							if ("id".equalsIgnoreCase(category_node.getNodeName())) {
+								ids.add(Integer.parseInt(category_node.getTextContent()));
+							}
+						}
+						_categories.put(categoryType, ids);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Checks if ID is in category.
+	 * @param type the category type
+	 * @param classId the id to be checked
+	 * @return {@code true} if id is in category, {@code false} if id is not in category or category was not found
+	 */
+	public boolean isInCategory(CategoryType type, ClassId classId) {
+		return isInCategory(type, classId.getId());
+	}
+	
+	/**
+	 * Checks if ID is in category.
+	 * @param type The category type
+	 * @param id The id to be checked
+	 * @return {@code true} if id is in category, {@code false} if id is not in category or category was not found
+	 */
+	public boolean isInCategory(CategoryType type, int id) {
+		final Set<Integer> category = getCategoryByType(type);
+		if (category == null) {
+			LOG.warn("Can not find category type {}!", type);
+			return false;
+		}
+		return category.contains(id);
+	}
+	
+	/**
+	 * Gets the category by category type.
+	 * @param type The category type
+	 * @return A {@code Set} containing all the IDs in category if category is found, {@code null} if category was not found
+	 */
+	public Set<Integer> getCategoryByType(CategoryType type) {
+		return _categories.get(type);
+	}
+	
+	public static CategoryData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CategoryData INSTANCE = new CategoryData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java
new file mode 100644
index 00000000..9c8cfcfc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/ClassListData.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.base.ClassInfo;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads the the list of classes and it's info.
+ * @author Zoey76
+ */
+public final class ClassListData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ClassListData.class);
+	
+	private final Map<ClassId, ClassInfo> _classData = new HashMap<>();
+	
+	protected ClassListData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_classData.clear();
+		parseDatapackFile("data/stats/chars/classList.xml");
+		LOG.info("Loaded {} class data.", _classData.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equals(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					final NamedNodeMap attrs = d.getAttributes();
+					if ("class".equals(d.getNodeName())) {
+						Node attr = attrs.getNamedItem("classId");
+						final ClassId classId = ClassId.getClassId(parseInteger(attr));
+						attr = attrs.getNamedItem("name");
+						final String className = attr.getNodeValue();
+						attr = attrs.getNamedItem("parentClassId");
+						final ClassId parentClassId = (attr != null) ? ClassId.getClassId(parseInteger(attr)) : null;
+						_classData.put(classId, new ClassInfo(classId, className, parentClassId));
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the class list.
+	 * @return the complete class list
+	 */
+	public Map<ClassId, ClassInfo> getClassList() {
+		return _classData;
+	}
+	
+	/**
+	 * Gets the class info.
+	 * @param classId the class ID
+	 * @return the class info related to the given {@code classId}
+	 */
+	public ClassInfo getClass(ClassId classId) {
+		return _classData.get(classId);
+	}
+	
+	/**
+	 * Gets the class info.
+	 * @param classId the class Id as integer
+	 * @return the class info related to the given {@code classId}
+	 */
+	public ClassInfo getClass(int classId) {
+		final ClassId id = ClassId.getClassId(classId);
+		return (id != null) ? _classData.get(id) : null;
+	}
+	
+	public static ClassListData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ClassListData INSTANCE = new ClassListData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java
new file mode 100644
index 00000000..aacfad1a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/DoorData.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
+import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads doors.
+ * @author JIV
+ * @author GodKratos
+ * @author UnAfraid
+ */
+public class DoorData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DoorData.class);
+	
+	private static final Map<String, Set<Integer>> GROUPS = new HashMap<>();
+	
+	private final Map<Integer, L2DoorInstance> _doors = new HashMap<>();
+	
+	private final Map<String, L2DoorInstance> _doorsName = new HashMap<>();
+	
+	private final Map<Integer, StatsSet> _templates = new HashMap<>();
+	
+	private final Map<Integer, List<L2DoorInstance>> _regions = new HashMap<>();
+	
+	protected DoorData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_doors.clear();
+		_doorsName.clear();
+		GROUPS.clear();
+		_regions.clear();
+		parseDatapackFile("data/doors.xml");
+		LOG.info("Loaded {} door templates for {} regions.", _doors.size(), _regions.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node a = doc.getFirstChild(); a != null; a = a.getNextSibling()) {
+			if ("list".equalsIgnoreCase(a.getNodeName())) {
+				for (Node b = a.getFirstChild(); b != null; b = b.getNextSibling()) {
+					if ("door".equalsIgnoreCase(b.getNodeName())) {
+						final NamedNodeMap attrs = b.getAttributes();
+						final StatsSet set = new StatsSet();
+						set.set("baseHpMax", 1); // Avoid doors without HP value created dead due to default value 0 in L2CharTemplate
+						for (int i = 0; i < attrs.getLength(); i++) {
+							final Node att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						makeDoor(set);
+						_templates.put(set.getInt("id"), set);
+					}
+				}
+			}
+		}
+	}
+	
+	public void insertCollisionData(StatsSet set) {
+		int posX, posY, nodeX, nodeY, height;
+		height = set.getInt("height");
+		String[] pos = set.getString("node1").split(",");
+		nodeX = Integer.parseInt(pos[0]);
+		nodeY = Integer.parseInt(pos[1]);
+		pos = set.getString("node2").split(",");
+		posX = Integer.parseInt(pos[0]);
+		posY = Integer.parseInt(pos[1]);
+		int collisionRadius; // (max) radius for movement checks
+		collisionRadius = Math.min(Math.abs(nodeX - posX), Math.abs(nodeY - posY));
+		if (collisionRadius < 20) {
+			collisionRadius = 20;
+		}
+		
+		set.set("collisionRadius", collisionRadius);
+		set.set("collisionHeight", height);
+	}
+	
+	private void makeDoor(StatsSet set) {
+		insertCollisionData(set);
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var template = new L2DoorTemplate(set);
+		final var door = new L2DoorInstance(objectId, template);
+		door.setCurrentHp(door.getMaxHp());
+		door.spawnMe(template.getX(), template.getY(), template.getZ());
+		putDoor(door, MapRegionManager.getInstance().getMapRegionLocId(door));
+	}
+	
+	public StatsSet getDoorTemplate(int doorId) {
+		return _templates.get(doorId);
+	}
+	
+	public L2DoorInstance getDoor(int doorId) {
+		return _doors.get(doorId);
+	}
+	
+	public L2DoorInstance getDoorByName(String name) {
+		return _doorsName.get(name);
+	}
+	
+	public void putDoor(L2DoorInstance door, int region) {
+		_doors.put(door.getId(), door);
+		_doorsName.put(door.getDoorName(), door);
+		_regions.computeIfAbsent(region, _ -> new ArrayList<>()).add(door);
+	}
+	
+	public static void addDoorGroup(String groupName, int doorId) {
+		GROUPS.computeIfAbsent(groupName, _ -> new HashSet<>()).add(doorId);
+	}
+	
+	public static Set<Integer> getDoorsByGroup(String groupName) {
+		return GROUPS.get(groupName);
+	}
+	
+	public Collection<L2DoorInstance> getDoors() {
+		return _doors.values();
+	}
+	
+	public boolean checkIfDoorsBetween(AbstractNodeLoc start, AbstractNodeLoc end, int instanceId) {
+		return checkIfDoorsBetween(start.getX(), start.getY(), start.getZ(), end.getX(), end.getY(), end.getZ(), instanceId);
+	}
+	
+	public boolean checkIfDoorsBetween(int x, int y, int z, int tx, int ty, int tz, int instanceId) {
+		return checkIfDoorsBetween(x, y, z, tx, ty, tz, instanceId, false);
+	}
+	
+	/**
+	 * GodKratos: TODO: remove GeoData checks from door table and convert door nodes to Geo zones
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param tx
+	 * @param ty
+	 * @param tz
+	 * @param instanceId
+	 * @param doubleFaceCheck
+	 * @return {@code boolean}
+	 */
+	public boolean checkIfDoorsBetween(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean doubleFaceCheck) {
+		Collection<L2DoorInstance> allDoors;
+		if ((instanceId > 0) && (InstanceManager.getInstance().getInstance(instanceId) != null)) {
+			allDoors = InstanceManager.getInstance().getInstance(instanceId).getDoors();
+		} else {
+			allDoors = _regions.get(MapRegionManager.getInstance().getMapRegionLocId(x, y));
+		}
+		
+		if (allDoors == null) {
+			return false;
+		}
+		
+		for (L2DoorInstance doorInst : allDoors) {
+			// check dead and open
+			if (doorInst.isDead() || doorInst.getOpen() || !doorInst.checkCollision() || (doorInst.getX(0) == 0)) {
+				continue;
+			}
+			
+			boolean intersectFace = false;
+			for (int i = 0; i < 4; i++) {
+				int j = (i + 1) < 4 ? i + 1 : 0;
+				// lower part of the multiplier fraction, if it is 0 we avoid an error and also know that the lines are parallel
+				int denominator = ((ty - y) * (doorInst.getX(i) - doorInst.getX(j))) - ((tx - x) * (doorInst.getY(i) - doorInst.getY(j)));
+				if (denominator == 0) {
+					continue;
+				}
+				
+				// multipliers to the equations of the lines. If they are lower than 0 or bigger than 1, we know that segments don't intersect
+				float multiplier1 = (float) (((doorInst.getX(j) - doorInst.getX(i)) * (y - doorInst.getY(i))) - ((doorInst.getY(j) - doorInst.getY(i)) * (x - doorInst.getX(i)))) / denominator;
+				float multiplier2 = (float) (((tx - x) * (y - doorInst.getY(i))) - ((ty - y) * (x - doorInst.getX(i)))) / denominator;
+				if ((multiplier1 >= 0) && (multiplier1 <= 1) && (multiplier2 >= 0) && (multiplier2 <= 1)) {
+					int intersectZ = Math.round(z + (multiplier1 * (tz - z)));
+					// now checking if the resulting point is between door's min and max z
+					if ((intersectZ > doorInst.getZMin()) && (intersectZ < doorInst.getZMax())) {
+						if (!doubleFaceCheck || intersectFace) {
+							return true;
+						}
+						intersectFace = true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	public static DoorData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final DoorData INSTANCE = new DoorData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemData.java
new file mode 100644
index 00000000..01c1dfaf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemData.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
+import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads item enchant data.
+ * @author UnAfraid
+ */
+public class EnchantItemData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantItemData.class);
+	
+	private final Map<Integer, EnchantScroll> _scrolls = new HashMap<>();
+	
+	private final Map<Integer, EnchantSupportItem> _supports = new HashMap<>();
+	
+	public EnchantItemData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_scrolls.clear();
+		_supports.clear();
+		parseDatapackFile("data/enchantItemData.xml");
+		LOG.info("Loaded {} enchant scrolls.", _scrolls.size());
+		LOG.info("Loaded {} support items.", _supports.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		StatsSet set;
+		Node att;
+		NamedNodeMap attrs;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("enchant".equalsIgnoreCase(d.getNodeName())) {
+						attrs = d.getAttributes();
+						set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						
+						try {
+							final EnchantScroll item = new EnchantScroll(set);
+							for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+								if ("item".equalsIgnoreCase(cd.getNodeName())) {
+									item.addItem(parseInteger(cd.getAttributes(), "id"));
+								}
+							}
+							_scrolls.put(item.getId(), item);
+						} catch (NullPointerException e) {
+							LOG.warn("Nonexistent enchant scroll: {} defined in enchant data!", set.getString("id"));
+						} catch (IllegalAccessError e) {
+							LOG.warn("Wrong enchant scroll item type: {} defined in enchant data!", set.getString("id"));
+						}
+					} else if ("support".equalsIgnoreCase(d.getNodeName())) {
+						attrs = d.getAttributes();
+						set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						
+						try {
+							final EnchantSupportItem item = new EnchantSupportItem(set);
+							_supports.put(item.getId(), item);
+						} catch (NullPointerException e) {
+							LOG.warn("Nonexistent enchant support item: {} defined in enchant data!", set.getString("id"));
+						} catch (IllegalAccessError e) {
+							LOG.warn("Wrong enchant support item type: {} defined in enchant data!", set.getString("id"));
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the enchant scroll.
+	 * @param scroll the scroll
+	 * @return enchant template for scroll
+	 */
+	public final EnchantScroll getEnchantScroll(L2ItemInstance scroll) {
+		return _scrolls.get(scroll.getId());
+	}
+	
+	/**
+	 * Gets the support item.
+	 * @param item the item
+	 * @return enchant template for support item
+	 */
+	public final EnchantSupportItem getSupportItem(L2ItemInstance item) {
+		return _supports.get(item.getId());
+	}
+	
+	/**
+	 * Gets the single instance of EnchantItemData.
+	 * @return single instance of EnchantItemData
+	 */
+	public static EnchantItemData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EnchantItemData _instance = new EnchantItemData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java
new file mode 100644
index 00000000..9d947f53
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemGroupsData.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.holders.RangeChanceHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.enchant.EnchantItemGroup;
+import com.l2jserver.gameserver.model.items.enchant.EnchantRateItem;
+import com.l2jserver.gameserver.model.items.enchant.EnchantScrollGroup;
+import com.l2jserver.gameserver.util.IXmlReader;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Enchant Item Group data.
+ * @author UnAfraid
+ */
+public final class EnchantItemGroupsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantItemGroupsData.class);
+	
+	private final Map<String, EnchantItemGroup> _itemGroups = new HashMap<>();
+	
+	private final Map<Integer, EnchantScrollGroup> _scrollGroups = new HashMap<>();
+	
+	protected EnchantItemGroupsData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_itemGroups.clear();
+		_scrollGroups.clear();
+		parseDatapackFile("data/enchantItemGroups.xml");
+		LOG.info("Loaded {} item group templates.", _itemGroups.size());
+		LOG.info("Loaded {} scroll group templates.", _scrollGroups.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("enchantRateGroup".equalsIgnoreCase(d.getNodeName())) {
+						final String name = parseString(d.getAttributes(), "name");
+						final EnchantItemGroup group = new EnchantItemGroup(name);
+						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+							if ("current".equalsIgnoreCase(cd.getNodeName())) {
+								String range = parseString(cd.getAttributes(), "enchant");
+								double chance = parseDouble(cd.getAttributes(), "chance");
+								int min = -1;
+								int max = 0;
+								if (range.contains("-")) {
+									String[] split = range.split("-");
+									if ((split.length == 2) && Util.isDigit(split[0]) && Util.isDigit(split[1])) {
+										min = Integer.parseInt(split[0]);
+										max = Integer.parseInt(split[1]);
+									}
+								} else if (Util.isDigit(range)) {
+									min = Integer.parseInt(range);
+									max = min;
+								}
+								if ((min > -1) && (max > 0)) {
+									group.addChance(new RangeChanceHolder(min, max, chance));
+								}
+							}
+						}
+						_itemGroups.put(name, group);
+					} else if ("enchantScrollGroup".equals(d.getNodeName())) {
+						int id = parseInteger(d.getAttributes(), "id");
+						final EnchantScrollGroup group = new EnchantScrollGroup(id);
+						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+							if ("enchantRate".equalsIgnoreCase(cd.getNodeName())) {
+								final EnchantRateItem rateGroup = new EnchantRateItem(parseString(cd.getAttributes(), "group"));
+								for (Node z = cd.getFirstChild(); z != null; z = z.getNextSibling()) {
+									if ("item".equals(z.getNodeName())) {
+										final NamedNodeMap attrs = z.getAttributes();
+										if (attrs.getNamedItem("slot") != null) {
+											rateGroup.addSlot(ItemTable.SLOTS.get(parseString(attrs, "slot")));
+										}
+										if (attrs.getNamedItem("magicWeapon") != null) {
+											rateGroup.setMagicWeapon(parseBoolean(attrs, "magicWeapon"));
+										}
+										if (attrs.getNamedItem("id") != null) {
+											rateGroup.setItemId(parseInteger(attrs, "id"));
+										}
+									}
+								}
+								group.addRateGroup(rateGroup);
+							}
+						}
+						_scrollGroups.put(id, group);
+					}
+				}
+			}
+		}
+	}
+	
+	public EnchantItemGroup getItemGroup(L2Item item, int scrollGroup) {
+		final EnchantScrollGroup group = _scrollGroups.get(scrollGroup);
+		final EnchantRateItem rateGroup = group.getRateGroup(item);
+		return rateGroup != null ? _itemGroups.get(rateGroup.getName()) : null;
+	}
+	
+	public EnchantItemGroup getItemGroup(String name) {
+		return _itemGroups.get(name);
+	}
+	
+	public EnchantScrollGroup getScrollGroup(int id) {
+		return _scrollGroups.get(id);
+	}
+	
+	public static EnchantItemGroupsData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EnchantItemGroupsData _instance = new EnchantItemGroupsData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java
new file mode 100644
index 00000000..547c42aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemHPBonusData.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.StatFunction;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Enchant HP Bonus data parser.
+ * @author MrPoke
+ * @author Zoey76
+ */
+public class EnchantItemHPBonusData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantItemHPBonusData.class);
+	
+	private static final float FULL_ARMOR_MODIFIER = 1.5f; // TODO: Move it to config!
+	
+	private final Map<CrystalType, List<Integer>> _armorHPBonuses = new EnumMap<>(CrystalType.class);
+	
+	protected EnchantItemHPBonusData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_armorHPBonuses.clear();
+		parseDatapackFile("data/stats/enchantHPBonus.xml");
+		LOG.info("Loaded {} Enchant HP Bonuses.", _armorHPBonuses.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("enchantHP".equalsIgnoreCase(d.getNodeName())) {
+						final List<Integer> bonuses = new ArrayList<>(12);
+						for (Node e = d.getFirstChild(); e != null; e = e.getNextSibling()) {
+							if ("bonus".equalsIgnoreCase(e.getNodeName())) {
+								bonuses.add(Integer.parseInt(e.getTextContent()));
+							}
+						}
+						_armorHPBonuses.put(parseEnum(d.getAttributes(), CrystalType.class, "grade"), bonuses);
+					}
+				}
+			}
+		}
+		
+		if (!_armorHPBonuses.isEmpty()) {
+			final ItemTable it = ItemTable.getInstance();
+			// Armors
+			final Collection<Integer> armorIds = it.getAllArmorsId();
+			for (Integer itemId : armorIds) {
+				L2Item item = it.getTemplate(itemId);
+				if ((item != null) && (item.getCrystalType() != CrystalType.NONE)) {
+					switch (item.getBodyPart()) {
+						case L2Item.SLOT_CHEST:
+						case L2Item.SLOT_FEET:
+						case L2Item.SLOT_GLOVES:
+						case L2Item.SLOT_HEAD:
+						case L2Item.SLOT_LEGS:
+						case L2Item.SLOT_BACK:
+						case L2Item.SLOT_FULL_ARMOR:
+						case L2Item.SLOT_UNDERWEAR:
+						case L2Item.SLOT_L_HAND:
+						case L2Item.SLOT_BELT:
+							item.attach(new FuncTemplate(null, null, StatFunction.ENCHANTHP.getName(), -1, Stats.MAX_HP, 0));
+							break;
+						default:
+							break;
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the HP bonus.
+	 * @param item the item
+	 * @return the HP bonus
+	 */
+	public final int getHPBonus(L2ItemInstance item) {
+		final List<Integer> values = _armorHPBonuses.get(item.getItem().getItemGradeSPlus());
+		if ((values == null) || values.isEmpty() || (item.getOlyEnchantLevel() <= 0)) {
+			return 0;
+		}
+		
+		final int bonus = values.get(Math.min(item.getOlyEnchantLevel(), values.size()) - 1);
+		if (item.getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) {
+			return (int) (bonus * FULL_ARMOR_MODIFIER);
+		}
+		return bonus;
+	}
+	
+	public static EnchantItemHPBonusData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EnchantItemHPBonusData INSTANCE = new EnchantItemHPBonusData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java
new file mode 100644
index 00000000..381c0727
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantItemOptionsData.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.options.EnchantOptions;
+import com.l2jserver.gameserver.util.IXmlReader;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author UnAfraid
+ */
+public class EnchantItemOptionsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantItemOptionsData.class);
+	
+	private final Map<Integer, Map<Integer, EnchantOptions>> _data = new HashMap<>();
+	
+	protected EnchantItemOptionsData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_data.clear();
+		parseDatapackFile("data/enchantItemOptions.xml");
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		int counter = 0;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("item".equalsIgnoreCase(d.getNodeName())) {
+						int itemId = parseInteger(d.getAttributes(), "id");
+						if (!_data.containsKey(itemId)) {
+							_data.put(itemId, new HashMap<>());
+						}
+						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+							if ("options".equalsIgnoreCase(cd.getNodeName())) {
+								final EnchantOptions op = new EnchantOptions(parseInteger(cd.getAttributes(), "level"));
+								_data.get(itemId).put(op.getLevel(), op);
+								
+								for (byte i = 0; i < 3; i++) {
+									final Node att = cd.getAttributes().getNamedItem("option" + (i + 1));
+									if ((att != null) && Util.isDigit(att.getNodeValue())) {
+										op.setOption(i, parseInteger(att));
+									}
+								}
+								counter++;
+							}
+						}
+					}
+				}
+			}
+		}
+		LOG.info("Loaded {} items and {} options.", _data.size(), counter);
+	}
+	
+	public EnchantOptions getOptions(int itemId, int enchantLevel) {
+		if (!_data.containsKey(itemId) || !_data.get(itemId).containsKey(enchantLevel)) {
+			return null;
+		}
+		return _data.get(itemId).get(enchantLevel);
+	}
+	
+	public EnchantOptions getOptions(L2ItemInstance item) {
+		return item != null ? getOptions(item.getId(), item.getEnchantLevel()) : null;
+	}
+	
+	public static EnchantItemOptionsData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EnchantItemOptionsData _instance = new EnchantItemOptionsData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java
new file mode 100644
index 00000000..8dc66b32
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/EnchantSkillGroupsData.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Enchant skill group data parser.
+ * @author Micr0
+ */
+public class EnchantSkillGroupsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantSkillGroupsData.class);
+	
+	public static final int NORMAL_ENCHANT_BOOK = 6622;
+	
+	public static final int SAFE_ENCHANT_BOOK = 9627;
+	
+	public static final int CHANGE_ENCHANT_BOOK = 9626;
+	
+	public static final int UNTRAIN_ENCHANT_BOOK = 9625;
+	
+	private final Map<Integer, L2EnchantSkillGroup> _enchantSkillGroups = new HashMap<>();
+	
+	private final Map<Integer, L2EnchantSkillLearn> _enchantSkillTrees = new HashMap<>();
+	
+	protected EnchantSkillGroupsData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_enchantSkillGroups.clear();
+		_enchantSkillTrees.clear();
+		parseDatapackFile("data/enchantSkillGroups.xml");
+		int routes = 0;
+		for (L2EnchantSkillGroup group : _enchantSkillGroups.values()) {
+			routes += group.getEnchantGroupDetails().size();
+		}
+		LOG.info("Loaded {} groups and {} routes.", _enchantSkillGroups.size(), routes);
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("group".equalsIgnoreCase(d.getNodeName())) {
+						NamedNodeMap attrs = d.getAttributes();
+						final int id = parseInteger(attrs, "id");
+						L2EnchantSkillGroup group = _enchantSkillGroups.get(id);
+						if (group == null) {
+							group = new L2EnchantSkillGroup(id);
+							_enchantSkillGroups.put(id, group);
+						}
+						
+						for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling()) {
+							if ("enchant".equalsIgnoreCase(b.getNodeName())) {
+								attrs = b.getAttributes();
+								StatsSet set = new StatsSet();
+								
+								for (int i = 0; i < attrs.getLength(); i++) {
+									Node att = attrs.item(i);
+									set.set(att.getNodeName(), att.getNodeValue());
+								}
+								group.addEnchantDetail(new EnchantSkillHolder(set));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Adds the new route for skill.
+	 * @param skillId the skill id
+	 * @param maxLvL the max lvl
+	 * @param route the route
+	 * @param group the group
+	 * @return the int
+	 */
+	public int addNewRouteForSkill(int skillId, int maxLvL, int route, int group) {
+		L2EnchantSkillLearn enchantableSkill = _enchantSkillTrees.get(skillId);
+		if (enchantableSkill == null) {
+			enchantableSkill = new L2EnchantSkillLearn(skillId, maxLvL);
+			_enchantSkillTrees.put(skillId, enchantableSkill);
+		}
+		if (_enchantSkillGroups.containsKey(group)) {
+			enchantableSkill.addNewEnchantRoute(route, group);
+			
+			return _enchantSkillGroups.get(group).getEnchantGroupDetails().size();
+		}
+		LOG.error("There has been an error while loading generating enchant skill Id {}, route {} and group {}!", skillId, route, group);
+		return 0;
+	}
+	
+	/**
+	 * Gets the skill enchantment for skill.
+	 * @param skill the skill
+	 * @return the skill enchantment for skill
+	 */
+	public L2EnchantSkillLearn getSkillEnchantmentForSkill(Skill skill) {
+		// there is enchantment for this skill and we have the required level of it
+		final L2EnchantSkillLearn esl = getSkillEnchantmentBySkillId(skill.getId());
+		if ((esl != null) && (skill.getLevel() >= esl.getBaseLevel())) {
+			return esl;
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the skill enchantment by skill id.
+	 * @param skillId the skill id
+	 * @return the skill enchantment by skill id
+	 */
+	public L2EnchantSkillLearn getSkillEnchantmentBySkillId(int skillId) {
+		return _enchantSkillTrees.get(skillId);
+	}
+	
+	/**
+	 * Gets the enchant skill group by id.
+	 * @param id the id
+	 * @return the enchant skill group by id
+	 */
+	public L2EnchantSkillGroup getEnchantSkillGroupById(int id) {
+		return _enchantSkillGroups.get(id);
+	}
+	
+	/**
+	 * Gets the enchant skill sp cost.
+	 * @param skill the skill
+	 * @return the enchant skill sp cost
+	 */
+	public int getEnchantSkillSpCost(Skill skill) {
+		final L2EnchantSkillLearn enchantSkillLearn = _enchantSkillTrees.get(skill.getId());
+		if (enchantSkillLearn != null) {
+			final EnchantSkillHolder esh = enchantSkillLearn.getEnchantSkillHolder(skill.getLevel());
+			if (esh != null) {
+				return esh.getSpCost();
+			}
+		}
+		return Integer.MAX_VALUE;
+	}
+	
+	/**
+	 * Gets the enchant skill Adena cost.
+	 * @param skill the skill
+	 * @return the enchant skill Adena cost
+	 */
+	public int getEnchantSkillAdenaCost(Skill skill) {
+		final L2EnchantSkillLearn enchantSkillLearn = _enchantSkillTrees.get(skill.getId());
+		if (enchantSkillLearn != null) {
+			final EnchantSkillHolder esh = enchantSkillLearn.getEnchantSkillHolder(skill.getLevel());
+			if (esh != null) {
+				return esh.getAdenaCost();
+			}
+		}
+		return Integer.MAX_VALUE;
+	}
+	
+	/**
+	 * Gets the enchant skill rate.
+	 * @param player the player
+	 * @param skill the skill
+	 * @return the enchant skill rate
+	 */
+	public byte getEnchantSkillRate(L2PcInstance player, Skill skill) {
+		final L2EnchantSkillLearn enchantSkillLearn = _enchantSkillTrees.get(skill.getId());
+		if (enchantSkillLearn != null) {
+			final EnchantSkillHolder esh = enchantSkillLearn.getEnchantSkillHolder(skill.getLevel());
+			if (esh != null) {
+				return esh.getRate(player);
+			}
+		}
+		return 0;
+	}
+	
+	public static EnchantSkillGroupsData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EnchantSkillGroupsData INSTANCE = new EnchantSkillGroupsData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishData.java
new file mode 100644
index 00000000..9321baff
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishData.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.fishing.L2Fish;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Fish data parser.
+ * @author nonom
+ */
+public final class FishData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FishData.class);
+	
+	private final Map<Integer, L2Fish> _fishNormal = new HashMap<>();
+	
+	private final Map<Integer, L2Fish> _fishEasy = new HashMap<>();
+	
+	private final Map<Integer, L2Fish> _fishHard = new HashMap<>();
+	
+	protected FishData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_fishEasy.clear();
+		_fishNormal.clear();
+		_fishHard.clear();
+		parseDatapackFile("data/stats/fishing/fishes.xml");
+		LOG.info("Loaded {} fish.", (_fishEasy.size() + _fishNormal.size() + _fishHard.size()));
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("fish".equalsIgnoreCase(d.getNodeName())) {
+						final NamedNodeMap attrs = d.getAttributes();
+						
+						final StatsSet set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							final Node att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						
+						final L2Fish fish = new L2Fish(set);
+						switch (fish.getFishGrade()) {
+							case 0 -> _fishEasy.put(fish.getFishId(), fish);
+							case 1 -> _fishNormal.put(fish.getFishId(), fish);
+							case 2 -> _fishHard.put(fish.getFishId(), fish);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the fish.
+	 * @param level the fish Level
+	 * @param group the fish Group
+	 * @param grade the fish Grade
+	 * @return List of Fish that can be fished
+	 */
+	public List<L2Fish> getFish(int level, int group, int grade) {
+		final ArrayList<L2Fish> result = new ArrayList<>();
+		Map<Integer, L2Fish> fish;
+		switch (grade) {
+			case 0 -> fish = _fishEasy;
+			case 1 -> fish = _fishNormal;
+			case 2 -> fish = _fishHard;
+			default -> {
+				LOG.warn("Unmanaged fish grade!");
+				return result;
+			}
+		}
+		
+		for (L2Fish f : fish.values()) {
+			if ((f.getFishLevel() != level) || (f.getFishGroup() != group)) {
+				continue;
+			}
+			result.add(f);
+		}
+		
+		if (result.isEmpty()) {
+			LOG.warn("Cannot find any fish for level: {} group: {} and grade: {}!", level, group, grade);
+		}
+		return result;
+	}
+	
+	public static FishData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FishData INSTANCE = new FishData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingMonstersData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingMonstersData.java
new file mode 100644
index 00000000..3f1fd25e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingMonstersData.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.fishing.L2FishingMonster;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Fishing monsters data parser.
+ * @author nonom
+ */
+public final class FishingMonstersData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FishingMonstersData.class);
+	
+	private final Map<Integer, L2FishingMonster> _fishingMonstersData = new HashMap<>();
+	
+	protected FishingMonstersData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_fishingMonstersData.clear();
+		parseDatapackFile("data/stats/fishing/fishingMonsters.xml");
+		LOG.info("Loaded {} fishing monsters.", _fishingMonstersData.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("fishingMonster".equalsIgnoreCase(d.getNodeName())) {
+						
+						final NamedNodeMap attrs = d.getAttributes();
+						final StatsSet set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							final Node att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						
+						final L2FishingMonster fishingMonster = new L2FishingMonster(set);
+						_fishingMonstersData.put(fishingMonster.getFishingMonsterId(), fishingMonster);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the fishing monster.
+	 * @param lvl the fisherman level
+	 * @return a fishing monster given the fisherman level
+	 */
+	public L2FishingMonster getFishingMonster(int lvl) {
+		for (L2FishingMonster fishingMonster : _fishingMonstersData.values()) {
+			if ((lvl >= fishingMonster.getUserMinLevel()) && (lvl <= fishingMonster.getUserMaxLevel())) {
+				return fishingMonster;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the fishing monster by Id.
+	 * @param id the fishing monster Id
+	 * @return the fishing monster by Id
+	 */
+	public L2FishingMonster getFishingMonsterById(int id) {
+		if (_fishingMonstersData.containsKey(id)) {
+			return _fishingMonstersData.get(id);
+		}
+		return null;
+	}
+	
+	public static FishingMonstersData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FishingMonstersData INSTANCE = new FishingMonstersData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingRodsData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingRodsData.java
new file mode 100644
index 00000000..fedfba41
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/FishingRodsData.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.fishing.L2FishingRod;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Fishing rods data parser.
+ * @author nonom
+ */
+public final class FishingRodsData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FishingRodsData.class);
+	
+	private final Map<Integer, L2FishingRod> _fishingRods = new HashMap<>();
+	
+	protected FishingRodsData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_fishingRods.clear();
+		parseDatapackFile("data/stats/fishing/fishingRods.xml");
+		LOG.info("Loaded {} fishing rods.", _fishingRods.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("fishingRod".equalsIgnoreCase(d.getNodeName())) {
+						final NamedNodeMap attrs = d.getAttributes();
+						final StatsSet set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							final Node att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						
+						final L2FishingRod fishingRod = new L2FishingRod(set);
+						_fishingRods.put(fishingRod.getFishingRodItemId(), fishingRod);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the fishing rod.
+	 * @param itemId the item id
+	 * @return A fishing Rod by Item Id
+	 */
+	public L2FishingRod getFishingRod(int itemId) {
+		return _fishingRods.get(itemId);
+	}
+	
+	public static FishingRodsData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FishingRodsData INSTANCE = new FishingRodsData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/HennaData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/HennaData.java
new file mode 100644
index 00000000..d03dd60f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/HennaData.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Henna data parser.<br>
+ * Cost and required amount to add the henna to the player.<br>
+ * Cost and retrieved amount for removing the henna from the player.<br>
+ * Allowed classes to wear each henna.
+ * @author Zoey76
+ */
+public final class HennaData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(HennaData.class);
+	
+	private final Map<Integer, L2Henna> _hennaList = new HashMap<>();
+	
+	protected HennaData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_hennaList.clear();
+		parseDatapackFile("data/stats/hennaList.xml");
+		LOG.info("Loaded {} Henna data.", _hennaList.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equals(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("henna".equals(d.getNodeName())) {
+						parseHenna(d);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Parses the henna.
+	 * @param d the d
+	 */
+	private void parseHenna(Node d) {
+		final StatsSet set = new StatsSet();
+		final List<ClassId> wearClassIds = new ArrayList<>();
+		NamedNodeMap attrs = d.getAttributes();
+		Node attr;
+		for (int i = 0; i < attrs.getLength(); i++) {
+			attr = attrs.item(i);
+			set.set(attr.getNodeName(), attr.getNodeValue());
+		}
+		
+		for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+			final String name = c.getNodeName();
+			attrs = c.getAttributes();
+			switch (name) {
+				case "stats" -> {
+					for (int i = 0; i < attrs.getLength(); i++) {
+						attr = attrs.item(i);
+						set.set(attr.getNodeName(), attr.getNodeValue());
+					}
+				}
+				case "wear" -> {
+					attr = attrs.getNamedItem("count");
+					set.set("wear_count", attr.getNodeValue());
+					attr = attrs.getNamedItem("fee");
+					set.set("wear_fee", attr.getNodeValue());
+				}
+				case "cancel" -> {
+					attr = attrs.getNamedItem("count");
+					set.set("cancel_count", attr.getNodeValue());
+					attr = attrs.getNamedItem("fee");
+					set.set("cancel_fee", attr.getNodeValue());
+				}
+				case "classId" -> wearClassIds.add(ClassId.getClassId(Integer.parseInt(c.getTextContent())));
+			}
+		}
+		final L2Henna henna = new L2Henna(set);
+		henna.setWearClassIds(wearClassIds);
+		_hennaList.put(henna.getDyeId(), henna);
+	}
+	
+	/**
+	 * Gets the henna.
+	 * @param id of the dye.
+	 * @return the dye with that id.
+	 */
+	public L2Henna getHenna(int id) {
+		return _hennaList.get(id);
+	}
+	
+	/**
+	 * Gets the henna list.
+	 * @param classId the player's class Id.
+	 * @return the list with all the allowed dyes.
+	 */
+	public List<L2Henna> getHennaList(ClassId classId) {
+		final List<L2Henna> list = new ArrayList<>();
+		for (L2Henna henna : _hennaList.values()) {
+			if (henna.isAllowedClass(classId)) {
+				list.add(henna);
+			}
+		}
+		return list;
+	}
+	
+	public static HennaData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final HennaData INSTANCE = new HennaData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java
new file mode 100644
index 00000000..dbe68aa4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/HitConditionBonusData.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Hit condition bonuses parser.
+ * @author Nik
+ */
+public final class HitConditionBonusData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(HitConditionBonusData.class);
+	
+	private int frontBonus = 0;
+	
+	private int sideBonus = 0;
+	
+	private int backBonus = 0;
+	
+	private int highBonus = 0;
+	
+	private int lowBonus = 0;
+	
+	private int darkBonus = 0;
+	
+	private int rainBonus = 0;
+	
+	protected HitConditionBonusData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		parseDatapackFile("data/stats/hitConditionBonus.xml");
+		LOG.info("Loaded Hit Condition bonuses.");
+		LOG.debug("Front bonus {}.", frontBonus);
+		LOG.debug("Side bonus {}.", sideBonus);
+		LOG.debug("Back bonus {}.", backBonus);
+		LOG.debug("High bonus {}.", highBonus);
+		LOG.debug("Low bonus {}.", lowBonus);
+		LOG.debug("Dark bonus {}.", darkBonus);
+		LOG.debug("Rain bonus {}.", rainBonus);
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node d = doc.getFirstChild().getFirstChild(); d != null; d = d.getNextSibling()) {
+			NamedNodeMap attrs = d.getAttributes();
+			switch (d.getNodeName()) {
+				case "front" -> frontBonus = parseInteger(attrs, "val");
+				case "side" -> sideBonus = parseInteger(attrs, "val");
+				case "back" -> backBonus = parseInteger(attrs, "val");
+				case "high" -> highBonus = parseInteger(attrs, "val");
+				case "low" -> lowBonus = parseInteger(attrs, "val");
+				case "dark" -> darkBonus = parseInteger(attrs, "val");
+				case "rain" -> rainBonus = parseInteger(attrs, "val");
+			}
+		}
+	}
+	
+	/**
+	 * Gets the condition bonus.
+	 * @param attacker the attacking character.
+	 * @param target the attacked character.
+	 * @return the bonus of the attacker against the target.
+	 */
+	public double getConditionBonus(L2Character attacker, L2Character target) {
+		double mod = 100;
+		// Get high or low bonus
+		if ((attacker.getZ() - target.getZ()) > 50) {
+			mod += highBonus;
+		} else if ((attacker.getZ() - target.getZ()) < -50) {
+			mod += lowBonus;
+		}
+		
+		// Get weather bonus
+		if (GameTimeController.getInstance().isNight()) {
+			mod += darkBonus;
+			// else if () No rain support yet.
+			// chance += hitConditionBonus.rainBonus;
+		}
+		
+		// Get side bonus
+		if (attacker.isBehindTarget()) {
+			mod += backBonus;
+		} else if (attacker.isInFrontOfTarget()) {
+			mod += frontBonus;
+		} else {
+			mod += sideBonus;
+		}
+		
+		// If (mod / 100) is less than 0, return 0, because we can't lower more than 100%.
+		return Math.max(mod / 100, 0);
+	}
+	
+	public static HitConditionBonusData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final HitConditionBonusData INSTANCE = new HitConditionBonusData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java
new file mode 100644
index 00000000..ceae7ea3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialEquipmentData.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.items.PcItemTemplate;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class holds the Initial Equipment information.<br>
+ * What items get each newly created character and if this item is equipped upon creation (<b>Requires the item to be equippable</b>).
+ * @author Zoey76
+ */
+public final class InitialEquipmentData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(InitialEquipmentData.class);
+	
+	private static final String NORMAL = "data/stats/initialEquipment.xml";
+	
+	private static final String EVENT = "data/stats/initialEquipmentEvent.xml";
+	
+	private final Map<ClassId, List<PcItemTemplate>> _initialEquipmentList = new HashMap<>();
+	
+	protected InitialEquipmentData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_initialEquipmentList.clear();
+		parseDatapackFile(character().initialEquipmentEvent() ? EVENT : NORMAL);
+		LOG.info("Loaded {} initial equipment data.", _initialEquipmentList.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("equipment".equalsIgnoreCase(d.getNodeName())) {
+						parseEquipment(d);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Parses the equipment.
+	 * @param d parse an initial equipment and add it to {@link #_initialEquipmentList}
+	 */
+	private void parseEquipment(Node d) {
+		NamedNodeMap attrs = d.getAttributes();
+		final ClassId classId = ClassId.getClassId(Integer.parseInt(attrs.getNamedItem("classId").getNodeValue()));
+		final List<PcItemTemplate> equipList = new ArrayList<>();
+		for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+			if ("item".equalsIgnoreCase(c.getNodeName())) {
+				final StatsSet set = new StatsSet();
+				attrs = c.getAttributes();
+				for (int i = 0; i < attrs.getLength(); i++) {
+					Node attr = attrs.item(i);
+					set.set(attr.getNodeName(), attr.getNodeValue());
+				}
+				equipList.add(new PcItemTemplate(set));
+			}
+		}
+		_initialEquipmentList.put(classId, equipList);
+	}
+	
+	/**
+	 * Gets the equipment list.
+	 * @param cId the class Id for the required initial equipment.
+	 * @return the initial equipment for the given class Id.
+	 */
+	public List<PcItemTemplate> getEquipmentList(ClassId cId) {
+		return _initialEquipmentList.get(cId);
+	}
+	
+	/**
+	 * Gets the equipment list.
+	 * @param cId the class Id for the required initial equipment.
+	 * @return the initial equipment for the given class Id.
+	 */
+	public List<PcItemTemplate> getEquipmentList(int cId) {
+		return _initialEquipmentList.get(ClassId.getClassId(cId));
+	}
+	
+	public static InitialEquipmentData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final InitialEquipmentData INSTANCE = new InitialEquipmentData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialShortcutData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialShortcutData.java
new file mode 100644
index 00000000..5d5077ea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/InitialShortcutData.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.enums.MacroType;
+import com.l2jserver.gameserver.enums.ShortcutType;
+import com.l2jserver.gameserver.model.Macro;
+import com.l2jserver.gameserver.model.MacroCmd;
+import com.l2jserver.gameserver.model.Shortcut;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class holds the Initial Shortcuts information.<br>
+ * What shortcuts get each newly created character.
+ * @author Zoey76
+ */
+public final class InitialShortcutData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(InitialShortcutData.class);
+	
+	private final Map<ClassId, List<Shortcut>> _initialShortcutData = new HashMap<>();
+	
+	private final List<Shortcut> _initialGlobalShortcutList = new ArrayList<>();
+	
+	private final Map<Integer, Macro> _macroPresets = new HashMap<>();
+	
+	protected InitialShortcutData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_initialShortcutData.clear();
+		_initialGlobalShortcutList.clear();
+		
+		parseDatapackFile("data/stats/initialShortcuts.xml");
+		
+		LOG.info("Loaded {} initial dlobal shortcuts data.", _initialGlobalShortcutList.size());
+		LOG.info("Loaded {} initial shortcuts data.", _initialShortcutData.size());
+		LOG.info("Loaded {} macros presets.", _macroPresets.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equals(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					switch (d.getNodeName()) {
+						case "shortcuts" -> parseShortcuts(d);
+						case "macros" -> parseMacros(d);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Parses a shortcut.
+	 * @param d the node
+	 */
+	private void parseShortcuts(Node d) {
+		NamedNodeMap attrs = d.getAttributes();
+		final Node classIdNode = attrs.getNamedItem("classId");
+		final List<Shortcut> list = new ArrayList<>();
+		for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+			if ("page".equals(c.getNodeName())) {
+				attrs = c.getAttributes();
+				final int pageId = parseInteger(attrs, "pageId");
+				for (Node b = c.getFirstChild(); b != null; b = b.getNextSibling()) {
+					if ("slot".equals(b.getNodeName())) {
+						list.add(createShortcut(pageId, b));
+					}
+				}
+			}
+		}
+		
+		if (classIdNode != null) {
+			_initialShortcutData.put(ClassId.getClassId(Integer.parseInt(classIdNode.getNodeValue())), list);
+		} else {
+			_initialGlobalShortcutList.addAll(list);
+		}
+	}
+	
+	/**
+	 * Parses a macro.
+	 * @param d the node
+	 */
+	private void parseMacros(Node d) {
+		for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+			if ("macro".equals(c.getNodeName())) {
+				NamedNodeMap attrs = c.getAttributes();
+				if (!parseBoolean(attrs, "enabled", true)) {
+					continue;
+				}
+				
+				final int macroId = parseInteger(attrs, "macroId");
+				final int icon = parseInteger(attrs, "icon");
+				final String name = parseString(attrs, "name");
+				final String description = parseString(attrs, "description");
+				final String acronym = parseString(attrs, "acronym");
+				final List<MacroCmd> commands = new ArrayList<>(1);
+				int entry = 0;
+				for (Node b = c.getFirstChild(); b != null; b = b.getNextSibling()) {
+					if ("command".equals(b.getNodeName())) {
+						attrs = b.getAttributes();
+						final MacroType type = parseEnum(attrs, MacroType.class, "type");
+						int d1 = 0;
+						int d2 = 0;
+						final String cmd = b.getTextContent();
+						switch (type) {
+							case SKILL -> {
+								d1 = parseInteger(attrs, "skillId"); // Skill ID
+								d2 = parseInteger(attrs, "skillLvl", 0); // Skill level
+							}
+							case ACTION -> d1 = parseInteger(attrs, "actionId"); // Not handled by client.
+							case TEXT -> {
+								// Doesn't have numeric parameters.
+							}
+							case SHORTCUT -> {
+								d1 = parseInteger(attrs, "page"); // Page
+								d2 = parseInteger(attrs, "slot", 0); // Slot
+							}
+							case ITEM -> d1 = parseInteger(attrs, "itemId"); // Not handled by client.
+							case DELAY -> d1 = parseInteger(attrs, "delay"); // Delay in seconds
+						}
+						commands.add(new MacroCmd(entry++, type, d1, d2, cmd));
+					}
+				}
+				_macroPresets.put(macroId, new Macro(macroId, icon, name, description, acronym, commands));
+			}
+		}
+	}
+	
+	/**
+	 * Parses a node an create a shortcut from it.
+	 * @param pageId the page ID
+	 * @param b the node to parse
+	 * @return the new shortcut
+	 */
+	private Shortcut createShortcut(int pageId, Node b) {
+		final NamedNodeMap attrs = b.getAttributes();
+		final int slotId = parseInteger(attrs, "slotId");
+		final ShortcutType shortcutType = parseEnum(attrs, ShortcutType.class, "shortcutType");
+		final int shortcutId = parseInteger(attrs, "shortcutId");
+		final int shortcutLevel = parseInteger(attrs, "shortcutLevel", 0);
+		final int characterType = parseInteger(attrs, "characterType", 0);
+		return new Shortcut(slotId, pageId, shortcutType, shortcutId, shortcutLevel, characterType);
+	}
+	
+	/**
+	 * Gets the shortcut list.
+	 * @param cId the class ID for the shortcut list
+	 * @return the shortcut list for the give class ID
+	 */
+	public List<Shortcut> getShortcutList(ClassId cId) {
+		return _initialShortcutData.get(cId);
+	}
+	
+	/**
+	 * Gets the shortcut list.
+	 * @param cId the class ID for the shortcut list
+	 * @return the shortcut list for the give class ID
+	 */
+	public List<Shortcut> getShortcutList(int cId) {
+		return _initialShortcutData.get(ClassId.getClassId(cId));
+	}
+	
+	/**
+	 * Gets the global shortcut list.
+	 * @return the global shortcut list
+	 */
+	public List<Shortcut> getGlobalMacroList() {
+		return _initialGlobalShortcutList;
+	}
+	
+	/**
+	 * Register all the available shortcuts for the given player.
+	 * @param player the player
+	 */
+	public void registerAllShortcuts(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		// Register global shortcuts.
+		for (Shortcut shortcut : _initialGlobalShortcutList) {
+			int shortcutId = shortcut.getId();
+			switch (shortcut.getType()) {
+				case ITEM -> {
+					final L2ItemInstance item = player.getInventory().getItemByItemId(shortcutId);
+					if (item == null) {
+						continue;
+					}
+					shortcutId = item.getObjectId();
+				}
+				case SKILL -> {
+					if (!player.getSkills().containsKey(shortcutId)) {
+						continue;
+					}
+				}
+				case MACRO -> {
+					final Macro macro = _macroPresets.get(shortcutId);
+					if (macro == null) {
+						continue;
+					}
+					player.registerMacro(macro);
+				}
+			}
+			
+			// Register shortcut
+			final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getCharacterType());
+			player.sendPacket(new ShortCutRegister(newShortcut));
+			player.registerShortCut(newShortcut);
+		}
+		
+		// Register class specific shortcuts.
+		if (_initialShortcutData.containsKey(player.getClassId())) {
+			for (Shortcut shortcut : _initialShortcutData.get(player.getClassId())) {
+				int shortcutId = shortcut.getId();
+				switch (shortcut.getType()) {
+					case ITEM -> {
+						final L2ItemInstance item = player.getInventory().getItemByItemId(shortcutId);
+						if (item == null) {
+							continue;
+						}
+						shortcutId = item.getObjectId();
+					}
+					case SKILL -> {
+						if (!player.getSkills().containsKey(shortcut.getId())) {
+							continue;
+						}
+					}
+					case MACRO -> {
+						final Macro macro = _macroPresets.get(shortcutId);
+						if (macro == null) {
+							continue;
+						}
+						player.registerMacro(macro);
+					}
+				}
+				// Register shortcut
+				final Shortcut newShortcut = new Shortcut(shortcut.getSlot(), shortcut.getPage(), shortcut.getType(), shortcutId, shortcut.getLevel(), shortcut.getCharacterType());
+				player.sendPacket(new ShortCutRegister(newShortcut));
+				player.registerShortCut(newShortcut);
+			}
+		}
+	}
+	
+	public static InitialShortcutData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final InitialShortcutData INSTANCE = new InitialShortcutData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java
new file mode 100644
index 00000000..7aa189f9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/KarmaData.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Karma data.
+ * @author UnAfraid
+ */
+public class KarmaData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(KarmaData.class);
+	
+	private final Map<Integer, Double> _karmaTable = new HashMap<>();
+	
+	public KarmaData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_karmaTable.clear();
+		parseDatapackFile("data/stats/chars/pcKarmaIncrease.xml");
+		LOG.info("Loaded {} karma modifiers.", _karmaTable.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("pcKarmaIncrease".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("increase".equalsIgnoreCase(d.getNodeName())) {
+						final NamedNodeMap attrs = d.getAttributes();
+						_karmaTable.put(parseInteger(attrs, "lvl"), parseDouble(attrs, "val"));
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @param level
+	 * @return {@code double} modifier used to calculate karma lost upon death.
+	 */
+	public double getMultiplier(int level) {
+		return _karmaTable.get(level);
+	}
+	
+	public static KarmaData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final KarmaData INSTANCE = new KarmaData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java
new file mode 100644
index 00000000..fb1398b6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/MultisellData.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.multisell.Entry;
+import com.l2jserver.gameserver.model.multisell.Ingredient;
+import com.l2jserver.gameserver.model.multisell.ListContainer;
+import com.l2jserver.gameserver.model.multisell.PreparedListContainer;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.MultiSellList;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.IXmlReader;
+import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.gameserver.util.file.filter.NumericNameFilter;
+
+public final class MultisellData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(MultisellData.class);
+	
+	public static final int PAGE_SIZE = 40;
+	// Special IDs.
+	public static final int PC_BANG_POINTS = -100;
+	public static final int CLAN_REPUTATION = -200;
+	public static final int FAME = -300;
+	// Misc
+	private static final FileFilter NUMERIC_FILTER = new NumericNameFilter();
+	
+	private final Map<Integer, ListContainer> _entries = new HashMap<>();
+	
+	protected MultisellData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_entries.clear();
+		parseDatapackDirectory("data/multisell", false);
+		if (general().customMultisellLoad()) {
+			parseDatapackDirectory("data/multisell/custom", false);
+		}
+		
+		verify();
+		LOG.info("Loaded {} multisell lists.", _entries.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f) {
+		try {
+			int id = Integer.parseInt(f.getName().replaceAll(".xml", ""));
+			int entryId = 1;
+			Node att;
+			final ListContainer list = new ListContainer(id);
+			
+			for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+				if ("list".equalsIgnoreCase(n.getNodeName())) {
+					att = n.getAttributes().getNamedItem("applyTaxes");
+					list.setApplyTaxes((att != null) && Boolean.parseBoolean(att.getNodeValue()));
+					
+					att = n.getAttributes().getNamedItem("useRate");
+					if (att != null) {
+						try {
+							
+							list.setUseRate(Double.parseDouble(att.getNodeValue()));
+							if (list.getUseRate() <= 1e-6) {
+								throw new NumberFormatException("The value cannot be 0"); // threat 0 as invalid value
+							}
+						} catch (NumberFormatException ex) {
+							LOG.warn("Unable to parse {}!", doc.getLocalName(), ex);
+							list.setUseRate(1.0);
+						} catch (DOMException ex) {
+							LOG.warn("Unable to parse {}!", doc.getLocalName(), ex);
+						}
+					}
+					
+					att = n.getAttributes().getNamedItem("maintainEnchantment");
+					list.setMaintainEnchantment((att != null) && Boolean.parseBoolean(att.getNodeValue()));
+					
+					for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+						if ("item".equalsIgnoreCase(d.getNodeName())) {
+							Entry e = parseEntry(d, entryId++, list);
+							list.getEntries().add(e);
+						} else if ("npcs".equalsIgnoreCase(d.getNodeName())) {
+							for (Node b = d.getFirstChild(); b != null; b = b.getNextSibling()) {
+								if ("npc".equalsIgnoreCase(b.getNodeName())) {
+									if (Util.isDigit(b.getTextContent())) {
+										list.allowNpc(Integer.parseInt(b.getTextContent()));
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			_entries.put(id, list);
+		} catch (Exception ex) {
+			LOG.error("There has been an error in file {}!", f, ex);
+		}
+	}
+	
+	@Override
+	public FileFilter getCurrentFileFilter() {
+		return NUMERIC_FILTER;
+	}
+	
+	private Entry parseEntry(Node n, int entryId, ListContainer list) {
+		Node first = n.getFirstChild();
+		final Entry entry = new Entry(entryId);
+		
+		NamedNodeMap attrs;
+		Node att;
+		StatsSet set;
+		
+		for (n = first; n != null; n = n.getNextSibling()) {
+			if ("ingredient".equalsIgnoreCase(n.getNodeName())) {
+				attrs = n.getAttributes();
+				set = new StatsSet();
+				for (int i = 0; i < attrs.getLength(); i++) {
+					att = attrs.item(i);
+					set.set(att.getNodeName(), att.getNodeValue());
+				}
+				entry.addIngredient(new Ingredient(set));
+			} else if ("production".equalsIgnoreCase(n.getNodeName())) {
+				attrs = n.getAttributes();
+				set = new StatsSet();
+				for (int i = 0; i < attrs.getLength(); i++) {
+					att = attrs.item(i);
+					set.set(att.getNodeName(), att.getNodeValue());
+				}
+				entry.addProduct(new Ingredient(set));
+			}
+		}
+		
+		return entry;
+	}
+	
+	/**
+	 * This will generate the multisell list for the items.<br>
+	 * There exist various parameters in multisells that affect the way they will appear:
+	 * <ol>
+	 * <li>Inventory only:
+	 * <ul>
+	 * <li>If true, only show items of the multisell for which the "primary" ingredients are already in the player's inventory. By "primary" ingredients we mean weapon and armor.</li>
+	 * <li>If false, show the entire list.</li>
+	 * </ul>
+	 * </li>
+	 * <li>Maintain enchantment: presumably, only lists with "inventory only" set to true should sometimes have this as true. This makes no sense otherwise...
+	 * <ul>
+	 * <li>If true, then the product will match the enchantment level of the ingredient.<br>
+	 * If the player has multiple items that match the ingredient list but the enchantment levels differ, then the entries need to be duplicated to show the products and ingredients for each enchantment level.<br>
+	 * For example: If the player has a crystal staff +1 and a crystal staff +3 and goes to exchange it at the mammon, the list should have all exchange possibilities for the +1 staff, followed by all possibilities for the +3 staff.</li>
+	 * <li>If false, then any level ingredient will be considered equal and product will always be at +0</li>
+	 * </ul>
+	 * </li>
+	 * <li>Apply taxes: Uses the "taxIngredient" entry in order to add a certain amount of adena to the ingredients.
+	 * <li>
+	 * <li>Additional product and ingredient multipliers.</li>
+	 * </ol>
+	 * @param listId
+	 * @param player
+	 * @param npc
+	 * @param inventoryOnly
+	 * @param productMultiplier
+	 * @param ingredientMultiplier
+	 */
+	public void separateAndSend(int listId, L2PcInstance player, L2Npc npc, boolean inventoryOnly, double productMultiplier, double ingredientMultiplier) {
+		ListContainer template = _entries.get(listId);
+		if (template == null) {
+			LOG.warn("Cannot find list ID: {} requested by player: {}, NPC ID: {}!", listId, player, (npc != null ? npc.getId() : 0));
+			return;
+		}
+		
+		if (((npc != null) && !template.isNpcAllowed(npc.getId())) || ((npc == null) && template.isNpcOnly())) {
+			LOG.warn("Player {} attempted to open multisell {} from npc {} which is not allowed!", player, listId, npc);
+			return;
+		}
+		
+		final PreparedListContainer list = new PreparedListContainer(template, inventoryOnly, player, npc);
+		
+		// Pass through this only when multipliers are different from 1
+		if ((productMultiplier != 1) || (ingredientMultiplier != 1)) {
+			list.getEntries().forEach(entry -> {
+				// Math.max used here to avoid dropping count to 0
+				entry.getProducts().forEach(product -> product.setItemCount((long) Math.max(product.getItemCount() * productMultiplier, 1)));
+				
+				// Math.max used here to avoid dropping count to 0
+				entry.getIngredients().forEach(ingredient -> ingredient.setItemCount((long) Math.max(ingredient.getItemCount() * ingredientMultiplier, 1)));
+			});
+		}
+		int index = 0;
+		do {
+			// send list at least once even if size = 0
+			player.sendPacket(new MultiSellList(list, index));
+			index += PAGE_SIZE;
+		}
+		while (index < list.getEntries().size());
+		
+		player.setMultiSell(list);
+	}
+	
+	public void separateAndSend(int listId, L2PcInstance player, L2Npc npc, boolean inventoryOnly) {
+		separateAndSend(listId, player, npc, inventoryOnly, 1, 1);
+	}
+	
+	public static boolean hasSpecialIngredient(int id, long amount, L2PcInstance player) {
+		switch (id) {
+			case CLAN_REPUTATION -> {
+				if (player.getClan() == null) {
+					player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER);
+					break;
+				}
+				if (!player.isClanLeader()) {
+					player.sendPacket(SystemMessageId.ONLY_THE_CLAN_LEADER_IS_ENABLED);
+					break;
+				}
+				if (player.getClan().getReputationScore() < amount) {
+					player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW);
+					break;
+				}
+				return true;
+			}
+			case FAME -> {
+				if (player.getFame() < amount) {
+					player.sendPacket(SystemMessageId.NOT_ENOUGH_FAME_POINTS);
+					break;
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public static boolean takeSpecialIngredient(int id, long amount, L2PcInstance player) {
+		switch (id) {
+			case CLAN_REPUTATION -> {
+				player.getClan().takeReputationScore((int) amount, true);
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+				smsg.addLong(amount);
+				player.sendPacket(smsg);
+				return true;
+			}
+			case FAME -> {
+				player.setFame(player.getFame() - (int) amount);
+				player.sendPacket(new UserInfo(player));
+				player.sendPacket(new ExBrExtraUserInfo(player));
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public static void giveSpecialProduct(int id, long amount, L2PcInstance player) {
+		switch (id) {
+			case CLAN_REPUTATION -> player.getClan().addReputationScore((int) amount, true);
+			case FAME -> {
+				player.setFame((int) (player.getFame() + amount));
+				player.sendPacket(new UserInfo(player));
+				player.sendPacket(new ExBrExtraUserInfo(player));
+			}
+		}
+	}
+	
+	private void verify() {
+		for (ListContainer listContainer : _entries.values()) {
+			for (Entry ent : listContainer.getEntries()) {
+				for (Ingredient ing : ent.getIngredients()) {
+					if (!verifyIngredient(ing)) {
+						LOG.warn("Cannot find ingredient with item ID: {} in list: {}!", ing.getItemId(), listContainer.getListId());
+					}
+				}
+				for (Ingredient ing : ent.getProducts()) {
+					if (!verifyIngredient(ing)) {
+						LOG.warn("Cannot find product with item ID: {} in list: {}!", ing.getItemId(), listContainer.getListId());
+					}
+				}
+			}
+		}
+	}
+	
+	private boolean verifyIngredient(Ingredient ing) {
+		return switch (ing.getItemId()) {
+			case CLAN_REPUTATION, FAME -> true;
+			default -> ing.getTemplate() != null;
+		};
+	}
+	
+	public static MultisellData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final MultisellData _instance = new MultisellData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java
new file mode 100644
index 00000000..84bb2e88
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/NpcData.java
@@ -0,0 +1,636 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.AISkillScope;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.drops.DropListScope;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.holders.MinionHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.IXmlReader;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * NPC data parser.
+ * @author NosBit
+ */
+public class NpcData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(NpcData.class);
+	
+	private final Map<Integer, L2NpcTemplate> _npcs = new ConcurrentHashMap<>();
+	
+	private final Map<String, Integer> _clans = new ConcurrentHashMap<>();
+	
+	private MinionData _minionData;
+	
+	protected NpcData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_minionData = new MinionData();
+		
+		parseDatapackDirectory("data/stats/npcs", false);
+		LOG.info("Loaded {} NPCs.", _npcs.size());
+		
+		if (general().customNpcData()) {
+			final int npcCount = _npcs.size();
+			parseDatapackDirectory("data/stats/npcs/custom", true);
+			LOG.info("Loaded {} custom NPCs.", (_npcs.size() - npcCount));
+		}
+		
+		_minionData = null;
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f) {
+		for (Node node = doc.getFirstChild(); node != null; node = node.getNextSibling()) {
+			if ("list".equalsIgnoreCase(node.getNodeName())) {
+				for (Node listNode = node.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) {
+					if ("npc".equalsIgnoreCase(listNode.getNodeName())) {
+						NamedNodeMap attrs = listNode.getAttributes();
+						final StatsSet set = new StatsSet();
+						final int npcId = parseInteger(attrs, "id");
+						Map<String, Object> parameters = null;
+						Map<Integer, Skill> skills = null;
+						Set<Integer> clans = null;
+						Set<Integer> ignoreClanNpcIds = null;
+						Map<DropListScope, List<IDropItem>> dropLists = null;
+						set.set("id", npcId);
+						set.set("displayId", parseInteger(attrs, "displayId"));
+						set.set("level", parseByte(attrs, "level"));
+						set.set("type", parseString(attrs, "type"));
+						set.set("name", parseString(attrs, "name"));
+						set.set("usingServerSideName", parseBoolean(attrs, "usingServerSideName"));
+						set.set("title", parseString(attrs, "title"));
+						set.set("usingServerSideTitle", parseBoolean(attrs, "usingServerSideTitle"));
+						for (Node npcNode = listNode.getFirstChild(); npcNode != null; npcNode = npcNode.getNextSibling()) {
+							attrs = npcNode.getAttributes();
+							switch (npcNode.getNodeName().toLowerCase()) {
+								case "parameters" -> {
+									if (parameters == null) {
+										parameters = new HashMap<>();
+									}
+									
+									for (Node parametersNode = npcNode.getFirstChild(); parametersNode != null; parametersNode = parametersNode.getNextSibling()) {
+										attrs = parametersNode.getAttributes();
+										switch (parametersNode.getNodeName().toLowerCase()) {
+											case "param" -> parameters.put(parseString(attrs, "name"), parseString(attrs, "value"));
+											case "skill" -> parameters.put(parseString(attrs, "name"), new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "level")));
+											case "minions" -> {
+												final List<MinionHolder> minions = new ArrayList<>(1);
+												for (Node minionsNode = parametersNode.getFirstChild(); minionsNode != null; minionsNode = minionsNode.getNextSibling()) {
+													if (minionsNode.getNodeName().equalsIgnoreCase("npc")) {
+														attrs = minionsNode.getAttributes();
+														minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), parseInteger(attrs, "weightPoint")));
+													}
+												}
+												
+												if (!minions.isEmpty()) {
+													parameters.put(parseString(parametersNode.getAttributes(), "name"), minions);
+												}
+											}
+										}
+									}
+								}
+								case "race", "sex" -> set.set(npcNode.getNodeName(), npcNode.getTextContent().toUpperCase());
+								case "equipment" -> {
+									set.set("chestId", parseInteger(attrs, "chest"));
+									set.set("rhandId", parseInteger(attrs, "rhand"));
+									set.set("lhandId", parseInteger(attrs, "lhand"));
+									set.set("weaponEnchant", parseInteger(attrs, "weaponEnchant"));
+								}
+								case "acquire" -> {
+									set.set("expRate", parseDouble(attrs, "expRate"));
+									set.set("sp", parseDouble(attrs, "sp"));
+									set.set("raidPoints", parseDouble(attrs, "raidPoints"));
+								}
+								case "stats" -> {
+									set.set("baseSTR", parseInteger(attrs, "str"));
+									set.set("baseINT", parseInteger(attrs, "int"));
+									set.set("baseDEX", parseInteger(attrs, "dex"));
+									set.set("baseWIT", parseInteger(attrs, "wit"));
+									set.set("baseCON", parseInteger(attrs, "con"));
+									set.set("baseMEN", parseInteger(attrs, "men"));
+									for (Node statsNode = npcNode.getFirstChild(); statsNode != null; statsNode = statsNode.getNextSibling()) {
+										attrs = statsNode.getAttributes();
+										switch (statsNode.getNodeName().toLowerCase()) {
+											case "vitals" -> {
+												set.set("baseHpMax", parseDouble(attrs, "hp"));
+												set.set("baseHpReg", parseDouble(attrs, "hpRegen"));
+												set.set("baseMpMax", parseDouble(attrs, "mp"));
+												set.set("baseMpReg", parseDouble(attrs, "mpRegen"));
+											}
+											case "attack" -> {
+												set.set("basePAtk", parseDouble(attrs, "physical"));
+												set.set("baseMAtk", parseDouble(attrs, "magical"));
+												set.set("baseRndDam", parseInteger(attrs, "random"));
+												set.set("baseCritRate", parseInteger(attrs, "critical"));
+												set.set("accuracy", parseDouble(attrs, "accuracy"));// TODO: Implement me
+												set.set("basePAtkSpd", parseInteger(attrs, "attackSpeed"));
+												set.set("reuseDelay", parseInteger(attrs, "reuseDelay"));
+												set.set("baseAtkType", parseString(attrs, "type"));
+												set.set("baseAtkRange", parseInteger(attrs, "range"));
+												set.set("distance", parseInteger(attrs, "distance"));// TODO: Implement me
+												set.set("width", parseInteger(attrs, "width"));// TODO: Implement me
+											}
+											case "defence" -> {
+												set.set("basePDef", parseDouble(attrs, "physical"));
+												set.set("baseMDef", parseDouble(attrs, "magical"));
+												set.set("evasion", parseInteger(attrs, "evasion"));// TODO: Implement me
+												set.set("baseShldDef", parseInteger(attrs, "shield"));
+												set.set("baseShldRate", parseInteger(attrs, "shieldRate"));
+											}
+											case "attribute" -> {
+												for (Node attributeNode = statsNode.getFirstChild(); attributeNode != null; attributeNode = attributeNode.getNextSibling()) {
+													attrs = attributeNode.getAttributes();
+													switch (attributeNode.getNodeName().toLowerCase()) {
+														case "attack" -> {
+															String attackAttributeType = parseString(attrs, "type");
+															switch (attackAttributeType.toUpperCase()) {
+																case "FIRE" -> set.set("baseFire", parseInteger(attrs, "value"));
+																case "WATER" -> set.set("baseWater", parseInteger(attrs, "value"));
+																case "WIND" -> set.set("baseWind", parseInteger(attrs, "value"));
+																case "EARTH" -> set.set("baseEarth", parseInteger(attrs, "value"));
+																case "DARK" -> set.set("baseDark", parseInteger(attrs, "value"));
+																case "HOLY" -> set.set("baseHoly", parseInteger(attrs, "value"));
+															}
+														}
+														case "defence" -> {
+															set.set("baseFireRes", parseInteger(attrs, "fire"));
+															set.set("baseWaterRes", parseInteger(attrs, "water"));
+															set.set("baseWindRes", parseInteger(attrs, "wind"));
+															set.set("baseEarthRes", parseInteger(attrs, "earth"));
+															set.set("baseHolyRes", parseInteger(attrs, "holy"));
+															set.set("baseDarkRes", parseInteger(attrs, "dark"));
+															set.set("baseElementRes", parseInteger(attrs, "default"));
+														}
+													}
+												}
+											}
+											case "speed" -> {
+												for (Node speedNode = statsNode.getFirstChild(); speedNode != null; speedNode = speedNode.getNextSibling()) {
+													attrs = speedNode.getAttributes();
+													switch (speedNode.getNodeName().toLowerCase()) {
+														case "walk" -> {
+															set.set("baseWalkSpd", parseDouble(attrs, "ground"));
+															set.set("baseSwimWalkSpd", parseDouble(attrs, "swim"));
+															set.set("baseFlyWalkSpd", parseDouble(attrs, "fly"));
+														}
+														case "run" -> {
+															set.set("baseRunSpd", parseDouble(attrs, "ground"));
+															set.set("baseSwimRunSpd", parseDouble(attrs, "swim"));
+															set.set("baseFlyRunSpd", parseDouble(attrs, "fly"));
+														}
+													}
+												}
+											}
+											case "hittime" -> set.set("hitTime", npcNode.getTextContent());// TODO: Implement me default 600 (value in ms)
+										}
+									}
+								}
+								case "status" -> {
+									set.set("unique", parseBoolean(attrs, "unique"));
+									set.set("attackable", parseBoolean(attrs, "attackable"));
+									set.set("targetable", parseBoolean(attrs, "targetable"));
+									set.set("undying", parseBoolean(attrs, "undying"));
+									set.set("showName", parseBoolean(attrs, "showName"));
+									set.set("flying", parseBoolean(attrs, "flying"));
+									set.set("canMove", parseBoolean(attrs, "canMove"));
+									set.set("noSleepMode", parseBoolean(attrs, "noSleepMode"));
+									set.set("passableDoor", parseBoolean(attrs, "passableDoor"));
+									set.set("hasSummoner", parseBoolean(attrs, "hasSummoner"));
+									set.set("canBeSown", parseBoolean(attrs, "canBeSown"));
+								}
+								case "skilllist" -> {
+									skills = new HashMap<>();
+									for (Node skillListNode = npcNode.getFirstChild(); skillListNode != null; skillListNode = skillListNode.getNextSibling()) {
+										if ("skill".equalsIgnoreCase(skillListNode.getNodeName())) {
+											attrs = skillListNode.getAttributes();
+											final int skillId = parseInteger(attrs, "id");
+											final int skillLevel = parseInteger(attrs, "level");
+											final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
+											if (skill != null) {
+												skills.put(skill.getId(), skill);
+											} else {
+												LOG.warn("{} skill not found. NPC Id {}, skill Id {}, skill level: {}!", f, npcId, skillId, skillLevel);
+											}
+										}
+									}
+								}
+								case "shots" -> {
+									set.set("soulShot", parseInteger(attrs, "soul"));
+									set.set("spiritShot", parseInteger(attrs, "spirit"));
+									set.set("shotShotChance", parseInteger(attrs, "shotChance"));
+									set.set("spiritShotChance", parseInteger(attrs, "spiritChance"));
+								}
+								case "corpsetime" -> set.set("corpseTime", npcNode.getTextContent());
+								case "excrteffect" -> set.set("exCrtEffect", npcNode.getTextContent()); // TODO: Implement me default ? type boolean
+								case "snpcprophprate" -> set.set("sNpcPropHpRate", npcNode.getTextContent()); // TODO: Implement me default 1 type double
+								case "ai" -> {
+									set.set("aiType", parseString(attrs, "type"));
+									set.set("aggroRange", parseInteger(attrs, "aggroRange"));
+									set.set("clanHelpRange", parseInteger(attrs, "clanHelpRange"));
+									set.set("isChaos", parseBoolean(attrs, "isChaos"));
+									set.set("isAggressive", parseBoolean(attrs, "isAggressive"));
+									for (Node aiNode = npcNode.getFirstChild(); aiNode != null; aiNode = aiNode.getNextSibling()) {
+										attrs = aiNode.getAttributes();
+										switch (aiNode.getNodeName().toLowerCase()) {
+											case "skill" -> {
+												set.set("minSkillChance", parseInteger(attrs, "minChance"));
+												set.set("maxSkillChance", parseInteger(attrs, "maxChance"));
+												set.set("primarySkillId", parseInteger(attrs, "primaryId"));
+												set.set("shortRangeSkillId", parseInteger(attrs, "shortRangeId"));
+												set.set("shortRangeSkillChance", parseInteger(attrs, "shortRangeChance"));
+												set.set("longRangeSkillId", parseInteger(attrs, "longRangeId"));
+												set.set("longRangeSkillChance", parseInteger(attrs, "longRangeChance"));
+											}
+											case "clanlist" -> {
+												for (Node clanListNode = aiNode.getFirstChild(); clanListNode != null; clanListNode = clanListNode.getNextSibling()) {
+													attrs = clanListNode.getAttributes();
+													switch (clanListNode.getNodeName().toLowerCase()) {
+														case "clan" -> {
+															if (clans == null) {
+																clans = new HashSet<>(1);
+															}
+															clans.add(getOrCreateClanId(clanListNode.getTextContent()));
+														}
+														case "ignorenpcid" -> {
+															if (ignoreClanNpcIds == null) {
+																ignoreClanNpcIds = new HashSet<>(1);
+															}
+															ignoreClanNpcIds.add(Integer.parseInt(clanListNode.getTextContent()));
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+								case "droplists" -> {
+									for (Node dropListsNode = npcNode.getFirstChild(); dropListsNode != null; dropListsNode = dropListsNode.getNextSibling()) {
+										DropListScope dropListScope = null;
+										
+										try {
+											dropListScope = Enum.valueOf(DropListScope.class, dropListsNode.getNodeName().toUpperCase());
+										} catch (Exception e) {
+										}
+										
+										if (dropListScope != null) {
+											if (dropLists == null) {
+												dropLists = new EnumMap<>(DropListScope.class);
+											}
+											
+											List<IDropItem> dropList = new ArrayList<>();
+											parseDropList(f, dropListsNode, dropListScope, dropList);
+											dropLists.put(dropListScope, Collections.unmodifiableList(dropList));
+										}
+									}
+								}
+								case "collision" -> {
+									for (Node collisionNode = npcNode.getFirstChild(); collisionNode != null; collisionNode = collisionNode.getNextSibling()) {
+										attrs = collisionNode.getAttributes();
+										switch (collisionNode.getNodeName().toLowerCase()) {
+											case "radius" -> {
+												set.set("collisionRadius", parseDouble(attrs, "normal"));
+												set.set("collisionRadiusGrown", parseDouble(attrs, "grown"));
+											}
+											case "height" -> {
+												set.set("collisionHeight", parseDouble(attrs, "normal"));
+												set.set("collisionHeightGrown", parseDouble(attrs, "grown"));
+											}
+										}
+									}
+								}
+							}
+						}
+						
+						L2NpcTemplate template = _npcs.get(npcId);
+						if (template == null) {
+							template = new L2NpcTemplate(set);
+							_npcs.put(template.getId(), template);
+						} else {
+							template.set(set);
+						}
+						
+						if (_minionData._tempMinions.containsKey(npcId)) {
+							if (parameters == null) {
+								parameters = new HashMap<>();
+							}
+							parameters.putIfAbsent("Privates", _minionData._tempMinions.get(npcId));
+						}
+						
+						if (parameters != null) {
+							// Using unmodifiable map parameters of template are not meant to be changed at runtime.
+							template.setParameters(new StatsSet(Collections.unmodifiableMap(parameters)));
+						} else {
+							template.setParameters(StatsSet.EMPTY_STATSET);
+						}
+						
+						if (skills != null) {
+							Map<AISkillScope, List<Skill>> aiSkillLists = null;
+							for (Skill skill : skills.values()) {
+								if (skill.isPassive()) {
+									continue;
+								}
+								
+								if (aiSkillLists == null) {
+									aiSkillLists = new EnumMap<>(AISkillScope.class);
+								}
+								
+								final List<AISkillScope> aiSkillScopes = new ArrayList<>();
+								final AISkillScope shortOrLongRangeScope = skill.getCastRange() <= 150 ? AISkillScope.SHORT_RANGE : AISkillScope.LONG_RANGE;
+								if (skill.isSuicideAttack()) {
+									aiSkillScopes.add(AISkillScope.SUICIDE);
+								} else {
+									aiSkillScopes.add(AISkillScope.GENERAL);
+									
+									if (skill.isContinuous()) {
+										if (!skill.isDebuff()) {
+											aiSkillScopes.add(AISkillScope.BUFF);
+										} else {
+											aiSkillScopes.add(AISkillScope.DEBUFF);
+											aiSkillScopes.add(AISkillScope.COT);
+											aiSkillScopes.add(shortOrLongRangeScope);
+										}
+									} else {
+										if (skill.hasEffectType(L2EffectType.DISPEL)) {
+											aiSkillScopes.add(AISkillScope.NEGATIVE);
+											aiSkillScopes.add(shortOrLongRangeScope);
+										} else if (skill.hasEffectType(L2EffectType.HP)) {
+											aiSkillScopes.add(AISkillScope.HEAL);
+										} else if (skill.hasEffectType(L2EffectType.PHYSICAL_ATTACK, L2EffectType.MAGICAL_ATTACK, L2EffectType.HP_DRAIN)) {
+											aiSkillScopes.add(AISkillScope.ATTACK);
+											aiSkillScopes.add(AISkillScope.UNIVERSAL);
+											aiSkillScopes.add(shortOrLongRangeScope);
+										} else if (skill.hasEffectType(L2EffectType.SLEEP)) {
+											aiSkillScopes.add(AISkillScope.IMMOBILIZE);
+										} else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT)) {
+											aiSkillScopes.add(AISkillScope.IMMOBILIZE);
+											aiSkillScopes.add(shortOrLongRangeScope);
+										} else if (skill.hasEffectType(L2EffectType.MUTE, L2EffectType.FEAR)) {
+											aiSkillScopes.add(AISkillScope.COT);
+											aiSkillScopes.add(shortOrLongRangeScope);
+										} else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME)) {
+											aiSkillScopes.add(shortOrLongRangeScope);
+										} else if (skill.hasEffectType(L2EffectType.RESURRECTION)) {
+											aiSkillScopes.add(AISkillScope.RES);
+										} else {
+											aiSkillScopes.add(AISkillScope.UNIVERSAL);
+										}
+									}
+								}
+								
+								for (AISkillScope aiSkillScope : aiSkillScopes) {
+									List<Skill> aiSkills = aiSkillLists.computeIfAbsent(aiSkillScope, _ -> new ArrayList<>());
+									aiSkills.add(skill);
+								}
+							}
+							
+							template.setSkills(skills);
+							template.setAISkillLists(aiSkillLists);
+						} else {
+							template.setSkills(null);
+							template.setAISkillLists(null);
+						}
+						
+						template.setClans(clans);
+						template.setIgnoreClanNpcIds(ignoreClanNpcIds);
+						
+						template.setDropLists(dropLists);
+					}
+				}
+			}
+		}
+	}
+	
+	private void parseDropList(File f, Node dropListNode, DropListScope dropListScope, List<IDropItem> drops) {
+		for (Node dropNode = dropListNode.getFirstChild(); dropNode != null; dropNode = dropNode.getNextSibling()) {
+			NamedNodeMap attrs = dropNode.getAttributes();
+			if ("group".equals(dropNode.getNodeName().toLowerCase())) {
+				GroupedGeneralDropItem dropItem = dropListScope.newGroupedDropItem(parseDouble(attrs, "chance"));
+				List<IDropItem> groupedDropList = new ArrayList<>(2);
+				for (Node groupNode = dropNode.getFirstChild(); groupNode != null; groupNode = groupNode.getNextSibling()) {
+					parseDropListItem(groupNode, dropListScope, groupedDropList);
+				}
+				
+				List<GeneralDropItem> items = new ArrayList<>(groupedDropList.size());
+				for (IDropItem item : groupedDropList) {
+					if (item instanceof GeneralDropItem) {
+						items.add((GeneralDropItem) item);
+					} else {
+						LOG.warn("{} grouped general drop item supports only general drop item.", f);
+					}
+				}
+				dropItem.setItems(items);
+				
+				drops.add(dropItem);
+			} else {
+				parseDropListItem(dropNode, dropListScope, drops);
+			}
+		}
+	}
+	
+	private void parseDropListItem(Node dropListItem, DropListScope dropListScope, List<IDropItem> drops) {
+		NamedNodeMap attrs = dropListItem.getAttributes();
+		if ("item".equals(dropListItem.getNodeName().toLowerCase())) {
+			final IDropItem dropItem = dropListScope.newDropItem(parseInteger(attrs, "id"), parseLong(attrs, "min"), parseLong(attrs, "max"), parseDouble(attrs, "chance"));
+			if (dropItem != null) {
+				drops.add(dropItem);
+			}
+		}
+	}
+	
+	/**
+	 * Gets or creates a clan id if it doesnt exists.
+	 * @param clanName the clan name to get or create its id
+	 * @return the clan id for the given clan name
+	 */
+	private int getOrCreateClanId(String clanName) {
+		Integer id = _clans.get(clanName.toUpperCase());
+		if (id == null) {
+			id = _clans.size();
+			_clans.put(clanName.toUpperCase(), id);
+		}
+		return id;
+	}
+	
+	/**
+	 * Gets the clan id
+	 * @param clanName the clan name to get its id
+	 * @return the clan id for the given clan name if it exists, -1 otherwise
+	 */
+	public int getClanId(String clanName) {
+		Integer id = _clans.get(clanName.toUpperCase());
+		return id != null ? id : -1;
+	}
+	
+	/**
+	 * Gets the template.
+	 * @param id the template Id to get.
+	 * @return the template for the given id.
+	 */
+	public L2NpcTemplate getTemplate(int id) {
+		return _npcs.get(id);
+	}
+	
+	/**
+	 * Gets the template by name.
+	 * @param name of the template to get.
+	 * @return the template for the given name.
+	 */
+	public L2NpcTemplate getTemplateByName(String name) {
+		for (L2NpcTemplate npcTemplate : _npcs.values()) {
+			if (npcTemplate.getName().equalsIgnoreCase(name)) {
+				return npcTemplate;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets all templates matching the filter.
+	 * @param filter
+	 * @return the template list for the given filter
+	 */
+	public List<L2NpcTemplate> getTemplates(Predicate<L2NpcTemplate> filter) {
+		return _npcs.values()
+			.stream()
+			.filter(filter)
+			.toList();
+	}
+	
+	/**
+	 * Gets the all of level.
+	 * @param lvls of all the templates to get.
+	 * @return the template list for the given level.
+	 */
+	public List<L2NpcTemplate> getAllOfLevel(int... lvls) {
+		return getTemplates(template -> Util.contains(lvls, template.getLevel()));
+	}
+	
+	/**
+	 * Gets the all monsters of level.
+	 * @param lvls of all the monster templates to get.
+	 * @return the template list for the given level.
+	 */
+	public List<L2NpcTemplate> getAllMonstersOfLevel(int... lvls) {
+		return getTemplates(template -> Util.contains(lvls, template.getLevel()) && template.isType("L2Monster"));
+	}
+	
+	/**
+	 * Gets the all npc starting with.
+	 * @param text of all the NPC templates which its name start with.
+	 * @return the template list for the given letter.
+	 */
+	public List<L2NpcTemplate> getAllNpcStartingWith(String text) {
+		return getTemplates(template -> template.isType("L2Npc") && template.getName().startsWith(text));
+	}
+	
+	/**
+	 * Gets the all npc of class type.
+	 * @param classTypes of all the templates to get.
+	 * @return the template list for the given class type.
+	 */
+	public List<L2NpcTemplate> getAllNpcOfClassType(String... classTypes) {
+		return getTemplates(template -> Util.contains(classTypes, template.getType(), true));
+	}
+	
+	/**
+	 * This class handles minions from Spawn System<br>
+	 * Once Spawn System gets reworked delete this class<br>
+	 * @author Zealar
+	 */
+	private static class MinionData implements IXmlReader {
+		
+		private static final Logger LOG = LoggerFactory.getLogger(MinionData.class);
+		
+		public final Map<Integer, List<MinionHolder>> _tempMinions = new HashMap<>();
+		
+		protected MinionData() {
+			load();
+		}
+		
+		@Override
+		public void load() {
+			_tempMinions.clear();
+			parseDatapackFile("data/minionData.xml");
+			LOG.info("Loaded {} minions data.", _tempMinions.size());
+		}
+		
+		@Override
+		public void parseDocument(Document doc) {
+			for (Node node = doc.getFirstChild(); node != null; node = node.getNextSibling()) {
+				if ("list".equals(node.getNodeName())) {
+					for (Node listNode = node.getFirstChild(); listNode != null; listNode = listNode.getNextSibling()) {
+						if ("npc".equals(listNode.getNodeName())) {
+							final List<MinionHolder> minions = new ArrayList<>(1);
+							NamedNodeMap attrs = listNode.getAttributes();
+							int id = parseInteger(attrs, "id");
+							for (Node npcNode = listNode.getFirstChild(); npcNode != null; npcNode = npcNode.getNextSibling()) {
+								if ("minion".equals(npcNode.getNodeName())) {
+									attrs = npcNode.getAttributes();
+									minions.add(new MinionHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count"), parseInteger(attrs, "respawnTime"), 0));
+								}
+							}
+							_tempMinions.put(id, minions);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public static NpcData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final NpcData INSTANCE = new NpcData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java
new file mode 100644
index 00000000..0bf4b6f2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/OptionData.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.options.Options;
+import com.l2jserver.gameserver.model.options.OptionsSkillHolder;
+import com.l2jserver.gameserver.model.options.OptionsSkillType;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Item Option data.
+ * @author UnAfraid
+ */
+public class OptionData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(OptionData.class);
+	
+	private final Map<Integer, Options> _optionData = new HashMap<>();
+	
+	protected OptionData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_optionData.clear();
+		parseDatapackDirectory("data/stats/options", false);
+		LOG.info("Loaded {} item options.", _optionData.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("option".equalsIgnoreCase(d.getNodeName())) {
+						final int id = parseInteger(d.getAttributes(), "id");
+						final Options op = new Options(id);
+						
+						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+							switch (cd.getNodeName()) {
+								case "for" -> {
+									for (Node fd = cd.getFirstChild(); fd != null; fd = fd.getNextSibling()) {
+										switch (fd.getNodeName()) {
+											case "add", "sub", "mul", "div", "set", "share", "enchant", "enchanthp" -> parseFuncs(fd.getAttributes(), fd.getNodeName(), op);
+										}
+									}
+								}
+								case "active_skill" -> op.setActiveSkill(new SkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level")));
+								case "passive_skill" -> op.setPassiveSkill(new SkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level")));
+								case "attack_skill" -> op.addActivationSkill(new OptionsSkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level"), parseDouble(cd.getAttributes(), "chance"), OptionsSkillType.ATTACK));
+								case "magic_skill" -> op.addActivationSkill(new OptionsSkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level"), parseDouble(cd.getAttributes(), "chance"), OptionsSkillType.MAGIC));
+								case "critical_skill" -> op.addActivationSkill(new OptionsSkillHolder(parseInteger(cd.getAttributes(), "id"), parseInteger(cd.getAttributes(), "level"), parseDouble(cd.getAttributes(), "chance"), OptionsSkillType.CRITICAL));
+							}
+						}
+						_optionData.put(op.getId(), op);
+					}
+				}
+			}
+		}
+	}
+	
+	private void parseFuncs(NamedNodeMap attrs, String functionName, Options op) {
+		Stats stat = Stats.valueOfXml(parseString(attrs, "stat"));
+		double val = parseDouble(attrs, "val");
+		int order = -1;
+		final Node orderNode = attrs.getNamedItem("order");
+		if (orderNode != null) {
+			order = Integer.parseInt(orderNode.getNodeValue());
+		}
+		op.addFunc(new FuncTemplate(null, null, functionName, order, stat, val));
+	}
+	
+	public Options getOptions(int id) {
+		return _optionData.get(id);
+	}
+	
+	public static OptionData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final OptionData INSTANCE = new OptionData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java
new file mode 100644
index 00000000..051e22e3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PetDataTable.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.model.L2PetData;
+import com.l2jserver.gameserver.model.L2PetLevelData;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class parse and hold all pet parameters.<br>
+ * TODO: load and use all pet parameters.
+ * @author Zoey76
+ */
+public final class PetDataTable implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PetDataTable.class);
+	
+	private final Map<Integer, L2PetData> _pets = new HashMap<>();
+	
+	protected PetDataTable() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_pets.clear();
+		parseDatapackDirectory("data/stats/pets", false);
+		LOG.info("Loaded {} Pets.", _pets.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		NamedNodeMap attrs;
+		Node n = doc.getFirstChild();
+		for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+			if (d.getNodeName().equals("pet")) {
+				int npcId = parseInteger(d.getAttributes(), "id");
+				int itemId = parseInteger(d.getAttributes(), "itemId");
+				// index ignored for now
+				L2PetData data = new L2PetData(npcId, itemId);
+				for (Node p = d.getFirstChild(); p != null; p = p.getNextSibling()) {
+					if (p.getNodeName().equals("set")) {
+						attrs = p.getAttributes();
+						String type = attrs.getNamedItem("name").getNodeValue();
+						if ("food".equals(type)) {
+							for (String foodId : attrs.getNamedItem("val").getNodeValue().split(";")) {
+								data.addFood(Integer.valueOf(foodId));
+							}
+						} else if ("hungry_limit".equals(type)) {
+							data.setHungryLimit(parseInteger(attrs, "val"));
+						} else if ("sync_level".equals(type)) {
+							data.setSyncLevel(parseInteger(attrs, "val") == 1);
+						}
+						// evolve ignored
+					} else if (p.getNodeName().equals("skills")) {
+						for (Node s = p.getFirstChild(); s != null; s = s.getNextSibling()) {
+							if (s.getNodeName().equals("skill")) {
+								attrs = s.getAttributes();
+								data.addNewSkill(parseInteger(attrs, "skillId"), parseInteger(attrs, "skillLvl"), parseInteger(attrs, "minLvl"));
+							}
+						}
+					} else if (p.getNodeName().equals("stats")) {
+						for (Node s = p.getFirstChild(); s != null; s = s.getNextSibling()) {
+							if (s.getNodeName().equals("stat")) {
+								final int level = Integer.parseInt(s.getAttributes().getNamedItem("level").getNodeValue());
+								final StatsSet set = new StatsSet();
+								for (Node bean = s.getFirstChild(); bean != null; bean = bean.getNextSibling()) {
+									if (bean.getNodeName().equals("set")) {
+										attrs = bean.getAttributes();
+										if (attrs.getNamedItem("name").getNodeValue().equals("speed_on_ride")) {
+											set.set("walkSpeedOnRide", attrs.getNamedItem("walk").getNodeValue());
+											set.set("runSpeedOnRide", attrs.getNamedItem("run").getNodeValue());
+											set.set("slowSwimSpeedOnRide", attrs.getNamedItem("slowSwim").getNodeValue());
+											set.set("fastSwimSpeedOnRide", attrs.getNamedItem("fastSwim").getNodeValue());
+											if (attrs.getNamedItem("slowFly") != null) {
+												set.set("slowFlySpeedOnRide", attrs.getNamedItem("slowFly").getNodeValue());
+											}
+											if (attrs.getNamedItem("fastFly") != null) {
+												set.set("fastFlySpeedOnRide", attrs.getNamedItem("fastFly").getNodeValue());
+											}
+										} else {
+											set.set(attrs.getNamedItem("name").getNodeValue(), attrs.getNamedItem("val").getNodeValue());
+										}
+									}
+								}
+								data.addNewStat(level, new L2PetLevelData(set));
+							}
+						}
+					}
+				}
+				_pets.put(npcId, data);
+			}
+		}
+	}
+	
+	public L2PetData getPetDataByItemId(int itemId) {
+		for (L2PetData data : _pets.values()) {
+			if (data.getItemId() == itemId) {
+				return data;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the pet level data.
+	 * @param petId the pet Id.
+	 * @param petLevel the pet level.
+	 * @return the pet's parameters for the given Id and level.
+	 */
+	public L2PetLevelData getPetLevelData(int petId, int petLevel) {
+		final L2PetData pd = getPetData(petId);
+		if (pd != null) {
+			return pd.getPetLevelData(petLevel);
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the pet data.
+	 * @param petId the pet Id.
+	 * @return the pet data
+	 */
+	public L2PetData getPetData(int petId) {
+		if (!_pets.containsKey(petId)) {
+			LOG.warn("Missing pet data for NPC Id {}!", petId);
+		}
+		return _pets.get(petId);
+	}
+	
+	/**
+	 * Gets the pet min level.
+	 * @param petId the pet Id.
+	 * @return the pet min level
+	 */
+	public int getPetMinLevel(int petId) {
+		return _pets.get(petId).getMinLevel();
+	}
+	
+	/**
+	 * Gets the pet items by npc.
+	 * @param npcId the NPC ID to get its summoning item
+	 * @return summoning item for the given NPC ID
+	 */
+	public int getPetItemsByNpc(int npcId) {
+		return _pets.get(npcId).getItemId();
+	}
+	
+	/**
+	 * Checks if is mountable.
+	 * @param npcId the NPC Id to verify.
+	 * @return {@code true} if the given Id is from a mountable pet, {@code false} otherwise.
+	 */
+	public static boolean isMountable(int npcId) {
+		return MountType.findByNpcId(npcId) != MountType.NONE;
+	}
+	
+	public static PetDataTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PetDataTable INSTANCE = new PetDataTable();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerCreationPointData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerCreationPointData.java
new file mode 100644
index 00000000..a10ef79c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerCreationPointData.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * @author Michael
+ */
+public class PlayerCreationPointData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerCreationPointData.class);
+	
+	private final Map<ClassId, Location[]> _creationPointData = new HashMap<>();
+	
+	protected PlayerCreationPointData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_creationPointData.clear();
+		parseDatapackFile("data/stats/chars/pcCreationPoints.xml");
+		LOG.info("Loaded {} character creation points.", _creationPointData.values().stream().mapToInt(array -> array.length).sum());
+	}
+	
+	/**
+	 * @return random Location of created character spawn.
+	 */
+	public Location getCreationPoint(ClassId classId) {
+		return Rnd.randomElement(_creationPointData.get(classId));
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		NamedNodeMap attrs;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("startpoints".equalsIgnoreCase(d.getNodeName())) {
+						List<Location> creationPoints = new ArrayList<>();
+						for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+							if ("spawn".equalsIgnoreCase(c.getNodeName())) {
+								attrs = c.getAttributes();
+								creationPoints.add(new Location(parseInteger(attrs, "x"), parseInteger(attrs, "y"), parseInteger(attrs, "z")));
+							} else if ("classid".equalsIgnoreCase(c.getNodeName())) {
+								_creationPointData.put(ClassId.getClassId(Integer.parseInt(c.getTextContent())), creationPoints.toArray(new Location[0]));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public static PlayerCreationPointData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PlayerCreationPointData INSTANCE = new PlayerCreationPointData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java
new file mode 100644
index 00000000..f60316ed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerTemplateData.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Loads player's base stats.
+ * @author Forsaiken
+ * @author Zoey76
+ * @author GKR
+ */
+public final class PlayerTemplateData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerTemplateData.class);
+	
+	private final Map<ClassId, L2PcTemplate> _playerTemplates = new HashMap<>();
+	
+	private int _dataCount = 0;
+	
+	protected PlayerTemplateData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_playerTemplates.clear();
+		parseDatapackDirectory("data/stats/chars/baseStats", false);
+		LOG.info("Loaded {} character templates.", _playerTemplates.size());
+		LOG.info("Loaded {} level up gain records.", _dataCount);
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		NamedNodeMap attrs;
+		int classId = 0;
+		
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("classId".equalsIgnoreCase(d.getNodeName())) {
+						classId = Integer.parseInt(d.getTextContent());
+					} else if ("staticData".equalsIgnoreCase(d.getNodeName())) {
+						StatsSet set = new StatsSet();
+						set.set("classId", classId);
+						for (Node nd = d.getFirstChild(); nd != null; nd = nd.getNextSibling()) {
+							// Skip odd nodes
+							if (nd.getNodeName().equals("#text")) {
+								continue;
+							}
+							
+							if (nd.getChildNodes().getLength() > 1) {
+								for (Node cnd = nd.getFirstChild(); cnd != null; cnd = cnd.getNextSibling()) {
+									// use L2CharTemplate(superclass) fields for male collision height and collision radius
+									if (nd.getNodeName().equalsIgnoreCase("collisionMale")) {
+										if (cnd.getNodeName().equalsIgnoreCase("radius")) {
+											set.set("collisionRadius", cnd.getTextContent());
+										} else if (cnd.getNodeName().equalsIgnoreCase("height")) {
+											set.set("collisionHeight", cnd.getTextContent());
+										}
+									}
+									if ("walk".equalsIgnoreCase(cnd.getNodeName())) {
+										set.set("baseWalkSpd", cnd.getTextContent());
+									} else if ("run".equalsIgnoreCase(cnd.getNodeName())) {
+										set.set("baseRunSpd", cnd.getTextContent());
+									} else if ("slowSwim".equals(cnd.getNodeName())) {
+										set.set("baseSwimWalkSpd", cnd.getTextContent());
+									} else if ("fastSwim".equals(cnd.getNodeName())) {
+										set.set("baseSwimRunSpd", cnd.getTextContent());
+									} else if (!cnd.getNodeName().equals("#text")) {
+										set.set((nd.getNodeName() + cnd.getNodeName()), cnd.getTextContent());
+									}
+								}
+							} else {
+								set.set(nd.getNodeName(), nd.getTextContent());
+							}
+						}
+						// calculate total pdef and mdef from parts
+						set.set("basePDef", (set.getInt("basePDefchest", 0) + set.getInt("basePDeflegs", 0) + set.getInt("basePDefhead", 0) + set.getInt("basePDeffeet", 0) + set.getInt("basePDefgloves", 0) + set.getInt("basePDefunderwear", 0) + set.getInt("basePDefcloak", 0)));
+						set.set("baseMDef", (set.getInt("baseMDefrear", 0) + set.getInt("baseMDeflear", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefrfinger", 0) + set.getInt("baseMDefneck", 0)));
+						
+						_playerTemplates.put(ClassId.getClassId(classId), new L2PcTemplate(set));
+					} else if ("lvlUpgainData".equalsIgnoreCase(d.getNodeName())) {
+						for (Node lvlNode = d.getFirstChild(); lvlNode != null; lvlNode = lvlNode.getNextSibling()) {
+							if ("level".equalsIgnoreCase(lvlNode.getNodeName())) {
+								attrs = lvlNode.getAttributes();
+								int level = parseInteger(attrs, "val");
+								
+								for (Node valNode = lvlNode.getFirstChild(); valNode != null; valNode = valNode.getNextSibling()) {
+									String nodeName = valNode.getNodeName();
+									
+									if ((nodeName.startsWith("hp") || nodeName.startsWith("mp") || nodeName.startsWith("cp")) && _playerTemplates.containsKey(ClassId.getClassId(classId))) {
+										_playerTemplates.get(ClassId.getClassId(classId)).setUpgainValue(nodeName, level, Double.parseDouble(valNode.getTextContent()));
+										_dataCount++;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public L2PcTemplate getTemplate(ClassId classId) {
+		return _playerTemplates.get(classId);
+	}
+	
+	public L2PcTemplate getTemplate(int classId) {
+		return _playerTemplates.get(ClassId.getClassId(classId));
+	}
+	
+	public static PlayerTemplateData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PlayerTemplateData INSTANCE = new PlayerTemplateData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java
new file mode 100644
index 00000000..8f9e6f21
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/PlayerXpPercentLostData.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.Arrays;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class holds the Player Xp Percent Lost Data for each level for players.
+ * @author Zealar
+ */
+public final class PlayerXpPercentLostData implements IXmlReader {
+	
+	private final double[] _playerXpPercentLost = new double[character().getMaxPlayerLevel() + 1];
+	
+	protected PlayerXpPercentLostData() {
+		Arrays.fill(_playerXpPercentLost, 1.);
+		load();
+	}
+	
+	@Override
+	public void load() {
+		parseDatapackFile("data/stats/chars/playerXpPercentLost.xml");
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("xpLost".equalsIgnoreCase(d.getNodeName())) {
+						NamedNodeMap attrs = d.getAttributes();
+						_playerXpPercentLost[parseInteger(attrs, "level")] = parseDouble(attrs, "val");
+					}
+				}
+			}
+		}
+	}
+	
+	public double getXpPercent(final int level) {
+		if (level > character().getMaxPlayerLevel()) {
+			LOG.warn("Require to high level inside PlayerXpPercentLostData ({})", level);
+			return _playerXpPercentLost[character().getMaxPlayerLevel()];
+		}
+		return _playerXpPercentLost[level];
+	}
+	
+	/**
+	 * Gets the single instance of PlayerXpPercentLostData.
+	 * @return single instance of PlayerXpPercentLostData.
+	 */
+	public static PlayerXpPercentLostData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PlayerXpPercentLostData _instance = new PlayerXpPercentLostData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java
new file mode 100644
index 00000000..45d8f842
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/RecipeData.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.L2RecipeInstance;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.L2RecipeStatInstance;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Recipe data.
+ * @author Zoey76
+ */
+public class RecipeData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RecipeData.class);
+	
+	private final Map<Integer, L2RecipeList> _recipes = new HashMap<>();
+	
+	protected RecipeData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_recipes.clear();
+		parseDatapackFile("data/recipes.xml");
+		LOG.info("Loaded {} recipes.", _recipes.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		// TODO: Cleanup checks enforced by XSD.
+		final List<L2RecipeInstance> recipePartList = new ArrayList<>();
+		final List<L2RecipeStatInstance> recipeStatUseList = new ArrayList<>();
+		final List<L2RecipeStatInstance> recipeAltStatChangeList = new ArrayList<>();
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				RECIPES_FILE:
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("item".equalsIgnoreCase(d.getNodeName())) {
+						recipePartList.clear();
+						recipeStatUseList.clear();
+						recipeAltStatChangeList.clear();
+						NamedNodeMap attrs = d.getAttributes();
+						boolean haveRare = false;
+						StatsSet set = new StatsSet();
+						
+						Node att = attrs.getNamedItem("id");
+						if (att == null) {
+							LOG.error("Missing id for recipe item, skipping!");
+							continue;
+						}
+						int id = Integer.parseInt(att.getNodeValue());
+						set.set("id", id);
+						
+						att = attrs.getNamedItem("recipeId");
+						if (att == null) {
+							LOG.error("Missing recipeId for recipe item ID: {}, skipping!", id);
+							continue;
+						}
+						set.set("recipeId", Integer.parseInt(att.getNodeValue()));
+						
+						att = attrs.getNamedItem("name");
+						if (att == null) {
+							LOG.error("Missing name for recipe item ID: {}, skipping!", id);
+							continue;
+						}
+						set.set("recipeName", att.getNodeValue());
+						
+						att = attrs.getNamedItem("craftLevel");
+						if (att == null) {
+							LOG.error("Missing level for recipe item ID: {}, skipping!", id);
+							continue;
+						}
+						set.set("craftLevel", Integer.parseInt(att.getNodeValue()));
+						
+						att = attrs.getNamedItem("type");
+						if (att == null) {
+							LOG.error("Missing type for recipe item ID: {}, skipping!", id);
+							continue;
+						}
+						set.set("isDwarvenRecipe", att.getNodeValue().equalsIgnoreCase("dwarven"));
+						
+						att = attrs.getNamedItem("successRate");
+						if (att == null) {
+							LOG.error("Missing successRate for recipe item ID: {}, skipping!", id);
+							continue;
+						}
+						set.set("successRate", Integer.parseInt(att.getNodeValue()));
+						
+						for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+							if ("statUse".equalsIgnoreCase(c.getNodeName())) {
+								String statName = c.getAttributes().getNamedItem("name").getNodeValue();
+								int value = Integer.parseInt(c.getAttributes().getNamedItem("value").getNodeValue());
+								try {
+									recipeStatUseList.add(new L2RecipeStatInstance(statName, value));
+								} catch (Exception e) {
+									LOG.error("Error in StatUse parameter for recipe item ID: {}, skipping!", id);
+									continue RECIPES_FILE;
+								}
+							} else if ("altStatChange".equalsIgnoreCase(c.getNodeName())) {
+								String statName = c.getAttributes().getNamedItem("name").getNodeValue();
+								int value = Integer.parseInt(c.getAttributes().getNamedItem("value").getNodeValue());
+								try {
+									recipeAltStatChangeList.add(new L2RecipeStatInstance(statName, value));
+								} catch (Exception e) {
+									LOG.error("Error in AltStatChange parameter for recipe item ID: {}, skipping!", id);
+									continue RECIPES_FILE;
+								}
+							} else if ("ingredient".equalsIgnoreCase(c.getNodeName())) {
+								int ingId = Integer.parseInt(c.getAttributes().getNamedItem("id").getNodeValue());
+								int ingCount = Integer.parseInt(c.getAttributes().getNamedItem("count").getNodeValue());
+								recipePartList.add(new L2RecipeInstance(ingId, ingCount));
+							} else if ("production".equalsIgnoreCase(c.getNodeName())) {
+								set.set("itemId", Integer.parseInt(c.getAttributes().getNamedItem("id").getNodeValue()));
+								set.set("count", Integer.parseInt(c.getAttributes().getNamedItem("count").getNodeValue()));
+							} else if ("productionRare".equalsIgnoreCase(c.getNodeName())) {
+								set.set("rareItemId", Integer.parseInt(c.getAttributes().getNamedItem("id").getNodeValue()));
+								set.set("rareCount", Integer.parseInt(c.getAttributes().getNamedItem("count").getNodeValue()));
+								set.set("rarity", Integer.parseInt(c.getAttributes().getNamedItem("rarity").getNodeValue()));
+								haveRare = true;
+							}
+						}
+						
+						L2RecipeList recipeList = new L2RecipeList(set, haveRare);
+						for (L2RecipeInstance recipePart : recipePartList) {
+							recipeList.addRecipe(recipePart);
+						}
+						for (L2RecipeStatInstance recipeStatUse : recipeStatUseList) {
+							recipeList.addStatUse(recipeStatUse);
+						}
+						for (L2RecipeStatInstance recipeAltStatChange : recipeAltStatChangeList) {
+							recipeList.addAltStatChange(recipeAltStatChange);
+						}
+						
+						_recipes.put(id, recipeList);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Gets the recipe list.
+	 * @param listId the list id
+	 * @return the recipe list
+	 */
+	public L2RecipeList getRecipeList(int listId) {
+		return _recipes.get(listId);
+	}
+	
+	/**
+	 * Gets the recipe by item id.
+	 * @param itemId the item id
+	 * @return the recipe by item id
+	 */
+	public L2RecipeList getRecipeByItemId(int itemId) {
+		for (L2RecipeList find : _recipes.values()) {
+			if (find.getRecipeId() == itemId) {
+				return find;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the all item ids.
+	 * @return the all item ids
+	 */
+	public int[] getAllItemIds() {
+		int[] idList = new int[_recipes.size()];
+		int i = 0;
+		for (L2RecipeList rec : _recipes.values()) {
+			idList[i++] = rec.getRecipeId();
+		}
+		return idList;
+	}
+	
+	/**
+	 * Gets the valid recipe list.
+	 * @param player the player
+	 * @param id the recipe list id
+	 * @return the valid recipe list
+	 */
+	public L2RecipeList getValidRecipeList(L2PcInstance player, int id) {
+		L2RecipeList recipeList = _recipes.get(id);
+		if ((recipeList == null) || (recipeList.getRecipes().length == 0)) {
+			player.sendMessage(getClass().getSimpleName() + ": No recipe for: " + id);
+			player.isInCraftMode(false);
+			return null;
+		}
+		return recipeList;
+	}
+	
+	public static RecipeData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final RecipeData INSTANCE = new RecipeData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/SecondaryAuthData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SecondaryAuthData.java
new file mode 100644
index 00000000..5fb6c7fc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SecondaryAuthData.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Secondary Auth data.
+ * @author NosBit
+ */
+public class SecondaryAuthData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SecondaryAuthData.class);
+	
+	private final Set<String> _forbiddenPasswords = new HashSet<>();
+	
+	private boolean _enabled = false;
+	
+	private int _maxAttempts = 5;
+	
+	private int _banTime = 480;
+	
+	private String _recoveryLink = "";
+	
+	protected SecondaryAuthData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_forbiddenPasswords.clear();
+		parseFile(new File("config/SecondaryAuth.xml"));
+		LOG.info("Loaded {} forbidden passwords.", _forbiddenPasswords.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		try {
+			for (Node node = doc.getFirstChild(); node != null; node = node.getNextSibling()) {
+				if ("list".equalsIgnoreCase(node.getNodeName())) {
+					for (Node list_node = node.getFirstChild(); list_node != null; list_node = list_node.getNextSibling()) {
+						if ("enabled".equalsIgnoreCase(list_node.getNodeName())) {
+							_enabled = Boolean.parseBoolean(list_node.getTextContent());
+						} else if ("maxAttempts".equalsIgnoreCase(list_node.getNodeName())) {
+							_maxAttempts = Integer.parseInt(list_node.getTextContent());
+						} else if ("banTime".equalsIgnoreCase(list_node.getNodeName())) {
+							_banTime = Integer.parseInt(list_node.getTextContent());
+						} else if ("recoveryLink".equalsIgnoreCase(list_node.getNodeName())) {
+							_recoveryLink = list_node.getTextContent();
+						} else if ("forbiddenPasswords".equalsIgnoreCase(list_node.getNodeName())) {
+							for (Node forbiddenPasswords_node = list_node.getFirstChild(); forbiddenPasswords_node != null; forbiddenPasswords_node = forbiddenPasswords_node.getNextSibling()) {
+								if ("password".equalsIgnoreCase(forbiddenPasswords_node.getNodeName())) {
+									_forbiddenPasswords.add(forbiddenPasswords_node.getTextContent());
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Failed to load secondary auth data from xml.", ex);
+		}
+	}
+	
+	public boolean isEnabled() {
+		return _enabled;
+	}
+	
+	public int getMaxAttempts() {
+		return _maxAttempts;
+	}
+	
+	public int getBanTime() {
+		return _banTime;
+	}
+	
+	public String getRecoveryLink() {
+		return _recoveryLink;
+	}
+	
+	public Set<String> getForbiddenPasswords() {
+		return _forbiddenPasswords;
+	}
+	
+	public boolean isForbiddenPassword(String password) {
+		return _forbiddenPasswords.contains(password);
+	}
+	
+	public static SecondaryAuthData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SecondaryAuthData INSTANCE = new SecondaryAuthData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java
new file mode 100644
index 00000000..aa2cac5d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SiegeScheduleData.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.SiegeScheduleDate;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.util.IXmlReader;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Siege Schedule data.
+ * @author UnAfraid
+ */
+public class SiegeScheduleData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SiegeScheduleData.class);
+	
+	private final List<SiegeScheduleDate> _scheduleData = new ArrayList<>();
+	
+	protected SiegeScheduleData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_scheduleData.clear();
+		parseFile(new File("config/SiegeSchedule.xml"));
+		LOG.info("Loaded {} siege schedulers.", _scheduleData.size());
+		
+		if (_scheduleData.isEmpty()) {
+			_scheduleData.add(new SiegeScheduleDate(new StatsSet()));
+			LOG.info("Emergency Loaded {} default siege schedulers.", _scheduleData.size());
+		}
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node cd = n.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+					if ("schedule".equals(cd.getNodeName())) {
+						final StatsSet set = new StatsSet();
+						final NamedNodeMap attrs = cd.getAttributes();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							Node node = attrs.item(i);
+							String key = node.getNodeName();
+							String val = node.getNodeValue();
+							if ("day".equals(key)) {
+								if (!Util.isDigit(val)) {
+									val = Integer.toString(getValueForField(val));
+								}
+							}
+							set.set(key, val);
+						}
+						_scheduleData.add(new SiegeScheduleDate(set));
+					}
+				}
+			}
+		}
+	}
+	
+	private int getValueForField(String field) {
+		try {
+			return Calendar.class.getField(field).getInt(Calendar.class);
+		} catch (Exception ex) {
+			LOG.warn("Unable to get value!", ex);
+			return -1;
+		}
+	}
+	
+	public List<SiegeScheduleDate> getScheduleDates() {
+		return _scheduleData;
+	}
+	
+	public static SiegeScheduleData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SiegeScheduleData INSTANCE = new SiegeScheduleData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java
new file mode 100644
index 00000000..cf4c8322
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillLearnData.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Holds all skill learn data for all NPCs.
+ * @author xban1x
+ */
+public final class SkillLearnData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SkillLearnData.class);
+	
+	private final Map<Integer, List<ClassId>> _skillLearn = new HashMap<>();
+	
+	protected SkillLearnData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_skillLearn.clear();
+		parseDatapackFile("data/skillLearn.xml");
+		LOG.info("Loaded {} skill learn data.", _skillLearn.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (var node = doc.getFirstChild(); node != null; node = node.getNextSibling()) {
+			if ("list".equalsIgnoreCase(node.getNodeName())) {
+				for (var list_node = node.getFirstChild(); list_node != null; list_node = list_node.getNextSibling()) {
+					if ("npc".equalsIgnoreCase(list_node.getNodeName())) {
+						final var classIds = new LinkedList<ClassId>();
+						for (var c = list_node.getFirstChild(); c != null; c = c.getNextSibling()) {
+							if ("classId".equalsIgnoreCase(c.getNodeName())) {
+								classIds.add(ClassId.getClassId(Integer.parseInt(c.getTextContent())));
+							}
+						}
+						_skillLearn.put(parseInteger(list_node.getAttributes(), "id"), classIds);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @param npcId
+	 * @return {@link List} of {@link ClassId}'s that this npcId can teach.
+	 */
+	public List<ClassId> getSkillLearnData(int npcId) {
+		return _skillLearn.get(npcId);
+	}
+	
+	public static SkillLearnData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SkillLearnData INSTANCE = new SkillLearnData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java
new file mode 100644
index 00000000..5a741f47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/SkillTreesData.java
@@ -0,0 +1,1063 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.base.SocialClass;
+import com.l2jserver.gameserver.model.base.SubClass;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.PlayerSkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class loads and manage the characters and pledges skills trees.<br>
+ * Here can be found the following skill trees:<br>
+ * <ul>
+ * <li>Class skill trees: player skill trees for each class.</li>
+ * <li>Transfer skill trees: player skill trees for each healer class.</lI>
+ * <li>Collect skill tree: player skill tree for Gracia related skills.</li>
+ * <li>Fishing skill tree: player skill tree for fishing related skills.</li>
+ * <li>Transform skill tree: player skill tree for transformation related skills.</li>
+ * <li>Sub-Class skill tree: player skill tree for sub-class related skills.</li>
+ * <li>Noble skill tree: player skill tree for noblesse related skills.</li>
+ * <li>Hero skill tree: player skill tree for heroes related skills.</li>
+ * <li>GM skill tree: player skill tree for Game Master related skills.</li>
+ * <li>Common skill tree: custom skill tree for players, skills in this skill tree will be available for all players.</li>
+ * <li>Pledge skill tree: clan skill tree for main clan.</li>
+ * <li>Sub-Pledge skill tree: clan skill tree for sub-clans.</li>
+ * </ul>
+ * For easy customization of player class skill trees, the parent Id of each class is taken from the XML data, this means you can use a different class parent Id than in the normal game play, for example all 3rd class dagger users will have Treasure Hunter skills as 1st and 2nd class skills.<br>
+ * For XML schema please refer to skillTrees.xsd in datapack in xsd folder and for parameters documentation refer to documentation.txt in skillTrees folder.<br>
+ * @author Zoey76
+ */
+public final class SkillTreesData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SkillTreesData.class);
+	
+	// ClassId, Map of Skill Hash Code, L2SkillLearn
+	private final Map<ClassId, Map<Integer, L2SkillLearn>> _classSkillTrees = new LinkedHashMap<>();
+	private final Map<ClassId, Map<Integer, L2SkillLearn>> _transferSkillTrees = new LinkedHashMap<>();
+	// Skill Hash Code, L2SkillLearn
+	private final Map<Integer, L2SkillLearn> _collectSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _fishingSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _pledgeSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _subClassSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _subPledgeSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _transformSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _commonSkillTree = new LinkedHashMap<>();
+	// Other skill trees
+	private final Map<Integer, L2SkillLearn> _nobleSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _heroSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _gameMasterSkillTree = new LinkedHashMap<>();
+	private final Map<Integer, L2SkillLearn> _gameMasterAuraSkillTree = new LinkedHashMap<>();
+	
+	// Checker, sorted arrays of hash codes
+	private Map<Integer, int[]> _skillsByClassIdHashCodes; // Occupation skills
+	private Map<Integer, int[]> _skillsByRaceHashCodes; // Race-specific Transformations
+	private int[] _allSkillsHashCodes; // Fishing, Collection, Transformations, Common Skills.
+	
+	private boolean _loading = true;
+	
+	/** Parent class IDs are read from XML and stored in this map, to allow easy customization. */
+	private final Map<ClassId, ClassId> _parentClassMap = new LinkedHashMap<>();
+	
+	/**
+	 * Instantiates a new skill trees data.
+	 */
+	protected SkillTreesData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_loading = true;
+		_classSkillTrees.clear();
+		_collectSkillTree.clear();
+		_fishingSkillTree.clear();
+		_pledgeSkillTree.clear();
+		_subClassSkillTree.clear();
+		_subPledgeSkillTree.clear();
+		_transferSkillTrees.clear();
+		_transformSkillTree.clear();
+		_nobleSkillTree.clear();
+		_heroSkillTree.clear();
+		_gameMasterSkillTree.clear();
+		_gameMasterAuraSkillTree.clear();
+		
+		// Load files.
+		parseDatapackDirectory("data/skillTrees/", false);
+		
+		// Generate check arrays.
+		generateCheckArrays();
+		
+		_loading = false;
+		
+		// Logs a report with skill trees info.
+		report();
+	}
+	
+	/**
+	 * Parse a skill tree file and store it into the correct skill tree.
+	 */
+	@Override
+	public void parseDocument(Document doc) {
+		int cId;
+		ClassId classId = null;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("skillTree".equalsIgnoreCase(d.getNodeName())) {
+						final Map<Integer, L2SkillLearn> classSkillTree = new HashMap<>();
+						final Map<Integer, L2SkillLearn> trasferSkillTree = new HashMap<>();
+						final String type = d.getAttributes().getNamedItem("type").getNodeValue();
+						Node attr = d.getAttributes().getNamedItem("classId");
+						if (attr != null) {
+							cId = Integer.parseInt(attr.getNodeValue());
+							classId = ClassId.values()[cId];
+						} else {
+							cId = -1;
+						}
+						
+						attr = d.getAttributes().getNamedItem("parentClassId");
+						if (attr != null) {
+							final int parentClassId = Integer.parseInt(attr.getNodeValue());
+							if ((cId > -1) && (cId != parentClassId) && (parentClassId > -1) && !_parentClassMap.containsKey(classId)) {
+								_parentClassMap.put(classId, ClassId.values()[parentClassId]);
+							}
+						}
+						
+						for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+							if ("skill".equalsIgnoreCase(c.getNodeName())) {
+								final StatsSet learnSkillSet = new StatsSet();
+								NamedNodeMap attrs = c.getAttributes();
+								for (int i = 0; i < attrs.getLength(); i++) {
+									attr = attrs.item(i);
+									learnSkillSet.set(attr.getNodeName(), attr.getNodeValue());
+								}
+								
+								final L2SkillLearn skillLearn = new L2SkillLearn(learnSkillSet);
+								for (Node b = c.getFirstChild(); b != null; b = b.getNextSibling()) {
+									attrs = b.getAttributes();
+									switch (b.getNodeName()) {
+										case "item" -> skillLearn.addRequiredItem(new ItemHolder(parseInteger(attrs, "id"), parseInteger(attrs, "count")));
+										case "preRequisiteSkill" -> skillLearn.addPreReqSkill(new SkillHolder(parseInteger(attrs, "id"), parseInteger(attrs, "lvl")));
+										case "race" -> skillLearn.addRace(Race.valueOf(b.getTextContent()));
+										case "residenceId" -> skillLearn.addResidenceId(Integer.valueOf(b.getTextContent()));
+										case "socialClass" -> skillLearn.setSocialClass(Enum.valueOf(SocialClass.class, b.getTextContent()));
+										case "subClassConditions" -> skillLearn.addSubclassConditions(parseInteger(attrs, "slot"), parseInteger(attrs, "lvl"));
+									}
+								}
+								
+								final int skillHashCode = SkillData.getSkillHashCode(skillLearn.getSkillId(), skillLearn.getSkillLevel());
+								switch (type) {
+									case "classSkillTree" -> {
+										if (cId != -1) {
+											classSkillTree.put(skillHashCode, skillLearn);
+										} else {
+											_commonSkillTree.put(skillHashCode, skillLearn);
+										}
+									}
+									case "transferSkillTree" -> trasferSkillTree.put(skillHashCode, skillLearn);
+									case "collectSkillTree" -> _collectSkillTree.put(skillHashCode, skillLearn);
+									case "fishingSkillTree" -> _fishingSkillTree.put(skillHashCode, skillLearn);
+									case "pledgeSkillTree" -> _pledgeSkillTree.put(skillHashCode, skillLearn);
+									case "subClassSkillTree" -> _subClassSkillTree.put(skillHashCode, skillLearn);
+									case "subPledgeSkillTree" -> _subPledgeSkillTree.put(skillHashCode, skillLearn);
+									case "transformSkillTree" -> _transformSkillTree.put(skillHashCode, skillLearn);
+									case "nobleSkillTree" -> _nobleSkillTree.put(skillHashCode, skillLearn);
+									case "heroSkillTree" -> _heroSkillTree.put(skillHashCode, skillLearn);
+									case "gameMasterSkillTree" -> _gameMasterSkillTree.put(skillHashCode, skillLearn);
+									case "gameMasterAuraSkillTree" -> _gameMasterAuraSkillTree.put(skillHashCode, skillLearn);
+									default -> LOG.warn("Unknown Skill Tree type: {}!", type);
+								}
+							}
+						}
+						
+						if (type.equals("transferSkillTree")) {
+							_transferSkillTrees.put(classId, trasferSkillTree);
+						} else if (type.equals("classSkillTree") && (cId > -1)) {
+							if (!_classSkillTrees.containsKey(classId)) {
+								_classSkillTrees.put(classId, classSkillTree);
+							} else {
+								_classSkillTrees.get(classId).putAll(classSkillTree);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Method to get the complete skill tree for a given class id.<br>
+	 * Include all skills common to all classes.<br>
+	 * Includes all parent skill trees.
+	 * @param classId the class skill tree Id
+	 * @return the complete Class Skill Tree including skill trees from parent class for a given {@code classId}
+	 */
+	public Map<Integer, L2SkillLearn> getCompleteClassSkillTree(ClassId classId) {
+		// Add all skills that belong to all classes.
+		final Map<Integer, L2SkillLearn> skillTree = new LinkedHashMap<>(_commonSkillTree);
+		final LinkedList<ClassId> classSequence = new LinkedList<>();
+		while (classId != null) {
+			classSequence.addFirst(classId);
+			classId = _parentClassMap.get(classId);
+		}
+		
+		for (ClassId cid : classSequence) {
+			final Map<Integer, L2SkillLearn> classSkillTree = _classSkillTrees.get(cid);
+			if (classSkillTree != null) {
+				skillTree.putAll(classSkillTree);
+			}
+		}
+		return skillTree;
+	}
+	
+	/**
+	 * Gets the transfer skill tree.<br>
+	 * If new classes are implemented over 3rd class, we use a recursive call.
+	 * @param classId the transfer skill tree Id
+	 * @return the complete Transfer Skill Tree for a given {@code classId}
+	 */
+	public Map<Integer, L2SkillLearn> getTransferSkillTree(ClassId classId) {
+		if (classId.level() >= 3) {
+			return getTransferSkillTree(classId.getParent());
+		}
+		return _transferSkillTrees.get(classId);
+	}
+	
+	/**
+	 * Gets the common skill tree.
+	 * @return the complete Common Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getCommonSkillTree() {
+		return _commonSkillTree;
+	}
+	
+	/**
+	 * Gets the collect skill tree.
+	 * @return the complete Collect Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getCollectSkillTree() {
+		return _collectSkillTree;
+	}
+	
+	/**
+	 * Gets the fishing skill tree.
+	 * @return the complete Fishing Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getFishingSkillTree() {
+		return _fishingSkillTree;
+	}
+	
+	/**
+	 * Gets the pledge skill tree.
+	 * @return the complete Pledge Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getPledgeSkillTree() {
+		return _pledgeSkillTree;
+	}
+	
+	/**
+	 * Gets the sub class skill tree.
+	 * @return the complete Sub-Class Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getSubClassSkillTree() {
+		return _subClassSkillTree;
+	}
+	
+	/**
+	 * Gets the sub pledge skill tree.
+	 * @return the complete Sub-Pledge Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getSubPledgeSkillTree() {
+		return _subPledgeSkillTree;
+	}
+	
+	/**
+	 * Gets the transform skill tree.
+	 * @return the complete Transform Skill Tree
+	 */
+	public Map<Integer, L2SkillLearn> getTransformSkillTree() {
+		return _transformSkillTree;
+	}
+	
+	/**
+	 * Gets the noble skill tree.
+	 * @return the complete Noble Skill Tree
+	 */
+	public Map<Integer, Skill> getNobleSkillTree() {
+		final Map<Integer, Skill> tree = new HashMap<>();
+		final SkillData st = SkillData.getInstance();
+		for (Entry<Integer, L2SkillLearn> e : _nobleSkillTree.entrySet()) {
+			tree.put(e.getKey(), st.getSkill(e.getValue().getSkillId(), e.getValue().getSkillLevel()));
+		}
+		return tree;
+	}
+	
+	/**
+	 * Gets the hero skill tree.
+	 * @return the complete Hero Skill Tree
+	 */
+	public Map<Integer, Skill> getHeroSkillTree() {
+		final Map<Integer, Skill> tree = new HashMap<>();
+		final SkillData st = SkillData.getInstance();
+		for (Entry<Integer, L2SkillLearn> e : _heroSkillTree.entrySet()) {
+			tree.put(e.getKey(), st.getSkill(e.getValue().getSkillId(), e.getValue().getSkillLevel()));
+		}
+		return tree;
+	}
+	
+	/**
+	 * Gets the Game Master skill tree.
+	 * @return the complete Game Master Skill Tree
+	 */
+	public Map<Integer, Skill> getGMSkillTree() {
+		final Map<Integer, Skill> tree = new HashMap<>();
+		final SkillData st = SkillData.getInstance();
+		for (Entry<Integer, L2SkillLearn> e : _gameMasterSkillTree.entrySet()) {
+			tree.put(e.getKey(), st.getSkill(e.getValue().getSkillId(), e.getValue().getSkillLevel()));
+		}
+		return tree;
+	}
+	
+	/**
+	 * Gets the Game Master Aura skill tree.
+	 * @return the complete Game Master Aura Skill Tree
+	 */
+	public Map<Integer, Skill> getGMAuraSkillTree() {
+		final Map<Integer, Skill> tree = new HashMap<>();
+		final SkillData st = SkillData.getInstance();
+		for (Entry<Integer, L2SkillLearn> e : _gameMasterAuraSkillTree.entrySet()) {
+			tree.put(e.getKey(), st.getSkill(e.getValue().getSkillId(), e.getValue().getSkillLevel()));
+		}
+		return tree;
+	}
+	
+	/**
+	 * Gets the available skills.
+	 * @param player the learning skill player
+	 * @param classId the learning skill class Id
+	 * @param includeByFs if {@code true} skills from Forgotten Scroll will be included
+	 * @param includeAutoGet if {@code true} Auto-Get skills will be included
+	 * @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
+	 */
+	public List<L2SkillLearn> getAvailableSkills(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet) {
+		return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
+	}
+	
+	/**
+	 * Gets the available skills.
+	 * @param player the learning skill player
+	 * @param classId the learning skill class Id
+	 * @param includeByFs if {@code true} skills from Forgotten Scroll will be included
+	 * @param includeAutoGet if {@code true} Auto-Get skills will be included
+	 * @param holder
+	 * @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
+	 */
+	private List<L2SkillLearn> getAvailableSkills(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		final Map<Integer, L2SkillLearn> skills = getCompleteClassSkillTree(classId);
+		
+		if (skills.isEmpty()) {
+			// The Skill Tree for this class is undefined.
+			LOG.warn("{}: Skilltree for class {} is not defined!", getClass().getSimpleName(), classId);
+			return result;
+		}
+		
+		for (L2SkillLearn skill : skills.values()) {
+			if (((skill.getSkillId() == CommonSkill.DIVINE_INSPIRATION.getId()) && (!character().autoLearnDivineInspiration() && includeAutoGet) && !player.isGM())) {
+				continue;
+			}
+			
+			if (((includeAutoGet && skill.isAutoGet()) || skill.isLearnedByNpc() || (includeByFs && skill.isLearnedByFS())) && (player.getLevel() >= skill.getGetLevel())) {
+				final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
+				if (oldSkill != null) {
+					if (oldSkill.getLevel() == (skill.getSkillLevel() - 1)) {
+						result.add(skill);
+					}
+				} else if (skill.getSkillLevel() == 1) {
+					result.add(skill);
+				}
+			}
+		}
+		return result;
+	}
+	
+	public Collection<Skill> getAllAvailableSkills(L2PcInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet) {
+		// Get available skills
+		PlayerSkillHolder holder = new PlayerSkillHolder(player);
+		List<L2SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
+		while (learnable.size() > 0) {
+			for (L2SkillLearn s : learnable) {
+				Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
+				holder.addSkill(sk);
+			}
+			
+			// Get new available skills, some skills depend of previous skills to be available.
+			learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
+		}
+		return holder.getSkills().values();
+	}
+	
+	/**
+	 * Gets the available auto get skills.
+	 * @param player the player requesting the Auto-Get skills
+	 * @return all the available Auto-Get skills for a given {@code player}
+	 */
+	public List<L2SkillLearn> getAvailableAutoGetSkills(L2PcInstance player) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		final Map<Integer, L2SkillLearn> skills = getCompleteClassSkillTree(player.getClassId());
+		if (skills.isEmpty()) {
+			// The Skill Tree for this class is undefined, so we return an empty list.
+			LOG.warn("{}: Skill Tree for class ID {} is not defined!", getClass().getSimpleName(), player.getClassId());
+			return result;
+		}
+		
+		final Race race = player.getRace();
+		for (L2SkillLearn skill : skills.values()) {
+			if (!skill.getRaces().isEmpty() && !skill.getRaces().contains(race)) {
+				continue;
+			}
+			
+			if (skill.isAutoGet() && (player.getLevel() >= skill.getGetLevel())) {
+				final Skill oldSkill = player.getSkills().get(skill.getSkillId());
+				if (oldSkill != null) {
+					if (oldSkill.getLevel() < skill.getSkillLevel()) {
+						result.add(skill);
+					}
+				} else {
+					result.add(skill);
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Dwarvens will get additional dwarven only fishing skills.
+	 * @param player the player
+	 * @return all the available Fishing skills for a given {@code player}
+	 */
+	public List<L2SkillLearn> getAvailableFishingSkills(L2PcInstance player) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		final Race playerRace = player.getRace();
+		for (L2SkillLearn skill : _fishingSkillTree.values()) {
+			// If skill is Race specific and the player's race isn't allowed, skip it.
+			if (!skill.getRaces().isEmpty() && !skill.getRaces().contains(playerRace)) {
+				continue;
+			}
+			
+			if (skill.isLearnedByNpc() && (player.getLevel() >= skill.getGetLevel())) {
+				final Skill oldSkill = player.getSkills().get(skill.getSkillId());
+				if (oldSkill != null) {
+					if (oldSkill.getLevel() == (skill.getSkillLevel() - 1)) {
+						result.add(skill);
+					}
+				} else if (skill.getSkillLevel() == 1) {
+					result.add(skill);
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Used in Gracia continent.
+	 * @param player the collecting skill learning player
+	 * @return all the available Collecting skills for a given {@code player}
+	 */
+	public List<L2SkillLearn> getAvailableCollectSkills(L2PcInstance player) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		for (L2SkillLearn skill : _collectSkillTree.values()) {
+			final Skill oldSkill = player.getSkills().get(skill.getSkillId());
+			if (oldSkill != null) {
+				if (oldSkill.getLevel() == (skill.getSkillLevel() - 1)) {
+					result.add(skill);
+				}
+			} else if (skill.getSkillLevel() == 1) {
+				result.add(skill);
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Gets the available transfer skills.
+	 * @param player the transfer skill learning player
+	 * @return all the available Transfer skills for a given {@code player}
+	 */
+	public List<L2SkillLearn> getAvailableTransferSkills(L2PcInstance player) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		ClassId classId = player.getClassId();
+		// If new classes are implemented over 3rd class, a different way should be implemented.
+		if (classId.level() == 3) {
+			classId = classId.getParent();
+		}
+		
+		if (!_transferSkillTrees.containsKey(classId)) {
+			return result;
+		}
+		
+		for (L2SkillLearn skill : _transferSkillTrees.get(classId).values()) {
+			// If player doesn't know this transfer skill:
+			if (player.getKnownSkill(skill.getSkillId()) == null) {
+				result.add(skill);
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Some transformations are not available for some races.
+	 * @param player the transformation skill learning player
+	 * @return all the available Transformation skills for a given {@code player}
+	 */
+	public List<L2SkillLearn> getAvailableTransformSkills(L2PcInstance player) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		final Race race = player.getRace();
+		for (L2SkillLearn skill : _transformSkillTree.values()) {
+			if ((player.getLevel() >= skill.getGetLevel()) && (skill.getRaces().isEmpty() || skill.getRaces().contains(race))) {
+				final Skill oldSkill = player.getSkills().get(skill.getSkillId());
+				if (oldSkill != null) {
+					if (oldSkill.getLevel() == (skill.getSkillLevel() - 1)) {
+						result.add(skill);
+					}
+				} else if (skill.getSkillLevel() == 1) {
+					result.add(skill);
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Gets the available pledge skills.
+	 * @param clan the pledge skill learning clan
+	 * @return all the available Pledge skills for a given {@code clan}
+	 */
+	public List<L2SkillLearn> getAvailablePledgeSkills(L2Clan clan) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		
+		for (L2SkillLearn skill : _pledgeSkillTree.values()) {
+			if (!skill.isResidentialSkill() && (clan.getLevel() >= skill.getGetLevel())) {
+				final Skill oldSkill = clan.getSkills().get(skill.getSkillId());
+				if (oldSkill != null) {
+					if ((oldSkill.getLevel() + 1) == skill.getSkillLevel()) {
+						result.add(skill);
+					}
+				} else if (skill.getSkillLevel() == 1) {
+					result.add(skill);
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Gets the available pledge skills.
+	 * @param clan the pledge skill learning clan
+	 * @param includeSquad if squad skill will be added too
+	 * @return all the available pledge skills for a given {@code clan}
+	 */
+	public Map<Integer, L2SkillLearn> getMaxPledgeSkills(L2Clan clan, boolean includeSquad) {
+		final Map<Integer, L2SkillLearn> result = new HashMap<>();
+		for (L2SkillLearn skill : _pledgeSkillTree.values()) {
+			if (!skill.isResidentialSkill() && (clan.getLevel() >= skill.getGetLevel())) {
+				final Skill oldSkill = clan.getSkills().get(skill.getSkillId());
+				if ((oldSkill == null) || (oldSkill.getLevel() < skill.getSkillLevel())) {
+					result.put(skill.getSkillId(), skill);
+				}
+			}
+		}
+		
+		if (includeSquad) {
+			for (L2SkillLearn skill : _subPledgeSkillTree.values()) {
+				if ((clan.getLevel() >= skill.getGetLevel())) {
+					final Skill oldSkill = clan.getSkills().get(skill.getSkillId());
+					if ((oldSkill == null) || (oldSkill.getLevel() < skill.getSkillLevel())) {
+						result.put(skill.getSkillId(), skill);
+					}
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Gets the available sub pledge skills.
+	 * @param clan the sub-pledge skill learning clan
+	 * @return all the available Sub-Pledge skills for a given {@code clan}
+	 */
+	public List<L2SkillLearn> getAvailableSubPledgeSkills(L2Clan clan) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		for (L2SkillLearn skill : _subPledgeSkillTree.values()) {
+			if ((clan.getLevel() >= skill.getGetLevel()) && clan.isLearnableSubSkill(skill.getSkillId(), skill.getSkillLevel())) {
+				result.add(skill);
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Gets the available sub class skills.
+	 * @param player the sub-class skill learning player
+	 * @return all the available Sub-Class skills for a given {@code player}
+	 */
+	public List<L2SkillLearn> getAvailableSubClassSkills(L2PcInstance player) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		for (L2SkillLearn skill : _subClassSkillTree.values()) {
+			if (player.getLevel() >= skill.getGetLevel()) {
+				for (SubClass subClass : player.getSubClasses().values()) {
+					final var subClassConds = skill.getSubClassConditions();
+					if (!subClassConds.isEmpty() && (subClass.getClassIndex() <= subClassConds.size()) && (subClass.getClassIndex() == subClassConds.get(subClass.getClassIndex() - 1).getSlot()) && (subClassConds.get(subClass.getClassIndex() - 1).getLvl() <= subClass.getLevel())) {
+						final Skill oldSkill = player.getSkills().get(skill.getSkillId());
+						if (oldSkill != null) {
+							if (oldSkill.getLevel() == (skill.getSkillLevel() - 1)) {
+								result.add(skill);
+							}
+						} else if (skill.getSkillLevel() == 1) {
+							result.add(skill);
+						}
+					}
+				}
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Gets the available residential skills.
+	 * @param residenceId the id of the Castle, Fort, Territory
+	 * @return all the available Residential skills for a given {@code residenceId}
+	 */
+	public List<L2SkillLearn> getAvailableResidentialSkills(int residenceId) {
+		final List<L2SkillLearn> result = new ArrayList<>();
+		for (L2SkillLearn skill : _pledgeSkillTree.values()) {
+			if (skill.isResidentialSkill() && skill.getResidenceIds().contains(residenceId)) {
+				result.add(skill);
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Just a wrapper for all skill trees.
+	 * @param skillType the skill type
+	 * @param id the skill Id
+	 * @param lvl the skill level
+	 * @param player the player learning the skill
+	 * @return the skill learn for the specified parameters
+	 */
+	public L2SkillLearn getSkillLearn(AcquireSkillType skillType, int id, int lvl, L2PcInstance player) {
+		return switch (skillType) {
+			case CLASS -> getClassSkill(id, lvl, player.getLearningClass());
+			case TRANSFORM -> getTransformSkill(id, lvl);
+			case FISHING -> getFishingSkill(id, lvl);
+			case PLEDGE -> getPledgeSkill(id, lvl);
+			case SUBPLEDGE -> getSubPledgeSkill(id, lvl);
+			case TRANSFER -> getTransferSkill(id, lvl, player.getClassId());
+			case SUBCLASS -> getSubClassSkill(id, lvl);
+			case COLLECT -> getCollectSkill(id, lvl);
+			default -> null;
+		};
+	}
+	
+	/**
+	 * Gets the transform skill.
+	 * @param id the transformation skill Id
+	 * @param lvl the transformation skill level
+	 * @return the transform skill from the Transform Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getTransformSkill(int id, int lvl) {
+		return _transformSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the class skill.
+	 * @param id the class skill Id
+	 * @param lvl the class skill level.
+	 * @param classId the class skill tree Id
+	 * @return the class skill from the Class Skill Trees for a given {@code classId}, {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getClassSkill(int id, int lvl, ClassId classId) {
+		return getCompleteClassSkillTree(classId).get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the fishing skill.
+	 * @param id the fishing skill Id
+	 * @param lvl the fishing skill level
+	 * @return Fishing skill from the Fishing Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getFishingSkill(int id, int lvl) {
+		return _fishingSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the pledge skill.
+	 * @param id the pledge skill Id
+	 * @param lvl the pledge skill level
+	 * @return the pledge skill from the Pledge Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getPledgeSkill(int id, int lvl) {
+		return _pledgeSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the sub pledge skill.
+	 * @param id the sub-pledge skill Id
+	 * @param lvl the sub-pledge skill level
+	 * @return the sub-pledge skill from the Sub-Pledge Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getSubPledgeSkill(int id, int lvl) {
+		return _subPledgeSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the transfer skill.
+	 * @param id the transfer skill Id
+	 * @param lvl the transfer skill level.
+	 * @param classId the transfer skill tree Id
+	 * @return the transfer skill from the Transfer Skill Trees for a given {@code classId}, {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getTransferSkill(int id, int lvl, ClassId classId) {
+		if (classId.getParent() != null) {
+			final ClassId parentId = classId.getParent();
+			if (_transferSkillTrees.get(parentId) != null) {
+				return _transferSkillTrees.get(parentId).get(SkillData.getSkillHashCode(id, lvl));
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the sub class skill.
+	 * @param id the sub-class skill Id
+	 * @param lvl the sub-class skill level
+	 * @return the sub-class skill from the Sub-Class Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getSubClassSkill(int id, int lvl) {
+		return _subClassSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the common skill.
+	 * @param id the common skill Id.
+	 * @param lvl the common skill level
+	 * @return the common skill from the Common Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getCommonSkill(int id, int lvl) {
+		return _commonSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the collect skill.
+	 * @param id the collect skill Id
+	 * @param lvl the collect skill level
+	 * @return the collect skill from the Collect Skill Tree for a given {@code id} and {@code lvl}
+	 */
+	public L2SkillLearn getCollectSkill(int id, int lvl) {
+		return _collectSkillTree.get(SkillData.getSkillHashCode(id, lvl));
+	}
+	
+	/**
+	 * Gets the minimum level for new skill.
+	 * @param player the player that requires the minimum level
+	 * @param skillTree the skill tree to search the minimum get level
+	 * @return the minimum level for a new skill for a given {@code player} and {@code skillTree}
+	 */
+	public int getMinLevelForNewSkill(L2PcInstance player, Map<Integer, L2SkillLearn> skillTree) {
+		int minLevel = 0;
+		if (skillTree.isEmpty()) {
+			LOG.warn("{}: SkillTree is not defined for getMinLevelForNewSkill!", getClass().getSimpleName());
+		} else {
+			for (L2SkillLearn s : skillTree.values()) {
+				if (s.isLearnedByNpc() && (player.getLevel() < s.getGetLevel())) {
+					if ((minLevel == 0) || (minLevel > s.getGetLevel())) {
+						minLevel = s.getGetLevel();
+					}
+				}
+			}
+		}
+		return minLevel;
+	}
+	
+	/**
+	 * Checks if is hero skill.
+	 * @param skillId the Id of the skill to check
+	 * @param skillLevel the level of the skill to check, if it's -1 only Id will be checked
+	 * @return {@code true} if the skill is present in the Hero Skill Tree, {@code false} otherwise
+	 */
+	public boolean isHeroSkill(int skillId, int skillLevel) {
+		if (_heroSkillTree.containsKey(SkillData.getSkillHashCode(skillId, skillLevel))) {
+			return true;
+		}
+		
+		for (L2SkillLearn skill : _heroSkillTree.values()) {
+			if ((skill.getSkillId() == skillId) && (skillLevel == -1)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Checks if is GM skill.
+	 * @param skillId the Id of the skill to check
+	 * @param skillLevel the level of the skill to check, if it's -1 only Id will be checked
+	 * @return {@code true} if the skill is present in the Game Master Skill Trees, {@code false} otherwise
+	 */
+	public boolean isGMSkill(int skillId, int skillLevel) {
+		if (skillLevel <= 0) {
+			return _gameMasterSkillTree.values().stream().anyMatch(s -> s.getSkillId() == skillId) //
+				|| _gameMasterAuraSkillTree.values().stream().anyMatch(s -> s.getSkillId() == skillId);
+		}
+		final int hashCode = SkillData.getSkillHashCode(skillId, skillLevel);
+		return _gameMasterSkillTree.containsKey(hashCode) || _gameMasterAuraSkillTree.containsKey(hashCode);
+	}
+	
+	/**
+	 * Checks if a skill is a Clan skill.
+	 * @param skillId the Id of the skill to check
+	 * @param skillLevel the level of the skill to check
+	 * @return {@code true} if the skill is present in the Pledge or Subpledge Skill Trees, {@code false} otherwise
+	 */
+	public boolean isClanSkill(int skillId, int skillLevel) {
+		final int hashCode = SkillData.getSkillHashCode(skillId, skillLevel);
+		return _pledgeSkillTree.containsKey(hashCode) || _subPledgeSkillTree.containsKey(hashCode);
+	}
+	
+	/**
+	 * Adds the skills.
+	 * @param gmchar the player to add the Game Master skills
+	 * @param auraSkills if {@code true} it will add "GM Aura" skills, else will add the "GM regular" skills
+	 */
+	public void addSkills(L2PcInstance gmchar, boolean auraSkills) {
+		final Collection<L2SkillLearn> skills = auraSkills ? _gameMasterAuraSkillTree.values() : _gameMasterSkillTree.values();
+		final SkillData st = SkillData.getInstance();
+		for (L2SkillLearn sl : skills) {
+			gmchar.addSkill(st.getSkill(sl.getSkillId(), sl.getSkillLevel()), false); // Don't Save GM skills to database
+		}
+	}
+	
+	/**
+	 * Create and store hash values for skills for easy and fast checks.
+	 */
+	private void generateCheckArrays() {
+		int i;
+		int[] array;
+		
+		// Class specific skills:
+		Map<Integer, L2SkillLearn> tempMap;
+		final Set<ClassId> keySet = _classSkillTrees.keySet();
+		_skillsByClassIdHashCodes = new HashMap<>(keySet.size());
+		for (ClassId cls : keySet) {
+			i = 0;
+			tempMap = getCompleteClassSkillTree(cls);
+			array = new int[tempMap.size()];
+			for (int h : tempMap.keySet()) {
+				array[i++] = h;
+			}
+			tempMap.clear();
+			Arrays.sort(array);
+			_skillsByClassIdHashCodes.put(cls.ordinal(), array);
+		}
+		
+		// Race specific skills from Fishing and Transformation skill trees.
+		final List<Integer> list = new ArrayList<>();
+		_skillsByRaceHashCodes = new HashMap<>(Race.values().length);
+		for (Race r : Race.values()) {
+			for (L2SkillLearn s : _fishingSkillTree.values()) {
+				if (s.getRaces().contains(r)) {
+					list.add(SkillData.getSkillHashCode(s.getSkillId(), s.getSkillLevel()));
+				}
+			}
+			
+			for (L2SkillLearn s : _transformSkillTree.values()) {
+				if (s.getRaces().contains(r)) {
+					list.add(SkillData.getSkillHashCode(s.getSkillId(), s.getSkillLevel()));
+				}
+			}
+			
+			i = 0;
+			array = new int[list.size()];
+			for (int s : list) {
+				array[i++] = s;
+			}
+			Arrays.sort(array);
+			_skillsByRaceHashCodes.put(r.ordinal(), array);
+			list.clear();
+		}
+		
+		// Skills available for all classes and races
+		for (L2SkillLearn s : _commonSkillTree.values()) {
+			if (s.getRaces().isEmpty()) {
+				list.add(SkillData.getSkillHashCode(s.getSkillId(), s.getSkillLevel()));
+			}
+		}
+		
+		for (L2SkillLearn s : _fishingSkillTree.values()) {
+			if (s.getRaces().isEmpty()) {
+				list.add(SkillData.getSkillHashCode(s.getSkillId(), s.getSkillLevel()));
+			}
+		}
+		
+		for (L2SkillLearn s : _transformSkillTree.values()) {
+			if (s.getRaces().isEmpty()) {
+				list.add(SkillData.getSkillHashCode(s.getSkillId(), s.getSkillLevel()));
+			}
+		}
+		
+		for (L2SkillLearn s : _collectSkillTree.values()) {
+			list.add(SkillData.getSkillHashCode(s.getSkillId(), s.getSkillLevel()));
+		}
+		
+		_allSkillsHashCodes = new int[list.size()];
+		int j = 0;
+		for (int hashcode : list) {
+			_allSkillsHashCodes[j++] = hashcode;
+		}
+		Arrays.sort(_allSkillsHashCodes);
+	}
+	
+	/**
+	 * Verify if the give skill is valid for the given player.<br>
+	 * GM's skills are excluded for GM players
+	 * @param player the player to verify the skill
+	 * @param skill the skill to be verified
+	 * @return {@code true} if the skill is allowed to the given player
+	 */
+	public boolean isSkillAllowed(L2PcInstance player, Skill skill) {
+		if (skill.isExcludedFromCheck()) {
+			return true;
+		}
+		
+		if (player.isGM() && skill.isGMSkill()) {
+			return true;
+		}
+		
+		// Prevent accidental skill remove during reload
+		if (_loading) {
+			return true;
+		}
+		
+		final int maxLvl = SkillData.getInstance().getMaxLevel(skill.getId());
+		final int hashCode = SkillData.getSkillHashCode(skill.getId(), Math.min(skill.getLevel(), maxLvl));
+		
+		if (Arrays.binarySearch(_skillsByClassIdHashCodes.get(player.getClassId().ordinal()), hashCode) >= 0) {
+			return true;
+		}
+		
+		if (Arrays.binarySearch(_skillsByRaceHashCodes.get(player.getRace().ordinal()), hashCode) >= 0) {
+			return true;
+		}
+		
+		if (Arrays.binarySearch(_allSkillsHashCodes, hashCode) >= 0) {
+			return true;
+		}
+		
+		// Exclude Transfer Skills from this check.
+		return getTransferSkill(skill.getId(), Math.min(skill.getLevel(), maxLvl), player.getClassId()) != null;
+	}
+	
+	/**
+	 * Logs current Skill Trees skills count.
+	 */
+	private void report() {
+		int classSkillTreeCount = 0;
+		for (Map<Integer, L2SkillLearn> classSkillTree : _classSkillTrees.values()) {
+			classSkillTreeCount += classSkillTree.size();
+		}
+		
+		int trasferSkillTreeCount = 0;
+		for (Map<Integer, L2SkillLearn> trasferSkillTree : _transferSkillTrees.values()) {
+			trasferSkillTreeCount += trasferSkillTree.size();
+		}
+		
+		int dwarvenOnlyFishingSkillCount = 0;
+		for (L2SkillLearn fishSkill : _fishingSkillTree.values()) {
+			if (fishSkill.getRaces().contains(Race.DWARF)) {
+				dwarvenOnlyFishingSkillCount++;
+			}
+		}
+		
+		int resSkillCount = 0;
+		for (L2SkillLearn pledgeSkill : _pledgeSkillTree.values()) {
+			if (pledgeSkill.isResidentialSkill()) {
+				resSkillCount++;
+			}
+		}
+		
+		LOG.info("Loaded {} Class Skills for {} Class Skill Trees.", classSkillTreeCount, _classSkillTrees.size());
+		LOG.info("Loaded {} Sub-Class Skills.", _subClassSkillTree.size());
+		LOG.info("Loaded {} Transfer Skills for {} Transfer Skill Trees.", trasferSkillTreeCount, _transferSkillTrees.size());
+		LOG.info("Loaded {} Fishing Skills, {} Dwarven only Fishing Skills.", _fishingSkillTree.size(), dwarvenOnlyFishingSkillCount);
+		LOG.info("Loaded {} Collect Skills.", _collectSkillTree.size());
+		LOG.info("Loaded {} Pledge Skills, {} for Pledge and {} Residential.", _pledgeSkillTree.size(), (_pledgeSkillTree.size() - resSkillCount), resSkillCount);
+		LOG.info("Loaded {} Sub-Pledge Skills.", _subPledgeSkillTree.size());
+		LOG.info("Loaded {} Transform Skills.", _transformSkillTree.size());
+		LOG.info("Loaded {} Noble Skills.", _nobleSkillTree.size());
+		LOG.info("Loaded {} Hero Skills.", _heroSkillTree.size());
+		LOG.info("Loaded {} Game Master Skills.", _gameMasterSkillTree.size());
+		LOG.info("Loaded {} Game Master Aura Skills.", _gameMasterAuraSkillTree.size());
+		final int commonSkills = _commonSkillTree.size();
+		if (commonSkills > 0) {
+			LOG.info("Loaded {} Common Skills to all classes.", commonSkills);
+		}
+	}
+	
+	public static SkillTreesData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SkillTreesData INSTANCE = new SkillTreesData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java
new file mode 100644
index 00000000..76d504b0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/StaticObjectData.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class loads and holds all static object data.
+ * @author UnAfraid
+ */
+public final class StaticObjectData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(StaticObjectData.class);
+	
+	private final Map<Integer, L2StaticObjectInstance> _staticObjects = new HashMap<>();
+	
+	protected StaticObjectData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_staticObjects.clear();
+		parseDatapackFile("data/staticObjects.xml");
+		LOG.info("Loaded {} static object templates.", _staticObjects.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("object".equalsIgnoreCase(d.getNodeName())) {
+						final NamedNodeMap attrs = d.getAttributes();
+						final StatsSet set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							final Node att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						addObject(set);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Initialize an static object based on the stats set and add it to the map.
+	 * @param set the stats set to add.
+	 */
+	private void addObject(StatsSet set) {
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var template = new L2CharTemplate(new StatsSet());
+		final var obj = new L2StaticObjectInstance(objectId, template, set.getInt("id"));
+		obj.setType(set.getInt("type", 0));
+		obj.setName(set.getString("name"));
+		obj.setMap(set.getString("texture", "none"), set.getInt("map_x", 0), set.getInt("map_y", 0));
+		obj.spawnMe(set.getInt("x"), set.getInt("y"), set.getInt("z"));
+		_staticObjects.put(obj.getObjectId(), obj);
+	}
+	
+	/**
+	 * Gets the static objects.
+	 * @return a collection of static objects.
+	 */
+	public Collection<L2StaticObjectInstance> getStaticObjects() {
+		return _staticObjects.values();
+	}
+	
+	public static StaticObjectData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final StaticObjectData INSTANCE = new StaticObjectData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java
new file mode 100644
index 00000000..1aa3d01c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/TransformData.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.transform.Transform;
+import com.l2jserver.gameserver.model.actor.transform.TransformLevelData;
+import com.l2jserver.gameserver.model.actor.transform.TransformTemplate;
+import com.l2jserver.gameserver.model.holders.AdditionalItemHolder;
+import com.l2jserver.gameserver.model.holders.AdditionalSkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Transformation data.
+ * @author UnAfraid
+ */
+public final class TransformData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TransformData.class);
+	
+	private final Map<Integer, Transform> _transformData = new HashMap<>();
+	
+	protected TransformData() {
+		load();
+	}
+	
+	@Override
+	public synchronized void load() {
+		_transformData.clear();
+		parseDatapackDirectory("data/stats/transformations", false);
+		LOG.info("Loaded {} transform templates.", _transformData.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("transform".equalsIgnoreCase(d.getNodeName())) {
+						NamedNodeMap attrs = d.getAttributes();
+						StatsSet set = new StatsSet();
+						for (int i = 0; i < attrs.getLength(); i++) {
+							Node att = attrs.item(i);
+							set.set(att.getNodeName(), att.getNodeValue());
+						}
+						final Transform transform = new Transform(set);
+						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+							boolean isMale = "Male".equalsIgnoreCase(cd.getNodeName());
+							if ("Male".equalsIgnoreCase(cd.getNodeName()) || "Female".equalsIgnoreCase(cd.getNodeName())) {
+								TransformTemplate templateData = null;
+								for (Node z = cd.getFirstChild(); z != null; z = z.getNextSibling()) {
+									switch (z.getNodeName()) {
+										case "common" -> {
+											for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) {
+												switch (s.getNodeName()) {
+													case "base", "stats", "defense", "magicDefense", "collision", "moving" -> {
+														attrs = s.getAttributes();
+														for (int i = 0; i < attrs.getLength(); i++) {
+															Node att = attrs.item(i);
+															set.set(att.getNodeName(), att.getNodeValue());
+														}
+													}
+												}
+											}
+											templateData = new TransformTemplate(set);
+											transform.setTemplate(isMale, templateData);
+										}
+										case "skills" -> {
+											if (templateData == null) {
+												templateData = new TransformTemplate(set);
+												transform.setTemplate(isMale, templateData);
+											}
+											for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) {
+												if ("skill".equals(s.getNodeName())) {
+													attrs = s.getAttributes();
+													int skillId = parseInteger(attrs, "id");
+													int skillLevel = parseInteger(attrs, "level");
+													templateData.addSkill(new SkillHolder(skillId, skillLevel));
+												}
+											}
+										}
+										case "actions" -> {
+											if (templateData == null) {
+												templateData = new TransformTemplate(set);
+												transform.setTemplate(isMale, templateData);
+											}
+											set.set("actions", z.getTextContent());
+											final int[] actions = set.getIntArray("actions", " ");
+											templateData.setBasicActionList(new ExBasicActionList(actions));
+										}
+										case "additionalSkills" -> {
+											if (templateData == null) {
+												templateData = new TransformTemplate(set);
+												transform.setTemplate(isMale, templateData);
+											}
+											for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) {
+												if ("skill".equals(s.getNodeName())) {
+													attrs = s.getAttributes();
+													int skillId = parseInteger(attrs, "id");
+													int skillLevel = parseInteger(attrs, "level");
+													int minLevel = parseInteger(attrs, "minLevel");
+													templateData.addAdditionalSkill(new AdditionalSkillHolder(skillId, skillLevel, minLevel));
+												}
+											}
+										}
+										case "items" -> {
+											if (templateData == null) {
+												templateData = new TransformTemplate(set);
+												transform.setTemplate(isMale, templateData);
+											}
+											for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) {
+												if ("item".equals(s.getNodeName())) {
+													attrs = s.getAttributes();
+													int itemId = parseInteger(attrs, "id");
+													boolean allowed = parseBoolean(attrs, "allowed");
+													templateData.addAdditionalItem(new AdditionalItemHolder(itemId, allowed));
+												}
+											}
+										}
+										case "levels" -> {
+											if (templateData == null) {
+												templateData = new TransformTemplate(set);
+												transform.setTemplate(isMale, templateData);
+											}
+											
+											for (Node s = z.getFirstChild(); s != null; s = s.getNextSibling()) {
+												if ("level".equals(s.getNodeName())) {
+													final var levelsSet = new StatsSet();
+													attrs = s.getAttributes();
+													for (int i = 0; i < attrs.getLength(); i++) {
+														final var att = attrs.item(i);
+														levelsSet.set(att.getNodeName(), att.getNodeValue());
+													}
+													templateData.addLevelData(new TransformLevelData(levelsSet));
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+						_transformData.put(transform.getId(), transform);
+					}
+				}
+			}
+		}
+	}
+	
+	public Transform getTransform(int id) {
+		return _transformData.get(id);
+	}
+	
+	public boolean transformPlayer(int id, L2PcInstance player) {
+		final Transform transform = getTransform(id);
+		if (transform != null) {
+			player.transform(transform);
+		}
+		return transform != null;
+	}
+	
+	public static TransformData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final TransformData _instance = new TransformData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/data/xml/impl/UIData.java b/src/main/java/com/l2jserver/gameserver/data/xml/impl/UIData.java
new file mode 100644
index 00000000..5da571a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/data/xml/impl/UIData.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.ActionKey;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * UI Data parser.
+ * @author Zoey76
+ */
+public class UIData implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(UIData.class);
+	
+	private final Map<Integer, List<ActionKey>> _storedKeys = new HashMap<>();
+	
+	private final Map<Integer, List<Integer>> _storedCategories = new HashMap<>();
+	
+	protected UIData() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_storedKeys.clear();
+		_storedCategories.clear();
+		parseDatapackFile("data/ui/ui_en.xml");
+		LOG.info("Loaded {} keys {} categories.", _storedKeys.size(), _storedCategories.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("category".equalsIgnoreCase(d.getNodeName())) {
+						parseCategory(d);
+					}
+				}
+			}
+		}
+	}
+	
+	private void parseCategory(Node n) {
+		final int cat = parseInteger(n.getAttributes(), "id");
+		for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+			if ("commands".equalsIgnoreCase(d.getNodeName())) {
+				parseCommands(cat, d);
+			} else if ("keys".equalsIgnoreCase(d.getNodeName())) {
+				parseKeys(cat, d);
+			}
+		}
+	}
+	
+	private void parseCommands(int cat, Node d) {
+		for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+			if ("cmd".equalsIgnoreCase(c.getNodeName())) {
+				addCategory(_storedCategories, cat, Integer.parseInt(c.getTextContent()));
+			}
+		}
+	}
+	
+	private void parseKeys(int cat, Node d) {
+		for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+			if ("key".equalsIgnoreCase(c.getNodeName())) {
+				final ActionKey akey = new ActionKey(cat);
+				for (int i = 0; i < c.getAttributes().getLength(); i++) {
+					final Node att = c.getAttributes().item(i);
+					final int val = Integer.parseInt(att.getNodeValue());
+					switch (att.getNodeName()) {
+						case "cmd" -> akey.setCommandId(val);
+						case "key" -> akey.setKeyId(val);
+						case "toggleKey1" -> akey.setToggleKey1(val);
+						case "toggleKey2" -> akey.setToggleKey2(val);
+						case "showType" -> akey.setShowStatus(val);
+					}
+				}
+				addKey(_storedKeys, cat, akey);
+			}
+		}
+	}
+	
+	/**
+	 * Add a category to the stored categories.
+	 * @param map the map to store the category
+	 * @param cat the category
+	 * @param cmd the command
+	 */
+	public static void addCategory(Map<Integer, List<Integer>> map, int cat, int cmd) {
+		map.computeIfAbsent(cat, _ -> new ArrayList<>()).add(cmd);
+	}
+	
+	/**
+	 * Create and insert an Action Key into the stored keys.
+	 * @param map the map to store the key
+	 * @param cat the category
+	 * @param akey the action key
+	 */
+	public static void addKey(Map<Integer, List<ActionKey>> map, int cat, ActionKey akey) {
+		map.computeIfAbsent(cat, _ -> new ArrayList<>()).add(akey);
+	}
+	
+	/**
+	 * @return the categories
+	 */
+	public Map<Integer, List<Integer>> getCategories() {
+		return _storedCategories;
+	}
+	
+	/**
+	 * @return the keys
+	 */
+	public Map<Integer, List<ActionKey>> getKeys() {
+		return _storedKeys;
+	}
+	
+	public static UIData getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final UIData INSTANCE = new UIData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/AugmentationData.java b/src/main/java/com/l2jserver/gameserver/datatables/AugmentationData.java
new file mode 100644
index 00000000..864eea74
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/AugmentationData.java
@@ -0,0 +1,796 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.OptionData;
+import com.l2jserver.gameserver.model.L2Augmentation;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.options.Options;
+import com.l2jserver.gameserver.network.clientpackets.AbstractRefinePacket;
+
+/**
+ * Loads augmentation bonuses and skills.
+ * @author durgus
+ * @author Gigiikun
+ * @author Sandro
+ * @author UnAfraid
+ */
+public class AugmentationData {
+	
+	// TODO(Zoey76): Implement using IXmlReader.
+	private static final Logger LOG = LoggerFactory.getLogger(AugmentationData.class);
+	
+	// stats
+	private static final int STAT_BLOCKSIZE = 3640;
+	private static final int STAT_SUBBLOCKSIZE = 91;
+	public static final int MIN_SKILL_ID = STAT_BLOCKSIZE * 4;
+	
+	// skills
+	private static final int BLUE_START = 14561;
+	private static final int SKILLS_BLOCKSIZE = 178;
+	
+	// basestats
+	private static final int BASESTAT_STR = 16341;
+	private static final int BASESTAT_MEN = 16344;
+	
+	// accessory
+	private static final int ACC_START = 16669;
+	private static final int ACC_BLOCKS_NUM = 10;
+	private static final int ACC_STAT_SUBBLOCKSIZE = 21;
+	
+	private static final int ACC_RING_START = ACC_START;
+	private static final int ACC_RING_SKILLS = 18;
+	private static final int ACC_RING_BLOCKSIZE = ACC_RING_SKILLS + (4 * ACC_STAT_SUBBLOCKSIZE);
+	private static final int ACC_RING_END = (ACC_RING_START + (ACC_BLOCKS_NUM * ACC_RING_BLOCKSIZE)) - 1;
+	
+	private static final int ACC_EAR_START = ACC_RING_END + 1;
+	private static final int ACC_EAR_SKILLS = 18;
+	private static final int ACC_EAR_BLOCKSIZE = ACC_EAR_SKILLS + (4 * ACC_STAT_SUBBLOCKSIZE);
+	private static final int ACC_EAR_END = (ACC_EAR_START + (ACC_BLOCKS_NUM * ACC_EAR_BLOCKSIZE)) - 1;
+	
+	private static final int ACC_NECK_START = ACC_EAR_END + 1;
+	private static final int ACC_NECK_SKILLS = 24;
+	private static final int ACC_NECK_BLOCKSIZE = ACC_NECK_SKILLS + (4 * ACC_STAT_SUBBLOCKSIZE);
+	
+	private final List<List<Integer>> _blueSkills = new ArrayList<>();
+	private final List<List<Integer>> _purpleSkills = new ArrayList<>();
+	private final List<List<Integer>> _redSkills = new ArrayList<>();
+	
+	private final List<AugmentationChance> _augmentationChances = new ArrayList<>();
+	private final List<augmentationChanceAcc> _augmentationChancesAcc = new ArrayList<>();
+	
+	private final Map<Integer, SkillHolder> _allSkills = new HashMap<>();
+	
+	protected AugmentationData() {
+		for (int i = 0; i < 10; i++) {
+			_blueSkills.add(new ArrayList<>());
+			_purpleSkills.add(new ArrayList<>());
+			_redSkills.add(new ArrayList<>());
+		}
+		
+		load();
+		
+		if (!character().retailLikeAugmentation()) {
+			for (int i = 0; i < 10; i++) {
+				LOG.info("Loaded {} blue, {} purple and {} red skills for life stone level {}.", _blueSkills.get(i).size(), _purpleSkills.get(i).size(), _redSkills.get(i).size(), i);
+			}
+		} else {
+			LOG.info("Loaded {} augmentations.", _augmentationChances.size());
+			LOG.info("Loaded {} accessory augmentations.", _augmentationChancesAcc.size());
+		}
+	}
+	
+	public class AugmentationChance {
+		private final String _WeaponType;
+		private final int _StoneId;
+		private final int _VariationId;
+		private final int _CategoryChance;
+		private final int _AugmentId;
+		private final float _AugmentChance;
+		
+		public AugmentationChance(String WeaponType, int StoneId, int VariationId, int CategoryChance, int AugmentId, float AugmentChance) {
+			_WeaponType = WeaponType;
+			_StoneId = StoneId;
+			_VariationId = VariationId;
+			_CategoryChance = CategoryChance;
+			_AugmentId = AugmentId;
+			_AugmentChance = AugmentChance;
+		}
+		
+		public String getWeaponType() {
+			return _WeaponType;
+		}
+		
+		public int getStoneId() {
+			return _StoneId;
+		}
+		
+		public int getVariationId() {
+			return _VariationId;
+		}
+		
+		public int getCategoryChance() {
+			return _CategoryChance;
+		}
+		
+		public int getAugmentId() {
+			return _AugmentId;
+		}
+		
+		public float getAugmentChance() {
+			return _AugmentChance;
+		}
+	}
+	
+	public class augmentationChanceAcc {
+		private final String _WeaponType;
+		private final int _StoneId;
+		private final int _VariationId;
+		private final int _CategoryChance;
+		private final int _AugmentId;
+		private final float _AugmentChance;
+		
+		public augmentationChanceAcc(String WeaponType, int StoneId, int VariationId, int CategoryChance, int AugmentId, float AugmentChance) {
+			_WeaponType = WeaponType;
+			_StoneId = StoneId;
+			_VariationId = VariationId;
+			_CategoryChance = CategoryChance;
+			_AugmentId = AugmentId;
+			_AugmentChance = AugmentChance;
+		}
+		
+		public String getWeaponType() {
+			return _WeaponType;
+		}
+		
+		public int getStoneId() {
+			return _StoneId;
+		}
+		
+		public int getVariationId() {
+			return _VariationId;
+		}
+		
+		public int getCategoryChance() {
+			return _CategoryChance;
+		}
+		
+		public int getAugmentId() {
+			return _AugmentId;
+		}
+		
+		public float getAugmentChance() {
+			return _AugmentChance;
+		}
+	}
+	
+	private final void load() {
+		// Load stats
+		DocumentBuilderFactory factory2 = DocumentBuilderFactory.newInstance();
+		factory2.setValidating(false);
+		factory2.setIgnoringComments(true);
+		
+		// Load the skillmap
+		// Note: the skillmap data is only used when generating new augmentations
+		// the client expects a different id in order to display the skill in the
+		// items description...
+		if (!character().retailLikeAugmentation()) {
+			try {
+				int badAugmantData = 0;
+				DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+				factory.setValidating(false);
+				factory.setIgnoringComments(true);
+				
+				File file = new File(server().getDatapackRoot(), "data/stats/augmentation/augmentation_skillmap.xml");
+				if (!file.exists()) {
+					LOG.warn("The augmentation skillmap file is missing!");
+					return;
+				}
+				
+				Document doc = factory.newDocumentBuilder().parse(file);
+				
+				for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+					if ("list".equalsIgnoreCase(n.getNodeName())) {
+						for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+							if ("augmentation".equalsIgnoreCase(d.getNodeName())) {
+								NamedNodeMap attrs = d.getAttributes();
+								int skillId = 0, augmentationId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue());
+								int skillLvL = 0;
+								String type = "blue";
+								
+								for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+									if ("skillId".equalsIgnoreCase(cd.getNodeName())) {
+										attrs = cd.getAttributes();
+										skillId = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									} else if ("skillLevel".equalsIgnoreCase(cd.getNodeName())) {
+										attrs = cd.getAttributes();
+										skillLvL = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									} else if ("type".equalsIgnoreCase(cd.getNodeName())) {
+										attrs = cd.getAttributes();
+										type = attrs.getNamedItem("val").getNodeValue();
+									}
+								}
+								if (skillId == 0) {
+									badAugmantData++;
+									continue;
+								} else if (skillLvL == 0) {
+									badAugmantData++;
+									continue;
+								}
+								int k = (augmentationId - BLUE_START) / SKILLS_BLOCKSIZE;
+								
+								if (type.equalsIgnoreCase("blue")) {
+									_blueSkills.get(k).add(augmentationId);
+								} else if (type.equalsIgnoreCase("purple")) {
+									_purpleSkills.get(k).add(augmentationId);
+								} else {
+									_redSkills.get(k).add(augmentationId);
+								}
+								
+								_allSkills.put(augmentationId, new SkillHolder(skillId, skillLvL));
+							}
+						}
+					}
+				}
+				if (badAugmantData != 0) {
+					LOG.warn("{} bad skill(s) were skipped.", badAugmantData);
+				}
+			} catch (Exception ex) {
+				LOG.warn("There has been an error parsing augmentation_skillmap.xml!", ex);
+				return;
+			}
+		} else {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setIgnoringComments(true);
+			
+			File aFile = new File(server().getDatapackRoot(), "data/stats/augmentation/retailchances.xml");
+			if (aFile.exists()) {
+				Document aDoc = null;
+				
+				try {
+					aDoc = factory.newDocumentBuilder().parse(aFile);
+				} catch (Exception e) {
+					e.printStackTrace();
+					return;
+				}
+				String aWeaponType = null;
+				int aStoneId = 0;
+				int aVariationId = 0;
+				int aCategoryChance = 0;
+				int aAugmentId = 0;
+				float aAugmentChance = 0;
+				
+				for (Node l = aDoc.getFirstChild(); l != null; l = l.getNextSibling()) {
+					if (l.getNodeName().equals("list")) {
+						NamedNodeMap aNodeAttributes = null;
+						
+						for (Node n = l.getFirstChild(); n != null; n = n.getNextSibling()) {
+							if (n.getNodeName().equals("weapon")) {
+								aNodeAttributes = n.getAttributes();
+								
+								aWeaponType = aNodeAttributes.getNamedItem("type").getNodeValue();
+								
+								for (Node c = n.getFirstChild(); c != null; c = c.getNextSibling()) {
+									if (c.getNodeName().equals("stone")) {
+										aNodeAttributes = c.getAttributes();
+										
+										aStoneId = Integer.parseInt(aNodeAttributes.getNamedItem("id").getNodeValue());
+										
+										for (Node v = c.getFirstChild(); v != null; v = v.getNextSibling()) {
+											if (v.getNodeName().equals("variation")) {
+												aNodeAttributes = v.getAttributes();
+												
+												aVariationId = Integer.parseInt(aNodeAttributes.getNamedItem("id").getNodeValue());
+												
+												for (Node j = v.getFirstChild(); j != null; j = j.getNextSibling()) {
+													if (j.getNodeName().equals("category")) {
+														aNodeAttributes = j.getAttributes();
+														
+														aCategoryChance = Integer.parseInt(aNodeAttributes.getNamedItem("probability").getNodeValue());
+														
+														for (Node e = j.getFirstChild(); e != null; e = e.getNextSibling()) {
+															if (e.getNodeName().equals("augment")) {
+																aNodeAttributes = e.getAttributes();
+																
+																aAugmentId = Integer.parseInt(aNodeAttributes.getNamedItem("id").getNodeValue());
+																aAugmentChance = Float.parseFloat(aNodeAttributes.getNamedItem("chance").getNodeValue());
+																
+																_augmentationChances.add(new AugmentationChance(aWeaponType, aStoneId, aVariationId, aCategoryChance, aAugmentId, aAugmentChance));
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			} else {
+				LOG.warn("The retailchances.xml data file is missing!");
+				return;
+			}
+		}
+		
+		if (character().retailLikeAugmentationAccessory()) {
+			DocumentBuilderFactory factory3 = DocumentBuilderFactory.newInstance();
+			factory3.setValidating(false);
+			factory3.setIgnoringComments(true);
+			
+			File aFile3 = new File(server().getDatapackRoot(), "data/stats/augmentation/retailchances_accessory.xml");
+			if (aFile3.exists()) {
+				Document aDoc = null;
+				
+				try {
+					aDoc = factory3.newDocumentBuilder().parse(aFile3);
+				} catch (Exception e) {
+					e.printStackTrace();
+					return;
+				}
+				String aWeaponType = null;
+				int aStoneId = 0;
+				int aVariationId = 0;
+				int aCategoryChance = 0;
+				int aAugmentId = 0;
+				float aAugmentChance = 0;
+				
+				for (Node l = aDoc.getFirstChild(); l != null; l = l.getNextSibling()) {
+					if (l.getNodeName().equals("list")) {
+						NamedNodeMap aNodeAttributes = null;
+						for (Node n = l.getFirstChild(); n != null; n = n.getNextSibling()) {
+							if (n.getNodeName().equals("weapon")) {
+								aNodeAttributes = n.getAttributes();
+								
+								aWeaponType = aNodeAttributes.getNamedItem("type").getNodeValue();
+								
+								for (Node c = n.getFirstChild(); c != null; c = c.getNextSibling()) {
+									if (c.getNodeName().equals("stone")) {
+										aNodeAttributes = c.getAttributes();
+										
+										aStoneId = Integer.parseInt(aNodeAttributes.getNamedItem("id").getNodeValue());
+										
+										for (Node v = c.getFirstChild(); v != null; v = v.getNextSibling()) {
+											if (v.getNodeName().equals("variation")) {
+												aNodeAttributes = v.getAttributes();
+												
+												aVariationId = Integer.parseInt(aNodeAttributes.getNamedItem("id").getNodeValue());
+												
+												for (Node j = v.getFirstChild(); j != null; j = j.getNextSibling()) {
+													if (j.getNodeName().equals("category")) {
+														aNodeAttributes = j.getAttributes();
+														
+														aCategoryChance = Integer.parseInt(aNodeAttributes.getNamedItem("probability").getNodeValue());
+														
+														for (Node e = j.getFirstChild(); e != null; e = e.getNextSibling()) {
+															if (e.getNodeName().equals("augment")) {
+																aNodeAttributes = e.getAttributes();
+																
+																aAugmentId = Integer.parseInt(aNodeAttributes.getNamedItem("id").getNodeValue());
+																aAugmentChance = Float.parseFloat(aNodeAttributes.getNamedItem("chance").getNodeValue());
+																
+																_augmentationChancesAcc.add(new augmentationChanceAcc(aWeaponType, aStoneId, aVariationId, aCategoryChance, aAugmentId, aAugmentChance));
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			} else {
+				LOG.warn("The retailchances_accessory.xml data file is missing!");
+				return;
+			}
+		}
+	}
+	
+	/**
+	 * Generate a new random augmentation
+	 * @param lifeStoneLevel
+	 * @param lifeStoneGrade
+	 * @param bodyPart
+	 * @param lifeStoneId
+	 * @param targetItem
+	 * @return
+	 */
+	public L2Augmentation generateRandomAugmentation(int lifeStoneLevel, int lifeStoneGrade, int bodyPart, int lifeStoneId, L2ItemInstance targetItem) {
+		return switch (bodyPart) {
+			case L2Item.SLOT_LR_FINGER, L2Item.SLOT_LR_EAR, L2Item.SLOT_NECK -> generateRandomAccessoryAugmentation(lifeStoneLevel, bodyPart, lifeStoneId);
+			default -> generateRandomWeaponAugmentation(lifeStoneLevel, lifeStoneGrade, lifeStoneId, targetItem);
+		};
+	}
+	
+	private L2Augmentation generateRandomWeaponAugmentation(int lifeStoneLevel, int lifeStoneGrade, int lifeStoneId, L2ItemInstance item) {
+		int stat12 = 0;
+		int stat34 = 0;
+		if (character().retailLikeAugmentation()) {
+			if (item.getItem().isMagicWeapon()) {
+				List<AugmentationChance> _selectedChances12 = new ArrayList<>();
+				List<AugmentationChance> _selectedChances34 = new ArrayList<>();
+				for (AugmentationChance ac : _augmentationChances) {
+					if (ac.getWeaponType().equals("mage") && (ac.getStoneId() == lifeStoneId)) {
+						if (ac.getVariationId() == 1) {
+							_selectedChances12.add(ac);
+						} else {
+							_selectedChances34.add(ac);
+						}
+					}
+				}
+				int r = Rnd.get(10000);
+				float s = 10000;
+				for (AugmentationChance ac : _selectedChances12) {
+					if (s > r) {
+						s -= (ac.getAugmentChance() * 100);
+						stat12 = ac.getAugmentId();
+					}
+				}
+				List<Integer> gradeChance = switch (lifeStoneGrade) {
+					case AbstractRefinePacket.GRADE_NONE -> character().getRetailLikeAugmentationNoGradeChance();
+					case AbstractRefinePacket.GRADE_MID -> character().getRetailLikeAugmentationMidGradeChance();
+					case AbstractRefinePacket.GRADE_HIGH -> character().getRetailLikeAugmentationHighGradeChance();
+					case AbstractRefinePacket.GRADE_TOP -> character().getRetailLikeAugmentationTopGradeChance();
+					default -> character().getRetailLikeAugmentationNoGradeChance();
+				};
+				
+				int c = Rnd.get(100);
+				if (c < gradeChance.get(0)) {
+					c = 55;
+				} else if (c < (gradeChance.get(0) + gradeChance.get(1))) {
+					c = 35;
+				} else if (c < (gradeChance.get(0) + gradeChance.get(1) + gradeChance.get(2))) {
+					c = 7;
+				} else {
+					c = 3;
+				}
+				List<AugmentationChance> _selectedChances34final = new ArrayList<>();
+				for (AugmentationChance ac : _selectedChances34) {
+					if (ac.getCategoryChance() == c) {
+						_selectedChances34final.add(ac);
+					}
+				}
+				
+				r = Rnd.get(10000);
+				s = 10000;
+				
+				for (AugmentationChance ac : _selectedChances34final) {
+					if (s > r) {
+						s -= (ac.getAugmentChance() * 100);
+						stat34 = ac.getAugmentId();
+					}
+				}
+			} else {
+				List<AugmentationChance> _selectedChances12 = new ArrayList<>();
+				List<AugmentationChance> _selectedChances34 = new ArrayList<>();
+				for (AugmentationChance ac : _augmentationChances) {
+					if (ac.getWeaponType().equals("warrior") && (ac.getStoneId() == lifeStoneId)) {
+						if (ac.getVariationId() == 1) {
+							_selectedChances12.add(ac);
+						} else {
+							_selectedChances34.add(ac);
+						}
+					}
+				}
+				int r = Rnd.get(10000);
+				float s = 10000;
+				for (AugmentationChance ac : _selectedChances12) {
+					if (s > r) {
+						s -= (ac.getAugmentChance() * 100);
+						stat12 = ac.getAugmentId();
+					}
+				}
+				List<Integer> gradeChance = switch (lifeStoneGrade) {
+					case AbstractRefinePacket.GRADE_NONE -> character().getRetailLikeAugmentationNoGradeChance();
+					case AbstractRefinePacket.GRADE_MID -> character().getRetailLikeAugmentationMidGradeChance();
+					case AbstractRefinePacket.GRADE_HIGH -> character().getRetailLikeAugmentationHighGradeChance();
+					case AbstractRefinePacket.GRADE_TOP -> character().getRetailLikeAugmentationTopGradeChance();
+					default -> character().getRetailLikeAugmentationNoGradeChance();
+				};
+				
+				int c = Rnd.get(100);
+				if (c < gradeChance.get(0)) {
+					c = 55;
+				} else if (c < (gradeChance.get(0) + gradeChance.get(1))) {
+					c = 35;
+				} else if (c < (gradeChance.get(0) + gradeChance.get(1) + gradeChance.get(2))) {
+					c = 7;
+				} else {
+					c = 3;
+				}
+				List<AugmentationChance> _selectedChances34final = new ArrayList<>();
+				for (AugmentationChance ac : _selectedChances34) {
+					if (ac.getCategoryChance() == c) {
+						_selectedChances34final.add(ac);
+					}
+				}
+				r = Rnd.get(10000);
+				s = 10000;
+				for (AugmentationChance ac : _selectedChances34final) {
+					if (s > r) {
+						s -= (ac.getAugmentChance() * 100);
+						stat34 = ac.getAugmentId();
+					}
+				}
+			}
+			return new L2Augmentation(((stat34 << 16) + stat12));
+		}
+		boolean generateSkill = false;
+		boolean generateGlow = false;
+		
+		// life stone level is used for stat Id and skill level, but here the max level is 9
+		lifeStoneLevel = Math.min(lifeStoneLevel, 9);
+		
+		switch (lifeStoneGrade) {
+			case AbstractRefinePacket.GRADE_NONE:
+				if (Rnd.get(1, 100) <= character().getAugmentationNGSkillChance()) {
+					generateSkill = true;
+				}
+				if (Rnd.get(1, 100) <= character().getAugmentationNGGlowChance()) {
+					generateGlow = true;
+				}
+				break;
+			case AbstractRefinePacket.GRADE_MID:
+				if (Rnd.get(1, 100) <= character().getAugmentationMidSkillChance()) {
+					generateSkill = true;
+				}
+				if (Rnd.get(1, 100) <= character().getAugmentationMidGlowChance()) {
+					generateGlow = true;
+				}
+				break;
+			case AbstractRefinePacket.GRADE_HIGH:
+				if (Rnd.get(1, 100) <= character().getAugmentationHighSkillChance()) {
+					generateSkill = true;
+				}
+				if (Rnd.get(1, 100) <= character().getAugmentationHighGlowChance()) {
+					generateGlow = true;
+				}
+				break;
+			case AbstractRefinePacket.GRADE_TOP:
+				if (Rnd.get(1, 100) <= character().getAugmentationTopSkillChance()) {
+					generateSkill = true;
+				}
+				if (Rnd.get(1, 100) <= character().getAugmentationTopGlowChance()) {
+					generateGlow = true;
+				}
+				break;
+			case AbstractRefinePacket.GRADE_ACC:
+				if (Rnd.get(1, 100) <= character().getAugmentationAccSkillChance()) {
+					generateSkill = true;
+				}
+		}
+		
+		if (!generateSkill && (Rnd.get(1, 100) <= character().getAugmentationBaseStatChance())) {
+			stat34 = Rnd.get(BASESTAT_STR, BASESTAT_MEN);
+		}
+		
+		// Second: decide which grade the augmentation result is going to have:
+		// 0:yellow, 1:blue, 2:purple, 3:red
+		// The chances used here are most likely custom,
+		// what's known is: you can't have yellow with skill(or baseStatModifier)
+		// noGrade stone can not have glow, mid only with skill, high has a chance(custom), top allways glow
+		int resultColor = Rnd.get(0, 100);
+		if ((stat34 == 0) && !generateSkill) {
+			if (resultColor <= ((15 * lifeStoneGrade) + 40)) {
+				resultColor = 1;
+			} else {
+				resultColor = 0;
+			}
+		} else {
+			if ((resultColor <= ((10 * lifeStoneGrade) + 5)) || (stat34 != 0)) {
+				resultColor = 3;
+			} else if (resultColor <= ((10 * lifeStoneGrade) + 10)) {
+				resultColor = 1;
+			} else {
+				resultColor = 2;
+			}
+		}
+		
+		// generate a skill if necessary
+		if (generateSkill) {
+			stat34 = switch (resultColor) {
+				case 1 -> _blueSkills.get(lifeStoneLevel).get(Rnd.get(0, _blueSkills.get(lifeStoneLevel).size() - 1));
+				case 2 -> _purpleSkills.get(lifeStoneLevel).get(Rnd.get(0, _purpleSkills.get(lifeStoneLevel).size() - 1));
+				case 3 -> _redSkills.get(lifeStoneLevel).get(Rnd.get(0, _redSkills.get(lifeStoneLevel).size() - 1));
+				default -> stat34;
+			};
+		}
+		
+		// Third: Calculate the subblock offset for the chosen color,
+		// and the level of the lifeStone
+		// from large number of retail augmentations:
+		// no skill part
+		// Id for stat12:
+		// A:1-910 B:911-1820 C:1821-2730 D:2731-3640 E:3641-4550 F:4551-5460 G:5461-6370 H:6371-7280
+		// Id for stat34(this defines the color):
+		// I:7281-8190(yellow) K:8191-9100(blue) L:10921-11830(yellow) M:11831-12740(blue)
+		// you can combine I-K with A-D and L-M with E-H
+		// using C-D or G-H Id you will get a glow effect
+		// there seems no correlation in which grade use which Id except for the glowing restriction
+		// skill part
+		// Id for stat12:
+		// same for no skill part
+		// A same as E, B same as F, C same as G, D same as H
+		// A - no glow, no grade LS
+		// B - weak glow, mid grade LS?
+		// C - glow, high grade LS?
+		// D - strong glow, top grade LS?
+		
+		// is neither a skill nor basestat used for stat34? then generate a normal stat
+		int offset;
+		if (stat34 == 0) {
+			int temp = Rnd.get(2, 3);
+			int colorOffset = (resultColor * (10 * STAT_SUBBLOCKSIZE)) + (temp * STAT_BLOCKSIZE) + 1;
+			offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + colorOffset;
+			
+			stat34 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1);
+			if (generateGlow && (lifeStoneGrade >= 2)) {
+				offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + ((temp - 2) * STAT_BLOCKSIZE) + (lifeStoneGrade * (10 * STAT_SUBBLOCKSIZE)) + 1;
+			} else {
+				offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + ((temp - 2) * STAT_BLOCKSIZE) + (Rnd.get(0, 1) * (10 * STAT_SUBBLOCKSIZE)) + 1;
+			}
+		} else {
+			if (!generateGlow) {
+				offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + (Rnd.get(0, 1) * STAT_BLOCKSIZE) + 1;
+			} else {
+				offset = (lifeStoneLevel * STAT_SUBBLOCKSIZE) + (Rnd.get(0, 1) * STAT_BLOCKSIZE) + (((lifeStoneGrade + resultColor) / 2) * (10 * STAT_SUBBLOCKSIZE)) + 1;
+			}
+		}
+		stat12 = Rnd.get(offset, (offset + STAT_SUBBLOCKSIZE) - 1);
+		
+		if (general().debug()) {
+			LOG.info("Augmentation success: stat12={}; stat34={}; resultColor={}; level={}; grade={}", stat12, stat34, resultColor, lifeStoneLevel, lifeStoneGrade);
+		}
+		return new L2Augmentation(((stat34 << 16) + stat12));
+	}
+	
+	private L2Augmentation generateRandomAccessoryAugmentation(int lifeStoneLevel, int bodyPart, int lifeStoneId) {
+		int stat12 = 0;
+		int stat34 = 0;
+		if (character().retailLikeAugmentationAccessory()) {
+			List<augmentationChanceAcc> _selectedChances12 = new ArrayList<>();
+			List<augmentationChanceAcc> _selectedChances34 = new ArrayList<>();
+			for (augmentationChanceAcc ac : _augmentationChancesAcc) {
+				if (ac.getWeaponType().equals("warrior") && (ac.getStoneId() == lifeStoneId)) {
+					if (ac.getVariationId() == 1) {
+						_selectedChances12.add(ac);
+					} else {
+						_selectedChances34.add(ac);
+					}
+				}
+			}
+			int r = Rnd.get(10000);
+			float s = 10000;
+			for (augmentationChanceAcc ac : _selectedChances12) {
+				if (s > r) {
+					s -= (ac.getAugmentChance() * 100);
+					stat12 = ac.getAugmentId();
+				}
+			}
+			int c = Rnd.get(100);
+			if (c < 55) {
+				c = 55;
+			} else if (c < 90) {
+				c = 35;
+			} else if (c < 99) {
+				c = 9;
+			} else {
+				c = 1;
+			}
+			List<augmentationChanceAcc> _selectedChances34final = new ArrayList<>();
+			for (augmentationChanceAcc ac : _selectedChances34) {
+				if (ac.getCategoryChance() == c) {
+					_selectedChances34final.add(ac);
+				}
+			}
+			r = Rnd.get(10000);
+			s = 10000;
+			for (augmentationChanceAcc ac : _selectedChances34final) {
+				if (s > r) {
+					s -= (ac.getAugmentChance() * 100);
+					stat34 = ac.getAugmentId();
+				}
+			}
+			
+			return new L2Augmentation(((stat34 << 16) + stat12));
+		}
+		lifeStoneLevel = Math.min(lifeStoneLevel, 9);
+		int base = 0;
+		int skillsLength = 0;
+		
+		switch (bodyPart) {
+			case L2Item.SLOT_LR_FINGER:
+				base = ACC_RING_START + (ACC_RING_BLOCKSIZE * lifeStoneLevel);
+				skillsLength = ACC_RING_SKILLS;
+				break;
+			case L2Item.SLOT_LR_EAR:
+				base = ACC_EAR_START + (ACC_EAR_BLOCKSIZE * lifeStoneLevel);
+				skillsLength = ACC_EAR_SKILLS;
+				break;
+			case L2Item.SLOT_NECK:
+				base = ACC_NECK_START + (ACC_NECK_BLOCKSIZE * lifeStoneLevel);
+				skillsLength = ACC_NECK_SKILLS;
+				break;
+			default:
+				return null;
+		}
+		
+		int resultColor = Rnd.get(0, 3);
+		
+		// first augmentation (stats only)
+		stat12 = Rnd.get(ACC_STAT_SUBBLOCKSIZE);
+		Options op = null;
+		if (Rnd.get(1, 100) <= character().getAugmentationAccSkillChance()) {
+			// second augmentation (skill)
+			stat34 = base + Rnd.get(skillsLength);
+			op = OptionData.getInstance().getOptions(stat34);
+		}
+		
+		if ((op == null) || (!op.hasActiveSkill() && !op.hasPassiveSkill() && !op.hasActivationSkills())) {
+			// second augmentation (stats)
+			// calculating any different from stat12 value inside sub-block
+			// starting from next and wrapping over using remainder
+			stat34 = (stat12 + 1 + Rnd.get(ACC_STAT_SUBBLOCKSIZE - 1)) % ACC_STAT_SUBBLOCKSIZE;
+			// this is a stats - skipping skills
+			stat34 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat34;
+		}
+		
+		// stat12 has stats only
+		stat12 = base + skillsLength + (ACC_STAT_SUBBLOCKSIZE * resultColor) + stat12;
+		
+		if (general().debug()) {
+			LOG.info("Accessory augmentation success: stat12={}; stat34={}; level={}", stat12, stat34, lifeStoneLevel);
+		}
+		return new L2Augmentation(((stat34 << 16) + stat12));
+	}
+	
+	public static final AugmentationData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AugmentationData _instance = new AugmentationData();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/BotReportTable.java b/src/main/java/com/l2jserver/gameserver/datatables/BotReportTable.java
new file mode 100644
index 00000000..b8d7d318
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/BotReportTable.java
@@ -0,0 +1,531 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.network.SystemMessageId.C1_WAS_REPORTED_AS_BOT;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP;
+import static com.l2jserver.gameserver.network.SystemMessageId.TARGET_NOT_REPORT_CANNOT_REPORT_PEACE_PVP_ZONE_OR_OLYMPIAD_OR_CLAN_WAR_ENEMY;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CHARACTER_IN_PEACE_OR_BATTLE_ZONE;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_1;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CHAR_WHO_ACQUIRED_XP;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_REPORT_CLAN_WAR_ENEMY;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_BEEN_REPORTED_AND_CANNOT_REPORT;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_USED_ALL_POINTS_POINTS_ARE_RESET_AT_NOON;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT;
+import static java.util.concurrent.TimeUnit.DAYS;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.DefaultHandler;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Bot Report table.
+ * @author BiggBoss
+ */
+public final class BotReportTable {
+	
+	// Zoey76: TODO: Split XML parsing from SQL operations, use IXmlReader instead of SAXParser.
+	private static final Logger LOG = LoggerFactory.getLogger(BotReportTable.class);
+	
+	private static final int COLUMN_BOT_ID = 1;
+	private static final int COLUMN_REPORTER_ID = 2;
+	private static final int COLUMN_REPORT_TIME = 3;
+	
+	public static final int ATTACK_ACTION_BLOCK_ID = -1;
+	public static final int TRADE_ACTION_BLOCK_ID = -2;
+	public static final int PARTY_ACTION_BLOCK_ID = -3;
+	public static final int ACTION_BLOCK_ID = -4;
+	public static final int CHAT_BLOCK_ID = -5;
+	
+	private static final String SQL_LOAD_REPORTED_CHAR_DATA = "SELECT * FROM bot_reported_char_data";
+	private static final String SQL_INSERT_REPORTED_CHAR_DATA = "INSERT INTO bot_reported_char_data VALUES (?,?,?)";
+	private static final String SQL_CLEAR_REPORTED_CHAR_DATA = "DELETE FROM bot_reported_char_data";
+	
+	private Map<Integer, Long> _ipRegistry;
+	private Map<Integer, ReporterCharData> _charRegistry;
+	private Map<Integer, ReportedCharData> _reports;
+	private Map<Integer, PunishHolder> _punishments;
+	
+	BotReportTable() {
+		if (general().enableBotReportButton()) {
+			_ipRegistry = new HashMap<>();
+			_charRegistry = new ConcurrentHashMap<>();
+			_reports = new ConcurrentHashMap<>();
+			_punishments = new ConcurrentHashMap<>();
+			
+			try {
+				File punishments = new File("./config/botreport_punishments.xml");
+				if (!punishments.exists()) {
+					throw new FileNotFoundException(punishments.getName());
+				}
+				
+				SAXParser parser = SAXParserFactory.newInstance().newSAXParser();
+				parser.parse(punishments, new PunishmentsLoader());
+			} catch (Exception ex) {
+				LOG.warn("Could not load punishments from /config/botreport_punishments.xml", ex);
+			}
+			
+			loadReportedCharData();
+			scheduleResetPointTask();
+		}
+	}
+	
+	/**
+	 * Loads all reports of each reported bot into this cache class.<br>
+	 * Warning: Heavy method, used only on server start up
+	 */
+	private void loadReportedCharData() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.createStatement();
+			var rs = st.executeQuery(SQL_LOAD_REPORTED_CHAR_DATA)) {
+			long lastResetTime = 0;
+			try {
+				String[] hour = general().getBotReportPointsResetHour().split(":");
+				Calendar c = Calendar.getInstance();
+				c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
+				c.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
+				
+				if (System.currentTimeMillis() < c.getTimeInMillis()) {
+					c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) - 1);
+				}
+				
+				lastResetTime = c.getTimeInMillis();
+			} catch (Exception e) {
+				
+			}
+			
+			while (rs.next()) {
+				int botId = rs.getInt(COLUMN_BOT_ID);
+				int reporter = rs.getInt(COLUMN_REPORTER_ID);
+				long date = rs.getLong(COLUMN_REPORT_TIME);
+				if (_reports.containsKey(botId)) {
+					_reports.get(botId).addReporter(reporter, date);
+				} else {
+					ReportedCharData rcd = new ReportedCharData();
+					rcd.addReporter(reporter, date);
+					_reports.put(rs.getInt(COLUMN_BOT_ID), rcd);
+				}
+				
+				if (date > lastResetTime) {
+					ReporterCharData rcd = _charRegistry.get(reporter);
+					if (rcd != null) {
+						rcd.setPoints(rcd.getPointsLeft() - 1);
+					} else {
+						rcd = new ReporterCharData();
+						rcd.setPoints(6);
+						_charRegistry.put(reporter, rcd);
+					}
+				}
+			}
+			
+			LOG.info("Loaded {} bot reports.", _reports.size());
+		} catch (Exception ex) {
+			LOG.warn("Could not load reported char data!", ex);
+		}
+	}
+	
+	/**
+	 * Save all reports for each reported bot down to database.<br>
+	 * Warning: Heavy method, used only at server shutdown
+	 */
+	public void saveReportedCharData() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.createStatement();
+			var ps = con.prepareStatement(SQL_INSERT_REPORTED_CHAR_DATA)) {
+			st.execute(SQL_CLEAR_REPORTED_CHAR_DATA);
+			
+			for (Map.Entry<Integer, ReportedCharData> entrySet : _reports.entrySet()) {
+				Map<Integer, Long> reportTable = entrySet.getValue()._reporters;
+				for (int reporterId : reportTable.keySet()) {
+					ps.setInt(1, entrySet.getKey());
+					ps.setInt(2, reporterId);
+					ps.setLong(3, reportTable.get(reporterId));
+					ps.execute();
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not update reported char data in database!", ex);
+		}
+	}
+	
+	/**
+	 * Attempts to perform a bot report. R/W to ip and char id registry is synchronized. Triggers bot punish management<br>
+	 * @param reporter (L2PcInstance who issued the report)
+	 * @return True, if the report was registered, False otherwise
+	 */
+	public boolean reportBot(L2PcInstance reporter) {
+		L2Object target = reporter.getTarget();
+		
+		if (target == null) {
+			return false;
+		}
+		
+		L2PcInstance bot = target.getActingPlayer();
+		
+		if ((bot == null) || (target.getObjectId() == reporter.getObjectId())) {
+			return false;
+		}
+		
+		if (bot.isInsideZone(ZoneId.PEACE) || bot.isInsideZone(ZoneId.PVP)) {
+			reporter.sendPacket(YOU_CANNOT_REPORT_CHARACTER_IN_PEACE_OR_BATTLE_ZONE);
+			return false;
+		}
+		
+		if (bot.isInOlympiadMode()) {
+			reporter.sendPacket(TARGET_NOT_REPORT_CANNOT_REPORT_PEACE_PVP_ZONE_OR_OLYMPIAD_OR_CLAN_WAR_ENEMY);
+			return false;
+		}
+		
+		if ((bot.getClan() != null) && bot.getClan().isAtWarWith(reporter.getClan())) {
+			reporter.sendPacket(YOU_CANNOT_REPORT_CLAN_WAR_ENEMY);
+			return false;
+		}
+		
+		if (bot.getExp() == bot.getStat().getStartingExp()) {
+			reporter.sendPacket(YOU_CANNOT_REPORT_CHAR_WHO_ACQUIRED_XP);
+			return false;
+		}
+		
+		ReportedCharData rcd = _reports.get(bot.getObjectId());
+		ReporterCharData rcdRep = _charRegistry.get(reporter.getObjectId());
+		final int reporterId = reporter.getObjectId();
+		
+		synchronized (this) {
+			if (_reports.containsKey(reporterId)) {
+				reporter.sendPacket(YOU_HAVE_BEEN_REPORTED_AND_CANNOT_REPORT);
+				return false;
+			}
+			
+			final int ip = hashIp(reporter);
+			if (!timeHasPassed(_ipRegistry, ip)) {
+				reporter.sendPacket(CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP);
+				return false;
+			}
+			
+			if (rcd != null) {
+				if (rcd.alreadyReportedBy(reporterId)) {
+					reporter.sendPacket(YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_1);
+					return false;
+				}
+				
+				if (!general().allowReportsFromSameClanMembers() && rcd.reportedBySameClan(reporter.getClan())) {
+					reporter.sendPacket(CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP);
+					return false;
+				}
+			}
+			
+			if (rcdRep != null) {
+				if (rcdRep.getPointsLeft() == 0) {
+					reporter.sendPacket(YOU_HAVE_USED_ALL_POINTS_POINTS_ARE_RESET_AT_NOON);
+					return false;
+				}
+				
+				long reuse = (System.currentTimeMillis() - rcdRep.getLastReportTime());
+				if (reuse < general().getBotReportDelay()) {
+					SystemMessage sm = SystemMessage.getSystemMessage(YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT);
+					sm.addInt((int) (reuse / 60000));
+					sm.addInt(rcdRep.getPointsLeft());
+					reporter.sendPacket(sm);
+					return false;
+				}
+			}
+			
+			final long curTime = System.currentTimeMillis();
+			
+			if (rcd == null) {
+				rcd = new ReportedCharData();
+				_reports.put(bot.getObjectId(), rcd);
+			}
+			rcd.addReporter(reporterId, curTime);
+			
+			if (rcdRep == null) {
+				rcdRep = new ReporterCharData();
+			}
+			rcdRep.registerReport(curTime);
+			
+			_ipRegistry.put(ip, curTime);
+			_charRegistry.put(reporterId, rcdRep);
+		}
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(C1_WAS_REPORTED_AS_BOT);
+		sm.addCharName(bot);
+		reporter.sendPacket(sm);
+		
+		sm = SystemMessage.getSystemMessage(YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT);
+		sm.addCharName(bot);
+		sm.addInt(rcdRep.getPointsLeft());
+		reporter.sendPacket(sm);
+		
+		handleReport(bot, rcd);
+		
+		return true;
+	}
+	
+	/**
+	 * Find the punishment to apply to the given bot and triggers the punish method.
+	 * @param bot (L2PcInstance to be punished)
+	 * @param rcd (ReportedCharData linked to this bot)
+	 */
+	private void handleReport(L2PcInstance bot, final ReportedCharData rcd) {
+		// Report count punishment
+		punishBot(bot, _punishments.get(rcd.getReportCount()));
+		
+		// Range punishments
+		for (int key : _punishments.keySet()) {
+			if ((key < 0) && (Math.abs(key) <= rcd.getReportCount())) {
+				punishBot(bot, _punishments.get(key));
+			}
+		}
+	}
+	
+	/**
+	 * Applies the given punish to the bot if the action is secure
+	 * @param bot (L2PcInstance to punish)
+	 * @param ph (PunishHolder containing the debuff and a possible system message to send)
+	 */
+	private void punishBot(L2PcInstance bot, PunishHolder ph) {
+		if (ph != null) {
+			ph._punish.applyEffects(bot, bot);
+			if (ph._systemMessageId > -1) {
+				bot.sendPacket(SystemMessageId.getSystemMessageId(ph._systemMessageId));
+			}
+		}
+	}
+	
+	/**
+	 * Adds a debuff punishment into the punishments record. If skill does not exist, will log it and return
+	 * @param neededReports (report count to trigger this debuff)
+	 * @param skillId
+	 * @param skillLevel
+	 * @param sysMsg (id of a system message to send when applying the punish)
+	 */
+	void addPunishment(int neededReports, int skillId, int skillLevel, int sysMsg) {
+		Skill sk = SkillData.getInstance().getSkill(skillId, skillLevel);
+		if (sk != null) {
+			_punishments.put(neededReports, new PunishHolder(sk, sysMsg));
+		} else {
+			LOG.warn("Could not add punishment for {} report(s): Skill {}-{} does not exist!", neededReports, skillId, skillLevel);
+		}
+	}
+	
+	void resetPointsAndSchedule() {
+		synchronized (_charRegistry) {
+			for (ReporterCharData rcd : _charRegistry.values()) {
+				rcd.setPoints(7);
+			}
+		}
+		
+		scheduleResetPointTask();
+	}
+	
+	private void scheduleResetPointTask() {
+		try {
+			String[] hour = general().getBotReportPointsResetHour().split(":");
+			Calendar c = Calendar.getInstance();
+			c.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
+			c.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
+			
+			if (System.currentTimeMillis() > c.getTimeInMillis()) {
+				c.set(Calendar.DAY_OF_YEAR, c.get(Calendar.DAY_OF_YEAR) + 1);
+			}
+			
+			ThreadPoolManager.getInstance().scheduleGeneral(new ResetPointTask(), c.getTimeInMillis() - System.currentTimeMillis());
+		} catch (Exception ex) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new ResetPointTask(), DAYS.toMillis(1));
+			LOG.warn("Could not properly schedule bot report points reset task. Scheduled in 24 hours!", ex);
+		}
+	}
+	
+	/**
+	 * Returns a integer representative number from a connection
+	 * @param player (The L2PcInstance owner of the connection)
+	 * @return int (hashed ip)
+	 */
+	private static int hashIp(L2PcInstance player) {
+		String con = player.getClient().getConnection().getInetAddress().getHostAddress();
+		String[] rawByte = con.split("\\.");
+		int[] rawIp = new int[4];
+		for (int i = 0; i < 4; i++) {
+			rawIp[i] = Integer.parseInt(rawByte[i]);
+		}
+		
+		return rawIp[0] | (rawIp[1] << 8) | (rawIp[2] << 16) | (rawIp[3] << 24);
+	}
+	
+	/**
+	 * Checks and return if the abstract barrier specified by an integer (map key) has accomplished the waiting time
+	 * @param map (a Map to study (Int = barrier, Long = fully qualified unix time)
+	 * @param objectId (an existent map key)
+	 * @return true if the time has passed.
+	 */
+	private static boolean timeHasPassed(Map<Integer, Long> map, int objectId) {
+		if (map.containsKey(objectId)) {
+			return (System.currentTimeMillis() - map.get(objectId)) > general().getBotReportDelay();
+		}
+		return true;
+	}
+	
+	/**
+	 * Represents the info about a reporter
+	 */
+	private static final class ReporterCharData {
+		private long _lastReport;
+		private byte _reportPoints;
+		
+		ReporterCharData() {
+			_reportPoints = 7;
+			_lastReport = 0;
+		}
+		
+		void registerReport(long time) {
+			_reportPoints -= 1;
+			_lastReport = time;
+		}
+		
+		long getLastReportTime() {
+			return _lastReport;
+		}
+		
+		byte getPointsLeft() {
+			return _reportPoints;
+		}
+		
+		void setPoints(int points) {
+			_reportPoints = (byte) points;
+		}
+	}
+	
+	/**
+	 * Represents the info about a reported character
+	 */
+	private static final class ReportedCharData {
+		Map<Integer, Long> _reporters;
+		
+		ReportedCharData() {
+			_reporters = new HashMap<>();
+		}
+		
+		int getReportCount() {
+			return _reporters.size();
+		}
+		
+		boolean alreadyReportedBy(int objectId) {
+			return _reporters.containsKey(objectId);
+		}
+		
+		void addReporter(int objectId, long reportTime) {
+			_reporters.put(objectId, reportTime);
+		}
+		
+		boolean reportedBySameClan(L2Clan clan) {
+			if (clan == null) {
+				return false;
+			}
+			
+			for (int reporterId : _reporters.keySet()) {
+				if (clan.isMember(reporterId)) {
+					return true;
+				}
+			}
+			
+			return false;
+		}
+	}
+	
+	/**
+	 * SAX loader to parse /config/botreport_punishments.xml file
+	 */
+	private final class PunishmentsLoader extends DefaultHandler {
+		PunishmentsLoader() {
+		}
+		
+		@Override
+		public void startElement(String uri, String localName, String qName, Attributes attr) {
+			if (qName.equals("punishment")) {
+				int reportCount = -1, skillId = -1, skillLevel = 1, sysMessage = -1;
+				try {
+					reportCount = Integer.parseInt(attr.getValue("neededReportCount"));
+					skillId = Integer.parseInt(attr.getValue("skillId"));
+					String level = attr.getValue("skillLevel");
+					String systemMessageId = attr.getValue("sysMessageId");
+					if (level != null) {
+						skillLevel = Integer.parseInt(level);
+					}
+					
+					if (systemMessageId != null) {
+						sysMessage = Integer.parseInt(systemMessageId);
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				
+				addPunishment(reportCount, skillId, skillLevel, sysMessage);
+			}
+		}
+	}
+	
+	static class PunishHolder {
+		final Skill _punish;
+		final int _systemMessageId;
+		
+		PunishHolder(final Skill sk, final int sysMsg) {
+			_punish = sk;
+			_systemMessageId = sysMsg;
+		}
+	}
+	
+	class ResetPointTask implements Runnable {
+		@Override
+		public void run() {
+			resetPointsAndSchedule();
+			
+		}
+	}
+	
+	public static BotReportTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static final class SingletonHolder {
+		static final BotReportTable INSTANCE = new BotReportTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/EventDroplist.java b/src/main/java/com/l2jserver/gameserver/datatables/EventDroplist.java
new file mode 100644
index 00000000..9bc388f0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/EventDroplist.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import com.l2jserver.gameserver.script.DateRange;
+import com.l2jserver.gameserver.script.EventDrop;
+
+/**
+ * This class manage drop of Special Events created by GM for a defined period.<br>
+ * During a Special Event all L2Attackable can drop extra Items.<br>
+ * Those extra Items are defined in the table <b>allNpcDateDrops</b>.<br>
+ * Each Special Event has a start and end date to stop to drop extra Items automatically.
+ */
+public class EventDroplist {
+	/**
+	 * The table containing all DataDrop object
+	 */
+	private static final List<DateDrop> ALL_NPC_DATE_DROPS = new ArrayList<>();
+	
+	public static class DateDrop {
+		protected final DateRange _dateRange;
+		private final EventDrop _eventDrop;
+		
+		public DateDrop(DateRange dateRange, EventDrop eventDrop) {
+			_dateRange = dateRange;
+			_eventDrop = eventDrop;
+		}
+		
+		/**
+		 * @return the _eventDrop
+		 */
+		public EventDrop getEventDrop() {
+			return _eventDrop;
+		}
+		
+		/**
+		 * @return the _dateRange
+		 */
+		public DateRange getDateRange() {
+			return _dateRange;
+		}
+	}
+	
+	/**
+	 * Create and Init a new DateDrop then add it to the allNpcDateDrops of EventDroplist .
+	 * @param itemIdList The table containing all item identifier of this DateDrop
+	 * @param count The table containing min and max value of this DateDrop
+	 * @param chance The chance to obtain this drop
+	 * @param dateRange The DateRange object to add to this DateDrop
+	 */
+	public void addGlobalDrop(int[] itemIdList, int[] count, int chance, DateRange dateRange) {
+		ALL_NPC_DATE_DROPS.add(new DateDrop(dateRange, new EventDrop(itemIdList, count[0], count[1], chance)));
+	}
+	
+	/**
+	 * @param itemId the item Id for the drop
+	 * @param min the minimum drop count
+	 * @param max the maximum drop count
+	 * @param chance the drop chance
+	 * @param dateRange the event drop rate range
+	 */
+	public void addGlobalDrop(int itemId, long min, long max, int chance, DateRange dateRange) {
+		ALL_NPC_DATE_DROPS.add(new DateDrop(dateRange, new EventDrop(itemId, min, max, chance)));
+	}
+	
+	/**
+	 * Adds an event drop for a given date range.
+	 * @param dateRange the date range.
+	 * @param eventDrop the event drop.
+	 */
+	public void addGlobalDrop(DateRange dateRange, EventDrop eventDrop) {
+		ALL_NPC_DATE_DROPS.add(new DateDrop(dateRange, eventDrop));
+	}
+	
+	/**
+	 * @return all DateDrop of EventDroplist allNpcDateDrops within the date range.
+	 */
+	public List<DateDrop> getAllDrops() {
+		final List<DateDrop> list = new ArrayList<>();
+		final Date currentDate = new Date();
+		for (DateDrop drop : ALL_NPC_DATE_DROPS) {
+			if (drop._dateRange.isWithinRange(currentDate)) {
+				list.add(drop);
+			}
+		}
+		return list;
+	}
+	
+	public static EventDroplist getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EventDroplist _instance = new EventDroplist();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/ItemTable.java b/src/main/java/com/l2jserver/gameserver/datatables/ItemTable.java
new file mode 100644
index 00000000..d879ccec
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/ItemTable.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+import static com.l2jserver.gameserver.model.items.type.EtcItemType.ARROW;
+import static com.l2jserver.gameserver.model.items.type.EtcItemType.SHOT;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemHPBonusData;
+import com.l2jserver.gameserver.engines.DocumentEngine;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.item.ItemCreate;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.util.GMAudit;
+
+/**
+ * This class serves as a container for all item templates in the game.
+ */
+public class ItemTable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ItemTable.class);
+	
+	private static final Logger LOG_ITEM = LoggerFactory.getLogger("item");
+	
+	public static final Map<String, Integer> SLOTS = new HashMap<>();
+	
+	private L2Item[] _allTemplates;
+	
+	private final Map<Integer, L2EtcItem> _etcItems = new HashMap<>();
+	
+	private final Map<Integer, L2Armor> _armors = new HashMap<>();
+	
+	private final Map<Integer, L2Weapon> _weapons = new HashMap<>();
+	
+	static {
+		SLOTS.put("shirt", L2Item.SLOT_UNDERWEAR);
+		SLOTS.put("lbracelet", L2Item.SLOT_L_BRACELET);
+		SLOTS.put("rbracelet", L2Item.SLOT_R_BRACELET);
+		SLOTS.put("talisman", L2Item.SLOT_DECO);
+		SLOTS.put("chest", L2Item.SLOT_CHEST);
+		SLOTS.put("fullarmor", L2Item.SLOT_FULL_ARMOR);
+		SLOTS.put("head", L2Item.SLOT_HEAD);
+		SLOTS.put("hair", L2Item.SLOT_HAIR);
+		SLOTS.put("hairall", L2Item.SLOT_HAIRALL);
+		SLOTS.put("underwear", L2Item.SLOT_UNDERWEAR);
+		SLOTS.put("back", L2Item.SLOT_BACK);
+		SLOTS.put("neck", L2Item.SLOT_NECK);
+		SLOTS.put("legs", L2Item.SLOT_LEGS);
+		SLOTS.put("feet", L2Item.SLOT_FEET);
+		SLOTS.put("gloves", L2Item.SLOT_GLOVES);
+		SLOTS.put("chest,legs", L2Item.SLOT_CHEST | L2Item.SLOT_LEGS);
+		SLOTS.put("belt", L2Item.SLOT_BELT);
+		SLOTS.put("rhand", L2Item.SLOT_R_HAND);
+		SLOTS.put("lhand", L2Item.SLOT_L_HAND);
+		SLOTS.put("lrhand", L2Item.SLOT_LR_HAND);
+		SLOTS.put("rear;lear", L2Item.SLOT_R_EAR | L2Item.SLOT_L_EAR);
+		SLOTS.put("rfinger;lfinger", L2Item.SLOT_R_FINGER | L2Item.SLOT_L_FINGER);
+		SLOTS.put("wolf", L2Item.SLOT_WOLF);
+		SLOTS.put("greatwolf", L2Item.SLOT_GREATWOLF);
+		SLOTS.put("hatchling", L2Item.SLOT_HATCHLING);
+		SLOTS.put("strider", L2Item.SLOT_STRIDER);
+		SLOTS.put("babypet", L2Item.SLOT_BABYPET);
+		SLOTS.put("none", L2Item.SLOT_NONE);
+		
+		// retail compatibility
+		SLOTS.put("onepiece", L2Item.SLOT_FULL_ARMOR);
+		SLOTS.put("hair2", L2Item.SLOT_HAIR2);
+		SLOTS.put("dhair", L2Item.SLOT_HAIRALL);
+		SLOTS.put("alldress", L2Item.SLOT_ALLDRESS);
+		SLOTS.put("deco1", L2Item.SLOT_DECO);
+		SLOTS.put("waist", L2Item.SLOT_BELT);
+	}
+	
+	public static ItemTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	protected ItemTable() {
+		load();
+	}
+	
+	private void load() {
+		final var start = System.currentTimeMillis();
+		
+		int highest = 0;
+		_armors.clear();
+		_etcItems.clear();
+		_weapons.clear();
+		for (L2Item item : DocumentEngine.getInstance().loadItems()) {
+			if (highest < item.getId()) {
+				highest = item.getId();
+			}
+			if (item instanceof L2EtcItem etc) {
+				_etcItems.put(item.getId(), etc);
+			} else if (item instanceof L2Armor armor) {
+				_armors.put(item.getId(), armor);
+			} else {
+				_weapons.put(item.getId(), (L2Weapon) item);
+			}
+		}
+		
+		buildFastLookupTable(highest);
+		
+		LOG.info("Loaded {} Etc items.", _etcItems.size());
+		LOG.info("Loaded {} Armor items.", _armors.size());
+		LOG.info("Loaded {} Weapon items.", _weapons.size());
+		LOG.info("Loaded {} items total in {}ms.", (_etcItems.size() + _armors.size() + _weapons.size()), System.currentTimeMillis() - start);
+	}
+	
+	/**
+	 * Builds a variable in which all items are putting in in function of their ID.
+	 * @param size
+	 */
+	private void buildFastLookupTable(int size) {
+		// Create a FastLookUp Table called _allTemplates of size : value of the highest item ID
+		LOG.info("Highest item Id used {}.", size);
+		_allTemplates = new L2Item[size + 1];
+		
+		// Insert armor item in Fast Look Up Table
+		for (L2Armor item : _armors.values()) {
+			_allTemplates[item.getId()] = item;
+		}
+		
+		// Insert weapon item in Fast Look Up Table
+		for (L2Weapon item : _weapons.values()) {
+			_allTemplates[item.getId()] = item;
+		}
+		
+		// Insert etcItem item in Fast Look Up Table
+		for (L2EtcItem item : _etcItems.values()) {
+			_allTemplates[item.getId()] = item;
+		}
+	}
+	
+	/**
+	 * Returns the item corresponding to the item ID
+	 * @param id : int designating the item
+	 * @return L2Item
+	 */
+	public L2Item getTemplate(int id) {
+		if ((id >= _allTemplates.length) || (id < 0)) {
+			return null;
+		}
+		
+		return _allTemplates[id];
+	}
+	
+	/**
+	 * Create the L2ItemInstance corresponding to the Item Identifier and quantitiy add logs the activity. <B><U> Actions</U> :</B>
+	 * <li>Create and Init the L2ItemInstance corresponding to the Item Identifier and quantity</li>
+	 * <li>Add the L2ItemInstance object to _allObjects of L2world</li>
+	 * <li>Logs Item creation according to log settings</li>
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item Identifier of the item to be created
+	 * @param count : int Quantity of items to be created for stackable items
+	 * @param actor : L2PcInstance Player requesting the item creation
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item
+	 */
+	public L2ItemInstance createItem(String process, int itemId, long count, L2PcInstance actor, Object reference) {
+		// Create and Init the L2ItemInstance corresponding to the Item Identifier
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var item = new L2ItemInstance(objectId, itemId);
+		
+		if (process.equalsIgnoreCase("loot")) {
+			// loot privilege for raids
+			if ((reference instanceof L2Attackable raid) && raid.isRaid()) {
+				// if in CommandChannel and was killing a World/RaidBoss
+				if ((raid.getFirstCommandChannelAttacked() != null) && !character().autoLootRaids()) {
+					item.setOwnerId(raid.getFirstCommandChannelAttacked().getLeaderObjectId());
+					final var itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), character().getRaidLootRightsInterval());
+					item.setItemLootSchedule(itemLootShedule);
+				}
+			} else if (!character().autoLoot() || ((reference instanceof L2EventMonsterInstance eventMonster) && eventMonster.eventDropOnGround())) {
+				item.setOwnerId(actor.getObjectId());
+				final var itemLootShedule = ThreadPoolManager.getInstance().scheduleGeneral(new ResetOwner(item), 15000);
+				item.setItemLootSchedule(itemLootShedule);
+			}
+		}
+		
+		if (general().debug()) {
+			LOG.info("Item created object Id {} and item Id {}.", item.getObjectId(), itemId);
+		}
+		
+		// Add the L2ItemInstance object to _allObjects of L2world
+		L2World.getInstance().storeObject(item);
+		
+		// Set Item parameters
+		if (item.isStackable() && (count > 1)) {
+			item.setCount(count);
+		}
+		
+		if (general().logItems() && !process.equals("Reset")) {
+			if (!general().logItemsSmallLog() || (general().logItemsSmallLog() && (item.isEquipable() || (item.getId() == ADENA_ID)))) {
+				if ((item.getItemType() != ARROW) && (item.getItemType() != SHOT)) {
+					LOG_ITEM.info("CREATED {} by {}, referenced by {}.", item, actor, reference);
+				}
+			}
+		}
+		
+		if (actor != null) {
+			if (actor.isGM()) {
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object object) {
+					referenceName = (object.getName() != null ? object.getName() : "no-name");
+				} else if (reference instanceof String) {
+					referenceName = (String) reference;
+				}
+				String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+				if (general().gmAudit()) {
+					GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + itemId + " count: " + count + " name: " + item.getItemName() + " objId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
+				}
+			}
+		}
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new ItemCreate(process, item, actor, reference), item.getItem());
+		return item;
+	}
+	
+	public L2ItemInstance createItem(String process, int itemId, int count, L2PcInstance actor) {
+		return createItem(process, itemId, count, actor, null);
+	}
+	
+	/**
+	 * Destroys the L2ItemInstance.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Sets L2ItemInstance parameters to be unusable</li>
+	 * <li>Removes the L2ItemInstance object to _allObjects of L2world</li>
+	 * <li>Logs Item deletion according to log settings</li>
+	 * </ul>
+	 * @param process a string identifier of process triggering this action.
+	 * @param item the item instance to be destroyed.
+	 * @param actor the player requesting the item destroy.
+	 * @param reference the object referencing current action like NPC selling item or previous item in transformation.
+	 */
+	public void destroyItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		synchronized (item) {
+			long old = item.getCount();
+			item.setCount(0);
+			item.setOwnerId(0);
+			item.setItemLocation(ItemLocation.VOID);
+			item.setLastChange(L2ItemInstance.REMOVED);
+			
+			L2World.getInstance().removeObject(item);
+			IdFactory.getInstance().releaseId(item.getObjectId());
+			
+			if (general().logItems()) {
+				if (!general().logItemsSmallLog() || (general().logItemsSmallLog() && (item.isEquipable() || (item.getId() == ADENA_ID)))) {
+					if ((item.getItemType() != ARROW) && (item.getItemType() != SHOT)) {
+						LOG_ITEM.info("DELETED {} amount {} by {}, referenced by {}.", item, old, actor, reference);
+					}
+				}
+			}
+			
+			if (actor != null) {
+				if (actor.isGM()) {
+					String referenceName = "no-reference";
+					if (reference instanceof L2Object object) {
+						referenceName = (object.getName() != null ? object.getName() : "no-name");
+					} else if (reference instanceof String) {
+						referenceName = (String) reference;
+					}
+					String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
+					if (general().gmAudit()) {
+						GMAudit.auditGMAction(actor.getName() + " [" + actor.getObjectId() + "]", process + "(id: " + item.getId() + " count: " + item.getCount() + " itemObjId: " + item.getObjectId() + ")", targetName, "L2Object referencing this action is: " + referenceName);
+					}
+				}
+			}
+			
+			// if it's a pet control item, delete the pet as well
+			if (item.getItem().isPetItem()) {
+				try (var con = ConnectionFactory.getInstance().getConnection();
+					var statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id=?")) {
+					statement.setInt(1, item.getObjectId());
+					statement.execute();
+				} catch (Exception ex) {
+					LOG.warn("Could not delete pet object Id {}!", item.getObjectId(), ex);
+				}
+			}
+		}
+	}
+	
+	public void reload() {
+		load();
+		EnchantItemHPBonusData.getInstance().load();
+	}
+	
+	protected static class ResetOwner implements Runnable {
+		L2ItemInstance _item;
+		
+		public ResetOwner(L2ItemInstance item) {
+			_item = item;
+		}
+		
+		@Override
+		public void run() {
+			_item.setOwnerId(0);
+			_item.setItemLootSchedule(null);
+		}
+	}
+	
+	public Set<Integer> getAllArmorsId() {
+		return _armors.keySet();
+	}
+	
+	public Set<Integer> getAllWeaponsId() {
+		return _weapons.keySet();
+	}
+	
+	public int getArraySize() {
+		return _allTemplates.length;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ItemTable _instance = new ItemTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java b/src/main/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java
new file mode 100644
index 00000000..044685af
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * This class holds parameter, specific to certain NPCs.<br>
+ * It can be either general parameters overridden for certain NPC instance instead of template parameters(aggro range, for example), or some optional parameters, handled by datapack scripts.
+ * @author GKR
+ */
+public class NpcPersonalAIData {
+	private final Map<String, Map<String, Integer>> _AIData = new HashMap<>();
+	
+	/**
+	 * Instantiates a new table.
+	 */
+	protected NpcPersonalAIData() {
+	}
+	
+	/**
+	 * Stores data for given spawn.
+	 * @param spawnDat spawn to process
+	 * @param data Map of AI values
+	 */
+	public void storeData(L2Spawn spawnDat, Map<String, Integer> data) {
+		if ((data != null) && !data.isEmpty()) {
+			// check for spawn name. Since spawn name is key for AI Data, generate random name, if spawn name isn't specified
+			if (spawnDat.getName() == null) {
+				spawnDat.setName(Long.toString(Rnd.nextLong()));
+			}
+			
+			_AIData.put(spawnDat.getName(), data);
+		}
+	}
+	
+	/**
+	 * Gets AI value with given spawnName and paramName
+	 * @param spawnName spawn name to check
+	 * @param paramName parameter to check
+	 * @return value of given parameter for given spawn name
+	 */
+	public int getAIValue(final String spawnName, final String paramName) {
+		if (_AIData.containsKey(spawnName)) {
+			return _AIData.get(spawnName).getOrDefault(paramName, -1);
+		}
+		return -1;
+	}
+	
+	/**
+	 * Verifies if there is AI value with given spawnName and paramName
+	 * @param spawnName spawn name to check
+	 * @param paramName parameter name to check
+	 * @return {@code true} if parameter paramName is set for spawn spawnName, {@code false} otherwise
+	 */
+	public boolean hasAIValue(String spawnName, String paramName) {
+		return (spawnName != null) && _AIData.containsKey(spawnName) && _AIData.get(spawnName).containsKey(paramName);
+	}
+	
+	/**
+	 * Initializes npc parameters by specified values.
+	 * @param npc NPC to process
+	 * @param spawn link to NPC's spawn
+	 * @param spawnName name of spawn
+	 */
+	public void initializeNpcParameters(L2Npc npc, L2Spawn spawn, String spawnName) {
+		if (_AIData.containsKey(spawnName)) {
+			Map<String, Integer> map = _AIData.get(spawnName);
+			
+			try {
+				for (String key : map.keySet()) {
+					switch (key) {
+						case "disableRandomAnimation" -> npc.setRandomAnimationEnabled((map.get(key) == 0));
+						case "disableRandomWalk" -> {
+							npc.setIsNoRndWalk((map.get(key) == 1));
+							spawn.setIsNoRndWalk((map.get(key) == 1));
+						}
+					}
+				}
+			} catch (Exception e) {
+				// Do nothing
+			}
+		}
+	}
+	
+	/**
+	 * Gets the single instance of NpcTable.
+	 * @return single instance of NpcTable
+	 */
+	public static NpcPersonalAIData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final NpcPersonalAIData _instance = new NpcPersonalAIData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/SkillData.java b/src/main/java/com/l2jserver/gameserver/datatables/SkillData.java
new file mode 100644
index 00000000..713d3486
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/SkillData.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.engines.DocumentEngine;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Skill data.
+ */
+public final class SkillData {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SkillData.class);
+	
+	private final Map<Integer, Skill> _skills = new HashMap<>();
+	private final Map<Integer, Integer> _skillMaxLevel = new HashMap<>();
+	private final Set<Integer> _enchantable = new HashSet<>();
+	
+	protected SkillData() {
+		load();
+	}
+	
+	public void reload() {
+		load();
+		// Reload Skill Tree as well.
+		SkillTreesData.getInstance().load();
+	}
+	
+	private void load() {
+		final var start = System.currentTimeMillis();
+		
+		final var temp = DocumentEngine.getInstance().loadAllSkills();
+		
+		_skills.clear();
+		_skills.putAll(temp);
+		
+		_skillMaxLevel.clear();
+		_enchantable.clear();
+		for (Skill skill : _skills.values()) {
+			final int skillId = skill.getId();
+			final int skillLvl = skill.getLevel();
+			if (skillLvl > 99) {
+				_enchantable.add(skillId);
+				continue;
+			}
+			
+			// only non-enchanted skills
+			final int maxLvl = getMaxLevel(skillId);
+			if (skillLvl > maxLvl) {
+				_skillMaxLevel.put(skillId, skillLvl);
+			}
+		}
+		
+		LOG.info("Loaded {} skill templates from XML files in {}ms.", _skills.size(), System.currentTimeMillis() - start);
+	}
+	
+	/**
+	 * Provides the skill hash
+	 * @param skill The L2Skill to be hashed
+	 * @return getSkillHashCode(skill.getId(), skill.getLevel())
+	 */
+	public static int getSkillHashCode(Skill skill) {
+		return getSkillHashCode(skill.getId(), skill.getLevel());
+	}
+	
+	/**
+	 * Centralized method for easier change of the hashing sys
+	 * @param skillId The Skill Id
+	 * @param skillLevel The Skill Level
+	 * @return The Skill hash number
+	 */
+	public static int getSkillHashCode(int skillId, int skillLevel) {
+		return (skillId * 1021) + skillLevel;
+	}
+	
+	public Skill getSkill(int skillId, int level) {
+		final Skill result = _skills.get(getSkillHashCode(skillId, level));
+		if (result != null) {
+			return result;
+		}
+		
+		// skill/level not found, fix for transformation scripts
+		final int maxLvl = getMaxLevel(skillId);
+		// requested level too high
+		if ((maxLvl > 0) && (level > maxLvl)) {
+			if (general().debug()) {
+				LOG.warn("Call to unexisting skill level Id {} requested level {} max level {}!", skillId, level, maxLvl);
+			}
+			return _skills.get(getSkillHashCode(skillId, maxLvl));
+		}
+		
+		LOG.warn("No skill info found for skill Id {} and skill level {}!", skillId, level);
+		return null;
+	}
+	
+	public int getMaxLevel(int skillId) {
+		final Integer maxLevel = _skillMaxLevel.get(skillId);
+		return maxLevel != null ? maxLevel : 0;
+	}
+	
+	/**
+	 * Verifies if the given skill ID correspond to an enchantable skill.
+	 * @param skillId the skill ID
+	 * @return {@code true} if the skill is enchantable, {@code false} otherwise
+	 */
+	public boolean isEnchantable(int skillId) {
+		return _enchantable.contains(skillId);
+	}
+	
+	/**
+	 * @param addNoble
+	 * @param hasCastle
+	 * @return an array with siege skills. If addNoble == true, will add also Advanced headquarters.
+	 */
+	public Skill[] getSiegeSkills(boolean addNoble, boolean hasCastle) {
+		Skill[] temp = new Skill[2 + (addNoble ? 1 : 0) + (hasCastle ? 2 : 0)];
+		int i = 0;
+		temp[i++] = _skills.get(SkillData.getSkillHashCode(246, 1));
+		temp[i++] = _skills.get(SkillData.getSkillHashCode(247, 1));
+		
+		if (addNoble) {
+			temp[i++] = _skills.get(SkillData.getSkillHashCode(326, 1));
+		}
+		if (hasCastle) {
+			temp[i++] = _skills.get(SkillData.getSkillHashCode(844, 1));
+			temp[i] = _skills.get(SkillData.getSkillHashCode(845, 1));
+		}
+		return temp;
+	}
+	
+	public static SkillData getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SkillData _instance = new SkillData();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/datatables/SpawnTable.java b/src/main/java/com/l2jserver/gameserver/datatables/SpawnTable.java
new file mode 100644
index 00000000..76de6a13
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/datatables/SpawnTable.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.instancemanager.DayNightSpawnManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Spawn data retriever.
+ * @author Zoey76
+ */
+public final class SpawnTable implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SpawnTable.class);
+	
+	private static final String SELECT_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM spawnlist";
+	
+	private static final String SELECT_CUSTOM_SPAWNS = "SELECT count, npc_templateid, locx, locy, locz, heading, respawn_delay, respawn_random, loc_id, periodOfDay FROM custom_spawnlist";
+	
+	private static final Map<Integer, Set<L2Spawn>> _spawnTable = new ConcurrentHashMap<>();
+	
+	private int _xmlSpawnCount = 0;
+	
+	@Override
+	public void load() {
+		if (!general().noSpawns()) {
+			fillSpawnTable(false);
+			final int spawnCount = _spawnTable.size();
+			LOG.info("Loaded {} NPC spawns.", spawnCount);
+			
+			if (general().customSpawnlistTable()) {
+				fillSpawnTable(true);
+				LOG.info("Loaded {} custom NPC spawns.", (_spawnTable.size() - spawnCount));
+			}
+			
+			// Load XML list
+			parseDatapackDirectory("data/spawnlist", false);
+			LOG.info("Loaded {} NPC spawns from XML.", _xmlSpawnCount);
+		}
+	}
+	
+	/**
+	 * Verifies if the template exists and it's spawnable.
+	 * @param npcId the NPC ID
+	 * @return {@code true} if the NPC ID belongs to an spawnable template, {@code false} otherwise
+	 */
+	private boolean checkTemplate(int npcId) {
+		L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId);
+		if (npcTemplate == null) {
+			LOG.warn("Data missing in NPC table for ID {}!", npcId);
+			return false;
+		}
+		
+		// Don't spawn
+		return !npcTemplate.isType("L2SiegeGuard") && !npcTemplate.isType("L2RaidBoss");
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		NamedNodeMap attrs;
+		for (Node list = doc.getFirstChild(); list != null; list = list.getNextSibling()) {
+			if (list.getNodeName().equalsIgnoreCase("list")) {
+				attrs = list.getAttributes();
+				// skip disabled spawnlists
+				if (!Boolean.parseBoolean(attrs.getNamedItem("enabled").getNodeValue())) {
+					continue;
+				}
+				for (Node param = list.getFirstChild(); param != null; param = param.getNextSibling()) {
+					attrs = param.getAttributes();
+					if (param.getNodeName().equalsIgnoreCase("spawn")) {
+						String territoryName = null;
+						String spawnName = null;
+						Map<String, Integer> map = null;
+						
+						// Check, if spawn name specified
+						if (attrs.getNamedItem("name") != null) {
+							spawnName = parseString(attrs, "name");
+						}
+						// Check, if spawn territory specified and exists
+						if ((attrs.getNamedItem("zone") != null) && (ZoneManager.getInstance().getSpawnTerritory(attrs.getNamedItem("zone").getNodeValue()) != null)) {
+							territoryName = parseString(attrs, "zone");
+						}
+						
+						for (Node npctag = param.getFirstChild(); npctag != null; npctag = npctag.getNextSibling()) {
+							attrs = npctag.getAttributes();
+							// Check if there are any AI parameters
+							if (npctag.getNodeName().equalsIgnoreCase("AIData")) {
+								attrs = npctag.getAttributes();
+								if (map == null) {
+									map = new HashMap<>();
+								}
+								for (Node c = npctag.getFirstChild(); c != null; c = c.getNextSibling()) {
+									// Skip odd nodes
+									if (c.getNodeName().equals("#text")) {
+										continue;
+									}
+									int val = switch (c.getNodeName()) {
+										case "disableRandomAnimation", "disableRandomWalk" -> Boolean.parseBoolean(c.getTextContent()) ? 1 : 0;
+										default -> Integer.parseInt(c.getTextContent());
+									};
+									map.put(c.getNodeName(), val);
+								}
+							}
+							// Check for NPC spawns
+							else if (npctag.getNodeName().equalsIgnoreCase("npc")) {
+								// mandatory
+								final int templateId = parseInteger(attrs, "id");
+								// coordinates are optional, if territory is specified; mandatory otherwise
+								int x = 0;
+								int y = 0;
+								int z = 0;
+								
+								try {
+									x = parseInteger(attrs, "x");
+									y = parseInteger(attrs, "y");
+									z = parseInteger(attrs, "z");
+								} catch (NullPointerException npe) {
+									// x, y, z can be unspecified, if this spawn is territory based, do nothing
+								}
+								
+								if ((x == 0) && (y == 0) && (territoryName == null)) // Both coordinates and zone are unspecified
+								{
+									LOG.warn("Spawn could not be initialized, both coordinates and zone are unspecified for ID {}!", templateId);
+									continue;
+								}
+								
+								StatsSet spawnInfo = new StatsSet();
+								spawnInfo.set("npcTemplateid", templateId);
+								spawnInfo.set("x", x);
+								spawnInfo.set("y", y);
+								spawnInfo.set("z", z);
+								spawnInfo.set("territoryName", territoryName);
+								spawnInfo.set("spawnName", spawnName);
+								
+								// trying to read optional parameters
+								if (attrs.getNamedItem("heading") != null) {
+									spawnInfo.set("heading", parseInteger(attrs, "heading"));
+								}
+								
+								if (attrs.getNamedItem("count") != null) {
+									spawnInfo.set("count", parseInteger(attrs, "count"));
+								}
+								
+								if (attrs.getNamedItem("respawnDelay") != null) {
+									spawnInfo.set("respawnDelay", parseInteger(attrs, "respawnDelay"));
+								}
+								
+								if (attrs.getNamedItem("respawnRandom") != null) {
+									spawnInfo.set("respawnRandom", parseInteger(attrs, "respawnRandom"));
+								}
+								
+								if (attrs.getNamedItem("periodOfDay") != null) {
+									String period = attrs.getNamedItem("periodOfDay").getNodeValue();
+									if (period.equalsIgnoreCase("day") || period.equalsIgnoreCase("night")) {
+										spawnInfo.set("periodOfDay", period.equalsIgnoreCase("day") ? 1 : 2);
+									}
+								}
+								
+								_xmlSpawnCount += addSpawn(spawnInfo, map);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Retrieves spawn data from database.
+	 * @param isCustom if {@code true} the spawns are loaded as custom from custom spawn table
+	 * @return the spawn count
+	 */
+	private int fillSpawnTable(boolean isCustom) {
+		int npcSpawnCount = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(isCustom ? SELECT_CUSTOM_SPAWNS : SELECT_SPAWNS)) {
+			while (rs.next()) {
+				StatsSet spawnInfo = new StatsSet();
+				int npcId = rs.getInt("npc_templateid");
+				
+				// Check basic requirements first
+				if (!checkTemplate(npcId)) {
+					// Don't spawn
+					continue;
+				}
+				
+				spawnInfo.set("npcTemplateid", npcId);
+				spawnInfo.set("count", rs.getInt("count"));
+				spawnInfo.set("x", rs.getInt("locx"));
+				spawnInfo.set("y", rs.getInt("locy"));
+				spawnInfo.set("z", rs.getInt("locz"));
+				spawnInfo.set("heading", rs.getInt("heading"));
+				spawnInfo.set("respawnDelay", rs.getInt("respawn_delay"));
+				spawnInfo.set("respawnRandom", rs.getInt("respawn_random"));
+				spawnInfo.set("locId", rs.getInt("loc_id"));
+				spawnInfo.set("periodOfDay", rs.getInt("periodOfDay"));
+				spawnInfo.set("isCustomSpawn", isCustom);
+				npcSpawnCount += addSpawn(spawnInfo);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Spawn could not be initialized!", ex);
+		}
+		return npcSpawnCount;
+	}
+	
+	/**
+	 * Creates NPC spawn
+	 * @param spawnInfo StatsSet of spawn parameters
+	 * @param AIData Map of specific AI parameters for this spawn
+	 * @return count NPC instances, spawned by this spawn
+	 */
+	private int addSpawn(StatsSet spawnInfo, Map<String, Integer> AIData) {
+		int ret = 0;
+		try {
+			final var spawnDat = new L2Spawn(spawnInfo.getInt("npcTemplateid"));
+			spawnDat.setAmount(spawnInfo.getInt("count", 1));
+			spawnDat.setX(spawnInfo.getInt("x", 0));
+			spawnDat.setY(spawnInfo.getInt("y", 0));
+			spawnDat.setZ(spawnInfo.getInt("z", 0));
+			spawnDat.setHeading(spawnInfo.getInt("heading", -1));
+			spawnDat.setRespawnDelay(spawnInfo.getInt("respawnDelay", 0), spawnInfo.getInt("respawnRandom", 0));
+			spawnDat.setLocationId(spawnInfo.getInt("locId", 0));
+			String territoryName = spawnInfo.getString("territoryName", "");
+			String spawnName = spawnInfo.getString("spawnName", "");
+			spawnDat.setCustom(spawnInfo.getBoolean("isCustomSpawn", false));
+			if (!spawnName.isEmpty()) {
+				spawnDat.setName(spawnName);
+			}
+			if (!territoryName.isEmpty()) {
+				spawnDat.setSpawnTerritory(ZoneManager.getInstance().getSpawnTerritory(territoryName));
+			}
+			// Register AI Data for this spawn
+			NpcPersonalAIData.getInstance().storeData(spawnDat, AIData);
+			switch (spawnInfo.getInt("periodOfDay", 0)) {
+				// default
+				case 0 -> ret += spawnDat.init();
+				// Day
+				case 1 -> {
+					DayNightSpawnManager.getInstance().addDayCreature(spawnDat);
+					ret = 1;
+				}
+				// Night
+				case 2 -> {
+					DayNightSpawnManager.getInstance().addNightCreature(spawnDat);
+					ret = 1;
+				}
+			}
+			
+			addSpawn(spawnDat);
+		} catch (Exception ex) {
+			LOG.warn("Spawn could not be initialized!", ex);
+		}
+		return ret;
+	}
+	
+	/**
+	 * Wrapper for {@link #addSpawn(StatsSet, Map)}.
+	 * @param spawnInfo StatsSet of spawn parameters
+	 * @return count NPC instances, spawned by this spawn
+	 */
+	private int addSpawn(StatsSet spawnInfo) {
+		return addSpawn(spawnInfo, null);
+	}
+	
+	/**
+	 * Gets the spawn data.
+	 * @return the spawn data
+	 */
+	public Map<Integer, Set<L2Spawn>> getSpawnTable() {
+		return _spawnTable;
+	}
+	
+	/**
+	 * Gets the spawns for the NPC Id.
+	 * @param npcId the NPC Id
+	 * @return the spawn set for the given npcId
+	 */
+	public Set<L2Spawn> getSpawns(int npcId) {
+		return _spawnTable.getOrDefault(npcId, Collections.emptySet());
+	}
+	
+	/**
+	 * Gets the spawn count for the given NPC ID.
+	 * @param npcId the NPC Id
+	 * @return the spawn count
+	 */
+	public int getSpawnCount(int npcId) {
+		return getSpawns(npcId).size();
+	}
+	
+	/**
+	 * Finds a spawn for the given NPC ID.
+	 * @param npcId the NPC Id
+	 * @return a spawn for the given NPC ID or {@code null}
+	 */
+	public L2Spawn findAny(int npcId) {
+		return getSpawns(npcId).stream().findFirst().orElse(null);
+	}
+	
+	/**
+	 * Adds a new spawn to the spawn table.
+	 * @param spawn the spawn to add
+	 * @param storeInDb if {@code true} it'll be saved in the database
+	 */
+	public void addNewSpawn(L2Spawn spawn, boolean storeInDb) {
+		addSpawn(spawn);
+		
+		if (storeInDb) {
+			final String spawnTable = spawn.isCustom() && general().customSpawnlistTable() ? "custom_spawnlist" : "spawnlist";
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var insert = con.prepareStatement("INSERT INTO " + spawnTable + "(count,npc_templateid,locx,locy,locz,heading,respawn_delay,respawn_random,loc_id) values(?,?,?,?,?,?,?,?,?)")) {
+				insert.setInt(1, spawn.getAmount());
+				insert.setInt(2, spawn.getId());
+				insert.setInt(3, spawn.getX());
+				insert.setInt(4, spawn.getY());
+				insert.setInt(5, spawn.getZ());
+				insert.setInt(6, spawn.getHeading());
+				insert.setInt(7, (int) MILLISECONDS.toSeconds(spawn.getRespawnDelay()));
+				insert.setInt(8, spawn.getRespawnMaxDelay() - spawn.getRespawnMinDelay());
+				insert.setInt(9, spawn.getLocationId());
+				insert.execute();
+			} catch (Exception ex) {
+				LOG.warn("Could not store spawn in the DB!", ex);
+			}
+		}
+	}
+	
+	/**
+	 * Delete an spawn from the spawn table.
+	 * @param spawn the spawn to delete
+	 * @param updateDb if {@code true} database will be updated
+	 */
+	public void deleteSpawn(L2Spawn spawn, boolean updateDb) {
+		if (!removeSpawn(spawn)) {
+			return;
+		}
+		
+		if (updateDb) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var delete = con.prepareStatement("DELETE FROM " + (spawn.isCustom() ? "custom_spawnlist" : "spawnlist") + " WHERE locx=? AND locy=? AND locz=? AND npc_templateid=? AND heading=?")) {
+				delete.setInt(1, spawn.getX());
+				delete.setInt(2, spawn.getY());
+				delete.setInt(3, spawn.getZ());
+				delete.setInt(4, spawn.getId());
+				delete.setInt(5, spawn.getHeading());
+				delete.execute();
+			} catch (Exception ex) {
+				LOG.warn("Spawn {} could not be removed from DB!", spawn, ex);
+			}
+		}
+	}
+	
+	/**
+	 * Add a spawn to the spawn set if present, otherwise add a spawn set and add the spawn to the newly created spawn set.
+	 * @param spawn the NPC spawn to add
+	 */
+	private void addSpawn(L2Spawn spawn) {
+		_spawnTable.computeIfAbsent(spawn.getId(), _ -> ConcurrentHashMap.newKeySet(1)).add(spawn);
+	}
+	
+	/**
+	 * Remove a spawn from the spawn set, if the spawn set is empty, remove it as well.
+	 * @param spawn the NPC spawn to remove
+	 * @return {@code true} if the spawn was successfully removed, {@code false} otherwise
+	 */
+	private boolean removeSpawn(L2Spawn spawn) {
+		final Set<L2Spawn> set = _spawnTable.get(spawn.getId());
+		if (set != null) {
+			boolean removed = set.remove(spawn);
+			if (set.isEmpty()) {
+				_spawnTable.remove(spawn.getId());
+			}
+			return removed;
+		}
+		return false;
+	}
+	
+	/**
+	 * Execute a procedure over all spawns.<br>
+	 * <font size="4" color="red">Do not use it!</font>
+	 * @param function the function to execute
+	 * @return {@code true} if all procedures were executed, {@code false} otherwise
+	 */
+	public boolean forEachSpawn(Function<L2Spawn, Boolean> function) {
+		for (Set<L2Spawn> set : _spawnTable.values()) {
+			for (L2Spawn spawn : set) {
+				if (!function.apply(spawn)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+	
+	public static SpawnTable getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SpawnTable INSTANCE = new SpawnTable();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/engines/DocumentBase.java b/src/main/java/com/l2jserver/gameserver/engines/DocumentBase.java
new file mode 100644
index 00000000..32079ad0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/engines/DocumentBase.java
@@ -0,0 +1,956 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.engines;
+
+import static java.util.stream.Collectors.toSet;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.base.PlayerState;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.conditions.ConditionCategoryType;
+import com.l2jserver.gameserver.model.conditions.ConditionChangeWeapon;
+import com.l2jserver.gameserver.model.conditions.ConditionCheckAbnormal;
+import com.l2jserver.gameserver.model.conditions.ConditionGameChance;
+import com.l2jserver.gameserver.model.conditions.ConditionGameTime;
+import com.l2jserver.gameserver.model.conditions.ConditionGameTime.CheckGameTime;
+import com.l2jserver.gameserver.model.conditions.ConditionLogicAnd;
+import com.l2jserver.gameserver.model.conditions.ConditionLogicNot;
+import com.l2jserver.gameserver.model.conditions.ConditionLogicOr;
+import com.l2jserver.gameserver.model.conditions.ConditionMinDistance;
+import com.l2jserver.gameserver.model.conditions.ConditionOpCompanion;
+import com.l2jserver.gameserver.model.conditions.ConditionOpExistNpc;
+import com.l2jserver.gameserver.model.conditions.ConditionOpResurrection;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerActiveEffectId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerActiveSkillId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerAgathionEnergy;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerAgathionId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCallPc;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanCreateBase;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanCreateOutpost;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanEscape;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanRefuelAirship;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanSummon;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanSummonSiegeGolem;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanSweep;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanTakeCastle;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanTakeFort;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanTransform;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCanUntransform;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCharges;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerClassIdRestriction;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCloakStatus;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerCp;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerFlyMounted;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerGrade;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasAgathion;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasCastle;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasClanHall;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasFort;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasPet;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHasServitor;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerHp;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerInsideZoneId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerInstanceId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerInvSize;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerIsClanLeader;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerIsHero;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerLandingZone;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerLevel;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerLevelRange;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerMp;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerPkCount;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerPledgeClass;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerRace;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerRangeFromNpc;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSex;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSiegeSide;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSouls;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerState;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerSubclass;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerTransformationId;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerTvTEvent;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerVehicleMounted;
+import com.l2jserver.gameserver.model.conditions.ConditionPlayerWeight;
+import com.l2jserver.gameserver.model.conditions.ConditionSiegeZone;
+import com.l2jserver.gameserver.model.conditions.ConditionSlotItemId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetAbnormal;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveEffectId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetActiveSkillId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetAggro;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetClassIdRestriction;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetInvSize;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetLevel;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetLevelRange;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetMyParty;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetNpcId;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetNpcType;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetPlayable;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetRace;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetUsesWeaponKind;
+import com.l2jserver.gameserver.model.conditions.ConditionTargetWeight;
+import com.l2jserver.gameserver.model.conditions.ConditionUsingItemType;
+import com.l2jserver.gameserver.model.conditions.ConditionUsingSkill;
+import com.l2jserver.gameserver.model.conditions.ConditionUsingSlotType;
+import com.l2jserver.gameserver.model.conditions.ConditionWithSkill;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.type.ArmorType;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.EffectScope;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+
+/**
+ * Document Base.
+ * @author mkizub
+ */
+public abstract class DocumentBase {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DocumentBase.class);
+	
+	private final File _file;
+	
+	protected final Map<String, String[]> _tables = new HashMap<>();
+	
+	protected DocumentBase(File pFile) {
+		_file = pFile;
+	}
+	
+	public Document parse() {
+		Document doc = null;
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setIgnoringComments(true);
+			doc = factory.newDocumentBuilder().parse(_file);
+			parseDocument(doc);
+		} catch (Exception ex) {
+			LOG.error("Error loading file {}!", _file, ex);
+		}
+		return doc;
+	}
+	
+	protected abstract void parseDocument(Document doc);
+	
+	protected abstract StatsSet getStatsSet();
+	
+	protected abstract String getTableValue(String name);
+	
+	protected abstract String getTableValue(String name, int idx);
+	
+	protected void resetTable() {
+		_tables.clear();
+	}
+	
+	protected void setTable(String name, String[] table) {
+		_tables.put(name, table);
+	}
+	
+	protected void parseTemplate(Node n, Object template) {
+		parseTemplate(n, template, null);
+	}
+	
+	protected void parseTemplate(Node n, Object template, EffectScope effectScope) {
+		Condition condition = null;
+		n = n.getFirstChild();
+		if (n == null) {
+			return;
+		}
+		if ("cond".equalsIgnoreCase(n.getNodeName())) {
+			condition = parseCondition(n.getFirstChild(), template);
+			Node msg = n.getAttributes().getNamedItem("msg");
+			Node msgId = n.getAttributes().getNamedItem("msgId");
+			if ((condition != null) && (msg != null)) {
+				condition.setMessage(msg.getNodeValue());
+			} else if ((condition != null) && (msgId != null)) {
+				condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+				Node addName = n.getAttributes().getNamedItem("addName");
+				if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+					condition.addName();
+				}
+			}
+			n = n.getNextSibling();
+		}
+		for (; n != null; n = n.getNextSibling()) {
+			final String name = n.getNodeName().toLowerCase();
+			
+			switch (name) {
+				case "effect" -> {
+					if (template instanceof AbstractEffect) {
+						throw new RuntimeException("Nested effects");
+					}
+					attachEffect(n, template, condition, effectScope);
+				}
+				case "add", "sub", "mul", "div", "set", "share", "enchant", "enchanthp" -> attachFunc(n, template, name, condition);
+			}
+		}
+	}
+	
+	protected void attachFunc(Node n, Object template, String functionName, Condition attachCond) {
+		Stats stat = Stats.valueOfXml(n.getAttributes().getNamedItem("stat").getNodeValue());
+		int order = -1;
+		final Node orderNode = n.getAttributes().getNamedItem("order");
+		if (orderNode != null) {
+			order = Integer.parseInt(orderNode.getNodeValue());
+		}
+		
+		String valueString = n.getAttributes().getNamedItem("val").getNodeValue();
+		double value;
+		if (valueString.charAt(0) == '#') {
+			value = Double.parseDouble(getTableValue(valueString));
+		} else {
+			value = Double.parseDouble(valueString);
+		}
+		
+		final Condition applyCond = parseCondition(n.getFirstChild(), template);
+		final FuncTemplate ft = new FuncTemplate(attachCond, applyCond, functionName, order, stat, value);
+		if (template instanceof L2Item item) {
+			item.attach(ft);
+		} else if (template instanceof AbstractEffect effect) {
+			effect.attach(ft);
+		} else {
+			throw new RuntimeException("Attaching stat to a non-effect template!!!");
+		}
+	}
+	
+	protected void attachEffect(Node n, Object template, Condition attachCond) {
+		attachEffect(n, template, attachCond, null);
+	}
+	
+	protected void attachEffect(Node n, Object template, Condition attachCond, EffectScope effectScope) {
+		final NamedNodeMap attrs = n.getAttributes();
+		final StatsSet set = new StatsSet();
+		for (int i = 0; i < attrs.getLength(); i++) {
+			Node att = attrs.item(i);
+			set.set(att.getNodeName(), getValue(att.getNodeValue(), template));
+		}
+		
+		final StatsSet parameters = parseParameters(n.getFirstChild(), template);
+		final Condition applyCond = parseCondition(n.getFirstChild(), template);
+		
+		if (template instanceof IIdentifiable id) {
+			set.set("id", id.getId());
+		}
+		
+		final AbstractEffect effect = AbstractEffect.createEffect(attachCond, applyCond, set, parameters);
+		parseTemplate(n, effect);
+		if (template instanceof L2Item) {
+			LOG.error("Item {} with effects!", template);
+		} else if (template instanceof Skill skill) {
+			if (effectScope != null) {
+				skill.addEffect(effectScope, effect);
+			} else if (skill.isPassive()) {
+				skill.addEffect(EffectScope.PASSIVE, effect);
+			} else {
+				skill.addEffect(EffectScope.GENERAL, effect);
+			}
+		}
+	}
+	
+	/**
+	 * Parse effect's parameters.
+	 * @param n the node to start the parsing
+	 * @param template the effect template
+	 * @return the list of parameters if any, {@code null} otherwise
+	 */
+	private StatsSet parseParameters(Node n, Object template) {
+		StatsSet parameters = null;
+		while ((n != null)) {
+			// Parse all parameters.
+			if ((n.getNodeType() == Node.ELEMENT_NODE) && "param".equals(n.getNodeName())) {
+				if (parameters == null) {
+					parameters = new StatsSet();
+				}
+				NamedNodeMap params = n.getAttributes();
+				for (int i = 0; i < params.getLength(); i++) {
+					Node att = params.item(i);
+					parameters.set(att.getNodeName(), getValue(att.getNodeValue(), template));
+				}
+			}
+			n = n.getNextSibling();
+		}
+		return parameters == null ? StatsSet.EMPTY_STATSET : parameters;
+	}
+	
+	protected Condition parseCondition(Node n, Object template) {
+		while ((n != null) && (n.getNodeType() != Node.ELEMENT_NODE)) {
+			n = n.getNextSibling();
+		}
+		
+		Condition condition = null;
+		if (n != null) {
+			switch (n.getNodeName().toLowerCase()) {
+				case "and" -> condition = parseLogicAnd(n, template);
+				case "or" -> condition = parseLogicOr(n, template);
+				case "not" -> condition = parseLogicNot(n, template);
+				case "player" -> condition = parsePlayerCondition(n, template);
+				case "target" -> condition = parseTargetCondition(n, template);
+				case "using" -> condition = parseUsingCondition(n);
+				case "game" -> condition = parseGameCondition(n);
+			}
+		}
+		return condition;
+	}
+	
+	protected Condition parseLogicAnd(Node n, Object template) {
+		ConditionLogicAnd cond = new ConditionLogicAnd();
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if (n.getNodeType() == Node.ELEMENT_NODE) {
+				cond.add(parseCondition(n, template));
+			}
+		}
+		if ((cond.conditions == null) || (cond.conditions.length == 0)) {
+			LOG.error("Empty <and> condition in file {}!", _file);
+		}
+		return cond;
+	}
+	
+	protected Condition parseLogicOr(Node n, Object template) {
+		ConditionLogicOr cond = new ConditionLogicOr();
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if (n.getNodeType() == Node.ELEMENT_NODE) {
+				cond.add(parseCondition(n, template));
+			}
+		}
+		if ((cond.conditions == null) || (cond.conditions.length == 0)) {
+			LOG.error("Empty <or> condition in file {}!", _file);
+		}
+		return cond;
+	}
+	
+	protected Condition parseLogicNot(Node n, Object template) {
+		for (n = n.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if (n.getNodeType() == Node.ELEMENT_NODE) {
+				return new ConditionLogicNot(parseCondition(n, template));
+			}
+		}
+		LOG.error("Empty <not> condition in file {}!", _file);
+		return null;
+	}
+	
+	protected Condition parsePlayerCondition(Node n, Object template) {
+		Condition cond = null;
+		NamedNodeMap attrs = n.getAttributes();
+		for (int i = 0; i < attrs.getLength(); i++) {
+			Node a = attrs.item(i);
+			switch (a.getNodeName().toLowerCase()) {
+				case "races" -> {
+					final String[] racesVal = a.getNodeValue().split(",");
+					final Race[] races = new Race[racesVal.length];
+					for (int r = 0; r < racesVal.length; r++) {
+						if (racesVal[r] != null) {
+							races[r] = Race.valueOf(racesVal[r]);
+						}
+					}
+					cond = joinAnd(cond, new ConditionPlayerRace(races));
+				}
+				case "level" -> {
+					int lvl = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerLevel(lvl));
+				}
+				case "levelrange" -> {
+					String[] range = getValue(a.getNodeValue(), template).split(";");
+					if (range.length == 2) {
+						final int minimumLevel = Integer.decode(getValue(a.getNodeValue(), template).split(";")[0]);
+						final int maximumLevel = Integer.decode(getValue(a.getNodeValue(), template).split(";")[1]);
+						cond = joinAnd(cond, new ConditionPlayerLevelRange(minimumLevel, maximumLevel));
+					}
+				}
+				case "resting" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.RESTING, val));
+				}
+				case "flying" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.FLYING, val));
+				}
+				case "moving" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.MOVING, val));
+				}
+				case "running" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.RUNNING, val));
+				}
+				case "standing" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.STANDING, val));
+				}
+				case "behind" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.BEHIND, val));
+				}
+				case "front" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.FRONT, val));
+				}
+				case "chaotic" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.CHAOTIC, val));
+				}
+				case "olympiad" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerState(PlayerState.OLYMPIAD, val));
+				}
+				case "ishero" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerIsHero(val));
+				}
+				case "transformationid" -> {
+					int id = Integer.parseInt(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerTransformationId(id));
+				}
+				case "hp" -> {
+					int hp = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerHp(hp));
+				}
+				case "mp" -> {
+					int hp = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerMp(hp));
+				}
+				case "cp" -> {
+					int cp = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerCp(cp));
+				}
+				case "grade" -> {
+					int expIndex = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerGrade(expIndex));
+				}
+				case "pkcount" -> {
+					int expIndex = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerPkCount(expIndex));
+				}
+				case "siegezone" -> {
+					int value = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionSiegeZone(value, true));
+				}
+				case "siegeside" -> {
+					int value = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerSiegeSide(value));
+				}
+				case "charges" -> {
+					int value = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerCharges(value));
+				}
+				case "souls" -> {
+					int value = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerSouls(value));
+				}
+				case "weight" -> {
+					int weight = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerWeight(weight));
+				}
+				case "invsize" -> {
+					int size = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerInvSize(size));
+				}
+				case "isclanleader" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerIsClanLeader(val));
+				}
+				case "ontvtevent" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerTvTEvent(val));
+				}
+				case "pledgeclass" -> {
+					int pledgeClass = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerPledgeClass(pledgeClass));
+				}
+				case "clanhall" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					ArrayList<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionPlayerHasClanHall(array));
+				}
+				case "fort" -> {
+					int fort = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerHasFort(fort));
+				}
+				case "castle" -> {
+					int castle = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerHasCastle(castle));
+				}
+				case "sex" -> {
+					int sex = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionPlayerSex(sex));
+				}
+				case "flymounted" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerFlyMounted(val));
+				}
+				case "vehiclemounted" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerVehicleMounted(val));
+				}
+				case "landingzone" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerLandingZone(val));
+				}
+				case "active_effect_id" -> {
+					int effectId = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerActiveEffectId(effectId));
+				}
+				case "active_effect_id_lvl" -> {
+					String val = getValue(a.getNodeValue(), template);
+					int effect_id = Integer.decode(getValue(val.split(",")[0], template));
+					int effect_lvl = Integer.decode(getValue(val.split(",")[1], template));
+					cond = joinAnd(cond, new ConditionPlayerActiveEffectId(effect_id, effect_lvl));
+				}
+				case "active_skill_id" -> {
+					int skill_id = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionPlayerActiveSkillId(skill_id));
+				}
+				case "active_skill_id_lvl" -> {
+					String val = getValue(a.getNodeValue(), template);
+					int skill_id = Integer.decode(getValue(val.split(",")[0], template));
+					int skill_lvl = Integer.decode(getValue(val.split(",")[1], template));
+					cond = joinAnd(cond, new ConditionPlayerActiveSkillId(skill_id, skill_lvl));
+				}
+				case "class_id_restriction" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					ArrayList<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionPlayerClassIdRestriction(array));
+				}
+				case "subclass" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerSubclass(val));
+				}
+				case "instanceid" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					ArrayList<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionPlayerInstanceId(array));
+				}
+				case "agathionid" -> {
+					int agathionId = Integer.decode(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerAgathionId(agathionId));
+				}
+				case "cloakstatus" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionPlayerCloakStatus(val));
+				}
+				case "haspet" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					ArrayList<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionPlayerHasPet(array));
+				}
+				case "hasservitor" -> cond = joinAnd(cond, new ConditionPlayerHasServitor());
+				case "npcidradius" -> {
+					final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					if (st.countTokens() == 3) {
+						final String[] ids = st.nextToken().split(";");
+						final int[] npcIds = new int[ids.length];
+						for (int index = 0; index < ids.length; index++) {
+							npcIds[index] = Integer.parseInt(getValue(ids[index], template));
+						}
+						final int radius = Integer.parseInt(st.nextToken());
+						final boolean val = Boolean.parseBoolean(st.nextToken());
+						cond = joinAnd(cond, new ConditionPlayerRangeFromNpc(npcIds, radius, val));
+					}
+				}
+				case "callpc" -> cond = joinAnd(cond, new ConditionPlayerCallPc(Boolean.parseBoolean(a.getNodeValue())));
+				case "cancreatebase" -> cond = joinAnd(cond, new ConditionPlayerCanCreateBase(Boolean.parseBoolean(a.getNodeValue())));
+				case "cancreateoutpost" -> cond = joinAnd(cond, new ConditionPlayerCanCreateOutpost(Boolean.parseBoolean(a.getNodeValue())));
+				case "canescape" -> cond = joinAnd(cond, new ConditionPlayerCanEscape(Boolean.parseBoolean(a.getNodeValue())));
+				case "canrefuelairship" -> cond = joinAnd(cond, new ConditionPlayerCanRefuelAirship(Integer.parseInt(a.getNodeValue())));
+				case "canresurrect" -> cond = joinAnd(cond, new ConditionOpResurrection());
+				case "cansummon" -> cond = joinAnd(cond, new ConditionPlayerCanSummon(Boolean.parseBoolean(a.getNodeValue())));
+				case "cansummonsiegegolem" -> cond = joinAnd(cond, new ConditionPlayerCanSummonSiegeGolem(Boolean.parseBoolean(a.getNodeValue())));
+				case "cansweep" -> cond = joinAnd(cond, new ConditionPlayerCanSweep(Boolean.parseBoolean(a.getNodeValue())));
+				case "cantakecastle" -> cond = joinAnd(cond, new ConditionPlayerCanTakeCastle());
+				case "cantakefort" -> cond = joinAnd(cond, new ConditionPlayerCanTakeFort(Boolean.parseBoolean(a.getNodeValue())));
+				case "cantransform" -> cond = joinAnd(cond, new ConditionPlayerCanTransform(Boolean.parseBoolean(a.getNodeValue())));
+				case "canuntransform" -> cond = joinAnd(cond, new ConditionPlayerCanUntransform(Boolean.parseBoolean(a.getNodeValue())));
+				case "insidezoneid" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					List<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionPlayerInsideZoneId(array));
+				}
+				case "checkabnormal" -> {
+					final String value = a.getNodeValue();
+					if (value.contains(";")) {
+						final String[] values = value.split(";");
+						final var type = AbnormalType.valueOf(values[0]);
+						final var level = Integer.decode(getValue(values[1], template));
+						final var mustHave = Boolean.parseBoolean(values[2]);
+						cond = joinAnd(cond, new ConditionCheckAbnormal(type, level, mustHave));
+					} else {
+						cond = joinAnd(cond, new ConditionCheckAbnormal(AbnormalType.valueOf(value), -1, true));
+					}
+					break;
+				}
+				case "categorytype" -> {
+					final String[] values = a.getNodeValue().split(",");
+					final Set<CategoryType> array = new HashSet<>(values.length);
+					for (String value : values) {
+						array.add(CategoryType.valueOf(getValue(value, null)));
+					}
+					cond = joinAnd(cond, new ConditionCategoryType(array));
+				}
+				case "hasagathion" -> cond = joinAnd(cond, new ConditionPlayerHasAgathion(Boolean.parseBoolean(a.getNodeValue())));
+				case "agathionenergy" -> cond = joinAnd(cond, new ConditionPlayerAgathionEnergy(Integer.decode(getValue(a.getNodeValue(), null))));
+				case "companion" -> cond = joinAnd(cond, new ConditionOpCompanion(a.getNodeValue()));
+				case "existnpc" -> {
+					final var attributes = a.getNodeValue().split(";");
+					final var npcIds = Arrays.stream(attributes[0].split(",")).map(Integer::valueOf).collect(toSet());
+					final var radius = Integer.parseInt(attributes[1]);
+					final var present = Boolean.parseBoolean(attributes[2]);
+					cond = joinAnd(cond, new ConditionOpExistNpc(npcIds, radius, present));
+				}
+				default -> LOG.error("Unrecognized <player> condition {} in file {}!", a.getNodeName().toLowerCase(), _file);
+			}
+		}
+		
+		if (cond == null) {
+			LOG.error("Unrecognized <player> condition in file {}!", _file);
+		}
+		return cond;
+	}
+	
+	protected Condition parseTargetCondition(Node n, Object template) {
+		Condition cond = null;
+		NamedNodeMap attrs = n.getAttributes();
+		for (int i = 0; i < attrs.getLength(); i++) {
+			Node a = attrs.item(i);
+			switch (a.getNodeName().toLowerCase()) {
+				case "aggro" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionTargetAggro(val));
+				}
+				case "siegezone" -> {
+					int value = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionSiegeZone(value, false));
+				}
+				case "level" -> {
+					int lvl = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionTargetLevel(lvl));
+				}
+				case "levelrange" -> {
+					String[] range = getValue(a.getNodeValue(), template).split(";");
+					if (range.length == 2) {
+						int minimumLevel = Integer.decode(getValue(a.getNodeValue(), template).split(";")[0]);
+						int maximumLevel = Integer.decode(getValue(a.getNodeValue(), template).split(";")[1]);
+						cond = joinAnd(cond, new ConditionTargetLevelRange(minimumLevel, maximumLevel));
+					}
+				}
+				case "myparty" -> cond = joinAnd(cond, new ConditionTargetMyParty(a.getNodeValue()));
+				case "playable" -> cond = joinAnd(cond, new ConditionTargetPlayable());
+				case "class_id_restriction" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					List<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionTargetClassIdRestriction(array));
+				}
+				case "active_effect_id" -> {
+					int effectId = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionTargetActiveEffectId(effectId));
+				}
+				case "active_effect_id_lvl" -> {
+					String val = getValue(a.getNodeValue(), template);
+					int effect_id = Integer.decode(getValue(val.split(",")[0], template));
+					int effect_lvl = Integer.decode(getValue(val.split(",")[1], template));
+					cond = joinAnd(cond, new ConditionTargetActiveEffectId(effect_id, effect_lvl));
+				}
+				case "active_skill_id" -> {
+					int skill_id = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionTargetActiveSkillId(skill_id));
+				}
+				case "active_skill_id_lvl" -> {
+					String val = getValue(a.getNodeValue(), template);
+					int skill_id = Integer.decode(getValue(val.split(",")[0], template));
+					int skill_lvl = Integer.decode(getValue(val.split(",")[1], template));
+					cond = joinAnd(cond, new ConditionTargetActiveSkillId(skill_id, skill_lvl));
+				}
+				case "abnormal" -> {
+					int abnormalId = Integer.decode(getValue(a.getNodeValue(), template));
+					cond = joinAnd(cond, new ConditionTargetAbnormal(abnormalId));
+				}
+				case "mindistance" -> {
+					int distance = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionMinDistance(distance * distance));
+				}
+				case "race" -> cond = joinAnd(cond, new ConditionTargetRace(Race.valueOf(a.getNodeValue())));
+				case "using" -> {
+					int mask = 0;
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						for (WeaponType wt : WeaponType.values()) {
+							if (wt.name().equals(item)) {
+								mask |= wt.mask();
+								break;
+							}
+						}
+						for (ArmorType at : ArmorType.values()) {
+							if (at.name().equals(item)) {
+								mask |= at.mask();
+								break;
+							}
+						}
+					}
+					cond = joinAnd(cond, new ConditionTargetUsesWeaponKind(mask));
+				}
+				case "npcid" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					List<Integer> array = new ArrayList<>(st.countTokens());
+					while (st.hasMoreTokens()) {
+						String item = st.nextToken().trim();
+						array.add(Integer.decode(getValue(item, null)));
+					}
+					cond = joinAnd(cond, new ConditionTargetNpcId(array));
+				}
+				case "npctype" -> {
+					String values = getValue(a.getNodeValue(), template).trim();
+					String[] valuesSplit = values.split(",");
+					InstanceType[] types = new InstanceType[valuesSplit.length];
+					for (int j = 0; j < valuesSplit.length; j++) {
+						types[j] = Enum.valueOf(InstanceType.class, valuesSplit[j]);
+					}
+					cond = joinAnd(cond, new ConditionTargetNpcType(types));
+				}
+				case "weight" -> {
+					int weight = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionTargetWeight(weight));
+				}
+				case "invsize" -> {
+					int size = Integer.decode(getValue(a.getNodeValue(), null));
+					cond = joinAnd(cond, new ConditionTargetInvSize(size));
+				}
+				case "checkabnormal" -> {
+					final String value = a.getNodeValue();
+					if (value.contains(";")) {
+						final String[] values = value.split(";");
+						final var type = AbnormalType.valueOf(values[0]);
+						final var level = Integer.decode(getValue(values[1], template));
+						final var mustHave = Boolean.parseBoolean(values[2]);
+						cond = joinAnd(cond, new ConditionCheckAbnormal(type, level, mustHave));
+					} else {
+						cond = joinAnd(cond, new ConditionCheckAbnormal(AbnormalType.valueOf(value), -1, true));
+					}
+					break;
+				}
+			}
+		}
+		
+		if (cond == null) {
+			LOG.error("Unrecognized <target> condition in file {}!", _file);
+		}
+		return cond;
+	}
+	
+	protected Condition parseUsingCondition(Node n) {
+		Condition cond = null;
+		NamedNodeMap attrs = n.getAttributes();
+		for (int i = 0; i < attrs.getLength(); i++) {
+			Node a = attrs.item(i);
+			switch (a.getNodeName().toLowerCase()) {
+				case "kind" -> {
+					int mask = 0;
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					while (st.hasMoreTokens()) {
+						int old = mask;
+						String item = st.nextToken().trim();
+						for (WeaponType wt : WeaponType.values()) {
+							if (wt.name().equals(item)) {
+								mask |= wt.mask();
+							}
+						}
+						
+						for (ArmorType at : ArmorType.values()) {
+							if (at.name().equals(item)) {
+								mask |= at.mask();
+							}
+						}
+						
+						if (old == mask) {
+							LOG.warn("[parseUsingCondition=\"kind\"] Unknown item type name: {} in string {}!", item, a.getNodeValue());
+						}
+					}
+					cond = joinAnd(cond, new ConditionUsingItemType(mask));
+				}
+				case "slot" -> {
+					int mask = 0;
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
+					while (st.hasMoreTokens()) {
+						int old = mask;
+						String item = st.nextToken().trim();
+						if (ItemTable.SLOTS.containsKey(item)) {
+							mask |= ItemTable.SLOTS.get(item);
+						}
+						
+						if (old == mask) {
+							LOG.warn("[parseUsingCondition=\"slot\"] Unknown item slot name {}!", item);
+						}
+					}
+					cond = joinAnd(cond, new ConditionUsingSlotType(mask));
+				}
+				case "skill" -> {
+					int id = Integer.parseInt(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionUsingSkill(id));
+				}
+				case "slotitem" -> {
+					StringTokenizer st = new StringTokenizer(a.getNodeValue(), ";");
+					int id = Integer.parseInt(st.nextToken().trim());
+					int slot = Integer.parseInt(st.nextToken().trim());
+					int enchant = 0;
+					if (st.hasMoreTokens()) {
+						enchant = Integer.parseInt(st.nextToken().trim());
+					}
+					cond = joinAnd(cond, new ConditionSlotItemId(slot, id, enchant));
+				}
+				case "weaponchange" -> {
+					boolean val = Boolean.parseBoolean(a.getNodeValue());
+					cond = joinAnd(cond, new ConditionChangeWeapon(val));
+				}
+			}
+		}
+		
+		if (cond == null) {
+			LOG.error("Unrecognized <using> condition in file {}!", _file);
+		}
+		return cond;
+	}
+	
+	protected Condition parseGameCondition(Node n) {
+		Condition cond = null;
+		NamedNodeMap attrs = n.getAttributes();
+		for (int i = 0; i < attrs.getLength(); i++) {
+			Node a = attrs.item(i);
+			if ("skill".equalsIgnoreCase(a.getNodeName())) {
+				boolean val = Boolean.parseBoolean(a.getNodeValue());
+				cond = joinAnd(cond, new ConditionWithSkill(val));
+			}
+			if ("night".equalsIgnoreCase(a.getNodeName())) {
+				boolean val = Boolean.parseBoolean(a.getNodeValue());
+				cond = joinAnd(cond, new ConditionGameTime(CheckGameTime.NIGHT, val));
+			}
+			if ("chance".equalsIgnoreCase(a.getNodeName())) {
+				int val = Integer.decode(getValue(a.getNodeValue(), null));
+				cond = joinAnd(cond, new ConditionGameChance(val));
+			}
+		}
+		if (cond == null) {
+			LOG.error("Unrecognized <game> condition in file {}!", _file);
+		}
+		return cond;
+	}
+	
+	protected void parseTable(Node n) {
+		NamedNodeMap attrs = n.getAttributes();
+		String name = attrs.getNamedItem("name").getNodeValue();
+		if (name.charAt(0) != '#') {
+			throw new IllegalArgumentException("Table name must start with #");
+		}
+		StringTokenizer data = new StringTokenizer(n.getFirstChild().getNodeValue());
+		List<String> array = new ArrayList<>(data.countTokens());
+		while (data.hasMoreTokens()) {
+			array.add(data.nextToken());
+		}
+		setTable(name, array.toArray(new String[array.size()]));
+	}
+	
+	protected void parseBeanSet(Node n, StatsSet set, Integer level) {
+		String name = n.getAttributes().getNamedItem("name").getNodeValue().trim();
+		String value = n.getAttributes().getNamedItem("val").getNodeValue().trim();
+		char ch = value.isEmpty() ? ' ' : value.charAt(0);
+		if ((ch == '#') || (ch == '-') || Character.isDigit(ch)) {
+			set.set(name, String.valueOf(getValue(value, level)));
+		} else {
+			set.set(name, value);
+		}
+	}
+	
+	protected void setExtractableSkillData(StatsSet set, String value) {
+		set.set("capsuled_items_skill", value);
+	}
+	
+	protected String getValue(String value, Object template) {
+		// is it a table?
+		if (value.charAt(0) == '#') {
+			if (template instanceof Skill) {
+				return getTableValue(value);
+			} else if (template instanceof Integer integer) {
+				return getTableValue(value, integer);
+			} else {
+				throw new IllegalStateException();
+			}
+		}
+		return value;
+	}
+	
+	protected Condition joinAnd(Condition cond, Condition c) {
+		if (cond == null) {
+			return c;
+		}
+		if (cond instanceof ConditionLogicAnd condAnd) {
+			condAnd.add(c);
+			return cond;
+		}
+		ConditionLogicAnd and = new ConditionLogicAnd();
+		and.add(cond);
+		and.add(c);
+		return and;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/engines/DocumentEngine.java b/src/main/java/com/l2jserver/gameserver/engines/DocumentEngine.java
new file mode 100644
index 00000000..aaf4ebc6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/engines/DocumentEngine.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.engines;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.engines.items.DocumentItem;
+import com.l2jserver.gameserver.engines.skills.DocumentSkill;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.file.filter.XMLFilter;
+
+/**
+ * Document Engine.
+ * @author mkizub
+ */
+public class DocumentEngine {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DocumentEngine.class);
+	
+	private final List<File> _itemFiles = new ArrayList<>();
+	
+	private final List<File> _skillFiles = new ArrayList<>();
+	
+	public static DocumentEngine getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	protected DocumentEngine() {
+		hashFiles("data/stats/items", _itemFiles);
+		if (general().customItemsLoad()) {
+			hashFiles("data/stats/items/custom", _itemFiles);
+		}
+		hashFiles("data/stats/skills", _skillFiles);
+		if (general().customSkillsLoad()) {
+			hashFiles("data/stats/skills/custom", _skillFiles);
+		}
+	}
+	
+	private void hashFiles(String dirname, List<File> hash) {
+		final var dir = new File(server().getDatapackRoot(), dirname);
+		if (!dir.exists()) {
+			LOG.warn("Directory {} does not exists!", dir.getAbsolutePath());
+			return;
+		}
+		
+		final var files = dir.listFiles(new XMLFilter());
+		if (files != null) {
+			Collections.addAll(hash, files);
+		}
+	}
+	
+	private List<Skill> loadSkills(File file) {
+		if (file == null) {
+			LOG.warn("Skill file not found!");
+			return null;
+		}
+		DocumentSkill doc = new DocumentSkill(file);
+		doc.parse();
+		return doc.getSkills();
+	}
+	
+	public Map<Integer, Skill> loadAllSkills() {
+		return _skillFiles.parallelStream()
+			.map(this::loadSkills)
+			.filter(Objects::nonNull)
+			.flatMap(List::stream)
+			.collect(Collectors.toConcurrentMap(SkillData::getSkillHashCode, Function.identity()));
+	}
+	
+	/**
+	 * Return created items
+	 * @return List of {@link L2Item}
+	 */
+	public List<L2Item> loadItems() {
+		return _itemFiles.parallelStream()
+			.filter(Objects::nonNull)
+			.map(DocumentItem::new)
+			.map(doc -> {
+				doc.parse();
+				return doc.getItemList();
+			})
+			.flatMap(List::stream)
+			.toList();
+	}
+	
+	private static class SingletonHolder {
+		protected static final DocumentEngine _instance = new DocumentEngine();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/engines/items/DocumentItem.java b/src/main/java/com/l2jserver/gameserver/engines/items/DocumentItem.java
new file mode 100644
index 00000000..08b85598
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/engines/items/DocumentItem.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.engines.items;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.engines.DocumentBase;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.items.L2Item;
+
+/**
+ * Document Item.
+ * @author mkizub
+ * @author JIV
+ */
+public final class DocumentItem extends DocumentBase {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DocumentItem.class);
+	
+	private Item _currentItem = null;
+	
+	private final List<L2Item> _itemsInFile = new ArrayList<>();
+	
+	public DocumentItem(File file) {
+		super(file);
+	}
+	
+	@Override
+	protected StatsSet getStatsSet() {
+		return _currentItem.set;
+	}
+	
+	@Override
+	protected String getTableValue(String name) {
+		return _tables.get(name)[_currentItem.currentLevel];
+	}
+	
+	@Override
+	protected String getTableValue(String name, int idx) {
+		return _tables.get(name)[idx - 1];
+	}
+	
+	@Override
+	protected void parseDocument(Document doc) {
+		for (var n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (var d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("item".equalsIgnoreCase(d.getNodeName())) {
+						try {
+							_currentItem = new Item();
+							parseItem(d);
+							_itemsInFile.add(_currentItem.item);
+							resetTable();
+						} catch (Exception ex) {
+							LOG.warn("Cannot create item Id {}!", _currentItem.id, ex);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	protected void parseItem(Node n) throws InvocationTargetException {
+		int itemId = Integer.parseInt(n.getAttributes().getNamedItem("id").getNodeValue());
+		String className = n.getAttributes().getNamedItem("type").getNodeValue();
+		String itemName = n.getAttributes().getNamedItem("name").getNodeValue();
+		
+		_currentItem.id = itemId;
+		_currentItem.name = itemName;
+		_currentItem.type = className;
+		_currentItem.set = new StatsSet();
+		_currentItem.set.set("item_id", itemId);
+		_currentItem.set.set("name", itemName);
+		
+		Node first = n.getFirstChild();
+		for (n = first; n != null; n = n.getNextSibling()) {
+			if ("table".equalsIgnoreCase(n.getNodeName())) {
+				if (_currentItem.item != null) {
+					throw new IllegalStateException("Item created but table node found! Item " + itemId);
+				}
+				parseTable(n);
+			} else if ("set".equalsIgnoreCase(n.getNodeName())) {
+				if (_currentItem.item != null) {
+					throw new IllegalStateException("Item created but set node found! Item " + itemId);
+				}
+				parseBeanSet(n, _currentItem.set, 1);
+			} else if ("for".equalsIgnoreCase(n.getNodeName())) {
+				makeItem();
+				parseTemplate(n, _currentItem.item);
+			} else if ("cond".equalsIgnoreCase(n.getNodeName())) {
+				makeItem();
+				Condition condition = parseCondition(n.getFirstChild(), _currentItem.item);
+				Node msg = n.getAttributes().getNamedItem("msg");
+				Node msgId = n.getAttributes().getNamedItem("msgId");
+				if ((condition != null) && (msg != null)) {
+					condition.setMessage(msg.getNodeValue());
+				} else if ((condition != null) && (msgId != null)) {
+					condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+					Node addName = n.getAttributes().getNamedItem("addName");
+					if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+						condition.addName();
+					}
+				}
+				_currentItem.item.attach(condition);
+			}
+		}
+		// bah! in this point item doesn't have to be still created
+		makeItem();
+	}
+	
+	private void makeItem() throws InvocationTargetException {
+		if (_currentItem.item != null) {
+			return; // item is already created
+		}
+		try {
+			Constructor<?> c = Class.forName("com.l2jserver.gameserver.model.items.L2" + _currentItem.type).getConstructor(StatsSet.class);
+			_currentItem.item = (L2Item) c.newInstance(_currentItem.set);
+		} catch (Exception e) {
+			throw new InvocationTargetException(e);
+		}
+	}
+	
+	public List<L2Item> getItemList() {
+		return _itemsInFile;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/engines/items/Item.java b/src/main/java/com/l2jserver/gameserver/engines/items/Item.java
new file mode 100644
index 00000000..c3f4efbb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/engines/items/Item.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.engines.items;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.L2Item;
+
+public class Item {
+	public int id;
+	public String type;
+	public String name;
+	public StatsSet set;
+	public int currentLevel;
+	public L2Item item;
+}
diff --git a/src/main/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java b/src/main/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java
new file mode 100644
index 00000000..5ce3d587
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java
@@ -0,0 +1,1148 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.engines.skills;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.engines.DocumentBase;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.EffectScope;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Document Skill.
+ * @author mkizub
+ */
+public class DocumentSkill extends DocumentBase {
+	
+	public static class SkillInfo {
+		public int id;
+		public String name;
+		public StatsSet[] sets;
+		public StatsSet[] enchsets1;
+		public StatsSet[] enchsets2;
+		public StatsSet[] enchsets3;
+		public StatsSet[] enchsets4;
+		public StatsSet[] enchsets5;
+		public StatsSet[] enchsets6;
+		public StatsSet[] enchsets7;
+		public StatsSet[] enchsets8;
+		public int currentLevel;
+		public List<Skill> skills = new ArrayList<>();
+		public List<Skill> currentSkills = new ArrayList<>();
+	}
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DocumentSkill.class);
+	
+	private SkillInfo _currentSkill;
+	
+	private final List<Skill> _skillsInFile = new ArrayList<>();
+	
+	public DocumentSkill(File file) {
+		super(file);
+	}
+	
+	private void setCurrentSkill(SkillInfo skill) {
+		_currentSkill = skill;
+	}
+	
+	@Override
+	protected StatsSet getStatsSet() {
+		return _currentSkill.sets[_currentSkill.currentLevel];
+	}
+	
+	public List<Skill> getSkills() {
+		return _skillsInFile;
+	}
+	
+	@Override
+	protected String getTableValue(String name) {
+		try {
+			return _tables.get(name)[_currentSkill.currentLevel];
+		} catch (RuntimeException ex) {
+			LOG.error("Error in table {} of Skill Id {}!", name, _currentSkill.id, ex);
+			return "";
+		}
+	}
+	
+	@Override
+	protected String getTableValue(String name, int idx) {
+		try {
+			return _tables.get(name)[idx - 1];
+		} catch (RuntimeException ex) {
+			LOG.error("Wrong level count in skill Id {} name {} index {}!", _currentSkill.id, name, idx, ex);
+			return "";
+		}
+	}
+	
+	@Override
+	protected void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("skill".equalsIgnoreCase(d.getNodeName())) {
+						setCurrentSkill(new SkillInfo());
+						parseSkill(d);
+						_skillsInFile.addAll(_currentSkill.skills);
+						resetTable();
+					}
+				}
+			} else if ("skill".equalsIgnoreCase(n.getNodeName())) {
+				setCurrentSkill(new SkillInfo());
+				parseSkill(n);
+				_skillsInFile.addAll(_currentSkill.skills);
+			}
+		}
+	}
+	
+	protected void parseSkill(Node n) {
+		NamedNodeMap attrs = n.getAttributes();
+		int enchantLevels1 = 0;
+		int enchantLevels2 = 0;
+		int enchantLevels3 = 0;
+		int enchantLevels4 = 0;
+		int enchantLevels5 = 0;
+		int enchantLevels6 = 0;
+		int enchantLevels7 = 0;
+		int enchantLevels8 = 0;
+		int skillId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue());
+		String skillName = attrs.getNamedItem("name").getNodeValue();
+		String levels = attrs.getNamedItem("levels").getNodeValue();
+		int lastLvl = Integer.parseInt(levels);
+		if (attrs.getNamedItem("enchantGroup1") != null) {
+			enchantLevels1 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 1, Integer.parseInt(attrs.getNamedItem("enchantGroup1").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup2") != null) {
+			enchantLevels2 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 2, Integer.parseInt(attrs.getNamedItem("enchantGroup2").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup3") != null) {
+			enchantLevels3 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 3, Integer.parseInt(attrs.getNamedItem("enchantGroup3").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup4") != null) {
+			enchantLevels4 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 4, Integer.parseInt(attrs.getNamedItem("enchantGroup4").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup5") != null) {
+			enchantLevels5 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 5, Integer.parseInt(attrs.getNamedItem("enchantGroup5").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup6") != null) {
+			enchantLevels6 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 6, Integer.parseInt(attrs.getNamedItem("enchantGroup6").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup7") != null) {
+			enchantLevels7 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 7, Integer.parseInt(attrs.getNamedItem("enchantGroup7").getNodeValue()));
+		}
+		if (attrs.getNamedItem("enchantGroup8") != null) {
+			enchantLevels8 = EnchantSkillGroupsData.getInstance().addNewRouteForSkill(skillId, lastLvl, 8, Integer.parseInt(attrs.getNamedItem("enchantGroup8").getNodeValue()));
+		}
+		
+		_currentSkill.id = skillId;
+		_currentSkill.name = skillName;
+		_currentSkill.sets = new StatsSet[lastLvl];
+		_currentSkill.enchsets1 = new StatsSet[enchantLevels1];
+		_currentSkill.enchsets2 = new StatsSet[enchantLevels2];
+		_currentSkill.enchsets3 = new StatsSet[enchantLevels3];
+		_currentSkill.enchsets4 = new StatsSet[enchantLevels4];
+		_currentSkill.enchsets5 = new StatsSet[enchantLevels5];
+		_currentSkill.enchsets6 = new StatsSet[enchantLevels6];
+		_currentSkill.enchsets7 = new StatsSet[enchantLevels7];
+		_currentSkill.enchsets8 = new StatsSet[enchantLevels8];
+		
+		for (int i = 0; i < lastLvl; i++) {
+			_currentSkill.sets[i] = new StatsSet();
+			_currentSkill.sets[i].set("skill_id", _currentSkill.id);
+			_currentSkill.sets[i].set("level", i + 1);
+			_currentSkill.sets[i].set("name", _currentSkill.name);
+		}
+		
+		if (_currentSkill.sets.length != lastLvl) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + lastLvl + " levels expected");
+		}
+		
+		Node first = n.getFirstChild();
+		for (n = first; n != null; n = n.getNextSibling()) {
+			if ("table".equalsIgnoreCase(n.getNodeName())) {
+				parseTable(n);
+			}
+		}
+		for (int i = 1; i <= lastLvl; i++) {
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					// Extractable item skills by Zoey76
+					if ("capsuled_items_skill".equalsIgnoreCase(n.getAttributes().getNamedItem("name").getNodeValue())) {
+						setExtractableSkillData(_currentSkill.sets[i - 1], getTableValue("#extractableItems", i));
+					} else {
+						parseBeanSet(n, _currentSkill.sets[i - 1], i);
+					}
+				}
+			}
+		}
+		for (int i = 0; i < enchantLevels1; i++) {
+			_currentSkill.enchsets1[i] = new StatsSet();
+			_currentSkill.enchsets1[i].set("skill_id", _currentSkill.id);
+			// currentSkill.enchsets1[i] = currentSkill.sets[currentSkill.sets.length-1];
+			_currentSkill.enchsets1[i].set("level", i + 101);
+			_currentSkill.enchsets1[i].set("name", _currentSkill.name);
+			// currentSkill.enchsets1[i].set("skillType", "NOTDONE");
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets1[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant1".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets1[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets1.length != enchantLevels1) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels1 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels2; i++) {
+			_currentSkill.enchsets2[i] = new StatsSet();
+			// currentSkill.enchsets2[i] = currentSkill.sets[currentSkill.sets.length-1];
+			_currentSkill.enchsets2[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets2[i].set("level", i + 201);
+			_currentSkill.enchsets2[i].set("name", _currentSkill.name);
+			// currentSkill.enchsets2[i].set("skillType", "NOTDONE");
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets2[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant2".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets2[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets2.length != enchantLevels2) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels2 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels3; i++) {
+			_currentSkill.enchsets3[i] = new StatsSet();
+			_currentSkill.enchsets3[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets3[i].set("level", i + 301);
+			_currentSkill.enchsets3[i].set("name", _currentSkill.name);
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets3[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant3".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets3[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets3.length != enchantLevels3) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels3 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels4; i++) {
+			_currentSkill.enchsets4[i] = new StatsSet();
+			_currentSkill.enchsets4[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets4[i].set("level", i + 401);
+			_currentSkill.enchsets4[i].set("name", _currentSkill.name);
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets4[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant4".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets4[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets4.length != enchantLevels4) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels4 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels5; i++) {
+			_currentSkill.enchsets5[i] = new StatsSet();
+			_currentSkill.enchsets5[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets5[i].set("level", i + 501);
+			_currentSkill.enchsets5[i].set("name", _currentSkill.name);
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets5[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant5".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets5[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets5.length != enchantLevels5) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels5 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels6; i++) {
+			_currentSkill.enchsets6[i] = new StatsSet();
+			_currentSkill.enchsets6[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets6[i].set("level", i + 601);
+			_currentSkill.enchsets6[i].set("name", _currentSkill.name);
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets6[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant6".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets6[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets6.length != enchantLevels6) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels6 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels7; i++) {
+			_currentSkill.enchsets7[i] = new StatsSet();
+			_currentSkill.enchsets7[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets7[i].set("level", i + 701);
+			_currentSkill.enchsets7[i].set("name", _currentSkill.name);
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets7[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant7".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets7[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets7.length != enchantLevels7) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels7 + " levels expected");
+		}
+		
+		for (int i = 0; i < enchantLevels8; i++) {
+			_currentSkill.enchsets8[i] = new StatsSet();
+			_currentSkill.enchsets8[i].set("skill_id", _currentSkill.id);
+			_currentSkill.enchsets8[i].set("level", i + 801);
+			_currentSkill.enchsets8[i].set("name", _currentSkill.name);
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("set".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets8[i], _currentSkill.sets.length);
+				}
+			}
+			
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant8".equalsIgnoreCase(n.getNodeName())) {
+					parseBeanSet(n, _currentSkill.enchsets8[i], i + 1);
+				}
+			}
+		}
+		
+		if (_currentSkill.enchsets8.length != enchantLevels8) {
+			throw new RuntimeException("Skill id=" + skillId + " number of levels missmatch, " + enchantLevels8 + " levels expected");
+		}
+		
+		makeSkills();
+		for (int i = 0; i < lastLvl; i++) {
+			_currentSkill.currentLevel = i;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("cond".equalsIgnoreCase(n.getNodeName())) {
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("effects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("startEffects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("endEffects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+		}
+		
+		for (int i = lastLvl; i < (lastLvl + enchantLevels1); i++) {
+			_currentSkill.currentLevel = i - lastLvl;
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant1cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant1Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant1startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant1channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant1pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant1pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant1endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant1selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundStartEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1; i < (lastLvl + enchantLevels1 + enchantLevels2); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant2cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant2Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant2startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant2channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant2pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant2pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant2endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant2selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1 + enchantLevels2; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant3cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant3Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant3startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant3channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant3pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant3pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant3endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant3selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundStartEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant4cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant4Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant4startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant4channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant4pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant4pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant4endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant4selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundStartEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant5cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant5Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant5startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant5channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant5pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant5pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant5endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant5selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundStartEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4 - enchantLevels5;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant6cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant6Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant6startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant6channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant6pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant6pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant6endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant6selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundStartEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6 + enchantLevels7); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4 - enchantLevels5 - enchantLevels6;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant7cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant7Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant7startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant7channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant7pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant7pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant7endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant7selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundChannelingEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		for (int i = lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6 + enchantLevels7; i < (lastLvl + enchantLevels1 + enchantLevels2 + enchantLevels3 + enchantLevels4 + enchantLevels5 + enchantLevels6 + enchantLevels7
+			+ enchantLevels8); i++) {
+			boolean foundCond = false, foundEffect = false, foundChannelingEffects = false, foundStartEffects = false, foundPveEffects = false, foundPvpEffects = false, foundEndEffects = false, foundSelfEffects = false;
+			_currentSkill.currentLevel = i - lastLvl - enchantLevels1 - enchantLevels2 - enchantLevels3 - enchantLevels4 - enchantLevels5 - enchantLevels6 - enchantLevels7;
+			for (n = first; n != null; n = n.getNextSibling()) {
+				if ("enchant8cond".equalsIgnoreCase(n.getNodeName())) {
+					foundCond = true;
+					Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+					Node msg = n.getAttributes().getNamedItem("msg");
+					Node msgId = n.getAttributes().getNamedItem("msgId");
+					if ((condition != null) && (msg != null)) {
+						condition.setMessage(msg.getNodeValue());
+					} else if ((condition != null) && (msgId != null)) {
+						condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+						Node addName = n.getAttributes().getNamedItem("addName");
+						if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+							condition.addName();
+						}
+					}
+					_currentSkill.currentSkills.get(i).attach(condition, false);
+				} else if ("enchant8Effects".equalsIgnoreCase(n.getNodeName())) {
+					foundEffect = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i));
+				} else if ("enchant8startEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundStartEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+				} else if ("enchant8channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundChannelingEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+				} else if ("enchant8pveEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPveEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+				} else if ("enchant8pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundPvpEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+				} else if ("enchant8endEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundEndEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+				} else if ("enchant8selfEffects".equalsIgnoreCase(n.getNodeName())) {
+					foundSelfEffects = true;
+					parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+				}
+			}
+			// If none found, the enchanted skill will take effects from maxLvL of norm skill
+			if (!foundCond || !foundEffect || !foundChannelingEffects || !foundStartEffects || !foundPveEffects || !foundPvpEffects || !foundEndEffects || !foundSelfEffects) {
+				_currentSkill.currentLevel = lastLvl - 1;
+				for (n = first; n != null; n = n.getNextSibling()) {
+					if (!foundCond && "cond".equalsIgnoreCase(n.getNodeName())) {
+						Condition condition = parseCondition(n.getFirstChild(), _currentSkill.currentSkills.get(i));
+						Node msg = n.getAttributes().getNamedItem("msg");
+						Node msgId = n.getAttributes().getNamedItem("msgId");
+						if ((condition != null) && (msg != null)) {
+							condition.setMessage(msg.getNodeValue());
+						} else if ((condition != null) && (msgId != null)) {
+							condition.setMessageId(Integer.decode(getValue(msgId.getNodeValue(), null)));
+							Node addName = n.getAttributes().getNamedItem("addName");
+							if ((addName != null) && (Integer.decode(getValue(msgId.getNodeValue(), null)) > 0)) {
+								condition.addName();
+							}
+						}
+						_currentSkill.currentSkills.get(i).attach(condition, false);
+					} else if (!foundEffect && "effects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i));
+					} else if (!foundStartEffects && "startEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.START);
+					} else if (!foundChannelingEffects && "channelingEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.CHANNELING);
+					} else if (!foundPveEffects && "pveEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVE);
+					} else if (!foundPvpEffects && "pvpEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.PVP);
+					} else if (!foundEndEffects && "endEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.END);
+					} else if (!foundSelfEffects && "selfEffects".equalsIgnoreCase(n.getNodeName())) {
+						parseTemplate(n, _currentSkill.currentSkills.get(i), EffectScope.SELF);
+					}
+				}
+			}
+		}
+		_currentSkill.skills.addAll(_currentSkill.currentSkills);
+	}
+	
+	private void makeSkills() {
+		int count = 0;
+		_currentSkill.currentSkills = new ArrayList<>(_currentSkill.sets.length + _currentSkill.enchsets1.length + _currentSkill.enchsets2.length + _currentSkill.enchsets3.length + _currentSkill.enchsets4.length + _currentSkill.enchsets5.length + _currentSkill.enchsets6.length
+			+ _currentSkill.enchsets7.length + _currentSkill.enchsets8.length);
+		for (int i = 0; i < _currentSkill.sets.length; i++) {
+			final var set = _currentSkill.sets[i];
+			try {
+				_currentSkill.currentSkills.add(i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		int _count = count;
+		for (int i = 0; i < _currentSkill.enchsets1.length; i++) {
+			final var set = _currentSkill.enchsets1[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets2.length; i++) {
+			final var set = _currentSkill.enchsets2[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets3.length; i++) {
+			final var set = _currentSkill.enchsets3[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets4.length; i++) {
+			final var set = _currentSkill.enchsets4[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets5.length; i++) {
+			final var set = _currentSkill.enchsets5[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets6.length; i++) {
+			final var set = _currentSkill.enchsets6[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets7.length; i++) {
+			final var set = _currentSkill.enchsets7[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+		_count = count;
+		for (int i = 0; i < _currentSkill.enchsets8.length; i++) {
+			final var set = _currentSkill.enchsets8[i];
+			try {
+				_currentSkill.currentSkills.add(_count + i, new Skill(set));
+				count++;
+			} catch (Exception ex) {
+				LOG.error("Skill id={} level={}!", set.getInt("skill_id"), set.getInt("level"), ex);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/AISkillScope.java b/src/main/java/com/l2jserver/gameserver/enums/AISkillScope.java
new file mode 100644
index 00000000..38afac1f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/AISkillScope.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zoey76
+ */
+public enum AISkillScope {
+	BUFF,
+	DEBUFF,
+	NEGATIVE,
+	ATTACK,
+	IMMOBILIZE,
+	HEAL,
+	RES,
+	COT,
+	UNIVERSAL,
+	LONG_RANGE,
+	SHORT_RANGE,
+	GENERAL,
+	SUICIDE
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/AIType.java b/src/main/java/com/l2jserver/gameserver/enums/AIType.java
new file mode 100644
index 00000000..105b3c73
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/AIType.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zoey76
+ */
+public enum AIType {
+	FIGHTER,
+	ARCHER,
+	BALANCED,
+	MAGE,
+	HEALER,
+	CORPSE
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/AuctionItemType.java b/src/main/java/com/l2jserver/gameserver/enums/AuctionItemType.java
new file mode 100644
index 00000000..06095ec5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/AuctionItemType.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum AuctionItemType {
+	ClanHall
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/CategoryType.java b/src/main/java/com/l2jserver/gameserver/enums/CategoryType.java
new file mode 100644
index 00000000..888166d7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/CategoryType.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * This class defines all category types.
+ * @author xban1x
+ */
+public enum CategoryType {
+	FIGHTER_GROUP,
+	MAGE_GROUP,
+	WIZARD_GROUP,
+	CLERIC_GROUP,
+	ATTACKER_GROUP,
+	TANKER_GROUP,
+	FIRST_CLASS_GROUP,
+	SECOND_CLASS_GROUP,
+	THIRD_CLASS_GROUP,
+	FOURTH_CLASS_GROUP,
+	BOUNTY_HUNTER_GROUP,
+	WARSMITH_GROUP,
+	SUMMON_NPC_GROUP,
+	KNIGHT_GROUP,
+	WHITE_MAGIC_GROUP,
+	HEAL_GROUP,
+	ASSIST_MAGIC_GROUP,
+	WARRIOR_GROUP,
+	HUMAN_2ND_GROUP,
+	ELF_2ND_GROUP,
+	DELF_2ND_GROUP,
+	ORC_2ND_GROUP,
+	DWARF_2ND_GROUP,
+	STRIDER,
+	STRIDER_GROUP,
+	RED_STRIDER_GROUP,
+	WOLF_GROUP,
+	GROWN_UP_WOLF_GROUP,
+	HATCHLING_GROUP,
+	BABY_PET_GROUP,
+	UPGRADE_BABY_PET_GROUP,
+	WYVERN_GROUP,
+	ALL_WOLF_GROUP,
+	WOLF,
+	SIN_EATER_GROUP,
+	PET_GROUP,
+	ITEM_EQUIP_PET_GROUP,
+	SUBJOB_GROUP_DAGGER,
+	SUBJOB_GROUP_BOW,
+	SUBJOB_GROUP_KNIGHT,
+	SUBJOB_GROUP_SUMMONER,
+	SUBJOB_GROUP_HALF_HEALER,
+	SUBJOB_GROUP_DANCE,
+	SUBJOB_GROUP_WIZARD,
+	HUMAN_FALL_CLASS,
+	HUMAN_WALL_CLASS,
+	HUMAN_MALL_CLASS,
+	HUMAN_CALL_CLASS,
+	ELF_FALL_CLASS,
+	ELF_MALL_CLASS,
+	ELF_WALL_CLASS,
+	ELF_CALL_CLASS,
+	DELF_FALL_CLASS,
+	DELF_MALL_CLASS,
+	DELF_WALL_CLASS,
+	DELF_CALL_CLASS,
+	ORC_FALL_CLASS,
+	ORC_MALL_CLASS,
+	DWARF_ALL_CLASS,
+	DWARF_BOUNTY_CLASS,
+	DWARF_SMITH_CLASS,
+	KAMAEL_ALL_CLASS,
+	KAMAEL_FIRST_CLASS_GROUP,
+	KAMAEL_SECOND_CLASS_GROUP,
+	KAMAEL_THIRD_CLASS_GROUP,
+	KAMAEL_FOURTH_CLASS_GROUP,
+	BEGINNER_FIGHTER,
+	BEGINNER_MAGE,
+	KAMAEL_MALE_MAIN_OCCUPATION,
+	KAMAEL_FEMALE_MAIN_OCCUPATION,
+	ARCHER_GROUP,
+	SHIELD_MASTER,
+	BARD,
+	FORCE_MASTER,
+	WEAPON_MASTER,
+	BOW_MASTER,
+	DAGGER_MASTER,
+	HEAL_MASTER,
+	WIZARD_MASTER,
+	BUFF_MASTER,
+	SUMMON_MASTER,
+	WARRIOR_CLOACK,
+	ROGUE_CLOACK,
+	MAGE_CLOACK,
+	SHIELD_MASTER2_3,
+	BARD2_3,
+	FORCE_MASTER2_3,
+	WEAPON_MASTER2_3,
+	BOW_MASTER2_3,
+	DAGGER_MASTER2_3,
+	HEAL_MASTER2_3,
+	WIZARD_MASTER2_3,
+	BUFF_MASTER2_3,
+	SUMMON_MASTER2_3,
+	ATTRIBUTE_GROUP_SUMMONER,
+	SUB_GROUP_WARRIOR,
+	SUB_GROUP_ROGUE,
+	SUB_GROUP_KNIGHT,
+	SUB_GROUP_SUMMONER,
+	SUB_GROUP_WIZARD,
+	SUB_GROUP_HEALER,
+	SUB_GROUP_ENCHANTER,
+	SUB_GROUP_HEC,
+	SUB_GROUP_HEW,
+	SUB_GROUP_HEF,
+	SUB_GROUP_ORC,
+	SUB_GROUP_WARE,
+	SUB_GROUP_BLACK,
+	SUB_GROUP_DE,
+	SUB_GROUP_KAMAEL,
+	LIGHT_TANKER_GROUP,
+	DARK_TANKER_GROUP,
+	MELEE_ATTACKER,
+	RECOM_KNIGHT_GROUP,
+	RECOM_MAGIC_GROUP,
+	RECOM_WARRIOR_GROUP,
+	RECOM_ROGUE_GROUP,
+	RECOM_KAMAEL_GROUP,
+	RECOM_ORCF_GROUP,
+	RECOM_ORCM_GROUP,
+	DEINONYCHUS_PET_GROUP,
+	BEASTFARM_BEAST,
+	BEASTFARM_INVADER,
+	ICEQUEEN_NPC;
+	
+	/**
+	 * Finds category by it's name
+	 * @param categoryName
+	 * @return A {@code CategoryType} if category was found, {@code null} if category was not found
+	 */
+	public static CategoryType findByName(String categoryName) {
+		for (CategoryType type : values()) {
+			if (type.name().equalsIgnoreCase(categoryName)) {
+				return type;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/DispelCategory.java b/src/main/java/com/l2jserver/gameserver/enums/DispelCategory.java
new file mode 100644
index 00000000..8b0d8bf9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/DispelCategory.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zealar
+ */
+public enum DispelCategory {
+	ALL,
+	BUFF,
+	DEBUFF
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/DuelResult.java b/src/main/java/com/l2jserver/gameserver/enums/DuelResult.java
new file mode 100644
index 00000000..200ab482
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/DuelResult.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zealar
+ */
+public enum DuelResult {
+	CONTINUE,
+	TEAM_1_WIN,
+	TEAM_2_WIN,
+	TEAM_1_SURRENDER,
+	TEAM_2_SURRENDER,
+	CANCELED,
+	TIMEOUT
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/DuelState.java b/src/main/java/com/l2jserver/gameserver/enums/DuelState.java
new file mode 100644
index 00000000..33304788
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/DuelState.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zealar
+ */
+public enum DuelState {
+	NO_DUEL,
+	DUELLING,
+	DEAD,
+	WINNER,
+	INTERRUPTED
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/EffectCalculationType.java b/src/main/java/com/l2jserver/gameserver/enums/EffectCalculationType.java
new file mode 100644
index 00000000..d1d06f37
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/EffectCalculationType.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Effect calculation type.
+ * @author Zealar
+ * @version 2.6.2.0
+ */
+public enum EffectCalculationType {
+	DIFF,
+	PER
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/EventState.java b/src/main/java/com/l2jserver/gameserver/enums/EventState.java
new file mode 100644
index 00000000..42e53adc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/EventState.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author UnAfraid
+ */
+public enum EventState {
+	STARTED,
+	FINISHED,
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/FortTeleportWhoType.java b/src/main/java/com/l2jserver/gameserver/enums/FortTeleportWhoType.java
new file mode 100644
index 00000000..266ef93d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/FortTeleportWhoType.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum FortTeleportWhoType {
+	All,
+	Attacker,
+	Owner
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/HtmlActionScope.java b/src/main/java/com/l2jserver/gameserver/enums/HtmlActionScope.java
new file mode 100644
index 00000000..e775d42f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/HtmlActionScope.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author HorridoJoho
+ */
+public enum HtmlActionScope {
+	NPC_HTML,
+	NPC_ITEM_HTML,
+	NPC_QUEST_HTML,
+	TUTORIAL_HTML,
+	COMM_BOARD_HTML
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/IllegalActionPunishmentType.java b/src/main/java/com/l2jserver/gameserver/enums/IllegalActionPunishmentType.java
new file mode 100644
index 00000000..5e6c5f5b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/IllegalActionPunishmentType.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Illegal Action Punishment Type.
+ * @author xban1x
+ */
+public enum IllegalActionPunishmentType {
+	NONE,
+	BROADCAST,
+	KICK,
+	KICK_BAN,
+	JAIL
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/InstanceReenterType.java b/src/main/java/com/l2jserver/gameserver/enums/InstanceReenterType.java
new file mode 100644
index 00000000..ab73b63c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/InstanceReenterType.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author FallenAngel
+ */
+public enum InstanceReenterType {
+	NONE,
+	ON_INSTANCE_ENTER,
+	ON_INSTANCE_FINISH
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/InstanceRemoveBuffType.java b/src/main/java/com/l2jserver/gameserver/enums/InstanceRemoveBuffType.java
new file mode 100644
index 00000000..67638af0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/InstanceRemoveBuffType.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author St3eT
+ */
+public enum InstanceRemoveBuffType {
+	NONE,
+	ALL,
+	WHITELIST,
+	BLACKLIST
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/InstanceType.java b/src/main/java/com/l2jserver/gameserver/enums/InstanceType.java
new file mode 100644
index 00000000..54a2f16f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/InstanceType.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum InstanceType {
+	L2Object(null),
+	L2ItemInstance(L2Object),
+	L2Character(L2Object),
+	L2Npc(L2Character),
+	L2Playable(L2Character),
+	L2Summon(L2Playable),
+	L2Decoy(L2Character),
+	L2PcInstance(L2Playable),
+	L2NpcInstance(L2Npc),
+	L2MerchantInstance(L2NpcInstance),
+	L2WarehouseInstance(L2NpcInstance),
+	L2StaticObjectInstance(L2Character),
+	L2DoorInstance(L2Character),
+	L2TerrainObjectInstance(L2Npc),
+	L2EffectPointInstance(L2Npc),
+	// Summons, Pets, Decoys and Traps
+	L2ServitorInstance(L2Summon),
+	L2PetInstance(L2Summon),
+	L2BabyPetInstance(L2PetInstance),
+	L2DecoyInstance(L2Decoy),
+	L2TrapInstance(L2Npc),
+	// Attackable
+	L2Attackable(L2Npc),
+	L2GuardInstance(L2Attackable),
+	L2QuestGuardInstance(L2GuardInstance),
+	L2MonsterInstance(L2Attackable),
+	L2ChestInstance(L2MonsterInstance),
+	L2ControllableMobInstance(L2MonsterInstance),
+	L2FeedableBeastInstance(L2MonsterInstance),
+	L2TamedBeastInstance(L2FeedableBeastInstance),
+	L2FriendlyMobInstance(L2Attackable),
+	L2RiftInvaderInstance(L2MonsterInstance),
+	L2RaidBossInstance(L2MonsterInstance),
+	L2GrandBossInstance(L2RaidBossInstance),
+	// FlyMobs
+	L2FlyNpcInstance(L2NpcInstance),
+	L2FlyMonsterInstance(L2MonsterInstance),
+	L2FlyRaidBossInstance(L2RaidBossInstance),
+	L2FlyTerrainObjectInstance(L2Npc),
+	// Sepulchers
+	L2SepulcherNpcInstance(L2NpcInstance),
+	L2SepulcherMonsterInstance(L2MonsterInstance),
+	// Festival
+	L2FestivalGiudeInstance(L2Npc),
+	L2FestivalMonsterInstance(L2MonsterInstance),
+	// Vehicles
+	L2Vehicle(L2Character),
+	L2BoatInstance(L2Vehicle),
+	L2AirShipInstance(L2Vehicle),
+	L2ControllableAirShipInstance(L2AirShipInstance),
+	// Siege
+	L2DefenderInstance(L2Attackable),
+	L2ArtefactInstance(L2NpcInstance),
+	L2ControlTowerInstance(L2Npc),
+	L2FlameTowerInstance(L2Npc),
+	L2SiegeFlagInstance(L2Npc),
+	// Fort Siege
+	L2FortCommanderInstance(L2DefenderInstance),
+	// Fort NPCs
+	L2FortLogisticsInstance(L2MerchantInstance),
+	L2FortManagerInstance(L2MerchantInstance),
+	// City NPCs
+	L2AuctioneerInstance(L2Npc),
+	L2ClanHallManagerInstance(L2MerchantInstance),
+	L2FishermanInstance(L2MerchantInstance),
+	L2ObservationInstance(L2Npc),
+	L2OlympiadManagerInstance(L2Npc),
+	L2PetManagerInstance(L2MerchantInstance),
+	L2RaceManagerInstance(L2Npc),
+	L2TeleporterInstance(L2Npc),
+	L2VillageMasterInstance(L2NpcInstance),
+	// Doormens
+	L2DoormenInstance(L2NpcInstance),
+	L2CastleDoormenInstance(L2DoormenInstance),
+	L2FortDoormenInstance(L2DoormenInstance),
+	L2ClanHallDoormenInstance(L2DoormenInstance),
+	// Custom
+	L2NpcBufferInstance(L2Npc),
+	L2EventMobInstance(L2Npc);
+	
+	private final InstanceType _parent;
+	private final long _typeL;
+	private final long _typeH;
+	private final long _maskL;
+	private final long _maskH;
+	
+	InstanceType(InstanceType parent) {
+		_parent = parent;
+		
+		final int high = ordinal() - (Long.SIZE - 1);
+		if (high < 0) {
+			_typeL = 1L << ordinal();
+			_typeH = 0;
+		} else {
+			_typeL = 0;
+			_typeH = 1L << high;
+		}
+		
+		if ((_typeL < 0) || (_typeH < 0)) {
+			throw new Error("Too many instance types, failed to load " + name());
+		}
+		
+		if (parent != null) {
+			_maskL = _typeL | parent._maskL;
+			_maskH = _typeH | parent._maskH;
+		} else {
+			_maskL = _typeL;
+			_maskH = _typeH;
+		}
+	}
+	
+	public final InstanceType getParent() {
+		return _parent;
+	}
+	
+	public final boolean isType(InstanceType it) {
+		return ((_maskL & it._typeL) > 0) || ((_maskH & it._typeH) > 0);
+	}
+	
+	public final boolean isTypes(InstanceType... it) {
+		for (InstanceType i : it) {
+			if (isType(i)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/ItemLocation.java b/src/main/java/com/l2jserver/gameserver/enums/ItemLocation.java
new file mode 100644
index 00000000..f37d0bd6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/ItemLocation.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum ItemLocation {
+	VOID,
+	INVENTORY,
+	PAPERDOLL,
+	WAREHOUSE,
+	CLANWH,
+	PET,
+	PET_EQUIP,
+	LEASE,
+	REFUND,
+	MAIL,
+	FREIGHT
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/MacroType.java b/src/main/java/com/l2jserver/gameserver/enums/MacroType.java
new file mode 100644
index 00000000..e94ee644
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/MacroType.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Macro type enumerated.
+ * @author Zoey76
+ */
+public enum MacroType {
+	NONE,
+	SKILL,
+	ACTION,
+	TEXT,
+	SHORTCUT,
+	ITEM,
+	DELAY
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/ManorMode.java b/src/main/java/com/l2jserver/gameserver/enums/ManorMode.java
new file mode 100644
index 00000000..f900c91b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/ManorMode.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author malyelfik
+ */
+public enum ManorMode {
+	DISABLED,
+	MODIFIABLE,
+	MAINTENANCE,
+	APPROVED
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/MountType.java b/src/main/java/com/l2jserver/gameserver/enums/MountType.java
new file mode 100644
index 00000000..07249ff8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/MountType.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+import com.l2jserver.gameserver.data.xml.impl.CategoryData;
+
+/**
+ * @author UnAfraid
+ */
+public enum MountType {
+	NONE,
+	STRIDER,
+	WYVERN,
+	WOLF;
+	
+	public static MountType findByNpcId(int npcId) {
+		if (CategoryData.getInstance().isInCategory(CategoryType.STRIDER, npcId)) {
+			return STRIDER;
+		} else if (CategoryData.getInstance().isInCategory(CategoryType.WYVERN_GROUP, npcId)) {
+			return WYVERN;
+		} else if (CategoryData.getInstance().isInCategory(CategoryType.WOLF_GROUP, npcId)) {
+			return WOLF;
+		}
+		return NONE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/PartyDistributionType.java b/src/main/java/com/l2jserver/gameserver/enums/PartyDistributionType.java
new file mode 100644
index 00000000..c284db2a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/PartyDistributionType.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author NosBit
+ */
+public enum PartyDistributionType {
+	FINDERS_KEEPERS(0, 487),
+	RANDOM(1, 488),
+	RANDOM_INCLUDING_SPOIL(2, 798),
+	BY_TURN(3, 799),
+	BY_TURN_INCLUDING_SPOIL(4, 800);
+	
+	private final int _id;
+	private final int _sysStringId;
+	
+	/**
+	 * Constructs a party distribution type.
+	 * @param id the id used by packets.
+	 * @param sysStringId the sysstring id
+	 */
+	PartyDistributionType(int id, int sysStringId) {
+		_id = id;
+		_sysStringId = sysStringId;
+	}
+	
+	/**
+	 * Gets the id used by packets.
+	 * @return the id
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Gets the sysstring id used by system messages.
+	 * @return the sysstring-e id
+	 */
+	public int getSysStringId() {
+		return _sysStringId;
+	}
+	
+	/**
+	 * Finds the {@code PartyDistributionType} by its id
+	 * @param id the id
+	 * @return the {@code PartyDistributionType} if its found, {@code null} otherwise.
+	 */
+	public static PartyDistributionType findById(int id) {
+		for (PartyDistributionType partyDistributionType : values()) {
+			if (partyDistributionType.getId() == id) {
+				return partyDistributionType;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/PetitionState.java b/src/main/java/com/l2jserver/gameserver/enums/PetitionState.java
new file mode 100644
index 00000000..616cfa59
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/PetitionState.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Enum with petition states.
+ * @author xban1x
+ */
+public enum PetitionState {
+	PENDING,
+	RESPONDER_CANCEL,
+	RESPONDER_MISSING,
+	RESPONDER_REJECT,
+	RESPONDER_COMPLETE,
+	PETITIONER_CANCEL,
+	PETITIONER_MISSING,
+	IN_PROCESS,
+	COMPLETED
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/PetitionType.java b/src/main/java/com/l2jserver/gameserver/enums/PetitionType.java
new file mode 100644
index 00000000..7601feb2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/PetitionType.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Enum with petition types.
+ * @author xban1x
+ */
+public enum PetitionType {
+	IMMOBILITY,
+	RECOVERY_RELATED,
+	BUG_REPORT,
+	QUEST_RELATED,
+	BAD_USER,
+	SUGGESTIONS,
+	GAME_TIP,
+	OPERATION_RELATED,
+	OTHER
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/PlayerAction.java b/src/main/java/com/l2jserver/gameserver/enums/PlayerAction.java
new file mode 100644
index 00000000..746aef4c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/PlayerAction.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author UnAfraid
+ */
+public enum PlayerAction {
+	ADMIN_COMMAND,
+	USER_ENGAGE;
+	
+	private final int _mask;
+	
+	PlayerAction() {
+		_mask = (1 << ordinal());
+	}
+	
+	public int getMask() {
+		return _mask;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/PrivateStoreType.java b/src/main/java/com/l2jserver/gameserver/enums/PrivateStoreType.java
new file mode 100644
index 00000000..feb4b0a5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/PrivateStoreType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author NosBit
+ */
+public enum PrivateStoreType {
+	NONE(0),
+	SELL(1),
+	SELL_MANAGE(2),
+	BUY(3),
+	BUY_MANAGE(4),
+	MANUFACTURE(5),
+	PACKAGE_SELL(8);
+	
+	private final int _id;
+	
+	PrivateStoreType(int id) {
+		_id = id;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public static PrivateStoreType findById(int id) {
+		for (PrivateStoreType privateStoreType : values()) {
+			if (privateStoreType.getId() == id) {
+				return privateStoreType;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/QuestType.java b/src/main/java/com/l2jserver/gameserver/enums/QuestType.java
new file mode 100644
index 00000000..d5217c7d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/QuestType.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Luis Arias
+ */
+public enum QuestType {
+	REPEATABLE,
+	ONE_TIME,
+	DAILY
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/Race.java b/src/main/java/com/l2jserver/gameserver/enums/Race.java
new file mode 100644
index 00000000..92b64ad7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/Race.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Creature races enumerated.
+ * @author Zealar
+ */
+public enum Race {
+	HUMAN,
+	ELF,
+	DARK_ELF,
+	ORC,
+	DWARF,
+	KAMAEL,
+	ANIMAL,
+	BEAST,
+	BUG,
+	CASTLE_GUARD,
+	CONSTRUCT,
+	DEMONIC,
+	DIVINE,
+	DRAGON,
+	ELEMENTAL,
+	ETC,
+	FAIRY,
+	GIANT,
+	HUMANOID,
+	MERCENARY,
+	NONE,
+	PLANT,
+	SIEGE_WEAPON,
+	UNDEAD
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/Sex.java b/src/main/java/com/l2jserver/gameserver/enums/Sex.java
new file mode 100644
index 00000000..ad575037
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/Sex.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum Sex {
+	MALE,
+	FEMALE,
+	ETC
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/ShortcutType.java b/src/main/java/com/l2jserver/gameserver/enums/ShortcutType.java
new file mode 100644
index 00000000..c565c471
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/ShortcutType.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * Shortcut type enumerated.
+ * @author Zoey76
+ */
+public enum ShortcutType {
+	NONE,
+	ITEM,
+	SKILL,
+	ACTION,
+	MACRO,
+	RECIPE,
+	BOOKMARK
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/ShotType.java b/src/main/java/com/l2jserver/gameserver/enums/ShotType.java
new file mode 100644
index 00000000..e8fb6875
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/ShotType.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author UnAfraid
+ */
+public enum ShotType {
+	SOULSHOTS,
+	SPIRITSHOTS,
+	BLESSED_SPIRITSHOTS,
+	FISH_SOULSHOTS;
+	
+	private final int _mask;
+	
+	ShotType() {
+		_mask = (1 << ordinal());
+	}
+	
+	public int getMask() {
+		return _mask;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/SiegeTeleportWhoType.java b/src/main/java/com/l2jserver/gameserver/enums/SiegeTeleportWhoType.java
new file mode 100644
index 00000000..fd568c39
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/SiegeTeleportWhoType.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum SiegeTeleportWhoType {
+	Attacker,
+	Owner,
+	NotOwner,
+	Spectator
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/StartPosType.java b/src/main/java/com/l2jserver/gameserver/enums/StartPosType.java
new file mode 100644
index 00000000..fff0494f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/StartPosType.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zealar
+ */
+public enum StartPosType {
+	FIXED,
+	RANDOM
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/StatFunction.java b/src/main/java/com/l2jserver/gameserver/enums/StatFunction.java
new file mode 100644
index 00000000..6f2947c2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/StatFunction.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author Zealar
+ */
+public enum StatFunction {
+	ADD("Add", 30),
+	DIV("Div", 20),
+	ENCHANT("Enchant", 0),
+	ENCHANTHP("EnchantHp", 40),
+	MUL("Mul", 20),
+	SET("Set", 0),
+	SHARE("Share", 30),
+	SUB("Sub", 30);
+	
+	private final String _name;
+	private final int _order;
+	
+	StatFunction(String name, int order) {
+		_name = name;
+		_order = order;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int getOrder() {
+		return _order;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/StatType.java b/src/main/java/com/l2jserver/gameserver/enums/StatType.java
new file mode 100644
index 00000000..f1cb844d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/StatType.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum StatType {
+	
+	HP,
+	MP,
+	XP,
+	SP,
+	GIM // grab item modifier:
+	// GIM: the default function uses only the skilllevel to determine
+	// how many item is grabbed in each step
+	// with this stat changer you can multiple this
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/Team.java b/src/main/java/com/l2jserver/gameserver/enums/Team.java
new file mode 100644
index 00000000..209e0900
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/Team.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author NosBit
+ */
+public enum Team {
+	NONE(0),
+	BLUE(1),
+	RED(2);
+	
+	private final int _id;
+	
+	Team(int id) {
+		_id = id;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/TrapAction.java b/src/main/java/com/l2jserver/gameserver/enums/TrapAction.java
new file mode 100644
index 00000000..c6d54645
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/TrapAction.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+public enum TrapAction {
+	TRAP_TRIGGERED,
+	TRAP_DETECTED,
+	TRAP_DISARMED
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/enums/TriggerAttackType.java b/src/main/java/com/l2jserver/gameserver/enums/TriggerAttackType.java
new file mode 100644
index 00000000..d34c64f3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/TriggerAttackType.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Trigger Attack Type.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public enum TriggerAttackType {
+	NONE {
+		@Override
+		public boolean check(L2Character trigger, L2Object target) {
+			return false;
+		}
+	},
+	ENEMY_ALL {
+		@Override
+		public boolean check(L2Character trigger, L2Object target) {
+			return target.isCharacter() && target.isAutoAttackable(trigger);
+		}
+	},
+	MOB {
+		@Override
+		public boolean check(L2Character trigger, L2Object target) {
+			return target.isAttackable();
+		}
+	},
+	PK {
+		@Override
+		public boolean check(L2Character trigger, L2Object target) {
+			return target.isPlayer() || target.isSummon();
+		}
+	};
+	
+	public abstract boolean check(L2Character trigger, L2Object target);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/TriggerTargetType.java b/src/main/java/com/l2jserver/gameserver/enums/TriggerTargetType.java
new file mode 100644
index 00000000..438517be
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/TriggerTargetType.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Trigger Target Type.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public enum TriggerTargetType {
+	ENEMY {
+		@Override
+		public List<L2Character> getTargets(L2Character target, L2Character attacker) {
+			return List.of(attacker);
+		}
+	},
+	SELF {
+		@Override
+		public List<L2Character> getTargets(L2Character target, L2Character attacker) {
+			return List.of(target);
+		}
+	},
+	MY_PARTY {
+		@Override
+		public List<L2Character> getTargets(L2Character target, L2Character attacker) {
+			if (target.isPlayer() || target.isSummon()) {
+				final var player = target.getActingPlayer();
+				if (player.isInParty()) {
+					return new ArrayList<>(player.getParty().getMembers());
+				}
+				return List.of(player);
+			}
+			return List.of();
+		}
+	},
+	TARGET {
+		@Override
+		public List<L2Character> getTargets(L2Character target, L2Character attacker) {
+			return List.of(target);
+		}
+	},
+	SUMMON {
+		@Override
+		public List<L2Character> getTargets(L2Character target, L2Character attacker) {
+			if (target.hasSummon()) {
+				return List.of(target.getSummon());
+			}
+			return List.of();
+		}
+	};
+	
+	public abstract List<L2Character> getTargets(L2Character target, L2Character attacker);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/TriggerType.java b/src/main/java/com/l2jserver/gameserver/enums/TriggerType.java
new file mode 100644
index 00000000..7f89d087
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/TriggerType.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+/**
+ * @author kombat
+ */
+public enum TriggerType {
+	// You hit an enemy
+	ON_HIT(1),
+	// You hit an enemy - was crit
+	ON_CRIT(2),
+	// You cast a skill
+	ON_CAST(4),
+	// You cast a skill - it was a physical one
+	ON_PHYSICAL(8),
+	// You cast a skill - it was a magic one
+	ON_MAGIC(16),
+	// You cast a skill - it was a magic one - good magic
+	ON_MAGIC_GOOD(32),
+	// You cast a skill - it was a magic one - offensive magic
+	ON_MAGIC_OFFENSIVE(64),
+	// You are attacked by enemy
+	ON_ATTACKED(128),
+	// You are attacked by enemy - by hit
+	ON_ATTACKED_HIT(256),
+	// You are attacked by enemy - by hit - was crit
+	ON_ATTACKED_CRIT(512),
+	// A skill was casted on you
+	ON_HIT_BY_SKILL(1024),
+	// An evil skill was casted on you
+	ON_HIT_BY_OFFENSIVE_SKILL(2048),
+	// A good skill was casted on you
+	ON_HIT_BY_GOOD_MAGIC(4096),
+	// Evading melee attack
+	ON_EVADED_HIT(8192),
+	// Effect only - on start
+	ON_START(16384),
+	// Effect only - each second
+	ON_ACTION_TIME(32768),
+	// Effect only - on exit
+	ON_EXIT(65536);
+	
+	private final int _mask;
+	
+	TriggerType(int mask) {
+		_mask = mask;
+	}
+	
+	public final boolean check(int event) {
+		return (_mask & event) != 0; // Trigger (sub-)type contains event (sub-)type
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/audio/IAudio.java b/src/main/java/com/l2jserver/gameserver/enums/audio/IAudio.java
new file mode 100644
index 00000000..5702e3c8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/audio/IAudio.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums.audio;
+
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+/**
+ * @author Zealar
+ */
+public interface IAudio {
+	/**
+	 * @return the name of the sound of this audio object
+	 */
+	String getSoundName();
+	
+	/**
+	 * @return the {@link PlaySound} packet of this audio object
+	 */
+	PlaySound getPacket();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/audio/Music.java b/src/main/java/com/l2jserver/gameserver/enums/audio/Music.java
new file mode 100644
index 00000000..f3994f24
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/audio/Music.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums.audio;
+
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+/**
+ * @author Zealar
+ */
+public enum Music implements IAudio {
+	B03_D_10000("B03_D", 10000),
+	B03_F("B03_F"),
+	B04_S01("B04_S01"),
+	B06_F_2000("B06_F", 2000),
+	B06_S01_2000("B06_S01", 2000),
+	B07_S01_2000("B07_S01", 2000),
+	BS01_A_10000("BS01_A", 10000),
+	BS01_A_7000("BS01_A", 7000),
+	BS01_D_10000("BS01_D", 10000),
+	BS01_D_6000("BS01_D", 6000),
+	BS02_A_10000("BS02_A", 10000),
+	BS02_A_6000("BS02_A", 6000),
+	BS02_D_10000("BS02_D", 10000),
+	BS02_D_7000("BS02_D", 7000),
+	BS03_A_10000("BS03_A", 10000),
+	BS04_A_6000("BS04_A", 6000),
+	BS04_A_3000("BS04_A", 3000),
+	BS05_D_5000("BS05_D", 5000),
+	BS05_D_6000("BS05_D", 6000),
+	BS06_A_5000("BS06_A", 5000),
+	BS07_A_10000("BS07_A", 10000),
+	BS07_D_10000("BS07_D", 10000),
+	BS08_A_10000("BS08_A", 10000),
+	EV_01_10000("EV_01", 10000),
+	EV_02_10000("EV_02", 10000),
+	EV_03_200("EV_03", 200),
+	EV_04_200("EV_04", 200),
+	HB01_10000("HB01", 10000),
+	NS01_F_5000("ns01_f", 5000),
+	NS22_F_5000("ns22_f", 5000),
+	RM01_A_4000("Rm01_A", 4000),
+	RM01_A_8000("Rm01_A", 8000),
+	RM01_S_4000("RM01_S", 4000),
+	SSQ_Dawn_01("SSQ_Dawn_01"),
+	SSQ_Dusk_01("SSQ_Dusk_01"),
+	SSQ_Neutral_01("SSQ_Neutral_01"),
+	TP01_F_3000("TP01_F", 3000),
+	TP02_F_3000("TP02_F", 3000),
+	TP03_F_3000("TP03_F", 3000),
+	TP04_F_3000("TP04_F", 3000),
+	TP05_F("TP05_F"),
+	TP05_F_5000("TP05_F", 5000),
+	SF_S_01("SF_S_01"),
+	NS22_F("NS22_F"),
+	S_RACE("S_Race"),
+	SF_P_01("SF_P_01"),
+	SIEGE_VICTORY("Siege_Victory");
+	
+	private final PlaySound _playSound;
+	
+	Music(String soundName) {
+		_playSound = PlaySound.createMusic(soundName, 0);
+	}
+	
+	Music(String soundName, int delay) {
+		_playSound = PlaySound.createMusic(soundName, delay);
+	}
+	
+	@Override
+	public String getSoundName() {
+		return _playSound.getSoundName();
+	}
+	
+	@Override
+	public PlaySound getPacket() {
+		return _playSound;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/audio/Sound.java b/src/main/java/com/l2jserver/gameserver/enums/audio/Sound.java
new file mode 100644
index 00000000..239cb7b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/audio/Sound.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums.audio;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+public enum Sound implements IAudio {
+	ITEMSOUND_QUEST_ACCEPT("ItemSound.quest_accept"),
+	ITEMSOUND_QUEST_MIDDLE("ItemSound.quest_middle"),
+	ITEMSOUND_QUEST_FINISH("ItemSound.quest_finish"),
+	ITEMSOUND_QUEST_ITEMGET("ItemSound.quest_itemget"),
+	// Newbie Guide tutorial (incl. some quests), Mutated Kaneus quests, Quest 192
+	ITEMSOUND_QUEST_TUTORIAL("ItemSound.quest_tutorial"),
+	// Quests 107, 363, 364
+	ITEMSOUND_QUEST_GIVEUP("ItemSound.quest_giveup"),
+	// Quests 212, 217, 224, 226, 416
+	ITEMSOUND_QUEST_BEFORE_BATTLE("ItemSound.quest_before_battle"),
+	// Quests 211, 258, 266, 330
+	ITEMSOUND_QUEST_JACKPOT("ItemSound.quest_jackpot"),
+	// Quests 508, 509 and 510
+	ITEMSOUND_QUEST_FANFARE_1("ItemSound.quest_fanfare_1"),
+	// Played only after class transfer via Test Server Helpers (ID 31756 and 31757)
+	ITEMSOUND_QUEST_FANFARE_2("ItemSound.quest_fanfare_2"),
+	// Quest 336
+	ITEMSOUND_QUEST_FANFARE_MIDDLE("ItemSound.quest_fanfare_middle"),
+	// Quest 114
+	ITEMSOUND_ARMOR_WOOD("ItemSound.armor_wood_3"),
+	// Quest 21
+	ITEMSOUND_ARMOR_CLOTH("ItemSound.item_drop_equip_armor_cloth"),
+	AMDSOUND_ED_CHIMES("AmdSound.ed_chimes_05"),
+	HORROR_01("horror_01"), // played when spawned monster sees player
+	// Quest 22
+	AMBSOUND_HORROR_01("AmbSound.dd_horror_01"),
+	AMBSOUND_HORROR_03("AmbSound.d_horror_03"),
+	AMBSOUND_HORROR_15("AmbSound.d_horror_15"),
+	// Quest 23
+	ITEMSOUND_ARMOR_LEATHER("ItemSound.itemdrop_armor_leather"),
+	ITEMSOUND_WEAPON_SPEAR("ItemSound.itemdrop_weapon_spear"),
+	AMBSOUND_MT_CREAK("AmbSound.mt_creak01"),
+	AMBSOUND_EG_DRON("AmbSound.eg_dron_02"),
+	SKILLSOUND_HORROR_02("SkillSound5.horror_02"),
+	CHRSOUND_MHFIGHTER_CRY("ChrSound.MHFighter_cry"),
+	// Quest 24
+	AMDSOUND_WIND_LOOT("AmdSound.d_wind_loot_02"),
+	INTERFACESOUND_CHARSTAT_OPEN("InterfaceSound.charstat_open_01"),
+	// Quest 25
+	AMDSOUND_HORROR_02("AmdSound.dd_horror_02"),
+	CHRSOUND_FDELF_CRY("ChrSound.FDElf_Cry"),
+	// Quest 115
+	AMBSOUND_WINGFLAP("AmbSound.t_wingflap_04"),
+	AMBSOUND_THUNDER("AmbSound.thunder_02"),
+	// Quest 120
+	AMBSOUND_DRONE("AmbSound.ed_drone_02"),
+	AMBSOUND_CRYSTAL_LOOP("AmbSound.cd_crystal_loop"),
+	AMBSOUND_PERCUSSION_01("AmbSound.dt_percussion_01"),
+	AMBSOUND_PERCUSSION_02("AmbSound.ac_percussion_02"),
+	// Quest 648 and treasure chests
+	ITEMSOUND_BROKEN_KEY("ItemSound2.broken_key"),
+	// Quest 184
+	ITEMSOUND_SIREN("ItemSound3.sys_siren"),
+	// Quest 648
+	ITEMSOUND_ENCHANT_SUCCESS("ItemSound3.sys_enchant_success"),
+	ITEMSOUND_ENCHANT_FAILED("ItemSound3.sys_enchant_failed"),
+	// Best farm mobs
+	ITEMSOUND_SOW_SUCCESS("ItemSound3.sys_sow_success"),
+	// Quest 25
+	SKILLSOUND_HORROR_1("SkillSound5.horror_01"),
+	// Quests 21 and 23
+	SKILLSOUND_HORROR_2("SkillSound5.horror_02"),
+	// Quest 22
+	SKILLSOUND_ANTARAS_FEAR("SkillSound3.antaras_fear"),
+	// Quest 505
+	SKILLSOUND_JEWEL_CELEBRATE("SkillSound2.jewel.celebrate"),
+	// Quest 373
+	SKILLSOUND_LIQUID_MIX("SkillSound5.liquid_mix_01"),
+	SKILLSOUND_LIQUID_SUCCESS("SkillSound5.liquid_success_01"),
+	SKILLSOUND_LIQUID_FAIL("SkillSound5.liquid_fail_01"),
+	// Quest 111
+	ETCSOUND_ELROKI_SONG_FULL("EtcSound.elcroki_song_full"),
+	ETCSOUND_ELROKI_SONG_1ST("EtcSound.elcroki_song_1st"),
+	ETCSOUND_ELROKI_SONG_2ND("EtcSound.elcroki_song_2nd"),
+	ETCSOUND_ELROKI_SONG_3RD("EtcSound.elcroki_song_3rd"),
+	
+	ITEMSOUND2_RACE_START("ItemSound2.race_start"),
+	
+	// Ships
+	ITEMSOUND_SHIP_ARRIVAL_DEPARTURE("itemsound.ship_arrival_departure"),
+	ITEMSOUND_SHIP_5MIN("itemsound.ship_5min"),
+	ITEMSOUND_SHIP_1MIN("itemsound.ship_1min");
+	
+	private final PlaySound _playSound;
+	
+	Sound(String soundName) {
+		_playSound = PlaySound.createSound(soundName);
+	}
+	
+	public PlaySound withObject(L2Object obj) {
+		return PlaySound.createSound(getSoundName(), obj);
+	}
+	
+	@Override
+	public String getSoundName() {
+		return _playSound.getSoundName();
+	}
+	
+	@Override
+	public PlaySound getPacket() {
+		return _playSound;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/enums/audio/Voice.java b/src/main/java/com/l2jserver/gameserver/enums/audio/Voice.java
new file mode 100644
index 00000000..a200e430
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/enums/audio/Voice.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums.audio;
+
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+
+/**
+ * @author Zealar
+ */
+public enum Voice implements IAudio {
+	TUTORIAL_VOICE_001A_2000("tutorial_voice_001a", 2000),
+	TUTORIAL_VOICE_001B_2000("tutorial_voice_001b", 2000),
+	TUTORIAL_VOICE_001C_2000("tutorial_voice_001c", 2000),
+	TUTORIAL_VOICE_001D_2000("tutorial_voice_001d", 2000),
+	TUTORIAL_VOICE_001E_2000("tutorial_voice_001e", 2000),
+	TUTORIAL_VOICE_001F_2000("tutorial_voice_001f", 2000),
+	TUTORIAL_VOICE_001G_2000("tutorial_voice_001g", 2000),
+	TUTORIAL_VOICE_001H_2000("tutorial_voice_001h", 2000),
+	TUTORIAL_VOICE_001I_2000("tutorial_voice_001i", 2000),
+	TUTORIAL_VOICE_001K_2000("tutorial_voice_001k", 2000),
+	TUTORIAL_VOICE_002_1000("tutorial_voice_002", 1000),
+	TUTORIAL_VOICE_003_2000("tutorial_voice_003", 2000),
+	TUTORIAL_VOICE_004_5000("tutorial_voice_004", 5000),
+	TUTORIAL_VOICE_005_5000("tutorial_voice_005", 5000),
+	TUTORIAL_VOICE_006_1000("tutorial_voice_006", 1000),
+	TUTORIAL_VOICE_006_3500("tutorial_voice_006", 3500),
+	TUTORIAL_VOICE_007_3500("tutorial_voice_007", 3500),
+	TUTORIAL_VOICE_008_1000("tutorial_voice_008", 1000),
+	TUTORIAL_VOICE_009A("tutorial_voice_009a"),
+	TUTORIAL_VOICE_009B("tutorial_voice_009b"),
+	TUTORIAL_VOICE_009C("tutorial_voice_009c"),
+	TUTORIAL_VOICE_010A("tutorial_voice_010a"),
+	TUTORIAL_VOICE_010B("tutorial_voice_010b"),
+	TUTORIAL_VOICE_010C("tutorial_voice_010c"),
+	TUTORIAL_VOICE_010D("tutorial_voice_010d"),
+	TUTORIAL_VOICE_010E("tutorial_voice_010e"),
+	TUTORIAL_VOICE_010F("tutorial_voice_010f"),
+	TUTORIAL_VOICE_010G("tutorial_voice_010g"),
+	TUTORIAL_VOICE_011_1000("tutorial_voice_011", 1000),
+	TUTORIAL_VOICE_012_1000("tutorial_voice_012", 1000),
+	TUTORIAL_VOICE_013_1000("tutorial_voice_013", 1000),
+	TUTORIAL_VOICE_014_1000("tutorial_voice_014", 1000),
+	TUTORIAL_VOICE_016_1000("tutorial_voice_016", 1000),
+	TUTORIAL_VOICE_017_1000("tutorial_voice_017", 1000),
+	TUTORIAL_VOICE_018_1000("tutorial_voice_018", 1000),
+	TUTORIAL_VOICE_019_1000("tutorial_voice_019", 1000),
+	TUTORIAL_VOICE_020_1000("tutorial_voice_020", 1000),
+	TUTORIAL_VOICE_021_1000("tutorial_voice_021", 1000),
+	TUTORIAL_VOICE_023_1000("tutorial_voice_023", 1000),
+	TUTORIAL_VOICE_024_1000("tutorial_voice_024", 1000),
+	TUTORIAL_VOICE_025_1000("tutorial_voice_025", 1000),
+	TUTORIAL_VOICE_026_1000("tutorial_voice_026", 1000),
+	TUTORIAL_VOICE_027_1000("tutorial_voice_027", 1000),
+	TUTORIAL_VOICE_028_1000("tutorial_voice_028", 1000),
+	TUTORIAL_VOICE_030_1000("tutorial_voice_030", 1000);
+	
+	private final PlaySound _playSound;
+	
+	Voice(String soundName) {
+		_playSound = PlaySound.createVoice(soundName, 0);
+	}
+	
+	Voice(String soundName, int delay) {
+		_playSound = PlaySound.createVoice(soundName, delay);
+	}
+	
+	@Override
+	public String getSoundName() {
+		return _playSound.getSoundName();
+	}
+	
+	@Override
+	public PlaySound getPacket() {
+		return _playSound;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/ActionHandler.java b/src/main/java/com/l2jserver/gameserver/handler/ActionHandler.java
new file mode 100644
index 00000000..7820ef01
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/ActionHandler.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+
+/**
+ * @author UnAfraid
+ */
+public class ActionHandler implements IHandler<IActionHandler, InstanceType> {
+	private final Map<InstanceType, IActionHandler> _actions;
+	
+	public static ActionHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	protected ActionHandler() {
+		_actions = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IActionHandler handler) {
+		_actions.put(handler.getInstanceType(), handler);
+	}
+	
+	@Override
+	public synchronized void removeHandler(IActionHandler handler) {
+		_actions.remove(handler.getInstanceType());
+	}
+	
+	@Override
+	public IActionHandler getHandler(InstanceType iType) {
+		IActionHandler result = null;
+		for (InstanceType t = iType; t != null; t = t.getParent()) {
+			result = _actions.get(t);
+			if (result != null) {
+				break;
+			}
+		}
+		return result;
+	}
+	
+	@Override
+	public int size() {
+		return _actions.size();
+	}
+	
+	private static class SingletonHolder {
+		protected static final ActionHandler _instance = new ActionHandler();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java b/src/main/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java
new file mode 100644
index 00000000..2afcd24c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+
+/**
+ * @author UnAfraid
+ */
+public class ActionShiftHandler implements IHandler<IActionShiftHandler, InstanceType> {
+	private final Map<InstanceType, IActionShiftHandler> _actionsShift;
+	
+	protected ActionShiftHandler() {
+		_actionsShift = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IActionShiftHandler handler) {
+		_actionsShift.put(handler.getInstanceType(), handler);
+	}
+	
+	@Override
+	public synchronized void removeHandler(IActionShiftHandler handler) {
+		_actionsShift.remove(handler.getInstanceType());
+	}
+	
+	@Override
+	public IActionShiftHandler getHandler(InstanceType iType) {
+		IActionShiftHandler result = null;
+		for (InstanceType t = iType; t != null; t = t.getParent()) {
+			result = _actionsShift.get(t);
+			if (result != null) {
+				break;
+			}
+		}
+		return result;
+	}
+	
+	@Override
+	public int size() {
+		return _actionsShift.size();
+	}
+	
+	public static ActionShiftHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ActionShiftHandler _instance = new ActionShiftHandler();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java b/src/main/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java
new file mode 100644
index 00000000..329984b6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author UnAfraid
+ */
+public class AdminCommandHandler implements IHandler<IAdminCommandHandler, String> {
+	private final Map<String, IAdminCommandHandler> _datatable;
+	
+	protected AdminCommandHandler() {
+		_datatable = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IAdminCommandHandler handler) {
+		String[] ids = handler.getAdminCommandList();
+		for (String id : ids) {
+			_datatable.put(id, handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(IAdminCommandHandler handler) {
+		String[] ids = handler.getAdminCommandList();
+		for (String id : ids) {
+			_datatable.remove(id);
+		}
+	}
+	
+	@Override
+	public IAdminCommandHandler getHandler(String adminCommand) {
+		String command = adminCommand;
+		if (adminCommand.contains(" ")) {
+			command = adminCommand.substring(0, adminCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	public static AdminCommandHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AdminCommandHandler _instance = new AdminCommandHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/BypassHandler.java b/src/main/java/com/l2jserver/gameserver/handler/BypassHandler.java
new file mode 100644
index 00000000..df81f9a6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/BypassHandler.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author nBd
+ * @author UnAfraid
+ */
+public class BypassHandler implements IHandler<IBypassHandler, String> {
+	private final Map<String, IBypassHandler> _datatable;
+	
+	protected BypassHandler() {
+		_datatable = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IBypassHandler handler) {
+		for (String element : handler.getBypassList()) {
+			_datatable.put(element.toLowerCase(), handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(IBypassHandler handler) {
+		for (String element : handler.getBypassList()) {
+			_datatable.remove(element.toLowerCase());
+		}
+	}
+	
+	@Override
+	public IBypassHandler getHandler(String command) {
+		if (command.contains("?")) {
+			command = command.substring(0, command.indexOf("?"));
+		} else if (command.contains(" ")) {
+			command = command.substring(0, command.indexOf(" "));
+		}
+		return _datatable.get(command.toLowerCase());
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	public static BypassHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final BypassHandler _instance = new BypassHandler();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/ChatHandler.java b/src/main/java/com/l2jserver/gameserver/handler/ChatHandler.java
new file mode 100644
index 00000000..bf59b8e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/ChatHandler.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * This class handles all chat handlers
+ * @author durgus
+ * @author UnAfraid
+ */
+public class ChatHandler implements IHandler<IChatHandler, Integer> {
+	private final Map<Integer, IChatHandler> _datatable;
+	
+	protected ChatHandler() {
+		_datatable = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IChatHandler handler) {
+		int[] ids = handler.getChatTypeList();
+		for (int id : ids) {
+			_datatable.put(id, handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(IChatHandler handler) {
+		int[] ids = handler.getChatTypeList();
+		for (int id : ids) {
+			_datatable.remove(id);
+		}
+	}
+	
+	/**
+	 * Get the chat handler for the given chat type
+	 * @param chatType
+	 * @return
+	 */
+	@Override
+	public IChatHandler getHandler(Integer chatType) {
+		return _datatable.get(chatType);
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	public static ChatHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ChatHandler _instance = new ChatHandler();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/CommunityBoardHandler.java b/src/main/java/com/l2jserver/gameserver/handler/CommunityBoardHandler.java
new file mode 100644
index 00000000..79e04706
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/CommunityBoardHandler.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Community Board handler.
+ * @author Zoey76
+ */
+public final class CommunityBoardHandler implements IHandler<IParseBoardHandler, String> {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CommunityBoardHandler.class);
+	
+	/** The registered handlers. */
+	private final Map<String, IParseBoardHandler> _datatable = new HashMap<>();
+	/** The bypasses used by the players. */
+	private final Map<Integer, String> _bypasses = new ConcurrentHashMap<>();
+	
+	protected CommunityBoardHandler() {
+		// Prevent external initialization.
+	}
+	
+	@Override
+	public void registerHandler(IParseBoardHandler handler) {
+		for (String cmd : handler.getCommunityBoardCommands()) {
+			_datatable.put(cmd.toLowerCase(), handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(IParseBoardHandler handler) {
+		for (String cmd : handler.getCommunityBoardCommands()) {
+			_datatable.remove(cmd.toLowerCase());
+		}
+	}
+	
+	@Override
+	public IParseBoardHandler getHandler(String cmd) {
+		for (IParseBoardHandler cb : _datatable.values()) {
+			for (String command : cb.getCommunityBoardCommands()) {
+				if (cmd.toLowerCase().startsWith(command.toLowerCase())) {
+					return cb;
+				}
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	/**
+	 * Verifies if the string is a registered community board command.
+	 * @param cmd the command to verify
+	 * @return {@code true} if the command has been registered, {@code false} otherwise
+	 */
+	public boolean isCommunityBoardCommand(String cmd) {
+		return getHandler(cmd) != null;
+	}
+	
+	/**
+	 * Parses a community board command.
+	 * @param command the command
+	 * @param player the player
+	 */
+	public void handleParseCommand(String command, L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		if (!general().enableCommunityBoard()) {
+			player.sendPacket(SystemMessageId.CB_OFFLINE);
+			return;
+		}
+		
+		final IParseBoardHandler cb = getHandler(command);
+		if (cb == null) {
+			LOG.warn("Couldn't find parse handler for command {}!", command);
+			return;
+		}
+		
+		cb.parseCommunityBoardCommand(command, player);
+	}
+	
+	/**
+	 * Writes a command into the client.
+	 * @param player the player
+	 * @param url the command URL
+	 * @param arg1 the first argument
+	 * @param arg2 the second argument
+	 * @param arg3 the third argument
+	 * @param arg4 the fourth argument
+	 * @param arg5 the fifth argument
+	 */
+	public void handleWriteCommand(L2PcInstance player, String url, String arg1, String arg2, String arg3, String arg4, String arg5) {
+		if (player == null) {
+			return;
+		}
+		
+		if (!general().enableCommunityBoard()) {
+			player.sendPacket(SystemMessageId.CB_OFFLINE);
+			return;
+		}
+		
+		String cmd;
+		switch (url) {
+			case "Topic" -> cmd = "_bbstop";
+			case "Post" -> cmd = "_bbspos"; // TODO: Implement.
+			case "Region" -> cmd = "_bbsloc";
+			case "Notice" -> cmd = "_bbsclan";
+			default -> {
+				separateAndSend("<html><body><br><br><center>The command: " + url + " is not implemented yet.</center><br><br></body></html>", player);
+				return;
+			}
+		}
+		
+		final IParseBoardHandler cb = getHandler(cmd);
+		if (cb == null) {
+			LOG.warn("Couldn't find write handler for command {}!", cmd);
+			return;
+		}
+		
+		if (!(cb instanceof IWriteBoardHandler)) {
+			LOG.warn("{} doesn't implement write!", cb.getClass().getSimpleName());
+			return;
+		}
+		((IWriteBoardHandler) cb).writeCommunityBoardCommand(player, arg1, arg2, arg3, arg4, arg5);
+	}
+	
+	/**
+	 * Sets the last bypass used by the player.
+	 * @param player the player
+	 * @param title the title
+	 * @param bypass the bypass
+	 */
+	public void addBypass(L2PcInstance player, String title, String bypass) {
+		_bypasses.put(player.getObjectId(), title + "&" + bypass);
+	}
+	
+	/**
+	 * Removes the last bypass used by the player.
+	 * @param player the player
+	 * @return the last bypass used
+	 */
+	public String removeBypass(L2PcInstance player) {
+		return _bypasses.remove(player.getObjectId());
+	}
+	
+	/**
+	 * Separates and send an HTML into multiple packets, to display into the community board.<br>
+	 * The limit is 16383 characters.
+	 * @param html the HTML to send
+	 * @param player the player
+	 */
+	public static void separateAndSend(String html, L2PcInstance player) {
+		Util.sendCBHtml(player, html);
+	}
+	
+	public static CommunityBoardHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CommunityBoardHandler _instance = new CommunityBoardHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/EffectHandler.java b/src/main/java/com/l2jserver/gameserver/handler/EffectHandler.java
new file mode 100644
index 00000000..6f307894
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/EffectHandler.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.scripting.ScriptEngineManager;
+
+/**
+ * @author BiggBoss
+ * @author UnAfraid
+ */
+public final class EffectHandler implements IHandler<Class<? extends AbstractEffect>, String> {
+	private final Map<String, Class<? extends AbstractEffect>> _handlers;
+	
+	protected EffectHandler() {
+		_handlers = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(Class<? extends AbstractEffect> handler) {
+		_handlers.put(handler.getSimpleName(), handler);
+	}
+	
+	@Override
+	public synchronized void removeHandler(Class<? extends AbstractEffect> handler) {
+		_handlers.remove(handler.getSimpleName());
+	}
+	
+	@Override
+	public Class<? extends AbstractEffect> getHandler(String name) {
+		return _handlers.get(name);
+	}
+	
+	@Override
+	public int size() {
+		return _handlers.size();
+	}
+	
+	public void executeScript() throws Exception {
+		ScriptEngineManager.getInstance().executeScript("com/l2jserver/datapack/handlers/EffectMasterHandler.java");
+	}
+	
+	public static EffectHandler getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static final class SingletonHolder {
+		protected static final EffectHandler INSTANCE = new EffectHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IActionHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IActionHandler.java
new file mode 100644
index 00000000..512082f1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IActionHandler.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public interface IActionHandler {
+	boolean action(L2PcInstance activeChar, L2Object target, boolean interact);
+	
+	InstanceType getInstanceType();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IActionShiftHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IActionShiftHandler.java
new file mode 100644
index 00000000..f42afce6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IActionShiftHandler.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public interface IActionShiftHandler {
+	boolean action(L2PcInstance activeChar, L2Object target, boolean interact);
+	
+	InstanceType getInstanceType();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IAdminCommandHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IAdminCommandHandler.java
new file mode 100644
index 00000000..24b9540e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IAdminCommandHandler.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public interface IAdminCommandHandler {
+	/**
+	 * this is the worker method that is called when someone uses an admin command.
+	 * @param activeChar
+	 * @param command
+	 * @return command success
+	 */
+	boolean useAdminCommand(String command, L2PcInstance activeChar);
+	
+	/**
+	 * this method is called at initialization to register all the item ids automatically
+	 * @return all known itemIds
+	 */
+	String[] getAdminCommandList();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IBypassHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IBypassHandler.java
new file mode 100644
index 00000000..09f31098
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IBypassHandler.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Bypass Handler interface.
+ * @author nBd
+ */
+public interface IBypassHandler {
+	/**
+	 * This is the worker method that is called when someone uses an bypass command.
+	 * @param command
+	 * @param activeChar
+	 * @param bypassOrigin
+	 * @return success
+	 */
+	boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin);
+	
+	/**
+	 * This method is called at initialization to register all bypasses automatically.
+	 * @return all known bypasses
+	 */
+	String[] getBypassList();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IChatHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IChatHandler.java
new file mode 100644
index 00000000..9534aac3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IChatHandler.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Interface for chat handlers
+ * @author durgus
+ */
+public interface IChatHandler {
+	/**
+	 * Handles a specific type of chat messages
+	 * @param type
+	 * @param activeChar
+	 * @param target
+	 * @param text
+	 */
+	void handleChat(int type, L2PcInstance activeChar, String target, String text);
+	
+	/**
+	 * Returns a list of all chat types registered to this handler
+	 * @return
+	 */
+	int[] getChatTypeList();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IHandler.java
new file mode 100644
index 00000000..31551ed6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IHandler.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+/**
+ * Handler Interface.
+ * @author UnAfraid
+ * @author Zoey76
+ * @param <K>
+ * @param <V>
+ */
+public interface IHandler<K, V> {
+	@SuppressWarnings("unchecked")
+	default void registerByClass(Class<?> clazz) throws Exception {
+		final Object object = clazz.getDeclaredConstructor().newInstance();
+		registerHandler((K) object);
+	}
+	
+	/**
+	 * Registers the handler.
+	 * @param handler the handler
+	 */
+	void registerHandler(K handler);
+	
+	/**
+	 * Removes the handler.
+	 * @param handler the handler to remove
+	 */
+	void removeHandler(K handler);
+	
+	/**
+	 * Gets the handler for the given object.
+	 * @param val the object
+	 * @return the handler
+	 */
+	K getHandler(V val);
+	
+	/**
+	 * Gets the amount of handlers.
+	 * @return the amount of handlers
+	 */
+	int size();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IItemHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IItemHandler.java
new file mode 100644
index 00000000..6d49e89f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IItemHandler.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Mother class of all Item Handlers.
+ */
+public interface IItemHandler {
+	/**
+	 * Launch task associated to the item.
+	 * @param playable the non-NPC character using the item
+	 * @param item L2ItemInstance designating the item to use
+	 * @param forceUse ctrl hold on item use
+	 * @return {@code true} if the item all conditions are met and the item is used, {@code false} otherwise.
+	 */
+	boolean useItem(L2Playable playable, L2ItemInstance item, boolean forceUse);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IParseBoardHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IParseBoardHandler.java
new file mode 100644
index 00000000..e953f96d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IParseBoardHandler.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Community Board interface.
+ * @author Zoey76
+ */
+public interface IParseBoardHandler {
+	/**
+	 * Parses a community board command.
+	 * @param command the command
+	 * @param player the player
+	 * @return
+	 */
+	boolean parseCommunityBoardCommand(String command, L2PcInstance player);
+	
+	/**
+	 * Gets the community board commands.
+	 * @return the community board commands
+	 */
+	String[] getCommunityBoardCommands();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IPunishmentHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IPunishmentHandler.java
new file mode 100644
index 00000000..32793530
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IPunishmentHandler.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.punishment.PunishmentTask;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+
+/**
+ * Punishment Handler interface.
+ * @author UnAfraid
+ */
+public interface IPunishmentHandler {
+	void onStart(PunishmentTask task);
+	
+	void onEnd(PunishmentTask task);
+	
+	PunishmentType getType();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/ITelnetHandler.java b/src/main/java/com/l2jserver/gameserver/handler/ITelnetHandler.java
new file mode 100644
index 00000000..e98e32df
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/ITelnetHandler.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.io.PrintWriter;
+import java.net.Socket;
+
+/**
+ * Telnet Handler interface.
+ * @author UnAfraid
+ */
+public interface ITelnetHandler {
+	/**
+	 * this is the worker method that is called when someone uses an bypass command
+	 * @param command
+	 * @param _print
+	 * @param _cSocket
+	 * @param __uptime
+	 * @return success
+	 */
+	boolean useCommand(String command, PrintWriter _print, Socket _cSocket, int __uptime);
+	
+	/**
+	 * this method is called at initialization to register all bypasses automatically
+	 * @return all known bypasses
+	 */
+	String[] getCommandList();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IUserCommandHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IUserCommandHandler.java
new file mode 100644
index 00000000..8d74786e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IUserCommandHandler.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public interface IUserCommandHandler {
+	/**
+	 * this is the worker method that is called when someone uses an admin command.
+	 * @param id
+	 * @param activeChar
+	 * @return command success
+	 */
+	boolean useUserCommand(int id, L2PcInstance activeChar);
+	
+	/**
+	 * this method is called at initialization to register all the item ids automatically
+	 * @return all known itemIds
+	 */
+	int[] getUserCommandList();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IVoicedCommandHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IVoicedCommandHandler.java
new file mode 100644
index 00000000..aac0a239
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IVoicedCommandHandler.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public interface IVoicedCommandHandler {
+	/**
+	 * this is the worker method that is called when someone uses an admin command.
+	 * @param player
+	 * @param command
+	 * @param params
+	 * @return command success
+	 */
+	boolean useVoicedCommand(String command, L2PcInstance player, String params);
+	
+	/**
+	 * this method is called at initialization to register all the item ids automatically
+	 * @return all known itemIds
+	 */
+	String[] getVoicedCommandList();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/IWriteBoardHandler.java b/src/main/java/com/l2jserver/gameserver/handler/IWriteBoardHandler.java
new file mode 100644
index 00000000..2ba527fa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/IWriteBoardHandler.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Community Board interface.
+ * @author Zoey76
+ */
+public interface IWriteBoardHandler extends IParseBoardHandler {
+	/**
+	 * Writes a community board command into the client.
+	 * @param player the player
+	 * @param arg1 the first argument
+	 * @param arg2 the second argument
+	 * @param arg3 the third argument
+	 * @param arg4 the fourth argument
+	 * @param arg5 the fifth argument
+	 * @return
+	 */
+	boolean writeCommunityBoardCommand(L2PcInstance player, String arg1, String arg2, String arg3, String arg4, String arg5);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/ItemHandler.java b/src/main/java/com/l2jserver/gameserver/handler/ItemHandler.java
new file mode 100644
index 00000000..61854218
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/ItemHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+
+/**
+ * Item handlers.
+ * @author UnAfraid
+ */
+public class ItemHandler implements IHandler<IItemHandler, L2EtcItem> {
+	private final Map<String, IItemHandler> _datatable;
+	
+	protected ItemHandler() {
+		_datatable = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IItemHandler handler) {
+		_datatable.put(handler.getClass().getSimpleName(), handler);
+	}
+	
+	@Override
+	public synchronized void removeHandler(IItemHandler handler) {
+		_datatable.remove(handler.getClass().getSimpleName());
+	}
+	
+	@Override
+	public IItemHandler getHandler(L2EtcItem item) {
+		if ((item == null) || (item.getHandlerName() == null)) {
+			return null;
+		}
+		return _datatable.get(item.getHandlerName());
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	public static ItemHandler getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ItemHandler INSTANCE = new ItemHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/PunishmentHandler.java b/src/main/java/com/l2jserver/gameserver/handler/PunishmentHandler.java
new file mode 100644
index 00000000..61357262
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/PunishmentHandler.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+
+/**
+ * This class manages handlers of punishments.
+ * @author UnAfraid
+ */
+public class PunishmentHandler implements IHandler<IPunishmentHandler, PunishmentType> {
+	private final Map<PunishmentType, IPunishmentHandler> _handlers = new HashMap<>();
+	
+	protected PunishmentHandler() {
+		
+	}
+	
+	@Override
+	public void registerHandler(IPunishmentHandler handler) {
+		_handlers.put(handler.getType(), handler);
+	}
+	
+	@Override
+	public synchronized void removeHandler(IPunishmentHandler handler) {
+		_handlers.remove(handler.getType());
+	}
+	
+	@Override
+	public IPunishmentHandler getHandler(PunishmentType val) {
+		return _handlers.get(val);
+	}
+	
+	@Override
+	public int size() {
+		return _handlers.size();
+	}
+	
+	public static PunishmentHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PunishmentHandler _instance = new PunishmentHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/TelnetHandler.java b/src/main/java/com/l2jserver/gameserver/handler/TelnetHandler.java
new file mode 100644
index 00000000..fa5ec36c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/TelnetHandler.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author UnAfraid
+ */
+public class TelnetHandler implements IHandler<ITelnetHandler, String> {
+	private final Map<String, ITelnetHandler> _telnetHandlers;
+	
+	protected TelnetHandler() {
+		_telnetHandlers = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(ITelnetHandler handler) {
+		for (String element : handler.getCommandList()) {
+			_telnetHandlers.put(element.toLowerCase(), handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(ITelnetHandler handler) {
+		for (String element : handler.getCommandList()) {
+			_telnetHandlers.remove(element.toLowerCase());
+		}
+	}
+	
+	@Override
+	public ITelnetHandler getHandler(String command) {
+		if (command.contains(" ")) {
+			command = command.substring(0, command.indexOf(" "));
+		}
+		
+		return _telnetHandlers.get(command.toLowerCase());
+	}
+	
+	@Override
+	public int size() {
+		return _telnetHandlers.size();
+	}
+	
+	public static TelnetHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final TelnetHandler _instance = new TelnetHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/UserCommandHandler.java b/src/main/java/com/l2jserver/gameserver/handler/UserCommandHandler.java
new file mode 100644
index 00000000..484eb911
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/UserCommandHandler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author UnAfraid
+ */
+public class UserCommandHandler implements IHandler<IUserCommandHandler, Integer> {
+	private final Map<Integer, IUserCommandHandler> _datatable;
+	
+	protected UserCommandHandler() {
+		_datatable = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IUserCommandHandler handler) {
+		int[] ids = handler.getUserCommandList();
+		for (int id : ids) {
+			_datatable.put(id, handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(IUserCommandHandler handler) {
+		int[] ids = handler.getUserCommandList();
+		for (int id : ids) {
+			_datatable.remove(id);
+		}
+	}
+	
+	@Override
+	public IUserCommandHandler getHandler(Integer userCommand) {
+		return _datatable.get(userCommand);
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	public static UserCommandHandler getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final UserCommandHandler _instance = new UserCommandHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java b/src/main/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java
new file mode 100644
index 00000000..95714ad2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author UnAfraid
+ */
+public class VoicedCommandHandler implements IHandler<IVoicedCommandHandler, String> {
+	private final Map<String, IVoicedCommandHandler> _datatable;
+	
+	protected VoicedCommandHandler() {
+		_datatable = new HashMap<>();
+	}
+	
+	@Override
+	public void registerHandler(IVoicedCommandHandler handler) {
+		for (String id : handler.getVoicedCommandList()) {
+			_datatable.put(id, handler);
+		}
+	}
+	
+	@Override
+	public synchronized void removeHandler(IVoicedCommandHandler handler) {
+		for (String id : handler.getVoicedCommandList()) {
+			_datatable.remove(id);
+		}
+	}
+	
+	@Override
+	public IVoicedCommandHandler getHandler(String voicedCommand) {
+		String command = voicedCommand;
+		if (voicedCommand.contains(" ")) {
+			command = voicedCommand.substring(0, voicedCommand.indexOf(" "));
+		}
+		return _datatable.get(command);
+	}
+	
+	@Override
+	public int size() {
+		return _datatable.size();
+	}
+	
+	public static VoicedCommandHandler getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final VoicedCommandHandler INSTANCE = new VoicedCommandHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/idfactory/BitSetIDFactory.java b/src/main/java/com/l2jserver/gameserver/idfactory/BitSetIDFactory.java
new file mode 100644
index 00000000..526f1b23
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/idfactory/BitSetIDFactory.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.idfactory;
+
+import java.util.BitSet;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.util.file.filter.PrimeFinder;
+
+/**
+ * BitSet ID Factory.
+ * @version 2.6.1.0
+ */
+public class BitSetIDFactory extends IdFactory {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(BitSetIDFactory.class);
+	
+	private BitSet _freeIds;
+	
+	private AtomicInteger _freeIdCount;
+	
+	private AtomicInteger _nextFreeId;
+	
+	protected class BitSetCapacityCheck implements Runnable {
+		@Override
+		public void run() {
+			synchronized (BitSetIDFactory.this) {
+				if (reachingBitSetCapacity()) {
+					increaseBitSetCapacity();
+				}
+			}
+		}
+	}
+	
+	protected BitSetIDFactory() {
+		synchronized (BitSetIDFactory.class) {
+			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new BitSetCapacityCheck(), 30000, 30000);
+			initialize();
+		}
+		LOG.info("{} Ids available.", _freeIds.size());
+	}
+	
+	public void initialize() {
+		try {
+			_freeIds = new BitSet(PrimeFinder.nextPrime(100000));
+			_freeIds.clear();
+			_freeIdCount = new AtomicInteger(FREE_OBJECT_ID_SIZE);
+			
+			for (int usedObjectId : extractUsedObjectIDTable()) {
+				int objectID = usedObjectId - FIRST_OID;
+				if (objectID < 0) {
+					LOG.warn("Object Id {} in DB is less than minimum ID of {}!", usedObjectId, FIRST_OID);
+					continue;
+				}
+				_freeIds.set(usedObjectId - FIRST_OID);
+				_freeIdCount.decrementAndGet();
+			}
+			
+			_nextFreeId = new AtomicInteger(_freeIds.nextClearBit(0));
+			_initialized = true;
+		} catch (Exception ex) {
+			_initialized = false;
+			LOG.error("Could not be initialized properly!", ex);
+		}
+	}
+	
+	@Override
+	public synchronized void releaseId(int objectId) {
+		if ((objectId - FIRST_OID) > -1) {
+			_freeIds.clear(objectId - FIRST_OID);
+			_freeIdCount.incrementAndGet();
+		} else {
+			LOG.warn("Release objectID {} failed (< {}).", objectId, FIRST_OID);
+		}
+	}
+	
+	@Override
+	public synchronized int getNextId() {
+		int newID = _nextFreeId.get();
+		_freeIds.set(newID);
+		_freeIdCount.decrementAndGet();
+		
+		int nextFree = _freeIds.nextClearBit(newID);
+		
+		if (nextFree < 0) {
+			nextFree = _freeIds.nextClearBit(0);
+		}
+		if (nextFree < 0) {
+			if (_freeIds.size() < FREE_OBJECT_ID_SIZE) {
+				increaseBitSetCapacity();
+			} else {
+				throw new NullPointerException("Ran out of valid Id's.");
+			}
+		}
+		
+		_nextFreeId.set(nextFree);
+		
+		return newID + FIRST_OID;
+	}
+	
+	@Override
+	public synchronized int size() {
+		return _freeIdCount.get();
+	}
+	
+	/**
+	 * @return
+	 */
+	protected synchronized int usedIdCount() {
+		return (size() - FIRST_OID);
+	}
+	
+	/**
+	 * @return
+	 */
+	protected synchronized boolean reachingBitSetCapacity() {
+		return PrimeFinder.nextPrime((usedIdCount() * 11) / 10) > _freeIds.size();
+	}
+	
+	protected synchronized void increaseBitSetCapacity() {
+		BitSet newBitSet = new BitSet(PrimeFinder.nextPrime((usedIdCount() * 11) / 10));
+		newBitSet.or(_freeIds);
+		_freeIds = newBitSet;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/idfactory/CompactionIDFactory.java b/src/main/java/com/l2jserver/gameserver/idfactory/CompactionIDFactory.java
new file mode 100644
index 00000000..b165e217
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/idfactory/CompactionIDFactory.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.idfactory;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+
+/**
+ * 18.8.2010 - JIV: Disabling until someone update it
+ */
+@Deprecated
+public class CompactionIDFactory extends IdFactory {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CompactionIDFactory.class);
+	
+	private int _curOID;
+	
+	private final int _freeSize;
+	
+	protected CompactionIDFactory() {
+		_curOID = FIRST_OID;
+		_freeSize = 0;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			Integer[] tmp_obj_ids = extractUsedObjectIDTable();
+			
+			int N = tmp_obj_ids.length;
+			for (int idx = 0; idx < N; idx++) {
+				N = insertUntil(tmp_obj_ids, idx, N, con);
+			}
+			_curOID++;
+			LOG.info("Next usable Object Id is {}.", _curOID);
+			_initialized = true;
+		} catch (Exception ex) {
+			LOG.error("Could not initialize properly!", ex);
+		}
+	}
+	
+	private int insertUntil(Integer[] tmp_obj_ids, int idx, int N, Connection con) throws SQLException {
+		int id = tmp_obj_ids[idx];
+		if (id == _curOID) {
+			_curOID++;
+			return N;
+		}
+		// check these IDs not present in DB
+		if (server().badIdChecking()) {
+			for (String check : ID_CHECKS) {
+				try (var ps = con.prepareStatement(check)) {
+					ps.setInt(1, _curOID);
+					ps.setInt(2, id);
+					try (var rs = ps.executeQuery()) {
+						if (rs.next()) {
+							int badId = rs.getInt(1);
+							LOG.error("Bad Id {} in DB found by {}!", badId, check);
+							throw new RuntimeException();
+						}
+					}
+				}
+			}
+		}
+		
+		int hole = id - _curOID;
+		if (hole > (N - idx)) {
+			hole = N - idx;
+		}
+		for (int i = 1; i <= hole; i++) {
+			id = tmp_obj_ids[N - i];
+			LOG.info("Compacting DB object Id={} into {}.", id, _curOID);
+			for (String update : ID_UPDATES) {
+				try (var ps = con.prepareStatement(update)) {
+					ps.setInt(1, _curOID);
+					ps.setInt(2, id);
+					ps.execute();
+				}
+			}
+			_curOID++;
+		}
+		if (hole < (N - idx)) {
+			_curOID++;
+		}
+		return N - hole;
+	}
+	
+	@Override
+	public synchronized int getNextId() {
+		// @formatter:off
+		/*
+		 * if (_freeSize == 0)
+		 */
+			return _curOID++;
+		/*
+		 * else
+		 * 	return _freeOIDs[--_freeSize];
+		 */
+		// @formatter:on
+	}
+	
+	@Override
+	public synchronized void releaseId(int id) {
+		// Don't release Ids until we are sure it isn't messing up
+		// @formatter:off
+		/*
+		 if (_freeSize >= _freeOIDs.length)
+		 {
+		 	int[] tmp = new int[_freeSize + STACK_SIZE_INCREMENT];
+		 	System.arraycopy(_freeOIDs, 0, tmp, 0, _freeSize);
+		 	_freeOIDs = tmp;
+		 }
+		 _freeOIDs[_freeSize++] = id;
+		 */
+		// @formatter:on
+	}
+	
+	@Override
+	public int size() {
+		return (_freeSize + LAST_OID) - FIRST_OID;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/idfactory/IdFactory.java b/src/main/java/com/l2jserver/gameserver/idfactory/IdFactory.java
new file mode 100644
index 00000000..b0d2d138
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/idfactory/IdFactory.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.idfactory;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+
+/**
+ * Id Factory.
+ * @version 2.6.1.0
+ */
+public abstract class IdFactory {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(IdFactory.class);
+	
+	@Deprecated
+	protected static final String[] ID_UPDATES = {
+		"UPDATE items                 SET owner_id = ?    WHERE owner_id = ?",
+		"UPDATE items                 SET object_id = ?   WHERE object_id = ?",
+		"UPDATE character_quests      SET charId = ?     WHERE charId = ?",
+		"UPDATE character_contacts     SET charId = ?     WHERE charId = ?",
+		"UPDATE character_contacts     SET friendId = ?   WHERE contactId = ?",
+		"UPDATE character_friends     SET charId = ?     WHERE charId = ?",
+		"UPDATE character_friends     SET friendId = ?   WHERE friendId = ?",
+		"UPDATE character_hennas      SET charId = ? WHERE charId = ?",
+		"UPDATE character_recipebook  SET charId = ? WHERE charId = ?",
+		"UPDATE character_recipeshoplist  SET charId = ? WHERE charId = ?",
+		"UPDATE character_shortcuts   SET charId = ? WHERE charId = ?",
+		"UPDATE character_shortcuts   SET shortcut_id = ? WHERE shortcut_id = ? AND type = 1", // items
+		"UPDATE character_macroses    SET charId = ? WHERE charId = ?",
+		"UPDATE character_skills      SET charId = ? WHERE charId = ?",
+		"UPDATE character_skills_save SET charId = ? WHERE charId = ?",
+		"UPDATE character_subclasses  SET charId = ? WHERE charId = ?",
+		"UPDATE character_ui_actions  SET charId = ? WHERE charId = ?",
+		"UPDATE character_ui_categories  SET charId = ? WHERE charId = ?",
+		"UPDATE characters            SET charId = ? WHERE charId = ?",
+		"UPDATE characters            SET clanid = ?      WHERE clanid = ?",
+		"UPDATE clan_data             SET clan_id = ?     WHERE clan_id = ?",
+		"UPDATE siege_clans           SET clan_id = ?     WHERE clan_id = ?",
+		"UPDATE clan_data             SET ally_id = ?     WHERE ally_id = ?",
+		"UPDATE clan_data             SET leader_id = ?   WHERE leader_id = ?",
+		"UPDATE pets                  SET item_obj_id = ? WHERE item_obj_id = ?",
+		"UPDATE character_hennas     SET charId = ? WHERE charId = ?",
+		"UPDATE itemsonground         SET object_id = ?   WHERE object_id = ?",
+		"UPDATE auction_bid          SET bidderId = ?      WHERE bidderId = ?",
+		"UPDATE auction_watch        SET charObjId = ?     WHERE charObjId = ?",
+		"UPDATE olympiad_fights        SET charOneId = ?     WHERE charOneId = ?",
+		"UPDATE olympiad_fights        SET charTwoId = ?     WHERE charTwoId = ?",
+		"UPDATE heroes_diary        SET charId = ?     WHERE charId = ?",
+		"UPDATE olympiad_nobles        SET charId = ?     WHERE charId = ?",
+		"UPDATE character_offline_trade SET charId = ?     WHERE charId = ?",
+		"UPDATE character_offline_trade_items SET charId = ? WHERE charId = ?",
+		"UPDATE clanhall             SET ownerId = ?       WHERE ownerId = ?"
+	};
+	
+	protected static final String[] ID_CHECKS = {
+		"SELECT owner_id    FROM items                 WHERE object_id >= ?   AND object_id < ?",
+		"SELECT object_id   FROM items                 WHERE object_id >= ?   AND object_id < ?",
+		"SELECT charId     FROM character_quests      WHERE charId >= ?     AND charId < ?",
+		"SELECT charId     FROM character_contacts    WHERE charId >= ?     AND charId < ?",
+		"SELECT contactId  FROM character_contacts    WHERE contactId >= ?  AND contactId < ?",
+		"SELECT charId     FROM character_friends     WHERE charId >= ?     AND charId < ?",
+		"SELECT charId     FROM character_friends     WHERE friendId >= ?   AND friendId < ?",
+		"SELECT charId     FROM character_hennas      WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_recipebook  WHERE charId >= ?     AND charId < ?",
+		"SELECT charId     FROM character_recipeshoplist  WHERE charId >= ?     AND charId < ?",
+		"SELECT charId     FROM character_shortcuts   WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_macroses    WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_skills      WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_skills_save WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_subclasses  WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_ui_actions  WHERE charId >= ? AND charId < ?",
+		"SELECT charId     FROM character_ui_categories  WHERE charId >= ? AND charId < ?",
+		"SELECT charId      FROM characters            WHERE charId >= ?      AND charId < ?",
+		"SELECT clanid      FROM characters            WHERE clanid >= ?      AND clanid < ?",
+		"SELECT clan_id     FROM clan_data             WHERE clan_id >= ?     AND clan_id < ?",
+		"SELECT clan_id     FROM siege_clans           WHERE clan_id >= ?     AND clan_id < ?",
+		"SELECT ally_id     FROM clan_data             WHERE ally_id >= ?     AND ally_id < ?",
+		"SELECT leader_id   FROM clan_data             WHERE leader_id >= ?   AND leader_id < ?",
+		"SELECT item_obj_id FROM pets                  WHERE item_obj_id >= ? AND item_obj_id < ?",
+		"SELECT object_id   FROM itemsonground        WHERE object_id >= ?   AND object_id < ?"
+	};
+	
+	//@formatter:off
+	private static final String[][] ID_EXTRACTS =
+	{
+		{"characters","charId"},
+		{"items","object_id"},
+		{"clan_data","clan_id"},
+		{"itemsonground","object_id"},
+		{"messages","messageId"}
+	};
+	//@formatter:on
+	
+	private static final String[] TIMESTAMPS_CLEAN = {
+		"DELETE FROM character_instance_time WHERE time <= ?",
+		"DELETE FROM character_skills_save WHERE restore_type = 1 AND systime <= ?"
+	};
+	
+	protected boolean _initialized;
+	
+	public static final int FIRST_OID = 0x10000000;
+	public static final int LAST_OID = 0x7FFFFFFF;
+	public static final int FREE_OBJECT_ID_SIZE = LAST_OID - FIRST_OID;
+	
+	protected static IdFactory _instance;
+	
+	protected IdFactory() {
+		setAllCharacterOffline();
+		if (general().databaseCleanUp()) {
+			if (customs().allowWedding()) {
+				cleanInvalidWeddings();
+			}
+			cleanUpDB();
+		}
+		cleanUpTimeStamps();
+	}
+	
+	static {
+		switch (server().getIdFactory()) {
+			case BitSet -> _instance = new BitSetIDFactory();
+			case Stack -> _instance = new StackIDFactory();
+			case Compaction -> throw new UnsupportedOperationException("Compaction IdFactory is disabled.");
+		}
+	}
+	
+	private void setAllCharacterOffline() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate("UPDATE characters SET online = 0");
+			LOG.info("Updated characters online status.");
+		} catch (Exception ex) {
+			LOG.warn("Could not update characters online status!", ex);
+		}
+	}
+	
+	private void cleanUpDB() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var stmt = con.createStatement()) {
+			long cleanupStart = System.currentTimeMillis();
+			int cleanCount = 0;
+			// Misc/Account Related
+			// Please read the descriptions above each before uncommenting them. If you are still
+			// unsure of what exactly it does, leave it commented out. This is for those who know
+			// what they are doing. :)
+			
+			// Deletes only accounts that HAVE been logged into and have no characters associated
+			// with the account.
+			// cleanCount +=
+			// stmt.executeUpdate("DELETE FROM accounts WHERE accounts.lastactive > 0 AND accounts.login NOT IN (SELECT account_name FROM characters);");
+			
+			// Deletes any accounts that don't have characters. Whether or not the player has ever
+			// logged into the account.
+			// cleanCount +=
+			// stmt.executeUpdate("DELETE FROM accounts WHERE accounts.login NOT IN (SELECT account_name FROM characters);");
+			
+			// Deletes banned accounts that have not been logged into for xx amount of days
+			// (specified at the end of the script, default is set to 90 days). This prevents
+			// accounts from being deleted that were accidentally or temporarily banned.
+			// cleanCount +=
+			// stmt.executeUpdate("DELETE FROM accounts WHERE accounts.accessLevel < 0 AND DATEDIFF(CURRENT_DATE( ) , FROM_UNIXTIME(`lastactive`/1000)) > 90;");
+			// cleanCount +=
+			// stmt.executeUpdate("DELETE FROM characters WHERE characters.account_name NOT IN (SELECT login FROM accounts);");
+			
+			// If the character does not exist...
+			cleanCount += stmt.executeUpdate("DELETE FROM account_gsdata WHERE account_gsdata.account_name NOT IN (SELECT account_name FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_contacts WHERE character_contacts.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_contacts WHERE character_contacts.contactId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_friends WHERE character_friends.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_friends WHERE character_friends.friendId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_hennas WHERE character_hennas.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_macroses WHERE character_macroses.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_quests WHERE character_quests.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_recipebook WHERE character_recipebook.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_recipeshoplist WHERE character_recipeshoplist.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_shortcuts WHERE character_shortcuts.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_skills WHERE character_skills.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_skills_save WHERE character_skills_save.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_subclasses WHERE character_subclasses.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_raid_points WHERE character_raid_points.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_instance_time WHERE character_instance_time.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_ui_actions WHERE character_ui_actions.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_ui_categories WHERE character_ui_categories.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM items WHERE items.owner_id NOT IN (SELECT charId FROM characters) AND items.owner_id NOT IN (SELECT clan_id FROM clan_data) AND items.owner_id != -1;");
+			cleanCount += stmt.executeUpdate("DELETE FROM items WHERE items.owner_id = -1 AND loc LIKE 'MAIL' AND loc_data NOT IN (SELECT messageId FROM messages WHERE senderId = -1);");
+			cleanCount += stmt.executeUpdate("DELETE FROM item_auction_bid WHERE item_auction_bid.playerObjId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM item_attributes WHERE item_attributes.itemId NOT IN (SELECT object_id FROM items);");
+			cleanCount += stmt.executeUpdate("DELETE FROM item_elementals WHERE item_elementals.itemId NOT IN (SELECT object_id FROM items);");
+			cleanCount += stmt.executeUpdate("DELETE FROM cursed_weapons WHERE cursed_weapons.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM heroes WHERE heroes.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM olympiad_nobles WHERE olympiad_nobles.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM olympiad_nobles_eom WHERE olympiad_nobles_eom.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM pets WHERE pets.item_obj_id NOT IN (SELECT object_id FROM items);");
+			cleanCount += stmt.executeUpdate("DELETE FROM seven_signs WHERE seven_signs.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM merchant_lease WHERE merchant_lease.player_id NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_reco_bonus WHERE character_reco_bonus.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_data WHERE clan_data.leader_id NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_data WHERE clan_data.clan_id NOT IN (SELECT clanid FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM olympiad_fights WHERE olympiad_fights.charOneId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM olympiad_fights WHERE olympiad_fights.charTwoId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM heroes_diary WHERE heroes_diary.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_offline_trade WHERE character_offline_trade.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_offline_trade_items WHERE character_offline_trade_items.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_quest_global_data WHERE character_quest_global_data.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_tpbookmark WHERE character_tpbookmark.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_variables WHERE character_variables.charId NOT IN (SELECT charId FROM characters);");
+			
+			// If the clan does not exist...
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_privs WHERE clan_privs.clan_id NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_skills WHERE clan_skills.clan_id NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_subpledges WHERE clan_subpledges.clan_id NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_wars WHERE clan_wars.clan1 NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_wars WHERE clan_wars.clan2 NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clanhall_functions WHERE clanhall_functions.hall_id NOT IN (SELECT id FROM clanhall WHERE ownerId <> 0 union all SELECT clanHallId FROM siegable_clanhall WHERE ownerId <> 0);");
+			cleanCount += stmt.executeUpdate("DELETE FROM siege_clans WHERE siege_clans.clan_id NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM clan_notices WHERE clan_notices.clan_id NOT IN (SELECT clan_id FROM clan_data);");
+			cleanCount += stmt.executeUpdate("DELETE FROM auction_bid WHERE auction_bid.bidderId NOT IN (SELECT clan_id FROM clan_data);");
+			// Untested, leaving commented out until confirmation that it's safe/works properly. Was
+			// initially removed because of a bug. Search for idfactory.java changes in the trac for
+			// further info.
+			// cleanCount +=
+			// stmt.executeUpdate("DELETE FROM auction WHERE auction.id IN (SELECT id FROM clanhall WHERE ownerId <> 0) AND auction.sellerId=0;");
+			// cleanCount +=
+			// stmt.executeUpdate("DELETE FROM auction_bid WHERE auctionId NOT IN (SELECT id FROM auction)");
+			
+			// Forum Related
+			cleanCount += stmt.executeUpdate("DELETE FROM forums WHERE forums.forum_owner_id NOT IN (SELECT clan_id FROM clan_data) AND forums.forum_parent=2;");
+			cleanCount += stmt.executeUpdate("DELETE FROM forums WHERE forums.forum_owner_id NOT IN (SELECT charId FROM characters) AND forums.forum_parent=3;");
+			cleanCount += stmt.executeUpdate("DELETE FROM posts WHERE posts.post_forum_id NOT IN (SELECT forum_id FROM forums);");
+			cleanCount += stmt.executeUpdate("DELETE FROM topic WHERE topic.topic_forum_id NOT IN (SELECT forum_id FROM forums);");
+			
+			// Update needed items after cleaning has taken place.
+			stmt.executeUpdate("UPDATE clan_data SET auction_bid_at = 0 WHERE auction_bid_at NOT IN (SELECT auctionId FROM auction_bid);");
+			stmt.executeUpdate("UPDATE clan_data SET new_leader_id = 0 WHERE new_leader_id <> 0 AND new_leader_id NOT IN (SELECT charId FROM characters);");
+			stmt.executeUpdate("UPDATE clan_subpledges SET leader_id=0 WHERE clan_subpledges.leader_id NOT IN (SELECT charId FROM characters) AND leader_id > 0;");
+			stmt.executeUpdate("UPDATE castle SET taxpercent=0 WHERE castle.id NOT IN (SELECT hasCastle FROM clan_data);");
+			stmt.executeUpdate("UPDATE characters SET clanid=0, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0, clan_join_expiry_time=0, clan_create_expiry_time=0 WHERE characters.clanid > 0 AND characters.clanid NOT IN (SELECT clan_id FROM clan_data);");
+			stmt.executeUpdate("UPDATE clanhall SET ownerId=0, paidUntil=0, paid=0 WHERE clanhall.ownerId NOT IN (SELECT clan_id FROM clan_data);");
+			stmt.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);");
+			
+			LOG.info("Cleaned {} elements from database in {}s.", cleanCount, (System.currentTimeMillis() - cleanupStart) / 1000);
+		} catch (Exception ex) {
+			LOG.warn("Could not clean up database!", ex);
+		}
+	}
+	
+	private void cleanInvalidWeddings() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate("DELETE FROM mods_wedding WHERE player1Id NOT IN (SELECT charId FROM characters)");
+			s.executeUpdate("DELETE FROM mods_wedding WHERE player2Id NOT IN (SELECT charId FROM characters)");
+			LOG.info("Cleaned up invalid weddings.");
+		} catch (Exception ex) {
+			LOG.warn("Could not clean up invalid weddings!", ex);
+		}
+	}
+	
+	private void cleanUpTimeStamps() {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			int cleanCount = 0;
+			for (String line : TIMESTAMPS_CLEAN) {
+				try (var stmt = con.prepareStatement(line)) {
+					stmt.setLong(1, System.currentTimeMillis());
+					cleanCount += stmt.executeUpdate();
+				}
+			}
+			LOG.info("Cleaned {} expired timestamps from database.", cleanCount);
+		} catch (Exception e) {
+		}
+	}
+	
+	protected final Integer[] extractUsedObjectIDTable() throws Exception {
+		final List<Integer> temp = new ArrayList<>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			
+			String extractUsedObjectIdsQuery = "";
+			
+			for (String[] tblClmn : ID_EXTRACTS) {
+				extractUsedObjectIdsQuery += "SELECT " + tblClmn[1] + " FROM " + tblClmn[0] + " UNION ";
+			}
+			
+			extractUsedObjectIdsQuery = extractUsedObjectIdsQuery.substring(0, extractUsedObjectIdsQuery.length() - 7); // Remove the last " UNION "
+			try (var rs = s.executeQuery(extractUsedObjectIdsQuery)) {
+				while (rs.next()) {
+					temp.add(rs.getInt(1));
+				}
+			}
+		}
+		Collections.sort(temp);
+		return temp.toArray(new Integer[temp.size()]);
+	}
+	
+	public boolean isInitialized() {
+		return _initialized;
+	}
+	
+	public static IdFactory getInstance() {
+		return _instance;
+	}
+	
+	public abstract int getNextId();
+	
+	/**
+	 * return a used Object ID back to the pool
+	 * @param id
+	 */
+	public abstract void releaseId(int id);
+	
+	public abstract int size();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/idfactory/IdFactoryType.java b/src/main/java/com/l2jserver/gameserver/idfactory/IdFactoryType.java
new file mode 100644
index 00000000..04384243
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/idfactory/IdFactoryType.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.idfactory;
+
+/**
+ * Id Factory Type.
+ * @author Zoey76
+ * @version 2.6.1.0
+ */
+public enum IdFactoryType {
+	Compaction,
+	BitSet,
+	Stack
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/idfactory/StackIDFactory.java b/src/main/java/com/l2jserver/gameserver/idfactory/StackIDFactory.java
new file mode 100644
index 00000000..cf0bb462
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/idfactory/StackIDFactory.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.idfactory;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Stack;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+
+/**
+ * Stack ID Factory.
+ * @version 2.6.1.0
+ */
+public class StackIDFactory extends IdFactory {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(IdFactory.class);
+	
+	private int _curOID;
+	
+	private int _tempOID;
+	
+	private final Stack<Integer> _freeOIDStack = new Stack<>();
+	
+	protected StackIDFactory() {
+		_curOID = FIRST_OID;
+		_tempOID = FIRST_OID;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			Integer[] tmp_obj_ids = extractUsedObjectIDTable();
+			if (tmp_obj_ids.length > 0) {
+				_curOID = tmp_obj_ids[tmp_obj_ids.length - 1];
+			}
+			LOG.info("Max Id = {}.", _curOID);
+			
+			int N = tmp_obj_ids.length;
+			for (int idx = 0; idx < N; idx++) {
+				N = insertUntil(tmp_obj_ids, idx, N, con);
+			}
+			
+			_curOID++;
+			LOG.info("Next usable Object Id is {}.", _curOID);
+			_initialized = true;
+		} catch (Exception ex) {
+			LOG.error("Could not be initialized properly!", ex);
+		}
+	}
+	
+	private int insertUntil(Integer[] tmp_obj_ids, int idx, int N, Connection con) throws SQLException {
+		int id = tmp_obj_ids[idx];
+		if (id == _tempOID) {
+			_tempOID++;
+			return N;
+		}
+		// check these IDs not present in DB
+		if (server().badIdChecking()) {
+			for (String check : ID_CHECKS) {
+				try (var ps = con.prepareStatement(check)) {
+					ps.setInt(1, _tempOID);
+					// ps.setInt(1, _curOID);
+					ps.setInt(2, id);
+					try (var rs = ps.executeQuery()) {
+						if (rs.next()) {
+							int badId = rs.getInt(1);
+							LOG.error("Bad Id {} in DB found by {}!", badId, check);
+							throw new RuntimeException();
+						}
+					}
+				}
+			}
+		}
+		
+		// int hole = id - _curOID;
+		int hole = id - _tempOID;
+		if (hole > (N - idx)) {
+			hole = N - idx;
+		}
+		for (int i = 1; i <= hole; i++) {
+			// log.info("Free ID added " + (_tempOID));
+			_freeOIDStack.push(_tempOID);
+			_tempOID++;
+			// _curOID++;
+		}
+		if (hole < (N - idx)) {
+			_tempOID++;
+		}
+		return N - hole;
+	}
+	
+	public static IdFactory getInstance() {
+		return _instance;
+	}
+	
+	@Override
+	public synchronized int getNextId() {
+		int id;
+		if (!_freeOIDStack.empty()) {
+			id = _freeOIDStack.pop();
+		} else {
+			id = _curOID;
+			_curOID = _curOID + 1;
+		}
+		return id;
+	}
+	
+	/**
+	 * return a used Object ID back to the pool
+	 * @param id
+	 */
+	@Override
+	public synchronized void releaseId(int id) {
+		_freeOIDStack.push(id);
+	}
+	
+	@Override
+	public int size() {
+		return (FREE_OBJECT_ID_SIZE - _curOID) + FIRST_OID + _freeOIDStack.size();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java
new file mode 100644
index 00000000..290380bf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.AirShipTeleportList;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.VehiclePathPoint;
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ExAirShipTeleportList;
+
+public class AirShipManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AirShipManager.class);
+	
+	private static final String LOAD_DB = "SELECT * FROM airships";
+	private static final String ADD_DB = "INSERT INTO airships (owner_id,fuel) VALUES (?,?)";
+	private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?";
+	
+	private final L2CharTemplate _airShipTemplate;
+	private final Map<Integer, StatsSet> _airShipsInfo = new HashMap<>();
+	private final Map<Integer, L2AirShipInstance> _airShips = new HashMap<>();
+	private final Map<Integer, AirShipTeleportList> _teleports = new HashMap<>();
+	
+	protected AirShipManager() {
+		StatsSet npcDat = new StatsSet();
+		npcDat.set("npcId", 9);
+		npcDat.set("level", 0);
+		npcDat.set("jClass", "boat");
+		
+		npcDat.set("baseSTR", 0);
+		npcDat.set("baseCON", 0);
+		npcDat.set("baseDEX", 0);
+		npcDat.set("baseINT", 0);
+		npcDat.set("baseWIT", 0);
+		npcDat.set("baseMEN", 0);
+		
+		npcDat.set("baseShldDef", 0);
+		npcDat.set("baseShldRate", 0);
+		npcDat.set("baseAccCombat", 38);
+		npcDat.set("baseEvasRate", 38);
+		npcDat.set("baseCritRate", 38);
+		
+		npcDat.set("collisionRadius", 0);
+		npcDat.set("collisionHeight", 0);
+		npcDat.set("sex", "male");
+		npcDat.set("type", "");
+		npcDat.set("baseAtkRange", 0);
+		npcDat.set("baseMpMax", 0);
+		npcDat.set("baseCpMax", 0);
+		npcDat.set("rewardExp", 0);
+		npcDat.set("rewardSp", 0);
+		npcDat.set("basePAtk", 0);
+		npcDat.set("baseMAtk", 0);
+		npcDat.set("basePAtkSpd", 0);
+		npcDat.set("aggroRange", 0);
+		npcDat.set("baseMAtkSpd", 0);
+		npcDat.set("rhand", 0);
+		npcDat.set("lhand", 0);
+		npcDat.set("armor", 0);
+		npcDat.set("baseWalkSpd", 0);
+		npcDat.set("baseRunSpd", 0);
+		npcDat.set("name", "AirShip");
+		npcDat.set("baseHpMax", 50000);
+		npcDat.set("baseHpReg", 3.e-3f);
+		npcDat.set("baseMpReg", 3.e-3f);
+		npcDat.set("basePDef", 100);
+		npcDat.set("baseMDef", 100);
+		_airShipTemplate = new L2CharTemplate(npcDat);
+		
+		load();
+	}
+	
+	public L2AirShipInstance getNewAirShip(int x, int y, int z, int heading) {
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var airShip = new L2AirShipInstance(objectId, _airShipTemplate);
+		airShip.setHeading(heading);
+		airShip.setXYZInvisible(x, y, z);
+		airShip.spawnMe();
+		airShip.getStat().setMoveSpeed(280);
+		airShip.getStat().setRotationSpeed(2000);
+		return airShip;
+	}
+	
+	public L2AirShipInstance getNewAirShip(int x, int y, int z, int heading, int ownerId) {
+		final StatsSet info = _airShipsInfo.get(ownerId);
+		if (info == null) {
+			return null;
+		}
+		
+		final L2AirShipInstance airShip;
+		if (_airShips.containsKey(ownerId)) {
+			airShip = _airShips.get(ownerId);
+			airShip.refreshID();
+		} else {
+			final var objectId = IdFactory.getInstance().getNextId();
+			airShip = new L2ControllableAirShipInstance(objectId, _airShipTemplate, ownerId);
+			_airShips.put(ownerId, airShip);
+			
+			airShip.setMaxFuel(600);
+			airShip.setFuel(info.getInt("fuel"));
+			airShip.getStat().setMoveSpeed(280);
+			airShip.getStat().setRotationSpeed(2000);
+		}
+		
+		airShip.setHeading(heading);
+		airShip.setXYZInvisible(x, y, z);
+		airShip.spawnMe();
+		return airShip;
+	}
+	
+	public void removeAirShip(L2AirShipInstance ship) {
+		if (ship.getOwnerId() != 0) {
+			storeInDb(ship.getOwnerId());
+			final StatsSet info = _airShipsInfo.get(ship.getOwnerId());
+			if (info != null) {
+				info.set("fuel", ship.getFuel());
+			}
+		}
+	}
+	
+	public boolean hasAirShipLicense(int ownerId) {
+		return _airShipsInfo.containsKey(ownerId);
+	}
+	
+	public void registerLicense(int ownerId) {
+		if (!_airShipsInfo.containsKey(ownerId)) {
+			final StatsSet info = new StatsSet();
+			info.set("fuel", 600);
+			
+			_airShipsInfo.put(ownerId, info);
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(ADD_DB)) {
+				ps.setInt(1, ownerId);
+				ps.setInt(2, info.getInt("fuel"));
+				ps.executeUpdate();
+			} catch (Exception ex) {
+				LOG.warn("Could not add new airship license!", ex);
+			}
+		}
+	}
+	
+	public boolean hasAirShip(int ownerId) {
+		final L2AirShipInstance ship = _airShips.get(ownerId);
+		return (ship != null) && (ship.isVisible() || ship.isTeleporting());
+	}
+	
+	public void registerAirShipTeleportList(int dockId, int locationId, VehiclePathPoint[][] tp, int[] fuelConsumption) {
+		if (tp.length != fuelConsumption.length) {
+			return;
+		}
+		
+		_teleports.put(dockId, new AirShipTeleportList(locationId, fuelConsumption, tp));
+	}
+	
+	public void sendAirShipTeleportList(L2PcInstance player) {
+		if ((player == null) || !player.isInAirShip()) {
+			return;
+		}
+		
+		final L2AirShipInstance ship = player.getAirShip();
+		if (!ship.isCaptain(player) || !ship.isInDock() || ship.isMoving()) {
+			return;
+		}
+		
+		int dockId = ship.getDockId();
+		if (!_teleports.containsKey(dockId)) {
+			return;
+		}
+		
+		final AirShipTeleportList all = _teleports.get(dockId);
+		player.sendPacket(new ExAirShipTeleportList(all.getLocation(), all.getRoute(), all.getFuel()));
+	}
+	
+	public VehiclePathPoint[] getTeleportDestination(int dockId, int index) {
+		final AirShipTeleportList all = _teleports.get(dockId);
+		if (all == null) {
+			return null;
+		}
+		
+		if ((index < -1) || (index >= all.getRoute().length)) {
+			return null;
+		}
+		
+		return all.getRoute()[index + 1];
+	}
+	
+	public int getFuelConsumption(int dockId, int index) {
+		final AirShipTeleportList all = _teleports.get(dockId);
+		if (all == null) {
+			return 0;
+		}
+		
+		if ((index < -1) || (index >= all.getFuel().length)) {
+			return 0;
+		}
+		
+		return all.getFuel()[index + 1];
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(LOAD_DB)) {
+			StatsSet info;
+			while (rs.next()) {
+				info = new StatsSet();
+				info.set("fuel", rs.getInt("fuel"));
+				_airShipsInfo.put(rs.getInt("owner_id"), info);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not load airships table!", ex);
+		}
+		LOG.info("Loaded {} private airships.", _airShipsInfo.size());
+	}
+	
+	private void storeInDb(int ownerId) {
+		StatsSet info = _airShipsInfo.get(ownerId);
+		if (info == null) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_DB)) {
+			ps.setInt(1, info.getInt("fuel"));
+			ps.setInt(2, ownerId);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not update airships table!", ex);
+		}
+	}
+	
+	public static AirShipManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AirShipManager _instance = new AirShipManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java
new file mode 100644
index 00000000..968f1e1a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+public final class AntiFeedManager {
+	public static final int GAME_ID = 0;
+	public static final int OLYMPIAD_ID = 1;
+	public static final int TVT_ID = 2;
+	public static final int L2EVENT_ID = 3;
+	
+	private final Map<Integer, Long> _lastDeathTimes = new ConcurrentHashMap<>();
+	private final Map<Integer, Map<Integer, AtomicInteger>> _eventIPs = new ConcurrentHashMap<>();
+	
+	protected AntiFeedManager() {
+	}
+	
+	/**
+	 * Set time of the last player's death to current
+	 * @param objectId Player's objectId
+	 */
+	public void setLastDeathTime(int objectId) {
+		_lastDeathTimes.put(objectId, System.currentTimeMillis());
+	}
+	
+	/**
+	 * Check if current kill should be counted as non-feeded.
+	 * @param attacker Attacker character
+	 * @param target Target character
+	 * @return True if kill is non-feeded.
+	 */
+	public boolean check(L2Character attacker, L2Character target) {
+		if (!customs().antiFeedEnable()) {
+			return true;
+		}
+		
+		if (target == null) {
+			return false;
+		}
+		
+		final var targetPlayer = target.getActingPlayer();
+		if (targetPlayer == null) {
+			return false;
+		}
+		
+		if ((customs().getAntiFeedInterval() > 0) && _lastDeathTimes.containsKey(targetPlayer.getObjectId())) {
+			if ((System.currentTimeMillis() - _lastDeathTimes.get(targetPlayer.getObjectId())) < SECONDS.toMillis(customs().getAntiFeedInterval())) {
+				return false;
+			}
+		}
+		
+		if (customs().antiFeedDualbox() && (attacker != null)) {
+			final var attackerPlayer = attacker.getActingPlayer();
+			if (attackerPlayer == null) {
+				return false;
+			}
+			
+			final var targetClient = targetPlayer.getClient();
+			final var attackerClient = attackerPlayer.getClient();
+			if ((targetClient == null) || (attackerClient == null) || targetClient.isDetached() || attackerClient.isDetached()) {
+				// unable to check ip address
+				return !customs().antiFeedDisconnectedAsDualbox();
+			}
+			
+			return !targetClient.getConnectionAddress().equals(attackerClient.getConnectionAddress());
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Clears all timestamps
+	 */
+	public void clear() {
+		_lastDeathTimes.clear();
+	}
+	
+	/**
+	 * Register new event for dualbox check. Should be called only once.
+	 * @param eventId
+	 */
+	public void registerEvent(int eventId) {
+		_eventIPs.putIfAbsent(eventId, new ConcurrentHashMap<>());
+	}
+	
+	/**
+	 * @param eventId
+	 * @param player
+	 * @param max
+	 * @return If number of all simultaneous connections from player's IP address lower than max then increment connection count and return true.<br>
+	 *         False if number of all simultaneous connections from player's IP address higher than max.
+	 */
+	public boolean tryAddPlayer(int eventId, L2PcInstance player, int max) {
+		return tryAddClient(eventId, player.getClient(), max);
+	}
+	
+	/**
+	 * @param eventId
+	 * @param client
+	 * @param max
+	 * @return If number of all simultaneous connections from player's IP address lower than max then increment connection count and return true.<br>
+	 *         False if number of all simultaneous connections from player's IP address higher than max.
+	 */
+	public boolean tryAddClient(int eventId, L2GameClient client, int max) {
+		if (client == null) {
+			return false; // unable to determine IP address
+		}
+		
+		final var event = _eventIPs.get(eventId);
+		if (event == null) {
+			return false; // no such event registered
+		}
+		
+		final var addrHash = client.getConnectionAddress().hashCode();
+		final var connectionCount = event.computeIfAbsent(addrHash, _ -> new AtomicInteger());
+		final int whiteListCount = customs().getDualboxCheckWhitelist().getOrDefault(addrHash, 0);
+		if (whiteListCount < 0) {
+			connectionCount.incrementAndGet();
+			return true;
+		}
+		
+		final var limit = max + whiteListCount;
+		return connectionCount.getAndUpdate(current -> current < limit ? current + 1 : current) < limit;
+	}
+	
+	/**
+	 * Decreasing number of active connection from player's IP address
+	 * @param eventId
+	 * @param player
+	 * @return true if success and false if any problem detected.
+	 */
+	public boolean removePlayer(int eventId, L2PcInstance player) {
+		return removeClient(eventId, player.getClient());
+	}
+	
+	/**
+	 * Decreasing number of active connection from player's IP address
+	 * @param eventId
+	 * @param client
+	 * @return true if success and false if any problem detected.
+	 */
+	public boolean removeClient(int eventId, L2GameClient client) {
+		if (client == null) {
+			return false; // unable to determine IP address
+		}
+		
+		final var event = _eventIPs.get(eventId);
+		if (event == null) {
+			return false; // no such event registered
+		}
+		
+		final var addrHash = client.getConnectionAddress().hashCode();
+		
+		return event.computeIfPresent(addrHash, (_, v) -> {
+			if (v.decrementAndGet() == 0) {
+				return null;
+			}
+			return v;
+		}) != null;
+	}
+	
+	/**
+	 * Remove player connection IP address from all registered events lists.
+	 * @param client
+	 */
+	public void onDisconnect(L2GameClient client) {
+		if (client == null) {
+			return;
+		}
+		
+		_eventIPs.forEach((k, _) -> removeClient(k, client));
+	}
+	
+	/**
+	 * Clear all entries for this eventId.
+	 * @param eventId
+	 */
+	public void clear(int eventId) {
+		final Map<Integer, AtomicInteger> event = _eventIPs.get(eventId);
+		if (event != null) {
+			event.clear();
+		}
+	}
+	
+	/**
+	 * @param player
+	 * @param max
+	 * @return maximum number of allowed connections (whitelist + max)
+	 */
+	public int getLimit(L2PcInstance player, int max) {
+		return getLimit(player.getClient(), max);
+	}
+	
+	/**
+	 * @param client
+	 * @param max
+	 * @return maximum number of allowed connections (whitelist + max)
+	 */
+	public int getLimit(L2GameClient client, int max) {
+		if (client == null) {
+			return max;
+		}
+		
+		final var addrHash = client.getConnectionAddress().hashCode();
+		int limit = max;
+		if (customs().getDualboxCheckWhitelist().containsKey(addrHash)) {
+			limit += customs().getDualboxCheckWhitelist().get(addrHash);
+		}
+		return limit;
+	}
+	
+	public static AntiFeedManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AntiFeedManager _instance = new AntiFeedManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java
new file mode 100644
index 00000000..6678abdd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.entity.Auction;
+
+/**
+ * Zoey76: TODO: Rewrite it and unharcode it.
+ */
+public final class AuctionManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AuctionManager.class);
+	
+	private final List<Auction> _auctions = new ArrayList<>();
+	
+	private static final String[] ITEM_INIT_DATA = {
+		"(22, 0, 'NPC', 'NPC Clan', 'ClanHall', 22, 0, 'Moonstone Hall', 1, 20000000, 0, 1073037600000)",
+		"(23, 0, 'NPC', 'NPC Clan', 'ClanHall', 23, 0, 'Onyx Hall', 1, 20000000, 0, 1073037600000)",
+		"(24, 0, 'NPC', 'NPC Clan', 'ClanHall', 24, 0, 'Topaz Hall', 1, 20000000, 0, 1073037600000)",
+		"(25, 0, 'NPC', 'NPC Clan', 'ClanHall', 25, 0, 'Ruby Hall', 1, 20000000, 0, 1073037600000)",
+		"(26, 0, 'NPC', 'NPC Clan', 'ClanHall', 26, 0, 'Crystal Hall', 1, 20000000, 0, 1073037600000)",
+		"(27, 0, 'NPC', 'NPC Clan', 'ClanHall', 27, 0, 'Onyx Hall', 1, 20000000, 0, 1073037600000)",
+		"(28, 0, 'NPC', 'NPC Clan', 'ClanHall', 28, 0, 'Sapphire Hall', 1, 20000000, 0, 1073037600000)",
+		"(29, 0, 'NPC', 'NPC Clan', 'ClanHall', 29, 0, 'Moonstone Hall', 1, 20000000, 0, 1073037600000)",
+		"(30, 0, 'NPC', 'NPC Clan', 'ClanHall', 30, 0, 'Emerald Hall', 1, 20000000, 0, 1073037600000)",
+		"(31, 0, 'NPC', 'NPC Clan', 'ClanHall', 31, 0, 'The Atramental Barracks', 1, 8000000, 0, 1073037600000)",
+		"(32, 0, 'NPC', 'NPC Clan', 'ClanHall', 32, 0, 'The Scarlet Barracks', 1, 8000000, 0, 1073037600000)",
+		"(33, 0, 'NPC', 'NPC Clan', 'ClanHall', 33, 0, 'The Viridian Barracks', 1, 8000000, 0, 1073037600000)",
+		"(36, 0, 'NPC', 'NPC Clan', 'ClanHall', 36, 0, 'The Golden Chamber', 1, 50000000, 0, 1106827200000)",
+		"(37, 0, 'NPC', 'NPC Clan', 'ClanHall', 37, 0, 'The Silver Chamber', 1, 50000000, 0, 1106827200000)",
+		"(38, 0, 'NPC', 'NPC Clan', 'ClanHall', 38, 0, 'The Mithril Chamber', 1, 50000000, 0, 1106827200000)",
+		"(39, 0, 'NPC', 'NPC Clan', 'ClanHall', 39, 0, 'Silver Manor', 1, 50000000, 0, 1106827200000)",
+		"(40, 0, 'NPC', 'NPC Clan', 'ClanHall', 40, 0, 'Gold Manor', 1, 50000000, 0, 1106827200000)",
+		"(41, 0, 'NPC', 'NPC Clan', 'ClanHall', 41, 0, 'The Bronze Chamber', 1, 50000000, 0, 1106827200000)",
+		"(42, 0, 'NPC', 'NPC Clan', 'ClanHall', 42, 0, 'The Golden Chamber', 1, 50000000, 0, 1106827200000)",
+		"(43, 0, 'NPC', 'NPC Clan', 'ClanHall', 43, 0, 'The Silver Chamber', 1, 50000000, 0, 1106827200000)",
+		"(44, 0, 'NPC', 'NPC Clan', 'ClanHall', 44, 0, 'The Mithril Chamber', 1, 50000000, 0, 1106827200000)",
+		"(45, 0, 'NPC', 'NPC Clan', 'ClanHall', 45, 0, 'The Bronze Chamber', 1, 50000000, 0, 1106827200000)",
+		"(46, 0, 'NPC', 'NPC Clan', 'ClanHall', 46, 0, 'Silver Manor', 1, 50000000, 0, 1106827200000)",
+		"(47, 0, 'NPC', 'NPC Clan', 'ClanHall', 47, 0, 'Moonstone Hall', 1, 50000000, 0, 1106827200000)",
+		"(48, 0, 'NPC', 'NPC Clan', 'ClanHall', 48, 0, 'Onyx Hall', 1, 50000000, 0, 1106827200000)",
+		"(49, 0, 'NPC', 'NPC Clan', 'ClanHall', 49, 0, 'Emerald Hall', 1, 50000000, 0, 1106827200000)",
+		"(50, 0, 'NPC', 'NPC Clan', 'ClanHall', 50, 0, 'Sapphire Hall', 1, 50000000, 0, 1106827200000)",
+		"(51, 0, 'NPC', 'NPC Clan', 'ClanHall', 51, 0, 'Mont Chamber', 1, 50000000, 0, 1106827200000)",
+		"(52, 0, 'NPC', 'NPC Clan', 'ClanHall', 52, 0, 'Astaire Chamber', 1, 50000000, 0, 1106827200000)",
+		"(53, 0, 'NPC', 'NPC Clan', 'ClanHall', 53, 0, 'Aria Chamber', 1, 50000000, 0, 1106827200000)",
+		"(54, 0, 'NPC', 'NPC Clan', 'ClanHall', 54, 0, 'Yiana Chamber', 1, 50000000, 0, 1106827200000)",
+		"(55, 0, 'NPC', 'NPC Clan', 'ClanHall', 55, 0, 'Roien Chamber', 1, 50000000, 0, 1106827200000)",
+		"(56, 0, 'NPC', 'NPC Clan', 'ClanHall', 56, 0, 'Luna Chamber', 1, 50000000, 0, 1106827200000)",
+		"(57, 0, 'NPC', 'NPC Clan', 'ClanHall', 57, 0, 'Traban Chamber', 1, 50000000, 0, 1106827200000)",
+		"(58, 0, 'NPC', 'NPC Clan', 'ClanHall', 58, 0, 'Eisen Hall', 1, 20000000, 0, 1106827200000)",
+		"(59, 0, 'NPC', 'NPC Clan', 'ClanHall', 59, 0, 'Heavy Metal Hall', 1, 20000000, 0, 1106827200000)",
+		"(60, 0, 'NPC', 'NPC Clan', 'ClanHall', 60, 0, 'Molten Ore Hall', 1, 20000000, 0, 1106827200000)",
+		"(61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 20000000, 0, 1106827200000)"
+	};
+	
+	// @formatter:off
+	private static final int[] ITEM_INIT_DATA_ID =
+	{
+		22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42,
+		43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61
+	};
+	// @formatter:on
+	
+	protected AuctionManager() {
+		load();
+	}
+	
+	public void reload() {
+		_auctions.clear();
+		load();
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT id FROM auction ORDER BY id")) {
+			while (rs.next()) {
+				_auctions.add(new Auction(rs.getInt("id")));
+			}
+			LOG.info("Loaded {} auction(s).", _auctions.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading auctions from database!", ex);
+		}
+	}
+	
+	public Auction getAuction(int auctionId) {
+		int index = getAuctionIndex(auctionId);
+		if (index >= 0) {
+			return _auctions.get(index);
+		}
+		return null;
+	}
+	
+	public int getAuctionIndex(int auctionId) {
+		Auction auction;
+		for (int i = 0; i < _auctions.size(); i++) {
+			auction = _auctions.get(i);
+			if ((auction != null) && (auction.getId() == auctionId)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	public List<Auction> getAuctions() {
+		return _auctions;
+	}
+	
+	public void initNPC(int id) {
+		int i;
+		for (i = 0; i < ITEM_INIT_DATA_ID.length; i++) {
+			if (ITEM_INIT_DATA_ID[i] == id) {
+				break;
+			}
+		}
+		if ((i >= ITEM_INIT_DATA_ID.length) || (ITEM_INIT_DATA_ID[i] != id)) {
+			LOG.warn("Clan hall auction not found for Id {}!", id);
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate("INSERT INTO `auction` VALUES " + ITEM_INIT_DATA[i]);
+			_auctions.add(new Auction(id));
+			LOG.info("Created auction for clan hall Id {}.", id);
+		} catch (Exception ex) {
+			LOG.error("There has been an error storing auction!", ex);
+		}
+	}
+	
+	public static AuctionManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AuctionManager INSTANCE = new AuctionManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/BoatManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/BoatManager.java
new file mode 100644
index 00000000..09f680f0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/BoatManager.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.VehiclePathPoint;
+import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+
+public class BoatManager {
+	private final Map<Integer, L2BoatInstance> _boats = new ConcurrentHashMap<>();
+	private final boolean[] _docksBusy = new boolean[3];
+	
+	public static final int TALKING_ISLAND = 1;
+	public static final int GLUDIN_HARBOR = 2;
+	public static final int RUNE_HARBOR = 3;
+	
+	public static BoatManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	protected BoatManager() {
+		Arrays.fill(_docksBusy, false);
+	}
+	
+	public L2BoatInstance getNewBoat(int boatId, int x, int y, int z, int heading) {
+		if (!general().allowBoat()) {
+			return null;
+		}
+		
+		StatsSet npcDat = new StatsSet();
+		npcDat.set("npcId", boatId);
+		npcDat.set("level", 0);
+		npcDat.set("jClass", "boat");
+		
+		npcDat.set("baseSTR", 0);
+		npcDat.set("baseCON", 0);
+		npcDat.set("baseDEX", 0);
+		npcDat.set("baseINT", 0);
+		npcDat.set("baseWIT", 0);
+		npcDat.set("baseMEN", 0);
+		
+		npcDat.set("baseShldDef", 0);
+		npcDat.set("baseShldRate", 0);
+		npcDat.set("baseAccCombat", 38);
+		npcDat.set("baseEvasRate", 38);
+		npcDat.set("baseCritRate", 38);
+		
+		// npcDat.set("name", "");
+		npcDat.set("collision_radius", 0);
+		npcDat.set("collision_height", 0);
+		npcDat.set("sex", "male");
+		npcDat.set("type", "");
+		npcDat.set("baseAtkRange", 0);
+		npcDat.set("baseMpMax", 0);
+		npcDat.set("baseCpMax", 0);
+		npcDat.set("rewardExp", 0);
+		npcDat.set("rewardSp", 0);
+		npcDat.set("basePAtk", 0);
+		npcDat.set("baseMAtk", 0);
+		npcDat.set("basePAtkSpd", 0);
+		npcDat.set("aggroRange", 0);
+		npcDat.set("baseMAtkSpd", 0);
+		npcDat.set("rhand", 0);
+		npcDat.set("lhand", 0);
+		npcDat.set("armor", 0);
+		npcDat.set("baseWalkSpd", 0);
+		npcDat.set("baseRunSpd", 0);
+		npcDat.set("baseHpMax", 50000);
+		npcDat.set("baseHpReg", 3.e-3f);
+		npcDat.set("baseMpReg", 3.e-3f);
+		npcDat.set("basePDef", 100);
+		npcDat.set("baseMDef", 100);
+		
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var boat = new L2BoatInstance(objectId, new L2CharTemplate(npcDat));
+		boat.setHeading(heading);
+		boat.setXYZInvisible(x, y, z);
+		boat.spawnMe();
+		
+		_boats.put(boat.getObjectId(), boat);
+		return boat;
+	}
+	
+	/**
+	 * @param boatId
+	 * @return
+	 */
+	public L2BoatInstance getBoat(int boatId) {
+		return _boats.get(boatId);
+	}
+	
+	/**
+	 * Lock/unlock dock so only one ship can be docked
+	 * @param h Dock Id
+	 * @param value True if dock is locked
+	 */
+	public void dockShip(int h, boolean value) {
+		try {
+			_docksBusy[h] = value;
+		} catch (ArrayIndexOutOfBoundsException e) {
+		}
+	}
+	
+	/**
+	 * Check if dock is busy
+	 * @param h Dock Id
+	 * @return Trye if dock is locked
+	 */
+	public boolean dockBusy(int h) {
+		try {
+			return _docksBusy[h];
+		} catch (ArrayIndexOutOfBoundsException e) {
+			return false;
+		}
+	}
+	
+	/**
+	 * Broadcast one packet in both path points
+	 * @param point1
+	 * @param point2
+	 * @param packet
+	 */
+	public void broadcastPacket(VehiclePathPoint point1, VehiclePathPoint point2, L2GameServerPacket packet) {
+		broadcastPacketsToPlayers(point1, point2, packet);
+	}
+	
+	/**
+	 * Broadcast several packets in both path points
+	 * @param point1
+	 * @param point2
+	 * @param packets
+	 */
+	public void broadcastPackets(VehiclePathPoint point1, VehiclePathPoint point2, L2GameServerPacket... packets) {
+		broadcastPacketsToPlayers(point1, point2, packets);
+	}
+	
+	private void broadcastPacketsToPlayers(VehiclePathPoint point1, VehiclePathPoint point2, L2GameServerPacket... packets) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			if (Math.hypot(player.getX() - point1.getX(), player.getY() - point1.getY()) < general().getBoatBroadcastRadius()) {
+				for (L2GameServerPacket p : packets) {
+					player.sendPacket(p);
+				}
+			} else {
+				if (Math.hypot(player.getX() - point2.getX(), player.getY() - point2.getY()) < general().getBoatBroadcastRadius()) {
+					for (L2GameServerPacket p : packets) {
+						player.sendPacket(p);
+					}
+				}
+			}
+		}
+	}
+	
+	private static class SingletonHolder {
+		protected static final BoatManager _instance = new BoatManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/CastleManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/CastleManager.java
new file mode 100644
index 00000000..f7983959
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/CastleManager.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.InstanceListManager;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class CastleManager implements InstanceListManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CastleManager.class);
+	
+	private final List<Castle> _castles = new ArrayList<>();
+	
+	private final Map<Integer, Long> _castleSiegeDate = new ConcurrentHashMap<>();
+	
+	private static final int[] _castleCirclets = {
+		0,
+		6838,
+		6835,
+		6839,
+		6837,
+		6840,
+		6834,
+		6836,
+		8182,
+		8183
+	};
+	
+	public int findNearestCastleIndex(L2Object obj) {
+		return findNearestCastleIndex(obj, Long.MAX_VALUE);
+	}
+	
+	public int findNearestCastleIndex(L2Object obj, long maxDistance) {
+		int index = getCastleIndex(obj);
+		if (index < 0) {
+			double distance;
+			Castle castle;
+			for (int i = 0; i < _castles.size(); i++) {
+				castle = _castles.get(i);
+				if (castle == null) {
+					continue;
+				}
+				distance = castle.getDistance(obj);
+				if (maxDistance > distance) {
+					maxDistance = (long) distance;
+					index = i;
+				}
+			}
+		}
+		return index;
+	}
+	
+	public Castle getCastleById(int castleId) {
+		for (Castle temp : _castles) {
+			if (temp.getResidenceId() == castleId) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	public Castle getCastleByOwner(L2Clan clan) {
+		for (Castle temp : _castles) {
+			if (temp.getOwnerId() == clan.getId()) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	public Castle getCastle(String name) {
+		for (Castle temp : _castles) {
+			if (temp.getName().equalsIgnoreCase(name.trim())) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	public Castle getCastle(int x, int y, int z) {
+		for (Castle temp : _castles) {
+			if (temp.checkIfInZone(x, y, z)) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	public Castle getCastle(L2Object activeObject) {
+		return getCastle(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public int getCastleIndex(int castleId) {
+		Castle castle;
+		for (int i = 0; i < _castles.size(); i++) {
+			castle = _castles.get(i);
+			if ((castle != null) && (castle.getResidenceId() == castleId)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	public int getCastleIndex(L2Object activeObject) {
+		return getCastleIndex(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public int getCastleIndex(int x, int y, int z) {
+		Castle castle;
+		for (int i = 0; i < _castles.size(); i++) {
+			castle = _castles.get(i);
+			if ((castle != null) && castle.checkIfInZone(x, y, z)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	public List<Castle> getCastles() {
+		return _castles;
+	}
+	
+	public boolean hasOwnedCastle() {
+		boolean hasOwnedCastle = false;
+		for (Castle castle : _castles) {
+			if (castle.getOwnerId() > 0) {
+				hasOwnedCastle = true;
+				break;
+			}
+		}
+		return hasOwnedCastle;
+	}
+	
+	public void validateTaxes(int sealStrifeOwner) {
+		int maxTax = switch (sealStrifeOwner) {
+			case SevenSigns.CABAL_DUSK -> 5;
+			case SevenSigns.CABAL_DAWN -> 25;
+			default -> 15; // no owner
+		};
+		for (Castle castle : _castles) {
+			if (castle.getTaxPercent() > maxTax) {
+				castle.setTaxPercent(maxTax);
+			}
+		}
+	}
+	
+	public int getCirclet() {
+		return getCircletByCastleId(1);
+	}
+	
+	public int getCircletByCastleId(int castleId) {
+		if ((castleId > 0) && (castleId < 10)) {
+			return _castleCirclets[castleId];
+		}
+		
+		return 0;
+	}
+	
+	// remove this castle's circlets from the clan
+	public void removeCirclet(L2Clan clan, int castleId) {
+		for (L2ClanMember member : clan.getMembers()) {
+			removeCirclet(member, castleId);
+		}
+	}
+	
+	public void removeCirclet(L2ClanMember member, int castleId) {
+		if (member == null) {
+			return;
+		}
+		L2PcInstance player = member.getPlayerInstance();
+		int circletId = getCircletByCastleId(castleId);
+		
+		if (circletId != 0) {
+			// online-player circlet removal
+			if (player != null) {
+				try {
+					L2ItemInstance circlet = player.getInventory().getItemByItemId(circletId);
+					if (circlet != null) {
+						if (circlet.isEquipped()) {
+							player.getInventory().unEquipItemInSlot(circlet.getLocationSlot());
+						}
+						player.destroyItemByItemId("CastleCircletRemoval", circletId, 1, player, true);
+					}
+					return;
+				} catch (NullPointerException e) {
+					// continue removing offline
+				}
+			}
+			// else offline-player circlet removal
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("DELETE FROM items WHERE owner_id = ? and item_id = ?")) {
+				ps.setInt(1, member.getObjectId());
+				ps.setInt(2, circletId);
+				ps.execute();
+			} catch (Exception ex) {
+				LOG.warn("Failed to remove castle circlets offline for player {}!", player, ex);
+			}
+		}
+	}
+	
+	@Override
+	public void loadInstances() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT id FROM castle ORDER BY id")) {
+			while (rs.next()) {
+				_castles.add(new Castle(rs.getInt("id")));
+			}
+			LOG.info("Loaded {} castles.", _castles.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading castles from database!", ex);
+		}
+	}
+	
+	@Override
+	public void updateReferences() {
+	}
+	
+	@Override
+	public void activateInstances() {
+		for (final Castle castle : _castles) {
+			castle.activateInstance();
+		}
+	}
+	
+	public void registerSiegeDate(int castleId, long siegeDate) {
+		_castleSiegeDate.put(castleId, siegeDate);
+	}
+	
+	public int getSiegeDates(long siegeDate) {
+		int count = 0;
+		for (long date : _castleSiegeDate.values()) {
+			if (Math.abs(date - siegeDate) < 1000) {
+				count++;
+			}
+		}
+		return count;
+	}
+	
+	public static CastleManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CastleManager _instance = new CastleManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java
new file mode 100644
index 00000000..6ced46a0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java
@@ -0,0 +1,683 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.ManorMode;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.SeedProduction;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.interfaces.IStorable;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Castle manor system.
+ * @author malyelfik
+ */
+public final class CastleManorManager implements IXmlReader, IStorable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CastleManorManager.class);
+	
+	private static final String INSERT_PRODUCT = "INSERT INTO castle_manor_production VALUES (?, ?, ?, ?, ?, ?)";
+	
+	private static final String INSERT_CROP = "INSERT INTO castle_manor_procure VALUES (?, ?, ?, ?, ?, ?, ?)";
+	
+	// Current manor status
+	private ManorMode _mode = ManorMode.APPROVED;
+	// Temporary date
+	private Calendar _nextModeChange = null;
+	// Seeds holder
+	private static final Map<Integer, L2Seed> _seeds = new HashMap<>();
+	// Manor period settings
+	private final Map<Integer, List<CropProcure>> _procure = new HashMap<>();
+	private final Map<Integer, List<CropProcure>> _procureNext = new HashMap<>();
+	private final Map<Integer, List<SeedProduction>> _production = new HashMap<>();
+	private final Map<Integer, List<SeedProduction>> _productionNext = new HashMap<>();
+	
+	public CastleManorManager() {
+		if (general().allowManor()) {
+			load(); // Load seed data (XML)
+			loadDb(); // Load castle manor data (DB)
+			
+			// Set mode and start timer
+			final Calendar currentTime = Calendar.getInstance();
+			final int hour = currentTime.get(Calendar.HOUR_OF_DAY);
+			final int min = currentTime.get(Calendar.MINUTE);
+			final int maintenanceMin = general().getManorRefreshMin() + general().getManorMaintenanceMin();
+			
+			if (((hour >= general().getManorRefreshTime()) && (min >= maintenanceMin)) || (hour < general().getManorApproveTime()) || ((hour == general().getManorApproveTime()) && (min <= general().getManorApproveMin()))) {
+				_mode = ManorMode.MODIFIABLE;
+			} else if ((hour == general().getManorRefreshTime()) && ((min >= general().getManorRefreshMin()) && (min < maintenanceMin))) {
+				_mode = ManorMode.MAINTENANCE;
+			}
+			
+			// Schedule mode change
+			scheduleModeChange();
+			
+			// Schedule autosave
+			if (!general().manorSaveAllActions()) {
+				ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this::storeMe, general().getManorSavePeriodRate(), general().getManorSavePeriodRate(), TimeUnit.HOURS);
+			}
+			
+			// Send debug message
+			if (general().debug()) {
+				LOG.info("Current mode {}.", _mode);
+			}
+		} else {
+			_mode = ManorMode.DISABLED;
+			LOG.info("Manor system is deactivated.");
+		}
+	}
+	
+	@Override
+	public void load() {
+		parseDatapackFile("data/seeds.xml");
+		LOG.info("Loaded {} seeds.", _seeds.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		StatsSet set;
+		NamedNodeMap attrs;
+		Node att;
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("castle".equalsIgnoreCase(d.getNodeName())) {
+						final int castleId = parseInteger(d.getAttributes(), "id");
+						for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+							if ("crop".equalsIgnoreCase(c.getNodeName())) {
+								set = new StatsSet();
+								set.set("castleId", castleId);
+								
+								attrs = c.getAttributes();
+								for (int i = 0; i < attrs.getLength(); i++) {
+									att = attrs.item(i);
+									set.set(att.getNodeName(), att.getNodeValue());
+								}
+								_seeds.put(set.getInt("seedId"), new L2Seed(set));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	private void loadDb() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var stProduction = con.prepareStatement("SELECT * FROM castle_manor_production WHERE castle_id=?");
+			var stProcure = con.prepareStatement("SELECT * FROM castle_manor_procure WHERE castle_id=?")) {
+			for (Castle castle : CastleManager.getInstance().getCastles()) {
+				final int castleId = castle.getResidenceId();
+				
+				// Clear params
+				stProduction.clearParameters();
+				stProcure.clearParameters();
+				
+				// Seed production
+				final List<SeedProduction> pCurrent = new ArrayList<>();
+				final List<SeedProduction> pNext = new ArrayList<>();
+				stProduction.setInt(1, castleId);
+				try (var rs = stProduction.executeQuery()) {
+					while (rs.next()) {
+						final int seedId = rs.getInt("seed_id");
+						if (_seeds.containsKey(seedId)) // Don't load unknown seeds
+						{
+							final SeedProduction sp = new SeedProduction(seedId, rs.getLong("amount"), rs.getLong("price"), rs.getInt("start_amount"));
+							if (rs.getBoolean("next_period")) {
+								pNext.add(sp);
+							} else {
+								pCurrent.add(sp);
+							}
+						} else {
+							LOG.warn("Unknown seed Id {}!", seedId);
+						}
+					}
+				}
+				_production.put(castleId, pCurrent);
+				_productionNext.put(castleId, pNext);
+				
+				// Seed procure
+				final List<CropProcure> current = new ArrayList<>();
+				final List<CropProcure> next = new ArrayList<>();
+				stProcure.setInt(1, castleId);
+				try (var rs = stProcure.executeQuery()) {
+					final Set<Integer> cropIds = getCropIds();
+					while (rs.next()) {
+						final int cropId = rs.getInt("crop_id");
+						if (cropIds.contains(cropId)) // Don't load unknown crops
+						{
+							final CropProcure cp = new CropProcure(cropId, rs.getLong("amount"), rs.getInt("reward_type"), rs.getLong("start_amount"), rs.getLong("price"));
+							if (rs.getBoolean("next_period")) {
+								next.add(cp);
+							} else {
+								current.add(cp);
+							}
+						} else {
+							LOG.warn("Unknown crop Id {}!", cropId);
+						}
+					}
+				}
+				_procure.put(castleId, current);
+				_procureNext.put(castleId, next);
+			}
+			LOG.info("Manor data loaded.");
+		} catch (Exception ex) {
+			LOG.warn("Unable to load manor data!", ex);
+		}
+	}
+	
+	// -------------------------------------------------------
+	// Manor methods
+	// -------------------------------------------------------
+	
+	private void scheduleModeChange() {
+		// Calculate next mode change
+		_nextModeChange = Calendar.getInstance();
+		_nextModeChange.set(Calendar.SECOND, 0);
+		switch (_mode) {
+			case MODIFIABLE -> {
+				_nextModeChange.set(Calendar.HOUR_OF_DAY, general().getManorApproveTime());
+				_nextModeChange.set(Calendar.MINUTE, general().getManorApproveMin());
+				if (_nextModeChange.before(Calendar.getInstance())) {
+					_nextModeChange.add(Calendar.DATE, 1);
+				}
+			}
+			case MAINTENANCE -> {
+				_nextModeChange.set(Calendar.HOUR_OF_DAY, general().getManorRefreshTime());
+				_nextModeChange.set(Calendar.MINUTE, general().getManorRefreshMin() + general().getManorMaintenanceMin());
+			}
+			case APPROVED -> {
+				_nextModeChange.set(Calendar.HOUR_OF_DAY, general().getManorRefreshTime());
+				_nextModeChange.set(Calendar.MINUTE, general().getManorRefreshMin());
+			}
+		}
+		// Schedule mode change
+		ThreadPoolManager.getInstance().scheduleGeneral(this::changeMode, (_nextModeChange.getTimeInMillis() - System.currentTimeMillis()));
+	}
+	
+	public void changeMode() {
+		switch (_mode) {
+			case APPROVED: {
+				// Change mode
+				_mode = ManorMode.MAINTENANCE;
+				
+				// Update manor period
+				for (Castle castle : CastleManager.getInstance().getCastles()) {
+					final L2Clan owner = castle.getOwner();
+					if (owner == null) {
+						continue;
+					}
+					
+					final int castleId = castle.getResidenceId();
+					final ItemContainer cwh = owner.getWarehouse();
+					for (CropProcure crop : _procure.get(castleId)) {
+						if (crop.getStartAmount() > 0) {
+							// Adding bought crops to clan warehouse
+							if (crop.getStartAmount() != crop.getAmount()) {
+								long count = (long) ((crop.getStartAmount() - crop.getAmount()) * 0.9);
+								if ((count < 1) && (Rnd.nextInt(99) < 90)) {
+									count = 1;
+								}
+								
+								if (count > 0) {
+									cwh.addItem("Manor", getSeedByCrop(crop.getId()).getMatureId(), count, null, null);
+								}
+							}
+							// Reserved and not used money giving back to treasury
+							if (crop.getAmount() > 0) {
+								castle.addToTreasuryNoTax(crop.getAmount() * crop.getPrice());
+							}
+						}
+					}
+					
+					// Change next period to current and prepare next period data
+					final List<SeedProduction> _nextProduction = _productionNext.get(castleId);
+					final List<CropProcure> _nextProcure = _procureNext.get(castleId);
+					
+					_production.put(castleId, _nextProduction);
+					_procure.put(castleId, _nextProcure);
+					
+					if (castle.getTreasury() < getManorCost(castleId, false)) {
+						_productionNext.put(castleId, Collections.emptyList());
+						_procureNext.put(castleId, Collections.emptyList());
+					} else {
+						final List<SeedProduction> production = new ArrayList<>(_nextProduction);
+						for (SeedProduction s : production) {
+							s.setAmount(s.getStartAmount());
+						}
+						_productionNext.put(castleId, production);
+						
+						final List<CropProcure> procure = new ArrayList<>(_nextProcure);
+						for (CropProcure cr : procure) {
+							cr.setAmount(cr.getStartAmount());
+						}
+						_procureNext.put(castleId, procure);
+					}
+				}
+				
+				// Save changes
+				storeMe();
+				break;
+			}
+			case MAINTENANCE: {
+				// Notify clan leader about manor mode change
+				for (Castle castle : CastleManager.getInstance().getCastles()) {
+					final L2Clan owner = castle.getOwner();
+					if (owner != null) {
+						final L2ClanMember clanLeader = owner.getLeader();
+						if ((clanLeader != null) && clanLeader.isOnline()) {
+							clanLeader.getPlayerInstance().sendPacket(SystemMessageId.THE_MANOR_INFORMATION_HAS_BEEN_UPDATED);
+						}
+					}
+				}
+				_mode = ManorMode.MODIFIABLE;
+				break;
+			}
+			case MODIFIABLE: {
+				_mode = ManorMode.APPROVED;
+				
+				for (Castle castle : CastleManager.getInstance().getCastles()) {
+					final L2Clan owner = castle.getOwner();
+					if (owner == null) {
+						continue;
+					}
+					
+					int slots = 0;
+					final int castleId = castle.getResidenceId();
+					final ItemContainer cwh = owner.getWarehouse();
+					for (CropProcure crop : _procureNext.get(castleId)) {
+						if ((crop.getStartAmount() > 0) && (cwh.getItemsByItemId(getSeedByCrop(crop.getId()).getMatureId()) == null)) {
+							slots++;
+						}
+					}
+					
+					final long manorCost = getManorCost(castleId, true);
+					if (!cwh.validateCapacity(slots) && (castle.getTreasury() < manorCost)) {
+						_productionNext.get(castleId).clear();
+						_procureNext.get(castleId).clear();
+						
+						// Notify clan leader
+						final L2ClanMember clanLeader = owner.getLeader();
+						if ((clanLeader != null) && clanLeader.isOnline()) {
+							clanLeader.getPlayerInstance().sendPacket(SystemMessageId.THE_AMOUNT_IS_NOT_SUFFICIENT_AND_SO_THE_MANOR_IS_NOT_IN_OPERATION);
+						}
+					} else {
+						castle.addToTreasuryNoTax(-manorCost);
+					}
+				}
+				
+				// Store changes
+				if (general().manorSaveAllActions()) {
+					storeMe();
+				}
+				break;
+			}
+		}
+		scheduleModeChange();
+		if (general().debug()) {
+			LOG.info("Manor mode changed to {}!", _mode);
+		}
+	}
+	
+	public void setNextSeedProduction(List<SeedProduction> list, int castleId) {
+		_productionNext.put(castleId, list);
+		if (general().manorSaveAllActions()) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var dps = con.prepareStatement("DELETE FROM castle_manor_production WHERE castle_id = ? AND next_period = 1");
+				var ips = con.prepareStatement(INSERT_PRODUCT)) {
+				// Delete old data
+				dps.setInt(1, castleId);
+				dps.executeUpdate();
+				
+				// Insert new data
+				if (!list.isEmpty()) {
+					for (SeedProduction sp : list) {
+						ips.setInt(1, castleId);
+						ips.setInt(2, sp.getId());
+						ips.setLong(3, sp.getAmount());
+						ips.setLong(4, sp.getStartAmount());
+						ips.setLong(5, sp.getPrice());
+						ips.setBoolean(6, true);
+						ips.addBatch();
+					}
+					ips.executeBatch();
+				}
+			} catch (Exception ex) {
+				LOG.error("Unable to store manor data!", ex);
+			}
+		}
+	}
+	
+	public void setNextCropProcure(List<CropProcure> list, int castleId) {
+		_procureNext.put(castleId, list);
+		if (general().manorSaveAllActions()) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var dps = con.prepareStatement("DELETE FROM castle_manor_procure WHERE castle_id = ? AND next_period = 1");
+				var ips = con.prepareStatement(INSERT_CROP)) {
+				// Delete old data
+				dps.setInt(1, castleId);
+				dps.executeUpdate();
+				
+				// Insert new data
+				if (!list.isEmpty()) {
+					for (CropProcure cp : list) {
+						ips.setInt(1, castleId);
+						ips.setInt(2, cp.getId());
+						ips.setLong(3, cp.getAmount());
+						ips.setLong(4, cp.getStartAmount());
+						ips.setLong(5, cp.getPrice());
+						ips.setInt(6, cp.getReward());
+						ips.setBoolean(7, true);
+						ips.addBatch();
+					}
+					ips.executeBatch();
+				}
+			} catch (Exception ex) {
+				LOG.warn("Unable to store manor data!", ex);
+			}
+		}
+	}
+	
+	public void updateCurrentProduction(int castleId, Collection<SeedProduction> items) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle_manor_production SET amount = ? WHERE castle_id = ? AND seed_id = ? AND next_period = 0")) {
+			for (SeedProduction sp : items) {
+				ps.setLong(1, sp.getAmount());
+				ps.setInt(2, castleId);
+				ps.setInt(3, sp.getId());
+				ps.addBatch();
+			}
+			ps.executeBatch();
+		} catch (Exception ex) {
+			LOG.warn("Unable to store manor data!", ex);
+		}
+	}
+	
+	public void updateCurrentProcure(int castleId, Collection<CropProcure> items) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle_manor_procure SET amount = ? WHERE castle_id = ? AND crop_id = ? AND next_period = 0")) {
+			for (CropProcure sp : items) {
+				ps.setLong(1, sp.getAmount());
+				ps.setInt(2, castleId);
+				ps.setInt(3, sp.getId());
+				ps.addBatch();
+			}
+			ps.executeBatch();
+		} catch (Exception ex) {
+			LOG.warn("Unable to store manor data!", ex);
+		}
+	}
+	
+	public List<SeedProduction> getSeedProduction(int castleId, boolean nextPeriod) {
+		return (nextPeriod) ? _productionNext.get(castleId) : _production.get(castleId);
+	}
+	
+	public SeedProduction getSeedProduct(int castleId, int seedId, boolean nextPeriod) {
+		for (SeedProduction sp : getSeedProduction(castleId, nextPeriod)) {
+			if (sp.getId() == seedId) {
+				return sp;
+			}
+		}
+		return null;
+	}
+	
+	public List<CropProcure> getCropProcure(int castleId, boolean nextPeriod) {
+		return (nextPeriod) ? _procureNext.get(castleId) : _procure.get(castleId);
+	}
+	
+	public CropProcure getCropProcure(int castleId, int cropId, boolean nextPeriod) {
+		for (CropProcure cp : getCropProcure(castleId, nextPeriod)) {
+			if (cp.getId() == cropId) {
+				return cp;
+			}
+		}
+		return null;
+	}
+	
+	public long getManorCost(int castleId, boolean nextPeriod) {
+		final List<CropProcure> procure = getCropProcure(castleId, nextPeriod);
+		final List<SeedProduction> production = getSeedProduction(castleId, nextPeriod);
+		
+		long total = 0;
+		for (SeedProduction seed : production) {
+			final L2Seed s = getSeed(seed.getId());
+			total += (s == null) ? 1 : (s.getSeedReferencePrice() * seed.getStartAmount());
+		}
+		for (CropProcure crop : procure) {
+			total += (crop.getPrice() * crop.getStartAmount());
+		}
+		return total;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ds = con.prepareStatement("DELETE FROM castle_manor_production");
+			var is = con.prepareStatement(INSERT_PRODUCT);
+			var dp = con.prepareStatement("DELETE FROM castle_manor_procure");
+			var ip = con.prepareStatement(INSERT_CROP)) {
+			// Delete old seeds
+			ds.executeUpdate();
+			
+			// Current production
+			for (Map.Entry<Integer, List<SeedProduction>> entry : _production.entrySet()) {
+				for (SeedProduction sp : entry.getValue()) {
+					is.setInt(1, entry.getKey());
+					is.setInt(2, sp.getId());
+					is.setLong(3, sp.getAmount());
+					is.setLong(4, sp.getStartAmount());
+					is.setLong(5, sp.getPrice());
+					is.setBoolean(6, false);
+					is.addBatch();
+				}
+			}
+			
+			// Next production
+			for (Map.Entry<Integer, List<SeedProduction>> entry : _productionNext.entrySet()) {
+				for (SeedProduction sp : entry.getValue()) {
+					is.setInt(1, entry.getKey());
+					is.setInt(2, sp.getId());
+					is.setLong(3, sp.getAmount());
+					is.setLong(4, sp.getStartAmount());
+					is.setLong(5, sp.getPrice());
+					is.setBoolean(6, true);
+					is.addBatch();
+				}
+			}
+			
+			// Execute production batch
+			is.executeBatch();
+			
+			// Delete old procure
+			dp.executeUpdate();
+			
+			// Current procure
+			for (Map.Entry<Integer, List<CropProcure>> entry : _procure.entrySet()) {
+				for (CropProcure cp : entry.getValue()) {
+					ip.setInt(1, entry.getKey());
+					ip.setInt(2, cp.getId());
+					ip.setLong(3, cp.getAmount());
+					ip.setLong(4, cp.getStartAmount());
+					ip.setLong(5, cp.getPrice());
+					ip.setInt(6, cp.getReward());
+					ip.setBoolean(7, false);
+					ip.addBatch();
+				}
+			}
+			
+			// Next procure
+			for (Map.Entry<Integer, List<CropProcure>> entry : _procureNext.entrySet()) {
+				for (CropProcure cp : entry.getValue()) {
+					ip.setInt(1, entry.getKey());
+					ip.setInt(2, cp.getId());
+					ip.setLong(3, cp.getAmount());
+					ip.setLong(4, cp.getStartAmount());
+					ip.setLong(5, cp.getPrice());
+					ip.setInt(6, cp.getReward());
+					ip.setBoolean(7, true);
+					ip.addBatch();
+				}
+			}
+			
+			// Execute procure batch
+			ip.executeBatch();
+			
+			return true;
+		} catch (Exception ex) {
+			LOG.warn("Unable to store manor data!", ex);
+			return false;
+		}
+	}
+	
+	public void resetManorData(int castleId) {
+		if (!general().allowManor()) {
+			return;
+		}
+		
+		_procure.get(castleId).clear();
+		_procureNext.get(castleId).clear();
+		_production.get(castleId).clear();
+		_productionNext.get(castleId).clear();
+		
+		if (general().allowManor()) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ds = con.prepareStatement("DELETE FROM castle_manor_production WHERE castle_id = ?");
+				var dc = con.prepareStatement("DELETE FROM castle_manor_procure WHERE castle_id = ?")) {
+				// Delete seeds
+				ds.setInt(1, castleId);
+				ds.executeUpdate();
+				
+				// Delete procure
+				dc.setInt(1, castleId);
+				dc.executeUpdate();
+			} catch (Exception ex) {
+				LOG.warn("Unable to store manor data!", ex);
+			}
+		}
+	}
+	
+	public boolean isUnderMaintenance() {
+		return _mode.equals(ManorMode.MAINTENANCE);
+	}
+	
+	public boolean isManorApproved() {
+		return _mode.equals(ManorMode.APPROVED);
+	}
+	
+	public boolean isModifiablePeriod() {
+		return _mode.equals(ManorMode.MODIFIABLE);
+	}
+	
+	public String getCurrentModeName() {
+		return _mode.toString();
+	}
+	
+	public String getNextModeChange() {
+		return new SimpleDateFormat("dd/MM HH:mm:ss").format(_nextModeChange.getTime());
+	}
+	
+	// -------------------------------------------------------
+	// Seed methods
+	// -------------------------------------------------------
+	
+	public List<L2Seed> getCrops() {
+		final List<L2Seed> seeds = new ArrayList<>();
+		final List<Integer> cropIds = new ArrayList<>();
+		for (L2Seed seed : _seeds.values()) {
+			if (!cropIds.contains(seed.getCropId())) {
+				seeds.add(seed);
+				cropIds.add(seed.getCropId());
+			}
+		}
+		cropIds.clear();
+		return seeds;
+	}
+	
+	public Set<L2Seed> getSeedsForCastle(int castleId) {
+		return _seeds.values().stream().filter(s -> s.getCastleId() == castleId).collect(Collectors.toSet());
+	}
+	
+	public Set<Integer> getSeedIds() {
+		return _seeds.keySet();
+	}
+	
+	public Set<Integer> getCropIds() {
+		return _seeds.values().stream().map(L2Seed::getCropId).collect(Collectors.toSet());
+	}
+	
+	public L2Seed getSeed(int seedId) {
+		return _seeds.get(seedId);
+	}
+	
+	public L2Seed getSeedByCrop(int cropId, int castleId) {
+		for (L2Seed s : getSeedsForCastle(castleId)) {
+			if (s.getCropId() == cropId) {
+				return s;
+			}
+		}
+		return null;
+	}
+	
+	public L2Seed getSeedByCrop(int cropId) {
+		for (L2Seed s : _seeds.values()) {
+			if (s.getCropId() == cropId) {
+				return s;
+			}
+		}
+		return null;
+	}
+	
+	public static CastleManorManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CastleManorManager INSTANCE = new CastleManorManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
new file mode 100644
index 00000000..1f760dd5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.entity.Auction;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
+
+/**
+ * Clan Hall Manger.
+ * @author Steuf
+ */
+public final class ClanHallManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ClanHallManager.class);
+	
+	private final Map<Integer, AuctionableHall> _clanHall = new ConcurrentHashMap<>();
+	
+	private final Map<Integer, AuctionableHall> _freeClanHall = new ConcurrentHashMap<>();
+	
+	private final Map<Integer, AuctionableHall> _allAuctionableClanHalls = new HashMap<>();
+	
+	private static final Map<Integer, ClanHall> _allClanHalls = new HashMap<>();
+	
+	private boolean _loaded = false;
+	
+	public boolean loaded() {
+		return _loaded;
+	}
+	
+	protected ClanHallManager() {
+		load();
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM clanhall ORDER BY id")) {
+			int id, ownerId, lease;
+			while (rs.next()) {
+				StatsSet set = new StatsSet();
+				
+				id = rs.getInt("id");
+				ownerId = rs.getInt("ownerId");
+				lease = rs.getInt("lease");
+				
+				set.set("id", id);
+				set.set("name", rs.getString("name"));
+				set.set("ownerId", ownerId);
+				set.set("lease", lease);
+				set.set("desc", rs.getString("desc"));
+				set.set("location", rs.getString("location"));
+				set.set("paidUntil", rs.getLong("paidUntil"));
+				set.set("grade", rs.getInt("Grade"));
+				set.set("paid", rs.getBoolean("paid"));
+				AuctionableHall ch = new AuctionableHall(set);
+				_allAuctionableClanHalls.put(id, ch);
+				addClanHall(ch);
+				
+				if (ch.getOwnerId() > 0) {
+					_clanHall.put(id, ch);
+					continue;
+				}
+				_freeClanHall.put(id, ch);
+				
+				Auction auc = AuctionManager.getInstance().getAuction(id);
+				if ((auc == null) && (lease > 0)) {
+					AuctionManager.getInstance().initNPC(id);
+				}
+			}
+			LOG.info("Loaded {} clan halls.", getClanHalls().size());
+			LOG.info("Loaded {} free clan halls.", getFreeClanHalls().size());
+			_loaded = true;
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading clan halls from database!", ex);
+		}
+	}
+	
+	public Map<Integer, ClanHall> getAllClanHalls() {
+		return _allClanHalls;
+	}
+	
+	public Map<Integer, AuctionableHall> getFreeClanHalls() {
+		return _freeClanHall;
+	}
+	
+	/**
+	 * @return all ClanHalls that have owner
+	 */
+	public Map<Integer, AuctionableHall> getClanHalls() {
+		return _clanHall;
+	}
+	
+	public Map<Integer, AuctionableHall> getAllAuctionableClanHalls() {
+		return _allAuctionableClanHalls;
+	}
+	
+	public void addClanHall(ClanHall hall) {
+		_allClanHalls.put(hall.getId(), hall);
+	}
+	
+	public boolean isFree(int chId) {
+		return _freeClanHall.containsKey(chId);
+	}
+	
+	public synchronized void setFree(int chId) {
+		_freeClanHall.put(chId, _clanHall.get(chId));
+		ClanTable.getInstance().getClan(_freeClanHall.get(chId).getOwnerId()).setHideoutId(0);
+		_freeClanHall.get(chId).free();
+		_clanHall.remove(chId);
+	}
+	
+	public synchronized void setOwner(int chId, L2Clan clan) {
+		if (!_clanHall.containsKey(chId)) {
+			_clanHall.put(chId, _freeClanHall.get(chId));
+			_freeClanHall.remove(chId);
+		} else {
+			_clanHall.get(chId).free();
+		}
+		ClanTable.getInstance().getClan(clan.getId()).setHideoutId(chId);
+		_clanHall.get(chId).setOwner(clan);
+	}
+	
+	public ClanHall getClanHallById(int clanHallId) {
+		return _allClanHalls.get(clanHallId);
+	}
+	
+	public AuctionableHall getAuctionableHallById(int clanHallId) {
+		return _allAuctionableClanHalls.get(clanHallId);
+	}
+	
+	public ClanHall getClanHall(int x, int y, int z) {
+		for (ClanHall temp : _allClanHalls.values()) {
+			if (temp.checkIfInZone(x, y, z)) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	public ClanHall getClanHall(L2Object activeObject) {
+		return getClanHall(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public AuctionableHall getNearbyClanHall(int x, int y, int maxDist) {
+		L2ClanHallZone zone;
+		
+		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet()) {
+			zone = ch.getValue().getZone();
+			if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) {
+				return ch.getValue();
+			}
+		}
+		for (Map.Entry<Integer, AuctionableHall> ch : _freeClanHall.entrySet()) {
+			zone = ch.getValue().getZone();
+			if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) {
+				return ch.getValue();
+			}
+		}
+		return null;
+	}
+	
+	public ClanHall getNearbyAbstractHall(int x, int y, int maxDist) {
+		for (Map.Entry<Integer, ClanHall> ch : _allClanHalls.entrySet()) {
+			final var zone = ch.getValue().getZone();
+			if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) {
+				return ch.getValue();
+			}
+		}
+		return null;
+	}
+	
+	public AuctionableHall getClanHallByOwner(L2Clan clan) {
+		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet()) {
+			if (clan.getId() == ch.getValue().getOwnerId()) {
+				return ch.getValue();
+			}
+		}
+		return null;
+	}
+	
+	public ClanHall getAbstractHallByOwner(L2Clan clan) {
+		// Separate loops to avoid iterating over free clan halls
+		for (Map.Entry<Integer, AuctionableHall> ch : _clanHall.entrySet()) {
+			if (clan.getId() == ch.getValue().getOwnerId()) {
+				return ch.getValue();
+			}
+		}
+		for (Map.Entry<Integer, SiegableHall> ch : ClanHallSiegeManager.getInstance().getConquerableHalls().entrySet()) {
+			if (clan.getId() == ch.getValue().getOwnerId()) {
+				return ch.getValue();
+			}
+		}
+		return null;
+	}
+	
+	public static ClanHallManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ClanHallManager INSTANCE = new ClanHallManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallSiegeManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallSiegeManager.java
new file mode 100644
index 00000000..2ef23862
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/ClanHallSiegeManager.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.clanhall;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.clanhall.ClanHallSiegeEngine;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Clan Hall Siege Manager.
+ * @author BiggBoss
+ */
+public final class ClanHallSiegeManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ClanHallSiegeManager.class);
+	
+	private static final String SQL_LOAD_HALLS = "SELECT * FROM siegable_clanhall";
+	
+	private final Map<Integer, SiegableHall> _siegableHalls = new HashMap<>();
+	
+	protected ClanHallSiegeManager() {
+		loadClanHalls();
+	}
+	
+	private void loadClanHalls() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(SQL_LOAD_HALLS)) {
+			_siegableHalls.clear();
+			
+			while (rs.next()) {
+				final int id = rs.getInt("clanHallId");
+				
+				StatsSet set = new StatsSet();
+				
+				set.set("id", id);
+				set.set("name", rs.getString("name"));
+				set.set("ownerId", rs.getInt("ownerId"));
+				set.set("desc", rs.getString("desc"));
+				set.set("location", rs.getString("location"));
+				set.set("nextSiege", rs.getLong("nextSiege"));
+				set.set("siegeLength", rs.getLong("siege_length"));
+				set.set("scheduleConfig", rs.getString("schedule_config"));
+				SiegableHall hall = new SiegableHall(set);
+				_siegableHalls.put(id, hall);
+				ClanHallManager.getInstance().addClanHall(hall);
+			}
+			LOG.info("Loaded {} conquerable clan halls.", _siegableHalls.size());
+		} catch (Exception ex) {
+			LOG.warn("Could not load siegable clan halls!", ex);
+		}
+	}
+	
+	public Map<Integer, SiegableHall> getConquerableHalls() {
+		return _siegableHalls;
+	}
+	
+	public SiegableHall getSiegableHall(int clanHall) {
+		return getConquerableHalls().get(clanHall);
+	}
+	
+	public SiegableHall getNearbyClanHall(L2Character activeChar) {
+		return getNearbyClanHall(activeChar.getX(), activeChar.getY(), 10000);
+	}
+	
+	public SiegableHall getNearbyClanHall(int x, int y, int maxDist) {
+		for (Map.Entry<Integer, SiegableHall> ch : _siegableHalls.entrySet()) {
+			final var zone = ch.getValue().getZone();
+			if ((zone != null) && (zone.getDistanceToZone(x, y) < maxDist)) {
+				return ch.getValue();
+			}
+		}
+		return null;
+	}
+	
+	public ClanHallSiegeEngine getSiege(L2Character character) {
+		SiegableHall hall = getNearbyClanHall(character);
+		if (hall == null) {
+			return null;
+		}
+		return hall.getSiege();
+	}
+	
+	public void registerClan(L2Clan clan, SiegableHall hall, L2PcInstance player) {
+		if (clan.getLevel() < clanhall().getMinClanLevel()) {
+			player.sendMessage("Only clans of level " + clanhall().getMinClanLevel() + " or higher may register for a castle siege");
+		} else if (hall.isWaitingBattle()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DEADLINE_FOR_SIEGE_S1_PASSED);
+			sm.addString(hall.getName());
+			player.sendPacket(sm);
+		} else if (hall.isInSiege()) {
+			player.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
+		} else if (hall.getOwnerId() == clan.getId()) {
+			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);
+		} else if ((clan.getCastleId() != 0) || (clan.getHideoutId() != 0)) {
+			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_CANNOT_PARTICIPATE_OTHER_SIEGE);
+		} else if (hall.getSiege().checkIsAttacker(clan)) {
+			player.sendPacket(SystemMessageId.ALREADY_REQUESTED_SIEGE_BATTLE);
+		} else if (isClanParticipating(clan)) {
+			player.sendPacket(SystemMessageId.APPLICATION_DENIED_BECAUSE_ALREADY_SUBMITTED_A_REQUEST_FOR_ANOTHER_SIEGE_BATTLE);
+		} else if (hall.getSiege().getAttackers().size() >= clanhall().getMaxAttackers()) {
+			player.sendPacket(SystemMessageId.ATTACKER_SIDE_FULL);
+		} else {
+			hall.addAttacker(clan);
+		}
+	}
+	
+	public void unRegisterClan(L2Clan clan, SiegableHall hall) {
+		if (!hall.isRegistering()) {
+			return;
+		}
+		hall.removeAttacker(clan);
+	}
+	
+	public boolean isClanParticipating(L2Clan clan) {
+		for (SiegableHall hall : getConquerableHalls().values()) {
+			if ((hall.getSiege() != null) && hall.getSiege().checkIsAttacker(clan)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public void onServerShutDown() {
+		for (SiegableHall hall : getConquerableHalls().values()) {
+			// Rainbow springs has his own attackers table
+			if ((hall.getId() == 62) || (hall.getSiege() == null)) {
+				continue;
+			}
+			
+			hall.getSiege().saveAttackers();
+		}
+	}
+	
+	public static ClanHallSiegeManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static final class SingletonHolder {
+		protected static final ClanHallSiegeManager INSTANCE = new ClanHallSiegeManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java
new file mode 100644
index 00000000..3eda6bcb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Couple;
+
+/**
+ * Couple Manager.
+ * @author evill33t
+ */
+public final class CoupleManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CoupleManager.class);
+	
+	private final List<Couple> _couples = new CopyOnWriteArrayList<>();
+	
+	private CoupleManager() {
+		load();
+	}
+	
+	public void reload() {
+		_couples.clear();
+		load();
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.createStatement();
+			var rs = ps.executeQuery("SELECT id FROM mods_wedding ORDER BY id")) {
+			while (rs.next()) {
+				getCouples().add(new Couple(rs.getInt("id")));
+			}
+			LOG.info("Loaded: {} couples(s)", getCouples().size());
+		} catch (Exception e) {
+			LOG.error("Exception: CoupleManager.load(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public Couple getCouple(int coupleId) {
+		int index = getCoupleIndex(coupleId);
+		if (index >= 0) {
+			return getCouples().get(index);
+		}
+		return null;
+	}
+	
+	public void createCouple(L2PcInstance player1, L2PcInstance player2) {
+		if ((player1 != null) && (player2 != null)) {
+			if ((player1.getPartnerId() == 0) && (player2.getPartnerId() == 0)) {
+				int player1id = player1.getObjectId();
+				int player2id = player2.getObjectId();
+				
+				Couple couple = new Couple(player1, player2);
+				getCouples().add(couple);
+				player1.setPartnerId(player2id);
+				player2.setPartnerId(player1id);
+				player1.setCoupleId(couple.getId());
+				player2.setCoupleId(couple.getId());
+			}
+		}
+	}
+	
+	public void deleteCouple(int coupleId) {
+		int index = getCoupleIndex(coupleId);
+		Couple couple = getCouples().get(index);
+		if (couple != null) {
+			L2PcInstance player1 = L2World.getInstance().getPlayer(couple.getPlayer1Id());
+			L2PcInstance player2 = L2World.getInstance().getPlayer(couple.getPlayer2Id());
+			if (player1 != null) {
+				player1.setPartnerId(0);
+				player1.setMarried(false);
+				player1.setCoupleId(0);
+				
+			}
+			if (player2 != null) {
+				player2.setPartnerId(0);
+				player2.setMarried(false);
+				player2.setCoupleId(0);
+				
+			}
+			couple.divorce();
+			getCouples().remove(index);
+		}
+	}
+	
+	public int getCoupleIndex(int coupleId) {
+		int i = 0;
+		for (Couple temp : getCouples()) {
+			if ((temp != null) && (temp.getId() == coupleId)) {
+				return i;
+			}
+			i++;
+		}
+		return -1;
+	}
+	
+	public List<Couple> getCouples() {
+		return _couples;
+	}
+	
+	public static CoupleManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CoupleManager _instance = new CoupleManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java
new file mode 100644
index 00000000..38a24a08
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.CursedWeapon;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FeedableBeastInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FestivalMonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2GuardInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * UnAfraid: TODO: Rewrite with DocumentParser
+ * @author Micht
+ */
+public final class CursedWeaponsManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(CursedWeaponsManager.class);
+	
+	private Map<Integer, CursedWeapon> _cursedWeapons;
+	
+	protected CursedWeaponsManager() {
+		init();
+	}
+	
+	private void init() {
+		_cursedWeapons = new HashMap<>();
+		
+		if (!general().allowCursedWeapons()) {
+			return;
+		}
+		
+		load();
+		restore();
+		controlPlayers();
+		LOG.info("Loaded {} cursed weapon(s).", _cursedWeapons.size());
+	}
+	
+	public void reload() {
+		init();
+	}
+	
+	private void load() {
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setIgnoringComments(true);
+			
+			File file = new File(server().getDatapackRoot(), "data/cursedWeapons.xml");
+			if (!file.exists()) {
+				LOG.warn("Couldn't find {}!", file.getAbsoluteFile());
+				return;
+			}
+			
+			Document doc = factory.newDocumentBuilder().parse(file);
+			
+			for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+				if ("list".equalsIgnoreCase(n.getNodeName())) {
+					for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+						if ("item".equalsIgnoreCase(d.getNodeName())) {
+							NamedNodeMap attrs = d.getAttributes();
+							int id = Integer.parseInt(attrs.getNamedItem("id").getNodeValue());
+							int skillId = Integer.parseInt(attrs.getNamedItem("skillId").getNodeValue());
+							String name = attrs.getNamedItem("name").getNodeValue();
+							
+							CursedWeapon cw = new CursedWeapon(id, skillId, name);
+							
+							int val;
+							for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+								if ("dropRate".equalsIgnoreCase(cd.getNodeName())) {
+									attrs = cd.getAttributes();
+									val = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									cw.setDropRate(val);
+								} else if ("duration".equalsIgnoreCase(cd.getNodeName())) {
+									attrs = cd.getAttributes();
+									val = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									cw.setDuration(val);
+								} else if ("durationLost".equalsIgnoreCase(cd.getNodeName())) {
+									attrs = cd.getAttributes();
+									val = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									cw.setDurationLost(val);
+								} else if ("disappearChance".equalsIgnoreCase(cd.getNodeName())) {
+									attrs = cd.getAttributes();
+									val = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									cw.setDisappearChance(val);
+								} else if ("stageKills".equalsIgnoreCase(cd.getNodeName())) {
+									attrs = cd.getAttributes();
+									val = Integer.parseInt(attrs.getNamedItem("val").getNodeValue());
+									cw.setStageKills(val);
+								}
+							}
+							
+							// Store cursed weapon
+							_cursedWeapons.put(id, cw);
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error parsing cursed weapons file!", ex);
+		}
+	}
+	
+	private void restore() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT itemId, charId, playerKarma, playerPkKills, nbKills, endTime FROM cursed_weapons")) {
+			// Retrieve the L2PcInstance from the characters table of the database
+			CursedWeapon cw;
+			while (rs.next()) {
+				cw = _cursedWeapons.get(rs.getInt("itemId"));
+				cw.setPlayerId(rs.getInt("charId"));
+				cw.setPlayerKarma(rs.getInt("playerKarma"));
+				cw.setPlayerPkKills(rs.getInt("playerPkKills"));
+				cw.setNbKills(rs.getInt("nbKills"));
+				cw.setEndTime(rs.getLong("endTime"));
+				cw.reActivate();
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not restore cursed weapons data!", ex);
+		}
+	}
+	
+	private void controlPlayers() {
+		// TODO: See comments below...
+		// This entire for loop should NOT be necessary, since it is already handled by
+		// CursedWeapon.endOfLife(). However, if we indeed *need* to duplicate it for safety,
+		// then we'd better make sure that it FULLY cleans up inactive cursed weapons!
+		// Undesired effects result otherwise, such as player with no zariche but with karma
+		// or a lost-child entry in the cursed weapons table, without a corresponding one in items...
+		
+		// Retrieve the L2PcInstance from the characters table of the database
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT owner_id FROM items WHERE item_id=?")) {
+			for (CursedWeapon cw : _cursedWeapons.values()) {
+				if (cw.isActivated()) {
+					continue;
+				}
+				
+				// Do an item check to be sure that the cursed weapon isn't hold by someone
+				int itemId = cw.getItemId();
+				ps.setInt(1, itemId);
+				try (var rset = ps.executeQuery()) {
+					if (rset.next()) {
+						// A player has the cursed weapon in his inventory ...
+						int playerId = rset.getInt("owner_id");
+						LOG.warn("Player {} owns the cursed weapon {} but he shouldn't!", playerId, itemId);
+						
+						// Delete the item
+						try (var delete = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?")) {
+							delete.setInt(1, playerId);
+							delete.setInt(2, itemId);
+							if (delete.executeUpdate() != 1) {
+								LOG.warn("There has been an error while deleting cursed weapon {} from player Id {}!", itemId, playerId);
+							}
+						}
+						
+						// Restore the player's old karma and pk count
+						try (var update = con.prepareStatement("UPDATE characters SET karma=?, pkkills=? WHERE charId=?")) {
+							update.setInt(1, cw.getPlayerKarma());
+							update.setInt(2, cw.getPlayerPkKills());
+							update.setInt(3, playerId);
+							if (update.executeUpdate() != 1) {
+								LOG.warn("There has been an error while updating karma & pkkills for player Id {}!", cw.getPlayerId());
+							}
+						}
+						// clean up the cursed weapons table.
+						removeFromDb(itemId);
+					}
+				}
+				ps.clearParameters();
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not check cursed weapons data!", ex);
+		}
+	}
+	
+	public synchronized void checkDrop(L2Attackable attackable, L2PcInstance player) {
+		// Cursed weapons cannot drop in instance
+		if (attackable.getInstanceId() != 0) {
+			return;
+		}
+		if ((attackable instanceof L2DefenderInstance) || (attackable instanceof L2RiftInvaderInstance) || (attackable instanceof L2FestivalMonsterInstance) || (attackable instanceof L2GuardInstance) || (attackable instanceof L2GrandBossInstance) || (attackable instanceof L2FeedableBeastInstance)
+			|| (attackable instanceof L2FortCommanderInstance)) {
+			return;
+		}
+		
+		for (CursedWeapon cw : _cursedWeapons.values()) {
+			if (cw.isActive()) {
+				continue;
+			}
+			
+			if (cw.checkDrop(attackable, player)) {
+				break;
+			}
+		}
+	}
+	
+	public void activate(L2PcInstance player, L2ItemInstance item) {
+		CursedWeapon cw = _cursedWeapons.get(item.getId());
+		if (player.isCursedWeaponEquipped()) // cannot own 2 cursed swords
+		{
+			CursedWeapon cw2 = _cursedWeapons.get(player.getCursedWeaponEquippedId());
+			// TODO: give the bonus level in a more appropriate manner.
+			// The following code adds "_stageKills" levels. This will also show in the char status.
+			// I do not have enough info to know if the bonus should be shown in the pk count, or if it
+			// should be a full "_stageKills" bonus or just the remaining from the current count till the of the current stage...
+			// This code is a TEMP fix, so that the cursed weapon's bonus level can be observed with as little change in the code as possible, until proper info arises.
+			cw2.setNbKills(cw2.getStageKills() - 1);
+			cw2.increaseKills();
+			
+			// erase the newly obtained cursed weapon
+			cw.setPlayer(player); // NECESSARY in order to find which inventory the weapon is in!
+			cw.endOfLife(); // expire the weapon and clean up.
+		} else {
+			cw.activate(player, item);
+		}
+	}
+	
+	public void drop(int itemId, L2Character killer) {
+		CursedWeapon cw = _cursedWeapons.get(itemId);
+		
+		cw.dropIt(killer);
+	}
+	
+	public void increaseKills(int itemId) {
+		CursedWeapon cw = _cursedWeapons.get(itemId);
+		
+		cw.increaseKills();
+	}
+	
+	public int getLevel(int itemId) {
+		CursedWeapon cw = _cursedWeapons.get(itemId);
+		
+		return cw.getLevel();
+	}
+	
+	public static void announce(SystemMessage sm) {
+		Broadcast.toAllOnlinePlayers(sm);
+	}
+	
+	public void checkPlayer(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		for (CursedWeapon cw : _cursedWeapons.values()) {
+			if (cw.isActivated() && (player.getObjectId() == cw.getPlayerId())) {
+				cw.setPlayer(player);
+				cw.setItem(player.getInventory().getItemByItemId(cw.getItemId()));
+				cw.giveSkill();
+				player.setCursedWeaponEquippedId(cw.getItemId());
+				
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTE_OF_USAGE_TIME_ARE_LEFT_FOR_S1);
+				sm.addString(cw.getName());
+				// sm.addItemName(cw.getItemId());
+				sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000));
+				player.sendPacket(sm);
+			}
+		}
+	}
+	
+	public int checkOwnsWeaponId(int ownerId) {
+		for (CursedWeapon cw : _cursedWeapons.values()) {
+			if (cw.isActivated() && (ownerId == cw.getPlayerId())) {
+				return cw.getItemId();
+			}
+		}
+		return -1;
+	}
+	
+	public static void removeFromDb(int itemId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?")) {
+			ps.setInt(1, itemId);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Failed to remove cursed weapon Id {}!", itemId, ex);
+		}
+	}
+	
+	public void saveData() {
+		for (CursedWeapon cw : _cursedWeapons.values()) {
+			cw.saveData();
+		}
+	}
+	
+	public boolean isCursed(int itemId) {
+		return _cursedWeapons.containsKey(itemId);
+	}
+	
+	public Collection<CursedWeapon> getCursedWeapons() {
+		return _cursedWeapons.values();
+	}
+	
+	public Set<Integer> getCursedWeaponsIds() {
+		return _cursedWeapons.keySet();
+	}
+	
+	public CursedWeapon getCursedWeapon(int itemId) {
+		return _cursedWeapons.get(itemId);
+	}
+	
+	public void givePassive(int itemId) {
+		try {
+			_cursedWeapons.get(itemId).giveSkill();
+		} catch (Exception e) {
+			/***/
+		}
+	}
+	
+	public static CursedWeaponsManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CursedWeaponsManager _instance = new CursedWeaponsManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java
new file mode 100644
index 00000000..9a61aebb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
+
+/**
+ * @author godson
+ */
+public final class DayNightSpawnManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DayNightSpawnManager.class);
+	
+	private final List<L2Spawn> _dayCreatures = new ArrayList<>();
+	
+	private final List<L2Spawn> _nightCreatures = new ArrayList<>();
+	
+	private final Map<L2Spawn, L2RaidBossInstance> _bosses = new HashMap<>();
+	
+	private DayNightSpawnManager() {
+		// Prevent external initialization.
+	}
+	
+	public void addDayCreature(L2Spawn spawnDat) {
+		_dayCreatures.add(spawnDat);
+	}
+	
+	public void addNightCreature(L2Spawn spawnDat) {
+		_nightCreatures.add(spawnDat);
+	}
+	
+	/**
+	 * Spawn Day Creatures, and Unspawn Night Creatures
+	 */
+	public void spawnDayCreatures() {
+		spawnCreatures(_nightCreatures, _dayCreatures, "night", "day");
+	}
+	
+	/**
+	 * Spawn Night Creatures, and Unspawn Day Creatures
+	 */
+	public void spawnNightCreatures() {
+		spawnCreatures(_dayCreatures, _nightCreatures, "day", "night");
+	}
+	
+	/**
+	 * Manage Spawn/Respawn
+	 * @param unSpawnCreatures List with spawns must be unspawned
+	 * @param spawnCreatures List with spawns must be spawned
+	 * @param unspawnLogInfo String for log info for unspawned L2NpcInstance
+	 * @param spawnLogInfo String for log info for spawned L2NpcInstance
+	 */
+	private void spawnCreatures(List<L2Spawn> unSpawnCreatures, List<L2Spawn> spawnCreatures, String unspawnLogInfo, String spawnLogInfo) {
+		try {
+			if (!unSpawnCreatures.isEmpty()) {
+				int i = 0;
+				for (L2Spawn spawn : unSpawnCreatures) {
+					if (spawn == null) {
+						continue;
+					}
+					
+					spawn.stopRespawn();
+					L2Npc last = spawn.getLastSpawn();
+					if (last != null) {
+						last.deleteMe();
+						i++;
+					}
+				}
+				LOG.info("Removed {} {} creatures.", i, unspawnLogInfo);
+			}
+			
+			int i = 0;
+			for (L2Spawn spawnDat : spawnCreatures) {
+				if (spawnDat == null) {
+					continue;
+				}
+				spawnDat.startRespawn();
+				spawnDat.doSpawn();
+				i++;
+			}
+			
+			LOG.info("Spawned {} {} creatures.", i, spawnLogInfo);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while spawning creatures!", ex);
+		}
+	}
+	
+	private void changeMode(int mode) {
+		if (_nightCreatures.isEmpty() && _dayCreatures.isEmpty() && _bosses.isEmpty()) {
+			return;
+		}
+		
+		switch (mode) {
+			case 0 -> {
+				spawnDayCreatures();
+				specialNightBoss(0);
+			}
+			case 1 -> {
+				spawnNightCreatures();
+				specialNightBoss(1);
+			}
+		}
+	}
+	
+	public DayNightSpawnManager trim() {
+		((ArrayList<?>) _nightCreatures).trimToSize();
+		((ArrayList<?>) _dayCreatures).trimToSize();
+		return this;
+	}
+	
+	public void notifyChangeMode() {
+		if (GameTimeController.getInstance().isNight()) {
+			changeMode(1);
+		} else {
+			changeMode(0);
+		}
+	}
+	
+	public void cleanUp() {
+		_nightCreatures.clear();
+		_dayCreatures.clear();
+		_bosses.clear();
+	}
+	
+	private void specialNightBoss(int mode) {
+		try {
+			for (L2Spawn spawn : _bosses.keySet()) {
+				var boss = _bosses.get(spawn);
+				if ((boss == null) && (mode == 1)) {
+					boss = (L2RaidBossInstance) spawn.doSpawn();
+					RaidBossSpawnManager.getInstance().notifySpawnNightBoss(boss);
+					_bosses.put(spawn, boss);
+					continue;
+				}
+				
+				if ((boss == null) && (mode == 0)) {
+					continue;
+				}
+				
+				if ((boss != null) && (boss.getId() == 25328) && boss.getRaidStatus().equals(RaidBossSpawnManager.StatusEnum.ALIVE)) {
+					handleHellmann(boss, mode);
+				}
+				return;
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while spawning special night boss!", ex);
+		}
+	}
+	
+	private void handleHellmann(L2RaidBossInstance boss, int mode) {
+		switch (mode) {
+			case 0 -> {
+				boss.deleteMe();
+				LOG.info("Deleting Hellmann raidboss.");
+			}
+			case 1 -> {
+				if (!boss.isVisible()) {
+					boss.stopAllEffects();
+					boss.setIsDead(false);
+					boss.setDecayed(false);
+					boss.setCurrentHpMp(boss.getMaxHp(), boss.getMaxMp());
+					boss.spawnMe();
+					RaidBossSpawnManager.getInstance().notifySpawnNightBoss(boss);
+				}
+				LOG.info("Spawning Hellmann raidboss.");
+			}
+		}
+	}
+	
+	public L2RaidBossInstance handleBoss(L2Spawn bossSpawn) {
+		if (_bosses.containsKey(bossSpawn)) {
+			return _bosses.get(bossSpawn);
+		}
+		
+		if (GameTimeController.getInstance().isNight()) {
+			L2RaidBossInstance raidboss = (L2RaidBossInstance) bossSpawn.doSpawn();
+			_bosses.put(bossSpawn, raidboss);
+			
+			return raidboss;
+		}
+		_bosses.put(bossSpawn, null);
+		return null;
+	}
+	
+	public static DayNightSpawnManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final DayNightSpawnManager INSTANCE = new DayNightSpawnManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java
new file mode 100644
index 00000000..07264110
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.DimensionalRiftRoom;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.DimensionalRift;
+
+/**
+ * Dimensional Rift manager.
+ * @author kombat
+ */
+public final class DimensionalRiftManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(DimensionalRiftManager.class);
+	
+	private final Map<Byte, Map<Byte, DimensionalRiftRoom>> _rooms = new HashMap<>(7);
+	
+	protected DimensionalRiftManager() {
+		loadRooms();
+		loadSpawns();
+	}
+	
+	public DimensionalRiftRoom getRoom(byte type, byte room) {
+		return _rooms.get(type) == null ? null : _rooms.get(type).get(room);
+	}
+	
+	private void loadRooms() {
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setIgnoringComments(true);
+			
+			File file = new File(server().getDatapackRoot(), "data/dimensionalRiftRooms.xml");
+			if (!file.exists()) {
+				LOG.warn("Could not find file {}!", file.getAbsoluteFile());
+				return;
+			}
+			
+			Document doc = factory.newDocumentBuilder().parse(file);
+			NamedNodeMap attrs;
+			
+			byte type, id;
+			int xMin, xMax, yMin, yMax, zMin, zMax, xT, yT, zT;
+			boolean boss;
+			
+			for (Node list = doc.getFirstChild(); list != null; list = list.getNextSibling()) {
+				if ("list".equalsIgnoreCase(list.getNodeName())) {
+					for (Node room = list.getFirstChild(); room != null; room = room.getNextSibling()) {
+						if ("room".equalsIgnoreCase(room.getNodeName())) {
+							attrs = room.getAttributes();
+							
+							type = Byte.parseByte(attrs.getNamedItem("type").getNodeValue());
+							id = Byte.parseByte(attrs.getNamedItem("id").getNodeValue());
+							
+							xMin = Integer.parseInt(attrs.getNamedItem("xMin").getNodeValue());
+							xMax = Integer.parseInt(attrs.getNamedItem("xMax").getNodeValue());
+							yMin = Integer.parseInt(attrs.getNamedItem("yMin").getNodeValue());
+							yMax = Integer.parseInt(attrs.getNamedItem("yMax").getNodeValue());
+							zMin = Integer.parseInt(attrs.getNamedItem("zMin").getNodeValue());
+							zMax = Integer.parseInt(attrs.getNamedItem("zMax").getNodeValue());
+							xT = Integer.parseInt(attrs.getNamedItem("xT").getNodeValue());
+							yT = Integer.parseInt(attrs.getNamedItem("yT").getNodeValue());
+							zT = Integer.parseInt(attrs.getNamedItem("zT").getNodeValue());
+							
+							boss = Boolean.parseBoolean(attrs.getNamedItem("boss").getNodeValue());
+							
+							if (!_rooms.containsKey(type)) {
+								_rooms.put(type, new HashMap<>(9));
+							}
+							
+							_rooms.get(type).put(id, new DimensionalRiftRoom(type, id, xMin, xMax, yMin, yMax, zMin, zMax, xT, yT, zT, boss));
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There was an error on loading Dimensional Rift rooms!", ex);
+		}
+		
+		int typeSize = _rooms.size();
+		int roomSize = 0;
+		
+		for (byte b : _rooms.keySet()) {
+			roomSize += _rooms.get(b).size();
+		}
+		
+		LOG.info("Loaded {} room types with {} rooms.", typeSize, roomSize);
+	}
+	
+	public void loadSpawns() {
+		int countGood = 0, countBad = 0;
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setIgnoringComments(true);
+			
+			File file = new File(server().getDatapackRoot(), "data/dimensionalRiftSpawns.xml");
+			if (!file.exists()) {
+				LOG.warn("Could not find file {}!", file.getAbsoluteFile());
+				return;
+			}
+			
+			Document doc = factory.newDocumentBuilder().parse(file);
+			NamedNodeMap attrs;
+			byte type, roomId;
+			int mobId, x, y, z, delay, count;
+			
+			for (Node rift = doc.getFirstChild(); rift != null; rift = rift.getNextSibling()) {
+				if ("rift".equalsIgnoreCase(rift.getNodeName())) {
+					for (Node area = rift.getFirstChild(); area != null; area = area.getNextSibling()) {
+						if ("area".equalsIgnoreCase(area.getNodeName())) {
+							attrs = area.getAttributes();
+							type = Byte.parseByte(attrs.getNamedItem("type").getNodeValue());
+							
+							for (Node room = area.getFirstChild(); room != null; room = room.getNextSibling()) {
+								if ("room".equalsIgnoreCase(room.getNodeName())) {
+									attrs = room.getAttributes();
+									roomId = Byte.parseByte(attrs.getNamedItem("id").getNodeValue());
+									
+									for (Node spawn = room.getFirstChild(); spawn != null; spawn = spawn.getNextSibling()) {
+										if ("spawn".equalsIgnoreCase(spawn.getNodeName())) {
+											attrs = spawn.getAttributes();
+											mobId = Integer.parseInt(attrs.getNamedItem("mobId").getNodeValue());
+											delay = Integer.parseInt(attrs.getNamedItem("delay").getNodeValue());
+											count = Integer.parseInt(attrs.getNamedItem("count").getNodeValue());
+											
+											if (!_rooms.containsKey(type)) {
+												LOG.warn("Type {} not found!", type);
+											} else if (!_rooms.get(type).containsKey(roomId)) {
+												LOG.warn("Room {} in type {} not found!", roomId, type);
+											}
+											
+											for (int i = 0; i < count; i++) {
+												final DimensionalRiftRoom riftRoom = _rooms.get(type).get(roomId);
+												x = riftRoom.getRandomX();
+												y = riftRoom.getRandomY();
+												z = riftRoom.getTeleportCoordinates().getZ();
+												
+												if (_rooms.containsKey(type) && _rooms.get(type).containsKey(roomId)) {
+													final L2Spawn spawnDat = new L2Spawn(mobId);
+													spawnDat.setAmount(1);
+													spawnDat.setX(x);
+													spawnDat.setY(y);
+													spawnDat.setZ(z);
+													spawnDat.setHeading(-1);
+													spawnDat.setRespawnDelay(delay);
+													SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+													_rooms.get(type).get(roomId).getSpawns().add(spawnDat);
+													countGood++;
+												} else {
+													countBad++;
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There was an error on loading Dimensional Rift spawns!", ex);
+		}
+		
+		LOG.info("Loaded {} Dimensional Rift spawns.", countGood);
+		
+		if (countBad > 0) {
+			LOG.warn("There has been {} errors in DImensinal Rift spawns!", countBad);
+		}
+	}
+	
+	public void reload() {
+		for (byte b : _rooms.keySet()) {
+			for (byte i : _rooms.get(b).keySet()) {
+				_rooms.get(b).get(i).getSpawns().clear();
+			}
+			_rooms.get(b).clear();
+		}
+		_rooms.clear();
+		loadRooms();
+		loadSpawns();
+	}
+	
+	public boolean checkIfInRiftZone(int x, int y, int z, boolean ignorePeaceZone) {
+		if (ignorePeaceZone) {
+			return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z);
+		}
+		
+		return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z) && !_rooms.get((byte) 0).get((byte) 0).checkIfInZone(x, y, z);
+	}
+	
+	public boolean checkIfInPeaceZone(int x, int y, int z) {
+		return _rooms.get((byte) 0).get((byte) 0).checkIfInZone(x, y, z);
+	}
+	
+	public void teleportToWaitingRoom(L2PcInstance player) {
+		player.teleToLocation(getRoom((byte) 0, (byte) 0).getTeleportCoordinates());
+	}
+	
+	public synchronized void start(L2PcInstance player, byte type, L2Npc npc) {
+		byte room;
+		List<Byte> emptyRooms;
+		do {
+			emptyRooms = getFreeRooms(type);
+			room = emptyRooms.get(Rnd.get(1, emptyRooms.size()) - 1);
+		}
+		
+		// find empty room
+		while (_rooms.get(type).get(room).getParty() != null);
+		new DimensionalRift(npc, player.getParty(), type, room);
+	}
+	
+	public void killRift(DimensionalRift d) {
+		if (d.getTeleportTimerTask() != null) {
+			d.getTeleportTimerTask().cancel();
+		}
+		d.setTeleportTimerTask(null);
+		
+		if (d.getTeleportTimer() != null) {
+			d.getTeleportTimer().cancel();
+		}
+		d.setTeleportTimer(null);
+		
+		if (d.getSpawnTimerTask() != null) {
+			d.getSpawnTimerTask().cancel();
+		}
+		d.setSpawnTimerTask(null);
+		
+		if (d.getSpawnTimer() != null) {
+			d.getSpawnTimer().cancel();
+		}
+		d.setSpawnTimer(null);
+	}
+	
+	public boolean isAllowedEnter(byte type) {
+		int count = 0;
+		for (DimensionalRiftRoom room : _rooms.get(type).values()) {
+			if (room.getParty() != null) {
+				count++;
+			}
+		}
+		return (count < (_rooms.get(type).size() - 1));
+	}
+	
+	public List<Byte> getFreeRooms(byte type) {
+		List<Byte> list = new ArrayList<>();
+		for (DimensionalRiftRoom room : _rooms.get(type).values()) {
+			if (room.getParty() == null) {
+				list.add(room.getRoom());
+			}
+		}
+		return list;
+	}
+	
+	public static DimensionalRiftManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final DimensionalRiftManager _instance = new DimensionalRiftManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/DuelManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/DuelManager.java
new file mode 100644
index 00000000..8f6c30d4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/DuelManager.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Duel;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class DuelManager {
+	private final Map<Integer, Duel> _duels = new ConcurrentHashMap<>();
+	private final AtomicInteger _currentDuelId = new AtomicInteger();
+	
+	DuelManager() {
+		// Hide constructor
+	}
+	
+	public Duel getDuel(int duelId) {
+		return _duels.get(duelId);
+	}
+	
+	public void addDuel(L2PcInstance playerA, L2PcInstance playerB, boolean partyDuel) {
+		if ((playerA == null) || (playerB == null)) {
+			return;
+		}
+		
+		final int duelId = _currentDuelId.incrementAndGet();
+		_duels.put(duelId, new Duel(playerA, playerB, partyDuel, duelId));
+	}
+	
+	public void removeDuel(Duel duel) {
+		_duels.remove(duel.getId());
+	}
+	
+	public void doSurrender(L2PcInstance player) {
+		if ((player == null) || !player.isInDuel()) {
+			return;
+		}
+		final Duel duel = getDuel(player.getDuelId());
+		duel.doSurrender(player);
+	}
+	
+	/**
+	 * Updates player states.
+	 * @param player - the dying player
+	 */
+	public void onPlayerDefeat(L2PcInstance player) {
+		if ((player == null) || !player.isInDuel()) {
+			return;
+		}
+		final Duel duel = getDuel(player.getDuelId());
+		if (duel != null) {
+			duel.onPlayerDefeat(player);
+		}
+	}
+	
+	/**
+	 * Broadcasts a packet to the team opposing the given player.
+	 * @param player
+	 * @param packet
+	 */
+	public void broadcastToOpposingTeam(L2PcInstance player, L2GameServerPacket packet) {
+		if ((player == null) || !player.isInDuel()) {
+			return;
+		}
+		final Duel duel = getDuel(player.getDuelId());
+		
+		if (duel == null) {
+			return;
+		}
+		if (duel.getTeamA().contains(player)) {
+			duel.broadcastToTeam2(packet);
+		} else {
+			duel.broadcastToTeam1(packet);
+		}
+	}
+	
+	/**
+	 * Checks if this player might join / start a duel.
+	 * @param player
+	 * @param target
+	 * @param partyDuel
+	 * @return true if the player might join/start a duel.
+	 */
+	public static boolean canDuel(L2PcInstance player, L2PcInstance target, boolean partyDuel) {
+		SystemMessageId reason = null;
+		if (target.isInCombat() || target.isJailed()) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_BATTLE;
+		} else if (target.isTransformed()) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_WHILE_POLYMORPHED;
+		} else if (target.isDead() || ((target.getCurrentHp() < (target.getMaxHp() / 2.0)) || (target.getCurrentMp() < (target.getMaxMp() / 2.0)))) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_HP_OR_MP_IS_BELOW_50_PERCENT;
+		} else if (target.isInDuel()) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL;
+		} else if (target.isInOlympiadMode()) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD;
+		} else if (target.isCursedWeaponEquipped() || (target.getKarma() > 0) || (target.getPvpFlag() > 0)) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_STATE;
+		} else if (target.getPrivateStoreType() != PrivateStoreType.NONE) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE;
+		} else if (target.isMounted() || target.isInBoat()) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_RIDING_A_BOAT_STEED_OR_STRIDER;
+		} else if (target.isFishing()) {
+			reason = SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_FISHING;
+		} else if ((!partyDuel && (target.isInsideZone(ZoneId.PEACE) || target.isInsideZone(ZoneId.WATER))) || target.isInsideZone(ZoneId.PVP) || target.isInsideZone(ZoneId.SIEGE)) {
+			reason = SystemMessageId.C1_CANNOT_MAKE_A_CHALLANGE_TO_A_DUEL_BECAUSE_C1_IS_CURRENTLY_IN_A_DUEL_PROHIBITED_AREA;
+		}
+		
+		if (reason != null) {
+			SystemMessage msg = SystemMessage.getSystemMessage(reason);
+			msg.addString(target.getName());
+			player.sendPacket(msg);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	public static DuelManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		static final DuelManager _instance = new DuelManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/FortManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/FortManager.java
new file mode 100644
index 00000000..0ea27141
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/FortManager.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.InstanceListManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.entity.Fort;
+
+public final class FortManager implements InstanceListManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FortManager.class);
+	
+	private final List<Fort> _forts = new CopyOnWriteArrayList<>();
+	
+	public int findNearestFortIndex(L2Object obj) {
+		return findNearestFortIndex(obj, Long.MAX_VALUE);
+	}
+	
+	public int findNearestFortIndex(L2Object obj, long maxDistance) {
+		int index = getFortIndex(obj);
+		if (index < 0) {
+			double distance;
+			Fort fort;
+			for (int i = 0; i < _forts.size(); i++) {
+				fort = _forts.get(i);
+				if (fort == null) {
+					continue;
+				}
+				distance = fort.getDistance(obj);
+				if (maxDistance > distance) {
+					maxDistance = (long) distance;
+					index = i;
+				}
+			}
+		}
+		return index;
+	}
+	
+	public Fort getFortById(int fortId) {
+		for (Fort f : _forts) {
+			if (f.getResidenceId() == fortId) {
+				return f;
+			}
+		}
+		return null;
+	}
+	
+	public Fort getFortByOwner(L2Clan clan) {
+		for (Fort f : _forts) {
+			if (f.getOwnerClan() == clan) {
+				return f;
+			}
+		}
+		return null;
+	}
+	
+	public Fort getFort(String name) {
+		for (Fort f : _forts) {
+			if (f.getName().equalsIgnoreCase(name.trim())) {
+				return f;
+			}
+		}
+		return null;
+	}
+	
+	public Fort getFort(int x, int y, int z) {
+		for (Fort f : _forts) {
+			if (f.checkIfInZone(x, y, z)) {
+				return f;
+			}
+		}
+		return null;
+	}
+	
+	public Fort getFort(L2Object activeObject) {
+		return getFort(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public int getFortIndex(int fortId) {
+		Fort fort;
+		for (int i = 0; i < _forts.size(); i++) {
+			fort = _forts.get(i);
+			if ((fort != null) && (fort.getResidenceId() == fortId)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	public int getFortIndex(L2Object activeObject) {
+		return getFortIndex(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public int getFortIndex(int x, int y, int z) {
+		Fort fort;
+		for (int i = 0; i < _forts.size(); i++) {
+			fort = _forts.get(i);
+			if ((fort != null) && fort.checkIfInZone(x, y, z)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	public List<Fort> getForts() {
+		return _forts;
+	}
+	
+	@Override
+	public void loadInstances() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT id FROM fort ORDER BY id")) {
+			while (rs.next()) {
+				_forts.add(new Fort(rs.getInt("id")));
+			}
+			
+			LOG.info("Loaded {} fortress.", _forts.size());
+			
+			for (Fort fort : _forts) {
+				fort.getSiege().getSiegeGuardManager().loadSiegeGuard();
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading fort instances!", ex);
+		}
+	}
+	
+	@Override
+	public void updateReferences() {
+	}
+	
+	@Override
+	public void activateInstances() {
+		for (final Fort fort : _forts) {
+			fort.activateInstance();
+		}
+	}
+	
+	public static FortManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FortManager _instance = new FortManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java
new file mode 100644
index 00000000..3af97352
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.entity.Fort;
+
+public final class FortSiegeGuardManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FortSiegeGuardManager.class);
+	
+	private final Fort _fort;
+	
+	private final Map<Integer, List<L2Spawn>> _siegeGuards = new HashMap<>();
+	
+	public FortSiegeGuardManager(Fort fort) {
+		_fort = fort;
+	}
+	
+	public void spawnSiegeGuard() {
+		try {
+			final List<L2Spawn> monsterList = _siegeGuards.get(getFort().getResidenceId());
+			if (monsterList != null) {
+				for (L2Spawn spawnDat : monsterList) {
+					spawnDat.doSpawn();
+					if (spawnDat.getRespawnDelay() == 0) {
+						spawnDat.stopRespawn();
+					} else {
+						spawnDat.startRespawn();
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Error spawning siege guards for fort {}: {}", getFort().getName(), e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Unspawn guards.
+	 */
+	public void unspawnSiegeGuard() {
+		try {
+			final List<L2Spawn> monsterList = _siegeGuards.get(getFort().getResidenceId());
+			if (monsterList != null) {
+				for (L2Spawn spawnDat : monsterList) {
+					spawnDat.stopRespawn();
+					if (spawnDat.getLastSpawn() != null) {
+						spawnDat.getLastSpawn().doDie(spawnDat.getLastSpawn());
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Error despawning siege guards for fort {}: {}", getFort().getName(), e.getMessage(), e);
+		}
+	}
+	
+	void loadSiegeGuard() {
+		_siegeGuards.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT npcId, x, y, z, heading, respawnDelay FROM fort_siege_guards WHERE fortId = ?")) {
+			final int fortId = getFort().getResidenceId();
+			ps.setInt(1, fortId);
+			try (var rs = ps.executeQuery()) {
+				final List<L2Spawn> siegeGuardSpawns = new ArrayList<>();
+				while (rs.next()) {
+					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
+					spawn.setAmount(1);
+					spawn.setX(rs.getInt("x"));
+					spawn.setY(rs.getInt("y"));
+					spawn.setZ(rs.getInt("z"));
+					spawn.setHeading(rs.getInt("heading"));
+					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
+					spawn.setLocationId(0);
+					
+					siegeGuardSpawns.add(spawn);
+				}
+				_siegeGuards.put(fortId, siegeGuardSpawns);
+			}
+		} catch (Exception e) {
+			LOG.warn("Error loading siege guard for fort {}: {}", getFort().getName(), e.getMessage(), e);
+		}
+	}
+	
+	public Fort getFort() {
+		return _fort;
+	}
+	
+	public Map<Integer, List<L2Spawn>> getSiegeGuardSpawn() {
+		return _siegeGuards;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java
new file mode 100644
index 00000000..0d9b8d1c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.fortSiege;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.CombatFlag;
+import com.l2jserver.gameserver.model.FortSiegeSpawn;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.FortSiege;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class FortSiegeManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FortSiegeManager.class);
+	
+	// Fort Siege settings
+	private Map<Integer, List<FortSiegeSpawn>> _commanderSpawnList;
+	private Map<Integer, List<CombatFlag>> _flagList;
+	private final List<FortSiege> _sieges = new ArrayList<>();
+	
+	private FortSiegeManager() {
+		load();
+	}
+	
+	public void addSiegeSkills(L2PcInstance character) {
+		character.addSkill(CommonSkill.SEAL_OF_RULER.getSkill(), false);
+		character.addSkill(CommonSkill.BUILD_HEADQUARTERS.getSkill(), false);
+	}
+	
+	/**
+	 * @param clan The L2Clan of the player
+	 * @param fortid id of the fort to check against
+	 * @return true if the clan is registered or owner of a fort
+	 */
+	public boolean checkIsRegistered(L2Clan clan, int fortid) {
+		if (clan == null) {
+			return false;
+		}
+		
+		boolean register = false;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans where clan_id=? and fort_id=?")) {
+			ps.setInt(1, clan.getId());
+			ps.setInt(2, fortid);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					register = true;
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: checkIsRegistered(): {}", e.getMessage(), e);
+		}
+		return register;
+	}
+	
+	public void removeSiegeSkills(L2PcInstance character) {
+		character.removeSkill(CommonSkill.SEAL_OF_RULER.getSkill());
+		character.removeSkill(CommonSkill.BUILD_HEADQUARTERS.getSkill());
+	}
+	
+	private void load() {
+		// Siege spawns settings
+		_commanderSpawnList = new ConcurrentHashMap<>();
+		_flagList = new ConcurrentHashMap<>();
+		
+		for (Fort fort : FortManager.getInstance().getForts()) {
+			List<FortSiegeSpawn> commanderSpawns = new ArrayList<>();
+			List<CombatFlag> flagSpawns = new ArrayList<>();
+			for (int i = 1; i < 5; i++) {
+				final String spawnParams = fortSiege().getProperty(fort.getName().replace(" ", "") + "Commander" + i);
+				if (spawnParams == null) {
+					break;
+				}
+				
+				final StringTokenizer st = new StringTokenizer(spawnParams.trim(), ",");
+				try {
+					int x = Integer.parseInt(st.nextToken());
+					int y = Integer.parseInt(st.nextToken());
+					int z = Integer.parseInt(st.nextToken());
+					int heading = Integer.parseInt(st.nextToken());
+					int npc_id = Integer.parseInt(st.nextToken());
+					commanderSpawns.add(new FortSiegeSpawn(fort.getResidenceId(), x, y, z, heading, npc_id, i));
+				} catch (Exception e) {
+					LOG.warn("Error while loading commander(s) for {} fort.", fort.getName());
+				}
+			}
+			
+			_commanderSpawnList.put(fort.getResidenceId(), commanderSpawns);
+			
+			for (int i = 1; i < 4; i++) {
+				final String spawnParams = fortSiege().getProperty(fort.getName().replace(" ", "") + "Flag" + i);
+				if (spawnParams == null) {
+					break;
+				}
+				final StringTokenizer st = new StringTokenizer(spawnParams.trim(), ",");
+				
+				try {
+					int x = Integer.parseInt(st.nextToken());
+					int y = Integer.parseInt(st.nextToken());
+					int z = Integer.parseInt(st.nextToken());
+					int flag_id = Integer.parseInt(st.nextToken());
+					
+					flagSpawns.add(new CombatFlag(fort.getResidenceId(), x, y, z, 0, flag_id));
+				} catch (Exception e) {
+					LOG.warn("Error while loading flag(s) for {} fort.", fort.getName());
+				}
+			}
+			_flagList.put(fort.getResidenceId(), flagSpawns);
+		}
+	}
+	
+	public List<FortSiegeSpawn> getCommanderSpawnList(int _fortId) {
+		return _commanderSpawnList.get(_fortId);
+	}
+	
+	public List<CombatFlag> getFlagList(int _fortId) {
+		return _flagList.get(_fortId);
+	}
+	
+	public FortSiege getSiege(L2Object activeObject) {
+		return getSiege(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public FortSiege getSiege(int x, int y, int z) {
+		for (Fort fort : FortManager.getInstance().getForts()) {
+			if (fort.getSiege().checkIfInZone(x, y, z)) {
+				return fort.getSiege();
+			}
+		}
+		return null;
+	}
+	
+	public List<FortSiege> getSieges() {
+		return _sieges;
+	}
+	
+	public void addSiege(FortSiege fortSiege) {
+		_sieges.add(fortSiege);
+	}
+	
+	public boolean isCombat(int itemId) {
+		return (itemId == 9819);
+	}
+	
+	public boolean activateCombatFlag(L2PcInstance player, L2ItemInstance item) {
+		if (!checkIfCanPickup(player)) {
+			return false;
+		}
+		
+		final Fort fort = FortManager.getInstance().getFort(player);
+		
+		final List<CombatFlag> fcf = _flagList.get(fort.getResidenceId());
+		for (CombatFlag cf : fcf) {
+			if (cf.getCombatFlagInstance() == item) {
+				cf.activate(player, item);
+			}
+		}
+		return true;
+	}
+	
+	public boolean checkIfCanPickup(L2PcInstance player) {
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
+		sm.addItemName(9819);
+		// Cannot own 2 combat flag
+		if (player.isCombatFlagEquipped()) {
+			player.sendPacket(sm);
+			return false;
+		}
+		
+		// here check if is siege is in progress
+		// here check if is siege is attacker
+		final Fort fort = FortManager.getInstance().getFort(player);
+		
+		if ((fort == null) || (fort.getResidenceId() <= 0)) {
+			player.sendPacket(sm);
+			return false;
+		} else if (!fort.getSiege().isInProgress()) {
+			player.sendPacket(sm);
+			return false;
+		} else if (fort.getSiege().getAttackerClan(player.getClan()) == null) {
+			player.sendPacket(sm);
+			return false;
+		}
+		return true;
+	}
+	
+	public void dropCombatFlag(L2PcInstance player, int fortId) {
+		final Fort fort = FortManager.getInstance().getFortById(fortId);
+		final List<CombatFlag> fcf = _flagList.get(fort.getResidenceId());
+		for (CombatFlag cf : fcf) {
+			if (cf.getPlayerObjectId() == player.getObjectId()) {
+				cf.dropIt();
+				if (fort.getSiege().isInProgress()) {
+					cf.spawnMe();
+				}
+			}
+		}
+	}
+	
+	public static FortSiegeManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FortSiegeManager _instance = new FortSiegeManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java
new file mode 100644
index 00000000..ea69a20e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java
@@ -0,0 +1,1280 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.instancemanager.tasks.FourSepulchersChangeAttackTimeTask;
+import com.l2jserver.gameserver.instancemanager.tasks.FourSepulchersChangeCoolDownTimeTask;
+import com.l2jserver.gameserver.instancemanager.tasks.FourSepulchersChangeEntryTimeTask;
+import com.l2jserver.gameserver.instancemanager.tasks.FourSepulchersChangeWarmUpTimeTask;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SepulcherMonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SepulcherNpcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Zoey76: TODO: Use Location DTO instead of array of int.
+ * @author sandman
+ */
+public final class FourSepulchersManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FourSepulchersManager.class);
+	
+	private static final int QUEST_ID = 620;
+	
+	private static final int ENTRANCE_PASS = 7075;
+	
+	private static final int USED_PASS = 7261;
+	
+	private static final int CHAPEL_KEY = 7260;
+	
+	private static final int ANTIQUE_BROOCH = 7262;
+	
+	private boolean _firstTimeRun;
+	private boolean _inEntryTime = false;
+	private boolean _inWarmUpTime = false;
+	private boolean _inAttackTime = false;
+	private boolean _inCoolDownTime = false;
+	
+	private ScheduledFuture<?> _changeCoolDownTimeTask = null;
+	private ScheduledFuture<?> _changeEntryTimeTask = null;
+	private ScheduledFuture<?> _changeWarmUpTimeTask = null;
+	private ScheduledFuture<?> _changeAttackTimeTask = null;
+	
+	// @formatter:off
+	private final int[][] _startHallSpawn =
+	{
+		{ 181632, -85587, -7218 },
+		{ 179963, -88978, -7218 },
+		{ 173217, -86132, -7218 },
+		{ 175608, -82296, -7218 }
+	};
+	
+	private final int[][][] _shadowSpawnLoc =
+	{
+		{
+			{ 25339, 191231, -85574, -7216, 33380 },
+			{ 25349, 189534, -88969, -7216, 32768 },
+			{ 25346, 173195, -76560, -7215, 49277 },
+			{ 25342, 175591, -72744, -7215, 49317 }
+		},
+		{
+			{ 25342, 191231, -85574, -7216, 33380 },
+			{ 25339, 189534, -88969, -7216, 32768 },
+			{ 25349, 173195, -76560, -7215, 49277 },
+			{ 25346, 175591, -72744, -7215, 49317 }
+		},
+		{
+			{ 25346, 191231, -85574, -7216, 33380 },
+			{ 25342, 189534, -88969, -7216, 32768 },
+			{ 25339, 173195, -76560, -7215, 49277 },
+			{ 25349, 175591, -72744, -7215, 49317 }
+		},
+		{
+			{ 25349, 191231, -85574, -7216, 33380 },
+			{ 25346, 189534, -88969, -7216, 32768 },
+			{ 25342, 173195, -76560, -7215, 49277 },
+			{ 25339, 175591, -72744, -7215, 49317 }
+		},
+	};
+	// @formatter:on
+	
+	protected Map<Integer, Boolean> _archonSpawned = new ConcurrentHashMap<>();
+	protected Map<Integer, Boolean> _hallInUse = new ConcurrentHashMap<>();
+	protected Map<Integer, L2PcInstance> _challengers = new ConcurrentHashMap<>();
+	protected Map<Integer, int[]> _startHallSpawns = new HashMap<>();
+	protected Map<Integer, Integer> _hallGateKeepers = new HashMap<>();
+	protected Map<Integer, Integer> _keyBoxNpc = new HashMap<>();
+	protected Map<Integer, Integer> _victim = new HashMap<>();
+	protected Map<Integer, L2Spawn> _executionerSpawns = new HashMap<>();
+	protected Map<Integer, L2Spawn> _keyBoxSpawns = new HashMap<>();
+	protected Map<Integer, L2Spawn> _mysteriousBoxSpawns = new HashMap<>();
+	protected Map<Integer, L2Spawn> _shadowSpawns = new HashMap<>();
+	protected Map<Integer, List<L2Spawn>> _dukeFinalMobs = new HashMap<>();
+	protected Map<Integer, List<L2SepulcherMonsterInstance>> _dukeMobs = new HashMap<>();
+	protected Map<Integer, List<L2Spawn>> _emperorsGraveNpcs = new HashMap<>();
+	protected Map<Integer, List<L2Spawn>> _magicalMonsters = new HashMap<>();
+	protected Map<Integer, List<L2Spawn>> _physicalMonsters = new HashMap<>();
+	protected Map<Integer, List<L2SepulcherMonsterInstance>> _viscountMobs = new HashMap<>();
+	
+	protected List<L2Spawn> _physicalSpawns;
+	protected List<L2Spawn> _magicalSpawns;
+	protected List<L2Spawn> _managers;
+	protected List<L2Spawn> _dukeFinalSpawns;
+	protected List<L2Spawn> _emperorsGraveSpawns;
+	protected List<L2Npc> _allMobs = new CopyOnWriteArrayList<>();
+	
+	private long _attackTimeEnd = 0;
+	private long _coolDownTimeEnd = 0;
+	private long _entryTimeEnd = 0;
+	private long _warmUpTimeEnd = 0;
+	
+	private final byte _newCycleMin = 55;
+	
+	public void init() {
+		if (_changeCoolDownTimeTask != null) {
+			_changeCoolDownTimeTask.cancel(true);
+		}
+		if (_changeEntryTimeTask != null) {
+			_changeEntryTimeTask.cancel(true);
+		}
+		if (_changeWarmUpTimeTask != null) {
+			_changeWarmUpTimeTask.cancel(true);
+		}
+		if (_changeAttackTimeTask != null) {
+			_changeAttackTimeTask.cancel(true);
+		}
+		
+		_changeCoolDownTimeTask = null;
+		_changeEntryTimeTask = null;
+		_changeWarmUpTimeTask = null;
+		_changeAttackTimeTask = null;
+		
+		_inEntryTime = false;
+		_inWarmUpTime = false;
+		_inAttackTime = false;
+		_inCoolDownTime = false;
+		
+		_firstTimeRun = true;
+		initFixedInfo();
+		loadMysteriousBox();
+		initKeyBoxSpawns();
+		loadPhysicalMonsters();
+		loadMagicalMonsters();
+		initLocationShadowSpawns();
+		initExecutionerSpawns();
+		loadDukeMonsters();
+		loadEmperorsGraveMonsters();
+		spawnManagers();
+		timeSelector();
+	}
+	
+	// phase select on server launch
+	protected void timeSelector() {
+		timeCalculator();
+		long currentTime = Calendar.getInstance().getTimeInMillis();
+		// if current time >= time of entry beginning and if current time < time of entry beginning + time of entry end
+		if ((currentTime >= _coolDownTimeEnd) && (currentTime < _entryTimeEnd)) // entry time check
+		{
+			clean();
+			_changeEntryTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeEntryTimeTask(), 0);
+			LOG.info("Beginning in entry time");
+		} else if ((currentTime >= _entryTimeEnd) && (currentTime < _warmUpTimeEnd)) // warmup time check
+		{
+			clean();
+			_changeWarmUpTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeWarmUpTimeTask(), 0);
+			LOG.info("Beginning in warm-up time.");
+		} else if ((currentTime >= _warmUpTimeEnd) && (currentTime < _attackTimeEnd)) // attack time check
+		{
+			clean();
+			_changeAttackTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeAttackTimeTask(), 0);
+			LOG.info("Beginning in attack time.");
+		} else
+		// else cooldown time and without cleanup because it's already implemented
+		{
+			_changeCoolDownTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeCoolDownTimeTask(), 0);
+			LOG.info("Beginning in cooldown time.");
+		}
+	}
+	
+	// phase end times calculator
+	protected void timeCalculator() {
+		Calendar tmp = Calendar.getInstance();
+		if (tmp.get(Calendar.MINUTE) < _newCycleMin) {
+			tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1);
+		}
+		tmp.set(Calendar.MINUTE, _newCycleMin);
+		_coolDownTimeEnd = tmp.getTimeInMillis();
+		_entryTimeEnd = _coolDownTimeEnd + general().getTimeOfEntry();
+		_warmUpTimeEnd = _entryTimeEnd + general().getTimeOfWarmUp();
+		_attackTimeEnd = _warmUpTimeEnd + general().getTimeOfAttack();
+	}
+	
+	public void clean() {
+		for (var i = 31921; i < 31925; i++) {
+			if (!_startHallSpawns.containsKey(i)) {
+				LOG.warn("NPC Id {} is not inside {}!", i, _startHallSpawns);
+				continue;
+			}
+			final var location = _startHallSpawns.get(i);
+			GrandBossManager.getInstance().getZone(location[0], location[1], location[2]).oustAllPlayers();
+		}
+		
+		deleteAllMobs();
+		
+		closeAllDoors();
+		
+		_hallInUse.clear();
+		_hallInUse.put(31921, false);
+		_hallInUse.put(31922, false);
+		_hallInUse.put(31923, false);
+		_hallInUse.put(31924, false);
+		
+		_archonSpawned.replaceAll((_, _) -> false);
+	}
+	
+	protected void spawnManagers() {
+		_managers = new CopyOnWriteArrayList<>();
+		
+		for (int npcId = 31921; npcId <= 31924; npcId++) {
+			try {
+				final L2Spawn spawnDat = new L2Spawn(npcId);
+				spawnDat.setAmount(1);
+				spawnDat.setRespawnDelay(60);
+				switch (npcId) {
+					// conquerors
+					case 31921 -> {
+						spawnDat.setX(181061);
+						spawnDat.setY(-85595);
+						spawnDat.setZ(-7200);
+						spawnDat.setHeading(-32584);
+					}
+					// emperors
+					case 31922 -> {
+						spawnDat.setX(179292);
+						spawnDat.setY(-88981);
+						spawnDat.setZ(-7200);
+						spawnDat.setHeading(-33272);
+					}
+					// sages
+					case 31923 -> {
+						spawnDat.setX(173202);
+						spawnDat.setY(-87004);
+						spawnDat.setZ(-7200);
+						spawnDat.setHeading(-16248);
+					}
+					// judges
+					case 31924 -> {
+						spawnDat.setX(175606);
+						spawnDat.setY(-82853);
+						spawnDat.setZ(-7200);
+						spawnDat.setHeading(-16248);
+					}
+				}
+				_managers.add(spawnDat);
+				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+				spawnDat.doSpawn();
+				spawnDat.startRespawn();
+				LOG.info("Spawned {}.", spawnDat.getTemplate().getName());
+			} catch (Exception ex) {
+				LOG.warn("There has been an error while spawning managers!", ex);
+			}
+		}
+	}
+	
+	protected void initFixedInfo() {
+		_startHallSpawns.put(31921, _startHallSpawn[0]);
+		_startHallSpawns.put(31922, _startHallSpawn[1]);
+		_startHallSpawns.put(31923, _startHallSpawn[2]);
+		_startHallSpawns.put(31924, _startHallSpawn[3]);
+		
+		_hallInUse.put(31921, false);
+		_hallInUse.put(31922, false);
+		_hallInUse.put(31923, false);
+		_hallInUse.put(31924, false);
+		
+		_hallGateKeepers.put(31925, 25150012);
+		_hallGateKeepers.put(31926, 25150013);
+		_hallGateKeepers.put(31927, 25150014);
+		_hallGateKeepers.put(31928, 25150015);
+		_hallGateKeepers.put(31929, 25150016);
+		_hallGateKeepers.put(31930, 25150002);
+		_hallGateKeepers.put(31931, 25150003);
+		_hallGateKeepers.put(31932, 25150004);
+		_hallGateKeepers.put(31933, 25150005);
+		_hallGateKeepers.put(31934, 25150006);
+		_hallGateKeepers.put(31935, 25150032);
+		_hallGateKeepers.put(31936, 25150033);
+		_hallGateKeepers.put(31937, 25150034);
+		_hallGateKeepers.put(31938, 25150035);
+		_hallGateKeepers.put(31939, 25150036);
+		_hallGateKeepers.put(31940, 25150022);
+		_hallGateKeepers.put(31941, 25150023);
+		_hallGateKeepers.put(31942, 25150024);
+		_hallGateKeepers.put(31943, 25150025);
+		_hallGateKeepers.put(31944, 25150026);
+		
+		_keyBoxNpc.put(18120, 31455);
+		_keyBoxNpc.put(18121, 31455);
+		_keyBoxNpc.put(18122, 31455);
+		_keyBoxNpc.put(18123, 31455);
+		_keyBoxNpc.put(18124, 31456);
+		_keyBoxNpc.put(18125, 31456);
+		_keyBoxNpc.put(18126, 31456);
+		_keyBoxNpc.put(18127, 31456);
+		_keyBoxNpc.put(18128, 31457);
+		_keyBoxNpc.put(18129, 31457);
+		_keyBoxNpc.put(18130, 31457);
+		_keyBoxNpc.put(18131, 31457);
+		_keyBoxNpc.put(18149, 31458);
+		_keyBoxNpc.put(18150, 31459);
+		_keyBoxNpc.put(18151, 31459);
+		_keyBoxNpc.put(18152, 31459);
+		_keyBoxNpc.put(18153, 31459);
+		_keyBoxNpc.put(18154, 31460);
+		_keyBoxNpc.put(18155, 31460);
+		_keyBoxNpc.put(18156, 31460);
+		_keyBoxNpc.put(18157, 31460);
+		_keyBoxNpc.put(18158, 31461);
+		_keyBoxNpc.put(18159, 31461);
+		_keyBoxNpc.put(18160, 31461);
+		_keyBoxNpc.put(18161, 31461);
+		_keyBoxNpc.put(18162, 31462);
+		_keyBoxNpc.put(18163, 31462);
+		_keyBoxNpc.put(18164, 31462);
+		_keyBoxNpc.put(18165, 31462);
+		_keyBoxNpc.put(18183, 31463);
+		_keyBoxNpc.put(18184, 31464);
+		_keyBoxNpc.put(18212, 31465);
+		_keyBoxNpc.put(18213, 31465);
+		_keyBoxNpc.put(18214, 31465);
+		_keyBoxNpc.put(18215, 31465);
+		_keyBoxNpc.put(18216, 31466);
+		_keyBoxNpc.put(18217, 31466);
+		_keyBoxNpc.put(18218, 31466);
+		_keyBoxNpc.put(18219, 31466);
+		
+		_victim.put(18150, 18158);
+		_victim.put(18151, 18159);
+		_victim.put(18152, 18160);
+		_victim.put(18153, 18161);
+		_victim.put(18154, 18162);
+		_victim.put(18155, 18163);
+		_victim.put(18156, 18164);
+		_victim.put(18157, 18165);
+	}
+	
+	private void loadMysteriousBox() {
+		_mysteriousBoxSpawns.clear();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay, key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY id")) {
+			ps.setInt(1, 0);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npc_templateid"));
+					spawnDat.setAmount(rs.getInt("count"));
+					spawnDat.setX(rs.getInt("locx"));
+					spawnDat.setY(rs.getInt("locy"));
+					spawnDat.setZ(rs.getInt("locz"));
+					spawnDat.setHeading(rs.getInt("heading"));
+					spawnDat.setRespawnDelay(rs.getInt("respawn_delay"));
+					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+					int keyNpcId = rs.getInt("key_npc_id");
+					_mysteriousBoxSpawns.put(keyNpcId, spawnDat);
+				}
+			}
+			LOG.info("Loaded {} Mysterious-Box spawns.", _mysteriousBoxSpawns.size());
+		} catch (Exception ex) {
+			LOG.warn("Misterious-Boc spawn could not be initialized!", ex);
+		}
+	}
+	
+	private void initKeyBoxSpawns() {
+		for (Entry<Integer, Integer> keyNpc : _keyBoxNpc.entrySet()) {
+			try {
+				final L2Spawn spawnDat = new L2Spawn(keyNpc.getValue());
+				spawnDat.setAmount(1);
+				spawnDat.setX(0);
+				spawnDat.setY(0);
+				spawnDat.setZ(0);
+				spawnDat.setHeading(0);
+				spawnDat.setRespawnDelay(3600);
+				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+				_keyBoxSpawns.put(keyNpc.getKey(), spawnDat);
+			} catch (Exception ex) {
+				LOG.warn("Key Box spawn could not be initialized!", ex);
+			}
+		}
+	}
+	
+	private void loadPhysicalMonsters() {
+		_physicalMonsters.clear();
+		
+		int loaded = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id")) {
+			ps1.setInt(1, 1);
+			try (var rs1 = ps1.executeQuery();
+				var ps2 = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay, key_npc_id FROM four_sepulchers_spawnlist Where key_npc_id = ? and spawntype = ? ORDER BY id")) {
+				while (rs1.next()) {
+					int keyNpcId = rs1.getInt("key_npc_id");
+					
+					ps2.setInt(1, keyNpcId);
+					ps2.setInt(2, 1);
+					try (var rs2 = ps2.executeQuery()) {
+						_physicalSpawns = new ArrayList<>();
+						while (rs2.next()) {
+							final L2Spawn spawnDat = new L2Spawn(rs2.getInt("npc_templateid"));
+							spawnDat.setAmount(rs2.getInt("count"));
+							spawnDat.setX(rs2.getInt("locx"));
+							spawnDat.setY(rs2.getInt("locy"));
+							spawnDat.setZ(rs2.getInt("locz"));
+							spawnDat.setHeading(rs2.getInt("heading"));
+							spawnDat.setRespawnDelay(rs2.getInt("respawn_delay"));
+							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+							_physicalSpawns.add(spawnDat);
+							loaded++;
+						}
+					}
+					ps2.clearParameters();
+					_physicalMonsters.put(keyNpcId, _physicalSpawns);
+				}
+			}
+			LOG.info("Loaded {} Physical type monsters spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Physical monsters spawn could not be initialized!", ex);
+		}
+	}
+	
+	private void loadMagicalMonsters() {
+		_magicalMonsters.clear();
+		
+		int loaded = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id")) {
+			ps1.setInt(1, 2);
+			try (var rs1 = ps1.executeQuery();
+				var ps2 = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay, key_npc_id FROM four_sepulchers_spawnlist WHERE key_npc_id = ? AND spawntype = ? ORDER BY id")) {
+				while (rs1.next()) {
+					int keyNpcId = rs1.getInt("key_npc_id");
+					
+					ps2.setInt(1, keyNpcId);
+					ps2.setInt(2, 2);
+					try (var rset2 = ps2.executeQuery()) {
+						_magicalSpawns = new ArrayList<>();
+						
+						while (rset2.next()) {
+							final L2Spawn spawnDat = new L2Spawn(rset2.getInt("npc_templateid"));
+							spawnDat.setAmount(rset2.getInt("count"));
+							spawnDat.setX(rset2.getInt("locx"));
+							spawnDat.setY(rset2.getInt("locy"));
+							spawnDat.setZ(rset2.getInt("locz"));
+							spawnDat.setHeading(rset2.getInt("heading"));
+							spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
+							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+							_magicalSpawns.add(spawnDat);
+							loaded++;
+						}
+					}
+					ps2.clearParameters();
+					_magicalMonsters.put(keyNpcId, _magicalSpawns);
+				}
+			}
+			LOG.info("Loaded {} Magical monsters spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Magical monsters spawn could not be initialized!", ex);
+		}
+	}
+	
+	private void loadDukeMonsters() {
+		_dukeFinalMobs.clear();
+		_archonSpawned.clear();
+		
+		int loaded = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id")) {
+			ps1.setInt(1, 5);
+			try (var rs1 = ps1.executeQuery();
+				var ps2 = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay, key_npc_id FROM four_sepulchers_spawnlist WHERE key_npc_id = ? AND spawntype = ? ORDER BY id")) {
+				while (rs1.next()) {
+					int keyNpcId = rs1.getInt("key_npc_id");
+					
+					ps2.setInt(1, keyNpcId);
+					ps2.setInt(2, 5);
+					try (var rset2 = ps2.executeQuery()) {
+						ps2.clearParameters();
+						
+						_dukeFinalSpawns = new ArrayList<>();
+						
+						while (rset2.next()) {
+							final L2Spawn spawnDat = new L2Spawn(rset2.getInt("npc_templateid"));
+							spawnDat.setAmount(rset2.getInt("count"));
+							spawnDat.setX(rset2.getInt("locx"));
+							spawnDat.setY(rset2.getInt("locy"));
+							spawnDat.setZ(rset2.getInt("locz"));
+							spawnDat.setHeading(rset2.getInt("heading"));
+							spawnDat.setRespawnDelay(rset2.getInt("respawn_delay"));
+							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+							_dukeFinalSpawns.add(spawnDat);
+							loaded++;
+						}
+					}
+					ps2.clearParameters();
+					_dukeFinalMobs.put(keyNpcId, _dukeFinalSpawns);
+					_archonSpawned.put(keyNpcId, false);
+				}
+			}
+			LOG.info("Loaded {} Church of duke monsters spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Duke monsters spawn could not be initialized", ex);
+		}
+	}
+	
+	private void loadEmperorsGraveMonsters() {
+		_emperorsGraveNpcs.clear();
+		
+		int loaded = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("SELECT Distinct key_npc_id FROM four_sepulchers_spawnlist Where spawntype = ? ORDER BY key_npc_id")) {
+			ps1.setInt(1, 6);
+			try (var rs1 = ps1.executeQuery();
+				var ps2 = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay, key_npc_id FROM four_sepulchers_spawnlist WHERE key_npc_id = ? and spawntype = ? ORDER BY id")) {
+				while (rs1.next()) {
+					int keyNpcId = rs1.getInt("key_npc_id");
+					
+					ps2.setInt(1, keyNpcId);
+					ps2.setInt(2, 6);
+					try (var rs2 = ps2.executeQuery()) {
+						_emperorsGraveSpawns = new ArrayList<>();
+						
+						while (rs2.next()) {
+							final L2Spawn spawnDat = new L2Spawn(rs2.getInt("npc_templateid"));
+							spawnDat.setAmount(rs2.getInt("count"));
+							spawnDat.setX(rs2.getInt("locx"));
+							spawnDat.setY(rs2.getInt("locy"));
+							spawnDat.setZ(rs2.getInt("locz"));
+							spawnDat.setHeading(rs2.getInt("heading"));
+							spawnDat.setRespawnDelay(rs2.getInt("respawn_delay"));
+							SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+							_emperorsGraveSpawns.add(spawnDat);
+							loaded++;
+						}
+					}
+					ps2.clearParameters();
+					_emperorsGraveNpcs.put(keyNpcId, _emperorsGraveSpawns);
+				}
+			}
+			LOG.info("Loaded {} Emperor's Grave spawns.", loaded);
+		} catch (Exception ex) {
+			LOG.warn("Emperor's Grave spawns could not be initialized!", ex);
+		}
+	}
+	
+	protected void initLocationShadowSpawns() {
+		int locNo = Rnd.get(4);
+		final int[] gateKeeper = {
+			31929,
+			31934,
+			31939,
+			31944
+		};
+		
+		_shadowSpawns.clear();
+		
+		for (int i = 0; i <= 3; i++) {
+			try {
+				final L2Spawn spawnDat = new L2Spawn(_shadowSpawnLoc[locNo][i][0]);
+				spawnDat.setAmount(1);
+				spawnDat.setX(_shadowSpawnLoc[locNo][i][1]);
+				spawnDat.setY(_shadowSpawnLoc[locNo][i][2]);
+				spawnDat.setZ(_shadowSpawnLoc[locNo][i][3]);
+				spawnDat.setHeading(_shadowSpawnLoc[locNo][i][4]);
+				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+				_shadowSpawns.put(gateKeeper[i], spawnDat);
+			} catch (Exception ex) {
+				LOG.warn("There has been an error spawning shadows!", ex);
+			}
+		}
+	}
+	
+	protected void initExecutionerSpawns() {
+		for (int keyNpcId : _victim.keySet()) {
+			try {
+				final L2Spawn spawnDat = new L2Spawn(_victim.get(keyNpcId));
+				spawnDat.setAmount(1);
+				spawnDat.setX(0);
+				spawnDat.setY(0);
+				spawnDat.setZ(0);
+				spawnDat.setHeading(0);
+				spawnDat.setRespawnDelay(3600);
+				SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+				_executionerSpawns.put(keyNpcId, spawnDat);
+			} catch (Exception ex) {
+				LOG.warn("Executioner spawns could not be initialized!", ex);
+			}
+		}
+	}
+	
+	public ScheduledFuture<?> getChangeAttackTimeTask() {
+		return _changeAttackTimeTask;
+	}
+	
+	public void setChangeAttackTimeTask(ScheduledFuture<?> task) {
+		_changeAttackTimeTask = task;
+	}
+	
+	public ScheduledFuture<?> getChangeCoolDownTimeTask() {
+		return _changeCoolDownTimeTask;
+	}
+	
+	public void setChangeCoolDownTimeTask(ScheduledFuture<?> task) {
+		_changeCoolDownTimeTask = task;
+	}
+	
+	public ScheduledFuture<?> getChangeEntryTimeTask() {
+		return _changeEntryTimeTask;
+	}
+	
+	public void setChangeEntryTimeTask(ScheduledFuture<?> task) {
+		_changeEntryTimeTask = task;
+	}
+	
+	public ScheduledFuture<?> getChangeWarmUpTimeTask() {
+		return _changeWarmUpTimeTask;
+	}
+	
+	public void setChangeWarmUpTimeTask(ScheduledFuture<?> task) {
+		_changeWarmUpTimeTask = task;
+	}
+	
+	public long getAttackTimeEnd() {
+		return _attackTimeEnd;
+	}
+	
+	public void setAttackTimeEnd(long attackTimeEnd) {
+		_attackTimeEnd = attackTimeEnd;
+	}
+	
+	public byte getCycleMin() {
+		return _newCycleMin;
+	}
+	
+	public long getEntrytTimeEnd() {
+		return _entryTimeEnd;
+	}
+	
+	public void setEntryTimeEnd(long entryTimeEnd) {
+		_entryTimeEnd = entryTimeEnd;
+	}
+	
+	public long getWarmUpTimeEnd() {
+		return _warmUpTimeEnd;
+	}
+	
+	public void setWarmUpTimeEnd(long warmUpTimeEnd) {
+		_warmUpTimeEnd = warmUpTimeEnd;
+	}
+	
+	public boolean isAttackTime() {
+		return _inAttackTime;
+	}
+	
+	public void setIsAttackTime(boolean attackTime) {
+		_inAttackTime = attackTime;
+	}
+	
+	public boolean isCoolDownTime() {
+		return _inCoolDownTime;
+	}
+	
+	public void setIsCoolDownTime(boolean isCoolDownTime) {
+		_inCoolDownTime = isCoolDownTime;
+	}
+	
+	public boolean isEntryTime() {
+		return _inEntryTime;
+	}
+	
+	public void setIsEntryTime(boolean entryTime) {
+		_inEntryTime = entryTime;
+	}
+	
+	public boolean isFirstTimeRun() {
+		return _firstTimeRun;
+	}
+	
+	public void setIsFirstTimeRun(boolean isFirstTimeRun) {
+		_firstTimeRun = isFirstTimeRun;
+	}
+	
+	public boolean isWarmUpTime() {
+		return _inWarmUpTime;
+	}
+	
+	public void setIsWarmUpTime(boolean isWarmUpTime) {
+		_inWarmUpTime = isWarmUpTime;
+	}
+	
+	public synchronized void tryEntry(L2Npc npc, L2PcInstance player) {
+		Quest hostQuest = QuestManager.getInstance().getQuest(QUEST_ID);
+		if (hostQuest == null) {
+			LOG.warn("Could not find quest Id {}!", QUEST_ID);
+			return;
+		}
+		
+		int npcId = npc.getId();
+		switch (npcId) {
+			// ID ok
+			case 31921:
+			case 31922:
+			case 31923:
+			case 31924:
+				break;
+			// ID not ok
+			default: {
+				if (!player.isGM()) {
+					LOG.warn("Player {} tried to cheat in four sepulchers.", player);
+					Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " tried to enter four sepulchers with invalid npc id.");
+				}
+				return;
+			}
+		}
+		
+		if (_hallInUse.get(npcId)) {
+			showHtmlFile(player, npcId + "-FULL.htm", npc, null);
+			return;
+		}
+		
+		if (general().getNumberOfNecessaryPartyMembers() > 1) {
+			if (!player.isInParty() || (player.getParty().getMemberCount() < general().getNumberOfNecessaryPartyMembers())) {
+				showHtmlFile(player, npcId + "-SP.htm", npc, null);
+				return;
+			}
+			
+			if (!player.getParty().isLeader(player)) {
+				showHtmlFile(player, npcId + "-NL.htm", npc, null);
+				return;
+			}
+			
+			for (L2PcInstance mem : player.getParty().getMembers()) {
+				QuestState qs = mem.getQuestState(hostQuest.getName());
+				if ((qs == null) || (!qs.isStarted() && !qs.isCompleted())) {
+					showHtmlFile(player, npcId + "-NS.htm", npc, mem);
+					return;
+				}
+				if (mem.getInventory().getItemByItemId(ENTRANCE_PASS) == null) {
+					showHtmlFile(player, npcId + "-SE.htm", npc, mem);
+					return;
+				}
+				
+				if (player.getWeightPenalty() >= 3) {
+					mem.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
+					return;
+				}
+			}
+		} else if ((general().getNumberOfNecessaryPartyMembers() <= 1) && player.isInParty()) {
+			if (!player.getParty().isLeader(player)) {
+				showHtmlFile(player, npcId + "-NL.htm", npc, null);
+				return;
+			}
+			for (L2PcInstance mem : player.getParty().getMembers()) {
+				QuestState qs = mem.getQuestState(hostQuest.getName());
+				if ((qs == null) || (!qs.isStarted() && !qs.isCompleted())) {
+					showHtmlFile(player, npcId + "-NS.htm", npc, mem);
+					return;
+				}
+				if (mem.getInventory().getItemByItemId(ENTRANCE_PASS) == null) {
+					showHtmlFile(player, npcId + "-SE.htm", npc, mem);
+					return;
+				}
+				
+				if (player.getWeightPenalty() >= 3) {
+					mem.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
+					return;
+				}
+			}
+		} else {
+			QuestState qs = player.getQuestState(hostQuest.getName());
+			if ((qs == null) || (!qs.isStarted() && !qs.isCompleted())) {
+				showHtmlFile(player, npcId + "-NS.htm", npc, player);
+				return;
+			}
+			if (player.getInventory().getItemByItemId(ENTRANCE_PASS) == null) {
+				showHtmlFile(player, npcId + "-SE.htm", npc, player);
+				return;
+			}
+			
+			if (player.getWeightPenalty() >= 3) {
+				player.sendPacket(SystemMessageId.INVENTORY_LESS_THAN_80_PERCENT);
+				return;
+			}
+		}
+		
+		if (!isEntryTime()) {
+			showHtmlFile(player, npcId + "-NE.htm", npc, null);
+			return;
+		}
+		
+		showHtmlFile(player, npcId + "-OK.htm", npc, null);
+		
+		entry(npcId, player);
+	}
+	
+	private void entry(int npcId, L2PcInstance player) {
+		int[] Location = _startHallSpawns.get(npcId);
+		int driftx;
+		int drifty;
+		
+		if (general().getNumberOfNecessaryPartyMembers() > 1) {
+			final List<L2PcInstance> members = new LinkedList<>();
+			for (L2PcInstance mem : player.getParty().getMembers()) {
+				if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true)) {
+					members.add(mem);
+				}
+			}
+			
+			for (L2PcInstance mem : members) {
+				GrandBossManager.getInstance().getZone(Location[0], Location[1], Location[2]).allowPlayerEntry(mem, 30);
+				driftx = Rnd.get(-80, 80);
+				drifty = Rnd.get(-80, 80);
+				mem.teleToLocation(Location[0] + driftx, Location[1] + drifty, Location[2]);
+				mem.destroyItemByItemId("Quest", ENTRANCE_PASS, 1, mem, true);
+				if (mem.getInventory().getItemByItemId(ANTIQUE_BROOCH) == null) {
+					mem.addItem("Quest", USED_PASS, 1, mem, true);
+				}
+				
+				L2ItemInstance hallsKey = mem.getInventory().getItemByItemId(CHAPEL_KEY);
+				if (hallsKey != null) {
+					mem.destroyItemByItemId("Quest", CHAPEL_KEY, hallsKey.getCount(), mem, true);
+				}
+			}
+			
+			_challengers.put(npcId, player);
+			
+			_hallInUse.put(npcId, true);
+		}
+		if ((general().getNumberOfNecessaryPartyMembers() <= 1) && player.isInParty()) {
+			final List<L2PcInstance> members = new LinkedList<>();
+			for (L2PcInstance mem : player.getParty().getMembers()) {
+				if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true)) {
+					members.add(mem);
+				}
+			}
+			
+			for (L2PcInstance mem : members) {
+				GrandBossManager.getInstance().getZone(Location[0], Location[1], Location[2]).allowPlayerEntry(mem, 30);
+				driftx = Rnd.get(-80, 80);
+				drifty = Rnd.get(-80, 80);
+				mem.teleToLocation(Location[0] + driftx, Location[1] + drifty, Location[2]);
+				mem.destroyItemByItemId("Quest", ENTRANCE_PASS, 1, mem, true);
+				if (mem.getInventory().getItemByItemId(ANTIQUE_BROOCH) == null) {
+					mem.addItem("Quest", USED_PASS, 1, mem, true);
+				}
+				
+				L2ItemInstance hallsKey = mem.getInventory().getItemByItemId(CHAPEL_KEY);
+				if (hallsKey != null) {
+					mem.destroyItemByItemId("Quest", CHAPEL_KEY, hallsKey.getCount(), mem, true);
+				}
+			}
+			
+			_challengers.put(npcId, player);
+			
+			_hallInUse.put(npcId, true);
+		} else {
+			GrandBossManager.getInstance().getZone(Location[0], Location[1], Location[2]).allowPlayerEntry(player, 30);
+			driftx = Rnd.get(-80, 80);
+			drifty = Rnd.get(-80, 80);
+			player.teleToLocation(Location[0] + driftx, Location[1] + drifty, Location[2]);
+			player.destroyItemByItemId("Quest", ENTRANCE_PASS, 1, player, true);
+			if (player.getInventory().getItemByItemId(ANTIQUE_BROOCH) == null) {
+				player.addItem("Quest", USED_PASS, 1, player, true);
+			}
+			
+			L2ItemInstance hallsKey = player.getInventory().getItemByItemId(CHAPEL_KEY);
+			if (hallsKey != null) {
+				player.destroyItemByItemId("Quest", CHAPEL_KEY, hallsKey.getCount(), player, true);
+			}
+			
+			_challengers.put(npcId, player);
+			
+			_hallInUse.put(npcId, true);
+		}
+	}
+	
+	public void spawnMysteriousBox(int npcId) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		L2Spawn spawnDat = _mysteriousBoxSpawns.get(npcId);
+		if (spawnDat != null) {
+			_allMobs.add(spawnDat.doSpawn());
+			spawnDat.stopRespawn();
+		}
+	}
+	
+	public void spawnMonster(int npcId) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		final List<L2SepulcherMonsterInstance> mobs = new CopyOnWriteArrayList<>();
+		final List<L2Spawn> monsterList;
+		if (Rnd.get(2) == 0) {
+			monsterList = _physicalMonsters.get(npcId);
+		} else {
+			monsterList = _magicalMonsters.get(npcId);
+		}
+		
+		if (monsterList != null) {
+			boolean spawnKeyBoxMob = false;
+			boolean spawnedKeyBoxMob = false;
+			
+			for (L2Spawn spawnDat : monsterList) {
+				if (spawnedKeyBoxMob) {
+					spawnKeyBoxMob = false;
+				} else {
+					switch (npcId) {
+						case 31469:
+						case 31474:
+						case 31479:
+						case 31484:
+							if (Rnd.get(48) == 0) {
+								spawnKeyBoxMob = true;
+							}
+							break;
+						default:
+							spawnKeyBoxMob = false;
+					}
+				}
+				
+				L2SepulcherMonsterInstance mob = null;
+				
+				if (spawnKeyBoxMob) {
+					try {
+						final L2Spawn keyBoxMobSpawn = new L2Spawn(18149);
+						keyBoxMobSpawn.setAmount(1);
+						keyBoxMobSpawn.setLocation(spawnDat.getLocation());
+						keyBoxMobSpawn.setRespawnDelay(3600);
+						SpawnTable.getInstance().addNewSpawn(keyBoxMobSpawn, false);
+						mob = (L2SepulcherMonsterInstance) keyBoxMobSpawn.doSpawn();
+						keyBoxMobSpawn.stopRespawn();
+					} catch (Exception ex) {
+						LOG.warn("Monster spawns could not be initialized!", ex);
+					}
+					
+					spawnedKeyBoxMob = true;
+				} else {
+					mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn();
+					spawnDat.stopRespawn();
+				}
+				
+				if (mob != null) {
+					mob.mysteriousBoxId = npcId;
+					switch (npcId) {
+						case 31469, 31474, 31479, 31484, 31472, 31477, 31482, 31487 -> mobs.add(mob);
+					}
+					_allMobs.add(mob);
+				}
+			}
+			
+			switch (npcId) {
+				case 31469, 31474, 31479, 31484 -> _viscountMobs.put(npcId, mobs);
+				case 31472, 31477, 31482, 31487 -> _dukeMobs.put(npcId, mobs);
+			}
+		}
+	}
+	
+	public synchronized boolean isViscountMobsAnnihilated(int npcId) {
+		List<L2SepulcherMonsterInstance> mobs = _viscountMobs.get(npcId);
+		if (mobs == null) {
+			return true;
+		}
+		
+		for (L2SepulcherMonsterInstance mob : mobs) {
+			if (!mob.isDead()) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	public synchronized boolean isDukeMobsAnnihilated(int npcId) {
+		List<L2SepulcherMonsterInstance> mobs = _dukeMobs.get(npcId);
+		if (mobs == null) {
+			return true;
+		}
+		
+		for (L2SepulcherMonsterInstance mob : mobs) {
+			if (!mob.isDead()) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	public void spawnKeyBox(L2Npc activeChar) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		L2Spawn spawnDat = _keyBoxSpawns.get(activeChar.getId());
+		if (spawnDat != null) {
+			spawnDat.setAmount(1);
+			spawnDat.setX(activeChar.getX());
+			spawnDat.setY(activeChar.getY());
+			spawnDat.setZ(activeChar.getZ());
+			spawnDat.setHeading(activeChar.getHeading());
+			spawnDat.setRespawnDelay(3600);
+			_allMobs.add(spawnDat.doSpawn());
+			spawnDat.stopRespawn();
+		}
+	}
+	
+	public void spawnExecutionerOfHalisha(L2Npc activeChar) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		L2Spawn spawnDat = _executionerSpawns.get(activeChar.getId());
+		if (spawnDat != null) {
+			spawnDat.setAmount(1);
+			spawnDat.setX(activeChar.getX());
+			spawnDat.setY(activeChar.getY());
+			spawnDat.setZ(activeChar.getZ());
+			spawnDat.setHeading(activeChar.getHeading());
+			spawnDat.setRespawnDelay(3600);
+			_allMobs.add(spawnDat.doSpawn());
+			spawnDat.stopRespawn();
+		}
+	}
+	
+	public void spawnArchonOfHalisha(int npcId) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		if (_archonSpawned.get(npcId)) {
+			return;
+		}
+		
+		List<L2Spawn> monsterList = _dukeFinalMobs.get(npcId);
+		if (monsterList != null) {
+			for (L2Spawn spawnDat : monsterList) {
+				L2SepulcherMonsterInstance mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn();
+				spawnDat.stopRespawn();
+				
+				if (mob != null) {
+					mob.mysteriousBoxId = npcId;
+					_allMobs.add(mob);
+				}
+			}
+			_archonSpawned.put(npcId, true);
+		}
+	}
+	
+	public void spawnEmperorsGraveNpc(int npcId) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		List<L2Spawn> monsterList = _emperorsGraveNpcs.get(npcId);
+		if (monsterList != null) {
+			for (L2Spawn spawnDat : monsterList) {
+				_allMobs.add(spawnDat.doSpawn());
+				spawnDat.stopRespawn();
+			}
+		}
+	}
+	
+	public void locationShadowSpawns() {
+		int locNo = Rnd.get(4);
+		final int[] gateKeeper = {
+			31929,
+			31934,
+			31939,
+			31944
+		};
+		
+		for (int i = 0; i <= 3; i++) {
+			int keyNpcId = gateKeeper[i];
+			L2Spawn spawnDat = _shadowSpawns.get(keyNpcId);
+			spawnDat.setX(_shadowSpawnLoc[locNo][i][1]);
+			spawnDat.setY(_shadowSpawnLoc[locNo][i][2]);
+			spawnDat.setZ(_shadowSpawnLoc[locNo][i][3]);
+			spawnDat.setHeading(_shadowSpawnLoc[locNo][i][4]);
+			_shadowSpawns.put(keyNpcId, spawnDat);
+		}
+	}
+	
+	public void spawnShadow(int npcId) {
+		if (!isAttackTime()) {
+			return;
+		}
+		
+		L2Spawn spawnDat = _shadowSpawns.get(npcId);
+		if (spawnDat != null) {
+			L2SepulcherMonsterInstance mob = (L2SepulcherMonsterInstance) spawnDat.doSpawn();
+			spawnDat.stopRespawn();
+			
+			if (mob != null) {
+				mob.mysteriousBoxId = npcId;
+				_allMobs.add(mob);
+			}
+		}
+	}
+	
+	public void deleteAllMobs() {
+		for (L2Npc mob : _allMobs) {
+			try {
+				if (mob.getSpawn() != null) {
+					mob.getSpawn().stopRespawn();
+				}
+				mob.deleteMe();
+			} catch (Exception ex) {
+				LOG.warn("Failed deleting mob!", ex);
+			}
+		}
+		_allMobs.clear();
+	}
+	
+	protected void closeAllDoors() {
+		for (int doorId : _hallGateKeepers.values()) {
+			try {
+				L2DoorInstance door = DoorData.getInstance().getDoor(doorId);
+				if (door != null) {
+					door.closeMe();
+				} else {
+					LOG.warn("Attempted to close undefined door Id {}!", doorId);
+				}
+			} catch (Exception ex) {
+				LOG.warn("Failed closing door Id {}!", doorId, ex);
+			}
+		}
+	}
+	
+	protected byte minuteSelect(byte min) {
+		if (((double) min % 5) != 0) // if doesn't divides on 5 fully
+		{
+			// mad table for selecting proper minutes...
+			// may be there is a better way to do this
+			switch (min) {
+				case 6, 7 -> min = 5;
+				case 8, 9, 11, 12 -> min = 10;
+				case 13, 14, 16, 17 -> min = 15;
+				case 18, 19, 21, 22 -> min = 20;
+				case 23, 24, 26, 27 -> min = 25;
+				case 28, 29, 31, 32 -> min = 30;
+				case 33, 34, 36, 37 -> min = 35;
+				case 38, 39, 41, 42 -> min = 40;
+				case 43, 44, 46, 47 -> min = 45;
+				case 48, 49, 51, 52 -> min = 50;
+				case 53, 54, 56, 57 -> min = 55;
+			}
+		}
+		return min;
+	}
+	
+	public void managerSay(byte min) {
+		// for attack phase, sending message every 5 minutes
+		if (_inAttackTime) {
+			if (min < 5) {
+				return; // do not shout when < 5 minutes
+			}
+			
+			min = minuteSelect(min);
+			
+			NpcStringId msg = NpcStringId.MINUTES_HAVE_PASSED;
+			
+			if (min == 90) {
+				msg = NpcStringId.GAME_OVER_THE_TELEPORT_WILL_APPEAR_MOMENTARILY;
+			}
+			
+			for (L2Spawn temp : _managers) {
+				if (temp == null) {
+					LOG.warn("Manager is null on attack time!");
+					continue;
+				}
+				
+				if (!(temp.getLastSpawn() instanceof L2SepulcherNpcInstance)) {
+					LOG.warn("Manager is not Sepulcher instance on attack time!");
+					continue;
+				}
+				
+				// hall not used right now, so its manager will not tell you anything :)
+				// if you don't need this - delete next two lines.
+				if (!_hallInUse.get(temp.getId())) {
+					continue;
+				}
+				
+				((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout(msg);
+			}
+		}
+		
+		else if (_inEntryTime) {
+			NpcStringId msg1 = NpcStringId.YOU_MAY_NOW_ENTER_THE_SEPULCHER;
+			NpcStringId msg2 = NpcStringId.IF_YOU_PLACE_YOUR_HAND_ON_THE_STONE_STATUE_IN_FRONT_OF_EACH_SEPULCHER_YOU_WILL_BE_ABLE_TO_ENTER;
+			for (L2Spawn temp : _managers) {
+				if (temp == null) {
+					LOG.warn("Manager is null on entry time!");
+					continue;
+				}
+				if (!(temp.getLastSpawn() instanceof L2SepulcherNpcInstance)) {
+					LOG.warn("Manager is not Sepulcher instance on entry time!");
+					continue;
+				}
+				((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout(msg1);
+				((L2SepulcherNpcInstance) temp.getLastSpawn()).sayInShout(msg2);
+			}
+		}
+	}
+	
+	public Map<Integer, Integer> getHallGateKeepers() {
+		return _hallGateKeepers;
+	}
+	
+	public void showHtmlFile(L2PcInstance player, String file, L2Npc npc, L2PcInstance member) {
+		final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
+		html.setFile(player.getHtmlPrefix(), "data/html/SepulcherNpc/" + file);
+		if (member != null) {
+			html.replace("%member%", member.getName());
+		}
+		player.sendPacket(html);
+	}
+	
+	public static FourSepulchersManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FourSepulchersManager _instance = new FourSepulchersManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java
new file mode 100644
index 00000000..2eedaa03
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.variables.AbstractVariables;
+
+/**
+ * Global Variables Manager.
+ * @author xban1x
+ */
+public final class GlobalVariablesManager extends AbstractVariables {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(GlobalVariablesManager.class);
+	
+	private static final String SELECT_QUERY = "SELECT * FROM global_variables";
+	
+	private static final String DELETE_QUERY = "DELETE FROM global_variables";
+	
+	private static final String INSERT_QUERY = "INSERT INTO global_variables (var, value) VALUES (?, ?)";
+	
+	protected GlobalVariablesManager() {
+		restoreMe();
+	}
+	
+	@Override
+	public boolean restoreMe() {
+		// Restore previous variables.
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.createStatement();
+			var rs = st.executeQuery(SELECT_QUERY)) {
+			while (rs.next()) {
+				set(rs.getString("var"), rs.getString("value"));
+			}
+		} catch (Exception ex) {
+			LOG.warn("Couldn't restore global variables!", ex);
+			return false;
+		} finally {
+			compareAndSetChanges(true, false);
+		}
+		LOG.info("Loaded {} variables.", getSet().size());
+		return true;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		// No changes, nothing to store.
+		if (!hasChanges()) {
+			return false;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var del = con.createStatement();
+			var st = con.prepareStatement(INSERT_QUERY)) {
+			// Clear previous entries.
+			del.execute(DELETE_QUERY);
+			
+			// Insert all variables.
+			for (Entry<String, Object> entry : getSet().entrySet()) {
+				st.setString(1, entry.getKey());
+				st.setString(2, String.valueOf(entry.getValue()));
+				st.addBatch();
+			}
+			st.executeBatch();
+		} catch (Exception ex) {
+			LOG.warn("Couldn't save global variables to database!", ex);
+			return false;
+		} finally {
+			compareAndSetChanges(true, false);
+		}
+		LOG.info("Stored {} variables.", getSet().size());
+		return true;
+	}
+	
+	public static GlobalVariablesManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final GlobalVariablesManager _instance = new GlobalVariablesManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java
new file mode 100644
index 00000000..e92f6647
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.graciaSeeds;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.tasks.UpdateSoDStateTask;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.quest.Quest;
+
+public final class GraciaSeedsManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(GraciaSeedsManager.class);
+	
+	private static final String ENERGY_SEEDS = "EnergySeeds";
+	private static final String SOD_DEFENCE = "Defence";
+	
+	private static final byte SOITYPE = 2;
+	
+	private static final byte SOATYPE = 3;
+	
+	// Seed of Destruction
+	private static final int EDRIC = 32527;
+	private static final Location EDRIC_SPAWN_LOCATION = new Location(-248525, 250048, 4307, 24576);
+	private static final byte SODTYPE = 1;
+	private L2Npc edricSpawn = null;
+	private int _SoDTiatKilled = 0;
+	private int _SoDState = 1;
+	private final Calendar _SoDLastStateChangeDate;
+	
+	private GraciaSeedsManager() {
+		_SoDLastStateChangeDate = Calendar.getInstance();
+		loadData();
+		handleSodStages();
+	}
+	
+	private void saveData(byte seedType) {
+		switch (seedType) {
+			case SODTYPE:
+				// Seed of Destruction
+				GlobalVariablesManager.getInstance().set("SoDState", _SoDState);
+				GlobalVariablesManager.getInstance().set("SoDTiatKilled", _SoDTiatKilled);
+				GlobalVariablesManager.getInstance().set("SoDLSCDate", _SoDLastStateChangeDate.getTimeInMillis());
+				break;
+			case SOITYPE:
+				// Seed of Infinity
+				break;
+			case SOATYPE:
+				// Seed of Annihilation
+				break;
+			default:
+				LOG.warn("Unknown SeedType in SaveData: {}", seedType);
+				break;
+		}
+	}
+	
+	private void loadData() {
+		// Seed of Destruction variables
+		if (GlobalVariablesManager.getInstance().hasVariable("SoDState")) {
+			_SoDState = GlobalVariablesManager.getInstance().getInt("SoDState");
+			_SoDTiatKilled = GlobalVariablesManager.getInstance().getInt("SoDTiatKilled", _SoDTiatKilled);
+			_SoDLastStateChangeDate.setTimeInMillis(GlobalVariablesManager.getInstance().getLong("SoDLSCDate"));
+		} else {
+			// save Initial values
+			saveData(SODTYPE);
+		}
+	}
+	
+	private void handleSodStages() {
+		switch (_SoDState) {
+			case 1:
+				// Despawn Edric(Remnant Manager) and do nothing else, players should kill Tiat a few times
+				despawnSoDRemnantManager();
+				break;
+			case 2:
+				// Conquest Complete state, if too much time is passed than change to defense state
+				long timePast = System.currentTimeMillis() - _SoDLastStateChangeDate.getTimeInMillis();
+				if (timePast >= graciaSeeds().getStage2Length()) {
+					// change to Defend state
+					setSoDState(5, true, false);
+				} else {
+					// Schedule change to Defend state
+					ThreadPoolManager.getInstance().scheduleEffect(new UpdateSoDStateTask(), graciaSeeds().getStage2Length() - timePast);
+				}
+				// Spawn Edric(Remnant Manager) for solo instances;
+				spawnSoDRemnantManager();
+				break;
+			case 3, 4, 5:
+				// Spawn Edric(Remnant Manager) else is handled by datapack
+				spawnSoDRemnantManager();
+				break;
+			default:
+				LOG.warn("Unknown Seed of Destruction state({})! ", _SoDState);
+		}
+	}
+	
+	private void updateSoDDefence(int state) {
+		if ((state >= 3) && (state <= 5)) {
+			final Quest quest = QuestManager.getInstance().getQuest(SOD_DEFENCE);
+			if (quest == null) {
+				LOG.warn(": missing Defence Quest!");
+			} else {
+				quest.notifyEvent("start", null, null);
+			}
+		} else {
+			LOG.warn("Invalid Seed of Destruction defence state({}), should be 3, 4 or 5", state);
+		}
+	}
+	
+	private void stopSoDInvasion() {
+		final Quest defQuest = QuestManager.getInstance().getQuest(SOD_DEFENCE);
+		if (defQuest == null) {
+			LOG.warn("Missing Defence Quest!");
+		} else {
+			defQuest.notifyEvent("stop", null, null);
+		}
+	}
+	
+	public void updateSodState() {
+		final Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS);
+		if (esQuest == null) {
+			LOG.warn("Missing EnergySeeds Quest!");
+		} else {
+			esQuest.notifyEvent("StopSoDAi", null, null);
+			stopSoDInvasion();
+		}
+	}
+	
+	public void increaseSoDTiatKilled() {
+		if (_SoDState == 1) {
+			_SoDTiatKilled++;
+			if (_SoDTiatKilled >= graciaSeeds().getTiatKillCountForNextState()) {
+				setSoDState(2, false, true);
+			}
+			saveData(SODTYPE);
+		}
+	}
+	
+	private void setSoDOpenState() {
+		Quest esQuest = QuestManager.getInstance().getQuest(ENERGY_SEEDS);
+		if (esQuest == null) {
+			LOG.warn(getClass().getSimpleName() + ": missing EnergySeeds Quest!");
+		} else {
+			esQuest.notifyEvent("StartSoDAi", null, null);
+			stopSoDInvasion();
+		}
+	}
+	
+	private void spawnSoDRemnantManager() {
+		try {
+			if ((edricSpawn == null) || edricSpawn.isDecayed()) {
+				final L2Spawn spawn = new L2Spawn(EDRIC);
+				spawn.setInstanceId(0);
+				spawn.setLocation(EDRIC_SPAWN_LOCATION);
+				spawn.stopRespawn();
+				edricSpawn = spawn.spawnOne(false);
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not spawn NPC Edric #" + EDRIC + "; error: {}", e.getMessage());
+		}
+	}
+	
+	private void despawnSoDRemnantManager() {
+		if (edricSpawn != null) {
+			edricSpawn.deleteMe();
+		}
+	}
+	
+	public int getSoDTiatKilled() {
+		return _SoDTiatKilled;
+	}
+	
+	public void setSoDState(int value, boolean doSave, boolean updateDate) {
+		LOG.info("New Seed of Destruction state -> {}.", value);
+		if (updateDate) {
+			_SoDLastStateChangeDate.setTimeInMillis(System.currentTimeMillis());
+		}
+		_SoDState = value;
+		
+		if (_SoDState == 1) {
+			// reset number of Tiat kills
+			_SoDTiatKilled = 0;
+			updateSodState();
+		} else if (_SoDState == 2) {
+			setSoDOpenState();
+		} else if (_SoDState > 2) {
+			updateSoDDefence(_SoDState);
+		}
+		
+		handleSodStages();
+		
+		if (doSave) {
+			saveData(SODTYPE);
+		}
+	}
+	
+	public long getSoDTimeForNextStateChange() {
+		// this should not happen!
+		return switch (_SoDState) {
+			case 2 -> ((_SoDLastStateChangeDate.getTimeInMillis() + graciaSeeds().getStage2Length()) - System.currentTimeMillis());
+			default -> -1;
+		};
+	}
+	
+	public Calendar getSoDLastStateChangeDate() {
+		return _SoDLastStateChangeDate;
+	}
+	
+	public int getSoDState() {
+		return _SoDState;
+	}
+	
+	/**
+	 * Gets the single instance of {@code GraciaSeedsManager}.
+	 * @return single instance of {@code GraciaSeedsManager}
+	 */
+	public static GraciaSeedsManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final GraciaSeedsManager _instance = new GraciaSeedsManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java
new file mode 100644
index 00000000..4604b39c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java
@@ -0,0 +1,319 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.instancemanager.tasks.GrandBossManagerStoreTask;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IStorable;
+import com.l2jserver.gameserver.model.zone.type.L2BossZone;
+
+/**
+ * Grand Boss manager.
+ * @author DaRkRaGe
+ * @author Emperorc
+ */
+public final class GrandBossManager implements IStorable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(GrandBossManager.class);
+	
+	private static final String DELETE_GRAND_BOSS_LIST = "DELETE FROM grandboss_list";
+	
+	private static final String INSERT_GRAND_BOSS_LIST = "INSERT INTO grandboss_list (player_id,zone) VALUES (?,?)";
+	
+	private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?";
+	
+	private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?";
+	
+	protected static final Map<Integer, L2GrandBossInstance> BOSSES = new ConcurrentHashMap<>();
+	
+	protected static Map<Integer, StatsSet> _storedInfo = new HashMap<>();
+	
+	private final Map<Integer, Integer> _bossStatus = new ConcurrentHashMap<>();
+	
+	private final Map<Integer, L2BossZone> _zones = new ConcurrentHashMap<>();
+	
+	protected GrandBossManager() {
+		init();
+	}
+	
+	private void init() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * from grandboss_data ORDER BY boss_id")) {
+			while (rs.next()) {
+				// Read all info from DB, and store it for AI to read and decide what to do
+				// faster than accessing DB in real time
+				StatsSet info = new StatsSet();
+				int bossId = rs.getInt("boss_id");
+				info.set("loc_x", rs.getInt("loc_x"));
+				info.set("loc_y", rs.getInt("loc_y"));
+				info.set("loc_z", rs.getInt("loc_z"));
+				info.set("heading", rs.getInt("heading"));
+				info.set("respawn_time", rs.getLong("respawn_time"));
+				double HP = rs.getDouble("currentHP"); // jython doesn't recognize doubles
+				int true_HP = (int) HP; // so use java's ability to type cast
+				info.set("currentHP", true_HP); // to convert double to int
+				double MP = rs.getDouble("currentMP");
+				int true_MP = (int) MP;
+				info.set("currentMP", true_MP);
+				int status = rs.getInt("status");
+				_bossStatus.put(bossId, status);
+				_storedInfo.put(bossId, info);
+				LOG.info("{} ({}) status is {}.", NpcData.getInstance().getTemplate(bossId).getName(), bossId, status);
+				if (status > 0) {
+					LOG.info("Next spawn date of {} is {}.", NpcData.getInstance().getTemplate(bossId).getName(), new Date(info.getLong("respawn_time")));
+				}
+			}
+			LOG.info("Loaded {} grand boss instances.", _storedInfo.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while initializing GrandBossManager!", ex);
+		}
+		ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new GrandBossManagerStoreTask(), 5 * 60 * 1000, 5 * 60 * 1000);
+	}
+	
+	public void initZones() {
+		final Map<Integer, List<Integer>> zones = new HashMap<>();
+		for (Integer zoneId : _zones.keySet()) {
+			zones.put(zoneId, new ArrayList<>());
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * from grandboss_list ORDER BY player_id")) {
+			while (rs.next()) {
+				int id = rs.getInt("player_id");
+				int zoneId = rs.getInt("zone");
+				zones.get(zoneId).add(id);
+			}
+			LOG.info("Initialized {} grand boss zones.", _zones.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while initializing GrandBoss zones!", ex);
+		}
+		
+		for (Entry<Integer, L2BossZone> e : _zones.entrySet()) {
+			e.getValue().setAllowedPlayers(zones.get(e.getKey()));
+		}
+		
+		zones.clear();
+	}
+	
+	public void addZone(L2BossZone zone) {
+		_zones.put(zone.getId(), zone);
+	}
+	
+	public L2BossZone getZone(int zoneId) {
+		return _zones.get(zoneId);
+	}
+	
+	public L2BossZone getZone(L2Character character) {
+		return _zones.values().stream().filter(z -> z.isCharacterInZone(character)).findFirst().orElse(null);
+	}
+	
+	public L2BossZone getZone(Location loc) {
+		return getZone(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	public L2BossZone getZone(int x, int y, int z) {
+		return _zones.values().stream().filter(zone -> zone.isInsideZone(x, y, z)).findFirst().orElse(null);
+	}
+	
+	public boolean checkIfInZone(String zoneType, L2Object obj) {
+		final L2BossZone temp = getZone(obj.getX(), obj.getY(), obj.getZ());
+		return (temp != null) && temp.getName().equalsIgnoreCase(zoneType);
+	}
+	
+	public boolean checkIfInZone(L2PcInstance player) {
+		return (player != null) && (getZone(player.getX(), player.getY(), player.getZ()) != null);
+	}
+	
+	public int getBossStatus(int bossId) {
+		return _bossStatus.get(bossId);
+	}
+	
+	public void setBossStatus(int bossId, int status) {
+		_bossStatus.put(bossId, status);
+		LOG.info("Updated {} ({}) status to {}.", NpcData.getInstance().getTemplate(bossId).getName(), bossId, status);
+		updateDb(bossId, true);
+	}
+	
+	/**
+	 * Adds a L2GrandBossInstance to the list of bosses.
+	 * @param boss
+	 */
+	public void addBoss(L2GrandBossInstance boss) {
+		if (boss != null) {
+			BOSSES.put(boss.getId(), boss);
+		}
+	}
+	
+	public L2GrandBossInstance getBoss(int bossId) {
+		return BOSSES.get(bossId);
+	}
+	
+	public StatsSet getStatsSet(int bossId) {
+		return _storedInfo.get(bossId);
+	}
+	
+	public void setStatsSet(int bossId, StatsSet info) {
+		_storedInfo.put(bossId, info);
+		updateDb(bossId, false);
+	}
+	
+	@Override
+	public boolean storeMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate(DELETE_GRAND_BOSS_LIST);
+			
+			try (var insert = con.prepareStatement(INSERT_GRAND_BOSS_LIST)) {
+				for (Entry<Integer, L2BossZone> e : _zones.entrySet()) {
+					List<Integer> list = e.getValue().getAllowedPlayers();
+					if ((list == null) || list.isEmpty()) {
+						continue;
+					}
+					for (Integer player : list) {
+						insert.setInt(1, player);
+						insert.setInt(2, e.getKey());
+						insert.executeUpdate();
+						insert.clearParameters();
+					}
+				}
+			}
+			for (Entry<Integer, StatsSet> e : _storedInfo.entrySet()) {
+				final L2GrandBossInstance boss = BOSSES.get(e.getKey());
+				StatsSet info = e.getValue();
+				if ((boss == null) || (info == null)) {
+					try (var update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) {
+						update.setInt(1, _bossStatus.get(e.getKey()));
+						update.setInt(2, e.getKey());
+						update.executeUpdate();
+						update.clearParameters();
+					}
+				} else {
+					try (var update = con.prepareStatement(UPDATE_GRAND_BOSS_DATA)) {
+						update.setInt(1, boss.getX());
+						update.setInt(2, boss.getY());
+						update.setInt(3, boss.getZ());
+						update.setInt(4, boss.getHeading());
+						update.setLong(5, info.getLong("respawn_time"));
+						double hp = boss.getCurrentHp();
+						double mp = boss.getCurrentMp();
+						if (boss.isDead()) {
+							hp = boss.getMaxHp();
+							mp = boss.getMaxMp();
+						}
+						update.setDouble(6, hp);
+						update.setDouble(7, mp);
+						update.setInt(8, _bossStatus.get(e.getKey()));
+						update.setInt(9, e.getKey());
+						update.executeUpdate();
+						update.clearParameters();
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not store grand bosses to database!", ex);
+			return false;
+		}
+		return true;
+	}
+	
+	private void updateDb(int bossId, boolean statusOnly) {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			L2GrandBossInstance boss = BOSSES.get(bossId);
+			StatsSet info = _storedInfo.get(bossId);
+			
+			if (statusOnly || (boss == null) || (info == null)) {
+				try (var ps = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2)) {
+					ps.setInt(1, _bossStatus.get(bossId));
+					ps.setInt(2, bossId);
+					ps.executeUpdate();
+				}
+			} else {
+				try (var ps = con.prepareStatement(UPDATE_GRAND_BOSS_DATA)) {
+					ps.setInt(1, boss.getX());
+					ps.setInt(2, boss.getY());
+					ps.setInt(3, boss.getZ());
+					ps.setInt(4, boss.getHeading());
+					ps.setLong(5, info.getLong("respawn_time"));
+					double hp = boss.getCurrentHp();
+					double mp = boss.getCurrentMp();
+					if (boss.isDead()) {
+						hp = boss.getMaxHp();
+						mp = boss.getMaxMp();
+					}
+					ps.setDouble(6, hp);
+					ps.setDouble(7, mp);
+					ps.setInt(8, _bossStatus.get(bossId));
+					ps.setInt(9, bossId);
+					ps.executeUpdate();
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not update grand bosses to database!", ex);
+		}
+	}
+	
+	/**
+	 * Saves all Grand Boss info and then clears all info from memory, including all schedules.
+	 */
+	public void cleanUp() {
+		storeMe();
+		
+		BOSSES.clear();
+		_storedInfo.clear();
+		_bossStatus.clear();
+		_zones.clear();
+	}
+	
+	public Map<Integer, L2BossZone> getZones() {
+		return _zones;
+	}
+	
+	/**
+	 * Gets the single instance of {@code GrandBossManager}.
+	 * @return single instance of {@code GrandBossManager}
+	 */
+	public static GrandBossManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final GrandBossManager _instance = new GrandBossManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java
new file mode 100644
index 00000000..49ca0a04
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.instancemanager.tasks.PenaltyRemoveTask;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameAddPlayer;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameChangeTeam;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameRemovePlayer;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This class manage the player add/remove, team change and event arena status, as the clearance of the participants list or liberate the arena.
+ * @author BiggBoss
+ */
+public final class HandysBlockCheckerManager {
+	// All the participants and their team classified by arena
+	private static final ArenaParticipantsHolder[] _arenaPlayers = new ArenaParticipantsHolder[4];
+	
+	// Arena votes to start the game
+	private static final Map<Integer, Integer> _arenaVotes = new HashMap<>();
+	
+	// Arena Status, True = is being used, otherwise, False
+	private static final Map<Integer, Boolean> _arenaStatus = new HashMap<>();
+	
+	// Registration request penalty (10 seconds)
+	protected static Set<Integer> _registrationPenalty = Collections.synchronizedSet(new HashSet<>());
+	
+	/**
+	 * Return the number of event-start votes for the specified arena id
+	 * @param arenaId
+	 * @return int (number of votes)
+	 */
+	public synchronized int getArenaVotes(int arenaId) {
+		return _arenaVotes.get(arenaId);
+	}
+	
+	/**
+	 * Add a new vote to start the event for the specified arena id
+	 * @param arena
+	 */
+	public synchronized void increaseArenaVotes(int arena) {
+		int newVotes = _arenaVotes.get(arena) + 1;
+		ArenaParticipantsHolder holder = _arenaPlayers[arena];
+		
+		if ((newVotes > (holder.getAllPlayers().size() / 2)) && !holder.getEvent().isStarted()) {
+			clearArenaVotes(arena);
+			if ((holder.getBlueTeamSize() == 0) || (holder.getRedTeamSize() == 0)) {
+				return;
+			}
+			if (general().isHBCEFairPlay()) {
+				holder.checkAndShuffle();
+			}
+			ThreadPoolManager.getInstance().executeGeneral(holder.getEvent().new StartEvent());
+		} else {
+			_arenaVotes.put(arena, newVotes);
+		}
+	}
+	
+	/**
+	 * Will clear the votes queue (of event start) for the specified arena id
+	 * @param arena
+	 */
+	public synchronized void clearArenaVotes(int arena) {
+		_arenaVotes.put(arena, 0);
+	}
+	
+	protected HandysBlockCheckerManager() {
+		// Initialize arena status
+		_arenaStatus.put(0, false);
+		_arenaStatus.put(1, false);
+		_arenaStatus.put(2, false);
+		_arenaStatus.put(3, false);
+		
+		// Initialize arena votes
+		_arenaVotes.put(0, 0);
+		_arenaVotes.put(1, 0);
+		_arenaVotes.put(2, 0);
+		_arenaVotes.put(3, 0);
+	}
+	
+	/**
+	 * Returns the players holder
+	 * @param arena
+	 * @return ArenaParticipantsHolder
+	 */
+	public ArenaParticipantsHolder getHolder(int arena) {
+		return _arenaPlayers[arena];
+	}
+	
+	/**
+	 * Initializes the participants holder
+	 */
+	public void startUpParticipantsQueue() {
+		for (int i = 0; i < 4; ++i) {
+			_arenaPlayers[i] = new ArenaParticipantsHolder(i);
+		}
+	}
+	
+	/**
+	 * Add the player to the specified arena (through the specified arena manager) and send the needed server -> client packets
+	 * @param player
+	 * @param arenaId
+	 * @return
+	 */
+	public boolean addPlayerToArena(L2PcInstance player, int arenaId) {
+		ArenaParticipantsHolder holder = _arenaPlayers[arenaId];
+		
+		synchronized (holder) {
+			boolean isRed;
+			
+			for (int i = 0; i < 4; i++) {
+				if (_arenaPlayers[i].getAllPlayers().contains(player)) {
+					SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST);
+					msg.addCharName(player);
+					player.sendPacket(msg);
+					return false;
+				}
+			}
+			
+			if (player.isCursedWeaponEquipped()) {
+				player.sendPacket(SystemMessageId.CANNOT_REGISTER_PROCESSING_CURSED_WEAPON);
+				return false;
+			}
+			
+			if (player.isOnEvent() || player.isInOlympiadMode()) {
+				player.sendMessage("Couldnt register you due other event participation");
+				return false;
+			}
+			
+			if (OlympiadManager.getInstance().isRegistered(player)) {
+				OlympiadManager.getInstance().unRegisterNoble(player);
+				player.sendPacket(SystemMessageId.COLISEUM_OLYMPIAD_KRATEIS_APPLICANTS_CANNOT_PARTICIPATE);
+			}
+			
+			// if(UnderGroundColiseum.getInstance().isRegisteredPlayer(player))
+			// {
+			// UngerGroundColiseum.getInstance().removeParticipant(player);
+			// player.sendPacket(SystemMessageId.COLISEUM_OLYMPIAD_KRATEIS_APPLICANTS_CANNOT_PARTICIPATE));
+			// }
+			// if(KrateiCubeManager.getInstance().isRegisteredPlayer(player))
+			// {
+			// KrateiCubeManager.getInstance().removeParticipant(player);
+			// player.sendPacket(SystemMessageId.COLISEUM_OLYMPIAD_KRATEIS_APPLICANTS_CANNOT_PARTICIPATE));
+			// }
+			
+			if (_registrationPenalty.contains(player.getObjectId())) {
+				player.sendPacket(SystemMessageId.CANNOT_REQUEST_REGISTRATION_10_SECS_AFTER);
+				return false;
+			}
+			
+			if (holder.getBlueTeamSize() < holder.getRedTeamSize()) {
+				holder.addPlayer(player, 1);
+				isRed = false;
+			} else {
+				holder.addPlayer(player, 0);
+				isRed = true;
+			}
+			holder.broadCastPacketToTeam(new ExCubeGameAddPlayer(player, isRed));
+			return true;
+		}
+	}
+	
+	/**
+	 * Will remove the specified player from the specified team and arena and will send the needed packet to all his team mates / enemy team mates
+	 * @param player
+	 * @param arenaId
+	 * @param team
+	 */
+	public void removePlayer(L2PcInstance player, int arenaId, int team) {
+		ArenaParticipantsHolder holder = _arenaPlayers[arenaId];
+		synchronized (holder) {
+			boolean isRed = team == 0;
+			
+			holder.removePlayer(player, team);
+			holder.broadCastPacketToTeam(new ExCubeGameRemovePlayer(player, isRed));
+			
+			// End event if theres an empty team
+			int teamSize = isRed ? holder.getRedTeamSize() : holder.getBlueTeamSize();
+			if (teamSize == 0) {
+				holder.getEvent().endEventAbnormally();
+			}
+			
+			_registrationPenalty.add(player.getObjectId());
+			schedulePenaltyRemoval(player.getObjectId());
+		}
+	}
+	
+	/**
+	 * Will change the player from one team to other (if possible) and will send the needed packets
+	 * @param player
+	 * @param arena
+	 * @param team
+	 */
+	public void changePlayerToTeam(L2PcInstance player, int arena, int team) {
+		ArenaParticipantsHolder holder = _arenaPlayers[arena];
+		
+		synchronized (holder) {
+			boolean isFromRed = holder.getRedPlayers().contains(player);
+			
+			if (isFromRed && (holder.getBlueTeamSize() == 6)) {
+				player.sendMessage("The team is full");
+				return;
+			} else if (!isFromRed && (holder.getRedTeamSize() == 6)) {
+				player.sendMessage("The team is full");
+				return;
+			}
+			
+			int futureTeam = isFromRed ? 1 : 0;
+			holder.addPlayer(player, futureTeam);
+			
+			if (isFromRed) {
+				holder.removePlayer(player, 0);
+			} else {
+				holder.removePlayer(player, 1);
+			}
+			holder.broadCastPacketToTeam(new ExCubeGameChangeTeam(player, isFromRed));
+		}
+	}
+	
+	/**
+	 * Will erase all participants from the specified holder
+	 * @param arenaId
+	 */
+	public synchronized void clearPaticipantQueueByArenaId(int arenaId) {
+		_arenaPlayers[arenaId].clearPlayers();
+	}
+	
+	/**
+	 * Returns true if arena is holding an event at this momment
+	 * @param arenaId
+	 * @return boolean
+	 */
+	public boolean arenaIsBeingUsed(int arenaId) {
+		if ((arenaId < 0) || (arenaId > 3)) {
+			return false;
+		}
+		return _arenaStatus.get(arenaId);
+	}
+	
+	/**
+	 * Set the specified arena as being used
+	 * @param arenaId
+	 */
+	public void setArenaBeingUsed(int arenaId) {
+		_arenaStatus.put(arenaId, true);
+	}
+	
+	/**
+	 * Set as free the specified arena for future events
+	 * @param arenaId
+	 */
+	public void setArenaFree(int arenaId) {
+		_arenaStatus.put(arenaId, false);
+	}
+	
+	/**
+	 * Called when played logs out while participating in Block Checker Event
+	 * @param player
+	 */
+	public void onDisconnect(L2PcInstance player) {
+		int arena = player.getBlockCheckerArena();
+		int team = getHolder(arena).getPlayerTeam(player);
+		HandysBlockCheckerManager.getInstance().removePlayer(player, arena, team);
+		if (player.getTeam() != Team.NONE) {
+			player.stopAllEffects();
+			// Remove team aura
+			player.setTeam(Team.NONE);
+			
+			// Remove the event items
+			PcInventory inv = player.getInventory();
+			
+			if (inv.getItemByItemId(13787) != null) {
+				long count = inv.getInventoryItemCount(13787, 0);
+				inv.destroyItemByItemId("Handys Block Checker", 13787, count, player, player);
+			}
+			if (inv.getItemByItemId(13788) != null) {
+				long count = inv.getInventoryItemCount(13788, 0);
+				inv.destroyItemByItemId("Handys Block Checker", 13788, count, player, player);
+			}
+			player.setInsideZone(ZoneId.PVP, false);
+			// Teleport Back
+			player.teleToLocation(-57478, -60367, -2370);
+		}
+	}
+	
+	public void removePenalty(int objectId) {
+		_registrationPenalty.remove(objectId);
+	}
+	
+	private void schedulePenaltyRemoval(int objId) {
+		ThreadPoolManager.getInstance().scheduleGeneral(new PenaltyRemoveTask(objId), 10000);
+	}
+	
+	/**
+	 * Gets the single instance of {@code HandysBlockCheckerManager}.
+	 * @return single instance of {@code HandysBlockCheckerManager}
+	 */
+	public static HandysBlockCheckerManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final HandysBlockCheckerManager _instance = new HandysBlockCheckerManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java
new file mode 100644
index 00000000..71712251
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Instance Manager.
+ * @author evill33t
+ * @author GodKratos
+ */
+public final class InstanceManager implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(InstanceManager.class);
+	
+	private static final Map<Integer, Instance> INSTANCES = new ConcurrentHashMap<>();
+	
+	private final Map<Integer, InstanceWorld> _instanceWorlds = new ConcurrentHashMap<>();
+	
+	private int _dynamic = 300000;
+	
+	private static final Map<Integer, String> _instanceIdNames = new HashMap<>();
+	
+	private final Map<Integer, Map<Integer, Long>> _playerInstanceTimes = new ConcurrentHashMap<>();
+	
+	private static final String ADD_INSTANCE_TIME = "INSERT INTO character_instance_time (charId,instanceId,time) values (?,?,?) ON DUPLICATE KEY UPDATE time=?";
+	
+	private static final String RESTORE_INSTANCE_TIMES = "SELECT instanceId,time FROM character_instance_time WHERE charId=?";
+	
+	private static final String DELETE_INSTANCE_TIME = "DELETE FROM character_instance_time WHERE charId=? AND instanceId=?";
+	
+	protected InstanceManager() {
+		// Creates the multiverse.
+		INSTANCES.put(-1, new Instance(-1, "multiverse"));
+		LOG.info("Multiverse Instance created.");
+		// Creates the universe.
+		INSTANCES.put(0, new Instance(0, "universe"));
+		LOG.info("Universe Instance created.");
+		load();
+	}
+	
+	@Override
+	public void load() {
+		_instanceIdNames.clear();
+		parseDatapackFile("data/instancenames.xml");
+		LOG.info("Loaded {} instance names.", _instanceIdNames.size());
+	}
+	
+	public long getInstanceTime(int playerObjId, int id) {
+		if (!_playerInstanceTimes.containsKey(playerObjId)) {
+			restoreInstanceTimes(playerObjId);
+		}
+		if (_playerInstanceTimes.get(playerObjId).containsKey(id)) {
+			return _playerInstanceTimes.get(playerObjId).get(id);
+		}
+		return -1;
+	}
+	
+	public Map<Integer, Long> getAllInstanceTimes(int playerObjId) {
+		if (!_playerInstanceTimes.containsKey(playerObjId)) {
+			restoreInstanceTimes(playerObjId);
+		}
+		return _playerInstanceTimes.get(playerObjId);
+	}
+	
+	public void setInstanceTime(int playerObjId, int id, long time) {
+		if (!_playerInstanceTimes.containsKey(playerObjId)) {
+			restoreInstanceTimes(playerObjId);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(ADD_INSTANCE_TIME)) {
+			ps.setInt(1, playerObjId);
+			ps.setInt(2, id);
+			ps.setLong(3, time);
+			ps.setLong(4, time);
+			ps.execute();
+			_playerInstanceTimes.get(playerObjId).put(id, time);
+		} catch (Exception ex) {
+			LOG.warn("Could not insert character instance time data!", ex);
+		}
+	}
+	
+	public void deleteInstanceTime(int playerObjId, int id) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_INSTANCE_TIME)) {
+			ps.setInt(1, playerObjId);
+			ps.setInt(2, id);
+			ps.execute();
+			_playerInstanceTimes.get(playerObjId).remove(id);
+		} catch (Exception ex) {
+			LOG.warn("Could not delete character instance time data!", ex);
+		}
+	}
+	
+	public void restoreInstanceTimes(int playerObjId) {
+		if (_playerInstanceTimes.containsKey(playerObjId)) {
+			return; // already restored
+		}
+		_playerInstanceTimes.put(playerObjId, new ConcurrentHashMap<>());
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(RESTORE_INSTANCE_TIMES)) {
+			ps.setInt(1, playerObjId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int id = rs.getInt("instanceId");
+					long time = rs.getLong("time");
+					if (time < System.currentTimeMillis()) {
+						deleteInstanceTime(playerObjId, id);
+					} else {
+						_playerInstanceTimes.get(playerObjId).put(id, time);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not delete character instance time data!", ex);
+		}
+	}
+	
+	public String getInstanceIdName(int id) {
+		if (_instanceIdNames.containsKey(id)) {
+			return _instanceIdNames.get(id);
+		}
+		return ("UnknownInstance");
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equals(n.getNodeName())) {
+				NamedNodeMap attrs;
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("instance".equals(d.getNodeName())) {
+						attrs = d.getAttributes();
+						_instanceIdNames.put(parseInteger(attrs, "id"), attrs.getNamedItem("name").getNodeValue());
+					}
+				}
+			}
+		}
+	}
+	
+	public void addWorld(InstanceWorld world) {
+		_instanceWorlds.put(world.getInstanceId(), world);
+	}
+	
+	public InstanceWorld getWorld(int instanceId) {
+		return _instanceWorlds.get(instanceId);
+	}
+	
+	/**
+	 * Check if the player have a World Instance where it's allowed to enter.
+	 * @param player the player to check
+	 * @return the instance world
+	 */
+	public InstanceWorld getPlayerWorld(L2PcInstance player) {
+		for (InstanceWorld temp : _instanceWorlds.values()) {
+			if ((temp != null) && (temp.isAllowed(player.getObjectId()))) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	public void destroyInstance(int instanceid) {
+		if (instanceid <= 0) {
+			return;
+		}
+		final Instance temp = INSTANCES.get(instanceid);
+		if (temp != null) {
+			temp.removeNpcs();
+			temp.removePlayers();
+			temp.removeDoors();
+			temp.cancelTimer();
+			INSTANCES.remove(instanceid);
+			_instanceWorlds.remove(instanceid);
+		}
+	}
+	
+	public Instance getInstance(int instanceid) {
+		return INSTANCES.get(instanceid);
+	}
+	
+	public Map<Integer, Instance> getInstances() {
+		return INSTANCES;
+	}
+	
+	public int getPlayerInstance(int objectId) {
+		for (Instance temp : INSTANCES.values()) {
+			if (temp == null) {
+				continue;
+			}
+			// check if the player is in any active instance
+			if (temp.containsPlayer(objectId)) {
+				return temp.getId();
+			}
+		}
+		// 0 is default instance aka the world
+		return 0;
+	}
+	
+	public boolean createInstance(int id) {
+		if (getInstance(id) != null) {
+			return false;
+		}
+		
+		final Instance instance = new Instance(id);
+		INSTANCES.put(id, instance);
+		return true;
+	}
+	
+	public boolean createInstanceFromTemplate(int id, String template) {
+		if (getInstance(id) != null) {
+			return false;
+		}
+		
+		final Instance instance = new Instance(id);
+		INSTANCES.put(id, instance);
+		instance.loadInstanceTemplate(template);
+		return true;
+	}
+	
+	/**
+	 * Create a new instance with a dynamic instance id based on a template (or null)
+	 * @param template xml file
+	 * @return
+	 */
+	public int createDynamicInstance(String template) {
+		while (getInstance(_dynamic) != null) {
+			_dynamic++;
+			if (_dynamic == Integer.MAX_VALUE) {
+				LOG.warn("More then {} instances has been created!", Integer.MAX_VALUE - 300000);
+				_dynamic = 300000;
+			}
+		}
+		final Instance instance = new Instance(_dynamic);
+		INSTANCES.put(_dynamic, instance);
+		if (template != null) {
+			instance.loadInstanceTemplate(template);
+		}
+		return _dynamic;
+	}
+	
+	public static InstanceManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final InstanceManager _instance = new InstanceManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java
new file mode 100644
index 00000000..38fe4c75
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.itemauction.ItemAuctionInstance;
+
+/**
+ * Item Auction Manager.
+ * @author Forsaiken
+ */
+public final class ItemAuctionManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ItemAuctionManager.class);
+	
+	private final Map<Integer, ItemAuctionInstance> _managerInstances = new HashMap<>();
+	private final AtomicInteger _auctionIds;
+	
+	protected ItemAuctionManager() {
+		_auctionIds = new AtomicInteger(1);
+		
+		if (!general().itemAuctionEnabled()) {
+			LOG.info("Auction Manager disabled by config.");
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT auctionId FROM item_auction ORDER BY auctionId DESC LIMIT 0, 1")) {
+			if (rs.next()) {
+				_auctionIds.set(rs.getInt(1) + 1);
+			}
+		} catch (Exception e) {
+			LOG.error("Failed loading auctions!", e);
+		}
+		
+		final File file = new File(server().getDatapackRoot(), "data/ItemAuctions.xml");
+		if (!file.exists()) {
+			LOG.warn("Missing ItemAuctions.xml!");
+			return;
+		}
+		
+		// TODO(Zoey76): Use IXmlReader.
+		final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setValidating(false);
+		factory.setIgnoringComments(true);
+		
+		try {
+			final Document doc = factory.newDocumentBuilder().parse(file);
+			for (Node na = doc.getFirstChild(); na != null; na = na.getNextSibling()) {
+				if ("list".equalsIgnoreCase(na.getNodeName())) {
+					for (Node nb = na.getFirstChild(); nb != null; nb = nb.getNextSibling()) {
+						if ("instance".equalsIgnoreCase(nb.getNodeName())) {
+							final NamedNodeMap nab = nb.getAttributes();
+							final int instanceId = Integer.parseInt(nab.getNamedItem("id").getNodeValue());
+							
+							if (_managerInstances.containsKey(instanceId)) {
+								throw new Exception("Dublicated instanceId " + instanceId);
+							}
+							
+							final ItemAuctionInstance instance = new ItemAuctionInstance(instanceId, _auctionIds, nb);
+							_managerInstances.put(instanceId, instance);
+						}
+					}
+				}
+			}
+			LOG.info("Loaded " + _managerInstances.size() + " auction manager instance(s).");
+		} catch (Exception e) {
+			LOG.error("Failed loading auctions from xml!", e);
+		}
+	}
+	
+	public void shutdown() {
+		for (ItemAuctionInstance instance : _managerInstances.values()) {
+			instance.shutdown();
+		}
+	}
+	
+	public ItemAuctionInstance getManagerInstance(final int instanceId) {
+		return _managerInstances.get(instanceId);
+	}
+	
+	public int getNextAuctionId() {
+		return _auctionIds.getAndIncrement();
+	}
+	
+	public static void deleteAuction(final int auctionId) {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			try (var ps = con.prepareStatement("DELETE FROM item_auction WHERE auctionId=?")) {
+				ps.setInt(1, auctionId);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM item_auction_bid WHERE auctionId=?")) {
+				ps.setInt(1, auctionId);
+				ps.execute();
+			}
+		} catch (Exception e) {
+			LOG.error("Failed deleting auction ID {}!", auctionId, e);
+		}
+	}
+	
+	/**
+	 * Gets the single instance of {@code ItemAuctionManager}.
+	 * @return single instance of {@code ItemAuctionManager}
+	 */
+	public static ItemAuctionManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ItemAuctionManager INSTANCE = new ItemAuctionManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java
new file mode 100644
index 00000000..8e41dab7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ItemsAutoDestroy;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * This class manage all items on ground.
+ * @author Enforcer
+ */
+public final class ItemsOnGroundManager implements Runnable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ItemsOnGroundManager.class);
+	
+	private final List<L2ItemInstance> _items = new CopyOnWriteArrayList<>();
+	
+	private ItemsOnGroundManager() {
+		if (general().getSaveDroppedItemInterval() > 0) {
+			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this, general().getSaveDroppedItemInterval(), general().getSaveDroppedItemInterval());
+		}
+		load();
+	}
+	
+	private void load() {
+		// If SaveDroppedItem is false, may want to delete all items previously stored to avoid add old items on reactivate
+		if (!general().saveDroppedItem() && general().clearDroppedItemTable()) {
+			emptyTable();
+		}
+		
+		if (!general().saveDroppedItem()) {
+			return;
+		}
+		
+		// if DestroyPlayerDroppedItem was previously false, items currently protected will be added to ItemsAutoDestroy
+		if (general().destroyPlayerDroppedItem()) {
+			String str;
+			if (!general().destroyEquipableItem()) {
+				// Recycle misc. items only
+				str = "UPDATE itemsonground SET drop_time = ? WHERE drop_time = -1 AND equipable = 0";
+			} else {
+				// Recycle all items including equipable
+				str = "UPDATE itemsonground SET drop_time = ? WHERE drop_time = -1";
+			}
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(str)) {
+				ps.setLong(1, System.currentTimeMillis());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.error("Error while updating table ItemsOnGround: {}", e.getMessage(), e);
+			}
+		}
+		
+		// Add items to world
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT object_id,item_id,count,enchant_level,x,y,z,drop_time,equipable FROM itemsonground")) {
+			int count = 0;
+			try (var rs = ps.executeQuery()) {
+				L2ItemInstance item;
+				while (rs.next()) {
+					item = new L2ItemInstance(rs.getInt(1), rs.getInt(2));
+					L2World.getInstance().storeObject(item);
+					// this check and..
+					if (item.isStackable() && (rs.getInt(3) > 1)) {
+						item.setCount(rs.getInt(3));
+					}
+					// this, are really necessary?
+					if (rs.getInt(4) > 0) {
+						item.setEnchantLevel(rs.getInt(4));
+					}
+					item.setXYZ(rs.getInt(5), rs.getInt(6), rs.getInt(7));
+					item.setWorldRegion(L2World.getInstance().getRegion(item.getLocation()));
+					item.getWorldRegion().addVisibleObject(item);
+					final long dropTime = rs.getLong(8);
+					item.setDropTime(dropTime);
+					item.setProtected(dropTime == -1);
+					item.setIsVisible(true);
+					L2World.getInstance().addVisibleObject(item, item.getWorldRegion());
+					_items.add(item);
+					count++;
+					// add to ItemsAutoDestroy only items not protected
+					if (!general().getProtectedItems().contains(item.getId())) {
+						if (dropTime > -1) {
+							if (((general().getAutoDestroyDroppedItemAfter() > 0) && !item.getItem().hasExImmediateEffect()) || ((general().getAutoDestroyHerbTime() > 0) && item.getItem().hasExImmediateEffect())) {
+								ItemsAutoDestroy.getInstance().addItem(item);
+							}
+						}
+					}
+				}
+			}
+			LOG.info("Loaded {} items.", count);
+		} catch (Exception e) {
+			LOG.error("Error while loading ItemsOnGround: {}", e.getMessage(), e);
+		}
+		
+		if (general().emptyDroppedItemTableAfterLoad()) {
+			emptyTable();
+		}
+	}
+	
+	public void save(L2ItemInstance item) {
+		if (!general().saveDroppedItem()) {
+			return;
+		}
+		_items.add(item);
+	}
+	
+	public void removeObject(L2ItemInstance item) {
+		if (general().saveDroppedItem()) {
+			_items.remove(item);
+		}
+	}
+	
+	public void saveInDb() {
+		run();
+	}
+	
+	public void cleanUp() {
+		_items.clear();
+	}
+	
+	private void emptyTable() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate("DELETE FROM itemsonground");
+		} catch (Exception e1) {
+			LOG.error("Error while cleaning table ItemsOnGround: {}", e1.getMessage(), e1);
+		}
+	}
+	
+	@Override
+	public synchronized void run() {
+		if (!general().saveDroppedItem()) {
+			return;
+		}
+		
+		emptyTable();
+		
+		if (_items.isEmpty()) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO itemsonground(object_id,item_id,count,enchant_level,x,y,z,drop_time,equipable) VALUES(?,?,?,?,?,?,?,?,?)")) {
+			for (L2ItemInstance item : _items) {
+				if (item == null) {
+					continue;
+				}
+				
+				if (CursedWeaponsManager.getInstance().isCursed(item.getId())) {
+					continue; // Cursed Items not saved to ground, prevent double save
+				}
+				
+				try {
+					ps.setInt(1, item.getObjectId());
+					ps.setInt(2, item.getId());
+					ps.setLong(3, item.getCount());
+					ps.setInt(4, item.getEnchantLevel());
+					ps.setInt(5, item.getX());
+					ps.setInt(6, item.getY());
+					ps.setInt(7, item.getZ());
+					ps.setLong(8, (item.isProtected() ? -1 : item.getDropTime())); // item is protected or AutoDestroyed
+					ps.setLong(9, (item.isEquipable() ? 1 : 0)); // set equip-able
+					ps.execute();
+					ps.clearParameters();
+				} catch (Exception e) {
+					LOG.error("Error while inserting into table ItemsOnGround: {}", e.getMessage(), e);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("SQL error while storing items on ground: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Gets the single instance of {@code ItemsOnGroundManager}.
+	 * @return single instance of {@code ItemsOnGroundManager}
+	 */
+	public static ItemsOnGroundManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ItemsOnGroundManager _instance = new ItemsOnGroundManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/MailManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/MailManager.java
new file mode 100644
index 00000000..e9090541
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/MailManager.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.tasks.MessageDeletionTask;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.network.serverpackets.ExNoticePostArrived;
+
+/**
+ * Mail Manager.
+ * @author Migi
+ * @author DS
+ */
+public final class MailManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(MailManager.class);
+	
+	private final Map<Integer, Message> _messages = new ConcurrentHashMap<>();
+	
+	protected MailManager() {
+		load();
+	}
+	
+	private void load() {
+		int count = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.createStatement();
+			var rs = ps.executeQuery("SELECT * FROM messages ORDER BY expiration")) {
+			while (rs.next()) {
+				final Message msg = new Message(rs);
+				
+				int msgId = msg.getId();
+				_messages.put(msgId, msg);
+				
+				count++;
+				
+				long expiration = msg.getExpiration();
+				
+				if (expiration < System.currentTimeMillis()) {
+					ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msgId), 10000);
+				} else {
+					ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msgId), expiration - System.currentTimeMillis());
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading from database!", ex);
+		}
+		LOG.info("Successfully loaded {} messages.", count);
+	}
+	
+	public Message getMessage(int msgId) {
+		return _messages.get(msgId);
+	}
+	
+	public Collection<Message> getMessages() {
+		return _messages.values();
+	}
+	
+	public boolean hasUnreadPost(L2PcInstance player) {
+		final int objectId = player.getObjectId();
+		for (Message msg : getMessages()) {
+			if ((msg != null) && (msg.getReceiverId() == objectId) && msg.isUnread()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public int getInboxSize(int objectId) {
+		int size = 0;
+		for (Message msg : getMessages()) {
+			if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) {
+				size++;
+			}
+		}
+		return size;
+	}
+	
+	public int getOutboxSize(int objectId) {
+		int size = 0;
+		for (Message msg : getMessages()) {
+			if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) {
+				size++;
+			}
+		}
+		return size;
+	}
+	
+	public List<Message> getInbox(int objectId) {
+		final List<Message> inbox = new ArrayList<>();
+		for (Message msg : getMessages()) {
+			if ((msg != null) && (msg.getReceiverId() == objectId) && !msg.isDeletedByReceiver()) {
+				inbox.add(msg);
+			}
+		}
+		return inbox;
+	}
+	
+	public List<Message> getOutbox(int objectId) {
+		final List<Message> outbox = new ArrayList<>();
+		for (Message msg : getMessages()) {
+			if ((msg != null) && (msg.getSenderId() == objectId) && !msg.isDeletedBySender()) {
+				outbox.add(msg);
+			}
+		}
+		return outbox;
+	}
+	
+	public void sendMessage(Message msg) {
+		_messages.put(msg.getId(), msg);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = Message.getStatement(msg, con)) {
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error saving message Id {}!", msg.getId(), ex);
+		}
+		
+		final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
+		if (receiver != null) {
+			receiver.sendPacket(ExNoticePostArrived.valueOf(true));
+		}
+		
+		ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msg.getId()), msg.getExpiration() - System.currentTimeMillis());
+	}
+	
+	public void markAsReadInDb(int msgId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE messages SET isUnread=FALSE WHERE messageId = ?")) {
+			ps.setInt(1, msgId);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error marking as read message Id {}!", msgId, ex);
+		}
+	}
+	
+	public void markAsDeletedBySenderInDb(int msgId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE messages SET isDeletedBySender=TRUE WHERE messageId = ?")) {
+			ps.setInt(1, msgId);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error marking as deleted by sender message Id {}!", msgId, ex);
+		}
+	}
+	
+	public void markAsDeletedByReceiverInDb(int msgId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE messages SET isDeletedByReceiver=TRUE WHERE messageId = ?")) {
+			ps.setInt(1, msgId);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error marking as deleted by receiver message Id {}!", msgId, ex);
+		}
+	}
+	
+	public void removeAttachmentsInDb(int msgId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE messages SET hasAttachments=FALSE WHERE messageId = ?")) {
+			ps.setInt(1, msgId);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error removing attachments in message Id {}!", msgId, ex);
+		}
+	}
+	
+	public void deleteMessageInDb(int msgId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM messages WHERE messageId = ?")) {
+			ps.setInt(1, msgId);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error deleting message Id {}!", msgId, ex);
+		}
+		
+		_messages.remove(msgId);
+		IdFactory.getInstance().releaseId(msgId);
+	}
+	
+	public static MailManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final MailManager INSTANCE = new MailManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java
new file mode 100644
index 00000000..58d09236
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java
@@ -0,0 +1,358 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.L2MapRegion;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
+import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * Map Region Manager.
+ * @author Nyaran
+ */
+public final class MapRegionManager implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(MapRegionManager.class);
+	
+	private static final Map<String, L2MapRegion> REGIONS = new HashMap<>();
+	
+	private static final String DEFAULT_RESPAWN = "talking_island_town";
+	
+	protected MapRegionManager() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		REGIONS.clear();
+		parseDatapackDirectory("data/mapregion", false);
+		LOG.info("Loaded {} map regions.", REGIONS.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		NamedNodeMap attrs;
+		String name;
+		String town;
+		int locId;
+		int castle;
+		int bbs;
+		
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("region".equalsIgnoreCase(d.getNodeName())) {
+						attrs = d.getAttributes();
+						name = attrs.getNamedItem("name").getNodeValue();
+						town = attrs.getNamedItem("town").getNodeValue();
+						locId = parseInteger(attrs, "locId");
+						castle = parseInteger(attrs, "castle");
+						bbs = parseInteger(attrs, "bbs");
+						
+						L2MapRegion region = new L2MapRegion(name, town, locId, castle, bbs);
+						for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) {
+							attrs = c.getAttributes();
+							if ("respawnPoint".equalsIgnoreCase(c.getNodeName())) {
+								int spawnX = parseInteger(attrs, "X");
+								int spawnY = parseInteger(attrs, "Y");
+								int spawnZ = parseInteger(attrs, "Z");
+								
+								boolean other = parseBoolean(attrs, "isOther", false);
+								boolean chaotic = parseBoolean(attrs, "isChaotic", false);
+								boolean banish = parseBoolean(attrs, "isBanish", false);
+								
+								if (other) {
+									region.addOtherSpawn(spawnX, spawnY, spawnZ);
+								} else if (chaotic) {
+									region.addChaoticSpawn(spawnX, spawnY, spawnZ);
+								} else if (banish) {
+									region.addBanishSpawn(spawnX, spawnY, spawnZ);
+								} else {
+									region.addSpawn(spawnX, spawnY, spawnZ);
+								}
+							} else if ("map".equalsIgnoreCase(c.getNodeName())) {
+								region.addMap(parseInteger(attrs, "X"), parseInteger(attrs, "Y"));
+							} else if ("banned".equalsIgnoreCase(c.getNodeName())) {
+								region.addBannedRace(attrs.getNamedItem("race").getNodeValue(), attrs.getNamedItem("point").getNodeValue());
+							}
+						}
+						REGIONS.put(name, region);
+					}
+				}
+			}
+		}
+	}
+	
+	public L2MapRegion getMapRegion(int locX, int locY) {
+		for (L2MapRegion region : REGIONS.values()) {
+			if (region.isZoneInRegion(getMapRegionX(locX), getMapRegionY(locY))) {
+				return region;
+			}
+		}
+		return null;
+	}
+	
+	public int getMapRegionLocId(int locX, int locY) {
+		L2MapRegion region = getMapRegion(locX, locY);
+		if (region != null) {
+			return region.getLocId();
+		}
+		return 0;
+	}
+	
+	public L2MapRegion getMapRegion(L2Object obj) {
+		return getMapRegion(obj.getX(), obj.getY());
+	}
+	
+	public int getMapRegionLocId(L2Object obj) {
+		return getMapRegionLocId(obj.getX(), obj.getY());
+	}
+	
+	public int getMapRegionX(int posX) {
+		return (posX >> 15) + 9 + 11;// + centerTileX;
+	}
+	
+	public int getMapRegionY(int posY) {
+		return (posY >> 15) + 10 + 8;// + centerTileX;
+	}
+	
+	/**
+	 * Get town name by character position
+	 * @param activeChar
+	 * @return
+	 */
+	public String getClosestTownName(L2Character activeChar) {
+		L2MapRegion region = getMapRegion(activeChar);
+		
+		if (region == null) {
+			return "Aden Castle Town";
+		}
+		
+		return region.getTown();
+	}
+	
+	public int getAreaCastle(L2Character activeChar) {
+		L2MapRegion region = getMapRegion(activeChar);
+		if (region == null) {
+			return 0;
+		}
+		return region.getCastle();
+	}
+	
+	public Location getTeleToLocation(L2Character activeChar, TeleportWhereType teleportWhere) {
+		Location loc;
+		if (activeChar.isPlayer()) {
+			final L2PcInstance player = activeChar.getActingPlayer();
+			
+			// flying players in gracia cant use teleports to aden continent
+			if ((player.getClan() != null) && !player.isFlyingMounted() && !player.isFlying()) {
+				// If teleport to clan hall
+				if (teleportWhere == TeleportWhereType.CLANHALL) {
+					final var clanhall = ClanHallManager.getInstance().getAbstractHallByOwner(player.getClan());
+					if (clanhall != null) {
+						L2ClanHallZone zone = clanhall.getZone();
+						if ((zone != null) && !player.isFlyingMounted()) {
+							if (player.getKarma() > 0) {
+								return zone.getChaoticSpawnLoc();
+							}
+							return zone.getSpawnLoc();
+						}
+					}
+				}
+				
+				// If teleport to castle
+				if (teleportWhere == TeleportWhereType.CASTLE) {
+					var castle = CastleManager.getInstance().getCastleByOwner(player.getClan());
+					// Otherwise check if player is on castle or fortress ground
+					// and player's clan is defender
+					if (castle == null) {
+						castle = CastleManager.getInstance().getCastle(player);
+						if (!((castle != null) && castle.getSiege().isInProgress() && (castle.getSiege().getDefenderClan(player.getClan()) != null))) {
+							castle = null;
+						}
+					}
+					
+					if ((castle != null) && (castle.getResidenceId() > 0)) {
+						if (player.getKarma() > 0) {
+							return castle.getResidenceZone().getChaoticSpawnLoc();
+						}
+						return castle.getResidenceZone().getSpawnLoc();
+					}
+				}
+				
+				// If teleport to fortress
+				if (teleportWhere == TeleportWhereType.FORTRESS) {
+					var fort = FortManager.getInstance().getFortByOwner(player.getClan());
+					// Otherwise check if player is on castle or fortress ground
+					// and player's clan is defender
+					if (fort == null) {
+						fort = FortManager.getInstance().getFort(player);
+						if (!((fort != null) && fort.getSiege().isInProgress() && (fort.getOwnerClan() == player.getClan()))) {
+							fort = null;
+						}
+					}
+					
+					if ((fort != null) && (fort.getResidenceId() > 0)) {
+						if (player.getKarma() > 0) {
+							return fort.getResidenceZone().getChaoticSpawnLoc();
+						}
+						return fort.getResidenceZone().getSpawnLoc();
+					}
+				}
+				
+				// If teleport to SiegeHQ
+				if (teleportWhere == TeleportWhereType.SIEGEFLAG) {
+					final var castle = CastleManager.getInstance().getCastle(player);
+					final var fort = FortManager.getInstance().getFort(player);
+					final var clanhall = ClanHallManager.getInstance().getNearbyAbstractHall(activeChar.getX(), activeChar.getY(), 10000);
+					L2SiegeFlagInstance tw_flag = TerritoryWarManager.getInstance().getHQForClan(player.getClan());
+					if (tw_flag != null) {
+						return tw_flag.getLocation();
+					} else if (castle != null) {
+						if (castle.getSiege().isInProgress()) {
+							// Check if player's clan is attacker
+							List<L2Npc> flags = castle.getSiege().getFlag(player.getClan());
+							if ((flags != null) && !flags.isEmpty()) {
+								// Spawn to flag - Need more work to get player to the nearest flag
+								return flags.get(0).getLocation();
+							}
+						}
+						
+					} else if (fort != null) {
+						if (fort.getSiege().isInProgress()) {
+							// Check if player's clan is attacker
+							List<L2Npc> flags = fort.getSiege().getFlag(player.getClan());
+							if ((flags != null) && !flags.isEmpty()) {
+								// Spawn to flag - Need more work to get player to the nearest flag
+								return flags.get(0).getLocation();
+							}
+						}
+					} else if ((clanhall != null) && clanhall.isSiegableHall()) {
+						SiegableHall sHall = (SiegableHall) clanhall;
+						List<L2Npc> flags = sHall.getSiege().getFlag(player.getClan());
+						if ((flags != null) && !flags.isEmpty()) {
+							return flags.get(0).getLocation();
+						}
+					}
+				}
+			}
+			
+			// Karma player land out of city
+			if (player.getKarma() > 0) {
+				try {
+					L2RespawnZone zone = ZoneManager.getInstance().getZone(player, L2RespawnZone.class);
+					if (zone != null) {
+						return getRestartRegion(activeChar, zone.getRespawnPoint((L2PcInstance) activeChar)).getChaoticSpawnLoc();
+					}
+					return getMapRegion(activeChar).getChaoticSpawnLoc();
+				} catch (Exception e) {
+					if (player.isFlyingMounted()) {
+						return REGIONS.get("union_base_of_kserth").getChaoticSpawnLoc();
+					}
+					return REGIONS.get(DEFAULT_RESPAWN).getChaoticSpawnLoc();
+				}
+			}
+			
+			// Checking if needed to be respawned in "far" town from the castle;
+			final var castle = CastleManager.getInstance().getCastle(player);
+			if (castle != null) {
+				if (castle.getSiege().isInProgress()) {
+					// Check if player's clan is participating
+					if ((castle.getSiege().checkIsDefender(player.getClan()) || castle.getSiege().checkIsAttacker(player.getClan())) && (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DAWN)) {
+						return castle.getResidenceZone().getOtherSpawnLoc();
+					}
+				}
+			}
+			
+			// Checking if in an instance
+			if (player.getInstanceId() > 0) {
+				Instance inst = InstanceManager.getInstance().getInstance(player.getInstanceId());
+				if (inst != null) {
+					loc = inst.getExitLoc();
+					if (loc != null) {
+						return loc;
+					}
+				}
+			}
+		}
+		
+		// Get the nearest town
+		try {
+			L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class);
+			if (zone != null) {
+				return getRestartRegion(activeChar, zone.getRespawnPoint((L2PcInstance) activeChar)).getSpawnLoc();
+			}
+			return getMapRegion(activeChar).getSpawnLoc();
+		} catch (Exception e) {
+			// Port to the default respawn if no closest town found.
+			return REGIONS.get(DEFAULT_RESPAWN).getSpawnLoc();
+		}
+	}
+	
+	public L2MapRegion getRestartRegion(L2Character activeChar, String point) {
+		try {
+			L2PcInstance player = ((L2PcInstance) activeChar);
+			L2MapRegion region = REGIONS.get(point);
+			
+			if (region.getBannedRace().containsKey(player.getRace())) {
+				getRestartRegion(player, region.getBannedRace().get(player.getRace()));
+			}
+			return region;
+		} catch (Exception e) {
+			return REGIONS.get(DEFAULT_RESPAWN);
+		}
+	}
+	
+	/**
+	 * @param regionName the map region name.
+	 * @return if exists the map region identified by that name, null otherwise.
+	 */
+	public L2MapRegion getMapRegionByName(String regionName) {
+		return REGIONS.get(regionName);
+	}
+	
+	public static MapRegionManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final MapRegionManager INSTANCE = new MapRegionManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java
new file mode 100644
index 00000000..86ce9ca6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * This class is similar to the SiegeGuardManager, except it handles the loading of the mercenary tickets that are dropped on castle floors by the castle lords.<br>
+ * These tickets (a.k.a. badges) need to be read after each server reboot except when the server crashed in the middle of an ongoing siege.<br>
+ * In addition, this class keeps track of the added tickets, in order to properly limit the number of mercenaries in each castle and the number of mercenaries from each mercenary type.<br>
+ * Finally, we provide auxiliary functions to identify the castle in which each item (and its corresponding NPC) belong to, in order to help avoid mixing them up.
+ * @author yellowperil
+ * @author Fulminus
+ */
+public final class MercTicketManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(MercTicketManager.class);
+	
+	private static final List<L2ItemInstance> DROPPED_TICKETS = new CopyOnWriteArrayList<>();
+	
+	// TODO: move all these values into siege.properties
+	// max tickets per merc type = 10 + (castleid * 2)?
+	// max ticker per castle = 40 + (castleid * 20)?
+	// @formatter:off
+	private static final int[] MAX_MERC_PER_TYPE =
+	{
+		10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, // Gludio
+		15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, // Dion
+		10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, // Giran
+		10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, // Oren
+		20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // Aden
+		20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // Innadril
+		20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // Goddard
+		20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, // Rune
+		20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20 // Schuttgart
+	};
+	
+	//TODO: not retail like: clan lvl 5 - 30 ticks max, lvl 7+ - 50 max
+	protected static final int[] MERCS_MAX_PER_CASTLE =
+	{
+		100, // Gludio
+		150, // Dion
+		200, // Giran
+		300, // Oren
+		400, // Aden
+		400, // Innadril
+		400, // Goddard
+		400, // Rune
+		400 // Schuttgart
+	};
+	
+	private static final int[] ITEM_IDS =
+	{
+		3960, 3961, 3962, 3963, 3964, 3965, 3966, 3967, 3968, 3969, 6115, 6116, 6117, 6118, 6119, 6120, 6121, 6122, 6123, 6124, 6038, 6039, 6040, 6041, 6042, 6043, 6044, 6045, 6046, 6047, 6175, 6176, 6177, 6178, 6179, 6180, 6181, 6182, 6183, 6184, 6235, 6236, 6237, 6238, 6239, 6240, 6241, 6242, 6243, 6244, 6295, 6296,	// Gludio
+		3973, 3974, 3975, 3976, 3977, 3978, 3979, 3980, 3981, 3982, 6125, 6126, 6127, 6128, 6129, 6130, 6131, 6132, 6133, 6134, 6051, 6052, 6053, 6054, 6055, 6056, 6057, 6058, 6059, 6060, 6185, 6186, 6187, 6188, 6189, 6190, 6191, 6192, 6193, 6194, 6245, 6246, 6247, 6248, 6249, 6250, 6251, 6252, 6253, 6254, 6297, 6298,	// Dion
+		3986, 3987, 3988, 3989, 3990, 3991, 3992, 3993, 3994, 3995, 6135, 6136, 6137, 6138, 6139, 6140, 6141, 6142, 6143, 6144, 6064, 6065, 6066, 6067, 6068, 6069, 6070, 6071, 6072, 6073, 6195, 6196, 6197, 6198, 6199, 6200, 6201, 6202, 6203, 6204, 6255, 6256, 6257, 6258, 6259, 6260, 6261, 6262, 6263, 6264, 6299, 6300,	// Giran
+		3999, 4000, 4001, 4002, 4003, 4004, 4005, 4006, 4007, 4008, 6145, 6146, 6147, 6148, 6149, 6150, 6151, 6152, 6153, 6154, 6077, 6078, 6079, 6080, 6081, 6082, 6083, 6084, 6085, 6086, 6205, 6206, 6207, 6208, 6209, 6210, 6211, 6212, 6213, 6214, 6265, 6266, 6267, 6268, 6269, 6270, 6271, 6272, 6273, 6274, 6301, 6302,	// Oren
+		4012, 4013, 4014, 4015, 4016, 4017, 4018, 4019, 4020, 4021, 6155, 6156, 6157, 6158, 6159, 6160, 6161, 6162, 6163, 6164, 6090, 6091, 6092, 6093, 6094, 6095, 6096, 6097, 6098, 6099, 6215, 6216, 6217, 6218, 6219, 6220, 6221, 6222, 6223, 6224, 6275, 6276, 6277, 6278, 6279, 6280, 6281, 6282, 6283, 6284, 6303, 6304,	// Aden
+		5205, 5206, 5207, 5208, 5209, 5210, 5211, 5212, 5213, 5214, 6165, 6166, 6167, 6168, 6169, 6170, 6171, 6172, 6173, 6174, 6105, 6106, 6107, 6108, 6109, 6110, 6111, 6112, 6113, 6114, 6225, 6226, 6227, 6228, 6229, 6230, 6231, 6232, 6233, 6234, 6285, 6286, 6287, 6288, 6289, 6290, 6291, 6292, 6293, 6294, 6305, 6306,	// Innadril
+		6779, 6780, 6781, 6782, 6783, 6784, 6785, 6786, 6787, 6788, 6802, 6803, 6804, 6805, 6806, 6807, 6808, 6809, 6810, 6811, 6792, 6793, 6794, 6795, 6796, 6797, 6798, 6799, 6800, 6801, 6812, 6813, 6814, 6815, 6816, 6817, 6818, 6819, 6820, 6821, 6822, 6823, 6824, 6825, 6826, 6827, 6828, 6829, 6830, 6831, 6832, 6833,	// Goddard
+		7973, 7974, 7975, 7976, 7977, 7978, 7979, 7980, 7981, 7982, 7998, 7999, 8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 7988, 7989, 7990, 7991, 7992, 7993, 7994, 7995, 7996, 7997, 8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015, 8016, 8017, 8018, 8019, 8020, 8021, 8022, 8023, 8024, 8025, 8026, 8027, 8028, 8029,	// Rune
+		7918, 7919, 7920, 7921, 7922, 7923, 7924, 7925, 7926, 7927, 7941, 7942, 7943, 7944, 7945, 7946, 7947, 7948, 7949, 7950, 7931, 7932, 7933, 7934, 7935, 7936, 7937, 7938, 7939, 7940, 7951, 7952, 7953, 7954, 7955, 7956, 7957, 7958, 7959, 7960, 7961, 7962, 7963, 7964, 7965, 7966, 7967, 7968, 7969, 7970, 7971, 7972	// Schuttgart
+	};
+	
+	private static final int[] NPC_IDS =
+	{
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Gludio
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Dion
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Giran
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Oren
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Aden
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Innadril
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Goddard
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Rune
+		35010, 35011, 35012, 35013, 35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027, 35028, 35029, 35030,35031,35032,35033,35034,35035,35036,35037,35038,35039, 35040, 35041, 35042, 35043, 35044, 35045, 35046, 35047, 35048, 35049, 35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, // Schuttgart
+	};
+	// @formatter:on
+	
+	private static final int GUARDIAN_TYPES_COUNT = 52;
+	
+	protected MercTicketManager() {
+		load();
+	}
+	
+	// returns the castleId for the passed ticket item id
+	public int getTicketCastleId(int itemId) {
+		for (int i = 0; i < 9; i++) // CastleID`s from 1 to 9 minus;
+		{
+			for (int i2 = 0; i2 < 50; i2 += 10) {
+				// Simplified if statement;
+				if (((itemId >= ITEM_IDS[i2 + (i * GUARDIAN_TYPES_COUNT)]) && (itemId <= ITEM_IDS[i2 + 9 + (i * GUARDIAN_TYPES_COUNT)]))) {
+					return i + 1;
+				}
+			}
+			if ((itemId >= ITEM_IDS[50]) && (itemId <= ITEM_IDS[51])) {
+				return i + 1;
+			}
+		}
+		return -1;
+	}
+	
+	public void reload() {
+		DROPPED_TICKETS.clear();
+		load();
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM castle_siege_guards Where isHired = 1")) {
+			int npcId;
+			int itemId;
+			int x, y, z;
+			int[] mercPlaced = new int[20];
+			// start index to begin the search for the itemId corresponding to this NPC
+			// this will help with:
+			// a) skip unnecessary iterations in the search loop
+			// b) avoid finding the wrong itemId whenever tickets of different spawn the same npc!
+			int startindex = 0;
+			
+			while (rs.next()) {
+				npcId = rs.getInt("npcId");
+				x = rs.getInt("x");
+				y = rs.getInt("y");
+				z = rs.getInt("z");
+				Castle castle = CastleManager.getInstance().getCastle(x, y, z);
+				if (castle != null) {
+					if (mercPlaced[castle.getResidenceId() - 1] >= MERCS_MAX_PER_CASTLE[castle.getResidenceId() - 1]) {
+						continue;
+					}
+					startindex = GUARDIAN_TYPES_COUNT * (castle.getResidenceId() - 1);
+					mercPlaced[castle.getResidenceId() - 1] += 1;
+				}
+				
+				// find the FIRST ticket itemId with spawns the saved NPC in the saved location
+				for (int i = startindex; i < (startindex + GUARDIAN_TYPES_COUNT); i++) {
+					if (NPC_IDS[i] == npcId) // Find the index of the item used
+					{
+						// only handle tickets if a siege is not ongoing in this npc's castle
+						if ((castle != null) && !(castle.getSiege().isInProgress())) {
+							itemId = ITEM_IDS[i];
+							// create the ticket in the gameworld
+							final var objectId = IdFactory.getInstance().getNextId();
+							final var dropticket = new L2ItemInstance(objectId, itemId);
+							dropticket.setItemLocation(ItemLocation.VOID);
+							dropticket.dropMe(null, x, y, z);
+							dropticket.setDropTime(0); // avoids it from being removed by the auto item destroyer
+							L2World.getInstance().storeObject(dropticket);
+							DROPPED_TICKETS.add(dropticket);
+						}
+						break;
+					}
+				}
+			}
+			rs.close();
+			s.close();
+			
+			LOG.info("Loaded {} mercenary tickets.", DROPPED_TICKETS.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading mercenary tickets!", ex);
+		}
+	}
+	
+	/**
+	 * Checks if the passed item has reached the limit of number of dropped tickets that this SPECIFIC item may have in its castle
+	 * @param itemId
+	 * @return
+	 */
+	public boolean isAtTypeLimit(int itemId) {
+		int limit = -1;
+		// find the max value for this item
+		for (int i = 0; i < ITEM_IDS.length; i++) {
+			if (ITEM_IDS[i] == itemId) // Find the index of the item used
+			{
+				limit = MAX_MERC_PER_TYPE[i];
+				break;
+			}
+		}
+		
+		if (limit <= 0) {
+			return true;
+		}
+		
+		int count = 0;
+		for (L2ItemInstance ticket : DROPPED_TICKETS) {
+			if ((ticket != null) && (ticket.getId() == itemId)) {
+				count++;
+			}
+		}
+		return count >= limit;
+	}
+	
+	/**
+	 * Checks if the passed item belongs to a castle which has reached its limit of number of dropped tickets.
+	 * @param itemId
+	 * @return
+	 */
+	public boolean isAtCasleLimit(int itemId) {
+		int castleId = getTicketCastleId(itemId);
+		if (castleId <= 0) {
+			return true;
+		}
+		int limit = MERCS_MAX_PER_CASTLE[castleId - 1];
+		if (limit <= 0) {
+			return true;
+		}
+		
+		int count = 0;
+		for (L2ItemInstance ticket : DROPPED_TICKETS) {
+			if ((ticket != null) && (getTicketCastleId(ticket.getId()) == castleId)) {
+				count++;
+			}
+		}
+		return count >= limit;
+	}
+	
+	public int getMaxAllowedMerc(int castleId) {
+		return MERCS_MAX_PER_CASTLE[castleId - 1];
+	}
+	
+	public boolean isTooCloseToAnotherTicket(int x, int y, int z) {
+		for (L2ItemInstance item : DROPPED_TICKETS) {
+			double dx = x - item.getX();
+			double dy = y - item.getY();
+			double dz = z - item.getZ();
+			
+			if (((dx * dx) + (dy * dy) + (dz * dz)) < (25 * 25)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * addTicket actions 1) find the npc that needs to be saved in the mercenary spawns, given this item 2) Use the passed character's location info to add the spawn 3) create a copy of the item to drop in the world returns the id of the mercenary npc that was added to the spawn returns -1 if this
+	 * fails.
+	 * @param itemId
+	 * @param activeChar
+	 * @return
+	 */
+	public int addTicket(int itemId, L2PcInstance activeChar) {
+		int x = activeChar.getX();
+		int y = activeChar.getY();
+		int z = activeChar.getZ();
+		int heading = activeChar.getHeading();
+		
+		Castle castle = CastleManager.getInstance().getCastle(activeChar);
+		if (castle == null) {
+			return -1;
+		}
+		
+		for (int i = 0; i < ITEM_IDS.length; i++) {
+			// Find the index of the item used
+			if (ITEM_IDS[i] == itemId) {
+				spawnMercenary(NPC_IDS[i], x, y, z, 3000);
+				
+				// Hire merc for this castle. NpcId is at the same index as the item used.
+				castle.getSiege().getSiegeGuardManager().hireMerc(x, y, z, heading, NPC_IDS[i]);
+				
+				// create the ticket in the gameworld
+				final var objectId = IdFactory.getInstance().getNextId();
+				final var dropticket = new L2ItemInstance(objectId, itemId);
+				dropticket.setItemLocation(ItemLocation.VOID);
+				dropticket.dropMe(null, x, y, z);
+				dropticket.setDropTime(0); // avoids it from beeing removed by the auto item destroyer
+				L2World.getInstance().storeObject(dropticket); // add to the world
+				// and keep track of this ticket in the list
+				DROPPED_TICKETS.add(dropticket);
+				
+				return NPC_IDS[i];
+			}
+		}
+		return -1;
+	}
+	
+	private void spawnMercenary(int npcId, int x, int y, int z, int despawnDelay) {
+		final var template = NpcData.getInstance().getTemplate(npcId);
+		if (template != null) {
+			final var objectId = IdFactory.getInstance().getNextId();
+			final var npc = new L2DefenderInstance(objectId, template);
+			npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp());
+			npc.setDecayed(false);
+			npc.spawnMe(x, y, (z + 20));
+			
+			if (despawnDelay > 0) {
+				npc.scheduleDespawn(despawnDelay);
+			}
+		}
+	}
+	
+	/**
+	 * Delete all tickets from a castle; remove the items from the world and remove references to them from this class
+	 * @param castleId
+	 */
+	public void deleteTickets(int castleId) {
+		for (L2ItemInstance item : DROPPED_TICKETS) {
+			if ((item != null) && (getTicketCastleId(item.getId()) == castleId)) {
+				item.decayMe();
+				L2World.getInstance().removeObject(item);
+				DROPPED_TICKETS.remove(item);
+			}
+		}
+	}
+	
+	/**
+	 * remove a single ticket and its associated spawn from the world (used when the castle lord picks up a ticket, for example)
+	 * @param item
+	 */
+	public void removeTicket(L2ItemInstance item) {
+		int itemId = item.getId();
+		int npcId = -1;
+		
+		// find the FIRST ticket itemId with spawns the saved NPC in the saved location
+		for (int i = 0; i < ITEM_IDS.length; i++) {
+			if (ITEM_IDS[i] == itemId) // Find the index of the item used
+			{
+				npcId = NPC_IDS[i];
+				break;
+			}
+		}
+		// find the castle where this item is
+		Castle castle = CastleManager.getInstance().getCastleById(getTicketCastleId(itemId));
+		
+		if ((npcId > 0) && (castle != null)) {
+			(new SiegeGuardManager(castle)).removeMerc(npcId, item.getX(), item.getY(), item.getZ());
+		}
+		
+		DROPPED_TICKETS.remove(item);
+	}
+	
+	public int[] getItemIds() {
+		return ITEM_IDS;
+	}
+	
+	public List<L2ItemInstance> getDroppedTickets() {
+		return DROPPED_TICKETS;
+	}
+	
+	/**
+	 * Gets the single instance of {@code MercTicketManager}.
+	 * @return single instance of {@code MercTicketManager}
+	 */
+	public static MercTicketManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final MercTicketManager _instance = new MercTicketManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java
new file mode 100644
index 00000000..3f1c67f4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.enums.PetitionState;
+import com.l2jserver.gameserver.model.Petition;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Petition Manager
+ * @author Tempy
+ */
+public final class PetitionManager {
+	private static final Logger LOG = LoggerFactory.getLogger(PetitionManager.class);
+	
+	private final Map<Integer, Petition> _pendingPetitions;
+	private final Map<Integer, Petition> _completedPetitions;
+	
+	private PetitionManager() {
+		_pendingPetitions = new HashMap<>();
+		_completedPetitions = new HashMap<>();
+	}
+	
+	public void clearCompletedPetitions() {
+		final int numPetitions = getPendingPetitionCount();
+		
+		getCompletedPetitions().clear();
+		LOG.info("Completed petition data cleared. {} petition(s) removed.", numPetitions);
+	}
+	
+	public void clearPendingPetitions() {
+		final int numPetitions = getPendingPetitionCount();
+		
+		getPendingPetitions().clear();
+		LOG.info("Pending petition queue cleared. {} petition(s) removed.", numPetitions);
+	}
+	
+	public boolean acceptPetition(L2PcInstance respondingAdmin, int petitionId) {
+		if (!isValidPetition(petitionId)) {
+			return false;
+		}
+		
+		final Petition currPetition = getPendingPetitions().get(petitionId);
+		
+		if (currPetition.getResponder() != null) {
+			return false;
+		}
+		
+		currPetition.setResponder(respondingAdmin);
+		currPetition.setState(PetitionState.IN_PROCESS);
+		
+		// Petition application accepted. (Send to Petitioner)
+		currPetition.sendPetitionerPacket(SystemMessage.getSystemMessage(SystemMessageId.PETITION_APP_ACCEPTED));
+		
+		// Petition application accepted. Reciept No. is <ID>
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_ACCEPTED_RECENT_NO_S1);
+		sm.addInt(currPetition.getId());
+		currPetition.sendResponderPacket(sm);
+		
+		// Petition consultation with <Player> underway.
+		sm = SystemMessage.getSystemMessage(SystemMessageId.STARTING_PETITION_WITH_C1);
+		sm.addString(currPetition.getPetitioner().getName());
+		currPetition.sendResponderPacket(sm);
+		
+		// Set responder name on petitioner instance
+		currPetition.getPetitioner().setLastPetitionGmName(currPetition.getResponder().getName());
+		return true;
+	}
+	
+	public boolean cancelActivePetition(L2PcInstance player) {
+		for (Petition currPetition : getPendingPetitions().values()) {
+			if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) {
+				return (currPetition.endPetitionConsultation(PetitionState.PETITIONER_CANCEL));
+			}
+			
+			if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) {
+				return (currPetition.endPetitionConsultation(PetitionState.RESPONDER_CANCEL));
+			}
+		}
+		
+		return false;
+	}
+	
+	public void checkPetitionMessages(L2PcInstance petitioner) {
+		if (petitioner != null) {
+			for (Petition currPetition : getPendingPetitions().values()) {
+				if (currPetition == null) {
+					continue;
+				}
+				
+				if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == petitioner.getObjectId())) {
+					for (CreatureSay logMessage : currPetition.getLogMessages()) {
+						petitioner.sendPacket(logMessage);
+					}
+					
+					return;
+				}
+			}
+		}
+	}
+	
+	public boolean endActivePetition(L2PcInstance player) {
+		if (!player.isGM()) {
+			return false;
+		}
+		
+		for (Petition currPetition : getPendingPetitions().values()) {
+			if (currPetition == null) {
+				continue;
+			}
+			
+			if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) {
+				return (currPetition.endPetitionConsultation(PetitionState.COMPLETED));
+			}
+		}
+		
+		return false;
+	}
+	
+	public Map<Integer, Petition> getCompletedPetitions() {
+		return _completedPetitions;
+	}
+	
+	public Map<Integer, Petition> getPendingPetitions() {
+		return _pendingPetitions;
+	}
+	
+	public int getPendingPetitionCount() {
+		return getPendingPetitions().size();
+	}
+	
+	public int getPlayerTotalPetitionCount(L2PcInstance player) {
+		if (player == null) {
+			return 0;
+		}
+		
+		int petitionCount = 0;
+		
+		for (Petition currPetition : getPendingPetitions().values()) {
+			if (currPetition == null) {
+				continue;
+			}
+			
+			if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) {
+				petitionCount++;
+			}
+		}
+		
+		for (Petition currPetition : getCompletedPetitions().values()) {
+			if (currPetition == null) {
+				continue;
+			}
+			
+			if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) {
+				petitionCount++;
+			}
+		}
+		
+		return petitionCount;
+	}
+	
+	public boolean isPetitionInProcess() {
+		for (Petition currPetition : getPendingPetitions().values()) {
+			if (currPetition == null) {
+				continue;
+			}
+			
+			if (currPetition.getState() == PetitionState.IN_PROCESS) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public boolean isPetitionInProcess(int petitionId) {
+		if (!isValidPetition(petitionId)) {
+			return false;
+		}
+		
+		final Petition currPetition = getPendingPetitions().get(petitionId);
+		return (currPetition.getState() == PetitionState.IN_PROCESS);
+	}
+	
+	public boolean isPlayerInConsultation(L2PcInstance player) {
+		if (player != null) {
+			for (Petition currPetition : getPendingPetitions().values()) {
+				if (currPetition == null) {
+					continue;
+				}
+				
+				if (currPetition.getState() != PetitionState.IN_PROCESS) {
+					continue;
+				}
+				
+				if (((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) || ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId()))) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	public boolean isPetitioningAllowed() {
+		return character().petitioningAllowed();
+	}
+	
+	public boolean isPlayerPetitionPending(L2PcInstance petitioner) {
+		if (petitioner != null) {
+			for (Petition currPetition : getPendingPetitions().values()) {
+				if (currPetition == null) {
+					continue;
+				}
+				
+				if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == petitioner.getObjectId())) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	private boolean isValidPetition(int petitionId) {
+		return getPendingPetitions().containsKey(petitionId);
+	}
+	
+	public boolean rejectPetition(L2PcInstance respondingAdmin, int petitionId) {
+		if (!isValidPetition(petitionId)) {
+			return false;
+		}
+		
+		final Petition currPetition = getPendingPetitions().get(petitionId);
+		
+		if (currPetition.getResponder() != null) {
+			return false;
+		}
+		
+		currPetition.setResponder(respondingAdmin);
+		return (currPetition.endPetitionConsultation(PetitionState.RESPONDER_REJECT));
+	}
+	
+	public boolean sendActivePetitionMessage(L2PcInstance player, String messageText) {
+		// if (!isPlayerInConsultation(player))
+		// return false;
+		
+		CreatureSay cs;
+		
+		for (Petition currPetition : getPendingPetitions().values()) {
+			if (currPetition == null) {
+				continue;
+			}
+			
+			if ((currPetition.getPetitioner() != null) && (currPetition.getPetitioner().getObjectId() == player.getObjectId())) {
+				cs = new CreatureSay(player.getObjectId(), Say2.PETITION_PLAYER, player.getName(), messageText);
+				currPetition.addLogMessage(cs);
+				
+				currPetition.sendResponderPacket(cs);
+				currPetition.sendPetitionerPacket(cs);
+				return true;
+			}
+			
+			if ((currPetition.getResponder() != null) && (currPetition.getResponder().getObjectId() == player.getObjectId())) {
+				cs = new CreatureSay(player.getObjectId(), Say2.PETITION_GM, player.getName(), messageText);
+				currPetition.addLogMessage(cs);
+				
+				currPetition.sendResponderPacket(cs);
+				currPetition.sendPetitionerPacket(cs);
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public void sendPendingPetitionList(L2PcInstance activeChar) {
+		final StringBuilder htmlContent = StringUtil.startAppend(600 + (getPendingPetitionCount() * 300), "<html><body><center><table width=270><tr>"
+			+ "<td width=45><button value=\"Main\" action=\"bypass -h admin_admin\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>" + "<td width=180><center>Petition Menu</center></td>"
+			+ "<td width=45><button value=\"Back\" action=\"bypass -h admin_admin7\" width=45 height=21 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><br>" + "<table width=\"270\">"
+			+ "<tr><td><table width=\"270\"><tr><td><button value=\"Reset\" action=\"bypass -h admin_reset_petitions\" width=\"80\" height=\"21\" back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>"
+			+ "<td align=right><button value=\"Refresh\" action=\"bypass -h admin_view_petitions\" width=\"80\" height=\"21\" back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table><br></td></tr>");
+		
+		final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		
+		if (getPendingPetitionCount() == 0) {
+			htmlContent.append("<tr><td>There are no currently pending petitions.</td></tr>");
+		} else {
+			htmlContent.append("<tr><td><font color=\"LEVEL\">Current Petitions:</font><br></td></tr>");
+		}
+		
+		boolean color = true;
+		int petcount = 0;
+		for (Petition currPetition : getPendingPetitions().values()) {
+			if (currPetition == null) {
+				continue;
+			}
+			
+			StringUtil.append(htmlContent, "<tr><td width=\"270\"><table width=\"270\" cellpadding=\"2\" bgcolor=", (color ? "131210" : "444444"), "><tr><td width=\"130\">", dateFormat.format(new Date(currPetition.getSubmitTime())));
+			StringUtil.append(htmlContent, "</td><td width=\"140\" align=right><font color=\"", (currPetition.getPetitioner().isOnline() ? "00FF00" : "999999"), "\">", currPetition.getPetitioner().getName(), "</font></td></tr>");
+			StringUtil.append(htmlContent, "<tr><td width=\"130\">");
+			if (currPetition.getState() != PetitionState.IN_PROCESS) {
+				StringUtil.append(htmlContent, "<table width=\"130\" cellpadding=\"2\"><tr>" + "<td><button value=\"View\" action=\"bypass -h admin_view_petition ", String.valueOf(currPetition.getId()), "\" width=\"50\" height=\"21\" back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td>"
+					+ "<td><button value=\"Reject\" action=\"bypass -h admin_reject_petition ", String.valueOf(currPetition.getId()), "\" width=\"50\" height=\"21\" back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr></table>");
+			} else {
+				htmlContent.append("<font color=\"").append(currPetition.getResponder().isOnline() ? "00FF00" : "999999").append("\">").append(currPetition.getResponder().getName()).append("</font>");
+			}
+			StringUtil.append(htmlContent, "</td>", currPetition.getTypeAsString(), "<td width=\"140\" align=right>", currPetition.getTypeAsString(), "</td></tr></table></td></tr>");
+			color = !color;
+			petcount++;
+			if (petcount > 10) {
+				htmlContent.append("<tr><td><font color=\"LEVEL\">There is more pending petition...</font><br></td></tr>");
+				break;
+			}
+		}
+		
+		htmlContent.append("</table></center></body></html>");
+		
+		final NpcHtmlMessage htmlMsg = new NpcHtmlMessage();
+		htmlMsg.setHtml(htmlContent.toString());
+		activeChar.sendPacket(htmlMsg);
+	}
+	
+	public int submitPetition(L2PcInstance petitioner, String petitionText, int petitionType) {
+		// Create a new petition instance and add it to the list of pending petitions.
+		final Petition newPetition = new Petition(petitioner, petitionText, petitionType);
+		int newPetitionId = newPetition.getId();
+		getPendingPetitions().put(newPetitionId, newPetition);
+		
+		// Notify all GMs that a new petition has been submitted.
+		final String msgContent = petitioner.getName() + " has submitted a new petition."; // (ID: " + newPetitionId + ").";
+		AdminData.getInstance().broadcastToGMs(new CreatureSay(petitioner.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
+		
+		return newPetitionId;
+	}
+	
+	public void viewPetition(L2PcInstance activeChar, int petitionId) {
+		if (!activeChar.isGM()) {
+			return;
+		}
+		
+		if (!isValidPetition(petitionId)) {
+			return;
+		}
+		
+		final Petition currPetition = getPendingPetitions().get(petitionId);
+		final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+		
+		final NpcHtmlMessage html = new NpcHtmlMessage();
+		html.setFile(activeChar.getHtmlPrefix(), "data/html/admin/petition.htm");
+		html.replace("%petition%", String.valueOf(currPetition.getId()));
+		html.replace("%time%", dateFormat.format(new Date(currPetition.getSubmitTime())));
+		html.replace("%type%", currPetition.getTypeAsString());
+		html.replace("%petitioner%", currPetition.getPetitioner().getName());
+		html.replace("%online%", (currPetition.getPetitioner().isOnline() ? "00FF00" : "999999"));
+		html.replace("%text%", currPetition.getContent());
+		
+		activeChar.sendPacket(html);
+	}
+	
+	/**
+	 * Gets the single instance of {@code PetitionManager}.
+	 * @return single instance of {@code PetitionManager}
+	 */
+	public static PetitionManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PetitionManager _instance = new PetitionManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/PunishmentManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/PunishmentManager.java
new file mode 100644
index 00000000..20dc13e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/PunishmentManager.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.holders.PunishmentHolder;
+import com.l2jserver.gameserver.model.punishment.PunishmentAffect;
+import com.l2jserver.gameserver.model.punishment.PunishmentTask;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+
+/**
+ * Punishment Manager.
+ * @author UnAfraid
+ */
+public final class PunishmentManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(PunishmentManager.class);
+	
+	private final Map<PunishmentAffect, PunishmentHolder> _tasks = new ConcurrentHashMap<>();
+	
+	protected PunishmentManager() {
+		load();
+	}
+	
+	private void load() {
+		// Initiate task holders.
+		for (PunishmentAffect affect : PunishmentAffect.values()) {
+			_tasks.put(affect, new PunishmentHolder());
+		}
+		
+		int initiated = 0;
+		int expired = 0;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.createStatement();
+			var rs = st.executeQuery("SELECT * FROM punishments")) {
+			while (rs.next()) {
+				final int id = rs.getInt("id");
+				final String key = rs.getString("key");
+				final PunishmentAffect affect = PunishmentAffect.getByName(rs.getString("affect"));
+				final PunishmentType type = PunishmentType.getByName(rs.getString("type"));
+				final long expirationTime = rs.getLong("expiration");
+				final String reason = rs.getString("reason");
+				final String punishedBy = rs.getString("punishedBy");
+				if ((type != null) && (affect != null)) {
+					if ((expirationTime > 0) && (System.currentTimeMillis() > expirationTime)) // expired task.
+					{
+						expired++;
+					} else {
+						initiated++;
+						_tasks.get(affect).addPunishment(new PunishmentTask(id, key, affect, type, expirationTime, reason, punishedBy, true));
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while loading punishments!", ex);
+		}
+		
+		LOG.info("Loaded {} active and {} expired punishments.", initiated, expired);
+	}
+	
+	public void startPunishment(PunishmentTask task) {
+		_tasks.get(task.getAffect()).addPunishment(task);
+	}
+	
+	public void stopPunishment(Object key, PunishmentAffect affect, PunishmentType type) {
+		final PunishmentTask task = getPunishment(key, affect, type);
+		if (task != null) {
+			_tasks.get(affect).stopPunishment(task);
+		}
+	}
+	
+	public boolean hasPunishment(Object key, PunishmentAffect affect, PunishmentType type) {
+		final PunishmentHolder holder = _tasks.get(affect);
+		return holder.hasPunishment(String.valueOf(key), type);
+	}
+	
+	public long getPunishmentExpiration(Object key, PunishmentAffect affect, PunishmentType type) {
+		final PunishmentTask p = getPunishment(key, affect, type);
+		return p != null ? p.getExpirationTime() : 0;
+	}
+	
+	private PunishmentTask getPunishment(Object key, PunishmentAffect affect, PunishmentType type) {
+		return _tasks.get(affect).getPunishment(String.valueOf(key), type);
+	}
+	
+	/**
+	 * Gets the single instance of {@code PunishmentManager}.
+	 * @return single instance of {@code PunishmentManager}
+	 */
+	public static PunishmentManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PunishmentManager _instance = new PunishmentManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/QuestManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/QuestManager.java
new file mode 100644
index 00000000..2a9d95a7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/QuestManager.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Util;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.scripting.ScriptEngineManager;
+import com.l2jserver.gameserver.scripting.ScriptManager;
+
+/**
+ * Quests and scripts manager.
+ * @author Zoey76
+ */
+public final class QuestManager extends ScriptManager<Quest> {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(QuestManager.class);
+	
+	/** Map containing all the quests. */
+	private final Map<String, Quest> _quests = new ConcurrentHashMap<>();
+	/** Map containing all the scripts. */
+	private final Map<String, Quest> _scripts = new ConcurrentHashMap<>();
+	
+	protected QuestManager() {
+		// Prevent initialization.
+	}
+	
+	public boolean reload(String questFolder) {
+		final Quest q = getQuest(questFolder);
+		if (q == null) {
+			return false;
+		}
+		return q.reload();
+	}
+	
+	/**
+	 * Reloads a the quest by ID.
+	 * @param questId the ID of the quest to be reloaded
+	 * @return {@code true} if reload was successful, {@code false} otherwise
+	 */
+	public boolean reload(int questId) {
+		final Quest q = getQuest(questId);
+		if (q == null) {
+			return false;
+		}
+		return q.reload();
+	}
+	
+	/**
+	 * Reload all quests and scripts.<br>
+	 * Unload all quests and scripts and load scripts.cfg.
+	 */
+	public void reloadAllScripts() {
+		LOG.info("Reloading all server scripts.");
+		
+		// Unload quests.
+		for (Quest quest : _quests.values()) {
+			if (quest != null) {
+				quest.unload(false);
+			}
+		}
+		
+		_quests.clear();
+		
+		// Unload scripts.
+		for (Quest script : _scripts.values()) {
+			if (script != null) {
+				script.unload(false);
+			}
+		}
+		_scripts.clear();
+		
+		try {
+			ScriptEngineManager.getInstance().executeScriptList(new File(server().getDatapackRoot(), "data/scripts.cfg"));
+		} catch (Exception ex) {
+			LOG.warn("Failed loading scripts.cfg, no script going to be loaded!", ex);
+		}
+		
+		LOG.info("Loaded {} quests.", _quests.size());
+		LOG.info("Loaded {} scripts.", _scripts.size());
+	}
+	
+	/**
+	 * Calls {@link Quest#saveGlobalData()} in all quests and scripts.
+	 */
+	public void save() {
+		// Save quests.
+		for (Quest quest : _quests.values()) {
+			quest.saveGlobalData();
+		}
+		
+		// Save scripts.
+		for (Quest script : _scripts.values()) {
+			script.saveGlobalData();
+		}
+	}
+	
+	/**
+	 * Gets a quest by name.<br>
+	 * <i>For backwards compatibility, verifies scripts with the given name if the quest is not found.</i>
+	 * @param name the quest name
+	 * @return the quest
+	 */
+	public Quest getQuest(String name) {
+		if (_quests.containsKey(name)) {
+			return _quests.get(name);
+		}
+		return _scripts.get(name);
+	}
+	
+	/**
+	 * Gets a quest by ID.
+	 * @param questId the ID of the quest to get
+	 * @return if found, the quest, {@code null} otherwise
+	 */
+	public Quest getQuest(int questId) {
+		for (Quest q : _quests.values()) {
+			if (q.getId() == questId) {
+				return q;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Adds a new quest.
+	 * @param quest the quest to be added
+	 */
+	public void addQuest(Quest quest) {
+		if (quest == null) {
+			throw new IllegalArgumentException("Quest argument cannot be null");
+		}
+		
+		// FIXME: unloading the old quest at this point is a tad too late.
+		// the new quest has already initialized itself and read the data, starting
+		// an unpredictable number of tasks with that data. The old quest will now
+		// save data which will never be read.
+		// However, requesting the newQuest to re-read the data is not necessarily a
+		// good option, since the newQuest may have already started timers, spawned NPCs
+		// or taken any other action which it might re-take by re-reading the data.
+		// the current solution properly closes the running tasks of the old quest but
+		// ignores the data; perhaps the least of all evils...
+		final Quest old = _quests.put(quest.getName(), quest);
+		if (old != null) {
+			old.unload();
+			LOG.info("Replaced quest {} with a new version.", old);
+			
+		}
+		
+		if (general().showQuestsLoadInLogs()) {
+			final String questName = quest.getName().contains("_") ? quest.getName().substring(quest.getName().indexOf('_') + 1) : quest.getName();
+			LOG.info("Loaded quest {}.", Util.splitWords(questName));
+		}
+	}
+	
+	/**
+	 * Removes a script.
+	 * @param script the script to remove
+	 * @return {@code true} if the script was removed, {@code false} otherwise
+	 */
+	public boolean removeScript(Quest script) {
+		if (_quests.containsKey(script.getName())) {
+			_quests.remove(script.getName());
+			return true;
+		} else if (_scripts.containsKey(script.getName())) {
+			_scripts.remove(script.getName());
+			return true;
+		}
+		return false;
+	}
+	
+	public Map<String, Quest> getQuests() {
+		return _quests;
+	}
+	
+	@Override
+	public boolean unload(Quest ms) {
+		ms.saveGlobalData();
+		return removeScript(ms);
+	}
+	
+	@Override
+	public String getScriptManagerName() {
+		return getClass().getSimpleName();
+	}
+	
+	/**
+	 * Gets all the registered scripts.
+	 * @return all the scripts
+	 */
+	@Override
+	public Map<String, Quest> getScripts() {
+		return _scripts;
+	}
+	
+	/**
+	 * Adds a script.
+	 * @param script the script to be added
+	 */
+	public void addScript(Quest script) {
+		final Quest old = _scripts.put(script.getClass().getSimpleName(), script);
+		if (old != null) {
+			old.unload();
+			LOG.info("Replaced script {} with a new version.", old);
+		}
+		
+		if (general().showQuestsLoadInLogs()) {
+			LOG.info("Loaded script {}.", Util.splitWords(script.getClass().getSimpleName()));
+		}
+	}
+	
+	public static QuestManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final QuestManager INSTANCE = new QuestManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java
new file mode 100644
index 00000000..9a2b7fd9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Kerberos
+ * @authir JIV
+ * @version 8/24/10
+ */
+public class RaidBossPointsManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RaidBossPointsManager.class);
+	
+	private final Map<Integer, Map<Integer, Integer>> _list = new ConcurrentHashMap<>();
+	
+	public RaidBossPointsManager() {
+		init();
+	}
+	
+	private void init() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT `charId`,`boss_id`,`points` FROM `character_raid_points`")) {
+			while (rs.next()) {
+				final var charId = rs.getInt("charId");
+				final var bossId = rs.getInt("boss_id");
+				final var points = rs.getInt("points");
+				_list.computeIfAbsent(charId, _ -> new ConcurrentHashMap<>()).put(bossId, points);
+			}
+			LOG.info("Loaded {} characters raid points.", _list.size());
+		} catch (Exception ex) {
+			LOG.warn("Couldn't load character raid points!", ex);
+		}
+	}
+	
+	public final void updatePointsInDB(L2PcInstance player, int raidId, int points) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("REPLACE INTO character_raid_points (`charId`,`boss_id`,`points`) VALUES (?,?,?)")) {
+			ps.setInt(1, player.getObjectId());
+			ps.setInt(2, raidId);
+			ps.setInt(3, points);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not update character raid points for player {}!", player, ex);
+		}
+	}
+	
+	public final void addPoints(L2PcInstance player, int bossId, int points) {
+		final var tmpPoint = _list.computeIfAbsent(player.getObjectId(), _ -> new ConcurrentHashMap<>());
+		updatePointsInDB(player, bossId, tmpPoint.merge(bossId, points, Integer::sum));
+	}
+	
+	public final int getPointsByOwnerId(int ownerId) {
+		final var tmpPoint = _list.get(ownerId);
+		var totalPoints = 0;
+		
+		if ((tmpPoint == null) || tmpPoint.isEmpty()) {
+			return 0;
+		}
+		
+		for (int points : tmpPoint.values()) {
+			totalPoints += points;
+		}
+		return totalPoints;
+	}
+	
+	public final Map<Integer, Integer> getList(L2PcInstance player) {
+		return _list.get(player.getObjectId());
+	}
+	
+	public final void cleanUp() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate("DELETE from character_raid_points WHERE charId > 0");
+			_list.clear();
+		} catch (Exception ex) {
+			LOG.warn("Could not clean character raid points!", ex);
+		}
+	}
+	
+	public final int calculateRanking(int playerObjId) {
+		final var rank = getRankList();
+		if (rank.containsKey(playerObjId)) {
+			return rank.get(playerObjId);
+		}
+		return 0;
+	}
+	
+	public Map<Integer, Integer> getRankList() {
+		final var tmpPoints = new HashMap<Integer, Integer>();
+		for (var ownerId : _list.keySet()) {
+			final var totalPoints = getPointsByOwnerId(ownerId);
+			if (totalPoints != 0) {
+				tmpPoints.put(ownerId, totalPoints);
+			}
+		}
+		
+		final var list = new ArrayList<>(tmpPoints.entrySet());
+		list.sort(Comparator.comparing(Entry<Integer, Integer>::getValue).reversed());
+		var ranking = 1;
+		final var tmpRanking = new HashMap<Integer, Integer>();
+		for (var entry : list) {
+			tmpRanking.put(entry.getKey(), ranking++);
+		}
+		return tmpRanking;
+	}
+	
+	public static RaidBossPointsManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final RaidBossPointsManager _instance = new RaidBossPointsManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java
new file mode 100644
index 00000000..aba072d4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java
@@ -0,0 +1,458 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.Calendar;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
+
+/**
+ * Raid Boss spawn manager.
+ * @author godson
+ */
+public class RaidBossSpawnManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RaidBossSpawnManager.class);
+	
+	private static final int EILHALDER_VON_HELLMANN = 25328;
+	
+	protected static final Map<Integer, L2RaidBossInstance> _bosses = new ConcurrentHashMap<>();
+	
+	protected static final Map<Integer, L2Spawn> _spawns = new ConcurrentHashMap<>();
+	
+	protected static final Map<Integer, StatsSet> _storedInfo = new ConcurrentHashMap<>();
+	
+	protected static final Map<Integer, ScheduledFuture<?>> _schedules = new ConcurrentHashMap<>();
+	
+	public enum StatusEnum {
+		ALIVE,
+		DEAD,
+		UNDEFINED
+	}
+	
+	protected RaidBossSpawnManager() {
+		load();
+	}
+	
+	public void load() {
+		LOG.info("Spawning raid bosses...");
+		
+		_bosses.clear();
+		_spawns.clear();
+		_storedInfo.clear();
+		_schedules.clear();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM raidboss_spawnlist ORDER BY boss_id")) {
+			while (rs.next()) {
+				final L2Spawn spawnDat = new L2Spawn(rs.getInt("boss_id"));
+				spawnDat.setX(rs.getInt("loc_x"));
+				spawnDat.setY(rs.getInt("loc_y"));
+				spawnDat.setZ(rs.getInt("loc_z"));
+				spawnDat.setAmount(rs.getInt("amount"));
+				spawnDat.setHeading(rs.getInt("heading"));
+				spawnDat.setRespawnDelay(rs.getInt("respawn_delay"), rs.getInt("respawn_random"));
+				
+				addNewSpawn(spawnDat, rs.getLong("respawn_time"), rs.getDouble("currentHP"), rs.getDouble("currentMP"), false);
+			}
+			
+			LOG.info("Loaded {} bosses.", _bosses.size());
+			LOG.info("Scheduled {} boss instances.", _schedules.size());
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while initializing raid boss spawn manager!", ex);
+		}
+	}
+	
+	private static class SpawnSchedule implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(SpawnSchedule.class);
+		
+		private final int bossId;
+		
+		public SpawnSchedule(int npcId) {
+			bossId = npcId;
+		}
+		
+		@Override
+		public void run() {
+			L2RaidBossInstance raidBoss;
+			if (bossId == EILHALDER_VON_HELLMANN) {
+				raidBoss = DayNightSpawnManager.getInstance().handleBoss(_spawns.get(bossId));
+			} else {
+				raidBoss = (L2RaidBossInstance) _spawns.get(bossId).doSpawn();
+			}
+			
+			if (raidBoss != null) {
+				raidBoss.setRaidStatus(StatusEnum.ALIVE);
+				
+				final StatsSet info = new StatsSet();
+				info.set("currentHP", raidBoss.getCurrentHp());
+				info.set("currentMP", raidBoss.getCurrentMp());
+				info.set("respawnTime", 0L);
+				
+				_storedInfo.put(bossId, info);
+				
+				LOG.info("Spawning Raid Boss {}.", raidBoss.getName());
+				
+				_bosses.put(bossId, raidBoss);
+			}
+			
+			_schedules.remove(bossId);
+		}
+	}
+	
+	/**
+	 * Update status.
+	 * @param boss the boss
+	 * @param isBossDead the is boss dead
+	 */
+	public void updateStatus(L2RaidBossInstance boss, boolean isBossDead) {
+		final StatsSet info = _storedInfo.get(boss.getId());
+		if (info == null) {
+			return;
+		}
+		
+		if (isBossDead) {
+			boss.setRaidStatus(StatusEnum.DEAD);
+			
+			final int respawnMinDelay = (int) (boss.getSpawn().getRespawnMinDelay() * npc().getRaidMinRespawnMultiplier());
+			final int respawnMaxDelay = (int) (boss.getSpawn().getRespawnMaxDelay() * npc().getRaidMaxRespawnMultiplier());
+			final int respawnDelay = Rnd.get(respawnMinDelay, respawnMaxDelay);
+			final long respawnTime = Calendar.getInstance().getTimeInMillis() + respawnDelay;
+			
+			info.set("currentHP", boss.getMaxHp());
+			info.set("currentMP", boss.getMaxMp());
+			info.set("respawnTime", respawnTime);
+			
+			if (!_schedules.containsKey(boss.getId()) && ((respawnMinDelay > 0) || (respawnMaxDelay > 0))) {
+				final Calendar time = Calendar.getInstance();
+				time.setTimeInMillis(respawnTime);
+				LOG.info("Updated {} respawn time to {}.", boss.getName(), time.getTime());
+				
+				_schedules.put(boss.getId(), ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(boss.getId()), respawnDelay));
+				updateDb();
+			}
+		} else {
+			boss.setRaidStatus(StatusEnum.ALIVE);
+			
+			info.set("currentHP", boss.getCurrentHp());
+			info.set("currentMP", boss.getCurrentMp());
+			info.set("respawnTime", 0L);
+		}
+		_storedInfo.put(boss.getId(), info);
+	}
+	
+	/**
+	 * Adds the new spawn.
+	 * @param spawnDat the spawn dat
+	 * @param respawnTime the respawn time
+	 * @param currentHP the current hp
+	 * @param currentMP the current mp
+	 * @param storeInDb the store in db
+	 */
+	public void addNewSpawn(L2Spawn spawnDat, long respawnTime, double currentHP, double currentMP, boolean storeInDb) {
+		if (spawnDat == null) {
+			return;
+		}
+		if (_spawns.containsKey(spawnDat.getId())) {
+			return;
+		}
+		
+		final int bossId = spawnDat.getId();
+		final long time = Calendar.getInstance().getTimeInMillis();
+		
+		SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+		
+		if ((respawnTime == 0L) || (time > respawnTime)) {
+			L2RaidBossInstance raidBoss;
+			if (bossId == EILHALDER_VON_HELLMANN) {
+				raidBoss = DayNightSpawnManager.getInstance().handleBoss(spawnDat);
+			} else {
+				raidBoss = (L2RaidBossInstance) spawnDat.doSpawn();
+			}
+			
+			if (raidBoss != null) {
+				raidBoss.setCurrentHp(currentHP);
+				raidBoss.setCurrentMp(currentMP);
+				raidBoss.setRaidStatus(StatusEnum.ALIVE);
+				
+				_bosses.put(bossId, raidBoss);
+				
+				final StatsSet info = new StatsSet();
+				info.set("currentHP", currentHP);
+				info.set("currentMP", currentMP);
+				info.set("respawnTime", 0L);
+				
+				_storedInfo.put(bossId, info);
+			}
+		} else {
+			final long spawnTime = respawnTime - Calendar.getInstance().getTimeInMillis();
+			_schedules.put(bossId, ThreadPoolManager.getInstance().scheduleGeneral(new SpawnSchedule(bossId), spawnTime));
+		}
+		
+		_spawns.put(bossId, spawnDat);
+		
+		if (storeInDb) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("INSERT INTO raidboss_spawnlist (boss_id,amount,loc_x,loc_y,loc_z,heading,respawn_time,currentHp,currentMp) VALUES(?,?,?,?,?,?,?,?,?)")) {
+				ps.setInt(1, spawnDat.getId());
+				ps.setInt(2, spawnDat.getAmount());
+				ps.setInt(3, spawnDat.getX());
+				ps.setInt(4, spawnDat.getY());
+				ps.setInt(5, spawnDat.getZ());
+				ps.setInt(6, spawnDat.getHeading());
+				ps.setLong(7, respawnTime);
+				ps.setDouble(8, currentHP);
+				ps.setDouble(9, currentMP);
+				ps.execute();
+			} catch (Exception ex) {
+				LOG.warn("Could not store raid boss Id {} in the DB!", bossId, ex);
+			}
+		}
+	}
+	
+	/**
+	 * Delete spawn.
+	 * @param spawnDat the spawn dat
+	 * @param updateDb the update db
+	 */
+	public void deleteSpawn(L2Spawn spawnDat, boolean updateDb) {
+		if (spawnDat == null) {
+			return;
+		}
+		
+		final int bossId = spawnDat.getId();
+		if (!_spawns.containsKey(bossId)) {
+			return;
+		}
+		
+		SpawnTable.getInstance().deleteSpawn(spawnDat, false);
+		_spawns.remove(bossId);
+		
+		_bosses.remove(bossId);
+		
+		final ScheduledFuture<?> f = _schedules.remove(bossId);
+		if (f != null) {
+			f.cancel(true);
+		}
+		
+		_storedInfo.remove(bossId);
+		
+		if (updateDb) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("DELETE FROM raidboss_spawnlist WHERE boss_id=?")) {
+				ps.setInt(1, bossId);
+				ps.execute();
+			} catch (Exception ex) {
+				LOG.warn("Could not remove raid boss Id {} from DB!", bossId, ex);
+			}
+		}
+	}
+	
+	private void updateDb() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE raidboss_spawnlist SET respawn_time = ?, currentHP = ?, currentMP = ? WHERE boss_id = ?")) {
+			for (Integer bossId : _storedInfo.keySet()) {
+				if (bossId == null) {
+					continue;
+				}
+				
+				L2RaidBossInstance boss = _bosses.get(bossId);
+				
+				if (boss == null) {
+					continue;
+				}
+				
+				if (boss.getRaidStatus().equals(StatusEnum.ALIVE)) {
+					updateStatus(boss, false);
+				}
+				
+				StatsSet info = _storedInfo.get(bossId);
+				
+				if (info == null) {
+					continue;
+				}
+				
+				try {
+					// TODO(Zoey76): Change this to use batch.
+					ps.setLong(1, info.getLong("respawnTime"));
+					ps.setDouble(2, info.getDouble("currentHP"));
+					ps.setDouble(3, info.getDouble("currentMP"));
+					ps.setInt(4, bossId);
+					ps.executeUpdate();
+					ps.clearParameters();
+				} catch (Exception ex) {
+					LOG.warn("Could not update raid boss spawn list table!", ex);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("SQL error while updating Raid Boss spawn to database!", ex);
+		}
+	}
+	
+	/**
+	 * Gets the all raid boss status.
+	 * @return the all raid boss status
+	 */
+	public String[] getAllRaidBossStatus() {
+		final String[] msg = new String[Math.max(_bosses.size(), 1)];
+		if (_bosses.isEmpty()) {
+			msg[0] = "None";
+			return msg;
+		}
+		
+		int index = 0;
+		for (var boss : _bosses.values()) {
+			msg[index++] = boss.getName() + ": " + boss.getRaidStatus().name();
+		}
+		return msg;
+	}
+	
+	/**
+	 * Gets the raid boss status.
+	 * @param bossId the boss id
+	 * @return the raid boss status
+	 */
+	public String getRaidBossStatus(int bossId) {
+		String msg = "RaidBoss Status..." + Configuration.EOL;
+		
+		if (_bosses == null) {
+			msg += "None";
+			return msg;
+		}
+		
+		if (_bosses.containsKey(bossId)) {
+			final L2RaidBossInstance boss = _bosses.get(bossId);
+			
+			msg += boss.getName() + ": " + boss.getRaidStatus().name();
+		}
+		
+		return msg;
+	}
+	
+	/**
+	 * Gets the raid boss status id.
+	 * @param bossId the boss id
+	 * @return the raid boss status id
+	 */
+	public StatusEnum getRaidBossStatusId(int bossId) {
+		if (_bosses.containsKey(bossId)) {
+			return _bosses.get(bossId).getRaidStatus();
+		} else if (_schedules.containsKey(bossId)) {
+			return StatusEnum.DEAD;
+		} else {
+			return StatusEnum.UNDEFINED;
+		}
+	}
+	
+	/**
+	 * Notify spawn night boss.
+	 * @param raidBoss the raid boss
+	 */
+	public void notifySpawnNightBoss(L2RaidBossInstance raidBoss) {
+		final StatsSet info = new StatsSet();
+		info.set("currentHP", raidBoss.getCurrentHp());
+		info.set("currentMP", raidBoss.getCurrentMp());
+		info.set("respawnTime", 0L);
+		
+		raidBoss.setRaidStatus(StatusEnum.ALIVE);
+		
+		_storedInfo.put(raidBoss.getId(), info);
+		
+		LOG.info("Spawning Night Raid Boss {}.", raidBoss.getName());
+		
+		_bosses.put(raidBoss.getId(), raidBoss);
+	}
+	
+	/**
+	 * Checks if the boss is defined.
+	 * @param bossId the boss id
+	 * @return {@code true} if is defined
+	 */
+	public boolean isDefined(int bossId) {
+		return _spawns.containsKey(bossId);
+	}
+	
+	/**
+	 * Gets the bosses.
+	 * @return the bosses
+	 */
+	public Map<Integer, L2RaidBossInstance> getBosses() {
+		return _bosses;
+	}
+	
+	/**
+	 * Gets the spawns.
+	 * @return the spawns
+	 */
+	public Map<Integer, L2Spawn> getSpawns() {
+		return _spawns;
+	}
+	
+	/**
+	 * Gets the stored info.
+	 * @return the stored info
+	 */
+	public Map<Integer, StatsSet> getStoredInfo() {
+		return _storedInfo;
+	}
+	
+	/**
+	 * Saves and clears the raid bosses status, including all schedules.
+	 */
+	public void cleanUp() {
+		updateDb();
+		
+		_bosses.clear();
+		
+		if (_schedules != null) {
+			for (Integer bossId : _schedules.keySet()) {
+				ScheduledFuture<?> f = _schedules.get(bossId);
+				f.cancel(true);
+			}
+			_schedules.clear();
+		}
+		
+		_storedInfo.clear();
+		_spawns.clear();
+	}
+	
+	public static RaidBossSpawnManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final RaidBossSpawnManager INSTANCE = new RaidBossSpawnManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java
new file mode 100644
index 00000000..cf702165
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+
+public final class SiegeGuardManager {
+	private static final Logger LOG = LoggerFactory.getLogger(SiegeGuardManager.class);
+	
+	private final Castle _castle;
+	
+	private final List<L2Spawn> _siegeGuardSpawn = new ArrayList<>();
+	
+	public SiegeGuardManager(Castle castle) {
+		_castle = castle;
+	}
+	
+	public void addSiegeGuard(L2PcInstance activeChar, int npcId) {
+		if (activeChar == null) {
+			return;
+		}
+		addSiegeGuard(activeChar.getX(), activeChar.getY(), activeChar.getZ(), activeChar.getHeading(), npcId);
+	}
+	
+	private void addSiegeGuard(int x, int y, int z, int heading, int npcId) {
+		saveSiegeGuard(x, y, z, heading, npcId, 0);
+	}
+	
+	public void hireMerc(L2PcInstance activeChar, int npcId) {
+		if (activeChar == null) {
+			return;
+		}
+		hireMerc(activeChar.getX(), activeChar.getY(), activeChar.getZ(), activeChar.getHeading(), npcId);
+	}
+	
+	public void hireMerc(int x, int y, int z, int heading, int npcId) {
+		saveSiegeGuard(x, y, z, heading, npcId, 1);
+	}
+	
+	/**
+	 * Remove a single mercenary, identified by the npcId and location. Presumably, this is used when a castle lord picks up a previously dropped ticket
+	 */
+	public void removeMerc(int npcId, int x, int y, int z) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM castle_siege_guards WHERE npcId = ? AND x = ? AND y = ? AND z = ? AND isHired = 1")) {
+			ps.setInt(1, npcId);
+			ps.setInt(2, x);
+			ps.setInt(3, y);
+			ps.setInt(4, z);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Error deleting hired siege guard at {},{},{}: {}", x, y, z, e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Remove mercs.
+	 */
+	public void removeMercs() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM castle_siege_guards WHERE castleId = ? AND isHired = 1")) {
+			ps.setInt(1, getCastle().getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Error deleting hired siege guard for castle {}: {}", getCastle().getName(), e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Spawn guards.
+	 */
+	public void spawnSiegeGuard() {
+		try {
+			int hiredCount = 0, hiredMax = MercTicketManager.getInstance().getMaxAllowedMerc(_castle.getResidenceId());
+			boolean isHired = getCastle().getOwnerId() > 0;
+			loadSiegeGuard();
+			for (L2Spawn spawn : _siegeGuardSpawn) {
+				if (spawn != null) {
+					spawn.init();
+					if (isHired) {
+						spawn.stopRespawn();
+						if (++hiredCount > hiredMax) {
+							return;
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Error spawning siege guards for castle {}", getCastle().getName(), e);
+		}
+	}
+	
+	/**
+	 * Unspawn guards.
+	 */
+	public void unspawnSiegeGuard() {
+		for (L2Spawn spawn : _siegeGuardSpawn) {
+			if ((spawn != null) && (spawn.getLastSpawn() != null)) {
+				spawn.stopRespawn();
+				spawn.getLastSpawn().doDie(spawn.getLastSpawn());
+			}
+		}
+		
+		_siegeGuardSpawn.clear();
+	}
+	
+	/**
+	 * Load guards.
+	 */
+	private void loadSiegeGuard() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM castle_siege_guards WHERE castleId = ? AND isHired = ?")) {
+			ps.setInt(1, getCastle().getResidenceId());
+			if (getCastle().getOwnerId() > 0) {
+				ps.setInt(2, 1);
+			} else {
+				ps.setInt(2, 0);
+			}
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final L2Spawn spawn = new L2Spawn(rs.getInt("npcId"));
+					spawn.setAmount(1);
+					spawn.setX(rs.getInt("x"));
+					spawn.setY(rs.getInt("y"));
+					spawn.setZ(rs.getInt("z"));
+					spawn.setHeading(rs.getInt("heading"));
+					spawn.setRespawnDelay(rs.getInt("respawnDelay"));
+					spawn.setLocationId(0);
+					
+					_siegeGuardSpawn.add(spawn);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Error loading siege guard for castle {}: {}", getCastle().getName(), e.getMessage(), e);
+		}
+	}
+	
+	private void saveSiegeGuard(int x, int y, int z, int heading, int npcId, int isHire) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO castle_siege_guards (castleId, npcId, x, y, z, heading, respawnDelay, isHired) VALUES (?, ?, ?, ?, ?, ?, ?, ?)")) {
+			ps.setInt(1, getCastle().getResidenceId());
+			ps.setInt(2, npcId);
+			ps.setInt(3, x);
+			ps.setInt(4, y);
+			ps.setInt(5, z);
+			ps.setInt(6, heading);
+			ps.setInt(7, (isHire == 1 ? 0 : 600));
+			ps.setInt(8, isHire);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Error adding siege guard for castle {}: {}", getCastle().getName(), e.getMessage(), e);
+		}
+	}
+	
+	public Castle getCastle() {
+		return _castle;
+	}
+	
+	public List<L2Spawn> getSiegeGuardSpawn() {
+		return _siegeGuardSpawn;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java
new file mode 100644
index 00000000..8a8432af
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.siege;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.TowerSpawn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+public final class SiegeManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SiegeManager.class);
+	
+	private final Map<Integer, List<TowerSpawn>> _controlTowers = new HashMap<>();
+	
+	private final Map<Integer, List<TowerSpawn>> _flameTowers = new HashMap<>();
+	
+	protected SiegeManager() {
+		load();
+	}
+	
+	public void addSiegeSkills(L2PcInstance character) {
+		for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0)) {
+			character.addSkill(sk, false);
+		}
+	}
+	
+	/**
+	 * @param clan The L2Clan of the player
+	 * @param castleId
+	 * @return true if the clan is registered or owner of a castle
+	 */
+	public boolean checkIsRegistered(L2Clan clan, int castleId) {
+		if (clan == null) {
+			return false;
+		}
+		
+		if (clan.getCastleId() > 0) {
+			return true;
+		}
+		
+		boolean register = false;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT clan_id FROM siege_clans where clan_id=? and castle_id=?")) {
+			ps.setInt(1, clan.getId());
+			ps.setInt(2, castleId);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					register = true;
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error verifying if the clan is registered to the siege!", ex);
+		}
+		return register;
+	}
+	
+	public void removeSiegeSkills(L2PcInstance character) {
+		for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0)) {
+			character.removeSkill(sk);
+		}
+	}
+	
+	private void load() {
+		// Gludio
+		_controlTowers.put(1, List.of(siege().getGludioControlTower1(), //
+			siege().getGludioControlTower2(), //
+			siege().getGludioControlTower3()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[0] = siege().getGludioMaxMercenaries();
+		_flameTowers.put(1, List.of(siege().getGludioFlameTower1(), //
+			siege().getGludioFlameTower1()));
+		// Dion
+		_controlTowers.put(2, List.of(siege().getDionControlTower1(), //
+			siege().getDionControlTower2(), //
+			siege().getDionControlTower3()));
+		_flameTowers.put(2, List.of(siege().getDionFlameTower1(), //
+			siege().getDionFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[1] = siege().getDionMaxMercenaries();
+		// Giran
+		_controlTowers.put(3, List.of(siege().getGiranControlTower1(), //
+			siege().getGiranControlTower2(), //
+			siege().getGiranControlTower3()));
+		_flameTowers.put(3, List.of(siege().getGiranFlameTower1(), //
+			siege().getGiranFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[2] = siege().getGiranMaxMercenaries();
+		// Oren
+		_controlTowers.put(4, List.of(siege().getOrenControlTower1(), //
+			siege().getOrenControlTower2(), //
+			siege().getOrenControlTower3()));
+		_flameTowers.put(4, List.of(siege().getOrenFlameTower1(), //
+			siege().getOrenFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[3] = siege().getOrenMaxMercenaries();
+		// Aden
+		_controlTowers.put(5, List.of(siege().getAdenControlTower1(), //
+			siege().getAdenControlTower2(), //
+			siege().getAdenControlTower3()));
+		_flameTowers.put(5, List.of(siege().getAdenFlameTower1(), //
+			siege().getAdenFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[4] = siege().getAdenMaxMercenaries();
+		// Innadril
+		_controlTowers.put(6, List.of(siege().getInnadrilControlTower1(), //
+			siege().getInnadrilControlTower2(), //
+			siege().getInnadrilControlTower3()));
+		_flameTowers.put(6, List.of(siege().getInnadrilFlameTower1(), //
+			siege().getInnadrilFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[5] = siege().getInnadrilMaxMercenaries();
+		// Goddard
+		_controlTowers.put(7, List.of(siege().getGoddardControlTower1(), //
+			siege().getGoddardControlTower2(), //
+			siege().getGoddardControlTower3()));
+		_flameTowers.put(7, List.of(siege().getGoddardFlameTower1(), //
+			siege().getGoddardFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[6] = siege().getGoddardMaxMercenaries();
+		// Rune
+		_controlTowers.put(8, List.of(siege().getRuneControlTower1(), //
+			siege().getRuneControlTower2(), //
+			siege().getRuneControlTower3()));
+		_flameTowers.put(8, List.of(siege().getRuneFlameTower1(), //
+			siege().getRuneFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[7] = siege().getRuneMaxMercenaries();
+		// Schuttgart
+		_controlTowers.put(9, List.of(siege().getSchuttgartControlTower1(), //
+			siege().getSchuttgartControlTower2(), //
+			siege().getSchuttgartControlTower3()));
+		_flameTowers.put(9, List.of(siege().getSchuttgartFlameTower1(), //
+			siege().getSchuttgartFlameTower1()));
+		MercTicketManager.MERCS_MAX_PER_CASTLE[8] = siege().getSchuttgartMaxMercenaries();
+		
+		for (Castle castle : CastleManager.getInstance().getCastles()) {
+			if (castle.getOwnerId() != 0) {
+				loadTrapUpgrade(castle.getResidenceId());
+			}
+		}
+	}
+	
+	public List<TowerSpawn> getControlTowers(int castleId) {
+		return _controlTowers.get(castleId);
+	}
+	
+	public List<TowerSpawn> getFlameTowers(int castleId) {
+		return _flameTowers.get(castleId);
+	}
+	
+	public int getAttackerMaxClans() {
+		return siege().getAttackerMaxClans();
+	}
+	
+	public int getAttackerRespawnDelay() {
+		return siege().getAttackerRespawn();
+	}
+	
+	public int getDefenderMaxClans() {
+		return siege().getDefenderMaxClans();
+	}
+	
+	public int getFlagMaxCount() {
+		return siege().getMaxFlags();
+	}
+	
+	public Siege getSiege(ILocational loc) {
+		return getSiege(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	public Siege getSiege(L2Object activeObject) {
+		return getSiege(activeObject.getX(), activeObject.getY(), activeObject.getZ());
+	}
+	
+	public Siege getSiege(int x, int y, int z) {
+		for (Castle castle : CastleManager.getInstance().getCastles()) {
+			if (castle.getSiege().checkIfInZone(x, y, z)) {
+				return castle.getSiege();
+			}
+		}
+		return null;
+	}
+	
+	public int getSiegeClanMinLevel() {
+		return siege().getClanMinLevel();
+	}
+	
+	public int getSiegeLength() {
+		return siege().getSiegeLength();
+	}
+	
+	public int getBloodAllianceReward() {
+		return siege().getBloodAllianceReward();
+	}
+	
+	public List<Siege> getSieges() {
+		List<Siege> sieges = new ArrayList<>();
+		for (Castle castle : CastleManager.getInstance().getCastles()) {
+			sieges.add(castle.getSiege());
+		}
+		return sieges;
+	}
+	
+	private void loadTrapUpgrade(int castleId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM castle_trapupgrade WHERE castleId=?")) {
+			ps.setInt(1, castleId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					_flameTowers.get(castleId).get(rs.getInt("towerIndex")).setUpgradeLevel(rs.getInt("level"));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading trap upgrade!", ex);
+		}
+	}
+	
+	public static SiegeManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final SiegeManager _instance = new SiegeManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
new file mode 100644
index 00000000..30c56011
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java
@@ -0,0 +1,1389 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.territoryWar;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TerritoryWard;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.Siegable;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+import com.l2jserver.gameserver.util.Util;
+
+public final class TerritoryWarManager implements Siegable {
+	private static final Logger LOG = LoggerFactory.getLogger(TerritoryWarManager.class);
+	
+	private static final String DELETE = "DELETE FROM territory_registrations WHERE castleId = ? and registeredId = ?";
+	
+	private static final String INSERT = "INSERT INTO territory_registrations (castleId, registeredId) values (?, ?)";
+	
+	public static final Map<Integer, Integer> TERRITORY_ITEM_IDS = new HashMap<>();
+	
+	private static final String qn = "TerritoryWarSuperClass";
+	
+	public static String GLOBAL_VARIABLE = "nextTWStartDate";
+	
+	// Territory War settings
+	private final Map<Integer, List<L2Clan>> _registeredClans = new ConcurrentHashMap<>();
+	private final Map<Integer, List<Integer>> _registeredMercenaries = new ConcurrentHashMap<>();
+	private final Map<Integer, Territory> _territoryList = new ConcurrentHashMap<>();
+	private final List<Integer> _disguisedPlayers = new CopyOnWriteArrayList<>();
+	private final List<TerritoryWard> _territoryWards = new CopyOnWriteArrayList<>();
+	private final Map<L2Clan, L2SiegeFlagInstance> _clanFlags = new ConcurrentHashMap<>();
+	private final Map<Integer, Integer[]> _participantPoints = new ConcurrentHashMap<>();
+	private final Calendar _startTWDate = Calendar.getInstance();
+	private boolean _isRegistrationOver = true;
+	private boolean _isTWChannelOpen = false;
+	private boolean _isTWInProgress = false;
+	private ScheduledFuture<?> _scheduledStartTWTask = null;
+	private ScheduledFuture<?> _scheduledEndTWTask = null;
+	private ScheduledFuture<?> _scheduledRewardOnlineTask = null;
+	
+	static {
+		TERRITORY_ITEM_IDS.put(81, 13757);
+		TERRITORY_ITEM_IDS.put(82, 13758);
+		TERRITORY_ITEM_IDS.put(83, 13759);
+		TERRITORY_ITEM_IDS.put(84, 13760);
+		TERRITORY_ITEM_IDS.put(85, 13761);
+		TERRITORY_ITEM_IDS.put(86, 13762);
+		TERRITORY_ITEM_IDS.put(87, 13763);
+		TERRITORY_ITEM_IDS.put(88, 13764);
+		TERRITORY_ITEM_IDS.put(89, 13765);
+	}
+	
+	private TerritoryWarManager() {
+		load();
+	}
+	
+	public int getRegisteredTerritoryId(L2PcInstance player) {
+		if ((player == null) || !_isTWChannelOpen || (player.getLevel() < territoryWar().getPlayerMinLevel())) {
+			return 0;
+		}
+		if (player.getClan() != null) {
+			if (player.getClan().getCastleId() > 0) {
+				return player.getClan().getCastleId() + 80;
+			}
+			for (int cId : _registeredClans.keySet()) {
+				if (_registeredClans.get(cId).contains(player.getClan())) {
+					return cId + 80;
+				}
+			}
+		}
+		for (int cId : _registeredMercenaries.keySet()) {
+			if (_registeredMercenaries.get(cId).contains(player.getObjectId())) {
+				return cId + 80;
+			}
+		}
+		return 0;
+	}
+	
+	public boolean isAllyField(L2PcInstance player, int fieldId) {
+		if ((player == null) || (player.getSiegeSide() == 0)) {
+			return false;
+		} else if ((player.getSiegeSide() - 80) == fieldId) {
+			return true;
+		} else if ((fieldId > 100) && _territoryList.containsKey((player.getSiegeSide() - 80)) && (_territoryList.get((player.getSiegeSide() - 80)).getFortId() == fieldId)) {
+			return true;
+		}
+		return false;
+		
+	}
+	
+	/**
+	 * @param castleId id of the castle to check registration for
+	 * @param clan The L2Clan of the player
+	 * @return true if the clan is registered
+	 */
+	public boolean checkIsRegistered(int castleId, L2Clan clan) {
+		if (clan == null) {
+			return false;
+		}
+		
+		if (clan.getCastleId() > 0) {
+			return ((castleId == -1) || (clan.getCastleId() == castleId));
+		}
+		
+		if (castleId == -1) {
+			for (int cId : _registeredClans.keySet()) {
+				if (_registeredClans.get(cId).contains(clan)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return _registeredClans.get(castleId).contains(clan);
+	}
+	
+	/**
+	 * @param castleId
+	 * @param objId
+	 * @return true if the player is registered
+	 */
+	public boolean checkIsRegistered(int castleId, int objId) {
+		if (castleId == -1) {
+			for (int cId : _registeredMercenaries.keySet()) {
+				if (_registeredMercenaries.get(cId).contains(objId)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		return _registeredMercenaries.get(castleId).contains(objId);
+	}
+	
+	public Territory getTerritory(int castleId) {
+		return _territoryList.get(castleId);
+	}
+	
+	public List<Territory> getAllTerritories() {
+		List<Territory> ret = new LinkedList<>();
+		for (Territory t : _territoryList.values()) {
+			if (t.getOwnerClan() != null) {
+				ret.add(t);
+			}
+		}
+		return ret;
+	}
+	
+	public List<L2Clan> getRegisteredClans(int castleId) {
+		return _registeredClans.get(castleId);
+	}
+	
+	public void addDisguisedPlayer(int playerObjId) {
+		_disguisedPlayers.add(playerObjId);
+	}
+	
+	public boolean isDisguised(int playerObjId) {
+		return _disguisedPlayers.contains(playerObjId);
+	}
+	
+	public List<Integer> getRegisteredMercenaries(int castleId) {
+		return _registeredMercenaries.get(castleId);
+	}
+	
+	public long getTWStartTimeInMillis() {
+		return _startTWDate.getTimeInMillis();
+	}
+	
+	public Calendar getTWStart() {
+		return _startTWDate;
+	}
+	
+	public void setTWStartTimeInMillis(long time) {
+		_startTWDate.setTimeInMillis(time);
+		if (_isTWInProgress) {
+			if (_scheduledEndTWTask != null) {
+				_scheduledEndTWTask.cancel(false);
+			}
+			_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), 1000);
+		} else {
+			if (_scheduledStartTWTask != null) {
+				_scheduledStartTWTask.cancel(false);
+			}
+			_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), 1000);
+		}
+	}
+	
+	public boolean isTWChannelOpen() {
+		return _isTWChannelOpen;
+	}
+	
+	public void registerClan(int castleId, L2Clan clan) {
+		if ((clan == null) || ((_registeredClans.get(castleId) != null) && _registeredClans.get(castleId).contains(clan))) {
+			return;
+		}
+		
+		_registeredClans.putIfAbsent(castleId, new CopyOnWriteArrayList<>());
+		_registeredClans.get(castleId).add(clan);
+		changeRegistration(castleId, clan.getId(), false);
+	}
+	
+	public void registerMerc(int castleId, L2PcInstance player) {
+		if ((player == null) || (player.getLevel() < territoryWar().getPlayerMinLevel()) || ((_registeredMercenaries.get(castleId) != null) && _registeredMercenaries.get(castleId).contains(player.getObjectId()))) {
+			return;
+		}
+		
+		_registeredMercenaries.putIfAbsent(castleId, new CopyOnWriteArrayList<>());
+		_registeredMercenaries.get(castleId).add(player.getObjectId());
+		changeRegistration(castleId, player.getObjectId(), false);
+	}
+	
+	public void removeClan(int castleId, L2Clan clan) {
+		if (clan == null) {
+			return;
+		}
+		
+		if ((_registeredClans.get(castleId) != null) && _registeredClans.get(castleId).contains(clan)) {
+			_registeredClans.get(castleId).remove(clan);
+			changeRegistration(castleId, clan.getId(), true);
+		}
+	}
+	
+	public void removeMerc(int castleId, L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		if ((_registeredMercenaries.get(castleId) != null) && _registeredMercenaries.get(castleId).contains(player.getObjectId())) {
+			_registeredMercenaries.get(castleId).remove((Integer) player.getObjectId());
+			changeRegistration(castleId, player.getObjectId(), true);
+		}
+	}
+	
+	public boolean getIsRegistrationOver() {
+		return _isRegistrationOver;
+	}
+	
+	public boolean isTWInProgress() {
+		return _isTWInProgress;
+	}
+	
+	public void territoryCatapultDestroyed(int castleId) {
+		if (_territoryList.get(castleId) != null) {
+			_territoryList.get(castleId).changeNPCsSpawn(2, false);
+		}
+		for (L2DoorInstance door : CastleManager.getInstance().getCastleById(castleId).getDoors()) {
+			door.openMe();
+		}
+	}
+	
+	public L2Npc addTerritoryWard(int territoryId, int newOwnerId, int oldOwnerId, boolean broadcastMessage) {
+		L2Npc ret = null;
+		Territory terNew = _territoryList.get(newOwnerId);
+		if (terNew != null) {
+			TerritoryNPCSpawn ward = terNew.getFreeWardSpawnPlace();
+			if (ward != null) {
+				ward._npcId = territoryId;
+				ret = spawnNPC(36491 + territoryId, ward.getLocation());
+				ward.setNPC(ret);
+				if (!isTWInProgress() && !territoryWar().spawnWardsWhenTWIsNotInProgress()) {
+					ret.decayMe();
+				}
+				if ((terNew.getOwnerClan() != null) && terNew.getOwnedWardIds().contains(newOwnerId + 80)) {
+					for (int wardId : terNew.getOwnedWardIds()) {
+						final List<L2SkillLearn> residentialSkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
+						for (L2SkillLearn s : residentialSkills) {
+							final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
+							if (sk != null) {
+								for (L2PcInstance member : terNew.getOwnerClan().getOnlineMembers(0)) {
+									if (!member.isInOlympiadMode()) {
+										member.addSkill(sk, false);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			if (_territoryList.containsKey(oldOwnerId)) {
+				Territory terOld = _territoryList.get(oldOwnerId);
+				terOld.removeWard(territoryId);
+				updateTerritoryData(terOld);
+				updateTerritoryData(terNew);
+				if (broadcastMessage) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_HAS_SUCCEDED_IN_CAPTURING_S2_TERRITORY_WARD);
+					sm.addString(terNew.getOwnerClan().getName());
+					sm.addCastleId(territoryId);
+					announceToParticipants(sm, 135000, 13500);
+				}
+				if (terOld.getOwnerClan() != null) {
+					final List<L2SkillLearn> territorySkills = SkillTreesData.getInstance().getAvailableResidentialSkills(territoryId);
+					for (L2SkillLearn s : territorySkills) {
+						final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
+						if (sk != null) {
+							for (L2PcInstance member : terOld.getOwnerClan().getOnlineMembers(0)) {
+								member.removeSkill(sk, false);
+							}
+						}
+					}
+					
+					if (!terOld.getOwnedWardIds().isEmpty() && !terOld.getOwnedWardIds().contains(oldOwnerId + 80)) {
+						for (int wardId : terOld.getOwnedWardIds()) {
+							final List<L2SkillLearn> wardSkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
+							for (L2SkillLearn s : wardSkills) {
+								final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
+								if (sk != null) {
+									for (L2PcInstance member : terOld.getOwnerClan().getOnlineMembers(0)) {
+										member.removeSkill(sk, false);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		} else {
+			LOG.warn("Missing territory for new Ward owner: {}; {}", newOwnerId, territoryId);
+		}
+		return ret;
+	}
+	
+	public L2SiegeFlagInstance getHQForClan(L2Clan clan) {
+		if (clan.getCastleId() > 0) {
+			return _territoryList.get(clan.getCastleId()).getHQ();
+		}
+		return null;
+	}
+	
+	public L2SiegeFlagInstance getHQForTerritory(int territoryId) {
+		return _territoryList.get(territoryId - 80).getHQ();
+	}
+	
+	public void setHQForClan(L2Clan clan, L2SiegeFlagInstance hq) {
+		if (clan.getCastleId() > 0) {
+			_territoryList.get(clan.getCastleId()).setHQ(hq);
+		}
+	}
+	
+	public void addClanFlag(L2Clan clan, L2SiegeFlagInstance flag) {
+		_clanFlags.put(clan, flag);
+	}
+	
+	public boolean isClanHasFlag(L2Clan clan) {
+		return _clanFlags.containsKey(clan);
+	}
+	
+	public L2SiegeFlagInstance getFlagForClan(L2Clan clan) {
+		return _clanFlags.get(clan);
+	}
+	
+	public void removeClanFlag(L2Clan clan) {
+		_clanFlags.remove(clan);
+	}
+	
+	public List<TerritoryWard> getAllTerritoryWards() {
+		return _territoryWards;
+	}
+	
+	public TerritoryWard getTerritoryWardForOwner(int castleId) {
+		for (TerritoryWard twWard : _territoryWards) {
+			if (twWard.getTerritoryId() == castleId) {
+				return twWard;
+			}
+		}
+		return null;
+	}
+	
+	public TerritoryWard getTerritoryWard(int territoryId) {
+		for (TerritoryWard twWard : _territoryWards) {
+			if (twWard.getTerritoryId() == territoryId) {
+				return twWard;
+			}
+		}
+		return null;
+	}
+	
+	public TerritoryWard getTerritoryWard(L2PcInstance player) {
+		for (TerritoryWard twWard : _territoryWards) {
+			if (twWard.playerId == player.getObjectId()) {
+				return twWard;
+			}
+		}
+		return null;
+	}
+	
+	public void dropCombatFlag(L2PcInstance player, boolean isKilled, boolean isSpawnBack) {
+		for (TerritoryWard twWard : _territoryWards) {
+			if (twWard.playerId == player.getObjectId()) {
+				twWard.dropIt();
+				if (isTWInProgress()) {
+					if (isKilled) {
+						twWard.spawnMe();
+					} else if (isSpawnBack) {
+						twWard.spawnBack();
+					} else {
+						for (TerritoryNPCSpawn wardSpawn : _territoryList.get(twWard.getOwnerCastleId()).getOwnedWard()) {
+							if (wardSpawn.getId() == twWard.getTerritoryId()) {
+								wardSpawn.setNPC(wardSpawn.getNpc().getSpawn().doSpawn());
+								twWard.unSpawnMe();
+								twWard.setNpc(wardSpawn.getNpc());
+							}
+						}
+					}
+				}
+				if (isKilled) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_CHAR_THAT_ACQUIRED_S1_WARD_HAS_BEEN_KILLED);
+					sm.addString(twWard.getNpc().getName().replace(" Ward", ""));
+					announceToParticipants(sm, 0, 0);
+				}
+			}
+		}
+	}
+	
+	public void giveTWQuestPoint(L2PcInstance player) {
+		_participantPoints.putIfAbsent(player.getObjectId(), new Integer[] {
+			player.getSiegeSide(),
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		});
+		_participantPoints.get(player.getObjectId())[2]++;
+	}
+	
+	public void giveTWPoint(L2PcInstance killer, int victimSide, int type) {
+		if (victimSide == 0) {
+			return;
+		}
+		if ((killer.getParty() != null) && (type < 5)) {
+			for (L2PcInstance pl : killer.getParty().getMembers()) {
+				if ((pl.getSiegeSide() == victimSide) || (pl.getSiegeSide() == 0) || !Util.checkIfInRange(2000, killer, pl, false)) {
+					continue;
+				}
+				
+				_participantPoints.putIfAbsent(pl.getObjectId(), new Integer[] {
+					pl.getSiegeSide(),
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				});
+				_participantPoints.get(pl.getObjectId())[type]++;
+			}
+		} else {
+			if ((killer.getSiegeSide() == victimSide) || (killer.getSiegeSide() == 0)) {
+				return;
+			}
+			
+			_participantPoints.putIfAbsent(killer.getObjectId(), new Integer[] {
+				killer.getSiegeSide(),
+				0,
+				0,
+				0,
+				0,
+				0,
+				0
+			});
+			_participantPoints.get(killer.getObjectId())[type]++;
+		}
+	}
+	
+	public int[] calcReward(L2PcInstance player) {
+		if (_participantPoints.containsKey(player.getObjectId())) {
+			int[] reward = new int[2];
+			Integer[] temp = _participantPoints.get(player.getObjectId());
+			reward[0] = temp[0];
+			// badges for being online. if char was not online at least 10 mins
+			// than he cant get rewards(also this will handle that player already get his/her rewards)
+			if (temp[6] < 10) {
+				return reward;
+			}
+			reward[1] += (temp[6] > 70 ? 7 : (int) (temp[6] * 0.1));
+			// badges for player Quests
+			reward[1] += temp[2] * 7;
+			// badges for player Kills
+			if (temp[1] < 50) {
+				reward[1] += temp[1] * 0.1;
+			} else if (temp[1] < 120) {
+				reward[1] += (5 + ((temp[1] - 50) / 14));
+			} else {
+				reward[1] += 10;
+			}
+			// badges for territory npcs
+			reward[1] += temp[3];
+			// badges for territory catapults
+			reward[1] += temp[4] * 2;
+			// badges for territory Wards
+			reward[1] += (temp[5] > 0 ? 5 : 0);
+			// badges for territory quest done
+			reward[1] += Math.min(_territoryList.get(temp[0] - 80).getQuestDone()[0], 10);
+			reward[1] += _territoryList.get(temp[0] - 80).getQuestDone()[1];
+			reward[1] += _territoryList.get(temp[0] - 80).getOwnedWardIds().size();
+			return reward;
+		}
+		return new int[] {
+			0,
+			0
+		};
+	}
+	
+	public void debugReward(L2PcInstance player) {
+		player.sendMessage("Registered TerrId: " + player.getSiegeSide());
+		if (_participantPoints.containsKey(player.getObjectId())) {
+			Integer[] temp = _participantPoints.get(player.getObjectId());
+			player.sendMessage("TerrId: " + temp[0]);
+			player.sendMessage("PcKill: " + temp[1]);
+			player.sendMessage("PcQuests: " + temp[2]);
+			player.sendMessage("npcKill: " + temp[3]);
+			player.sendMessage("CatatKill: " + temp[4]);
+			player.sendMessage("WardKill: " + temp[5]);
+			player.sendMessage("onlineTime: " + temp[6]);
+		} else {
+			player.sendMessage("No points for you!");
+		}
+		if (_territoryList.containsKey(player.getSiegeSide() - 80)) {
+			player.sendMessage("Your Territory's jobs:");
+			player.sendMessage("npcKill: " + _territoryList.get(player.getSiegeSide() - 80).getQuestDone()[0]);
+			player.sendMessage("WardCaptured: " + _territoryList.get(player.getSiegeSide() - 80).getQuestDone()[1]);
+		}
+	}
+	
+	public void resetReward(L2PcInstance player) {
+		if (_participantPoints.containsKey(player.getObjectId())) {
+			_participantPoints.get(player.getObjectId())[6] = 0;
+		}
+	}
+	
+	public L2Npc spawnNPC(int npcId, Location loc) {
+		try {
+			final L2Spawn spawnDat = new L2Spawn(npcId);
+			spawnDat.setAmount(1);
+			spawnDat.setX(loc.getX());
+			spawnDat.setY(loc.getY());
+			spawnDat.setZ(loc.getZ());
+			spawnDat.setHeading(loc.getHeading());
+			spawnDat.stopRespawn();
+			return spawnDat.spawnOne(false);
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		return null;
+	}
+	
+	private void changeRegistration(int castleId, int objId, boolean delete) {
+		final String query = delete ? DELETE : INSERT;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(query)) {
+			ps.setInt(1, castleId);
+			ps.setInt(2, objId);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: Territory War registration: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void updateTerritoryData(Territory ter) {
+		StringBuilder wardList = new StringBuilder();
+		for (int i : ter.getOwnedWardIds()) {
+			wardList.append(i).append(";");
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE territories SET ownedWardIds=? WHERE territoryId=?")) {
+			ps.setString(1, wardList.toString());
+			ps.setInt(2, ter.getTerritoryId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: Territory Data update: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM territory_spawnlist")) {
+			while (rs.next()) {
+				int castleId = rs.getInt("castleId");
+				int npcId = rs.getInt("npcId");
+				Location loc = new Location(rs.getInt("x"), rs.getInt("y"), rs.getInt("z"), rs.getInt("heading"));
+				int spawnType = rs.getInt("spawnType");
+				if (!_territoryList.containsKey(castleId)) {
+					_territoryList.put(castleId, new Territory(castleId));
+				}
+				switch (spawnType) {
+					case 0: // town npcs
+					case 1: // fortress npcs
+					case 2: // castle npcs
+						_territoryList.get(castleId).getSpawnList().add(new TerritoryNPCSpawn(castleId, loc, npcId, spawnType, null));
+						break;
+					case 3: // ward spawns
+						_territoryList.get(castleId).addWardSpawnPlace(loc);
+						break;
+					default:
+						LOG.warn("Unknown npc type for {}", rs.getInt("id"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("SpawnList error: {}", e.getMessage(), e);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM territories")) {
+			while (rs.next()) {
+				int castleId = rs.getInt("castleId");
+				int fortId = rs.getInt("fortId");
+				String ownedWardIds = rs.getString("OwnedWardIds");
+				
+				Territory t = _territoryList.get(castleId);
+				if (t != null) {
+					t._fortId = fortId;
+					if (CastleManager.getInstance().getCastleById(castleId).getOwnerId() > 0) {
+						t.setOwnerClan(ClanTable.getInstance().getClan(CastleManager.getInstance().getCastleById(castleId).getOwnerId()));
+						t.changeNPCsSpawn(0, true);
+					}
+					
+					if (!ownedWardIds.isEmpty()) {
+						for (String wardId : ownedWardIds.split(";")) {
+							if (Integer.parseInt(wardId) > 0) {
+								addTerritoryWard(Integer.parseInt(wardId), castleId, 0, false);
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Territory list error(): {}", e.getMessage(), e);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM territory_registrations")) {
+			while (rs.next()) {
+				int castleId = rs.getInt("castleId");
+				int registeredId = rs.getInt("registeredId");
+				if (ClanTable.getInstance().getClan(registeredId) != null) {
+					if (_registeredClans.get(castleId) == null) {
+						_registeredClans.putIfAbsent(castleId, new CopyOnWriteArrayList<>());
+					}
+					_registeredClans.get(castleId).add(ClanTable.getInstance().getClan(registeredId));
+				} else {
+					_registeredMercenaries.computeIfAbsent(castleId, _ -> new CopyOnWriteArrayList<>());
+					_registeredMercenaries.get(castleId).add(registeredId);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Registration list error: {}", e.getMessage(), e);
+		}
+	}
+	
+	public void startTerritoryWar() {
+		List<Territory> activeTerritoryList = new LinkedList<>();
+		for (Territory t : _territoryList.values()) {
+			Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
+			if (castle != null) {
+				if (castle.getOwnerId() > 0) {
+					activeTerritoryList.add(t);
+				}
+			} else {
+				LOG.warn("Castle missing! CastleId: {}", t.getCastleId());
+			}
+		}
+		
+		if (activeTerritoryList.size() < 2) {
+			return;
+		}
+		
+		_isTWInProgress = true;
+		if (!updatePlayerTWStateFlags(false)) {
+			return;
+		}
+		
+		// teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town); // Teleport to the closest town
+		for (Territory t : activeTerritoryList) {
+			Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
+			Fort fort = FortManager.getInstance().getFortById(t.getFortId());
+			// spawnControlTower(t.getCastleId()); // Spawn control tower
+			if (castle != null) {
+				t.changeNPCsSpawn(2, true);
+				castle.spawnDoor(); // Spawn door
+				castle.getZone().setSiegeInstance(this);
+				castle.getZone().setIsActive(true);
+				castle.getZone().updateZoneStatusForCharactersInside();
+			} else {
+				LOG.warn("Castle missing! CastleId: {}", t.getCastleId());
+			}
+			if (fort != null) {
+				t.changeNPCsSpawn(1, true);
+				fort.resetDoors(); // Spawn door
+				fort.getZone().setSiegeInstance(this);
+				fort.getZone().setIsActive(true);
+				fort.getZone().updateZoneStatusForCharactersInside();
+			} else {
+				LOG.warn("Fort missing! FortId: {}", t.getFortId());
+			}
+			for (TerritoryNPCSpawn ward : t.getOwnedWard()) {
+				if ((ward.getNpc() != null) && (t.getOwnerClan() != null)) {
+					if (!ward.getNpc().isVisible()) {
+						ward.setNPC(ward.getNpc().getSpawn().doSpawn());
+					}
+					_territoryWards.add(new TerritoryWard(ward.getId(), ward.getLocation().getX(), ward.getLocation().getY(), ward.getLocation().getZ(), 0, ward.getId() + 13479, t.getCastleId(), ward.getNpc()));
+				}
+			}
+			t.getQuestDone()[0] = 0; // killed npc
+			t.getQuestDone()[1] = 0; // captured wards
+		}
+		_participantPoints.clear();
+		
+		if (territoryWar().returnWardsWhenTWStarts()) {
+			for (TerritoryWard ward : _territoryWards) {
+				if (ward.getOwnerCastleId() != (ward.getTerritoryId() - 80)) {
+					ward.unSpawnMe();
+					ward.setNpc(addTerritoryWard(ward.getTerritoryId(), ward.getTerritoryId() - 80, ward.getOwnerCastleId(), false));
+					ward.setOwnerCastleId(ward.getTerritoryId() - 80);
+				}
+			}
+		}
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_HAS_BEGUN);
+		Broadcast.toAllOnlinePlayers(sm);
+	}
+	
+	public void endTerritoryWar() {
+		_isTWInProgress = false;
+		List<Territory> activeTerritoryList = new LinkedList<>();
+		for (Territory t : _territoryList.values()) {
+			Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
+			if (castle != null) {
+				if (castle.getOwnerId() > 0) {
+					activeTerritoryList.add(t);
+				}
+			} else {
+				LOG.warn("Castle missing! CastleId: {}", t.getCastleId());
+			}
+		}
+		
+		if (activeTerritoryList.size() < 2) {
+			return;
+		}
+		
+		if (!updatePlayerTWStateFlags(true)) {
+			return;
+		}
+		
+		for (TerritoryWard twWard : _territoryWards) {
+			twWard.unSpawnMe();
+		}
+		_territoryWards.clear();
+		
+		// teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town); // Teleport to the closest town
+		for (Territory t : activeTerritoryList) {
+			Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
+			Fort fort = FortManager.getInstance().getFortById(t.getFortId());
+			
+			if (castle != null) {
+				castle.spawnDoor();
+				t.changeNPCsSpawn(2, false);
+				castle.getZone().setIsActive(false);
+				castle.getZone().updateZoneStatusForCharactersInside();
+				castle.getZone().setSiegeInstance(null);
+			} else {
+				LOG.warn("Castle missing! CastleId: {}", t.getCastleId());
+			}
+			
+			if (fort != null) {
+				t.changeNPCsSpawn(1, false);
+				fort.getZone().setIsActive(false);
+				fort.getZone().updateZoneStatusForCharactersInside();
+				fort.getZone().setSiegeInstance(null);
+			} else {
+				LOG.warn("Fort missing! FortId: {}", t.getFortId());
+			}
+			
+			if (t.getHQ() != null) {
+				t.getHQ().deleteMe();
+			}
+			
+			for (TerritoryNPCSpawn ward : t.getOwnedWard()) {
+				if (ward.getNpc() != null) {
+					if (!ward.getNpc().isVisible() && territoryWar().spawnWardsWhenTWIsNotInProgress()) {
+						ward.setNPC(ward.getNpc().getSpawn().doSpawn());
+					} else if (ward.getNpc().isVisible() && !territoryWar().spawnWardsWhenTWIsNotInProgress()) {
+						ward.getNpc().decayMe();
+					}
+				}
+			}
+		}
+		for (L2SiegeFlagInstance flag : _clanFlags.values()) {
+			flag.deleteMe();
+		}
+		_clanFlags.clear();
+		
+		for (Integer castleId : _registeredClans.keySet()) {
+			for (L2Clan clan : _registeredClans.get(castleId)) {
+				changeRegistration(castleId, clan.getId(), true);
+			}
+		}
+		for (Integer castleId : _registeredMercenaries.keySet()) {
+			for (Integer pl_objId : _registeredMercenaries.get(castleId)) {
+				changeRegistration(castleId, pl_objId, true);
+			}
+		}
+		// change next TW date
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_HAS_ENDED);
+		Broadcast.toAllOnlinePlayers(sm);
+	}
+	
+	public boolean updatePlayerTWStateFlags(boolean clear) {
+		Quest twQuest = QuestManager.getInstance().getQuest(qn);
+		if (twQuest == null) {
+			LOG.warn("Missing main Quest!");
+			return false;
+		}
+		for (int castleId : _registeredClans.keySet()) {
+			for (L2Clan clan : _registeredClans.get(castleId)) {
+				for (L2PcInstance player : clan.getOnlineMembers(0)) {
+					if (clear) {
+						player.setSiegeState((byte) 0);
+						if (!_isTWChannelOpen) {
+							player.setSiegeSide(0);
+						}
+					} else {
+						if ((player.getLevel() < territoryWar().getPlayerMinLevel()) || (player.getClassId().level() < 2)) {
+							continue;
+						}
+						if (_isTWInProgress) {
+							player.setSiegeState((byte) 1);
+						}
+						player.setSiegeSide(80 + castleId);
+					}
+					player.broadcastUserInfo();
+				}
+			}
+		}
+		for (int castleId : _registeredMercenaries.keySet()) {
+			for (int objId : _registeredMercenaries.get(castleId)) {
+				L2PcInstance player = L2World.getInstance().getPlayer(objId);
+				if (player == null) {
+					continue;
+				}
+				if (clear) {
+					player.setSiegeState((byte) 0);
+					if (!_isTWChannelOpen) {
+						player.setSiegeSide(0);
+					}
+				} else {
+					if (_isTWInProgress) {
+						player.setSiegeState((byte) 1);
+					}
+					player.setSiegeSide(80 + castleId);
+				}
+				player.broadcastUserInfo();
+			}
+		}
+		for (Territory terr : _territoryList.values()) {
+			if (terr.getOwnerClan() != null) {
+				for (L2PcInstance player : terr.getOwnerClan().getOnlineMembers(0)) {
+					if (player == null) {
+						continue;
+					}
+					if (clear) {
+						player.setSiegeState((byte) 0);
+						if (!_isTWChannelOpen) {
+							player.setSiegeSide(0);
+						}
+					} else {
+						if ((player.getLevel() < territoryWar().getPlayerMinLevel()) || (player.getClassId().level() < 2)) {
+							continue;
+						}
+						if (_isTWInProgress) {
+							player.setSiegeState((byte) 1);
+						}
+						player.setSiegeSide(80 + terr.getCastleId());
+					}
+					player.broadcastUserInfo();
+				}
+			}
+		}
+		twQuest.setOnEnterWorld(_isTWInProgress);
+		return true;
+	}
+	
+	protected class RewardOnlineParticipants implements Runnable {
+		@Override
+		public void run() {
+			if (isTWInProgress()) {
+				for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+					if ((player != null) && (player.getSiegeSide() > 0)) {
+						giveTWPoint(player, 1000, 6);
+					}
+				}
+			} else {
+				_scheduledRewardOnlineTask.cancel(false);
+			}
+		}
+	}
+	
+	protected class ScheduleStartTWTask implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(ScheduleStartTWTask.class);
+		
+		@Override
+		public void run() {
+			_scheduledStartTWTask.cancel(false);
+			try {
+				long timeRemaining = _startTWDate.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+				if (timeRemaining > 7200000) {
+					_isRegistrationOver = false;
+					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 7200000); // Prepare task for 2h before TW start to end registration
+				} else if (timeRemaining > 1200000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_REGISTERING_PERIOD_ENDED);
+					Broadcast.toAllOnlinePlayers(sm);
+					_isRegistrationOver = true;
+					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 1200000); // Prepare task for 20 mins left before TW start.
+				} else if (timeRemaining > 600000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_BEGINS_IN_20_MINUTES);
+					Broadcast.toAllOnlinePlayers(sm);
+					_isTWChannelOpen = true;
+					_isRegistrationOver = true;
+					updatePlayerTWStateFlags(false);
+					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 600000); // Prepare task for 10 mins left before TW start.
+				} else if (timeRemaining > 300000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_BEGINS_IN_10_MINUTES);
+					Broadcast.toAllOnlinePlayers(sm);
+					_isTWChannelOpen = true;
+					_isRegistrationOver = true;
+					updatePlayerTWStateFlags(false);
+					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 300000); // Prepare task for 5 mins left before TW start.
+				} else if (timeRemaining > 60000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_BEGINS_IN_5_MINUTES);
+					Broadcast.toAllOnlinePlayers(sm);
+					_isTWChannelOpen = true;
+					_isRegistrationOver = true;
+					updatePlayerTWStateFlags(false);
+					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining - 60000); // Prepare task for 1 min left before TW start.
+				} else if (timeRemaining > 0) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_BEGINS_IN_1_MINUTE);
+					Broadcast.toAllOnlinePlayers(sm);
+					_isTWChannelOpen = true;
+					_isRegistrationOver = true;
+					updatePlayerTWStateFlags(false);
+					_scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), timeRemaining); // Prepare task for TW start.
+				} else if ((timeRemaining + MINUTES.toMillis(territoryWar().getWarLength())) > 0) {
+					_isTWChannelOpen = true;
+					_isRegistrationOver = true;
+					startTerritoryWar();
+					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), 1000); // Prepare task for TW end.
+					_scheduledRewardOnlineTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RewardOnlineParticipants(), 60000, 60000);
+				}
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	private class ScheduleEndTWTask implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(ScheduleEndTWTask.class);
+		
+		protected ScheduleEndTWTask() {
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_scheduledEndTWTask.cancel(false);
+				long timeRemaining = (_startTWDate.getTimeInMillis() + MINUTES.toMillis(territoryWar().getWarLength())) - Calendar.getInstance().getTimeInMillis();
+				if (timeRemaining > 3600000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_HOURS);
+					sm.addInt(2);
+					announceToParticipants(sm, 0, 0);
+					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 3600000); // Prepare task for 1 hr left.
+				} else if (timeRemaining > 600000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES);
+					sm.addInt((int) (timeRemaining / 60000));
+					announceToParticipants(sm, 0, 0);
+					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 600000); // Prepare task for 10 minute left.
+				} else if (timeRemaining > 300000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES);
+					sm.addInt((int) (timeRemaining / 60000));
+					announceToParticipants(sm, 0, 0);
+					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 300000); // Prepare task for 5 minute left.
+				} else if (timeRemaining > 10000) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES);
+					sm.addInt((int) (timeRemaining / 60000));
+					announceToParticipants(sm, 0, 0);
+					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 10000); // Prepare task for 10 seconds count down
+				} else if (timeRemaining > 0) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_TO_THE_END_OF_TERRITORY_WAR);
+					sm.addInt((int) (timeRemaining / 1000));
+					announceToParticipants(sm, 0, 0);
+					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining); // Prepare task for second count down
+				} else {
+					endTerritoryWar();
+					// _scheduledStartTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartTWTask(), 1000);
+					ThreadPoolManager.getInstance().scheduleGeneral(new closeTerritoryChannelTask(), 600000);
+				}
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	private class closeTerritoryChannelTask implements Runnable {
+		public closeTerritoryChannelTask() {
+		}
+		
+		@Override
+		public void run() {
+			_isTWChannelOpen = false;
+			_disguisedPlayers.clear();
+			updatePlayerTWStateFlags(true);
+		}
+	}
+	
+	public void announceToParticipants(L2GameServerPacket sm, int exp, int sp) {
+		// broadcast to clan members
+		for (Territory ter : _territoryList.values()) {
+			if (ter.getOwnerClan() != null) {
+				for (L2PcInstance member : ter.getOwnerClan().getOnlineMembers(0)) {
+					member.sendPacket(sm);
+					if ((exp > 0) || (sp > 0)) {
+						member.addExpAndSp(exp, sp);
+					}
+				}
+			}
+		}
+		for (List<L2Clan> list : _registeredClans.values()) {
+			for (L2Clan c : list) {
+				for (L2PcInstance member : c.getOnlineMembers(0)) {
+					member.sendPacket(sm);
+					if ((exp > 0) || (sp > 0)) {
+						member.addExpAndSp(exp, sp);
+					}
+				}
+			}
+		}
+		// broadcast to mercenaries
+		for (List<Integer> list : _registeredMercenaries.values()) {
+			for (int objId : list) {
+				L2PcInstance player = L2World.getInstance().getPlayer(objId);
+				if ((player != null) && ((player.getClan() == null) || !checkIsRegistered(-1, player.getClan()))) {
+					player.sendPacket(sm);
+					if ((exp > 0) || (sp > 0)) {
+						player.addExpAndSp(exp, sp);
+					}
+				}
+			}
+		}
+	}
+	
+	public static class TerritoryNPCSpawn implements IIdentifiable {
+		private final Location _location;
+		protected int _npcId;
+		private final int _castleId;
+		private final int _type;
+		private L2Npc _npc;
+		
+		public TerritoryNPCSpawn(int castle_id, Location loc, int npc_id, int type, L2Npc npc) {
+			_castleId = castle_id;
+			_location = loc;
+			_npcId = npc_id;
+			_type = type;
+			_npc = npc;
+		}
+		
+		public int getCastleId() {
+			return _castleId;
+		}
+		
+		/**
+		 * Gets the NPC ID.
+		 * @return the NPC ID
+		 */
+		@Override
+		public int getId() {
+			return _npcId;
+		}
+		
+		public int getType() {
+			return _type;
+		}
+		
+		public void setNPC(L2Npc npc) {
+			if (_npc != null) {
+				_npc.deleteMe();
+			}
+			_npc = npc;
+		}
+		
+		public L2Npc getNpc() {
+			return _npc;
+		}
+		
+		public Location getLocation() {
+			return _location;
+		}
+	}
+	
+	public class Territory {
+		private static final Logger LOG = LoggerFactory.getLogger(Territory.class);
+		
+		private final int _territoryId;
+		private final int _castleId; // territory Castle
+		protected int _fortId; // territory Fortress
+		private L2Clan _ownerClan;
+		private final List<TerritoryNPCSpawn> _spawnList = new LinkedList<>();
+		private final TerritoryNPCSpawn[] _territoryWardSpawnPlaces;
+		private boolean _isInProgress = false;
+		private L2SiegeFlagInstance _territoryHQ = null;
+		private final int[] _questDone;
+		
+		public Territory(int castleId) {
+			_castleId = castleId;
+			_territoryId = castleId + 80;
+			_territoryWardSpawnPlaces = new TerritoryNPCSpawn[9];
+			_questDone = new int[2];
+		}
+		
+		protected void addWardSpawnPlace(Location loc) {
+			for (int i = 0; i < _territoryWardSpawnPlaces.length; i++) {
+				if (_territoryWardSpawnPlaces[i] == null) {
+					_territoryWardSpawnPlaces[i] = new TerritoryNPCSpawn(_castleId, loc, 0, 4, null);
+					return;
+				}
+			}
+		}
+		
+		protected TerritoryNPCSpawn getFreeWardSpawnPlace() {
+			for (TerritoryNPCSpawn _territoryWardSpawnPlace : _territoryWardSpawnPlaces) {
+				if ((_territoryWardSpawnPlace != null) && (_territoryWardSpawnPlace.getNpc() == null)) {
+					return _territoryWardSpawnPlace;
+				}
+			}
+			LOG.warn("No free Ward spawn found for territory: {}", _territoryId);
+			for (int i = 0; i < _territoryWardSpawnPlaces.length; i++) {
+				if (_territoryWardSpawnPlaces[i] == null) {
+					LOG.warn("Territory ward spawn place {} is null!", i);
+				} else if (_territoryWardSpawnPlaces[i].getNpc() != null) {
+					LOG.warn("Territory ward spawn place {} has npc name: {}", i, _territoryWardSpawnPlaces[i].getNpc().getName());
+				} else {
+					LOG.warn("Territory ward spawn place {} is empty!", i);
+				}
+			}
+			return null;
+		}
+		
+		public List<TerritoryNPCSpawn> getSpawnList() {
+			return _spawnList;
+		}
+		
+		protected void changeNPCsSpawn(int type, boolean isSpawn) {
+			if ((type < 0) || (type > 3)) {
+				LOG.warn("Wrong type({}) for NPCs spawn change!", type);
+				return;
+			}
+			for (TerritoryNPCSpawn twSpawn : _spawnList) {
+				if (twSpawn.getType() != type) {
+					continue;
+				}
+				if (isSpawn) {
+					twSpawn.setNPC(spawnNPC(twSpawn.getId(), twSpawn.getLocation()));
+				} else {
+					L2Npc npc = twSpawn.getNpc();
+					if ((npc != null) && !npc.isDead()) {
+						npc.deleteMe();
+					}
+					twSpawn.setNPC(null);
+				}
+			}
+		}
+		
+		protected void removeWard(int wardId) {
+			for (TerritoryNPCSpawn wardSpawn : _territoryWardSpawnPlaces) {
+				if (wardSpawn.getId() == wardId) {
+					wardSpawn.getNpc().deleteMe();
+					wardSpawn.setNPC(null);
+					wardSpawn._npcId = 0;
+					return;
+				}
+			}
+			LOG.warn("Can't delete wardId: {} for territory: {}", wardId, _territoryId);
+		}
+		
+		public int getTerritoryId() {
+			return _territoryId;
+		}
+		
+		public int getCastleId() {
+			return _castleId;
+		}
+		
+		public int getFortId() {
+			return _fortId;
+		}
+		
+		public L2Clan getOwnerClan() {
+			return _ownerClan;
+		}
+		
+		public void setOwnerClan(L2Clan newOwner) {
+			_ownerClan = newOwner;
+		}
+		
+		public void setHQ(L2SiegeFlagInstance hq) {
+			_territoryHQ = hq;
+		}
+		
+		public L2SiegeFlagInstance getHQ() {
+			return _territoryHQ;
+		}
+		
+		public TerritoryNPCSpawn[] getOwnedWard() {
+			return _territoryWardSpawnPlaces;
+		}
+		
+		public int[] getQuestDone() {
+			return _questDone;
+		}
+		
+		public List<Integer> getOwnedWardIds() {
+			List<Integer> ret = new LinkedList<>();
+			for (TerritoryNPCSpawn wardSpawn : _territoryWardSpawnPlaces) {
+				if (wardSpawn.getId() > 0) {
+					ret.add(wardSpawn.getId());
+				}
+			}
+			return ret;
+		}
+		
+		public boolean isInProgress() {
+			return _isInProgress;
+		}
+		
+		public void setIsInProgress(boolean val) {
+			_isInProgress = val;
+		}
+	}
+	
+	@Override
+	public void startSiege() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public void endSiege() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public L2SiegeClan getAttackerClan(int clanId) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public L2SiegeClan getAttackerClan(L2Clan clan) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public List<L2SiegeClan> getAttackerClans() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public List<L2PcInstance> getAttackersInZone() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean checkIsAttacker(L2Clan clan) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public L2SiegeClan getDefenderClan(int clanId) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public L2SiegeClan getDefenderClan(L2Clan clan) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public List<L2SiegeClan> getDefenderClans() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean checkIsDefender(L2Clan clan) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public List<L2Npc> getFlag(L2Clan clan) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public Calendar getSiegeDate() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean giveFame() {
+		return true;
+	}
+	
+	@Override
+	public int getFameFrequency() {
+		return (int) character().getCastleZoneFameTaskFrequency();
+	}
+	
+	@Override
+	public int getFameAmount() {
+		return character().getCastleZoneFameAcquirePoints();
+	}
+	
+	@Override
+	public void updateSiege() {
+		
+	}
+	
+	public void declareLord(int territoryId, L2PcInstance player) {
+		// TODO(Zoey76): Implement.
+	}
+	
+	public static TerritoryWarManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final TerritoryWarManager _instance = new TerritoryWarManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/TownManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/TownManager.java
new file mode 100644
index 00000000..f3cf8d2d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/TownManager.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.type.L2TownZone;
+
+public final class TownManager {
+	public static int getTownCastle(int townId) {
+		return switch (townId) {
+			case 912 -> 1;
+			case 916 -> 2;
+			case 918 -> 3;
+			case 922 -> 4;
+			case 924 -> 5;
+			case 926 -> 6;
+			case 1538 -> 7;
+			case 1537 -> 8;
+			case 1714 -> 9;
+			default -> 0;
+		};
+	}
+	
+	public static boolean townHasCastleInSiege(int townId) {
+		int castleIndex = getTownCastle(townId);
+		
+		if (castleIndex > 0) {
+			Castle castle = CastleManager.getInstance().getCastles().get(CastleManager.getInstance().getCastleIndex(castleIndex));
+			if (castle != null) {
+				return castle.getSiege().isInProgress();
+			}
+		}
+		return false;
+	}
+	
+	public static boolean townHasCastleInSiege(int x, int y) {
+		return townHasCastleInSiege(MapRegionManager.getInstance().getMapRegionLocId(x, y));
+	}
+	
+	public static L2TownZone getTown(int townId) {
+		for (L2TownZone temp : ZoneManager.getInstance().getAllZones(L2TownZone.class)) {
+			if (temp.getTownId() == townId) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Returns the town at that position (if any)
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return
+	 */
+	public static L2TownZone getTown(int x, int y, int z) {
+		for (L2ZoneType temp : ZoneManager.getInstance().getZones(x, y, z)) {
+			if (temp instanceof L2TownZone) {
+				return (L2TownZone) temp;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java
new file mode 100644
index 00000000..9105b404
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/WalkingManager.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.instancemanager.tasks.StartMovingTask;
+import com.l2jserver.gameserver.model.L2NpcWalkerNode;
+import com.l2jserver.gameserver.model.L2WalkRoute;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.WalkInfo;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.tasks.npc.walker.ArrivedTask;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveNodeArrived;
+import com.l2jserver.gameserver.model.holders.NpcRoutesHolder;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.util.Broadcast;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class manages walking monsters.
+ * @author GKR
+ */
+public final class WalkingManager implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(WalkingManager.class);
+	
+	// Repeat style:
+	// -1 - no repeat
+	// 0 - go back
+	// 1 - go to first point (circle style)
+	// 2 - teleport to first point (conveyor style)
+	// 3 - random walking between points.
+	public static final byte NO_REPEAT = -1;
+	public static final byte REPEAT_GO_BACK = 0;
+	public static final byte REPEAT_GO_FIRST = 1;
+	public static final byte REPEAT_TELE_FIRST = 2;
+	public static final byte REPEAT_RANDOM = 3;
+	
+	private final Map<String, L2WalkRoute> _routes = new HashMap<>(); // all available routes
+	private final Map<Integer, WalkInfo> _activeRoutes = new HashMap<>(); // each record represents NPC, moving by predefined route from _routes, and moving progress
+	private final Map<Integer, NpcRoutesHolder> _routesToAttach = new HashMap<>(); // each record represents NPC and all available routes for it
+	
+	protected WalkingManager() {
+		load();
+	}
+	
+	@Override
+	public void load() {
+		parseDatapackFile("data/Routes.xml");
+		LOG.info("Loaded {} walking routes.", _routes.size());
+	}
+	
+	@Override
+	public void parseDocument(Document doc) {
+		Node n = doc.getFirstChild();
+		for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+			if (d.getNodeName().equals("route")) {
+				final String routeName = parseString(d.getAttributes(), "name");
+				boolean repeat = parseBoolean(d.getAttributes(), "repeat");
+				final String repeatStyle = d.getAttributes().getNamedItem("repeatStyle").getNodeValue().toLowerCase();
+				
+				final byte repeatType;
+				switch (repeatStyle) {
+					case "back" -> repeatType = REPEAT_GO_BACK;
+					case "cycle" -> repeatType = REPEAT_GO_FIRST;
+					case "conveyor" -> repeatType = REPEAT_TELE_FIRST;
+					case "random" -> repeatType = REPEAT_RANDOM;
+					default -> repeatType = NO_REPEAT;
+				}
+				
+				final List<L2NpcWalkerNode> list = new ArrayList<>();
+				for (Node r = d.getFirstChild(); r != null; r = r.getNextSibling()) {
+					if (r.getNodeName().equals("point")) {
+						NamedNodeMap attrs = r.getAttributes();
+						int x = parseInteger(attrs, "X");
+						int y = parseInteger(attrs, "Y");
+						int z = parseInteger(attrs, "Z");
+						int delay = parseInteger(attrs, "delay");
+						boolean run = parseBoolean(attrs, "run");
+						NpcStringId npcString = null;
+						String chatString = null;
+						
+						Node node = attrs.getNamedItem("string");
+						if (node != null) {
+							chatString = node.getNodeValue();
+						} else {
+							node = attrs.getNamedItem("npcString");
+							if (node != null) {
+								npcString = NpcStringId.getNpcStringId(node.getNodeValue());
+								if (npcString == null) {
+									LOG.warn("Unknown NPC String {} for route {}!", node.getNodeValue(), routeName);
+									continue;
+								}
+							} else {
+								node = attrs.getNamedItem("npcStringId");
+								if (node != null) {
+									npcString = NpcStringId.getNpcStringId(Integer.parseInt(node.getNodeValue()));
+								}
+							}
+						}
+						list.add(new L2NpcWalkerNode(x, y, z, delay, run, npcString, chatString));
+					}
+					
+					else if (r.getNodeName().equals("target")) {
+						NamedNodeMap attrs = r.getAttributes();
+						try {
+							int npcId = Integer.parseInt(attrs.getNamedItem("id").getNodeValue());
+							int x = Integer.parseInt(attrs.getNamedItem("spawnX").getNodeValue());
+							int y = Integer.parseInt(attrs.getNamedItem("spawnY").getNodeValue());
+							int z = Integer.parseInt(attrs.getNamedItem("spawnZ").getNodeValue());
+							
+							NpcRoutesHolder holder = _routesToAttach.containsKey(npcId) ? _routesToAttach.get(npcId) : new NpcRoutesHolder();
+							holder.addRoute(routeName, new Location(x, y, z));
+							_routesToAttach.put(npcId, holder);
+						} catch (Exception e) {
+							LOG.warn("Error in target definition for route {}!", routeName);
+						}
+					}
+				}
+				_routes.put(routeName, new L2WalkRoute(routeName, list, repeat, false, repeatType));
+			}
+		}
+	}
+	
+	/**
+	 * @param npc NPC to check
+	 * @return {@code true} if given NPC, or its leader is controlled by Walking Manager and moves currently.
+	 */
+	public boolean isOnWalk(L2Npc npc) {
+		L2MonsterInstance monster = null;
+		
+		if (npc.isMonster()) {
+			if (((L2MonsterInstance) npc).getLeader() == null) {
+				monster = (L2MonsterInstance) npc;
+			} else {
+				monster = ((L2MonsterInstance) npc).getLeader();
+			}
+		}
+		
+		if (((monster != null) && !isRegistered(monster)) || !isRegistered(npc)) {
+			return false;
+		}
+		
+		final WalkInfo walk = monster != null ? _activeRoutes.get(monster.getObjectId()) : _activeRoutes.get(npc.getObjectId());
+		return !walk.isStoppedByAttack() && !walk.isSuspended();
+	}
+	
+	public L2WalkRoute getRoute(String route) {
+		return _routes.get(route);
+	}
+	
+	/**
+	 * @param npc NPC to check
+	 * @return {@code true} if given NPC controlled by Walking Manager.
+	 */
+	public boolean isRegistered(L2Npc npc) {
+		return _activeRoutes.containsKey(npc.getObjectId());
+	}
+	
+	/**
+	 * @param npc
+	 * @return name of route
+	 */
+	public String getRouteName(L2Npc npc) {
+		return _activeRoutes.containsKey(npc.getObjectId()) ? _activeRoutes.get(npc.getObjectId()).getRoute().getName() : "";
+	}
+	
+	/**
+	 * Start to move given NPC by given route
+	 * @param npc NPC to move
+	 * @param routeName name of route to move by
+	 */
+	public void startMoving(final L2Npc npc, final String routeName) {
+		if (_routes.containsKey(routeName) && (npc != null) && !npc.isDead()) // check, if these route and NPC present
+		{
+			if (!_activeRoutes.containsKey(npc.getObjectId())) // new walk task
+			{
+				// only if not already moved / not engaged in battle... should not happens if called on spawn
+				if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)) {
+					final WalkInfo walk = new WalkInfo(routeName);
+					
+					if (npc.isDebug()) {
+						walk.setLastAction(System.currentTimeMillis());
+					}
+					
+					L2NpcWalkerNode node = walk.getCurrentNode();
+					
+					// adjust next waypoint, if NPC spawns at first waypoint
+					if ((npc.getX() == node.getX()) && (npc.getY() == node.getY())) {
+						walk.calculateNextNode(npc);
+						node = walk.getCurrentNode();
+						npc.sendDebugMessage("Route '" + routeName + "': spawn point is same with first waypoint, adjusted to next");
+					}
+					
+					if (!npc.isInsideRadius(node, 3000, true, false)) {
+						final String message = "Route '" + routeName + "': NPC (id=" + npc.getId() + ", x=" + npc.getX() + ", y=" + npc.getY() + ", z=" + npc.getZ() + ") is too far from starting point (node x=" + node.getX() + ", y=" + node.getY() + ", z=" + node.getZ() + ", range="
+							+ npc.calculateDistance(node, true, true) + "), walking will not start!";
+						LOG.warn(message);
+						npc.sendDebugMessage(message);
+						return;
+					}
+					
+					npc.sendDebugMessage("Starting to move at route '" + routeName + "'");
+					npc.setIsRunning(node.runToLocation());
+					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node);
+					walk.setWalkCheckTask(ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new StartMovingTask(npc, routeName), 60000, 60000)); // start walk check task, for resuming walk after fight
+					
+					npc.getKnownList().startTrackingTask();
+					
+					_activeRoutes.put(npc.getObjectId(), walk); // register route
+				} else {
+					npc.sendDebugMessage("Failed to start moving along route '" + routeName + "', scheduled");
+					ThreadPoolManager.getInstance().scheduleGeneral(new StartMovingTask(npc, routeName), 60000);
+				}
+			} else
+			// walk was stopped due to some reason (arrived to node, script action, fight or something else), resume it
+			{
+				if (_activeRoutes.containsKey(npc.getObjectId()) && ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) || (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE))) {
+					final WalkInfo walk = _activeRoutes.get(npc.getObjectId());
+					if (walk == null) {
+						return;
+					}
+					
+					// Prevent call simultaneously from scheduled task and onArrived() or temporarily stop walking for resuming in future
+					if (walk.isBlocked() || walk.isSuspended()) {
+						npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (operation is blocked)");
+						return;
+					}
+					
+					walk.setBlocked(true);
+					final L2NpcWalkerNode node = walk.getCurrentNode();
+					npc.sendDebugMessage("Route '" + routeName + "', continuing to node " + walk.getCurrentNodeId());
+					npc.setIsRunning(node.runToLocation());
+					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, node);
+					walk.setBlocked(false);
+					walk.setStoppedByAttack(false);
+				} else {
+					npc.sendDebugMessage("Failed to continue moving along route '" + routeName + "' (wrong AI state - " + npc.getAI().getIntention() + ")");
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Cancel NPC moving permanently
+	 * @param npc NPC to cancel
+	 */
+	public synchronized void cancelMoving(L2Npc npc) {
+		final WalkInfo walk = _activeRoutes.remove(npc.getObjectId());
+		if (walk != null) {
+			walk.getWalkCheckTask().cancel(true);
+			npc.getKnownList().stopTrackingTask();
+		}
+	}
+	
+	/**
+	 * Resumes previously stopped moving
+	 * @param npc NPC to resume
+	 */
+	public void resumeMoving(final L2Npc npc) {
+		final WalkInfo walk = _activeRoutes.get(npc.getObjectId());
+		if (walk != null) {
+			walk.setSuspended(false);
+			walk.setStoppedByAttack(false);
+			startMoving(npc, walk.getRoute().getName());
+		}
+	}
+	
+	/**
+	 * Pause NPC moving until it will be resumed
+	 * @param npc NPC to pause moving
+	 * @param suspend {@code true} if moving was temporarily suspended for some reasons of AI-controlling script
+	 * @param stoppedByAttack {@code true} if moving was suspended because of NPC was attacked or desired to attack
+	 */
+	public void stopMoving(L2Npc npc, boolean suspend, boolean stoppedByAttack) {
+		L2MonsterInstance monster = null;
+		
+		if (npc.isMonster()) {
+			if (((L2MonsterInstance) npc).getLeader() == null) {
+				monster = (L2MonsterInstance) npc;
+			} else {
+				monster = ((L2MonsterInstance) npc).getLeader();
+			}
+		}
+		
+		if (((monster != null) && !isRegistered(monster)) || !isRegistered(npc)) {
+			return;
+		}
+		
+		final WalkInfo walk = monster != null ? _activeRoutes.get(monster.getObjectId()) : _activeRoutes.get(npc.getObjectId());
+		
+		walk.setSuspended(suspend);
+		walk.setStoppedByAttack(stoppedByAttack);
+		
+		if (monster != null) {
+			monster.stopMove(null);
+			monster.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		} else {
+			npc.stopMove(null);
+			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		}
+	}
+	
+	/**
+	 * Manage "node arriving"-related tasks: schedule move to next node; send ON_NODE_ARRIVED event to Quest script
+	 * @param npc NPC to manage
+	 */
+	public void onArrived(final L2Npc npc) {
+		if (_activeRoutes.containsKey(npc.getObjectId())) {
+			// Notify quest
+			EventDispatcher.getInstance().notifyEventAsync(new NpcMoveNodeArrived(npc), npc);
+			
+			final WalkInfo walk = _activeRoutes.get(npc.getObjectId());
+			
+			// Opposite should not happen... but happens sometime
+			if ((walk.getCurrentNodeId() >= 0) && (walk.getCurrentNodeId() < walk.getRoute().getNodesCount())) {
+				final L2NpcWalkerNode node = walk.getRoute().getNodeList().get(walk.getCurrentNodeId());
+				if (npc.isInsideRadius(node, 10, false, false)) {
+					npc.sendDebugMessage("Route '" + walk.getRoute().getName() + "', arrived to node " + walk.getCurrentNodeId());
+					npc.sendDebugMessage("Done in " + ((System.currentTimeMillis() - walk.getLastAction()) / 1000) + " s");
+					walk.calculateNextNode(npc);
+					walk.setBlocked(true); // prevents to be ran from walk check task, if there is delay in this node.
+					
+					if (node.getNpcString() != null) {
+						Broadcast.toKnownPlayers(npc, new NpcSay(npc, Say2.NPC_ALL, node.getNpcString()));
+					} else if (!node.getChatText().isEmpty()) {
+						Broadcast.toKnownPlayers(npc, new NpcSay(npc, Say2.NPC_ALL, node.getChatText()));
+					}
+					
+					if (npc.isDebug()) {
+						walk.setLastAction(System.currentTimeMillis());
+					}
+					ThreadPoolManager.getInstance().scheduleGeneral(new ArrivedTask(npc, walk), 100 + (node.getDelay() * 1000L));
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Manage "on death"-related tasks: permanently cancel moving of died NPC
+	 * @param npc NPC to manage
+	 */
+	public void onDeath(L2Npc npc) {
+		cancelMoving(npc);
+	}
+	
+	/**
+	 * Manage "on spawn"-related tasks: start NPC moving, if there is route attached to its spawn point
+	 * @param npc NPC to manage
+	 */
+	public void onSpawn(L2Npc npc) {
+		if (_routesToAttach.containsKey(npc.getId())) {
+			final String routeName = _routesToAttach.get(npc.getId()).getRouteName(npc);
+			if (!routeName.isEmpty()) {
+				startMoving(npc, routeName);
+			}
+		}
+	}
+	
+	public static WalkingManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final WalkingManager INSTANCE = new WalkingManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java b/src/main/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java
new file mode 100644
index 00000000..94108944
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java
@@ -0,0 +1,631 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager;
+
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneForm;
+import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.form.ZoneCuboid;
+import com.l2jserver.gameserver.model.zone.form.ZoneCylinder;
+import com.l2jserver.gameserver.model.zone.form.ZoneNPoly;
+import com.l2jserver.gameserver.model.zone.type.L2ArenaZone;
+import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
+import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
+import com.l2jserver.gameserver.model.zone.type.NpcSpawnTerritory;
+import com.l2jserver.gameserver.util.IXmlReader;
+
+/**
+ * This class manages the zones
+ * @author durgus
+ */
+public final class ZoneManager implements IXmlReader {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ZoneManager.class);
+	
+	private static final Map<String, AbstractZoneSettings> _settings = new HashMap<>();
+	
+	private final Map<Class<? extends L2ZoneType>, Map<Integer, ? extends L2ZoneType>> _classZones = new HashMap<>();
+	
+	private final Map<String, NpcSpawnTerritory> _spawnTerritories = new HashMap<>();
+	
+	private int _lastDynamicId = 300000;
+	
+	private List<L2ItemInstance> _debugItems;
+	
+	protected ZoneManager() {
+		load();
+	}
+	
+	public void reload() {
+		// Get the world regions
+		int count = 0;
+		final L2WorldRegion[][] worldRegions = L2World.getInstance().getWorldRegions();
+		
+		// Backup old zone settings
+		for (Map<Integer, ? extends L2ZoneType> map : _classZones.values()) {
+			for (L2ZoneType zone : map.values()) {
+				if (zone.getSettings() != null) {
+					_settings.put(zone.getName(), zone.getSettings());
+				}
+			}
+		}
+		
+		// Clear zones
+		for (L2WorldRegion[] worldRegion : worldRegions) {
+			for (L2WorldRegion element : worldRegion) {
+				element.getZones().clear();
+				count++;
+			}
+		}
+		
+		GrandBossManager.getInstance().getZones().clear();
+		LOG.info("Removed zones in {} regions.", count);
+		
+		// Load the zones
+		load();
+		
+		// Re-validate all characters in zones
+		for (L2Object obj : L2World.getInstance().getVisibleObjects()) {
+			if (obj instanceof L2Character) {
+				((L2Character) obj).revalidateZone(true);
+			}
+		}
+		_settings.clear();
+	}
+	
+	@Override
+	public void parseDocument(Document doc, File f) {
+		// Get the world regions
+		final L2WorldRegion[][] worldRegions = L2World.getInstance().getWorldRegions();
+		NamedNodeMap attrs;
+		Node attribute;
+		String zoneName;
+		int[][] coords;
+		int zoneId, minZ, maxZ;
+		String zoneType, zoneShape;
+		final List<int[]> rs = new ArrayList<>();
+		
+		for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+			if ("list".equalsIgnoreCase(n.getNodeName())) {
+				attrs = n.getAttributes();
+				attribute = attrs.getNamedItem("enabled");
+				if ((attribute != null) && !Boolean.parseBoolean(attribute.getNodeValue())) {
+					continue;
+				}
+				
+				for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+					if ("zone".equalsIgnoreCase(d.getNodeName())) {
+						attrs = d.getAttributes();
+						
+						attribute = attrs.getNamedItem("type");
+						if (attribute != null) {
+							zoneType = attribute.getNodeValue();
+						} else {
+							LOG.warn("Missing type for zone in file {}!", f);
+							continue;
+						}
+						
+						attribute = attrs.getNamedItem("id");
+						if (attribute != null) {
+							zoneId = Integer.parseInt(attribute.getNodeValue());
+						} else {
+							zoneId = zoneType.equalsIgnoreCase("NpcSpawnTerritory") ? 0 : _lastDynamicId++;
+						}
+						
+						attribute = attrs.getNamedItem("name");
+						if (attribute != null) {
+							zoneName = attribute.getNodeValue();
+						} else {
+							zoneName = null;
+						}
+						
+						// Check zone name for NpcSpawnTerritory. Must exist and to be unique
+						if (zoneType.equalsIgnoreCase("NpcSpawnTerritory")) {
+							if (zoneName == null) {
+								LOG.warn("Missing name for NpcSpawnTerritory in file: {}, skipping zone!", f);
+								continue;
+							} else if (_spawnTerritories.containsKey(zoneName)) {
+								LOG.warn("Name {} already used for another zone, check file {}, skipping zone!", zoneName, f);
+								continue;
+							}
+						}
+						
+						minZ = parseInteger(attrs, "minZ");
+						maxZ = parseInteger(attrs, "maxZ");
+						
+						zoneType = parseString(attrs, "type");
+						zoneShape = parseString(attrs, "shape");
+						
+						// Get the zone shape from xml
+						L2ZoneForm zoneForm = null;
+						try {
+							for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+								if ("node".equalsIgnoreCase(cd.getNodeName())) {
+									attrs = cd.getAttributes();
+									int[] point = new int[2];
+									point[0] = parseInteger(attrs, "X");
+									point[1] = parseInteger(attrs, "Y");
+									rs.add(point);
+								}
+							}
+							
+							coords = rs.toArray(new int[rs.size()][2]);
+							rs.clear();
+							
+							if (coords.length == 0) {
+								LOG.warn("Missing data for zone {} XML file {}!", zoneId, f);
+								continue;
+							}
+							
+							// Create this zone. Parsing for cuboids is a bit different than for other polygons cuboids need exactly 2 points to be defined.
+							// Other polygons need at least 3 (one per vertex)
+							if (zoneShape.equalsIgnoreCase("Cuboid")) {
+								if (coords.length == 2) {
+									zoneForm = new ZoneCuboid(coords[0][0], coords[1][0], coords[0][1], coords[1][1], minZ, maxZ);
+								} else {
+									LOG.warn("Missing cuboid vertex in SQL data for zone {} in file {}!", zoneId, f);
+									continue;
+								}
+							} else if (zoneShape.equalsIgnoreCase("NPoly")) {
+								// nPoly needs to have at least 3 vertices
+								if (coords.length > 2) {
+									final int[] aX = new int[coords.length];
+									final int[] aY = new int[coords.length];
+									for (int i = 0; i < coords.length; i++) {
+										aX[i] = coords[i][0];
+										aY[i] = coords[i][1];
+									}
+									zoneForm = new ZoneNPoly(aX, aY, minZ, maxZ);
+								} else {
+									LOG.warn("Bad data for zone {} in file {}!", zoneId, f);
+									continue;
+								}
+							} else if (zoneShape.equalsIgnoreCase("Cylinder")) {
+								// A Cylinder zone requires a center point
+								// at x,y and a radius
+								attrs = d.getAttributes();
+								final int zoneRad = Integer.parseInt(attrs.getNamedItem("rad").getNodeValue());
+								if ((coords.length == 1) && (zoneRad > 0)) {
+									zoneForm = new ZoneCylinder(coords[0][0], coords[0][1], minZ, maxZ, zoneRad);
+								} else {
+									LOG.warn("Bad data for zone {} in file {}!", zoneId, f);
+									continue;
+								}
+							} else {
+								LOG.warn("Unknown shape: {} for zone {} in file {}!", zoneShape, zoneId, f);
+								continue;
+							}
+						} catch (Exception e) {
+							LOG.warn("Failed to load zone {} coordinates!", zoneId, e);
+						}
+						
+						// No further parameters needed, if NpcSpawnTerritory is loading
+						if (zoneType.equalsIgnoreCase("NpcSpawnTerritory")) {
+							_spawnTerritories.put(zoneName, new NpcSpawnTerritory(zoneName, zoneForm));
+							continue;
+						}
+						
+						// Create the zone
+						Class<?> newZone;
+						Constructor<?> zoneConstructor;
+						L2ZoneType temp;
+						try {
+							newZone = Class.forName("com.l2jserver.gameserver.model.zone.type.L2" + zoneType);
+							zoneConstructor = newZone.getConstructor(int.class);
+							temp = (L2ZoneType) zoneConstructor.newInstance(zoneId);
+							temp.setZone(zoneForm);
+						} catch (Exception e) {
+							LOG.warn("No such zone type {} in file {}!", zoneType, f);
+							continue;
+						}
+						
+						// Check for additional parameters
+						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling()) {
+							if ("stat".equalsIgnoreCase(cd.getNodeName())) {
+								attrs = cd.getAttributes();
+								String name = attrs.getNamedItem("name").getNodeValue();
+								String val = attrs.getNamedItem("val").getNodeValue();
+								
+								temp.setParameter(name, val);
+							} else if ("spawn".equalsIgnoreCase(cd.getNodeName()) && (temp instanceof L2ZoneRespawn)) {
+								attrs = cd.getAttributes();
+								int spawnX = Integer.parseInt(attrs.getNamedItem("X").getNodeValue());
+								int spawnY = Integer.parseInt(attrs.getNamedItem("Y").getNodeValue());
+								int spawnZ = Integer.parseInt(attrs.getNamedItem("Z").getNodeValue());
+								Node val = attrs.getNamedItem("type");
+								((L2ZoneRespawn) temp).parseLoc(spawnX, spawnY, spawnZ, val == null ? null : val.getNodeValue());
+							} else if ("race".equalsIgnoreCase(cd.getNodeName()) && (temp instanceof L2RespawnZone)) {
+								attrs = cd.getAttributes();
+								String race = attrs.getNamedItem("name").getNodeValue();
+								String point = attrs.getNamedItem("point").getNodeValue();
+								
+								((L2RespawnZone) temp).addRaceRespawnPoint(race, point);
+							}
+						}
+						
+						if (checkId(zoneId)) {
+							LOG.debug("Caution: Zone ({}) from file {} overrides previous definition.", zoneId, f);
+						}
+						
+						if ((zoneName != null) && !zoneName.isEmpty()) {
+							temp.setName(zoneName);
+						}
+						
+						addZone(zoneId, temp);
+						
+						// Register the zone into any world region it intersects with...
+						final var boundingBox = temp.getZone().getBoundingBox();
+						final var bottomLeftRegion = L2World.getInstance().getRegion((int) boundingBox.getMinX(), (int) boundingBox.getMinY());
+						final var topRightRegion = L2World.getInstance().getRegion((int) boundingBox.getMaxX(), (int) boundingBox.getMaxY());
+						
+						int ax, ay, bx, by;
+						for (int x = bottomLeftRegion.getTileX(); x <= topRightRegion.getTileX(); x++) {
+							for (int y = bottomLeftRegion.getTileY(); y <= topRightRegion.getTileY(); y++) {
+								ax = (x - L2World.OFFSET_X) << L2World.SHIFT_BY;
+								bx = ((x + 1) - L2World.OFFSET_X) << L2World.SHIFT_BY;
+								ay = (y - L2World.OFFSET_Y) << L2World.SHIFT_BY;
+								by = ((y + 1) - L2World.OFFSET_Y) << L2World.SHIFT_BY;
+								
+								if (temp.getZone().intersectsRectangle(ax, bx, ay, by)) {
+									worldRegions[x][y].addZone(temp);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void load() {
+		final var start = System.currentTimeMillis();
+		_classZones.clear();
+		_spawnTerritories.clear();
+		parseDatapackDirectory("data/zones", false);
+		final var endZones = System.currentTimeMillis();
+		LOG.info("Loaded {} zone classes and {} zones in {}ms.", _classZones.size(), getSize(), endZones - start);
+		parseDatapackDirectory("data/zones/npcSpawnTerritories", false);
+		LOG.info("Loaded {} NPC spawn territories in {}ms.", _spawnTerritories.size(), System.currentTimeMillis() - endZones);
+	}
+	
+	/**
+	 * Gets the size.
+	 * @return the size
+	 */
+	public int getSize() {
+		int i = 0;
+		for (Map<Integer, ? extends L2ZoneType> map : _classZones.values()) {
+			i += map.size();
+		}
+		return i;
+	}
+	
+	/**
+	 * Check id.
+	 * @param id the id
+	 * @return true, if successful
+	 */
+	public boolean checkId(int id) {
+		for (Map<Integer, ? extends L2ZoneType> map : _classZones.values()) {
+			if (map.containsKey(id)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Add new zone.
+	 * @param <T> the generic type
+	 * @param id the id
+	 * @param zone the zone
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends L2ZoneType> void addZone(Integer id, T zone) {
+		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
+		if (map == null) {
+			map = new HashMap<>();
+			map.put(id, zone);
+			_classZones.put(zone.getClass(), map);
+		} else {
+			map.put(id, zone);
+		}
+	}
+	
+	/**
+	 * Returns all zones registered with the ZoneManager. To minimize iteration processing retrieve zones from L2WorldRegion for a specific location instead.
+	 * @return zones
+	 * @see #getAllZones(Class)
+	 */
+	@Deprecated
+	public Collection<L2ZoneType> getAllZones() {
+		final List<L2ZoneType> zones = new ArrayList<>();
+		for (Map<Integer, ? extends L2ZoneType> map : _classZones.values()) {
+			zones.addAll(map.values());
+		}
+		return zones;
+	}
+	
+	/**
+	 * Return all zones by class type.
+	 * @param <T> the generic type
+	 * @param zoneType Zone class
+	 * @return Collection of zones
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends L2ZoneType> Collection<T> getAllZones(Class<T> zoneType) {
+		return (Collection<T>) _classZones.get(zoneType).values();
+	}
+	
+	/**
+	 * Get zone by ID.
+	 * @param id the id
+	 * @return the zone by id
+	 * @see #getZoneById(int, Class)
+	 */
+	public L2ZoneType getZoneById(int id) {
+		for (Map<Integer, ? extends L2ZoneType> map : _classZones.values()) {
+			if (map.containsKey(id)) {
+				return map.get(id);
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Get zone by ID and zone class.
+	 * @param <T> the generic type
+	 * @param id the id
+	 * @param zoneType the zone type
+	 * @return zone
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends L2ZoneType> T getZoneById(int id, Class<T> zoneType) {
+		return (T) _classZones.get(zoneType).get(id);
+	}
+	
+	/**
+	 * Returns all zones from where the object is located.
+	 * @param object the object
+	 * @return zones
+	 */
+	public List<L2ZoneType> getZones(L2Object object) {
+		return getZones(object.getX(), object.getY(), object.getZ());
+	}
+	
+	/**
+	 * Gets the zone.
+	 * @param <T> the generic type
+	 * @param object the object
+	 * @param type the type
+	 * @return zone from where the object is located by type
+	 */
+	public <T extends L2ZoneType> T getZone(L2Object object, Class<T> type) {
+		if (object == null) {
+			return null;
+		}
+		return getZone(object.getX(), object.getY(), object.getZ(), type);
+	}
+	
+	/**
+	 * Returns all zones from given coordinates (plane).
+	 * @param x the x
+	 * @param y the y
+	 * @return zones
+	 */
+	public List<L2ZoneType> getZones(int x, int y) {
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y);
+		final List<L2ZoneType> temp = new ArrayList<>();
+		for (L2ZoneType zone : region.getZones()) {
+			if (zone.isInsideZone(x, y)) {
+				temp.add(zone);
+			}
+		}
+		return temp;
+	}
+	
+	/**
+	 * Returns all zones from given coordinates.
+	 * @param x the x
+	 * @param y the y
+	 * @param z the z
+	 * @return zones
+	 */
+	public List<L2ZoneType> getZones(int x, int y, int z) {
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y);
+		final List<L2ZoneType> temp = new ArrayList<>();
+		for (L2ZoneType zone : region.getZones()) {
+			if (zone.isInsideZone(x, y, z)) {
+				temp.add(zone);
+			}
+		}
+		return temp;
+	}
+	
+	/**
+	 * Gets the zone.
+	 * @param <T> the generic type
+	 * @param x the x
+	 * @param y the y
+	 * @param z the z
+	 * @param type the type
+	 * @return zone from given coordinates
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends L2ZoneType> T getZone(int x, int y, int z, Class<T> type) {
+		final L2WorldRegion region = L2World.getInstance().getRegion(x, y);
+		for (L2ZoneType zone : region.getZones()) {
+			if (zone.isInsideZone(x, y, z) && type.isInstance(zone)) {
+				return (T) zone;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Get spawm territory by name
+	 * @param name name of territory to search
+	 * @return link to zone form
+	 */
+	public NpcSpawnTerritory getSpawnTerritory(String name) {
+		return _spawnTerritories.get(name);
+	}
+	
+	/**
+	 * Returns all spawm territories from where the object is located
+	 * @param object
+	 * @return zones
+	 */
+	public List<NpcSpawnTerritory> getSpawnTerritories(L2Object object) {
+		List<NpcSpawnTerritory> temp = new ArrayList<>();
+		for (NpcSpawnTerritory territory : _spawnTerritories.values()) {
+			if (territory.isInsideZone(object.getX(), object.getY(), object.getZ())) {
+				temp.add(territory);
+			}
+		}
+		
+		return temp;
+	}
+	
+	/**
+	 * Gets the arena.
+	 * @param character the character
+	 * @return the arena
+	 */
+	public L2ArenaZone getArena(L2Character character) {
+		if (character == null) {
+			return null;
+		}
+		
+		for (L2ZoneType temp : ZoneManager.getInstance().getZones(character.getX(), character.getY(), character.getZ())) {
+			if ((temp instanceof L2ArenaZone) && temp.isCharacterInZone(character)) {
+				return ((L2ArenaZone) temp);
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Gets the olympiad stadium.
+	 * @param character the character
+	 * @return the olympiad stadium
+	 */
+	public L2OlympiadStadiumZone getOlympiadStadium(L2Character character) {
+		if (character == null) {
+			return null;
+		}
+		
+		for (L2ZoneType temp : ZoneManager.getInstance().getZones(character.getX(), character.getY(), character.getZ())) {
+			if ((temp instanceof L2OlympiadStadiumZone) && temp.isCharacterInZone(character)) {
+				return ((L2OlympiadStadiumZone) temp);
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * For testing purposes only.
+	 * @param <T> the generic type
+	 * @param obj the obj
+	 * @param type the type
+	 * @return the closest zone
+	 */
+	@SuppressWarnings("unchecked")
+	public <T extends L2ZoneType> T getClosestZone(L2Object obj, Class<T> type) {
+		T zone = getZone(obj, type);
+		if (zone == null) {
+			double closestdis = Double.MAX_VALUE;
+			for (T temp : (Collection<T>) _classZones.get(type).values()) {
+				double distance = temp.getDistanceToZone(obj);
+				if (distance < closestdis) {
+					closestdis = distance;
+					zone = temp;
+				}
+			}
+		}
+		return zone;
+	}
+	
+	/**
+	 * General storage for debug items used for visualizing zones.
+	 * @return list of items
+	 */
+	public List<L2ItemInstance> getDebugItems() {
+		if (_debugItems == null) {
+			_debugItems = new ArrayList<>();
+		}
+		return _debugItems;
+	}
+	
+	/**
+	 * Remove all debug items from l2world.
+	 */
+	public void clearDebugItems() {
+		if (_debugItems != null) {
+			final Iterator<L2ItemInstance> it = _debugItems.iterator();
+			while (it.hasNext()) {
+				final L2ItemInstance item = it.next();
+				if (item != null) {
+					item.decayMe();
+				}
+				it.remove();
+			}
+		}
+	}
+	
+	/**
+	 * Gets the settings.
+	 * @param name the name
+	 * @return the settings
+	 */
+	public static AbstractZoneSettings getSettings(String name) {
+		return _settings.get(name);
+	}
+	
+	public static ZoneManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ZoneManager INSTANCE = new ZoneManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java b/src/main/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java
new file mode 100644
index 00000000..d0d6b3f5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java
@@ -0,0 +1,468 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.games;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+public class Lottery {
+	protected static final Logger LOG = LoggerFactory.getLogger(Lottery.class);
+	
+	public static final long SECOND = 1000;
+	public static final long MINUTE = 60000;
+	
+	private static final String INSERT_LOTTERY = "INSERT INTO games(id, idnr, enddate, prize, newprize) VALUES (?, ?, ?, ?, ?)";
+	private static final String UPDATE_PRICE = "UPDATE games SET prize=?, newprize=? WHERE id = 1 AND idnr = ?";
+	private static final String UPDATE_LOTTERY = "UPDATE games SET finished=1, prize=?, newprize=?, number1=?, number2=?, prize1=?, prize2=?, prize3=? WHERE id=1 AND idnr=?";
+	private static final String SELECT_LAST_LOTTERY = "SELECT idnr, prize, newprize, enddate, finished FROM games WHERE id = 1 ORDER BY idnr DESC LIMIT 1";
+	private static final String SELECT_LOTTERY_ITEM = "SELECT enchant_level, custom_type2 FROM items WHERE item_id = 4442 AND custom_type1 = ?";
+	private static final String SELECT_LOTTERY_TICKET = "SELECT number1, number2, prize1, prize2, prize3 FROM games WHERE id = 1 and idnr = ?";
+	
+	private int _number;
+	private long _prize;
+	private boolean _isSellingTickets;
+	private boolean _isStarted;
+	private long _enddate;
+	
+	protected Lottery() {
+		_number = 1;
+		_prize = general().getLotteryPrize();
+		_isSellingTickets = false;
+		_isStarted = false;
+		_enddate = System.currentTimeMillis();
+		
+		if (general().allowLottery()) {
+			(new StartLottery()).run();
+		}
+	}
+	
+	public static Lottery getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	public int getId() {
+		return _number;
+	}
+	
+	public long getPrize() {
+		return _prize;
+	}
+	
+	public long getEndDate() {
+		return _enddate;
+	}
+	
+	public void increasePrize(long count) {
+		_prize += count;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_PRICE)) {
+			ps.setLong(1, getPrize());
+			ps.setLong(2, getPrize());
+			ps.setInt(3, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not increase current lottery prize: {}", e.getMessage(), e);
+		}
+	}
+	
+	public boolean isSellableTickets() {
+		return _isSellingTickets;
+	}
+	
+	public boolean isStarted() {
+		return _isStarted;
+	}
+	
+	private class StartLottery implements Runnable {
+		protected StartLottery() {
+			// Do nothing
+		}
+		
+		@Override
+		public void run() {
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var s = con.createStatement();
+				var rs = s.executeQuery(SELECT_LAST_LOTTERY)) {
+				if (rs.next()) {
+					_number = rs.getInt("idnr");
+					
+					if (rs.getInt("finished") == 1) {
+						_number++;
+						_prize = rs.getLong("newprize");
+					} else {
+						_prize = rs.getLong("prize");
+						_enddate = rs.getLong("enddate");
+						
+						if (_enddate <= (System.currentTimeMillis() + (2 * MINUTE))) {
+							(new FinishLottery()).run();
+							return;
+						}
+						
+						if (_enddate > System.currentTimeMillis()) {
+							_isStarted = true;
+							ThreadPoolManager.getInstance().scheduleGeneral(new FinishLottery(), _enddate - System.currentTimeMillis());
+							
+							if (_enddate > (System.currentTimeMillis() + (12 * MINUTE))) {
+								_isSellingTickets = true;
+								ThreadPoolManager.getInstance().scheduleGeneral(new StopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
+							}
+							return;
+						}
+					}
+				}
+			} catch (Exception e) {
+				LOG.warn("Could not restore lottery data: {}", e.getMessage(), e);
+			}
+			
+			if (general().debug()) {
+				LOG.info("Starting ticket sell for lottery #{}.", getId());
+			}
+			_isSellingTickets = true;
+			_isStarted = true;
+			
+			Broadcast.toAllOnlinePlayers("Lottery tickets are now available for Lucky Lottery #" + getId() + ".");
+			Calendar finishtime = Calendar.getInstance();
+			finishtime.setTimeInMillis(_enddate);
+			finishtime.set(Calendar.MINUTE, 0);
+			finishtime.set(Calendar.SECOND, 0);
+			
+			if (finishtime.get(Calendar.DAY_OF_WEEK) == Calendar.SUNDAY) {
+				finishtime.set(Calendar.HOUR_OF_DAY, 19);
+				_enddate = finishtime.getTimeInMillis();
+				_enddate += 604800000;
+			} else {
+				finishtime.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
+				finishtime.set(Calendar.HOUR_OF_DAY, 19);
+				_enddate = finishtime.getTimeInMillis();
+			}
+			
+			ThreadPoolManager.getInstance().scheduleGeneral(new StopSellingTickets(), _enddate - System.currentTimeMillis() - (10 * MINUTE));
+			ThreadPoolManager.getInstance().scheduleGeneral(new FinishLottery(), _enddate - System.currentTimeMillis());
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(INSERT_LOTTERY)) {
+				ps.setInt(1, 1);
+				ps.setInt(2, getId());
+				ps.setLong(3, getEndDate());
+				ps.setLong(4, getPrize());
+				ps.setLong(5, getPrize());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Could not store new lottery data: {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	private class StopSellingTickets implements Runnable {
+		protected StopSellingTickets() {
+			// Do nothing
+		}
+		
+		@Override
+		public void run() {
+			if (general().debug()) {
+				LOG.info("Stopping ticket sell for lottery #{}.", getId());
+			}
+			_isSellingTickets = false;
+			
+			Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.LOTTERY_TICKET_SALES_TEMP_SUSPENDED));
+		}
+	}
+	
+	private class FinishLottery implements Runnable {
+		protected FinishLottery() {
+			// Do nothing
+		}
+		
+		@Override
+		public void run() {
+			if (general().debug()) {
+				LOG.info("Ending lottery #{}.", getId());
+			}
+			
+			int[] luckynums = new int[5];
+			int luckynum = 0;
+			
+			for (int i = 0; i < 5; i++) {
+				boolean found = true;
+				
+				while (found) {
+					luckynum = Rnd.get(20) + 1;
+					found = false;
+					
+					for (int j = 0; j < i; j++) {
+						if (luckynums[j] == luckynum) {
+							found = true;
+							break;
+						}
+					}
+				}
+				
+				luckynums[i] = luckynum;
+			}
+			
+			if (general().debug()) {
+				LOG.info("The lucky numbers are {}, {}, {}, {}, {}.", luckynums[0], luckynums[1], luckynums[2], luckynums[3], luckynums[4]);
+			}
+			
+			int enchant = 0;
+			int type2 = 0;
+			
+			for (int i = 0; i < 5; i++) {
+				if (luckynums[i] < 17) {
+					enchant += (int) Math.pow(2, luckynums[i] - 1);
+				} else {
+					type2 += (int) Math.pow(2, luckynums[i] - 17);
+				}
+			}
+			
+			if (general().debug()) {
+				LOG.info("Encoded lucky numbers are {}, {}", enchant, type2);
+			}
+			
+			int count1 = 0;
+			int count2 = 0;
+			int count3 = 0;
+			int count4 = 0;
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(SELECT_LOTTERY_ITEM)) {
+				ps.setInt(1, getId());
+				try (var rset = ps.executeQuery()) {
+					while (rset.next()) {
+						int curenchant = rset.getInt("enchant_level") & enchant;
+						int curtype2 = rset.getInt("custom_type2") & type2;
+						
+						if ((curenchant == 0) && (curtype2 == 0)) {
+							continue;
+						}
+						
+						int count = 0;
+						
+						for (int i = 1; i <= 16; i++) {
+							int val = curenchant / 2;
+							
+							if (val != Math.round((double) curenchant / 2)) {
+								count++;
+							}
+							
+							int val2 = curtype2 / 2;
+							
+							if (val2 != ((double) curtype2 / 2)) {
+								count++;
+							}
+							
+							curenchant = val;
+							curtype2 = val2;
+						}
+						
+						if (count == 5) {
+							count1++;
+						} else if (count == 4) {
+							count2++;
+						} else if (count == 3) {
+							count3++;
+						} else if (count > 0) {
+							count4++;
+						}
+					}
+				}
+			} catch (Exception e) {
+				LOG.warn("Could not restore lottery data: {}", e.getMessage(), e);
+			}
+			
+			long prize4 = count4 * general().getLottery2and1NumberPrize();
+			long prize1 = 0;
+			long prize2 = 0;
+			long prize3 = 0;
+			
+			if (count1 > 0) {
+				prize1 = (long) (((getPrize() - prize4) * general().getLottery5NumberRate()) / count1);
+			}
+			
+			if (count2 > 0) {
+				prize2 = (long) (((getPrize() - prize4) * general().getLottery4NumberRate()) / count2);
+			}
+			
+			if (count3 > 0) {
+				prize3 = (long) (((getPrize() - prize4) * general().getLottery3NumberRate()) / count3);
+			}
+			
+			if (general().debug()) {
+				LOG.info("{} players with all FIVE numbers each win {}.", count1, prize1);
+				LOG.info("{} players with FOUR numbers each win {}.", count2, prize2);
+				LOG.info("{} players with THREE numbers each win {}.", count3, prize3);
+				LOG.info("{} players with ONE or TWO numbers each win {}.", count4, prize4);
+			}
+			
+			long newprize = getPrize() - (prize1 + prize2 + prize3 + prize4);
+			if (general().debug()) {
+				LOG.info("Jackpot for next lottery is {}.", newprize);
+			}
+			
+			SystemMessage sm;
+			if (count1 > 0) {
+				// There are winners.
+				sm = SystemMessage.getSystemMessage(SystemMessageId.AMOUNT_FOR_WINNER_S1_IS_S2_ADENA_WE_HAVE_S3_PRIZE_WINNER);
+				sm.addInt(getId());
+				sm.addLong(getPrize());
+				sm.addLong(count1);
+				Broadcast.toAllOnlinePlayers(sm);
+			} else {
+				// There are no winners.
+				sm = SystemMessage.getSystemMessage(SystemMessageId.AMOUNT_FOR_LOTTERY_S1_IS_S2_ADENA_NO_WINNER);
+				sm.addInt(getId());
+				sm.addLong(getPrize());
+				Broadcast.toAllOnlinePlayers(sm);
+			}
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(UPDATE_LOTTERY)) {
+				ps.setLong(1, getPrize());
+				ps.setLong(2, newprize);
+				ps.setInt(3, enchant);
+				ps.setInt(4, type2);
+				ps.setLong(5, prize1);
+				ps.setLong(6, prize2);
+				ps.setLong(7, prize3);
+				ps.setInt(8, getId());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Could not store finished lottery data: {}", e.getMessage(), e);
+			}
+			
+			ThreadPoolManager.getInstance().scheduleGeneral(new StartLottery(), MINUTE);
+			_number++;
+			
+			_isStarted = false;
+		}
+	}
+	
+	public int[] decodeNumbers(int enchant, int type2) {
+		int[] res = new int[5];
+		int id = 0;
+		int nr = 1;
+		
+		while (enchant > 0) {
+			int val = enchant / 2;
+			if (val != Math.round((double) enchant / 2)) {
+				res[id++] = nr;
+			}
+			enchant /= 2;
+			nr++;
+		}
+		
+		nr = 17;
+		
+		while (type2 > 0) {
+			int val = type2 / 2;
+			if (val != ((double) type2 / 2)) {
+				res[id++] = nr;
+			}
+			type2 /= 2;
+			nr++;
+		}
+		
+		return res;
+	}
+	
+	public long[] checkTicket(L2ItemInstance item) {
+		return checkTicket(item.getCustomType1(), item.getEnchantLevel(), item.getCustomType2());
+	}
+	
+	private long[] checkTicket(int id, int enchant, int type2) {
+		long[] res = {
+			0,
+			0
+		};
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_LOTTERY_TICKET)) {
+			ps.setInt(1, id);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					int curenchant = rs.getInt("number1") & enchant;
+					int curtype2 = rs.getInt("number2") & type2;
+					
+					if ((curenchant == 0) && (curtype2 == 0)) {
+						return res;
+					}
+					
+					int count = 0;
+					
+					for (int i = 1; i <= 16; i++) {
+						int val = curenchant / 2;
+						if (val != Math.round((double) curenchant / 2)) {
+							count++;
+						}
+						int val2 = curtype2 / 2;
+						if (val2 != ((double) curtype2 / 2)) {
+							count++;
+						}
+						curenchant = val;
+						curtype2 = val2;
+					}
+					
+					switch (count) {
+						case 0:
+							break;
+						case 5:
+							res[0] = 1;
+							res[1] = rs.getLong("prize1");
+							break;
+						case 4:
+							res[0] = 2;
+							res[1] = rs.getLong("prize2");
+							break;
+						case 3:
+							res[0] = 3;
+							res[1] = rs.getLong("prize3");
+							break;
+						default:
+							res[0] = 4;
+							res[1] = general().getLottery2and1NumberPrize();
+					}
+					
+					if (general().debug()) {
+						LOG.warn("count: {}, id: {}, enchant: {}, type2: {}", count, id, enchant, type2);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not check lottery ticket #{}: {}", id, e.getMessage(), e);
+		}
+		return res;
+	}
+	
+	private static class SingletonHolder {
+		protected static final Lottery _instance = new Lottery();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeAttackTimeTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeAttackTimeTask.java
new file mode 100644
index 00000000..2d4e0466
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeAttackTimeTask.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Calendar;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+
+/**
+ * Four Sepulchers change attack time task.
+ * @author xban1x
+ */
+public final class FourSepulchersChangeAttackTimeTask implements Runnable {
+	@Override
+	public void run() {
+		final FourSepulchersManager manager = FourSepulchersManager.getInstance();
+		manager.setIsEntryTime(false);
+		manager.setIsWarmUpTime(false);
+		manager.setIsAttackTime(true);
+		manager.setIsCoolDownTime(false);
+		
+		manager.locationShadowSpawns();
+		
+		manager.spawnMysteriousBox(31921);
+		manager.spawnMysteriousBox(31922);
+		manager.spawnMysteriousBox(31923);
+		manager.spawnMysteriousBox(31924);
+		
+		if (!manager.isFirstTimeRun()) {
+			manager.setWarmUpTimeEnd(Calendar.getInstance().getTimeInMillis());
+		}
+		
+		long interval;
+		// say task
+		if (manager.isFirstTimeRun()) {
+			for (double min = Calendar.getInstance().get(Calendar.MINUTE); min < manager.getCycleMin(); min++) {
+				// looking for next shout time....
+				if ((min % 5) == 0)// check if min can be divided by 5
+				{
+					final Calendar inter = Calendar.getInstance();
+					inter.set(Calendar.MINUTE, (int) min);
+					ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), inter.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
+					break;
+				}
+			}
+		} else {
+			ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), 5 * 60400);
+		}
+		// searching time when attack time will be ended:
+		// counting difference between time when attack time ends and
+		// current time
+		// and then launching change time task
+		if (manager.isFirstTimeRun()) {
+			interval = manager.getAttackTimeEnd() - Calendar.getInstance().getTimeInMillis();
+		} else {
+			interval = general().getTimeOfAttack();
+		}
+		
+		manager.setChangeCoolDownTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeCoolDownTimeTask(), interval));
+		final ScheduledFuture<?> changeAttackTimeTask = manager.getChangeAttackTimeTask();
+		
+		if (changeAttackTimeTask != null) {
+			changeAttackTimeTask.cancel(true);
+			manager.setChangeAttackTimeTask(null);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java
new file mode 100644
index 00000000..d0b414f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeCoolDownTimeTask.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import java.util.Calendar;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+
+/**
+ * Four Sepulchers change cool down time task.
+ * @author xban1x
+ */
+public final class FourSepulchersChangeCoolDownTimeTask implements Runnable {
+	@Override
+	public void run() {
+		final FourSepulchersManager manager = FourSepulchersManager.getInstance();
+		manager.setIsEntryTime(false);
+		manager.setIsWarmUpTime(false);
+		manager.setIsAttackTime(false);
+		manager.setIsCoolDownTime(true);
+		
+		manager.clean();
+		
+		final Calendar time = Calendar.getInstance();
+		// one hour = 55th min to 55 min of next hour, so we check for this,
+		// also check for first launch
+		if (!manager.isFirstTimeRun() && (Calendar.getInstance().get(Calendar.MINUTE) > manager.getCycleMin())) {
+			time.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) + 1);
+		}
+		time.set(Calendar.MINUTE, manager.getCycleMin());
+		if (manager.isFirstTimeRun()) {
+			manager.setIsFirstTimeRun(false);
+		}
+		
+		long interval = time.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+		
+		manager.setChangeEntryTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeEntryTimeTask(), interval));
+		final ScheduledFuture<?> changeCoolDownTimeTask = manager.getChangeCoolDownTimeTask();
+		
+		if (changeCoolDownTimeTask != null) {
+			changeCoolDownTimeTask.cancel(true);
+			manager.setChangeCoolDownTimeTask(null);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeEntryTimeTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeEntryTimeTask.java
new file mode 100644
index 00000000..01cd4bf0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeEntryTimeTask.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Calendar;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+
+/**
+ * Four Sepulchers change entry time task.
+ * @author xban1x
+ */
+public final class FourSepulchersChangeEntryTimeTask implements Runnable {
+	@Override
+	public void run() {
+		final FourSepulchersManager manager = FourSepulchersManager.getInstance();
+		manager.setIsEntryTime(true);
+		manager.setIsWarmUpTime(false);
+		manager.setIsAttackTime(false);
+		manager.setIsCoolDownTime(false);
+		
+		long interval;
+		// if this is first launch - search time whFourSepulchersManager_inEntryTime = true;naFourSepulchersManager_inEntryTime = true;maen entry time will be
+		// ended:
+		// counting difference between time when entry time ends and current time
+		// and then launching change time task
+		if (manager.isFirstTimeRun()) {
+			interval = manager.getEntrytTimeEnd() - Calendar.getInstance().getTimeInMillis();
+		} else {
+			interval = general().getTimeOfEntry(); // else use stupid method
+		}
+		
+		// launching saying process...
+		ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), 0);
+		manager.setChangeWarmUpTimeTask(ThreadPoolManager.getInstance().scheduleEffect(new FourSepulchersChangeWarmUpTimeTask(), interval));
+		final ScheduledFuture<?> changeEntryTimeTask = manager.getChangeEntryTimeTask();
+		
+		if (changeEntryTimeTask != null) {
+			changeEntryTimeTask.cancel(true);
+			manager.setChangeEntryTimeTask(null);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeWarmUpTimeTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeWarmUpTimeTask.java
new file mode 100644
index 00000000..a55d7ae5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersChangeWarmUpTimeTask.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Calendar;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+
+/**
+ * Four Sepulchers change warm up time task.
+ * @author xban1x
+ */
+public final class FourSepulchersChangeWarmUpTimeTask implements Runnable {
+	@Override
+	public void run() {
+		final FourSepulchersManager manager = FourSepulchersManager.getInstance();
+		manager.setIsEntryTime(true);
+		manager.setIsWarmUpTime(false);
+		manager.setIsAttackTime(false);
+		manager.setIsCoolDownTime(false);
+		
+		long interval;
+		// searching time when warmup time will be ended:
+		// counting difference between time when warmup time ends and
+		// current time and then launching change time task
+		if (manager.isFirstTimeRun()) {
+			interval = manager.getWarmUpTimeEnd() - Calendar.getInstance().getTimeInMillis();
+		} else {
+			interval = general().getTimeOfWarmUp();
+		}
+		
+		manager.setChangeAttackTimeTask(ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersChangeAttackTimeTask(), interval));
+		final ScheduledFuture<?> changeWarmUpTimeTask = manager.getChangeWarmUpTimeTask();
+		
+		if (changeWarmUpTimeTask != null) {
+			changeWarmUpTimeTask.cancel(true);
+			manager.setChangeWarmUpTimeTask(null);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersManagerSayTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersManagerSayTask.java
new file mode 100644
index 00000000..03e3cf14
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/FourSepulchersManagerSayTask.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Calendar;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+
+/**
+ * Four Sepulchers manager say task.
+ * @author xban1x
+ */
+public final class FourSepulchersManagerSayTask implements Runnable {
+	@Override
+	public void run() {
+		if (FourSepulchersManager.getInstance().isAttackTime()) {
+			final Calendar tmp = Calendar.getInstance();
+			tmp.setTimeInMillis(Calendar.getInstance().getTimeInMillis() - FourSepulchersManager.getInstance().getWarmUpTimeEnd());
+			if ((tmp.get(Calendar.MINUTE) + 5) < general().getTimeOfAttack()) {
+				// byte because minute cannot be more than 59
+				FourSepulchersManager.getInstance().managerSay((byte) tmp.get(Calendar.MINUTE));
+				ThreadPoolManager.getInstance().scheduleGeneral(new FourSepulchersManagerSayTask(), 5 * 60000);
+			}
+			// attack time ending chat
+			else if ((tmp.get(Calendar.MINUTE) + 5) >= general().getTimeOfAttack()) {
+				FourSepulchersManager.getInstance().managerSay((byte) 90); // sending a unique id :D
+			}
+		} else if (FourSepulchersManager.getInstance().isEntryTime()) {
+			FourSepulchersManager.getInstance().managerSay((byte) 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/GrandBossManagerStoreTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/GrandBossManagerStoreTask.java
new file mode 100644
index 00000000..c25fdcc6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/GrandBossManagerStoreTask.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import com.l2jserver.gameserver.instancemanager.GrandBossManager;
+
+/**
+ * @author xban1x
+ */
+public class GrandBossManagerStoreTask implements Runnable {
+	@Override
+	public void run() {
+		GrandBossManager.getInstance().storeMe();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java
new file mode 100644
index 00000000..32324edb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/MessageDeletionTask.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Message deletion task.
+ * @author xban1x
+ */
+public final class MessageDeletionTask implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(MessageDeletionTask.class);
+	
+	private final int _msgId;
+	
+	public MessageDeletionTask(int msgId) {
+		_msgId = msgId;
+	}
+	
+	@Override
+	public void run() {
+		final Message msg = MailManager.getInstance().getMessage(_msgId);
+		if (msg == null) {
+			return;
+		}
+		
+		if (msg.hasAttachments()) {
+			try {
+				final L2PcInstance sender = L2World.getInstance().getPlayer(msg.getSenderId());
+				if (sender != null) {
+					msg.getAttachments().returnToWh(sender.getWarehouse());
+					sender.sendPacket(SystemMessageId.MAIL_RETURNED);
+				} else {
+					msg.getAttachments().returnToWh(null);
+				}
+				
+				msg.getAttachments().deleteMe();
+				msg.removeAttachments();
+				
+				final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
+				if (receiver != null) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.MAIL_RETURNED);
+					// sm.addString(msg.getReceiverName());
+					receiver.sendPacket(sm);
+				}
+			} catch (Exception e) {
+				LOG.warn("Error returning items:{}", e.getMessage(), e);
+			}
+		}
+		MailManager.getInstance().deleteMessageInDb(msg.getId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/PenaltyRemoveTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/PenaltyRemoveTask.java
new file mode 100644
index 00000000..eb3962c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/PenaltyRemoveTask.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+
+/**
+ * Handys Block Checker penalty remove.
+ * @author xban1x
+ */
+public final class PenaltyRemoveTask implements Runnable {
+	private final int _objectId;
+	
+	public PenaltyRemoveTask(int id) {
+		_objectId = id;
+	}
+	
+	@Override
+	public void run() {
+		HandysBlockCheckerManager.getInstance().removePenalty(_objectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/StartMovingTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/StartMovingTask.java
new file mode 100644
index 00000000..a5f47722
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/StartMovingTask.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * Task which starts npc movement.
+ * @author xban1x
+ */
+public final class StartMovingTask implements Runnable {
+	private final L2Npc _npc;
+	private final String _routeName;
+	
+	public StartMovingTask(L2Npc npc, String routeName) {
+		_npc = npc;
+		_routeName = routeName;
+	}
+	
+	@Override
+	public void run() {
+		if (_npc != null) {
+			WalkingManager.getInstance().startMoving(_npc, _routeName);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/UpdateSoDStateTask.java b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/UpdateSoDStateTask.java
new file mode 100644
index 00000000..b6293cd6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/instancemanager/tasks/UpdateSoDStateTask.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.instancemanager.tasks;
+
+import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
+
+/**
+ * Task which updates Seed of Destruction state.
+ * @author xban1x
+ */
+public final class UpdateSoDStateTask implements Runnable {
+	@Override
+	public void run() {
+		final GraciaSeedsManager manager = GraciaSeedsManager.getInstance();
+		manager.setSoDState(5, true, true);
+		manager.updateSodState();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/AbsorberInfo.java b/src/main/java/com/l2jserver/gameserver/model/AbsorberInfo.java
new file mode 100644
index 00000000..d8e95915
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/AbsorberInfo.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.interfaces.IUniqueId;
+
+/**
+ * @author xban1x
+ */
+public final class AbsorberInfo implements IUniqueId {
+	private int _objectId;
+	private double _absorbedHp;
+	
+	public AbsorberInfo(int objectId, double pAbsorbedHp) {
+		_objectId = objectId;
+		_absorbedHp = pAbsorbedHp;
+	}
+	
+	public double getAbsorbedHp() {
+		return _absorbedHp;
+	}
+	
+	public void setAbsorbedHp(double absorbedHp) {
+		_absorbedHp = absorbedHp;
+	}
+	
+	@Override
+	public int getObjectId() {
+		return _objectId;
+	}
+	
+	public void setObjectId(int objectId) {
+		_objectId = objectId;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		
+		if (obj instanceof AbsorberInfo) {
+			return (((AbsorberInfo) obj).getObjectId() == _objectId);
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return _objectId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java b/src/main/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java
new file mode 100644
index 00000000..557655fa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/AbstractPlayerGroup.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Battlecruiser
+ */
+public abstract class AbstractPlayerGroup {
+	/**
+	 * @return a list of all members of this group
+	 */
+	public abstract List<L2PcInstance> getMembers();
+	
+	/**
+	 * @return a list of object IDs of the members of this group
+	 */
+	public List<Integer> getMembersObjectId() {
+		final List<Integer> ids = new ArrayList<>();
+		forEachMember(m -> {
+			ids.add(m.getObjectId());
+			return true;
+		});
+		return ids;
+	}
+	
+	/**
+	 * @return the leader of this group
+	 */
+	public abstract L2PcInstance getLeader();
+	
+	/**
+	 * Change the leader of this group to the specified player.
+	 * @param leader the player to set as the new leader of this group
+	 */
+	public abstract void setLeader(L2PcInstance leader);
+	
+	/**
+	 * @return the leader's object ID
+	 */
+	public int getLeaderObjectId() {
+		return getLeader().getObjectId();
+	}
+	
+	/**
+	 * Check if a given player is the leader of this group.
+	 * @param player the player to check
+	 * @return {@code true} if the specified player is the leader of this group, {@code false} otherwise
+	 */
+	public boolean isLeader(L2PcInstance player) {
+		return (getLeaderObjectId() == player.getObjectId());
+	}
+	
+	/**
+	 * @return the count of all players in this group
+	 */
+	public int getMemberCount() {
+		return getMembers().size();
+	}
+	
+	/**
+	 * @return the level of this group
+	 */
+	public abstract int getLevel();
+	
+	/**
+	 * Broadcast a packet to every member of this group.
+	 * @param packet the packet to broadcast
+	 */
+	public void broadcastPacket(final L2GameServerPacket packet) {
+		forEachMember(m -> {
+			if (m != null) {
+				m.sendPacket(packet);
+			}
+			return true;
+		});
+	}
+	
+	/**
+	 * Broadcast a system message to this group.
+	 * @param message the system message to broadcast
+	 */
+	public void broadcastMessage(SystemMessageId message) {
+		broadcastPacket(SystemMessage.getSystemMessage(message));
+	}
+	
+	/**
+	 * Broadcast a text message to this group.
+	 * @param text to broadcast
+	 */
+	public void broadcastString(String text) {
+		broadcastPacket(SystemMessage.sendString(text));
+	}
+	
+	public void broadcastCreatureSay(final CreatureSay msg, final L2PcInstance broadcaster) {
+		forEachMember(m -> {
+			if ((m != null) && !BlockList.isBlocked(m, broadcaster)) {
+				m.sendPacket(msg);
+			}
+			return true;
+		});
+	}
+	
+	/**
+	 * Check if this group contains a given player.
+	 * @param player the player to check
+	 * @return {@code true} if this group contains the specified player, {@code false} otherwise
+	 */
+	public boolean containsPlayer(L2PcInstance player) {
+		return getMembers().contains(player);
+	}
+	
+	/**
+	 * @return a random member of this group
+	 */
+	public L2PcInstance getRandomPlayer() {
+		return getMembers().get(Rnd.get(getMemberCount()));
+	}
+	
+	/**
+	 * Iterates over the group and executes procedure on each member
+	 * @param procedure the procedure to be executed on each member.<br>
+	 *            If executing the procedure on a member returns {@code true}, the loop continues to the next member, otherwise it breaks the loop
+	 * @return {@code true} if the procedure executed correctly, {@code false} if the loop was broken prematurely
+	 */
+	public boolean forEachMember(Function<L2PcInstance, Boolean> procedure) {
+		for (L2PcInstance player : getMembers()) {
+			if (!procedure.apply(player)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/ActionKey.java b/src/main/java/com/l2jserver/gameserver/model/ActionKey.java
new file mode 100644
index 00000000..294bad62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ActionKey.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * Action Key DTO.
+ * @author mrTJO
+ * @author Zoey76
+ */
+public class ActionKey {
+	private final int _cat;
+	private int _cmd = 0;
+	private int _key = 0;
+	private int _toggleKey1 = 0;
+	private int _toggleKey2 = 0;
+	private int _show = 1;
+	
+	public ActionKey(int cat) {
+		_cat = cat;
+	}
+	
+	/**
+	 * L2ActionKey Initialization
+	 * @param cat Category ID
+	 * @param cmd Command ID
+	 * @param key User Defined Primary Key
+	 * @param tgKey1 1st Toggled Key (eg. Alt, Ctrl or Shift)
+	 * @param tgKey2 2nd Toggled Key (eg. Alt, Ctrl or Shift)
+	 * @param show Show Action in UI
+	 */
+	public ActionKey(int cat, int cmd, int key, int tgKey1, int tgKey2, int show) {
+		_cat = cat;
+		_cmd = cmd;
+		_key = key;
+		_toggleKey1 = tgKey1;
+		_toggleKey2 = tgKey2;
+		_show = show;
+	}
+	
+	public int getCategory() {
+		return _cat;
+	}
+	
+	public int getCommandId() {
+		return _cmd;
+	}
+	
+	public void setCommandId(int cmd) {
+		_cmd = cmd;
+	}
+	
+	public int getKeyId() {
+		return _key;
+	}
+	
+	public void setKeyId(int key) {
+		_key = key;
+	}
+	
+	public int getToggleKey1() {
+		return _toggleKey1;
+	}
+	
+	public void setToggleKey1(int tKey1) {
+		_toggleKey1 = tKey1;
+	}
+	
+	public int getToggleKey2() {
+		return _toggleKey2;
+	}
+	
+	public void setToggleKey2(int tKey2) {
+		_toggleKey2 = tKey2;
+	}
+	
+	public int getShowStatus() {
+		return _show;
+	}
+	
+	public void setShowStatus(int show) {
+		_show = show;
+	}
+	
+	public String getSqlSaveString(int playerId, int order) {
+		return "(" + playerId + ", " + _cat + ", " + order + ", " + _cmd + "," + _key + ", " + _toggleKey1 + ", " + _toggleKey2 + ", " + _show + ")";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/AggroInfo.java b/src/main/java/com/l2jserver/gameserver/model/AggroInfo.java
new file mode 100644
index 00000000..29f57558
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/AggroInfo.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author xban1x
+ */
+public final class AggroInfo {
+	private final L2Character _attacker;
+	private long _hate = 0;
+	private int _damage = 0;
+	
+	public AggroInfo(L2Character pAttacker) {
+		_attacker = pAttacker;
+	}
+	
+	public L2Character getAttacker() {
+		return _attacker;
+	}
+	
+	public long getHate() {
+		return _hate;
+	}
+	
+	public long checkHate(L2Character owner) {
+		if (_attacker.isAlikeDead() || !_attacker.isVisible() || !owner.getKnownList().knowsObject(_attacker)) {
+			_hate = 0;
+		}
+		
+		return _hate;
+	}
+	
+	public void addHate(long value) {
+		_hate = Math.min(_hate + value, 999999999);
+	}
+	
+	public void stopHate() {
+		_hate = 0;
+	}
+	
+	public int getDamage() {
+		return _damage;
+	}
+	
+	public void addDamage(int value) {
+		_damage = (int) Math.min(_damage + (long) value, 999999999);
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		
+		if (obj instanceof AggroInfo) {
+			return (((AggroInfo) obj).getAttacker() == _attacker);
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return _attacker.getObjectId();
+	}
+	
+	@Override
+	public String toString() {
+		return "AggroInfo [attacker=" + _attacker + ", hate=" + _hate + ", damage=" + _damage + "]";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/AirShipTeleportList.java b/src/main/java/com/l2jserver/gameserver/model/AirShipTeleportList.java
new file mode 100644
index 00000000..7878fc79
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/AirShipTeleportList.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * Holds a list of all AirShip teleports.
+ * @author xban1x
+ */
+public final class AirShipTeleportList {
+	private final int _location;
+	private final int[] _fuel;
+	private final VehiclePathPoint[][] _routes;
+	
+	public AirShipTeleportList(int loc, int[] f, VehiclePathPoint[][] r) {
+		_location = loc;
+		_fuel = f;
+		_routes = r;
+	}
+	
+	public int getLocation() {
+		return _location;
+	}
+	
+	public int[] getFuel() {
+		return _fuel;
+	}
+	
+	public VehiclePathPoint[][] getRoute() {
+		return _routes;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java b/src/main/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java
new file mode 100644
index 00000000..71cb6445
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ArenaParticipantsHolder.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.BlockCheckerEngine;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author xban1x
+ */
+public final class ArenaParticipantsHolder {
+	private final int _arena;
+	private final List<L2PcInstance> _redPlayers;
+	private final List<L2PcInstance> _bluePlayers;
+	private final BlockCheckerEngine _engine;
+	
+	public ArenaParticipantsHolder(int arena) {
+		_arena = arena;
+		_redPlayers = new ArrayList<>(6);
+		_bluePlayers = new ArrayList<>(6);
+		_engine = new BlockCheckerEngine(this, _arena);
+	}
+	
+	public List<L2PcInstance> getRedPlayers() {
+		return _redPlayers;
+	}
+	
+	public List<L2PcInstance> getBluePlayers() {
+		return _bluePlayers;
+	}
+	
+	public List<L2PcInstance> getAllPlayers() {
+		List<L2PcInstance> all = new ArrayList<>(12);
+		all.addAll(_redPlayers);
+		all.addAll(_bluePlayers);
+		return all;
+	}
+	
+	public void addPlayer(L2PcInstance player, int team) {
+		if (team == 0) {
+			_redPlayers.add(player);
+		} else {
+			_bluePlayers.add(player);
+		}
+	}
+	
+	public void removePlayer(L2PcInstance player, int team) {
+		if (team == 0) {
+			_redPlayers.remove(player);
+		} else {
+			_bluePlayers.remove(player);
+		}
+	}
+	
+	public int getPlayerTeam(L2PcInstance player) {
+		if (_redPlayers.contains(player)) {
+			return 0;
+		} else if (_bluePlayers.contains(player)) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+	
+	public int getRedTeamSize() {
+		return _redPlayers.size();
+	}
+	
+	public int getBlueTeamSize() {
+		return _bluePlayers.size();
+	}
+	
+	public void broadCastPacketToTeam(L2GameServerPacket packet) {
+		for (L2PcInstance p : _redPlayers) {
+			p.sendPacket(packet);
+		}
+		for (L2PcInstance p : _bluePlayers) {
+			p.sendPacket(packet);
+		}
+	}
+	
+	public void clearPlayers() {
+		_redPlayers.clear();
+		_bluePlayers.clear();
+	}
+	
+	public BlockCheckerEngine getEvent() {
+		return _engine;
+	}
+	
+	public void updateEvent() {
+		_engine.updatePlayersOnStart(this);
+	}
+	
+	public void checkAndShuffle() {
+		final int redSize = _redPlayers.size();
+		final int blueSize = _bluePlayers.size();
+		if (redSize > (blueSize + 1)) {
+			broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.TEAM_ADJUSTED_BECAUSE_WRONG_POPULATION_RATIO));
+			final int needed = redSize - (blueSize + 1);
+			for (int i = 0; i < (needed + 1); i++) {
+				final L2PcInstance plr = _redPlayers.get(i);
+				if (plr == null) {
+					continue;
+				}
+				HandysBlockCheckerManager.getInstance().changePlayerToTeam(plr, _arena, 1);
+			}
+		} else if (blueSize > (redSize + 1)) {
+			broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.TEAM_ADJUSTED_BECAUSE_WRONG_POPULATION_RATIO));
+			final int needed = blueSize - (redSize + 1);
+			for (int i = 0; i < (needed + 1); i++) {
+				final L2PcInstance plr = _bluePlayers.get(i);
+				if (plr == null) {
+					continue;
+				}
+				HandysBlockCheckerManager.getInstance().changePlayerToTeam(plr, _arena, 0);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java b/src/main/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java
new file mode 100644
index 00000000..d3c42dcb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java
@@ -0,0 +1,627 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * Auto Spawn handler.<br>
+ * Allows spawning of a NPC object based on a timer.<br>
+ * (From the official idea used for the Merchant and Blacksmith of Mammon)<br>
+ * General Usage: - Call registerSpawn() with the parameters listed below.<br>
+ * int npcId int[][] spawnPoints or specify NULL to add points later.<br>
+ * int initialDelay (If < 0 = default value) int respawnDelay (If < 0 = default value)<br>
+ * int despawnDelay (If < 0 = default value or if = 0, function disabled)<br>
+ * spawnPoints is a standard two-dimensional int array containing X,Y and Z coordinates.<br>
+ * The default respawn/despawn delays are currently every hour (as for Mammon on official servers).<br>
+ * The resulting AutoSpawnInstance object represents the newly added spawn index.<br>
+ * The internal methods of this object can be used to adjust random spawning, for instance a call to setRandomSpawn(1, true); would set the spawn at index 1 to be randomly rather than sequentially-based.<br>
+ * Also they can be used to specify the number of NPC instances to spawn using setSpawnCount(), and broadcast a message to all users using setBroadcast().<br>
+ * Random Spawning = OFF by default Broadcasting = OFF by default
+ * @author Tempy
+ */
+public class AutoSpawnHandler {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AutoSpawnHandler.class);
+	
+	private static final int DEFAULT_INITIAL_SPAWN = 30000; // 30 seconds after registration
+	
+	private static final int DEFAULT_RESPAWN = 3600000; // 1 hour in milliseconds
+	
+	private static final int DEFAULT_DESPAWN = 3600000; // 1 hour in milliseconds
+	
+	protected Map<Integer, AutoSpawnInstance> _registeredSpawns = new ConcurrentHashMap<>();
+	
+	protected Map<Integer, ScheduledFuture<?>> _runningSpawns = new ConcurrentHashMap<>();
+	
+	protected boolean _activeState = true;
+	
+	protected AutoSpawnHandler() {
+		restoreSpawnData();
+	}
+	
+	public void reload() {
+		// stop all timers
+		for (ScheduledFuture<?> sf : _runningSpawns.values()) {
+			if (sf != null) {
+				sf.cancel(true);
+			}
+		}
+		// unregister all registered spawns
+		for (AutoSpawnInstance asi : _registeredSpawns.values()) {
+			if (asi != null) {
+				this.removeSpawn(asi);
+			}
+		}
+		
+		// create clean list
+		_registeredSpawns.clear();
+		_runningSpawns.clear();
+		
+		// load
+		restoreSpawnData();
+	}
+	
+	private void restoreSpawnData() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery("SELECT * FROM random_spawn ORDER BY groupId");
+			var ps = con.prepareStatement("SELECT * FROM random_spawn_loc WHERE groupId=?")) {
+			// Restore spawn group data, then the location data.
+			while (rs.next()) {
+				// Register random spawn group, set various options on the
+				// created spawn instance.
+				AutoSpawnInstance spawnInst = registerSpawn(rs.getInt("npcId"), rs.getInt("initialDelay"), rs.getInt("respawnDelay"), rs.getInt("despawnDelay"));
+				
+				spawnInst.setSpawnCount(rs.getInt("count"));
+				spawnInst.setBroadcast(rs.getBoolean("broadcastSpawn"));
+				spawnInst.setRandomSpawn(rs.getBoolean("randomSpawn"));
+				
+				// Restore the spawn locations for this spawn group/instance.
+				ps.setInt(1, rs.getInt("groupId"));
+				try (var rs2 = ps.executeQuery()) {
+					ps.clearParameters();
+					
+					while (rs2.next()) {
+						// Add each location to the spawn group/instance.
+						spawnInst.addSpawnLocation(rs2.getInt("x"), rs2.getInt("y"), rs2.getInt("z"), rs2.getInt("heading"));
+					}
+				}
+			}
+			LOG.info("Loaded {} handlers.", _registeredSpawns.size());
+		} catch (Exception ex) {
+			LOG.warn("Could not restore spawn data!", ex);
+		}
+	}
+	
+	/**
+	 * Registers a spawn with the given parameters with the spawner, and marks it as active.<br>
+	 * Returns a AutoSpawnInstance containing info about the spawn.
+	 * @param npcId
+	 * @param spawnPoints
+	 * @param initialDelay (If < 0 = default value)
+	 * @param respawnDelay (If < 0 = default value)
+	 * @param despawnDelay (If < 0 = default value or if = 0, function disabled)
+	 * @return AutoSpawnInstance spawnInst
+	 */
+	public AutoSpawnInstance registerSpawn(int npcId, int[][] spawnPoints, int initialDelay, int respawnDelay, int despawnDelay) {
+		if (initialDelay < 0) {
+			initialDelay = DEFAULT_INITIAL_SPAWN;
+		}
+		
+		if (respawnDelay < 0) {
+			respawnDelay = DEFAULT_RESPAWN;
+		}
+		
+		if (despawnDelay < 0) {
+			despawnDelay = DEFAULT_DESPAWN;
+		}
+		
+		AutoSpawnInstance newSpawn = new AutoSpawnInstance(npcId, initialDelay, respawnDelay, despawnDelay);
+		
+		if (spawnPoints != null) {
+			for (int[] spawnPoint : spawnPoints) {
+				newSpawn.addSpawnLocation(spawnPoint);
+			}
+		}
+		
+		int objectId = IdFactory.getInstance().getNextId();
+		newSpawn._objectId = objectId;
+		_registeredSpawns.put(objectId, newSpawn);
+		
+		setSpawnActive(newSpawn, true);
+		return newSpawn;
+	}
+	
+	/**
+	 * Registers a spawn with the given parameters with the spawner, and marks it as active.<br>
+	 * Returns a AutoSpawnInstance containing info about the spawn.<br>
+	 * <B>Warning:</B> Spawn locations must be specified separately using addSpawnLocation().
+	 * @param npcId
+	 * @param initialDelay (If < 0 = default value)
+	 * @param respawnDelay (If < 0 = default value)
+	 * @param despawnDelay (If < 0 = default value or if = 0, function disabled)
+	 * @return AutoSpawnInstance spawnInst
+	 */
+	public AutoSpawnInstance registerSpawn(int npcId, int initialDelay, int respawnDelay, int despawnDelay) {
+		return registerSpawn(npcId, null, initialDelay, respawnDelay, despawnDelay);
+	}
+	
+	/**
+	 * Remove a registered spawn from the list, specified by the given spawn instance.
+	 * @param spawnInst
+	 * @return boolean removedSuccessfully
+	 */
+	public boolean removeSpawn(AutoSpawnInstance spawnInst) {
+		if (!isSpawnRegistered(spawnInst)) {
+			return false;
+		}
+		
+		try {
+			// Try to remove from the list of registered spawns if it exists.
+			_registeredSpawns.remove(spawnInst.getId());
+			
+			// Cancel the currently associated running scheduled task.
+			ScheduledFuture<?> respawnTask = _runningSpawns.remove(spawnInst._objectId);
+			respawnTask.cancel(false);
+		} catch (Exception ex) {
+			LOG.warn("Could not auto spawn for NPC Id {} (Object Id={})!", spawnInst._npcId, spawnInst._objectId, ex);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Remove a registered spawn from the list, specified by the given spawn object ID.
+	 * @param objectId
+	 */
+	public void removeSpawn(int objectId) {
+		removeSpawn(_registeredSpawns.get(objectId));
+	}
+	
+	/**
+	 * Sets the active state of the specified spawn.
+	 * @param spawnInst
+	 * @param isActive
+	 */
+	public void setSpawnActive(AutoSpawnInstance spawnInst, boolean isActive) {
+		if (spawnInst == null) {
+			return;
+		}
+		
+		int objectId = spawnInst._objectId;
+		
+		if (isSpawnRegistered(objectId)) {
+			ScheduledFuture<?> spawnTask;
+			
+			if (isActive) {
+				AutoSpawner rs = new AutoSpawner(objectId);
+				
+				if (spawnInst._desDelay > 0) {
+					spawnTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(rs, spawnInst._initDelay, spawnInst._resDelay);
+				} else {
+					spawnTask = ThreadPoolManager.getInstance().scheduleEffect(rs, spawnInst._initDelay);
+				}
+				
+				_runningSpawns.put(objectId, spawnTask);
+			} else {
+				AutoDespawner rd = new AutoDespawner(objectId);
+				spawnTask = _runningSpawns.remove(objectId);
+				
+				if (spawnTask != null) {
+					spawnTask.cancel(false);
+				}
+				
+				ThreadPoolManager.getInstance().scheduleEffect(rd, 0);
+			}
+			
+			spawnInst.setSpawnActive(isActive);
+		}
+	}
+	
+	/**
+	 * Sets the active state of all auto spawn instances to that specified, and cancels the scheduled spawn task if necessary.
+	 * @param isActive
+	 */
+	public void setAllActive(boolean isActive) {
+		if (_activeState == isActive) {
+			return;
+		}
+		
+		for (AutoSpawnInstance spawnInst : _registeredSpawns.values()) {
+			setSpawnActive(spawnInst, isActive);
+		}
+		
+		_activeState = isActive;
+	}
+	
+	/**
+	 * Returns the number of milliseconds until the next occurrence of the given spawn.
+	 * @param spawnInst
+	 * @return
+	 */
+	public final long getTimeToNextSpawn(AutoSpawnInstance spawnInst) {
+		int objectId = spawnInst.getObjectId();
+		
+		if (!isSpawnRegistered(objectId)) {
+			return -1;
+		}
+		
+		return (_runningSpawns.containsKey(objectId)) ? _runningSpawns.get(objectId).getDelay(TimeUnit.MILLISECONDS) : 0;
+	}
+	
+	/**
+	 * Attempts to return the AutoSpawnInstance associated with the given NPC or Object ID type.<br>
+	 * Note: If isObjectId == false, returns first instance for the specified NPC ID.
+	 * @param id
+	 * @param isObjectId
+	 * @return AutoSpawnInstance spawnInst
+	 */
+	public final AutoSpawnInstance getAutoSpawnInstance(int id, boolean isObjectId) {
+		if (isObjectId) {
+			if (isSpawnRegistered(id)) {
+				return _registeredSpawns.get(id);
+			}
+		} else {
+			for (AutoSpawnInstance spawnInst : _registeredSpawns.values()) {
+				if (spawnInst.getId() == id) {
+					return spawnInst;
+				}
+			}
+		}
+		return null;
+	}
+	
+	public List<AutoSpawnInstance> getAutoSpawnInstances(int npcId) {
+		final List<AutoSpawnInstance> result = new LinkedList<>();
+		for (AutoSpawnInstance spawnInst : _registeredSpawns.values()) {
+			if (spawnInst.getId() == npcId) {
+				result.add(spawnInst);
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * Tests if the specified object ID is assigned to an auto spawn.
+	 * @param objectId
+	 * @return isAssigned
+	 */
+	public final boolean isSpawnRegistered(int objectId) {
+		return _registeredSpawns.containsKey(objectId);
+	}
+	
+	/**
+	 * Tests if the specified spawn instance is assigned to an auto spawn.
+	 * @param spawnInst
+	 * @return boolean isAssigned
+	 */
+	public final boolean isSpawnRegistered(AutoSpawnInstance spawnInst) {
+		return _registeredSpawns.containsValue(spawnInst);
+	}
+	
+	/**
+	 * AutoSpawner class<br>
+	 * This handles the main spawn task for an auto spawn instance, and initializes a despawner if required.
+	 * @author Tempy
+	 */
+	private class AutoSpawner implements Runnable {
+		private final int _objectId;
+		
+		protected AutoSpawner(int objectId) {
+			_objectId = objectId;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				// Retrieve the required spawn instance for this spawn task.
+				AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId);
+				
+				// If the spawn is not scheduled to be active, cancel the spawn
+				// task.
+				if (!spawnInst.isSpawnActive()) {
+					return;
+				}
+				
+				Location[] locationList = spawnInst.getLocationList();
+				
+				// If there are no set co-ordinates, cancel the spawn task.
+				if (locationList.length == 0) {
+					LOG.warn("No location co-ords specified for spawn instance (Object Id={}).", _objectId);
+					return;
+				}
+				
+				int locationCount = locationList.length;
+				int locationIndex = Rnd.nextInt(locationCount);
+				
+				// If random spawning is disabled, the spawn at the next set of co-ordinates after the last.
+				// If the index is greater than the number of possible spawns, reset the counter to zero.
+				if (!spawnInst.isRandomSpawn()) {
+					locationIndex = spawnInst._lastLocIndex + 1;
+					
+					if (locationIndex == locationCount) {
+						locationIndex = 0;
+					}
+					
+					spawnInst._lastLocIndex = locationIndex;
+				}
+				
+				// Set the X, Y and Z co-ordinates, where this spawn will take place.
+				final int x = locationList[locationIndex].getX();
+				final int y = locationList[locationIndex].getY();
+				final int z = locationList[locationIndex].getZ();
+				final int heading = locationList[locationIndex].getHeading();
+				
+				final L2Spawn newSpawn = new L2Spawn(spawnInst.getId());
+				newSpawn.setX(x);
+				newSpawn.setY(y);
+				newSpawn.setZ(z);
+				if (heading != -1) {
+					newSpawn.setHeading(heading);
+				}
+				newSpawn.setAmount(spawnInst.getSpawnCount());
+				if (spawnInst._desDelay == 0) {
+					newSpawn.setRespawnDelay(spawnInst._resDelay);
+				}
+				
+				// Add the new spawn information to the spawn table, but do not store it.
+				SpawnTable.getInstance().addNewSpawn(newSpawn, false);
+				L2Npc npcInst = null;
+				
+				if (spawnInst._spawnCount == 1) {
+					npcInst = newSpawn.doSpawn();
+					npcInst.setXYZ(npcInst.getX(), npcInst.getY(), npcInst.getZ());
+					spawnInst.addNpcInstance(npcInst);
+				} else {
+					for (int i = 0; i < spawnInst._spawnCount; i++) {
+						npcInst = newSpawn.doSpawn();
+						
+						// To prevent spawning of more than one NPC in the exact same spot, move it slightly by a small random offset.
+						npcInst.setXYZ(npcInst.getX() + Rnd.nextInt(50), npcInst.getY() + Rnd.nextInt(50), npcInst.getZ());
+						
+						// Add the NPC instance to the list of managed instances.
+						spawnInst.addNpcInstance(npcInst);
+					}
+				}
+				
+				if (npcInst != null) {
+					String nearestTown = MapRegionManager.getInstance().getClosestTownName(npcInst);
+					
+					// Announce to all players that the spawn has taken place, with the nearest town location.
+					if (spawnInst.isBroadcasting()) {
+						Broadcast.toAllOnlinePlayers("The " + npcInst.getName() + " has spawned near " + nearestTown + "!");
+					}
+				}
+				
+				// If there is no despawn time, do not create a despawn task.
+				if (spawnInst.getDespawnDelay() > 0) {
+					AutoDespawner rd = new AutoDespawner(_objectId);
+					ThreadPoolManager.getInstance().scheduleAi(rd, spawnInst.getDespawnDelay() - 1000);
+				}
+			} catch (Exception ex) {
+				LOG.warn("An error occurred while initializing spawn instance (Object Id={})!", _objectId, ex);
+			}
+		}
+	}
+	
+	/**
+	 * AutoDespawner Class<br>
+	 * Simply used as a secondary class for despawning an auto spawn instance.
+	 * @author Tempy
+	 */
+	private class AutoDespawner implements Runnable {
+		private final int _objectId;
+		
+		protected AutoDespawner(int objectId) {
+			_objectId = objectId;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				AutoSpawnInstance spawnInst = _registeredSpawns.get(_objectId);
+				if (spawnInst == null) {
+					LOG.warn("No spawn registered for object Id={}!", _objectId);
+					return;
+				}
+				
+				for (L2Npc npcInst : spawnInst.getNPCInstanceList()) {
+					npcInst.deleteMe();
+					SpawnTable.getInstance().deleteSpawn(npcInst.getSpawn(), false);
+					spawnInst.removeNpcInstance(npcInst);
+				}
+			} catch (Exception ex) {
+				LOG.warn("An error occurred while despawning spawn (Object Id={})!", _objectId, ex);
+			}
+		}
+	}
+	
+	/**
+	 * AutoSpawnInstance Class<br>
+	 * Stores information about a registered auto spawn.
+	 * @author Tempy
+	 */
+	public static class AutoSpawnInstance implements IIdentifiable {
+		protected int _objectId;
+		
+		protected int _spawnIndex;
+		
+		protected int _npcId;
+		
+		protected int _initDelay;
+		
+		protected int _resDelay;
+		
+		protected int _desDelay;
+		
+		protected int _spawnCount = 1;
+		
+		protected int _lastLocIndex = -1;
+		
+		private final Queue<L2Npc> _npcList = new ConcurrentLinkedQueue<>();
+		
+		private final List<Location> _locList = new CopyOnWriteArrayList<>();
+		
+		private boolean _spawnActive;
+		
+		private boolean _randomSpawn = false;
+		
+		private boolean _broadcastAnnouncement = false;
+		
+		protected AutoSpawnInstance(int npcId, int initDelay, int respawnDelay, int despawnDelay) {
+			_npcId = npcId;
+			_initDelay = initDelay;
+			_resDelay = respawnDelay;
+			_desDelay = despawnDelay;
+		}
+		
+		protected void setSpawnActive(boolean activeValue) {
+			_spawnActive = activeValue;
+		}
+		
+		protected boolean addNpcInstance(L2Npc npcInst) {
+			return _npcList.add(npcInst);
+		}
+		
+		protected boolean removeNpcInstance(L2Npc npcInst) {
+			return _npcList.remove(npcInst);
+		}
+		
+		public int getObjectId() {
+			return _objectId;
+		}
+		
+		public int getInitialDelay() {
+			return _initDelay;
+		}
+		
+		public int getRespawnDelay() {
+			return _resDelay;
+		}
+		
+		public int getDespawnDelay() {
+			return _desDelay;
+		}
+		
+		/**
+		 * Gets the NPC ID.
+		 * @return the NPC ID
+		 */
+		@Override
+		public int getId() {
+			return _npcId;
+		}
+		
+		public int getSpawnCount() {
+			return _spawnCount;
+		}
+		
+		public Location[] getLocationList() {
+			return _locList.toArray(new Location[_locList.size()]);
+		}
+		
+		public Queue<L2Npc> getNPCInstanceList() {
+			return _npcList;
+		}
+		
+		public List<L2Spawn> getSpawns() {
+			final List<L2Spawn> npcSpawns = new ArrayList<>();
+			for (L2Npc npcInst : _npcList) {
+				npcSpawns.add(npcInst.getSpawn());
+			}
+			return npcSpawns;
+		}
+		
+		public void setSpawnCount(int spawnCount) {
+			_spawnCount = spawnCount;
+		}
+		
+		public void setRandomSpawn(boolean randValue) {
+			_randomSpawn = randValue;
+		}
+		
+		public void setBroadcast(boolean broadcastValue) {
+			_broadcastAnnouncement = broadcastValue;
+		}
+		
+		public boolean isSpawnActive() {
+			return _spawnActive;
+		}
+		
+		public boolean isRandomSpawn() {
+			return _randomSpawn;
+		}
+		
+		public boolean isBroadcasting() {
+			return _broadcastAnnouncement;
+		}
+		
+		public boolean addSpawnLocation(int x, int y, int z, int heading) {
+			return _locList.add(new Location(x, y, z, heading));
+		}
+		
+		public boolean addSpawnLocation(int[] spawnLoc) {
+			if (spawnLoc.length != 3) {
+				return false;
+			}
+			
+			return addSpawnLocation(spawnLoc[0], spawnLoc[1], spawnLoc[2], -1);
+		}
+		
+		public Location removeSpawnLocation(int locIndex) {
+			try {
+				return _locList.remove(locIndex);
+			} catch (IndexOutOfBoundsException e) {
+				return null;
+			}
+		}
+	}
+	
+	public static AutoSpawnHandler getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AutoSpawnHandler INSTANCE = new AutoSpawnHandler();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/BlockList.java b/src/main/java/com/l2jserver/gameserver/model/BlockList.java
new file mode 100644
index 00000000..f8eb93ed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/BlockList.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.network.SystemMessageId.BLOCK_LIST_HEADER;
+import static com.l2jserver.gameserver.network.SystemMessageId.FRIEND_LIST_FOOTER;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_ALREADY_IN_FRIENDS_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_HAS_ADDED_YOU_TO_IGNORE_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_WAS_ADDED_TO_YOUR_IGNORE_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_WAS_REMOVED_FROM_YOUR_IGNORE_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.TARGET_IS_INCORRECT;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CAN_ONLY_ENTER_UP_TO_128_NAMES_IN_YOUR_BLOCK_LIST;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+// TODO(Zoey76): Rewrite this class in an OOP style.
+public class BlockList {
+	private static final Logger LOG = LoggerFactory.getLogger(BlockList.class);
+	
+	private static final Map<Integer, List<Integer>> OFFLINE_LIST = new ConcurrentHashMap<>();
+	
+	private final L2PcInstance _owner;
+	
+	private List<Integer> _blockList;
+	
+	public BlockList(L2PcInstance owner) {
+		_owner = owner;
+		_blockList = OFFLINE_LIST.get(owner.getObjectId());
+		if (_blockList == null) {
+			_blockList = loadList(_owner.getObjectId());
+		}
+	}
+	
+	private void addToBlockList(int target) {
+		_blockList.add(target);
+		persistInDB(target);
+	}
+	
+	private void removeFromBlockList(int target) {
+		_blockList.remove(Integer.valueOf(target));
+		removeFromDB(target);
+	}
+	
+	public void playerLogout() {
+		OFFLINE_LIST.put(_owner.getObjectId(), _blockList);
+	}
+	
+	private static List<Integer> loadList(int ObjId) {
+		List<Integer> list = new ArrayList<>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT friendId FROM character_friends WHERE charId=? AND relation=1")) {
+			ps.setInt(1, ObjId);
+			try (var rs = ps.executeQuery()) {
+				int friendId;
+				while (rs.next()) {
+					friendId = rs.getInt("friendId");
+					if (friendId == ObjId) {
+						continue;
+					}
+					list.add(friendId);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Error found in {} FriendList while loading BlockList: {}", ObjId, e.getMessage(), e);
+		}
+		return list;
+	}
+	
+	private void removeFromDB(int targetId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_friends WHERE charId=? AND friendId=? AND relation=1")) {
+			ps.setInt(1, _owner.getObjectId());
+			ps.setInt(2, targetId);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not remove blocked player: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void persistInDB(int targetId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO character_friends (charId, friendId, relation) VALUES (?, ?, 1)")) {
+			ps.setInt(1, _owner.getObjectId());
+			ps.setInt(2, targetId);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not add blocked player: {}", e.getMessage(), e);
+		}
+	}
+	
+	public boolean isInBlockList(L2PcInstance target) {
+		return isInBlockList(target.getObjectId());
+	}
+	
+	public boolean isInBlockList(int targetId) {
+		return _blockList.contains(targetId);
+	}
+	
+	private boolean isBlockAll() {
+		return _owner.getMessageRefusal();
+	}
+	
+	public static boolean isBlocked(L2PcInstance listOwner, L2PcInstance target) {
+		BlockList blockList = listOwner.getBlockList();
+		return blockList.isBlockAll() || blockList.isInBlockList(target);
+	}
+	
+	public static boolean isBlocked(L2PcInstance listOwner, int targetId) {
+		BlockList blockList = listOwner.getBlockList();
+		return blockList.isBlockAll() || blockList.isInBlockList(targetId);
+	}
+	
+	private void setBlockAll(boolean state) {
+		_owner.setMessageRefusal(state);
+	}
+	
+	private List<Integer> getBlockList() {
+		return _blockList;
+	}
+	
+	public static void addToBlockList(L2PcInstance listOwner, int targetId) {
+		if (listOwner == null) {
+			return;
+		}
+		
+		if (listOwner.getBlockList().getBlockList().size() >= character().getBlockListLimit()) {
+			listOwner.sendPacket(YOU_CAN_ONLY_ENTER_UP_TO_128_NAMES_IN_YOUR_BLOCK_LIST);
+			return;
+		}
+		
+		String charName = CharNameTable.getInstance().getNameById(targetId);
+		if (listOwner.isFriend(targetId)) {
+			final var sm = SystemMessage.getSystemMessage(S1_ALREADY_IN_FRIENDS_LIST);
+			sm.addString(charName);
+			listOwner.sendPacket(sm);
+			return;
+		}
+		
+		if (listOwner.getBlockList().getBlockList().contains(targetId)) {
+			listOwner.sendMessage("Already in ignore list.");
+			return;
+		}
+		
+		listOwner.getBlockList().addToBlockList(targetId);
+		
+		var sm = SystemMessage.getSystemMessage(S1_WAS_ADDED_TO_YOUR_IGNORE_LIST);
+		sm.addString(charName);
+		listOwner.sendPacket(sm);
+		
+		L2PcInstance player = L2World.getInstance().getPlayer(targetId);
+		
+		if (player != null) {
+			sm = SystemMessage.getSystemMessage(S1_HAS_ADDED_YOU_TO_IGNORE_LIST);
+			sm.addString(listOwner.getName());
+			player.sendPacket(sm);
+		}
+	}
+	
+	public static void removeFromBlockList(L2PcInstance listOwner, int targetId) {
+		if (listOwner == null) {
+			return;
+		}
+		
+		String charName = CharNameTable.getInstance().getNameById(targetId);
+		
+		if (!listOwner.getBlockList().getBlockList().contains(targetId)) {
+			listOwner.sendPacket(TARGET_IS_INCORRECT);
+			return;
+		}
+		
+		listOwner.getBlockList().removeFromBlockList(targetId);
+		
+		final var sm = SystemMessage.getSystemMessage(S1_WAS_REMOVED_FROM_YOUR_IGNORE_LIST);
+		sm.addString(charName);
+		listOwner.sendPacket(sm);
+	}
+	
+	public static boolean isInBlockList(L2PcInstance listOwner, L2PcInstance target) {
+		return listOwner.getBlockList().isInBlockList(target);
+	}
+	
+	public boolean isBlockAll(L2PcInstance listOwner) {
+		return listOwner.getBlockList().isBlockAll();
+	}
+	
+	public static void setBlockAll(L2PcInstance listOwner, boolean newValue) {
+		listOwner.getBlockList().setBlockAll(newValue);
+	}
+	
+	public static void sendListToOwner(L2PcInstance listOwner) {
+		int i = 1;
+		listOwner.sendPacket(BLOCK_LIST_HEADER);
+		for (int playerId : listOwner.getBlockList().getBlockList()) {
+			listOwner.sendMessage((i++) + ". " + CharNameTable.getInstance().getNameById(playerId));
+		}
+		listOwner.sendPacket(FRIEND_LIST_FOOTER);
+	}
+	
+	/**
+	 * @param ownerId object id of owner block list
+	 * @param targetId object id of potential blocked player
+	 * @return true if blocked
+	 */
+	public static boolean isInBlockList(int ownerId, int targetId) {
+		L2PcInstance player = L2World.getInstance().getPlayer(ownerId);
+		if (player != null) {
+			return BlockList.isBlocked(player, targetId);
+		}
+		if (!OFFLINE_LIST.containsKey(ownerId)) {
+			OFFLINE_LIST.put(ownerId, loadList(ownerId));
+		}
+		return OFFLINE_LIST.get(ownerId).contains(targetId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/CharEffectList.java b/src/main/java/com/l2jserver/gameserver/model/CharEffectList.java
new file mode 100644
index 00000000..1807136a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/CharEffectList.java
@@ -0,0 +1,1424 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.effects.EffectFlag;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.EffectScope;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.AbnormalStatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadSpelledInfo;
+import com.l2jserver.gameserver.network.serverpackets.PartySpelled;
+import com.l2jserver.gameserver.network.serverpackets.ShortBuffStatusUpdate;
+
+/**
+ * Effect lists.<br>
+ * Holds all the buff infos that are affecting a creature.<br>
+ * Manages the logic that controls whether a buff is added, remove, replaced or set inactive.<br>
+ * Uses maps with skill ID as key and buff info DTO as value to avoid iterations.<br>
+ * Uses Double-Checked Locking to avoid useless initialization and synchronization issues and overhead.<br>
+ * Methods may resemble List interface, although it doesn't implement such interface.
+ * @author Zoey76
+ */
+public final class CharEffectList {
+	private static final Logger LOG = LoggerFactory.getLogger(CharEffectList.class);
+	
+	/** Queue containing all effects from buffs for this effect list. */
+	private volatile Queue<BuffInfo> _buffs;
+	/** Queue containing all triggered skills for this effect list. */
+	private volatile Queue<BuffInfo> _triggered;
+	/** Queue containing all dances/songs for this effect list. */
+	private volatile Queue<BuffInfo> _dances;
+	/** Queue containing all toggle for this effect list. */
+	private volatile Queue<BuffInfo> _toggles;
+	/** Queue containing all debuffs for this effect list. */
+	private volatile Queue<BuffInfo> _debuffs;
+	/** Queue containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */
+	private volatile Queue<BuffInfo> _passives;
+	/** Map containing the all stacked effect in progress for each abnormal type. */
+	private volatile Map<AbnormalType, BuffInfo> _stackedEffects;
+	/** Set containing all abnormal types that shouldn't be added to this creature effect list. */
+	private volatile Set<AbnormalType> _blockedBuffSlots = null;
+	/** Short buff skill ID. */
+	private BuffInfo _shortBuff = null;
+	/** If {@code true} this effect list has buffs removed on any action. */
+	private volatile boolean _hasBuffsRemovedOnAnyAction = false;
+	/** If {@code true} this effect list has buffs removed on damage. */
+	private volatile boolean _hasBuffsRemovedOnDamage = false;
+	/** If {@code true} this effect list has debuffs removed on damage. */
+	private volatile boolean _hasDebuffsRemovedOnDamage = false;
+	/** Effect flags. */
+	private int _effectFlags;
+	/** If {@code true} only party icons need to be updated. */
+	private boolean _partyOnly = false;
+	/** The owner of this effect list. */
+	private final L2Character _owner;
+	/** Hidden buffs count, prevents iterations. */
+	private final AtomicInteger _hiddenBuffs = new AtomicInteger();
+	
+	/**
+	 * Constructor for effect list.
+	 * @param owner the creature that owns this effect list
+	 */
+	public CharEffectList(L2Character owner) {
+		_owner = owner;
+	}
+	
+	/**
+	 * Gets buff skills.
+	 * @return the buff skills
+	 */
+	public Queue<BuffInfo> getBuffs() {
+		if (_buffs == null) {
+			synchronized (this) {
+				if (_buffs == null) {
+					_buffs = new ConcurrentLinkedQueue<>();
+				}
+			}
+		}
+		return _buffs;
+	}
+	
+	/**
+	 * Gets triggered skill skills.
+	 * @return the triggered skill skills
+	 */
+	public Queue<BuffInfo> getTriggered() {
+		if (_triggered == null) {
+			synchronized (this) {
+				if (_triggered == null) {
+					_triggered = new ConcurrentLinkedQueue<>();
+				}
+			}
+		}
+		return _triggered;
+	}
+	
+	/**
+	 * Gets dance/song skills.
+	 * @return the dance/song skills
+	 */
+	public Queue<BuffInfo> getDances() {
+		if (_dances == null) {
+			synchronized (this) {
+				if (_dances == null) {
+					_dances = new ConcurrentLinkedQueue<>();
+				}
+			}
+		}
+		return _dances;
+	}
+	
+	/**
+	 * Gets toggle skills.
+	 * @return the toggle skills
+	 */
+	public Queue<BuffInfo> getToggles() {
+		if (_toggles == null) {
+			synchronized (this) {
+				if (_toggles == null) {
+					_toggles = new ConcurrentLinkedQueue<>();
+				}
+			}
+		}
+		return _toggles;
+	}
+	
+	/**
+	 * Gets debuff skills.
+	 * @return the debuff skills
+	 */
+	public Queue<BuffInfo> getDebuffs() {
+		if (_debuffs == null) {
+			synchronized (this) {
+				if (_debuffs == null) {
+					_debuffs = new ConcurrentLinkedQueue<>();
+				}
+			}
+		}
+		return _debuffs;
+	}
+	
+	/**
+	 * Gets passive skills.
+	 * @return the passive skills
+	 */
+	public Queue<BuffInfo> getPassives() {
+		if (_passives == null) {
+			synchronized (this) {
+				if (_passives == null) {
+					_passives = new ConcurrentLinkedQueue<>();
+				}
+			}
+		}
+		return _passives;
+	}
+	
+	/**
+	 * Gets all the effects on this effect list.
+	 * @return all the effects on this effect list
+	 */
+	public List<BuffInfo> getEffects() {
+		if (isEmpty()) {
+			return Collections.emptyList();
+		}
+		
+		final List<BuffInfo> buffs = new ArrayList<>();
+		if (hasBuffs()) {
+			buffs.addAll(getBuffs());
+		}
+		
+		if (hasTriggered()) {
+			buffs.addAll(getTriggered());
+		}
+		
+		if (hasDances()) {
+			buffs.addAll(getDances());
+		}
+		
+		if (hasToggles()) {
+			buffs.addAll(getToggles());
+		}
+		
+		if (hasDebuffs()) {
+			buffs.addAll(getDebuffs());
+		}
+		return buffs;
+	}
+	
+	/**
+	 * Gets the effect list where the skill effects should be.
+	 * @param skill the skill
+	 * @return the effect list
+	 */
+	private Queue<BuffInfo> getEffectList(Skill skill) {
+		if (skill == null) {
+			return null;
+		}
+		
+		final Queue<BuffInfo> effects;
+		if (skill.isPassive()) {
+			effects = getPassives();
+		} else if (skill.isDebuff()) {
+			effects = getDebuffs();
+		} else if (skill.isTrigger()) {
+			effects = getTriggered();
+		} else if (skill.isDance()) {
+			effects = getDances();
+		} else if (skill.isToggle()) {
+			effects = getToggles();
+		} else {
+			effects = getBuffs();
+		}
+		return effects;
+	}
+	
+	/**
+	 * Gets the first effect for the given effect type.<br>
+	 * Prevents initialization.<br>
+	 * TODO: Remove this method after all the effect types gets replaced by abnormal skill types.
+	 * @param type the effect type
+	 * @return the first effect matching the given effect type
+	 */
+	public BuffInfo getFirstEffect(L2EffectType type) {
+		if (hasBuffs()) {
+			for (BuffInfo info : getBuffs()) {
+				if (info != null) {
+					for (AbstractEffect effect : info.getEffects()) {
+						if ((effect != null) && (effect.getEffectType() == type)) {
+							return info;
+						}
+					}
+				}
+			}
+		}
+		
+		if (hasTriggered()) {
+			for (BuffInfo info : getTriggered()) {
+				if (info != null) {
+					for (AbstractEffect effect : info.getEffects()) {
+						if ((effect != null) && (effect.getEffectType() == type)) {
+							return info;
+						}
+					}
+				}
+			}
+		}
+		
+		if (hasDances()) {
+			for (BuffInfo info : getDances()) {
+				if (info != null) {
+					for (AbstractEffect effect : info.getEffects()) {
+						if ((effect != null) && (effect.getEffectType() == type)) {
+							return info;
+						}
+					}
+				}
+			}
+		}
+		
+		if (hasToggles()) {
+			for (BuffInfo info : getToggles()) {
+				if (info != null) {
+					for (AbstractEffect effect : info.getEffects()) {
+						if ((effect != null) && (effect.getEffectType() == type)) {
+							return info;
+						}
+					}
+				}
+			}
+		}
+		
+		if (hasDebuffs()) {
+			for (BuffInfo info : getDebuffs()) {
+				if (info != null) {
+					for (AbstractEffect effect : info.getEffects()) {
+						if ((effect != null) && (effect.getEffectType() == type)) {
+							return info;
+						}
+					}
+				}
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Verifies if this effect list contains the given skill ID.<br>
+	 * Prevents initialization.
+	 * @param skillId the skill ID to verify
+	 * @return {@code true} if the skill ID is present in the effect list, {@code false} otherwise
+	 */
+	public boolean isAffectedBySkill(int skillId) {
+		return getBuffInfoBySkillId(skillId) != null;
+	}
+	
+	/**
+	 * Gets the buff info by skill ID.<br>
+	 * Prevents initialization.
+	 * @param skillId the skill ID
+	 * @return the buff info
+	 */
+	public BuffInfo getBuffInfoBySkillId(int skillId) {
+		BuffInfo info = null;
+		if (hasBuffs()) {
+			info = getBuffs().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null);
+		}
+		
+		if (hasTriggered() && (info == null)) {
+			info = getTriggered().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null);
+		}
+		
+		if (hasDances() && (info == null)) {
+			info = getDances().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null);
+		}
+		
+		if (hasToggles() && (info == null)) {
+			info = getToggles().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null);
+		}
+		
+		if (hasDebuffs() && (info == null)) {
+			info = getDebuffs().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null);
+		}
+		
+		if (hasPassives() && (info == null)) {
+			info = getPassives().stream().filter(b -> b.getSkill().getId() == skillId).findFirst().orElse(null);
+		}
+		return info;
+	}
+	
+	/**
+	 * Gets a buff info by abnormal type.<br>
+	 * It's O(1) for every buff in this effect list.
+	 * @param type the abnormal skill type
+	 * @return the buff info if it's present, {@code null} otherwise
+	 */
+	public BuffInfo getBuffInfoByAbnormalType(AbnormalType type) {
+		return (_stackedEffects != null) ? _stackedEffects.get(type) : null;
+	}
+	
+	/**
+	 * Adds abnormal types to the blocked buff slot set.
+	 * @param blockedBuffSlots the blocked buff slot set to add
+	 */
+	public void addBlockedBuffSlots(Set<AbnormalType> blockedBuffSlots) {
+		if (_blockedBuffSlots == null) {
+			synchronized (this) {
+				if (_blockedBuffSlots == null) {
+					_blockedBuffSlots = ConcurrentHashMap.newKeySet(blockedBuffSlots.size());
+				}
+			}
+		}
+		_blockedBuffSlots.addAll(blockedBuffSlots);
+	}
+	
+	/**
+	 * Removes abnormal types from the blocked buff slot set.
+	 * @param blockedBuffSlots the blocked buff slot set to remove
+	 * @return {@code true} if the blocked buff slots set has been modified, {@code false} otherwise
+	 */
+	public boolean removeBlockedBuffSlots(Set<AbnormalType> blockedBuffSlots) {
+		if (_blockedBuffSlots != null) {
+			return _blockedBuffSlots.removeAll(blockedBuffSlots);
+		}
+		return false;
+	}
+	
+	/**
+	 * Gets all the blocked abnormal types for this creature effect list.
+	 * @return the current blocked buff slots set
+	 */
+	public Set<AbnormalType> getAllBlockedBuffSlots() {
+		return _blockedBuffSlots;
+	}
+	
+	/**
+	 * Gets the Short Buff info.
+	 * @return the short buff info
+	 */
+	public BuffInfo getShortBuff() {
+		return _shortBuff;
+	}
+	
+	/**
+	 * Sets the Short Buff data and sends an update if the effected is a player.
+	 * @param info the buff info
+	 */
+	public void shortBuffStatusUpdate(BuffInfo info) {
+		if (_owner.isPlayer()) {
+			_shortBuff = info;
+			if (info == null) {
+				_owner.sendPacket(ShortBuffStatusUpdate.RESET_SHORT_BUFF);
+			} else {
+				_owner.sendPacket(new ShortBuffStatusUpdate(info.getSkill().getId(), info.getSkill().getLevel(), info.getTime()));
+			}
+		}
+	}
+	
+	/**
+	 * Checks if the given skill stacks with an existing one.
+	 * @param skill the skill to verify
+	 * @return {@code true} if this effect stacks with the given skill, {@code false} otherwise
+	 */
+	private boolean doesStack(Skill skill) {
+		final AbnormalType type = skill.getAbnormalType();
+		if (type.isNone() || isEmpty()) {
+			return false;
+		}
+		
+		final Queue<BuffInfo> effects = getEffectList(skill);
+		for (BuffInfo info : effects) {
+			if ((info != null) && (info.getSkill().getAbnormalType() == type)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Gets the buffs count without including the hidden buffs (after getting an Herb buff).<br>
+	 * Prevents initialization.
+	 * @return the number of buffs in this creature effect list
+	 */
+	public int getBuffCount() {
+		return hasBuffs() ? getBuffs().size() - _hiddenBuffs.get() - (getShortBuff() != null ? 1 : 0) : 0;
+	}
+	
+	/**
+	 * Gets the Songs/Dances count.<br>
+	 * Prevents initialization.
+	 * @return the number of Songs/Dances in this creature effect list
+	 */
+	public int getDanceCount() {
+		return hasDances() ? getDances().size() : 0;
+	}
+	
+	/**
+	 * Gets the triggered buffs count.<br>
+	 * Prevents initialization.
+	 * @return the number of triggered buffs in this creature effect list
+	 */
+	public int getTriggeredBuffCount() {
+		return hasTriggered() ? getTriggered().size() : 0;
+	}
+	
+	/**
+	 * Gets the hidden buff count.
+	 * @return the number of hidden buffs
+	 */
+	public int getHiddenBuffsCount() {
+		return _hiddenBuffs.get();
+	}
+	
+	/**
+	 * Auxiliary method to stop all effects from a buff info and remove it from an effect list and stacked effects.
+	 * @param info the buff info
+	 */
+	protected void stopAndRemove(BuffInfo info) {
+		stopAndRemove(true, info, getEffectList(info.getSkill()));
+	}
+	
+	/**
+	 * Auxiliary method to stop all effects from a buff info and remove it from an effect list and stacked effects.
+	 * @param info the buff info
+	 * @param effects the effect list
+	 */
+	protected void stopAndRemove(BuffInfo info, Queue<BuffInfo> effects) {
+		stopAndRemove(true, info, effects);
+	}
+	
+	/**
+	 * Auxiliary method to stop all effects from a buff info and remove it from an effect list and stacked effects.
+	 * @param removed {@code true} if the effect is removed, {@code false} otherwise
+	 * @param info the buff info
+	 * @param buffs the buff list
+	 */
+	private void stopAndRemove(boolean removed, BuffInfo info, Queue<BuffInfo> buffs) {
+		if (info == null) {
+			return;
+		}
+		
+		// Removes the buff from the given effect list.
+		buffs.remove(info);
+		// Stop the buff effects.
+		info.stopAllEffects(removed);
+		// If it's a hidden buff that ends, then decrease hidden buff count.
+		if (!info.isInUse()) {
+			_hiddenBuffs.decrementAndGet();
+		}
+		// Removes the buff from the stack.
+		else if (_stackedEffects != null) {
+			_stackedEffects.remove(info.getSkill().getAbnormalType());
+		}
+		
+		// If it's an herb that ends, check if there are hidden buffs.
+		if (info.getSkill().isAbnormalInstant() && hasBuffs()) {
+			for (BuffInfo buff : getBuffs()) {
+				if ((buff != null) && (buff.getSkill().getAbnormalType() == info.getSkill().getAbnormalType()) && !buff.isInUse()) {
+					// Sets the buff in use again.
+					buff.setInUse(true);
+					// Adds the stats.
+					buff.addStats();
+					// Adds the buff to the stack.
+					if (_stackedEffects != null) {
+						_stackedEffects.put(buff.getSkill().getAbnormalType(), buff);
+					}
+					// If it's a hidden buff that gets activated, then decrease hidden buff count.
+					_hiddenBuffs.decrementAndGet();
+					break;
+				}
+			}
+		}
+		
+		if (!removed) {
+			info.getSkill().applyEffectScope(EffectScope.END, info, true, false);
+		}
+	}
+	
+	/**
+	 * Exits all effects in this effect list.<br>
+	 * Stops all the effects, clear the effect lists and updates the effect flags and icons.
+	 */
+	public void stopAllEffects() {
+		// Stop buffs.
+		stopAllBuffs(false, true);
+		// Stop dances and songs.
+		stopAllDances(false);
+		// Stop toggles.
+		stopAllToggles(false);
+		// Stop debuffs.
+		stopAllDebuffs(false);
+		
+		if (_stackedEffects != null) {
+			_stackedEffects.clear();
+		}
+		
+		// Update effect flags and icons.
+		updateEffectList(true);
+	}
+	
+	/**
+	 * Stops all effects in this effect list except those that last through death.
+	 */
+	public void stopAllEffectsExceptThoseThatLastThroughDeath() {
+		boolean update = false;
+		if (hasBuffs()) {
+			getBuffs().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getBuffs()));
+			update = true;
+		}
+		
+		if (hasTriggered()) {
+			getTriggered().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getTriggered()));
+			update = true;
+		}
+		
+		if (hasDebuffs()) {
+			getDebuffs().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getDebuffs()));
+			update = true;
+		}
+		
+		if (hasDances()) {
+			getDances().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getDances()));
+			update = true;
+		}
+		
+		if (hasToggles()) {
+			getToggles().stream().filter(info -> !info.getSkill().isStayAfterDeath()).forEach(info -> stopAndRemove(info, getToggles()));
+			update = true;
+		}
+		
+		// Update effect flags and icons.
+		updateEffectList(update);
+	}
+	
+	/**
+	 * Stop all effects that doesn't stay on sub-class change.
+	 */
+	public void stopAllEffectsNotStayOnSubclassChange() {
+		boolean update = false;
+		if (hasBuffs()) {
+			getBuffs().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getBuffs()));
+			update = true;
+		}
+		
+		if (hasTriggered()) {
+			getTriggered().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getTriggered()));
+			update = true;
+		}
+		
+		if (hasDebuffs()) {
+			getDebuffs().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getDebuffs()));
+			update = true;
+		}
+		
+		if (hasDances()) {
+			getDances().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getDances()));
+			update = true;
+		}
+		
+		if (hasToggles()) {
+			getToggles().stream().filter(info -> !info.getSkill().isStayOnSubclassChange()).forEach(info -> stopAndRemove(info, getToggles()));
+			update = true;
+		}
+		
+		// Update effect flags and icons.
+		updateEffectList(update);
+	}
+	
+	/**
+	 * Stops all the active buffs.
+	 * @param update set to true to update the effect flags and icons
+	 * @param triggered if {@code true} stops triggered skills buffs
+	 */
+	public void stopAllBuffs(boolean update, boolean triggered) {
+		if (hasBuffs()) {
+			getBuffs().forEach(b -> stopAndRemove(b, getBuffs()));
+		}
+		
+		if (triggered && hasTriggered()) {
+			getTriggered().forEach(b -> stopAndRemove(b, getTriggered()));
+		}
+		
+		// Update effect flags and icons.
+		updateEffectList(update);
+	}
+	
+	/**
+	 * Stops all active toggle skills.<br>
+	 * Performs an update.
+	 */
+	public void stopAllToggles() {
+		stopAllToggles(true);
+	}
+	
+	/**
+	 * Stops all active toggle skills.
+	 * @param update set to true to update the effect flags and icons
+	 */
+	public void stopAllToggles(boolean update) {
+		if (hasToggles()) {
+			getToggles().forEach(b -> stopAndRemove(b, getToggles()));
+			// Update effect flags and icons.
+			updateEffectList(update);
+		}
+	}
+	
+	/**
+	 * Stops all active dances/songs skills.
+	 * @param update set to true to update the effect flags and icons
+	 */
+	public void stopAllDances(boolean update) {
+		if (hasDances()) {
+			getDances().forEach(b -> stopAndRemove(b, getDances()));
+			// Update effect flags and icons.
+			updateEffectList(update);
+		}
+	}
+	
+	/**
+	 * Stops all active dances/songs skills.
+	 * @param update set to true to update the effect flags and icons
+	 */
+	public void stopAllDebuffs(boolean update) {
+		if (hasDebuffs()) {
+			getDebuffs().forEach(b -> stopAndRemove(b, getDebuffs()));
+			// Update effect flags and icons.
+			updateEffectList(update);
+		}
+	}
+	
+	/**
+	 * Exit all effects having a specified type.<br>
+	 * TODO: Remove after all effect types are replaced by abnormal skill types.
+	 * @param type the type of the effect to stop
+	 */
+	public void stopEffects(L2EffectType type) {
+		boolean update = false;
+		final Consumer<BuffInfo> action = info -> {
+			if (info.getEffects().stream().anyMatch(effect -> (effect != null) && (effect.getEffectType() == type))) {
+				stopAndRemove(info);
+			}
+		};
+		
+		if (hasBuffs()) {
+			getBuffs().stream().filter(Objects::nonNull).forEach(action);
+			update = true;
+		}
+		
+		if (hasTriggered()) {
+			getTriggered().stream().filter(Objects::nonNull).forEach(action);
+			update = true;
+		}
+		
+		if (hasDances()) {
+			getDances().stream().filter(Objects::nonNull).forEach(action);
+			update = true;
+		}
+		
+		if (hasToggles()) {
+			getToggles().stream().filter(Objects::nonNull).forEach(action);
+			update = true;
+		}
+		
+		if (hasDebuffs()) {
+			getDebuffs().stream().filter(Objects::nonNull).forEach(action);
+			update = true;
+		}
+		
+		// Update effect flags and icons.
+		updateEffectList(update);
+	}
+	
+	/**
+	 * Exits all effects created by a specific skill ID.<br>
+	 * Removes the effects from the effect list.<br>
+	 * Removes the stats from the creature.<br>
+	 * Updates the effect flags and icons.<br>
+	 * Presents two overloads:<br>
+	 * {@link #stopSkillEffects(boolean, Skill)}<br>
+	 * {@link #stopSkillEffects(boolean, AbnormalType)}
+	 * @param removed {@code true} if the effect is removed, {@code false} otherwise
+	 * @param skillId the skill ID
+	 */
+	public void stopSkillEffects(boolean removed, int skillId) {
+		final BuffInfo info = getBuffInfoBySkillId(skillId);
+		if (info != null) {
+			remove(removed, info);
+		}
+	}
+	
+	/**
+	 * Exits all effects created by a specific skill.<br>
+	 * Removes the effects from the effect list.<br>
+	 * Removes the stats from the creature.<br>
+	 * Updates the effect flags and icons.<br>
+	 * Presents two overloads:<br>
+	 * {@link #stopSkillEffects(boolean, int)}<br>
+	 * {@link #stopSkillEffects(boolean, AbnormalType)}
+	 * @param removed {@code true} if the effect is removed, {@code false} otherwise
+	 * @param skill the skill
+	 */
+	public void stopSkillEffects(boolean removed, Skill skill) {
+		if (skill != null) {
+			stopSkillEffects(removed, skill.getId());
+		}
+	}
+	
+	/**
+	 * Exits all effects created by a specific skill abnormal type.<br>
+	 * It's O(1) for every effect in this effect list except passive effects.<br>
+	 * Presents two overloads:<br>
+	 * {@link #stopSkillEffects(boolean, int)}<br>
+	 * {@link #stopSkillEffects(boolean, Skill)}
+	 * @param removed {@code true} if the effect is removed, {@code false} otherwise
+	 * @param type the skill abnormal type
+	 * @return {@code true} if there was a buff info with the given abnormal type
+	 */
+	public boolean stopSkillEffects(boolean removed, AbnormalType type) {
+		if (_stackedEffects != null) {
+			final BuffInfo old = _stackedEffects.remove(type);
+			if (old != null) {
+				stopSkillEffects(removed, old.getSkill());
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Exits all buffs effects of the skills with "removedOnAnyAction" set.<br>
+	 * Called on any action except movement (attack, cast).
+	 */
+	public void stopEffectsOnAction() {
+		if (_hasBuffsRemovedOnAnyAction) {
+			boolean update = false;
+			if (hasBuffs()) {
+				getBuffs().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getBuffs()));
+				update = true;
+			}
+			
+			if (hasTriggered()) {
+				getTriggered().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getTriggered()));
+				update = true;
+			}
+			
+			if (hasDebuffs()) {
+				getDebuffs().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getDebuffs()));
+				update = true;
+			}
+			
+			if (hasDances()) {
+				getDances().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getDances()));
+				update = true;
+			}
+			
+			if (hasToggles()) {
+				getToggles().stream().filter(info -> info.getSkill().isRemovedOnAnyActionExceptMove()).forEach(info -> stopAndRemove(info, getToggles()));
+				update = true;
+			}
+			
+			// Update effect flags and icons.
+			updateEffectList(update);
+		}
+	}
+	
+	public void stopEffectsOnDamage(boolean awake) {
+		if (awake) {
+			boolean update = false;
+			if (_hasBuffsRemovedOnDamage) {
+				if (hasBuffs()) {
+					getBuffs().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getBuffs()));
+					update = true;
+				}
+				
+				if (hasTriggered()) {
+					getTriggered().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getTriggered()));
+					update = true;
+				}
+				
+				if (hasDances()) {
+					getDances().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getDances()));
+					update = true;
+				}
+				
+				if (hasToggles()) {
+					getToggles().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getToggles()));
+					update = true;
+				}
+			}
+			
+			if (_hasDebuffsRemovedOnDamage) {
+				if (hasDebuffs()) {
+					getDebuffs().stream().filter(Objects::nonNull).filter(info -> info.getSkill().isRemovedOnDamage()).forEach(info -> stopAndRemove(info, getDebuffs()));
+					update = true;
+				}
+			}
+			// Update effect flags and icons.
+			updateEffectList(update);
+		}
+	}
+	
+	/**
+	 * @param partyOnly
+	 */
+	public void updateEffectIcons(boolean partyOnly) {
+		if (partyOnly) {
+			_partyOnly = true;
+		}
+		// Update effect flags and icons.
+		updateEffectList(true);
+	}
+	
+	/**
+	 * Verify if this effect list is empty.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if this effect list contains any skills
+	 */
+	public boolean isEmpty() {
+		return !hasBuffs() && !hasTriggered() && !hasDances() && !hasDebuffs() && !hasToggles();
+	}
+	
+	/**
+	 * Verify if this effect list has buffs skills.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if {@link #_buffs} is not {@code null} and is not empty
+	 */
+	public boolean hasBuffs() {
+		return (_buffs != null) && !_buffs.isEmpty();
+	}
+	
+	/**
+	 * Verify if this effect list has triggered skills.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if {@link #_triggered} is not {@code null} and is not empty
+	 */
+	public boolean hasTriggered() {
+		return (_triggered != null) && !_triggered.isEmpty();
+	}
+	
+	/**
+	 * Verify if this effect list has dance/song skills.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if {@link #_dances} is not {@code null} and is not empty
+	 */
+	public boolean hasDances() {
+		return (_dances != null) && !_dances.isEmpty();
+	}
+	
+	/**
+	 * Verify if this effect list has toggle skills.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if {@link #_toggles} is not {@code null} and is not empty
+	 */
+	public boolean hasToggles() {
+		return (_toggles != null) && !_toggles.isEmpty();
+	}
+	
+	/**
+	 * Verify if this effect list has debuffs skills.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if {@link #_debuffs} is not {@code null} and is not empty
+	 */
+	public boolean hasDebuffs() {
+		return (_debuffs != null) && !_debuffs.isEmpty();
+	}
+	
+	/**
+	 * Verify if this effect list has passive skills.<br>
+	 * Prevents initialization.
+	 * @return {@code true} if {@link #_passives} is not {@code null} and is not empty
+	 */
+	public boolean hasPassives() {
+		return (_passives != null) && !_passives.isEmpty();
+	}
+	
+	/**
+	 * Executes a procedure for all effects.<br>
+	 * Prevents initialization.
+	 * @param function the function to execute
+	 * @param dances if {@code true} dances/songs will be included
+	 */
+	public void forEach(Function<BuffInfo, Boolean> function, boolean dances) {
+		boolean update = false;
+		if (hasBuffs()) {
+			for (BuffInfo info : getBuffs()) {
+				update |= function.apply(info);
+			}
+		}
+		
+		if (hasTriggered()) {
+			for (BuffInfo info : getTriggered()) {
+				update |= function.apply(info);
+			}
+		}
+		
+		if (dances && hasDances()) {
+			for (BuffInfo info : getDances()) {
+				update |= function.apply(info);
+			}
+		}
+		
+		if (hasToggles()) {
+			for (BuffInfo info : getToggles()) {
+				update |= function.apply(info);
+			}
+		}
+		
+		if (hasDebuffs()) {
+			for (BuffInfo info : getDebuffs()) {
+				update |= function.apply(info);
+			}
+		}
+		// Update effect flags and icons.
+		updateEffectList(update);
+	}
+	
+	/**
+	 * Removes a set of effects from this effect list.
+	 * @param removed {@code true} if the effect is removed, {@code false} otherwise
+	 * @param info the effects to remove
+	 */
+	public void remove(boolean removed, BuffInfo info) {
+		if (info == null) {
+			return;
+		}
+		
+		// Remove the effect from creature effects.
+		stopAndRemove(removed, info, getEffectList(info.getSkill()));
+		// Update effect flags and icons.
+		updateEffectList(true);
+	}
+	
+	/**
+	 * Adds a set of effects to this effect list.
+	 * @param info the buff info
+	 */
+	public void add(BuffInfo info) {
+		if (info == null) {
+			return;
+		}
+		
+		// Support for blocked buff slots.
+		final Skill skill = info.getSkill();
+		if ((_blockedBuffSlots != null) && _blockedBuffSlots.contains(skill.getAbnormalType())) {
+			return;
+		}
+		
+		// Passive effects are treated specially
+		if (skill.isPassive()) {
+			// Passive effects don't need stack type!
+			if (!skill.getAbnormalType().isNone()) {
+				LOG.warn("Passive {} with abnormal type: {}!", skill, skill.getAbnormalType());
+			}
+			
+			// Check for passive skill conditions.
+			if (!skill.checkCondition(info.getEffector(), info.getEffected(), false)) {
+				return;
+			}
+			
+			// Puts the effects in the list.
+			getPassives().stream().filter(b -> b.getSkill().getId() == skill.getId()).forEach(b -> {
+				// Removes the old stats from the creature if the skill was present.
+				b.setInUse(false);
+				b.removeStats();
+				getPassives().remove(b);
+			});
+			
+			getPassives().add(info);
+			
+			// Initialize effects.
+			info.initializeEffects();
+			return;
+		}
+		
+		// Prevent adding and initializing buffs/effects on dead creatures.
+		if (info.getEffected().isDead() && (info.getEffector() != info.getEffector())) {
+			return;
+		}
+		
+		// The old effect is removed using Map#remove(key) instead of Map#put(key, value) (that would be the wisest choice),
+		// Because order matters and put method would insert in the same place it was before, instead of, at the end of the effect list
+		// Where new buff should be placed
+		if (skill.getAbnormalType().isNone()) {
+			stopSkillEffects(true, skill);
+		}
+		// Verify stacked skills.
+		else {
+			if (_stackedEffects == null) {
+				synchronized (this) {
+					if (_stackedEffects == null) {
+						_stackedEffects = new ConcurrentHashMap<>();
+					}
+				}
+			}
+			
+			if (_stackedEffects.containsKey(skill.getAbnormalType())) {
+				BuffInfo stackedInfo = _stackedEffects.get(skill.getAbnormalType());
+				// Skills are only replaced if the incoming buff has greater or equal abnormal level.
+				if ((stackedInfo != null) && (skill.getAbnormalLvl() >= stackedInfo.getSkill().getAbnormalLvl())) {
+					// If it is an herb, set as not in use the lesser buff.
+					// Effect will be present in the effect list.
+					// Effects stats are removed and onActionTime() is not called.
+					// But finish task continues to run, and ticks as well.
+					if (skill.isAbnormalInstant()) {
+						if (stackedInfo.getSkill().isAbnormalInstant()) {
+							stopSkillEffects(true, skill.getAbnormalType());
+							stackedInfo = _stackedEffects.get(skill.getAbnormalType());
+						}
+						
+						if (stackedInfo != null) {
+							stackedInfo.setInUse(false);
+							// Remove stats
+							stackedInfo.removeStats();
+							_hiddenBuffs.incrementAndGet();
+						}
+					}
+					// Remove buff that will stack with the abnormal type.
+					else {
+						if (stackedInfo.getSkill().isAbnormalInstant()) {
+							stopSkillEffects(true, skill.getAbnormalType());
+						}
+						stopSkillEffects(true, skill.getAbnormalType());
+					}
+				}
+				// If the new buff is a lesser buff, then don't add it.
+				else {
+					return;
+				}
+			}
+			_stackedEffects.put(skill.getAbnormalType(), info);
+		}
+		
+		// Select the map that holds the effects related to this skill.
+		final Queue<BuffInfo> effects = getEffectList(skill);
+		// Remove first buff when buff list is full.
+		if (!skill.isDebuff() && !skill.isToggle() && !skill.is7Signs() && !doesStack(skill)) {
+			int buffsToRemove = -1;
+			if (skill.isDance()) {
+				buffsToRemove = getDanceCount() - character().getMaxDanceAmount();
+			} else if (skill.isTrigger()) {
+				buffsToRemove = getTriggeredBuffCount() - character().getMaxTriggeredBuffAmount();
+			} else if (!skill.isHealingPotionSkill()) {
+				buffsToRemove = getBuffCount() - _owner.getStat().getMaxBuffCount();
+			}
+			
+			for (BuffInfo bi : effects) {
+				if (buffsToRemove < 0) {
+					break;
+				}
+				
+				if (!bi.isInUse()) {
+					continue;
+				}
+				
+				if (bi.getSkill().getAbnormalType() == AbnormalType.SUMMON_CONDITION) {
+					continue;
+				}
+				
+				stopAndRemove(bi, effects);
+				
+				buffsToRemove--;
+			}
+		}
+		
+		// After removing old buff (same ID) or stacked buff (same abnormal type),
+		// Add the buff to the end of the effect list.
+		effects.add(info);
+		// Initialize effects.
+		info.initializeEffects();
+		// Update effect flags and icons.
+		updateEffectList(true);
+	}
+	
+	/**
+	 * Update effect icons.<br>
+	 * Prevents initialization.
+	 */
+	private void updateEffectIcons() {
+		if (_owner == null) {
+			return;
+		}
+		
+		updateEffectFlags();
+		
+		if (!_owner.isPlayable()) {
+			return;
+		}
+		
+		AbnormalStatusUpdate asu = null;
+		PartySpelled ps = null;
+		PartySpelled psSummon = null;
+		ExOlympiadSpelledInfo os = null;
+		boolean isSummon = false;
+		
+		if (_owner.isPlayer()) {
+			if (_partyOnly) {
+				_partyOnly = false;
+			} else {
+				asu = new AbnormalStatusUpdate();
+			}
+			
+			if (_owner.isInParty()) {
+				ps = new PartySpelled(_owner);
+			}
+			
+			if (_owner.getActingPlayer().isInOlympiadMode() && _owner.getActingPlayer().isOlympiadStart()) {
+				os = new ExOlympiadSpelledInfo(_owner.getActingPlayer());
+			}
+		} else if (_owner.isSummon()) {
+			isSummon = true;
+			ps = new PartySpelled(_owner);
+			psSummon = new PartySpelled(_owner);
+		}
+		
+		// Buffs.
+		if (hasBuffs()) {
+			for (BuffInfo info : getBuffs()) {
+				if (info.getSkill().isHealingPotionSkill()) {
+					shortBuffStatusUpdate(info);
+				} else {
+					addIcon(info, asu, ps, psSummon, os, isSummon);
+				}
+			}
+		}
+		
+		// Triggered buffs.
+		if (hasTriggered()) {
+			for (BuffInfo info : getTriggered()) {
+				addIcon(info, asu, ps, psSummon, os, isSummon);
+			}
+		}
+		
+		// Songs and dances.
+		if (hasDances()) {
+			for (BuffInfo info : getDances()) {
+				addIcon(info, asu, ps, psSummon, os, isSummon);
+			}
+		}
+		
+		// Songs and dances.
+		if (hasToggles()) {
+			for (BuffInfo info : getToggles()) {
+				addIcon(info, asu, ps, psSummon, os, isSummon);
+			}
+		}
+		
+		// Debuffs.
+		if (hasDebuffs()) {
+			for (BuffInfo info : getDebuffs()) {
+				addIcon(info, asu, ps, psSummon, os, isSummon);
+			}
+		}
+		
+		if (asu != null) {
+			_owner.sendPacket(asu);
+		}
+		
+		if (ps != null) {
+			if (_owner.isSummon()) {
+				final L2PcInstance summonOwner = ((L2Summon) _owner).getOwner();
+				if (summonOwner != null) {
+					if (summonOwner.isInParty()) {
+						summonOwner.getParty().broadcastToPartyMembers(summonOwner, psSummon); // send to all member except summonOwner
+					}
+					summonOwner.sendPacket(ps);
+				}
+			} else if (_owner.isPlayer() && _owner.isInParty()) {
+				_owner.getParty().broadcastPacket(ps);
+			}
+		}
+		
+		if (os != null) {
+			final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(_owner.getActingPlayer().getOlympiadGameId());
+			if ((game != null) && game.isBattleStarted()) {
+				game.getZone().broadcastPacketToObservers(os);
+			}
+		}
+	}
+	
+	private void addIcon(BuffInfo info, AbnormalStatusUpdate asu, PartySpelled ps, PartySpelled psSummon, ExOlympiadSpelledInfo os, boolean isSummon) {
+		// Avoid null and not in use buffs.
+		if ((info == null) || !info.isInUse()) {
+			return;
+		}
+		
+		final Skill skill = info.getSkill();
+		if (asu != null) {
+			asu.addSkill(info);
+		}
+		
+		if ((ps != null) && (isSummon || !skill.isToggle())) {
+			ps.addSkill(info);
+		}
+		
+		if ((psSummon != null) && !skill.isToggle()) {
+			psSummon.addSkill(info);
+		}
+		
+		if (os != null) {
+			os.addSkill(info);
+		}
+	}
+	
+	/**
+	 * Wrapper to update abnormal icons and effect flags.
+	 * @param update if {@code true} performs an update
+	 */
+	private void updateEffectList(boolean update) {
+		if (update) {
+			updateEffectIcons();
+			computeEffectFlags();
+		}
+	}
+	
+	/**
+	 * Updates effect flags.<br>
+	 * TODO: Rework it to update in real time (add/remove/stop/activate/deactivate operations) and avoid iterations.
+	 */
+	private void updateEffectFlags() {
+		if (hasBuffs()) {
+			for (BuffInfo info : getBuffs()) {
+				if (info == null) {
+					continue;
+				}
+				
+				if (info.getSkill().isRemovedOnAnyActionExceptMove()) {
+					_hasBuffsRemovedOnAnyAction = true;
+				}
+				
+				if (info.getSkill().isRemovedOnDamage()) {
+					_hasBuffsRemovedOnDamage = true;
+				}
+			}
+		}
+		
+		if (hasTriggered()) {
+			for (BuffInfo info : getTriggered()) {
+				if (info == null) {
+					continue;
+				}
+				
+				if (info.getSkill().isRemovedOnAnyActionExceptMove()) {
+					_hasBuffsRemovedOnAnyAction = true;
+				}
+				
+				if (info.getSkill().isRemovedOnDamage()) {
+					_hasBuffsRemovedOnDamage = true;
+				}
+			}
+		}
+		
+		if (hasToggles()) {
+			for (BuffInfo info : getToggles()) {
+				if (info == null) {
+					continue;
+				}
+				
+				if (info.getSkill().isRemovedOnAnyActionExceptMove()) {
+					_hasBuffsRemovedOnAnyAction = true;
+				}
+				
+				if (info.getSkill().isRemovedOnDamage()) {
+					_hasBuffsRemovedOnDamage = true;
+				}
+			}
+		}
+		
+		if (hasDebuffs()) {
+			for (BuffInfo info : getDebuffs()) {
+				if ((info != null) && info.getSkill().isRemovedOnDamage()) {
+					_hasDebuffsRemovedOnDamage = true;
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Recalculate effect bits flag.<br>
+	 * TODO: Rework to update in real time and avoid iterations.
+	 */
+	private void computeEffectFlags() {
+		int flags = 0;
+		if (hasBuffs()) {
+			for (BuffInfo info : getBuffs()) {
+				if (info != null) {
+					for (AbstractEffect e : info.getEffects()) {
+						flags |= e.getEffectFlags();
+					}
+				}
+			}
+		}
+		
+		if (hasTriggered()) {
+			for (BuffInfo info : getTriggered()) {
+				if (info != null) {
+					for (AbstractEffect e : info.getEffects()) {
+						flags |= e.getEffectFlags();
+					}
+				}
+			}
+		}
+		
+		if (hasDebuffs()) {
+			for (BuffInfo info : getDebuffs()) {
+				if (info != null) {
+					for (AbstractEffect e : info.getEffects()) {
+						flags |= e.getEffectFlags();
+					}
+				}
+			}
+		}
+		
+		if (hasDances()) {
+			for (BuffInfo info : getDances()) {
+				if (info != null) {
+					for (AbstractEffect e : info.getEffects()) {
+						flags |= e.getEffectFlags();
+					}
+				}
+			}
+		}
+		
+		if (hasToggles()) {
+			for (BuffInfo info : getToggles()) {
+				if (info != null) {
+					for (AbstractEffect e : info.getEffects()) {
+						flags |= e.getEffectFlags();
+					}
+				}
+			}
+		}
+		_effectFlags = flags;
+	}
+	
+	/**
+	 * Check if target is affected with special buff
+	 * @param flag of special buff
+	 * @return boolean true if affected
+	 */
+	public boolean isAffected(EffectFlag flag) {
+		return (_effectFlags & flag.getMask()) != 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java b/src/main/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
new file mode 100644
index 00000000..d4099cea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/CharSelectInfoPackage.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+
+/**
+ * Used to Store data sent to Client for Character.<br>
+ * Selection screen.
+ * @since 2005/03/27 15:29:33
+ */
+public class CharSelectInfoPackage {
+	private String _name;
+	private int _objectId = 0;
+	private long _exp = 0;
+	private int _sp = 0;
+	private int _clanId = 0;
+	private int _race = 0;
+	private int _classId = 0;
+	private int _baseClassId = 0;
+	private long _deleteTimer = 0L;
+	private long _lastAccess = 0L;
+	private int _face = 0;
+	private int _hairStyle = 0;
+	private int _hairColor = 0;
+	private int _sex = 0;
+	private int _level = 1;
+	private int _maxCp = 0;
+	private double _currentCp = 0;
+	private int _maxHp = 0;
+	private double _currentHp = 0;
+	private int _maxMp = 0;
+	private double _currentMp = 0;
+	private final int[][] _paperdoll;
+	private int _karma = 0;
+	private int _pkKills = 0;
+	private int _pvpKills = 0;
+	private int _augmentationId = 0;
+	private int _x = 0;
+	private int _y = 0;
+	private int _z = 0;
+	private String _htmlPrefix = null;
+	private int _vitalityPoints = 0;
+	private int _accessLevel = 0;
+	
+	/**
+	 * Constructor for CharSelectInfoPackage.
+	 * @param objectId character object Id.
+	 * @param name the character's name.
+	 */
+	public CharSelectInfoPackage(int objectId, String name) {
+		setObjectId(objectId);
+		_name = name;
+		_paperdoll = PcInventory.restoreVisibleInventory(objectId);
+	}
+	
+	/**
+	 * @return the character object Id.
+	 */
+	public int getObjectId() {
+		return _objectId;
+	}
+	
+	public void setObjectId(int objectId) {
+		_objectId = objectId;
+	}
+	
+	/**
+	 * @return the character's access level.
+	 */
+	public int getAccessLevel() {
+		return _accessLevel;
+	}
+	
+	/**
+	 * @param level the character's access level to be set.
+	 */
+	public void setAccessLevel(int level) {
+		_accessLevel = level;
+	}
+	
+	public int getClanId() {
+		return _clanId;
+	}
+	
+	public void setClanId(int clanId) {
+		_clanId = clanId;
+	}
+	
+	public int getClassId() {
+		return _classId;
+	}
+	
+	public int getBaseClassId() {
+		return _baseClassId;
+	}
+	
+	public void setClassId(int classId) {
+		_classId = classId;
+	}
+	
+	public void setBaseClassId(int baseClassId) {
+		_baseClassId = baseClassId;
+	}
+	
+	public double getCurrentCp() {
+		return _currentCp;
+	}
+	
+	public void setCurrentCp(double currentCp) {
+		_currentCp = currentCp;
+	}
+	
+	public double getCurrentHp() {
+		return _currentHp;
+	}
+	
+	public void setCurrentHp(double currentHp) {
+		_currentHp = currentHp;
+	}
+	
+	public double getCurrentMp() {
+		return _currentMp;
+	}
+	
+	public void setCurrentMp(double currentMp) {
+		_currentMp = currentMp;
+	}
+	
+	public long getDeleteTimer() {
+		return _deleteTimer;
+	}
+	
+	public void setDeleteTimer(long deleteTimer) {
+		_deleteTimer = deleteTimer;
+	}
+	
+	public long getLastAccess() {
+		return _lastAccess;
+	}
+	
+	public void setLastAccess(long lastAccess) {
+		_lastAccess = lastAccess;
+	}
+	
+	public long getExp() {
+		return _exp;
+	}
+	
+	public void setExp(long exp) {
+		_exp = exp;
+	}
+	
+	public int getFace() {
+		return _face;
+	}
+	
+	public void setFace(int face) {
+		_face = face;
+	}
+	
+	public int getHairColor() {
+		return _hairColor;
+	}
+	
+	public void setHairColor(int hairColor) {
+		_hairColor = hairColor;
+	}
+	
+	public int getHairStyle() {
+		return _hairStyle;
+	}
+	
+	public void setHairStyle(int hairStyle) {
+		_hairStyle = hairStyle;
+	}
+	
+	public int getPaperdollObjectId(int slot) {
+		return _paperdoll[slot][0];
+	}
+	
+	public int getPaperdollItemId(int slot) {
+		return _paperdoll[slot][1];
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public void setLevel(int level) {
+		_level = level;
+	}
+	
+	public int getMaxCp() {
+		return _maxCp;
+	}
+	
+	public void setMaxCp(int maxCp) {
+		_maxCp = maxCp;
+	}
+	
+	public int getMaxHp() {
+		return _maxHp;
+	}
+	
+	public void setMaxHp(int maxHp) {
+		_maxHp = maxHp;
+	}
+	
+	public int getMaxMp() {
+		return _maxMp;
+	}
+	
+	public void setMaxMp(int maxMp) {
+		_maxMp = maxMp;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public void setName(String name) {
+		_name = name;
+	}
+	
+	public int getRace() {
+		return _race;
+	}
+	
+	public void setRace(int race) {
+		_race = race;
+	}
+	
+	public int getSex() {
+		return _sex;
+	}
+	
+	public void setSex(int sex) {
+		_sex = sex;
+	}
+	
+	public int getSp() {
+		return _sp;
+	}
+	
+	public void setSp(int sp) {
+		_sp = sp;
+	}
+	
+	public int getEnchantEffect() {
+		if (_paperdoll[Inventory.PAPERDOLL_RHAND][2] > 0) {
+			return _paperdoll[Inventory.PAPERDOLL_RHAND][2];
+		}
+		return _paperdoll[Inventory.PAPERDOLL_RHAND][2];
+	}
+	
+	public void setKarma(int k) {
+		_karma = k;
+	}
+	
+	public int getKarma() {
+		return _karma;
+	}
+	
+	public void setAugmentationId(int augmentationId) {
+		_augmentationId = augmentationId;
+	}
+	
+	public int getAugmentationId() {
+		return _augmentationId;
+	}
+	
+	public void setPkKills(int PkKills) {
+		_pkKills = PkKills;
+	}
+	
+	public int getPkKills() {
+		return _pkKills;
+	}
+	
+	public void setPvPKills(int PvPKills) {
+		_pvpKills = PvPKills;
+	}
+	
+	public int getPvPKills() {
+		return _pvpKills;
+	}
+	
+	public int getX() {
+		return _x;
+	}
+	
+	public int getY() {
+		return _y;
+	}
+	
+	public int getZ() {
+		return _z;
+	}
+	
+	public void setX(int x) {
+		_x = x;
+	}
+	
+	public void setY(int y) {
+		_y = y;
+	}
+	
+	public void setZ(int z) {
+		_z = z;
+	}
+	
+	public String getHtmlPrefix() {
+		return _htmlPrefix;
+	}
+	
+	public void setHtmlPrefix(String s) {
+		_htmlPrefix = s;
+	}
+	
+	public void setVitalityPoints(int points) {
+		_vitalityPoints = points;
+	}
+	
+	public int getVitalityPoints() {
+		return _vitalityPoints;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/ClanInfo.java b/src/main/java/com/l2jserver/gameserver/model/ClanInfo.java
new file mode 100644
index 00000000..aa015604
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ClanInfo.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author UnAfraid
+ */
+public class ClanInfo {
+	private final L2Clan _clan;
+	private final int _total;
+	private final int _online;
+	
+	public ClanInfo(final L2Clan clan) {
+		_clan = clan;
+		_total = clan.getMembersCount();
+		_online = clan.getOnlineMembersCount();
+	}
+	
+	public L2Clan getClan() {
+		return _clan;
+	}
+	
+	public int getTotal() {
+		return _total;
+	}
+	
+	public int getOnline() {
+		return _online;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/ClanPrivilege.java b/src/main/java/com/l2jserver/gameserver/model/ClanPrivilege.java
new file mode 100644
index 00000000..a723af7a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ClanPrivilege.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * This enum is used for clan privileges.<br>
+ * The ordinal of each entry is the bit index in the privilege bitmask.
+ * @author HorridoJoho
+ */
+public enum ClanPrivilege {
+	/** dummy entry */
+	DUMMY,
+	/** Privilege to join clan */
+	CL_JOIN_CLAN,
+	/** Privilege to give a title */
+	CL_GIVE_TITLE,
+	/** Privilege to view warehouse content */
+	CL_VIEW_WAREHOUSE,
+	/** Privilege to manage clan ranks */
+	CL_MANAGE_RANKS,
+	CL_PLEDGE_WAR,
+	CL_DISMISS,
+	/** Privilege to register clan crest */
+	CL_REGISTER_CREST,
+	CL_APPRENTICE,
+	CL_TROOPS_FAME,
+	CL_SUMMON_AIRSHIP,
+	/** Privilege to open a door */
+	CH_OPEN_DOOR,
+	CH_OTHER_RIGHTS,
+	CH_AUCTION,
+	CH_DISMISS,
+	CH_SET_FUNCTIONS,
+	CS_OPEN_DOOR,
+	CS_MANOR_ADMIN,
+	CS_MANAGE_SIEGE,
+	CS_USE_FUNCTIONS,
+	CS_DISMISS,
+	CS_TAXES,
+	CS_MERCENARIES,
+	CS_SET_FUNCTIONS;
+	
+	public int getBitmask() {
+		return 1 << ordinal();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/CombatFlag.java b/src/main/java/com/l2jserver/gameserver/model/CombatFlag.java
new file mode 100644
index 00000000..21ddbebb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/CombatFlag.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class CombatFlag {
+	// private static final Logger _log = Logger.getLogger(CombatFlag.class.getName());
+	
+	private L2PcInstance _player = null;
+	private int _playerId = 0;
+	private L2ItemInstance _item = null;
+	private L2ItemInstance _itemInstance;
+	private final Location _location;
+	private final int _itemId;
+	
+	public CombatFlag(int fortId, int x, int y, int z, int heading, int item_id) {
+		_location = new Location(x, y, z, heading);
+		_itemId = item_id;
+	}
+	
+	public synchronized void spawnMe() {
+		// Init the dropped L2ItemInstance and add it in the world as a visible object at the position where mob was last
+		_itemInstance = ItemTable.getInstance().createItem("Combat", _itemId, 1, null, null);
+		_itemInstance.dropMe(null, _location.getX(), _location.getY(), _location.getZ());
+	}
+	
+	public synchronized void unSpawnMe() {
+		if (_player != null) {
+			dropIt();
+		}
+		if (_itemInstance != null) {
+			_itemInstance.decayMe();
+		}
+	}
+	
+	public boolean activate(L2PcInstance player, L2ItemInstance item) {
+		if (player.isMounted()) {
+			player.sendPacket(SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+			return false;
+		}
+		
+		// Player holding it data
+		_player = player;
+		_playerId = _player.getObjectId();
+		_itemInstance = null;
+		
+		// Equip with the weapon
+		_item = item;
+		_player.getInventory().equipItem(_item);
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_EQUIPPED);
+		sm.addItemName(_item);
+		_player.sendPacket(sm);
+		
+		// Refresh inventory
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addItem(_item);
+			_player.sendPacket(iu);
+		} else {
+			_player.sendPacket(new ItemList(_player, false));
+		}
+		// Refresh player stats
+		_player.broadcastUserInfo();
+		_player.setCombatFlagEquipped(true);
+		return true;
+	}
+	
+	public void dropIt() {
+		// Reset player stats
+		_player.setCombatFlagEquipped(false);
+		int slot = _player.getInventory().getSlotFromItem(_item);
+		_player.getInventory().unEquipItemInBodySlot(slot);
+		_player.destroyItem("CombatFlag", _item, null, true);
+		_item = null;
+		_player.broadcastUserInfo();
+		_player = null;
+		_playerId = 0;
+	}
+	
+	public int getPlayerObjectId() {
+		return _playerId;
+	}
+	
+	public L2ItemInstance getCombatFlagInstance() {
+		return _itemInstance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/CropProcure.java b/src/main/java/com/l2jserver/gameserver/model/CropProcure.java
new file mode 100644
index 00000000..f6f18b17
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/CropProcure.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author malyelfik
+ */
+public final class CropProcure extends SeedProduction {
+	private final int _rewardType;
+	
+	public CropProcure(int id, long amount, int type, long startAmount, long price) {
+		super(id, amount, price, startAmount);
+		_rewardType = type;
+	}
+	
+	public int getReward() {
+		return _rewardType;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/CursedWeapon.java b/src/main/java/com/l2jserver/gameserver/model/CursedWeapon.java
new file mode 100644
index 00000000..c12374cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/CursedWeapon.java
@@ -0,0 +1,626 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.TransformData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.model.L2Party.messageType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.Earthquake;
+import com.l2jserver.gameserver.network.serverpackets.ExRedSky;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.Broadcast;
+
+public class CursedWeapon implements INamable {
+	private static final Logger LOG = LoggerFactory.getLogger(CursedWeapon.class);
+	
+	// _name is the name of the cursed weapon associated with its ID.
+	private final String _name;
+	// _itemId is the Item ID of the cursed weapon.
+	private final int _itemId;
+	// _skillId is the skills ID.
+	private final int _skillId;
+	private final int _skillMaxLevel;
+	private int _dropRate;
+	private int _duration;
+	private int _durationLost;
+	private int _disappearChance;
+	private int _stageKills;
+	
+	// this should be false unless if the cursed weapon is dropped, in that case it would be true.
+	private boolean _isDropped = false;
+	// this sets the cursed weapon status to true only if a player has the cursed weapon, otherwise this should be false.
+	private boolean _isActivated = false;
+	private ScheduledFuture<?> _removeTask;
+	
+	private int _nbKills = 0;
+	private long _endTime = 0;
+	
+	private int _playerId = 0;
+	protected L2PcInstance _player = null;
+	private L2ItemInstance _item = null;
+	private int _playerKarma = 0;
+	private int _playerPkKills = 0;
+	private int transformationId = 0;
+	
+	public CursedWeapon(int itemId, int skillId, String name) {
+		_name = name;
+		_itemId = itemId;
+		_skillId = skillId;
+		_skillMaxLevel = SkillData.getInstance().getMaxLevel(_skillId);
+	}
+	
+	public void endOfLife() {
+		if (_isActivated) {
+			if ((_player != null) && _player.isOnline()) {
+				// Remove from player
+				LOG.info("{} being removed online.", _name);
+				
+				_player.abortAttack();
+				
+				_player.setKarma(_playerKarma);
+				_player.setPkKills(_playerPkKills);
+				_player.setCursedWeaponEquippedId(0);
+				removeSkill();
+				
+				// Remove
+				_player.getInventory().unEquipItemInBodySlot(L2Item.SLOT_LR_HAND);
+				_player.storeMe();
+				
+				// Destroy
+				L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
+				if (!general().forceInventoryUpdate()) {
+					InventoryUpdate iu = new InventoryUpdate();
+					if (removedItem.getCount() == 0) {
+						iu.addRemovedItem(removedItem);
+					} else {
+						iu.addModifiedItem(removedItem);
+					}
+					
+					_player.sendPacket(iu);
+				} else {
+					_player.sendPacket(new ItemList(_player, true));
+				}
+				
+				_player.broadcastUserInfo();
+			} else {
+				// Remove from Db
+				LOG.info("{} being removed offline.", _name);
+				
+				try (var con = ConnectionFactory.getInstance().getConnection();
+					var del = con.prepareStatement("DELETE FROM items WHERE owner_id=? AND item_id=?");
+					var ps = con.prepareStatement("UPDATE characters SET karma=?, pkkills=? WHERE charId=?")) {
+					// Delete the item
+					del.setInt(1, _playerId);
+					del.setInt(2, _itemId);
+					if (del.executeUpdate() != 1) {
+						LOG.warn("Error while deleting itemId {} from userId {}", _itemId, _playerId);
+					}
+					
+					// Restore the karma
+					ps.setInt(1, _playerKarma);
+					ps.setInt(2, _playerPkKills);
+					ps.setInt(3, _playerId);
+					if (ps.executeUpdate() != 1) {
+						LOG.warn("Error while updating karma & pkkills for userId {}", _playerId);
+					}
+				} catch (Exception e) {
+					LOG.warn("Could not delete : {}", e.getMessage(), e);
+				}
+			}
+		} else {
+			// either this cursed weapon is in the inventory of someone who has another cursed weapon equipped,
+			// OR this cursed weapon is on the ground.
+			if ((_player != null) && (_player.getInventory().getItemByItemId(_itemId) != null)) {
+				// Destroy
+				L2ItemInstance removedItem = _player.getInventory().destroyItemByItemId("", _itemId, 1, _player, null);
+				if (!general().forceInventoryUpdate()) {
+					InventoryUpdate iu = new InventoryUpdate();
+					if (removedItem.getCount() == 0) {
+						iu.addRemovedItem(removedItem);
+					} else {
+						iu.addModifiedItem(removedItem);
+					}
+					
+					_player.sendPacket(iu);
+				} else {
+					_player.sendPacket(new ItemList(_player, true));
+				}
+				
+				_player.broadcastUserInfo();
+			}
+			// is dropped on the ground
+			else if (_item != null) {
+				_item.decayMe();
+				L2World.getInstance().removeObject(_item);
+				LOG.info("{} item has been removed from World.", _name);
+			}
+		}
+		
+		// Delete infos from table if any
+		CursedWeaponsManager.removeFromDb(_itemId);
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_DISAPPEARED);
+		sm.addItemName(_itemId);
+		CursedWeaponsManager.announce(sm);
+		
+		// Reset state
+		cancelTask();
+		_isActivated = false;
+		_isDropped = false;
+		_endTime = 0;
+		_player = null;
+		_playerId = 0;
+		_playerKarma = 0;
+		_playerPkKills = 0;
+		_item = null;
+		_nbKills = 0;
+	}
+	
+	private void cancelTask() {
+		if (_removeTask != null) {
+			_removeTask.cancel(true);
+			_removeTask = null;
+		}
+	}
+	
+	private class RemoveTask implements Runnable {
+		protected RemoveTask() {
+		}
+		
+		@Override
+		public void run() {
+			if (System.currentTimeMillis() >= getEndTime()) {
+				endOfLife();
+			}
+		}
+	}
+	
+	private void dropIt(L2Attackable attackable, L2PcInstance player) {
+		dropIt(attackable, player, null, true);
+	}
+	
+	private void dropIt(L2Attackable attackable, L2PcInstance player, L2Character killer, boolean fromMonster) {
+		_isActivated = false;
+		
+		if (fromMonster) {
+			_item = attackable.dropItem(player, _itemId, 1);
+			_item.setDropTime(0); // Prevent item from being removed by ItemsAutoDestroy
+			
+			// RedSky and Earthquake
+			ExRedSky packet = new ExRedSky(10);
+			Earthquake eq = new Earthquake(player.getX(), player.getY(), player.getZ(), 14, 3);
+			Broadcast.toAllOnlinePlayers(packet);
+			Broadcast.toAllOnlinePlayers(eq);
+		} else {
+			_item = _player.getInventory().getItemByItemId(_itemId);
+			_player.dropItem("DieDrop", _item, killer, true);
+			_player.setKarma(_playerKarma);
+			_player.setPkKills(_playerPkKills);
+			_player.setCursedWeaponEquippedId(0);
+			removeSkill();
+			_player.abortAttack();
+			// L2ItemInstance item = _player.getInventory().getItemByItemId(_itemId);
+			// _player.getInventory().dropItem("DieDrop", item, _player, null);
+			// _player.getInventory().getItemByItemId(_itemId).dropMe(_player, _player.getX(), _player.getY(), _player.getZ());
+		}
+		_isDropped = true;
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_WAS_DROPPED_IN_THE_S1_REGION);
+		if (player != null) {
+			sm.addZoneName(player.getX(), player.getY(), player.getZ()); // Region Name
+		} else if (_player != null) {
+			sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name
+		} else {
+			sm.addZoneName(killer.getX(), killer.getY(), killer.getZ()); // Region Name
+		}
+		sm.addItemName(_itemId);
+		CursedWeaponsManager.announce(sm); // in the Hot Spring region
+	}
+	
+	public void cursedOnLogin() {
+		doTransform();
+		giveSkill();
+		
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_OWNER_HAS_LOGGED_INTO_THE_S1_REGION);
+		msg.addZoneName(_player.getX(), _player.getY(), _player.getZ());
+		msg.addItemName(_player.getCursedWeaponEquippedId());
+		CursedWeaponsManager.announce(msg);
+		
+		CursedWeapon cw = CursedWeaponsManager.getInstance().getCursedWeapon(_player.getCursedWeaponEquippedId());
+		SystemMessage msg2 = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTE_OF_USAGE_TIME_ARE_LEFT_FOR_S1);
+		int timeLeft = (int) (cw.getTimeLeft() / 60000);
+		msg2.addItemName(_player.getCursedWeaponEquippedId());
+		msg2.addInt(timeLeft);
+		_player.sendPacket(msg2);
+	}
+	
+	/**
+	 * Yesod:<br>
+	 * Rebind the passive skill belonging to the CursedWeapon. Invoke this method if the weapon owner switches to a subclass.
+	 */
+	public void giveSkill() {
+		int level = 1 + (_nbKills / _stageKills);
+		if (level > _skillMaxLevel) {
+			level = _skillMaxLevel;
+		}
+		
+		final Skill skill = SkillData.getInstance().getSkill(_skillId, level);
+		_player.addSkill(skill, false);
+		
+		// Void Burst, Void Flow
+		_player.addSkill(CommonSkill.VOID_BURST.getSkill(), false);
+		_player.addTransformSkill(CommonSkill.VOID_BURST.getSkill());
+		_player.addSkill(CommonSkill.VOID_FLOW.getSkill(), false);
+		_player.addTransformSkill(CommonSkill.VOID_FLOW.getSkill());
+		_player.sendSkillList();
+	}
+	
+	public void doTransform() {
+		if (_itemId == 8689) {
+			transformationId = 302;
+		} else if (_itemId == 8190) {
+			transformationId = 301;
+		}
+		
+		if (_player.isTransformed() || _player.isInStance()) {
+			_player.stopTransformation(true);
+			
+			ThreadPoolManager.getInstance().scheduleGeneral(() -> TransformData.getInstance().transformPlayer(transformationId, _player), 500);
+		} else {
+			TransformData.getInstance().transformPlayer(transformationId, _player);
+		}
+	}
+	
+	public void removeSkill() {
+		_player.removeSkill(_skillId);
+		_player.removeSkill(CommonSkill.VOID_BURST.getSkill().getId());
+		_player.removeSkill(CommonSkill.VOID_FLOW.getSkill().getId());
+		_player.untransform();
+		_player.sendSkillList();
+	}
+	
+	public void reActivate() {
+		_isActivated = true;
+		if ((_endTime - System.currentTimeMillis()) <= 0) {
+			endOfLife();
+		} else {
+			_removeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RemoveTask(), _durationLost * 12000L, _durationLost * 12000L);
+		}
+		
+	}
+	
+	public boolean checkDrop(L2Attackable attackable, L2PcInstance player) {
+		if (Rnd.get(100000) < _dropRate) {
+			// Drop the item
+			dropIt(attackable, player);
+			
+			// Start the Life Task
+			_endTime = System.currentTimeMillis() + (_duration * 60000L);
+			_removeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RemoveTask(), _durationLost * 12000L, _durationLost * 12000L);
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public void activate(L2PcInstance player, L2ItemInstance item) {
+		// If the player is mounted, attempt to unmount first.
+		// Only allow picking up the cursed weapon if unmounting is successful.
+		if (player.isMounted() && !player.dismount()) {
+			// TODO: Verify the following system message, may still be custom.
+			player.sendPacket(SystemMessageId.FAILED_TO_PICKUP_S1);
+			player.dropItem("InvDrop", item, null, true);
+			return;
+		}
+		
+		_isActivated = true;
+		
+		// Player holding it data
+		_player = player;
+		_playerId = _player.getObjectId();
+		_playerKarma = _player.getKarma();
+		_playerPkKills = _player.getPkKills();
+		saveData();
+		
+		// Change player stats
+		_player.setCursedWeaponEquippedId(_itemId);
+		_player.setKarma(9999999);
+		_player.setPkKills(0);
+		if (_player.isInParty()) {
+			_player.getParty().removePartyMember(_player, messageType.Expelled);
+		}
+		
+		// Disable All Skills
+		// Do Transform
+		doTransform();
+		// Add skill
+		giveSkill();
+		
+		// Equip with the weapon
+		_item = item;
+		// L2ItemInstance[] items =
+		_player.getInventory().equipItem(_item);
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_EQUIPPED);
+		sm.addItemName(_item);
+		_player.sendPacket(sm);
+		
+		// Fully heal player
+		_player.setCurrentHpMp(_player.getMaxHp(), _player.getMaxMp());
+		_player.setCurrentCp(_player.getMaxCp());
+		
+		// Refresh inventory
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addItem(_item);
+			// iu.addItems(Arrays.asList(items));
+			_player.sendPacket(iu);
+		} else {
+			_player.sendPacket(new ItemList(_player, false));
+		}
+		
+		// Refresh player stats
+		_player.broadcastUserInfo();
+		
+		SocialAction atk = new SocialAction(_player.getObjectId(), 17);
+		
+		_player.broadcastPacket(atk);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION);
+		sm.addZoneName(_player.getX(), _player.getY(), _player.getZ()); // Region Name
+		sm.addItemName(_item);
+		CursedWeaponsManager.announce(sm);
+	}
+	
+	public void saveData() {
+		if (general().debug()) {
+			LOG.info("CursedWeapon: Saving data to disk.");
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var del = con.prepareStatement("DELETE FROM cursed_weapons WHERE itemId = ?");
+			var ps = con.prepareStatement("INSERT INTO cursed_weapons (itemId, charId, playerKarma, playerPkKills, nbKills, endTime) VALUES (?, ?, ?, ?, ?, ?)")) {
+			// Delete previous data
+			del.setInt(1, _itemId);
+			del.executeUpdate();
+			
+			if (_isActivated) {
+				ps.setInt(1, _itemId);
+				ps.setInt(2, _playerId);
+				ps.setInt(3, _playerKarma);
+				ps.setInt(4, _playerPkKills);
+				ps.setInt(5, _nbKills);
+				ps.setLong(6, _endTime);
+				ps.executeUpdate();
+			}
+		} catch (Exception e) {
+			LOG.error("Failed to save data.", e);
+		}
+	}
+	
+	public void dropIt(L2Character killer) {
+		if (Rnd.get(100) <= _disappearChance) {
+			// Remove it
+			endOfLife();
+		} else {
+			// Unequip & Drop
+			dropIt(null, null, killer, false);
+			// Reset player stats
+			_player.setKarma(_playerKarma);
+			_player.setPkKills(_playerPkKills);
+			_player.setCursedWeaponEquippedId(0);
+			removeSkill();
+			
+			_player.abortAttack();
+			
+			_player.broadcastUserInfo();
+		}
+	}
+	
+	public void increaseKills() {
+		_nbKills++;
+		
+		if ((_player != null) && _player.isOnline()) {
+			_player.setPkKills(_nbKills);
+			_player.sendPacket(new UserInfo(_player));
+			
+			if (((_nbKills % _stageKills) == 0) && (_nbKills <= (_stageKills * (_skillMaxLevel - 1)))) {
+				giveSkill();
+			}
+		}
+		// Reduce time-to-live
+		_endTime -= _durationLost * 60000L;
+		saveData();
+	}
+	
+	public void setDisappearChance(int disappearChance) {
+		_disappearChance = disappearChance;
+	}
+	
+	public void setDropRate(int dropRate) {
+		_dropRate = dropRate;
+	}
+	
+	public void setDuration(int duration) {
+		_duration = duration;
+	}
+	
+	public void setDurationLost(int durationLost) {
+		_durationLost = durationLost;
+	}
+	
+	public void setStageKills(int stageKills) {
+		_stageKills = stageKills;
+	}
+	
+	public void setNbKills(int nbKills) {
+		_nbKills = nbKills;
+	}
+	
+	public void setPlayerId(int playerId) {
+		_playerId = playerId;
+	}
+	
+	public void setPlayerKarma(int playerKarma) {
+		_playerKarma = playerKarma;
+	}
+	
+	public void setPlayerPkKills(int playerPkKills) {
+		_playerPkKills = playerPkKills;
+	}
+	
+	public void setActivated(boolean isActivated) {
+		_isActivated = isActivated;
+	}
+	
+	public void setDropped(boolean isDropped) {
+		_isDropped = isDropped;
+	}
+	
+	public void setEndTime(long endTime) {
+		_endTime = endTime;
+	}
+	
+	public void setPlayer(L2PcInstance player) {
+		_player = player;
+	}
+	
+	public void setItem(L2ItemInstance item) {
+		_item = item;
+	}
+	
+	public boolean isActivated() {
+		return _isActivated;
+	}
+	
+	public boolean isDropped() {
+		return _isDropped;
+	}
+	
+	public long getEndTime() {
+		return _endTime;
+	}
+	
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	public int getSkillId() {
+		return _skillId;
+	}
+	
+	public int getPlayerId() {
+		return _playerId;
+	}
+	
+	public L2PcInstance getPlayer() {
+		return _player;
+	}
+	
+	public int getPlayerKarma() {
+		return _playerKarma;
+	}
+	
+	public int getPlayerPkKills() {
+		return _playerPkKills;
+	}
+	
+	public int getNbKills() {
+		return _nbKills;
+	}
+	
+	public int getStageKills() {
+		return _stageKills;
+	}
+	
+	public boolean isActive() {
+		return _isActivated || _isDropped;
+	}
+	
+	public int getLevel() {
+		if (_nbKills > (_stageKills * _skillMaxLevel)) {
+			return _skillMaxLevel;
+		}
+		return (_nbKills / _stageKills);
+	}
+	
+	public long getTimeLeft() {
+		return _endTime - System.currentTimeMillis();
+	}
+	
+	public void goTo(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		if (_isActivated && (_player != null)) {
+			// Go to player holding the weapon
+			player.teleToLocation(_player.getLocation(), true);
+		} else if (_isDropped && (_item != null)) {
+			// Go to item on the ground
+			player.teleToLocation(_item.getLocation(), true);
+		} else {
+			player.sendMessage(_name + " isn't in the World.");
+		}
+	}
+	
+	public Location getWorldPosition() {
+		if (_isActivated && (_player != null)) {
+			return _player.getLocation();
+		}
+		
+		if (_isDropped && (_item != null)) {
+			return _item.getLocation();
+		}
+		
+		return null;
+	}
+	
+	public long getDuration() {
+		return _duration;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/DamageDoneInfo.java b/src/main/java/com/l2jserver/gameserver/model/DamageDoneInfo.java
new file mode 100644
index 00000000..b5fd8782
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/DamageDoneInfo.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author xban1x
+ */
+public final class DamageDoneInfo {
+	private final L2PcInstance _attacker;
+	private int _damage = 0;
+	
+	public DamageDoneInfo(L2PcInstance attacker) {
+		_attacker = attacker;
+	}
+	
+	public L2PcInstance getAttacker() {
+		return _attacker;
+	}
+	
+	public void addDamage(int damage) {
+		_damage += damage;
+	}
+	
+	public int getDamage() {
+		return _damage;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		
+		if (obj instanceof DamageDoneInfo) {
+			return (((DamageDoneInfo) obj).getAttacker() == _attacker);
+		}
+		
+		return false;
+	}
+	
+	@Override
+	public int hashCode() {
+		return _attacker.getObjectId();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/DimensionalRiftRoom.java b/src/main/java/com/l2jserver/gameserver/model/DimensionalRiftRoom.java
new file mode 100644
index 00000000..fcc8a050
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/DimensionalRiftRoom.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.awt.Polygon;
+import java.awt.Shape;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.commons.util.Rnd;
+
+/**
+ * Dimensional Rift Room.
+ * @author xban1x
+ */
+public final class DimensionalRiftRoom {
+	private final byte _type;
+	private final byte _room;
+	private final int _xMin;
+	private final int _xMax;
+	private final int _yMin;
+	private final int _yMax;
+	private final int _zMin;
+	private final int _zMax;
+	private final Location _teleportCoords;
+	private final Shape _s;
+	private final boolean _isBossRoom;
+	private final List<L2Spawn> _roomSpawns = new ArrayList<>();
+	private L2Party _party = null;
+	
+	public DimensionalRiftRoom(byte type, byte room, int xMin, int xMax, int yMin, int yMax, int zMin, int zMax, int xT, int yT, int zT, boolean isBossRoom) {
+		_type = type;
+		_room = room;
+		_xMin = (xMin + 128);
+		_xMax = (xMax - 128);
+		_yMin = (yMin + 128);
+		_yMax = (yMax - 128);
+		_zMin = zMin;
+		_zMax = zMax;
+		_teleportCoords = new Location(xT, yT, zT);
+		_isBossRoom = isBossRoom;
+		_s = new Polygon(new int[] {
+			xMin,
+			xMax,
+			xMax,
+			xMin
+		}, new int[] {
+			yMin,
+			yMin,
+			yMax,
+			yMax
+		}, 4);
+	}
+	
+	public byte getType() {
+		return _type;
+	}
+	
+	public byte getRoom() {
+		return _room;
+	}
+	
+	public int getRandomX() {
+		return Rnd.get(_xMin, _xMax);
+	}
+	
+	public int getRandomY() {
+		return Rnd.get(_yMin, _yMax);
+	}
+	
+	public Location getTeleportCoordinates() {
+		return _teleportCoords;
+	}
+	
+	public boolean checkIfInZone(int x, int y, int z) {
+		return _s.contains(x, y) && (z >= _zMin) && (z <= _zMax);
+	}
+	
+	public boolean isBossRoom() {
+		return _isBossRoom;
+	}
+	
+	public List<L2Spawn> getSpawns() {
+		return _roomSpawns;
+	}
+	
+	public void spawn() {
+		for (L2Spawn spawn : _roomSpawns) {
+			spawn.doSpawn();
+			spawn.startRespawn();
+		}
+	}
+	
+	public DimensionalRiftRoom unspawn() {
+		for (L2Spawn spawn : _roomSpawns) {
+			spawn.stopRespawn();
+			if (spawn.getLastSpawn() != null) {
+				spawn.getLastSpawn().deleteMe();
+			}
+		}
+		return this;
+	}
+	
+	/**
+	 * Sets the party inside.
+	 * @param party
+	 */
+	public void setParty(L2Party party) {
+		_party = party;
+	}
+	
+	public L2Party getParty() {
+		return _party;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/DropProtection.java b/src/main/java/com/l2jserver/gameserver/model/DropProtection.java
new file mode 100644
index 00000000..31c192a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/DropProtection.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+
+/**
+ * @author DrHouse
+ */
+public class DropProtection implements Runnable {
+	private volatile boolean _isProtected = false;
+	private L2PcInstance _owner = null;
+	private ScheduledFuture<?> _task = null;
+	
+	private static final long PROTECTED_MILLIS_TIME = 15000;
+	
+	@Override
+	public synchronized void run() {
+		_isProtected = false;
+		_owner = null;
+		_task = null;
+	}
+	
+	public boolean isProtected() {
+		return _isProtected;
+	}
+	
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	public synchronized boolean tryPickUp(L2PcInstance actor) {
+		if (!_isProtected) {
+			return true;
+		}
+		
+		if (_owner == actor) {
+			return true;
+		}
+		
+		if ((_owner.getParty() != null) && (_owner.getParty() == actor.getParty())) {
+			return true;
+		}
+		
+		/*
+		 * if (_owner.getClan() != null && _owner.getClan() == actor.getClan()) return true;
+		 */
+		
+		return false;
+	}
+	
+	public boolean tryPickUp(L2PetInstance pet) {
+		return tryPickUp(pet.getOwner());
+	}
+	
+	public synchronized void unprotect() {
+		if (_task != null) {
+			_task.cancel(false);
+		}
+		_isProtected = false;
+		_owner = null;
+		_task = null;
+	}
+	
+	public synchronized void protect(L2PcInstance player) {
+		unprotect();
+		
+		_isProtected = true;
+		_owner = player;
+		
+		if (_owner == null) {
+			throw new NullPointerException("Trying to protect dropped item to null owner");
+		}
+		
+		_task = ThreadPoolManager.getInstance().scheduleGeneral(this, PROTECTED_MILLIS_TIME);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/Elementals.java b/src/main/java/com/l2jserver/gameserver/model/Elementals.java
new file mode 100644
index 00000000..cf37bda1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/Elementals.java
@@ -0,0 +1,301 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.FuncAdd;
+
+public final class Elementals {
+	private static final Map<Integer, ElementalItems> TABLE = new HashMap<>();
+	
+	static {
+		for (ElementalItems item : ElementalItems.values()) {
+			TABLE.put(item._itemId, item);
+		}
+	}
+	
+	public static final byte NONE = -1;
+	public static final byte FIRE = 0;
+	public static final byte WATER = 1;
+	public static final byte WIND = 2;
+	public static final byte EARTH = 3;
+	public static final byte HOLY = 4;
+	public static final byte DARK = 5;
+	
+	public static final int FIRST_WEAPON_BONUS = 20;
+	public static final int NEXT_WEAPON_BONUS = 5;
+	public static final int ARMOR_BONUS = 6;
+	
+	public static final int[] WEAPON_VALUES = {
+		0, // Level 1
+		25, // Level 2
+		75, // Level 3
+		150, // Level 4
+		175, // Level 5
+		225, // Level 6
+		300, // Level 7
+		325, // Level 8
+		375, // Level 9
+		450, // Level 10
+		475, // Level 11
+		525, // Level 12
+		600, // Level 13
+		Integer.MAX_VALUE
+		// TODO: Higher stones
+	};
+	
+	public static final int[] ARMOR_VALUES = {
+		0, // Level 1
+		12, // Level 2
+		30, // Level 3
+		60, // Level 4
+		72, // Level 5
+		90, // Level 6
+		120, // Level 7
+		132, // Level 8
+		150, // Level 9
+		180, // Level 10
+		192, // Level 11
+		210, // Level 12
+		240, // Level 13
+		Integer.MAX_VALUE
+		// TODO: Higher stones
+	};
+	
+	public enum ElementalItemType {
+		Stone(3),
+		Roughore(3),
+		Crystal(6),
+		Jewel(9),
+		Energy(12);
+		
+		public int _maxLevel;
+		
+		ElementalItemType(int maxLvl) {
+			_maxLevel = maxLvl;
+		}
+	}
+	
+	public enum ElementalItems {
+		fireStone(FIRE, 9546, ElementalItemType.Stone),
+		waterStone(WATER, 9547, ElementalItemType.Stone),
+		windStone(WIND, 9549, ElementalItemType.Stone),
+		earthStone(EARTH, 9548, ElementalItemType.Stone),
+		divineStone(HOLY, 9551, ElementalItemType.Stone),
+		darkStone(DARK, 9550, ElementalItemType.Stone),
+		
+		fireRoughtore(FIRE, 10521, ElementalItemType.Roughore),
+		waterRoughtore(WATER, 10522, ElementalItemType.Roughore),
+		windRoughtore(WIND, 10524, ElementalItemType.Roughore),
+		earthRoughtore(EARTH, 10523, ElementalItemType.Roughore),
+		divineRoughtore(HOLY, 10526, ElementalItemType.Roughore),
+		darkRoughtore(DARK, 10525, ElementalItemType.Roughore),
+		
+		fireCrystal(FIRE, 9552, ElementalItemType.Crystal),
+		waterCrystal(WATER, 9553, ElementalItemType.Crystal),
+		windCrystal(WIND, 9555, ElementalItemType.Crystal),
+		earthCrystal(EARTH, 9554, ElementalItemType.Crystal),
+		divineCrystal(HOLY, 9557, ElementalItemType.Crystal),
+		darkCrystal(DARK, 9556, ElementalItemType.Crystal),
+		
+		fireJewel(FIRE, 9558, ElementalItemType.Jewel),
+		waterJewel(WATER, 9559, ElementalItemType.Jewel),
+		windJewel(WIND, 9561, ElementalItemType.Jewel),
+		earthJewel(EARTH, 9560, ElementalItemType.Jewel),
+		divineJewel(HOLY, 9563, ElementalItemType.Jewel),
+		darkJewel(DARK, 9562, ElementalItemType.Jewel),
+		
+		// not yet supported by client (Freya pts)
+		fireEnergy(FIRE, 9564, ElementalItemType.Energy),
+		waterEnergy(WATER, 9565, ElementalItemType.Energy),
+		windEnergy(WIND, 9567, ElementalItemType.Energy),
+		earthEnergy(EARTH, 9566, ElementalItemType.Energy),
+		divineEnergy(HOLY, 9569, ElementalItemType.Energy),
+		darkEnergy(DARK, 9568, ElementalItemType.Energy);
+		
+		public byte _element;
+		public int _itemId;
+		public ElementalItemType _type;
+		
+		ElementalItems(byte element, int itemId, ElementalItemType type) {
+			_element = element;
+			_itemId = itemId;
+			_type = type;
+		}
+	}
+	
+	public static byte getItemElement(int itemId) {
+		ElementalItems item = TABLE.get(itemId);
+		if (item != null) {
+			return item._element;
+		}
+		return NONE;
+	}
+	
+	public static ElementalItems getItemElemental(int itemId) {
+		return TABLE.get(itemId);
+	}
+	
+	public static int getMaxElementLevel(int itemId) {
+		ElementalItems item = TABLE.get(itemId);
+		if (item != null) {
+			return item._type._maxLevel;
+		}
+		return -1;
+	}
+	
+	public static String getElementName(byte element) {
+		return switch (element) {
+			case FIRE -> "Fire";
+			case WATER -> "Water";
+			case WIND -> "Wind";
+			case EARTH -> "Earth";
+			case DARK -> "Dark";
+			case HOLY -> "Holy";
+			default -> "None";
+		};
+	}
+	
+	public static byte getElementId(String name) {
+		String tmp = name.toLowerCase();
+		if (tmp.equals("fire")) {
+			return FIRE;
+		}
+		if (tmp.equals("water")) {
+			return WATER;
+		}
+		if (tmp.equals("wind")) {
+			return WIND;
+		}
+		if (tmp.equals("earth")) {
+			return EARTH;
+		}
+		if (tmp.equals("dark")) {
+			return DARK;
+		}
+		if (tmp.equals("holy")) {
+			return HOLY;
+		}
+		return NONE;
+	}
+	
+	public static byte getOppositeElement(byte element) {
+		return (byte) (((element % 2) == 0) ? (element + 1) : (element - 1));
+	}
+	
+	public static class ElementalStatBoni {
+		private byte _elementalType;
+		private int _elementalValue;
+		private boolean _active;
+		
+		public ElementalStatBoni(byte type, int value) {
+			_elementalType = type;
+			_elementalValue = value;
+			_active = false;
+		}
+		
+		public void applyBonus(L2PcInstance player, boolean isArmor) {
+			// make sure the bonuses are not applied twice..
+			if (_active) {
+				return;
+			}
+			
+			switch (_elementalType) {
+				case FIRE -> player.addStatFuncs(new FuncAdd(isArmor ? Stats.FIRE_RES : Stats.FIRE_POWER, 0x40, this, _elementalValue, null));
+				case WATER -> player.addStatFuncs(new FuncAdd(isArmor ? Stats.WATER_RES : Stats.WATER_POWER, 0x40, this, _elementalValue, null));
+				case WIND -> player.addStatFuncs(new FuncAdd(isArmor ? Stats.WIND_RES : Stats.WIND_POWER, 0x40, this, _elementalValue, null));
+				case EARTH -> player.addStatFuncs(new FuncAdd(isArmor ? Stats.EARTH_RES : Stats.EARTH_POWER, 0x40, this, _elementalValue, null));
+				case DARK -> player.addStatFuncs(new FuncAdd(isArmor ? Stats.DARK_RES : Stats.DARK_POWER, 0x40, this, _elementalValue, null));
+				case HOLY -> player.addStatFuncs(new FuncAdd(isArmor ? Stats.HOLY_RES : Stats.HOLY_POWER, 0x40, this, _elementalValue, null));
+			}
+			
+			_active = true;
+		}
+		
+		public void removeBonus(L2PcInstance player) {
+			// make sure the bonuses are not removed twice
+			if (!_active) {
+				return;
+			}
+			
+			player.removeStatsOwner(this);
+			
+			_active = false;
+		}
+		
+		public void setValue(int val) {
+			_elementalValue = val;
+		}
+		
+		public void setElement(byte type) {
+			_elementalType = type;
+		}
+	}
+	
+	// non static:
+	private final ElementalStatBoni _boni;
+	private byte _element;
+	private int _value;
+	
+	public byte getElement() {
+		return _element;
+	}
+	
+	public void setElement(byte type) {
+		_element = type;
+		_boni.setElement(type);
+	}
+	
+	public int getValue() {
+		return _value;
+	}
+	
+	public void setValue(int val) {
+		_value = val;
+		_boni.setValue(val);
+	}
+	
+	@Override
+	public String toString() {
+		return getElementName(_element) + " +" + _value;
+	}
+	
+	public Elementals(byte type, int value) {
+		_element = type;
+		_value = value;
+		_boni = new ElementalStatBoni(_element, _value);
+	}
+	
+	public void applyBonus(L2PcInstance player, boolean isArmor) {
+		_boni.applyBonus(player, isArmor);
+	}
+	
+	public void removeBonus(L2PcInstance player) {
+		_boni.removeBonus(player);
+	}
+	
+	public void updateBonus(L2PcInstance player, boolean isArmor) {
+		_boni.removeBonus(player);
+		_boni.applyBonus(player, isArmor);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/FortSiegeSpawn.java b/src/main/java/com/l2jserver/gameserver/model/FortSiegeSpawn.java
new file mode 100644
index 00000000..20855747
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/FortSiegeSpawn.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
+/**
+ * Fort Siege Spawn.
+ * @author xban1x
+ */
+public final class FortSiegeSpawn extends Location implements IIdentifiable {
+	private final int _npcId;
+	private final int _fortId;
+	private final int _id;
+	
+	public FortSiegeSpawn(int fort_id, int x, int y, int z, int heading, int npc_id, int id) {
+		super(x, y, z, heading);
+		_fortId = fort_id;
+		_npcId = npc_id;
+		_id = id;
+	}
+	
+	public int getFortId() {
+		return _fortId;
+	}
+	
+	/**
+	 * Gets the NPC ID.
+	 * @return the NPC ID
+	 */
+	@Override
+	public int getId() {
+		return _npcId;
+	}
+	
+	public int getMessageId() {
+		return _id;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/Hit.java b/src/main/java/com/l2jserver/gameserver/model/Hit.java
new file mode 100644
index 00000000..56cfc732
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/Hit.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author UnAfraid
+ */
+public class Hit {
+	private static final int HITFLAG_USESS = 0x10;
+	private static final int HITFLAG_CRIT = 0x20;
+	private static final int HITFLAG_SHLD = 0x40;
+	private static final int HITFLAG_MISS = 0x80;
+	
+	private final int _targetId;
+	private final int _damage;
+	private int _flags = 0;
+	
+	public Hit(L2Object target, int damage, boolean miss, boolean crit, byte shld, boolean soulshot, int ssGrade) {
+		_targetId = target.getObjectId();
+		_damage = damage;
+		
+		if (soulshot) {
+			_flags |= HITFLAG_USESS | ssGrade;
+		}
+		
+		if (crit) {
+			_flags |= HITFLAG_CRIT;
+		}
+		
+		if (shld > 0) {
+			_flags |= HITFLAG_SHLD;
+		}
+		
+		if (miss) {
+			_flags |= HITFLAG_MISS;
+		}
+	}
+	
+	public int getTargetId() {
+		return _targetId;
+	}
+	
+	public int getDamage() {
+		return _damage;
+	}
+	
+	public int getFlags() {
+		return _flags;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/ItemInfo.java b/src/main/java/com/l2jserver/gameserver/model/ItemInfo.java
new file mode 100644
index 00000000..5c2e7170
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ItemInfo.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Get all information from L2ItemInstance to generate ItemInfo.
+ */
+public class ItemInfo {
+	/** Identifier of the L2ItemInstance */
+	private int _objectId;
+	
+	/** The L2Item template of the L2ItemInstance */
+	private L2Item _item;
+	
+	/** The level of enchant on the L2ItemInstance */
+	private int _enchant;
+	
+	/** The augmentation of the item */
+	private int _augmentation;
+	
+	/** The quantity of L2ItemInstance */
+	private long _count;
+	
+	/** The price of the L2ItemInstance */
+	private int _price;
+	
+	/** The custom L2ItemInstance types (used loto, race tickets) */
+	private int _type1;
+	private int _type2;
+	
+	/** If True the L2ItemInstance is equipped */
+	private int _equipped;
+	
+	/** The action to do clientside (1=ADD, 2=MODIFY, 3=REMOVE) */
+	private int _change;
+	
+	/** The mana of this item */
+	private int _mana;
+	private int _time;
+	
+	private int _location;
+	
+	private int _elemAtkType = -2;
+	private int _elemAtkPower = 0;
+	private final int[] _elemDefAttr = {
+		0,
+		0,
+		0,
+		0,
+		0,
+		0
+	};
+	
+	private int[] _option;
+	
+	/**
+	 * Get all information from L2ItemInstance to generate ItemInfo.
+	 * @param item
+	 */
+	public ItemInfo(L2ItemInstance item) {
+		if (item == null) {
+			return;
+		}
+		
+		// Get the Identifier of the L2ItemInstance
+		_objectId = item.getObjectId();
+		
+		// Get the L2Item of the L2ItemInstance
+		_item = item.getItem();
+		
+		// Get the enchant level of the L2ItemInstance
+		_enchant = item.getEnchantLevel();
+		
+		// Get the augmentation boni
+		if (item.isAugmented()) {
+			_augmentation = item.getAugmentation().getAugmentationId();
+		} else {
+			_augmentation = 0;
+		}
+		
+		// Get the quantity of the L2ItemInstance
+		_count = item.getCount();
+		
+		// Get custom item types (used loto, race tickets)
+		_type1 = item.getCustomType1();
+		_type2 = item.getCustomType2();
+		
+		// Verify if the L2ItemInstance is equipped
+		_equipped = item.isEquipped() ? 1 : 0;
+		
+		// Get the action to do clientside
+		switch (item.getLastChange()) {
+			case (L2ItemInstance.ADDED) -> _change = 1;
+			case (L2ItemInstance.MODIFIED) -> _change = 2;
+			case (L2ItemInstance.REMOVED) -> _change = 3;
+		}
+		
+		// Get shadow item mana
+		_mana = item.getMana();
+		_time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -9999;
+		_location = item.getLocationSlot();
+		
+		_elemAtkType = item.getAttackElementType();
+		_elemAtkPower = item.getAttackElementPower();
+		for (byte i = 0; i < 6; i++) {
+			_elemDefAttr[i] = item.getElementDefAttr(i);
+		}
+		_option = item.getEnchantOptions();
+	}
+	
+	public ItemInfo(L2ItemInstance item, int change) {
+		this(item);
+		_change = change;
+	}
+	
+	public ItemInfo(TradeItem item) {
+		if (item == null) {
+			return;
+		}
+		
+		// Get the Identifier of the L2ItemInstance
+		_objectId = item.getObjectId();
+		
+		// Get the L2Item of the L2ItemInstance
+		_item = item.getItem();
+		
+		// Get the enchant level of the L2ItemInstance
+		_enchant = item.getEnchant();
+		
+		// Get the augmentation boni
+		_augmentation = 0;
+		
+		// Get the quantity of the L2ItemInstance
+		_count = item.getCount();
+		
+		// Get custom item types (used loto, race tickets)
+		_type1 = item.getCustomType1();
+		_type2 = item.getCustomType2();
+		
+		// Verify if the L2ItemInstance is equipped
+		_equipped = 0;
+		
+		// Get the action to do clientside
+		_change = 0;
+		
+		// Get shadow item mana
+		_mana = -1;
+		_time = -9999;
+		
+		_location = item.getLocationSlot();
+		
+		_elemAtkType = item.getAttackElementType();
+		_elemAtkPower = item.getAttackElementPower();
+		for (byte i = 0; i < 6; i++) {
+			_elemDefAttr[i] = item.getElementDefAttr(i);
+		}
+		
+		_option = item.getEnchantOptions();
+	}
+	
+	public int getObjectId() {
+		return _objectId;
+	}
+	
+	public L2Item getItem() {
+		return _item;
+	}
+	
+	public int getEnchant() {
+		return _enchant;
+	}
+	
+	public int getAugmentationBonus() {
+		return _augmentation;
+	}
+	
+	public long getCount() {
+		return _count;
+	}
+	
+	public int getPrice() {
+		return _price;
+	}
+	
+	public int getCustomType1() {
+		return _type1;
+	}
+	
+	public int getCustomType2() {
+		return _type2;
+	}
+	
+	public int getEquipped() {
+		return _equipped;
+	}
+	
+	public int getChange() {
+		return _change;
+	}
+	
+	public int getMana() {
+		return _mana;
+	}
+	
+	public int getTime() {
+		return _time;
+	}
+	
+	public int getLocation() {
+		return _location;
+	}
+	
+	public int getAttackElementType() {
+		return _elemAtkType;
+	}
+	
+	public int getAttackElementPower() {
+		return _elemAtkPower;
+	}
+	
+	public int getElementDefAttr(byte i) {
+		return _elemDefAttr[i];
+	}
+	
+	public int[] getEnchantOptions() {
+		return _option;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/ItemRequest.java b/src/main/java/com/l2jserver/gameserver/model/ItemRequest.java
new file mode 100644
index 00000000..b50ba9e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ItemRequest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+public class ItemRequest {
+	int _objectId;
+	int _itemId;
+	long _count;
+	long _price;
+	
+	public ItemRequest(int objectId, long count, long price) {
+		_objectId = objectId;
+		_count = count;
+		_price = price;
+	}
+	
+	public ItemRequest(int objectId, int itemId, long count, long price) {
+		_objectId = objectId;
+		_itemId = itemId;
+		_count = count;
+		_price = price;
+	}
+	
+	public int getObjectId() {
+		return _objectId;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	public void setCount(long count) {
+		_count = count;
+	}
+	
+	public long getCount() {
+		return _count;
+	}
+	
+	public long getPrice() {
+		return _price;
+	}
+	
+	@Override
+	public int hashCode() {
+		return _objectId;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof ItemRequest)) {
+			return false;
+		}
+		return (_objectId != ((ItemRequest) obj)._objectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2AccessLevel.java b/src/main/java/com/l2jserver/gameserver/model/L2AccessLevel.java
new file mode 100644
index 00000000..bddfed19
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2AccessLevel.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+
+/**
+ * @author HorridoJoho
+ */
+public class L2AccessLevel {
+	/** The access level. */
+	private final int _accessLevel;
+	/** The access level name. */
+	private final String _name;
+	/** Child access levels. */
+	private L2AccessLevel _childrenAccessLevel = null;
+	/** Child access levels. */
+	private final int _child;
+	/** The name color for the access level. */
+	private final int _nameColor;
+	/** The title color for the access level. */
+	private final int _titleColor;
+	/** Flag to determine if the access level has GM access. */
+	private final boolean _isGm;
+	/** Flag for peace zone attack */
+	private final boolean _allowPeaceAttack;
+	/** Flag for fixed res */
+	private final boolean _allowFixedRes;
+	/** Flag for transactions */
+	private final boolean _allowTransaction;
+	/** Flag for AltG commands */
+	private final boolean _allowAltG;
+	/** Flag to give damage */
+	private final boolean _giveDamage;
+	/** Flag to take aggro */
+	private final boolean _takeAggro;
+	/** Flag to gain exp in party */
+	private final boolean _gainExp;
+	
+	public L2AccessLevel(StatsSet set) {
+		_accessLevel = set.getInt("level");
+		_name = set.getString("name");
+		_nameColor = Integer.decode("0x" + set.getString("nameColor", "FFFFFF"));
+		_titleColor = Integer.decode("0x" + set.getString("titleColor", "FFFFFF"));
+		_child = set.getInt("childAccess", 0);
+		_isGm = set.getBoolean("isGM", false);
+		_allowPeaceAttack = set.getBoolean("allowPeaceAttack", false);
+		_allowFixedRes = set.getBoolean("allowFixedRes", false);
+		_allowTransaction = set.getBoolean("allowTransaction", true);
+		_allowAltG = set.getBoolean("allowAltg", false);
+		_giveDamage = set.getBoolean("giveDamage", true);
+		_takeAggro = set.getBoolean("takeAggro", true);
+		_gainExp = set.getBoolean("gainExp", true);
+	}
+	
+	public L2AccessLevel() {
+		_accessLevel = 0;
+		_name = "User";
+		_nameColor = Integer.decode("0xFFFFFF");
+		_titleColor = Integer.decode("0xFFFFFF");
+		_child = 0;
+		_isGm = false;
+		_allowPeaceAttack = false;
+		_allowFixedRes = false;
+		_allowTransaction = true;
+		_allowAltG = false;
+		_giveDamage = true;
+		_takeAggro = true;
+		_gainExp = true;
+	}
+	
+	/**
+	 * Gets the access level.
+	 * @return the access level
+	 */
+	public int getLevel() {
+		return _accessLevel;
+	}
+	
+	/**
+	 * Gets the access level name.
+	 * @return the access level name
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Gets the name color of the access level.
+	 * @return the name color for the access level
+	 */
+	public int getNameColor() {
+		return _nameColor;
+	}
+	
+	/**
+	 * Gets the title color color of the access level.
+	 * @return the title color for the access level
+	 */
+	public int getTitleColor() {
+		return _titleColor;
+	}
+	
+	/**
+	 * Verifies if the access level has GM access or not.
+	 * @return {@code true} if access level have GM access, otherwise {@code false}
+	 */
+	public boolean isGm() {
+		return _isGm;
+	}
+	
+	/**
+	 * Verifies if the access level is allowed to attack in peace zone or not.
+	 * @return {@code true} if the access level is allowed to attack in peace zone, otherwise {@code false}
+	 */
+	public boolean allowPeaceAttack() {
+		return _allowPeaceAttack;
+	}
+	
+	/**
+	 * Verifies if the access level is allowed to use fixed resurrection or not.
+	 * @return {@ode true} if the access level is allowed to use fixed resurrection, otherwise {@code false}
+	 */
+	public boolean allowFixedRes() {
+		return _allowFixedRes;
+	}
+	
+	/**
+	 * Verifies if the access level is allowed to perform transactions or not.
+	 * @return {@ode true} if access level is allowed to perform transactions, otherwise {@code false}
+	 */
+	public boolean allowTransaction() {
+		return _allowTransaction;
+	}
+	
+	/**
+	 * Verifies if the access level is allowed to use AltG commands or not.
+	 * @return {@ode true} if access level is allowed to use AltG commands, otherwise {@code false}
+	 */
+	public boolean allowAltG() {
+		return _allowAltG;
+	}
+	
+	/**
+	 * Verifies if the access level can give damage or not.
+	 * @return {@ode true} if the access level can give damage, otherwise {@code false}
+	 */
+	public boolean canGiveDamage() {
+		return _giveDamage;
+	}
+	
+	/**
+	 * Verifies if the access level can take aggro or not.
+	 * @return {@ode true} if the access level can take aggro, otherwise {@code false}
+	 */
+	public boolean canTakeAggro() {
+		return _takeAggro;
+	}
+	
+	/**
+	 * Verifies if the access level can gain exp or not.
+	 * @return {@ode true} if the access level can gain exp, otherwise {@code false}
+	 */
+	public boolean canGainExp() {
+		return _gainExp;
+	}
+	
+	/**
+	 * Returns if the access level contains allowedAccess as child.
+	 * @param accessLevel the parent access level
+	 * @return {@ode true} if a child access level is equals to allowedAccess, otherwise {@code false}
+	 */
+	public boolean hasChildAccess(L2AccessLevel accessLevel) {
+		if (_childrenAccessLevel == null) {
+			if (_child <= 0) {
+				return false;
+			}
+			
+			_childrenAccessLevel = AdminData.getInstance().getAccessLevel(_child);
+		}
+		return ((_childrenAccessLevel.getLevel() == accessLevel.getLevel()) || _childrenAccessLevel.hasChildAccess(accessLevel));
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java b/src/main/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java
new file mode 100644
index 00000000..1fa84c46
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2AdminCommandAccessRight.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+
+/**
+ * @author HorridoJoho
+ */
+public class L2AdminCommandAccessRight {
+	private final String _adminCommand;
+	private final int _accessLevel;
+	private final boolean _requireConfirm;
+	
+	public L2AdminCommandAccessRight(StatsSet set) {
+		_adminCommand = set.getString("command");
+		_requireConfirm = set.getBoolean("confirmDlg", false);
+		_accessLevel = set.getInt("accessLevel", 7);
+	}
+	
+	public L2AdminCommandAccessRight(String command, boolean confirm, int level) {
+		_adminCommand = command;
+		_requireConfirm = confirm;
+		_accessLevel = level;
+	}
+	
+	/**
+	 * @return the admin command the access right belongs to
+	 */
+	public String getAdminCommand() {
+		return _adminCommand;
+	}
+	
+	/**
+	 * @param characterAccessLevel
+	 * @return {@code true} if characterAccessLevel is allowed to use the admin command which belongs to this access right, {@code false} otherwise
+	 */
+	public boolean hasAccess(L2AccessLevel characterAccessLevel) {
+		L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(_accessLevel);
+		return ((accessLevel.getLevel() == characterAccessLevel.getLevel()) || characterAccessLevel.hasChildAccess(accessLevel));
+	}
+	
+	/**
+	 * @return {@code true} if admin command requires confirmation before execution, {@code false} otherwise.
+	 */
+	public boolean getRequireConfirm() {
+		return _requireConfirm;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ArmorSet.java b/src/main/java/com/l2jserver/gameserver/model/L2ArmorSet.java
new file mode 100644
index 00000000..1e6260aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ArmorSet.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Luno
+ */
+public final class L2ArmorSet {
+	private int _chestId;
+	private final List<Integer> _legs;
+	private final List<Integer> _head;
+	private final List<Integer> _gloves;
+	private final List<Integer> _feet;
+	private final List<Integer> _shield;
+	
+	private final List<SkillHolder> _skills;
+	private final List<SkillHolder> _shieldSkills;
+	private final List<SkillHolder> _enchant6Skill;
+	
+	private int _con;
+	private int _dex;
+	private int _str;
+	private int _men;
+	private int _wit;
+	private int _int;
+	
+	public L2ArmorSet() {
+		_legs = new ArrayList<>();
+		_head = new ArrayList<>();
+		_gloves = new ArrayList<>();
+		_feet = new ArrayList<>();
+		_shield = new ArrayList<>();
+		
+		_skills = new ArrayList<>();
+		_shieldSkills = new ArrayList<>();
+		_enchant6Skill = new ArrayList<>();
+	}
+	
+	public void addChest(int id) {
+		_chestId = id;
+	}
+	
+	public void addLegs(int id) {
+		_legs.add(id);
+	}
+	
+	public void addHead(int id) {
+		_head.add(id);
+	}
+	
+	public void addGloves(int id) {
+		_gloves.add(id);
+	}
+	
+	public void addFeet(int id) {
+		_feet.add(id);
+	}
+	
+	public void addShield(int id) {
+		_shield.add(id);
+	}
+	
+	public void addSkill(SkillHolder holder) {
+		_skills.add(holder);
+	}
+	
+	public void addShieldSkill(SkillHolder holder) {
+		_shieldSkills.add(holder);
+	}
+	
+	public void addEnchant6Skill(SkillHolder holder) {
+		_enchant6Skill.add(holder);
+	}
+	
+	public void addCon(int val) {
+		_con = val;
+	}
+	
+	public void addDex(int val) {
+		_dex = val;
+	}
+	
+	public void addStr(int val) {
+		_str = val;
+	}
+	
+	public void addMen(int val) {
+		_men = val;
+	}
+	
+	public void addWit(int val) {
+		_wit = val;
+	}
+	
+	public void addInt(int val) {
+		_int = val;
+	}
+	
+	/**
+	 * Checks if player have equipped all items from set (not checking shield)
+	 * @param player whose inventory is being checked
+	 * @return True if player equips whole set
+	 */
+	public boolean containAll(L2PcInstance player) {
+		Inventory inv = player.getInventory();
+		
+		L2ItemInstance legsItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
+		L2ItemInstance headItem = inv.getPaperdollItem(Inventory.PAPERDOLL_HEAD);
+		L2ItemInstance glovesItem = inv.getPaperdollItem(Inventory.PAPERDOLL_GLOVES);
+		L2ItemInstance feetItem = inv.getPaperdollItem(Inventory.PAPERDOLL_FEET);
+		
+		int legs = 0;
+		int head = 0;
+		int gloves = 0;
+		int feet = 0;
+		
+		if (legsItem != null) {
+			legs = legsItem.getId();
+		}
+		if (headItem != null) {
+			head = headItem.getId();
+		}
+		if (glovesItem != null) {
+			gloves = glovesItem.getId();
+		}
+		if (feetItem != null) {
+			feet = feetItem.getId();
+		}
+		
+		return containAll(_chestId, legs, head, gloves, feet);
+	}
+	
+	public boolean containAll(int chest, int legs, int head, int gloves, int feet) {
+		if ((_chestId != 0) && (_chestId != chest)) {
+			return false;
+		}
+		if (!_legs.isEmpty() && !_legs.contains(legs)) {
+			return false;
+		}
+		if (!_head.isEmpty() && !_head.contains(head)) {
+			return false;
+		}
+		if (!_gloves.isEmpty() && !_gloves.contains(gloves)) {
+			return false;
+		}
+		return _feet.isEmpty() || _feet.contains(feet);
+	}
+	
+	public boolean containItem(int slot, int itemId) {
+		return switch (slot) {
+			case Inventory.PAPERDOLL_CHEST -> _chestId == itemId;
+			case Inventory.PAPERDOLL_LEGS -> _legs.contains(itemId);
+			case Inventory.PAPERDOLL_HEAD -> _head.contains(itemId);
+			case Inventory.PAPERDOLL_GLOVES -> _gloves.contains(itemId);
+			case Inventory.PAPERDOLL_FEET -> _feet.contains(itemId);
+			default -> false;
+		};
+	}
+	
+	public int getChestId() {
+		return _chestId;
+	}
+	
+	public List<SkillHolder> getSkills() {
+		return _skills;
+	}
+	
+	public boolean containShield(L2PcInstance player) {
+		Inventory inv = player.getInventory();
+		
+		L2ItemInstance shieldItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+		return ((shieldItem != null) && _shield.contains(shieldItem.getId()));
+	}
+	
+	public boolean containShield(int shieldId) {
+		return _shield.contains(shieldId);
+	}
+	
+	public List<SkillHolder> getShieldSkillId() {
+		return _shieldSkills;
+	}
+	
+	public List<SkillHolder> getEnchant6skillId() {
+		return _enchant6Skill;
+	}
+	
+	/**
+	 * @param player
+	 * @return true if all parts of set are enchanted to +6 or more
+	 */
+	public boolean isEnchanted6(L2PcInstance player) {
+		// Player don't have full set
+		if (!containAll(player)) {
+			return false;
+		}
+		
+		Inventory inv = player.getInventory();
+		
+		L2ItemInstance chestItem = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
+		L2ItemInstance legsItem = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
+		L2ItemInstance headItem = inv.getPaperdollItem(Inventory.PAPERDOLL_HEAD);
+		L2ItemInstance glovesItem = inv.getPaperdollItem(Inventory.PAPERDOLL_GLOVES);
+		L2ItemInstance feetItem = inv.getPaperdollItem(Inventory.PAPERDOLL_FEET);
+		
+		if ((chestItem == null) || (chestItem.getEnchantLevel() < 6)) {
+			return false;
+		}
+		if (!_legs.isEmpty() && ((legsItem == null) || (legsItem.getEnchantLevel() < 6))) {
+			return false;
+		}
+		if (!_gloves.isEmpty() && ((glovesItem == null) || (glovesItem.getEnchantLevel() < 6))) {
+			return false;
+		}
+		if (!_head.isEmpty() && ((headItem == null) || (headItem.getEnchantLevel() < 6))) {
+			return false;
+		}
+		return _feet.isEmpty() || ((feetItem != null) && (feetItem.getEnchantLevel() >= 6));
+	}
+	
+	public int getCON() {
+		return _con;
+	}
+	
+	public int getDEX() {
+		return _dex;
+	}
+	
+	public int getSTR() {
+		return _str;
+	}
+	
+	public int getMEN() {
+		return _men;
+	}
+	
+	public int getWIT() {
+		return _wit;
+	}
+	
+	public int getINT() {
+		return _int;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Augmentation.java b/src/main/java/com/l2jserver/gameserver/model/L2Augmentation.java
new file mode 100644
index 00000000..ffd9683d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Augmentation.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.OptionData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.options.Options;
+
+/**
+ * Used to store an augmentation and its bonuses.
+ * @author durgus
+ * @author UnAfraid
+ */
+public final class L2Augmentation {
+	private final int _effectsId;
+	private final AugmentationStatBoni _boni;
+	
+	public L2Augmentation(int effects) {
+		_effectsId = effects;
+		_boni = new AugmentationStatBoni(_effectsId);
+	}
+	
+	public static class AugmentationStatBoni {
+		private static final Logger LOG = LoggerFactory.getLogger(AugmentationStatBoni.class);
+		
+		private final List<Options> _options = new ArrayList<>();
+		private boolean _active;
+		
+		public AugmentationStatBoni(int augmentationId) {
+			_active = false;
+			int[] stats = new int[2];
+			stats[0] = 0x0000FFFF & augmentationId;
+			stats[1] = (augmentationId >> 16);
+			
+			for (int stat : stats) {
+				Options op = OptionData.getInstance().getOptions(stat);
+				if (op != null) {
+					_options.add(op);
+				} else {
+					LOG.warn("Couldn't find option: {}", stat);
+				}
+			}
+		}
+		
+		public void applyBonus(L2PcInstance player) {
+			// make sure the bonuses are not applied twice..
+			if (_active) {
+				return;
+			}
+			
+			for (Options op : _options) {
+				op.apply(player);
+			}
+			
+			_active = true;
+		}
+		
+		public void removeBonus(L2PcInstance player) {
+			// make sure the bonuses are not removed twice
+			if (!_active) {
+				return;
+			}
+			
+			for (Options op : _options) {
+				op.remove(player);
+			}
+			
+			_active = false;
+		}
+	}
+	
+	public int getAttributes() {
+		return _effectsId;
+	}
+	
+	/**
+	 * Get the augmentation "id" used in server packets.
+	 * @return augmentationId
+	 */
+	public int getAugmentationId() {
+		return _effectsId;
+	}
+	
+	/**
+	 * Applies the bonuses to the player.
+	 */
+	public void applyBonus(L2PcInstance player) {
+		_boni.applyBonus(player);
+	}
+	
+	/**
+	 * Removes the augmentation bonuses from the player.
+	 */
+	public void removeBonus(L2PcInstance player) {
+		_boni.removeBonus(player);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Clan.java b/src/main/java/com/l2jserver/gameserver/model/L2Clan.java
new file mode 100644
index 00000000..dbbc78f9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Clan.java
@@ -0,0 +1,2353 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.clan;
+import static com.l2jserver.gameserver.config.Configuration.fortress;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.bbs.service.ForumsBBSManager;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanJoin;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanLeaderChange;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanLeave;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanLevelUp;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExSubPledgeSkillAdd;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.PledgeReceiveSubPledgeCreated;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListAll;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListDeleteAll;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList;
+import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList.SubPledgeSkill;
+import com.l2jserver.gameserver.network.serverpackets.PledgeSkillListAdd;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.EnumIntBitmask;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Clan.
+ * @author JIV
+ * @author janiii
+ * @author _DS_
+ * @author Gigiikun
+ * @author MELERIX
+ * @author Zoey76
+ * @author UnAfraid
+ * @author VlLight
+ * @author nBd
+ * @author Adry_85
+ * @author xban1x
+ * @author Nos
+ * @author Zealar
+ * @author HorridoJoho
+ * @author Kita
+ */
+public class L2Clan implements IIdentifiable, INamable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Clan.class);
+	
+	// SQL queries
+	private static final String INSERT_CLAN_DATA = "INSERT INTO clan_data (clan_id,clan_name,clan_level,hasCastle,blood_alliance_count,blood_oath_count,ally_id,ally_name,leader_id,crest_id,crest_large_id,ally_crest_id,new_leader_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?)";
+	private static final String SELECT_CLAN_DATA = "SELECT * FROM clan_data where clan_id=?";
+	
+	// Ally Penalty Types
+	/** Clan left ally */
+	public static final int PENALTY_TYPE_CLAN_LEFT = 1;
+	/** Clan was dismissed from ally */
+	public static final int PENALTY_TYPE_CLAN_DISMISSED = 2;
+	/** Leader clan dismiss clan from ally */
+	public static final int PENALTY_TYPE_DISMISS_CLAN = 3;
+	/** Leader clan dissolve ally */
+	public static final int PENALTY_TYPE_DISSOLVE_ALLY = 4;
+	// Sub-unit types
+	/** Clan subunit type of Academy */
+	public static final int SUBUNIT_ACADEMY = -1;
+	/** Clan subunit type of Royal Guard A */
+	public static final int SUBUNIT_ROYAL1 = 100;
+	/** Clan subunit type of Royal Guard B */
+	public static final int SUBUNIT_ROYAL2 = 200;
+	/** Clan subunit type of Order of Knights A-1 */
+	public static final int SUBUNIT_KNIGHT1 = 1001;
+	/** Clan subunit type of Order of Knights A-2 */
+	public static final int SUBUNIT_KNIGHT2 = 1002;
+	/** Clan subunit type of Order of Knights B-1 */
+	public static final int SUBUNIT_KNIGHT3 = 2001;
+	/** Clan subunit type of Order of Knights B-2 */
+	public static final int SUBUNIT_KNIGHT4 = 2002;
+	
+	private String _name;
+	private int _clanId;
+	private L2ClanMember _leader;
+	private final Map<Integer, L2ClanMember> _members = new ConcurrentHashMap<>();
+	
+	private String _allyName;
+	private int _allyId;
+	private int _level;
+	private int _castleId;
+	private int _fortId;
+	private int _hideoutId;
+	private int _hiredGuards;
+	private int _crestId;
+	private int _crestLargeId;
+	private int _allyCrestId;
+	private int _auctionBidAt = 0;
+	private long _allyPenaltyExpiryTime;
+	private int _allyPenaltyType;
+	private long _charPenaltyExpiryTime;
+	private long _dissolvingExpiryTime;
+	private int _bloodAllianceCount;
+	private int _bloodOathCount;
+	
+	private final ItemContainer _warehouse = new ClanWarehouse(this);
+	private final Set<Integer> _atWarWith = ConcurrentHashMap.newKeySet();
+	private final Set<Integer> _atWarAttackers = ConcurrentHashMap.newKeySet();
+	
+	/** Map(Integer, L2Skill) containing all skills of the L2Clan */
+	private final Map<Integer, Skill> _skills = new ConcurrentHashMap<>();
+	private final Map<Integer, RankPrivs> _privs = new ConcurrentHashMap<>();
+	private final Map<Integer, SubPledge> _subPledges = new ConcurrentHashMap<>();
+	private final Map<Integer, Skill> _subPledgeSkills = new ConcurrentHashMap<>();
+	
+	private int _reputationScore = 0;
+	private int _rank = 0;
+	
+	private String _notice;
+	private boolean _noticeEnabled = false;
+	private static final int MAX_NOTICE_LENGTH = 8192;
+	private int _newLeaderId;
+	
+	private final AtomicInteger _siegeKills = new AtomicInteger();
+	private final AtomicInteger _siegeDeaths = new AtomicInteger();
+	
+	/**
+	 * Called if a clan is referenced only by id. In this case all other data needs to be fetched from db
+	 * @param clanId A valid clan Id to create and restore
+	 */
+	public L2Clan(int clanId) {
+		_clanId = clanId;
+		initializePrivs();
+		restore();
+		getWarehouse().restore();
+	}
+	
+	/**
+	 * Called only if a new clan is created
+	 * @param clanId A valid clan Id to create
+	 * @param clanName A valid clan name
+	 */
+	public L2Clan(int clanId, String clanName) {
+		_clanId = clanId;
+		_name = clanName;
+		initializePrivs();
+	}
+	
+	@Override
+	public int getId() {
+		return _clanId;
+	}
+	
+	public void setClanId(int clanId) {
+		_clanId = clanId;
+	}
+	
+	public int getLeaderId() {
+		return (_leader != null ? _leader.getObjectId() : 0);
+	}
+	
+	public L2ClanMember getLeader() {
+		return _leader;
+	}
+	
+	public void setLeader(L2ClanMember leader) {
+		_leader = leader;
+		_members.put(leader.getObjectId(), leader);
+	}
+	
+	public void setNewLeader(L2ClanMember member) {
+		final L2PcInstance newLeader = member.getPlayerInstance();
+		final L2ClanMember exMember = getLeader();
+		final L2PcInstance exLeader = exMember.getPlayerInstance();
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanLeaderChange(exMember, member, this));
+		
+		if (exLeader != null) {
+			if (exLeader.isFlying()) {
+				exLeader.dismount();
+			}
+			
+			if (getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) {
+				SiegeManager.getInstance().removeSiegeSkills(exLeader);
+			}
+			exLeader.getClanPrivileges().clear();
+			exLeader.broadcastUserInfo();
+			
+		} else {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("UPDATE characters SET clan_privs = ? WHERE charId = ?")) {
+				ps.setInt(1, 0);
+				ps.setInt(2, getLeaderId());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Couldn't update clan privs for old clan leader", e);
+			}
+		}
+		
+		setLeader(member);
+		if (getNewLeaderId() != 0) {
+			setNewLeaderId(0, true);
+		}
+		updateClanInDB();
+		
+		if (exLeader != null) {
+			exLeader.setPledgeClass(L2ClanMember.calculatePledgeClass(exLeader));
+			exLeader.broadcastUserInfo();
+			exLeader.checkItemRestriction();
+		}
+		
+		if (newLeader != null) {
+			newLeader.setPledgeClass(L2ClanMember.calculatePledgeClass(newLeader));
+			newLeader.getClanPrivileges().setAll();
+			
+			if (getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) {
+				SiegeManager.getInstance().addSiegeSkills(newLeader);
+			}
+			newLeader.broadcastUserInfo();
+		} else {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("UPDATE characters SET clan_privs = ? WHERE charId = ?")) {
+				ps.setInt(1, EnumIntBitmask.getAllBitmask(ClanPrivilege.class));
+				ps.setInt(2, getLeaderId());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Couldn't update clan privs for new clan leader", e);
+			}
+		}
+		
+		broadcastClanStatus();
+		broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1).addString(member.getName()));
+		
+		LOG.info("Leader of Clan: {} changed to: {} ex leader: {}", getName(), member.getName(), exMember.getName());
+	}
+	
+	public String getLeaderName() {
+		if (_leader == null) {
+			LOG.warn("Clan {} without clan leader!", getName());
+			return "";
+		}
+		return _leader.getName();
+	}
+	
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	public void setName(String name) {
+		_name = name;
+	}
+	
+	/**
+	 * Adds a clan member to the clan.
+	 * @param member the clan member.
+	 */
+	private void addClanMember(L2ClanMember member) {
+		_members.put(member.getObjectId(), member);
+	}
+	
+	/**
+	 * Adds a clan member to the clan.<br>
+	 * Using a different constructor, to make it easier to read.
+	 * @param player the clan member
+	 */
+	public void addClanMember(L2PcInstance player) {
+		final L2ClanMember member = new L2ClanMember(this, player);
+		member.setPlayerInstance(player);
+		addClanMember(member);
+		
+		player.setClan(this);
+		player.setPledgeClass(L2ClanMember.calculatePledgeClass(player));
+		player.sendPacket(new PledgeShowMemberListUpdate(player));
+		player.sendPacket(new PledgeSkillList(this));
+		
+		addSkillEffects(player);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanJoin(member, this));
+	}
+	
+	/**
+	 * Updates player status in clan.
+	 * @param player the player to be updated.
+	 */
+	public void updateClanMember(L2PcInstance player) {
+		final L2ClanMember member = new L2ClanMember(player.getClan(), player);
+		if (player.isClanLeader()) {
+			setLeader(member);
+		}
+		
+		addClanMember(member);
+	}
+	
+	/**
+	 * @param name the name of the required clan member.
+	 * @return the clan member for a given name.
+	 */
+	public L2ClanMember getClanMember(String name) {
+		for (L2ClanMember temp : _members.values()) {
+			if (temp.getName().equals(name)) {
+				return temp;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @param objectId the required clan member object Id.
+	 * @return the clan member for a given {@code objectId}.
+	 */
+	public L2ClanMember getClanMember(int objectId) {
+		return _members.get(objectId);
+	}
+	
+	/**
+	 * @param objectId the object Id of the member that will be removed.
+	 * @param clanJoinExpiryTime time penalty to join a clan.
+	 */
+	public void removeClanMember(int objectId, long clanJoinExpiryTime) {
+		final L2ClanMember exMember = _members.remove(objectId);
+		if (exMember == null) {
+			LOG.warn("Member Object ID: {} not found in clan while trying to remove", objectId);
+			return;
+		}
+		final int subPledgeLeader = getLeaderSubPledge(objectId);
+		if (subPledgeLeader != 0) {
+			// Subunit leader withdraws, position becomes vacant and leader should appoint new via NPC
+			getSubPledge(subPledgeLeader).setLeaderId(0);
+			updateSubPledgeInDB(subPledgeLeader);
+		}
+		
+		if (exMember.getApprentice() != 0) {
+			final L2ClanMember apprentice = getClanMember(exMember.getApprentice());
+			if (apprentice != null) {
+				if (apprentice.getPlayerInstance() != null) {
+					apprentice.getPlayerInstance().setSponsor(0);
+				} else {
+					apprentice.setApprenticeAndSponsor(0, 0);
+				}
+				
+				apprentice.saveApprenticeAndSponsor(0, 0);
+			}
+		}
+		if (exMember.getSponsor() != 0) {
+			final L2ClanMember sponsor = getClanMember(exMember.getSponsor());
+			if (sponsor != null) {
+				if (sponsor.getPlayerInstance() != null) {
+					sponsor.getPlayerInstance().setApprentice(0);
+				} else {
+					sponsor.setApprenticeAndSponsor(0, 0);
+				}
+				
+				sponsor.saveApprenticeAndSponsor(0, 0);
+			}
+		}
+		exMember.saveApprenticeAndSponsor(0, 0);
+		if (character().removeCastleCirclets()) {
+			CastleManager.getInstance().removeCirclet(exMember, getCastleId());
+		}
+		
+		final L2PcInstance player = exMember.getPlayerInstance();
+		if (player != null) {
+			if (!player.isNoble()) {
+				player.setTitle("");
+			}
+			player.setApprentice(0);
+			player.setSponsor(0);
+			
+			if (player.isClanLeader()) {
+				SiegeManager.getInstance().removeSiegeSkills(player);
+				player.setClanCreateExpiryTime(System.currentTimeMillis() + character().getDaysBeforeCreateAClan());
+			}
+			// remove Clan skills from Player
+			removeSkillEffects(player);
+			
+			// remove Residential skills
+			if (player.getClan().getCastleId() > 0) {
+				CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+			}
+			if (player.getClan().getFortId() > 0) {
+				FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+			}
+			player.sendSkillList();
+			
+			player.setClan(null);
+			
+			// players leaving from clan academy have no penalty
+			if (exMember.getPledgeType() != -1) {
+				player.setClanJoinExpiryTime(clanJoinExpiryTime);
+			}
+			
+			player.setPledgeClass(L2ClanMember.calculatePledgeClass(player));
+			player.broadcastUserInfo();
+			// disable clan tab
+			player.sendPacket(PledgeShowMemberListDeleteAll.STATIC_PACKET);
+		} else {
+			removeMemberInDatabase(exMember.getObjectId(), clanJoinExpiryTime, getLeaderId() == objectId ? System.currentTimeMillis() + character().getDaysBeforeCreateAClan() : 0);
+		}
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanLeave(exMember, this));
+	}
+	
+	public L2ClanMember[] getMembers() {
+		return _members.values().toArray(new L2ClanMember[0]);
+	}
+	
+	public int getMembersCount() {
+		return _members.size();
+	}
+	
+	public int getSubPledgeMembersCount(int subpl) {
+		int result = 0;
+		for (L2ClanMember temp : _members.values()) {
+			if (temp.getPledgeType() == subpl) {
+				result++;
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * @param pledgeType the Id of the pledge type.
+	 * @return the maximum number of members allowed for a given {@code pledgeType}.
+	 */
+	public int getMaxNrOfMembers(int pledgeType) {
+		int limit = 0;
+		
+		switch (pledgeType) {
+			case 0:
+				limit = switch (getLevel()) {
+					case 3 -> 30;
+					case 2 -> 20;
+					case 1 -> 15;
+					case 0 -> 10;
+					default -> 40;
+				};
+				break;
+			case -1:
+				limit = 20;
+				break;
+			case 100:
+			case 200:
+				if (getLevel() == 11) {
+					limit = 30;
+				} else {
+					limit = 20;
+				}
+				break;
+			case 1001:
+			case 1002:
+			case 2001:
+			case 2002:
+				limit = switch (getLevel()) {
+					case 9, 10, 11 -> 25;
+					default -> 10;
+				};
+				break;
+			default:
+				break;
+		}
+		return limit;
+	}
+	
+	/**
+	 * @param exclude the object Id to exclude from list.
+	 * @return all online members excluding the one with object id {code exclude}.
+	 */
+	public List<L2PcInstance> getOnlineMembers(int exclude) {
+		final List<L2PcInstance> onlineMembers = new ArrayList<>();
+		for (L2ClanMember temp : _members.values()) {
+			if ((temp != null) && temp.isOnline() && (temp.getObjectId() != exclude)) {
+				onlineMembers.add(temp.getPlayerInstance());
+			}
+		}
+		return onlineMembers;
+	}
+	
+	/**
+	 * @return the online clan member count.
+	 */
+	public int getOnlineMembersCount() {
+		int count = 0;
+		for (L2ClanMember temp : _members.values()) {
+			if ((temp == null) || !temp.isOnline()) {
+				continue;
+			}
+			count++;
+		}
+		return count;
+	}
+	
+	/**
+	 * @return the alliance Id.
+	 */
+	public int getAllyId() {
+		return _allyId;
+	}
+	
+	/**
+	 * @return the alliance name.
+	 */
+	public String getAllyName() {
+		return _allyName;
+	}
+	
+	/**
+	 * @param allyCrestId the alliance crest Id to be set.
+	 */
+	public void setAllyCrestId(int allyCrestId) {
+		_allyCrestId = allyCrestId;
+	}
+	
+	/**
+	 * @return the alliance crest Id.
+	 */
+	public int getAllyCrestId() {
+		return _allyCrestId;
+	}
+	
+	/**
+	 * Gets the clan level.
+	 * @return the clan level
+	 */
+	public int getLevel() {
+		return _level;
+	}
+	
+	/**
+	 * Sets the clan level.
+	 * @param level the level to set
+	 */
+	public void setLevel(int level) {
+		_level = level;
+	}
+	
+	/**
+	 * @return the castle Id for this clan if owns a castle, zero otherwise.
+	 */
+	public int getCastleId() {
+		return _castleId;
+	}
+	
+	/**
+	 * @return the fort Id for this clan if owns a fort, zero otherwise.
+	 */
+	public int getFortId() {
+		return _fortId;
+	}
+	
+	/**
+	 * @return the hideout Id for this clan if owns a hideout, zero otherwise.
+	 */
+	public int getHideoutId() {
+		return _hideoutId;
+	}
+	
+	/**
+	 * @param crestId the Id of the clan crest to be set.
+	 */
+	public void setCrestId(int crestId) {
+		_crestId = crestId;
+	}
+	
+	/**
+	 * @return Returns the clanCrestId.
+	 */
+	public int getCrestId() {
+		return _crestId;
+	}
+	
+	/**
+	 * @param crestLargeId The id of pledge LargeCrest.
+	 */
+	public void setCrestLargeId(int crestLargeId) {
+		_crestLargeId = crestLargeId;
+	}
+	
+	/**
+	 * @return Returns the clan CrestLargeId
+	 */
+	public int getCrestLargeId() {
+		return _crestLargeId;
+	}
+	
+	/**
+	 * @param allyId The allyId to set.
+	 */
+	public void setAllyId(int allyId) {
+		_allyId = allyId;
+	}
+	
+	/**
+	 * @param allyName The allyName to set.
+	 */
+	public void setAllyName(String allyName) {
+		_allyName = allyName;
+	}
+	
+	/**
+	 * @param castleId the castle Id to set.
+	 */
+	public void setCastleId(int castleId) {
+		_castleId = castleId;
+	}
+	
+	/**
+	 * @param fortId the fort Id to set.
+	 */
+	public void setFortId(int fortId) {
+		_fortId = fortId;
+	}
+	
+	/**
+	 * @param hideoutId the hideout Id to set.
+	 */
+	public void setHideoutId(int hideoutId) {
+		_hideoutId = hideoutId;
+	}
+	
+	/**
+	 * @param id the Id of the player to be verified.
+	 * @return {code true} if the player belongs to the clan.
+	 */
+	public boolean isMember(int id) {
+		return ((id != 0) && _members.containsKey(id));
+	}
+	
+	/**
+	 * @return the Blood Alliance count for this clan
+	 */
+	public int getBloodAllianceCount() {
+		return _bloodAllianceCount;
+	}
+	
+	/**
+	 * Increase Blood Alliance count by config predefined count and updates the database.
+	 */
+	public void increaseBloodAllianceCount() {
+		_bloodAllianceCount += SiegeManager.getInstance().getBloodAllianceReward();
+		updateBloodAllianceCountInDB();
+	}
+	
+	/**
+	 * Reset the Blood Alliance count to zero and updates the database.
+	 */
+	public void resetBloodAllianceCount() {
+		_bloodAllianceCount = 0;
+		updateBloodAllianceCountInDB();
+	}
+	
+	/**
+	 * Store current Blood Alliances count in database.
+	 */
+	public void updateBloodAllianceCountInDB() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET blood_alliance_count=? WHERE clan_id=?")) {
+			ps.setInt(1, getBloodAllianceCount());
+			ps.setInt(2, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception on updateBloodAllianceCountInDB(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * @return the Blood Oath count for this clan
+	 */
+	public int getBloodOathCount() {
+		return _bloodOathCount;
+	}
+	
+	/**
+	 * Increase Blood Oath count by config predefined count and updates the database.
+	 */
+	public void increaseBloodOathCount() {
+		_bloodOathCount += fortress().getBloodOathCount();
+		updateBloodOathCountInDB();
+	}
+	
+	/**
+	 * Reset the Blood Oath count to zero and updates the database.
+	 */
+	public void resetBloodOathCount() {
+		_bloodOathCount = 0;
+		updateBloodOathCountInDB();
+	}
+	
+	/**
+	 * Store current Blood Alliances count in database.
+	 */
+	public void updateBloodOathCountInDB() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET blood_oath_count=? WHERE clan_id=?")) {
+			ps.setInt(1, getBloodOathCount());
+			ps.setInt(2, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception on updateBloodAllianceCountInDB(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Store in database current clan's reputation.
+	 */
+	public void updateClanScoreInDB() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET reputation_score=? WHERE clan_id=?")) {
+			ps.setInt(1, getReputationScore());
+			ps.setInt(2, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception on updateClanScoreInDb(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Updates in database clan information:
+	 * <ul>
+	 * <li>Clan leader Id</li>
+	 * <li>Alliance Id</li>
+	 * <li>Alliance name</li>
+	 * <li>Clan's reputation</li>
+	 * <li>Alliance's penalty expiration time</li>
+	 * <li>Alliance's penalty type</li>
+	 * <li>Character's penalty expiration time</li>
+	 * <li>Dissolving expiration time</li>
+	 * <li>Clan's id</li>
+	 * </ul>
+	 */
+	public void updateClanInDB() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET leader_id=?,ally_id=?,ally_name=?,reputation_score=?,ally_penalty_expiry_time=?,ally_penalty_type=?,char_penalty_expiry_time=?,dissolving_expiry_time=?,new_leader_id=? WHERE clan_id=?")) {
+			ps.setInt(1, getLeaderId());
+			ps.setInt(2, getAllyId());
+			ps.setString(3, getAllyName());
+			ps.setInt(4, getReputationScore());
+			ps.setLong(5, getAllyPenaltyExpiryTime());
+			ps.setInt(6, getAllyPenaltyType());
+			ps.setLong(7, getCharPenaltyExpiryTime());
+			ps.setLong(8, getDissolvingExpiryTime());
+			ps.setInt(9, getNewLeaderId());
+			ps.setInt(10, getId());
+			ps.execute();
+			if (general().debug()) {
+				LOG.debug("New clan leader saved in db: {}", getId());
+			}
+		} catch (Exception e) {
+			LOG.error("Error saving clan: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Stores in database clan information:
+	 * <ul>
+	 * <li>Clan Id</li>
+	 * <li>Clan name</li>
+	 * <li>Clan level</li>
+	 * <li>Has castle</li>
+	 * <li>Alliance Id</li>
+	 * <li>Alliance name</li>
+	 * <li>Clan leader Id</li>
+	 * <li>Clan crest Id</li>
+	 * <li>Clan large crest Id</li>
+	 * <li>Alliance crest Id</li>
+	 * </ul>
+	 */
+	public void store() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_CLAN_DATA)) {
+			ps.setInt(1, getId());
+			ps.setString(2, getName());
+			ps.setInt(3, getLevel());
+			ps.setInt(4, getCastleId());
+			ps.setInt(5, getBloodAllianceCount());
+			ps.setInt(6, getBloodOathCount());
+			ps.setInt(7, getAllyId());
+			ps.setString(8, getAllyName());
+			ps.setInt(9, getLeaderId());
+			ps.setInt(10, getCrestId());
+			ps.setInt(11, getCrestLargeId());
+			ps.setInt(12, getAllyCrestId());
+			ps.setInt(13, getNewLeaderId());
+			ps.execute();
+			if (general().debug()) {
+				LOG.debug("New clan saved in db: {}", getId());
+			}
+		} catch (Exception e) {
+			LOG.error("Error saving new clan: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Removes a clan member from this clan.
+	 * @param playerId the clan member object ID to be removed
+	 * @param clanJoinExpiryTime the time penalty for the player to join a new clan
+	 * @param clanCreateExpiryTime the time penalty for the player to create a new clan
+	 */
+	private void removeMemberInDatabase(int playerId, long clanJoinExpiryTime, long clanCreateExpiryTime) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("UPDATE characters SET clanid=0, title=?, clan_join_expiry_time=?, clan_create_expiry_time=?, clan_privs=0, wantspeace=0, subpledge=0, lvl_joined_academy=0, apprentice=0, sponsor=0 WHERE charId=?");
+			var ps2 = con.prepareStatement("UPDATE characters SET apprentice=0 WHERE apprentice=?");
+			var ps3 = con.prepareStatement("UPDATE characters SET sponsor=0 WHERE sponsor=?")) {
+			// Remove clan member.
+			ps1.setString(1, "");
+			ps1.setLong(2, clanJoinExpiryTime);
+			ps1.setLong(3, clanCreateExpiryTime);
+			ps1.setInt(4, playerId);
+			ps1.execute();
+			// Remove apprentice.
+			ps2.setInt(1, playerId);
+			ps2.execute();
+			// Remove sponsor.
+			ps3.setInt(1, playerId);
+			ps3.execute();
+		} catch (Exception e) {
+			LOG.error("Error removing clan member: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void restore() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_CLAN_DATA)) {
+			ps.setInt(1, getId());
+			try (var clanData = ps.executeQuery()) {
+				if (clanData.next()) {
+					setName(clanData.getString("clan_name"));
+					setLevel(clanData.getInt("clan_level"));
+					setCastleId(clanData.getInt("hasCastle"));
+					_bloodAllianceCount = clanData.getInt("blood_alliance_count");
+					_bloodOathCount = clanData.getInt("blood_oath_count");
+					setAllyId(clanData.getInt("ally_id"));
+					setAllyName(clanData.getString("ally_name"));
+					setAllyPenaltyExpiryTime(clanData.getLong("ally_penalty_expiry_time"), clanData.getInt("ally_penalty_type"));
+					if (getAllyPenaltyExpiryTime() < System.currentTimeMillis()) {
+						setAllyPenaltyExpiryTime(0, 0);
+					}
+					setCharPenaltyExpiryTime(clanData.getLong("char_penalty_expiry_time"));
+					
+					if ((getCharPenaltyExpiryTime() + character().getDaysBeforeJoinAClan()) < System.currentTimeMillis()) {
+						setCharPenaltyExpiryTime(0);
+					}
+					setDissolvingExpiryTime(clanData.getLong("dissolving_expiry_time"));
+					
+					setCrestId(clanData.getInt("crest_id"));
+					setCrestLargeId(clanData.getInt("crest_large_id"));
+					setAllyCrestId(clanData.getInt("ally_crest_id"));
+					
+					setReputationScore(clanData.getInt("reputation_score"), false);
+					setAuctionBidAt(clanData.getInt("auction_bid_at"), false);
+					setNewLeaderId(clanData.getInt("new_leader_id"), false);
+					
+					final int leaderId = (clanData.getInt("leader_id"));
+					
+					ps.clearParameters();
+					
+					try (var select = con.prepareStatement("SELECT char_name,level,classid,charId,title,power_grade,subpledge,apprentice,sponsor,sex,race FROM characters WHERE clanid=?")) {
+						select.setInt(1, getId());
+						try (var clanMember = select.executeQuery()) {
+							while (clanMember.next()) {
+								final var member = new L2ClanMember(this, clanMember);
+								if (member.getObjectId() == leaderId) {
+									setLeader(member);
+								} else {
+									addClanMember(member);
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			if (general().debug() && (getName() != null)) {
+				LOG.info("Restored clan data for \"" + getName() + "\" from database.");
+			}
+			
+			restoreSubPledges();
+			restoreRankPrivs();
+			restoreSkills();
+			restoreNotice();
+		} catch (Exception ex) {
+			LOG.error("Error restoring clan data for clan {}!", getId(), ex);
+		}
+	}
+	
+	private void restoreNotice() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT enabled,notice FROM clan_notices WHERE clan_id=?")) {
+			ps.setInt(1, getId());
+			try (var noticeData = ps.executeQuery()) {
+				while (noticeData.next()) {
+					_noticeEnabled = noticeData.getBoolean("enabled");
+					_notice = noticeData.getString("notice");
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Error restoring clan notice: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void storeNotice(String notice, boolean enabled) {
+		if (notice == null) {
+			notice = "";
+		}
+		
+		if (notice.length() > MAX_NOTICE_LENGTH) {
+			notice = notice.substring(0, MAX_NOTICE_LENGTH - 1);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO clan_notices (clan_id,notice,enabled) values (?,?,?) ON DUPLICATE KEY UPDATE notice=?,enabled=?")) {
+			ps.setInt(1, getId());
+			ps.setString(2, notice);
+			ps.setBoolean(3, enabled);
+			ps.setString(4, notice);
+			ps.setBoolean(5, enabled);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Error could not store clan notice: {}", e.getMessage(), e);
+		}
+		
+		_notice = notice;
+		_noticeEnabled = enabled;
+	}
+	
+	public void setNoticeEnabled(boolean enabled) {
+		storeNotice(_notice, enabled);
+	}
+	
+	public void setNotice(String notice) {
+		storeNotice(notice, _noticeEnabled);
+	}
+	
+	public boolean isNoticeEnabled() {
+		return _noticeEnabled;
+	}
+	
+	public String getNotice() {
+		if (_notice == null) {
+			return "";
+		}
+		return _notice;
+	}
+	
+	private void restoreSkills() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT skill_id,skill_level,sub_pledge_id FROM clan_skills WHERE clan_id=?")) {
+			// Retrieve all skills of this L2PcInstance from the database
+			ps.setInt(1, getId());
+			try (var rs = ps.executeQuery()) {
+				// Go though the recordset of this SQL query
+				while (rs.next()) {
+					int id = rs.getInt("skill_id");
+					int level = rs.getInt("skill_level");
+					// Create a L2Skill object for each record
+					Skill skill = SkillData.getInstance().getSkill(id, level);
+					// Add the L2Skill object to the L2Clan _skills
+					int subType = rs.getInt("sub_pledge_id");
+					
+					if (subType == -2) {
+						_skills.put(skill.getId(), skill);
+					} else if (subType == 0) {
+						_subPledgeSkills.put(skill.getId(), skill);
+					} else {
+						SubPledge subunit = _subPledges.get(subType);
+						if (subunit != null) {
+							subunit.addNewSkill(skill);
+						} else {
+							LOG.info("Missing subpledge " + subType + " for clan " + this + ", skill skipped.");
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Error restoring clan skills: {}", e.getMessage(), e);
+		}
+	}
+	
+	public final Skill[] getAllSkills() {
+		return _skills.values().toArray(new Skill[0]);
+	}
+	
+	public Map<Integer, Skill> getSkills() {
+		return _skills;
+	}
+	
+	/**
+	 * Used to add a skill to skill list of this L2Clan
+	 * @return the previous version of the skill if it was present, {@code null} otherwise
+	 */
+	public Skill addSkill(Skill newSkill) {
+		Skill oldSkill = null;
+		
+		if (newSkill != null) {
+			// Replace oldSkill by newSkill or Add the newSkill
+			oldSkill = _skills.put(newSkill.getId(), newSkill);
+		}
+		
+		return oldSkill;
+	}
+	
+	public Skill addNewSkill(Skill newSkill) {
+		return addNewSkill(newSkill, -2);
+	}
+	
+	/**
+	 * Used to add a new skill to the list, send a packet to all online clan members, update their stats and store it in db
+	 * @param newSkill
+	 * @param subType
+	 * @return
+	 */
+	public Skill addNewSkill(Skill newSkill, int subType) {
+		Skill oldSkill = null;
+		if (newSkill != null) {
+			
+			if (subType == -2) {
+				oldSkill = _skills.put(newSkill.getId(), newSkill);
+			} else if (subType == 0) {
+				oldSkill = _subPledgeSkills.put(newSkill.getId(), newSkill);
+			} else {
+				SubPledge subunit = getSubPledge(subType);
+				if (subunit != null) {
+					oldSkill = subunit.addNewSkill(newSkill);
+				} else {
+					LOG.warn("Subpledge {} does not exist for clan {}", subType, this);
+					return null;
+				}
+			}
+			
+			try (var con = ConnectionFactory.getInstance().getConnection()) {
+				if (oldSkill != null) {
+					try (var ps = con.prepareStatement("UPDATE clan_skills SET skill_level=? WHERE skill_id=? AND clan_id=?")) {
+						ps.setInt(1, newSkill.getLevel());
+						ps.setInt(2, oldSkill.getId());
+						ps.setInt(3, getId());
+						ps.execute();
+					}
+				} else {
+					try (var ps = con.prepareStatement("INSERT INTO clan_skills (clan_id,skill_id,skill_level,skill_name,sub_pledge_id) VALUES (?,?,?,?,?)")) {
+						ps.setInt(1, getId());
+						ps.setInt(2, newSkill.getId());
+						ps.setInt(3, newSkill.getLevel());
+						ps.setString(4, newSkill.getName());
+						ps.setInt(5, subType);
+						ps.execute();
+					}
+				}
+			} catch (Exception e) {
+				LOG.warn("Error could not store clan skills: {}", e.getMessage(), e);
+			}
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILL_S1_ADDED);
+			sm.addSkillName(newSkill.getId());
+			
+			for (L2ClanMember temp : _members.values()) {
+				if ((temp != null) && (temp.getPlayerInstance() != null) && temp.isOnline()) {
+					if (subType == -2) {
+						if (newSkill.getMinPledgeClass() <= temp.getPlayerInstance().getPledgeClass()) {
+							temp.getPlayerInstance().addSkill(newSkill, false); // Skill is not saved to player DB
+							temp.getPlayerInstance().sendPacket(new PledgeSkillListAdd(newSkill.getId(), newSkill.getLevel()));
+							temp.getPlayerInstance().sendPacket(sm);
+							temp.getPlayerInstance().sendSkillList();
+						}
+					} else {
+						if (temp.getPledgeType() == subType) {
+							temp.getPlayerInstance().addSkill(newSkill, false); // Skill is not saved to player DB
+							temp.getPlayerInstance().sendPacket(new ExSubPledgeSkillAdd(subType, newSkill.getId(), newSkill.getLevel()));
+							temp.getPlayerInstance().sendPacket(sm);
+							temp.getPlayerInstance().sendSkillList();
+						}
+					}
+				}
+			}
+		}
+		
+		return oldSkill;
+	}
+	
+	public void addSkillEffects() {
+		for (Skill skill : _skills.values()) {
+			for (L2ClanMember temp : _members.values()) {
+				try {
+					if ((temp != null) && temp.isOnline()) {
+						if (skill.getMinPledgeClass() <= temp.getPlayerInstance().getPledgeClass()) {
+							temp.getPlayerInstance().addSkill(skill, false); // Skill is not saved to player DB
+						}
+					}
+				} catch (NullPointerException e) {
+					LOG.warn(e.getMessage(), e);
+				}
+			}
+		}
+	}
+	
+	public void addSkillEffects(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		for (Skill skill : _skills.values()) {
+			if (skill.getMinPledgeClass() <= player.getPledgeClass()) {
+				player.addSkill(skill, false); // Skill is not saved to player DB
+			}
+		}
+		
+		if (player.getPledgeType() == 0) {
+			for (Skill skill : _subPledgeSkills.values()) {
+				player.addSkill(skill, false); // Skill is not saved to player DB
+			}
+		} else {
+			SubPledge subunit = getSubPledge(player.getPledgeType());
+			if (subunit == null) {
+				return;
+			}
+			for (Skill skill : subunit.getSkills()) {
+				player.addSkill(skill, false); // Skill is not saved to player DB
+			}
+		}
+		
+		if (_reputationScore < 0) {
+			skillsStatus(player, true);
+		}
+	}
+	
+	public void removeSkillEffects(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		
+		for (Skill skill : _skills.values()) {
+			player.removeSkill(skill, false); // Skill is not saved to player DB
+		}
+		
+		if (player.getPledgeType() == 0) {
+			for (Skill skill : _subPledgeSkills.values()) {
+				player.removeSkill(skill, false); // Skill is not saved to player DB
+			}
+		} else {
+			SubPledge subunit = getSubPledge(player.getPledgeType());
+			if (subunit == null) {
+				return;
+			}
+			for (Skill skill : subunit.getSkills()) {
+				player.removeSkill(skill, false); // Skill is not saved to player DB
+			}
+		}
+	}
+	
+	public void skillsStatus(L2PcInstance player, boolean disable) {
+		if (player == null) {
+			return;
+		}
+		
+		for (Skill skill : _skills.values()) {
+			if (disable) {
+				player.disableSkill(skill, -1);
+			} else {
+				player.enableSkill(skill);
+			}
+		}
+		
+		if (player.getPledgeType() == 0) {
+			for (Skill skill : _subPledgeSkills.values()) {
+				if (disable) {
+					player.disableSkill(skill, -1);
+				} else {
+					player.enableSkill(skill);
+				}
+			}
+		} else {
+			final SubPledge subunit = getSubPledge(player.getPledgeType());
+			if (subunit != null) {
+				for (Skill skill : subunit.getSkills()) {
+					if (disable) {
+						player.disableSkill(skill, -1);
+					} else {
+						player.enableSkill(skill);
+					}
+				}
+			}
+		}
+	}
+	
+	public void broadcastToOnlineAllyMembers(L2GameServerPacket packet) {
+		for (L2Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) {
+			clan.broadcastToOnlineMembers(packet);
+		}
+	}
+	
+	public void broadcastToOnlineMembers(L2GameServerPacket packet) {
+		for (L2ClanMember member : _members.values()) {
+			if ((member != null) && member.isOnline()) {
+				member.getPlayerInstance().sendPacket(packet);
+			}
+		}
+	}
+	
+	public void broadcastCSToOnlineMembers(CreatureSay packet, L2PcInstance broadcaster) {
+		for (L2ClanMember member : _members.values()) {
+			if ((member != null) && member.isOnline() && !BlockList.isBlocked(member.getPlayerInstance(), broadcaster)) {
+				member.getPlayerInstance().sendPacket(packet);
+			}
+		}
+	}
+	
+	public void broadcastToOtherOnlineMembers(L2GameServerPacket packet, L2PcInstance player) {
+		for (L2ClanMember member : _members.values()) {
+			if ((member != null) && member.isOnline() && (member.getPlayerInstance() != player)) {
+				member.getPlayerInstance().sendPacket(packet);
+			}
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return getName() + "[" + getId() + "]";
+	}
+	
+	public ItemContainer getWarehouse() {
+		return _warehouse;
+	}
+	
+	public boolean isAtWarWith(int id) {
+		return _atWarWith.contains(id);
+	}
+	
+	public boolean isAtWarWith(L2Clan clan) {
+		return _atWarWith.contains(clan.getId());
+	}
+	
+	public boolean isAtWarAttacker(int id) {
+		return _atWarAttackers.contains(id);
+	}
+	
+	public void setEnemyClan(L2Clan clan) {
+		_atWarWith.add(clan.getId());
+	}
+	
+	public void setEnemyClan(int id) {
+		_atWarWith.add(id);
+	}
+	
+	public void setAttackerClan(L2Clan clan) {
+		_atWarAttackers.add(clan.getId());
+	}
+	
+	public void setAttackerClan(int clan) {
+		_atWarAttackers.add(clan);
+	}
+	
+	public void deleteEnemyClan(L2Clan clan) {
+		_atWarWith.remove(clan.getId());
+	}
+	
+	public void deleteAttackerClan(L2Clan clan) {
+		_atWarAttackers.remove(clan.getId());
+	}
+	
+	public int getHiredGuards() {
+		return _hiredGuards;
+	}
+	
+	public void incrementHiredGuards() {
+		_hiredGuards++;
+	}
+	
+	public boolean isAtWar() {
+		return !_atWarWith.isEmpty();
+	}
+	
+	public Set<Integer> getWarList() {
+		return _atWarWith;
+	}
+	
+	public Set<Integer> getAttackerList() {
+		return _atWarAttackers;
+	}
+	
+	public void broadcastClanStatus() {
+		for (L2PcInstance member : getOnlineMembers(0)) {
+			member.sendPacket(PledgeShowMemberListDeleteAll.STATIC_PACKET);
+			member.sendPacket(new PledgeShowMemberListAll(this, member));
+		}
+	}
+	
+	public static class SubPledge {
+		private final int _id;
+		private String _subPledgeName;
+		private int _leaderId;
+		private final Map<Integer, Skill> _subPledgeSkills = new HashMap<>();
+		
+		public SubPledge(int id, String name, int leaderId) {
+			_id = id;
+			_subPledgeName = name;
+			_leaderId = leaderId;
+		}
+		
+		public int getId() {
+			return _id;
+		}
+		
+		public String getName() {
+			return _subPledgeName;
+		}
+		
+		public void setName(String name) {
+			_subPledgeName = name;
+		}
+		
+		public int getLeaderId() {
+			return _leaderId;
+		}
+		
+		public void setLeaderId(int leaderId) {
+			_leaderId = leaderId;
+		}
+		
+		public Skill addNewSkill(Skill skill) {
+			return _subPledgeSkills.put(skill.getId(), skill);
+		}
+		
+		public Collection<Skill> getSkills() {
+			return _subPledgeSkills.values();
+		}
+		
+		public Skill getSkill(int id) {
+			return _subPledgeSkills.get(id);
+		}
+	}
+	
+	public static class RankPrivs {
+		private final int _rankId;
+		private final int _party;// TODO find out what this stuff means and implement it
+		private final EnumIntBitmask<ClanPrivilege> _rankPrivs;
+		
+		public RankPrivs(int rank, int party, int privs) {
+			_rankId = rank;
+			_party = party;
+			_rankPrivs = new EnumIntBitmask<>(ClanPrivilege.class, privs);
+		}
+		
+		public RankPrivs(int rank, int party, EnumIntBitmask<ClanPrivilege> rankPrivs) {
+			_rankId = rank;
+			_party = party;
+			_rankPrivs = rankPrivs;
+		}
+		
+		public int getRank() {
+			return _rankId;
+		}
+		
+		public int getParty() {
+			return _party;
+		}
+		
+		public EnumIntBitmask<ClanPrivilege> getPrivs() {
+			return _rankPrivs;
+		}
+		
+		public void setPrivs(int privs) {
+			_rankPrivs.setBitmask(privs);
+		}
+	}
+	
+	private void restoreSubPledges() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT sub_pledge_id,name,leader_id FROM clan_subpledges WHERE clan_id=?")) {
+			// Retrieve all subpledges of this clan from the database
+			ps.setInt(1, getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int id = rs.getInt("sub_pledge_id");
+					String name = rs.getString("name");
+					int leaderId = rs.getInt("leader_id");
+					// Create a SubPledge object for each record
+					SubPledge pledge = new SubPledge(id, name, leaderId);
+					_subPledges.put(id, pledge);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not restore clan sub-units: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * used to retrieve subPledge by type
+	 */
+	public final SubPledge getSubPledge(int pledgeType) {
+		return _subPledges.get(pledgeType);
+	}
+	
+	/**
+	 * Used to retrieve subPledge by name
+	 */
+	public final SubPledge getSubPledge(String pledgeName) {
+		for (SubPledge sp : _subPledges.values()) {
+			if (sp.getName().equalsIgnoreCase(pledgeName)) {
+				return sp;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Used to retrieve all subPledges
+	 */
+	public final SubPledge[] getAllSubPledges() {
+		return _subPledges.values().toArray(new SubPledge[0]);
+	}
+	
+	public SubPledge createSubPledge(L2PcInstance player, int pledgeType, int leaderId, String subPledgeName) {
+		SubPledge subPledge = null;
+		pledgeType = getAvailablePledgeTypes(pledgeType);
+		if (pledgeType == 0) {
+			if (pledgeType == SUBUNIT_ACADEMY) {
+				player.sendPacket(SystemMessageId.CLAN_HAS_ALREADY_ESTABLISHED_A_CLAN_ACADEMY);
+			} else {
+				player.sendMessage("You can't create any more sub-units of this type");
+			}
+			return null;
+		}
+		if (_leader.getObjectId() == leaderId) {
+			player.sendMessage("Leader is not correct");
+			return null;
+		}
+		
+		// Royal Guard 5000 points per each
+		// Order of Knights 10000 points per each
+		if ((pledgeType != -1) && (((getReputationScore() < clan().getCreateRoyalGuardCost()) && (pledgeType < SUBUNIT_KNIGHT1)) || //
+			((getReputationScore() < clan().getCreateKnightUnitCost()) && (pledgeType > SUBUNIT_ROYAL2)))) {
+			player.sendPacket(SystemMessageId.THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW);
+			return null;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)")) {
+			ps.setInt(1, getId());
+			ps.setInt(2, pledgeType);
+			ps.setString(3, subPledgeName);
+			ps.setInt(4, pledgeType != -1 ? leaderId : 0);
+			ps.execute();
+			
+			subPledge = new SubPledge(pledgeType, subPledgeName, leaderId);
+			_subPledges.put(pledgeType, subPledge);
+			
+			if (pledgeType != -1) {
+				// Royal Guard 5000 points per each
+				// Order of Knights 10000 points per each
+				if (pledgeType < SUBUNIT_KNIGHT1) {
+					setReputationScore(getReputationScore() - clan().getCreateRoyalGuardCost(), true);
+				} else {
+					setReputationScore(getReputationScore() - clan().getCreateKnightUnitCost(), true);
+					// TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use clan().getReinforceKnightUnitCost()
+				}
+			}
+			
+			if (general().debug()) {
+				LOG.debug("New sub_clan saved in db: {}; {}", getId(), pledgeType);
+			}
+		} catch (Exception e) {
+			LOG.error("Error saving sub clan data: {}", e.getMessage(), e);
+		}
+		
+		broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan()));
+		broadcastToOnlineMembers(new PledgeReceiveSubPledgeCreated(subPledge, _leader.getClan()));
+		return subPledge;
+	}
+	
+	public int getAvailablePledgeTypes(int pledgeType) {
+		if (_subPledges.get(pledgeType) != null) {
+			switch (pledgeType) {
+				case SUBUNIT_ROYAL2, SUBUNIT_ACADEMY, SUBUNIT_KNIGHT4 -> pledgeType = 0;
+				case SUBUNIT_ROYAL1 -> pledgeType = getAvailablePledgeTypes(SUBUNIT_ROYAL2);
+				case SUBUNIT_KNIGHT1 -> pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT2);
+				case SUBUNIT_KNIGHT2 -> pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT3);
+				case SUBUNIT_KNIGHT3 -> pledgeType = getAvailablePledgeTypes(SUBUNIT_KNIGHT4);
+			}
+		}
+		return pledgeType;
+	}
+	
+	public void updateSubPledgeInDB(int pledgeType) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_subpledges SET leader_id=?, name=? WHERE clan_id=? AND sub_pledge_id=?")) {
+			ps.setInt(1, getSubPledge(pledgeType).getLeaderId());
+			ps.setString(2, getSubPledge(pledgeType).getName());
+			ps.setInt(3, getId());
+			ps.setInt(4, pledgeType);
+			ps.execute();
+			if (general().debug()) {
+				LOG.debug("Subpledge updated in db: {}", getId());
+			}
+		} catch (Exception e) {
+			LOG.error("Error updating subpledge: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void restoreRankPrivs() {
+		DAOFactory.getInstance().getClanDAO().getPrivileges(getId()).forEach((rank, privileges) -> _privs.get(rank).setPrivs(privileges));
+	}
+	
+	private void initializePrivs() {
+		for (int i = 1; i < 10; i++) {
+			_privs.put(i, new RankPrivs(i, 0, new EnumIntBitmask<>(ClanPrivilege.class, false)));
+		}
+	}
+	
+	public EnumIntBitmask<ClanPrivilege> getRankPrivs(int rank) {
+		if (_privs.get(rank) != null) {
+			return _privs.get(rank).getPrivs();
+		}
+		return new EnumIntBitmask<>(ClanPrivilege.class, false);
+	}
+	
+	public void setRankPrivs(int rank, int privs) {
+		final var rankPrivileges = _privs.get(rank);
+		if (rankPrivileges != null) {
+			rankPrivileges.setPrivs(privs);
+			
+			DAOFactory.getInstance().getClanDAO().storePrivileges(getId(), rank, privs);
+			
+			for (var cm : getMembers()) {
+				if (cm.isOnline() && (cm.getPlayerInstance() != null) && (cm.getPowerGrade() == rank)) {
+					cm.getPlayerInstance().getClanPrivileges().setBitmask(privs);
+					cm.getPlayerInstance().sendPacket(new UserInfo(cm.getPlayerInstance()));
+					cm.getPlayerInstance().sendPacket(new ExBrExtraUserInfo(cm.getPlayerInstance()));
+				}
+			}
+			broadcastClanStatus();
+		} else {
+			_privs.put(rank, new RankPrivs(rank, 0, privs));
+			
+			DAOFactory.getInstance().getClanDAO().storePrivileges(getId(), rank, privs);
+		}
+	}
+	
+	public final RankPrivs[] getAllRankPrivs() {
+		return _privs.values().toArray(new RankPrivs[0]);
+	}
+	
+	public int getLeaderSubPledge(int leaderId) {
+		int id = 0;
+		for (SubPledge sp : _subPledges.values()) {
+			if (sp.getLeaderId() == 0) {
+				continue;
+			}
+			if (sp.getLeaderId() == leaderId) {
+				id = sp.getId();
+			}
+		}
+		return id;
+	}
+	
+	public synchronized void addReputationScore(int value, boolean save) {
+		setReputationScore(getReputationScore() + value, save);
+	}
+	
+	public synchronized void takeReputationScore(int value, boolean save) {
+		setReputationScore(getReputationScore() - value, save);
+	}
+	
+	private void setReputationScore(int value, boolean save) {
+		if ((_reputationScore >= 0) && (value < 0)) {
+			broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.REPUTATION_POINTS_0_OR_LOWER_CLAN_SKILLS_DEACTIVATED));
+			for (L2ClanMember member : _members.values()) {
+				if (member.isOnline() && (member.getPlayerInstance() != null)) {
+					skillsStatus(member.getPlayerInstance(), true);
+				}
+			}
+		} else if ((_reputationScore < 0) && (value >= 0)) {
+			broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_SKILLS_WILL_BE_ACTIVATED_SINCE_REPUTATION_IS_0_OR_HIGHER));
+			for (L2ClanMember member : _members.values()) {
+				if (member.isOnline() && (member.getPlayerInstance() != null)) {
+					skillsStatus(member.getPlayerInstance(), false);
+				}
+			}
+		}
+		
+		_reputationScore = value;
+		if (_reputationScore > 100000000) {
+			_reputationScore = 100000000;
+		}
+		if (_reputationScore < -100000000) {
+			_reputationScore = -100000000;
+		}
+		broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
+		if (save) {
+			updateClanScoreInDB();
+		}
+	}
+	
+	public int getReputationScore() {
+		return _reputationScore;
+	}
+	
+	public void setRank(int rank) {
+		_rank = rank;
+	}
+	
+	public int getRank() {
+		return _rank;
+	}
+	
+	public int getAuctionBidAt() {
+		return _auctionBidAt;
+	}
+	
+	public void setAuctionBidAt(int id, boolean storeInDb) {
+		_auctionBidAt = id;
+		
+		if (storeInDb) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("UPDATE clan_data SET auction_bid_at=? WHERE clan_id=?")) {
+				ps.setInt(1, id);
+				ps.setInt(2, getId());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Could not store auction for clan: {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	/**
+	 * @param activeChar the clan inviting player.
+	 * @param target the invited player.
+	 * @param pledgeType the pledge type to join.
+	 * @return {core true} if activeChar and target meet various conditions to join a clan.
+	 */
+	public boolean checkClanJoinCondition(L2PcInstance activeChar, L2PcInstance target, int pledgeType) {
+		if (activeChar == null) {
+			return false;
+		}
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_JOIN_CLAN)) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return false;
+		}
+		if (target == null) {
+			activeChar.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
+			return false;
+		}
+		if (activeChar.getObjectId() == target.getObjectId()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_INVITE_YOURSELF);
+			return false;
+		}
+		if (getCharPenaltyExpiryTime() > System.currentTimeMillis()) {
+			activeChar.sendPacket(SystemMessageId.YOU_MUST_WAIT_BEFORE_ACCEPTING_A_NEW_MEMBER);
+			return false;
+		}
+		if (target.getClanId() != 0) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_WORKING_WITH_ANOTHER_CLAN);
+			sm.addString(target.getName());
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		if (target.getClanJoinExpiryTime() > System.currentTimeMillis()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_MUST_WAIT_BEFORE_JOINING_ANOTHER_CLAN);
+			sm.addString(target.getName());
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		if (((target.getLevel() > 40) || (target.getClassId().level() >= 2)) && (pledgeType == -1)) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOESNOT_MEET_REQUIREMENTS_TO_JOIN_ACADEMY);
+			sm.addString(target.getName());
+			activeChar.sendPacket(sm);
+			activeChar.sendPacket(SystemMessageId.ACADEMY_REQUIREMENTS);
+			return false;
+		}
+		if (getSubPledgeMembersCount(pledgeType) >= getMaxNrOfMembers(pledgeType)) {
+			if (pledgeType == 0) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_FULL);
+				sm.addString(getName());
+				activeChar.sendPacket(sm);
+			} else {
+				activeChar.sendPacket(SystemMessageId.SUBCLAN_IS_FULL);
+			}
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * @param activeChar the clan inviting player.
+	 * @param target the invited player.
+	 * @return {core true} if activeChar and target meet various conditions to join a clan.
+	 */
+	public boolean checkAllyJoinCondition(L2PcInstance activeChar, L2PcInstance target) {
+		if (activeChar == null) {
+			return false;
+		}
+		if ((activeChar.getAllyId() == 0) || !activeChar.isClanLeader() || (activeChar.getClanId() != activeChar.getAllyId())) {
+			activeChar.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
+			return false;
+		}
+		L2Clan leaderClan = activeChar.getClan();
+		if (leaderClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) {
+			if (leaderClan.getAllyPenaltyType() == PENALTY_TYPE_DISMISS_CLAN) {
+				activeChar.sendPacket(SystemMessageId.CANT_INVITE_CLAN_WITHIN_1_DAY);
+				return false;
+			}
+		}
+		if (target == null) {
+			activeChar.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
+			return false;
+		}
+		if (activeChar.getObjectId() == target.getObjectId()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_INVITE_YOURSELF);
+			return false;
+		}
+		if (target.getClan() == null) {
+			activeChar.sendPacket(SystemMessageId.TARGET_MUST_BE_IN_CLAN);
+			return false;
+		}
+		if (!target.isClanLeader()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_NOT_A_CLAN_LEADER);
+			sm.addString(target.getName());
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		L2Clan targetClan = target.getClan();
+		if (target.getAllyId() != 0) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_ALREADY_MEMBER_OF_S2_ALLIANCE);
+			sm.addString(targetClan.getName());
+			sm.addString(targetClan.getAllyName());
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		if (targetClan.getAllyPenaltyExpiryTime() > System.currentTimeMillis()) {
+			if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_LEFT) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANT_ENTER_ALLIANCE_WITHIN_1_DAY);
+				sm.addString(target.getClan().getName());
+				sm.addString(target.getClan().getAllyName());
+				activeChar.sendPacket(sm);
+				return false;
+			}
+			if (targetClan.getAllyPenaltyType() == PENALTY_TYPE_CLAN_DISMISSED) {
+				activeChar.sendPacket(SystemMessageId.CANT_ENTER_ALLIANCE_WITHIN_1_DAY);
+				return false;
+			}
+		}
+		if (activeChar.isInsideZone(ZoneId.SIEGE) && target.isInsideZone(ZoneId.SIEGE)) {
+			activeChar.sendPacket(SystemMessageId.OPPOSING_CLAN_IS_PARTICIPATING_IN_SIEGE);
+			return false;
+		}
+		if (leaderClan.isAtWarWith(targetClan.getId())) {
+			activeChar.sendPacket(SystemMessageId.MAY_NOT_ALLY_CLAN_BATTLE);
+			return false;
+		}
+		
+		if (ClanTable.getInstance().getClanAllies(activeChar.getAllyId()).size() >= character().getMaxNumOfClansInAlly()) {
+			activeChar.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_THE_LIMIT);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	public long getAllyPenaltyExpiryTime() {
+		return _allyPenaltyExpiryTime;
+	}
+	
+	public int getAllyPenaltyType() {
+		return _allyPenaltyType;
+	}
+	
+	public void setAllyPenaltyExpiryTime(long expiryTime, int penaltyType) {
+		_allyPenaltyExpiryTime = expiryTime;
+		_allyPenaltyType = penaltyType;
+	}
+	
+	public long getCharPenaltyExpiryTime() {
+		return _charPenaltyExpiryTime;
+	}
+	
+	public void setCharPenaltyExpiryTime(long time) {
+		_charPenaltyExpiryTime = time;
+	}
+	
+	public long getDissolvingExpiryTime() {
+		return _dissolvingExpiryTime;
+	}
+	
+	public void setDissolvingExpiryTime(long time) {
+		_dissolvingExpiryTime = time;
+	}
+	
+	public void createAlly(L2PcInstance player, String allyName) {
+		if (null == player) {
+			return;
+		}
+		
+		if (general().debug()) {
+			LOG.debug("{}({}) requested ally creation from ", player.getObjectId(), player.getName());
+		}
+		
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_CREATE_ALLIANCE);
+			return;
+		}
+		if (getAllyId() != 0) {
+			player.sendPacket(SystemMessageId.ALREADY_JOINED_ALLIANCE);
+			return;
+		}
+		if (getLevel() < 5) {
+			player.sendPacket(SystemMessageId.TO_CREATE_AN_ALLY_YOU_CLAN_MUST_BE_LEVEL_5_OR_HIGHER);
+			return;
+		}
+		if (getAllyPenaltyExpiryTime() > System.currentTimeMillis()) {
+			if (getAllyPenaltyType() == PENALTY_TYPE_DISSOLVE_ALLY) {
+				player.sendPacket(SystemMessageId.CANT_CREATE_ALLIANCE_10_DAYS_DISOLUTION);
+				return;
+			}
+		}
+		if (getDissolvingExpiryTime() > System.currentTimeMillis()) {
+			player.sendPacket(SystemMessageId.YOU_MAY_NOT_CREATE_ALLY_WHILE_DISSOLVING);
+			return;
+		}
+		if (!Util.isAlphaNumeric(allyName)) {
+			player.sendPacket(SystemMessageId.INCORRECT_ALLIANCE_NAME);
+			return;
+		}
+		if ((allyName.length() > 16) || (allyName.length() < 2)) {
+			player.sendPacket(SystemMessageId.INCORRECT_ALLIANCE_NAME_LENGTH);
+			return;
+		}
+		if (ClanTable.getInstance().isAllyExists(allyName)) {
+			player.sendPacket(SystemMessageId.ALLIANCE_ALREADY_EXISTS);
+			return;
+		}
+		
+		setAllyId(getId());
+		setAllyName(allyName.trim());
+		setAllyPenaltyExpiryTime(0, 0);
+		updateClanInDB();
+		
+		player.sendPacket(new UserInfo(player));
+		player.sendPacket(new ExBrExtraUserInfo(player));
+		
+		// TODO: Need correct message id
+		player.sendMessage("Alliance " + allyName + " has been created.");
+	}
+	
+	public void dissolveAlly(L2PcInstance player) {
+		if (getAllyId() == 0) {
+			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);
+			return;
+		}
+		if (!player.isClanLeader() || (getId() != getAllyId())) {
+			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
+			return;
+		}
+		if (player.isInsideZone(ZoneId.SIEGE)) {
+			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_ALLY_WHILE_IN_SIEGE);
+			return;
+		}
+		
+		broadcastToOnlineAllyMembers(SystemMessage.getSystemMessage(SystemMessageId.ALLIANCE_DISOLVED));
+		
+		long currentTime = System.currentTimeMillis();
+		for (L2Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) {
+			if (clan.getId() != getId()) {
+				clan.setAllyId(0);
+				clan.setAllyName(null);
+				clan.setAllyPenaltyExpiryTime(0, 0);
+				clan.updateClanInDB();
+			}
+		}
+		
+		setAllyId(0);
+		setAllyName(null);
+		changeAllyCrest(0, false);
+		
+		setAllyPenaltyExpiryTime(currentTime + character().getDaysBeforeCreateNewAllyWhenDissolved(), PENALTY_TYPE_DISSOLVE_ALLY);
+		updateClanInDB();
+	}
+	
+	public boolean levelUpClan(L2PcInstance player) {
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return false;
+		}
+		if (System.currentTimeMillis() < getDissolvingExpiryTime()) {
+			player.sendPacket(SystemMessageId.CANNOT_RISE_LEVEL_WHILE_DISSOLUTION_IN_PROGRESS);
+			return false;
+		}
+		
+		boolean increaseClanLevel = false;
+		
+		switch (getLevel()) {
+			case 0: {
+				// Upgrade to 1
+				if ((player.getSp() >= 20000) && (player.getAdena() >= 650000)) {
+					if (player.reduceAdena("ClanLvl", 650000, player.getTarget(), true)) {
+						player.setSp(player.getSp() - 20000);
+						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
+						sp.addInt(20000);
+						player.sendPacket(sp);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			}
+			case 1: {
+				// Upgrade to 2
+				if ((player.getSp() >= 100000) && (player.getAdena() >= 2500000)) {
+					if (player.reduceAdena("ClanLvl", 2500000, player.getTarget(), true)) {
+						player.setSp(player.getSp() - 100000);
+						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
+						sp.addInt(100000);
+						player.sendPacket(sp);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			}
+			case 2: {
+				// Upgrade to 3
+				if ((player.getSp() >= 350000) && (player.getInventory().getItemByItemId(1419) != null)) {
+					// TODO unhardcode these item IDs
+					// itemId 1419 == Blood Mark
+					if (player.destroyItemByItemId("ClanLvl", 1419, 1, player.getTarget(), false)) {
+						player.setSp(player.getSp() - 350000);
+						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
+						sp.addInt(350000);
+						player.sendPacket(sp);
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+						sm.addItemName(1419);
+						player.sendPacket(sm);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			}
+			case 3: {
+				// Upgrade to 4
+				if ((player.getSp() >= 1000000) && (player.getInventory().getItemByItemId(3874) != null)) {
+					// itemId 3874 == Alliance Manifesto
+					if (player.destroyItemByItemId("ClanLvl", 3874, 1, player.getTarget(), false)) {
+						player.setSp(player.getSp() - 1000000);
+						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
+						sp.addInt(1000000);
+						player.sendPacket(sp);
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+						sm.addItemName(3874);
+						player.sendPacket(sm);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			}
+			case 4: {
+				// Upgrade to 5
+				if ((player.getSp() >= 2500000) && (player.getInventory().getItemByItemId(3870) != null)) {
+					// itemId 3870 == Seal of Aspiration
+					if (player.destroyItemByItemId("ClanLvl", 3870, 1, player.getTarget(), false)) {
+						player.setSp(player.getSp() - 2500000);
+						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
+						sp.addInt(2500000);
+						player.sendPacket(sp);
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+						sm.addItemName(3870);
+						player.sendPacket(sm);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			}
+			case 5:
+				// Upgrade to 6
+				if ((getReputationScore() >= clan().getClanLevel6Cost()) && (getMembersCount() >= clan().getClanLevel6Requirement())) {
+					setReputationScore(getReputationScore() - clan().getClanLevel6Cost(), true);
+					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+					cr.addInt(clan().getClanLevel6Cost());
+					player.sendPacket(cr);
+					increaseClanLevel = true;
+				}
+				break;
+			
+			case 6:
+				// Upgrade to 7
+				if ((getReputationScore() >= clan().getClanLevel7Cost()) && (getMembersCount() >= clan().getClanLevel7Requirement())) {
+					setReputationScore(getReputationScore() - clan().getClanLevel7Cost(), true);
+					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+					cr.addInt(clan().getClanLevel7Cost());
+					player.sendPacket(cr);
+					increaseClanLevel = true;
+				}
+				break;
+			case 7:
+				// Upgrade to 8
+				if ((getReputationScore() >= clan().getClanLevel8Cost()) && (getMembersCount() >= clan().getClanLevel8Requirement())) {
+					setReputationScore(getReputationScore() - clan().getClanLevel8Cost(), true);
+					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+					cr.addInt(clan().getClanLevel8Cost());
+					player.sendPacket(cr);
+					increaseClanLevel = true;
+				}
+				break;
+			case 8:
+				// Upgrade to 9
+				if ((getReputationScore() >= clan().getClanLevel9Cost()) && (player.getInventory().getItemByItemId(9910) != null) && (getMembersCount() >= clan().getClanLevel9Requirement())) {
+					// itemId 9910 == Blood Oath
+					if (player.destroyItemByItemId("ClanLvl", 9910, 150, player.getTarget(), false)) {
+						setReputationScore(getReputationScore() - clan().getClanLevel9Cost(), true);
+						SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+						cr.addInt(clan().getClanLevel9Cost());
+						player.sendPacket(cr);
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+						sm.addItemName(9910);
+						sm.addLong(150);
+						player.sendPacket(sm);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			case 9:
+				// Upgrade to 10
+				if ((getReputationScore() >= clan().getClanLevel10Cost()) && (player.getInventory().getItemByItemId(9911) != null) && (getMembersCount() >= clan().getClanLevel10Requirement())) {
+					// itemId 9911 == Blood Alliance
+					if (player.destroyItemByItemId("ClanLvl", 9911, 5, player.getTarget(), false)) {
+						setReputationScore(getReputationScore() - clan().getClanLevel10Cost(), true);
+						SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+						cr.addInt(clan().getClanLevel10Cost());
+						player.sendPacket(cr);
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+						sm.addItemName(9911);
+						sm.addLong(5);
+						player.sendPacket(sm);
+						increaseClanLevel = true;
+					}
+				}
+				break;
+			case 10:
+				// Upgrade to 11
+				boolean hasTerritory = false;
+				for (Territory terr : TerritoryWarManager.getInstance().getAllTerritories()) {
+					if (terr.getOwnerClan().getId() == getId()) {
+						hasTerritory = true;
+						break;
+					}
+				}
+				if (hasTerritory && (getReputationScore() >= clan().getClanLevel11Cost()) && (getMembersCount() >= clan().getClanLevel11Requirement())) {
+					setReputationScore(getReputationScore() - clan().getClanLevel11Cost(), true);
+					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
+					cr.addInt(clan().getClanLevel11Cost());
+					player.sendPacket(cr);
+					increaseClanLevel = true;
+				}
+				break;
+			default:
+				return false;
+		}
+		
+		if (!increaseClanLevel) {
+			player.sendPacket(SystemMessageId.FAILED_TO_INCREASE_CLAN_LEVEL);
+			return false;
+		}
+		
+		// the player should know that he has less sp now :p
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.SP, player.getSp());
+		player.sendPacket(su);
+		
+		player.sendPacket(new ItemList(player, false));
+		
+		changeLevel(getLevel() + 1);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanLevelUp(this));
+		return true;
+	}
+	
+	public void changeLevel(int level) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET clan_level = ? WHERE clan_id = ?")) {
+			ps.setInt(1, level);
+			ps.setInt(2, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not increase clan level: {}", e.getMessage(), e);
+		}
+		
+		setLevel(level);
+		
+		ForumsBBSManager.getInstance().onClanLevel(this);
+		
+		if (getLeader().isOnline()) {
+			L2PcInstance leader = getLeader().getPlayerInstance();
+			if (level > 4) {
+				SiegeManager.getInstance().addSiegeSkills(leader);
+				leader.sendPacket(SystemMessageId.CLAN_CAN_ACCUMULATE_CLAN_REPUTATION_POINTS);
+			} else {
+				SiegeManager.getInstance().removeSiegeSkills(leader);
+			}
+		}
+		
+		// notify all the members about it
+		broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.CLAN_LEVEL_INCREASED));
+		broadcastToOnlineMembers(new PledgeShowInfoUpdate(this));
+	}
+	
+	/**
+	 * Change the clan crest. If crest id is 0, crest is removed. New crest id is saved to database.
+	 * @param crestId if 0, crest is removed, else new crest id is set and saved to database
+	 */
+	public void changeClanCrest(int crestId) {
+		if (getCrestId() != 0) {
+			CrestTable.getInstance().removeCrest(getCrestId());
+		}
+		
+		setCrestId(crestId);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET crest_id = ? WHERE clan_id = ?")) {
+			ps.setInt(1, crestId);
+			ps.setInt(2, getId());
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Could not update crest for clan {} [{}]: {}", getName(), getId(), e.getMessage(), e);
+		}
+		
+		for (L2PcInstance member : getOnlineMembers(0)) {
+			member.broadcastUserInfo();
+		}
+	}
+	
+	/**
+	 * Change the ally crest. If crest id is 0, crest is removed. New crest id is saved to database.
+	 * @param crestId if 0, crest is removed, else new crest id is set and saved to database
+	 * @param onlyThisClan
+	 */
+	public void changeAllyCrest(int crestId, boolean onlyThisClan) {
+		String sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE clan_id = ?";
+		int allyId = getId();
+		if (!onlyThisClan) {
+			if (getAllyCrestId() != 0) {
+				CrestTable.getInstance().removeCrest(getAllyCrestId());
+			}
+			sqlStatement = "UPDATE clan_data SET ally_crest_id = ? WHERE ally_id = ?";
+			allyId = getAllyId();
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(sqlStatement)) {
+			ps.setInt(1, crestId);
+			ps.setInt(2, allyId);
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Could not update ally crest for ally/clan id {}: {}", allyId, e.getMessage(), e);
+		}
+		
+		if (onlyThisClan) {
+			setAllyCrestId(crestId);
+			for (L2PcInstance member : getOnlineMembers(0)) {
+				member.broadcastUserInfo();
+			}
+		} else {
+			for (L2Clan clan : ClanTable.getInstance().getClanAllies(getAllyId())) {
+				clan.setAllyCrestId(crestId);
+				for (L2PcInstance member : clan.getOnlineMembers(0)) {
+					member.broadcastUserInfo();
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Change the large crest. If crest id is 0, crest is removed. New crest id is saved to database.
+	 * @param crestId if 0, crest is removed, else new crest id is set and saved to database
+	 */
+	public void changeLargeCrest(int crestId) {
+		if (getCrestLargeId() != 0) {
+			CrestTable.getInstance().removeCrest(getCrestLargeId());
+		}
+		
+		setCrestLargeId(crestId);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clan_data SET crest_large_id = ? WHERE clan_id = ?")) {
+			ps.setInt(1, crestId);
+			ps.setInt(2, getId());
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Could not update large crest for clan {} [{}]: {}", getName(), getId(), e.getMessage(), e);
+		}
+		
+		for (L2PcInstance member : getOnlineMembers(0)) {
+			member.broadcastUserInfo();
+		}
+	}
+	
+	/**
+	 * Check if this clan can learn the skill for the given skill ID, level.
+	 * @return {@code true} if skill can be learned.
+	 */
+	public boolean isLearnableSubSkill(int skillId, int skillLevel) {
+		Skill current = _subPledgeSkills.get(skillId);
+		// is next level?
+		if ((current != null) && ((current.getLevel() + 1) == skillLevel)) {
+			return true;
+		}
+		// is first level?
+		if ((current == null) && (skillLevel == 1)) {
+			return true;
+		}
+		// other sub-pledges
+		for (SubPledge subunit : _subPledges.values()) {
+			// disable academy
+			if (subunit.getId() == -1) {
+				continue;
+			}
+			current = subunit.getSkill(skillId);
+			// is next level?
+			if ((current != null) && ((current.getLevel() + 1) == skillLevel)) {
+				return true;
+			}
+			// is first level?
+			if ((current == null) && (skillLevel == 1)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isLearnableSubPledgeSkill(Skill skill, int subType) {
+		// academy
+		if (subType == -1) {
+			return false;
+		}
+		
+		int id = skill.getId();
+		Skill current;
+		if (subType == 0) {
+			current = _subPledgeSkills.get(id);
+		} else {
+			current = _subPledges.get(subType).getSkill(id);
+		}
+		// is next level?
+		if ((current != null) && ((current.getLevel() + 1) == skill.getLevel())) {
+			return true;
+		}
+		// is first level?
+		return (current == null) && (skill.getLevel() == 1);
+	}
+	
+	public List<SubPledgeSkill> getAllSubSkills() {
+		final List<SubPledgeSkill> list = new LinkedList<>();
+		for (Skill skill : _subPledgeSkills.values()) {
+			list.add(new SubPledgeSkill(0, skill.getId(), skill.getLevel()));
+		}
+		for (SubPledge subunit : _subPledges.values()) {
+			for (Skill skill : subunit.getSkills()) {
+				list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel()));
+			}
+		}
+		return list;
+	}
+	
+	public void setNewLeaderId(int objectId, boolean storeInDb) {
+		_newLeaderId = objectId;
+		if (storeInDb) {
+			updateClanInDB();
+		}
+	}
+	
+	public int getNewLeaderId() {
+		return _newLeaderId;
+	}
+	
+	public L2PcInstance getNewLeader() {
+		return L2World.getInstance().getPlayer(_newLeaderId);
+	}
+	
+	public String getNewLeaderName() {
+		return CharNameTable.getInstance().getNameById(_newLeaderId);
+	}
+	
+	public int getSiegeKills() {
+		return _siegeKills.get();
+	}
+	
+	public int getSiegeDeaths() {
+		return _siegeDeaths.get();
+	}
+	
+	public int addSiegeKill() {
+		return _siegeKills.incrementAndGet();
+	}
+	
+	public int addSiegeDeath() {
+		return _siegeDeaths.incrementAndGet();
+	}
+	
+	public void clearSiegeKills() {
+		_siegeKills.set(0);
+	}
+	
+	public void clearSiegeDeaths() {
+		_siegeDeaths.set(0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ClanMember.java b/src/main/java/com/l2jserver/gameserver/model/L2ClanMember.java
new file mode 100644
index 00000000..04d32402
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ClanMember.java
@@ -0,0 +1,591 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * This class holds the clan members data.
+ */
+public class L2ClanMember {
+	private static final Logger LOG = LoggerFactory.getLogger(L2ClanMember.class);
+	
+	private final L2Clan _clan;
+	private int _objectId;
+	private String _name;
+	private String _title;
+	private int _powerGrade;
+	private int _level;
+	private int _classId;
+	private boolean _sex;
+	private int _raceOrdinal;
+	private L2PcInstance _player;
+	private int _pledgeType;
+	private int _apprentice;
+	private int _sponsor;
+	
+	/**
+	 * Used to restore a clan member from the database.
+	 * @param clan the clan where the clan member belongs.
+	 * @param clanMember the clan member result set
+	 * @throws SQLException if the columnLabel is not valid or a database error occurs
+	 */
+	public L2ClanMember(L2Clan clan, ResultSet clanMember) throws SQLException {
+		if (clan == null) {
+			throw new IllegalArgumentException("Cannot create a Clan Member with a null clan.");
+		}
+		_clan = clan;
+		_name = clanMember.getString("char_name");
+		_level = clanMember.getInt("level");
+		_classId = clanMember.getInt("classid");
+		_objectId = clanMember.getInt("charId");
+		_pledgeType = clanMember.getInt("subpledge");
+		_title = clanMember.getString("title");
+		_powerGrade = clanMember.getInt("power_grade");
+		_apprentice = clanMember.getInt("apprentice");
+		_sponsor = clanMember.getInt("sponsor");
+		_sex = clanMember.getInt("sex") != 0;
+		_raceOrdinal = clanMember.getInt("race");
+	}
+	
+	/**
+	 * Creates a clan member from a player instance.
+	 * @param clan the clan where the player belongs
+	 * @param player the player from which the clan member will be created
+	 */
+	public L2ClanMember(L2Clan clan, L2PcInstance player) {
+		if (clan == null) {
+			throw new IllegalArgumentException("Cannot create a Clan Member if player has a null clan.");
+		}
+		_player = player;
+		_clan = clan;
+		_name = player.getName();
+		_level = player.getLevel();
+		_classId = player.getClassId().getId();
+		_objectId = player.getObjectId();
+		_pledgeType = player.getPledgeType();
+		_powerGrade = player.getPowerGrade();
+		_title = player.getTitle();
+		_sponsor = 0;
+		_apprentice = 0;
+		_sex = player.getAppearance().getSex();
+		_raceOrdinal = player.getRace().ordinal();
+	}
+	
+	/**
+	 * Sets the player instance.
+	 * @param player the new player instance
+	 */
+	public void setPlayerInstance(L2PcInstance player) {
+		if ((player == null) && (_player != null)) {
+			// this is here to keep the data when the player logs off
+			_name = _player.getName();
+			_level = _player.getLevel();
+			_classId = _player.getClassId().getId();
+			_objectId = _player.getObjectId();
+			_powerGrade = _player.getPowerGrade();
+			_pledgeType = _player.getPledgeType();
+			_title = _player.getTitle();
+			_apprentice = _player.getApprentice();
+			_sponsor = _player.getSponsor();
+			_sex = _player.getAppearance().getSex();
+			_raceOrdinal = _player.getRace().ordinal();
+		}
+		
+		if (player != null) {
+			_clan.addSkillEffects(player);
+			if ((_clan.getLevel() > 3) && player.isClanLeader()) {
+				SiegeManager.getInstance().addSiegeSkills(player);
+			}
+			if (player.isClanLeader()) {
+				_clan.setLeader(this);
+			}
+		}
+		_player = player;
+	}
+	
+	/**
+	 * Gets the player instance.
+	 * @return the player instance
+	 */
+	public L2PcInstance getPlayerInstance() {
+		return _player;
+	}
+	
+	/**
+	 * Verifies if the clan member is online.
+	 * @return {@code true} if is online
+	 */
+	public boolean isOnline() {
+		if ((_player == null) || !_player.isOnline()) {
+			return false;
+		}
+		return !_player.isInOfflineMode();
+	}
+	
+	/**
+	 * Gets the class id.
+	 * @return the classId
+	 */
+	public int getClassId() {
+		if (_player != null) {
+			return _player.getClassId().getId();
+		}
+		return _classId;
+	}
+	
+	/**
+	 * Gets the level.
+	 * @return the level
+	 */
+	public int getLevel() {
+		if (_player != null) {
+			return _player.getLevel();
+		}
+		return _level;
+	}
+	
+	/**
+	 * Gets the name.
+	 * @return the name
+	 */
+	public String getName() {
+		if (_player != null) {
+			return _player.getName();
+		}
+		return _name;
+	}
+	
+	/**
+	 * Gets the object id.
+	 * @return Returns the objectId.
+	 */
+	public int getObjectId() {
+		if (_player != null) {
+			return _player.getObjectId();
+		}
+		return _objectId;
+	}
+	
+	/**
+	 * Gets the title.
+	 * @return the title
+	 */
+	public String getTitle() {
+		if (_player != null) {
+			return _player.getTitle();
+		}
+		return _title;
+	}
+	
+	/**
+	 * Gets the pledge type.
+	 * @return the pledge type
+	 */
+	public int getPledgeType() {
+		if (_player != null) {
+			return _player.getPledgeType();
+		}
+		return _pledgeType;
+	}
+	
+	/**
+	 * Sets the pledge type.
+	 * @param pledgeType the new pledge type
+	 */
+	public void setPledgeType(int pledgeType) {
+		_pledgeType = pledgeType;
+		if (_player != null) {
+			_player.setPledgeType(pledgeType);
+		} else {
+			// db save if char not logged in
+			updatePledgeType();
+		}
+	}
+	
+	/**
+	 * Update pledge type.
+	 */
+	public void updatePledgeType() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE characters SET subpledge=? WHERE charId=?")) {
+			ps.setLong(1, _pledgeType);
+			ps.setInt(2, getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not update pledge type: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Gets the power grade.
+	 * @return the power grade
+	 */
+	public int getPowerGrade() {
+		if (_player != null) {
+			return _player.getPowerGrade();
+		}
+		return _powerGrade;
+	}
+	
+	/**
+	 * Sets the power grade.
+	 * @param powerGrade the new power grade
+	 */
+	public void setPowerGrade(int powerGrade) {
+		_powerGrade = powerGrade;
+		if (_player != null) {
+			_player.setPowerGrade(powerGrade);
+		} else {
+			// db save if char not logged in
+			updatePowerGrade();
+		}
+	}
+	
+	/**
+	 * Update the characters table of the database with power grade.
+	 */
+	public void updatePowerGrade() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE characters SET power_grade=? WHERE charId=?")) {
+			ps.setLong(1, _powerGrade);
+			ps.setInt(2, getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not update power grade: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Sets the apprentice and sponsor.
+	 * @param apprenticeID the apprentice id
+	 * @param sponsorID the sponsor id
+	 */
+	public void setApprenticeAndSponsor(int apprenticeID, int sponsorID) {
+		_apprentice = apprenticeID;
+		_sponsor = sponsorID;
+	}
+	
+	/**
+	 * Gets the player's race ordinal.
+	 * @return the race ordinal
+	 */
+	public int getRaceOrdinal() {
+		if (_player != null) {
+			return _player.getRace().ordinal();
+		}
+		return _raceOrdinal;
+	}
+	
+	/**
+	 * Gets the player's sex.
+	 * @return the sex
+	 */
+	public boolean getSex() {
+		if (_player != null) {
+			return _player.getAppearance().getSex();
+		}
+		return _sex;
+	}
+	
+	/**
+	 * Gets the sponsor.
+	 * @return the sponsor
+	 */
+	public int getSponsor() {
+		if (_player != null) {
+			return _player.getSponsor();
+		}
+		return _sponsor;
+	}
+	
+	/**
+	 * Gets the apprentice.
+	 * @return the apprentice
+	 */
+	public int getApprentice() {
+		if (_player != null) {
+			return _player.getApprentice();
+		}
+		return _apprentice;
+	}
+	
+	/**
+	 * Gets the apprentice or sponsor name.
+	 * @return the apprentice or sponsor name
+	 */
+	public String getApprenticeOrSponsorName() {
+		if (_player != null) {
+			_apprentice = _player.getApprentice();
+			_sponsor = _player.getSponsor();
+		}
+		
+		if (_apprentice != 0) {
+			L2ClanMember apprentice = _clan.getClanMember(_apprentice);
+			if (apprentice != null) {
+				return apprentice.getName();
+			}
+			return "Error";
+		}
+		if (_sponsor != 0) {
+			L2ClanMember sponsor = _clan.getClanMember(_sponsor);
+			if (sponsor != null) {
+				return sponsor.getName();
+			}
+			return "Error";
+		}
+		return "";
+	}
+	
+	/**
+	 * Gets the clan.
+	 * @return the clan
+	 */
+	public L2Clan getClan() {
+		return _clan;
+	}
+	
+	/**
+	 * Calculate pledge class.
+	 * @param player the player
+	 * @return the int
+	 */
+	public static int calculatePledgeClass(L2PcInstance player) {
+		int pledgeClass = 0;
+		if (player == null) {
+			return pledgeClass;
+		}
+		
+		L2Clan clan = player.getClan();
+		if (clan != null) {
+			switch (clan.getLevel()) {
+				case 4:
+					if (player.isClanLeader()) {
+						pledgeClass = 3;
+					}
+					break;
+				case 5:
+					if (player.isClanLeader()) {
+						pledgeClass = 4;
+					} else {
+						pledgeClass = 2;
+					}
+					break;
+				case 6:
+					switch (player.getPledgeType()) {
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 2;
+							break;
+						case 0:
+							if (player.isClanLeader()) {
+								pledgeClass = 5;
+							} else {
+								pledgeClass = switch (clan.getLeaderSubPledge(player.getObjectId())) {
+									case 100, 200 -> 4;
+									default -> 3;
+								};
+							}
+							break;
+					}
+					break;
+				case 7:
+					switch (player.getPledgeType()) {
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 3;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 2;
+							break;
+						case 0:
+							if (player.isClanLeader()) {
+								pledgeClass = 7;
+							} else {
+								pledgeClass = switch (clan.getLeaderSubPledge(player.getObjectId())) {
+									case 100, 200 -> 6;
+									case 1001, 1002, 2001, 2002 -> 5;
+									default -> 4;
+								};
+							}
+							break;
+					}
+					break;
+				case 8:
+					switch (player.getPledgeType()) {
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 4;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 3;
+							break;
+						case 0:
+							if (player.isClanLeader()) {
+								pledgeClass = 8;
+							} else {
+								pledgeClass = switch (clan.getLeaderSubPledge(player.getObjectId())) {
+									case 100, 200 -> 7;
+									case 1001, 1002, 2001, 2002 -> 6;
+									default -> 5;
+								};
+							}
+							break;
+					}
+					break;
+				case 9:
+					switch (player.getPledgeType()) {
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 5;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 4;
+							break;
+						case 0:
+							if (player.isClanLeader()) {
+								pledgeClass = 9;
+							} else {
+								pledgeClass = switch (clan.getLeaderSubPledge(player.getObjectId())) {
+									case 100, 200 -> 8;
+									case 1001, 1002, 2001, 2002 -> 7;
+									default -> 6;
+								};
+							}
+							break;
+					}
+					break;
+				case 10:
+					switch (player.getPledgeType()) {
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 6;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 5;
+							break;
+						case 0:
+							if (player.isClanLeader()) {
+								pledgeClass = 10;
+							} else {
+								pledgeClass = switch (clan.getLeaderSubPledge(player.getObjectId())) {
+									case 100, 200 -> 9;
+									case 1001, 1002, 2001, 2002 -> 8;
+									default -> 7;
+								};
+							}
+							break;
+					}
+					break;
+				case 11:
+					switch (player.getPledgeType()) {
+						case -1:
+							pledgeClass = 1;
+							break;
+						case 100:
+						case 200:
+							pledgeClass = 7;
+							break;
+						case 1001:
+						case 1002:
+						case 2001:
+						case 2002:
+							pledgeClass = 6;
+							break;
+						case 0:
+							if (player.isClanLeader()) {
+								pledgeClass = 11;
+							} else {
+								pledgeClass = switch (clan.getLeaderSubPledge(player.getObjectId())) {
+									case 100, 200 -> 10;
+									case 1001, 1002, 2001, 2002 -> 9;
+									default -> 8;
+								};
+							}
+							break;
+					}
+					break;
+				default:
+					pledgeClass = 1;
+					break;
+			}
+		}
+		
+		if (player.isNoble() && (pledgeClass < 5)) {
+			pledgeClass = 5;
+		}
+		
+		if (player.isHero() && (pledgeClass < 8)) {
+			pledgeClass = 8;
+		}
+		return pledgeClass;
+	}
+	
+	/**
+	 * Save apprentice and sponsor.
+	 * @param apprentice the apprentice
+	 * @param sponsor the sponsor
+	 */
+	public void saveApprenticeAndSponsor(int apprentice, int sponsor) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE characters SET apprentice=?,sponsor=? WHERE charId=?")) {
+			ps.setInt(1, apprentice);
+			ps.setInt(2, sponsor);
+			ps.setInt(3, getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not save apprentice/sponsor: {}", e.getMessage(), e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2CommandChannel.java b/src/main/java/com/l2jserver/gameserver/model/L2CommandChannel.java
new file mode 100644
index 00000000..5c912476
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2CommandChannel.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Function;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExCloseMPCC;
+import com.l2jserver.gameserver.network.serverpackets.ExMPCCPartyInfoUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ExOpenMPCC;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This class serves as a container for command channels.
+ * @author chris_00
+ */
+public class L2CommandChannel extends AbstractPlayerGroup {
+	private final List<L2Party> _parties = new CopyOnWriteArrayList<>();
+	private L2PcInstance _commandLeader;
+	private int _channelLvl;
+	
+	public L2CommandChannel(L2PcInstance leader) {
+		_commandLeader = leader;
+		L2Party party = leader.getParty();
+		_parties.add(party);
+		_channelLvl = party.getLevel();
+		party.setCommandChannel(this);
+		party.broadcastMessage(SystemMessageId.COMMAND_CHANNEL_FORMED);
+		party.broadcastPacket(ExOpenMPCC.STATIC_PACKET);
+	}
+	
+	/**
+	 * Add a party to this command channel.
+	 * @param party the party to add
+	 */
+	public void addParty(L2Party party) {
+		if (party == null) {
+			return;
+		}
+		// Update the command channel info for existing players
+		broadcastPacket(new ExMPCCPartyInfoUpdate(party, 1));
+		
+		_parties.add(party);
+		if (party.getLevel() > _channelLvl) {
+			_channelLvl = party.getLevel();
+		}
+		party.setCommandChannel(this);
+		party.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.JOINED_COMMAND_CHANNEL));
+		party.broadcastPacket(ExOpenMPCC.STATIC_PACKET);
+	}
+	
+	/**
+	 * Remove a party from this command channel.
+	 * @param party the party to remove
+	 */
+	public void removeParty(L2Party party) {
+		if (party == null) {
+			return;
+		}
+		
+		_parties.remove(party);
+		_channelLvl = 0;
+		for (L2Party pty : _parties) {
+			if (pty.getLevel() > _channelLvl) {
+				_channelLvl = pty.getLevel();
+			}
+		}
+		party.setCommandChannel(null);
+		party.broadcastPacket(new ExCloseMPCC());
+		if (_parties.size() < 2) {
+			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.COMMAND_CHANNEL_DISBANDED));
+			disbandChannel();
+		} else {
+			// Update the command channel info for existing players
+			broadcastPacket(new ExMPCCPartyInfoUpdate(party, 0));
+		}
+	}
+	
+	public void disbandChannel() {
+		for (L2Party party : _parties) {
+			if (party != null) {
+				removeParty(party);
+			}
+		}
+		_parties.clear();
+	}
+	
+	/**
+	 * @return the total count of all members of this command channel
+	 */
+	@Override
+	public int getMemberCount() {
+		int count = 0;
+		for (L2Party party : _parties) {
+			if (party != null) {
+				count += party.getMemberCount();
+			}
+		}
+		return count;
+	}
+	
+	public List<L2Party> getParties() {
+		return _parties;
+	}
+	
+	/**
+	 * @return a list of all members in this command channel
+	 */
+	@Override
+	public List<L2PcInstance> getMembers() {
+		final List<L2PcInstance> members = new LinkedList<>();
+		for (L2Party party : getParties()) {
+			members.addAll(party.getMembers());
+		}
+		return members;
+	}
+	
+	/**
+	 * @return the level of this command channel (equals the level of the highest-leveled character in this command channel)
+	 */
+	@Override
+	public int getLevel() {
+		return _channelLvl;
+	}
+	
+	@Override
+	public void setLeader(L2PcInstance leader) {
+		_commandLeader = leader;
+		if (leader.getLevel() > _channelLvl) {
+			_channelLvl = leader.getLevel();
+		}
+	}
+	
+	/**
+	 * @param obj
+	 * @return true if proper condition for RaidWar
+	 */
+	public boolean meetRaidWarCondition(L2Object obj) {
+		if (!((obj instanceof L2Character) && ((L2Character) obj).isRaid())) {
+			return false;
+		}
+		return (getMemberCount() >= character().getRaidLootRightsCCSize());
+	}
+	
+	/**
+	 * @return the leader of this command channel
+	 */
+	@Override
+	public L2PcInstance getLeader() {
+		return _commandLeader;
+	}
+	
+	/**
+	 * Check if a given player is in this command channel.
+	 * @param player the player to check
+	 * @return {@code true} if he does, {@code false} otherwise
+	 */
+	@Override
+	public boolean containsPlayer(L2PcInstance player) {
+		for (L2Party party : _parties) {
+			if (party.containsPlayer(player)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Iterates over all command channel members without the need to allocate a new list
+	 * @see com.l2jserver.gameserver.model.AbstractPlayerGroup#forEachMember(Function)
+	 */
+	@Override
+	public boolean forEachMember(Function<L2PcInstance, Boolean> function) {
+		for (L2Party party : _parties) {
+			if (!party.forEachMember(function)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Check whether the leader of this command channel is the same as the leader of the specified command channel<br>
+	 * (which essentially means they're the same group).
+	 * @param cc the other command channel to check against
+	 * @return {@code true} if this command channel equals the specified command channel, {@code false} otherwise
+	 */
+	public boolean equals(L2CommandChannel cc) {
+		return (cc != null) && (getLeaderObjectId() == cc.getLeaderObjectId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ContactList.java b/src/main/java/com/l2jserver/gameserver/model/L2ContactList.java
new file mode 100644
index 00000000..c8cdc1ee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ContactList.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * TODO: System messages:<br>
+ * ADD: 3223: The previous name is being registered. Please try again later.<br>
+ * DEL 3219: $s1 was successfully deleted from your Contact List.<br>
+ * DEL 3217: The name is not currently registered.
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class L2ContactList {
+	private static final Logger LOG = LoggerFactory.getLogger(L2ContactList.class);
+	
+	private final L2PcInstance activeChar;
+	
+	private final List<String> _contacts = new CopyOnWriteArrayList<>();
+	
+	private static final String QUERY_ADD = "INSERT INTO character_contacts (charId, contactId) VALUES (?, ?)";
+	private static final String QUERY_REMOVE = "DELETE FROM character_contacts WHERE charId = ? and contactId = ?";
+	private static final String QUERY_LOAD = "SELECT contactId FROM character_contacts WHERE charId = ?";
+	
+	public L2ContactList(L2PcInstance player) {
+		activeChar = player;
+		restore();
+	}
+	
+	public void restore() {
+		_contacts.clear();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(QUERY_LOAD)) {
+			ps.setInt(1, activeChar.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				int contactId;
+				String contactName;
+				while (rs.next()) {
+					contactId = rs.getInt(1);
+					contactName = CharNameTable.getInstance().getNameById(contactId);
+					if ((contactName == null) || contactName.equals(activeChar.getName()) || (contactId == activeChar.getObjectId())) {
+						continue;
+					}
+					
+					_contacts.add(contactName);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Error found in {}'s ContactsList: {}", activeChar.getName(), e.getMessage(), e);
+		}
+	}
+	
+	public boolean add(String name) {
+		int contactId = CharNameTable.getInstance().getIdByName(name);
+		if (_contacts.contains(name)) {
+			activeChar.sendPacket(SystemMessageId.NAME_ALREADY_EXIST_ON_CONTACT_LIST);
+			return false;
+		} else if (activeChar.getName().equals(name)) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_ADD_YOUR_NAME_ON_CONTACT_LIST);
+			return false;
+		} else if (_contacts.size() >= 100) {
+			activeChar.sendPacket(SystemMessageId.CONTACT_LIST_LIMIT_REACHED);
+			return false;
+		} else if (contactId < 1) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.NAME_S1_NOT_EXIST_TRY_ANOTHER_NAME);
+			sm.addString(name);
+			activeChar.sendPacket(sm);
+			return false;
+		} else {
+			for (String contactName : _contacts) {
+				if (contactName.equalsIgnoreCase(name)) {
+					activeChar.sendPacket(SystemMessageId.NAME_ALREADY_EXIST_ON_CONTACT_LIST);
+					return false;
+				}
+			}
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(QUERY_ADD)) {
+			ps.setInt(1, activeChar.getObjectId());
+			ps.setInt(2, contactId);
+			ps.execute();
+			
+			_contacts.add(name);
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SUCCESSFULLY_ADDED_TO_CONTACT_LIST);
+			sm.addString(name);
+			activeChar.sendPacket(sm);
+		} catch (Exception e) {
+			LOG.warn("Error found in {}'s ContactsList: {}", activeChar.getName(), e.getMessage(), e);
+		}
+		return true;
+	}
+	
+	public void remove(String name) {
+		int contactId = CharNameTable.getInstance().getIdByName(name);
+		
+		if (!_contacts.contains(name)) {
+			activeChar.sendPacket(SystemMessageId.NAME_NOT_REGISTERED_ON_CONTACT_LIST);
+			return;
+		} else if (contactId < 1) {
+			// TODO: Message?
+			return;
+		}
+		
+		_contacts.remove(name);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(QUERY_REMOVE)) {
+			ps.setInt(1, activeChar.getObjectId());
+			ps.setInt(2, contactId);
+			ps.execute();
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SUCCESFULLY_DELETED_FROM_CONTACT_LIST);
+			sm.addString(name);
+			activeChar.sendPacket(sm);
+		} catch (Exception e) {
+			LOG.warn("Error found in {}'s ContactsList: {}", activeChar.getName(), e.getMessage(), e);
+		}
+	}
+	
+	public List<String> getAllContacts() {
+		return _contacts;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Crest.java b/src/main/java/com/l2jserver/gameserver/model/L2Crest.java
new file mode 100644
index 00000000..8f988262
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Crest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.hexId;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.network.serverpackets.AllyCrest;
+import com.l2jserver.gameserver.network.serverpackets.ExPledgeCrestLarge;
+import com.l2jserver.gameserver.network.serverpackets.PledgeCrest;
+
+/**
+ * @author NosBit
+ */
+public final class L2Crest implements IIdentifiable {
+	public enum CrestType {
+		PLEDGE(1),
+		PLEDGE_LARGE(2),
+		ALLY(3);
+		
+		private final int _id;
+		
+		CrestType(int id) {
+			_id = id;
+		}
+		
+		public int getId() {
+			return _id;
+		}
+		
+		public static CrestType getById(int id) {
+			for (CrestType crestType : values()) {
+				if (crestType.getId() == id) {
+					return crestType;
+				}
+			}
+			return null;
+		}
+	}
+	
+	private final int _id;
+	private final byte[] _data;
+	private final CrestType _type;
+	
+	public L2Crest(int id, byte[] data, CrestType type) {
+		_id = id;
+		_data = data;
+		_type = type;
+	}
+	
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	public byte[] getData() {
+		return _data;
+	}
+	
+	public CrestType getType() {
+		return _type;
+	}
+	
+	/**
+	 * Gets the client path to crest for use in html and sends the crest to {@code L2PcInstance}
+	 * @param activeChar the @{code L2PcInstance} where html is send to.
+	 * @return the client path to crest
+	 */
+	public String getClientPath(L2PcInstance activeChar) {
+		String path = null;
+		switch (getType()) {
+			case PLEDGE -> {
+				activeChar.sendPacket(new PledgeCrest(getId(), getData()));
+				path = "Crest.crest_" + hexId().getServerID() + "_" + getId();
+			}
+			case PLEDGE_LARGE -> {
+				activeChar.sendPacket(new ExPledgeCrestLarge(getId(), getData()));
+				path = "Crest.crest_" + hexId().getServerID() + "_" + getId() + "_l";
+			}
+			case ALLY -> {
+				activeChar.sendPacket(new AllyCrest(getId(), getData()));
+				path = "Crest.crest_" + hexId().getServerID() + "_" + getId();
+			}
+		}
+		return path;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2EnchantSkillGroup.java b/src/main/java/com/l2jserver/gameserver/model/L2EnchantSkillGroup.java
new file mode 100644
index 00000000..d716bf39
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2EnchantSkillGroup.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class L2EnchantSkillGroup {
+	private final int _id;
+	private final List<EnchantSkillHolder> _enchantDetails = new ArrayList<>();
+	
+	public L2EnchantSkillGroup(int id) {
+		_id = id;
+	}
+	
+	public void addEnchantDetail(EnchantSkillHolder detail) {
+		_enchantDetails.add(detail);
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public List<EnchantSkillHolder> getEnchantGroupDetails() {
+		return _enchantDetails;
+	}
+	
+	public static class EnchantSkillHolder {
+		private final int _level;
+		private final int _adenaCost;
+		private final int _expCost;
+		private final int _spCost;
+		private final byte[] _rate;
+		
+		public EnchantSkillHolder(StatsSet set) {
+			_level = set.getInt("level");
+			_adenaCost = set.getInt("adena");
+			_expCost = set.getInt("exp");
+			_spCost = set.getInt("sp");
+			_rate = new byte[24];
+			for (int i = 0; i < 24; i++) {
+				_rate[i] = set.getByte("chance" + (76 + i), (byte) 0);
+			}
+		}
+		
+		/**
+		 * @return Returns the level.
+		 */
+		public int getLevel() {
+			return _level;
+		}
+		
+		/**
+		 * @return Returns the spCost.
+		 */
+		public int getSpCost() {
+			return _spCost;
+		}
+		
+		public int getExpCost() {
+			return _expCost;
+		}
+		
+		public int getAdenaCost() {
+			return _adenaCost;
+		}
+		
+		public byte getRate(L2PcInstance ply) {
+			if (ply.getLevel() < 76) {
+				return 0;
+			}
+			return _rate[ply.getLevel() - 76];
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java b/src/main/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java
new file mode 100644
index 00000000..5aee5bfd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2EnchantSkillLearn.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.Set;
+import java.util.TreeMap;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+
+public final class L2EnchantSkillLearn {
+	private final int _id;
+	private final int _baseLvl;
+	private final TreeMap<Integer, Integer> _enchantRoutes = new TreeMap<>();
+	
+	public L2EnchantSkillLearn(int id, int baseLvl) {
+		_id = id;
+		_baseLvl = baseLvl;
+	}
+	
+	public void addNewEnchantRoute(int route, int group) {
+		_enchantRoutes.put(route, group);
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public int getBaseLevel() {
+		return _baseLvl;
+	}
+	
+	public static int getEnchantRoute(int level) {
+		return (int) Math.floor(level / 100.0);
+	}
+	
+	public static int getEnchantIndex(int level) {
+		return (level % 100) - 1;
+	}
+	
+	public L2EnchantSkillGroup getFirstRouteGroup() {
+		return EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.firstEntry().getValue());
+	}
+	
+	public Set<Integer> getAllRoutes() {
+		return _enchantRoutes.keySet();
+	}
+	
+	public int getMinSkillLevel(int level) {
+		if ((level % 100) == 1) {
+			return _baseLvl;
+		}
+		return level - 1;
+	}
+	
+	public boolean isMaxEnchant(int level) {
+		int route = getEnchantRoute(level);
+		if ((route < 1) || !_enchantRoutes.containsKey(route)) {
+			return false;
+		}
+		int index = getEnchantIndex(level);
+		
+		return (index + 1) >= EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(route)).getEnchantGroupDetails().size();
+	}
+	
+	public EnchantSkillHolder getEnchantSkillHolder(int level) {
+		int route = getEnchantRoute(level);
+		if ((route < 1) || !_enchantRoutes.containsKey(route)) {
+			return null;
+		}
+		int index = getEnchantIndex(level);
+		L2EnchantSkillGroup group = EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(route));
+		
+		if (index < 0) {
+			return group.getEnchantGroupDetails().get(0);
+		} else if (index >= group.getEnchantGroupDetails().size()) {
+			return group.getEnchantGroupDetails().get(EnchantSkillGroupsData.getInstance().getEnchantSkillGroupById(_enchantRoutes.get(route)).getEnchantGroupDetails().size() - 1);
+		}
+		return group.getEnchantGroupDetails().get(index);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ExtractableProduct.java b/src/main/java/com/l2jserver/gameserver/model/L2ExtractableProduct.java
new file mode 100644
index 00000000..960725e6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ExtractableProduct.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author JIV
+ */
+public class L2ExtractableProduct {
+	private final int _id;
+	private final int _min;
+	private final int _max;
+	private final int _chance;
+	
+	/**
+	 * Create Extractable product
+	 * @param id crete item id
+	 * @param min item count max
+	 * @param max item count min
+	 * @param chance chance for creating
+	 */
+	public L2ExtractableProduct(int id, int min, int max, double chance) {
+		_id = id;
+		_min = min;
+		_max = max;
+		_chance = (int) (chance * 1000);
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public int getMin() {
+		return _min;
+	}
+	
+	public int getMax() {
+		return _max;
+	}
+	
+	public int getChance() {
+		return _chance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ExtractableProductItem.java b/src/main/java/com/l2jserver/gameserver/model/L2ExtractableProductItem.java
new file mode 100644
index 00000000..bbad6f96
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ExtractableProductItem.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author Zoey76
+ */
+public class L2ExtractableProductItem {
+	private final List<ItemHolder> _items;
+	private final double _chance;
+	
+	public L2ExtractableProductItem(List<ItemHolder> items, double chance) {
+		_items = items;
+		_chance = chance;
+	}
+	
+	public List<ItemHolder> getItems() {
+		return _items;
+	}
+	
+	public double getChance() {
+		return _chance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ExtractableSkill.java b/src/main/java/com/l2jserver/gameserver/model/L2ExtractableSkill.java
new file mode 100644
index 00000000..c7a90eab
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ExtractableSkill.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+
+/**
+ * Extractable skill DTO.
+ * @author Zoey76
+ */
+public class L2ExtractableSkill {
+	private final int _hash;
+	private final List<L2ExtractableProductItem> _product;
+	
+	/**
+	 * Instantiates a new extractable skill.
+	 * @param hash the hash
+	 * @param products the products
+	 */
+	public L2ExtractableSkill(int hash, List<L2ExtractableProductItem> products) {
+		_hash = hash;
+		_product = products;
+	}
+	
+	/**
+	 * Gets the skill hash.
+	 * @return the skill hash
+	 */
+	public int getSkillHash() {
+		return _hash;
+	}
+	
+	/**
+	 * Gets the product items.
+	 * @return the product items
+	 */
+	public List<L2ExtractableProductItem> getProductItems() {
+		return _product;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2GroupSpawn.java b/src/main/java/com/l2jserver/gameserver/model/L2GroupSpawn.java
new file mode 100644
index 00000000..a1938f38
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2GroupSpawn.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.sql.impl.TerritoryTable;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @author littlecrow
+ */
+public class L2GroupSpawn extends L2Spawn {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(L2GroupSpawn.class);
+	
+	private final L2NpcTemplate _template;
+	
+	public L2GroupSpawn(L2NpcTemplate mobTemplate) throws SecurityException, ClassNotFoundException, NoSuchMethodException {
+		super(mobTemplate);
+		_template = mobTemplate;
+		
+		setAmount(1);
+	}
+	
+	public L2Npc doGroupSpawn() {
+		try {
+			if (_template.isType("L2Pet") || _template.isType("L2Minion")) {
+				return null;
+			}
+			
+			int newLocX = 0;
+			int newLocY = 0;
+			int newLocZ = 0;
+			
+			if ((getX() == 0) && (getY() == 0)) {
+				if (getLocationId() == 0) {
+					return null;
+				}
+				
+				final Location location = TerritoryTable.getInstance().getRandomPoint(getLocationId());
+				if (location != null) {
+					newLocX = location.getX();
+					newLocY = location.getY();
+					newLocZ = location.getZ();
+				}
+			} else {
+				newLocX = getX();
+				newLocY = getY();
+				newLocZ = getZ();
+			}
+			
+			final var objectId = IdFactory.getInstance().getNextId();
+			final var mob = new L2ControllableMobInstance(objectId, _template);
+			mob.setCurrentHpMp(mob.getMaxHp(), mob.getMaxMp());
+			
+			if (getHeading() == -1) {
+				mob.setHeading(Rnd.nextInt(61794));
+			} else {
+				mob.setHeading(getHeading());
+			}
+			
+			mob.setSpawn(this);
+			mob.spawnMe(newLocX, newLocY, newLocZ);
+			mob.onSpawn();
+			
+			if (general().debug()) {
+				LOG.trace("Spawned Mob Id: {} ,at: X: {} Y: {} Z: {}", _template.getId(), mob.getX(), mob.getY(), mob.getZ());
+			}
+			return mob;
+			
+		} catch (Exception e) {
+			LOG.warn("NPC class not found: {}", e.getMessage(), e);
+			return null;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2ManufactureItem.java b/src/main/java/com/l2jserver/gameserver/model/L2ManufactureItem.java
new file mode 100644
index 00000000..81579e28
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2ManufactureItem.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+
+public class L2ManufactureItem {
+	private final int _recipeId;
+	private final long _cost;
+	private final boolean _isDwarven;
+	
+	public L2ManufactureItem(int recipeId, long cost) {
+		_recipeId = recipeId;
+		_cost = cost;
+		_isDwarven = RecipeData.getInstance().getRecipeList(_recipeId).isDwarvenRecipe();
+	}
+	
+	public int getRecipeId() {
+		return _recipeId;
+	}
+	
+	public long getCost() {
+		return _cost;
+	}
+	
+	public boolean isDwarven() {
+		return _isDwarven;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2MapRegion.java b/src/main/java/com/l2jserver/gameserver/model/L2MapRegion.java
new file mode 100644
index 00000000..762f4887
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2MapRegion.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.enums.Race;
+
+/**
+ * @author Nyaran
+ */
+public class L2MapRegion {
+	private final String _name;
+	private final String _town;
+	private final int _locId;
+	private final int _castle;
+	private final int _bbs;
+	private List<int[]> _maps = null;
+	
+	private List<Location> _spawnLocs = null;
+	private List<Location> _otherSpawnLocs = null;
+	private List<Location> _chaoticSpawnLocs = null;
+	private List<Location> _banishSpawnLocs = null;
+	
+	private final Map<Race, String> _bannedRace = new HashMap<>();
+	
+	public L2MapRegion(String name, String town, int locId, int castle, int bbs) {
+		_name = name;
+		_town = town;
+		_locId = locId;
+		_castle = castle;
+		_bbs = bbs;
+	}
+	
+	public final String getName() {
+		return _name;
+	}
+	
+	public final String getTown() {
+		return _town;
+	}
+	
+	public final int getLocId() {
+		return _locId;
+	}
+	
+	public final int getCastle() {
+		return _castle;
+	}
+	
+	public final int getBbs() {
+		return _bbs;
+	}
+	
+	public final void addMap(int x, int y) {
+		if (_maps == null) {
+			_maps = new ArrayList<>();
+		}
+		
+		_maps.add(new int[] {
+			x,
+			y
+		});
+	}
+	
+	public final List<int[]> getMaps() {
+		return _maps;
+	}
+	
+	public final boolean isZoneInRegion(int x, int y) {
+		if (_maps == null) {
+			return false;
+		}
+		
+		for (int[] map : _maps) {
+			if ((map[0] == x) && (map[1] == y)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	// Respawn
+	public final void addSpawn(int x, int y, int z) {
+		if (_spawnLocs == null) {
+			_spawnLocs = new ArrayList<>();
+		}
+		
+		_spawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final void addOtherSpawn(int x, int y, int z) {
+		if (_otherSpawnLocs == null) {
+			_otherSpawnLocs = new ArrayList<>();
+		}
+		
+		_otherSpawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final void addChaoticSpawn(int x, int y, int z) {
+		if (_chaoticSpawnLocs == null) {
+			_chaoticSpawnLocs = new ArrayList<>();
+		}
+		
+		_chaoticSpawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final void addBanishSpawn(int x, int y, int z) {
+		if (_banishSpawnLocs == null) {
+			_banishSpawnLocs = new ArrayList<>();
+		}
+		
+		_banishSpawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final List<Location> getSpawns() {
+		return _spawnLocs;
+	}
+	
+	public final Location getSpawnLoc() {
+		if (character().randomRespawnInTown()) {
+			return _spawnLocs.get(Rnd.get(_spawnLocs.size()));
+		}
+		return _spawnLocs.get(0);
+	}
+	
+	public final Location getOtherSpawnLoc() {
+		if (_otherSpawnLocs != null) {
+			if (character().randomRespawnInTown()) {
+				return _otherSpawnLocs.get(Rnd.get(_otherSpawnLocs.size()));
+			}
+			return _otherSpawnLocs.get(0);
+		}
+		return getSpawnLoc();
+	}
+	
+	public final Location getChaoticSpawnLoc() {
+		if (_chaoticSpawnLocs != null) {
+			if (character().randomRespawnInTown()) {
+				return _chaoticSpawnLocs.get(Rnd.get(_chaoticSpawnLocs.size()));
+			}
+			return _chaoticSpawnLocs.get(0);
+		}
+		return getSpawnLoc();
+	}
+	
+	public final Location getBanishSpawnLoc() {
+		if (_banishSpawnLocs != null) {
+			if (character().randomRespawnInTown()) {
+				return _banishSpawnLocs.get(Rnd.get(_banishSpawnLocs.size()));
+			}
+			return _banishSpawnLocs.get(0);
+		}
+		return getSpawnLoc();
+	}
+	
+	public final void addBannedRace(String race, String point) {
+		_bannedRace.put(Race.valueOf(race), point);
+	}
+	
+	public final Map<Race, String> getBannedRace() {
+		return _bannedRace;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2NpcWalkerNode.java b/src/main/java/com/l2jserver/gameserver/model/L2NpcWalkerNode.java
new file mode 100644
index 00000000..96cad377
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2NpcWalkerNode.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.network.NpcStringId;
+
+/**
+ * @author Rayan RPG
+ * @author JIV
+ * @since 927
+ */
+public class L2NpcWalkerNode extends Location {
+	private final String _chatString;
+	private final NpcStringId _npcString;
+	private final int _delay;
+	private final boolean _runToLocation;
+	
+	public L2NpcWalkerNode(int moveX, int moveY, int moveZ, int delay, boolean runToLocation, NpcStringId npcString, String chatText) {
+		super(moveX, moveY, moveZ);
+		_delay = delay;
+		_runToLocation = runToLocation;
+		_npcString = npcString;
+		_chatString = ((chatText == null) ? "" : chatText);
+	}
+	
+	public int getDelay() {
+		return _delay;
+	}
+	
+	public boolean runToLocation() {
+		return _runToLocation;
+	}
+	
+	public NpcStringId getNpcString() {
+		return _npcString;
+	}
+	
+	public String getChatText() {
+		if (_npcString != null) {
+			throw new IllegalStateException("npcString is defined for walker route!");
+		}
+		return _chatString;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Object.java b/src/main/java/com/l2jserver/gameserver/model/L2Object.java
new file mode 100644
index 00000000..bef2d7aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Object.java
@@ -0,0 +1,874 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.handler.ActionHandler;
+import com.l2jserver.gameserver.handler.ActionShiftHandler;
+import com.l2jserver.gameserver.handler.IActionHandler;
+import com.l2jserver.gameserver.handler.IActionShiftHandler;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList;
+import com.l2jserver.gameserver.model.actor.poly.ObjectPoly;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.interfaces.IDecayable;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+import com.l2jserver.gameserver.model.interfaces.IPositionable;
+import com.l2jserver.gameserver.model.interfaces.ISpawnable;
+import com.l2jserver.gameserver.model.interfaces.IUniqueId;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
+import com.l2jserver.gameserver.network.serverpackets.ExSendUIEvent;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Base class for all interactive objects.
+ */
+public abstract class L2Object extends ListenersContainer implements IIdentifiable, INamable, ISpawnable, IUniqueId, IDecayable, IPositionable {
+	/** Name */
+	private String _name;
+	/** Object ID */
+	private int _objectId;
+	/** World Region */
+	private L2WorldRegion _worldRegion;
+	/** Instance type */
+	private InstanceType _instanceType = null;
+	private volatile Map<String, Object> _scripts;
+	/** X coordinate */
+	private final AtomicInteger _x = new AtomicInteger(0);
+	/** Y coordinate */
+	private final AtomicInteger _y = new AtomicInteger(0);
+	/** Z coordinate */
+	private final AtomicInteger _z = new AtomicInteger(0);
+	/** Orientation */
+	private final AtomicInteger _heading = new AtomicInteger(0);
+	/** Instance id of object. 0 - Global */
+	private final AtomicInteger _instanceId = new AtomicInteger(0);
+	private boolean _isVisible;
+	private boolean _isInvisible;
+	private ObjectKnownList _knownList;
+	
+	public L2Object(int objectId) {
+		setInstanceType(InstanceType.L2Object);
+		_objectId = objectId;
+		initKnownList();
+	}
+	
+	/**
+	 * Gets the instance type of object.
+	 * @return the instance type
+	 */
+	public final InstanceType getInstanceType() {
+		return _instanceType;
+	}
+	
+	/**
+	 * Sets the instance type.
+	 * @param newInstanceType the instance type to set
+	 */
+	protected final void setInstanceType(InstanceType newInstanceType) {
+		_instanceType = newInstanceType;
+	}
+	
+	/**
+	 * Verifies if object is of any given instance types.
+	 * @param instanceTypes the instance types to verify
+	 * @return {@code true} if object is of any given instance types, {@code false} otherwise
+	 */
+	public final boolean isInstanceTypes(InstanceType... instanceTypes) {
+		return _instanceType.isTypes(instanceTypes);
+	}
+	
+	public final void onAction(L2PcInstance player) {
+		onAction(player, true);
+	}
+	
+	public void onAction(L2PcInstance player, boolean interact) {
+		IActionHandler handler = ActionHandler.getInstance().getHandler(getInstanceType());
+		if (handler != null) {
+			handler.action(player, this, interact);
+		}
+		
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	public void onActionShift(L2PcInstance player) {
+		IActionShiftHandler handler = ActionShiftHandler.getInstance().getHandler(getInstanceType());
+		if (handler != null) {
+			handler.action(player, this, true);
+		}
+		
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	public void onForcedAttack(L2PcInstance player) {
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	public void onSpawn() {
+	}
+	
+	@Override
+	public boolean decayMe() {
+		assert getWorldRegion() != null;
+		
+		L2WorldRegion reg = getWorldRegion();
+		
+		synchronized (this) {
+			_isVisible = false;
+			setWorldRegion(null);
+		}
+		
+		// this can synchronize on others instances, so it's out of
+		// synchronized, to avoid deadlocks
+		// Remove the L2Object from the world
+		L2World.getInstance().removeVisibleObject(this, reg);
+		L2World.getInstance().removeObject(this);
+		
+		return true;
+	}
+	
+	public void refreshID() {
+		L2World.getInstance().removeObject(this);
+		IdFactory.getInstance().releaseId(getObjectId());
+		_objectId = IdFactory.getInstance().getNextId();
+	}
+	
+	@Override
+	public final boolean spawnMe() {
+		assert (getWorldRegion() == null) && (getLocation().getX() != 0) && (getLocation().getY() != 0) && (getLocation().getZ() != 0);
+		
+		synchronized (this) {
+			// Set the x,y,z position of the L2Object spawn and update its _worldregion
+			_isVisible = true;
+			setWorldRegion(L2World.getInstance().getRegion(getLocation()));
+			
+			// Add the L2Object spawn in the _allobjects of L2World
+			L2World.getInstance().storeObject(this);
+			
+			// Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion
+			getWorldRegion().addVisibleObject(this);
+		}
+		
+		// this can synchronize on others instances, so it's out of synchronized, to avoid deadlocks
+		// Add the L2Object spawn in the world as a visible object
+		L2World.getInstance().addVisibleObject(this, getWorldRegion());
+		
+		onSpawn();
+		
+		return true;
+	}
+	
+	public final void spawnMe(int x, int y, int z) {
+		assert getWorldRegion() == null;
+		
+		synchronized (this) {
+			// Set the x,y,z position of the L2Object spawn and update its _worldregion
+			_isVisible = true;
+			
+			if (x > L2World.MAP_MAX_X) {
+				x = L2World.MAP_MAX_X - 5000;
+			}
+			if (x < L2World.MAP_MIN_X) {
+				x = L2World.MAP_MIN_X + 5000;
+			}
+			if (y > L2World.MAP_MAX_Y) {
+				y = L2World.MAP_MAX_Y - 5000;
+			}
+			if (y < L2World.MAP_MIN_Y) {
+				y = L2World.MAP_MIN_Y + 5000;
+			}
+			
+			setXYZ(x, y, z);
+			setWorldRegion(L2World.getInstance().getRegion(getLocation()));
+			
+			// Add the L2Object spawn in the _allobjects of L2World
+		}
+		
+		L2World.getInstance().storeObject(this);
+		
+		// these can synchronize on others instances, so they're out of
+		// synchronized, to avoid deadlocks
+		
+		// Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion
+		getWorldRegion().addVisibleObject(this);
+		
+		// Add the L2Object spawn in the world as a visible object
+		L2World.getInstance().addVisibleObject(this, getWorldRegion());
+		
+		onSpawn();
+	}
+	
+	/**
+	 * Verify if object can be attacked.
+	 * @return {@code true} if object can be attacked, {@code false} otherwise
+	 */
+	public boolean canBeAttacked() {
+		return false;
+	}
+	
+	public abstract boolean isAutoAttackable(L2Character attacker);
+	
+	public final boolean isVisible() {
+		return getWorldRegion() != null;
+	}
+	
+	public final void setIsVisible(boolean value) {
+		_isVisible = value;
+		if (!_isVisible) {
+			setWorldRegion(null);
+		}
+	}
+	
+	public void toggleVisible() {
+		if (isVisible()) {
+			decayMe();
+		} else {
+			spawnMe();
+		}
+	}
+	
+	public ObjectKnownList getKnownList() {
+		return _knownList;
+	}
+	
+	public void initKnownList() {
+		_knownList = new ObjectKnownList(this);
+	}
+	
+	public final void setKnownList(ObjectKnownList value) {
+		_knownList = value;
+	}
+	
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	public void setName(String value) {
+		_name = value;
+	}
+	
+	@Override
+	public final int getObjectId() {
+		return _objectId;
+	}
+	
+	public final ObjectPoly getPoly() {
+		final ObjectPoly poly = getScript(ObjectPoly.class);
+		return (poly == null) ? addScript(new ObjectPoly(this)) : poly;
+	}
+	
+	public abstract void sendInfo(L2PcInstance activeChar);
+	
+	public void sendPacket(L2GameServerPacket mov) {
+	}
+	
+	public void sendPacket(SystemMessageId id) {
+	}
+	
+	public L2PcInstance getActingPlayer() {
+		return null;
+	}
+	
+	/**
+	 * Verify if object is instance of L2Attackable.
+	 * @return {@code true} if object is instance of L2Attackable, {@code false} otherwise
+	 */
+	public boolean isAttackable() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2Character.
+	 * @return {@code true} if object is instance of L2Character, {@code false} otherwise
+	 */
+	public boolean isCharacter() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2DoorInstance.
+	 * @return {@code true} if object is instance of L2DoorInstance, {@code false} otherwise
+	 */
+	public boolean isDoor() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2MonsterInstance.
+	 * @return {@code true} if object is instance of L2MonsterInstance, {@code false} otherwise
+	 */
+	public boolean isMonster() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2Npc.
+	 * @return {@code true} if object is instance of L2Npc, {@code false} otherwise
+	 */
+	public boolean isNpc() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2PetInstance.
+	 * @return {@code true} if object is instance of L2PetInstance, {@code false} otherwise
+	 */
+	public boolean isPet() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2PcInstance.
+	 * @return {@code true} if object is instance of L2PcInstance, {@code false} otherwise
+	 */
+	public boolean isPlayer() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2Playable.
+	 * @return {@code true} if object is instance of L2Playable, {@code false} otherwise
+	 */
+	public boolean isPlayable() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2ServitorInstance.
+	 * @return {@code true} if object is instance of L2ServitorInstance, {@code false} otherwise
+	 */
+	public boolean isServitor() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2Summon.
+	 * @return {@code true} if object is instance of L2Summon, {@code false} otherwise
+	 */
+	public boolean isSummon() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2TrapInstance.
+	 * @return {@code true} if object is instance of L2TrapInstance, {@code false} otherwise
+	 */
+	public boolean isTrap() {
+		return false;
+	}
+	
+	/**
+	 * Verify if object is instance of L2ItemInstance.
+	 * @return {@code true} if object is instance of L2ItemInstance, {@code false} otherwise
+	 */
+	public boolean isItem() {
+		return false;
+	}
+	
+	/**
+	 * Verifies if the object is a walker NPC.
+	 * @return {@code true} if object is a walker NPC, {@code false} otherwise
+	 */
+	public boolean isWalker() {
+		return false;
+	}
+	
+	/**
+	 * Verifies if this object is a vehicle.
+	 * @return {@code true} if object is Vehicle, {@code false} otherwise
+	 */
+	public boolean isVehicle() {
+		return false;
+	}
+	
+	/**
+	 * @return {@code true} if object Can be targeted
+	 */
+	public boolean isTargetable() {
+		return true;
+	}
+	
+	/**
+	 * Check if the object is in the given zone Id.
+	 * @param zone the zone Id to check
+	 * @return {@code true} if the object is in that zone Id
+	 */
+	public boolean isInsideZone(ZoneId zone) {
+		return false;
+	}
+	
+	/**
+	 * Check if current object has charged shot.
+	 * @param type of the shot to be checked.
+	 * @return {@code true} if the object has charged shot
+	 */
+	public boolean isChargedShot(ShotType type) {
+		return false;
+	}
+	
+	/**
+	 * Charging shot into the current object.
+	 * @param type of the shot to be charged.
+	 * @param charged
+	 */
+	public void setChargedShot(ShotType type, boolean charged) {
+	}
+	
+	/**
+	 * Try to recharge a shot.
+	 * @param physical skill are using Soul shots.
+	 * @param magical skill are using Spirit shots.
+	 */
+	public void rechargeShots(boolean physical, boolean magical) {
+	}
+	
+	/**
+	 * @param <T>
+	 * @param script
+	 * @return
+	 */
+	public final <T> T addScript(T script) {
+		if (_scripts == null) {
+			synchronized (this) {
+				if (_scripts == null) {
+					_scripts = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		_scripts.put(script.getClass().getName(), script);
+		return script;
+	}
+	
+	/**
+	 * @param <T>
+	 * @param script
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public final <T> T removeScript(Class<T> script) {
+		if (_scripts == null) {
+			return null;
+		}
+		return (T) _scripts.remove(script.getName());
+	}
+	
+	/**
+	 * @param <T>
+	 * @param script
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public final <T> T getScript(Class<T> script) {
+		if (_scripts == null) {
+			return null;
+		}
+		return (T) _scripts.get(script.getName());
+	}
+	
+	public void removeStatusListener(L2Character object) {
+		
+	}
+	
+	protected void badCoords() {
+		if (isCharacter()) {
+			decayMe();
+		} else if (isPlayer()) {
+			((L2Character) this).teleToLocation(new Location(0, 0, 0), false);
+			((L2Character) this).sendMessage("Error with your coords, Please ask a GM for help!");
+		}
+	}
+	
+	public final void setXYZInvisible(int x, int y, int z) {
+		assert getWorldRegion() == null;
+		if (x > L2World.MAP_MAX_X) {
+			x = L2World.MAP_MAX_X - 5000;
+		}
+		if (x < L2World.MAP_MIN_X) {
+			x = L2World.MAP_MIN_X + 5000;
+		}
+		if (y > L2World.MAP_MAX_Y) {
+			y = L2World.MAP_MAX_Y - 5000;
+		}
+		if (y < L2World.MAP_MIN_Y) {
+			y = L2World.MAP_MIN_Y + 5000;
+		}
+		
+		setXYZ(x, y, z);
+		setIsVisible(false);
+	}
+	
+	public final void setLocationInvisible(ILocational loc) {
+		setXYZInvisible(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	public void updateWorldRegion() {
+		if (!isVisible()) {
+			return;
+		}
+		
+		L2WorldRegion newRegion = L2World.getInstance().getRegion(getLocation());
+		if (newRegion != getWorldRegion()) {
+			getWorldRegion().removeVisibleObject(this);
+			
+			setWorldRegion(newRegion);
+			
+			// Add the L2Object spawn to _visibleObjects and if necessary to _allplayers of its L2WorldRegion
+			getWorldRegion().addVisibleObject(this);
+		}
+	}
+	
+	public final L2WorldRegion getWorldRegion() {
+		return _worldRegion;
+	}
+	
+	public void setWorldRegion(L2WorldRegion value) {
+		if ((getWorldRegion() != null) && isCharacter()) // confirm revalidation of old region's zones
+		{
+			if (value != null) {
+				getWorldRegion().revalidateZones((L2Character) this); // at world region change
+			} else {
+				getWorldRegion().removeFromZones((L2Character) this); // at world region change
+			}
+		}
+		
+		_worldRegion = value;
+	}
+	
+	/**
+	 * Gets the X coordinate.
+	 * @return the X coordinate
+	 */
+	@Override
+	public int getX() {
+		return _x.get();
+	}
+	
+	/**
+	 * Gets the Y coordinate.
+	 * @return the Y coordinate
+	 */
+	@Override
+	public int getY() {
+		return _y.get();
+	}
+	
+	/**
+	 * Gets the Z coordinate.
+	 * @return the Z coordinate
+	 */
+	@Override
+	public int getZ() {
+		return _z.get();
+	}
+	
+	/**
+	 * Gets the heading.
+	 * @return the heading
+	 */
+	@Override
+	public int getHeading() {
+		return _heading.get();
+	}
+	
+	/**
+	 * Gets the instance ID.
+	 * @return the instance ID
+	 */
+	@Override
+	public int getInstanceId() {
+		return _instanceId.get();
+	}
+	
+	/**
+	 * Gets the location object.
+	 * @return the location object
+	 */
+	@Override
+	public Location getLocation() {
+		return new Location(getX(), getY(), getZ(), getHeading(), getInstanceId());
+	}
+	
+	/**
+	 * Sets the X coordinate
+	 * @param newX the X coordinate
+	 */
+	@Override
+	public void setX(int newX) {
+		_x.set(newX);
+	}
+	
+	/**
+	 * Sets the Y coordinate
+	 * @param newY the Y coordinate
+	 */
+	@Override
+	public void setY(int newY) {
+		_y.set(newY);
+	}
+	
+	/**
+	 * Sets the Z coordinate
+	 * @param newZ the Z coordinate
+	 */
+	@Override
+	public void setZ(int newZ) {
+		_z.set(newZ);
+	}
+	
+	/**
+	 * Sets the x, y, z coordinate.
+	 * @param newX the X coordinate
+	 * @param newY the Y coordinate
+	 * @param newZ the Z coordinate
+	 */
+	@Override
+	public final void setXYZ(int newX, int newY, int newZ) {
+		assert getWorldRegion() != null;
+		
+		setX(newX);
+		setY(newY);
+		setZ(newZ);
+		
+		try {
+			if (L2World.getInstance().getRegion(getLocation()) != getWorldRegion()) {
+				updateWorldRegion();
+			}
+		} catch (Exception e) {
+			badCoords();
+		}
+	}
+	
+	/**
+	 * Sets the x, y, z coordinate.
+	 * @param loc the location object
+	 */
+	@Override
+	public void setXYZ(ILocational loc) {
+		setXYZ(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	/**
+	 * Sets heading of object.
+	 * @param newHeading the new heading
+	 */
+	@Override
+	public void setHeading(int newHeading) {
+		_heading.set(newHeading);
+	}
+	
+	/**
+	 * Sets the instance ID of object.<br>
+	 * 0 - Global<br>
+	 * TODO: Add listener here.
+	 * @param instanceId the ID of the instance
+	 */
+	@Override
+	public void setInstanceId(int instanceId) {
+		if ((instanceId < 0) || (getInstanceId() == instanceId)) {
+			return;
+		}
+		
+		Instance oldI = InstanceManager.getInstance().getInstance(getInstanceId());
+		Instance newI = InstanceManager.getInstance().getInstance(instanceId);
+		if (newI == null) {
+			return;
+		}
+		
+		if (isPlayer()) {
+			final L2PcInstance player = getActingPlayer();
+			if ((getInstanceId() > 0) && (oldI != null)) {
+				oldI.removePlayer(getObjectId());
+				if (oldI.isShowTimer()) {
+					sendInstanceUpdate(oldI, true);
+				}
+			}
+			if (instanceId > 0) {
+				newI.addPlayer(getObjectId());
+				if (newI.isShowTimer()) {
+					sendInstanceUpdate(newI, false);
+				}
+			}
+			if (player.hasSummon()) {
+				player.getSummon().setInstanceId(instanceId);
+			}
+		} else if (isNpc()) {
+			final L2Npc npc = (L2Npc) this;
+			if ((getInstanceId() > 0) && (oldI != null)) {
+				oldI.removeNpc(npc);
+			}
+			if (instanceId > 0) {
+				newI.addNpc(npc);
+			}
+		}
+		
+		_instanceId.set(instanceId);
+		if (_isVisible && (_knownList != null)) {
+			// We don't want some ugly looking disappear/appear effects, so don't update
+			// the knownlist here, but players usually enter instancezones through teleporting
+			// and the teleport will do the revalidation for us.
+			if (!isPlayer()) {
+				decayMe();
+				spawnMe();
+			}
+		}
+	}
+	
+	/**
+	 * Sets location of object.
+	 * @param loc the location object
+	 */
+	@Override
+	public void setLocation(Location loc) {
+		_x.set(loc.getX());
+		_y.set(loc.getY());
+		_z.set(loc.getZ());
+		_heading.set(loc.getHeading());
+		_instanceId.set(loc.getInstanceId());
+	}
+	
+	/**
+	 * Calculates distance between this L2Object and given x, y , z.
+	 * @param x the X coordinate
+	 * @param y the Y coordinate
+	 * @param z the Z coordinate
+	 * @param includeZAxis if {@code true} Z axis will be included
+	 * @param squared if {@code true} return will be squared
+	 * @return distance between object and given x, y, z.
+	 */
+	public final double calculateDistance(int x, int y, int z, boolean includeZAxis, boolean squared) {
+		final double distance = Math.pow(x - getX(), 2) + Math.pow(y - getY(), 2) + (includeZAxis ? Math.pow(z - getZ(), 2) : 0);
+		return (squared) ? distance : Math.sqrt(distance);
+	}
+	
+	/**
+	 * Calculates distance between this L2Object and given location.
+	 * @param loc the location object
+	 * @param includeZAxis if {@code true} Z axis will be included
+	 * @param squared if {@code true} return will be squared
+	 * @return distance between object and given location.
+	 */
+	public final double calculateDistance(ILocational loc, boolean includeZAxis, boolean squared) {
+		return calculateDistance(loc.getX(), loc.getY(), loc.getZ(), includeZAxis, squared);
+	}
+	
+	/**
+	 * Calculates the angle in degrees from this object to the given object.<br>
+	 * The return value can be described as how much this object has to turn<br>
+	 * to have the given object directly in front of it.
+	 * @param target the object to which to calculate the angle
+	 * @return the angle this object has to turn to have the given object in front of it
+	 */
+	public final double calculateDirectionTo(ILocational target) {
+		int heading = Util.calculateHeadingFrom(this, target) - getHeading();
+		if (heading < 0) {
+			heading = 65535 + heading;
+		}
+		return Util.convertHeadingToDegree(heading);
+	}
+	
+	/**
+	 * Sends an instance update for player.
+	 * @param instance the instance to update
+	 * @param hide if {@code true} hide the player
+	 */
+	private void sendInstanceUpdate(Instance instance, boolean hide) {
+		final int startTime = (int) ((System.currentTimeMillis() - instance.getInstanceStartTime()) / 1000);
+		final int endTime = (int) ((instance.getInstanceEndTime() - instance.getInstanceStartTime()) / 1000);
+		if (instance.isTimerIncrease()) {
+			sendPacket(new ExSendUIEvent(getActingPlayer(), hide, true, startTime, endTime, instance.getTimerText()));
+		} else {
+			sendPacket(new ExSendUIEvent(getActingPlayer(), hide, false, endTime - startTime, 0, instance.getTimerText()));
+		}
+	}
+	
+	/**
+	 * @return {@code true} if this object is invisible, {@code false} otherwise.
+	 */
+	public boolean isInvisible() {
+		return _isInvisible;
+	}
+	
+	/**
+	 * Sets this object as invisible or not
+	 * @param invis
+	 */
+	public void setInvisible(boolean invis) {
+		_isInvisible = invis;
+		if (invis) {
+			final DeleteObject deletePacket = new DeleteObject(this);
+			for (L2Object obj : getKnownList().getKnownObjects().values()) {
+				if ((obj != null) && obj.isPlayer()) {
+					final L2PcInstance player = obj.getActingPlayer();
+					if (!isVisibleFor(player)) {
+						obj.sendPacket(deletePacket);
+					}
+				}
+			}
+		}
+		
+		// Broadcast information regarding the object to those which are suppose to see.
+		broadcastInfo();
+	}
+	
+	/**
+	 * @param character The character we are checking visibility for.
+	 * @return {@code true} if character can see an invisible object if it's invisible, {@code false} otherwise.
+	 */
+	public boolean isVisibleFor(final L2Character character) {
+		return !isInvisible() || character.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS);
+	}
+	
+	/**
+	 * Broadcasts describing info to known players.
+	 */
+	public void broadcastInfo() {
+		for (L2Object obj : getKnownList().getKnownObjects().values()) {
+			if ((obj != null) && obj.isPlayer() && isVisibleFor(obj.getActingPlayer())) {
+				sendInfo(obj.getActingPlayer());
+			}
+		}
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		return ((obj instanceof L2Object) && (((L2Object) obj).getObjectId() == getObjectId()));
+	}
+	
+	@Override
+	public String toString() {
+		return getName() + " [" + getObjectId() + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Party.java b/src/main/java/com/l2jserver/gameserver/model/L2Party.java
new file mode 100644
index 00000000..d2b79ed1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Party.java
@@ -0,0 +1,924 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.hunting;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.entity.DimensionalRift;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExAskModifyPartyLooting;
+import com.l2jserver.gameserver.network.serverpackets.ExCloseMPCC;
+import com.l2jserver.gameserver.network.serverpackets.ExOpenMPCC;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowAdd;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowDelete;
+import com.l2jserver.gameserver.network.serverpackets.ExSetPartyLooting;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.PartyMemberPosition;
+import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowAdd;
+import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowAll;
+import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDelete;
+import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDeleteAll;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * This class serves as a container for player parties.
+ * @author nuocnam
+ */
+public class L2Party extends AbstractPlayerGroup {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Party.class);
+	
+	private static final int MAXIMUM_LEVEL_DIFFERENCE = 9;
+	
+	// @formatter:off
+	private static final double[] BONUS_EXP_SP =
+	{
+		1.0, 1.10, 1.20, 1.30, 1.40, 1.50, 2.0, 2.10, 2.20
+	};
+	// @formatter:on
+	
+	private static final Duration PARTY_POSITION_BROADCAST_INTERVAL = Duration.ofSeconds(12);
+	private static final Duration PARTY_DISTRIBUTION_TYPE_REQUEST_TIMEOUT = Duration.ofSeconds(15);
+	
+	private final List<L2PcInstance> _members = new CopyOnWriteArrayList<>();
+	private boolean _pendingInvitation = false;
+	private long _pendingInviteTimeout;
+	private int _partyLvl;
+	private volatile PartyDistributionType _distributionType;
+	private volatile PartyDistributionType _changeRequestDistributionType;
+	private volatile Future<?> _changeDistributionTypeRequestTask = null;
+	private volatile Set<Integer> _changeDistributionTypeAnswers = null;
+	private int _itemLastLoot = 0;
+	private L2CommandChannel _commandChannel = null;
+	private DimensionalRift _dr;
+	private Future<?> _positionBroadcastTask = null;
+	private PartyMemberPosition _positionPacket;
+	private boolean _disbanding = false;
+	
+	/**
+	 * The message type send to the party members.
+	 */
+	public enum messageType {
+		Expelled,
+		Left,
+		None,
+		Disconnected
+	}
+	
+	/**
+	 * Construct a new L2Party object with a single member - the leader.
+	 * @param leader the leader of this party
+	 * @param partyDistributionType the item distribution rule of this party
+	 */
+	public L2Party(L2PcInstance leader, PartyDistributionType partyDistributionType) {
+		_members.add(leader);
+		_partyLvl = leader.getLevel();
+		_distributionType = partyDistributionType;
+	}
+	
+	/**
+	 * Check if another player can start invitation process.
+	 * @return {@code true} if this party waits for a response on an invitation, {@code false} otherwise
+	 */
+	public boolean getPendingInvitation() {
+		return _pendingInvitation;
+	}
+	
+	/**
+	 * Set invitation process flag and store time for expiration. <br>
+	 * Happens when a player joins party or declines to join.
+	 * @param val the pending invitation state to set
+	 */
+	public void setPendingInvitation(boolean val) {
+		_pendingInvitation = val;
+		_pendingInviteTimeout = GameTimeController.getInstance().getGameTicks() + (L2PcInstance.REQUEST_TIMEOUT * GameTimeController.TICKS_PER_SECOND);
+	}
+	
+	/**
+	 * Check if a player invitation request is expired.
+	 * @return {@code true} if time is expired, {@code false} otherwise
+	 * @see com.l2jserver.gameserver.model.actor.instance.L2PcInstance#isRequestExpired()
+	 */
+	public boolean isInvitationRequestExpired() {
+		return (_pendingInviteTimeout <= GameTimeController.getInstance().getGameTicks());
+	}
+	
+	/**
+	 * Get a random member from this party.
+	 * @param itemId the ID of the item for which the member must have inventory space
+	 * @param target the object of which the member must be within a certain range (must not be null)
+	 * @return a random member from this party or {@code null} if none of the members have inventory space for the specified item
+	 */
+	private L2PcInstance getCheckedRandomMember(int itemId, L2Character target) {
+		List<L2PcInstance> availableMembers = new ArrayList<>();
+		for (L2PcInstance member : getMembers()) {
+			if (member.getInventory().validateCapacityByItemId(itemId) && Util.checkIfInRange(character().getPartyRange2(), target, member, true)) {
+				availableMembers.add(member);
+			}
+		}
+		if (!availableMembers.isEmpty()) {
+			return availableMembers.get(Rnd.get(availableMembers.size()));
+		}
+		return null;
+	}
+	
+	/**
+	 * get next item looter
+	 */
+	private L2PcInstance getCheckedNextLooter(int ItemId, L2Character target) {
+		for (int i = 0; i < getMemberCount(); i++) {
+			if (++_itemLastLoot >= getMemberCount()) {
+				_itemLastLoot = 0;
+			}
+			L2PcInstance member;
+			try {
+				member = getMembers().get(_itemLastLoot);
+				if (member.getInventory().validateCapacityByItemId(ItemId) && Util.checkIfInRange(character().getPartyRange2(), target, member, true)) {
+					return member;
+				}
+			} catch (Exception e) {
+				// continue, take another member if this just logged off
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * get next item looter
+	 */
+	private L2PcInstance getActualLooter(L2PcInstance player, int ItemId, boolean spoil, L2Character target) {
+		L2PcInstance looter = null;
+		
+		switch (_distributionType) {
+			case RANDOM:
+				if (!spoil) {
+					looter = getCheckedRandomMember(ItemId, target);
+				}
+				break;
+			case RANDOM_INCLUDING_SPOIL:
+				looter = getCheckedRandomMember(ItemId, target);
+				break;
+			case BY_TURN:
+				if (!spoil) {
+					looter = getCheckedNextLooter(ItemId, target);
+				}
+				break;
+			case BY_TURN_INCLUDING_SPOIL:
+				looter = getCheckedNextLooter(ItemId, target);
+				break;
+		}
+		
+		return looter != null ? looter : player;
+	}
+	
+	/**
+	 * Broadcasts UI update and User Info for new party leader.
+	 */
+	public void broadcastToPartyMembersNewLeader() {
+		for (L2PcInstance member : getMembers()) {
+			if (member != null) {
+				member.sendPacket(PartySmallWindowDeleteAll.STATIC_PACKET);
+				member.sendPacket(new PartySmallWindowAll(member, this));
+				member.broadcastUserInfo();
+			}
+		}
+	}
+	
+	/**
+	 * Send a Server->Client packet to all other L2PcInstance of the Party.<BR>
+	 */
+	public void broadcastToPartyMembers(L2PcInstance player, L2GameServerPacket msg) {
+		for (L2PcInstance member : getMembers()) {
+			if ((member != null) && (member.getObjectId() != player.getObjectId())) {
+				member.sendPacket(msg);
+			}
+		}
+	}
+	
+	/**
+	 * adds new member to party
+	 */
+	public void addPartyMember(L2PcInstance player) {
+		if (getMembers().contains(player)) {
+			return;
+		}
+		
+		if (_changeRequestDistributionType != null) {
+			finishLootRequest(false); // cancel on invite
+		}
+		// sends new member party window for all members
+		// we do all actions before adding member to a list, this speeds things up a little
+		player.sendPacket(new PartySmallWindowAll(player, this));
+		
+		// sends pets/summons of party members
+		for (L2PcInstance pMember : getMembers()) {
+			if ((pMember != null) && pMember.hasSummon()) {
+				player.sendPacket(new ExPartyPetWindowAdd(pMember.getSummon()));
+			}
+		}
+		
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_JOINED_S1_PARTY);
+		msg.addString(getLeader().getName());
+		player.sendPacket(msg);
+		
+		msg = SystemMessage.getSystemMessage(SystemMessageId.C1_JOINED_PARTY);
+		msg.addString(player.getName());
+		broadcastPacket(msg);
+		broadcastPacket(new PartySmallWindowAdd(player, this));
+		// send the position of all party members to the new party member
+		// player.sendPacket(new PartyMemberPosition(this));
+		// send the position of the new party member to all party members (except the new one - he knows his own position)
+		// broadcastToPartyMembers(player, new PartyMemberPosition(this));
+		
+		// if member has pet/summon add it to other as well
+		if (player.hasSummon()) {
+			broadcastPacket(new ExPartyPetWindowAdd(player.getSummon()));
+		}
+		
+		// add player to party, adjust party level
+		getMembers().add(player);
+		if (player.getLevel() > _partyLvl) {
+			_partyLvl = player.getLevel();
+		}
+		
+		// update partySpelled
+		L2Summon summon;
+		for (L2PcInstance member : getMembers()) {
+			if (member != null) {
+				member.updateEffectIcons(true); // update party icons only
+				summon = member.getSummon();
+				member.broadcastUserInfo();
+				if (summon != null) {
+					summon.updateEffectIcons();
+				}
+			}
+		}
+		
+		if (isInDimensionalRift()) {
+			_dr.partyMemberInvited();
+		}
+		
+		// open the CCInformationwindow
+		if (isInCommandChannel()) {
+			player.sendPacket(ExOpenMPCC.STATIC_PACKET);
+		}
+		
+		if (_positionBroadcastTask == null) {
+			_positionBroadcastTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() -> {
+				if (_positionPacket == null) {
+					_positionPacket = new PartyMemberPosition(this);
+				} else {
+					_positionPacket.reuse(this);
+				}
+				broadcastPacket(_positionPacket);
+			}, PARTY_POSITION_BROADCAST_INTERVAL.toMillis() / 2, PARTY_POSITION_BROADCAST_INTERVAL.toMillis());
+		}
+	}
+	
+	/**
+	 * Removes a party member using its name.
+	 * @param name player the player to be removed from the party.
+	 * @param type the message type {@link messageType}.
+	 */
+	public void removePartyMember(String name, messageType type) {
+		removePartyMember(getPlayerByName(name), type);
+	}
+	
+	/**
+	 * Removes a party member instance.
+	 * @param player the player to be removed from the party.
+	 * @param type the message type {@link messageType}.
+	 */
+	public void removePartyMember(L2PcInstance player, messageType type) {
+		if (getMembers().contains(player)) {
+			final boolean isLeader = isLeader(player);
+			if (!_disbanding) {
+				if ((getMembers().size() == 2) || (isLeader && !character().leavePartyLeader() && (type != messageType.Disconnected))) {
+					disbandParty();
+					return;
+				}
+			}
+			
+			getMembers().remove(player);
+			recalculatePartyLevel();
+			
+			if (player.isFestivalParticipant()) {
+				SevenSignsFestival.getInstance().updateParticipants(player, this);
+			}
+			
+			try {
+				// Channeling a player!
+				if (player.isChanneling() && (player.getSkillChannelizer().hasChannelized())) {
+					player.abortCast();
+				} else if (player.isChannelized()) {
+					player.getSkillChannelized().abortChannelization();
+				}
+			} catch (Exception e) {
+				LOG.warn(e.getMessage(), e);
+			}
+			
+			SystemMessage msg;
+			if (type == messageType.Expelled) {
+				player.sendPacket(SystemMessageId.HAVE_BEEN_EXPELLED_FROM_PARTY);
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_WAS_EXPELLED_FROM_PARTY);
+				msg.addString(player.getName());
+				broadcastPacket(msg);
+			} else if ((type == messageType.Left) || (type == messageType.Disconnected)) {
+				player.sendPacket(SystemMessageId.YOU_LEFT_PARTY);
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_LEFT_PARTY);
+				msg.addString(player.getName());
+				broadcastPacket(msg);
+			}
+			
+			// UI update.
+			player.sendPacket(PartySmallWindowDeleteAll.STATIC_PACKET);
+			player.setParty(null);
+			broadcastPacket(new PartySmallWindowDelete(player));
+			if (player.hasSummon()) {
+				broadcastPacket(new ExPartyPetWindowDelete(player.getSummon()));
+			}
+			
+			if (isInDimensionalRift()) {
+				_dr.partyMemberExited(player);
+			}
+			
+			// Close the CCInfoWindow
+			if (isInCommandChannel()) {
+				player.sendPacket(new ExCloseMPCC());
+			}
+			if (isLeader && (getMembers().size() > 1) && (character().leavePartyLeader() || (type == messageType.Disconnected))) {
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_A_PARTY_LEADER);
+				msg.addString(getLeader().getName());
+				broadcastPacket(msg);
+				broadcastToPartyMembersNewLeader();
+			} else if (getMembers().size() == 1) {
+				if (isInCommandChannel()) {
+					// delete the whole command channel when the party who opened the channel is disbanded
+					if (getCommandChannel().getLeader().getObjectId() == getLeader().getObjectId()) {
+						getCommandChannel().disbandChannel();
+					} else {
+						getCommandChannel().removeParty(this);
+					}
+				}
+				
+				if (getLeader() != null) {
+					getLeader().setParty(null);
+				}
+				
+				if (_changeDistributionTypeRequestTask != null) {
+					_changeDistributionTypeRequestTask.cancel(true);
+					_changeDistributionTypeRequestTask = null;
+				}
+				if (_positionBroadcastTask != null) {
+					_positionBroadcastTask.cancel(false);
+					_positionBroadcastTask = null;
+				}
+				_members.clear();
+			}
+		}
+	}
+	
+	/**
+	 * Disperse a party and send a message to all its members.
+	 */
+	public void disbandParty() {
+		_disbanding = true;
+		broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_DISPERSED));
+		for (L2PcInstance member : _members) {
+			if (member != null) {
+				removePartyMember(member, messageType.None);
+			}
+		}
+	}
+	
+	/**
+	 * Change party leader (used for string arguments)
+	 * @param name the name of the player to set as the new party leader
+	 */
+	public void changePartyLeader(String name) {
+		setLeader(getPlayerByName(name));
+	}
+	
+	@Override
+	public void setLeader(L2PcInstance player) {
+		if ((player != null) && !player.isInDuel()) {
+			if (getMembers().contains(player)) {
+				if (isLeader(player)) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFER_RIGHTS_TO_YOURSELF);
+				} else {
+					// Swap party members
+					L2PcInstance temp = getLeader();
+					int p1 = getMembers().indexOf(player);
+					getMembers().set(0, player);
+					getMembers().set(p1, temp);
+					
+					SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BECOME_A_PARTY_LEADER);
+					msg.addString(getLeader().getName());
+					broadcastPacket(msg);
+					broadcastToPartyMembersNewLeader();
+					if (isInCommandChannel() && _commandChannel.isLeader(temp)) {
+						_commandChannel.setLeader(getLeader());
+						msg = SystemMessage.getSystemMessage(SystemMessageId.COMMAND_CHANNEL_LEADER_NOW_C1);
+						msg.addString(_commandChannel.getLeader().getName());
+						_commandChannel.broadcastPacket(msg);
+					}
+					if (player.isInPartyMatchRoom()) {
+						PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(player);
+						room.changeLeader(player);
+					}
+				}
+			} else {
+				player.sendPacket(SystemMessageId.YOU_CAN_TRANSFER_RIGHTS_ONLY_TO_ANOTHER_PARTY_MEMBER);
+			}
+		}
+	}
+	
+	/**
+	 * finds a player in the party by name
+	 */
+	private L2PcInstance getPlayerByName(String name) {
+		for (L2PcInstance member : getMembers()) {
+			if (member.getName().equalsIgnoreCase(name)) {
+				return member;
+			}
+		}
+		return null;
+	}
+	
+	private boolean isItemToEvenlyDistribute(int itemId) {
+		L2Item item = ItemTable.getInstance().getTemplate(itemId);
+		if (item != null) {
+			if ((character().getPartyEvenlyDistributeAllStackableItems() && item.isStackable()) || (character().getPartyEvenlyDistributeAllOtherItems() && !item.isStackable())) {
+				return true;
+			}
+		}
+		
+		return character().getPartyEvenlyDistributeItems().contains(itemId);
+	}
+	
+	/**
+	 * distribute item(s) to party members
+	 */
+	public void distributeItem(L2PcInstance player, L2ItemInstance item) {
+		if (isItemToEvenlyDistribute(item.getId()) && item.getCount() > 1) {
+			distributeItemEvenly(player, item.getId(), item.getCount(), player);
+			ItemTable.getInstance().destroyItem("Party", item, player, null);
+			return;
+		}
+		
+		L2PcInstance target = getActualLooter(player, item.getId(), false, player);
+		target.addItem("Party", item, player, true);
+		
+		// Send messages to other party members about reward
+		if (item.getCount() > 0) {
+			if (item.getCount() > 1) {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
+				msg.addString(target.getName());
+				msg.addItemName(item);
+				msg.addLong(item.getCount());
+				broadcastToPartyMembers(target, msg);
+			} else {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S2);
+				msg.addString(target.getName());
+				msg.addItemName(item);
+				broadcastToPartyMembers(target, msg);
+			}
+		}
+	}
+	
+	/**
+	 * Distributes item loot between party members.
+	 * @param player the reference player
+	 * @param itemId the item ID
+	 * @param itemCount the item count
+	 * @param spoil {@code true} if it's spoil loot
+	 * @param target the NPC target
+	 */
+	public void distributeItem(L2PcInstance player, int itemId, long itemCount, boolean spoil, L2Attackable target) {
+		if (isItemToEvenlyDistribute(itemId) && itemCount > 1) {
+			distributeItemEvenly(player, itemId, itemCount, target);
+			return;
+		}
+		
+		L2PcInstance looter = getActualLooter(player, itemId, spoil, target);
+		
+		looter.addItem(spoil ? "Sweeper Party" : "Party", itemId, itemCount, target, true);
+		
+		// Send messages to other party members about reward
+		if (itemCount > 0) {
+			if (itemCount > 1) {
+				SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S3_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
+				msg.addString(looter.getName());
+				msg.addItemName(itemId);
+				msg.addLong(itemCount);
+				broadcastToPartyMembers(looter, msg);
+			} else {
+				SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S2);
+				msg.addString(looter.getName());
+				msg.addItemName(itemId);
+				broadcastToPartyMembers(looter, msg);
+			}
+		}
+	}
+	
+	/**
+	 * Method overload for {@link L2Party#distributeItem(L2PcInstance, int, long, boolean, L2Attackable)}
+	 * @param player the reference player
+	 * @param item the item holder
+	 * @param spoil {@code true} if it's spoil loot
+	 * @param target the NPC target
+	 */
+	public void distributeItem(L2PcInstance player, ItemHolder item, boolean spoil, L2Attackable target) {
+		distributeItem(player, item.getId(), item.getCount(), spoil, target);
+	}
+	
+	/**
+	 * Distribute an item evenly to party members in range.<BR>
+	 * Check the number of party members that must be rewarded<BR>
+	 * @param player owner (picker)
+	 * @param itemId the id of the item to split
+	 * @param itemAmount the amount of the item to split
+	 * @param target the target who drop / pick the adena
+	 */
+	public void distributeItemEvenly(L2PcInstance player, int itemId, long itemAmount, L2Character target) {
+		final var toReward = new HashMap<L2PcInstance, Long>(9);
+		
+		for (var member : getMembers()) {
+			if (Util.checkIfInRange(character().getPartyRange2(), target, member, true)) {
+				toReward.put(member, 0L);
+			}
+		}
+		
+		if (!toReward.isEmpty()) {
+			long leftOver = itemAmount % toReward.size();
+			final long count = itemAmount / toReward.size();
+			
+			if (count > 0) {
+				for (var member : toReward.keySet()) {
+					toReward.put(member, count);
+				}
+			}
+			
+			if (leftOver > 0) {
+				final var keys = new ArrayList<>(toReward.keySet());
+				while (leftOver-- > 0) {
+					final var rndMember = keys.get(Rnd.get(keys.size()));
+					toReward.compute(rndMember, (_, v) -> v + 1);
+				}
+			}
+			
+			for (var member : toReward.entrySet()) {
+				if (member.getValue() > 0) {
+					if (itemId == Inventory.ADENA_ID) {
+						member.getKey().addAdena("Party", member.getValue(), player, true);
+					} else {
+						member.getKey().addItem("Party", itemId, member.getValue(), target, true);
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Distribute Experience and SP rewards to L2PcInstance Party members in the known area of the last attacker.<BR>
+	 * <BR>
+	 * <B><U> Actions</U> :</B>
+	 * <li>Get the L2PcInstance owner of the L2ServitorInstance (if necessary)</li>
+	 * <li>Calculate the Experience and SP reward distribution rate</li>
+	 * <li>Add Experience and SP to the L2PcInstance</li><BR>
+	 * @param xpReward The Experience reward to distribute
+	 * @param spReward The SP reward to distribute
+	 * @param rewardedMembers The list of L2PcInstance to reward
+	 * @param topLvl
+	 * @param partyDmg
+	 * @param target
+	 */
+	public void distributeXpAndSp(long xpReward, int spReward, List<L2PcInstance> rewardedMembers, int topLvl, int partyDmg, L2Attackable target) {
+		final List<L2PcInstance> validMembers = getValidMembers(rewardedMembers, topLvl);
+		
+		xpReward *= getExpBonus(validMembers.size());
+		spReward *= getSpBonus(validMembers.size());
+		
+		int sqLevelSum = 0;
+		for (L2PcInstance member : validMembers) {
+			sqLevelSum += (member.getLevel() * member.getLevel());
+		}
+		
+		final float vitalityPoints = (target.getVitalityPoints(partyDmg) * rates().getRatePartyXp()) / validMembers.size();
+		final boolean useVitalityRate = target.useVitalityRate();
+		
+		for (L2PcInstance member : rewardedMembers) {
+			if (member.isDead()) {
+				continue;
+			}
+			
+			// Calculate and add the EXP and SP reward to the member
+			if (validMembers.contains(member)) {
+				// The servitor penalty
+				final float penalty = member.hasServitor() ? ((L2ServitorInstance) member.getSummon()).getExpMultiplier() : 1;
+				
+				final double sqLevel = member.getLevel() * member.getLevel();
+				final double preCalculation = (sqLevel / sqLevelSum) * penalty;
+				
+				// Add the XP/SP points to the requested party member
+				long addexp = Math.round(xpReward * preCalculation);
+				int addsp = (int) (spReward * preCalculation);
+				
+				addexp = calculateExpSpPartyCutoff(member.getActingPlayer(), topLvl, addexp, addsp, useVitalityRate);
+				if (addexp > 0) {
+					member.updateVitalityPoints(vitalityPoints, true, false);
+					if (!member.isInsideZone(ZoneId.PEACE) && ((member.getLevel() - target.getLevel()) <= MAXIMUM_LEVEL_DIFFERENCE)) {
+						if (hunting().getNevitEnable()) {
+							member.getHuntingSystem().startHuntingSystemTask();
+							if ((member.getHuntingSystem().getHuntingBonusTime() < hunting().getHuntingBonusMaxTime()) || !hunting().getHuntingBonusLimit()) {
+								member.getHuntingSystem().addPoints(hunting().getNevitNormalPoints());
+							}
+						}
+						
+						member.getRecSystem().startBonusTask(true);
+					}
+				}
+			} else {
+				member.addExpAndSp(0, 0);
+			}
+		}
+	}
+	
+	private long calculateExpSpPartyCutoff(L2PcInstance player, int topLvl, long addExp, int addSp, boolean vit) {
+		long xp = addExp;
+		int sp;
+		if (character().getPartyXpCutoffMethod().equalsIgnoreCase("highfive")) {
+			int i = 0;
+			final int lvlDiff = topLvl - player.getLevel();
+			for (Entry<Integer, Integer> gap : character().getPartyXpCutoffGaps().entrySet()) {
+				if ((lvlDiff >= gap.getKey()) && (lvlDiff <= gap.getValue())) {
+					xp = (addExp * character().getPartyXpCutoffGapPercent().get(i)) / 100;
+					sp = (addSp * character().getPartyXpCutoffGapPercent().get(i)) / 100;
+					player.addExpAndSp(xp, sp, vit);
+					break;
+				}
+				i++;
+			}
+		} else {
+			player.addExpAndSp(addExp, addSp, vit);
+		}
+		return xp;
+	}
+	
+	/**
+	 * refresh party level
+	 */
+	public void recalculatePartyLevel() {
+		int newLevel = 0;
+		for (L2PcInstance member : getMembers()) {
+			if (member == null) {
+				getMembers().remove(member);
+				continue;
+			}
+			
+			if (member.getLevel() > newLevel) {
+				newLevel = member.getLevel();
+			}
+		}
+		_partyLvl = newLevel;
+	}
+	
+	private List<L2PcInstance> getValidMembers(List<L2PcInstance> members, int topLvl) {
+		final List<L2PcInstance> validMembers = new ArrayList<>();
+		
+		// Fixed LevelDiff cutoff point
+		if (character().getPartyXpCutoffMethod().equalsIgnoreCase("level")) {
+			for (L2PcInstance member : members) {
+				if ((topLvl - member.getLevel()) <= character().getPartyXpCutoffLevel()) {
+					validMembers.add(member);
+				}
+			}
+		}
+		// Fixed MinPercentage cutoff point
+		else if (character().getPartyXpCutoffMethod().equalsIgnoreCase("percentage")) {
+			int sqLevelSum = 0;
+			for (L2PcInstance member : members) {
+				sqLevelSum += (member.getLevel() * member.getLevel());
+			}
+			
+			for (L2PcInstance member : members) {
+				int sqLevel = member.getLevel() * member.getLevel();
+				if ((sqLevel * 100) >= (sqLevelSum * character().getPartyXpCutoffPercent())) {
+					validMembers.add(member);
+				}
+			}
+		}
+		// Automatic cutoff method
+		else if (character().getPartyXpCutoffMethod().equalsIgnoreCase("auto")) {
+			int sqLevelSum = 0;
+			for (L2PcInstance member : members) {
+				sqLevelSum += (member.getLevel() * member.getLevel());
+			}
+			
+			int i = members.size() - 1;
+			if (i < 1) {
+				return members;
+			}
+			if (i >= BONUS_EXP_SP.length) {
+				i = BONUS_EXP_SP.length - 1;
+			}
+			
+			for (L2PcInstance member : members) {
+				int sqLevel = member.getLevel() * member.getLevel();
+				if (sqLevel >= (sqLevelSum / (members.size() * members.size()))) {
+					validMembers.add(member);
+				}
+			}
+		}
+		// High Five cutoff method
+		else if (character().getPartyXpCutoffMethod().equalsIgnoreCase("highfive")) {
+			validMembers.addAll(members);
+		} else if (character().getPartyXpCutoffMethod().equalsIgnoreCase("none")) {
+			validMembers.addAll(members);
+		}
+		return validMembers;
+	}
+	
+	private double getBaseExpSpBonus(int membersCount) {
+		int i = membersCount - 1;
+		if (i < 1) {
+			return 1;
+		}
+		if (i >= BONUS_EXP_SP.length) {
+			i = BONUS_EXP_SP.length - 1;
+		}
+		
+		return BONUS_EXP_SP[i];
+	}
+	
+	private double getExpBonus(int membersCount) {
+		return (membersCount < 2) ? (getBaseExpSpBonus(membersCount)) : (getBaseExpSpBonus(membersCount) * rates().getRatePartyXp());
+	}
+	
+	private double getSpBonus(int membersCount) {
+		return (membersCount < 2) ? (getBaseExpSpBonus(membersCount)) : (getBaseExpSpBonus(membersCount) * rates().getRatePartySp());
+	}
+	
+	@Override
+	public int getLevel() {
+		return _partyLvl;
+	}
+	
+	public PartyDistributionType getDistributionType() {
+		return _distributionType;
+	}
+	
+	public boolean isInCommandChannel() {
+		return _commandChannel != null;
+	}
+	
+	public L2CommandChannel getCommandChannel() {
+		return _commandChannel;
+	}
+	
+	public void setCommandChannel(L2CommandChannel channel) {
+		_commandChannel = channel;
+	}
+	
+	public boolean isInDimensionalRift() {
+		return _dr != null;
+	}
+	
+	public void setDimensionalRift(DimensionalRift dr) {
+		_dr = dr;
+	}
+	
+	public DimensionalRift getDimensionalRift() {
+		return _dr;
+	}
+	
+	/**
+	 * @return the leader of this party
+	 */
+	@Override
+	public L2PcInstance getLeader() {
+		return _members.getFirst();
+	}
+	
+	public synchronized void requestLootChange(PartyDistributionType partyDistributionType) {
+		if (_changeRequestDistributionType != null) {
+			return;
+		}
+		_changeRequestDistributionType = partyDistributionType;
+		_changeDistributionTypeAnswers = new HashSet<>();
+		_changeDistributionTypeRequestTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> finishLootRequest(false), PARTY_DISTRIBUTION_TYPE_REQUEST_TIMEOUT.toMillis());
+		
+		broadcastToPartyMembers(getLeader(), new ExAskModifyPartyLooting(getLeader().getName(), partyDistributionType));
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REQUESTING_APPROVAL_CHANGE_PARTY_LOOT_S1);
+		sm.addSystemString(partyDistributionType.getSysStringId());
+		getLeader().sendPacket(sm);
+	}
+	
+	public synchronized void answerLootChangeRequest(L2PcInstance member, boolean answer) {
+		if (_changeRequestDistributionType == null) {
+			return;
+		}
+		
+		if (_changeDistributionTypeAnswers.contains(member.getObjectId())) {
+			return;
+		}
+		
+		if (!answer) {
+			finishLootRequest(false);
+			return;
+		}
+		
+		_changeDistributionTypeAnswers.add(member.getObjectId());
+		if (_changeDistributionTypeAnswers.size() >= (getMemberCount() - 1)) {
+			finishLootRequest(true);
+		}
+	}
+	
+	private synchronized void finishLootRequest(boolean success) {
+		if (_changeRequestDistributionType == null) {
+			return;
+		}
+		if (_changeDistributionTypeRequestTask != null) {
+			_changeDistributionTypeRequestTask.cancel(false);
+			_changeDistributionTypeRequestTask = null;
+		}
+		if (success) {
+			broadcastPacket(new ExSetPartyLooting(1, _changeRequestDistributionType));
+			_distributionType = _changeRequestDistributionType;
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PARTY_LOOT_CHANGED_S1);
+			sm.addSystemString(_changeRequestDistributionType.getSysStringId());
+			broadcastPacket(sm);
+		} else {
+			broadcastPacket(new ExSetPartyLooting(0, _distributionType));
+			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_LOOT_CHANGE_CANCELLED));
+		}
+		_changeRequestDistributionType = null;
+		_changeDistributionTypeAnswers = null;
+	}
+	
+	/**
+	 * @return a list of all members of this party
+	 */
+	@Override
+	public List<L2PcInstance> getMembers() {
+		return _members;
+	}
+	
+	/**
+	 * Check whether the leader of this party is the same as the leader of the specified party (which essentially means they're the same group).
+	 * @param party the other party to check against
+	 * @return {@code true} if this party equals the specified party, {@code false} otherwise
+	 */
+	public boolean equals(L2Party party) {
+		return (party != null) && (getLeaderObjectId() == party.getLeaderObjectId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2PetData.java b/src/main/java/com/l2jserver/gameserver/model/L2PetData.java
new file mode 100644
index 00000000..e3ef351f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2PetData.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.IntStream;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+/**
+ * Class hold information about basic pet stats which are same on each level.
+ * @author JIV
+ */
+public class L2PetData {
+	private final Map<Integer, L2PetLevelData> _levelStats = new HashMap<>();
+	private final List<L2PetSkillLearn> _skills = new ArrayList<>();
+	
+	private final int _npcId;
+	private final int _itemId;
+	private int _hungryLimit = 1;
+	private int _minLvl = Byte.MAX_VALUE;
+	private boolean _syncLevel = false;
+	private final List<Integer> _food = new ArrayList<>();
+	
+	public L2PetData(int npcId, int itemId) {
+		_npcId = npcId;
+		_itemId = itemId;
+	}
+	
+	/**
+	 * @return the npc id representing this pet.
+	 */
+	public int getNpcId() {
+		return _npcId;
+	}
+	
+	/**
+	 * @return the item id that could summon this pet.
+	 */
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	/**
+	 * @param level the pet's level.
+	 * @param data the pet's data.
+	 */
+	public void addNewStat(int level, L2PetLevelData data) {
+		if (_minLvl > level) {
+			_minLvl = level;
+		}
+		_levelStats.put(level, data);
+	}
+	
+	/**
+	 * @param petLevel the pet's level.
+	 * @return the pet data associated to that pet level.
+	 */
+	public L2PetLevelData getPetLevelData(int petLevel) {
+		return _levelStats.get(petLevel);
+	}
+	
+	/**
+	 * @return the pet's hunger limit.
+	 */
+	public int getHungryLimit() {
+		return _hungryLimit;
+	}
+	
+	/**
+	 * @return {@code true} if pet synchronizes it's level with his master's
+	 */
+	public boolean isSyncLevel() {
+		return _syncLevel;
+	}
+	
+	/**
+	 * @return the pet's minimum level.
+	 */
+	public int getMinLevel() {
+		return _minLvl;
+	}
+	
+	/**
+	 * @return the pet's food list.
+	 */
+	public List<Integer> getFood() {
+		return _food;
+	}
+	
+	/**
+	 * @param foodId the pet's food Id to add.
+	 */
+	public void addFood(Integer foodId) {
+		_food.add(foodId);
+	}
+	
+	/**
+	 * @param limit the hunger limit to set.
+	 */
+	public void setHungryLimit(int limit) {
+		_hungryLimit = limit;
+	}
+	
+	/**
+	 * @param val synchronizes level with master or not.
+	 */
+	public void setSyncLevel(boolean val) {
+		_syncLevel = val;
+	}
+	
+	/**
+	 * @param skillId the skill Id to add.
+	 * @param skillLvl the skill level.
+	 * @param petLvl the pet's level when this skill is available.
+	 */
+	public void addNewSkill(int skillId, int skillLvl, int petLvl) {
+		_skills.add(new L2PetSkillLearn(skillId, skillLvl, petLvl));
+	}
+	
+	public int getAvailableLevel(final L2Summon pet, int skillId) {
+		final StatsSet parameters = pet.getTemplate().getParameters();
+		final int currentStep = (int) Math.floor((pet.getLevel() / 5.) - 11);
+		
+		return IntStream.rangeClosed(0, currentStep)
+			.map(i -> currentStep - i)
+			.mapToObj(step -> IntStream.iterate(1, i -> i + 1)
+				.mapToObj(skillNum -> parameters.getObject("step" + step + "_skill0" + skillNum, SkillHolder.class))
+				.takeWhile(Objects::nonNull)
+				.filter(skill -> skill.getSkillId() == skillId)
+				.findFirst())
+			.filter(Optional::isPresent)
+			.map(Optional::get)
+			.mapToInt(SkillHolder::getSkillLvl)
+			.findFirst()
+			.orElse(0);
+	}
+	
+	/**
+	 * @return the list with the pet's skill data.
+	 */
+	public List<L2PetSkillLearn> getAvailableSkills() {
+		return _skills;
+	}
+	
+	public static final class L2PetSkillLearn extends SkillHolder {
+		private final int _minLevel;
+		
+		/**
+		 * @param id the skill Id.
+		 * @param lvl the skill level.
+		 * @param minLvl the minimum level when this skill is available.
+		 */
+		public L2PetSkillLearn(int id, int lvl, int minLvl) {
+			super(id, lvl);
+			_minLevel = minLvl;
+		}
+		
+		/**
+		 * @return the minimum level for the pet to get the skill.
+		 */
+		public int getMinLevel() {
+			return _minLevel;
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2PetLevelData.java b/src/main/java/com/l2jserver/gameserver/model/L2PetLevelData.java
new file mode 100644
index 00000000..ab8e2fe0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2PetLevelData.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.stats.MoveType;
+
+/**
+ * Stats definition for each pet level.
+ * @author JIV
+ * @author Zoey76
+ */
+public class L2PetLevelData {
+	private final int _ownerExpTaken;
+	private final int _petFeedBattle;
+	private final int _petFeedNormal;
+	private final float _petMAtk;
+	private final long _petMaxExp;
+	private final int _petMaxFeed;
+	private final float _petMaxHP;
+	private final float _petMaxMP;
+	private final float _petMDef;
+	private final float _petPAtk;
+	private final float _petPDef;
+	private final float _petRegenHP;
+	private final float _petRegenMP;
+	private final short _petSoulShot;
+	private final short _petSpiritShot;
+	private final double _walkSpeedOnRide;
+	private final double _runSpeedOnRide;
+	private final double _slowSwimSpeedOnRide;
+	private final double _fastSwimSpeedOnRide;
+	private final double _slowFlySpeedOnRide;
+	private final double _fastFlySpeedOnRide;
+	
+	public L2PetLevelData(StatsSet set) {
+		_ownerExpTaken = set.getInt("get_exp_type");
+		_petMaxExp = (long) set.getDouble("exp");
+		_petMaxHP = set.getFloat("org_hp");
+		_petMaxMP = set.getFloat("org_mp");
+		_petPAtk = set.getFloat("org_pattack");
+		_petPDef = set.getFloat("org_pdefend");
+		_petMAtk = set.getFloat("org_mattack");
+		_petMDef = set.getFloat("org_mdefend");
+		_petMaxFeed = set.getInt("max_meal");
+		_petFeedBattle = set.getInt("consume_meal_in_battle");
+		_petFeedNormal = set.getInt("consume_meal_in_normal");
+		_petRegenHP = set.getFloat("org_hp_regen");
+		_petRegenMP = set.getFloat("org_mp_regen");
+		_petSoulShot = set.getShort("soulshot_count");
+		_petSpiritShot = set.getShort("spiritshot_count");
+		_walkSpeedOnRide = set.getDouble("walkSpeedOnRide", 0);
+		_runSpeedOnRide = set.getDouble("runSpeedOnRide", 0);
+		_slowSwimSpeedOnRide = set.getDouble("slowSwimSpeedOnRide", 0);
+		_fastSwimSpeedOnRide = set.getDouble("fastSwimSpeedOnRide", 0);
+		_slowFlySpeedOnRide = set.getDouble("slowFlySpeedOnRide", 0);
+		_fastFlySpeedOnRide = set.getDouble("fastFlySpeedOnRide", 0);
+	}
+	
+	/**
+	 * @return the owner's experience points consumed by the pet.
+	 */
+	public int getOwnerExpTaken() {
+		return _ownerExpTaken;
+	}
+	
+	/**
+	 * @return the pet's food consume rate at battle state.
+	 */
+	public int getPetFeedBattle() {
+		return _petFeedBattle;
+	}
+	
+	/**
+	 * @return the pet's food consume rate at normal state.
+	 */
+	public int getPetFeedNormal() {
+		return _petFeedNormal;
+	}
+	
+	/**
+	 * @return the pet's Magical Attack.
+	 */
+	public float getPetMAtk() {
+		return _petMAtk;
+	}
+	
+	/**
+	 * @return the pet's maximum experience points.
+	 */
+	public long getPetMaxExp() {
+		return _petMaxExp;
+	}
+	
+	/**
+	 * @return the pet's maximum feed points.
+	 */
+	public int getPetMaxFeed() {
+		return _petMaxFeed;
+	}
+	
+	/**
+	 * @return the pet's maximum HP.
+	 */
+	public float getPetMaxHP() {
+		return _petMaxHP;
+	}
+	
+	/**
+	 * @return the pet's maximum MP.
+	 */
+	public float getPetMaxMP() {
+		return _petMaxMP;
+	}
+	
+	/**
+	 * @return the pet's Magical Defense.
+	 */
+	public float getPetMDef() {
+		return _petMDef;
+	}
+	
+	/**
+	 * @return the pet's Physical Attack.
+	 */
+	public float getPetPAtk() {
+		return _petPAtk;
+	}
+	
+	/**
+	 * @return the pet's Physical Defense.
+	 */
+	public float getPetPDef() {
+		return _petPDef;
+	}
+	
+	/**
+	 * @return the pet's HP regeneration rate.
+	 */
+	public float getPetRegenHP() {
+		return _petRegenHP;
+	}
+	
+	/**
+	 * @return the pet's MP regeneration rate.
+	 */
+	public float getPetRegenMP() {
+		return _petRegenMP;
+	}
+	
+	/**
+	 * @return the pet's soulshot use count.
+	 */
+	public short getPetSoulShot() {
+		return _petSoulShot;
+	}
+	
+	/**
+	 * @return the pet's spiritshot use count.
+	 */
+	public short getPetSpiritShot() {
+		return _petSpiritShot;
+	}
+	
+	/**
+	 * @param mt movement type
+	 * @return the base riding speed of given movement type.
+	 */
+	public double getSpeedOnRide(MoveType mt) {
+		return switch (mt) {
+			case WALK -> _walkSpeedOnRide;
+			case RUN -> _runSpeedOnRide;
+			case SLOW_SWIM -> _slowSwimSpeedOnRide;
+			case FAST_SWIM -> _fastSwimSpeedOnRide;
+			case SLOW_FLY -> _slowFlySpeedOnRide;
+			case FAST_FLY -> _fastFlySpeedOnRide;
+		};
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2PremiumItem.java b/src/main/java/com/l2jserver/gameserver/model/L2PremiumItem.java
new file mode 100644
index 00000000..c457afe6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2PremiumItem.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ ** @author Gnacik
+ */
+public class L2PremiumItem {
+	private final int _itemId;
+	private long _count;
+	private final String _sender;
+	
+	public L2PremiumItem(int itemId, long count, String sender) {
+		_itemId = itemId;
+		_count = count;
+		_sender = sender;
+	}
+	
+	public void updateCount(long newCount) {
+		_count = newCount;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	public long getCount() {
+		return _count;
+	}
+	
+	public String getSender() {
+		return _sender;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Radar.java b/src/main/java/com/l2jserver/gameserver/model/L2Radar.java
new file mode 100644
index 00000000..259ac7e9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Radar.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.network.serverpackets.RadarControl.RadarAction.ADD;
+import static com.l2jserver.gameserver.network.serverpackets.RadarControl.RadarAction.DELETE;
+import static com.l2jserver.gameserver.network.serverpackets.RadarControl.RadarAction.DELETE_ALL;
+import static com.l2jserver.gameserver.network.serverpackets.RadarControl.RadarType.FLAG_1;
+import static com.l2jserver.gameserver.network.serverpackets.RadarControl.RadarType.FLAG_2;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.RadarControl;
+
+/**
+ * Radar.
+ * @author dalrond
+ * @author Zoey76
+ */
+public final class L2Radar {
+	private final L2PcInstance _player;
+	private final Set<RadarMarker> _markers = ConcurrentHashMap.newKeySet();
+	
+	public L2Radar(L2PcInstance player) {
+		_player = player;
+	}
+	
+	public void showRadar(int x, int y, int z, int type) {
+		_markers.add(new RadarMarker(x, y, z));
+		_player.sendPacket(new RadarControl(DELETE_ALL, FLAG_2, x, y, z));
+		_player.sendPacket(new RadarControl(ADD, FLAG_1, x, y, z));
+	}
+	
+	public void deleteRadar(int x, int y, int z, int type) {
+		_markers.remove(new RadarMarker(x, y, z));
+		_player.sendPacket(new RadarControl(DELETE, FLAG_1, x, y, z));
+	}
+	
+	public void deleteAllRadar(int type) {
+		for (var r : _markers) {
+			_player.sendPacket(new RadarControl(DELETE_ALL, FLAG_2, r._x, r._y, r._z));
+		}
+		_markers.clear();
+	}
+	
+	public void loadMarkers() {
+		_player.sendPacket(new RadarControl(DELETE_ALL, FLAG_2, _player.getX(), _player.getY(), _player.getZ()));
+		for (var r : _markers) {
+			_player.sendPacket(new RadarControl(ADD, FLAG_1, r._x, r._y, r._z));
+		}
+	}
+	
+	static class RadarMarker {
+		int _type, _x, _y, _z;
+		
+		RadarMarker(int type, int x, int y, int z) {
+			_type = type;
+			_x = x;
+			_y = y;
+			_z = z;
+		}
+		
+		RadarMarker(int x, int y, int z) {
+			_type = 1;
+			_x = x;
+			_y = y;
+			_z = z;
+		}
+		
+		@Override
+		public int hashCode() {
+			final int prime = 31;
+			int result = 1;
+			result = (prime * result) + _type;
+			result = (prime * result) + _x;
+			result = (prime * result) + _y;
+			result = (prime * result) + _z;
+			return result;
+		}
+		
+		@Override
+		public boolean equals(Object obj) {
+			if (this == obj) {
+				return true;
+			}
+			if (!(obj instanceof RadarMarker other)) {
+				return false;
+			}
+			return (_type == other._type) && (_x == other._x) && (_y == other._y) && (_z == other._z);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2RecipeInstance.java b/src/main/java/com/l2jserver/gameserver/model/L2RecipeInstance.java
new file mode 100644
index 00000000..45312c47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2RecipeInstance.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * This class describes a RecipeList component (1 line of the recipe : Item-Quantity needed).
+ */
+public class L2RecipeInstance {
+	/** The Identifier of the item needed in the L2RecipeInstance */
+	private final int _itemId;
+	
+	/** The item quantity needed in the L2RecipeInstance */
+	private final int _quantity;
+	
+	/**
+	 * Constructor of L2RecipeInstance (create a new line in a RecipeList).
+	 * @param itemId
+	 * @param quantity
+	 */
+	public L2RecipeInstance(int itemId, int quantity) {
+		_itemId = itemId;
+		_quantity = quantity;
+	}
+	
+	/**
+	 * @return the Identifier of the L2RecipeInstance Item needed.
+	 */
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	/**
+	 * @return the Item quantity needed of the L2RecipeInstance.
+	 */
+	public int getQuantity() {
+		return _quantity;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2RecipeList.java b/src/main/java/com/l2jserver/gameserver/model/L2RecipeList.java
new file mode 100644
index 00000000..e8040f30
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2RecipeList.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * This class describes a Recipe used by Dwarf to craft Item. All L2RecipeList are made of L2RecipeInstance (1 line of the recipe : Item-Quantity needed).
+ */
+public class L2RecipeList {
+	/** The table containing all L2RecipeInstance (1 line of the recipe : Item-Quantity needed) of the L2RecipeList */
+	private L2RecipeInstance[] _recipes;
+	
+	/** The table containing all L2RecipeStatInstance for the statUse parameter of the L2RecipeList */
+	private L2RecipeStatInstance[] _statUse;
+	
+	/** The table containing all L2RecipeStatInstance for the altStatChange parameter of the L2RecipeList */
+	private L2RecipeStatInstance[] _altStatChange;
+	
+	/** The Identifier of the Instance */
+	private final int _id;
+	
+	/** The crafting level needed to use this L2RecipeList */
+	private final int _level;
+	
+	/** The Identifier of the L2RecipeList */
+	private final int _recipeId;
+	
+	/** The name of the L2RecipeList */
+	private final String _recipeName;
+	
+	/** The crafting success rate when using the L2RecipeList */
+	private final int _successRate;
+	
+	/** The Identifier of the Item crafted with this L2RecipeList */
+	private final int _itemId;
+	
+	/** The quantity of Item crafted when using this L2RecipeList */
+	private final int _count;
+	
+	/** The Identifier of the Rare Item crafted with this L2RecipeList */
+	private int _rareItemId;
+	
+	/** The quantity of Rare Item crafted when using this L2RecipeList */
+	private int _rareCount;
+	
+	/** The chance of Rare Item crafted when using this L2RecipeList */
+	private int _rarity;
+	
+	/** If this a common or a dwarven recipe */
+	private final boolean _isDwarvenRecipe;
+	
+	/**
+	 * Constructor of L2RecipeList (create a new Recipe).
+	 * @param set
+	 * @param haveRare
+	 */
+	public L2RecipeList(StatsSet set, boolean haveRare) {
+		_recipes = new L2RecipeInstance[0];
+		_statUse = new L2RecipeStatInstance[0];
+		_altStatChange = new L2RecipeStatInstance[0];
+		_id = set.getInt("id");
+		_level = set.getInt("craftLevel");
+		_recipeId = set.getInt("recipeId");
+		_recipeName = set.getString("recipeName");
+		_successRate = set.getInt("successRate");
+		_itemId = set.getInt("itemId");
+		_count = set.getInt("count");
+		if (haveRare) {
+			_rareItemId = set.getInt("rareItemId");
+			_rareCount = set.getInt("rareCount");
+			_rarity = set.getInt("rarity");
+		}
+		_isDwarvenRecipe = set.getBoolean("isDwarvenRecipe");
+	}
+	
+	/**
+	 * Add a L2RecipeInstance to the L2RecipeList (add a line Item-Quantity needed to the Recipe).
+	 * @param recipe
+	 */
+	public void addRecipe(L2RecipeInstance recipe) {
+		int len = _recipes.length;
+		L2RecipeInstance[] tmp = new L2RecipeInstance[len + 1];
+		System.arraycopy(_recipes, 0, tmp, 0, len);
+		tmp[len] = recipe;
+		_recipes = tmp;
+	}
+	
+	/**
+	 * Add a L2RecipeStatInstance of the statUse parameter to the L2RecipeList.
+	 * @param statUse
+	 */
+	public void addStatUse(L2RecipeStatInstance statUse) {
+		int len = _statUse.length;
+		L2RecipeStatInstance[] tmp = new L2RecipeStatInstance[len + 1];
+		System.arraycopy(_statUse, 0, tmp, 0, len);
+		tmp[len] = statUse;
+		_statUse = tmp;
+	}
+	
+	/**
+	 * Add a L2RecipeStatInstance of the altStatChange parameter to the L2RecipeList.
+	 * @param statChange
+	 */
+	public void addAltStatChange(L2RecipeStatInstance statChange) {
+		int len = _altStatChange.length;
+		L2RecipeStatInstance[] tmp = new L2RecipeStatInstance[len + 1];
+		System.arraycopy(_altStatChange, 0, tmp, 0, len);
+		tmp[len] = statChange;
+		_altStatChange = tmp;
+	}
+	
+	/**
+	 * @return the Identifier of the Instance.
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * @return the crafting level needed to use this L2RecipeList.
+	 */
+	public int getLevel() {
+		return _level;
+	}
+	
+	/**
+	 * @return the Identifier of the L2RecipeList.
+	 */
+	public int getRecipeId() {
+		return _recipeId;
+	}
+	
+	/**
+	 * @return the name of the L2RecipeList.
+	 */
+	public String getRecipeName() {
+		return _recipeName;
+	}
+	
+	/**
+	 * @return the crafting success rate when using the L2RecipeList.
+	 */
+	public int getSuccessRate() {
+		return _successRate;
+	}
+	
+	/**
+	 * @return the Identifier of the Item crafted with this L2RecipeList.
+	 */
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	/**
+	 * @return the quantity of Item crafted when using this L2RecipeList.
+	 */
+	public int getCount() {
+		return _count;
+	}
+	
+	/**
+	 * @return the Identifier of the Rare Item crafted with this L2RecipeList.
+	 */
+	public int getRareItemId() {
+		return _rareItemId;
+	}
+	
+	/**
+	 * @return the quantity of Rare Item crafted when using this L2RecipeList.
+	 */
+	public int getRareCount() {
+		return _rareCount;
+	}
+	
+	/**
+	 * @return the chance of Rare Item crafted when using this L2RecipeList.
+	 */
+	public int getRarity() {
+		return _rarity;
+	}
+	
+	/**
+	 * @return {@code true} if this a Dwarven recipe or {@code false} if its a Common recipe
+	 */
+	public boolean isDwarvenRecipe() {
+		return _isDwarvenRecipe;
+	}
+	
+	/**
+	 * @return the table containing all L2RecipeInstance (1 line of the recipe : Item-Quantity needed) of the L2RecipeList.
+	 */
+	public L2RecipeInstance[] getRecipes() {
+		return _recipes;
+	}
+	
+	/**
+	 * @return the table containing all L2RecipeStatInstance of the statUse parameter of the L2RecipeList.
+	 */
+	public L2RecipeStatInstance[] getStatUse() {
+		return _statUse;
+	}
+	
+	/**
+	 * @return the table containing all L2RecipeStatInstance of the AltStatChange parameter of the L2RecipeList.
+	 */
+	public L2RecipeStatInstance[] getAltStatChange() {
+		return _altStatChange;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2RecipeStatInstance.java b/src/main/java/com/l2jserver/gameserver/model/L2RecipeStatInstance.java
new file mode 100644
index 00000000..eb4495e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2RecipeStatInstance.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.enums.StatType;
+
+/**
+ * This class describes a RecipeList statUse and altStatChange component.
+ */
+public class L2RecipeStatInstance {
+	/** The Identifier of the statType */
+	private final StatType _type;
+	
+	/** The value of the statType */
+	private final int _value;
+	
+	public L2RecipeStatInstance(String type, int value) {
+		_type = Enum.valueOf(StatType.class, type);
+		_value = value;
+	}
+	
+	public StatType getType() {
+		return _type;
+	}
+	
+	public int getValue() {
+		return _value;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Request.java b/src/main/java/com/l2jserver/gameserver/model/L2Request.java
new file mode 100644
index 00000000..1ef848c1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Request.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This class manages requests (transactions) between two L2PcInstance.
+ * @author kriau
+ */
+public class L2Request {
+	private static final int REQUEST_TIMEOUT = 15; // in secs
+	
+	protected L2PcInstance _player;
+	protected L2PcInstance _partner;
+	protected boolean _isRequestor;
+	protected boolean _isAnswerer;
+	protected L2GameClientPacket _requestPacket;
+	
+	public L2Request(L2PcInstance player) {
+		_player = player;
+	}
+	
+	protected void clear() {
+		_partner = null;
+		_requestPacket = null;
+		_isRequestor = false;
+		_isAnswerer = false;
+	}
+	
+	/**
+	 * Set the L2PcInstance member of a transaction (ex : FriendInvite, JoinAlly, JoinParty...).
+	 * @param partner
+	 */
+	private synchronized void setPartner(L2PcInstance partner) {
+		_partner = partner;
+	}
+	
+	/**
+	 * @return the L2PcInstance member of a transaction (ex : FriendInvite, JoinAlly, JoinParty...).
+	 */
+	public L2PcInstance getPartner() {
+		return _partner;
+	}
+	
+	/**
+	 * Set the packet incomed from requester.
+	 * @param packet
+	 */
+	private synchronized void setRequestPacket(L2GameClientPacket packet) {
+		_requestPacket = packet;
+	}
+	
+	/**
+	 * Return the packet originally incomed from requester.
+	 * @return
+	 */
+	public L2GameClientPacket getRequestPacket() {
+		return _requestPacket;
+	}
+	
+	/**
+	 * Checks if request can be made and in success case puts both PC on request state.
+	 * @param partner
+	 * @param packet
+	 * @return
+	 */
+	public synchronized boolean setRequest(L2PcInstance partner, L2GameClientPacket packet) {
+		if (partner == null) {
+			_player.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
+			return false;
+		}
+		if (partner.getRequest().isProcessingRequest()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
+			sm.addString(partner.getName());
+			_player.sendPacket(sm);
+			return false;
+		}
+		if (isProcessingRequest()) {
+			_player.sendPacket(SystemMessageId.WAITING_FOR_ANOTHER_REPLY);
+			return false;
+		}
+		
+		_partner = partner;
+		_requestPacket = packet;
+		setOnRequestTimer(true);
+		_partner.getRequest().setPartner(_player);
+		_partner.getRequest().setRequestPacket(packet);
+		_partner.getRequest().setOnRequestTimer(false);
+		return true;
+	}
+	
+	private void setOnRequestTimer(boolean isRequestor) {
+		_isRequestor = isRequestor;
+		_isAnswerer = !isRequestor;
+		ThreadPoolManager.getInstance().scheduleGeneral(this::clear, REQUEST_TIMEOUT * 1000);
+	}
+	
+	/**
+	 * Clears PC request state. Should be called after answer packet receive.
+	 */
+	public void onRequestResponse() {
+		if (_partner != null) {
+			_partner.getRequest().clear();
+		}
+		clear();
+	}
+	
+	/**
+	 * @return {@code true} if a transaction is in progress.
+	 */
+	public boolean isProcessingRequest() {
+		return _partner != null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Seed.java b/src/main/java/com/l2jserver/gameserver/model/L2Seed.java
new file mode 100644
index 00000000..c43797d3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Seed.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.items.L2Item;
+
+public final class L2Seed {
+	private final int _seedId;
+	private final int _cropId; // crop type
+	private final int _level; // seed level
+	private final int _matureId; // mature crop type
+	private final int _reward1;
+	private final int _reward2;
+	private final int _castleId; // id of manor (castle id) where seed can be farmed
+	private final boolean _isAlternative;
+	private final int _limitSeeds;
+	private final int _limitCrops;
+	private final int _seedReferencePrice;
+	private final int _cropReferencePrice;
+	
+	public L2Seed(StatsSet set) {
+		_cropId = set.getInt("id");
+		_seedId = set.getInt("seedId");
+		_level = set.getInt("level");
+		_matureId = set.getInt("mature_Id");
+		_reward1 = set.getInt("reward1");
+		_reward2 = set.getInt("reward2");
+		_castleId = set.getInt("castleId");
+		_isAlternative = set.getBoolean("alternative");
+		_limitCrops = set.getInt("limit_crops");
+		_limitSeeds = set.getInt("limit_seed");
+		// Set prices
+		L2Item item = ItemTable.getInstance().getTemplate(_cropId);
+		_cropReferencePrice = (item != null) ? item.getReferencePrice() : 1;
+		item = ItemTable.getInstance().getTemplate(_seedId);
+		_seedReferencePrice = (item != null) ? item.getReferencePrice() : 1;
+	}
+	
+	public int getCastleId() {
+		return _castleId;
+	}
+	
+	public int getSeedId() {
+		return _seedId;
+	}
+	
+	public int getCropId() {
+		return _cropId;
+	}
+	
+	public int getMatureId() {
+		return _matureId;
+	}
+	
+	public int getReward(int type) {
+		return (type == 1) ? _reward1 : _reward2;
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public boolean isAlternative() {
+		return _isAlternative;
+	}
+	
+	public int getSeedLimit() {
+		return _limitSeeds * rates().getRateDropManor();
+	}
+	
+	public int getCropLimit() {
+		return _limitCrops * rates().getRateDropManor();
+	}
+	
+	public int getSeedReferencePrice() {
+		return _seedReferencePrice;
+	}
+	
+	public int getSeedMaxPrice() {
+		return _seedReferencePrice * 10;
+	}
+	
+	public int getSeedMinPrice() {
+		return (int) (_seedReferencePrice * 0.6);
+	}
+	
+	public int getCropReferencePrice() {
+		return _cropReferencePrice;
+	}
+	
+	public int getCropMaxPrice() {
+		return _cropReferencePrice * 10;
+	}
+	
+	public int getCropMinPrice() {
+		return (int) (_cropReferencePrice * 0.6);
+	}
+	
+	@Override
+	public String toString() {
+		return "SeedData [_id=" + _seedId + ", _level=" + _level + ", _crop=" + _cropId + ", _mature=" + _matureId + ", _type1=" + _reward1 + ", _type2=" + _reward2 + //
+			", _manorId=" + _castleId + ", _isAlternative=" + _isAlternative + ", _limitSeeds=" + _limitSeeds + ", _limitCrops=" + _limitCrops + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2SiegeClan.java b/src/main/java/com/l2jserver/gameserver/model/L2SiegeClan.java
new file mode 100644
index 00000000..54564003
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2SiegeClan.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+public class L2SiegeClan {
+	private final int _clanId;
+	private final List<L2Npc> _flag = new CopyOnWriteArrayList<>();
+	private SiegeClanType _type;
+	
+	public enum SiegeClanType {
+		OWNER,
+		DEFENDER,
+		ATTACKER,
+		DEFENDER_PENDING
+	}
+	
+	public L2SiegeClan(int clanId, SiegeClanType type) {
+		_clanId = clanId;
+		_type = type;
+	}
+	
+	public int getNumFlags() {
+		return _flag.size();
+	}
+	
+	public void addFlag(L2Npc flag) {
+		_flag.add(flag);
+	}
+	
+	public boolean removeFlag(L2Npc flag) {
+		boolean ret = _flag.remove(flag);
+		flag.deleteMe();
+		return ret;
+	}
+	
+	public void removeFlags() {
+		_flag.forEach(L2Object::decayMe);
+		_flag.clear();
+	}
+	
+	public final int getClanId() {
+		return _clanId;
+	}
+	
+	public final List<L2Npc> getFlag() {
+		return _flag;
+	}
+	
+	public SiegeClanType getType() {
+		return _type;
+	}
+	
+	public void setType(SiegeClanType setType) {
+		_type = setType;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2SkillLearn.java b/src/main/java/com/l2jserver/gameserver/model/L2SkillLearn.java
new file mode 100644
index 00000000..3678f9a2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2SkillLearn.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.base.SocialClass;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+/**
+ * Skill Learn.
+ * @author Zoey76
+ */
+public final class L2SkillLearn {
+	private final String _skillName;
+	private final int _skillId;
+	private final int _skillLvl;
+	private final int _getLevel;
+	private final boolean _autoGet;
+	private final int _levelUpSp;
+	private final List<ItemHolder> _requiredItems = new LinkedList<>();
+	private final List<Race> _races = new LinkedList<>();
+	private final List<SkillHolder> _preReqSkills = new LinkedList<>();
+	private SocialClass _socialClass;
+	private final boolean _residenceSkill;
+	private final List<Integer> _residenceIds = new LinkedList<>();
+	private final List<SubClassData> _subClassLvlNumber = new LinkedList<>();
+	private final boolean _learnedByNpc;
+	private final boolean _learnedByFS;
+	
+	public static class SubClassData {
+		private final int slot;
+		private final int lvl;
+		
+		public SubClassData(int pSlot, int pLvl) {
+			slot = pSlot;
+			lvl = pLvl;
+		}
+		
+		public int getSlot() {
+			return slot;
+		}
+		
+		public int getLvl() {
+			return lvl;
+		}
+	}
+	
+	/**
+	 * Constructor for L2SkillLearn.
+	 * @param set the set with the L2SkillLearn data.
+	 */
+	public L2SkillLearn(StatsSet set) {
+		_skillName = set.getString("skillName");
+		_skillId = set.getInt("skillId");
+		_skillLvl = set.getInt("skillLvl");
+		_getLevel = set.getInt("getLevel");
+		_autoGet = set.getBoolean("autoGet", false);
+		_levelUpSp = set.getInt("levelUpSp", 0);
+		_residenceSkill = set.getBoolean("residenceSkill", false);
+		_learnedByNpc = set.getBoolean("learnedByNpc", false);
+		_learnedByFS = set.getBoolean("learnedByFS", false);
+	}
+	
+	/**
+	 * @return the name of this skill.
+	 */
+	public String getName() {
+		return _skillName;
+	}
+	
+	/**
+	 * @return the ID of this skill.
+	 */
+	public int getSkillId() {
+		return _skillId;
+	}
+	
+	/**
+	 * @return the level of this skill.
+	 */
+	public int getSkillLevel() {
+		return _skillLvl;
+	}
+	
+	/**
+	 * @return the minimum level required to acquire this skill.
+	 */
+	public int getGetLevel() {
+		return _getLevel;
+	}
+	
+	/**
+	 * @return the amount of SP/Clan Reputation to acquire this skill.
+	 */
+	public int getLevelUpSp() {
+		return _levelUpSp;
+	}
+	
+	/**
+	 * @return {@code true} if the skill is auto-get, this skill is automatically delivered.
+	 */
+	public boolean isAutoGet() {
+		return _autoGet;
+	}
+	
+	/**
+	 * @return the list with the item holders required to acquire this skill.
+	 */
+	public List<ItemHolder> getRequiredItems() {
+		return _requiredItems;
+	}
+	
+	/**
+	 * Adds a required item holder to learn this skill.
+	 * @param item the required item holder.
+	 */
+	public void addRequiredItem(ItemHolder item) {
+		_requiredItems.add(item);
+	}
+	
+	/**
+	 * @return a list with the races that can acquire this skill.
+	 */
+	public List<Race> getRaces() {
+		return _races;
+	}
+	
+	/**
+	 * Adds a required race to learn this skill.
+	 * @param race the required race.
+	 */
+	public void addRace(Race race) {
+		_races.add(race);
+	}
+	
+	/**
+	 * @return the list of skill holders required to acquire this skill.
+	 */
+	public List<SkillHolder> getPreReqSkills() {
+		return _preReqSkills;
+	}
+	
+	/**
+	 * Adds a required skill holder to learn this skill.
+	 * @param skill the required skill holder.
+	 */
+	public void addPreReqSkill(SkillHolder skill) {
+		_preReqSkills.add(skill);
+	}
+	
+	/**
+	 * @return the social class required to get this skill.
+	 */
+	public SocialClass getSocialClass() {
+		return _socialClass;
+	}
+	
+	/**
+	 * Sets the social class if hasn't been set before.
+	 * @param socialClass the social class to set.
+	 */
+	public void setSocialClass(SocialClass socialClass) {
+		if (_socialClass == null) {
+			_socialClass = socialClass;
+		}
+	}
+	
+	/**
+	 * @return {@code true} if this skill is a Residence skill.
+	 */
+	public boolean isResidentialSkill() {
+		return _residenceSkill;
+	}
+	
+	/**
+	 * @return a list with the Ids where this skill is available.
+	 */
+	public List<Integer> getResidenceIds() {
+		return _residenceIds;
+	}
+	
+	/**
+	 * Adds a required residence Id.
+	 * @param id the residence Id to add.
+	 */
+	public void addResidenceId(Integer id) {
+		_residenceIds.add(id);
+	}
+	
+	/**
+	 * @return a list with Sub-Class conditions, amount of subclasses and level.
+	 */
+	public List<SubClassData> getSubClassConditions() {
+		return _subClassLvlNumber;
+	}
+	
+	/**
+	 * Adds a required residence Id.
+	 * @param slot the sub-class slot.
+	 * @param lvl the required sub-class level.
+	 */
+	public void addSubclassConditions(int slot, int lvl) {
+		_subClassLvlNumber.add(new SubClassData(slot, lvl));
+	}
+	
+	/**
+	 * @return {@code true} if this skill is learned from Npc.
+	 */
+	public boolean isLearnedByNpc() {
+		return _learnedByNpc;
+	}
+	
+	/**
+	 * @return {@code true} if this skill is learned by Forgotten Scroll.
+	 */
+	public boolean isLearnedByFS() {
+		return _learnedByFS;
+	}
+	
+	/**
+	 * Used for AltGameSkillLearn mod.<br>
+	 * If the alternative skill learn system is enabled and the player is learning a skill from a different class apply a fee.<br>
+	 * If the player is learning a skill from other class type (mage learning warrior skills or vice versa) the fee is higher.
+	 * @param playerClass the player class Id.
+	 * @param learningClass the skill learning player class Id.
+	 * @return the amount of SP required to acquire this skill, by calculating the cost for the alternative skill learn system.
+	 */
+	public int getCalculatedLevelUpSp(ClassId playerClass, ClassId learningClass) {
+		if ((playerClass == null) || (learningClass == null)) {
+			return _levelUpSp;
+		}
+		
+		int levelUpSp = _levelUpSp;
+		// If the alternative skill learn system is enabled and the player is learning a skill from a different class apply a fee.
+		if (character().skillLearn() && (playerClass != learningClass)) {
+			// If the player is learning a skill from other class type (mage learning warrior skills or vice versa) the fee is higher.
+			if (playerClass.isMage() != learningClass.isMage()) {
+				levelUpSp *= 3;
+			} else {
+				levelUpSp *= 2;
+			}
+		}
+		return levelUpSp;
+	}
+	
+	@Override
+	public String toString() {
+		return _skillName + " (" + _skillId + ", " + _skillLvl + ")";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Spawn.java b/src/main/java/com/l2jserver/gameserver/model/L2Spawn.java
new file mode 100644
index 00000000..9cf17251
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Spawn.java
@@ -0,0 +1,746 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.lang.reflect.Constructor;
+import java.util.Deque;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.TerritoryTable;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.NpcPersonalAIData;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+import com.l2jserver.gameserver.model.interfaces.IPositionable;
+import com.l2jserver.gameserver.model.zone.type.NpcSpawnTerritory;
+
+/**
+ * This class manages the spawn and respawn of a group of L2NpcInstance that are in the same are and have the same type.<br>
+ * <B><U>Concept</U>:</B><br>
+ * L2NpcInstance can be spawned either in a random position into a location area (if Lox=0 and Locy=0), either at an exact position.<br>
+ * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).
+ * @author Nightmare
+ */
+public class L2Spawn implements IPositionable, IIdentifiable, INamable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Spawn.class);
+	
+	/** String identifier of this spawn */
+	private String _name;
+	/** The link on the L2NpcTemplate object containing generic and static properties of this spawn (ex : RewardExp, RewardSP, AggroRange...) */
+	private final L2NpcTemplate _template;
+	/** The maximum number of L2NpcInstance that can manage this L2Spawn */
+	private int _maximumCount;
+	/** The current number of L2NpcInstance managed by this L2Spawn */
+	private int _currentCount;
+	/** The current number of SpawnTask in progress or stand by of this L2Spawn */
+	private int _scheduledCount;
+	/** The identifier of the location area where L2NpcInstance can be spwaned */
+	private int _locationId;
+	/** The Location of this NPC spawn. */
+	private Location _location = new Location(0, 0, 0, 0, 0);
+	/** Link to NPC spawn territory */
+	private NpcSpawnTerritory _spawnTerritory = null;
+	/** Minimum respawn delay */
+	private int _respawnMinDelay;
+	/** Maximum respawn delay */
+	private int _respawnMaxDelay;
+	/** The generic constructor of L2NpcInstance managed by this L2Spawn */
+	private Constructor<? extends L2Npc> _constructor;
+	/** If True a L2NpcInstance is respawned each time that another is killed */
+	private boolean _doRespawn;
+	/** If true then spawn is custom */
+	private boolean _customSpawn;
+	private static final List<SpawnListener> _spawnListeners = new CopyOnWriteArrayList<>();
+	private final Deque<L2Npc> _spawnedNpcs = new ConcurrentLinkedDeque<>();
+	private Map<Integer, Location> _lastSpawnPoints;
+	private boolean _isNoRndWalk = false; // Is no random walk
+	private String _areaName;
+	private int _globalMapId;
+	
+	/** The task launching the function doSpawn() */
+	class SpawnTask implements Runnable {
+		private final L2Npc _oldNpc;
+		
+		public SpawnTask(L2Npc pOldNpc) {
+			_oldNpc = pOldNpc;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				// doSpawn();
+				respawnNpc(_oldNpc);
+			} catch (Exception e) {
+				LOG.warn(e.getMessage(), e);
+			}
+			
+			_scheduledCount--;
+		}
+	}
+	
+	/**
+	 * Constructor of L2Spawn.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Each L2Spawn owns generic and static properties (ex : RewardExp, RewardSP, AggroRange...).<br>
+	 * All of those properties are stored in a different L2NpcTemplate for each type of L2Spawn. Each template is loaded once in the server cache memory (reduce memory use).<br>
+	 * When a new instance of L2Spawn is created, server just create a link between the instance and the template.<br>
+	 * This link is stored in <B>_template</B> Each L2NpcInstance is linked to a L2Spawn that manages its spawn and respawn (delay, location...).<br>
+	 * This link is stored in <B>_spawn</B> of the L2NpcInstance.<br>
+	 * <B><U> Actions</U>:</B><br>
+	 * <ul>
+	 * <li>Set the _template of the L2Spawn</li>
+	 * <li>Calculate the implementationName used to generate the generic constructor of L2NpcInstance managed by this L2Spawn</li>
+	 * <li>Create the generic constructor of L2NpcInstance managed by this L2Spawn</li>
+	 * </ul>
+	 * @param template The L2NpcTemplate to link to this L2Spawn
+	 * @throws SecurityException
+	 * @throws ClassNotFoundException
+	 * @throws NoSuchMethodException
+	 * @throws ClassCastException when template type is not subclass of L2Npc
+	 */
+	public L2Spawn(L2NpcTemplate template) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException {
+		// Set the _template of the L2Spawn
+		_template = template;
+		
+		if (_template == null) {
+			return;
+		}
+		
+		String className = "com.l2jserver.gameserver.model.actor.instance." + _template.getType() + "Instance";
+		
+		// Create the generic constructor of L2Npc managed by this L2Spawn
+		_constructor = Class.forName(className).asSubclass(L2Npc.class).getConstructor(int.class, L2NpcTemplate.class);
+	}
+	
+	/**
+	 * Creates a spawn.
+	 * @param npcId the NPC ID
+	 * @throws ClassCastException
+	 * @throws NoSuchMethodException
+	 * @throws ClassNotFoundException
+	 * @throws SecurityException
+	 */
+	public L2Spawn(int npcId) throws SecurityException, ClassNotFoundException, NoSuchMethodException, ClassCastException {
+		this(NpcData.getInstance().getTemplate(npcId));
+	}
+	
+	/**
+	 * @return the maximum number of L2NpcInstance that this L2Spawn can manage.
+	 */
+	public int getAmount() {
+		return _maximumCount;
+	}
+	
+	/**
+	 * @return the String Identifier of this spawn.
+	 */
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Set the String Identifier of this spawn.
+	 * @param name
+	 */
+	public void setName(String name) {
+		_name = name;
+	}
+	
+	/**
+	 * @return the Identifier of the location area where L2NpcInstance can be spwaned.
+	 */
+	public int getLocationId() {
+		return _locationId;
+	}
+	
+	@Override
+	public Location getLocation() {
+		return _location;
+	}
+	
+	public Location getLocation(L2Object obj) {
+		return ((_lastSpawnPoints == null) || (obj == null) || !_lastSpawnPoints.containsKey(obj.getObjectId())) ? _location : _lastSpawnPoints.get(obj.getObjectId());
+	}
+	
+	@Override
+	public int getX() {
+		return _location.getX();
+	}
+	
+	/**
+	 * @param obj object to check
+	 * @return the X position of the last spawn point of given NPC.
+	 */
+	public int getX(L2Object obj) {
+		return getLocation(obj).getX();
+	}
+	
+	/**
+	 * Set the X position of the spawn point.
+	 * @param x the x coordinate
+	 */
+	@Override
+	public void setX(int x) {
+		_location.setX(x);
+	}
+	
+	@Override
+	public int getY() {
+		return _location.getY();
+	}
+	
+	/**
+	 * @param obj object to check
+	 * @return the Y position of the last spawn point of given NPC.
+	 */
+	public int getY(L2Object obj) {
+		return getLocation(obj).getY();
+	}
+	
+	/**
+	 * Set the Y position of the spawn point.
+	 * @param y the y coordinate
+	 */
+	@Override
+	public void setY(int y) {
+		_location.setY(y);
+	}
+	
+	@Override
+	public int getZ() {
+		return _location.getZ();
+	}
+	
+	/**
+	 * @param obj object to check
+	 * @return the Z position of the last spawn point of given NPC.
+	 */
+	public int getZ(L2Object obj) {
+		return getLocation(obj).getZ();
+	}
+	
+	/**
+	 * Set the Z position of the spawn point.
+	 * @param z the z coordinate
+	 */
+	@Override
+	public void setZ(int z) {
+		_location.setZ(z);
+	}
+	
+	/**
+	 * Set the x, y, z position of the spawn point.
+	 * @param x The x coordinate.
+	 * @param y The y coordinate.
+	 * @param z The z coordinate.
+	 */
+	@Override
+	public void setXYZ(int x, int y, int z) {
+		setX(x);
+		setY(y);
+		setZ(z);
+	}
+	
+	/**
+	 * Set the x, y, z position of the spawn point.
+	 * @param loc The location.
+	 */
+	@Override
+	public void setXYZ(ILocational loc) {
+		setXYZ(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	/**
+	 * @return the heading of L2NpcInstance when they are spawned.
+	 */
+	@Override
+	public int getHeading() {
+		return _location.getHeading();
+	}
+	
+	/**
+	 * Set the heading of L2NpcInstance when they are spawned.
+	 * @param heading
+	 */
+	@Override
+	public void setHeading(int heading) {
+		_location.setHeading(heading);
+	}
+	
+	/**
+	 * Set the XYZ position of the spawn point.
+	 * @param loc
+	 */
+	@Override
+	public void setLocation(Location loc) {
+		_location = loc;
+	}
+	
+	/**
+	 * Gets the NPC ID.
+	 * @return the NPC ID
+	 */
+	@Override
+	public int getId() {
+		return _template.getId();
+	}
+	
+	/**
+	 * @return min respawn delay.
+	 */
+	public int getRespawnMinDelay() {
+		return _respawnMinDelay;
+	}
+	
+	/**
+	 * @return max respawn delay.
+	 */
+	public int getRespawnMaxDelay() {
+		return _respawnMaxDelay;
+	}
+	
+	/**
+	 * Set the maximum number of L2NpcInstance that this L2Spawn can manage.
+	 * @param amount
+	 */
+	public void setAmount(int amount) {
+		_maximumCount = amount;
+	}
+	
+	/**
+	 * Set the Identifier of the location area where L2NpcInstance can be spawned.
+	 * @param id
+	 */
+	public void setLocationId(int id) {
+		_locationId = id;
+	}
+	
+	/**
+	 * Set Minimum Respawn Delay.
+	 * @param date
+	 */
+	public void setRespawnMinDelay(int date) {
+		_respawnMinDelay = date;
+	}
+	
+	/**
+	 * Set Maximum Respawn Delay.
+	 * @param date
+	 */
+	public void setRespawnMaxDelay(int date) {
+		_respawnMaxDelay = date;
+	}
+	
+	/**
+	 * Set the spawn as custom.<BR>
+	 * @param custom
+	 */
+	public void setCustom(boolean custom) {
+		_customSpawn = custom;
+	}
+	
+	/**
+	 * @return type of spawn.
+	 */
+	public boolean isCustom() {
+		return _customSpawn;
+	}
+	
+	/**
+	 * Decrease the current number of NPC instances of this spawn and if necessary create a spawn task to launch after the respawn delay.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <li>Decrease the current number of L2NpcInstance of this L2Spawn</li>
+	 * <li>Check if respawn is possible to prevent multiple respawning caused by lag</li>
+	 * <li>Update the current number of SpawnTask in progress or stand by of this L2Spawn</li>
+	 * <li>Create a new SpawnTask to launch after the respawn Delay</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: A respawn is possible ONLY if _doRespawn=True and _scheduledCount + _currentCount < _maximumCount</B></FONT>
+	 * @param oldNpc
+	 */
+	public void decreaseCount(L2Npc oldNpc) {
+		// sanity check
+		if (_currentCount <= 0) {
+			return;
+		}
+		
+		// Decrease the current number of L2NpcInstance of this L2Spawn
+		_currentCount--;
+		
+		// Remove this NPC from list of spawned
+		_spawnedNpcs.remove(oldNpc);
+		
+		// Remove spawn point for old NPC
+		if (_lastSpawnPoints != null) {
+			_lastSpawnPoints.remove(oldNpc.getObjectId());
+		}
+		
+		// Check if respawn is possible to prevent multiple respawning caused by lag
+		if (_doRespawn && ((_scheduledCount + _currentCount) < _maximumCount)) {
+			// Update the current number of SpawnTask in progress or stand by of this L2Spawn
+			_scheduledCount++;
+			
+			// Create a new SpawnTask to launch after the respawn Delay
+			// ClientScheduler.getInstance().scheduleLow(new SpawnTask(npcId), _respawnDelay);
+			ThreadPoolManager.getInstance().scheduleGeneral(new SpawnTask(oldNpc), hasRespawnRandom() ? Rnd.get(_respawnMinDelay, _respawnMaxDelay) : _respawnMinDelay);
+		}
+	}
+	
+	/**
+	 * Create the initial spawning and set _doRespawn to False, if respawn time set to 0, or set it to True otherwise.
+	 * @return The number of L2NpcInstance that were spawned
+	 */
+	public int init() {
+		while (_currentCount < _maximumCount) {
+			doSpawn();
+		}
+		_doRespawn = _respawnMinDelay != 0;
+		
+		return _currentCount;
+	}
+	
+	/**
+	 * Create a L2NpcInstance in this L2Spawn.
+	 * @param val
+	 * @return
+	 */
+	public L2Npc spawnOne(boolean val) {
+		return doSpawn(val);
+	}
+	
+	/**
+	 * @return true if respawn enabled
+	 */
+	public boolean isRespawnEnabled() {
+		return _doRespawn;
+	}
+	
+	/**
+	 * Set _doRespawn to False to stop respawn in this L2Spawn.
+	 */
+	public void stopRespawn() {
+		_doRespawn = false;
+	}
+	
+	/**
+	 * Set _doRespawn to True to start or restart respawn in this L2Spawn.
+	 */
+	public void startRespawn() {
+		_doRespawn = true;
+	}
+	
+	public L2Npc doSpawn() {
+		return doSpawn(false);
+	}
+	
+	/**
+	 * Create the L2NpcInstance, add it to the world and launch its OnSpawn action.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * L2NpcInstance can be spawned either in a random position into a location area (if Lox=0 and Locy=0), either at an exact position.<br>
+	 * The heading of the L2NpcInstance can be a random heading if not defined (value= -1) or an exact heading (ex : merchant...).<br>
+	 * <B><U>Actions for an random spawn into location area</U>:<I> (if Locx=0 and Locy=0)</I></B>
+	 * <ul>
+	 * <li>Get L2NpcInstance Init parameters and its generate an Identifier</li>
+	 * <li>Call the constructor of the L2NpcInstance</li>
+	 * <li>Calculate the random position in the location area (if Locx=0 and Locy=0) or get its exact position from the L2Spawn</li>
+	 * <li>Set the position of the L2NpcInstance</li>
+	 * <li>Set the HP and MP of the L2NpcInstance to the max</li>
+	 * <li>Set the heading of the L2NpcInstance (random heading if not defined : value=-1)</li>
+	 * <li>Link the L2NpcInstance to this L2Spawn</li>
+	 * <li>Init other values of the L2NpcInstance (ex : from its L2CharTemplate for INT, STR, DEX...) and add it in the world</li>
+	 * <li>Launch the action OnSpawn fo the L2NpcInstance</li>
+	 * <li>Increase the current number of L2NpcInstance managed by this L2Spawn</li>
+	 * </ul>
+	 * @param isSummonSpawn
+	 * @return
+	 */
+	public L2Npc doSpawn(boolean isSummonSpawn) {
+		try {
+			// Check if the L2Spawn is not a L2Pet or L2Minion or L2Decoy spawn
+			if (_template.isType("L2Pet") || _template.isType("L2Decoy") || _template.isType("L2Trap")) {
+				_currentCount++;
+				
+				return null;
+			}
+			
+			// Call the constructor of the L2Npc
+			final var objectId = IdFactory.getInstance().getNextId();
+			final var npc = _constructor.newInstance(objectId, _template);
+			npc.setInstanceId(getInstanceId()); // Must be done before object is spawned into visible world
+			if (isSummonSpawn) {
+				npc.setShowSummonAnimation(isSummonSpawn);
+			}
+			
+			// Check for certain AI data, overridden in spawnlist
+			if (_name != null) {
+				NpcPersonalAIData.getInstance().initializeNpcParameters(npc, this, _name);
+			}
+			
+			return initializeNpcInstance(npc);
+		} catch (Exception e) {
+			LOG.warn("NPC {} class not found", _template.getId(), e);
+		}
+		return null;
+	}
+	
+	private L2Npc initializeNpcInstance(L2Npc mob) {
+		int newlocx = 0;
+		int newlocy = 0;
+		int newlocz = 0;
+		
+		// If Locx and Locy are not defined, the L2NpcInstance must be spawned in an area defined by location or spawn territory
+		// New method
+		if (isTerritoryBased()) {
+			int[] p = _spawnTerritory.getRandomPoint();
+			newlocx = p[0];
+			newlocy = p[1];
+			newlocz = p[2];
+		}
+		// Old method (for backward compatibility)
+		else if ((getX() == 0) && (getY() == 0)) {
+			if (getLocationId() == 0) {
+				return mob;
+			}
+			
+			// Calculate the random position in the location area
+			final Location location = TerritoryTable.getInstance().getRandomPoint(getLocationId());
+			
+			// Set the calculated position of the L2NpcInstance
+			if (location != null) {
+				newlocx = location.getX();
+				newlocy = location.getY();
+				newlocz = location.getZ();
+			}
+		} else {
+			// The L2NpcInstance is spawned at the exact position (Lox, Locy, Locz)
+			newlocx = getX();
+			newlocy = getY();
+			newlocz = getZ();
+		}
+		
+		// don't correct z of flying npc's
+		if (!mob.isFlying()) {
+			newlocz = GeoData.getInstance().getSpawnHeight(newlocx, newlocy, newlocz);
+		}
+		
+		mob.stopAllEffects();
+		
+		mob.setIsDead(false);
+		// Reset decay info
+		mob.setDecayed(false);
+		// Clear script variables
+		if (mob.hasVariables()) {
+			mob.getVariables().getSet().clear();
+		}
+		// Set is not random walk default value
+		mob.setIsNoRndWalk(isNoRndWalk());
+		
+		// Set the heading of the L2NpcInstance (random heading if not defined)
+		if (getHeading() == -1) {
+			mob.setHeading(Rnd.nextInt(61794));
+		} else {
+			mob.setHeading(getHeading());
+		}
+		
+		if (mob instanceof L2Attackable) {
+			((L2Attackable) mob).setChampion(false);
+		}
+		
+		if (customs().championEnable()) {
+			// Set champion on next spawn
+			if (mob.isMonster() && !getTemplate().isUndying() && !mob.isRaid() && !mob.isRaidMinion() && //
+				(customs().getChampionFrequency() > 0) && //
+				(mob.getLevel() >= customs().getChampionMinLevel()) && //
+				(mob.getLevel() <= customs().getChampionMaxLevel()) && //
+				(customs().championEnableInInstances() || (getInstanceId() == 0))) {
+				if (Rnd.get(100) < customs().getChampionFrequency()) {
+					((L2Attackable) mob).setChampion(true);
+				}
+			}
+		}
+		
+		// Set the HP and MP of the L2NpcInstance to the max
+		mob.setCurrentHpMp(mob.getMaxHp(), mob.getMaxMp());
+		// Reset summoner
+		mob.setSummoner(null);
+		// Reset summoned list
+		mob.resetSummonedNpcs();
+		// Link the L2NpcInstance to this L2Spawn
+		mob.setSpawn(this);
+		
+		// Spawn NPC
+		mob.spawnMe(newlocx, newlocy, newlocz);
+		
+		notifyNpcSpawned(mob);
+		
+		_spawnedNpcs.add(mob);
+		if (_lastSpawnPoints != null) {
+			_lastSpawnPoints.put(mob.getObjectId(), new Location(newlocx, newlocy, newlocz));
+		}
+		
+		if (general().debug()) {
+			LOG.trace("Spawned Mob Id: {} , at: X: {} Y: {} Z: {}", _template.getId(), mob.getX(), mob.getY(), mob.getZ());
+		}
+		// Increase the current number of L2NpcInstance managed by this L2Spawn
+		_currentCount++;
+		return mob;
+	}
+	
+	public static void addSpawnListener(SpawnListener listener) {
+		_spawnListeners.add(listener);
+	}
+	
+	public static void removeSpawnListener(SpawnListener listener) {
+		_spawnListeners.remove(listener);
+	}
+	
+	public static void notifyNpcSpawned(L2Npc npc) {
+		for (SpawnListener listener : _spawnListeners) {
+			listener.npcSpawned(npc);
+		}
+	}
+	
+	/**
+	 * Set bounds for random calculation and delay for respawn
+	 * @param delay delay in seconds
+	 * @param randomInterval random interval in seconds
+	 */
+	public void setRespawnDelay(int delay, int randomInterval) {
+		if (delay != 0) {
+			if (delay < 0) {
+				LOG.warn("Respawn delay is negative for spawn: {}", this);
+			}
+			
+			int minDelay = delay - randomInterval;
+			int maxDelay = delay + randomInterval;
+			
+			_respawnMinDelay = Math.max(10, minDelay) * 1000;
+			_respawnMaxDelay = Math.max(10, maxDelay) * 1000;
+		}
+		
+		else {
+			_respawnMinDelay = 0;
+			_respawnMaxDelay = 0;
+		}
+	}
+	
+	public void setRespawnDelay(int delay) {
+		setRespawnDelay(delay, 0);
+	}
+	
+	public int getRespawnDelay() {
+		return (_respawnMinDelay + _respawnMaxDelay) / 2;
+	}
+	
+	public boolean hasRespawnRandom() {
+		return _respawnMinDelay != _respawnMaxDelay;
+	}
+	
+	public void setSpawnTerritory(NpcSpawnTerritory territory) {
+		_spawnTerritory = territory;
+		_lastSpawnPoints = new ConcurrentHashMap<>();
+	}
+	
+	public NpcSpawnTerritory getSpawnTerritory() {
+		return _spawnTerritory;
+	}
+	
+	public boolean isTerritoryBased() {
+		return (_spawnTerritory != null) && (_location.getX() == 0) && (_location.getY() == 0);
+	}
+	
+	public L2Npc getLastSpawn() {
+		return _spawnedNpcs.peekLast();
+	}
+	
+	public final Deque<L2Npc> getSpawnedNpcs() {
+		return _spawnedNpcs;
+	}
+	
+	/**
+	 * @param oldNpc
+	 */
+	public void respawnNpc(L2Npc oldNpc) {
+		if (_doRespawn) {
+			oldNpc.refreshID();
+			initializeNpcInstance(oldNpc);
+		}
+	}
+	
+	public L2NpcTemplate getTemplate() {
+		return _template;
+	}
+	
+	@Override
+	public int getInstanceId() {
+		return _location.getInstanceId();
+	}
+	
+	@Override
+	public void setInstanceId(int instanceId) {
+		_location.setInstanceId(instanceId);
+	}
+	
+	public final boolean isNoRndWalk() {
+		return _isNoRndWalk;
+	}
+	
+	public final void setIsNoRndWalk(boolean value) {
+		_isNoRndWalk = value;
+	}
+	
+	public String getAreaName() {
+		return _areaName;
+	}
+	
+	public void setAreaName(String areaName) {
+		_areaName = areaName;
+	}
+	
+	public int getGlobalMapId() {
+		return _globalMapId;
+	}
+	
+	public void setGlobalMapId(int globalMapId) {
+		_globalMapId = globalMapId;
+	}
+	
+	@Override
+	public String toString() {
+		return "L2Spawn ID: " + getId() + " " + getLocation();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2TeleportLocation.java b/src/main/java/com/l2jserver/gameserver/model/L2TeleportLocation.java
new file mode 100644
index 00000000..4c86f975
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2TeleportLocation.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * Teleport location.
+ * @since 2005/03/27 15:29:32
+ */
+public class L2TeleportLocation {
+	private int _teleId;
+	private int _locX;
+	private int _locY;
+	private int _locZ;
+	private int _price;
+	private boolean _forNoble;
+	private int _itemId;
+	
+	public void setTeleId(int id) {
+		_teleId = id;
+	}
+	
+	public void setLocX(int locX) {
+		_locX = locX;
+	}
+	
+	public void setLocY(int locY) {
+		_locY = locY;
+	}
+	
+	public void setLocZ(int locZ) {
+		_locZ = locZ;
+	}
+	
+	public void setPrice(int price) {
+		_price = price;
+	}
+	
+	public void setIsForNoble(boolean val) {
+		_forNoble = val;
+	}
+	
+	public void setItemId(int val) {
+		_itemId = val;
+	}
+	
+	public int getTeleId() {
+		return _teleId;
+	}
+	
+	public int getLocX() {
+		return _locX;
+	}
+	
+	public int getLocY() {
+		return _locY;
+	}
+	
+	public int getLocZ() {
+		return _locZ;
+	}
+	
+	public int getPrice() {
+		return _price;
+	}
+	
+	public boolean getIsForNoble() {
+		return _forNoble;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2Territory.java b/src/main/java/com/l2jserver/gameserver/model/L2Territory.java
new file mode 100644
index 00000000..9b38f056
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2Territory.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+
+/**
+ * @version 0.1, 2005-03-12
+ * @author Balancer
+ */
+public class L2Territory {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Territory.class);
+	
+	protected static class Point {
+		protected int _x, _y, _zmin, _zmax, _proc;
+		
+		Point(int x, int y, int zmin, int zmax, int proc) {
+			_x = x;
+			_y = y;
+			_zmin = zmin;
+			_zmax = zmax;
+			_proc = proc;
+		}
+	}
+	
+	private final List<Point> _points = new CopyOnWriteArrayList<>();
+	private final int _terr;
+	private int _xMin;
+	private int _xMax;
+	private int _yMin;
+	private int _yMax;
+	private int _zMin;
+	private int _zMax;
+	private int _procMax;
+	
+	public L2Territory(int terr) {
+		_terr = terr;
+		_xMin = 999999;
+		_xMax = -999999;
+		_yMin = 999999;
+		_yMax = -999999;
+		_zMin = 999999;
+		_zMax = -999999;
+		_procMax = 0;
+	}
+	
+	public void add(int x, int y, int zmin, int zmax, int proc) {
+		_points.add(new Point(x, y, zmin, zmax, proc));
+		if (x < _xMin) {
+			_xMin = x;
+		}
+		if (y < _yMin) {
+			_yMin = y;
+		}
+		if (x > _xMax) {
+			_xMax = x;
+		}
+		if (y > _yMax) {
+			_yMax = y;
+		}
+		if (zmin < _zMin) {
+			_zMin = zmin;
+		}
+		if (zmax > _zMax) {
+			_zMax = zmax;
+		}
+		_procMax += proc;
+	}
+	
+	public boolean isIntersect(int x, int y, Point p1, Point p2) {
+		double dy1 = p1._y - y;
+		double dy2 = p2._y - y;
+		
+		if (Math.abs(Math.signum(dy1) - Math.signum(dy2)) <= 1e-6) {
+			return false;
+		}
+		
+		double dx1 = p1._x - x;
+		double dx2 = p2._x - x;
+		
+		if ((dx1 >= 0) && (dx2 >= 0)) {
+			return true;
+		}
+		
+		if ((dx1 < 0) && (dx2 < 0)) {
+			return false;
+		}
+		
+		double dx0 = (dy1 * (p1._x - p2._x)) / (p1._y - p2._y);
+		
+		return dx0 <= dx1;
+	}
+	
+	public boolean isInside(int x, int y) {
+		int intersect_count = 0;
+		for (int i = 0; i < _points.size(); i++) {
+			Point p1 = _points.get(i > 0 ? i - 1 : _points.size() - 1);
+			Point p2 = _points.get(i);
+			
+			if (isIntersect(x, y, p1, p2)) {
+				intersect_count++;
+			}
+		}
+		
+		return (intersect_count % 2) == 1;
+	}
+	
+	public Location getRandomPoint() {
+		if (_procMax > 0) {
+			int pos = 0;
+			int rnd = Rnd.nextInt(_procMax);
+			for (Point p1 : _points) {
+				pos += p1._proc;
+				if (rnd <= pos) {
+					return new Location(p1._x, p1._y, Rnd.get(p1._zmin, p1._zmax));
+				}
+			}
+			
+		}
+		for (int i = 0; i < 100; i++) {
+			int x = Rnd.get(_xMin, _xMax);
+			int y = Rnd.get(_yMin, _yMax);
+			if (isInside(x, y)) {
+				double curdistance = 0;
+				int zmin = _zMin;
+				for (Point p1 : _points) {
+					double distance = Math.hypot(p1._x - x, p1._y - y);
+					if ((curdistance == 0) || (distance < curdistance)) {
+						curdistance = distance;
+						zmin = p1._zmin;
+					}
+				}
+				return new Location(x, y, Rnd.get(zmin, _zMax));
+			}
+		}
+		LOG.warn("Can't make point for territory {}", _terr);
+		return null;
+	}
+	
+	public int getProcMax() {
+		return _procMax;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2WalkRoute.java b/src/main/java/com/l2jserver/gameserver/model/L2WalkRoute.java
new file mode 100644
index 00000000..1ca913f7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2WalkRoute.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+
+/**
+ * @author GKR
+ */
+public class L2WalkRoute {
+	private final String _name;
+	private final List<L2NpcWalkerNode> _nodeList; // List of nodes
+	private final boolean _repeatWalk; // Does repeat walk, after arriving into last point in list, or not
+	private boolean _stopAfterCycle; // Make only one cycle or endlessly
+	private final byte _repeatType; // Repeat style: 0 - go back, 1 - go to first point (circle style), 2 - teleport to first point (conveyor style), 3 - random walking between points
+	
+	public L2WalkRoute(String name, List<L2NpcWalkerNode> route, boolean repeat, boolean once, byte repeatType) {
+		_name = name;
+		_nodeList = route;
+		_repeatType = repeatType;
+		_repeatWalk = (_repeatType >= 0) && (_repeatType <= 2) && repeat;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public List<L2NpcWalkerNode> getNodeList() {
+		return _nodeList;
+	}
+	
+	public L2NpcWalkerNode getLastNode() {
+		return _nodeList.get(_nodeList.size() - 1);
+	}
+	
+	public boolean repeatWalk() {
+		return _repeatWalk;
+	}
+	
+	public boolean doOnce() {
+		return _stopAfterCycle;
+	}
+	
+	public byte getRepeatType() {
+		return _repeatType;
+	}
+	
+	public int getNodesCount() {
+		return _nodeList.size();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2World.java b/src/main/java/com/l2jserver/gameserver/model/L2World.java
new file mode 100644
index 00000000..96433c3c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2World.java
@@ -0,0 +1,537 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+
+public final class L2World {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(L2World.class);
+	
+	/** Gracia border Flying objects not allowed to the east of it. */
+	public static final int GRACIA_MAX_X = -166168;
+	public static final int GRACIA_MAX_Z = 6105;
+	public static final int GRACIA_MIN_Z = -895;
+	
+	/** Biteshift, defines number of regions note, shifting by 15 will result in regions corresponding to map tiles shifting by 12 divides one tile to 8x8 regions. */
+	public static final int SHIFT_BY = 12;
+	
+	private static final int TILE_SIZE = 32768;
+	
+	/** Map dimensions */
+	public static final int TILE_X_MIN = 11;
+	public static final int TILE_Y_MIN = 10;
+	public static final int TILE_X_MAX = 26;
+	public static final int TILE_Y_MAX = 26;
+	public static final int TILE_ZERO_COORD_X = 20;
+	public static final int TILE_ZERO_COORD_Y = 18;
+	public static final int MAP_MIN_X = (TILE_X_MIN - TILE_ZERO_COORD_X) * TILE_SIZE;
+	public static final int MAP_MIN_Y = (TILE_Y_MIN - TILE_ZERO_COORD_Y) * TILE_SIZE;
+	
+	public static final int MAP_MAX_X = ((TILE_X_MAX - TILE_ZERO_COORD_X) + 1) * TILE_SIZE;
+	public static final int MAP_MAX_Y = ((TILE_Y_MAX - TILE_ZERO_COORD_Y) + 1) * TILE_SIZE;
+	
+	/** calculated offset used so top left region is 0,0 */
+	public static final int OFFSET_X = Math.abs(MAP_MIN_X >> SHIFT_BY);
+	public static final int OFFSET_Y = Math.abs(MAP_MIN_Y >> SHIFT_BY);
+	
+	/** number of regions */
+	private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
+	private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
+	
+	/** Map containing all the players in game. */
+	private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
+	/** Map containing all visible objects. */
+	private final Map<Integer, L2Object> _allObjects = new ConcurrentHashMap<>();
+	/** Map with the pets instances and their owner ID. */
+	private final Map<Integer, L2PetInstance> _petsInstance = new ConcurrentHashMap<>();
+	
+	private L2WorldRegion[][] _worldRegions;
+	
+	/** Constructor of L2World. */
+	protected L2World() {
+		initRegions();
+	}
+	
+	/**
+	 * Adds an object to the world.<br>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>Withdraw an item from the warehouse, create an item</li>
+	 * <li>Spawn a L2Character (PC, NPC, Pet)</li>
+	 * </ul>
+	 * @param object
+	 */
+	public void storeObject(L2Object object) {
+		if (_allObjects.containsKey(object.getObjectId())) {
+			LOG.warn("Current object: {} already exist in OID map!", object);
+			return;
+		}
+		_allObjects.put(object.getObjectId(), object);
+	}
+	
+	/**
+	 * Removes an object from the world.<br>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>Delete item from inventory, transfer Item from inventory to warehouse</li>
+	 * <li>Crystallize item</li>
+	 * <li>Remove NPC/PC/Pet from the world</li>
+	 * </ul>
+	 * @param object the object to remove
+	 */
+	public void removeObject(L2Object object) {
+		_allObjects.remove(object.getObjectId());
+	}
+	
+	/**
+	 * <B><U> Example of use</U>:</B>
+	 * <ul>
+	 * <li>Client packets : Action, AttackRequest, RequestJoinParty, RequestJoinPledge...</li>
+	 * </ul>
+	 * @param objectId Identifier of the L2Object
+	 * @return the L2Object object that belongs to an ID or null if no object found.
+	 */
+	public L2Object findObject(int objectId) {
+		return _allObjects.get(objectId);
+	}
+	
+	public Collection<L2Object> getVisibleObjects() {
+		return _allObjects.values();
+	}
+	
+	/**
+	 * Get the count of all visible objects in world.
+	 * @return count off all L2World objects
+	 */
+	public int getVisibleObjectsCount() {
+		return _allObjects.size();
+	}
+	
+	public List<L2PcInstance> getAllGMs() {
+		return AdminData.getInstance().getAllGms(true);
+	}
+	
+	public Collection<L2PcInstance> getPlayers() {
+		return _allPlayers.values();
+	}
+	
+	/**
+	 * Gets all players sorted by the given comparator.
+	 * @param comparator the comparator
+	 * @return the players sorted by the comparator
+	 */
+	public L2PcInstance[] getPlayersSortedBy(Comparator<L2PcInstance> comparator) {
+		final L2PcInstance[] players = _allPlayers.values().toArray(new L2PcInstance[_allPlayers.size()]);
+		Arrays.sort(players, comparator);
+		return players;
+	}
+	
+	/**
+	 * Return how many players are online.
+	 * @return number of online players.
+	 */
+	public int getAllPlayersCount() {
+		return _allPlayers.size();
+	}
+	
+	/**
+	 * <B>If you have access to player objectId use {@link #getPlayer(int playerObjId)}</B>
+	 * @param name Name of the player to get Instance
+	 * @return the player instance corresponding to the given name.
+	 */
+	public L2PcInstance getPlayer(String name) {
+		return getPlayer(CharNameTable.getInstance().getIdByName(name));
+	}
+	
+	/**
+	 * @param objectId of the player to get Instance
+	 * @return the player instance corresponding to the given object ID.
+	 */
+	public L2PcInstance getPlayer(int objectId) {
+		return _allPlayers.get(objectId);
+	}
+	
+	/**
+	 * @param ownerId ID of the owner
+	 * @return the pet instance from the given ownerId.
+	 */
+	public L2PetInstance getPet(int ownerId) {
+		return _petsInstance.get(ownerId);
+	}
+	
+	/**
+	 * Add the given pet instance from the given ownerId.
+	 * @param ownerId ID of the owner
+	 * @param pet L2PetInstance of the pet
+	 * @return
+	 */
+	public L2PetInstance addPet(int ownerId, L2PetInstance pet) {
+		return _petsInstance.put(ownerId, pet);
+	}
+	
+	/**
+	 * Remove the given pet instance.
+	 * @param ownerId ID of the owner
+	 */
+	public void removePet(int ownerId) {
+		_petsInstance.remove(ownerId);
+	}
+	
+	/**
+	 * Remove the given pet instance.
+	 * @param pet the pet to remove
+	 */
+	public void removePet(L2PetInstance pet) {
+		_petsInstance.remove(pet.getOwner().getObjectId());
+	}
+	
+	/**
+	 * Add a L2Object in the world. <B><U> Concept</U> :</B> L2Object (including L2PcInstance) are identified in <B>_visibleObjects</B> of his current L2WorldRegion and in <B>_knownObjects</B> of other surrounding L2Characters <BR>
+	 * L2PcInstance are identified in <B>_allPlayers</B> of L2World, in <B>_allPlayers</B> of his current L2WorldRegion and in <B>_knownPlayer</B> of other surrounding L2Characters <B><U> Actions</U> :</B>
+	 * <li>Add the L2Object object in _allPlayers* of L2World</li>
+	 * <li>Add the L2Object object in _gmList** of GmListTable</li>
+	 * <li>Add object in _knownObjects and _knownPlayer* of all surrounding L2WorldRegion L2Characters</li><BR>
+	 * <li>If object is a L2Character, add all surrounding L2Object in its _knownObjects and all surrounding L2PcInstance in its _knownPlayer</li><BR>
+	 * <I>* only if object is a L2PcInstance</I><BR>
+	 * <I>** only if object is a GM L2PcInstance</I> <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T ADD the object in _visibleObjects and _allPlayers* of L2WorldRegion (need synchronisation)</B></FONT><BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T ADD the object to _allObjects and _allPlayers* of L2World (need synchronisation)</B></FONT> <B><U> Example of use </U> :</B>
+	 * <li>Drop an Item</li>
+	 * <li>Spawn a L2Character</li>
+	 * <li>Apply Death Penalty of a L2PcInstance</li>
+	 * @param object L2object to add in the world
+	 * @param newRegion L2WorldRegion in wich the object will be add (not used)
+	 */
+	public void addVisibleObject(L2Object object, L2WorldRegion newRegion) {
+		if (!newRegion.isActive()) {
+			return;
+		}
+		// Get all visible objects contained in the _visibleObjects of L2WorldRegions
+		// in a circular area of 2000 units
+		List<L2Object> visibles = getVisibleObjects(object, 2000);
+		if (general().debug()) {
+			LOG.debug("Objects in range {}.", visibles.size());
+		}
+		
+		// tell the player about the surroundings
+		// Go through the visible objects contained in the circular area
+		for (L2Object visible : visibles) {
+			if (visible == null) {
+				continue;
+			}
+			
+			// Add the object in L2ObjectHashSet(L2Object) _knownObjects of the visible L2Character according to conditions :
+			// - L2Character is visible
+			// - object is not already known
+			// - object is in the watch distance
+			// If L2Object is a L2PcInstance, add L2Object in L2ObjectHashSet(L2PcInstance) _knownPlayer of the visible L2Character
+			visible.getKnownList().addKnownObject(object);
+			
+			// Add the visible L2Object in L2ObjectHashSet(L2Object) _knownObjects of the object according to conditions
+			// If visible L2Object is a L2PcInstance, add visible L2Object in L2ObjectHashSet(L2PcInstance) _knownPlayer of the object
+			object.getKnownList().addKnownObject(visible);
+		}
+	}
+	
+	/**
+	 * Adds the player to the world.
+	 * @param player the player to add
+	 */
+	public void addPlayerToWorld(L2PcInstance player) {
+		_allPlayers.put(player.getObjectId(), player);
+	}
+	
+	/**
+	 * Remove the player from the world.
+	 * @param player the player to remove
+	 */
+	public void removeFromAllPlayers(L2PcInstance player) {
+		_allPlayers.remove(player.getObjectId());
+	}
+	
+	/**
+	 * Remove an object from the world.<br>
+	 * <B><U> Concept</U> :</B> L2Object (including L2PcInstance) are identified in <B>_visibleObjects</B> of his current L2WorldRegion and in <B>_knownObjects</B> of other surrounding L2Characters <BR>
+	 * L2PcInstance are identified in <B>_allPlayers</B> of L2World, in <B>_allPlayers</B> of his current L2WorldRegion and in <B>_knownPlayer</B> of other surrounding L2Characters <B><U> Actions</U> :</B>
+	 * <li>Remove the L2Object object from _allPlayers* of L2World</li>
+	 * <li>Remove the L2Object object from _visibleObjects and _allPlayers* of L2WorldRegion</li>
+	 * <li>Remove the L2Object object from _gmList** of GmListTable</li>
+	 * <li>Remove object from _knownObjects and _knownPlayer* of all surrounding L2WorldRegion L2Characters</li><BR>
+	 * <li>If object is a L2Character, remove all L2Object from its _knownObjects and all L2PcInstance from its _knownPlayer</li> <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T REMOVE the object from _allObjects of L2World</B></FONT> <I>* only if object is a L2PcInstance</I><BR>
+	 * <I>** only if object is a GM L2PcInstance</I> <B><U> Example of use </U> :</B>
+	 * <li>Pickup an Item</li>
+	 * <li>Decay a L2Character</li>
+	 * @param object L2object to remove from the world
+	 * @param oldWorldRegion L2WorldRegion in which the object was before removing
+	 */
+	public void removeVisibleObject(L2Object object, L2WorldRegion oldWorldRegion) {
+		if (object == null) {
+			return;
+		}
+		
+		if (oldWorldRegion == null) {
+			return;
+		}
+		
+		// Removes the object from the visible objects of world region.
+		// If object is a player, removes it from the players map of this world region.
+		oldWorldRegion.removeVisibleObject(object);
+		
+		// Goes through all surrounding world region's creatures.
+		// And removes the object from their known lists.
+		for (L2WorldRegion worldRegion : oldWorldRegion.getSurroundingRegions()) {
+			for (L2Object obj : worldRegion.getVisibleObjects().values()) {
+				if (obj != null) {
+					obj.getKnownList().removeKnownObject(object);
+				}
+			}
+		}
+		
+		// Removes all objects from the object's known list.
+		object.getKnownList().removeAllKnownObjects();
+	}
+	
+	/**
+	 * Return all visible objects of the L2WorldRegion object's and of its surrounding L2WorldRegion. <B><U> Concept</U> :</B> All visible object are identified in <B>_visibleObjects</B> of their current L2WorldRegion <BR>
+	 * All surrounding L2WorldRegion are identified in <B>_surroundingRegions</B> of the selected L2WorldRegion in order to scan a large area around a L2Object <B><U> Example of use </U> :</B>
+	 * <li>Find Close Objects for L2Character</li><BR>
+	 * @param object L2object that determine the current L2WorldRegion
+	 * @return
+	 */
+	public List<L2Object> getVisibleObjects(L2Object object) {
+		final List<L2Object> result = new LinkedList<>();
+		for (L2WorldRegion regi : object.getWorldRegion().getSurroundingRegions()) {
+			for (L2Object visibleObject : regi.getVisibleObjects().values()) {
+				if ((visibleObject == null) || visibleObject.equals(object) || !visibleObject.isVisible()) {
+					continue; // skip our own character
+				}
+				result.add(visibleObject);
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * Gets the visible objects to the given object inside the given radius.
+	 * @param object the origin
+	 * @param radius the radius to check
+	 * @return the visible objects in the radius
+	 */
+	public List<L2Object> getVisibleObjects(L2Object object, int radius) {
+		return getVisibleObjects(object, radius, true);
+	}
+	
+	/**
+	 * Gets the visible objects around a given object.
+	 * @param object the origin
+	 * @param radius the radius to check
+	 * @param excludeTarget if the target should be excluded
+	 * @return the visible objects in the radius
+	 */
+	public List<L2Object> getVisibleObjects(L2Object object, int radius, boolean excludeTarget) {
+		return getVisibleObjectsStream(object, radius, excludeTarget).toList();
+	}
+	
+	public Stream<L2Object> getVisibleObjectsStream(L2Object object, int radius, boolean excludeTarget) {
+		if ((object == null) || !object.isVisible()) {
+			return Stream.of();
+		}
+		final int sqRadius = radius * radius;
+		return object.getWorldRegion()
+			.getSurroundingRegions()
+			.stream()
+			.flatMap(r -> r.getVisibleObjects().values().stream())
+			.filter(Objects::nonNull)
+			.filter(o -> !excludeTarget || !o.equals(object))
+			.filter(o -> sqRadius > object.calculateDistance(o, false, true));
+	}
+	
+	/**
+	 * Return all visible objects of the L2WorldRegions in the spheric area (radius) centered on the object. <B><U> Concept</U> :</B> All visible object are identified in <B>_visibleObjects</B> of their current L2WorldRegion <BR>
+	 * All surrounding L2WorldRegion are identified in <B>_surroundingRegions</B> of the selected L2WorldRegion in order to scan a large area around a L2Object <B><U> Example of use </U> :</B>
+	 * <li>Define the target list of a skill</li>
+	 * <li>Define the target list of a polearme attack</li>
+	 * @param object L2object that determine the center of the circular area
+	 * @param radius Radius of the spherical area
+	 * @return
+	 */
+	public List<L2Object> getVisibleObjects3D(L2Object object, int radius) {
+		if ((object == null) || !object.isVisible()) {
+			return new ArrayList<>();
+		}
+		
+		final int sqRadius = radius * radius;
+		
+		// Create a list in order to contain all visible objects.
+		final List<L2Object> result = new LinkedList<>();
+		for (L2WorldRegion regi : object.getWorldRegion().getSurroundingRegions()) {
+			for (L2Object _object : regi.getVisibleObjects().values()) {
+				if ((_object == null) || _object.equals(object)) {
+					continue; // skip our own character
+				}
+				
+				if (sqRadius > object.calculateDistance(_object, true, true)) {
+					result.add(_object);
+				}
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * <B><U> Concept</U> :</B> All visible object are identified in <B>_visibleObjects</B> of their current L2WorldRegion <BR>
+	 * All surrounding L2WorldRegion are identified in <B>_surroundingRegions</B> of the selected L2WorldRegion in order to scan a large area around a L2Object <B><U> Example of use </U> :</B>
+	 * <li>Find Close Objects for L2Character</li><BR>
+	 * @param object L2object that determine the current L2WorldRegion
+	 * @return all visible players of the L2WorldRegion object's and of its surrounding L2WorldRegion.
+	 */
+	public List<L2Playable> getVisiblePlayable(L2Object object) {
+		L2WorldRegion reg = object.getWorldRegion();
+		if (reg == null) {
+			return null;
+		}
+		
+		// Create a list in order to contain all visible objects.
+		final List<L2Playable> result = new LinkedList<>();
+		for (L2WorldRegion regi : reg.getSurroundingRegions()) {
+			// Create an Iterator to go through the visible L2Object of the L2WorldRegion
+			Map<Integer, L2Playable> _allpls = regi.getVisiblePlayable();
+			Collection<L2Playable> _playables = _allpls.values();
+			// Go through visible object of the selected region
+			for (L2Playable _object : _playables) {
+				if ((_object == null) || _object.equals(object)) {
+					continue; // skip our own character
+				}
+				
+				if (!_object.isVisible()) {
+					continue; // skip dying objects
+				}
+				
+				result.add(_object);
+			}
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
+	 * <li>Set position of a new L2Object (drop, spawn...)</li>
+	 * <li>Update position of a L2Object after a movement</li><BR>
+	 * @param point position of the object
+	 * @return
+	 */
+	public L2WorldRegion getRegion(Location point) {
+		return _worldRegions[(point.getX() >> SHIFT_BY) + OFFSET_X][(point.getY() >> SHIFT_BY) + OFFSET_Y];
+	}
+	
+	public L2WorldRegion getRegion(int x, int y) {
+		return _worldRegions[(x >> SHIFT_BY) + OFFSET_X][(y >> SHIFT_BY) + OFFSET_Y];
+	}
+	
+	/**
+	 * Returns the whole 2d array containing the world regions used by ZoneData.java to setup zones inside the world regions
+	 * @return
+	 */
+	public L2WorldRegion[][] getWorldRegions() {
+		return _worldRegions;
+	}
+	
+	/**
+	 * Check if the current L2WorldRegions of the object is valid according to its position (x,y). <B><U> Example of use </U> :</B>
+	 * <li>Init L2WorldRegions</li><BR>
+	 * @param x X position of the object
+	 * @param y Y position of the object
+	 * @return True if the L2WorldRegion is valid
+	 */
+	private boolean validRegion(int x, int y) {
+		return ((x >= 0) && (x <= REGIONS_X) && (y >= 0) && (y <= REGIONS_Y));
+	}
+	
+	/**
+	 * Initialize the world regions.
+	 */
+	private void initRegions() {
+		_worldRegions = new L2WorldRegion[REGIONS_X + 1][REGIONS_Y + 1];
+		
+		for (int i = 0; i <= REGIONS_X; i++) {
+			for (int j = 0; j <= REGIONS_Y; j++) {
+				_worldRegions[i][j] = new L2WorldRegion(i, j);
+			}
+		}
+		
+		for (int x = 0; x <= REGIONS_X; x++) {
+			for (int y = 0; y <= REGIONS_Y; y++) {
+				for (int a = -1; a <= 1; a++) {
+					for (int b = -1; b <= 1; b++) {
+						if (validRegion(x + a, y + b)) {
+							_worldRegions[x + a][y + b].addSurroundingRegion(_worldRegions[x][y]);
+						}
+					}
+				}
+			}
+		}
+		
+		LOG.info("{} by {} world region grid set up.", REGIONS_X, REGIONS_Y);
+		
+	}
+	
+	/**
+	 * Deleted all spawns in the world.
+	 */
+	public void deleteVisibleNpcSpawns() {
+		LOG.info("Deleting all visible NPCs.");
+		for (int i = 0; i <= REGIONS_X; i++) {
+			for (int j = 0; j <= REGIONS_Y; j++) {
+				_worldRegions[i][j].deleteVisibleNpcSpawns();
+			}
+		}
+		LOG.info("All visible NPCs deleted.");
+	}
+	
+	public static L2World getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final L2World INSTANCE = new L2World();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/L2WorldRegion.java b/src/main/java/com/l2jserver/gameserver/model/L2WorldRegion.java
new file mode 100644
index 00000000..8780460a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/L2WorldRegion.java
@@ -0,0 +1,415 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Vehicle;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.type.L2PeaceZone;
+
+public final class L2WorldRegion {
+	private static final Logger LOG = LoggerFactory.getLogger(L2WorldRegion.class);
+	
+	/** Map containing all playable characters in game in this world region. */
+	private final Map<Integer, L2Playable> _allPlayable = new ConcurrentHashMap<>();
+	
+	/** Map containing visible objects in this world region. */
+	private final Map<Integer, L2Object> _visibleObjects = new ConcurrentHashMap<>();
+	
+	private final Queue<L2WorldRegion> _surroundingRegions = new ConcurrentLinkedQueue<>();
+	private final int _tileX, _tileY;
+	private boolean _active;
+	private ScheduledFuture<?> _neighborsTask = null;
+	private final List<L2ZoneType> _zones = new CopyOnWriteArrayList<>();
+	
+	public L2WorldRegion(int pTileX, int pTileY) {
+		_tileX = pTileX;
+		_tileY = pTileY;
+		
+		// default a newly initialized region to inactive, unless always on is specified
+		_active = general().gridsAlwaysOn();
+	}
+	
+	public int getTileX() {
+		return _tileX;
+	}
+	
+	public int getTileY() {
+		return _tileY;
+	}
+	
+	public List<L2ZoneType> getZones() {
+		return _zones;
+	}
+	
+	public void addZone(L2ZoneType zone) {
+		_zones.add(zone);
+	}
+	
+	public void removeZone(L2ZoneType zone) {
+		_zones.remove(zone);
+	}
+	
+	public void revalidateZones(L2Character character) {
+		// do NOT update the world region while the character is still in the process of teleporting
+		// Once the teleport is COMPLETED, revalidation occurs safely, at that time.
+		
+		if (character.isTeleporting()) {
+			return;
+		}
+		
+		for (L2ZoneType z : getZones()) {
+			if (z != null) {
+				z.revalidateInZone(character);
+			}
+		}
+	}
+	
+	public void removeFromZones(L2Character character) {
+		for (L2ZoneType z : getZones()) {
+			if (z != null) {
+				z.removeCharacter(character);
+			}
+		}
+	}
+	
+	public boolean containsZone(int zoneId) {
+		for (L2ZoneType z : getZones()) {
+			if (z.getId() == zoneId) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean checkEffectRangeInsidePeaceZone(Skill skill, final int x, final int y, final int z) {
+		final int range = skill.getEffectRange();
+		final int up = y + range;
+		final int down = y - range;
+		final int left = x + range;
+		final int right = x - range;
+		
+		for (L2ZoneType e : getZones()) {
+			if (e instanceof L2PeaceZone) {
+				if (e.isInsideZone(x, up, z)) {
+					return false;
+				}
+				
+				if (e.isInsideZone(x, down, z)) {
+					return false;
+				}
+				
+				if (e.isInsideZone(left, y, z)) {
+					return false;
+				}
+				
+				if (e.isInsideZone(right, y, z)) {
+					return false;
+				}
+				
+				if (e.isInsideZone(x, y, z)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+	
+	public void onDeath(L2Character character) {
+		for (L2ZoneType z : getZones()) {
+			if (z != null) {
+				z.onDieInside(character);
+			}
+		}
+	}
+	
+	public void onRevive(L2Character character) {
+		for (L2ZoneType z : getZones()) {
+			if (z != null) {
+				z.onReviveInside(character);
+			}
+		}
+	}
+	
+	/** Task of AI notification */
+	public class NeighborsTask implements Runnable {
+		private final boolean _isActivating;
+		
+		public NeighborsTask(boolean isActivating) {
+			_isActivating = isActivating;
+		}
+		
+		@Override
+		public void run() {
+			if (_isActivating) {
+				// for each neighbor, if it's not active, activate.
+				for (L2WorldRegion neighbor : getSurroundingRegions()) {
+					neighbor.setActive(true);
+				}
+			} else {
+				if (areNeighborsEmpty()) {
+					setActive(false);
+				}
+				
+				// check and deactivate
+				for (L2WorldRegion neighbor : getSurroundingRegions()) {
+					if (neighbor.areNeighborsEmpty()) {
+						neighbor.setActive(false);
+					}
+				}
+			}
+		}
+	}
+	
+	private void switchAI(boolean isOn) {
+		int c = 0;
+		if (!isOn) {
+			for (L2Object o : _visibleObjects.values()) {
+				if (o instanceof L2Attackable mob) {
+					c++;
+					
+					// Set target to null and cancel Attack or Cast
+					mob.setTarget(null);
+					
+					// Stop movement
+					mob.stopMove(null);
+					
+					// Stop all active skills effects in progress on the L2Character
+					mob.stopAllEffects();
+					
+					mob.clearAggroList();
+					mob.getAttackByList().clear();
+					mob.getKnownList().removeAllKnownObjects();
+					
+					// stop the ai tasks
+					if (mob.hasAI()) {
+						mob.getAI().setIntention(com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE);
+						mob.getAI().stopAITask();
+					}
+				} else if (o instanceof L2Vehicle vehicle) {
+					c++;
+					vehicle.getKnownList().removeAllKnownObjects();
+				}
+			}
+			LOG.debug("{} mobs were turned off", c);
+		} else {
+			for (L2Object o : _visibleObjects.values()) {
+				if (o instanceof L2Attackable attackable) {
+					c++;
+					// Start HP/MP/CP Regeneration task
+					attackable.getStatus().startHpMpRegeneration();
+				} else if (o instanceof L2Npc npc) {
+					npc.startRandomAnimationTimer();
+				}
+			}
+			LOG.debug("{} mobs were turned on", c);
+		}
+	}
+	
+	public boolean isActive() {
+		return _active;
+	}
+	
+	// check if all 9 neighbors (including self) are inactive or active but with no players.
+	// returns true if the above condition is met.
+	public boolean areNeighborsEmpty() {
+		// if this region is occupied, return false.
+		if (isActive() && !_allPlayable.isEmpty()) {
+			return false;
+		}
+		
+		// if any one of the neighbors is occupied, return false
+		for (L2WorldRegion neighbor : _surroundingRegions) {
+			if (neighbor.isActive() && !neighbor._allPlayable.isEmpty()) {
+				return false;
+			}
+		}
+		
+		// in all other cases, return true.
+		return true;
+	}
+	
+	/**
+	 * this function turns this region's AI and geodata on or off
+	 * @param value
+	 */
+	public void setActive(boolean value) {
+		if (_active == value) {
+			return;
+		}
+		
+		_active = value;
+		
+		// turn the AI on or off to match the region's activation.
+		switchAI(value);
+		
+		// TODO
+		// turn the geodata on or off to match the region's activation.
+		if (value) {
+			LOG.debug("Starting Grid {}, {}", _tileX, _tileY);
+		} else {
+			LOG.debug("Stopping Grid {}, {}", _tileX, _tileY);
+		}
+	}
+	
+	/**
+	 * Immediately sets self as active and starts a timer to set neighbors as active this timer is to avoid turning on neighbors in the case when a person just teleported into a region and then teleported out immediately...there is no reason to activate all the neighbors in that case.
+	 */
+	private void startActivation() {
+		// first set self to active and do self-tasks...
+		setActive(true);
+		
+		// if the timer to deactivate neighbors is running, cancel it.
+		synchronized (this) {
+			if (_neighborsTask != null) {
+				_neighborsTask.cancel(true);
+				_neighborsTask = null;
+			}
+			
+			// then, set a timer to activate the neighbors
+			_neighborsTask = ThreadPoolManager.getInstance().scheduleGeneral(new NeighborsTask(true), 1000L * general().getGridNeighborTurnOnTime());
+		}
+	}
+	
+	/**
+	 * starts a timer to set neighbors (including self) as inactive this timer is to avoid turning off neighbors in the case when a person just moved out of a region that he may very soon return to. There is no reason to turn self & neighbors off in that case.
+	 */
+	private void startDeactivation() {
+		// if the timer to activate neighbors is running, cancel it.
+		synchronized (this) {
+			if (_neighborsTask != null) {
+				_neighborsTask.cancel(true);
+				_neighborsTask = null;
+			}
+			
+			// start a timer to "suggest" a deactivate to self and neighbors.
+			// suggest means: first check if a neighbor has L2PcInstances in it. If not, deactivate.
+			_neighborsTask = ThreadPoolManager.getInstance().scheduleGeneral(new NeighborsTask(false), 1000L * general().getGridNeighborTurnOffTime());
+		}
+	}
+	
+	/**
+	 * Add the L2Object in the L2ObjectHashSet(L2Object) _visibleObjects containing L2Object visible in this L2WorldRegion <BR>
+	 * If L2Object is a L2PcInstance, Add the L2PcInstance in the L2ObjectHashSet(L2PcInstance) _allPlayable containing L2PcInstance of all player in game in this L2WorldRegion <BR>
+	 * Assert : object.getCurrentWorldRegion() == this
+	 * @param object
+	 */
+	public void addVisibleObject(L2Object object) {
+		if (object == null) {
+			return;
+		}
+		
+		assert object.getWorldRegion() == this;
+		
+		_visibleObjects.put(object.getObjectId(), object);
+		
+		if (object instanceof L2Playable playable) {
+			_allPlayable.put(object.getObjectId(), playable);
+			
+			// if this is the first player to enter the region, activate self & neighbors
+			if ((_allPlayable.size() == 1) && !general().gridsAlwaysOn()) {
+				startActivation();
+			}
+		}
+	}
+	
+	/**
+	 * Remove the L2Object from the L2ObjectHashSet(L2Object) _visibleObjects in this L2WorldRegion. If L2Object is a L2PcInstance, remove it from the L2ObjectHashSet(L2PcInstance) _allPlayable of this L2WorldRegion <BR>
+	 * Assert : object.getCurrentWorldRegion() == this || object.getCurrentWorldRegion() == null
+	 * @param object
+	 */
+	public void removeVisibleObject(L2Object object) {
+		if (object == null) {
+			return;
+		}
+		
+		assert (object.getWorldRegion() == this) || (object.getWorldRegion() == null);
+		
+		_visibleObjects.remove(object.getObjectId());
+		
+		if (object instanceof L2Playable) {
+			_allPlayable.remove(object.getObjectId());
+			
+			if (_allPlayable.isEmpty() && !general().gridsAlwaysOn()) {
+				startDeactivation();
+			}
+		}
+	}
+	
+	public void addSurroundingRegion(L2WorldRegion region) {
+		_surroundingRegions.add(region);
+	}
+	
+	/**
+	 * @return the list containing all L2WorldRegion around the current world region
+	 */
+	public Queue<L2WorldRegion> getSurroundingRegions() {
+		return _surroundingRegions;
+	}
+	
+	public Map<Integer, L2Playable> getVisiblePlayable() {
+		return _allPlayable;
+	}
+	
+	public Map<Integer, L2Object> getVisibleObjects() {
+		return _visibleObjects;
+	}
+	
+	public String getName() {
+		return "(" + _tileX + ", " + _tileY + ")";
+	}
+	
+	/**
+	 * Deleted all spawns in the world.
+	 */
+	public void deleteVisibleNpcSpawns() {
+		LOG.debug("Deleting all visible NPCs in Region: {}", getName());
+		for (L2Object obj : _visibleObjects.values()) {
+			if (obj instanceof L2Npc target) {
+				target.deleteMe();
+				L2Spawn spawn = target.getSpawn();
+				if (spawn != null) {
+					spawn.stopRespawn();
+					SpawnTable.getInstance().deleteSpawn(spawn, false);
+				}
+				LOG.trace("Removed NPC {}", target.getObjectId());
+			}
+		}
+		LOG.info("All visible NPCs deleted in Region: {}", getName());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/Location.java b/src/main/java/com/l2jserver/gameserver/model/Location.java
new file mode 100644
index 00000000..0dbe99a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/Location.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.interfaces.IPositionable;
+
+/**
+ * Location data transfer object.<br>
+ * Contains coordinates data, heading and instance Id.
+ * @author Zoey76
+ */
+public class Location implements IPositionable {
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _heading;
+	private int _instanceId;
+	
+	public Location(int x, int y, int z) {
+		this(x, y, z, 0, -1);
+	}
+	
+	public Location(int x, int y, int z, int heading) {
+		this(x, y, z, heading, -1);
+	}
+	
+	public Location(L2Object obj) {
+		this(obj.getX(), obj.getY(), obj.getZ(), obj.getHeading(), obj.getInstanceId());
+	}
+	
+	public Location(int x, int y, int z, int heading, int instanceId) {
+		_x = x;
+		_y = y;
+		_z = z;
+		_heading = heading;
+		_instanceId = instanceId;
+	}
+	
+	/**
+	 * Get the x coordinate.
+	 * @return the x coordinate
+	 */
+	@Override
+	public int getX() {
+		return _x;
+	}
+	
+	/**
+	 * Set the x coordinate.
+	 * @param x the x coordinate
+	 */
+	@Override
+	public void setX(int x) {
+		_x = x;
+	}
+	
+	/**
+	 * Get the y coordinate.
+	 * @return the y coordinate
+	 */
+	@Override
+	public int getY() {
+		return _y;
+	}
+	
+	/**
+	 * Set the y coordinate.
+	 * @param y the x coordinate
+	 */
+	@Override
+	public void setY(int y) {
+		_y = y;
+	}
+	
+	/**
+	 * Get the z coordinate.
+	 * @return the z coordinate
+	 */
+	@Override
+	public int getZ() {
+		return _z;
+	}
+	
+	/**
+	 * Set the z coordinate.
+	 * @param z the z coordinate
+	 */
+	@Override
+	public void setZ(int z) {
+		_z = z;
+	}
+	
+	/**
+	 * Set the x, y, z coordinates.
+	 * @param x the x coordinate
+	 * @param y the y coordinate
+	 * @param z the z coordinate
+	 */
+	@Override
+	public void setXYZ(int x, int y, int z) {
+		setX(x);
+		setY(y);
+		setZ(z);
+	}
+	
+	/**
+	 * Set the x, y, z coordinates.
+	 * @param loc The location.
+	 */
+	@Override
+	public void setXYZ(ILocational loc) {
+		setXYZ(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	/**
+	 * Get the heading.
+	 * @return the heading
+	 */
+	@Override
+	public int getHeading() {
+		return _heading;
+	}
+	
+	/**
+	 * Set the heading.
+	 * @param heading the heading
+	 */
+	@Override
+	public void setHeading(int heading) {
+		_heading = heading;
+	}
+	
+	/**
+	 * Get the instance Id.
+	 * @return the instance Id
+	 */
+	@Override
+	public int getInstanceId() {
+		return _instanceId;
+	}
+	
+	/**
+	 * Set the instance Id.
+	 * @param instanceId the instance Id to set
+	 */
+	@Override
+	public void setInstanceId(int instanceId) {
+		_instanceId = instanceId;
+	}
+	
+	@Override
+	public IPositionable getLocation() {
+		return this;
+	}
+	
+	@Override
+	public void setLocation(Location loc) {
+		_x = loc.getX();
+		_y = loc.getY();
+		_z = loc.getZ();
+		_heading = loc.getHeading();
+		_instanceId = loc.getInstanceId();
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (obj instanceof Location loc) {
+			return (getX() == loc.getX()) && (getY() == loc.getY()) && (getZ() == loc.getZ()) && (getHeading() == loc.getHeading()) && (getInstanceId() == loc.getInstanceId());
+		}
+		return false;
+	}
+	
+	@Override
+	public String toString() {
+		return "[Location] X: " + getX() + " Y: " + getY() + " Z: " + getZ() + " Heading: " + _heading + " Instance Id: " + _instanceId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/Macro.java b/src/main/java/com/l2jserver/gameserver/model/Macro.java
new file mode 100644
index 00000000..2495251a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/Macro.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+
+public class Macro implements IIdentifiable, INamable {
+	private int _id;
+	private final int _icon;
+	private final String _name;
+	private final String _descr;
+	private final String _acronym;
+	private final List<MacroCmd> _commands;
+	
+	/**
+	 * Constructor for macros.
+	 * @param id the macro ID
+	 * @param icon the icon ID
+	 * @param name the macro name
+	 * @param descr the macro description
+	 * @param acronym the macro acronym
+	 * @param list the macro command list
+	 */
+	public Macro(int id, int icon, String name, String descr, String acronym, List<MacroCmd> list) {
+		_id = id;
+		_icon = icon;
+		_name = name;
+		_descr = descr;
+		_acronym = acronym;
+		_commands = list;
+	}
+	
+	/**
+	 * Gets the marco ID.
+	 * @returns the marco ID
+	 */
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Sets the marco ID.
+	 * @param id the marco ID
+	 */
+	public void setId(int id) {
+		_id = id;
+	}
+	
+	/**
+	 * Gets the macro icon ID.
+	 * @return the icon
+	 */
+	public int getIcon() {
+		return _icon;
+	}
+	
+	/**
+	 * Gets the macro name.
+	 * @return the name
+	 */
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Gets the macro description.
+	 * @return the description
+	 */
+	public String getDescr() {
+		return _descr;
+	}
+	
+	/**
+	 * Gets the macro acronym.
+	 * @return the acronym
+	 */
+	public String getAcronym() {
+		return _acronym;
+	}
+	
+	/**
+	 * Gets the macro command list.
+	 * @return the macro command list
+	 */
+	public List<MacroCmd> getCommands() {
+		return _commands;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/MacroCmd.java b/src/main/java/com/l2jserver/gameserver/model/MacroCmd.java
new file mode 100644
index 00000000..1c0d0ac2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/MacroCmd.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.enums.MacroType;
+
+/**
+ * Macro Cmd DTO.
+ * @author Zoey76
+ */
+public class MacroCmd {
+	private final int _entry;
+	private final MacroType _type;
+	private final int _d1; // skill_id or page for shortcuts
+	private final int _d2; // shortcut
+	private final String _cmd;
+	
+	public MacroCmd(int entry, MacroType type, int d1, int d2, String cmd) {
+		_entry = entry;
+		_type = type;
+		_d1 = d1;
+		_d2 = d2;
+		_cmd = cmd;
+	}
+	
+	/**
+	 * Gets the entry index.
+	 * @return the entry index
+	 */
+	public int getEntry() {
+		return _entry;
+	}
+	
+	/**
+	 * Gets the macro type.
+	 * @return the macro type
+	 */
+	public MacroType getType() {
+		return _type;
+	}
+	
+	/**
+	 * Gets the skill ID, item ID, page ID, depending on the marco use.
+	 * @return the first value
+	 */
+	public int getD1() {
+		return _d1;
+	}
+	
+	/**
+	 * Gets the skill level, shortcut ID, depending on the marco use.
+	 * @return the second value
+	 */
+	public int getD2() {
+		return _d2;
+	}
+	
+	/**
+	 * Gets the command.
+	 * @return the command
+	 */
+	public String getCmd() {
+		return _cmd;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/MacroList.java b/src/main/java/com/l2jserver/gameserver/model/MacroList.java
new file mode 100644
index 00000000..d5fa9577
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/MacroList.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.enums.MacroType;
+import com.l2jserver.gameserver.enums.ShortcutType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IRestorable;
+import com.l2jserver.gameserver.network.serverpackets.SendMacroList;
+import com.l2jserver.gameserver.util.StringUtil;
+
+public class MacroList implements IRestorable {
+	private static final Logger LOG = LoggerFactory.getLogger(MacroList.class);
+	
+	private final L2PcInstance _owner;
+	
+	private int _revision;
+	
+	private int _macroId;
+	
+	private final Map<Integer, Macro> _macros = Collections.synchronizedMap(new LinkedHashMap<>());
+	
+	public MacroList(L2PcInstance owner) {
+		_owner = owner;
+		_revision = 1;
+		_macroId = 1000;
+	}
+	
+	public int getRevision() {
+		return _revision;
+	}
+	
+	public Map<Integer, Macro> getAllMacros() {
+		return _macros;
+	}
+	
+	public void registerMacro(Macro macro) {
+		if (macro.getId() == 0) {
+			do {
+				macro.setId(_macroId++);
+			}
+			while (_macros.containsKey(macro.getId()));
+			_macros.put(macro.getId(), macro);
+			registerMacroInDb(macro);
+		} else {
+			final Macro old = _macros.put(macro.getId(), macro);
+			if (old != null) {
+				deleteMacroFromDb(old);
+			}
+			registerMacroInDb(macro);
+		}
+		sendUpdate();
+	}
+	
+	public void deleteMacro(int id) {
+		final Macro removed = _macros.remove(id);
+		if (removed != null) {
+			deleteMacroFromDb(removed);
+		}
+		
+		final Shortcut[] allShortCuts = _owner.getAllShortCuts();
+		for (Shortcut sc : allShortCuts) {
+			if ((sc.getId() == id) && (sc.getType() == ShortcutType.MACRO)) {
+				_owner.deleteShortCut(sc.getSlot(), sc.getPage());
+			}
+		}
+		
+		sendUpdate();
+	}
+	
+	public void sendUpdate() {
+		_revision++;
+		final Collection<Macro> allMacros = _macros.values();
+		synchronized (_macros) {
+			if (allMacros.isEmpty()) {
+				_owner.sendPacket(new SendMacroList(_revision, 0, null));
+			} else {
+				for (Macro m : allMacros) {
+					_owner.sendPacket(new SendMacroList(_revision, allMacros.size(), m));
+				}
+			}
+		}
+	}
+	
+	private void registerMacroInDb(Macro macro) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO character_macroses (charId,id,icon,name,descr,acronym,commands) values(?,?,?,?,?,?,?)")) {
+			ps.setInt(1, _owner.getObjectId());
+			ps.setInt(2, macro.getId());
+			ps.setInt(3, macro.getIcon());
+			ps.setString(4, macro.getName());
+			ps.setString(5, macro.getDescr());
+			ps.setString(6, macro.getAcronym());
+			final StringBuilder sb = new StringBuilder(300);
+			for (MacroCmd cmd : macro.getCommands()) {
+				StringUtil.append(sb, String.valueOf(cmd.getType().ordinal()), ",", String.valueOf(cmd.getD1()), ",", String.valueOf(cmd.getD2()));
+				if ((cmd.getCmd() != null) && (!cmd.getCmd().isEmpty())) {
+					StringUtil.append(sb, ",", cmd.getCmd());
+				}
+				sb.append(';');
+			}
+			
+			if (sb.length() > 255) {
+				sb.setLength(255);
+			}
+			
+			ps.setString(7, sb.toString());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not store macro:", e);
+		}
+	}
+	
+	private void deleteMacroFromDb(Macro macro) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_macroses WHERE charId=? AND id=?")) {
+			ps.setInt(1, _owner.getObjectId());
+			ps.setInt(2, macro.getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not delete macro:", e);
+		}
+	}
+	
+	@Override
+	public boolean restoreMe() {
+		_macros.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT charId, id, icon, name, descr, acronym, commands FROM character_macroses WHERE charId=?")) {
+			ps.setInt(1, _owner.getObjectId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int id = rs.getInt("id");
+					int icon = rs.getInt("icon");
+					String name = rs.getString("name");
+					String descr = rs.getString("descr");
+					String acronym = rs.getString("acronym");
+					List<MacroCmd> commands = new ArrayList<>();
+					StringTokenizer st1 = new StringTokenizer(rs.getString("commands"), ";");
+					while (st1.hasMoreTokens()) {
+						StringTokenizer st = new StringTokenizer(st1.nextToken(), ",");
+						if (st.countTokens() < 3) {
+							continue;
+						}
+						MacroType type = MacroType.values()[Integer.parseInt(st.nextToken())];
+						int d1 = Integer.parseInt(st.nextToken());
+						int d2 = Integer.parseInt(st.nextToken());
+						String cmd = "";
+						if (st.hasMoreTokens()) {
+							cmd = st.nextToken();
+						}
+						commands.add(new MacroCmd(commands.size(), type, d1, d2, cmd));
+					}
+					_macros.put(id, new Macro(id, icon, name, descr, acronym, commands));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not store shortcuts:", e);
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/MobGroup.java b/src/main/java/com/l2jserver/gameserver/model/MobGroup.java
new file mode 100644
index 00000000..2b245309
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/MobGroup.java
@@ -0,0 +1,335 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2ControllableMobAI;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @author littlecrow
+ */
+public final class MobGroup {
+	private final L2NpcTemplate _npcTemplate;
+	private final int _groupId;
+	private final int _maxMobCount;
+	
+	private List<L2ControllableMobInstance> _mobs;
+	
+	public MobGroup(int groupId, L2NpcTemplate npcTemplate, int maxMobCount) {
+		_groupId = groupId;
+		_npcTemplate = npcTemplate;
+		_maxMobCount = maxMobCount;
+	}
+	
+	public int getActiveMobCount() {
+		return getMobs().size();
+	}
+	
+	public int getGroupId() {
+		return _groupId;
+	}
+	
+	public int getMaxMobCount() {
+		return _maxMobCount;
+	}
+	
+	public List<L2ControllableMobInstance> getMobs() {
+		if (_mobs == null) {
+			_mobs = new CopyOnWriteArrayList<>();
+		}
+		
+		return _mobs;
+	}
+	
+	public String getStatus() {
+		try {
+			L2ControllableMobAI mobGroupAI = (L2ControllableMobAI) getMobs().get(0).getAI();
+			return switch (mobGroupAI.getAlternateAI()) {
+				case L2ControllableMobAI.AI_FORCE_ATTACK -> "Force Attacking";
+				case L2ControllableMobAI.AI_FOLLOW -> "Following";
+				case L2ControllableMobAI.AI_CAST -> "Casting";
+				case L2ControllableMobAI.AI_ATTACK_GROUP -> "Attacking Group";
+				default -> "Idle";
+			};
+		} catch (Exception e) {
+			return "Unspawned";
+		}
+	}
+	
+	public L2NpcTemplate getTemplate() {
+		return _npcTemplate;
+	}
+	
+	public boolean isGroupMember(L2ControllableMobInstance mobInst) {
+		for (L2ControllableMobInstance groupMember : getMobs()) {
+			if (groupMember == null) {
+				continue;
+			}
+			
+			if (groupMember.getObjectId() == mobInst.getObjectId()) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public void spawnGroup(int x, int y, int z) {
+		if (getActiveMobCount() > 0) {
+			return;
+		}
+		
+		try {
+			for (int i = 0; i < getMaxMobCount(); i++) {
+				L2GroupSpawn spawn = new L2GroupSpawn(getTemplate());
+				
+				int signX = (Rnd.nextInt(2) == 0) ? -1 : 1;
+				int signY = (Rnd.nextInt(2) == 0) ? -1 : 1;
+				int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
+				int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
+				
+				spawn.setX(x + (signX * randX));
+				spawn.setY(y + (signY * randY));
+				spawn.setZ(z);
+				spawn.stopRespawn();
+				
+				SpawnTable.getInstance().addNewSpawn(spawn, false);
+				getMobs().add((L2ControllableMobInstance) spawn.doGroupSpawn());
+			}
+		} catch (Exception ex) {
+			
+		}
+	}
+	
+	public void spawnGroup(L2PcInstance activeChar) {
+		spawnGroup(activeChar.getX(), activeChar.getY(), activeChar.getZ());
+	}
+	
+	public void teleportGroup(L2PcInstance player) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			if (!mobInst.isDead()) {
+				int x = player.getX() + Rnd.nextInt(50);
+				int y = player.getY() + Rnd.nextInt(50);
+				
+				mobInst.teleToLocation(new Location(x, y, player.getZ()), true);
+				L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+				ai.follow(player);
+			}
+		}
+	}
+	
+	public L2ControllableMobInstance getRandomMob() {
+		removeDead();
+		
+		if (getActiveMobCount() == 0) {
+			return null;
+		}
+		
+		int choice = Rnd.nextInt(getActiveMobCount());
+		return getMobs().get(choice);
+	}
+	
+	public void unspawnGroup() {
+		removeDead();
+		
+		if (getActiveMobCount() == 0) {
+			return;
+		}
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			if (!mobInst.isDead()) {
+				mobInst.deleteMe();
+			}
+			
+			SpawnTable.getInstance().deleteSpawn(mobInst.getSpawn(), false);
+		}
+		
+		getMobs().clear();
+	}
+	
+	public void killGroup(L2PcInstance activeChar) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			if (!mobInst.isDead()) {
+				mobInst.reduceCurrentHp(mobInst.getMaxHp() + 1, activeChar, null);
+			}
+			
+			SpawnTable.getInstance().deleteSpawn(mobInst.getSpawn(), false);
+		}
+		
+		getMobs().clear();
+	}
+	
+	public void setAttackRandom() {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.setAlternateAI(L2ControllableMobAI.AI_NORMAL);
+			ai.setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		}
+	}
+	
+	public void setAttackTarget(L2Character target) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.forceAttack(target);
+		}
+	}
+	
+	public void setIdleMode() {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.stop();
+		}
+	}
+	
+	public void returnGroup(L2Character activeChar) {
+		setIdleMode();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			int signX = (Rnd.nextInt(2) == 0) ? -1 : 1;
+			int signY = (Rnd.nextInt(2) == 0) ? -1 : 1;
+			int randX = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
+			int randY = Rnd.nextInt(MobGroupTable.RANDOM_RANGE);
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.move(activeChar.getX() + (signX * randX), activeChar.getY() + (signY * randY), activeChar.getZ());
+		}
+	}
+	
+	public void setFollowMode(L2Character character) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.follow(character);
+		}
+	}
+	
+	public void setCastMode() {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.setAlternateAI(L2ControllableMobAI.AI_CAST);
+		}
+	}
+	
+	public void setNoMoveMode(boolean enabled) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.setNotMoving(enabled);
+		}
+	}
+	
+	protected void removeDead() {
+		List<L2ControllableMobInstance> deadMobs = new LinkedList<>();
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if ((mobInst != null) && mobInst.isDead()) {
+				deadMobs.add(mobInst);
+			}
+		}
+		
+		getMobs().removeAll(deadMobs);
+	}
+	
+	public void setInvul(boolean invulState) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst != null) {
+				mobInst.setInvul(invulState);
+			}
+		}
+	}
+	
+	public void setAttackGroup(MobGroup otherGrp) {
+		removeDead();
+		
+		for (L2ControllableMobInstance mobInst : getMobs()) {
+			if (mobInst == null) {
+				continue;
+			}
+			
+			L2ControllableMobAI ai = (L2ControllableMobAI) mobInst.getAI();
+			ai.forceAttackGroup(otherGrp);
+			ai.setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/MobGroupTable.java b/src/main/java/com/l2jserver/gameserver/model/MobGroupTable.java
new file mode 100644
index 00000000..dd1d4ae1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/MobGroupTable.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
+
+/**
+ * @author littlecrow
+ */
+public class MobGroupTable {
+	private final Map<Integer, MobGroup> _groupMap;
+	
+	public static final int FOLLOW_RANGE = 300;
+	public static final int RANDOM_RANGE = 300;
+	
+	protected MobGroupTable() {
+		_groupMap = new ConcurrentHashMap<>();
+	}
+	
+	public static MobGroupTable getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	public void addGroup(int groupKey, MobGroup group) {
+		_groupMap.put(groupKey, group);
+	}
+	
+	public MobGroup getGroup(int groupKey) {
+		return _groupMap.get(groupKey);
+	}
+	
+	public int getGroupCount() {
+		return _groupMap.size();
+	}
+	
+	public MobGroup getGroupForMob(L2ControllableMobInstance mobInst) {
+		for (MobGroup mobGroup : _groupMap.values()) {
+			if (mobGroup.isGroupMember(mobInst)) {
+				return mobGroup;
+			}
+		}
+		
+		return null;
+	}
+	
+	public MobGroup[] getGroups() {
+		return _groupMap.values().toArray(new MobGroup[getGroupCount()]);
+	}
+	
+	public boolean removeGroup(int groupKey) {
+		return (_groupMap.remove(groupKey) != null);
+	}
+	
+	private static class SingletonHolder {
+		protected static final MobGroupTable _instance = new MobGroupTable();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/PageResult.java b/src/main/java/com/l2jserver/gameserver/model/PageResult.java
new file mode 100644
index 00000000..cc12d9a4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/PageResult.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author UnAfraid
+ */
+public class PageResult {
+	private final int _pages;
+	private final StringBuilder _pagerTemplate;
+	private final StringBuilder _bodyTemplate;
+	
+	public PageResult(int pages, StringBuilder pagerTemplate, StringBuilder bodyTemplate) {
+		_pages = pages;
+		_pagerTemplate = pagerTemplate;
+		_bodyTemplate = bodyTemplate;
+	}
+	
+	public int getPages() {
+		return _pages;
+	}
+	
+	public StringBuilder getPagerTemplate() {
+		return _pagerTemplate;
+	}
+	
+	public StringBuilder getBodyTemplate() {
+		return _bodyTemplate;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/PartyMatchRoom.java b/src/main/java/com/l2jserver/gameserver/model/PartyMatchRoom.java
new file mode 100644
index 00000000..0eef7ab6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/PartyMatchRoom.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Gnacik
+ */
+public class PartyMatchRoom implements IIdentifiable {
+	private final int _id;
+	private String _title;
+	private int _loot;
+	private int _minlvl;
+	private int _maxlvl;
+	private int _maxmem;
+	private final List<L2PcInstance> _members = new ArrayList<>();
+	
+	public PartyMatchRoom(int id, String title, int loot, int minlvl, int maxlvl, int maxmem, L2PcInstance owner) {
+		_id = id;
+		_title = title;
+		_loot = loot;
+		_minlvl = minlvl;
+		_maxlvl = maxlvl;
+		_maxmem = maxmem;
+		_members.add(owner);
+	}
+	
+	public List<L2PcInstance> getPartyMembers() {
+		return _members;
+	}
+	
+	public void addMember(L2PcInstance player) {
+		_members.add(player);
+	}
+	
+	public void deleteMember(L2PcInstance player) {
+		if (player != getOwner()) {
+			_members.remove(player);
+			notifyMembersAboutExit(player);
+		} else if (_members.size() == 1) {
+			PartyMatchRoomList.getInstance().deleteRoom(_id);
+		} else {
+			changeLeader(_members.get(1));
+			deleteMember(player);
+		}
+	}
+	
+	public void notifyMembersAboutExit(L2PcInstance player) {
+		for (L2PcInstance _member : _members) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_LEFT_PARTY_ROOM);
+			sm.addCharName(player);
+			_member.sendPacket(sm);
+			_member.sendPacket(new ExManagePartyRoomMember(player, this, 2));
+		}
+	}
+	
+	public void changeLeader(L2PcInstance newLeader) {
+		// Get current leader
+		L2PcInstance oldLeader = _members.get(0);
+		// Remove new leader
+		_members.remove(newLeader);
+		// Move him to first position
+		_members.set(0, newLeader);
+		// Add old leader as normal member
+		_members.add(oldLeader);
+		// Broadcast change
+		for (L2PcInstance member : _members) {
+			member.sendPacket(new ExManagePartyRoomMember(newLeader, this, 1));
+			member.sendPacket(new ExManagePartyRoomMember(oldLeader, this, 1));
+			member.sendPacket(SystemMessageId.PARTY_ROOM_LEADER_CHANGED);
+		}
+	}
+	
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	public int getLootType() {
+		return _loot;
+	}
+	
+	public int getMinLvl() {
+		return _minlvl;
+	}
+	
+	public int getMaxLvl() {
+		return _maxlvl;
+	}
+	
+	/**
+	 * <ul>
+	 * <li>1 : Talking Island</li>
+	 * <li>2 : Gludio</li>
+	 * <li>3 : Dark Elven Ter.</li>
+	 * <li>4 : Elven Territory</li>
+	 * <li>5 : Dion</li>
+	 * <li>6 : Giran</li>
+	 * <li>7 : Neutral Zone</li>
+	 * <li>8 : Lyonn</li>
+	 * <li>9 : Schuttgart</li>
+	 * <li>10 : Oren</li>
+	 * <li>11 : Hunters Village</li>
+	 * <li>12 : Innadril</li>
+	 * <li>13 : Aden</li>
+	 * <li>14 : Rune</li>
+	 * <li>15 : Goddard</li>
+	 * </ul>
+	 * @return the id
+	 */
+	public int getLocation() {
+		return MapRegionManager.getInstance().getMapRegion(_members.get(0)).getBbs();
+	}
+	
+	public int getMembers() {
+		return _members.size();
+	}
+	
+	public int getMaxMembers() {
+		return _maxmem;
+	}
+	
+	public String getTitle() {
+		return _title;
+	}
+	
+	public L2PcInstance getOwner() {
+		return _members.get(0);
+	}
+	
+	/* SET */
+	
+	public void setMinLvl(int minlvl) {
+		_minlvl = minlvl;
+	}
+	
+	public void setMaxLvl(int maxlvl) {
+		_maxlvl = maxlvl;
+	}
+	
+	public void setLootType(int loot) {
+		_loot = loot;
+	}
+	
+	public void setMaxMembers(int maxmem) {
+		_maxmem = maxmem;
+	}
+	
+	public void setTitle(String title) {
+		_title = title;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/PartyMatchRoomList.java b/src/main/java/com/l2jserver/gameserver/model/PartyMatchRoomList.java
new file mode 100644
index 00000000..8bc83b72
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/PartyMatchRoomList.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExClosePartyRoom;
+
+/**
+ * @author Gnacik
+ */
+public class PartyMatchRoomList {
+	private int _maxid = 1;
+	private final Map<Integer, PartyMatchRoom> _rooms;
+	
+	protected PartyMatchRoomList() {
+		_rooms = new ConcurrentHashMap<>();
+	}
+	
+	public synchronized void addPartyMatchRoom(int id, PartyMatchRoom room) {
+		_rooms.put(id, room);
+		_maxid++;
+	}
+	
+	public void deleteRoom(int id) {
+		for (L2PcInstance _member : getRoom(id).getPartyMembers()) {
+			if (_member == null) {
+				continue;
+			}
+			
+			_member.sendPacket(new ExClosePartyRoom());
+			_member.sendPacket(SystemMessageId.PARTY_ROOM_DISBANDED);
+			
+			_member.setPartyRoom(0);
+			// _member.setPartyMatching(0);
+			_member.broadcastUserInfo();
+		}
+		_rooms.remove(id);
+	}
+	
+	public PartyMatchRoom getRoom(int id) {
+		return _rooms.get(id);
+	}
+	
+	public PartyMatchRoom[] getRooms() {
+		return _rooms.values().toArray(new PartyMatchRoom[_rooms.size()]);
+	}
+	
+	public int getPartyMatchRoomCount() {
+		return _rooms.size();
+	}
+	
+	public int getMaxId() {
+		return _maxid;
+	}
+	
+	public PartyMatchRoom getPlayerRoom(L2PcInstance player) {
+		for (PartyMatchRoom _room : _rooms.values()) {
+			for (L2PcInstance member : _room.getPartyMembers()) {
+				if (member.equals(player)) {
+					return _room;
+				}
+			}
+		}
+		return null;
+	}
+	
+	public int getPlayerRoomId(L2PcInstance player) {
+		for (PartyMatchRoom _room : _rooms.values()) {
+			for (L2PcInstance member : _room.getPartyMembers()) {
+				if (member.equals(player)) {
+					return _room.getId();
+				}
+			}
+		}
+		return -1;
+	}
+	
+	public static PartyMatchRoomList getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PartyMatchRoomList _instance = new PartyMatchRoomList();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/PartyMatchWaitingList.java b/src/main/java/com/l2jserver/gameserver/model/PartyMatchWaitingList.java
new file mode 100644
index 00000000..e9f4154d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/PartyMatchWaitingList.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import org.apache.logging.log4j.util.Strings;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Party Match Waiting List.
+ * @author Zoey76
+ */
+public class PartyMatchWaitingList {
+	
+	private final Set<L2PcInstance> _members = ConcurrentHashMap.newKeySet(1);
+	
+	protected PartyMatchWaitingList() {
+		// Do nothing.
+	}
+	
+	public void addPlayer(L2PcInstance player) {
+		_members.add(player);
+	}
+	
+	public void removePlayer(L2PcInstance player) {
+		_members.remove(player);
+	}
+	
+	public Set<L2PcInstance> getPlayers() {
+		return _members;
+	}
+	
+	public List<L2PcInstance> findPlayers(int minLevel, int maxLevel, Set<Integer> classes, String filter) {
+		return _members.stream() //
+			.filter(p -> p.getLevel() >= minLevel) //
+			.filter(p -> p.getLevel() <= maxLevel) //
+			.filter(p -> classes.isEmpty() || classes.contains(p.getClassId().getId())) //
+			.filter(p -> Strings.isBlank(filter) || p.getName().toLowerCase().contains(filter.toLowerCase())) //
+			.filter(L2PcInstance::isPartyWaiting) //
+			.collect(Collectors.toList());
+	}
+	
+	public static PartyMatchWaitingList getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final PartyMatchWaitingList INSTANCE = new PartyMatchWaitingList();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/PcCondOverride.java b/src/main/java/com/l2jserver/gameserver/model/PcCondOverride.java
new file mode 100644
index 00000000..478e3903
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/PcCondOverride.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author UnAfraid
+ */
+public enum PcCondOverride {
+	MAX_STATS_VALUE(0, "Overrides maximum states conditions"),
+	ITEM_CONDITIONS(1, "Overrides item usage conditions"),
+	SKILL_CONDITIONS(2, "Overrides skill usage conditions"),
+	ZONE_CONDITIONS(3, "Overrides zone conditions"),
+	CASTLE_CONDITIONS(4, "Overrides castle conditions"),
+	FORTRESS_CONDITIONS(5, "Overrides fortress conditions"),
+	CLANHALL_CONDITIONS(6, "Overrides clan hall conditions"),
+	FLOOD_CONDITIONS(7, "Overrides floods conditions"),
+	CHAT_CONDITIONS(8, "Overrides chat conditions"),
+	INSTANCE_CONDITIONS(9, "Overrides instance conditions"),
+	QUEST_CONDITIONS(10, "Overrides quest conditions"),
+	DEATH_PENALTY(11, "Overrides death penalty conditions"),
+	DESTROY_ALL_ITEMS(12, "Overrides item destroy conditions"),
+	SEE_ALL_PLAYERS(13, "Overrides the conditions to see hidden players"),
+	TARGET_ALL(14, "Overrides target conditions"),
+	DROP_ALL_ITEMS(15, "Overrides item drop conditions");
+	
+	private final int _mask;
+	private final String _descr;
+	
+	PcCondOverride(int id, String descr) {
+		_mask = 1 << id;
+		_descr = descr;
+	}
+	
+	public int getMask() {
+		return _mask;
+	}
+	
+	public String getDescription() {
+		return _descr;
+	}
+	
+	public static PcCondOverride getCondOverride(int ordinal) {
+		try {
+			return values()[ordinal];
+		} catch (Exception e) {
+			return null;
+		}
+	}
+	
+	public static long getAllExceptionsMask() {
+		long result = 0L;
+		for (PcCondOverride ex : values()) {
+			result |= ex.getMask();
+		}
+		return result;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/Petition.java b/src/main/java/com/l2jserver/gameserver/model/Petition.java
new file mode 100644
index 00000000..b76688c8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/Petition.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.gameserver.enums.PetitionState;
+import com.l2jserver.gameserver.enums.PetitionType;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.PetitionManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.PetitionVotePacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Petition
+ * @author xban1x
+ */
+public final class Petition {
+	private final long _submitTime = System.currentTimeMillis();
+	private final int _id;
+	private final PetitionType _type;
+	private PetitionState _state = PetitionState.PENDING;
+	private final String _content;
+	private final List<CreatureSay> _messageLog = new CopyOnWriteArrayList<>();
+	private final L2PcInstance _petitioner;
+	private L2PcInstance _responder;
+	
+	public Petition(L2PcInstance petitioner, String petitionText, int petitionType) {
+		_id = IdFactory.getInstance().getNextId();
+		_type = PetitionType.values()[--petitionType];
+		_content = petitionText;
+		_petitioner = petitioner;
+	}
+	
+	public boolean addLogMessage(CreatureSay cs) {
+		return _messageLog.add(cs);
+	}
+	
+	public List<CreatureSay> getLogMessages() {
+		return _messageLog;
+	}
+	
+	public boolean endPetitionConsultation(PetitionState endState) {
+		setState(endState);
+		
+		if ((getResponder() != null) && getResponder().isOnline()) {
+			if (endState == PetitionState.RESPONDER_REJECT) {
+				getPetitioner().sendMessage("Your petition was rejected. Please try again later.");
+			} else {
+				// Ending petition consultation with <Player>.
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_ENDED_WITH_C1);
+				sm.addString(getPetitioner().getName());
+				getResponder().sendPacket(sm);
+				
+				if (endState == PetitionState.PETITIONER_CANCEL) {
+					// Receipt No. <ID> petition cancelled.
+					sm = SystemMessage.getSystemMessage(SystemMessageId.RECENT_NO_S1_CANCELED);
+					sm.addInt(getId());
+					getResponder().sendPacket(sm);
+				}
+			}
+		}
+		
+		// End petition consultation and inform them, if they are still online. And if petitioner is online, enable Evaluation button
+		if ((getPetitioner() != null) && getPetitioner().isOnline()) {
+			getPetitioner().sendPacket(SystemMessageId.THIS_END_THE_PETITION_PLEASE_PROVIDE_FEEDBACK);
+			getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET);
+		}
+		
+		PetitionManager.getInstance().getCompletedPetitions().put(getId(), this);
+		return (PetitionManager.getInstance().getPendingPetitions().remove(getId()) != null);
+	}
+	
+	public String getContent() {
+		return _content;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public L2PcInstance getPetitioner() {
+		return _petitioner;
+	}
+	
+	public L2PcInstance getResponder() {
+		return _responder;
+	}
+	
+	public long getSubmitTime() {
+		return _submitTime;
+	}
+	
+	public PetitionState getState() {
+		return _state;
+	}
+	
+	public String getTypeAsString() {
+		return _type.toString().replace("_", " ");
+	}
+	
+	public void sendPetitionerPacket(L2GameServerPacket responsePacket) {
+		if ((getPetitioner() == null) || !getPetitioner().isOnline()) {
+			// Allows petitioners to see the results of their petition when
+			// they log back into the game.
+			
+			// endPetitionConsultation(PetitionState.Petitioner_Missing);
+			return;
+		}
+		
+		getPetitioner().sendPacket(responsePacket);
+	}
+	
+	public void sendResponderPacket(L2GameServerPacket responsePacket) {
+		if ((getResponder() == null) || !getResponder().isOnline()) {
+			endPetitionConsultation(PetitionState.RESPONDER_MISSING);
+			return;
+		}
+		
+		getResponder().sendPacket(responsePacket);
+	}
+	
+	public void setState(PetitionState state) {
+		_state = state;
+	}
+	
+	public void setResponder(L2PcInstance respondingAdmin) {
+		if (getResponder() != null) {
+			return;
+		}
+		
+		_responder = respondingAdmin;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/SeedProduction.java b/src/main/java/com/l2jserver/gameserver/model/SeedProduction.java
new file mode 100644
index 00000000..b095294c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/SeedProduction.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * @author xban1x
+ */
+public class SeedProduction {
+	private final int _seedId;
+	private final long _price;
+	private final long _startAmount;
+	private final AtomicLong _amount;
+	
+	public SeedProduction(int id, long amount, long price, long startAmount) {
+		_seedId = id;
+		_amount = new AtomicLong(amount);
+		_price = price;
+		_startAmount = startAmount;
+	}
+	
+	public final int getId() {
+		return _seedId;
+	}
+	
+	public final long getAmount() {
+		return _amount.get();
+	}
+	
+	public final long getPrice() {
+		return _price;
+	}
+	
+	public final long getStartAmount() {
+		return _startAmount;
+	}
+	
+	public final void setAmount(long amount) {
+		_amount.set(amount);
+	}
+	
+	public final boolean decreaseAmount(long val) {
+		long current, next;
+		do {
+			current = _amount.get();
+			next = current - val;
+			if (next < 0) {
+				return false;
+			}
+		}
+		while (!_amount.compareAndSet(current, next));
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/ShortCuts.java b/src/main/java/com/l2jserver/gameserver/model/ShortCuts.java
new file mode 100644
index 00000000..6f162bf1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/ShortCuts.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.enums.ShortcutType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IRestorable;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;
+import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;
+import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;
+
+public class ShortCuts implements IRestorable {
+	private static final Logger LOG = LoggerFactory.getLogger(ShortCuts.class);
+	
+	private static final int MAX_SHORTCUTS_PER_BAR = 12;
+	private final L2PcInstance _owner;
+	private final Map<Integer, Shortcut> _shortCuts = new TreeMap<>();
+	
+	public ShortCuts(L2PcInstance owner) {
+		_owner = owner;
+	}
+	
+	public Shortcut[] getAllShortCuts() {
+		return _shortCuts.values().toArray(new Shortcut[0]);
+	}
+	
+	public Shortcut getShortCut(int slot, int page) {
+		Shortcut sc = _shortCuts.get(slot + (page * MAX_SHORTCUTS_PER_BAR));
+		// Verify shortcut
+		if ((sc != null) && (sc.getType() == ShortcutType.ITEM)) {
+			if (_owner.getInventory().getItemByObjectId(sc.getId()) == null) {
+				deleteShortCut(sc.getSlot(), sc.getPage());
+				sc = null;
+			}
+		}
+		return sc;
+	}
+	
+	public synchronized void registerShortCut(Shortcut shortcut) {
+		// Verify shortcut
+		if (shortcut.getType() == ShortcutType.ITEM) {
+			final L2ItemInstance item = _owner.getInventory().getItemByObjectId(shortcut.getId());
+			if (item == null) {
+				return;
+			}
+			shortcut.setSharedReuseGroup(item.getSharedReuseGroup());
+		}
+		final Shortcut oldShortCut = _shortCuts.put(shortcut.getSlot() + (shortcut.getPage() * MAX_SHORTCUTS_PER_BAR), shortcut);
+		registerShortCutInDb(shortcut, oldShortCut);
+	}
+	
+	private void registerShortCutInDb(Shortcut shortcut, Shortcut oldShortCut) {
+		if (oldShortCut != null) {
+			deleteShortCutFromDb(oldShortCut);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("REPLACE INTO character_shortcuts (charId,slot,page,type,shortcut_id,level,class_index) values(?,?,?,?,?,?,?)")) {
+			ps.setInt(1, _owner.getObjectId());
+			ps.setInt(2, shortcut.getSlot());
+			ps.setInt(3, shortcut.getPage());
+			ps.setInt(4, shortcut.getType().ordinal());
+			ps.setInt(5, shortcut.getId());
+			ps.setInt(6, shortcut.getLevel());
+			ps.setInt(7, _owner.getClassIndex());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not store character shortcut: {}", e.getMessage(), e);
+		}
+	}
+	
+	public synchronized void deleteShortCut(int slot, int page) {
+		final Shortcut old = _shortCuts.remove(slot + (page * MAX_SHORTCUTS_PER_BAR));
+		if ((old == null) || (_owner == null)) {
+			return;
+		}
+		deleteShortCutFromDb(old);
+		if (old.getType() == ShortcutType.ITEM) {
+			L2ItemInstance item = _owner.getInventory().getItemByObjectId(old.getId());
+			
+			if ((item != null) && (item.getItemType() == EtcItemType.SHOT)) {
+				if (_owner.removeAutoSoulShot(item.getId())) {
+					_owner.sendPacket(new ExAutoSoulShot(item.getId(), 0));
+				}
+			}
+		}
+		
+		_owner.sendPacket(new ShortCutInit(_owner));
+		
+		for (int shotId : _owner.getAutoSoulShot()) {
+			_owner.sendPacket(new ExAutoSoulShot(shotId, 1));
+		}
+	}
+	
+	public synchronized void deleteShortCutByObjectId(int objectId) {
+		for (Shortcut shortcut : _shortCuts.values()) {
+			if ((shortcut.getType() == ShortcutType.ITEM) && (shortcut.getId() == objectId)) {
+				deleteShortCut(shortcut.getSlot(), shortcut.getPage());
+				break;
+			}
+		}
+	}
+	
+	private void deleteShortCutFromDb(Shortcut shortcut) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_shortcuts WHERE charId=? AND slot=? AND page=? AND class_index=?")) {
+			ps.setInt(1, _owner.getObjectId());
+			ps.setInt(2, shortcut.getSlot());
+			ps.setInt(3, shortcut.getPage());
+			ps.setInt(4, _owner.getClassIndex());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Could not delete character shortcut: {}", e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	public boolean restoreMe() {
+		_shortCuts.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement("SELECT charId, slot, page, type, shortcut_id, level FROM character_shortcuts WHERE charId=? AND class_index=?")) {
+			statement.setInt(1, _owner.getObjectId());
+			statement.setInt(2, _owner.getClassIndex());
+			
+			try (var rs = statement.executeQuery()) {
+				while (rs.next()) {
+					int slot = rs.getInt("slot");
+					int page = rs.getInt("page");
+					int type = rs.getInt("type");
+					int id = rs.getInt("shortcut_id");
+					int level = rs.getInt("level");
+					
+					_shortCuts.put(slot + (page * MAX_SHORTCUTS_PER_BAR), new Shortcut(slot, page, ShortcutType.values()[type], id, level, 1));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not restore character shortcuts: {}", e.getMessage(), e);
+			return false;
+		}
+		
+		// Verify shortcuts
+		for (Shortcut sc : getAllShortCuts()) {
+			if (sc.getType() == ShortcutType.ITEM) {
+				L2ItemInstance item = _owner.getInventory().getItemByObjectId(sc.getId());
+				if (item == null) {
+					deleteShortCut(sc.getSlot(), sc.getPage());
+				} else if (item.isEtcItem()) {
+					sc.setSharedReuseGroup(item.getEtcItem().getSharedReuseGroup());
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Updates the shortcut bars with the new skill.
+	 * @param skillId the skill Id to search and update.
+	 * @param skillLevel the skill level to update.
+	 */
+	public synchronized void updateShortCuts(int skillId, int skillLevel) {
+		// Update all the shortcuts for this skill
+		for (Shortcut sc : _shortCuts.values()) {
+			if ((sc.getId() == skillId) && (sc.getType() == ShortcutType.SKILL)) {
+				final var shortcut = new Shortcut(sc.getSlot(), sc.getPage(), sc.getType(), sc.getId(), skillLevel, 1);
+				_owner.sendPacket(new ShortCutRegister(shortcut));
+				_owner.registerShortCut(shortcut);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/Shortcut.java b/src/main/java/com/l2jserver/gameserver/model/Shortcut.java
new file mode 100644
index 00000000..bf4a7eec
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/Shortcut.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.enums.ShortcutType;
+
+/**
+ * Shortcut DTO.
+ * @author Zoey76
+ */
+public class Shortcut {
+	/** Slot from 0 to 11. */
+	private final int _slot;
+	/** Page from 0 to 9. */
+	private final int _page;
+	/** Type: item, skill, action, macro, recipe, bookmark. */
+	private final ShortcutType _type;
+	/** Shortcut ID. */
+	private final int _id;
+	/** Shortcut level (skills). */
+	private final int _level;
+	/** Character type: 1 player, 2 summon. */
+	private final int _characterType;
+	/** Shared reuse group. */
+	private int _sharedReuseGroup = -1;
+	
+	public Shortcut(int slot, int page, ShortcutType type, int id, int level, int characterType) {
+		_slot = slot;
+		_page = page;
+		_type = type;
+		_id = id;
+		_level = level;
+		_characterType = characterType;
+	}
+	
+	/**
+	 * Gets the shortcut ID.
+	 * @return the ID
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Gets the shortcut level.
+	 * @return the level
+	 */
+	public int getLevel() {
+		return _level;
+	}
+	
+	/**
+	 * Gets the shortcut page.
+	 * @return the page
+	 */
+	public int getPage() {
+		return _page;
+	}
+	
+	/**
+	 * Gets the shortcut slot.
+	 * @return the slot
+	 */
+	public int getSlot() {
+		return _slot;
+	}
+	
+	/**
+	 * Gets the shortcut type.
+	 * @return the type
+	 */
+	public ShortcutType getType() {
+		return _type;
+	}
+	
+	/**
+	 * Gets the shortcut character type.
+	 * @return the character type
+	 */
+	public int getCharacterType() {
+		return _characterType;
+	}
+	
+	/**
+	 * Gets the shared reuse group.
+	 * @return the shared reuse group
+	 */
+	public int getSharedReuseGroup() {
+		return _sharedReuseGroup;
+	}
+	
+	/**
+	 * Sets the shared reuse group.
+	 * @param sharedReuseGroup the shared reuse group to set
+	 */
+	public void setSharedReuseGroup(int sharedReuseGroup) {
+		_sharedReuseGroup = sharedReuseGroup;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/SiegeScheduleDate.java b/src/main/java/com/l2jserver/gameserver/model/SiegeScheduleDate.java
new file mode 100644
index 00000000..67d7c918
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/SiegeScheduleDate.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.Calendar;
+
+/**
+ * @author UnAfraid
+ */
+public class SiegeScheduleDate {
+	private final int _day;
+	private final int _hour;
+	private final int _maxConcurrent;
+	
+	public SiegeScheduleDate(StatsSet set) {
+		_day = set.getInt("day", Calendar.SUNDAY);
+		_hour = set.getInt("hour", 16);
+		_maxConcurrent = set.getInt("maxConcurrent", 5);
+	}
+	
+	public int getDay() {
+		return _day;
+	}
+	
+	public int getHour() {
+		return _hour;
+	}
+	
+	public int getMaxConcurrent() {
+		return _maxConcurrent;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/SpawnListener.java b/src/main/java/com/l2jserver/gameserver/model/SpawnListener.java
new file mode 100644
index 00000000..274b349d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/SpawnListener.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * @since 2004/06/27 08:12:59
+ */
+public interface SpawnListener {
+	void npcSpawned(L2Npc npc);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/StatsSet.java b/src/main/java/com/l2jserver/gameserver/model/StatsSet.java
new file mode 100644
index 00000000..b851b7e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/StatsSet.java
@@ -0,0 +1,514 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.holders.MinionHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.IParserAdvUtils;
+
+/**
+ * This class is meant to hold a set of (key,value) pairs.<br>
+ * They are stored as object but can be retrieved in any type wanted. As long as cast is available.<br>
+ * @author mkizub
+ */
+public class StatsSet implements IParserAdvUtils {
+	private static final Logger LOG = LoggerFactory.getLogger(StatsSet.class);
+	
+	/** Static empty immutable map, used to avoid multiple null checks over the source. */
+	public static final StatsSet EMPTY_STATSET = new StatsSet(Collections.emptyMap());
+	
+	private final Map<String, Object> _set;
+	
+	public StatsSet() {
+		this(new LinkedHashMap<>());
+	}
+	
+	public StatsSet(Map<String, Object> map) {
+		_set = map;
+	}
+	
+	/**
+	 * Returns the set of values
+	 * @return HashMap
+	 */
+	public final Map<String, Object> getSet() {
+		return _set;
+	}
+	
+	/**
+	 * Add a set of couple values in the current set
+	 * @param newSet : StatsSet pointing out the list of couples to add in the current set
+	 */
+	public void add(StatsSet newSet) {
+		_set.putAll(newSet.getSet());
+	}
+	
+	/**
+	 * Verifies if the stat set is empty.
+	 * @return {@code true} if the stat set is empty, {@code false} otherwise
+	 */
+	public boolean isEmpty() {
+		return _set.isEmpty();
+	}
+	
+	public boolean containsKey(String key) {
+		return _set.containsKey(key);
+	}
+	
+	/**
+	 * Return the boolean value associated with key.
+	 * @param key : String designating the key in the set
+	 * @return boolean : value associated to the key
+	 * @throws IllegalArgumentException : If value is not set or value is not boolean
+	 */
+	@Override
+	public boolean getBoolean(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Boolean value required, but not specified");
+		}
+		if (val instanceof Boolean) {
+			return (Boolean) val;
+		}
+		try {
+			return Boolean.parseBoolean((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Boolean value required, but found: " + val);
+		}
+	}
+	
+	/**
+	 * Return the boolean value associated with key.<br>
+	 * If no value is associated with key, or type of value is wrong, returns defaultValue.
+	 * @param key : String designating the key in the entry set
+	 * @return boolean : value associated to the key
+	 */
+	@Override
+	public boolean getBoolean(String key, boolean defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Boolean) {
+			return (Boolean) val;
+		}
+		try {
+			return Boolean.parseBoolean((String) val);
+		} catch (Exception e) {
+			return defaultValue;
+		}
+	}
+	
+	@Override
+	public byte getByte(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Byte value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return ((Number) val).byteValue();
+		}
+		try {
+			return Byte.parseByte((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Byte value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public byte getByte(String key, byte defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Number) {
+			return ((Number) val).byteValue();
+		}
+		try {
+			return Byte.parseByte((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Byte value required, but found: " + val);
+		}
+	}
+	
+	public byte[] getByteArray(String key, String splitOn) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Byte value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return new byte[] {
+				((Number) val).byteValue()
+			};
+		}
+		int c = 0;
+		String[] values = ((String) val).split(splitOn);
+		byte[] result = new byte[values.length];
+		for (String v : values) {
+			try {
+				result[c++] = Byte.parseByte(v);
+			} catch (Exception e) {
+				throw new IllegalArgumentException("Byte value required, but found: " + val);
+			}
+		}
+		return result;
+	}
+	
+	public List<Byte> getByteList(String key, String splitOn) {
+		List<Byte> result = new ArrayList<>();
+		for (Byte i : getByteArray(key, splitOn)) {
+			result.add(i);
+		}
+		return result;
+	}
+	
+	@Override
+	public short getShort(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Short value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return ((Number) val).shortValue();
+		}
+		try {
+			return Short.parseShort((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Short value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public short getShort(String key, short defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Number) {
+			return ((Number) val).shortValue();
+		}
+		try {
+			return Short.parseShort((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Short value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public int getInt(String key) {
+		final Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Integer value required, but not specified: " + key + "!");
+		}
+		
+		if (val instanceof Number) {
+			return ((Number) val).intValue();
+		}
+		
+		try {
+			return Integer.parseInt((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Integer value required, but found: " + val + "!");
+		}
+	}
+	
+	@Override
+	public int getInt(String key, int defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Number) {
+			return ((Number) val).intValue();
+		}
+		try {
+			return Integer.parseInt((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Integer value required, but found: " + val);
+		}
+	}
+	
+	public int[] getIntArray(String key, String splitOn) {
+		return getIntArray(key, null, splitOn);
+	}
+	
+	public int[] getIntArray(String key, String defaultValue, String splitOn) {
+		Object val = _set.getOrDefault(key, defaultValue);
+		if (val == null) {
+			throw new IllegalArgumentException("Integer value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return new int[] {
+				((Number) val).intValue()
+			};
+		}
+		int c = 0;
+		String[] values = ((String) val).split(splitOn);
+		int[] result = new int[values.length];
+		for (String v : values) {
+			try {
+				result[c++] = Integer.parseInt(v);
+			} catch (Exception e) {
+				throw new IllegalArgumentException("Integer value required, but found: " + val);
+			}
+		}
+		return result;
+	}
+	
+	public List<Integer> getIntegerList(String key, String splitOn) {
+		List<Integer> result = new ArrayList<>();
+		for (int i : getIntArray(key, splitOn)) {
+			result.add(i);
+		}
+		return result;
+	}
+	
+	@Override
+	public long getLong(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Long value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return ((Number) val).longValue();
+		}
+		try {
+			return Long.parseLong((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Long value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public long getLong(String key, long defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Number) {
+			return ((Number) val).longValue();
+		}
+		try {
+			return Long.parseLong((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Long value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public float getFloat(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Float value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return ((Number) val).floatValue();
+		}
+		try {
+			return Float.parseFloat((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Float value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public float getFloat(String key, float defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Number) {
+			return ((Number) val).floatValue();
+		}
+		try {
+			return Float.parseFloat((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Float value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public double getDouble(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Double value required, but not specified");
+		}
+		if (val instanceof Number) {
+			return ((Number) val).doubleValue();
+		}
+		try {
+			return Double.parseDouble((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Double value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public double getDouble(String key, double defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (val instanceof Number) {
+			return ((Number) val).doubleValue();
+		}
+		try {
+			return Double.parseDouble((String) val);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Double value required, but found: " + val);
+		}
+	}
+	
+	@Override
+	public String getString(String key) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("String value required, but not specified");
+		}
+		return String.valueOf(val);
+	}
+	
+	@Override
+	public String getString(String key, String defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		return String.valueOf(val);
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T extends Enum<T>> T getEnum(String key, Class<T> enumClass) {
+		Object val = _set.get(key);
+		if (val == null) {
+			throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but not specified");
+		}
+		if (enumClass.isInstance(val)) {
+			return (T) val;
+		}
+		try {
+			return Enum.valueOf(enumClass, String.valueOf(val));
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val);
+		}
+	}
+	
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T extends Enum<T>> T getEnum(String key, Class<T> enumClass, T defaultValue) {
+		Object val = _set.get(key);
+		if (val == null) {
+			return defaultValue;
+		}
+		if (enumClass.isInstance(val)) {
+			return (T) val;
+		}
+		try {
+			return Enum.valueOf(enumClass, String.valueOf(val));
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Enum value of type " + enumClass.getName() + " required, but found: " + val);
+		}
+	}
+	
+	@SuppressWarnings("unchecked")
+	public final <A> A getObject(String name, Class<A> type) {
+		Object obj = _set.get(name);
+		if ((obj == null) || !type.isAssignableFrom(obj.getClass())) {
+			return null;
+		}
+		
+		return (A) obj;
+	}
+	
+	public SkillHolder getSkillHolder(String key) {
+		Object obj = _set.get(key);
+		if (!(obj instanceof SkillHolder)) {
+			return null;
+		}
+		return (SkillHolder) obj;
+	}
+	
+	@SuppressWarnings("unchecked")
+	public List<MinionHolder> getMinionList(String key) {
+		Object obj = _set.get(key);
+		if (!(obj instanceof List<?>)) {
+			return Collections.emptyList();
+		}
+		return (List<MinionHolder>) obj;
+	}
+	
+	public void set(String name, Object value) {
+		_set.put(name, value);
+	}
+	
+	public void set(String key, boolean value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, byte value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, short value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, int value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, long value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, float value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, double value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, String value) {
+		_set.put(key, value);
+	}
+	
+	public void set(String key, Enum<?> value) {
+		_set.put(key, value);
+	}
+	
+	public void safeSet(String key, int value, int min, int max, String reference) {
+		assert !(((min <= max) && ((value < min) || (value >= max))));
+		if ((min <= max) && ((value < min) || (value >= max))) {
+			LOG.error("Incorrect value: {} for: {} Ref: {}", value, key, reference);
+		}
+		
+		set(key, value);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TeleportBookmark.java b/src/main/java/com/l2jserver/gameserver/model/TeleportBookmark.java
new file mode 100644
index 00000000..fbcf4bd8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TeleportBookmark.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * @author UnAfraid
+ */
+public class TeleportBookmark extends Location {
+	private final int _id;
+	private int _icon;
+	private String _name, _tag;
+	
+	public TeleportBookmark(int id, int x, int y, int z, int icon, String tag, String name) {
+		super(x, y, z);
+		_id = id;
+		_icon = icon;
+		_name = name;
+		_tag = tag;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public void setName(String name) {
+		_name = name;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public int getIcon() {
+		return _icon;
+	}
+	
+	public void setIcon(int icon) {
+		_icon = icon;
+	}
+	
+	public String getTag() {
+		return _tag;
+	}
+	
+	public void setTag(String tag) {
+		_tag = tag;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TeleportWhereType.java b/src/main/java/com/l2jserver/gameserver/model/TeleportWhereType.java
new file mode 100644
index 00000000..30acfa51
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TeleportWhereType.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+/**
+ * All teleport types.
+ * @author xban1x
+ */
+public enum TeleportWhereType {
+	CASTLE,
+	CLANHALL,
+	SIEGEFLAG,
+	TOWN,
+	FORTRESS
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TempItem.java b/src/main/java/com/l2jserver/gameserver/model/TempItem.java
new file mode 100644
index 00000000..80405e48
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TempItem.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Class explanation:<br>
+ * For item counting or checking purposes. When you don't want to modify inventory<br>
+ * class contains itemId, quantity, ownerId, referencePrice, but not objectId<br>
+ * is stored, this will be only "list" of items with it's owner
+ */
+public final class TempItem {
+	private final int _itemId;
+	private int _quantity;
+	private final int _referencePrice;
+	private final String _itemName;
+	
+	public TempItem(L2ItemInstance item, int quantity) {
+		_itemId = item.getId();
+		_quantity = quantity;
+		_itemName = item.getItem().getName();
+		_referencePrice = item.getReferencePrice();
+	}
+	
+	public int getQuantity() {
+		return _quantity;
+	}
+	
+	public void setQuantity(int quantity) {
+		_quantity = quantity;
+	}
+	
+	public int getReferencePrice() {
+		return _referencePrice;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	public String getItemName() {
+		return _itemName;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TerritoryWard.java b/src/main/java/com/l2jserver/gameserver/model/TerritoryWard.java
new file mode 100644
index 00000000..7eb61186
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TerritoryWard.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class TerritoryWard {
+	
+	protected L2PcInstance _player = null;
+	public int playerId = 0;
+	private L2ItemInstance _item = null;
+	private L2Npc _npc;
+	
+	private Location _location;
+	private Location _oldLocation;
+	
+	private final int _itemId;
+	private int _ownerCastleId;
+	
+	private final int _territoryId;
+	
+	public TerritoryWard(int territory_id, int x, int y, int z, int heading, int item_id, int castleId, L2Npc npc) {
+		_territoryId = territory_id;
+		_location = new Location(x, y, z, heading);
+		_itemId = item_id;
+		_ownerCastleId = castleId;
+		_npc = npc;
+	}
+	
+	public int getTerritoryId() {
+		return _territoryId;
+	}
+	
+	public int getOwnerCastleId() {
+		return _ownerCastleId;
+	}
+	
+	public void setOwnerCastleId(int newOwner) {
+		_ownerCastleId = newOwner;
+	}
+	
+	public L2Npc getNpc() {
+		return _npc;
+	}
+	
+	public void setNpc(L2Npc npc) {
+		_npc = npc;
+	}
+	
+	public L2PcInstance getPlayer() {
+		return _player;
+	}
+	
+	public synchronized void spawnBack() {
+		if (_player != null) {
+			dropIt();
+		}
+		
+		// Init the dropped L2WardInstance and add it in the world as a visible object at the position where last Pc got it
+		_npc = TerritoryWarManager.getInstance().spawnNPC(36491 + _territoryId, _oldLocation);
+	}
+	
+	public synchronized void spawnMe() {
+		if (_player != null) {
+			dropIt();
+		}
+		
+		// Init the dropped L2WardInstance and add it in the world as a visible object at the position where Pc was last
+		_npc = TerritoryWarManager.getInstance().spawnNPC(36491 + _territoryId, _location);
+	}
+	
+	public synchronized void unSpawnMe() {
+		if (_player != null) {
+			dropIt();
+		}
+		if ((_npc != null) && !_npc.isDecayed()) {
+			_npc.deleteMe();
+		}
+	}
+	
+	public boolean activate(L2PcInstance player, L2ItemInstance item) {
+		if (player.isMounted()) {
+			player.sendPacket(SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+			player.destroyItem("CombatFlag", item, null, true);
+			spawnMe();
+			return false;
+		} else if (TerritoryWarManager.getInstance().getRegisteredTerritoryId(player) == 0) {
+			player.sendMessage("Non participants can't pickup Territory Wards!");
+			player.destroyItem("CombatFlag", item, null, true);
+			spawnMe();
+			return false;
+		}
+		
+		// Player holding it data
+		_player = player;
+		playerId = _player.getObjectId();
+		_oldLocation = new Location(_npc.getX(), _npc.getY(), _npc.getZ(), _npc.getHeading());
+		_npc = null;
+		
+		// Equip with the weapon
+		if (item == null) {
+			_item = ItemTable.getInstance().createItem("Combat", _itemId, 1, null, null);
+		} else {
+			_item = item;
+		}
+		_player.getInventory().equipItem(_item);
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_EQUIPPED);
+		sm.addItemName(_item);
+		_player.sendPacket(sm);
+		
+		// Refresh inventory
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addItem(_item);
+			_player.sendPacket(iu);
+		} else {
+			_player.sendPacket(new ItemList(_player, false));
+		}
+		
+		// Refresh player stats
+		_player.broadcastUserInfo();
+		_player.setCombatFlagEquipped(true);
+		_player.sendPacket(SystemMessageId.YOU_VE_ACQUIRED_THE_WARD);
+		TerritoryWarManager.getInstance().giveTWPoint(player, _territoryId, 5);
+		return true;
+	}
+	
+	public void dropIt() {
+		// Reset player stats
+		_player.setCombatFlagEquipped(false);
+		int slot = _player.getInventory().getSlotFromItem(_item);
+		_player.getInventory().unEquipItemInBodySlot(slot);
+		_player.destroyItem("CombatFlag", _item, null, true);
+		_item = null;
+		_player.broadcastUserInfo();
+		_location = new Location(_player.getX(), _player.getY(), _player.getZ(), _player.getHeading());
+		_player = null;
+		playerId = 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TimeStamp.java b/src/main/java/com/l2jserver/gameserver/model/TimeStamp.java
new file mode 100644
index 00000000..64aaa02e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TimeStamp.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Simple class containing all necessary information to maintain<br>
+ * valid time stamps and reuse for skills and items reuse upon re-login.<br>
+ * <b>Filter this carefully as it becomes redundant to store reuse for small delays.</b>
+ * @author Yesod
+ * @author Zoey76
+ */
+public class TimeStamp {
+	/** Item or skill ID. */
+	private final int _id1;
+	/** Item object ID or skill level. */
+	private final int _id2;
+	/** Item or skill reuse time. */
+	private final long _reuse;
+	/** Time stamp. */
+	private final long _stamp;
+	/** Shared reuse group. */
+	private final int _group;
+	
+	/**
+	 * Skill time stamp constructor.
+	 * @param skill the skill upon the stamp will be created.
+	 * @param reuse the reuse time for this skill.
+	 * @param systime overrides the system time with a customized one.
+	 */
+	public TimeStamp(Skill skill, long reuse, long systime) {
+		_id1 = skill.getId();
+		_id2 = skill.getLevel();
+		_reuse = reuse;
+		_stamp = systime > 0 ? systime : System.currentTimeMillis() + reuse;
+		_group = -1;
+	}
+	
+	/**
+	 * Item time stamp constructor.
+	 * @param item the item upon the stamp will be created.
+	 * @param reuse the reuse time for this item.
+	 * @param systime overrides the system time with a customized one.
+	 */
+	public TimeStamp(L2ItemInstance item, long reuse, long systime) {
+		_id1 = item.getId();
+		_id2 = item.getObjectId();
+		_reuse = reuse;
+		_stamp = systime > 0 ? systime : System.currentTimeMillis() + reuse;
+		_group = item.getSharedReuseGroup();
+	}
+	
+	/**
+	 * Gets the time stamp.
+	 * @return the time stamp, either the system time where this time stamp was created or the custom time assigned
+	 */
+	public long getStamp() {
+		return _stamp;
+	}
+	
+	/**
+	 * Gets the item ID.
+	 * @return the item ID
+	 */
+	public int getItemId() {
+		return _id1;
+	}
+	
+	/**
+	 * Gets the item object ID.
+	 * @return the item object ID
+	 */
+	public int getItemObjectId() {
+		return _id2;
+	}
+	
+	/**
+	 * Gets the skill ID.
+	 * @return the skill ID
+	 */
+	public int getSkillId() {
+		return _id1;
+	}
+	
+	/**
+	 * Gets the skill level.
+	 * @return the skill level
+	 */
+	public int getSkillLvl() {
+		return _id2;
+	}
+	
+	/**
+	 * Gets the reuse.
+	 * @return the reuse
+	 */
+	public long getReuse() {
+		return _reuse;
+	}
+	
+	/**
+	 * Get the shared reuse group.<br>
+	 * Only used on items.
+	 * @return the shared reuse group
+	 */
+	public int getSharedReuseGroup() {
+		return _group;
+	}
+	
+	/**
+	 * Gets the remaining time.
+	 * @return the remaining time for this time stamp to expire
+	 */
+	public long getRemaining() {
+		return Math.max(_stamp - System.currentTimeMillis(), 0);
+	}
+	
+	/**
+	 * Verifies if the reuse delay has passed.
+	 * @return {@code true} if this time stamp has expired, {@code false} otherwise
+	 */
+	public boolean hasNotPassed() {
+		return System.currentTimeMillis() < _stamp;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TowerSpawn.java b/src/main/java/com/l2jserver/gameserver/model/TowerSpawn.java
new file mode 100644
index 00000000..a6bf9b0d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TowerSpawn.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
+/**
+ * @author malyelfik
+ */
+public class TowerSpawn implements IIdentifiable {
+	private final int _npcId;
+	private final Location _location;
+	private List<Integer> _zoneList = null;
+	private int _upgradeLevel = 0;
+	
+	public TowerSpawn(int npcId, Location location) {
+		_location = location;
+		_npcId = npcId;
+	}
+	
+	public TowerSpawn(int npcId, Location location, List<Integer> zoneList) {
+		_location = location;
+		_npcId = npcId;
+		_zoneList = zoneList;
+	}
+	
+	@Override
+	public int getId() {
+		return _npcId;
+	}
+	
+	public Location getLocation() {
+		return _location;
+	}
+	
+	public List<Integer> getZoneList() {
+		return _zoneList;
+	}
+	
+	public void setUpgradeLevel(int level) {
+		_upgradeLevel = level;
+	}
+	
+	public int getUpgradeLevel() {
+		return _upgradeLevel;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/TradeItem.java b/src/main/java/com/l2jserver/gameserver/model/TradeItem.java
new file mode 100644
index 00000000..9d846b7b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TradeItem.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class TradeItem {
+	private int _objectId;
+	private final L2Item _item;
+	private final int _location;
+	private int _enchant;
+	private final int _type1;
+	private final int _type2;
+	private long _count;
+	private long _storeCount;
+	private long _price;
+	private final byte _elemAtkType;
+	private final int _elemAtkPower;
+	private final int[] _elemDefAttr = {
+		0,
+		0,
+		0,
+		0,
+		0,
+		0
+	};
+	private final int[] _enchantOptions;
+	
+	public TradeItem(L2ItemInstance item, long count, long price) {
+		_objectId = item.getObjectId();
+		_item = item.getItem();
+		_location = item.getLocationSlot();
+		_enchant = item.getEnchantLevel();
+		_type1 = item.getCustomType1();
+		_type2 = item.getCustomType2();
+		_count = count;
+		_price = price;
+		_elemAtkType = item.getAttackElementType();
+		_elemAtkPower = item.getAttackElementPower();
+		for (byte i = 0; i < 6; i++) {
+			_elemDefAttr[i] = item.getElementDefAttr(i);
+		}
+		_enchantOptions = item.getEnchantOptions();
+	}
+	
+	public TradeItem(L2Item item, long count, long price) {
+		_objectId = 0;
+		_item = item;
+		_location = 0;
+		_enchant = 0;
+		_type1 = 0;
+		_type2 = 0;
+		_count = count;
+		_storeCount = count;
+		_price = price;
+		_elemAtkType = Elementals.NONE;
+		_elemAtkPower = 0;
+		_enchantOptions = L2ItemInstance.DEFAULT_ENCHANT_OPTIONS;
+	}
+	
+	public TradeItem(TradeItem item, long count, long price) {
+		_objectId = item.getObjectId();
+		_item = item.getItem();
+		_location = item.getLocationSlot();
+		_enchant = item.getEnchant();
+		_type1 = item.getCustomType1();
+		_type2 = item.getCustomType2();
+		_count = count;
+		_storeCount = count;
+		_price = price;
+		_elemAtkType = item.getAttackElementType();
+		_elemAtkPower = item.getAttackElementPower();
+		for (byte i = 0; i < 6; i++) {
+			_elemDefAttr[i] = item.getElementDefAttr(i);
+		}
+		_enchantOptions = item.getEnchantOptions();
+	}
+	
+	public void setObjectId(int objectId) {
+		_objectId = objectId;
+	}
+	
+	public int getObjectId() {
+		return _objectId;
+	}
+	
+	public L2Item getItem() {
+		return _item;
+	}
+	
+	public int getLocationSlot() {
+		return _location;
+	}
+	
+	public void setEnchant(int enchant) {
+		_enchant = enchant;
+	}
+	
+	public int getEnchant() {
+		return _enchant;
+	}
+	
+	public int getCustomType1() {
+		return _type1;
+	}
+	
+	public int getCustomType2() {
+		return _type2;
+	}
+	
+	public void setCount(long count) {
+		_count = count;
+	}
+	
+	public long getCount() {
+		return _count;
+	}
+	
+	public long getStoreCount() {
+		return _storeCount;
+	}
+	
+	public void setPrice(long price) {
+		_price = price;
+	}
+	
+	public long getPrice() {
+		return _price;
+	}
+	
+	public byte getAttackElementType() {
+		return _elemAtkType;
+	}
+	
+	public int getAttackElementPower() {
+		return _elemAtkPower;
+	}
+	
+	public int getElementDefAttr(byte i) {
+		return _elemDefAttr[i];
+	}
+	
+	public int[] getEnchantOptions() {
+		return _enchantOptions;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/TradeList.java b/src/main/java/com/l2jserver/gameserver/model/TradeList.java
new file mode 100644
index 00000000..15dc950d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/TradeList.java
@@ -0,0 +1,887 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Advi
+ */
+public class TradeList {
+	private static final Logger LOG = LoggerFactory.getLogger(TradeList.class);
+	
+	private final L2PcInstance _owner;
+	private L2PcInstance _partner;
+	private final List<TradeItem> _items = new CopyOnWriteArrayList<>();
+	private String _title;
+	private boolean _packaged;
+	
+	private boolean _confirmed = false;
+	private boolean _locked = false;
+	
+	public TradeList(L2PcInstance owner) {
+		_owner = owner;
+	}
+	
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	public void setPartner(L2PcInstance partner) {
+		_partner = partner;
+	}
+	
+	public L2PcInstance getPartner() {
+		return _partner;
+	}
+	
+	public void setTitle(String title) {
+		_title = title;
+	}
+	
+	public String getTitle() {
+		return _title;
+	}
+	
+	public boolean isLocked() {
+		return _locked;
+	}
+	
+	public boolean isConfirmed() {
+		return _confirmed;
+	}
+	
+	public boolean isPackaged() {
+		return _packaged;
+	}
+	
+	public void setPackaged(boolean value) {
+		_packaged = value;
+	}
+	
+	/**
+	 * @return all items from TradeList
+	 */
+	public TradeItem[] getItems() {
+		return _items.toArray(new TradeItem[0]);
+	}
+	
+	/**
+	 * Returns the list of items in inventory available for transaction
+	 * @return L2ItemInstance : items in inventory
+	 */
+	public List<TradeItem> getAvailableItems(PcInventory inventory) {
+		final List<TradeItem> list = new LinkedList<>();
+		for (TradeItem item : _items) {
+			item = new TradeItem(item, item.getCount(), item.getPrice());
+			inventory.adjustAvailableItem(item);
+			list.add(item);
+		}
+		return list;
+	}
+	
+	/**
+	 * @return Item List size
+	 */
+	public int getItemCount() {
+		return _items.size();
+	}
+	
+	/**
+	 * Adjust available item from Inventory by the one in this list
+	 * @param item : L2ItemInstance to be adjusted
+	 * @return TradeItem representing adjusted item
+	 */
+	public TradeItem adjustAvailableItem(L2ItemInstance item) {
+		if (item.isStackable()) {
+			for (TradeItem exclItem : _items) {
+				if (exclItem.getItem().getId() == item.getId()) {
+					if (item.getCount() <= exclItem.getCount()) {
+						return null;
+					}
+					return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice());
+				}
+			}
+		}
+		return new TradeItem(item, item.getCount(), item.getReferencePrice());
+	}
+	
+	/**
+	 * Adjust ItemRequest by corresponding item in this list using its <b>ObjectId</b>
+	 * @param item : ItemRequest to be adjusted
+	 */
+	public void adjustItemRequest(ItemRequest item) {
+		for (TradeItem filtItem : _items) {
+			if (filtItem.getObjectId() == item.getObjectId()) {
+				if (filtItem.getCount() < item.getCount()) {
+					item.setCount(filtItem.getCount());
+				}
+				return;
+			}
+		}
+		item.setCount(0);
+	}
+	
+	/**
+	 * Add simplified item to TradeList
+	 * @param objectId : int
+	 * @param count : int
+	 * @return
+	 */
+	public TradeItem addItem(int objectId, long count) {
+		return addItem(objectId, count, 0);
+	}
+	
+	/**
+	 * Add item to TradeList
+	 * @param objectId : int
+	 * @param count : long
+	 * @param price : long
+	 * @return
+	 */
+	public synchronized TradeItem addItem(int objectId, long count, long price) {
+		if (isLocked()) {
+			LOG.warn("{}: Attempt to modify locked TradeList!", _owner.getName());
+			return null;
+		}
+		
+		L2Object o = L2World.getInstance().findObject(objectId);
+		if (!(o instanceof L2ItemInstance item)) {
+			LOG.warn("{}: Trying to add something other than an item!", _owner.getName());
+			return null;
+		}
+		
+		if (!(item.isTradeable() || (getOwner().isGM() && general().gmTradeRestrictedItems())) || item.isQuestItem()) {
+			LOG.warn("{}: Attempt to add a restricted item!", _owner.getName());
+			return null;
+		}
+		
+		if (!getOwner().getInventory().canManipulateWithItemId(item.getId())) {
+			LOG.warn("{}: Attempt to add an item that can't manipulate!", _owner.getName());
+			return null;
+		}
+		
+		if ((count <= 0) || (count > item.getCount())) {
+			LOG.warn("{}: Attempt to add an item with invalid item count!", _owner.getName());
+			return null;
+		}
+		
+		if (!item.isStackable() && (count > 1)) {
+			LOG.warn("{}: Attempt to add non-stackable item to TradeList with count > 1!", _owner.getName());
+			return null;
+		}
+		
+		if ((character().getMaxAdena() / count) < price) {
+			LOG.warn("{}: Attempt to overflow adena !", _owner.getName());
+			return null;
+		}
+		
+		for (TradeItem checkitem : _items) {
+			if (checkitem.getObjectId() == objectId) {
+				LOG.warn("{}: Attempt to add an item that is already present!", _owner.getName());
+				return null;
+			}
+		}
+		
+		TradeItem titem = new TradeItem(item, count, price);
+		_items.add(titem);
+		
+		// If Player has already confirmed this trade, invalidate the confirmation
+		invalidateConfirmation();
+		return titem;
+	}
+	
+	/**
+	 * Add item to TradeList
+	 */
+	public synchronized TradeItem addItemByItemId(int itemId, long count, long price) {
+		if (isLocked()) {
+			LOG.warn("{}: Attempt to modify locked TradeList!", _owner.getName());
+			return null;
+		}
+		
+		L2Item item = ItemTable.getInstance().getTemplate(itemId);
+		if (item == null) {
+			LOG.warn("{}: Attempt to add invalid item to TradeList!", _owner.getName());
+			return null;
+		}
+		
+		if (!item.isTradeable() || item.isQuestItem()) {
+			return null;
+		}
+		
+		if (!item.isStackable() && (count > 1)) {
+			LOG.warn("{}: Attempt to add non-stackable item to TradeList with count > 1!", _owner.getName());
+			return null;
+		}
+		
+		if ((character().getMaxAdena() / count) < price) {
+			LOG.warn("{}: Attempt to overflow adena !", _owner.getName());
+			return null;
+		}
+		
+		TradeItem titem = new TradeItem(item, count, price);
+		_items.add(titem);
+		
+		// If Player has already confirmed this trade, invalidate the confirmation
+		invalidateConfirmation();
+		return titem;
+	}
+	
+	/**
+	 * Remove item from TradeList
+	 * @param objectId : int
+	 * @param itemId
+	 * @param count : int
+	 * @return
+	 */
+	public synchronized TradeItem removeItem(int objectId, int itemId, long count) {
+		if (isLocked()) {
+			LOG.warn("{}: Attempt to modify locked TradeList!", _owner.getName());
+			return null;
+		}
+		
+		for (TradeItem titem : _items) {
+			if ((titem.getObjectId() == objectId) || (titem.getItem().getId() == itemId)) {
+				// If Partner has already confirmed this trade, invalidate the confirmation
+				if (_partner != null) {
+					TradeList partnerList = _partner.getActiveTradeList();
+					if (partnerList == null) {
+						LOG.warn("{}: Trading partner ({}) is invalid in this trade!", _partner.getName(), _partner.getName());
+						return null;
+					}
+					partnerList.invalidateConfirmation();
+				}
+				
+				// Reduce item count or complete item
+				if ((count != -1) && (titem.getCount() > count)) {
+					titem.setCount(titem.getCount() - count);
+				} else {
+					_items.remove(titem);
+				}
+				
+				return titem;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Update items in TradeList according their quantity in owner inventory
+	 */
+	public synchronized void updateItems() {
+		for (TradeItem titem : _items) {
+			L2ItemInstance item = _owner.getInventory().getItemByObjectId(titem.getObjectId());
+			if ((item == null) || (titem.getCount() < 1)) {
+				removeItem(titem.getObjectId(), -1, -1);
+			} else if (item.getCount() < titem.getCount()) {
+				titem.setCount(item.getCount());
+			}
+		}
+	}
+	
+	/**
+	 * Lockes TradeList, no further changes are allowed
+	 */
+	public void lock() {
+		_locked = true;
+	}
+	
+	/**
+	 * Clears item list
+	 */
+	public synchronized void clear() {
+		_items.clear();
+		_locked = false;
+	}
+	
+	/**
+	 * Confirms TradeList
+	 * @return : boolean
+	 */
+	public boolean confirm() {
+		if (_confirmed) {
+			return true; // Already confirmed
+		}
+		
+		// If Partner has already confirmed this trade, proceed exchange
+		if (_partner != null) {
+			TradeList partnerList = _partner.getActiveTradeList();
+			if (partnerList == null) {
+				LOG.warn("{}: Trading partner ({}) is invalid in this trade!", _partner.getName(), _partner.getName());
+				return false;
+			}
+			
+			// Synchronization order to avoid deadlock
+			TradeList sync1, sync2;
+			if (getOwner().getObjectId() > partnerList.getOwner().getObjectId()) {
+				sync1 = partnerList;
+				sync2 = this;
+			} else {
+				sync1 = this;
+				sync2 = partnerList;
+			}
+			
+			synchronized (sync1) {
+				synchronized (sync2) {
+					_confirmed = true;
+					if (partnerList.isConfirmed()) {
+						partnerList.lock();
+						lock();
+						if (!partnerList.validate()) {
+							return false;
+						}
+						if (!validate()) {
+							return false;
+						}
+						
+						doExchange(partnerList);
+					} else {
+						_partner.onTradeConfirm(_owner);
+					}
+				}
+			}
+		} else {
+			_confirmed = true;
+		}
+		
+		return _confirmed;
+	}
+	
+	/**
+	 * Cancels TradeList confirmation
+	 */
+	public void invalidateConfirmation() {
+		_confirmed = false;
+	}
+	
+	/**
+	 * Validates TradeList with owner inventory
+	 */
+	private boolean validate() {
+		// Check for Owner validity
+		if ((_owner == null) || (L2World.getInstance().getPlayer(_owner.getObjectId()) == null)) {
+			LOG.warn("Invalid owner of TradeList");
+			return false;
+		}
+		
+		// Check for Item validity
+		for (TradeItem titem : _items) {
+			L2ItemInstance item = _owner.checkItemManipulation(titem.getObjectId(), titem.getCount(), "transfer");
+			if ((item == null) || (item.getCount() < 1)) {
+				LOG.warn("{}: Invalid Item in TradeList", _owner.getName());
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Transfers all TradeItems from inventory to partner
+	 */
+	private boolean TransferItems(L2PcInstance partner, InventoryUpdate ownerIU, InventoryUpdate partnerIU) {
+		for (TradeItem titem : _items) {
+			L2ItemInstance oldItem = _owner.getInventory().getItemByObjectId(titem.getObjectId());
+			if (oldItem == null) {
+				return false;
+			}
+			L2ItemInstance newItem = _owner.getInventory().transferItem("Trade", titem.getObjectId(), titem.getCount(), partner.getInventory(), _owner, _partner);
+			if (newItem == null) {
+				return false;
+			}
+			
+			// Add changes to inventory update packets
+			if (ownerIU != null) {
+				if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+					ownerIU.addModifiedItem(oldItem);
+				} else {
+					ownerIU.addRemovedItem(oldItem);
+				}
+			}
+			
+			if (partnerIU != null) {
+				if (newItem.getCount() > titem.getCount()) {
+					partnerIU.addModifiedItem(newItem);
+				} else {
+					partnerIU.addNewItem(newItem);
+				}
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * @param partner
+	 * @return items slots count
+	 */
+	public int countItemsSlots(L2PcInstance partner) {
+		int slots = 0;
+		
+		for (TradeItem item : _items) {
+			if (item == null) {
+				continue;
+			}
+			L2Item template = ItemTable.getInstance().getTemplate(item.getItem().getId());
+			if (template == null) {
+				continue;
+			}
+			if (!template.isStackable()) {
+				slots += item.getCount();
+			} else if (partner.getInventory().getItemByItemId(item.getItem().getId()) == null) {
+				slots++;
+			}
+		}
+		
+		return slots;
+	}
+	
+	/**
+	 * @return the weight of items in tradeList
+	 */
+	public int calcItemsWeight() {
+		long weight = 0;
+		
+		for (TradeItem item : _items) {
+			if (item == null) {
+				continue;
+			}
+			L2Item template = ItemTable.getInstance().getTemplate(item.getItem().getId());
+			if (template == null) {
+				continue;
+			}
+			weight += item.getCount() * template.getWeight();
+		}
+		
+		return (int) Math.min(weight, Integer.MAX_VALUE);
+	}
+	
+	/**
+	 * Proceeds with trade
+	 * @param partnerList
+	 */
+	private void doExchange(TradeList partnerList) {
+		boolean success = false;
+		
+		// check weight and slots
+		if ((!getOwner().getInventory().validateWeight(partnerList.calcItemsWeight())) || !(partnerList.getOwner().getInventory().validateWeight(calcItemsWeight()))) {
+			partnerList.getOwner().sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			getOwner().sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+		} else if ((!getOwner().getInventory().validateCapacity(partnerList.countItemsSlots(getOwner()))) || (!partnerList.getOwner().getInventory().validateCapacity(countItemsSlots(partnerList.getOwner())))) {
+			partnerList.getOwner().sendPacket(SystemMessageId.SLOTS_FULL);
+			getOwner().sendPacket(SystemMessageId.SLOTS_FULL);
+		} else {
+			// Prepare inventory update packet
+			InventoryUpdate ownerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+			InventoryUpdate partnerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+			
+			// Transfer items
+			partnerList.TransferItems(getOwner(), partnerIU, ownerIU);
+			TransferItems(partnerList.getOwner(), ownerIU, partnerIU);
+			
+			// Send inventory update packet
+			_owner.sendPacket(Objects.requireNonNullElseGet(ownerIU, () -> new ItemList(_owner, false)));
+			_partner.sendPacket(Objects.requireNonNullElseGet(partnerIU, () -> new ItemList(_partner, false)));
+			
+			// Update current load as well
+			StatusUpdate playerSU = new StatusUpdate(_owner);
+			playerSU.addAttribute(StatusUpdate.CUR_LOAD, _owner.getCurrentLoad());
+			_owner.sendPacket(playerSU);
+			playerSU = new StatusUpdate(_partner);
+			playerSU.addAttribute(StatusUpdate.CUR_LOAD, _partner.getCurrentLoad());
+			_partner.sendPacket(playerSU);
+			
+			success = true;
+		}
+		// Finish the trade
+		partnerList.getOwner().onTradeFinish(success);
+		getOwner().onTradeFinish(success);
+	}
+	
+	/**
+	 * Buy items from this PrivateStore list
+	 * @param player
+	 * @param items
+	 * @return int: result of trading. 0 - ok, 1 - canceled (no adena), 2 - failed (item error)
+	 */
+	public synchronized int privateStoreBuy(L2PcInstance player, Set<ItemRequest> items) {
+		if (_locked) {
+			return 1;
+		}
+		
+		if (!validate()) {
+			lock();
+			return 1;
+		}
+		
+		if (!_owner.isOnline() || !player.isOnline()) {
+			return 1;
+		}
+		
+		int slots = 0;
+		int weight = 0;
+		long totalPrice = 0;
+		
+		final PcInventory ownerInventory = _owner.getInventory();
+		final PcInventory playerInventory = player.getInventory();
+		
+		for (ItemRequest item : items) {
+			boolean found = false;
+			
+			for (TradeItem ti : _items) {
+				if (ti.getObjectId() == item.getObjectId()) {
+					if (ti.getPrice() == item.getPrice()) {
+						if (ti.getCount() < item.getCount()) {
+							item.setCount(ti.getCount());
+						}
+						found = true;
+					}
+					break;
+				}
+			}
+			// item with this objectId and price not found in tradelist
+			if (!found) {
+				if (isPackaged()) {
+					Util.handleIllegalPlayerAction(player, "[TradeList.privateStoreBuy()] Player " + player.getName() + " tried to cheat the package sell and buy only a part of the package! Ban this player for bot usage!");
+					return 2;
+				}
+				
+				item.setCount(0);
+				continue;
+			}
+			
+			// check for overflow in the single item
+			if ((character().getMaxAdena() / item.getCount()) < item.getPrice()) {
+				// private store attempting to overflow - disable it
+				lock();
+				return 1;
+			}
+			
+			totalPrice += item.getCount() * item.getPrice();
+			// check for overflow of the total price
+			if ((character().getMaxAdena() < totalPrice) || (totalPrice < 0)) {
+				// private store attempting to overflow - disable it
+				lock();
+				return 1;
+			}
+			
+			// Check if requested item is available for manipulation
+			L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell");
+			if ((oldItem == null) || !oldItem.isTradeable()) {
+				// private store sell invalid item - disable it
+				lock();
+				return 2;
+			}
+			
+			L2Item template = ItemTable.getInstance().getTemplate(item.getItemId());
+			if (template == null) {
+				continue;
+			}
+			weight += item.getCount() * template.getWeight();
+			if (!template.isStackable()) {
+				slots += item.getCount();
+			} else if (playerInventory.getItemByItemId(item.getItemId()) == null) {
+				slots++;
+			}
+		}
+		
+		if (totalPrice > playerInventory.getAdena()) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			return 1;
+		}
+		
+		if (!playerInventory.validateWeight(weight)) {
+			player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			return 1;
+		}
+		
+		if (!playerInventory.validateCapacity(slots)) {
+			player.sendPacket(SystemMessageId.SLOTS_FULL);
+			return 1;
+		}
+		
+		// Prepare inventory update packets
+		final InventoryUpdate ownerIU = new InventoryUpdate();
+		final InventoryUpdate playerIU = new InventoryUpdate();
+		
+		final L2ItemInstance adenaItem = playerInventory.getAdenaInstance();
+		if (!playerInventory.reduceAdena("PrivateStore", totalPrice, player, _owner)) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			return 1;
+		}
+		playerIU.addItem(adenaItem);
+		ownerInventory.addAdena("PrivateStore", totalPrice, _owner, player);
+		// ownerIU.addItem(ownerInventory.getAdenaInstance());
+		
+		boolean ok = true;
+		
+		// Transfer items
+		for (ItemRequest item : items) {
+			if (item.getCount() == 0) {
+				continue;
+			}
+			
+			// Check if requested item is available for manipulation
+			L2ItemInstance oldItem = _owner.checkItemManipulation(item.getObjectId(), item.getCount(), "sell");
+			if (oldItem == null) {
+				// should not happens - validation already done
+				lock();
+				ok = false;
+				break;
+			}
+			
+			// Proceed with item transfer
+			L2ItemInstance newItem = ownerInventory.transferItem("PrivateStore", item.getObjectId(), item.getCount(), playerInventory, _owner, player);
+			if (newItem == null) {
+				ok = false;
+				break;
+			}
+			removeItem(item.getObjectId(), -1, item.getCount());
+			
+			// Add changes to inventory update packets
+			if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+				ownerIU.addModifiedItem(oldItem);
+			} else {
+				ownerIU.addRemovedItem(oldItem);
+			}
+			if (newItem.getCount() > item.getCount()) {
+				playerIU.addModifiedItem(newItem);
+			} else {
+				playerIU.addNewItem(newItem);
+			}
+			
+			// Send messages about the transaction to both players
+			if (newItem.isStackable()) {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
+				msg.addString(player.getName());
+				msg.addItemName(newItem);
+				msg.addLong(item.getCount());
+				_owner.sendPacket(msg);
+				
+				msg = SystemMessage.getSystemMessage(SystemMessageId.PURCHASED_S3_S2_S_FROM_C1);
+				msg.addString(_owner.getName());
+				msg.addItemName(newItem);
+				msg.addLong(item.getCount());
+				player.sendPacket(msg);
+			} else {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S2);
+				msg.addString(player.getName());
+				msg.addItemName(newItem);
+				_owner.sendPacket(msg);
+				
+				msg = SystemMessage.getSystemMessage(SystemMessageId.PURCHASED_S2_FROM_C1);
+				msg.addString(_owner.getName());
+				msg.addItemName(newItem);
+				player.sendPacket(msg);
+			}
+		}
+		
+		// Send inventory update packet
+		_owner.sendPacket(ownerIU);
+		player.sendPacket(playerIU);
+		if (ok) {
+			return 0;
+		}
+		return 2;
+	}
+	
+	/**
+	 * Sell items to this PrivateStore list
+	 * @param player
+	 * @param items
+	 * @return : boolean true if success
+	 */
+	public synchronized boolean privateStoreSell(L2PcInstance player, ItemRequest[] items) {
+		if (_locked) {
+			return false;
+		}
+		
+		if (!_owner.isOnline() || !player.isOnline()) {
+			return false;
+		}
+		
+		boolean ok = false;
+		
+		final PcInventory ownerInventory = _owner.getInventory();
+		final PcInventory playerInventory = player.getInventory();
+		
+		// Prepare inventory update packet
+		final InventoryUpdate ownerIU = new InventoryUpdate();
+		final InventoryUpdate playerIU = new InventoryUpdate();
+		
+		long totalPrice = 0;
+		
+		for (ItemRequest item : items) {
+			// searching item in tradelist using itemId
+			boolean found = false;
+			
+			for (TradeItem ti : _items) {
+				if (ti.getItem().getId() == item.getItemId()) {
+					// price should be the same
+					if (ti.getPrice() == item.getPrice()) {
+						// if requesting more than available - decrease count
+						if (ti.getCount() < item.getCount()) {
+							item.setCount(ti.getCount());
+						}
+						found = item.getCount() > 0;
+					}
+					break;
+				}
+			}
+			// not found any item in the tradelist with same itemId and price
+			// maybe another player already sold this item ?
+			if (!found) {
+				continue;
+			}
+			
+			// check for overflow in the single item
+			if ((character().getMaxAdena() / item.getCount()) < item.getPrice()) {
+				lock();
+				break;
+			}
+			
+			long _totalPrice = totalPrice + (item.getCount() * item.getPrice());
+			// check for overflow of the total price
+			if ((character().getMaxAdena() < _totalPrice) || (_totalPrice < 0)) {
+				lock();
+				break;
+			}
+			
+			if (ownerInventory.getAdena() < _totalPrice) {
+				continue;
+			}
+			
+			// Check if requested item is available for manipulation
+			int objectId = item.getObjectId();
+			L2ItemInstance oldItem = player.checkItemManipulation(objectId, item.getCount(), "sell");
+			// private store - buy use same objectId for buying several non-stackable items
+			if (oldItem == null) {
+				// searching other items using same itemId
+				oldItem = playerInventory.getItemByItemId(item.getItemId());
+				if (oldItem == null) {
+					continue;
+				}
+				objectId = oldItem.getObjectId();
+				oldItem = player.checkItemManipulation(objectId, item.getCount(), "sell");
+				if (oldItem == null) {
+					continue;
+				}
+			}
+			if (oldItem.getId() != item.getItemId()) {
+				Util.handleIllegalPlayerAction(player, player + " is cheating with sell items");
+				return false;
+			}
+			
+			if (!oldItem.isTradeable()) {
+				continue;
+			}
+			
+			// Proceed with item transfer
+			L2ItemInstance newItem = playerInventory.transferItem("PrivateStore", objectId, item.getCount(), ownerInventory, player, _owner);
+			if (newItem == null) {
+				continue;
+			}
+			
+			removeItem(-1, item.getItemId(), item.getCount());
+			ok = true;
+			
+			// increase total price only after successful transaction
+			totalPrice = _totalPrice;
+			
+			// Add changes to inventory update packets
+			if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+				playerIU.addModifiedItem(oldItem);
+			} else {
+				playerIU.addRemovedItem(oldItem);
+			}
+			if (newItem.getCount() > item.getCount()) {
+				ownerIU.addModifiedItem(newItem);
+			} else {
+				ownerIU.addNewItem(newItem);
+			}
+			
+			// Send messages about the transaction to both players
+			if (newItem.isStackable()) {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.PURCHASED_S3_S2_S_FROM_C1);
+				msg.addString(player.getName());
+				msg.addItemName(newItem);
+				msg.addLong(item.getCount());
+				_owner.sendPacket(msg);
+				
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
+				msg.addString(_owner.getName());
+				msg.addItemName(newItem);
+				msg.addLong(item.getCount());
+				player.sendPacket(msg);
+			} else {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.PURCHASED_S2_FROM_C1);
+				msg.addString(player.getName());
+				msg.addItemName(newItem);
+				_owner.sendPacket(msg);
+				
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S2);
+				msg.addString(_owner.getName());
+				msg.addItemName(newItem);
+				player.sendPacket(msg);
+			}
+		}
+		
+		if (totalPrice > 0) {
+			// Transfer adena
+			if (totalPrice > ownerInventory.getAdena()) {
+				// should not happens, just a precaution
+				return false;
+			}
+			final L2ItemInstance adenaItem = ownerInventory.getAdenaInstance();
+			ownerInventory.reduceAdena("PrivateStore", totalPrice, _owner, player);
+			ownerIU.addItem(adenaItem);
+			playerInventory.addAdena("PrivateStore", totalPrice, player, _owner);
+			playerIU.addItem(playerInventory.getAdenaInstance());
+		}
+		
+		if (ok) {
+			// Send inventory update packet
+			_owner.sendPacket(ownerIU);
+			player.sendPacket(playerIU);
+		}
+		return ok;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/UIKeysSettings.java b/src/main/java/com/l2jserver/gameserver/model/UIKeysSettings.java
new file mode 100644
index 00000000..294977f5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/UIKeysSettings.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.xml.impl.UIData;
+
+/**
+ * UI Keys Settings class.
+ * @author mrTJO
+ * @author Zoey76
+ */
+public class UIKeysSettings {
+	private static final Logger LOG = LoggerFactory.getLogger(UIKeysSettings.class);
+	
+	private final int _playerObjId;
+	private Map<Integer, List<ActionKey>> _storedKeys;
+	private Map<Integer, List<Integer>> _storedCategories;
+	private boolean _saved = true;
+	
+	public UIKeysSettings(int playerObjId) {
+		_playerObjId = playerObjId;
+		loadFromDB();
+	}
+	
+	public void storeAll(Map<Integer, List<Integer>> catMap, Map<Integer, List<ActionKey>> keyMap) {
+		_saved = false;
+		_storedCategories = catMap;
+		_storedKeys = keyMap;
+	}
+	
+	public void storeCategories(Map<Integer, List<Integer>> catMap) {
+		_saved = false;
+		_storedCategories = catMap;
+	}
+	
+	public Map<Integer, List<Integer>> getCategories() {
+		return _storedCategories;
+	}
+	
+	public void storeKeys(Map<Integer, List<ActionKey>> keyMap) {
+		_saved = false;
+		_storedKeys = keyMap;
+	}
+	
+	public Map<Integer, List<ActionKey>> getKeys() {
+		return _storedKeys;
+	}
+	
+	private void loadFromDB() {
+		getCatsFromDB();
+		getKeysFromDB();
+	}
+	
+	/**
+	 * Save Categories and Mapped Keys into GameServer DataBase
+	 */
+	public void saveInDB() {
+		StringBuilder query;
+		if (_saved) {
+			return;
+		}
+		
+		// TODO(Zoey76): Refactor this to use batch.
+		query = new StringBuilder("REPLACE INTO character_ui_categories (`charId`, `catId`, `order`, `cmdId`) VALUES ");
+		for (int category : _storedCategories.keySet()) {
+			int order = 0;
+			for (int key : _storedCategories.get(category)) {
+				query.append("(").append(_playerObjId).append(", ").append(category).append(", ").append(order++).append(", ").append(key).append("),");
+			}
+		}
+		query = new StringBuilder(query.substring(0, query.length() - 1) + "; ");
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement(query.toString())) {
+			statement.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: saveInDB(): {}", e.getMessage(), e);
+		}
+		
+		query = new StringBuilder("REPLACE INTO character_ui_actions (`charId`, `cat`, `order`, `cmd`, `key`, `tgKey1`, `tgKey2`, `show`) VALUES");
+		for (List<ActionKey> keyLst : _storedKeys.values()) {
+			int order = 0;
+			for (ActionKey key : keyLst) {
+				query.append(key.getSqlSaveString(_playerObjId, order++)).append(",");
+			}
+		}
+		query = new StringBuilder(query.substring(0, query.length() - 1) + ";");
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement(query.toString())) {
+			statement.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: saveInDB(): {}", e.getMessage(), e);
+		}
+		_saved = true;
+	}
+	
+	private void getCatsFromDB() {
+		if (_storedCategories != null) {
+			return;
+		}
+		
+		_storedCategories = new HashMap<>();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM character_ui_categories WHERE `charId` = ? ORDER BY `catId`, `order`")) {
+			ps.setInt(1, _playerObjId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					UIData.addCategory(_storedCategories, rs.getInt("catId"), rs.getInt("cmdId"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: getCatsFromDB(): {}", e.getMessage(), e);
+		}
+		
+		if (_storedCategories.isEmpty()) {
+			_storedCategories = UIData.getInstance().getCategories();
+		}
+	}
+	
+	private void getKeysFromDB() {
+		if (_storedKeys != null) {
+			return;
+		}
+		
+		_storedKeys = new HashMap<>();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM character_ui_actions WHERE `charId` = ? ORDER BY `cat`, `order`")) {
+			ps.setInt(1, _playerObjId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int cat = rs.getInt("cat");
+					int cmd = rs.getInt("cmd");
+					int key = rs.getInt("key");
+					int tgKey1 = rs.getInt("tgKey1");
+					int tgKey2 = rs.getInt("tgKey2");
+					int show = rs.getInt("show");
+					UIData.addKey(_storedKeys, cat, new ActionKey(cat, cmd, key, tgKey1, tgKey2, show));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: getKeysFromDB(): {}", e.getMessage(), e);
+		}
+		
+		if (_storedKeys.isEmpty()) {
+			_storedKeys = UIData.getInstance().getKeys();
+		}
+	}
+	
+	public boolean isSaved() {
+		return _saved;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/VehiclePathPoint.java b/src/main/java/com/l2jserver/gameserver/model/VehiclePathPoint.java
new file mode 100644
index 00000000..91622fdb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/VehiclePathPoint.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+public final class VehiclePathPoint extends Location {
+	private final int _moveSpeed;
+	private final int _rotationSpeed;
+	
+	public VehiclePathPoint(int x, int y, int z) {
+		super(x, y, z);
+		_moveSpeed = 350;
+		_rotationSpeed = 4000;
+	}
+	
+	public VehiclePathPoint(int x, int y, int z, int moveSpeed, int rotationSpeed) {
+		super(x, y, z);
+		_moveSpeed = moveSpeed;
+		_rotationSpeed = rotationSpeed;
+	}
+	
+	public int getMoveSpeed() {
+		return _moveSpeed;
+	}
+	
+	public int getRotationSpeed() {
+		return _rotationSpeed;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/WalkInfo.java b/src/main/java/com/l2jserver/gameserver/model/WalkInfo.java
new file mode 100644
index 00000000..2a128d87
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/WalkInfo.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model;
+
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveRouteFinished;
+
+/**
+ * Holds info about current walk progress.
+ * @author GKR
+ * @author UnAfraid
+ */
+public class WalkInfo {
+	private final String _routeName;
+	private ScheduledFuture<?> _walkCheckTask;
+	private boolean _blocked = false;
+	private boolean _suspended = false;
+	private boolean _stoppedByAttack = false;
+	private int _currentNode = 0;
+	private boolean _forward = true; // Determines first --> last or first <-- last direction
+	private long _lastActionTime; // Debug field
+	
+	public WalkInfo(String routeName) {
+		_routeName = routeName;
+	}
+	
+	/**
+	 * @return name of route of this WalkInfo.
+	 */
+	public L2WalkRoute getRoute() {
+		return WalkingManager.getInstance().getRoute(_routeName);
+	}
+	
+	/**
+	 * @return current node of this WalkInfo.
+	 */
+	public L2NpcWalkerNode getCurrentNode() {
+		return getRoute().getNodeList().get(_currentNode);
+	}
+	
+	/**
+	 * Calculate next node for this WalkInfo and send debug message from given npc
+	 * @param npc NPC to debug message to be sent from
+	 */
+	public synchronized void calculateNextNode(L2Npc npc) {
+		// Check this first, within the bounds of random moving, we have no conception of "first" or "last" node
+		if (getRoute().getRepeatType() == WalkingManager.REPEAT_RANDOM) {
+			int newNode = _currentNode;
+			
+			while (newNode == _currentNode) {
+				newNode = Rnd.get(getRoute().getNodesCount());
+			}
+			
+			_currentNode = newNode;
+			npc.sendDebugMessage("Route: " + getRoute().getName() + ", next random node is " + _currentNode);
+		} else {
+			if (_forward) {
+				_currentNode++;
+			} else {
+				_currentNode--;
+			}
+			
+			if (_currentNode == getRoute().getNodesCount()) // Last node arrived
+			{
+				// Notify quest
+				EventDispatcher.getInstance().notifyEventAsync(new NpcMoveRouteFinished(npc), npc);
+				npc.sendDebugMessage("Route: " + getRoute().getName() + ", last node arrived");
+				
+				if (!getRoute().repeatWalk()) {
+					WalkingManager.getInstance().cancelMoving(npc);
+					return;
+				}
+				
+				switch (getRoute().getRepeatType()) {
+					case WalkingManager.REPEAT_GO_BACK -> {
+						_forward = false;
+						_currentNode -= 2;
+					}
+					case WalkingManager.REPEAT_GO_FIRST -> _currentNode = 0;
+					case WalkingManager.REPEAT_TELE_FIRST -> {
+						npc.teleToLocation(npc.getSpawn().getLocation());
+						_currentNode = 0;
+					}
+				}
+			} else if (_currentNode == WalkingManager.NO_REPEAT) {
+				// First node arrived, when direction is first <-- last
+				_currentNode = 1;
+				_forward = true;
+			}
+		}
+	}
+	
+	/**
+	 * @return {@code true} if walking task is blocked, {@code false} otherwise,
+	 */
+	public boolean isBlocked() {
+		return _blocked;
+	}
+	
+	public void setBlocked(boolean val) {
+		_blocked = val;
+	}
+	
+	/**
+	 * @return {@code true} if walking task is suspended, {@code false} otherwise,
+	 */
+	public boolean isSuspended() {
+		return _suspended;
+	}
+	
+	public void setSuspended(boolean val) {
+		_suspended = val;
+	}
+	
+	/**
+	 * @return {@code true} if walking task shall be stopped by attack, {@code false} otherwise,
+	 */
+	public boolean isStoppedByAttack() {
+		return _stoppedByAttack;
+	}
+	
+	public void setStoppedByAttack(boolean val) {
+		_stoppedByAttack = val;
+	}
+	
+	/**
+	 * @return the id of the current node in this walking task.
+	 */
+	public int getCurrentNodeId() {
+		return _currentNode;
+	}
+	
+	/**
+	 * @return {@code long} last action time used only for debugging.
+	 */
+	public long getLastAction() {
+		return _lastActionTime;
+	}
+	
+	public void setLastAction(long val) {
+		_lastActionTime = val;
+	}
+	
+	/**
+	 * @return walking check task.
+	 */
+	public ScheduledFuture<?> getWalkCheckTask() {
+		return _walkCheckTask;
+	}
+	
+	/**
+	 * @param val walking check task.
+	 */
+	public void setWalkCheckTask(ScheduledFuture<?> val) {
+		_walkCheckTask = val;
+	}
+	
+	@Override
+	public String toString() {
+		return "WalkInfo [_routeName=" + _routeName + ", _walkCheckTask=" + _walkCheckTask + ", _blocked=" + _blocked + ", _suspended=" + _suspended + ", _stoppedByAttack=" + _stoppedByAttack + ", _currentNode=" + _currentNode + ", _forward=" + _forward + ", _lastActionTime=" + _lastActionTime
+			+ "]";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
new file mode 100644
index 00000000..fca039c8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
@@ -0,0 +1,1452 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.hunting;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2AttackableAI;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.ai.L2FortSiegeGuardAI;
+import com.l2jserver.gameserver.ai.L2SiegeGuardAI;
+import com.l2jserver.gameserver.datatables.EventDroplist;
+import com.l2jserver.gameserver.datatables.EventDroplist.DateDrop;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.AbsorberInfo;
+import com.l2jserver.gameserver.model.AggroInfo;
+import com.l2jserver.gameserver.model.DamageDoneInfo;
+import com.l2jserver.gameserver.model.L2CommandChannel;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.AttackableKnownList;
+import com.l2jserver.gameserver.model.actor.status.AttackableStatus;
+import com.l2jserver.gameserver.model.actor.tasks.attackable.CommandChannelTimer;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.drops.DropListScope;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAggroRangeEnter;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAttack;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableKill;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+import com.l2jserver.gameserver.util.Util;
+
+public class L2Attackable extends L2Npc {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Attackable.class);
+	// Raid
+	private boolean _isRaid = false;
+	private boolean _isRaidMinion = false;
+	//
+	private boolean _champion = false;
+	private final Map<L2Character, AggroInfo> _aggroList = new ConcurrentHashMap<>();
+	private boolean _isReturningToSpawnPoint = false;
+	private boolean _canReturnToSpawnPoint = true;
+	private boolean _seeThroughSilentMove = false;
+	// Manor
+	private boolean _seeded = false;
+	private L2Seed _seed = null;
+	private int _seederObjId = 0;
+	private final AtomicReference<ItemHolder> _harvestItem = new AtomicReference<>();
+	// Spoil
+	private int _spoilerObjectId;
+	private final AtomicReference<Collection<ItemHolder>> _sweepItems = new AtomicReference<>();
+	// Over-hit
+	private boolean _overhit;
+	private double _overhitDamage;
+	private L2Character _overhitAttacker;
+	// Command channel
+	private volatile L2CommandChannel _firstCommandChannelAttacked = null;
+	private CommandChannelTimer _commandChannelTimer = null;
+	private long _commandChannelLastAttack = 0;
+	// Soul crystal
+	private boolean _absorbed;
+	private final Map<Integer, AbsorberInfo> _absorbersList = new ConcurrentHashMap<>();
+	// Misc
+	private boolean _mustGiveExpSp;
+	protected int _onKillDelay = 5000;
+	
+	/**
+	 * Creates an attackable NPC.
+	 * @param template the attackable NPC template
+	 */
+	public L2Attackable(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2Attackable);
+		setIsInvul(false);
+		_mustGiveExpSp = true;
+	}
+	
+	@Override
+	public AttackableKnownList getKnownList() {
+		return (AttackableKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new AttackableKnownList(this));
+	}
+	
+	@Override
+	public AttackableStatus getStatus() {
+		return (AttackableStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new AttackableStatus(this));
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		return new L2AttackableAI(this);
+	}
+	
+	public final Map<L2Character, AggroInfo> getAggroList() {
+		return _aggroList;
+	}
+	
+	public final boolean isReturningToSpawnPoint() {
+		return _isReturningToSpawnPoint;
+	}
+	
+	public final void setisReturningToSpawnPoint(boolean value) {
+		_isReturningToSpawnPoint = value;
+	}
+	
+	public final boolean canReturnToSpawnPoint() {
+		return _canReturnToSpawnPoint;
+	}
+	
+	public final void setCanReturnToSpawnPoint(boolean value) {
+		_canReturnToSpawnPoint = value;
+	}
+	
+	public boolean canSeeThroughSilentMove() {
+		return _seeThroughSilentMove;
+	}
+	
+	public void setSeeThroughSilentMove(boolean val) {
+		_seeThroughSilentMove = val;
+	}
+	
+	/**
+	 * Use the skill if minimum checks are pass.
+	 * @param skill the skill
+	 */
+	public void useMagic(Skill skill) {
+		if ((skill == null) || isAlikeDead() || skill.isPassive() || isCastingNow() || isSkillDisabled(skill)) {
+			return;
+		}
+		
+		if ((getCurrentMp() < (getStat().getMpConsume1(skill) + getStat().getMpConsume2(skill))) || (getCurrentHp() <= skill.getHpConsume())) {
+			return;
+		}
+		
+		if (!skill.isStatic()) {
+			if (skill.isMagic()) {
+				if (isMuted()) {
+					return;
+				}
+			} else {
+				if (isPhysicalMuted()) {
+					return;
+				}
+			}
+		}
+		
+		final var targets = skill.getTargets(this);
+		if (!targets.isEmpty()) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, targets.get(0));
+		}
+	}
+	
+	/**
+	 * Reduce the current HP of the L2Attackable.
+	 * @param damage The HP decrease value
+	 * @param attacker The L2Character who attacks
+	 */
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, Skill skill) {
+		reduceCurrentHp(damage, attacker, true, false, skill);
+	}
+	
+	/**
+	 * Reduce the current HP of the L2Attackable, update its _aggroList and launch the doDie Task if necessary.
+	 * @param damage The HP decrease value
+	 * @param attacker The L2Character who attacks
+	 * @param awake The awake state (If True : stop sleeping)
+	 * @param isDOT
+	 * @param skill
+	 */
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, Skill skill) {
+		if (isRaid() && !isMinion() && (attacker != null) && (attacker.getParty() != null) && attacker.getParty().isInCommandChannel() && attacker.getParty().getCommandChannel().meetRaidWarCondition(this)) {
+			if (_firstCommandChannelAttacked == null) // looting right isn't set
+			{
+				synchronized (this) {
+					if (_firstCommandChannelAttacked == null) {
+						_firstCommandChannelAttacked = attacker.getParty().getCommandChannel();
+						if (_firstCommandChannelAttacked != null) {
+							_commandChannelTimer = new CommandChannelTimer(this);
+							_commandChannelLastAttack = System.currentTimeMillis();
+							ThreadPoolManager.getInstance().scheduleGeneral(_commandChannelTimer, 10000); // check for last attack
+							_firstCommandChannelAttacked.broadcastPacket(new CreatureSay(0, Say2.PARTYROOM_ALL, "", "You have looting rights!")); // TODO: retail msg
+						}
+					}
+				}
+			} else if (attacker.getParty().getCommandChannel().equals(_firstCommandChannelAttacked)) // is in same channel
+			{
+				_commandChannelLastAttack = System.currentTimeMillis(); // update last attack time
+			}
+		}
+		
+		if (isEventMob()) {
+			return;
+		}
+		
+		// Add damage and hate to the attacker AggroInfo of the L2Attackable _aggroList
+		if (attacker != null) {
+			addDamage(attacker, (int) damage, skill);
+		}
+		
+		// If this L2Attackable is a L2MonsterInstance and it has spawned minions, call its minions to battle
+		if (this instanceof L2MonsterInstance master) {
+			if (master.hasMinions()) {
+				master.getMinionList().onAssist(this, attacker);
+			}
+			
+			master = master.getLeader();
+			if ((master != null) && master.hasMinions()) {
+				master.getMinionList().onAssist(this, attacker);
+			}
+		}
+		// Reduce the current HP of the L2Attackable and launch the doDie Task if necessary
+		super.reduceCurrentHp(damage, attacker, awake, isDOT, skill);
+	}
+	
+	public synchronized void setMustRewardExpSp(boolean value) {
+		_mustGiveExpSp = value;
+	}
+	
+	public synchronized boolean getMustRewardExpSP() {
+		return _mustGiveExpSp;
+	}
+	
+	/**
+	 * Kill the L2Attackable (the corpse disappeared after 7 seconds), distribute rewards (EXP, SP, Drops...) and notify Quest Engine.<br>
+	 * Actions:<br>
+	 * Distribute Exp and SP rewards to L2PcInstance (including Summon owner) that hit the L2Attackable and to their Party members<br>
+	 * Notify the Quest Engine of the L2Attackable death if necessary.<br>
+	 * Kill the L2NpcInstance (the corpse disappeared after 7 seconds)<br>
+	 * Caution: This method DOESN'T GIVE rewards to L2PetInstance.
+	 * @param killer The L2Character that has killed the L2Attackable
+	 */
+	@Override
+	public boolean doDie(L2Character killer) {
+		// Kill the L2NpcInstance (the corpse disappeared after 7 seconds)
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		if ((killer != null) && killer.isPlayable()) {
+			// Delayed notification
+			EventDispatcher.getInstance().notifyEventAsyncDelayed(new AttackableKill(killer.getActingPlayer(), this, killer.isSummon()), this, _onKillDelay);
+		}
+		
+		// Notify to minions if there are.
+		if (isMonster()) {
+			final L2MonsterInstance mob = (L2MonsterInstance) this;
+			if ((mob.getLeader() != null) && mob.getLeader().hasMinions()) {
+				var respawnTime = npc().getCustomMinionsRespawnTime().get(getId());
+				respawnTime = respawnTime != null ? respawnTime * 1000 : -1;
+				mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
+			}
+			
+			if (mob.hasMinions()) {
+				mob.getMinionList().onMasterDie(false);
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Distribute Exp and SP rewards to L2PcInstance (including Summon owner) that hit the L2Attackable and to their Party members.<br>
+	 * Actions:<br>
+	 * Get the L2PcInstance owner of the L2ServitorInstance (if necessary) and L2Party in progress.<br>
+	 * Calculate the Experience and SP rewards in function of the level difference.<br>
+	 * Add Exp and SP rewards to L2PcInstance (including Summon penalty) and to Party members in the known area of the last attacker.<br>
+	 * Caution : This method DOESN'T GIVE rewards to L2PetInstance.
+	 * @param lastAttacker The L2Character that has killed the L2Attackable
+	 */
+	@Override
+	protected void calculateRewards(L2Character lastAttacker) {
+		try {
+			if (_aggroList.isEmpty()) {
+				return;
+			}
+			
+			// NOTE: Concurrent-safe map is used because while iterating to verify all conditions sometimes an entry must be removed.
+			final Map<L2PcInstance, DamageDoneInfo> rewards = new ConcurrentHashMap<>();
+			
+			L2PcInstance maxDealer = null;
+			int maxDamage = 0;
+			long totalDamage = 0;
+			// While Iterating over This Map Removing Object is Not Allowed
+			// Go through the _aggroList of the L2Attackable
+			for (AggroInfo info : _aggroList.values()) {
+				if (info == null) {
+					continue;
+				}
+				
+				// Get the L2Character corresponding to this attacker
+				final L2PcInstance attacker = info.getAttacker().getActingPlayer();
+				if (attacker != null) {
+					// Get damages done by this attacker
+					final int damage = info.getDamage();
+					
+					// Prevent unwanted behavior
+					if (damage > 1) {
+						// Check if damage dealer isn't too far from this (killed monster)
+						if (!Util.checkIfInRange(character().getPartyRange(), this, attacker, true)) {
+							continue;
+						}
+						
+						totalDamage += damage;
+						
+						// Calculate real damages (Summoners should get own damage plus summon's damage)
+						final DamageDoneInfo reward = rewards.computeIfAbsent(attacker, DamageDoneInfo::new);
+						reward.addDamage(damage);
+						
+						if (reward.getDamage() > maxDamage) {
+							maxDealer = attacker;
+							maxDamage = reward.getDamage();
+						}
+					}
+				}
+			}
+			
+			// Manage Base, Quests and Sweep drops of the L2Attackable
+			doItemDrop((maxDealer != null) && maxDealer.isOnline() ? maxDealer : lastAttacker);
+			
+			// Manage drop of Special Events created by GM for a defined period
+			doEventDrop(lastAttacker);
+			
+			if (!getMustRewardExpSP()) {
+				return;
+			}
+			
+			if (!rewards.isEmpty()) {
+				for (DamageDoneInfo reward : rewards.values()) {
+					if (reward == null) {
+						continue;
+					}
+					
+					// Attacker to be rewarded
+					final L2PcInstance attacker = reward.getAttacker();
+					
+					// Total amount of damage done
+					final int damage = reward.getDamage();
+					
+					// Get party
+					final L2Party attackerParty = attacker.getParty();
+					
+					// Penalty applied to the attacker's XP
+					// If this attacker have servitor, get Exp Penalty applied for the servitor.
+					final float penalty = attacker.hasServitor() ? ((L2ServitorInstance) attacker.getSummon()).getExpMultiplier() : 1;
+					
+					// If there's NO party in progress
+					if (attackerParty == null) {
+						// Calculate Exp and SP rewards
+						if (attacker.getKnownList().knowsObject(this)) {
+							// Calculate the difference of level between this attacker (player or servitor owner) and the L2Attackable
+							// mob = 24, atk = 10, diff = -14 (full xp)
+							// mob = 24, atk = 28, diff = 4 (some xp)
+							// mob = 24, atk = 50, diff = 26 (no xp)
+							final int levelDiff = attacker.getLevel() - getLevel();
+							
+							final int[] expSp = calculateExpAndSp(levelDiff, damage, totalDamage);
+							long exp = expSp[0];
+							int sp = expSp[1];
+							
+							if (customs().championEnable() && isChampion()) {
+								exp *= customs().getChampionRewardsExpSp();
+								sp *= customs().getChampionRewardsExpSp();
+							}
+							
+							exp *= penalty;
+							
+							// Check for an over-hit enabled strike
+							L2Character overhitAttacker = getOverhitAttacker();
+							if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) {
+								attacker.sendPacket(SystemMessageId.OVER_HIT);
+								exp += calculateOverhitExp(exp);
+							}
+							
+							// Distribute the Exp and SP between the L2PcInstance and its L2Summon
+							if (!attacker.isDead()) {
+								attacker.addExpAndSp(exp, sp, useVitalityRate());
+								if (exp > 0) {
+									attacker.updateVitalityPoints(getVitalityPoints(damage), true, false);
+									if (!attacker.isInsideZone(ZoneId.PEACE) && ((attacker.getLevel() - getLevel()) <= 9)) {
+										if (hunting().getNevitEnable()) {
+											attacker.getHuntingSystem().startHuntingSystemTask();
+											if ((attacker.getHuntingSystem().getHuntingBonusTime() < hunting().getHuntingBonusMaxTime()) || !hunting().getHuntingBonusLimit()) {
+												attacker.getHuntingSystem().addPoints(hunting().getNevitNormalPoints());
+											}
+										}
+										
+										attacker.getRecSystem().startBonusTask(true);
+									}
+								}
+							}
+						}
+					} else {
+						// share with party members
+						int partyDmg = 0;
+						float partyMul = 1;
+						int partyLvl = 0;
+						
+						// Get all L2Character that can be rewarded in the party
+						final List<L2PcInstance> rewardedMembers = new ArrayList<>();
+						// Go through all L2PcInstance in the party
+						final List<L2PcInstance> groupMembers = attackerParty.isInCommandChannel() ? attackerParty.getCommandChannel().getMembers() : attackerParty.getMembers();
+						for (L2PcInstance partyPlayer : groupMembers) {
+							if ((partyPlayer == null) || partyPlayer.isDead()) {
+								continue;
+							}
+							
+							// Get the RewardInfo of this L2PcInstance from L2Attackable rewards
+							final DamageDoneInfo reward2 = rewards.get(partyPlayer);
+							
+							// If the L2PcInstance is in the L2Attackable rewards add its damages to party damages
+							if (reward2 != null) {
+								if (Util.checkIfInRange(character().getPartyRange(), this, partyPlayer, true)) {
+									partyDmg += reward2.getDamage(); // Add L2PcInstance damages to party damages
+									rewardedMembers.add(partyPlayer);
+									
+									if (partyPlayer.getLevel() > partyLvl) {
+										if (attackerParty.isInCommandChannel()) {
+											partyLvl = attackerParty.getCommandChannel().getLevel();
+										} else {
+											partyLvl = partyPlayer.getLevel();
+										}
+									}
+								}
+								rewards.remove(partyPlayer); // Remove the L2PcInstance from the L2Attackable rewards
+							} else {
+								// Add L2PcInstance of the party (that have attacked or not) to members that can be rewarded
+								// and in range of the monster.
+								if (Util.checkIfInRange(character().getPartyRange(), this, partyPlayer, true)) {
+									rewardedMembers.add(partyPlayer);
+									if (partyPlayer.getLevel() > partyLvl) {
+										if (attackerParty.isInCommandChannel()) {
+											partyLvl = attackerParty.getCommandChannel().getLevel();
+										} else {
+											partyLvl = partyPlayer.getLevel();
+										}
+									}
+								}
+							}
+						}
+						
+						// If the party didn't killed this L2Attackable alone
+						if (partyDmg < totalDamage) {
+							partyMul = ((float) partyDmg / totalDamage);
+						}
+						
+						// Calculate the level difference between Party and L2Attackable
+						final int levelDiff = partyLvl - getLevel();
+						
+						// Calculate Exp and SP rewards
+						final int[] expSp = calculateExpAndSp(levelDiff, partyDmg, totalDamage);
+						long exp = expSp[0];
+						int sp = expSp[1];
+						
+						if (customs().championEnable() && isChampion()) {
+							exp *= customs().getChampionRewardsExpSp();
+							sp *= customs().getChampionRewardsExpSp();
+						}
+						
+						exp *= partyMul;
+						sp *= partyMul;
+						
+						// Check for an over-hit enabled strike
+						// (When in party, the over-hit exp bonus is given to the whole party and split proportionally through the party members)
+						L2Character overhitAttacker = getOverhitAttacker();
+						if (isOverhit() && (overhitAttacker != null) && (overhitAttacker.getActingPlayer() != null) && (attacker == overhitAttacker.getActingPlayer())) {
+							attacker.sendPacket(SystemMessageId.OVER_HIT);
+							exp += calculateOverhitExp(exp);
+						}
+						
+						// Distribute Experience and SP rewards to L2PcInstance Party members in the known area of the last attacker
+						if (partyDmg > 0) {
+							attackerParty.distributeXpAndSp(exp, sp, rewardedMembers, partyLvl, partyDmg, this);
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Error calculating rewards!", ex);
+		}
+	}
+	
+	@Override
+	public void addAttackerToAttackByList(L2Character player) {
+		if ((player == null) || (player == this) || getAttackByList().contains(player)) {
+			return;
+		}
+		getAttackByList().add(player);
+	}
+	
+	/**
+	 * Add damage and hate to the attacker AggroInfo of the L2Attackable _aggroList.
+	 * @param attacker The L2Character that gave damages to this L2Attackable
+	 * @param damage The number of damages given by the attacker L2Character
+	 * @param skill
+	 */
+	public void addDamage(L2Character attacker, int damage, Skill skill) {
+		if (attacker == null) {
+			return;
+		}
+		
+		// Notify the L2Attackable AI with EVT_ATTACKED
+		if (!isDead()) {
+			try {
+				// If monster is on walk - stop it
+				if (isWalker() && !isCoreAIDisabled() && WalkingManager.getInstance().isOnWalk(this)) {
+					WalkingManager.getInstance().stopMoving(this, false, true);
+				}
+				
+				getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, attacker);
+				addDamageHate(attacker, damage, (damage * 100) / (getLevel() + 7));
+				
+				final L2PcInstance player = attacker.getActingPlayer();
+				if (player != null) {
+					EventDispatcher.getInstance().notifyEventAsync(new AttackableAttack(player, this, damage, skill, attacker.isSummon()), this);
+				}
+			} catch (Exception ex) {
+				LOG.error("Error adding damage!", ex);
+			}
+		}
+	}
+	
+	/**
+	 * Adds damage and hate to the attacker aggression list for this character.
+	 * @param attacker The L2Character that gave damages to this L2Attackable
+	 * @param damage The number of damages given by the attacker L2Character
+	 * @param aggro The hate (=damage) given by the attacker L2Character
+	 */
+	public void addDamageHate(L2Character attacker, int damage, long aggro) {
+		if ((attacker == null) || (attacker == this)) {
+			return;
+		}
+		
+		// Get the AggroInfo of the attacker L2Character from the _aggroList of the L2Attackable
+		final AggroInfo ai = _aggroList.computeIfAbsent(attacker, AggroInfo::new);
+		ai.addDamage(damage);
+		
+		// Traps does not cause aggro
+		// making this hack because not possible to determine if damage made by trap
+		// so just check for triggered trap here
+		final L2PcInstance targetPlayer = attacker.getActingPlayer();
+		if ((targetPlayer == null) || (targetPlayer.getTrap() == null) || !targetPlayer.getTrap().isTriggered()) {
+			ai.addHate(aggro);
+		}
+		
+		if ((targetPlayer != null) && (aggro == 0)) {
+			addDamageHate(attacker, 0, 1);
+			
+			// Set the intention to the L2Attackable to AI_INTENTION_ACTIVE
+			if (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
+			
+			// Notify to scripts
+			EventDispatcher.getInstance().notifyEventAsync(new AttackableAggroRangeEnter(this, targetPlayer, attacker.isSummon()), this);
+		} else if ((targetPlayer == null) && (aggro == 0)) {
+			aggro = 1;
+			ai.addHate(1);
+		}
+		
+		// Set the intention to the L2Attackable to AI_INTENTION_ACTIVE
+		if ((aggro != 0) && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		}
+	}
+	
+	public void reduceHate(L2Character target, long amount) {
+		if ((getAI() instanceof L2SiegeGuardAI) || (getAI() instanceof L2FortSiegeGuardAI)) {
+			// TODO: this just prevents error until siege guards are handled properly
+			stopHating(target);
+			setTarget(null);
+			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+			return;
+		}
+		
+		if (target == null) // whole aggrolist
+		{
+			L2Character mostHated = getMostHated();
+			if (mostHated == null) // makes target passive for a moment more
+			{
+				((L2AttackableAI) getAI()).setGlobalAggro(-25);
+				return;
+			}
+			
+			for (AggroInfo ai : _aggroList.values()) {
+				ai.addHate(amount);
+			}
+			
+			amount = getHating(mostHated);
+			if (amount >= 0) {
+				((L2AttackableAI) getAI()).setGlobalAggro(-25);
+				clearAggroList();
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+				setWalking();
+			}
+			return;
+		}
+		
+		AggroInfo ai = _aggroList.get(target);
+		if (ai == null) {
+			LOG.info("Target {} not present in aggro list of {}.", target, this);
+			return;
+		}
+		
+		ai.addHate(amount);
+		if ((ai.getHate() >= 0) && (getMostHated() == null)) {
+			((L2AttackableAI) getAI()).setGlobalAggro(-25);
+			clearAggroList();
+			getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			setWalking();
+		}
+	}
+	
+	/**
+	 * Clears _aggroList hate of the L2Character without removing from the list.
+	 * @param target
+	 */
+	public void stopHating(L2Character target) {
+		if (target == null) {
+			return;
+		}
+		AggroInfo ai = _aggroList.get(target);
+		if (ai != null) {
+			ai.stopHate();
+		}
+	}
+	
+	/**
+	 * @return the most hated L2Character of the L2Attackable _aggroList.
+	 */
+	public L2Character getMostHated() {
+		if (_aggroList.isEmpty() || isAlikeDead()) {
+			return null;
+		}
+		
+		L2Character mostHated = null;
+		long maxHate = 0;
+		
+		// While Interacting over This Map Removing Object is Not Allowed
+		// Go through the aggroList of the L2Attackable
+		for (AggroInfo ai : _aggroList.values()) {
+			if (ai == null) {
+				continue;
+			}
+			
+			if (ai.checkHate(this) > maxHate) {
+				mostHated = ai.getAttacker();
+				maxHate = ai.getHate();
+			}
+		}
+		
+		return mostHated;
+	}
+	
+	/**
+	 * @return the 2 most hated L2Character of the L2Attackable _aggroList.
+	 */
+	public List<L2Character> get2MostHated() {
+		if (_aggroList.isEmpty() || isAlikeDead()) {
+			return null;
+		}
+		
+		L2Character mostHated = null;
+		L2Character secondMostHated = null;
+		long maxHate = 0;
+		List<L2Character> result = new ArrayList<>();
+		
+		// While iterating over this map removing objects is not allowed
+		// Go through the aggroList of the L2Attackable
+		for (AggroInfo ai : _aggroList.values()) {
+			if (ai == null) {
+				continue;
+			}
+			
+			if (ai.checkHate(this) > maxHate) {
+				secondMostHated = mostHated;
+				mostHated = ai.getAttacker();
+				maxHate = ai.getHate();
+			}
+		}
+		
+		result.add(mostHated);
+		
+		if (getAttackByList().contains(secondMostHated)) {
+			result.add(secondMostHated);
+		} else {
+			result.add(null);
+		}
+		return result;
+	}
+	
+	public List<L2Character> getHateList() {
+		if (_aggroList.isEmpty() || isAlikeDead()) {
+			return null;
+		}
+		
+		List<L2Character> result = new ArrayList<>();
+		for (AggroInfo ai : _aggroList.values()) {
+			if (ai == null) {
+				continue;
+			}
+			ai.checkHate(this);
+			
+			result.add(ai.getAttacker());
+		}
+		return result;
+	}
+	
+	/**
+	 * @param target The L2Character whose hate level must be returned
+	 * @return the hate level of the L2Attackable against this L2Character contained in _aggroList.
+	 */
+	public long getHating(final L2Character target) {
+		if (_aggroList.isEmpty() || (target == null)) {
+			return 0;
+		}
+		
+		final AggroInfo ai = _aggroList.get(target);
+		if (ai == null) {
+			return 0;
+		}
+		
+		if (ai.getAttacker() instanceof L2PcInstance act) {
+			if (act.isInvisible() || ai.getAttacker().isInvul() || act.isSpawnProtected()) {
+				// Remove Object Should Use This Method and Can be Blocked While Interacting
+				_aggroList.remove(target);
+				return 0;
+			}
+		}
+		
+		if (!ai.getAttacker().isVisible() || ai.getAttacker().isInvisible()) {
+			_aggroList.remove(target);
+			return 0;
+		}
+		
+		if (ai.getAttacker().isAlikeDead()) {
+			ai.stopHate();
+			return 0;
+		}
+		return ai.getHate();
+	}
+	
+	public void doItemDrop(L2Character mainDamageDealer) {
+		doItemDrop(getTemplate(), mainDamageDealer);
+	}
+	
+	/**
+	 * Manage Base, Quests and Special Events drops of L2Attackable (called by calculateRewards).<br>
+	 * Concept:<br>
+	 * During a Special Event all L2Attackable can drop extra Items.<br>
+	 * Those extra Items are defined in the table allNpcDateDrops of the EventDroplist.<br>
+	 * Each Special Event has a start and end date to stop to drop extra Items automatically.<br>
+	 * Actions:<br>
+	 * Manage drop of Special Events created by GM for a defined period.<br>
+	 * Get all possible drops of this L2Attackable from L2NpcTemplate and add it Quest drops.<br>
+	 * For each possible drops (base + quests), calculate which one must be dropped (random).<br>
+	 * Get each Item quantity dropped (random).<br>
+	 * Create this or these L2ItemInstance corresponding to each Item Identifier dropped.<br>
+	 * If the autoLoot mode is actif and if the L2Character that has killed the L2Attackable is a L2PcInstance, Give the item(s) to the L2PcInstance that has killed the L2Attackable.<br>
+	 * If the autoLoot mode isn't actif or if the L2Character that has killed the L2Attackable is not a L2PcInstance, add this or these item(s) in the world as a visible object at the position where mob was last.
+	 * @param npcTemplate
+	 * @param mainDamageDealer
+	 */
+	public void doItemDrop(L2NpcTemplate npcTemplate, L2Character mainDamageDealer) {
+		if (mainDamageDealer == null) {
+			return;
+		}
+		
+		L2PcInstance player = mainDamageDealer.getActingPlayer();
+		
+		// Don't drop anything if the last attacker or owner isn't L2PcInstance
+		if (player == null) {
+			return;
+		}
+		
+		CursedWeaponsManager.getInstance().checkDrop(this, player);
+		
+		if (isSpoiled()) {
+			_sweepItems.set(npcTemplate.calculateDrops(DropListScope.CORPSE, this, player));
+		}
+		
+		Collection<ItemHolder> deathItems = npcTemplate.calculateDrops(DropListScope.DEATH, this, player);
+		if (deathItems != null) {
+			for (ItemHolder drop : deathItems) {
+				L2Item item = ItemTable.getInstance().getTemplate(drop.getId());
+				// Check if the autoLoot mode is active
+				// Give the item(s) to the L2PcInstance inventory has killed the L2Attackable
+				if ((!item.hasExImmediateEffect() && ((!isRaid() && character().autoLoot()) || (isRaid() && character().autoLootRaids()))) || (item.hasExImmediateEffect() && character().autoLootHerbs())) {
+					player.doAutoLoot(this, drop);
+				} else if ((!item.hasExImmediateEffect() && ((!isRaid() && ((player.isAutoLoot() && !player.isAutoLootItem()) || (player.isAutoLootItem() && customs().getAutoLootItemsList().contains(item.getId())))))) || //
+					(item.hasExImmediateEffect() && ((player.isAutoLootHerb() && customs().getAutoLootHerbsList().contains(item.getId()))))) {
+					player.doAutoLoot(this, drop);
+				} else {
+					dropItem(player, drop); // Drop the rest or all item(s) on the ground
+				}
+				
+				// Broadcast message if RaidBoss was defeated
+				if (isRaid() && !isRaidMinion() && (drop.getCount() > 0)) {
+					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_DROPPED_S3_S2);
+					sm.addCharName(this);
+					sm.addItemName(item);
+					sm.addLong(drop.getCount());
+					broadcastPacket(sm);
+				}
+			}
+		}
+		
+		// Apply Special Item drop with random(rnd) quantity(qty) for champions.
+		if (customs().championEnable() && isChampion() && ((customs().getChampionRewardLowerLvlItemChance() > 0) || (customs().getChampionRewardHigherLvlItemChance() > 0))) {
+			int champqty = Rnd.get(customs().getChampionRewardItemQty());
+			ItemHolder item = new ItemHolder(customs().getChampionRewardItemID(), ++champqty);
+			
+			// Give the item(s) to the L2PcInstance inventory has killed the L2Attackable
+			if ((player.getLevel() <= getLevel()) && (Rnd.get(100) < customs().getChampionRewardLowerLvlItemChance())) {
+				if (character().autoLoot()) {
+					player.addItem("ChampionLoot", item.getId(), item.getCount(), this, true);
+				} else if ((player.isAutoLoot() && !player.isAutoLootItem()) || (player.isAutoLootItem() && customs().getAutoLootItemsList().contains(item.getId()))) {
+					player.addItem("ChampionLoot", item.getId(), item.getCount(), this, true);
+				} else {
+					dropItem(player, item);
+				}
+			} else if ((player.getLevel() > getLevel()) && (Rnd.get(100) < customs().getChampionRewardHigherLvlItemChance())) {
+				if (character().autoLoot()) {
+					player.addItem("ChampionLoot", item.getId(), item.getCount(), this, true);
+				} else if ((player.isAutoLoot() && !player.isAutoLootItem()) || (player.isAutoLootItem() && customs().getAutoLootItemsList().contains(item.getId()))) {
+					player.addItem("ChampionLoot", item.getId(), item.getCount(), this, true);
+				} else {
+					dropItem(player, item);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Manage Special Events drops created by GM for a defined period.<br>
+	 * Concept:<br>
+	 * During a Special Event all L2Attackable can drop extra Items.<br>
+	 * Those extra Items are defined in the table allNpcDateDrops of the EventDroplist.<br>
+	 * Each Special Event has a start and end date to stop to drop extra Items automatically.<br>
+	 * Actions: <I>If an extra drop must be generated</I><br>
+	 * Get an Item Identifier (random) from the DateDrop Item table of this Event.<br>
+	 * Get the Item quantity dropped (random).<br>
+	 * Create this or these L2ItemInstance corresponding to this Item Identifier.<br>
+	 * If the autoLoot mode is actif and if the L2Character that has killed the L2Attackable is a L2PcInstance, Give the item(s) to the L2PcInstance that has killed the L2Attackable<br>
+	 * If the autoLoot mode isn't actif or if the L2Character that has killed the L2Attackable is not a L2PcInstance, add this or these item(s) in the world as a visible object at the position where mob was last
+	 * @param lastAttacker The L2Character that has killed the L2Attackable
+	 */
+	public void doEventDrop(L2Character lastAttacker) {
+		if (lastAttacker == null) {
+			return;
+		}
+		
+		L2PcInstance player = lastAttacker.getActingPlayer();
+		
+		// Don't drop anything if the last attacker or owner isn't L2PcInstance
+		if (player == null) {
+			return;
+		}
+		
+		if ((player.getLevel() - getLevel()) > 9) {
+			return;
+		}
+		
+		// Go through DateDrop of EventDroplist allNpcDateDrops within the date range
+		for (DateDrop drop : EventDroplist.getInstance().getAllDrops()) {
+			if (Rnd.get(1000000) < drop.getEventDrop().getDropChance()) {
+				final int itemId = drop.getEventDrop().getItemIdList()[Rnd.get(drop.getEventDrop().getItemIdList().length)];
+				final long itemCount = Rnd.get(drop.getEventDrop().getMinCount(), drop.getEventDrop().getMaxCount());
+				// Give the item(s) to the L2PcInstance inventory has killed the L2Attackable
+				if (character().autoLoot()) {
+					player.doAutoLoot(this, itemId, itemCount);
+				} else if ((player.isAutoLoot() && !player.isAutoLootItem()) || (player.isAutoLootItem() && customs().getAutoLootItemsList().contains(itemId))) {
+					player.doAutoLoot(this, itemId, itemCount);
+				} else {
+					dropItem(player, itemId, itemCount); // Drop the rest or all item(s) on the ground
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @return the active weapon of this L2Attackable (= null).
+	 */
+	public L2ItemInstance getActiveWeapon() {
+		return null;
+	}
+	
+	/**
+	 * Verifies if the creature is in the aggro list.
+	 * @param creature the creature
+	 * @return {@code true} if the creature is in the aggro list, {@code false} otherwise
+	 */
+	public boolean isInAggroList(L2Character creature) {
+		return _aggroList.containsKey(creature);
+	}
+	
+	/**
+	 * Clear the _aggroList of the L2Attackable.
+	 */
+	public void clearAggroList() {
+		_aggroList.clear();
+		
+		// clear overhit values
+		_overhit = false;
+		_overhitDamage = 0;
+		_overhitAttacker = null;
+	}
+	
+	/**
+	 * @return {@code true} if there is a loot to sweep, {@code false} otherwise.
+	 */
+	@Override
+	public boolean isSweepActive() {
+		return _sweepItems.get() != null;
+	}
+	
+	/**
+	 * @return a copy of dummy items for the spoil loot.
+	 */
+	public List<L2Item> getSpoilLootItems() {
+		final Collection<ItemHolder> sweepItems = _sweepItems.get();
+		final List<L2Item> lootItems = new LinkedList<>();
+		if (sweepItems != null) {
+			for (ItemHolder item : sweepItems) {
+				lootItems.add(ItemTable.getInstance().getTemplate(item.getId()));
+			}
+		}
+		return lootItems;
+	}
+	
+	/**
+	 * @return table containing all L2ItemInstance that can be spoiled.
+	 */
+	public Collection<ItemHolder> takeSweep() {
+		return _sweepItems.getAndSet(null);
+	}
+	
+	/**
+	 * @return table containing all L2ItemInstance that can be harvested.
+	 */
+	public ItemHolder takeHarvest() {
+		return _harvestItem.getAndSet(null);
+	}
+	
+	/**
+	 * Checks if the corpse is too old.
+	 * @param attacker the player to validate
+	 * @param remainingTime the time to check
+	 * @param sendMessage if {@code true} will send a message of corpse too old
+	 * @return {@code true} if the corpse is too old
+	 */
+	public boolean isOldCorpse(L2PcInstance attacker, int remainingTime, boolean sendMessage) {
+		if (isDead() && (DecayTaskManager.getInstance().getRemainingTime(this) < remainingTime)) {
+			if (sendMessage && (attacker != null)) {
+				attacker.sendPacket(SystemMessageId.CORPSE_TOO_OLD_SKILL_NOT_USED);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * @param sweeper the player to validate.
+	 * @param sendMessage sendMessage if {@code true} will send a message of sweep not allowed.
+	 * @return {@code true} if is the spoiler or is in the spoiler party.
+	 */
+	public boolean checkSpoilOwner(L2PcInstance sweeper, boolean sendMessage) {
+		if ((sweeper.getObjectId() != getSpoilerObjectId()) && !sweeper.isInLooterParty(getSpoilerObjectId())) {
+			if (sendMessage) {
+				sweeper.sendPacket(SystemMessageId.SWEEP_NOT_ALLOWED);
+			}
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Set the over-hit flag on the L2Attackable.
+	 * @param status The status of the over-hit flag
+	 */
+	public void overhitEnabled(boolean status) {
+		_overhit = status;
+	}
+	
+	/**
+	 * Set the over-hit values like the attacker who did the strike and the amount of damage done by the skill.
+	 * @param attacker The L2Character who hit on the L2Attackable using the over-hit enabled skill
+	 * @param damage The amount of damage done by the over-hit enabled skill on the L2Attackable
+	 */
+	public void setOverhitValues(L2Character attacker, double damage) {
+		// Calculate the over-hit damage
+		// Ex: mob had 10 HP left, over-hit skill did 50 damage total, over-hit damage is 40
+		double overhitDmg = -(getCurrentHp() - damage);
+		if (overhitDmg < 0) {
+			// we didn't killed the mob with the over-hit strike. (it wasn't really an over-hit strike)
+			// let's just clear all the over-hit related values
+			overhitEnabled(false);
+			_overhitDamage = 0;
+			_overhitAttacker = null;
+			return;
+		}
+		overhitEnabled(true);
+		_overhitDamage = overhitDmg;
+		_overhitAttacker = attacker;
+	}
+	
+	/**
+	 * Return the L2Character who hit on the L2Attackable using an over-hit enabled skill.
+	 * @return L2Character attacker
+	 */
+	public L2Character getOverhitAttacker() {
+		return _overhitAttacker;
+	}
+	
+	/**
+	 * Return the amount of damage done on the L2Attackable using an over-hit enabled skill.
+	 * @return double damage
+	 */
+	public double getOverhitDamage() {
+		return _overhitDamage;
+	}
+	
+	/**
+	 * @return True if the L2Attackable was hit by an over-hit enabled skill.
+	 */
+	public boolean isOverhit() {
+		return _overhit;
+	}
+	
+	/**
+	 * Activate the absorbed soul condition on the L2Attackable.
+	 */
+	public void absorbSoul() {
+		_absorbed = true;
+	}
+	
+	/**
+	 * @return True if the L2Attackable had his soul absorbed.
+	 */
+	public boolean isAbsorbed() {
+		return _absorbed;
+	}
+	
+	/**
+	 * Adds an attacker that successfully absorbed the soul of this L2Attackable into the _absorbersList.
+	 * @param attacker
+	 */
+	public void addAbsorber(L2PcInstance attacker) {
+		// If we have no _absorbersList initiated, do it
+		final AbsorberInfo ai = _absorbersList.get(attacker.getObjectId());
+		
+		// If the L2Character attacker isn't already in the _absorbersList of this L2Attackable, add it
+		if (ai == null) {
+			_absorbersList.put(attacker.getObjectId(), new AbsorberInfo(attacker.getObjectId(), getCurrentHp()));
+		} else {
+			ai.setAbsorbedHp(getCurrentHp());
+		}
+		
+		// Set this L2Attackable as absorbed
+		absorbSoul();
+	}
+	
+	public void resetAbsorbList() {
+		_absorbed = false;
+		_absorbersList.clear();
+	}
+	
+	public Map<Integer, AbsorberInfo> getAbsorbersList() {
+		return _absorbersList;
+	}
+	
+	/**
+	 * Calculate the Experience and SP to distribute to attacker (L2PcInstance, L2ServitorInstance or L2Party) of the L2Attackable.
+	 * @param diff The difference of level between attacker (L2PcInstance, L2ServitorInstance or L2Party) and the L2Attackable
+	 * @param damage The damages given by the attacker (L2PcInstance, L2ServitorInstance or L2Party)
+	 * @param totalDamage The total damage done
+	 * @return
+	 */
+	private int[] calculateExpAndSp(int diff, int damage, long totalDamage) {
+		double xp;
+		double sp;
+		
+		if (diff < -5) {
+			diff = -5; // makes possible to use ALT_GAME_EXPONENT configuration
+		}
+		
+		xp = ((double) getExpReward() * damage) / totalDamage;
+		if (character().getExponentXp() != 0) {
+			xp *= Math.pow(2., -diff / character().getExponentXp());
+		}
+		
+		sp = ((double) getSpReward() * damage) / totalDamage;
+		if (character().getExponentSp() != 0) {
+			sp *= Math.pow(2., -diff / character().getExponentSp());
+		}
+		
+		if ((character().getExponentXp() == 0) && (character().getExponentSp() == 0)) {
+			// formula revised May 07
+			if (diff > 5) {
+				double pow = Math.pow((double) 5 / 6, diff - 5);
+				xp = xp * pow;
+				sp = sp * pow;
+			}
+			
+			if (xp <= 0) {
+				xp = 0;
+				sp = 0;
+			} else if (sp <= 0) {
+				sp = 0;
+			}
+		}
+		return new int[] {
+			(int) xp,
+			(int) sp
+		};
+	}
+	
+	public long calculateOverhitExp(long normalExp) {
+		// Get the percentage based on the total of extra (over-hit) damage done relative to the total (maximum) amount of HP on the L2Attackable
+		double overhitPercentage = ((getOverhitDamage() * 100) / getMaxHp());
+		
+		// Over-hit damage percentages are limited to 25% max
+		if (overhitPercentage > 25) {
+			overhitPercentage = 25;
+		}
+		
+		// Get the overhit exp bonus according to the above over-hit damage percentage
+		// (1/1 basis - 13% of over-hit damage, 13% of extra exp is given, and so on...)
+		double overhitExp = ((overhitPercentage / 100) * normalExp);
+		
+		// Return the rounded amount of exp points to be added to the player's normal exp reward
+		return Math.round(overhitExp);
+	}
+	
+	@Override
+	public boolean canBeAttacked() {
+		return true;
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		// Clear mob spoil, seed
+		setSpoilerObjectId(0);
+		// Clear all aggro char from list
+		clearAggroList();
+		// Clear Harvester reward
+		_harvestItem.set(null);
+		// Clear mod Seeded stat
+		_seeded = false;
+		_seed = null;
+		_seederObjId = 0;
+		// Clear overhit value
+		overhitEnabled(false);
+		
+		_sweepItems.set(null);
+		resetAbsorbList();
+		
+		setWalking();
+		
+		// check the region where this mob is, do not activate the AI if region is inactive.
+		if (!isInActiveRegion()) {
+			if (hasAI()) {
+				getAI().stopAITask();
+			}
+		}
+	}
+	
+	/**
+	 * Checks if its spoiled.
+	 * @return {@code true} if its spoiled, {@code false} otherwise
+	 */
+	public final boolean isSpoiled() {
+		return _spoilerObjectId != 0;
+	}
+	
+	/**
+	 * Gets the spoiler object id.
+	 * @return the spoiler object id if its spoiled, 0 otherwise
+	 */
+	public final int getSpoilerObjectId() {
+		return _spoilerObjectId;
+	}
+	
+	/**
+	 * Sets the spoiler object id.
+	 * @param spoilerObjectId the spoiler object id
+	 */
+	public final void setSpoilerObjectId(int spoilerObjectId) {
+		_spoilerObjectId = spoilerObjectId;
+	}
+	
+	/**
+	 * Sets state of the mob to seeded. Parameters needed to be set before.
+	 * @param seeder
+	 */
+	public final void setSeeded(L2PcInstance seeder) {
+		if ((_seed != null) && (_seederObjId == seeder.getObjectId())) {
+			_seeded = true;
+			
+			int count = 1;
+			for (int skillId : getTemplate().getSkills().keySet()) {
+				switch (skillId) {
+					case 4303 -> count *= 2; // Strong type x2
+					case 4304 -> count *= 3; // Strong type x3
+					case 4305 -> count *= 4; // Strong type x4
+					case 4306 -> count *= 5; // Strong type x5
+					case 4307 -> count *= 6; // Strong type x6
+					case 4308 -> count *= 7; // Strong type x7
+					case 4309 -> count *= 8; // Strong type x8
+					case 4310 -> count *= 9; // Strong type x9
+				}
+			}
+			
+			// hi-lvl mobs bonus
+			final int diff = getLevel() - _seed.getLevel() - 5;
+			if (diff > 0) {
+				count += diff;
+			}
+			_harvestItem.set(new ItemHolder(_seed.getCropId(), count * rates().getRateDropManor()));
+		}
+	}
+	
+	/**
+	 * Sets the seed parameters, but not the seed state
+	 * @param seed - instance {@link L2Seed} of used seed
+	 * @param seeder - player who sows the seed
+	 */
+	public final void setSeeded(L2Seed seed, L2PcInstance seeder) {
+		if (!_seeded) {
+			_seed = seed;
+			_seederObjId = seeder.getObjectId();
+		}
+	}
+	
+	public final int getSeederId() {
+		return _seederObjId;
+	}
+	
+	public final L2Seed getSeed() {
+		return _seed;
+	}
+	
+	public final boolean isSeeded() {
+		return _seeded;
+	}
+	
+	/**
+	 * Set delay for onKill() call, in ms Default: 5000 ms
+	 * @param delay
+	 */
+	public final void setOnKillDelay(int delay) {
+		_onKillDelay = delay;
+	}
+	
+	public final int getOnKillDelay() {
+		return _onKillDelay;
+	}
+	
+	/**
+	 * Check if the server allows Random Animation.
+	 */
+	// This is located here because L2Monster and L2FriendlyMob both extend this class. The other non-pc instances extend either L2NpcInstance or L2MonsterInstance.
+	@Override
+	public boolean hasRandomAnimation() {
+		return ((general().getMaxMonsterAnimation() > 0) && isRandomAnimationEnabled() && !(this instanceof L2GrandBossInstance));
+	}
+	
+	@Override
+	public boolean isMob() {
+		return true; // This means we use MAX_MONSTER_ANIMATION instead of MAX_NPC_ANIMATION
+	}
+	
+	public void setCommandChannelTimer(CommandChannelTimer commandChannelTimer) {
+		_commandChannelTimer = commandChannelTimer;
+	}
+	
+	public CommandChannelTimer getCommandChannelTimer() {
+		return _commandChannelTimer;
+	}
+	
+	public L2CommandChannel getFirstCommandChannelAttacked() {
+		return _firstCommandChannelAttacked;
+	}
+	
+	public void setFirstCommandChannelAttacked(L2CommandChannel firstCommandChannelAttacked) {
+		_firstCommandChannelAttacked = firstCommandChannelAttacked;
+	}
+	
+	/**
+	 * @return the _commandChannelLastAttack
+	 */
+	public long getCommandChannelLastAttack() {
+		return _commandChannelLastAttack;
+	}
+	
+	/**
+	 * @param channelLastAttack the _commandChannelLastAttack to set
+	 */
+	public void setCommandChannelLastAttack(long channelLastAttack) {
+		_commandChannelLastAttack = channelLastAttack;
+	}
+	
+	public void returnHome() {
+		clearAggroList();
+		
+		if (hasAI() && (getSpawn() != null)) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation(this));
+		}
+	}
+	
+	/*
+	 * Return vitality points decrease (if positive) or increase (if negative) based on damage. Maximum for damage = maxHp.
+	 */
+	public float getVitalityPoints(int damage) {
+		// sanity check
+		if (damage <= 0) {
+			return 0;
+		}
+		
+		final float divider = (getLevel() > 0) && (getExpReward() > 0) ? (getTemplate().getBaseHpMax() * 9 * getLevel() * getLevel()) / (100 * getExpReward()) : 0;
+		if (divider == 0) {
+			return 0;
+		}
+		
+		// negative value - vitality will be consumed
+		return -Math.min(damage, getMaxHp()) / divider;
+	}
+	
+	/**
+	 * Determines whether the vitality rate for EXP and SP should be applied.
+	 *
+	 * @return {@code true} if the vitality rate should be applied, {@code false} otherwise.
+	 */
+	public boolean useVitalityRate() {
+	    return !isChampion() || customs().championEnableVitality();
+	}
+	
+	/** Return True if the L2Character is RaidBoss or his minion. */
+	@Override
+	public boolean isRaid() {
+		return _isRaid;
+	}
+	
+	/**
+	 * Set this Npc as a Raid instance.
+	 * @param isRaid
+	 */
+	public void setIsRaid(boolean isRaid) {
+		_isRaid = isRaid;
+	}
+	
+	/**
+	 * Set this Npc as a Minion instance.
+	 * @param val
+	 */
+	public void setIsRaidMinion(boolean val) {
+		_isRaid = val;
+		_isRaidMinion = val;
+	}
+	
+	@Override
+	public boolean isRaidMinion() {
+		return _isRaidMinion;
+	}
+	
+	@Override
+	public boolean isMinion() {
+		return getLeader() != null;
+	}
+	
+	/**
+	 * @return leader of this minion or null.
+	 */
+	public L2Attackable getLeader() {
+		return null;
+	}
+	
+	public void setChampion(boolean champ) {
+		_champion = champ;
+	}
+	
+	@Override
+	public boolean isChampion() {
+		return _champion;
+	}
+	
+	@Override
+	public boolean isAttackable() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java
new file mode 100644
index 00000000..f4d736e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Character.java
@@ -0,0 +1,5735 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.config.Configuration.territoryWar;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.PARTY;
+import static com.l2jserver.gameserver.model.stats.Stats.NUM_STATS;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.StampedLock;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2AttackableAI;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.data.xml.impl.CategoryData;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.CharEffectList;
+import com.l2jserver.gameserver.model.L2AccessLevel;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.TimeStamp;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2RiftInvaderInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.CharKnownList;
+import com.l2jserver.gameserver.model.actor.stat.CharStat;
+import com.l2jserver.gameserver.model.actor.status.CharStatus;
+import com.l2jserver.gameserver.model.actor.tasks.character.FlyToLocationTask;
+import com.l2jserver.gameserver.model.actor.tasks.character.HitTask;
+import com.l2jserver.gameserver.model.actor.tasks.character.MagicUseTask;
+import com.l2jserver.gameserver.model.actor.tasks.character.NotifyAITask;
+import com.l2jserver.gameserver.model.actor.tasks.character.QueuedMagicUseTask;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.actor.transform.Transform;
+import com.l2jserver.gameserver.model.actor.transform.TransformTemplate;
+import com.l2jserver.gameserver.model.effects.EffectFlag;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.events.Containers;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureAttack;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureAttackAvoid;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureAttacked;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureDamageDealt;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureDamageReceived;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureKill;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureSkillUse;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureTeleported;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillSee;
+import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.holders.InvulSkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillUseHolder;
+import com.l2jserver.gameserver.model.interfaces.IDeletable;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.options.OptionsSkillHolder;
+import com.l2jserver.gameserver.model.options.OptionsSkillType;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.EffectScope;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.SkillChannelized;
+import com.l2jserver.gameserver.model.skills.SkillChannelizer;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.model.stats.Calculator;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.Attack;
+import com.l2jserver.gameserver.network.serverpackets.ChangeMoveType;
+import com.l2jserver.gameserver.network.serverpackets.ChangeWaitType;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.ExRotation;
+import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillCanceled;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.MoveToLocation;
+import com.l2jserver.gameserver.network.serverpackets.Revive;
+import com.l2jserver.gameserver.network.serverpackets.ServerObjectInfo;
+import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.StopMove;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.TeleportToLocation;
+import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+import com.l2jserver.gameserver.pathfinding.PathFinding;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+import com.l2jserver.gameserver.util.EmptyQueue;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Mother class of all character objects of the world (PC, NPC...)<br>
+ * L2Character:<br>
+ * <ul>
+ * <li>L2DoorInstance</li>
+ * <li>L2Playable</li>
+ * <li>L2Npc</li>
+ * <li>L2StaticObjectInstance</li>
+ * <li>L2Trap</li>
+ * <li>L2Vehicle</li>
+ * </ul>
+ * <br>
+ * <b>Concept of L2CharTemplate:</b><br>
+ * Each L2Character owns generic and static properties (ex : all Keltir have the same number of HP...).<br>
+ * All of those properties are stored in a different template for each type of L2Character.<br>
+ * Each template is loaded once in the server cache memory (reduce memory use).<br>
+ * When a new instance of L2Character is spawned, server just create a link between the instance and the template.<br>
+ * This link is stored in {@link #_template}
+ * @since 2005/04/11 10:06:08
+ */
+public abstract class L2Character extends L2Object implements ISkillsHolder, IDeletable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Character.class);
+	
+	private volatile Set<L2Character> _attackByList;
+	private volatile boolean _isCastingNow = false;
+	private volatile boolean _isCastingSimultaneouslyNow = false;
+	private Skill _lastSkillCast;
+	private Skill _lastSimultaneousSkillCast;
+	
+	private boolean _isDead = false;
+	private boolean _isImmobilized = false;
+	private boolean _isOverloaded = false; // the char is carrying too much
+	private boolean _isPendingRevive = false;
+	private boolean _isRunning = false;
+	private boolean _isNoRndWalk = false; // Is no random walk
+	protected boolean _showSummonAnimation = false;
+	protected boolean _isTeleporting = false;
+	private boolean _isInvul = false;
+	private boolean _isMortal = true; // Char will die when HP decreased to 0
+	private boolean _isFlying = false;
+	
+	private CharStat _stat;
+	private CharStatus _status;
+	private L2CharTemplate _template; // The link on the L2CharTemplate object containing generic and static properties of this L2Character type (ex : Max HP, Speed...)
+	private String _title;
+	
+	public static final double MAX_HP_BAR_PX = 352.0;
+	
+	private double _hpUpdateIncCheck = .0;
+	private double _hpUpdateDecCheck = .0;
+	private double _hpUpdateInterval = .0;
+	
+	/** Table of Calculators containing all used calculator */
+	private Calculator[] _calculators;
+	/** Map containing all skills of this character. */
+	private final Map<Integer, Skill> _skills = new ConcurrentHashMap<>();
+	/** Map containing the skill reuse time stamps. */
+	private volatile Map<Integer, TimeStamp> _reuseTimeStampsSkills = null;
+	/** Map containing the item reuse time stamps. */
+	private volatile Map<Integer, TimeStamp> _reuseTimeStampsItems = null;
+	/** Map containing all the disabled skills. */
+	private volatile Map<Integer, Long> _disabledSkills = null;
+	private boolean _allSkillsDisabled;
+	
+	private final byte[] _zones = new byte[ZoneId.getZoneCount()];
+	protected byte _zoneValidateCounter = 4;
+	
+	private L2Character _debugger = null;
+	
+	private final ReentrantLock _teleportLock = new ReentrantLock();
+	private final StampedLock _attackLock = new StampedLock();
+	
+	private Team _team = Team.NONE;
+	
+	protected long _exceptions = 0L;
+	
+	private boolean _lethalable = true;
+	
+	private volatile Map<Integer, OptionsSkillHolder> _triggerSkills;
+	
+	private volatile Map<Integer, InvulSkillHolder> _invulAgainst;
+	/** Creatures effect list. */
+	private final CharEffectList _effectList = new CharEffectList(this);
+	/** The character that summons this character. */
+	private L2Character _summoner = null;
+	
+	private SkillChannelizer _channelizer = null;
+	
+	private SkillChannelized _channelized = null;
+	
+	/** Map 32 bits, containing all abnormal visual effects in progress. */
+	private int _abnormalVisualEffects;
+	/** Map 32 bits, containing all special abnormal visual effects in progress. */
+	private int _abnormalVisualEffectsSpecial;
+	/** Map 32 bits, containing all event abnormal visual effects in progress. */
+	private int _abnormalVisualEffectsEvent;
+	
+	/** Movement data of this L2Character */
+	protected MoveData _move;
+	
+	/** This creature's target. */
+	private L2Object _target;
+	/** Represents the time where the attack should end, in nanoseconds. */
+	private volatile long _attackEndTime;
+	private long _disableBowAttackEndTime;
+	
+	private int _castInterruptTime;
+	
+	/** Table of calculators containing all standard NPC calculator (ex : ACCURACY_COMBAT, EVASION_RATE) */
+	private static final Calculator[] NPC_STD_CALCULATOR = Formulas.getStdNPCCalculators();
+	
+	private volatile L2CharacterAI _ai = null;
+	
+	/** Future Skill Cast */
+	protected Future<?> _skillCast;
+	protected Future<?> _skillCast2;
+	
+	/**
+	 * Constructor of L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Each L2Character owns generic and static properties (ex : all Keltir have the same number of HP...).<br>
+	 * All of those properties are stored in a different template for each type of L2Character. Each template is loaded once in the server cache memory (reduce memory use).<br>
+	 * When a new instance of L2Character is spawned, server just create a link between the instance and the template This link is stored in <B>_template</B><br>
+	 * <B><U> Actions</U>:</B>
+	 * <ul>
+	 * <li>Set the _template of the L2Character</li>
+	 * <li>Set _overloaded to false (the character can take more items)</li>
+	 * <li>If L2Character is a L2NPCInstance, copy skills from template to object</li>
+	 * <li>If L2Character is a L2NPCInstance, link _calculators to NPC_STD_CALCULATOR</li>
+	 * <li>If L2Character is NOT a L2NPCInstance, create an empty _skills slot</li>
+	 * <li>If L2Character is a L2PcInstance or L2Summon, copy basic Calculator set to object</li>
+	 * </ul>
+	 * @param objectId Identifier of the object to initialized
+	 * @param template The L2CharTemplate to apply to the object
+	 */
+	public L2Character(int objectId, L2CharTemplate template) {
+		super(objectId);
+		if (template == null) {
+			throw new NullPointerException("Template is null!");
+		}
+		
+		setInstanceType(InstanceType.L2Character);
+		initCharStat();
+		initCharStatus();
+		
+		// Set its template to the new L2Character
+		_template = template;
+		
+		if (isDoor()) {
+			_calculators = Formulas.getStdDoorCalculators();
+		} else if (isNpc()) {
+			_calculators = NPC_STD_CALCULATOR;
+		} else {
+			_calculators = new Calculator[NUM_STATS];
+		}
+		
+		setIsInvul(true);
+	}
+	
+	public final CharEffectList getEffectList() {
+		return _effectList;
+	}
+	
+	/**
+	 * Verify if this character is under debug.
+	 * @return {@code true} if this character is under debug, {@code false} otherwise
+	 */
+	public boolean isDebug() {
+		return _debugger != null;
+	}
+	
+	/**
+	 * Sets character instance, to which debug packets will be send.
+	 * @param debugger the character debugging this character
+	 */
+	public void setDebug(L2Character debugger) {
+		_debugger = debugger;
+	}
+	
+	/**
+	 * Send debug packet.
+	 * @param pkt
+	 */
+	public void sendDebugPacket(L2GameServerPacket pkt) {
+		if (_debugger != null) {
+			_debugger.sendPacket(pkt);
+		}
+	}
+	
+	/**
+	 * Send debug text string
+	 * @param msg
+	 */
+	public void sendDebugMessage(String msg) {
+		if (_debugger != null) {
+			_debugger.sendMessage(msg);
+		}
+	}
+	
+	/**
+	 * @return character inventory, default null, overridden in L2Playable types and in L2NPcInstance
+	 */
+	public Inventory getInventory() {
+		return null;
+	}
+	
+	public boolean destroyItemByItemId(String process, int itemId, long count, L2Object reference, boolean sendMessage) {
+		// Default: NPCs consume virtual items for their skills
+		// TODO: should be logged if even happens.. should be false
+		return true;
+	}
+	
+	public boolean destroyItem(String process, int objectId, long count, L2Object reference, boolean sendMessage) {
+		// Default: NPCs consume virtual items for their skills
+		// TODO: should be logged if even happens.. should be false
+		return true;
+	}
+	
+	/**
+	 * Check if the character is in the given zone Id.
+	 * @param zone the zone Id to check
+	 * @return {code true} if the character is in that zone
+	 */
+	@Override
+	public final boolean isInsideZone(ZoneId zone) {
+		Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
+		switch (zone) {
+			case PVP:
+				if ((instance != null) && instance.isPvPInstance()) {
+					return true;
+				}
+				return (_zones[ZoneId.PVP.ordinal()] > 0) && (_zones[ZoneId.PEACE.ordinal()] == 0);
+			case PEACE:
+				if ((instance != null) && instance.isPvPInstance()) {
+					return false;
+				}
+		}
+		return _zones[zone.ordinal()] > 0;
+	}
+	
+	/**
+	 * @param zone
+	 * @param state
+	 */
+	public final void setInsideZone(ZoneId zone, final boolean state) {
+		synchronized (_zones) {
+			if (state) {
+				_zones[zone.ordinal()]++;
+			} else if (_zones[zone.ordinal()] > 0) {
+				_zones[zone.ordinal()]--;
+			}
+		}
+	}
+	
+	/**
+	 * This will return true if the player is transformed,<br>
+	 * but if the player is not transformed it will return false.
+	 * @return transformation status
+	 */
+	public boolean isTransformed() {
+		return false;
+	}
+	
+	public Transform getTransformation() {
+		return null;
+	}
+	
+	/**
+	 * This will untransform a player if they are an instance of L2Pcinstance and if they are transformed.
+	 */
+	public void untransform() {
+		// Just a place holder
+	}
+	
+	/**
+	 * This will return true if the player is GM,<br>
+	 * but if the player is not GM it will return false.
+	 * @return GM status
+	 */
+	public boolean isGM() {
+		return false;
+	}
+	
+	/**
+	 * Overridden in L2PcInstance.
+	 * @return the access level.
+	 */
+	public L2AccessLevel getAccessLevel() {
+		return null;
+	}
+	
+	protected void initCharStatusUpdateValues() {
+		_hpUpdateIncCheck = getMaxHp();
+		_hpUpdateInterval = _hpUpdateIncCheck / MAX_HP_BAR_PX;
+		_hpUpdateDecCheck = _hpUpdateIncCheck - _hpUpdateInterval;
+	}
+	
+	/**
+	 * Remove the L2Character from the world when the decay task is launched.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T REMOVE the object from _allObjects of L2World </B></FONT><BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND Server->Client packets to players</B></FONT>
+	 */
+	public void onDecay() {
+		decayMe();
+		
+		final L2WorldRegion reg = getWorldRegion();
+		if (reg != null) {
+			reg.removeFromZones(this);
+		}
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		revalidateZone(true);
+	}
+	
+	public void onTeleported() {
+		if (!_teleportLock.tryLock()) {
+			return;
+		}
+		try {
+			if (!isTeleporting()) {
+				return;
+			}
+			spawnMe(getX(), getY(), getZ());
+			setIsTeleporting(false);
+			EventDispatcher.getInstance().notifyEventAsync(new CreatureTeleported(this), this);
+		} finally {
+			_teleportLock.unlock();
+		}
+	}
+	
+	/**
+	 * Add L2Character instance that is attacking to the attacker list.
+	 * @param player The L2Character that attacks this one
+	 */
+	public void addAttackerToAttackByList(L2Character player) {
+		// DS: moved to L2Attackable
+	}
+	
+	/**
+	 * Send a packet to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * L2PcInstance in the detection area of the L2Character are identified in <B>_knownPlayers</B>.<br>
+	 * In order to inform other players of state modification on the L2Character, server just need to go through _knownPlayers to send Server->Client Packet
+	 * @param mov
+	 */
+	public void broadcastPacket(L2GameServerPacket mov) {
+		mov.setInvisible(isInvisible());
+		Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		for (L2PcInstance player : plrs) {
+			if (player != null) {
+				player.sendPacket(mov);
+			}
+		}
+	}
+	
+	/**
+	 * Send a packet to the L2Character AND to all L2PcInstance in the radius (max knownlist radius) from the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * L2PcInstance in the detection area of the L2Character are identified in <B>_knownPlayers</B>.<br>
+	 * In order to inform other players of state modification on the L2Character, server just need to go through _knownPlayers to send Server->Client Packet
+	 * @param mov
+	 * @param radiusInKnownlist
+	 */
+	public void broadcastPacket(L2GameServerPacket mov, int radiusInKnownlist) {
+		mov.setInvisible(isInvisible());
+		Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		for (L2PcInstance player : plrs) {
+			if ((player != null) && isInsideRadius(player, radiusInKnownlist, false, false)) {
+				player.sendPacket(mov);
+			}
+		}
+	}
+	
+	/**
+	 * @return true if hp update should be done, false if not
+	 */
+	protected boolean needHpUpdate() {
+		double currentHp = getCurrentHp();
+		double maxHp = getMaxHp();
+		
+		if ((currentHp <= 1.0) || (maxHp < MAX_HP_BAR_PX)) {
+			return true;
+		}
+		
+		if ((currentHp < _hpUpdateDecCheck) || (Math.abs(currentHp - _hpUpdateDecCheck) <= 1e-6) || (currentHp > _hpUpdateIncCheck) || (Math.abs(currentHp - _hpUpdateIncCheck) <= 1e-6)) {
+			if (Math.abs(currentHp - maxHp) <= 1e-6) {
+				_hpUpdateIncCheck = currentHp + 1;
+				_hpUpdateDecCheck = currentHp - _hpUpdateInterval;
+			} else {
+				double doubleMulti = currentHp / _hpUpdateInterval;
+				int intMulti = (int) doubleMulti;
+				
+				_hpUpdateDecCheck = _hpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti);
+				_hpUpdateIncCheck = _hpUpdateDecCheck + _hpUpdateInterval;
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Create the Server->Client packet StatusUpdate with current HP and MP</li>
+	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all L2Character called _statusListener that must be informed of HP/MP updates of this L2Character</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: This method DOESN'T SEND CP information</B></FONT>
+	 */
+	public void broadcastStatusUpdate() {
+		if (getStatus().getStatusListener().isEmpty() || !needHpUpdate()) {
+			return;
+		}
+		
+		// Create the Server->Client packet StatusUpdate with current HP
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.MAX_HP, getMaxHp());
+		su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp());
+		
+		// Go through the StatusListener
+		// Send the Server->Client packet StatusUpdate with current HP and MP
+		for (L2Character temp : getStatus().getStatusListener()) {
+			if (temp != null) {
+				temp.sendPacket(su);
+			}
+		}
+	}
+	
+	/**
+	 * @param text
+	 */
+	public void sendMessage(String text) {
+		// default implementation
+	}
+	
+	/**
+	 * Teleport a L2Character and its pet if necessary.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Stop the movement of the L2Character</li>
+	 * <li>Set the x,y,z position of the L2Object and if necessary modify its _worldRegion</li>
+	 * <li>Send a Server->Client packet TeleportToLocationt to the L2Character AND to all L2PcInstance in its _KnownPlayers</li>
+	 * <li>Modify the position of the pet if necessary</li>
+	 * </ul>
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param heading
+	 * @param instanceId
+	 * @param randomOffset
+	 */
+	public void teleToLocation(int x, int y, int z, int heading, int instanceId, int randomOffset) {
+		setInstanceId(instanceId);
+		
+		if (_isPendingRevive) {
+			doRevive();
+		}
+		
+		stopMove(null, false);
+		abortAttack();
+		abortCast();
+		
+		setIsTeleporting(true);
+		setTarget(null);
+		
+		getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		
+		if (character().offsetOnTeleport() && (randomOffset > 0)) {
+			x += Rnd.get(-randomOffset, randomOffset);
+			y += Rnd.get(-randomOffset, randomOffset);
+		}
+		
+		z += 5;
+		
+		// Send a Server->Client packet TeleportToLocationt to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
+		broadcastPacket(new TeleportToLocation(this, x, y, z, heading));
+		
+		// remove the object from its old location
+		decayMe();
+		
+		// Set the x,y,z position of the L2Object and if necessary modify its _worldRegion
+		setXYZ(x, y, z);
+		
+		// temporary fix for heading on teleports
+		if (heading != 0) {
+			setHeading(heading);
+		}
+		
+		// allow recall of the detached characters
+		if (!isPlayer() || ((getActingPlayer().getClient() != null) && getActingPlayer().getClient().isDetached())) {
+			onTeleported();
+		}
+		
+		revalidateZone(true);
+	}
+	
+	public void teleToLocation(int x, int y, int z, int heading, int instanceId, boolean randomOffset) {
+		teleToLocation(x, y, z, heading, instanceId, (randomOffset) ? character().getMaxOffsetOnTeleport() : 0);
+	}
+	
+	public void teleToLocation(int x, int y, int z, int heading, int instanceId) {
+		teleToLocation(x, y, z, heading, instanceId, 0);
+	}
+	
+	public void teleToLocation(int x, int y, int z, int heading, boolean randomOffset) {
+		teleToLocation(x, y, z, heading, -1, (randomOffset) ? character().getMaxOffsetOnTeleport() : 0);
+	}
+	
+	public void teleToLocation(int x, int y, int z, int heading) {
+		teleToLocation(x, y, z, heading, -1, 0);
+	}
+	
+	public void teleToLocation(int x, int y, int z, boolean randomOffset) {
+		teleToLocation(x, y, z, 0, -1, (randomOffset) ? character().getMaxOffsetOnTeleport() : 0);
+	}
+	
+	public void teleToLocation(int x, int y, int z) {
+		teleToLocation(x, y, z, 0, -1, 0);
+	}
+	
+	public void teleToLocation(ILocational loc, int randomOffset) {
+		teleToLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getHeading(), loc.getInstanceId(), randomOffset);
+	}
+	
+	public void teleToLocation(ILocational loc, int instanceId, int randomOffset) {
+		teleToLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getHeading(), instanceId, randomOffset);
+	}
+	
+	public void teleToLocation(ILocational loc, boolean randomOffset) {
+		teleToLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getHeading(), loc.getInstanceId(), (randomOffset) ? character().getMaxOffsetOnTeleport() : 0);
+	}
+	
+	public void teleToLocation(ILocational loc) {
+		teleToLocation(loc.getX(), loc.getY(), loc.getZ(), loc.getHeading(), loc.getInstanceId(), 0);
+	}
+	
+	public void teleToLocation(TeleportWhereType teleportWhere) {
+		teleToLocation(MapRegionManager.getInstance().getTeleToLocation(this, teleportWhere), true);
+	}
+	
+	private boolean canUseRangeWeapon() {
+		if (isTransformed()) {
+			return true;
+		}
+		L2Weapon weaponItem = getActiveWeaponItem();
+		
+		final long betweenRangedAttack = _disableBowAttackEndTime - System.currentTimeMillis();
+		// Check for arrows and MP
+		if (isPlayer()) {
+			if ((weaponItem == null) || !weaponItem.isRange()) {
+				return false;
+			}
+			
+			// Equip arrows needed in left hand and send a Server->Client packet ItemList to the L2PcInstance then return True
+			if (!checkAndEquipArrows()) {
+				// Cancel the action because the L2PcInstance have no arrow
+				getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(weaponItem.isBow() ? SystemMessageId.NOT_ENOUGH_ARROWS : SystemMessageId.NOT_ENOUGH_BOLTS);
+				return false;
+			}
+			
+			// Verify if the bow can be use
+			if (betweenRangedAttack > 0) {
+				// Cancel the action because the bow can't be re-use at this moment
+				ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), betweenRangedAttack);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			// Verify if L2PcInstance owns enough MP
+			int mpConsume = weaponItem.getMpConsume();
+			if ((weaponItem.getReducedMpConsume() > 0) && (Rnd.get(100) < weaponItem.getReducedMpConsumeChance())) {
+				mpConsume = weaponItem.getReducedMpConsume();
+			}
+			mpConsume = (int) calcStat(Stats.BOW_MP_CONSUME_RATE, mpConsume, null, null);
+			
+			if (getCurrentMp() < mpConsume) {
+				// If L2PcInstance doesn't have enough MP, stop the attack
+				ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), 100);
+				sendPacket(SystemMessageId.NOT_ENOUGH_MP);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			// If L2PcInstance have enough MP, the bow consumes it
+			if (mpConsume > 0) {
+				getStatus().reduceMp(mpConsume);
+			}
+		} else if (isNpc()) {
+			// Verify reuse attack
+			if (betweenRangedAttack > 0) {
+				ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), betweenRangedAttack);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Launch a physical attack against a target (Simple, Bow, Pole or Dual).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Get the active weapon (always equipped in the right hand)</li>
+	 * <li>If weapon is a bow, check for arrows, MP and bow re-use delay (if necessary, equip the L2PcInstance with arrows in left hand)</li>
+	 * <li>If weapon is a bow, consume MP and set the new period of bow non re-use</li>
+	 * <li>Get the Attack Speed of the L2Character (delay (in milliseconds) before next attack)</li>
+	 * <li>Select the type of attack to start (Simple, Bow, Pole or Dual) and verify if SoulShot are charged then start calculation</li>
+	 * <li>If the Server->Client packet Attack contains at least 1 hit, send the Server->Client packet Attack to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character</li>
+	 * <li>Notify AI with EVT_READY_TO_ACT</li>
+	 * </ul>
+	 * @param target The L2Character targeted
+	 */
+	public void doAttack(L2Character target) {
+		final long stamp = _attackLock.tryWriteLock();
+		if (stamp == 0) {
+			return;
+		}
+		try {
+			if ((target == null) || isAttackingDisabled()) {
+				return;
+			}
+			
+			// Notify to scripts
+			final TerminateReturn attackReturn = EventDispatcher.getInstance().notifyEvent(new CreatureAttack(this, target), this, TerminateReturn.class);
+			if ((attackReturn != null) && attackReturn.terminate()) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			// Notify to scripts
+			final TerminateReturn attackedReturn = EventDispatcher.getInstance().notifyEvent(new CreatureAttacked(this, target), target, TerminateReturn.class);
+			if ((attackedReturn != null) && attackedReturn.terminate()) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if (!isAlikeDead()) {
+				if ((isNpc() && target.isAlikeDead()) || !getKnownList().knowsObject(target)) {
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				} else if (isPlayer()) {
+					if (target.isDead()) {
+						getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+						sendPacket(ActionFailed.STATIC_PACKET);
+						return;
+					}
+					
+					final L2PcInstance actor = getActingPlayer();
+					if (actor.isTransformed() && !actor.getTransformation().canAttack()) {
+						sendPacket(ActionFailed.STATIC_PACKET);
+						return;
+					}
+				}
+			}
+			
+			// Check if attacker's weapon can attack
+			if (getActiveWeaponItem() != null) {
+				L2Weapon wpn = getActiveWeaponItem();
+				if (!wpn.isAttackWeapon() && !isGM()) {
+					if (wpn.getItemType() == WeaponType.FISHINGROD) {
+						sendPacket(SystemMessageId.CANNOT_ATTACK_WITH_FISHING_POLE);
+					} else {
+						sendPacket(SystemMessageId.THAT_WEAPON_CANT_ATTACK);
+					}
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+			
+			if (getActingPlayer() != null) {
+				if (getActingPlayer().inObserverMode()) {
+					sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE);
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+				
+				else if ((target.getActingPlayer() != null) && (getActingPlayer().getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getActingPlayer().getSiegeState()) && (target.getActingPlayer() != this)
+					&& (target.getActingPlayer().getSiegeSide() == getActingPlayer().getSiegeSide())) {
+					if (TerritoryWarManager.getInstance().isTWInProgress()) {
+						sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_A_MEMBER_OF_THE_SAME_TERRITORY);
+					} else {
+						sendPacket(SystemMessageId.FORCED_ATTACK_IS_IMPOSSIBLE_AGAINST_SIEGE_SIDE_TEMPORARY_ALLIED_MEMBERS);
+					}
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+				
+				// Checking if target has moved to peace zone
+				else if (target.isInsidePeaceZone(getActingPlayer())) {
+					getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			} else if (isInsidePeaceZone(this, target)) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			stopEffectsOnAction();
+			
+			if (!GeoData.getInstance().canSeeTarget(this, target)) {
+				sendPacket(SystemMessageId.CANT_SEE_TARGET);
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			target.getKnownList().addKnownObject(this);
+			
+			L2Weapon weaponItem = getActiveWeaponItem();
+			final int timeAtk = calculateTimeBetweenAttacks();
+			final int timeToHit = timeAtk / 2;
+			
+			Attack attack = new Attack(this, target, isChargedShot(ShotType.SOULSHOTS), (weaponItem != null) ? weaponItem.getItemGradeSPlus().getId() : 0);
+			setHeading(Util.calculateHeadingFrom(this, target));
+			int reuse = calculateReuseTime(weaponItem);
+			
+			if (isNpc()) {
+				if (weaponItem == null) {
+					reuse = timeAtk;
+				}
+				reuse = reuse + getTemplate().getBaseReuseDelay();
+			}
+			
+			boolean hitted;
+			switch (getAttackType()) {
+				case BOW: {
+					if (!canUseRangeWeapon()) {
+						return;
+					}
+					_attackEndTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeAtk, TimeUnit.MILLISECONDS);
+					hitted = doAttackHitByBow(attack, target, timeAtk, reuse);
+					break;
+				}
+				case CROSSBOW: {
+					if (!canUseRangeWeapon()) {
+						return;
+					}
+					_attackEndTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeAtk, TimeUnit.MILLISECONDS);
+					hitted = doAttackHitByCrossBow(attack, target, timeAtk, reuse);
+					break;
+				}
+				case POLE: {
+					_attackEndTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeAtk, TimeUnit.MILLISECONDS);
+					hitted = doAttackHitByPole(attack, target, timeToHit);
+					break;
+				}
+				case FIST: {
+					if (!isPlayer()) {
+						_attackEndTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeAtk, TimeUnit.MILLISECONDS);
+						hitted = doAttackHitSimple(attack, target, timeToHit);
+						break;
+					}
+				}
+				case DUAL:
+				case DUALFIST:
+				case DUALDAGGER: {
+					_attackEndTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeAtk, TimeUnit.MILLISECONDS);
+					hitted = doAttackHitByDual(attack, target, timeToHit);
+					break;
+				}
+				default: {
+					_attackEndTime = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeAtk, TimeUnit.MILLISECONDS);
+					hitted = doAttackHitSimple(attack, target, timeToHit);
+					break;
+				}
+			}
+			
+			// Flag the attacker if it's a L2PcInstance outside a PvP area
+			final L2PcInstance player = getActingPlayer();
+			if (player != null) {
+				AttackStanceTaskManager.getInstance().addAttackStanceTask(player);
+				if (player.getSummon() != target) {
+					player.updatePvPStatus(target);
+				}
+			}
+			
+			// Check if hit isn't missed
+			if (!hitted) {
+				abortAttack(); // Abort the attack of the L2Character and send Server->Client ActionFailed packet
+			} else {
+				// If we didn't miss the hit, discharge the shoulshots, if any
+				setChargedShot(ShotType.SOULSHOTS, false);
+				
+				if (player != null) {
+					if (player.isCursedWeaponEquipped()) {
+						// If hit by a cursed weapon, CP is reduced to 0
+						if (!target.isInvul()) {
+							target.setCurrentCp(0);
+						}
+					} else if (player.isHero()) {
+						// If a cursed weapon is hit by a Hero, CP is reduced to 0
+						if (target.isPlayer() && target.getActingPlayer().isCursedWeaponEquipped()) {
+							target.setCurrentCp(0);
+						}
+					}
+				}
+			}
+			
+			// If the Server->Client packet Attack contains at least 1 hit, send the Server->Client packet Attack
+			// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
+			if (attack.hasHits()) {
+				broadcastPacket(attack);
+			}
+			
+			ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_READY_TO_ACT), timeAtk);
+		} finally {
+			_attackLock.unlockWrite(stamp);
+		}
+	}
+	
+	/**
+	 * Launch a Bow attack.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Calculate if hit is missed or not</li>
+	 * <li>Consume arrows</li>
+	 * <li>If hit isn't missed, calculate if shield defense is efficient</li>
+	 * <li>If hit isn't missed, calculate if hit is critical</li>
+	 * <li>If hit isn't missed, calculate physical damages</li>
+	 * <li>If the L2Character is a L2PcInstance, Send a Server->Client packet SetupGauge</li>
+	 * <li>Create a new hit task with Medium priority</li>
+	 * <li>Calculate and set the disable delay of the bow in function of the Attack Speed</li>
+	 * <li>Add this hit to the Server-Client packet Attack</li>
+	 * </ul>
+	 * @param attack Server->Client packet Attack in which the hit will be added
+	 * @param target The L2Character targeted
+	 * @param sAtk The Attack Speed of the attacker
+	 * @param reuse
+	 * @return True if the hit isn't missed
+	 */
+	private boolean doAttackHitByBow(Attack attack, L2Character target, int sAtk, int reuse) {
+		int damage1 = 0;
+		byte shld1 = 0;
+		boolean crit1 = false;
+		
+		// Calculate if hit is missed or not
+		boolean miss1 = Formulas.calcHitMiss(this, target);
+		
+		// Consume arrows
+		reduceArrowCount(false);
+		
+		_move = null;
+		
+		// Check if hit isn't missed
+		if (!miss1) {
+			// Calculate if shield defense is efficient
+			shld1 = Formulas.calcShldUse(this, target);
+			
+			// Calculate if hit is critical
+			crit1 = Formulas.calcCrit(this, target);
+			
+			// Calculate physical damages
+			damage1 = (int) Formulas.calcPhysDam(this, target, shld1, crit1, attack.hasSoulshot());
+			
+			// Bows Ranged Damage Formula (Damage gradually decreases when 60% or lower than full hit range, and increases when 60% or higher).
+			// full hit range is 500 which is the base bow range, and the 60% of this is 800.
+			damage1 *= (calculateDistance(target, true, false) / 4000) + 0.8;
+		}
+		
+		// Check if the L2Character is a L2PcInstance
+		if (isPlayer()) {
+			sendPacket(new SetupGauge(SetupGauge.RED, sAtk + reuse));
+		}
+		
+		// Create a new hit task with Medium priority
+		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
+		
+		// Calculate and set the disable delay of the bow in function of the Attack Speed
+		_disableBowAttackEndTime = (sAtk + reuse) + System.currentTimeMillis();
+		
+		// Add this hit to the Server-Client packet Attack
+		attack.addHit(target, damage1, miss1, crit1, shld1);
+		
+		// Return true if hit isn't missed
+		return !miss1;
+	}
+	
+	/**
+	 * Launch a CrossBow attack.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Calculate if hit is missed or not</li>
+	 * <li>Consume bolts</li>
+	 * <li>If hit isn't missed, calculate if shield defense is efficient</li>
+	 * <li>If hit isn't missed, calculate if hit is critical</li>
+	 * <li>If hit isn't missed, calculate physical damages</li>
+	 * <li>If the L2Character is a L2PcInstance, Send a Server->Client packet SetupGauge</li>
+	 * <li>Create a new hit task with Medium priority</li>
+	 * <li>Calculate and set the disable delay of the crossbow in function of the Attack Speed</li>
+	 * <li>Add this hit to the Server-Client packet Attack</li>
+	 * @param attack Server->Client packet Attack in which the hit will be added
+	 * @param target The L2Character targeted
+	 * @param sAtk The Attack Speed of the attacker
+	 * @param reuse
+	 * @return True if the hit isn't missed
+	 */
+	private boolean doAttackHitByCrossBow(Attack attack, L2Character target, int sAtk, int reuse) {
+		int damage1 = 0;
+		byte shld1 = 0;
+		boolean crit1 = false;
+		
+		// Calculate if hit is missed or not
+		boolean miss1 = Formulas.calcHitMiss(this, target);
+		
+		// Consume bolts
+		reduceArrowCount(true);
+		
+		_move = null;
+		
+		// Check if hit isn't missed
+		if (!miss1) {
+			// Calculate if shield defense is efficient
+			shld1 = Formulas.calcShldUse(this, target);
+			
+			// Calculate if hit is critical
+			crit1 = Formulas.calcCrit(this, target);
+			
+			// Calculate physical damages
+			damage1 = (int) Formulas.calcPhysDam(this, target, shld1, crit1, attack.hasSoulshot());
+		}
+		
+		// Check if the L2Character is a L2PcInstance
+		if (isPlayer()) {
+			// Send a system message
+			sendPacket(SystemMessageId.CROSSBOW_PREPARING_TO_FIRE);
+			
+			// Send a Server->Client packet SetupGauge
+			SetupGauge sg = new SetupGauge(SetupGauge.RED, sAtk + reuse);
+			sendPacket(sg);
+		}
+		
+		// Create a new hit task with Medium priority
+		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
+		
+		// Calculate and set the disable delay of the bow in function of the Attack Speed
+		_disableBowAttackEndTime = (sAtk + reuse) + System.currentTimeMillis();
+		
+		// Add this hit to the Server-Client packet Attack
+		attack.addHit(target, damage1, miss1, crit1, shld1);
+		
+		// Return true if hit isn't missed
+		return !miss1;
+	}
+	
+	/**
+	 * Launch a Dual attack.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Calculate if hits are missed or not</li>
+	 * <li>If hits aren't missed, calculate if shield defense is efficient</li>
+	 * <li>If hits aren't missed, calculate if hit is critical</li>
+	 * <li>If hits aren't missed, calculate physical damages</li>
+	 * <li>Create 2 new hit tasks with Medium priority</li>
+	 * <li>Add those hits to the Server-Client packet Attack</li>
+	 * </ul>
+	 * @param attack Server->Client packet Attack in which the hit will be added
+	 * @param target The L2Character targeted
+	 * @param sAtk
+	 * @return True if hit 1 or hit 2 isn't missed
+	 */
+	private boolean doAttackHitByDual(Attack attack, L2Character target, int sAtk) {
+		int damage1 = 0;
+		int damage2 = 0;
+		byte shld1 = 0;
+		byte shld2 = 0;
+		boolean crit1 = false;
+		boolean crit2 = false;
+		
+		// Calculate if hits are missed or not
+		boolean miss1 = Formulas.calcHitMiss(this, target);
+		boolean miss2 = Formulas.calcHitMiss(this, target);
+		
+		// Check if hit 1 isn't missed
+		if (!miss1) {
+			// Calculate if shield defense is efficient against hit 1
+			shld1 = Formulas.calcShldUse(this, target);
+			
+			// Calculate if hit 1 is critical
+			crit1 = Formulas.calcCrit(this, target);
+			
+			// Calculate physical damages of hit 1
+			damage1 = (int) Formulas.calcPhysDam(this, target, shld1, crit1, attack.hasSoulshot());
+			damage1 /= 2;
+		}
+		
+		// Check if hit 2 isn't missed
+		if (!miss2) {
+			// Calculate if shield defense is efficient against hit 2
+			shld2 = Formulas.calcShldUse(this, target);
+			
+			// Calculate if hit 2 is critical
+			crit2 = Formulas.calcCrit(this, target);
+			
+			// Calculate physical damages of hit 2
+			damage2 = (int) Formulas.calcPhysDam(this, target, shld2, crit2, attack.hasSoulshot());
+			damage2 /= 2;
+		}
+		
+		// Create a new hit task with Medium priority for hit 1
+		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk / 2);
+		
+		// Create a new hit task with Medium priority for hit 2 with a higher delay
+		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage2, crit2, miss2, attack.hasSoulshot(), shld2), sAtk);
+		
+		// Add those hits to the Server-Client packet Attack
+		attack.addHit(target, damage1, miss1, crit1, shld1);
+		attack.addHit(target, damage2, miss2, crit2, shld2);
+		
+		// Return true if hit 1 or hit 2 isn't missed
+		return (!miss1 || !miss2);
+	}
+	
+	/**
+	 * Launch a Pole attack.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Get all visible objects in a spherical area near the L2Character to obtain possible targets</li>
+	 * <li>If possible target is the L2Character targeted, launch a simple attack against it</li>
+	 * <li>If possible target isn't the L2Character targeted but is attackable, launch a simple attack against it</li>
+	 * </ul>
+	 * @param attack Server->Client packet Attack in which the hit will be added
+	 * @param target
+	 * @param sAtk
+	 * @return True if one hit isn't missed
+	 */
+	private boolean doAttackHitByPole(Attack attack, L2Character target, int sAtk) {
+		boolean hitted = doAttackHitSimple(attack, target, 100, sAtk);
+		
+		if (isAffected(EffectFlag.SINGLE_TARGET)) {
+			return hitted;
+		}
+		
+		// double angleChar;
+		int maxRadius = getStat().getPhysicalAttackRange();
+		int maxAngleDiff = getStat().getPhysicalAttackAngle();
+		
+		// o1 x: 83420 y: 148158 (Giran)
+		// o2 x: 83379 y: 148081 (Giran)
+		// dx = -41
+		// dy = -77
+		// distance between o1 and o2 = 87.24
+		// arctan2 = -120 (240) degree (excel arctan2(dx, dy); java arctan2(dy, dx))
+		//
+		// o2
+		//
+		// o1 ----- (heading)
+		// In the diagram above:
+		// o1 has a heading of 0/360 degree from horizontal (facing East)
+		// Degree of o2 in respect to o1 = -120 (240) degree
+		//
+		// o2 / (heading)
+		// /
+		// o1
+		// In the diagram above
+		// o1 has a heading of -80 (280) degree from horizontal (facing north east)
+		// Degree of o2 in respect to 01 = -40 (320) degree
+		
+		// Get char's heading degree
+		// angleChar = Util.convertHeadingToDegree(getHeading());
+		
+		// H5 Changes: without Polearm Mastery (skill 216) max simultaneous attacks is 3 (1 by default + 2 in skill 3599).
+		int attackRandomCountMax = (int) getStat().calcStat(Stats.ATTACK_COUNT_MAX, 1, null, null);
+		int attackcount = 0;
+		
+		// if (angleChar <= 0) angleChar += 360;
+		double attackpercent = 85;
+		L2Character temp;
+		Collection<L2Object> objs = getKnownList().getKnownObjects().values();
+		
+		for (L2Object obj : objs) {
+			if ((obj == target) || (obj == null)) {
+				continue; // do not hit twice
+			}
+			// Check if the L2Object is a L2Character
+			if (obj.isCharacter()) {
+				if (obj.isPet() && isPlayer() && (((L2PetInstance) obj).getOwner() == getActingPlayer())) {
+					continue;
+				}
+				
+				if (!Util.checkIfInRange(maxRadius, this, obj, false)) {
+					continue;
+				}
+				
+				// otherwise hit too high/low. 650 because mob z coord
+				// sometimes wrong on hills
+				if (Math.abs(obj.getZ() - getZ()) > 650) {
+					continue;
+				}
+				if (!isFacing(obj, maxAngleDiff)) {
+					continue;
+				}
+				
+				if (isAttackable() && obj.isPlayer() && obj.isAttackable()) {
+					continue;
+				}
+				
+				if (isAttackable() && obj.isAttackable() && !((L2Attackable) this).isChaos()) {
+					continue;
+				}
+				
+				temp = (L2Character) obj;
+				
+				// Launch a simple attack against the L2Character targeted
+				if (!temp.isAlikeDead()) {
+					if ((temp == getAI().getAttackTarget()) || temp.isAutoAttackable(this)) {
+						hitted |= doAttackHitSimple(attack, temp, attackpercent, sAtk);
+						attackpercent /= 1.15;
+						
+						attackcount++;
+						if (attackcount > attackRandomCountMax) {
+							break;
+						}
+					}
+				}
+			}
+		}
+		
+		// Return true if one hit isn't missed
+		return hitted;
+	}
+	
+	/**
+	 * Launch a simple attack.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Calculate if hit is missed or not</li>
+	 * <li>If hit isn't missed, calculate if shield defense is efficient</li>
+	 * <li>If hit isn't missed, calculate if hit is critical</li>
+	 * <li>If hit isn't missed, calculate physical damages</li>
+	 * <li>Create a new hit task with Medium priority</li>
+	 * <li>Add this hit to the Server-Client packet Attack</li>
+	 * </ul>
+	 * @param attack Server->Client packet Attack in which the hit will be added
+	 * @param target The L2Character targeted
+	 * @param sAtk
+	 * @return True if the hit isn't missed
+	 */
+	private boolean doAttackHitSimple(Attack attack, L2Character target, int sAtk) {
+		return doAttackHitSimple(attack, target, 100, sAtk);
+	}
+	
+	private boolean doAttackHitSimple(Attack attack, L2Character target, double attackpercent, int sAtk) {
+		int damage1 = 0;
+		byte shld1 = 0;
+		boolean crit1 = false;
+		
+		// Calculate if hit is missed or not
+		boolean miss1 = Formulas.calcHitMiss(this, target);
+		
+		// Check if hit isn't missed
+		if (!miss1) {
+			// Calculate if shield defense is efficient
+			shld1 = Formulas.calcShldUse(this, target);
+			
+			// Calculate if hit is critical
+			crit1 = Formulas.calcCrit(this, target);
+			
+			// Calculate physical damages
+			damage1 = (int) Formulas.calcPhysDam(this, target, shld1, crit1, attack.hasSoulshot());
+			
+			if (attackpercent != 100) {
+				damage1 = (int) ((damage1 * attackpercent) / 100);
+			}
+		}
+		
+		// Create a new hit task with Medium priority
+		ThreadPoolManager.getInstance().scheduleAi(new HitTask(this, target, damage1, crit1, miss1, attack.hasSoulshot(), shld1), sAtk);
+		
+		// Add this hit to the Server-Client packet Attack
+		attack.addHit(target, damage1, miss1, crit1, shld1);
+		
+		// Return true if hit isn't missed
+		return !miss1;
+	}
+	
+	/**
+	 * Manage the casting task (casting and interrupt time, re-use delay...) and display the casting bar and animation on client.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Verify the possibility of the the cast : skill is a spell, caster isn't muted...</li>
+	 * <li>Get the list of all targets (ex : area effects) and define the L2Charcater targeted (its stats will be used in calculation)</li>
+	 * <li>Calculate the casting time (base + modifier of MAtkSpd), interrupt time and re-use delay</li>
+	 * <li>Send a Server->Client packet MagicSkillUser (to display casting animation), a packet SetupGauge (to display casting bar) and a system message</li>
+	 * <li>Disable all skills during the casting time (create a task EnableAllSkills)</li>
+	 * <li>Disable the skill during the re-use delay (create a task EnableSkill)</li>
+	 * <li>Create a task MagicUseTask (that will call method onMagicUseTimer) to launch the Magic Skill at the end of the casting time</li>
+	 * </ul>
+	 * @param skill The L2Skill to use
+	 */
+	public void doCast(Skill skill) {
+		beginCast(skill, false);
+	}
+	
+	/**
+	 * SkillHolder version of {@link #doCast(Skill)} method.
+	 */
+	public void doCast(SkillHolder skill) {
+		beginCast(skill.getSkill(), false);
+	}
+	
+	public void doSimultaneousCast(Skill skill) {
+		beginCast(skill, true);
+	}
+	
+	/**
+	 * SkillHolder version of {@link #doSimultaneousCast(Skill)} method.
+	 */
+	public void doSimultaneousCast(SkillHolder skill) {
+		beginCast(skill.getSkill(), true);
+	}
+	
+	public void doCast(Skill skill, L2Character target, List<L2Object> targets) {
+		if (!checkDoCastConditions(skill)) {
+			setIsCastingNow(false);
+			return;
+		}
+		
+		// Override casting type
+		if (skill.isSimultaneousCast()) {
+			doSimultaneousCast(skill, target, targets);
+			return;
+		}
+		
+		stopEffectsOnAction();
+		
+		// Recharge AutoSoulShot
+		// this method should not used with L2Playable
+		
+		beginCast(skill, false, target, targets);
+	}
+	
+	public void doSimultaneousCast(Skill skill, L2Character target, List<L2Object> targets) {
+		if (!checkDoCastConditions(skill)) {
+			setIsCastingSimultaneouslyNow(false);
+			return;
+		}
+		stopEffectsOnAction();
+		
+		beginCast(skill, true, target, targets);
+	}
+	
+	private void beginCast(Skill skill, boolean simultaneously) {
+		if (!checkDoCastConditions(skill)) {
+			if (simultaneously) {
+				setIsCastingSimultaneouslyNow(false);
+			} else {
+				setIsCastingNow(false);
+			}
+			if (isPlayer()) {
+				getAI().setIntention(AI_INTENTION_ACTIVE);
+			}
+			return;
+		}
+		
+		// Override casting type
+		if (skill.isSimultaneousCast() && !simultaneously) {
+			simultaneously = true;
+		}
+		
+		stopEffectsOnAction();
+		
+		final var target = skill.getTargetType().getTarget(skill, this, _target);
+		final var targets = skill.getTargetType().getTargets(skill, this, _target);
+		beginCast(skill, simultaneously, (L2Character) target, targets);
+	}
+	
+	private void beginCast(Skill skill, boolean simultaneously, L2Character target, List<L2Object> targets) {
+		if (target == null) {
+			if (simultaneously) {
+				setIsCastingSimultaneouslyNow(false);
+			} else {
+				setIsCastingNow(false);
+			}
+			if (isPlayer()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				getAI().setIntention(AI_INTENTION_ACTIVE);
+			}
+			return;
+		}
+		
+		final var term = EventDispatcher.getInstance().notifyEvent(new CreatureSkillUse(this, skill, simultaneously, target, targets), this, TerminateReturn.class);
+		if ((term != null) && term.terminate()) {
+			if (simultaneously) {
+				setIsCastingSimultaneouslyNow(false);
+			} else {
+				setIsCastingNow(false);
+			}
+			if (isPlayer()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				getAI().setIntention(AI_INTENTION_ACTIVE);
+			}
+			return;
+		}
+		
+		// TODO: Unhardcode using event listeners!
+		if (skill.hasEffectType(L2EffectType.RESURRECTION)) {
+			if (isResurrectionBlocked() || target.isResurrectionBlocked()) {
+				sendPacket(SystemMessageId.REJECT_RESURRECTION); // Reject resurrection
+				target.sendPacket(SystemMessageId.REJECT_RESURRECTION); // Reject resurrection
+				
+				if (simultaneously) {
+					setIsCastingSimultaneouslyNow(false);
+				} else {
+					setIsCastingNow(false);
+				}
+				
+				if (isPlayer()) {
+					getAI().setIntention(AI_INTENTION_ACTIVE);
+					sendPacket(ActionFailed.STATIC_PACKET);
+				}
+				return;
+			}
+		}
+		
+		// Get the Identifier of the skill
+		int magicId = skill.getId();
+		
+		// Get the Base Casting Time of the Skills.
+		double skillAnimTime = Formulas.calcCastTime(this, skill);
+		
+		// queue herbs and potions
+		if (isCastingSimultaneouslyNow() && simultaneously) {
+			ThreadPoolManager.getInstance().scheduleAi(() -> beginCast(skill, simultaneously, target, targets), 100);
+			return;
+		}
+		
+		if (simultaneously) {
+			setIsCastingSimultaneouslyNow(true);
+			setLastSimultaneousSkillCast(skill);
+		} else {
+			setIsCastingNow(true);
+			_castInterruptTime = (-200 / GameTimeController.MILLIS_IN_TICK) // 200ms converted to ticks
+				+ GameTimeController.getInstance().getGameTicks() + ((int) skillAnimTime / GameTimeController.MILLIS_IN_TICK);
+			setLastSkillCast(skill);
+		}
+		
+		// Calculate the Reuse Time of the Skill
+		int reuseDelay;
+		if (skill.isReuseDelayLocked() || skill.isStatic()) {
+			reuseDelay = (skill.getReuseDelay());
+		} else if (skill.isMagic()) {
+			reuseDelay = (int) (skill.getReuseDelay() * calcStat(Stats.MAGIC_REUSE_RATE, 1, null, null));
+		} else if (skill.isPhysical()) {
+			reuseDelay = (int) (skill.getReuseDelay() * calcStat(Stats.P_REUSE, 1, null, null));
+		} else {
+			reuseDelay = (int) (skill.getReuseDelay() * calcStat(Stats.DANCE_REUSE, 1, null, null));
+		}
+		
+		boolean skillMastery = Formulas.calcSkillMastery(this, skill);
+		
+		// Skill reuse check
+		if ((reuseDelay > 30000) && !skillMastery) {
+			addTimeStamp(skill, reuseDelay);
+		}
+		
+		// Check if this skill consume mp on start casting
+		int initmpcons = getStat().getMpConsume1(skill);
+		if (initmpcons > 0) {
+			getStatus().reduceMp(initmpcons);
+			StatusUpdate su = new StatusUpdate(this);
+			su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp());
+			sendPacket(su);
+		}
+		
+		// Disable the skill during the re-use delay and create a task EnableSkill with Medium priority to enable it at the end of the re-use delay
+		if (reuseDelay > 10) {
+			if (skillMastery) {
+				reuseDelay = 100;
+				
+				if (getActingPlayer() != null) {
+					getActingPlayer().sendPacket(SystemMessageId.SKILL_READY_TO_USE_AGAIN);
+				}
+			}
+			
+			disableSkill(skill, reuseDelay);
+		}
+		
+		// Make sure that char is facing selected target
+		if (target != this) {
+			setHeading(Util.calculateHeadingFrom(this, target));
+			broadcastPacket(new ExRotation(getObjectId(), getHeading()));
+		}
+		
+		if (isPlayable()) {
+			if (skill.getItemConsumeId() > 0) {
+				if (!destroyItemByItemId("Consume", skill.getItemConsumeId(), skill.getItemConsumeCount(), null, true)) {
+					getActingPlayer().sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+					abortCast();
+					return;
+				}
+			}
+			
+			// reduce talisman mana on skill use
+			if ((skill.getReferenceItemId() > 0) && (ItemTable.getInstance().getTemplate(skill.getReferenceItemId()).getBodyPart() == L2Item.SLOT_DECO)) {
+				for (L2ItemInstance item : getInventory().getItemsByItemId(skill.getReferenceItemId())) {
+					if (item.isEquipped()) {
+						if (item.getMana() < item.useSkillDisTime()) {
+							abortCast();
+							return;
+						}
+						item.decreaseMana(false, item.useSkillDisTime());
+						break;
+					}
+				}
+			}
+		}
+		
+		// Send a Server->Client packet MagicSkillUser with target, displayId, level, skillTime, reuseDelay
+		// to the L2Character AND to all L2PcInstance in the _KnownPlayers of the L2Character
+		broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getDisplayLevel(), (int) skillAnimTime, reuseDelay));
+		
+		// Send a system message to the player.
+		if (isPlayer() && !skill.isAbnormalInstant()) {
+			SystemMessage sm = null;
+			switch (magicId) {
+				case 1312 -> {
+					// Fishing
+					// Done in L2PcInstance.startFishing()
+				}
+				case 2046 -> sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMON_A_PET); // Wolf Collar
+				default -> {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.USE_S1);
+					sm.addSkillName(skill);
+				}
+			}
+			sendPacket(sm);
+		}
+		
+		if (skill.hasEffects(EffectScope.START)) {
+			skill.applyEffectScope(EffectScope.START, new BuffInfo(this, target, skill), true, false);
+		}
+		
+		// Before start AI Cast Broadcast Fly Effect is Need
+		if (skill.isFlyType()) {
+			ThreadPoolManager.getInstance().scheduleEffect(new FlyToLocationTask(this, target, FlyType.CHARGE), 50);
+		}
+		
+		MagicUseTask mut = new MagicUseTask(this, targets, skill, (int) skillAnimTime, simultaneously);
+		
+		// launch the magic in skillTime milliseconds
+		if (skillAnimTime > 0) {
+			// Send a Server->Client packet SetupGauge with the color of the gauge and the casting time
+			if (isPlayer() && !simultaneously) {
+				sendPacket(new SetupGauge(SetupGauge.BLUE, (int) skillAnimTime));
+			}
+			
+			if (skill.isChanneling() && (skill.getChannelingSkillId() > 0)) {
+				getSkillChannelizer().startChanneling(skill);
+			} else if (skill.isContinuous()) {
+				// For client animation reasons (party buffs especially) 300 ms before!
+				skillAnimTime -= 300;
+			}
+			
+			if (simultaneously) {
+				Future<?> future = _skillCast2;
+				if (future != null) {
+					future.cancel(true);
+					_skillCast2 = null;
+				}
+				_skillCast2 = ThreadPoolManager.getInstance().scheduleEffect(mut, (int) skillAnimTime - 400);
+			} else {
+				Future<?> future = _skillCast;
+				if (future != null) {
+					future.cancel(true);
+					_skillCast = null;
+				}
+				_skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, (int) skillAnimTime - 400);
+			}
+		} else {
+			mut.setSkillTime(0);
+			onMagicLaunchedTimer(mut);
+		}
+	}
+	
+	/**
+	 * Check if casting of skill is possible
+	 * @param skill
+	 * @return True if casting is possible
+	 */
+	public boolean checkDoCastConditions(Skill skill) {
+		if ((skill == null) || isSkillDisabled(skill) || (skill.isFlyType() && isMovementDisabled())) {
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if the caster has enough MP
+		if (getCurrentMp() < (getStat().getMpConsume1(skill) + getStat().getMpConsume2(skill))) {
+			// Send a System Message to the caster
+			sendPacket(SystemMessageId.NOT_ENOUGH_MP);
+			
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if the caster has enough HP
+		if (getCurrentHp() <= skill.getHpConsume()) {
+			// Send a System Message to the caster
+			sendPacket(SystemMessageId.NOT_ENOUGH_HP);
+			
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Skill mute checks.
+		if (!skill.isStatic()) {
+			// Check if the skill is a magic spell and if the L2Character is not muted
+			if (skill.isMagic()) {
+				if (isMuted()) {
+					// Send a Server->Client packet ActionFailed to the L2PcInstance
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return false;
+				}
+			} else {
+				// Check if the skill is physical and if the L2Character is not physical_muted
+				if (isPhysicalMuted()) {
+					// Send a Server->Client packet ActionFailed to the L2PcInstance
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return false;
+				}
+			}
+		}
+		
+		// prevent casting signets to peace zone
+		if (skill.isChanneling() && (skill.getChannelingSkillId() > 0)) {
+			L2WorldRegion region = getWorldRegion();
+			if (region == null) {
+				return false;
+			}
+			boolean canCast = true;
+			if ((skill.getTargetType() == TargetType.GROUND) && isPlayer()) {
+				Location wp = getActingPlayer().getCurrentSkillWorldPosition();
+				if (!region.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ())) {
+					canCast = false;
+				}
+			} else if (!region.checkEffectRangeInsidePeaceZone(skill, getX(), getY(), getZ())) {
+				canCast = false;
+			}
+			if (!canCast) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+				sm.addSkillName(skill);
+				sendPacket(sm);
+				return false;
+			}
+		}
+		
+		// Check if the caster's weapon is limited to use only its own skills
+		if (getActiveWeaponItem() != null) {
+			L2Weapon wep = getActiveWeaponItem();
+			if (wep.useWeaponSkillsOnly() && !isGM() && wep.hasSkills()) {
+				boolean found = false;
+				for (SkillHolder sh : wep.getSkills()) {
+					if (sh.getSkillId() == skill.getId()) {
+						found = true;
+						break;
+					}
+				}
+				
+				if (!found) {
+					if (getActingPlayer() != null) {
+						sendPacket(SystemMessageId.WEAPON_CAN_USE_ONLY_WEAPON_SKILL);
+					}
+					return false;
+				}
+			}
+		}
+		
+		// Check if the spell consumes an Item
+		// TODO: combine check and consume
+		if ((skill.getItemConsumeId() > 0) && (getInventory() != null)) {
+			// Get the L2ItemInstance consumed by the spell
+			L2ItemInstance requiredItems = getInventory().getItemByItemId(skill.getItemConsumeId());
+			
+			// Check if the caster owns enough consumed Item to cast
+			if ((requiredItems == null) || (requiredItems.getCount() < skill.getItemConsumeCount())) {
+				// Checked: when a summon skill failed, server show required consume item count
+				if (skill.hasEffectType(L2EffectType.SUMMON)) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_SERVITOR_COSTS_S2_S1);
+					sm.addItemName(skill.getItemConsumeId());
+					sm.addInt(skill.getItemConsumeCount());
+					sendPacket(sm);
+				} else {
+					// Send a System Message to the caster
+					sendPacket(SystemMessageId.THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL);
+				}
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Gets the item reuse time stamps map.
+	 * @return the item reuse time stamps map
+	 */
+	public final Map<Integer, TimeStamp> getItemReuseTimeStamps() {
+		return _reuseTimeStampsItems;
+	}
+	
+	/**
+	 * Adds a item reuse time stamp.
+	 * @param item the item
+	 * @param reuse the reuse
+	 */
+	public final void addTimeStampItem(L2ItemInstance item, long reuse) {
+		addTimeStampItem(item, reuse, -1);
+	}
+	
+	/**
+	 * Adds a item reuse time stamp.<br>
+	 * Used for restoring purposes.
+	 * @param item the item
+	 * @param reuse the reuse
+	 * @param systime the system time
+	 */
+	public final void addTimeStampItem(L2ItemInstance item, long reuse, long systime) {
+		if (_reuseTimeStampsItems == null) {
+			synchronized (this) {
+				if (_reuseTimeStampsItems == null) {
+					_reuseTimeStampsItems = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		_reuseTimeStampsItems.put(item.getObjectId(), new TimeStamp(item, reuse, systime));
+	}
+	
+	/**
+	 * Gets the item remaining reuse time for a given item object ID.
+	 * @param itemObjId the item object ID
+	 * @return if the item has a reuse time stamp, the remaining time, otherwise -1
+	 */
+	public synchronized final long getItemRemainingReuseTime(int itemObjId) {
+		final TimeStamp reuseStamp = (_reuseTimeStampsItems != null) ? _reuseTimeStampsItems.get(itemObjId) : null;
+		return reuseStamp != null ? reuseStamp.getRemaining() : -1;
+	}
+	
+	/**
+	 * Gets the item remaining reuse time for a given shared reuse item group.
+	 * @param group the shared reuse item group
+	 * @return if the shared reuse item group has a reuse time stamp, the remaining time, otherwise -1
+	 */
+	public final long getReuseDelayOnGroup(int group) {
+		if ((group > 0) && (_reuseTimeStampsItems != null)) {
+			for (TimeStamp ts : _reuseTimeStampsItems.values()) {
+				if ((ts.getSharedReuseGroup() == group) && ts.hasNotPassed()) {
+					return ts.getRemaining();
+				}
+			}
+		}
+		return -1;
+	}
+	
+	/**
+	 * Gets the skill reuse time stamps map.
+	 * @return the skill reuse time stamps map
+	 */
+	public final Map<Integer, TimeStamp> getSkillReuseTimeStamps() {
+		return _reuseTimeStampsSkills;
+	}
+	
+	/**
+	 * Adds the skill reuse time stamp.
+	 * @param skill the skill
+	 * @param reuse the delay
+	 */
+	public final void addTimeStamp(Skill skill, long reuse) {
+		addTimeStamp(skill, reuse, -1);
+	}
+	
+	/**
+	 * Adds the skill reuse time stamp.<br>
+	 * Used for restoring purposes.
+	 * @param skill the skill
+	 * @param reuse the reuse
+	 * @param systime the system time
+	 */
+	public final void addTimeStamp(Skill skill, long reuse, long systime) {
+		if (_reuseTimeStampsSkills == null) {
+			synchronized (this) {
+				if (_reuseTimeStampsSkills == null) {
+					_reuseTimeStampsSkills = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		_reuseTimeStampsSkills.put(skill.getReuseHashCode(), new TimeStamp(skill, reuse, systime));
+	}
+	
+	/**
+	 * Removes a skill reuse time stamp.
+	 * @param skill the skill to remove
+	 */
+	public synchronized final void removeTimeStamp(Skill skill) {
+		if (_reuseTimeStampsSkills != null) {
+			_reuseTimeStampsSkills.remove(skill.getReuseHashCode());
+		}
+	}
+	
+	/**
+	 * Removes all skill reuse time stamps.
+	 */
+	public synchronized final void resetTimeStamps() {
+		if (_reuseTimeStampsSkills != null) {
+			_reuseTimeStampsSkills.clear();
+		}
+	}
+	
+	/**
+	 * Gets the skill remaining reuse time for a given skill hash code.
+	 * @param hashCode the skill hash code
+	 * @return if the skill has a reuse time stamp, the remaining time, otherwise -1
+	 */
+	public synchronized final long getSkillRemainingReuseTime(int hashCode) {
+		final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
+		return reuseStamp != null ? reuseStamp.getRemaining() : -1;
+	}
+	
+	/**
+	 * Verifies if the skill is under reuse time.
+	 * @param hashCode the skill hash code
+	 * @return {@code true} if the skill is under reuse time, {@code false} otherwise
+	 */
+	public synchronized final boolean hasSkillReuse(int hashCode) {
+		final TimeStamp reuseStamp = (_reuseTimeStampsSkills != null) ? _reuseTimeStampsSkills.get(hashCode) : null;
+		return (reuseStamp != null) && reuseStamp.hasNotPassed();
+	}
+	
+	/**
+	 * Gets the skill reuse time stamp.
+	 * @param hashCode the skill hash code
+	 * @return if the skill has a reuse time stamp, the skill reuse time stamp, otherwise {@code null}
+	 */
+	public synchronized final TimeStamp getSkillReuseTimeStamp(int hashCode) {
+		return _reuseTimeStampsSkills != null ? _reuseTimeStampsSkills.get(hashCode) : null;
+	}
+	
+	/**
+	 * Gets the disabled skills map.
+	 * @return the disabled skills map
+	 */
+	public Map<Integer, Long> getDisabledSkills() {
+		return _disabledSkills;
+	}
+	
+	/**
+	 * Enables a skill.
+	 * @param skill the skill to enable
+	 */
+	public void enableSkill(Skill skill) {
+		if ((skill == null) || (_disabledSkills == null)) {
+			return;
+		}
+		_disabledSkills.remove(skill.getReuseHashCode());
+	}
+	
+	/**
+	 * Disables a skill for a given time.<br>
+	 * If delay is lesser or equal than zero, skill will be disabled "forever".
+	 * @param skill the skill to disable
+	 * @param delay delay in milliseconds
+	 */
+	public void disableSkill(Skill skill, long delay) {
+		if (skill == null) {
+			return;
+		}
+		
+		if (_disabledSkills == null) {
+			synchronized (this) {
+				if (_disabledSkills == null) {
+					_disabledSkills = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		
+		_disabledSkills.put(skill.getReuseHashCode(), delay > 0 ? System.currentTimeMillis() + delay : Long.MAX_VALUE);
+	}
+	
+	/**
+	 * Removes all the disabled skills.
+	 */
+	public synchronized final void resetDisabledSkills() {
+		if (_disabledSkills != null) {
+			_disabledSkills.clear();
+		}
+	}
+	
+	/**
+	 * Verifies if the skill is disabled.
+	 * @param skill the skill
+	 * @return {@code true} if the skill is disabled, {@code false} otherwise
+	 */
+	public boolean isSkillDisabled(Skill skill) {
+		return (skill != null) && isSkillDisabled(skill.getReuseHashCode());
+	}
+	
+	/**
+	 * Verifies if the skill is disabled.
+	 * @param hashCode the skill hash code
+	 * @return {@code true} if the skill is disabled, {@code false} otherwise
+	 */
+	public boolean isSkillDisabled(int hashCode) {
+		if (isAllSkillsDisabled()) {
+			return true;
+		}
+		
+		if (_disabledSkills == null) {
+			return false;
+		}
+		
+		final Long stamp = _disabledSkills.get(hashCode);
+		if (stamp == null) {
+			return false;
+		}
+		
+		if (stamp < System.currentTimeMillis()) {
+			_disabledSkills.remove(hashCode);
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Disables all skills.
+	 */
+	public void disableAllSkills() {
+		_allSkillsDisabled = true;
+	}
+	
+	/**
+	 * Enables all skills, except those under reuse time or previously disabled.
+	 */
+	public void enableAllSkills() {
+		_allSkillsDisabled = false;
+	}
+	
+	/**
+	 * Kill the L2Character.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Set target to null and cancel Attack or Cast</li>
+	 * <li>Stop movement</li>
+	 * <li>Stop HP/MP/CP Regeneration task</li>
+	 * <li>Stop all active skills effects in progress on the L2Character</li>
+	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform</li>
+	 * <li>Notify L2Character AI</li>
+	 * </ul>
+	 * @param killer The L2Character who killed it
+	 * @return false if the player is already dead.
+	 */
+	public boolean doDie(L2Character killer) {
+		final TerminateReturn returnBack = EventDispatcher.getInstance().notifyEvent(new CreatureKill(killer, this), this, TerminateReturn.class);
+		if ((returnBack != null) && returnBack.terminate()) {
+			return false;
+		}
+		
+		// killing is only possible one time
+		synchronized (this) {
+			if (isDead()) {
+				return false;
+			}
+			
+			// now reset currentHp to zero
+			setCurrentHp(0);
+			setIsDead(true);
+		}
+		
+		// Set target to null and cancel Attack or Cast
+		setTarget(null);
+		
+		// Stop movement
+		stopMove(null);
+		
+		// Stop HP/MP/CP Regeneration task
+		getStatus().stopHpMpRegeneration();
+		
+		stopAllEffectsExceptThoseThatLastThroughDeath();
+		
+		calculateRewards(killer);
+		
+		// Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		broadcastStatusUpdate();
+		
+		// Notify L2Character AI
+		if (hasAI()) {
+			getAI().notifyEvent(CtrlEvent.EVT_DEAD);
+		}
+		
+		if (getWorldRegion() != null) {
+			getWorldRegion().onDeath(this);
+		}
+		
+		getAttackByList().clear();
+		
+		if (isChannelized()) {
+			getSkillChannelized().abortChannelization();
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		setDebug(null);
+		
+		if (hasAI()) {
+			getAI().stopAITask();
+		}
+		return true;
+	}
+	
+	public void detachAI() {
+		if (isWalker()) {
+			return;
+		}
+		setAI(null);
+	}
+	
+	protected void calculateRewards(L2Character killer) {
+	}
+	
+	/** Sets HP, MP and CP and revives the L2Character. */
+	public void doRevive() {
+		if (!isDead()) {
+			return;
+		}
+		if (!isTeleporting()) {
+			setIsPendingRevive(false);
+			setIsDead(false);
+			
+			if ((character().getRespawnRestoreCP() > 0) && (getCurrentCp() < (getMaxCp() * character().getRespawnRestoreCP()))) {
+				_status.setCurrentCp(getMaxCp() * character().getRespawnRestoreCP());
+			}
+			if ((character().getRespawnRestoreHP() > 0) && (getCurrentHp() < (getMaxHp() * character().getRespawnRestoreHP()))) {
+				_status.setCurrentHp(getMaxHp() * character().getRespawnRestoreHP());
+			}
+			if ((character().getRespawnRestoreMP() > 0) && (getCurrentMp() < (getMaxMp() * character().getRespawnRestoreMP()))) {
+				_status.setCurrentMp(getMaxMp() * character().getRespawnRestoreMP());
+			}
+			
+			// Start broadcast status
+			broadcastPacket(new Revive(this));
+			if (getWorldRegion() != null) {
+				getWorldRegion().onRevive(this);
+			}
+		} else {
+			setIsPendingRevive(true);
+		}
+	}
+	
+	/**
+	 * Revives the L2Character using skill.
+	 * @param revivePower
+	 */
+	public void doRevive(double revivePower) {
+		doRevive();
+	}
+	
+	/**
+	 * Gets this creature's AI.
+	 * @return the AI
+	 */
+	public final L2CharacterAI getAI() {
+		if (_ai == null) {
+			synchronized (this) {
+				if (_ai == null) {
+					// Return the new AI within the synchronized block
+					// to avoid being nulled by other threads
+					return _ai = initAI();
+				}
+			}
+		}
+		return _ai;
+	}
+	
+	/**
+	 * Initialize this creature's AI.<br>
+	 * OOP approach to be overridden in child classes.
+	 * @return the new AI
+	 */
+	protected L2CharacterAI initAI() {
+		return new L2CharacterAI(this);
+	}
+	
+	public void setAI(L2CharacterAI newAI) {
+		final L2CharacterAI oldAI = _ai;
+		if ((oldAI != newAI) && (oldAI instanceof L2AttackableAI)) {
+			oldAI.stopAITask();
+		}
+		_ai = newAI;
+	}
+	
+	/**
+	 * Verifies if this creature has an AI,
+	 * @return {@code true} if this creature has an AI, {@code false} otherwise
+	 */
+	public boolean hasAI() {
+		return _ai != null;
+	}
+	
+	/**
+	 * @return True if the L2Character is RaidBoss or his minion.
+	 */
+	public boolean isRaid() {
+		return false;
+	}
+	
+	/**
+	 * @return True if the L2Character is minion.
+	 */
+	public boolean isMinion() {
+		return false;
+	}
+	
+	/**
+	 * @return True if the L2Character is minion of RaidBoss.
+	 */
+	public boolean isRaidMinion() {
+		return false;
+	}
+	
+	/**
+	 * @return a list of L2Character that attacked.
+	 */
+	public final Set<L2Character> getAttackByList() {
+		if (_attackByList == null) {
+			synchronized (this) {
+				if (_attackByList == null) {
+					_attackByList = ConcurrentHashMap.newKeySet();
+				}
+			}
+		}
+		return _attackByList;
+	}
+	
+	public final Skill getLastSimultaneousSkillCast() {
+		return _lastSimultaneousSkillCast;
+	}
+	
+	public void setLastSimultaneousSkillCast(Skill skill) {
+		_lastSimultaneousSkillCast = skill;
+	}
+	
+	public final Skill getLastSkillCast() {
+		return _lastSkillCast;
+	}
+	
+	public void setLastSkillCast(Skill skill) {
+		_lastSkillCast = skill;
+	}
+	
+	public final boolean isNoRndWalk() {
+		return _isNoRndWalk;
+	}
+	
+	public final void setIsNoRndWalk(boolean value) {
+		_isNoRndWalk = value;
+	}
+	
+	public final boolean isAfraid() {
+		return isAffected(EffectFlag.FEAR);
+	}
+	
+	/**
+	 * @return True if the L2Character can't use its skills (ex : stun, sleep...).
+	 */
+	public final boolean isAllSkillsDisabled() {
+		return _allSkillsDisabled || isStunned() || isSleeping();
+	}
+	
+	/**
+	 * @return True if the L2Character can't attack (stun, sleep, attackEndTime, fakeDeath, attackMute).
+	 */
+	public boolean isAttackingDisabled() {
+		return isFlying() || isStunned() || isSleeping() || isAttackingNow() || isAlikeDead() || isPhysicalAttackMuted() || isCoreAIDisabled();
+	}
+	
+	public final Calculator[] getCalculators() {
+		return _calculators;
+	}
+	
+	public final boolean isConfused() {
+		return isAffected(EffectFlag.CONFUSED);
+	}
+	
+	/**
+	 * @return True if the L2Character is dead or use fake death.
+	 */
+	public boolean isAlikeDead() {
+		return _isDead;
+	}
+	
+	/**
+	 * @return True if the L2Character is dead.
+	 */
+	public final boolean isDead() {
+		return _isDead;
+	}
+	
+	public final void setIsDead(boolean value) {
+		_isDead = value;
+	}
+	
+	public boolean isImmobilized() {
+		return _isImmobilized;
+	}
+	
+	public void setIsImmobilized(boolean value) {
+		_isImmobilized = value;
+	}
+	
+	public final boolean isMuted() {
+		return isAffected(EffectFlag.MUTED);
+	}
+	
+	public final boolean isPhysicalMuted() {
+		return isAffected(EffectFlag.PSYCHICAL_MUTED);
+	}
+	
+	public final boolean isPhysicalAttackMuted() {
+		return isAffected(EffectFlag.PSYCHICAL_ATTACK_MUTED);
+	}
+	
+	/**
+	 * Verifies if the creature cannot move.
+	 * @return {@code true} if the creature cannot move, {@code false} otherwise
+	 */
+	public boolean isMovementDisabled() {
+		return isStunned() || isRooted() || isSleeping() || isOverloaded() || isImmobilized() || isAlikeDead() || isTeleporting();
+	}
+	
+	/**
+	 * @return True if the L2Character can not be controlled by the player (confused, afraid).
+	 */
+	public final boolean isOutOfControl() {
+		return isConfused() || isAfraid();
+	}
+	
+	public final boolean isOverloaded() {
+		return _isOverloaded;
+	}
+	
+	/**
+	 * Set the overloaded status of the L2Character is overloaded (if True, the L2PcInstance can't take more item).
+	 * @param value
+	 */
+	public final void setIsOverloaded(boolean value) {
+		_isOverloaded = value;
+	}
+	
+	public final boolean isPendingRevive() {
+		return isDead() && _isPendingRevive;
+	}
+	
+	public final void setIsPendingRevive(boolean value) {
+		_isPendingRevive = value;
+	}
+	
+	public final boolean isDisarmed() {
+		return isAffected(EffectFlag.DISARMED);
+	}
+	
+	/**
+	 * @return the summon
+	 */
+	public L2Summon getSummon() {
+		return null;
+	}
+	
+	/**
+	 * @return {@code true} if the character has a summon, {@code false} otherwise
+	 */
+	public final boolean hasSummon() {
+		return getSummon() != null;
+	}
+	
+	/**
+	 * @return {@code true} if the character has a pet, {@code false} otherwise
+	 */
+	public final boolean hasPet() {
+		return hasSummon() && getSummon().isPet();
+	}
+	
+	/**
+	 * @return {@code true} if the character has a servitor, {@code false} otherwise
+	 */
+	public final boolean hasServitor() {
+		return hasSummon() && getSummon().isServitor();
+	}
+	
+	public final boolean isRooted() {
+		return isAffected(EffectFlag.ROOTED);
+	}
+	
+	/**
+	 * @return True if the L2Character is running.
+	 */
+	public boolean isRunning() {
+		return _isRunning;
+	}
+	
+	public final void setIsRunning(boolean value) {
+		if (_isRunning == value) {
+			return;
+		}
+		
+		_isRunning = value;
+		if (getRunSpeed() != 0) {
+			broadcastPacket(new ChangeMoveType(this));
+		}
+		if (isPlayer()) {
+			getActingPlayer().broadcastUserInfo();
+		} else if (isSummon()) {
+			broadcastStatusUpdate();
+		} else if (isNpc()) {
+			Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+			for (L2PcInstance player : plrs) {
+				if ((player == null) || !isVisibleFor(player)) {
+					continue;
+				} else if (getRunSpeed() == 0) {
+					player.sendPacket(new ServerObjectInfo((L2Npc) this, player));
+				} else {
+					player.sendPacket(new AbstractNpcInfo.NpcInfo((L2Npc) this, player));
+				}
+			}
+		}
+	}
+	
+	/** Set the L2Character movement type to run and send Server->Client packet ChangeMoveType to all others L2PcInstance. */
+	public final void setRunning() {
+		if (!isRunning()) {
+			setIsRunning(true);
+		}
+	}
+	
+	public final boolean isSleeping() {
+		return isAffected(EffectFlag.SLEEP);
+	}
+	
+	public final boolean isStunned() {
+		return isAffected(EffectFlag.STUNNED);
+	}
+	
+	public final boolean isBetrayed() {
+		return isAffected(EffectFlag.BETRAYED);
+	}
+	
+	public final boolean isTeleporting() {
+		return _isTeleporting;
+	}
+	
+	public void setIsTeleporting(boolean value) {
+		_isTeleporting = value;
+	}
+	
+	public void setIsInvul(boolean b) {
+		_isInvul = b;
+	}
+	
+	public boolean isInvul() {
+		return _isInvul || _isTeleporting;
+	}
+	
+	public boolean isHpBlocked() {
+		return isAffected(EffectFlag.BLOCK_HP);
+	}
+	
+	public boolean isMpBlocked() {
+		return isAffected(EffectFlag.BLOCK_MP);
+	}
+	
+	public boolean isBuffBlocked() {
+		return isAffected(EffectFlag.BLOCK_BUFF);
+	}
+	
+	public boolean isDebuffBlocked() {
+		return isAffected(EffectFlag.BLOCK_DEBUFF);
+	}
+	
+	public void setIsMortal(boolean b) {
+		_isMortal = b;
+	}
+	
+	public boolean isMortal() {
+		return _isMortal;
+	}
+	
+	public boolean isUndead() {
+		return false;
+	}
+	
+	public boolean isResurrectionBlocked() {
+		return isAffected(EffectFlag.BLOCK_RESURRECTION);
+	}
+	
+	public final boolean isFlying() {
+		return _isFlying;
+	}
+	
+	public final void setIsFlying(boolean mode) {
+		_isFlying = mode;
+	}
+	
+	@Override
+	public CharKnownList getKnownList() {
+		return ((CharKnownList) super.getKnownList());
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new CharKnownList(this));
+	}
+	
+	public CharStat getStat() {
+		return _stat;
+	}
+	
+	/**
+	 * Initializes the CharStat class of the L2Object, is overwritten in classes that require a different CharStat Type.<br>
+	 * Removes the need for instanceof checks.
+	 */
+	public void initCharStat() {
+		_stat = new CharStat(this);
+	}
+	
+	public final void setStat(CharStat value) {
+		_stat = value;
+	}
+	
+	public CharStatus getStatus() {
+		return _status;
+	}
+	
+	/**
+	 * Initializes the CharStatus class of the L2Object, is overwritten in classes that require a different CharStatus Type.<br>
+	 * Removes the need for instanceof checks.
+	 */
+	public void initCharStatus() {
+		_status = new CharStatus(this);
+	}
+	
+	public final void setStatus(CharStatus value) {
+		_status = value;
+	}
+	
+	public L2CharTemplate getTemplate() {
+		return _template;
+	}
+	
+	/**
+	 * Set the template of the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Each L2Character owns generic and static properties (ex : all Keltir have the same number of HP...).<br>
+	 * All of those properties are stored in a different template for each type of L2Character.<br>
+	 * Each template is loaded once in the server cache memory (reduce memory use).<br>
+	 * When a new instance of L2Character is spawned, server just create a link between the instance and the template This link is stored in <B>_template</B>.
+	 * @param template
+	 */
+	protected final void setTemplate(L2CharTemplate template) {
+		_template = template;
+	}
+	
+	/**
+	 * @return the Title of the L2Character.
+	 */
+	public final String getTitle() {
+		return _title;
+	}
+	
+	/**
+	 * Set the Title of the L2Character.
+	 * @param value
+	 */
+	public final void setTitle(String value) {
+		if (value == null) {
+			_title = "";
+		} else {
+			_title = value.length() > 21 ? value.substring(0, 20) : value;
+		}
+	}
+	
+	/**
+	 * Set the L2Character movement type to walk and send Server->Client packet ChangeMoveType to all others L2PcInstance.
+	 */
+	public final void setWalking() {
+		if (isRunning()) {
+			setIsRunning(false);
+		}
+	}
+	
+	/**
+	 * Gets the abnormal visual effects affecting this character.
+	 * @return a map of 32 bits containing all abnormal visual effects in progress for this character
+	 */
+	public int getAbnormalVisualEffects() {
+		return _abnormalVisualEffects;
+	}
+	
+	/**
+	 * Gets the special abnormal visual effects affecting this character.
+	 * @return a map of 32 bits containing all special effect in progress for this character
+	 */
+	public int getAbnormalVisualEffectSpecial() {
+		return _abnormalVisualEffectsSpecial;
+	}
+	
+	/**
+	 * Gets the event abnormal visual effects affecting this character.
+	 * @return a map of 32 bits containing all event abnormal visual effects in progress for this character
+	 */
+	public int getAbnormalVisualEffectEvent() {
+		return _abnormalVisualEffectsEvent;
+	}
+	
+	/**
+	 * Verify if this creature is affected by the given abnormal visual effect.
+	 * @param ave the abnormal visual effect
+	 * @return {@code true} if the creature is affected by the abnormal visual effect, {@code false} otherwise
+	 */
+	public boolean hasAbnormalVisualEffect(AbnormalVisualEffect ave) {
+		if (ave.isEvent()) {
+			return (getAbnormalVisualEffectEvent() & ave.getMask()) == ave.getMask();
+		}
+		
+		if (ave.isSpecial()) {
+			return (getAbnormalVisualEffectSpecial() & ave.getMask()) == ave.getMask();
+		}
+		
+		return (getAbnormalVisualEffects() & ave.getMask()) == ave.getMask();
+	}
+	
+	/**
+	 * Adds the abnormal visual effect flags in the binary mask and send Server->Client UserInfo/CharInfo packet.
+	 * @param update if {@code true} update packets will be sent
+	 * @param aves the abnormal visual effects
+	 */
+	public final void startAbnormalVisualEffect(boolean update, AbnormalVisualEffect... aves) {
+		for (AbnormalVisualEffect ave : aves) {
+			if (ave.isEvent()) {
+				_abnormalVisualEffectsEvent |= ave.getMask();
+			} else if (ave.isSpecial()) {
+				_abnormalVisualEffectsSpecial |= ave.getMask();
+			} else {
+				_abnormalVisualEffects |= ave.getMask();
+			}
+		}
+		if (update) {
+			updateAbnormalEffect();
+		}
+	}
+	
+	/**
+	 * Removes the abnormal visual effect flags from the binary mask and send Server->Client UserInfo/CharInfo packet.
+	 * @param update if {@code true} update packets will be sent
+	 * @param aves the abnormal visual effects
+	 */
+	public final void stopAbnormalVisualEffect(boolean update, AbnormalVisualEffect... aves) {
+		for (AbnormalVisualEffect ave : aves) {
+			if (ave.isEvent()) {
+				_abnormalVisualEffectsEvent &= ~ave.getMask();
+			} else if (ave.isSpecial()) {
+				_abnormalVisualEffectsSpecial &= ~ave.getMask();
+			} else {
+				_abnormalVisualEffects &= ~ave.getMask();
+			}
+		}
+		if (update) {
+			updateAbnormalEffect();
+		}
+	}
+	
+	/**
+	 * Active the abnormal effect Fake Death flag, notify the L2Character AI and send Server->Client UserInfo/CharInfo packet.
+	 */
+	public final void startFakeDeath() {
+		if (!isPlayer()) {
+			return;
+		}
+		
+		getActingPlayer().setIsFakeDeath(true);
+		// Aborts any attacks/casts if fake dead
+		abortAttack();
+		abortCast();
+		stopMove(null);
+		getAI().notifyEvent(CtrlEvent.EVT_FAKE_DEATH);
+		broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_START_FAKE_DEATH));
+	}
+	
+	/**
+	 * Launch a Stun Abnormal Effect on the L2Character.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Calculate the success rate of the Stun Abnormal Effect on this L2Character</li>
+	 * <li>If Stun succeed, active the abnormal effect Stun flag, notify the L2Character AI and send Server->Client UserInfo/CharInfo packet</li>
+	 * <li>If Stun NOT succeed, send a system message Failed to the L2PcInstance attacker</li>
+	 * </ul>
+	 */
+	public final void startStunning() {
+		// Aborts any attacks/casts if stuned
+		abortAttack();
+		abortCast();
+		stopMove(null);
+		getAI().notifyEvent(CtrlEvent.EVT_STUNNED);
+		if (!isSummon()) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		}
+		updateAbnormalEffect();
+	}
+	
+	/**
+	 * Stop all active skills effects in progress on the L2Character.
+	 */
+	public void stopAllEffects() {
+		_effectList.stopAllEffects();
+	}
+	
+	/**
+	 * Stops all effects, except those that last through death.
+	 */
+	public void stopAllEffectsExceptThoseThatLastThroughDeath() {
+		_effectList.stopAllEffectsExceptThoseThatLastThroughDeath();
+	}
+	
+	/**
+	 * Stop and remove the effects corresponding to the skill ID.
+	 * @param removed if {@code true} the effect will be set as removed, and a system message will be sent
+	 * @param skillId the skill Id
+	 */
+	public void stopSkillEffects(boolean removed, int skillId) {
+		_effectList.stopSkillEffects(removed, skillId);
+	}
+	
+	public final void stopEffects(L2EffectType type) {
+		_effectList.stopEffects(type);
+	}
+	
+	/**
+	 * Exits all buffs effects of the skills with "removedOnAnyAction" set.<br>
+	 * Called on any action except movement (attack, cast).
+	 */
+	public final void stopEffectsOnAction() {
+		_effectList.stopEffectsOnAction();
+	}
+	
+	/**
+	 * Exits all buffs effects of the skills with "removedOnDamage" set.<br>
+	 * Called on decreasing HP and mana burn.
+	 * @param awake
+	 */
+	public final void stopEffectsOnDamage(boolean awake) {
+		_effectList.stopEffectsOnDamage(awake);
+	}
+	
+	/**
+	 * Stop a specified/all Fake Death abnormal L2Effect.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Delete a specified/all (if effect=null) Fake Death abnormal L2Effect from L2Character and update client magic icon</li>
+	 * <li>Set the abnormal effect flag _fake_death to False</li>
+	 * <li>Notify the L2Character AI</li>
+	 * </ul>
+	 * @param removeEffects
+	 */
+	public final void stopFakeDeath(boolean removeEffects) {
+		if (removeEffects) {
+			stopEffects(L2EffectType.FAKE_DEATH);
+		}
+		
+		// if this is a player instance, start the grace period for this character (grace from mobs only)!
+		if (isPlayer()) {
+			getActingPlayer().setIsFakeDeath(false);
+			getActingPlayer().setRecentFakeDeath(true);
+		}
+		
+		broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_STOP_FAKE_DEATH));
+		// TODO: Temp hack: players see FD on ppl that are moving: Teleport to someone who uses FD - if he gets up he will fall down again for that client -
+		// even tho he is actually standing... Probably bad info in CharInfo packet?
+		broadcastPacket(new Revive(this));
+	}
+	
+	/**
+	 * Stop a specified/all Stun abnormal L2Effect.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Delete a specified/all (if effect=null) Stun abnormal L2Effect from L2Character and update client magic icon</li>
+	 * <li>Set the abnormal effect flag _stuned to False</li>
+	 * <li>Notify the L2Character AI</li>
+	 * <li>Send Server->Client UserInfo/CharInfo packet</li>
+	 * </ul>
+	 * @param removeEffects
+	 */
+	public final void stopStunning(boolean removeEffects) {
+		if (removeEffects) {
+			stopEffects(L2EffectType.STUN);
+		}
+		
+		if (!isPlayer()) {
+			getAI().notifyEvent(CtrlEvent.EVT_THINK);
+		}
+		updateAbnormalEffect();
+	}
+	
+	/**
+	 * Stop L2Effect: Transformation.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Remove Transformation Effect</li>
+	 * <li>Notify the L2Character AI</li>
+	 * <li>Send Server->Client UserInfo/CharInfo packet</li>
+	 * </ul>
+	 * @param removeEffects
+	 */
+	public final void stopTransformation(boolean removeEffects) {
+		if (removeEffects) {
+			getEffectList().stopSkillEffects(false, AbnormalType.TRANSFORM);
+		}
+		
+		// if this is a player instance, then untransform, also set the transform_id column equal to 0 if not cursed.
+		if (isPlayer()) {
+			if (getActingPlayer().getTransformation() != null) {
+				getActingPlayer().untransform();
+			}
+		}
+		
+		if (!isPlayer()) {
+			getAI().notifyEvent(CtrlEvent.EVT_THINK);
+		}
+		updateAbnormalEffect();
+	}
+	
+	public abstract void updateAbnormalEffect();
+	
+	/**
+	 * Update active skills in progress (In Use and Not In Use because stacked) icons on client.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * All active skills effects in progress (In Use and Not In Use because stacked) are represented by an icon on the client.<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method ONLY UPDATE the client of the player and not clients of all players in the party.</B></FONT>
+	 */
+	public final void updateEffectIcons() {
+		updateEffectIcons(false);
+	}
+	
+	/**
+	 * Updates Effect Icons for this character(player/summon) and his party if any.
+	 * @param partyOnly
+	 */
+	public void updateEffectIcons(boolean partyOnly) {
+		// overridden
+	}
+	
+	public boolean isAffectedBySkill(int skillId) {
+		return _effectList.isAffectedBySkill(skillId);
+	}
+	
+	/**
+	 * This class group all movement data.<br>
+	 * <B><U> Data</U> :</B>
+	 * <ul>
+	 * <li>_moveTimestamp : Last time position update</li>
+	 * <li>_xDestination, _yDestination, _zDestination : Position of the destination</li>
+	 * <li>_xMoveFrom, _yMoveFrom, _zMoveFrom : Position of the origin</li>
+	 * <li>_moveStartTime : Start time of the movement</li>
+	 * <li>_ticksToMove : Nb of ticks between the start and the destination</li>
+	 * <li>_xSpeedTicks, _ySpeedTicks : Speed in unit/ticks</li>
+	 * </ul>
+	 */
+	public static class MoveData {
+		// when we retrieve x/y/z we use GameTimeControl.getGameTicks()
+		// if we are moving, but move timestamp==gameticks, we don't need
+		// to recalculate position
+		public int _moveStartTime;
+		public int _moveTimestamp; // last update
+		public int _xDestination;
+		public int _yDestination;
+		public int _zDestination;
+		public double _xAccurate; // otherwise there would be rounding errors
+		public double _yAccurate;
+		public double _zAccurate;
+		public int _heading;
+		
+		public boolean disregardingGeodata;
+		public int onGeodataPathIndex;
+		public List<AbstractNodeLoc> geoPath;
+		public int geoPathAccurateTx;
+		public int geoPathAccurateTy;
+		public int geoPathGtx;
+		public int geoPathGty;
+	}
+	
+	/**
+	 * Add a Func to the Calculator set of the L2Character.<br>
+	 * <b><u>Concept</u>:</b> A L2Character owns a table of Calculators called <b>_calculators</b>.<br>
+	 * Each Calculator (a calculator per state) own a table of Func object.<br>
+	 * A Func object is a mathematical function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...).<br>
+	 * To reduce cache memory use, L2NPCInstances who don't have skills share the same Calculator set called <b>NPC_STD_CALCULATOR</b>.<br>
+	 * That's why, if a L2NPCInstance is under a skill/spell effect that modify one of its state, a copy of the NPC_STD_CALCULATOR must be create in its _calculators before adding new Func object.<br>
+	 * <b><u>Actions</u>:</b>
+	 * <ul>
+	 * <li>If _calculators is linked to NPC_STD_CALCULATOR, create a copy of NPC_STD_CALCULATOR in _calculators</li>
+	 * <li>Add the Func object to _calculators</li>
+	 * </ul>
+	 * @param function The Func object to add to the Calculator corresponding to the state affected
+	 */
+	private final void addStatFunc(AbstractFunction function) {
+		if (function == null) {
+			return;
+		}
+		
+		synchronized (this) {
+			// Check if Calculator set is linked to the standard Calculator set of NPC
+			if (_calculators == NPC_STD_CALCULATOR) {
+				// Create a copy of the standard NPC Calculator set
+				_calculators = new Calculator[Stats.NUM_STATS];
+				
+				for (int i = 0; i < Stats.NUM_STATS; i++) {
+					if (NPC_STD_CALCULATOR[i] != null) {
+						_calculators[i] = new Calculator(NPC_STD_CALCULATOR[i]);
+					}
+				}
+			}
+			
+			// Select the Calculator of the affected state in the Calculator set
+			int stat = function.getStat().ordinal();
+			
+			if (_calculators[stat] == null) {
+				_calculators[stat] = new Calculator();
+			}
+			
+			// Add the Func to the calculator corresponding to the state
+			_calculators[stat].addFunc(function);
+		}
+	}
+	
+	/**
+	 * Add a list of Funcs to the Calculator set of the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * A L2Character owns a table of Calculators called <B>_calculators</B>.<br>
+	 * Each Calculator (a calculator per state) own a table of Func object.<br>
+	 * A Func object is a mathematic function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...).<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method is ONLY for L2PcInstance</B></FONT><br>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>Equip an item from inventory</li>
+	 * <li>Learn a new passive skill</li>
+	 * <li>Use an active skill</li>
+	 * </ul>
+	 * @param functions The list of Func objects to add to the Calculator corresponding to the state affected
+	 */
+	public final void addStatFuncs(List<AbstractFunction> functions) {
+		if (!isPlayer() && getKnownList().getKnownPlayers().isEmpty()) {
+			for (AbstractFunction f : functions) {
+				addStatFunc(f);
+			}
+		} else {
+			final List<Stats> modifiedStats = new ArrayList<>();
+			for (AbstractFunction f : functions) {
+				modifiedStats.add(f.getStat());
+				addStatFunc(f);
+			}
+			broadcastModifiedStats(modifiedStats);
+		}
+	}
+	
+	public final void addStatFuncs(AbstractFunction function) {
+		addStatFuncs(List.of(function));
+	}
+	
+	/**
+	 * Remove a Func from the Calculator set of the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * A L2Character owns a table of Calculators called <B>_calculators</B>.<br>
+	 * Each Calculator (a calculator per state) own a table of Func object.<br>
+	 * A Func object is a mathematic function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...).<br>
+	 * To reduce cache memory use, L2NPCInstances who don't have skills share the same Calculator set called <B>NPC_STD_CALCULATOR</B>.<br>
+	 * That's why, if a L2NPCInstance is under a skill/spell effect that modify one of its state, a copy of the NPC_STD_CALCULATOR must be create in its _calculators before addind new Func object.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Remove the Func object from _calculators</li>
+	 * <li>If L2Character is a L2NPCInstance and _calculators is equal to NPC_STD_CALCULATOR, free cache memory and just create a link on NPC_STD_CALCULATOR in _calculators</li>
+	 * </ul>
+	 * @param function The Func object to remove from the Calculator corresponding to the state affected
+	 */
+	private final void removeStatFunc(AbstractFunction function) {
+		if (function == null) {
+			return;
+		}
+		
+		// Select the Calculator of the affected state in the Calculator set
+		int stat = function.getStat().ordinal();
+		
+		synchronized (this) {
+			if (_calculators[stat] == null) {
+				return;
+			}
+			
+			// Remove the Func object from the Calculator
+			_calculators[stat].removeFunc(function);
+			
+			if (_calculators[stat].size() == 0) {
+				_calculators[stat] = null;
+			}
+			
+			// If possible, free the memory and just create a link on NPC_STD_CALCULATOR
+			if (isNpc()) {
+				int i = 0;
+				for (; i < Stats.NUM_STATS; i++) {
+					if (!Calculator.equalsCals(_calculators[i], NPC_STD_CALCULATOR[i])) {
+						break;
+					}
+				}
+				
+				if (i >= Stats.NUM_STATS) {
+					_calculators = NPC_STD_CALCULATOR;
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Remove a list of Funcs from the Calculator set of the L2PcInstance.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * A L2Character owns a table of Calculators called <B>_calculators</B>.<br>
+	 * Each Calculator (a calculator per state) own a table of Func object.<br>
+	 * A Func object is a mathematic function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...).<br>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method is ONLY for L2PcInstance</B></FONT><br>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>Unequip an item from inventory</li>
+	 * <li>Stop an active skill</li>
+	 * </ul>
+	 * @param functions The list of Func objects to add to the Calculator corresponding to the state affected
+	 */
+	public final void removeStatFuncs(AbstractFunction[] functions) {
+		if (!isPlayer() && getKnownList().getKnownPlayers().isEmpty()) {
+			for (AbstractFunction f : functions) {
+				removeStatFunc(f);
+			}
+		} else {
+			final List<Stats> modifiedStats = new ArrayList<>();
+			for (AbstractFunction f : functions) {
+				modifiedStats.add(f.getStat());
+				removeStatFunc(f);
+			}
+			
+			broadcastModifiedStats(modifiedStats);
+		}
+	}
+	
+	/**
+	 * Remove all Func objects with the selected owner from the Calculator set of the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * A L2Character owns a table of Calculators called <B>_calculators</B>.<br>
+	 * Each Calculator (a calculator per state) own a table of Func object.<br>
+	 * A Func object is a mathematic function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...).<br>
+	 * To reduce cache memory use, L2NPCInstances who don't have skills share the same Calculator set called <B>NPC_STD_CALCULATOR</B>.<br>
+	 * That's why, if a L2NPCInstance is under a skill/spell effect that modify one of its state, a copy of the NPC_STD_CALCULATOR must be create in its _calculators before addind new Func object.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Remove all Func objects of the selected owner from _calculators</li>
+	 * <li>If L2Character is a L2NPCInstance and _calculators is equal to NPC_STD_CALCULATOR, free cache memory and just create a link on NPC_STD_CALCULATOR in _calculators</li>
+	 * </ul>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>Unequip an item from inventory</li>
+	 * <li>Stop an active skill</li>
+	 * </ul>
+	 * @param owner The Object(Skill, Item...) that has created the effect
+	 */
+	public final void removeStatsOwner(Object owner) {
+		List<Stats> modifiedStats = null;
+		int i = 0;
+		// Go through the Calculator set
+		synchronized (this) {
+			for (Calculator calc : _calculators) {
+				if (calc != null) {
+					// Delete all Func objects of the selected owner
+					if (modifiedStats != null) {
+						modifiedStats.addAll(calc.removeOwner(owner));
+					} else {
+						modifiedStats = calc.removeOwner(owner);
+					}
+					
+					if (calc.size() == 0) {
+						_calculators[i] = null;
+					}
+				}
+				i++;
+			}
+			
+			// If possible, free the memory and just create a link on NPC_STD_CALCULATOR
+			if (isNpc()) {
+				i = 0;
+				for (; i < Stats.NUM_STATS; i++) {
+					if (!Calculator.equalsCals(_calculators[i], NPC_STD_CALCULATOR[i])) {
+						break;
+					}
+				}
+				
+				if (i >= Stats.NUM_STATS) {
+					_calculators = NPC_STD_CALCULATOR;
+				}
+			}
+			
+			broadcastModifiedStats(modifiedStats);
+		}
+	}
+	
+	protected void broadcastModifiedStats(List<Stats> stats) {
+		if ((stats == null) || stats.isEmpty()) {
+			return;
+		}
+		
+		if (isSummon()) {
+			L2Summon summon = (L2Summon) this;
+			if (summon.getOwner() != null) {
+				summon.updateAndBroadcastStatus(1);
+			}
+		} else {
+			boolean broadcastFull = false;
+			StatusUpdate su = new StatusUpdate(this);
+			
+			for (Stats stat : stats) {
+				if (stat == Stats.POWER_ATTACK_SPEED) {
+					su.addAttribute(StatusUpdate.ATK_SPD, (int) getPAtkSpd());
+				} else if (stat == Stats.MAGIC_ATTACK_SPEED) {
+					su.addAttribute(StatusUpdate.CAST_SPD, getMAtkSpd());
+				} else if (stat == Stats.MOVE_SPEED) {
+					broadcastFull = true;
+				}
+			}
+			
+			if (isPlayer()) {
+				if (broadcastFull) {
+					getActingPlayer().updateAndBroadcastStatus(2);
+				} else {
+					getActingPlayer().updateAndBroadcastStatus(1);
+					if (su.hasAttributes()) {
+						broadcastPacket(su);
+					}
+				}
+				if ((getSummon() != null) && isAffected(EffectFlag.SERVITOR_SHARE)) {
+					getSummon().broadcastStatusUpdate();
+				}
+			} else if (isNpc()) {
+				if (broadcastFull) {
+					Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+					for (L2PcInstance player : plrs) {
+						if ((player == null) || !isVisibleFor(player)) {
+							continue;
+						}
+						if (getRunSpeed() == 0) {
+							player.sendPacket(new ServerObjectInfo((L2Npc) this, player));
+						} else {
+							player.sendPacket(new AbstractNpcInfo.NpcInfo((L2Npc) this, player));
+						}
+					}
+				} else if (su.hasAttributes()) {
+					broadcastPacket(su);
+				}
+			} else if (su.hasAttributes()) {
+				broadcastPacket(su);
+			}
+		}
+	}
+	
+	public final int getXdestination() {
+		MoveData m = _move;
+		
+		if (m != null) {
+			return m._xDestination;
+		}
+		
+		return getX();
+	}
+	
+	/**
+	 * @return the Y destination of the L2Character or the Y position if not in movement.
+	 */
+	public final int getYdestination() {
+		MoveData m = _move;
+		
+		if (m != null) {
+			return m._yDestination;
+		}
+		
+		return getY();
+	}
+	
+	/**
+	 * @return the Z destination of the L2Character or the Z position if not in movement.
+	 */
+	public final int getZdestination() {
+		MoveData m = _move;
+		
+		if (m != null) {
+			return m._zDestination;
+		}
+		
+		return getZ();
+	}
+	
+	/**
+	 * @return True if the L2Character is in combat.
+	 */
+	public boolean isInCombat() {
+		return hasAI() && ((getAI().getAttackTarget() != null) || getAI().isAutoAttacking());
+	}
+	
+	/**
+	 * @return True if the L2Character is moving.
+	 */
+	public final boolean isMoving() {
+		return _move != null;
+	}
+	
+	/**
+	 * @return True if the L2Character is travelling a calculated path.
+	 */
+	public final boolean isOnGeodataPath() {
+		MoveData m = _move;
+		if (m == null) {
+			return false;
+		}
+		if (m.onGeodataPathIndex == -1) {
+			return false;
+		}
+		return m.onGeodataPathIndex != (m.geoPath.size() - 1);
+	}
+	
+	public final boolean isCastingNow() {
+		return _isCastingNow;
+	}
+	
+	public void setIsCastingNow(boolean value) {
+		_isCastingNow = value;
+	}
+	
+	public final boolean isCastingSimultaneouslyNow() {
+		return _isCastingSimultaneouslyNow;
+	}
+	
+	public void setIsCastingSimultaneouslyNow(boolean value) {
+		_isCastingSimultaneouslyNow = value;
+	}
+	
+	public final boolean canAbortCast() {
+		return _castInterruptTime > GameTimeController.getInstance().getGameTicks();
+	}
+	
+	public int getCastInterruptTime() {
+		return _castInterruptTime;
+	}
+	
+	/**
+	 * Verifies if the creature is attacking now.
+	 * @return {@code true} if the creature is attacking now, {@code false} otherwise
+	 */
+	public final boolean isAttackingNow() {
+		return _attackEndTime > System.nanoTime();
+	}
+	
+	/**
+	 * Abort the attack of the L2Character and send Server->Client ActionFailed packet.
+	 */
+	public final void abortAttack() {
+		if (isAttackingNow()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	/**
+	 * Abort the cast of the L2Character and send Server->Client MagicSkillCanceld/ActionFailed packet.
+	 */
+	public final void abortCast() {
+		if (isCastingNow() || isCastingSimultaneouslyNow()) {
+			Future<?> future = _skillCast;
+			// cancels the skill hit scheduled task
+			if (future != null) {
+				future.cancel(true);
+				_skillCast = null;
+			}
+			future = _skillCast2;
+			if (future != null) {
+				future.cancel(true);
+				_skillCast2 = null;
+			}
+			
+			// TODO: Handle removing spawned npc.
+			
+			if (isChanneling()) {
+				getSkillChannelizer().stopChanneling();
+			}
+			
+			if (_allSkillsDisabled) {
+				enableAllSkills(); // this remains for forced skill use, e.g. scroll of escape
+			}
+			setIsCastingNow(false);
+			setIsCastingSimultaneouslyNow(false);
+			// safeguard for cannot be interrupt any more
+			_castInterruptTime = 0;
+			if (isPlayer()) {
+				getAI().notifyEvent(CtrlEvent.EVT_FINISH_CASTING); // setting back previous intention
+			}
+			broadcastPacket(new MagicSkillCanceled(getObjectId())); // broadcast packet to stop animations client-side
+			sendPacket(ActionFailed.STATIC_PACKET); // send an "action failed" packet to the caster
+		}
+	}
+	
+	/**
+	 * Update the position of the L2Character during a movement and return True if the movement is finished.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * At the beginning of the move action, all properties of the movement are stored in the MoveData object called <B>_move</B> of the L2Character.<br>
+	 * The position of the start point and of the destination permit to estimated in function of the movement speed the time to achieve the destination.<br>
+	 * When the movement is started (ex : by MovetoLocation), this method will be called each 0.1 sec to estimate and update the L2Character position on the server.<br>
+	 * Note, that the current server position can differe from the current client position even if each movement is straight foward.<br>
+	 * That's why, client send regularly a Client->Server ValidatePosition packet to eventually correct the gap on the server.<br>
+	 * But, it's always the server position that is used in range calculation. At the end of the estimated movement time,<br>
+	 * the L2Character position is automatically set to the destination position even if the movement is not finished.<br>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: The current Z position is obtained FROM THE CLIENT by the Client->Server ValidatePosition Packet.<br>
+	 * But x and y positions must be calculated to avoid that players try to modify their movement speed.</B></FONT>
+	 * @return True if the movement is finished
+	 */
+	public boolean updatePosition() {
+		// Get movement data
+		MoveData m = _move;
+		
+		if (m == null) {
+			return true;
+		}
+		
+		if (!isVisible()) {
+			_move = null;
+			return true;
+		}
+		
+		// Check if this is the first update
+		if (m._moveTimestamp == 0) {
+			m._moveTimestamp = m._moveStartTime;
+			m._xAccurate = getX();
+			m._yAccurate = getY();
+		}
+		
+		int gameTicks = GameTimeController.getInstance().getGameTicks();
+		
+		// Check if the position has already been calculated
+		if (m._moveTimestamp == gameTicks) {
+			return false;
+		}
+		
+		int xPrev = getX();
+		int yPrev = getY();
+		int zPrev = getZ(); // the z coordinate may be modified by coordinate synchronizations
+		
+		double dx, dy, dz;
+		if (geodata().getCoordSynchronize() == 1) {
+			// the only method that can modify x,y while moving (otherwise _move would/should be set null)
+			dx = m._xDestination - xPrev;
+			dy = m._yDestination - yPrev;
+		} else {
+			// otherwise we need saved temporary values to avoid rounding errors
+			dx = m._xDestination - m._xAccurate;
+			dy = m._yDestination - m._yAccurate;
+		}
+		
+		final boolean isFloating = isFlying() || isInsideZone(ZoneId.WATER);
+		
+		// Z coordinate will follow geodata or client values
+		// once a second to reduce possible cpu load
+		if ((geodata().getCoordSynchronize() == 2) && //
+			!isFloating && !m.disregardingGeodata && //
+			((GameTimeController.getInstance().getGameTicks() % 10) == 0) //
+			&& GeoData.getInstance().hasGeo(xPrev, yPrev)) {
+			int geoHeight = GeoData.getInstance().getSpawnHeight(xPrev, yPrev, zPrev);
+			dz = m._zDestination - geoHeight;
+			// quite a big difference, compare to validatePosition packet
+			if (isPlayer() && (Math.abs(getActingPlayer().getClientZ() - geoHeight) > 200) && (Math.abs(getActingPlayer().getClientZ() - geoHeight) < 1500)) {
+				dz = m._zDestination - zPrev; // allow diff
+			} else if (isInCombat() && (Math.abs(dz) > 200) && (((dx * dx) + (dy * dy)) < 40000)) // allow mob to climb up to pcinstance
+			{
+				dz = m._zDestination - zPrev; // climbing
+			} else {
+				zPrev = geoHeight;
+			}
+		} else {
+			dz = m._zDestination - zPrev;
+		}
+		
+		double delta = (dx * dx) + (dy * dy);
+		// close enough, allows error between client and server geodata if it cannot be avoided
+		if ((delta < 10000) && ((dz * dz) > 2500) && !isFloating) {
+			delta = Math.sqrt(delta);
+		} else {
+			delta = Math.sqrt(delta + (dz * dz));
+		}
+		
+		double distFraction = Double.MAX_VALUE;
+		if (delta > 1) {
+			final double distPassed = (getMoveSpeed() * (gameTicks - m._moveTimestamp)) / GameTimeController.TICKS_PER_SECOND;
+			distFraction = distPassed / delta;
+		}
+		
+		// if (general().developer()) _log.warning("Move Ticks:" + (gameTicks - m._moveTimestamp) + ", distPassed:" + distPassed + ", distFraction:" + distFraction);
+		
+		if (distFraction > 1) {
+			// Set the position of the L2Character to the destination
+			super.setXYZ(m._xDestination, m._yDestination, m._zDestination);
+		} else {
+			m._xAccurate += dx * distFraction;
+			m._yAccurate += dy * distFraction;
+			
+			// Set the position of the L2Character to estimated after parcial move
+			super.setXYZ((int) (m._xAccurate), (int) (m._yAccurate), zPrev + (int) ((dz * distFraction) + 0.5));
+		}
+		revalidateZone(false);
+		
+		// Set the timer of last position update to now
+		m._moveTimestamp = gameTicks;
+		
+		if (distFraction > 1) {
+			ThreadPoolManager.getInstance().executeAi(() -> {
+				try {
+					if (general().moveBasedKnownList()) {
+						getKnownList().findObjects();
+					}
+					
+					getAI().notifyEvent(CtrlEvent.EVT_ARRIVED);
+				} catch (final Throwable e) {
+					LOG.warn("{}", e);
+				}
+			});
+			return true;
+		}
+		return false;
+	}
+	
+	public void revalidateZone(boolean force) {
+		if (getWorldRegion() == null) {
+			return;
+		}
+		
+		// This function is called too often from movement code
+		if (force) {
+			_zoneValidateCounter = 4;
+		} else {
+			_zoneValidateCounter--;
+			if (_zoneValidateCounter < 0) {
+				_zoneValidateCounter = 4;
+			} else {
+				return;
+			}
+		}
+		
+		getWorldRegion().revalidateZones(this);
+	}
+	
+	/**
+	 * Stop movement of the L2Character (Called by AI Accessor only).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Delete movement data of the L2Character</li>
+	 * <li>Set the current position (x,y,z), its current L2WorldRegion if necessary and its heading</li>
+	 * <li>Remove the L2Object object from _gmList of GmListTable</li>
+	 * <li>Remove object from _knownObjects and _knownPlayer of all surrounding L2WorldRegion L2Characters</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: This method DOESN'T send Server->Client packet StopMove/StopRotation</B></FONT>
+	 * @param loc
+	 */
+	public void stopMove(Location loc) {
+		stopMove(loc, false);
+	}
+	
+	public void stopMove(Location loc, boolean updateKnownObjects) {
+		// Delete movement data of the L2Character
+		_move = null;
+		
+		// if (getAI() != null)
+		// getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		
+		// Set the current position (x,y,z), its current L2WorldRegion if necessary and its heading
+		// All data are contained in a Location object
+		if (loc != null) {
+			setXYZ(loc.getX(), loc.getY(), loc.getZ());
+			setHeading(loc.getHeading());
+			revalidateZone(true);
+		}
+		broadcastPacket(new StopMove(this));
+		if (general().moveBasedKnownList() && updateKnownObjects) {
+			getKnownList().findObjects();
+		}
+	}
+	
+	/**
+	 * @return Returns the showSummonAnimation.
+	 */
+	public boolean isShowSummonAnimation() {
+		return _showSummonAnimation;
+	}
+	
+	/**
+	 * @param showSummonAnimation The showSummonAnimation to set.
+	 */
+	public void setShowSummonAnimation(boolean showSummonAnimation) {
+		_showSummonAnimation = showSummonAnimation;
+	}
+	
+	/**
+	 * Target a L2Object (add the target to the L2Character _target, _knownObject and L2Character to _KnownObject of the L2Object).<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * The L2Object (including L2Character) targeted is identified in <B>_target</B> of the L2Character.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Set the _target of L2Character to L2Object</li>
+	 * <li>If necessary, add L2Object to _knownObject of the L2Character</li>
+	 * <li>If necessary, add L2Character to _KnownObject of the L2Object</li>
+	 * <li>If object==null, cancel Attak or Cast</li>
+	 * </ul>
+	 * @param object L2object to target
+	 */
+	public void setTarget(L2Object object) {
+		if ((object != null) && !object.isVisible()) {
+			object = null;
+		}
+		
+		if ((object != null) && (object != _target)) {
+			getKnownList().addKnownObject(object);
+			object.getKnownList().addKnownObject(this);
+		}
+		
+		_target = object;
+	}
+	
+	/**
+	 * @return the identifier of the L2Object targeted or -1.
+	 */
+	public final int getTargetId() {
+		if (_target != null) {
+			return _target.getObjectId();
+		}
+		return 0;
+	}
+	
+	/**
+	 * @return the L2Object targeted or null.
+	 */
+	public final L2Object getTarget() {
+		return _target;
+	}
+	
+	/**
+	 * Calculate movement data for a move to location action and add the L2Character to movingObjects of GameTimeController (only called by AI Accessor).<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * At the beginning of the move action, all properties of the movement are stored in the MoveData object called <B>_move</B> of the L2Character.<br>
+	 * The position of the start point and of the destination permit to estimated in function of the movement speed the time to achieve the destination.<br>
+	 * All L2Character in movement are identified in <B>movingObjects</B> of GameTimeController that will call the updatePosition method of those L2Character each 0.1s.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Get current position of the L2Character</li>
+	 * <li>Calculate distance (dx,dy) between current position and destination including offset</li>
+	 * <li>Create and Init a MoveData object</li>
+	 * <li>Set the L2Character _move object to MoveData object</li>
+	 * <li>Add the L2Character to movingObjects of the GameTimeController</li>
+	 * <li>Create a task to notify the AI that L2Character arrives at a check point of the movement</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: This method DOESN'T send Server->Client packet MoveToPawn/CharMoveToLocation.</B></FONT><br>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>AI : onIntentionMoveTo(Location), onIntentionPickUp(L2Object), onIntentionInteract(L2Object)</li>
+	 * <li>FollowTask</li>
+	 * </ul>
+	 * @param x The X position of the destination
+	 * @param y The Y position of the destination
+	 * @param z The Y position of the destination
+	 * @param offset The size of the interaction area of the L2Character targeted
+	 */
+	public void moveToLocation(int x, int y, int z, int offset) {
+		// Get the Move Speed of the L2Charcater
+		double speed = getMoveSpeed();
+		if ((speed <= 0) || isMovementDisabled()) {
+			return;
+		}
+		
+		// Get current position of the L2Character
+		final int curX = super.getX();
+		final int curY = super.getY();
+		final int curZ = super.getZ();
+		
+		// Calculate distance (dx,dy) between current position and destination
+		// TODO: improve Z axis move/follow support when dx,dy are small compared to dz
+		double dx = (x - curX);
+		double dy = (y - curY);
+		double dz = (z - curZ);
+		double distance = Math.hypot(dx, dy);
+		
+		final boolean verticalMovementOnly = isFlying() && (distance == 0) && (dz != 0);
+		if (verticalMovementOnly) {
+			distance = Math.abs(dz);
+		}
+		
+		// make water move short and use no geodata checks for swimming chars
+		// distance in a click can easily be over 3000
+		if (isInsideZone(ZoneId.WATER) && (distance > 700)) {
+			double divider = 700 / distance;
+			x = curX + (int) (divider * dx);
+			y = curY + (int) (divider * dy);
+			z = curZ + (int) (divider * dz);
+			dx = (x - curX);
+			dy = (y - curY);
+			dz = (z - curZ);
+			distance = Math.hypot(dx, dy);
+		}
+		
+		// @formatter:off
+		// Define movement angles needed
+		// ^
+		// |    X (x,y)
+		// |   /
+		// |  / distance
+		// | /
+		// |/ angle
+		// X ---------->
+		// (curx,cury)
+		// @formatter:on
+		
+		double cos;
+		double sin;
+		
+		// Check if a movement offset is defined or no distance to go through
+		if ((offset > 0) || (distance < 1)) {
+			// approximation for moving closer when z coordinates are different
+			// TODO: handle Z axis movement better
+			offset -= Math.abs(dz);
+			if (offset < 5) {
+				offset = 5;
+			}
+			
+			// If no distance to go through, the movement is canceled
+			if ((distance < 1) || ((distance - offset) <= 0)) {
+				// Notify the AI that the L2Character is arrived at destination
+				getAI().notifyEvent(CtrlEvent.EVT_ARRIVED);
+				
+				return;
+			}
+			// Calculate movement angles needed
+			sin = dy / distance;
+			cos = dx / distance;
+			
+			distance -= (offset - 5); // due to rounding error, we have to move a bit closer to be in range
+			
+			// Calculate the new destination with offset included
+			x = curX + (int) (distance * cos);
+			y = curY + (int) (distance * sin);
+		} else {
+			// Calculate movement angles needed
+			sin = dy / distance;
+			cos = dx / distance;
+		}
+		
+		// Create and Init a MoveData object
+		MoveData m = new MoveData();
+		
+		// GEODATA MOVEMENT CHECKS AND PATHFINDING
+		m.onGeodataPathIndex = -1; // Initialize not on geodata path
+		m.disregardingGeodata = false;
+		
+		if (!isFlying() // flying chars not checked - even canSeeTarget doesn't work yet
+			&& (!isInsideZone(ZoneId.WATER) || isInsideZone(ZoneId.SIEGE))) // swimming also not checked unless in siege zone - but distance is limited
+		{
+			final boolean isInVehicle = isPlayer() && (getActingPlayer().getVehicle() != null);
+			if (isInVehicle) {
+				m.disregardingGeodata = true;
+			}
+			
+			double originalDistance = distance;
+			int originalX = x;
+			int originalY = y;
+			int originalZ = z;
+			int gtx = (originalX - L2World.MAP_MIN_X) >> 4;
+			int gty = (originalY - L2World.MAP_MIN_Y) >> 4;
+			
+			// Movement checks:
+			// When pathfinding enabled, for all characters except monsters returning home (could be changed later to teleport if pathfinding fails)
+			if (((geodata().getPathFinding() > 0) && (!(isAttackable() && ((L2Attackable) this).isReturningToSpawnPoint()))) //
+				|| (isPlayer() && !(isInVehicle && (distance > 1500))) //
+				|| (this instanceof L2RiftInvaderInstance)) {
+				if (isOnGeodataPath()) {
+					try {
+						if ((gtx == _move.geoPathGtx) && (gty == _move.geoPathGty)) {
+							return;
+						}
+						_move.onGeodataPathIndex = -1; // Set not on geodata path
+					} catch (NullPointerException e) {
+						// nothing
+					}
+				}
+				
+				if ((curX < L2World.MAP_MIN_X) || (curX > L2World.MAP_MAX_X) || (curY < L2World.MAP_MIN_Y) || (curY > L2World.MAP_MAX_Y)) {
+					// Temporary fix for character outside world region errors
+					LOG.warn("{} is outside world area, in coordinates x:{} y:{}", this, curX, curY);
+					getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					if (isPlayer()) {
+						getActingPlayer().logout();
+					} else if (isSummon()) {
+						return; // preventation when summon get out of world coords, player will not loose him, unsummon handled from pcinstance
+					} else {
+						onDecay();
+					}
+					return;
+				}
+				Location destiny = GeoData.getInstance().moveCheck(curX, curY, curZ, x, y, z, getInstanceId());
+				// location different if destination wasn't reached (or just z coord is different)
+				x = destiny.getX();
+				y = destiny.getY();
+				z = destiny.getZ();
+				dx = x - curX;
+				dy = y - curY;
+				dz = z - curZ;
+				distance = verticalMovementOnly ? Math.pow(dz, 2) : Math.hypot(dx, dy);
+			}
+			// Pathfinding checks. Only when geodata setting is 2, the LoS check gives shorter result
+			// than the original movement was and the LoS gives a shorter distance than 2000
+			// This way of detecting need for pathfinding could be changed.
+			if ((geodata().getPathFinding() > 0) && ((originalDistance - distance) > 30)) {
+				// Path calculation
+				// Overrides previous movement check
+				if ((isPlayable() && !isInVehicle) || isMinion() || isInCombat()) {
+					m.geoPath = PathFinding.getInstance().findPath(curX, curY, curZ, originalX, originalY, originalZ, getInstanceId(), isPlayable());
+					if ((m.geoPath == null) || (m.geoPath.size() < 2)) // No path found
+					{
+						// Even though there's no path found (remember geonodes aren't perfect),
+						// the mob is attacking and right now we set it so that the mob will go
+						// after target anyway, is dz is small enough.
+						// With cellpathfinding this approach could be changed but would require taking
+						// off the geonodes and some more checks.
+						// Summons will follow their masters no matter what.
+						// Currently minions also must move freely since L2AttackableAI commands them to move along with their leader
+						if (isPlayer() || (!isPlayable() && !isMinion() && (Math.abs(z - curZ) > 140)) || (isSummon() && !((L2Summon) this).getFollowStatus())) {
+							final Location destination = GeoData.getInstance().moveCheck(curX, curY, curZ, x, y, z, getInstanceId());
+							getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
+							return;
+						}
+						
+						m.disregardingGeodata = true;
+						x = originalX;
+						y = originalY;
+						z = originalZ;
+						distance = originalDistance;
+					} else {
+						m.onGeodataPathIndex = 0; // on first segment
+						m.geoPathGtx = gtx;
+						m.geoPathGty = gty;
+						m.geoPathAccurateTx = originalX;
+						m.geoPathAccurateTy = originalY;
+						
+						x = m.geoPath.get(m.onGeodataPathIndex).getX();
+						y = m.geoPath.get(m.onGeodataPathIndex).getY();
+						z = m.geoPath.get(m.onGeodataPathIndex).getZ();
+						
+						// check for doors in the route
+						if (DoorData.getInstance().checkIfDoorsBetween(curX, curY, curZ, x, y, z, getInstanceId())) {
+							m.geoPath = null;
+							getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+							return;
+						}
+						for (int i = 0; i < (m.geoPath.size() - 1); i++) {
+							if (DoorData.getInstance().checkIfDoorsBetween(m.geoPath.get(i), m.geoPath.get(i + 1), getInstanceId())) {
+								m.geoPath = null;
+								getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+								return;
+							}
+						}
+						
+						dx = x - curX;
+						dy = y - curY;
+						dz = z - curZ;
+						distance = verticalMovementOnly ? Math.pow(dz, 2) : Math.hypot(dx, dy);
+						sin = dy / distance;
+						cos = dx / distance;
+					}
+				}
+			}
+			// If no distance to go through, the movement is canceled
+			if ((distance < 1) && ((geodata().getPathFinding() > 0) || isPlayable() || (this instanceof L2RiftInvaderInstance) || isAfraid())) {
+				if (isSummon()) {
+					((L2Summon) this).setFollowStatus(false);
+				}
+				getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				return;
+			}
+		}
+		
+		// Apply Z distance for flying or swimming for correct timing calculations
+		if ((isFlying() || isInsideZone(ZoneId.WATER)) && !verticalMovementOnly) {
+			distance = Math.hypot(distance, dz);
+		}
+		
+		// Caclulate the Nb of ticks between the current position and the destination
+		// One tick added for rounding reasons
+		int ticksToMove = 1 + (int) ((GameTimeController.TICKS_PER_SECOND * distance) / speed);
+		m._xDestination = x;
+		m._yDestination = y;
+		m._zDestination = z; // this is what was requested from client
+		
+		// Calculate and set the heading of the L2Character
+		m._heading = 0; // initial value for coordinate sync
+		// Does not broke heading on vertical movements
+		if (!verticalMovementOnly) {
+			setHeading(Util.calculateHeadingFrom(cos, sin));
+		}
+		
+		m._moveStartTime = GameTimeController.getInstance().getGameTicks();
+		
+		// Set the L2Character _move object to MoveData object
+		_move = m;
+		
+		// Add the L2Character to movingObjects of the GameTimeController
+		// The GameTimeController manage objects movement
+		GameTimeController.getInstance().registerMovingObject(this);
+		
+		// Create a task to notify the AI that L2Character arrives at a check point of the movement
+		if ((ticksToMove * GameTimeController.MILLIS_IN_TICK) > 3000) {
+			ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000);
+		}
+		
+		// the CtrlEvent.EVT_ARRIVED will be sent when the character will actually arrive
+		// to destination by GameTimeController
+	}
+	
+	public boolean moveToNextRoutePoint() {
+		if (!isOnGeodataPath()) {
+			// Cancel the move action
+			_move = null;
+			return false;
+		}
+		
+		// Get the Move Speed of the L2Charcater
+		double speed = getMoveSpeed();
+		if ((speed <= 0) || isMovementDisabled()) {
+			// Cancel the move action
+			_move = null;
+			return false;
+		}
+		
+		MoveData md = _move;
+		if (md == null) {
+			return false;
+		}
+		
+		// Create and Init a MoveData object
+		MoveData m = new MoveData();
+		
+		// Update MoveData object
+		m.onGeodataPathIndex = md.onGeodataPathIndex + 1; // next segment
+		m.geoPath = md.geoPath;
+		m.geoPathGtx = md.geoPathGtx;
+		m.geoPathGty = md.geoPathGty;
+		m.geoPathAccurateTx = md.geoPathAccurateTx;
+		m.geoPathAccurateTy = md.geoPathAccurateTy;
+		
+		if (md.onGeodataPathIndex == (md.geoPath.size() - 2)) {
+			m._xDestination = md.geoPathAccurateTx;
+			m._yDestination = md.geoPathAccurateTy;
+			m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
+		} else {
+			m._xDestination = md.geoPath.get(m.onGeodataPathIndex).getX();
+			m._yDestination = md.geoPath.get(m.onGeodataPathIndex).getY();
+			m._zDestination = md.geoPath.get(m.onGeodataPathIndex).getZ();
+		}
+		
+		double distance = Math.hypot(m._xDestination - super.getX(), m._yDestination - super.getY());
+		// Calculate and set the heading of the L2Character
+		if (distance != 0) {
+			setHeading(Util.calculateHeadingFrom(getX(), getY(), m._xDestination, m._yDestination));
+		}
+		
+		// Caclulate the Nb of ticks between the current position and the destination
+		// One tick added for rounding reasons
+		int ticksToMove = 1 + (int) ((GameTimeController.TICKS_PER_SECOND * distance) / speed);
+		
+		m._heading = 0; // initial value for coordinate sync
+		
+		m._moveStartTime = GameTimeController.getInstance().getGameTicks();
+		
+		// Set the L2Character _move object to MoveData object
+		_move = m;
+		
+		// Add the L2Character to movingObjects of the GameTimeController
+		// The GameTimeController manage objects movement
+		GameTimeController.getInstance().registerMovingObject(this);
+		
+		// Create a task to notify the AI that L2Character arrives at a check point of the movement
+		if ((ticksToMove * GameTimeController.MILLIS_IN_TICK) > 3000) {
+			ThreadPoolManager.getInstance().scheduleAi(new NotifyAITask(this, CtrlEvent.EVT_ARRIVED_REVALIDATE), 2000);
+		}
+		
+		// the CtrlEvent.EVT_ARRIVED will be sent when the character will actually arrive
+		// to destination by GameTimeController
+		
+		// Send a Server->Client packet CharMoveToLocation to the actor and all L2PcInstance in its _knownPlayers
+		MoveToLocation msg = new MoveToLocation(this);
+		broadcastPacket(msg);
+		
+		return true;
+	}
+	
+	public boolean validateMovementHeading(int heading) {
+		MoveData m = _move;
+		
+		if (m == null) {
+			return true;
+		}
+		
+		boolean result = true;
+		if (m._heading != heading) {
+			result = (m._heading == 0); // initial value or false
+			m._heading = heading;
+		}
+		
+		return result;
+	}
+	
+	/**
+	 * Check if this object is inside the given radius around the given point.
+	 * @param loc Location of the target
+	 * @param radius the radius around the target
+	 * @param checkZAxis should we check Z axis also
+	 * @param strictCheck true if (distance < radius), false if (distance <= radius)
+	 * @return true if the L2Character is inside the radius.
+	 */
+	public final boolean isInsideRadius(ILocational loc, int radius, boolean checkZAxis, boolean strictCheck) {
+		return isInsideRadius(loc.getX(), loc.getY(), loc.getZ(), radius, checkZAxis, strictCheck);
+	}
+	
+	/**
+	 * Check if this object is inside the given radius around the given point.
+	 * @param x X position of the target
+	 * @param y Y position of the target
+	 * @param z Z position of the target
+	 * @param radius the radius around the target
+	 * @param checkZAxis should we check Z axis also
+	 * @param strictCheck true if (distance < radius), false if (distance <= radius)
+	 * @return true if the L2Character is inside the radius.
+	 */
+	public final boolean isInsideRadius(int x, int y, int z, int radius, boolean checkZAxis, boolean strictCheck) {
+		final double distance = calculateDistance(x, y, z, checkZAxis, true);
+		return (strictCheck) ? (distance < (radius * radius)) : (distance <= (radius * radius));
+	}
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @return True if arrows are available.
+	 */
+	protected boolean checkAndEquipArrows() {
+		return true;
+	}
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @return True if bolts are available.
+	 */
+	protected boolean checkAndEquipBolts() {
+		return true;
+	}
+	
+	/**
+	 * Add Exp and Sp to the L2Character.<br>
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * <li>L2PetInstance</li>
+	 * @param addToExp
+	 * @param addToSp
+	 */
+	public void addExpAndSp(long addToExp, int addToSp) {
+		// Dummy method (overridden by players and pets)
+	}
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @return the active weapon instance (always equiped in the right hand).
+	 */
+	public abstract L2ItemInstance getActiveWeaponInstance();
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @return the active weapon item (always equiped in the right hand).
+	 */
+	public abstract L2Weapon getActiveWeaponItem();
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @return the secondary weapon instance (always equiped in the left hand).
+	 */
+	public abstract L2ItemInstance getSecondaryWeaponInstance();
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @return the secondary {@link L2Item} item (always equiped in the left hand).
+	 */
+	public abstract L2Item getSecondaryWeaponItem();
+	
+	/**
+	 * Manage hit process (called by Hit Task).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL and send a Server->Client packet ActionFailed (if attacker is a L2PcInstance)</li>
+	 * <li>If attack isn't aborted, send a message system (critical hit, missed...) to attacker/target if they are L2PcInstance</li>
+	 * <li>If attack isn't aborted and hit isn't missed, reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary</li>
+	 * <li>if attack isn't aborted and hit isn't missed, manage attack or cast break of the target (calculating rate, sending message...)</li>
+	 * </ul>
+	 * @param target The L2Character targeted
+	 * @param damage Nb of HP to reduce
+	 * @param crit True if hit is critical
+	 * @param miss True if hit is missed
+	 * @param soulshot True if SoulShot are charged
+	 * @param shld True if shield is efficient
+	 */
+	public void onHitTimer(L2Character target, int damage, boolean crit, boolean miss, boolean soulshot, byte shld) {
+		// If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL
+		// and send a Server->Client packet ActionFailed (if attacker is a L2PcInstance)
+		if ((target == null) || isAlikeDead() || (isNpc() && ((L2Npc) this).isEventMob())) {
+			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
+			return;
+		}
+		
+		if (isStunned() || isSleeping() || isAfraid() || isPhysicalAttackMuted()) {
+			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
+			return;
+		}
+		
+		if ((isNpc() && target.isAlikeDead()) || target.isDead() || (!getKnownList().knowsObject(target) && !isDoor())) {
+			// getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+			// Some times attack is processed but target die before the hit
+			// So we need to recharge shot for next attack
+			rechargeShots(true, false);
+			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (miss) {
+			// Notify target AI
+			if (target.hasAI()) {
+				target.getAI().notifyEvent(CtrlEvent.EVT_EVADED, this);
+			}
+			notifyAttackAvoid(target, false);
+		}
+		
+		// Send message about damage/crit or miss
+		sendDamageMessage(target, damage, false, crit, miss);
+		
+		// Check Raidboss attack
+		// Character will be petrified if attacking a raid that's more
+		// than 8 levels lower
+		if (target.isRaid() && target.giveRaidCurse() && npc().raidCurse()) {
+			if (getLevel() > (target.getLevel() + 8)) {
+				Skill skill = CommonSkill.RAID_CURSE2.getSkill();
+				
+				if (skill != null) {
+					abortAttack();
+					abortCast();
+					getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+					skill.applyEffects(target, this);
+				} else {
+					LOG.warn("Skill 4515 at level 1 is missing in DP.");
+				}
+				
+				damage = 0; // prevents messing up drop calculation
+			}
+		}
+		
+		// If L2Character target is a L2PcInstance, send a system message
+		if (target.isPlayer()) {
+			L2PcInstance enemy = target.getActingPlayer();
+			enemy.getAI().clientStartAutoAttack();
+		}
+		
+		if (!miss && (damage > 0)) {
+			L2Weapon weapon = getActiveWeaponItem();
+			boolean isBow = ((weapon != null) && ((weapon.getItemType() == WeaponType.BOW) || (weapon.getItemType() == WeaponType.CROSSBOW)));
+			int reflectedDamage = 0;
+			
+			if (!isBow && !target.isInvul()) // Do not reflect if weapon is of type bow or target is invunlerable
+			{
+				// quick fix for no drop from raid if boss attack high-level char with damage reflection
+				if (!target.isRaid() || (getActingPlayer() == null) || (getActingPlayer().getLevel() <= (target.getLevel() + 8))) {
+					// Reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary
+					double reflectPercent = target.getStat().calcStat(Stats.REFLECT_DAMAGE_PERCENT, 0, null, null);
+					
+					if (reflectPercent > 0) {
+						reflectedDamage = (int) ((reflectPercent / 100.) * damage);
+						
+						if (reflectedDamage > target.getMaxHp()) {
+							reflectedDamage = target.getMaxHp();
+						}
+					}
+				}
+			}
+			
+			// reduce targets HP
+			target.reduceCurrentHp(damage, this, null);
+			target.notifyDamageReceived(damage, this, null, crit, false, false);
+			
+			if (reflectedDamage > 0) {
+				if (target.isPlayable()) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
+					sm.addCharName(target).addCharName(this).addInt(reflectedDamage);
+					target.sendPacket(sm);
+				}
+				
+				if (isSummon()) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
+					sm.addCharName(this).addCharName(target).addInt(reflectedDamage);
+					getActingPlayer().sendPacket(sm);
+				}
+				
+				reduceCurrentHp(reflectedDamage, target, true, false, null);
+				notifyDamageReceived(reflectedDamage, target, null, crit, false, true);
+			}
+			
+			if (!isBow) // Do not absorb if weapon is of type bow
+			{
+				// Absorb HP from the damage inflicted
+				double absorbPercent = getStat().calcStat(Stats.ABSORB_DAMAGE_PERCENT, 0, null, null);
+				
+				if (absorbPercent > 0) {
+					int maxCanAbsorb = (int) (getMaxRecoverableHp() - getCurrentHp());
+					int absorbDamage = (int) ((absorbPercent / 100.) * damage);
+					
+					if (absorbDamage > maxCanAbsorb) {
+						absorbDamage = maxCanAbsorb; // Can't absord more than max hp
+					}
+					
+					if (absorbDamage > 0) {
+						setCurrentHp(getCurrentHp() + absorbDamage);
+					}
+				}
+				
+				// Absorb MP from the damage inflicted
+				absorbPercent = getStat().calcStat(Stats.ABSORB_MANA_DAMAGE_PERCENT, 0, null, null);
+				
+				if (absorbPercent > 0) {
+					int maxCanAbsorb = (int) (getMaxRecoverableMp() - getCurrentMp());
+					int absorbDamage = (int) ((absorbPercent / 100.) * damage);
+					
+					if (absorbDamage > maxCanAbsorb) {
+						absorbDamage = maxCanAbsorb; // Can't absorb more than max hp
+					}
+					
+					if (absorbDamage > 0) {
+						setCurrentMp(getCurrentMp() + absorbDamage);
+					}
+				}
+				
+			}
+			
+			// Notify AI with EVT_ATTACKED
+			if (target.hasAI()) {
+				target.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+			}
+			getAI().clientStartAutoAttack();
+			if (isSummon()) {
+				L2PcInstance owner = ((L2Summon) this).getOwner();
+				if (owner != null) {
+					owner.getAI().clientStartAutoAttack();
+				}
+			}
+			
+			// Manage attack or cast break of the target (calculating rate, sending message...)
+			if (!target.isRaid() && Formulas.calcAtkBreak(target, damage)) {
+				target.breakAttack();
+				target.breakCast();
+			}
+			
+			if (_triggerSkills != null) {
+				for (OptionsSkillHolder holder : _triggerSkills.values()) {
+					if ((!crit && (holder.getSkillType() == OptionsSkillType.ATTACK)) || ((holder.getSkillType() == OptionsSkillType.CRITICAL) && crit)) {
+						if (Rnd.get(100) < holder.getChance()) {
+							makeTriggerCast(holder.getSkill(), target);
+						}
+					}
+				}
+			}
+			// Launch weapon onCritical Special ability effect if available
+			if (crit && (weapon != null)) {
+				weapon.castOnCriticalSkill(this, target);
+			}
+		}
+		// Recharge any active auto-soulshot tasks for current creature.
+		rechargeShots(true, false);
+	}
+	
+	/**
+	 * Break an attack and send Server->Client ActionFailed packet and a System Message to the L2Character.
+	 */
+	public void breakAttack() {
+		if (isAttackingNow()) {
+			// Abort the attack of the L2Character and send Server->Client ActionFailed packet
+			abortAttack();
+			if (isPlayer()) {
+				// Send a system message
+				sendPacket(SystemMessageId.ATTACK_FAILED);
+			}
+		}
+	}
+	
+	/**
+	 * Break a cast and send Server->Client ActionFailed packet and a System Message to the L2Character.
+	 */
+	public void breakCast() {
+		// damage can only cancel magical & static skills
+		if (isCastingNow() && canAbortCast() && (getLastSkillCast() != null) && (getLastSkillCast().isMagic() || getLastSkillCast().isStatic())) {
+			// Abort the cast of the L2Character and send Server->Client MagicSkillCanceld/ActionFailed packet.
+			abortCast();
+			
+			if (isPlayer()) {
+				// Send a system message
+				sendPacket(SystemMessageId.CASTING_INTERRUPTED);
+			}
+		}
+	}
+	
+	/**
+	 * Reduce the arrow number of the L2Character.<br>
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * @param bolts
+	 */
+	protected void reduceArrowCount(boolean bolts) {
+		// default is to do nothing
+	}
+	
+	/**
+	 * Manage Forced attack (shift + select target).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>If L2Character or target is in a town area, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed</li>
+	 * <li>If target is confused, send a Server->Client packet ActionFailed</li>
+	 * <li>If L2Character is a L2ArtefactInstance, send a Server->Client packet ActionFailed</li>
+	 * <li>Send a Server->Client packet MyTargetSelected to start attack and Notify AI with AI_INTENTION_ATTACK</li>
+	 * </ul>
+	 * @param player The L2PcInstance to attack
+	 */
+	@Override
+	public void onForcedAttack(L2PcInstance player) {
+		if (isInsidePeaceZone(player)) {
+			// If L2Character or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed
+			player.sendPacket(SystemMessageId.TARGET_IN_PEACEZONE);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		if (player.isInOlympiadMode() && (player.getTarget() != null) && player.getTarget().isPlayable()) {
+			L2PcInstance target = null;
+			L2Object object = player.getTarget();
+			if ((object != null) && object.isPlayable()) {
+				target = object.getActingPlayer();
+			}
+			
+			if ((target == null) || (target.isInOlympiadMode() && (!player.isOlympiadStart() || (player.getOlympiadGameId() != target.getOlympiadGameId())))) {
+				// if L2PcInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		}
+		if ((player.getTarget() != null) && !player.getTarget().canBeAttacked() && !player.getAccessLevel().allowPeaceAttack()) {
+			// If target is not attackable, send a Server->Client packet ActionFailed
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		if (player.isConfused()) {
+			// If target is confused, send a Server->Client packet ActionFailed
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		// GeoData Los Check or dz > 1000
+		if (!GeoData.getInstance().canSeeTarget(player, this)) {
+			player.sendPacket(SystemMessageId.CANT_SEE_TARGET);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		if (player.getBlockCheckerArena() != -1) {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		// Notify AI with AI_INTENTION_ATTACK
+		player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+	}
+	
+	/**
+	 * @param attacker
+	 * @return True if inside peace zone.
+	 */
+	public boolean isInsidePeaceZone(L2PcInstance attacker) {
+		return isInsidePeaceZone(attacker, this);
+	}
+	
+	public boolean isInsidePeaceZone(L2PcInstance attacker, L2Object target) {
+		return (!attacker.getAccessLevel().allowPeaceAttack() && isInsidePeaceZone((L2Object) attacker, target));
+	}
+	
+	public boolean isInsidePeaceZone(L2Object attacker, L2Object target) {
+		if (target == null) {
+			return false;
+		}
+		if (!(target.isPlayable() && attacker.isPlayable())) {
+			return false;
+		}
+		if (InstanceManager.getInstance().getInstance(getInstanceId()).isPvPInstance()) {
+			return false;
+		}
+		
+		if (territoryWar().playerWithWardCanBeKilledInPeaceZone() && TerritoryWarManager.getInstance().isTWInProgress()) {
+			if (target.isPlayer() && target.getActingPlayer().isCombatFlagEquipped()) {
+				return false;
+			}
+		}
+		
+		if (character().karmaPlayerCanBeKilledInPeaceZone()) {
+			// allows red to be attacked and red to attack flagged players
+			if ((target.getActingPlayer() != null) && (target.getActingPlayer().getKarma() > 0)) {
+				return false;
+			}
+			if ((attacker.getActingPlayer() != null) && (attacker.getActingPlayer().getKarma() > 0) && (target.getActingPlayer() != null) && (target.getActingPlayer().getPvpFlag() > 0)) {
+				return false;
+			}
+		}
+		
+		return (target.isInsideZone(ZoneId.PEACE) || attacker.isInsideZone(ZoneId.PEACE));
+	}
+	
+	/**
+	 * @return true if this character is inside an active grid.
+	 */
+	public boolean isInActiveRegion() {
+		L2WorldRegion region = getWorldRegion();
+		return ((region != null) && (region.isActive()));
+	}
+	
+	/**
+	 * @return True if the L2Character has a Party in progress.
+	 */
+	public boolean isInParty() {
+		return false;
+	}
+	
+	/**
+	 * @return the L2Party object of the L2Character.
+	 */
+	public L2Party getParty() {
+		return null;
+	}
+	
+	/**
+	 * @return the Attack Speed of the L2Character (delay (in milliseconds) before next attack).
+	 */
+	public int calculateTimeBetweenAttacks() {
+		return (int) (500000 / getPAtkSpd());
+	}
+	
+	/**
+	 * @param weapon
+	 * @return the Reuse Time of Attack (used for bow delay)
+	 */
+	public int calculateReuseTime(final L2Weapon weapon) {
+		if (isTransformed()) {
+			switch (getAttackType()) {
+				case BOW:
+					return (int) ((1500 * 333 * getStat().getWeaponReuseModifier(null)) / getStat().getPAtkSpd());
+				case CROSSBOW:
+					return (int) ((1200 * 333 * getStat().getWeaponReuseModifier(null)) / getStat().getPAtkSpd());
+			}
+		}
+		
+		if ((weapon == null) || (weapon.getReuseDelay() == 0)) {
+			return 0;
+		}
+		
+		return (int) ((weapon.getReuseDelay() * 333) / getPAtkSpd());
+	}
+	
+	/**
+	 * Add a skill to the L2Character _skills and its Func objects to the calculator set of the L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * All skills own by a L2Character are identified in <B>_skills</B><br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Replace oldSkill by newSkill or Add the newSkill</li>
+	 * <li>If an old skill has been replaced, remove all its Func objects of L2Character calculator set</li>
+	 * <li>Add Func objects of newSkill to the calculator set of the L2Character</li>
+	 * </ul>
+	 * <B><U>Overridden in</U>:</B>
+	 * <ul>
+	 * <li>L2PcInstance : Save update in the character_skills table of the database</li>
+	 * </ul>
+	 * @param newSkill The L2Skill to add to the L2Character
+	 * @return The L2Skill replaced or null if just added a new L2Skill
+	 */
+	@Override
+	public Skill addSkill(Skill newSkill) {
+		Skill oldSkill = null;
+		if (newSkill != null) {
+			// Replace oldSkill by newSkill or Add the newSkill
+			oldSkill = _skills.put(newSkill.getId(), newSkill);
+			// If an old skill has been replaced, remove all its Func objects
+			if (oldSkill != null) {
+				removeStatsOwner(oldSkill);
+				
+				if (oldSkill.isPassive()) {
+					stopSkillEffects(false, oldSkill.getId());
+				}
+			}
+			// Add Func objects of newSkill to the calculator set of the L2Character
+			addStatFuncs(newSkill.getStatFuncs(null, this));
+			
+			if (newSkill.isPassive()) {
+				newSkill.applyEffects(this, this, -1, false, true, false, 0);
+			}
+		}
+		return oldSkill;
+	}
+	
+	public Skill removeSkill(Skill skill, boolean cancelEffect) {
+		return (skill != null) ? removeSkill(skill.getId(), cancelEffect) : null;
+	}
+	
+	public Skill removeSkill(int skillId) {
+		return removeSkill(skillId, true);
+	}
+	
+	public Skill removeSkill(int skillId, boolean cancelEffect) {
+		// Remove the skill from the L2Character _skills
+		Skill oldSkill = _skills.remove(skillId);
+		// Remove all its Func objects from the L2Character calculator set
+		if (oldSkill != null) {
+			// Stop casting if this skill is used right now
+			if ((getLastSkillCast() != null) && isCastingNow()) {
+				if (oldSkill.getId() == getLastSkillCast().getId()) {
+					abortCast();
+				}
+			}
+			if ((getLastSimultaneousSkillCast() != null) && isCastingSimultaneouslyNow()) {
+				if (oldSkill.getId() == getLastSimultaneousSkillCast().getId()) {
+					abortCast();
+				}
+			}
+			
+			// Stop effects.
+			if (cancelEffect || oldSkill.isToggle() || oldSkill.isPassive()) {
+				removeStatsOwner(oldSkill);
+				stopSkillEffects(false, oldSkill.getId());
+			}
+		}
+		
+		return oldSkill;
+	}
+	
+	/**
+	 * <B><U>Concept</U>:</B><br>
+	 * All skills own by a L2Character are identified in <B>_skills</B> the L2Character
+	 * @return all skills own by the L2Character in a table of L2Skill.
+	 */
+	public final Collection<Skill> getAllSkills() {
+		return _skills.values();
+	}
+	
+	/**
+	 * @return the map containing this character skills.
+	 */
+	@Override
+	public Map<Integer, Skill> getSkills() {
+		return _skills;
+	}
+	
+	/**
+	 * Return the level of a skill owned by the L2Character.
+	 * @param skillId The identifier of the L2Skill whose level must be returned
+	 * @return The level of the L2Skill identified by skillId
+	 */
+	@Override
+	public int getSkillLevel(int skillId) {
+		final Skill skill = getKnownSkill(skillId);
+		return (skill == null) ? -1 : skill.getLevel();
+	}
+	
+	/**
+	 * @param skillId The identifier of the L2Skill to check the knowledge
+	 * @return the skill from the known skill.
+	 */
+	@Override
+	public final Skill getKnownSkill(int skillId) {
+		return _skills.get(skillId);
+	}
+	
+	/**
+	 * Return the number of buffs affecting this L2Character.
+	 * @return The number of Buffs affecting this L2Character
+	 */
+	public int getBuffCount() {
+		return _effectList.getBuffCount();
+	}
+	
+	public int getDanceCount() {
+		return _effectList.getDanceCount();
+	}
+	
+	/**
+	 * Manage the magic skill launching task (MP, HP, Item consumation...) and display the magic skill animation on client.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Send a Server->Client packet MagicSkillLaunched (to display magic skill animation) to all L2PcInstance of L2Character _knownPlayers</li>
+	 * <li>Consume MP, HP and Item if necessary</li>
+	 * <li>Send a Server->Client packet StatusUpdate with MP modification to the L2PcInstance</li>
+	 * <li>Launch the magic skill in order to calculate its effects</li>
+	 * <li>If the skill type is PDAM, notify the AI of the target with AI_INTENTION_ATTACK</li>
+	 * <li>Notify the AI of the L2Character with EVT_FINISH_CASTING</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: A magic skill casting MUST BE in progress</B></FONT>
+	 * @param mut
+	 */
+	public void onMagicLaunchedTimer(MagicUseTask mut) {
+		// TODO(Zoey76): The target list should be managed by the target type and affect scope and should not be modified here.
+		// TODO(Zoey76): The best approach would be to include the effect range and LOS validation in AffectScope.
+		
+		// Escaping from under skill's radius and peace zone check. First version, not perfect in AoE skills.
+		final var skill = mut.getSkill();
+		int escapeRange = 0;
+		if (skill.getEffectRange() > escapeRange) {
+			escapeRange = skill.getEffectRange();
+		} else if ((skill.getCastRange() < 0) && (skill.getAffectRange() > 80)) {
+			escapeRange = skill.getAffectRange();
+		}
+		
+		final var targets = mut.getTargets();
+		if (!targets.isEmpty() && (escapeRange > 0)) {
+			int skipRange = 0;
+			int skipLOS = 0;
+			int skipPeaceZone = 0;
+			final List<L2Object> targetList = new ArrayList<>();
+			for (L2Object target : targets) {
+				if (target instanceof L2Character creature) {
+					if (!isInsideRadius(target.getX(), target.getY(), target.getZ(), escapeRange + getTemplate().getCollisionRadius(), true, false)) {
+						skipRange++;
+						continue;
+					}
+					
+					// Healing party members should ignore LOS.
+					if (((skill.getAffectScope() != PARTY) || !skill.hasEffectType(L2EffectType.HP)) //
+						&& !GeoData.getInstance().canSeeTarget(this, target)) {
+						skipLOS++;
+						continue;
+					}
+					
+					if (skill.isBad()) {
+						if (isPlayer()) {
+							if (creature.isInsidePeaceZone(getActingPlayer())) {
+								skipPeaceZone++;
+								continue;
+							}
+						} else {
+							if (creature.isInsidePeaceZone(this, target)) {
+								skipPeaceZone++;
+								continue;
+							}
+						}
+					}
+					targetList.add(target);
+				}
+			}
+			if (targetList.isEmpty()) {
+				if (isPlayer()) {
+					if (skipRange > 0) {
+						sendPacket(SystemMessageId.DIST_TOO_FAR_CASTING_STOPPED);
+					} else if (skipLOS > 0) {
+						sendPacket(SystemMessageId.CANT_SEE_TARGET);
+					} else if (skipPeaceZone > 0) {
+						sendPacket(SystemMessageId.A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_PEACE_ZONE);
+					}
+				}
+				abortCast();
+				return;
+			}
+			mut.setTargets(targetList);
+		}
+		
+		// Ensure that a cast is in progress
+		// Check if player is using fake death.
+		// Static skills can be used while faking death.
+		if ((mut.isSimultaneous() && !isCastingSimultaneouslyNow()) || (!mut.isSimultaneous() && !isCastingNow()) || (isAlikeDead() && !skill.isStatic())) {
+			// now cancels both, simultaneous and normal
+			getAI().notifyEvent(CtrlEvent.EVT_CANCEL);
+			return;
+		}
+		
+		if (!skill.isToggle()) {
+			broadcastPacket(new MagicSkillLaunched(this, skill.getDisplayId(), skill.getDisplayLevel(), targets));
+		}
+		
+		mut.setPhase(2);
+		if (mut.getSkillTime() == 0) {
+			onMagicHitTimer(mut);
+		} else {
+			_skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, 400);
+		}
+	}
+	
+	// Runs in the end of skill casting
+	public void onMagicHitTimer(MagicUseTask mut) {
+		final Skill skill = mut.getSkill();
+		final var targets = mut.getTargets();
+		
+		if ((skill == null) || (targets == null)) {
+			abortCast();
+			return;
+		}
+		
+		// Go through targets table
+		for (L2Object tgt : targets) {
+			if (tgt.isPlayable()) {
+				if (isPlayer() && tgt.isSummon()) {
+					((L2Summon) tgt).updateAndBroadcastStatus(1);
+				}
+			} else if (isPlayable() && tgt.isAttackable()) {
+				L2Character target = (L2Character) tgt;
+				if (skill.getEffectPoint() > 0) {
+					((L2Attackable) target).reduceHate(this, skill.getEffectPoint());
+				} else if (skill.getEffectPoint() < 0) {
+					((L2Attackable) target).addDamageHate(this, 0, -skill.getEffectPoint());
+				}
+			}
+		}
+		
+		rechargeShots(skill.useSoulShot(), skill.useSpiritShot());
+		
+		final StatusUpdate su = new StatusUpdate(this);
+		boolean isSendStatus = false;
+		
+		// Consume MP of the L2Character and Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		double mpConsume2 = getStat().getMpConsume2(skill);
+		
+		if (mpConsume2 > 0) {
+			if (mpConsume2 > getCurrentMp()) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_MP);
+				abortCast();
+				return;
+			}
+			
+			getStatus().reduceMp(mpConsume2);
+			su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp());
+			isSendStatus = true;
+		}
+		
+		// Consume HP if necessary and Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		if (skill.getHpConsume() > 0) {
+			double consumeHp = skill.getHpConsume();
+			
+			if (consumeHp >= getCurrentHp()) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_HP);
+				abortCast();
+				return;
+			}
+			
+			getStatus().reduceHp(consumeHp, this, true);
+			
+			su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp());
+			isSendStatus = true;
+		}
+		
+		// Send a Server->Client packet StatusUpdate with MP modification to the L2PcInstance
+		if (isSendStatus) {
+			sendPacket(su);
+		}
+		
+		if (isPlayer()) {
+			// Consume Charges
+			if (skill.getChargeConsume() > 0) {
+				getActingPlayer().decreaseCharges(skill.getChargeConsume());
+			}
+		}
+		
+		// Launch the magic skill in order to calculate its effects
+		callSkill(mut.getSkill(), mut.getTargets());
+		
+		if (mut.getSkillTime() > 0) {
+			mut.setCount(mut.getCount() + 1);
+		}
+		
+		mut.setPhase(3);
+		if (mut.getSkillTime() == 0) {
+			onMagicFinalizer(mut);
+		} else {
+			if (mut.isSimultaneous()) {
+				_skillCast2 = ThreadPoolManager.getInstance().scheduleEffect(mut, 0);
+			} else {
+				_skillCast = ThreadPoolManager.getInstance().scheduleEffect(mut, 0);
+			}
+		}
+	}
+	
+	// Runs after skillTime
+	public void onMagicFinalizer(MagicUseTask mut) {
+		if (mut.isSimultaneous()) {
+			_skillCast2 = null;
+			setIsCastingSimultaneouslyNow(false);
+			return;
+		}
+		
+		// Cleanup
+		_skillCast = null;
+		_castInterruptTime = 0;
+		
+		// Stop casting
+		setIsCastingNow(false);
+		setIsCastingSimultaneouslyNow(false);
+		
+		final L2PcInstance player = getActingPlayer();
+		final Skill skill = mut.getSkill();
+		final L2Object target = !mut.getTargets().isEmpty() ? mut.getTargets().get(0) : null;
+		
+		// On each repeat recharge shots before cast.
+		if (mut.getCount() > 0) {
+			rechargeShots(mut.getSkill().useSoulShot(), mut.getSkill().useSpiritShot());
+		}
+		
+		// Attack target after skill use
+		if ((skill.nextActionIsAttack()) && (getTarget() instanceof L2Character) && (getTarget() != this) && (target != null) && (getTarget() == target) && target.canBeAttacked()) {
+			if ((getAI().getNextIntention() == null) || (getAI().getNextIntention().getCtrlIntention() != CtrlIntention.AI_INTENTION_MOVE_TO)) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
+			}
+		}
+		
+		if (skill.isBad() && (skill.getTargetType() != TargetType.DOOR_TREASURE)) {
+			getAI().clientStartAutoAttack();
+		}
+		
+		// Notify the AI of the L2Character with EVT_FINISH_CASTING
+		getAI().notifyEvent(CtrlEvent.EVT_FINISH_CASTING);
+		
+		// Notify DP Scripts
+		notifyQuestEventSkillFinished(skill, target);
+		
+		// If character is a player, then wipe their current cast state and check if a skill is queued.
+		// If there is a queued skill, launch it and wipe the queue.
+		if (isPlayer()) {
+			SkillUseHolder queuedSkill = player.getQueuedSkill();
+			
+			player.setCurrentSkill(null, false, false);
+			
+			if (queuedSkill != null) {
+				player.setQueuedSkill(null, false, false);
+				
+				// DON'T USE : Recursive call to useMagic() method
+				// player.useMagic(queuedSkill.getSkill(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed());
+				ThreadPoolManager.getInstance().executeGeneral(new QueuedMagicUseTask(player, queuedSkill.getSkill(), queuedSkill.isCtrlPressed(), queuedSkill.isShiftPressed()));
+			}
+		}
+		
+		if (isChanneling()) {
+			getSkillChannelizer().stopChanneling();
+		}
+	}
+	
+	// Quest event ON_SPELL_FNISHED
+	protected void notifyQuestEventSkillFinished(Skill skill, L2Object target) {
+		
+	}
+	
+	/**
+	 * Launch the magic skill and calculate its effects on each target contained in the targets table.
+	 * @param skill the skill
+	 * @param targets the targets
+	 */
+	public void callSkill(Skill skill, List<L2Object> targets) {
+		try {
+			L2Weapon activeWeapon = getActiveWeaponItem();
+			
+			// Check if the toggle skill effects are already in progress on the L2Character
+			if (skill.isToggle() && isAffectedBySkill(skill.getId())) {
+				return;
+			}
+			
+			// Initial checks
+			for (L2Object obj : targets) {
+				if ((obj == null) || !obj.isCharacter()) {
+					continue;
+				}
+				
+				final L2Character target = (L2Character) obj;
+				// Check raid monster attack and check buffing characters who attack raid monsters.
+				L2Character targetsAttackTarget = null;
+				L2Character targetsCastTarget = null;
+				if (target.hasAI()) {
+					targetsAttackTarget = target.getAI().getAttackTarget();
+					targetsCastTarget = target.getAI().getCastTarget();
+				}
+				
+				if (npc().raidCurse() && ((target.isRaid() && target.giveRaidCurse() && (getLevel() > (target.getLevel() + 8)))
+					|| (!skill.isBad() && (targetsAttackTarget != null) && targetsAttackTarget.isRaid() && targetsAttackTarget.giveRaidCurse() && targetsAttackTarget.getAttackByList().contains(target) && (getLevel() > (targetsAttackTarget.getLevel() + 8)))
+					|| (!skill.isBad() && (targetsCastTarget != null) && targetsCastTarget.isRaid() && targetsCastTarget.giveRaidCurse() && targetsCastTarget.getAttackByList().contains(target) && (getLevel() > (targetsCastTarget.getLevel() + 8))))) {
+					final CommonSkill curse = skill.isMagic() ? CommonSkill.RAID_CURSE : CommonSkill.RAID_CURSE2;
+					Skill curseSkill = curse.getSkill();
+					if (curseSkill != null) {
+						abortAttack();
+						abortCast();
+						getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+						curseSkill.applyEffects(target, this);
+					} else {
+						LOG.warn("Skill ID {} level {} is missing in DP!", curse.getId(), curse.getLevel());
+					}
+					return;
+				}
+				
+				// Check if over-hit is possible
+				if (skill.isOverhit()) {
+					if (target.isAttackable()) {
+						((L2Attackable) target).overhitEnabled(true);
+					}
+				}
+				
+				// Static skills not trigger any chance skills
+				if (!skill.isStatic()) {
+					// Launch weapon Special ability skill effect if available
+					if ((activeWeapon != null) && !target.isDead()) {
+						activeWeapon.castOnMagicSkill(this, target, skill);
+					}
+					
+					if (_triggerSkills != null) {
+						for (OptionsSkillHolder holder : _triggerSkills.values()) {
+							if ((skill.isMagic() && (holder.getSkillType() == OptionsSkillType.MAGIC)) || (skill.isPhysical() && (holder.getSkillType() == OptionsSkillType.ATTACK))) {
+								if (Rnd.get(100) < holder.getChance()) {
+									makeTriggerCast(holder.getSkill(), target);
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			// Launch the magic skill and calculate its effects
+			skill.activateSkill(this, targets);
+			
+			L2PcInstance player = getActingPlayer();
+			if (player != null) {
+				for (L2Object target : targets) {
+					// EVT_ATTACKED and PvPStatus
+					if (target instanceof L2Character creature) {
+						if (skill.getEffectPoint() <= 0) {
+							if (target.isPlayable() || target.isTrap()) {
+								// Casted on target_self but don't harm self
+								if (!target.equals(this)) {
+									// Combat-mode check
+									if (target.isPlayer()) {
+										target.getActingPlayer().getAI().clientStartAutoAttack();
+									} else if (target.isSummon() && creature.hasAI()) {
+										L2PcInstance owner = ((L2Summon) target).getOwner();
+										if (owner != null) {
+											owner.getAI().clientStartAutoAttack();
+										}
+									}
+									
+									// attack of the own pet does not flag player
+									// triggering trap not flag trap owner
+									if ((player.getSummon() != target) && !isTrap() && skill.isBad()) {
+										player.updatePvPStatus(creature);
+									}
+								}
+							} else if (target.isAttackable()) {
+								switch (skill.getId()) {
+									case 51: // Lure
+									case 511: // Temptation
+										break;
+									default:
+										// add attacker into list
+										creature.addAttackerToAttackByList(this);
+								}
+							}
+							// notify target AI about the attack
+							if (creature.hasAI() && !skill.hasEffectType(L2EffectType.HATE)) {
+								creature.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+							}
+						} else {
+							if (target.isPlayer()) {
+								// Casting non offensive skill on player with pvp flag set or with karma
+								if (!(target.equals(this) || target.equals(player)) && ((target.getActingPlayer().getPvpFlag() > 0) || (target.getActingPlayer().getKarma() > 0))) {
+									player.updatePvPStatus();
+								}
+							} else if (target.isAttackable()) {
+								player.updatePvPStatus();
+							}
+						}
+					}
+				}
+				
+				// Mobs in range 1000 see spell
+				Collection<L2Object> objs = player.getKnownList().getKnownObjects().values();
+				for (L2Object spMob : objs) {
+					if ((spMob != null) && spMob.isNpc()) {
+						final L2Npc npcMob = (L2Npc) spMob;
+						if ((npcMob.isInsideRadius(player, 1000, true, true))) {
+							EventDispatcher.getInstance().notifyEventAsync(new NpcSkillSee(npcMob, player, skill, targets, isSummon()), npcMob);
+							
+							// On Skill See logic
+							if (npcMob.isAttackable()) {
+								final L2Attackable attackable = (L2Attackable) npcMob;
+								
+								int skillEffectPoint = skill.getEffectPoint();
+								
+								if (player.hasSummon()) {
+									if ((targets.size() == 1) && targets.contains(player.getSummon())) {
+										skillEffectPoint = 0;
+									}
+								}
+								
+								if (skillEffectPoint > 0) {
+									if (attackable.hasAI() && (attackable.getAI().getIntention() == AI_INTENTION_ATTACK)) {
+										L2Object npcTarget = attackable.getTarget();
+										for (L2Object skillTarget : targets) {
+											if ((npcTarget == skillTarget) || (npcMob == skillTarget)) {
+												L2Character originalCaster = isSummon() ? getSummon() : player;
+												attackable.addDamageHate(originalCaster, 0, (skillEffectPoint * 150) / (attackable.getLevel() + 7));
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			
+			// Notify AI
+			if (skill.isBad() && !skill.hasEffectType(L2EffectType.HATE)) {
+				for (L2Object target : targets) {
+					if (target.isCharacter()) {
+						final L2Character creature = (L2Character) target;
+						if (creature.hasAI()) {
+							// Notify target AI about the attack
+							creature.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, this);
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("callSkill() failed. skill={} actor(id={}, name={})", skill.getId(), getObjectId(), getName(), e);
+		}
+	}
+	
+	/**
+	 * @param target
+	 * @return True if the L2Character is behind the target and can't be seen.
+	 */
+	public boolean isBehind(L2Object target) {
+		double angleChar, angleTarget, angleDiff, maxAngleDiff = 60;
+		if (target instanceof L2Character creature) {
+			angleChar = Util.calculateAngleFrom(this, creature);
+			angleTarget = Util.convertHeadingToDegree(creature.getHeading());
+			angleDiff = angleChar - angleTarget;
+			if (angleDiff <= (-360 + maxAngleDiff)) {
+				angleDiff += 360;
+			}
+			if (angleDiff >= (360 - maxAngleDiff)) {
+				angleDiff -= 360;
+			}
+			return Math.abs(angleDiff) <= maxAngleDiff;
+		}
+		return false;
+	}
+	
+	public boolean isBehindTarget() {
+		return isBehind(getTarget());
+	}
+	
+	/**
+	 * @param target
+	 * @return True if the target is facing the L2Character.
+	 */
+	public boolean isInFrontOf(L2Character target) {
+		double angleChar, angleTarget, angleDiff, maxAngleDiff = 60;
+		if (target == null) {
+			return false;
+		}
+		
+		angleTarget = Util.calculateAngleFrom(target, this);
+		angleChar = Util.convertHeadingToDegree(target.getHeading());
+		angleDiff = angleChar - angleTarget;
+		if (angleDiff <= (-360 + maxAngleDiff)) {
+			angleDiff += 360;
+		}
+		if (angleDiff >= (360 - maxAngleDiff)) {
+			angleDiff -= 360;
+		}
+		return Math.abs(angleDiff) <= maxAngleDiff;
+	}
+	
+	/**
+	 * @param target
+	 * @param maxAngle
+	 * @return true if target is in front of L2Character (shield def etc)
+	 */
+	public boolean isFacing(L2Object target, int maxAngle) {
+		double angleChar, angleTarget, angleDiff, maxAngleDiff;
+		if (target == null) {
+			return false;
+		}
+		maxAngleDiff = maxAngle / 2.;
+		angleTarget = Util.calculateAngleFrom(this, target);
+		angleChar = Util.convertHeadingToDegree(getHeading());
+		angleDiff = angleChar - angleTarget;
+		if (angleDiff <= (-360 + maxAngleDiff)) {
+			angleDiff += 360;
+		}
+		if (angleDiff >= (360 - maxAngleDiff)) {
+			angleDiff -= 360;
+		}
+		return Math.abs(angleDiff) <= maxAngleDiff;
+	}
+	
+	public boolean isInFrontOfTarget() {
+		L2Object target = getTarget();
+		if (target instanceof L2Character creature) {
+			return isInFrontOf(creature);
+		}
+		return false;
+	}
+	
+	/**
+	 * @return the Level Modifier ((level + 89) / 100).
+	 */
+	public double getLevelMod() {
+		return ((getLevel() + 89) / 100d);
+	}
+	
+	public final void setSkillCast(Future<?> newSkillCast) {
+		_skillCast = newSkillCast;
+	}
+	
+	/**
+	 * Sets _isCastingNow to true and _castInterruptTime is calculated from end time (ticks)
+	 * @param newSkillCastEndTick
+	 */
+	public final void forceIsCasting(int newSkillCastEndTick) {
+		setIsCastingNow(true);
+		// for interrupt -400 ms
+		_castInterruptTime = newSkillCastEndTick - (400 / GameTimeController.MILLIS_IN_TICK);
+	}
+	
+	private boolean _AIdisabled = false;
+	
+	public void updatePvPFlag(int value) {
+		// Overridden in L2PcInstance
+	}
+	
+	/**
+	 * @return a multiplier based on weapon random damage
+	 */
+	public final double getRandomDamageMultiplier() {
+		L2Weapon activeWeapon = getActiveWeaponItem();
+		int random;
+		
+		if (activeWeapon != null) {
+			random = activeWeapon.getRandomDamage();
+		} else {
+			random = 5 + (int) Math.sqrt(getLevel());
+		}
+		
+		return (1 + ((double) Rnd.get(0 - random, random) / 100));
+	}
+	
+	public final long getAttackEndTime() {
+		return _attackEndTime;
+	}
+	
+	/**
+	 * Not Implemented.
+	 * @return
+	 */
+	public abstract int getLevel();
+	
+	/**
+	 * Check minimum level what creature can be.<BR>
+	 * {@link L2PetInstance} use it, some pet cannot drop under specific level.
+	 * @return Minimum level what can be current Character.
+	 */
+	public int getMinLevel() {
+		return 1;
+	}
+	
+	public final double calcStat(Stats stat, double init) {
+		return getStat().calcStat(stat, init, null, null);
+	}
+	
+	// Stat - NEED TO REMOVE ONCE L2CHARSTAT IS COMPLETE
+	public final double calcStat(Stats stat, double init, L2Character target, Skill skill) {
+		return getStat().calcStat(stat, init, target, skill);
+	}
+	
+	public int getAccuracy() {
+		return getStat().getAccuracy();
+	}
+	
+	public final float getAttackSpeedMultiplier() {
+		return getStat().getAttackSpeedMultiplier();
+	}
+	
+	public final double getCriticalDmg(L2Character target, double init) {
+		return getStat().getCriticalDmg(target, init);
+	}
+	
+	public int getCriticalHit(L2Character target, Skill skill) {
+		return getStat().getCriticalHit(target, skill);
+	}
+	
+	public int getEvasionRate(L2Character target) {
+		return getStat().getEvasionRate(target);
+	}
+	
+	public final int getMagicalAttackRange(Skill skill) {
+		return getStat().getMagicalAttackRange(skill);
+	}
+	
+	public final int getMaxCp() {
+		return getStat().getMaxCp();
+	}
+	
+	public final int getMaxRecoverableCp() {
+		return getStat().getMaxRecoverableCp();
+	}
+	
+	public double getMAtk(L2Character target, Skill skill) {
+		return getStat().getMAtk(target, skill);
+	}
+	
+	public int getMAtkSpd() {
+		return getStat().getMAtkSpd();
+	}
+	
+	public int getMaxMp() {
+		return getStat().getMaxMp();
+	}
+	
+	public int getMaxRecoverableMp() {
+		return getStat().getMaxRecoverableMp();
+	}
+	
+	public int getMaxHp() {
+		return (customs().championEnable() && isChampion()) ? getStat().getMaxHp() * customs().getChampionHp() : getStat().getMaxHp();
+	}
+	
+	public int getMaxRecoverableHp() {
+		return getStat().getMaxRecoverableHp();
+	}
+	
+	public final int getMCriticalHit(L2Character target, Skill skill) {
+		return getStat().getMCriticalHit(target, skill);
+	}
+	
+	public double getMDef(L2Character target, Skill skill) {
+		return getStat().getMDef(target, skill);
+	}
+	
+	public double getMReuseRate(Skill skill) {
+		return getStat().getMReuseRate(skill);
+	}
+	
+	public double getPAtk(L2Character target) {
+		return getStat().getPAtk(target);
+	}
+	
+	public double getPAtkSpd() {
+		return getStat().getPAtkSpd();
+	}
+	
+	public double getPDef(L2Character target) {
+		return getStat().getPDef(target);
+	}
+	
+	public final int getPhysicalAttackRange() {
+		return getStat().getPhysicalAttackRange();
+	}
+	
+	public double getMovementSpeedMultiplier() {
+		return getStat().getMovementSpeedMultiplier();
+	}
+	
+	public double getRunSpeed() {
+		return getStat().getRunSpeed();
+	}
+	
+	public double getWalkSpeed() {
+		return getStat().getWalkSpeed();
+	}
+	
+	public final double getSwimRunSpeed() {
+		return getStat().getSwimRunSpeed();
+	}
+	
+	public final double getSwimWalkSpeed() {
+		return getStat().getSwimWalkSpeed();
+	}
+	
+	public double getMoveSpeed() {
+		return getStat().getMoveSpeed();
+	}
+	
+	public final int getShldDef() {
+		return getStat().getShldDef();
+	}
+	
+	public int getSTR() {
+		return getStat().getSTR();
+	}
+	
+	public int getDEX() {
+		return getStat().getDEX();
+	}
+	
+	public int getCON() {
+		return getStat().getCON();
+	}
+	
+	public int getINT() {
+		return getStat().getINT();
+	}
+	
+	public int getWIT() {
+		return getStat().getWIT();
+	}
+	
+	public int getMEN() {
+		return getStat().getMEN();
+	}
+	
+	// Status - NEED TO REMOVE ONCE L2CHARTATUS IS COMPLETE
+	public void addStatusListener(L2Character object) {
+		getStatus().addStatusListener(object);
+	}
+	
+	public void reduceCurrentHp(double damage, L2Character attacker, Skill skill) {
+		reduceCurrentHp(damage, attacker, true, false, skill);
+	}
+	
+	public void reduceCurrentHpByDOT(double damage, L2Character attacker, Skill skill) {
+		reduceCurrentHp(damage, attacker, !skill.isToggle(), true, skill);
+	}
+	
+	public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, Skill skill) {
+		getStatus().reduceHp(damage, attacker, awake, isDOT, false);
+	}
+	
+	public void reduceCurrentMp(double damage) {
+		getStatus().reduceMp(damage);
+	}
+	
+	@Override
+	public void removeStatusListener(L2Character object) {
+		getStatus().removeStatusListener(object);
+	}
+	
+	public void stopHpMpRegeneration() {
+		getStatus().stopHpMpRegeneration();
+	}
+	
+	public final double getCurrentCp() {
+		return getStatus().getCurrentCp();
+	}
+	
+	public final void setCurrentCp(double newCp) {
+		getStatus().setCurrentCp(newCp);
+	}
+	
+	public final double getCurrentHp() {
+		return getStatus().getCurrentHp();
+	}
+	
+	public final void setCurrentHp(double newHp) {
+		getStatus().setCurrentHp(newHp);
+	}
+	
+	public final int getHpPercentage() {
+		return (int) ((getCurrentHp() / getMaxHp()) * 100.0);
+	}
+	
+	public final int getMpPercentage() {
+		return (int) ((getCurrentMp() / getMaxMp()) * 100.0);
+	}
+	
+	public final void setCurrentHpMp(double newHp, double newMp) {
+		getStatus().setCurrentHpMp(newHp, newMp);
+	}
+	
+	public final double getCurrentMp() {
+		return getStatus().getCurrentMp();
+	}
+	
+	public final void setCurrentMp(double newMp) {
+		getStatus().setCurrentMp(newMp);
+	}
+	
+	/**
+	 * @return the max weight that the L2Character can load.
+	 */
+	public int getMaxLoad() {
+		return 0;
+	}
+	
+	public int getBonusWeightPenalty() {
+		return 0;
+	}
+	
+	/**
+	 * @return the current weight of the L2Character.
+	 */
+	public int getCurrentLoad() {
+		return 0;
+	}
+	
+	public boolean isChampion() {
+		return false;
+	}
+	
+	/**
+	 * Send system message about damage.
+	 * @param target
+	 * @param damage
+	 * @param mcrit
+	 * @param pcrit
+	 * @param miss
+	 */
+	public void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss) {
+		if (miss && target.isPlayer()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_EVADED_C2_ATTACK);
+			sm.addPcName(target.getActingPlayer());
+			sm.addCharName(this);
+			target.sendPacket(sm);
+		}
+	}
+	
+	public byte getAttackElement() {
+		return getStat().getAttackElement();
+	}
+	
+	public int getAttackElementValue(byte attackAttribute) {
+		return getStat().getAttackElementValue(attackAttribute);
+	}
+	
+	public int getDefenseElementValue(byte defenseAttribute) {
+		return getStat().getDefenseElementValue(defenseAttribute);
+	}
+	
+	public final void startPhysicalAttackMuted() {
+		abortAttack();
+	}
+	
+	public void disableCoreAI(boolean val) {
+		_AIdisabled = val;
+	}
+	
+	public boolean isCoreAIDisabled() {
+		return _AIdisabled;
+	}
+	
+	/**
+	 * @return true
+	 */
+	public boolean giveRaidCurse() {
+		return true;
+	}
+	
+	/**
+	 * Check if target is affected with special buff
+	 * @see CharEffectList#isAffected(EffectFlag)
+	 * @param flag int
+	 * @return boolean
+	 */
+	public boolean isAffected(EffectFlag flag) {
+		return _effectList.isAffected(flag);
+	}
+	
+	public void broadcastSocialAction(int id) {
+		broadcastPacket(new SocialAction(getObjectId(), id));
+	}
+	
+	public Team getTeam() {
+		return _team;
+	}
+	
+	public void setTeam(Team team) {
+		_team = team;
+	}
+	
+	public void addOverrideCond(PcCondOverride... excs) {
+		for (PcCondOverride exc : excs) {
+			_exceptions |= exc.getMask();
+		}
+	}
+	
+	public void removeOverridedCond(PcCondOverride... excs) {
+		for (PcCondOverride exc : excs) {
+			_exceptions &= ~exc.getMask();
+		}
+	}
+	
+	public boolean canOverrideCond(PcCondOverride excs) {
+		return (_exceptions & excs.getMask()) == excs.getMask();
+	}
+	
+	public void setOverrideCond(long masks) {
+		_exceptions = masks;
+	}
+	
+	public void setLethalable(boolean val) {
+		_lethalable = val;
+	}
+	
+	public boolean isLethalable() {
+		return _lethalable;
+	}
+	
+	public Map<Integer, OptionsSkillHolder> getTriggerSkills() {
+		if (_triggerSkills == null) {
+			synchronized (this) {
+				if (_triggerSkills == null) {
+					_triggerSkills = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return _triggerSkills;
+	}
+	
+	public void addTriggerSkill(OptionsSkillHolder holder) {
+		getTriggerSkills().put(holder.getSkillId(), holder);
+	}
+	
+	public void removeTriggerSkill(OptionsSkillHolder holder) {
+		getTriggerSkills().remove(holder.getSkillId());
+	}
+	
+	public void makeTriggerCast(Skill skill, L2Character target, boolean ignoreTargetType) {
+		try {
+			if ((skill == null)) {
+				return;
+			}
+			if (skill.checkCondition(this, target, false)) {
+				if (isSkillDisabled(skill)) {
+					return;
+				}
+				
+				if (skill.getReuseDelay() > 0) {
+					disableSkill(skill, skill.getReuseDelay());
+				}
+				
+				final List<L2Object> targets = !ignoreTargetType ? skill.getTargets(this, target) : List.of(target);
+				if (targets.isEmpty()) {
+					return;
+				}
+				
+				for (L2Object obj : targets) {
+					if ((obj != null) && obj.isCharacter()) {
+						target = (L2Character) obj;
+						break;
+					}
+				}
+				
+				if (character().validateTriggerSkills() && isPlayable() && (target != null) && target.isPlayable()) {
+					final L2PcInstance player = getActingPlayer();
+					if (!player.checkPvpSkill(target, skill)) {
+						return;
+					}
+				}
+				
+				broadcastPacket(new MagicSkillUse(this, target, skill.getDisplayId(), skill.getLevel(), 0, 0));
+				broadcastPacket(new MagicSkillLaunched(this, skill.getDisplayId(), skill.getLevel(), targets));
+				
+				// Launch the magic skill and calculate its effects
+				skill.activateSkill(this, targets);
+			}
+		} catch (Exception e) {
+			LOG.warn("{}", e);
+		}
+	}
+	
+	public void makeTriggerCast(Skill skill, L2Character target) {
+		makeTriggerCast(skill, target, false);
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
+	 */
+	public boolean canRevive() {
+		return true;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @param val
+	 */
+	public void setCanRevive(boolean val) {
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2Attackable}
+	 * @return {@code true} if there is a loot to sweep, {@code false} otherwise.
+	 */
+	public boolean isSweepActive() {
+		return false;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return {@code true} if player is on event, {@code false} otherwise.
+	 */
+	public boolean isOnEvent() {
+		return false;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return the clan id of current character.
+	 */
+	public int getClanId() {
+		return 0;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return the clan of current character.
+	 */
+	public L2Clan getClan() {
+		return null;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return {@code true} if player is in academy, {@code false} otherwise.
+	 */
+	public boolean isAcademyMember() {
+		return false;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return the pledge type of current character.
+	 */
+	public int getPledgeType() {
+		return 0;
+	}
+	
+	/**
+	 * Dummy method overridden in {@link L2PcInstance}
+	 * @return the alliance id of current character.
+	 */
+	public int getAllyId() {
+		return 0;
+	}
+	
+	/**
+	 * Notifies to listeners that current character received damage.
+	 * @param damage
+	 * @param attacker
+	 * @param skill
+	 * @param critical
+	 * @param damageOverTime
+	 */
+	public void notifyDamageReceived(double damage, L2Character attacker, Skill skill, boolean critical, boolean damageOverTime, boolean isReflect) {
+		EventDispatcher.getInstance().notifyEventAsync(new CreatureDamageReceived(attacker, this, damage, skill, critical, damageOverTime, isReflect), this);
+		EventDispatcher.getInstance().notifyEventAsync(new CreatureDamageDealt(attacker, this, damage, skill, critical, damageOverTime, isReflect), attacker);
+	}
+	
+	/**
+	 * Notifies to listeners that current character avoid attack.
+	 * @param target
+	 * @param isDot
+	 */
+	public void notifyAttackAvoid(final L2Character target, final boolean isDot) {
+		EventDispatcher.getInstance().notifyEventAsync(new CreatureAttackAvoid(this, target, isDot), target);
+	}
+	
+	/**
+	 * @return {@link WeaponType} of current character's weapon or basic weapon type.
+	 */
+	public final WeaponType getAttackType() {
+		if (isTransformed()) {
+			final TransformTemplate template = getTransformation().getTemplate(getActingPlayer());
+			if (template != null) {
+				return template.getBaseAttackType();
+			}
+		}
+		final L2Weapon weapon = getActiveWeaponItem();
+		if (weapon != null) {
+			return weapon.getItemType();
+		}
+		return getTemplate().getBaseAttackType();
+	}
+	
+	public final boolean isInCategory(CategoryType type) {
+		return CategoryData.getInstance().isInCategory(type, getId());
+	}
+	
+	/**
+	 * @return the character that summoned this NPC.
+	 */
+	public L2Character getSummoner() {
+		return _summoner;
+	}
+	
+	/**
+	 * @param summoner the summoner of this NPC.
+	 */
+	public void setSummoner(L2Character summoner) {
+		_summoner = summoner;
+	}
+	
+	@Override
+	public boolean isCharacter() {
+		return true;
+	}
+	
+	/**
+	 * @return {@code true} if current character is casting channeling skill, {@code false} otherwise.
+	 */
+	public final boolean isChanneling() {
+		return (_channelizer != null) && _channelizer.isChanneling();
+	}
+	
+	public final SkillChannelizer getSkillChannelizer() {
+		if (_channelizer == null) {
+			_channelizer = new SkillChannelizer(this);
+		}
+		return _channelizer;
+	}
+	
+	/**
+	 * @return {@code true} if current character is affected by channeling skill, {@code false} otherwise.
+	 */
+	public final boolean isChannelized() {
+		return (_channelized != null) && !_channelized.isChannelized();
+	}
+	
+	public final SkillChannelized getSkillChannelized() {
+		if (_channelized == null) {
+			_channelized = new SkillChannelized();
+		}
+		return _channelized;
+	}
+	
+	public void addInvulAgainst(SkillHolder holder) {
+		final InvulSkillHolder invulHolder = getInvulAgainstSkills().get(holder.getSkillId());
+		if (invulHolder != null) {
+			invulHolder.increaseInstances();
+			return;
+		}
+		getInvulAgainstSkills().put(holder.getSkillId(), new InvulSkillHolder(holder));
+	}
+	
+	public void removeInvulAgainst(SkillHolder holder) {
+		final InvulSkillHolder invulHolder = getInvulAgainstSkills().get(holder.getSkillId());
+		if ((invulHolder != null) && (invulHolder.decreaseInstances() < 1)) {
+			getInvulAgainstSkills().remove(holder.getSkillId());
+		}
+	}
+	
+	public boolean isInvulAgainst(int skillId, int skillLvl) {
+		if (_invulAgainst != null) {
+			final SkillHolder holder = getInvulAgainstSkills().get(skillId);
+			return ((holder != null) && ((holder.getSkillLvl() < 1) || (holder.getSkillLvl() == skillLvl)));
+		}
+		return false;
+	}
+	
+	private Map<Integer, InvulSkillHolder> getInvulAgainstSkills() {
+		if (_invulAgainst == null) {
+			synchronized (this) {
+				if (_invulAgainst == null) {
+					_invulAgainst = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return _invulAgainst;
+	}
+	
+	@Override
+	public Queue<AbstractEventListener> getListeners(EventType type) {
+		final Queue<AbstractEventListener> objectListenres = super.getListeners(type);
+		final Queue<AbstractEventListener> templateListeners = getTemplate().getListeners(type);
+		final Queue<AbstractEventListener> globalListeners = isNpc() && !isMonster() ? Containers.Npcs().getListeners(type) : isMonster() ? Containers.Monsters().getListeners(type) : isPlayer() ? Containers.Players().getListeners(type) : EmptyQueue.emptyQueue();
+		
+		// Attempt to do not create collection
+		if (objectListenres.isEmpty() && templateListeners.isEmpty() && globalListeners.isEmpty()) {
+			return EmptyQueue.emptyQueue();
+		} else if (!objectListenres.isEmpty() && templateListeners.isEmpty() && globalListeners.isEmpty()) {
+			return objectListenres;
+		} else if (!templateListeners.isEmpty() && objectListenres.isEmpty() && globalListeners.isEmpty()) {
+			return templateListeners;
+		} else if (!globalListeners.isEmpty() && objectListenres.isEmpty() && templateListeners.isEmpty()) {
+			return globalListeners;
+		}
+		
+		final Queue<AbstractEventListener> both = new LinkedBlockingDeque<>(objectListenres.size() + templateListeners.size() + globalListeners.size());
+		both.addAll(objectListenres);
+		both.addAll(templateListeners);
+		both.addAll(globalListeners);
+		return both;
+	}
+	
+	public Race getRace() {
+		return getTemplate().getRace();
+	}
+	
+	public boolean isInDuel() {
+		return false;
+	}
+	
+	public int getDuelId() {
+		return 0;
+	}
+	
+	public byte getSiegeState() {
+		return 0;
+	}
+	
+	public int getSiegeSide() {
+		return 0;
+	}
+	
+	/**
+	 * Send a normal message to all L2PcInstance in the known list.<br>
+	 * @param msg String with message
+	 */
+	public void say(String msg) {
+		broadcastPacket(new CreatureSay(getObjectId(), isPlayer() ? Say2.ALL : Say2.NPC_ALL, getName(), msg));
+	}
+	
+	/**
+	 * Send a client message to all L2PcInstance in the known list.<br>
+	 * @param msg NpcString from client
+	 */
+	public void say(NpcStringId msg) {
+		broadcastPacket(new CreatureSay(getObjectId(), isPlayer() ? Say2.ALL : Say2.NPC_ALL, getName(), msg));
+	}
+	
+	/**
+	 * Send a shout message (orange chat) to all L2PcInstance in the known list.<br>
+	 * @param msg String with message
+	 */
+	public void shout(String msg) {
+		broadcastPacket(new CreatureSay(getObjectId(), isPlayer() ? Say2.SHOUT : Say2.NPC_SHOUT, getName(), msg));
+	}
+	
+	/**
+	 * Send a shout message (orange chat) to all L2PcInstance in the known list.<br>
+	 * @param msg NpcString from client
+	 */
+	public void shout(NpcStringId msg) {
+		broadcastPacket(new CreatureSay(getObjectId(), isPlayer() ? Say2.SHOUT : Say2.NPC_SHOUT, getName(), msg));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Decoy.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Decoy.java
new file mode 100644
index 00000000..7f3f0b69
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Decoy.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.CharInfo;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+
+public abstract class L2Decoy extends L2Character {
+	private final L2PcInstance _owner;
+	
+	public L2Decoy(int objectId, L2CharTemplate template, L2PcInstance owner) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2Decoy);
+		_owner = owner;
+		setXYZInvisible(owner.getX(), owner.getY(), owner.getZ());
+		setIsInvul(false);
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		sendPacket(new CharInfo(this));
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+		for (L2PcInstance player : getKnownList().getKnownPlayers().values()) {
+			if (player != null) {
+				player.sendPacket(new CharInfo(this));
+			}
+		}
+	}
+	
+	public void stopDecay() {
+		DecayTaskManager.getInstance().cancel(this);
+	}
+	
+	@Override
+	public void onDecay() {
+		deleteMe(_owner);
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return _owner.isAutoAttackable(attacker);
+	}
+	
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public final int getId() {
+		return getTemplate().getId();
+	}
+	
+	@Override
+	public int getLevel() {
+		return getTemplate().getLevel();
+	}
+	
+	public void deleteMe(L2PcInstance owner) {
+		decayMe();
+		getKnownList().removeAllKnownObjects();
+		owner.setDecoy(null);
+	}
+	
+	public synchronized void unSummon(L2PcInstance owner) {
+		
+		if (isVisible() && !isDead()) {
+			if (getWorldRegion() != null) {
+				getWorldRegion().removeFromZones(this);
+			}
+			owner.setDecoy(null);
+			decayMe();
+			getKnownList().removeAllKnownObjects();
+		}
+	}
+	
+	public final L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	@Override
+	public L2PcInstance getActingPlayer() {
+		return _owner;
+	}
+	
+	@Override
+	public L2NpcTemplate getTemplate() {
+		return (L2NpcTemplate) super.getTemplate();
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		activeChar.sendPacket(new CharInfo(this));
+	}
+	
+	@Override
+	public void sendPacket(L2GameServerPacket mov) {
+		if (getOwner() != null) {
+			getOwner().sendPacket(mov);
+		}
+	}
+	
+	@Override
+	public void sendPacket(SystemMessageId id) {
+		if (getOwner() != null) {
+			getOwner().sendPacket(id);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Npc.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Npc.java
new file mode 100644
index 00000000..858336c9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Npc.java
@@ -0,0 +1,1619 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ACTIVE;
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+import static com.l2jserver.gameserver.enums.InstanceType.L2Npc;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_EVENT_RECEIVED;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ItemsAutoDestroy;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.datatables.NpcPersonalAIData;
+import com.l2jserver.gameserver.enums.AISkillScope;
+import com.l2jserver.gameserver.enums.AIType;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.handler.BypassHandler;
+import com.l2jserver.gameserver.handler.IBypassHandler;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.TownManager;
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2ClanHallManagerInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoormenInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2TeleporterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2WarehouseInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.NpcKnownList;
+import com.l2jserver.gameserver.model.actor.stat.NpcStat;
+import com.l2jserver.gameserver.model.actor.status.NpcStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcCanBeSeen;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcEventReceived;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSpawn;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcTeleport;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.variables.NpcVariables;
+import com.l2jserver.gameserver.model.zone.type.L2TownZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExChangeNpcState;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.ServerObjectInfo;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * This class represents a Non-Player-Character in the world.<br>
+ * It can be a monster or a friendly character.<br>
+ * It uses a template to fetch some static values.
+ */
+public class L2Npc extends L2Character {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Npc.class);
+	/** The interaction distance of the L2NpcInstance(is used as offset in MovetoLocation method) */
+	public static final int INTERACTION_DISTANCE = 150;
+	/** Maximum distance where the drop may appear given this NPC position. */
+	public static final int RANDOM_ITEM_DROP_LIMIT = 70;
+	/** The L2Spawn object that manage this L2NpcInstance */
+	private L2Spawn _spawn;
+	/** The flag to specify if this L2NpcInstance is busy */
+	private boolean _isBusy = false;
+	/** The busy message for this L2NpcInstance */
+	private String _busyMessage = "";
+	/** True if endDecayTask has already been called */
+	private volatile boolean _isDecayed = false;
+	/** The castle index in the array of L2Castle this L2NpcInstance belongs to */
+	private int _castleIndex = -2;
+	/** The fortress index in the array of L2Fort this L2NpcInstance belongs to */
+	private int _fortIndex = -2;
+	private boolean _eventMob = false;
+	private boolean _isInTown = false;
+	/** True if this L2Npc is autoattackable **/
+	private boolean _isAutoAttackable = false;
+	/** Time of last social packet broadcast */
+	private long _lastSocialBroadcast = 0;
+	/** Minimum interval between social packets */
+	private static final int MINIMUM_SOCIAL_INTERVAL = 6000;
+	/** Support for random animation switching */
+	private boolean _isRandomAnimationEnabled = true;
+	private boolean _isTalking = true;
+	
+	protected RandomAnimationTask _rAniTask = null;
+	private int _currentLHandId; // normally this shouldn't change from the template, but there exist exceptions
+	private int _currentRHandId; // normally this shouldn't change from the template, but there exist exceptions
+	private int _currentEnchant; // normally this shouldn't change from the template, but there exist exceptions
+	private double _currentCollisionHeight; // used for npc grow effect skills
+	private double _currentCollisionRadius; // used for npc grow effect skills
+	
+	private int _soulshotamount = 0;
+	private int _spiritshotamount = 0;
+	private int _displayEffect = 0;
+	
+	private int _shotsMask = 0;
+	private int _killingBlowWeaponId;
+	/** Map of summoned NPCs by this NPC. */
+	private volatile Map<Integer, L2Npc> _summonedNpcs = null;
+	
+	/**
+	 * Creates a NPC.
+	 * @param template the NPC template
+	 */
+	public L2Npc(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(L2Npc);
+		initCharStatusUpdateValues();
+		
+		// initialize the "current" equipment
+		_currentLHandId = getTemplate().getLHandId();
+		_currentRHandId = getTemplate().getRHandId();
+		_currentEnchant = npc().randomEnchantEffect() ? Rnd.get(4, 21) : getTemplate().getWeaponEnchant();
+		
+		// initialize the "current" collisions
+		_currentCollisionHeight = getTemplate().getfCollisionHeight();
+		_currentCollisionRadius = getTemplate().getfCollisionRadius();
+		
+		setIsFlying(template.isFlying());
+		
+		// Copy the skills from template.
+		for (Skill skill : template.getSkills().values()) {
+			addSkill(skill);
+		}
+	}
+	
+	/**
+	 * Creates a NPC.
+	 * @param npcId the NPC ID
+	 */
+	public L2Npc(int objectId, int npcId) {
+		this(objectId, NpcData.getInstance().getTemplate(npcId));
+	}
+	
+	public int getSoulShotChance() {
+		return getTemplate().getSoulShotChance();
+	}
+	
+	public int getSpiritShotChance() {
+		return getTemplate().getSpiritShotChance();
+	}
+	
+	/**
+	 * Verifies if the NPC can cast a skill given the minimum and maximum skill chances.
+	 * @return {@code true} if the NPC has chances of casting a skill
+	 */
+	public boolean hasSkillChance() {
+		return Rnd.get(100) < Rnd.get(getTemplate().getMinSkillChance(), getTemplate().getMaxSkillChance());
+	}
+	
+	public boolean canMove() {
+		return getTemplate().canMove();
+	}
+	
+	public boolean isChaos() {
+		return getTemplate().isChaos();
+	}
+	
+	public List<Skill> getLongRangeSkills() {
+		return getTemplate().getAISkills(AISkillScope.LONG_RANGE);
+	}
+	
+	public List<Skill> getShortRangeSkills() {
+		return getTemplate().getAISkills(AISkillScope.SHORT_RANGE);
+	}
+	
+	/** Task launching the function onRandomAnimation() */
+	protected static class RandomAnimationTask implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(RandomAnimationTask.class);
+		private final L2Npc _npc;
+		
+		protected RandomAnimationTask(L2Npc npc) {
+			_npc = npc;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				if (_npc.isMob()) {
+					// Cancel further animation timers until intention is changed to ACTIVE again.
+					if (_npc.getAI().getIntention() != AI_INTENTION_ACTIVE) {
+						return;
+					}
+				} else {
+					if (!_npc.isInActiveRegion()) {
+						return;
+					}
+				}
+				
+				if (!(_npc.isDead() || _npc.isStunned() || _npc.isSleeping())) {
+					_npc.onRandomAnimation(Rnd.get(2, 3));
+				}
+				
+				_npc.startRandomAnimationTimer();
+			} catch (Exception e) {
+				LOG.error("There has been an error trying to perform a random animation for NPC {}!", _npc, e);
+			}
+		}
+	}
+	
+	/**
+	 * Send a packet SocialAction to all L2PcInstance in the _KnownPlayers of the L2NpcInstance and create a new RandomAnimation Task.
+	 * @param animationId
+	 */
+	public void onRandomAnimation(int animationId) {
+		// Send a packet SocialAction to all L2PcInstance in the _KnownPlayers of the L2NpcInstance
+		long now = System.currentTimeMillis();
+		if ((now - _lastSocialBroadcast) > MINIMUM_SOCIAL_INTERVAL) {
+			_lastSocialBroadcast = now;
+			broadcastPacket(new SocialAction(getObjectId(), animationId));
+		}
+	}
+	
+	/**
+	 * Create a RandomAnimation Task that will be launched after the calculated delay.
+	 */
+	public void startRandomAnimationTimer() {
+		if (!hasRandomAnimation()) {
+			return;
+		}
+		
+		int minWait = isMob() ? general().getMinMonsterAnimation() : general().getMinNPCAnimation();
+		int maxWait = isMob() ? general().getMaxMonsterAnimation() : general().getMaxNPCAnimation();
+		
+		// Calculate the delay before the next animation
+		int interval = Rnd.get(minWait, maxWait) * 1000;
+		
+		// Create a RandomAnimation Task that will be launched after the calculated delay
+		_rAniTask = new RandomAnimationTask(this);
+		ThreadPoolManager.getInstance().scheduleGeneral(_rAniTask, interval);
+	}
+	
+	/**
+	 * @return true if the server allows Random Animation.
+	 */
+	public boolean hasRandomAnimation() {
+		return ((general().getMaxNPCAnimation() > 0) && _isRandomAnimationEnabled && !getAiType().equals(AIType.CORPSE));
+	}
+	
+	/**
+	 * Switches random Animation state into val.
+	 * @param val needed state of random animation
+	 */
+	public void setRandomAnimationEnabled(boolean val) {
+		_isRandomAnimationEnabled = val;
+	}
+	
+	/**
+	 * @return {@code true}, if random animation is enabled, {@code false} otherwise.
+	 */
+	public boolean isRandomAnimationEnabled() {
+		return _isRandomAnimationEnabled;
+	}
+	
+	@Override
+	public NpcKnownList getKnownList() {
+		return (NpcKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new NpcKnownList(this));
+	}
+	
+	@Override
+	public NpcStat getStat() {
+		return (NpcStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new NpcStat(this));
+	}
+	
+	@Override
+	public NpcStatus getStatus() {
+		return (NpcStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new NpcStatus(this));
+	}
+	
+	/** Return the L2NpcTemplate of the L2NpcInstance. */
+	@Override
+	public final L2NpcTemplate getTemplate() {
+		return (L2NpcTemplate) super.getTemplate();
+	}
+	
+	/**
+	 * Gets the NPC ID.
+	 * @return the NPC ID
+	 */
+	@Override
+	public int getId() {
+		return getTemplate().getId();
+	}
+	
+	@Override
+	public boolean canBeAttacked() {
+		return npc().attackableNpcs();
+	}
+	
+	/**
+	 * Return the Level of this L2NpcInstance contained in the L2NpcTemplate.
+	 */
+	@Override
+	public final int getLevel() {
+		return getTemplate().getLevel();
+	}
+	
+	/**
+	 * Verifies if the NPC is aggressive.
+	 * @return {@code true} if the NPC is aggressive, {@code false} otherwise
+	 */
+	public boolean isAggressive() {
+		return false;
+	}
+	
+	/**
+	 * Gets the aggression range.<br>
+	 * Overridden by AI value, capped by MaxAggroRange.
+	 * @return the aggression range
+	 */
+	public int getAggroRange() {
+		final int aiAggroRange = getAIValue("aggroRange");
+		if (aiAggroRange >= 0) {
+			return aiAggroRange;
+		}
+		
+		final int maxAggroRange = npc().getMaxAggroRange();
+		if (maxAggroRange > 0) {
+			return Math.min(getTemplate().getAggroRange(), maxAggroRange);
+		}
+		return getTemplate().getAggroRange();
+	}
+	
+	public boolean isInMyClan(L2Npc npc) {
+		return getTemplate().isClan(npc.getTemplate().getClans());
+	}
+	
+	/**
+	 * Return True if this L2NpcInstance is undead in function of the L2NpcTemplate.
+	 */
+	@Override
+	public boolean isUndead() {
+		return getTemplate().getRace() == Race.UNDEAD;
+	}
+	
+	public boolean isSevenNpc() {
+		return getTemplate().isClan("C_DUNGEON") && !getTemplate().isClan("ALL");
+	}
+	
+	/**
+	 * Send a packet NpcInfo with state of abnormal effect to all L2PcInstance in the _KnownPlayers of the L2NpcInstance.
+	 */
+	@Override
+	public void updateAbnormalEffect() {
+		// Send a Server->Client packet NpcInfo with state of abnormal effect to all L2PcInstance in the _KnownPlayers of the L2NpcInstance
+		Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		for (L2PcInstance player : plrs) {
+			if ((player == null) || !isVisibleFor(player)) {
+				continue;
+			}
+			if (getRunSpeed() == 0) {
+				player.sendPacket(new ServerObjectInfo(this, player));
+			} else {
+				player.sendPacket(new AbstractNpcInfo.NpcInfo(this, player));
+			}
+		}
+	}
+	
+	public boolean isEventMob() {
+		return _eventMob;
+	}
+	
+	public void setEventMob(boolean val) {
+		_eventMob = val;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return _isAutoAttackable;
+	}
+	
+	public void setAutoAttackable(boolean flag) {
+		_isAutoAttackable = flag;
+	}
+	
+	/**
+	 * @return the Identifier of the item in the left hand of this L2NpcInstance contained in the L2NpcTemplate.
+	 */
+	public int getLeftHandItem() {
+		return _currentLHandId;
+	}
+	
+	/**
+	 * @return the Identifier of the item in the right hand of this L2NpcInstance contained in the L2NpcTemplate.
+	 */
+	public int getRightHandItem() {
+		return _currentRHandId;
+	}
+	
+	public int getEnchantEffect() {
+		return _currentEnchant;
+	}
+	
+	/**
+	 * @return the busy status of this L2NpcInstance.
+	 */
+	public final boolean isBusy() {
+		return _isBusy;
+	}
+	
+	/**
+	 * @param isBusy the busy status of this L2Npc
+	 */
+	public void setBusy(boolean isBusy) {
+		_isBusy = isBusy;
+	}
+	
+	/**
+	 * @return the busy message of this L2NpcInstance.
+	 */
+	public final String getBusyMessage() {
+		return _busyMessage;
+	}
+	
+	/**
+	 * @param message the busy message of this L2Npc.
+	 */
+	public void setBusyMessage(String message) {
+		_busyMessage = message;
+	}
+	
+	/**
+	 * @return true if this L2Npc instance can be warehouse manager.
+	 */
+	public boolean isWarehouse() {
+		return false;
+	}
+	
+	public boolean canTarget(L2PcInstance player) {
+		if (player.isOutOfControl()) {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		if (player.isLockedTarget() && (player.getLockedTarget() != this)) {
+			player.sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		// TODO: More checks...
+		
+		return true;
+	}
+	
+	public boolean canInteract(L2PcInstance player) {
+		if (player.isCastingNow() || player.isCastingSimultaneouslyNow()) {
+			return false;
+		} else if (player.isDead() || player.isFakeDeath()) {
+			return false;
+		} else if (player.isSitting()) {
+			return false;
+		} else if (player.getPrivateStoreType() != PrivateStoreType.NONE) {
+			return false;
+		} else if (!isInsideRadius(player, INTERACTION_DISTANCE, true, false)) {
+			return false;
+		} else if ((player.getInstanceId() != getInstanceId()) && (player.getInstanceId() != -1)) {
+			return false;
+		} else if (isBusy()) {
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * @return the L2Castle this L2NpcInstance belongs to.
+	 */
+	public final Castle getCastle() {
+		// Get castle this NPC belongs to (excluding L2Attackable)
+		if (_castleIndex < 0) {
+			L2TownZone town = TownManager.getTown(getX(), getY(), getZ());
+			
+			if (town != null) {
+				_castleIndex = CastleManager.getInstance().getCastleIndex(town.getTaxById());
+			}
+			
+			if (_castleIndex < 0) {
+				_castleIndex = CastleManager.getInstance().findNearestCastleIndex(this);
+			} else {
+				_isInTown = true; // Npc was spawned in town
+			}
+		}
+		
+		if (_castleIndex < 0) {
+			return null;
+		}
+		
+		return CastleManager.getInstance().getCastles().get(_castleIndex);
+	}
+	
+	/**
+	 * Verify if the given player is this NPC's lord.
+	 * @param player the player to check
+	 * @return {@code true} if the player is clan leader and owner of a castle of fort that this NPC belongs to, {@code false} otherwise
+	 */
+	public boolean isMyLord(L2PcInstance player) {
+		if (player.isClanLeader()) {
+			final int castleId = getCastle() != null ? getCastle().getResidenceId() : -1;
+			final int fortId = getFort() != null ? getFort().getResidenceId() : -1;
+			return (player.getClan().getCastleId() == castleId) || (player.getClan().getFortId() == fortId);
+		}
+		return false;
+	}
+	
+	/**
+	 * Verify if the give dominion Id is this NPC's dominion.
+	 * @param dominionId the dominion Id to check
+	 * @return {@code true} if the dominion Id matches the castle/fort Id, {@code false} otherwise
+	 */
+	public boolean isDominionOfLord(int dominionId) {
+		final int castleId = getCastle() != null ? getCastle().getResidenceId() : -1;
+		final int fortId = getFort() != null ? getFort().getResidenceId() : -1;
+		return (dominionId == castleId) || (dominionId == fortId);
+	}
+	
+	public final SiegableHall getConquerableHall() {
+		return ClanHallSiegeManager.getInstance().getNearbyClanHall(getX(), getY(), 10000);
+	}
+	
+	/**
+	 * Return closest castle in defined distance
+	 * @param maxDistance long
+	 * @return Castle
+	 */
+	public final Castle getCastle(long maxDistance) {
+		int index = CastleManager.getInstance().findNearestCastleIndex(this, maxDistance);
+		
+		if (index < 0) {
+			return null;
+		}
+		
+		return CastleManager.getInstance().getCastles().get(index);
+	}
+	
+	/**
+	 * @return the L2Fort this L2NpcInstance belongs to.
+	 */
+	public final Fort getFort() {
+		// Get Fort this NPC belongs to (excluding L2Attackable)
+		if (_fortIndex < 0) {
+			Fort fort = FortManager.getInstance().getFort(getX(), getY(), getZ());
+			if (fort != null) {
+				_fortIndex = FortManager.getInstance().getFortIndex(fort.getResidenceId());
+			}
+			
+			if (_fortIndex < 0) {
+				_fortIndex = FortManager.getInstance().findNearestFortIndex(this);
+			}
+		}
+		
+		if (_fortIndex < 0) {
+			return null;
+		}
+		
+		return FortManager.getInstance().getForts().get(_fortIndex);
+	}
+	
+	/**
+	 * Return closest Fort in defined distance
+	 * @param maxDistance long
+	 * @return Fort
+	 */
+	public final Fort getFort(long maxDistance) {
+		int index = FortManager.getInstance().findNearestFortIndex(this, maxDistance);
+		
+		if (index < 0) {
+			return null;
+		}
+		
+		return FortManager.getInstance().getForts().get(index);
+	}
+	
+	public final boolean getIsInTown() {
+		if (_castleIndex < 0) {
+			getCastle();
+		}
+		
+		return _isInTown;
+	}
+	
+	/**
+	 * Open a quest or chat window on client with the text of the L2NpcInstance in function of the command.<br>
+	 * <B><U> Example of use </U> :</B>
+	 * <ul>
+	 * <li>Client packet : RequestBypassToServer</li>
+	 * </ul>
+	 * @param player
+	 * @param command The command string received from client
+	 */
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		// if (canInteract(player))
+		{
+			if (isBusy() && (getBusyMessage().length() > 0)) {
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+				
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), "data/html/npcbusy.htm");
+				html.replace("%busymessage%", getBusyMessage());
+				html.replace("%npcname%", getName());
+				html.replace("%playername%", player.getName());
+				player.sendPacket(html);
+			} else {
+				IBypassHandler handler = BypassHandler.getInstance().getHandler(command);
+				if (handler != null) {
+					handler.useBypass(command, player, this);
+				} else {
+					LOG.info("Unknown NPC bypass: \"{}\" NpcId: {}", command, getId());
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Return null (regular NPCs don't have weapons instances).
+	 */
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return null;
+	}
+	
+	/**
+	 * Return the weapon item equipped in the right hand of the L2NpcInstance or null.
+	 */
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		// Get the weapon identifier equipped in the right hand of the L2NpcInstance
+		int weaponId = getTemplate().getRHandId();
+		
+		if (weaponId < 1) {
+			return null;
+		}
+		
+		// Get the weapon item equipped in the right hand of the L2NpcInstance
+		L2Item item = ItemTable.getInstance().getTemplate(getTemplate().getRHandId());
+		
+		if (!(item instanceof L2Weapon)) {
+			return null;
+		}
+		
+		return (L2Weapon) item;
+	}
+	
+	/**
+	 * Return null (regular NPCs don't have weapons instances).
+	 */
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	/**
+	 * Return the weapon item equipped in the left hand of the L2NpcInstance or null.
+	 */
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		// Get the weapon identifier equipped in the right hand of the L2NpcInstance
+		int weaponId = getTemplate().getLHandId();
+		if (weaponId < 1) {
+			return null;
+		}
+		
+		// Get the weapon item equipped in the right hand of the L2NpcInstance
+		L2Item item = ItemTable.getInstance().getTemplate(getTemplate().getLHandId());
+		
+		if (!(item instanceof L2Weapon)) {
+			return null;
+		}
+		
+		return (L2Weapon) item;
+	}
+	
+	/**
+	 * Send a Server->Client packet NpcHtmlMessage to the L2PcInstance in order to display the message of the L2NpcInstance.
+	 * @param player The L2PcInstance who talks with the L2NpcInstance
+	 * @param content The text of the L2NpcMessage
+	 */
+	public void insertObjectIdAndShowChatWindow(L2PcInstance player, String content) {
+		// Send a Server->Client packet NpcHtmlMessage to the L2PcInstance in order to display the message of the L2NpcInstance
+		content = content.replaceAll("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(new NpcHtmlMessage(getObjectId(), content));
+	}
+	
+	/**
+	 * <B><U Format of the pathfile</U>:</B>
+	 * <ul>
+	 * <li>if the file exists on the server (page number = 0) : <B>data/html/default/12006.htm</B> (npcId-page number)</li>
+	 * <li>if the file exists on the server (page number > 0) : <B>data/html/default/12006-1.htm</B> (npcId-page number)</li>
+	 * <li>if the file doesn't exist on the server : <B>data/html/npcdefault.htm</B> (message : "I have nothing to say to you")</li>
+	 * </ul>
+	 * @param npcId The Identifier of the L2NpcInstance whose text must be display
+	 * @param val The number of the page to display
+	 * @return the pathfile of the selected HTML file in function of the npcId and of the page number.
+	 */
+	public String getHtmlPath(int npcId, int val) {
+		String pom = "";
+		
+		if (val == 0) {
+			pom = "" + npcId;
+		} else {
+			pom = npcId + "-" + val;
+		}
+		
+		String temp = "data/html/default/" + pom + ".htm";
+		
+		if (!general().lazyCache()) {
+			// If not running lazy cache the file must be in the cache or it doesn't exist
+			if (HtmCache.getInstance().contains(temp)) {
+				return temp;
+			}
+		} else {
+			if (HtmCache.getInstance().isLoadable(temp)) {
+				return temp;
+			}
+		}
+		
+		// If the file is not found, the standard message "I have nothing to say to you" is returned
+		return "data/html/npcdefault.htm";
+	}
+	
+	public void showChatWindow(L2PcInstance player) {
+		showChatWindow(player, 0);
+	}
+	
+	/**
+	 * Returns true if html exists
+	 * @param player
+	 * @param type
+	 * @return boolean
+	 */
+	private boolean showPkDenyChatWindow(L2PcInstance player, String type) {
+		final String html = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/" + type + "/" + getId() + "-pk.htm");
+		if (html != null) {
+			insertObjectIdAndShowChatWindow(player, html);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Open a chat window on client with the text of the L2NpcInstance.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Get the text of the selected HTML file in function of the npcId and of the page number</li>
+	 * <li>Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance</li>
+	 * <li>Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet</li>
+	 * </ul>
+	 * @param player The L2PcInstance that talk with the L2NpcInstance
+	 * @param val The number of the page of the L2NpcInstance to display
+	 */
+	public void showChatWindow(L2PcInstance player, int val) {
+		if (!isTalking()) {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isCursedWeaponEquipped() && (!(player.getTarget() instanceof L2ClanHallManagerInstance) || !(player.getTarget() instanceof L2DoormenInstance))) {
+			player.setTarget(player);
+			return;
+		}
+		
+		if (player.getKarma() > 0) {
+			if (!character().karmaPlayerCanShop() && (this instanceof L2MerchantInstance)) {
+				if (showPkDenyChatWindow(player, "merchant")) {
+					return;
+				}
+			} else if (!character().karmaPlayerCanUseGK() && (this instanceof L2TeleporterInstance)) {
+				if (showPkDenyChatWindow(player, "teleporter")) {
+					return;
+				}
+			} else if (!character().karmaPlayerCanUseWareHouse() && (this instanceof L2WarehouseInstance)) {
+				if (showPkDenyChatWindow(player, "warehouse")) {
+					return;
+				}
+			}
+		}
+		
+		if (getTemplate().isType("L2Auctioneer") && (val == 0)) {
+			return;
+		}
+		
+		int npcId = getTemplate().getId();
+		
+		/* For use with Seven Signs implementation */
+		String filename = SevenSigns.SEVEN_SIGNS_HTML_PATH;
+		
+		switch (npcId) {
+			case 31127: //
+			case 31128: //
+			case 31129: // Dawn Festival Guides
+			case 31130: //
+			case 31131: //
+				filename += "festival/dawn_guide.htm";
+				break;
+			case 31137: //
+			case 31138: //
+			case 31139: // Dusk Festival Guides
+			case 31140: //
+			case 31141: //
+				filename += "festival/dusk_guide.htm";
+				break;
+			case 31132:
+			case 31133:
+			case 31134:
+			case 31135:
+			case 31136: // Festival Witches
+			case 31142:
+			case 31143:
+			case 31144:
+			case 31145:
+			case 31146:
+				filename += "festival/festival_witch.htm";
+				break;
+			case 31688:
+				if (player.isNoble()) {
+					filename = Olympiad.OLYMPIAD_HTML_PATH + "noble_main.htm";
+				} else {
+					filename = getHtmlPath(npcId, val);
+				}
+				break;
+			case 31690:
+			case 31769:
+			case 31770:
+			case 31771:
+			case 31772:
+				if (player.isHero() || player.isNoble()) {
+					filename = Olympiad.OLYMPIAD_HTML_PATH + "hero_main.htm";
+				} else {
+					filename = getHtmlPath(npcId, val);
+				}
+				break;
+			case 36402:
+				if (player.getOlympiadBuffCount() > 0) {
+					filename = (player.getOlympiadBuffCount() == olympiad().getMaxBuffs() ? Olympiad.OLYMPIAD_HTML_PATH + "olympiad_buffs.htm" : Olympiad.OLYMPIAD_HTML_PATH + "olympiad_5buffs.htm");
+				} else {
+					filename = Olympiad.OLYMPIAD_HTML_PATH + "olympiad_nobuffs.htm";
+				}
+				break;
+			case 30298: // Blacksmith Pinter
+				if (player.isAcademyMember()) {
+					filename = getHtmlPath(npcId, 1);
+				} else {
+					filename = getHtmlPath(npcId, val);
+				}
+				break;
+			default:
+				if (((npcId >= 31093) && (npcId <= 31094)) || ((npcId >= 31172) && (npcId <= 31201)) || ((npcId >= 31239) && (npcId <= 31254))) {
+					return;
+				}
+				// Get the text of the selected HTML file in function of the npcId and of the page number
+				filename = getHtmlPath(npcId, val);
+				break;
+		}
+		
+		// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename);
+		
+		if (this instanceof L2MerchantInstance) {
+			if (npc().getPetRentNPCs().contains(npcId)) {
+				html.replace("_Quest", "_RentPet\">Rent Pet</a><br><a action=\"bypass -h npc_%objectId%_Quest");
+			}
+		}
+		
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		html.replace("%festivalMins%", SevenSignsFestival.getInstance().getTimeToNextFestivalStr());
+		player.sendPacket(html);
+		
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	/**
+	 * Open a chat window on client with the text specified by the given file name and path, relative to the datapack root.
+	 * @param player The L2PcInstance that talk with the L2NpcInstance
+	 * @param filename The filename that contains the text to send
+	 */
+	public void showChatWindow(L2PcInstance player, String filename) {
+		// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename);
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(html);
+		
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	/**
+	 * @return the Exp Reward of this L2Npc (modified by RATE_XP).
+	 */
+	public long getExpReward() {
+		return (long) (getLevel() * getLevel() * getTemplate().getExpRate() * rates().getRateXp());
+	}
+	
+	/**
+	 * @return the SP Reward of this L2Npc (modified by RATE_SP).
+	 */
+	public int getSpReward() {
+		return (int) (getTemplate().getSP() * rates().getRateSp());
+	}
+	
+	/**
+	 * Kill the L2NpcInstance (the corpse disappeared after 7 seconds).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Create a DecayTask to remove the corpse of the L2NpcInstance after 7 seconds</li>
+	 * <li>Set target to null and cancel Attack or Cast</li>
+	 * <li>Stop movement</li>
+	 * <li>Stop HP/MP/CP Regeneration task</li>
+	 * <li>Stop all active skills effects in progress on the L2Character</li>
+	 * <li>Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform</li>
+	 * <li>Notify L2Character AI</li>
+	 * </ul>
+	 * @param killer The L2Character who killed it
+	 */
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		// normally this wouldn't really be needed, but for those few exceptions,
+		// we do need to reset the weapons back to the initial template weapon.
+		_currentLHandId = getTemplate().getLHandId();
+		_currentRHandId = getTemplate().getRHandId();
+		_currentCollisionHeight = getTemplate().getfCollisionHeight();
+		_currentCollisionRadius = getTemplate().getfCollisionRadius();
+		
+		final L2Weapon weapon = (killer != null) ? killer.getActiveWeaponItem() : null;
+		_killingBlowWeaponId = (weapon != null) ? weapon.getId() : 0;
+		
+		DecayTaskManager.getInstance().add(this);
+		return true;
+	}
+	
+	/**
+	 * Set the spawn of the L2NpcInstance.
+	 * @param spawn The L2Spawn that manage the L2NpcInstance
+	 */
+	public void setSpawn(L2Spawn spawn) {
+		_spawn = spawn;
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		
+		// Recharge shots
+		_soulshotamount = getTemplate().getSoulShot();
+		_spiritshotamount = getTemplate().getSpiritShot();
+		_killingBlowWeaponId = 0;
+		
+		if (isTeleporting()) {
+			EventDispatcher.getInstance().notifyEventAsync(new NpcTeleport(this), this);
+		} else {
+			WalkingManager.getInstance().onSpawn(this);
+			EventDispatcher.getInstance().notifyEventAsync(new NpcSpawn(this), this);
+		}
+	}
+	
+	/**
+	 * Remove the L2NpcInstance from the world and update its spawn object (for a complete removal use the deleteMe method).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Remove the L2NpcInstance from the world when the decay task is launched</li>
+	 * <li>Decrease its spawn counter</li>
+	 * <li>Manage Siege task (killFlag, killCT)</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T REMOVE the object from _allObjects of L2World </B></FONT><BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND Server->Client packets to players</B></FONT>
+	 */
+	@Override
+	public void onDecay() {
+		if (isDecayed()) {
+			return;
+		}
+		setDecayed(true);
+		
+		// Remove the L2NpcInstance from the world when the decay task is launched
+		super.onDecay();
+		
+		// Decrease its spawn counter
+		if (_spawn != null) {
+			_spawn.decreaseCount(this);
+		}
+		
+		// Notify Walking Manager
+		WalkingManager.getInstance().onDeath(this);
+		
+		// Removes itself from the summoned list.
+		final L2Character summoner = getSummoner();
+		if ((summoner != null) && summoner.isNpc()) {
+			((L2Npc) summoner).removeSummonedNpc(getObjectId());
+		}
+	}
+	
+	/**
+	 * Remove PROPERLY the L2NpcInstance from the world.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Remove the L2NpcInstance from the world and update its spawn object</li>
+	 * <li>Remove all L2Object from _knownObjects and _knownPlayer of the L2NpcInstance then cancel Attack or Cast and notify AI</li>
+	 * <li>Remove L2Object object from _allObjects of L2World</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B><U>Caution</U>: This method DOESN'T SEND Server->Client packets to players</B></FONT><br>
+	 * UnAfraid: TODO: Add Listener here
+	 */
+	@Override
+	public boolean deleteMe() {
+		try {
+			onDecay();
+		} catch (Exception e) {
+			LOG.error("Failed decayMe(). {}", e);
+		}
+		
+		if (isChannelized()) {
+			getSkillChannelized().abortChannelization();
+		}
+		
+		final L2WorldRegion oldRegion = getWorldRegion();
+		if (oldRegion != null) {
+			oldRegion.removeFromZones(this);
+		}
+		
+		// Remove all L2Object from _knownObjects and _knownPlayer of the L2Character then cancel Attack or Cast and notify AI
+		try {
+			getKnownList().removeAllKnownObjects();
+		} catch (Exception e) {
+			LOG.error("Failed removing cleaning knownlist. {}", e);
+		}
+		
+		// Remove L2Object object from _allObjects of L2World
+		L2World.getInstance().removeObject(this);
+		
+		return super.deleteMe();
+	}
+	
+	/**
+	 * @return the L2Spawn object that manage this L2NpcInstance.
+	 */
+	public L2Spawn getSpawn() {
+		return _spawn;
+	}
+	
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + ":" + getName() + "(" + getId() + ")" + "[" + getObjectId() + "]";
+	}
+	
+	public boolean isDecayed() {
+		return _isDecayed;
+	}
+	
+	public void setDecayed(boolean decayed) {
+		_isDecayed = decayed;
+	}
+	
+	public void endDecayTask() {
+		if (!isDecayed()) {
+			DecayTaskManager.getInstance().cancel(this);
+			onDecay();
+		}
+	}
+	
+	public boolean isMob() // rather delete this check
+	{
+		return false; // This means we use MAX_NPC_ANIMATION instead of MAX_MONSTER_ANIMATION
+	}
+	
+	// Two functions to change the appearance of the equipped weapons on the NPC
+	// This is only useful for a few NPCs and is most likely going to be called from AI
+	public void setLHandId(int newWeaponId) {
+		_currentLHandId = newWeaponId;
+		updateAbnormalEffect();
+	}
+	
+	public void setRHandId(int newWeaponId) {
+		_currentRHandId = newWeaponId;
+		updateAbnormalEffect();
+	}
+	
+	public void setLRHandId(int newLWeaponId, int newRWeaponId) {
+		_currentRHandId = newRWeaponId;
+		_currentLHandId = newLWeaponId;
+		updateAbnormalEffect();
+	}
+	
+	public void setEnchant(int newEnchantValue) {
+		_currentEnchant = newEnchantValue;
+		updateAbnormalEffect();
+	}
+	
+	public boolean isShowName() {
+		return getTemplate().isShowName();
+	}
+	
+	@Override
+	public boolean isTargetable() {
+		return getTemplate().isTargetable();
+	}
+	
+	public void setCollisionHeight(double height) {
+		_currentCollisionHeight = height;
+	}
+	
+	public void setCollisionRadius(double radius) {
+		_currentCollisionRadius = radius;
+	}
+	
+	public double getCollisionHeight() {
+		return _currentCollisionHeight;
+	}
+	
+	public double getCollisionRadius() {
+		return _currentCollisionRadius;
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		if (isVisibleFor(activeChar)) {
+			if (general().checkKnownList() && activeChar.isGM()) {
+				activeChar.sendMessage("Added NPC: " + getName());
+			}
+			
+			if (getRunSpeed() == 0) {
+				activeChar.sendPacket(new ServerObjectInfo(this, activeChar));
+			} else {
+				activeChar.sendPacket(new AbstractNpcInfo.NpcInfo(this, activeChar));
+			}
+		}
+	}
+	
+	public L2Npc scheduleDespawn(long delay) {
+		ThreadPoolManager.getInstance().scheduleGeneral(() -> {
+			if (!isDecayed()) {
+				deleteMe();
+			}
+		}, delay);
+		return this;
+	}
+	
+	@Override
+	protected final void notifyQuestEventSkillFinished(Skill skill, L2Object target) {
+		if ((target != null) && target.isPlayable()) {
+			EventDispatcher.getInstance().notifyEventAsync(new NpcSkillFinished(this, target.getActingPlayer(), skill), this);
+		}
+	}
+	
+	@Override
+	public boolean isMovementDisabled() {
+		return super.isMovementDisabled() || !canMove() || getAiType().equals(AIType.CORPSE);
+	}
+	
+	public AIType getAiType() {
+		return getTemplate().getAIType();
+	}
+	
+	public void setDisplayEffect(int val) {
+		if (val != _displayEffect) {
+			_displayEffect = val;
+			broadcastPacket(new ExChangeNpcState(getObjectId(), val));
+		}
+	}
+	
+	public int getDisplayEffect() {
+		return _displayEffect;
+	}
+	
+	public int getColorEffect() {
+		return 0;
+	}
+	
+	@Override
+	public boolean isNpc() {
+		return true;
+	}
+	
+	@Override
+	public void setTeam(Team team) {
+		super.setTeam(team);
+		broadcastInfo();
+	}
+	
+	/**
+	 * @return {@code true} if this L2Npc is registered in WalkingManager
+	 */
+	@Override
+	public boolean isWalker() {
+		return WalkingManager.getInstance().isRegistered(this);
+	}
+	
+	@Override
+	public boolean isChargedShot(ShotType type) {
+		return (_shotsMask & type.getMask()) == type.getMask();
+	}
+	
+	@Override
+	public void setChargedShot(ShotType type, boolean charged) {
+		if (charged) {
+			_shotsMask |= type.getMask();
+		} else {
+			_shotsMask &= ~type.getMask();
+		}
+	}
+	
+	@Override
+	public void rechargeShots(boolean physical, boolean magic) {
+		if ((_soulshotamount > 0) || (_spiritshotamount > 0)) {
+			if (physical) {
+				if (_soulshotamount == 0) {
+					return;
+				} else if (Rnd.get(100) > getSoulShotChance()) {
+					return;
+				}
+				_soulshotamount--;
+				Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillUse(this, this, 2154, 1, 0, 0), 600);
+				setChargedShot(ShotType.SOULSHOTS, true);
+			}
+			if (magic) {
+				if (_spiritshotamount == 0) {
+					return;
+				} else if (Rnd.get(100) > getSpiritShotChance()) {
+					return;
+				}
+				_spiritshotamount--;
+				Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillUse(this, this, 2061, 1, 0, 0), 600);
+				setChargedShot(ShotType.SPIRITSHOTS, true);
+			}
+		}
+	}
+	
+	/**
+	 * Short wrapper for backward compatibility
+	 * @return stored script value
+	 */
+	public int getScriptValue() {
+		return getVariables().getInt("SCRIPT_VAL");
+	}
+	
+	/**
+	 * Short wrapper for backward compatibility. Stores script value
+	 * @param val value to store
+	 */
+	public void setScriptValue(int val) {
+		getVariables().set("SCRIPT_VAL", val);
+	}
+	
+	/**
+	 * Short wrapper for backward compatibility.
+	 * @param val value to store
+	 * @return {@code true} if stored script value equals given value, {@code false} otherwise
+	 */
+	public boolean isScriptValue(int val) {
+		return getVariables().getInt("SCRIPT_VAL") == val;
+	}
+	
+	/**
+	 * @param paramName the parameter name to check
+	 * @return given AI parameter value
+	 */
+	public int getAIValue(final String paramName) {
+		if ((getSpawn() == null) || (getSpawn().getName() == null)) {
+			return -1;
+		}
+		return NpcPersonalAIData.getInstance().getAIValue(getSpawn().getName(), paramName);
+	}
+	
+	/**
+	 * @param paramName the parameter name to check
+	 * @return {@code true} if given parameter is set for NPC, {@code false} otherwise
+	 */
+	public boolean hasAIValue(final String paramName) {
+		return (getSpawn() != null) && (getSpawn().getName() != null) && NpcPersonalAIData.getInstance().hasAIValue(getSpawn().getName(), paramName);
+	}
+	
+	/**
+	 * @param npc NPC to check
+	 * @return {@code true} if both given NPC and this NPC is in the same spawn group, {@code false} otherwise
+	 */
+	public boolean isInMySpawnGroup(L2Npc npc) {
+		return ((getSpawn() != null) && (npc.getSpawn() != null) && (getSpawn().getName() != null) && (getSpawn().getName().equals(npc.getSpawn().getName())));
+	}
+	
+	/**
+	 * @return {@code true} if NPC currently located in own spawn point, {@code false} otherwise
+	 */
+	public boolean staysInSpawnLoc() {
+		return ((getSpawn() != null) && (getSpawn().getX(this) == getX()) && (getSpawn().getY(this) == getY()));
+	}
+	
+	/**
+	 * @return {@code true} if {@link NpcVariables} instance is attached to current player's scripts, {@code false} otherwise.
+	 */
+	public boolean hasVariables() {
+		return getScript(NpcVariables.class) != null;
+	}
+	
+	/**
+	 * @return {@link NpcVariables} instance containing parameters regarding NPC.
+	 */
+	public NpcVariables getVariables() {
+		final NpcVariables vars = getScript(NpcVariables.class);
+		return vars != null ? vars : addScript(new NpcVariables());
+	}
+	
+	/**
+	 * Broadcasts a script event to all NPCs within a specified radius of the current object.
+	 * @param eventName the name of the event to broadcast
+	 * @param radius the radius within which to search for NPCs
+	 */
+	public void broadcastScriptEvent(String eventName, int radius) {
+		broadcastScriptEvent(eventName, radius, null, 0, 0);
+	}
+	
+	/**
+	 * Broadcasts a script event to all NPCs within a specified radius of the current object.
+	 * @param eventName the name of the event to broadcast
+	 * @param radius the radius within which to search for NPCs
+	 * @param reference an optional reference object to provide additional context for the event
+	 */
+	public void broadcastScriptEvent(String eventName, int radius, L2Object reference) {
+		broadcastScriptEvent(eventName, radius, reference, 0, 0);
+	}
+	
+	/**
+	 * Broadcasts a script event to all NPCs within a specified radius of the current object.
+	 * @param eventName the name of the event to broadcast
+	 * @param radius the radius within which to search for NPCs
+	 * @param arg1 an integer argument associated with the event
+	 */
+	public void broadcastScriptEvent(String eventName, int radius, int arg1) {
+		broadcastScriptEvent(eventName, radius, null, arg1, 0);
+	}
+	
+	/**
+	 * Broadcasts a script event to all NPCs within a specified radius of the current object.<br>
+	 * NPCs that are within the radius and have registered a listener for the {@code NPC_EVENT_RECEIVED} event will receive the event asynchronously.<br>
+	 * This method also supports passing a reference object and additional arguments.
+	 * @param eventName the name of the event to broadcast
+	 * @param radius the radius within which to search for NPCs
+	 * @param reference an optional reference object to provide additional context for the event
+	 * @param arg1 an integer argument associated with the event
+	 * @param arg2 an integer argument associated with the event
+	 */
+	public void broadcastScriptEvent(String eventName, int radius, L2Object reference, int arg1, int arg2) {
+		for (var obj : L2World.getInstance().getVisibleObjects(this, radius)) {
+			if (obj instanceof L2Npc npc && npc.hasListener(NPC_EVENT_RECEIVED)) {
+				EventDispatcher.getInstance().notifyEventAsync(new NpcEventReceived(eventName, this, npc, reference, arg1, arg2), npc);
+			}
+		}
+	}
+	
+	/**
+	 * Sends a script event to a specific receiver asynchronously.<br>
+	 * This method triggers the {@code NPC_EVENT_RECEIVED} event for the specified receiver.
+	 * @param eventName the name of the event to send
+	 * @param receiver the {@link L2Object} that will receive the event
+	 * @param reference an optional reference object to provide additional context for the event
+	 */
+	public void sendScriptEvent(String eventName, L2Object receiver, L2Object reference) {
+		EventDispatcher.getInstance().notifyEventAsync(new NpcEventReceived(eventName, this, (L2Npc) receiver, reference, 0, 0), receiver);
+	}
+	
+	/**
+	 * Gets point in range between radiusMin and radiusMax from this NPC
+	 * @param radiusMin miminal range from NPC (not closer than)
+	 * @param radiusMax maximal range from NPC (not further than)
+	 * @return Location in given range from this NPC
+	 */
+	public Location getPointInRange(int radiusMin, int radiusMax) {
+		if ((radiusMax == 0) || (radiusMax < radiusMin)) {
+			return new Location(getX(), getY(), getZ());
+		}
+		
+		final int radius = Rnd.get(radiusMin, radiusMax);
+		final double angle = Rnd.nextDouble() * 2 * Math.PI;
+		
+		return new Location((int) (getX() + (radius * Math.cos(angle))), (int) (getY() + (radius * Math.sin(angle))), getZ());
+	}
+	
+	/**
+	 * Drops an item.
+	 * @param player the last attacker or main damage dealer
+	 * @param itemId the item ID
+	 * @param itemCount the item count
+	 * @return the dropped item
+	 */
+	public L2ItemInstance dropItem(L2PcInstance player, int itemId, long itemCount) {
+		L2ItemInstance item = null;
+		for (int i = 0; i < itemCount; i++) {
+			// Randomize drop position.
+			final int newX = (getX() + Rnd.get((RANDOM_ITEM_DROP_LIMIT * 2) + 1)) - RANDOM_ITEM_DROP_LIMIT;
+			final int newY = (getY() + Rnd.get((RANDOM_ITEM_DROP_LIMIT * 2) + 1)) - RANDOM_ITEM_DROP_LIMIT;
+			final int newZ = getZ() + 20;
+			
+			if (ItemTable.getInstance().getTemplate(itemId) == null) {
+				LOG.error("Item doesn't exist so cannot be dropped. Item ID: {} Quest: {}", itemId, getName());
+				return null;
+			}
+			
+			item = ItemTable.getInstance().createItem("Loot", itemId, itemCount, player, this);
+			if (item == null) {
+				return null;
+			}
+			
+			if (player != null) {
+				item.getDropProtection().protect(player);
+			}
+			
+			item.dropMe(this, newX, newY, newZ);
+			
+			// Add drop to auto destroy item task.
+			if (!general().getProtectedItems().contains(itemId)) {
+				if (((general().getAutoDestroyDroppedItemAfter() > 0) && !item.getItem().hasExImmediateEffect()) || ((general().getAutoDestroyHerbTime() > 0) && item.getItem().hasExImmediateEffect())) {
+					ItemsAutoDestroy.getInstance().addItem(item);
+				}
+			}
+			item.setProtected(false);
+			
+			// If stackable, end loop as entire count is included in 1 instance of item.
+			if (item.isStackable() || !general().multipleItemDrop()) {
+				break;
+			}
+		}
+		return item;
+	}
+	
+	/**
+	 * Method overload for {@link L2Attackable#dropItem(L2PcInstance, int, long)}
+	 * @param player the last attacker or main damage dealer
+	 * @param item the item holder
+	 * @return the dropped item
+	 */
+	public L2ItemInstance dropItem(L2PcInstance player, ItemHolder item) {
+		return dropItem(player, item.getId(), item.getCount());
+	}
+	
+	@Override
+	public final String getName() {
+		return getTemplate().getName();
+	}
+	
+	@Override
+	public boolean isVisibleFor(L2Character character) {
+		if (hasListener(EventType.NPC_CAN_BE_SEEN)) {
+			final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new NpcCanBeSeen(this, character), this, TerminateReturn.class);
+			if (term != null) {
+				return term.terminate();
+			}
+		}
+		return super.isVisibleFor(character);
+	}
+	
+	/**
+	 * Sets if the players can talk with this npc or not
+	 * @param val {@code true} if the players can talk, {@code false} otherwise
+	 */
+	public void setTalking(boolean val) {
+		_isTalking = val;
+	}
+	
+	/**
+	 * Checks if the players can talk to this npc.
+	 * @return {@code true} if the players can talk, {@code false} otherwise.
+	 */
+	public boolean isTalking() {
+		return _isTalking;
+	}
+	
+	/**
+	 * Sets the weapon id with which this npc was killed.
+	 * @param weaponId
+	 */
+	public void setKillingBlowWeapon(int weaponId) {
+		_killingBlowWeaponId = weaponId;
+	}
+	
+	/**
+	 * @return the id of the weapon with which player killed this npc.
+	 */
+	public int getKillingBlowWeapon() {
+		return _killingBlowWeaponId;
+	}
+	
+	/**
+	 * Adds a summoned NPC.
+	 * @param npc the summoned NPC
+	 */
+	public final void addSummonedNpc(L2Npc npc) {
+		if (_summonedNpcs == null) {
+			synchronized (this) {
+				if (_summonedNpcs == null) {
+					_summonedNpcs = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		
+		_summonedNpcs.put(npc.getObjectId(), npc);
+		
+		npc.setSummoner(this);
+	}
+	
+	/**
+	 * Removes a summoned NPC by object ID.
+	 * @param objectId the summoned NPC object ID
+	 */
+	public final void removeSummonedNpc(int objectId) {
+		if (_summonedNpcs != null) {
+			_summonedNpcs.remove(objectId);
+		}
+	}
+	
+	/**
+	 * Gets the summoned NPCs.
+	 * @return the summoned NPCs
+	 */
+	public final Collection<L2Npc> getSummonedNpcs() {
+		return _summonedNpcs != null ? _summonedNpcs.values() : Collections.<L2Npc> emptyList();
+	}
+	
+	/**
+	 * Gets the summoned NPC by object ID.
+	 * @param objectId the summoned NPC object ID
+	 * @return the summoned NPC
+	 */
+	public final L2Npc getSummonedNpc(int objectId) {
+		if (_summonedNpcs != null) {
+			return _summonedNpcs.get(objectId);
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the summoned NPC count.
+	 * @return the summoned NPC count
+	 */
+	public final int getSummonedNpcCount() {
+		return _summonedNpcs != null ? _summonedNpcs.size() : 0;
+	}
+	
+	/**
+	 * Resets the summoned NPCs list.
+	 */
+	public final void resetSummonedNpcs() {
+		if (_summonedNpcs != null) {
+			_summonedNpcs.clear();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Playable.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Playable.java
new file mode 100644
index 00000000..ef6a7240
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Playable.java
@@ -0,0 +1,346 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.PlayableKnownList;
+import com.l2jserver.gameserver.model.actor.stat.PlayableStat;
+import com.l2jserver.gameserver.model.actor.status.PlayableStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.effects.EffectFlag;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureKill;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
+
+/**
+ * This class represents all Playable characters in the world.<br>
+ * L2Playable:
+ * <ul>
+ * <li>L2PcInstance</li>
+ * <li>L2Summon</li>
+ * </ul>
+ */
+public abstract class L2Playable extends L2Character {
+	private L2Character _lockedTarget = null;
+	private L2PcInstance transferDmgTo = null;
+	
+	public L2Playable(int objectId, L2CharTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2Playable);
+		setIsInvul(false);
+	}
+	
+	@Override
+	public PlayableKnownList getKnownList() {
+		return (PlayableKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new PlayableKnownList(this));
+	}
+	
+	@Override
+	public PlayableStat getStat() {
+		return (PlayableStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new PlayableStat(this));
+	}
+	
+	@Override
+	public PlayableStatus getStatus() {
+		return (PlayableStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new PlayableStatus(this));
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		final TerminateReturn returnBack = EventDispatcher.getInstance().notifyEvent(new CreatureKill(killer, this), this, TerminateReturn.class);
+		if ((returnBack != null) && returnBack.terminate()) {
+			return false;
+		}
+		
+		// killing is only possible one time
+		synchronized (this) {
+			if (isDead()) {
+				return false;
+			}
+			// now reset currentHp to zero
+			setCurrentHp(0);
+			setIsDead(true);
+		}
+		
+		// Set target to null and cancel Attack or Cast
+		setTarget(null);
+		
+		// Stop movement
+		stopMove(null);
+		
+		// Stop HP/MP/CP Regeneration task
+		getStatus().stopHpMpRegeneration();
+		
+		boolean deleteBuffs = true;
+		
+		if (isNoblesseBlessedAffected()) {
+			stopEffects(L2EffectType.NOBLESSE_BLESSING);
+			deleteBuffs = false;
+		}
+		if (isResurrectSpecialAffected()) {
+			stopEffects(L2EffectType.RESURRECTION_SPECIAL);
+			deleteBuffs = false;
+		}
+		if (isPlayer()) {
+			L2PcInstance activeChar = getActingPlayer();
+			
+			if (activeChar.hasCharmOfCourage()) {
+				if (activeChar.isInSiege()) {
+					getActingPlayer().reviveRequest(getActingPlayer(), null, false, 0, 0);
+				}
+				activeChar.setCharmOfCourage(false);
+				activeChar.sendPacket(new EtcStatusUpdate(activeChar));
+			}
+		}
+		
+		if (deleteBuffs) {
+			stopAllEffectsExceptThoseThatLastThroughDeath();
+		}
+		
+		// Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		broadcastStatusUpdate();
+		
+		if (getWorldRegion() != null) {
+			getWorldRegion().onDeath(this);
+		}
+		
+		// Notify Quest of L2Playable's death
+		L2PcInstance actingPlayer = getActingPlayer();
+		
+		if (!actingPlayer.isNotifyQuestOfDeathEmpty()) {
+			for (var qs : actingPlayer.getNotifyQuestOfDeath()) {
+				qs.getQuest().onDeath((killer == null ? this : killer), this, qs);
+			}
+		}
+		// Notify instance
+		if (getInstanceId() > 0) {
+			final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
+			if (instance != null) {
+				instance.notifyDeath(killer, this);
+			}
+		}
+		
+		if (killer != null) {
+			L2PcInstance player = killer.getActingPlayer();
+			
+			if (player != null) {
+				player.onKillUpdatePvPKarma(this);
+			}
+		}
+		
+		// Notify L2Character AI
+		getAI().notifyEvent(CtrlEvent.EVT_DEAD);
+		updateEffectIcons();
+		return true;
+	}
+	
+	public boolean doesSkillNeedCtrl(L2Character target, Skill skill) {
+		if (target.isPlayable()) {
+			return !checkIfPvP(target) && (target.getActingPlayer().getKarma() == 0);
+		}
+		
+		return false;
+	}
+	
+	public boolean checkIfPvP(L2Character target) {
+		if (target == null) {
+			return false; // Target is null
+		}
+		if (target == this) {
+			return false; // Target is self
+		}
+		if (!target.isPlayable()) {
+			return false; // Target is not a L2Playable
+		}
+		
+		final L2PcInstance player = getActingPlayer();
+		if (player == null) {
+			return false; // Active player is null
+		}
+		
+		final L2PcInstance targetPlayer = target.getActingPlayer();
+		if (targetPlayer == null) {
+			return false; // Target player is null
+		}
+		
+		if (targetPlayer == this) {
+			return false; // Target player is self
+		}
+		
+		// pvp zone is always pvp
+		if (player.isInsideZone(ZoneId.PVP) && targetPlayer.isInsideZone(ZoneId.PVP)) {
+			return true;
+		}
+		
+		if ((player.getKarma() != 0) || (targetPlayer.getKarma() != 0)) {
+			return false; // Active player or target player has karma
+		}
+		
+		if ((player.getClan() != null) && (targetPlayer.getClan() != null) && targetPlayer.getClan().isAtWarWith(player.getClanId()) && player.getClan().isAtWarWith(targetPlayer.getClanId()) && (player.getWantsPeace() == 0) && (targetPlayer.getWantsPeace() == 0) && !player.isAcademyMember()
+			&& !targetPlayer.isAcademyMember()) {
+			return true; // Target player and player has war
+		}
+		
+		return targetPlayer.getPvpFlag() != 0;
+	}
+	
+	/**
+	 * Return True.
+	 */
+	@Override
+	public boolean canBeAttacked() {
+		return true;
+	}
+	
+	// Support for Noblesse Blessing skill, where buffs are retained after resurrect
+	public final boolean isNoblesseBlessedAffected() {
+		return isAffected(EffectFlag.NOBLESS_BLESSING);
+	}
+	
+	/**
+	 * @return {@code true} if char can resurrect by himself, {@code false} otherwise
+	 */
+	public final boolean isResurrectSpecialAffected() {
+		return isAffected(EffectFlag.RESURRECTION_SPECIAL);
+	}
+	
+	/**
+	 * @return {@code true} if the Silent Moving mode is active, {@code false} otherwise
+	 */
+	public boolean isSilentMovingAffected() {
+		return isAffected(EffectFlag.SILENT_MOVE);
+	}
+	
+	/**
+	 * For Newbie Protection Blessing skill, keeps you safe from an attack by a chaotic character >= 10 levels apart from you.
+	 * @return
+	 */
+	public final boolean isProtectionBlessingAffected() {
+		return isAffected(EffectFlag.PROTECTION_BLESSING);
+	}
+	
+	@Override
+	public void updateEffectIcons(boolean partyOnly) {
+		getEffectList().updateEffectIcons(partyOnly);
+	}
+	
+	public boolean isLockedTarget() {
+		return _lockedTarget != null;
+	}
+	
+	public L2Character getLockedTarget() {
+		return _lockedTarget;
+	}
+	
+	public void setLockedTarget(L2Character cha) {
+		_lockedTarget = cha;
+	}
+	
+	public void setTransferDamageTo(L2PcInstance val) {
+		transferDmgTo = val;
+	}
+	
+	public L2PcInstance getTransferringDamageTo() {
+		return transferDmgTo;
+	}
+	
+	/**
+	 * Handle level add.<br>
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * <li>L2PetInstance</li>
+	 * @param levelAdd
+	 */
+	public boolean addLevel(int levelAdd) {
+		return false;
+	}
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * <li>L2PetInstance</li>
+	 */
+	public long getExp() {
+		return 0;
+	}
+	
+	/**
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * <li>L2PetInstance</li>
+	 * @return the SP amount
+	 */
+	public int getSp() {
+		return 0;
+	}
+	
+	/**
+	 * Handle packets send on level change.<br>
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance</li>
+	 * <li>L2PetInstance</li>
+	 * @param levelIncreased
+	 */
+	public void onLevelChange(boolean levelIncreased) {
+		
+	}
+	
+	public abstract void doPickupItem(L2Object object);
+	
+	public abstract int getKarma();
+	
+	public abstract byte getPvpFlag();
+	
+	public abstract boolean useMagic(Skill skill, boolean forceUse, boolean dontMove);
+	
+	public abstract void storeMe();
+	
+	public abstract void storeEffect(boolean storeEffects);
+	
+	public abstract void restoreEffects();
+	
+	@Override
+	public boolean isPlayable() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Summon.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Summon.java
new file mode 100644
index 00000000..0401ec50
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Summon.java
@@ -0,0 +1,1031 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+import static com.l2jserver.gameserver.enums.InstanceType.L2Summon;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.ai.L2SummonAI;
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.AggroInfo;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.SummonKnownList;
+import com.l2jserver.gameserver.model.actor.stat.SummonStat;
+import com.l2jserver.gameserver.model.actor.status.SummonStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSummonSpawn;
+import com.l2jserver.gameserver.model.itemcontainer.PetInventory;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.ActionType;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo.SummonInfo;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowAdd;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowDelete;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyPetWindowUpdate;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.PetDelete;
+import com.l2jserver.gameserver.network.serverpackets.PetInfo;
+import com.l2jserver.gameserver.network.serverpackets.PetItemList;
+import com.l2jserver.gameserver.network.serverpackets.PetStatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.RelationChanged;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.TeleportToLocation;
+import com.l2jserver.gameserver.pathfinding.PathFinding;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+import com.l2jserver.gameserver.util.Util;
+
+public abstract class L2Summon extends L2Playable {
+	private L2PcInstance _owner;
+	private int _attackRange = 36; // Melee range
+	private boolean _follow = true;
+	private boolean _previousFollowStatus = true;
+	protected boolean _restoreSummon = true;
+	private int _shotsMask = 0;
+	
+	// @formatter:off
+	private static final int[] PASSIVE_SUMMONS =
+	{
+		12564, 12621, 14702, 14703, 14704, 14705, 14706, 14707, 14708, 14709, 14710, 14711,
+		14712, 14713, 14714, 14715, 14716, 14717, 14718, 14719, 14720, 14721, 14722, 14723,
+		14724, 14725, 14726, 14727, 14728, 14729, 14730, 14731, 14732, 14733, 14734, 14735, 14736
+	};
+	// @formatter:on
+	
+	/**
+	 * Creates an abstract summon.
+	 * @param template the summon NPC template
+	 * @param owner the owner
+	 */
+	public L2Summon(int objectId, L2NpcTemplate template, L2PcInstance owner) {
+		super(objectId, template);
+		setInstanceType(L2Summon);
+		setInstanceId(owner.getInstanceId());
+		setShowSummonAnimation(true);
+		_owner = owner;
+		getAI();
+		
+		setXYZInvisible(owner.getX() + Rnd.get(-100, 100), owner.getY() + Rnd.get(-100, 100), owner.getZ());
+		
+		// Copy the skills from template.
+		for (Skill skill : template.getSkills().values()) {
+			addSkill(skill);
+		}
+		
+		Formulas.addFuncsToNewSummon(this);
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		
+		if (character().summonStoreSkillCooltime() && !isTeleporting()) {
+			restoreEffects();
+		}
+		
+		setFollowStatus(true);
+		updateAndBroadcastStatus(0);
+		sendPacket(new RelationChanged(this, getOwner().getRelation(getOwner()), false));
+		for (L2PcInstance player : getOwner().getKnownList().getKnownPlayersInRadius(800)) {
+			player.sendPacket(new RelationChanged(this, getOwner().getRelation(player), isAutoAttackable(player)));
+		}
+		L2Party party = getOwner().getParty();
+		if (party != null) {
+			party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowAdd(this));
+		}
+		setShowSummonAnimation(false); // addVisibleObject created the info packets with summon animation
+		// if someone comes into range now, the animation shouldn't show any more
+		_restoreSummon = false;
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerSummonSpawn(this), this);
+	}
+	
+	@Override
+	public final SummonKnownList getKnownList() {
+		return (SummonKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new SummonKnownList(this));
+	}
+	
+	@Override
+	public SummonStat getStat() {
+		return (SummonStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new SummonStat(this));
+	}
+	
+	@Override
+	public SummonStatus getStatus() {
+		return (SummonStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new SummonStatus(this));
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		return new L2SummonAI(this);
+	}
+	
+	@Override
+	public L2NpcTemplate getTemplate() {
+		return (L2NpcTemplate) super.getTemplate();
+	}
+	
+	// this defines the action buttons, 1 for Summon, 2 for Pets
+	public abstract int getSummonType();
+	
+	@Override
+	public final void stopAllEffects() {
+		super.stopAllEffects();
+		updateAndBroadcastStatus(1);
+	}
+	
+	@Override
+	public final void stopAllEffectsExceptThoseThatLastThroughDeath() {
+		super.stopAllEffectsExceptThoseThatLastThroughDeath();
+		updateAndBroadcastStatus(1);
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+		for (L2PcInstance player : getKnownList().getKnownPlayers().values()) {
+			player.sendPacket(new SummonInfo(this, player, 1));
+		}
+	}
+	
+	/**
+	 * @return Returns the mountable.
+	 */
+	public boolean isMountable() {
+		return false;
+	}
+	
+	public long getExpForThisLevel() {
+		if (getLevel() >= (character().getMaxPetLevel() + 1)) {
+			return 0;
+		}
+		return ExperienceData.getInstance().getExpForLevel(getLevel());
+	}
+	
+	public long getExpForNextLevel() {
+		if (getLevel() >= (character().getMaxPetLevel())) {
+			return 0;
+		}
+		return ExperienceData.getInstance().getExpForLevel(getLevel() + 1);
+	}
+	
+	@Override
+	public final int getKarma() {
+		return getOwner() != null ? getOwner().getKarma() : 0;
+	}
+	
+	@Override
+	public final byte getPvpFlag() {
+		return getOwner() != null ? getOwner().getPvpFlag() : 0;
+	}
+	
+	@Override
+	public final Team getTeam() {
+		return getOwner() != null ? getOwner().getTeam() : Team.NONE;
+	}
+	
+	public final L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	/**
+	 * Gets the summon ID.
+	 * @return the summon ID
+	 */
+	@Override
+	public final int getId() {
+		return getTemplate().getId();
+	}
+	
+	public short getSoulShotsPerHit() {
+		if (getTemplate().getSoulShot() > 0) {
+			return (short) getTemplate().getSoulShot();
+		}
+		return 1;
+	}
+	
+	public short getSpiritShotsPerHit() {
+		if (getTemplate().getSpiritShot() > 0) {
+			return (short) getTemplate().getSpiritShot();
+		}
+		return 1;
+	}
+	
+	public void followOwner() {
+		setFollowStatus(true);
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (isNoblesseBlessedAffected()) {
+			stopEffects(L2EffectType.NOBLESSE_BLESSING);
+			storeEffect(true);
+		} else {
+			storeEffect(false);
+		}
+		
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		final L2PcInstance owner = getOwner();
+		if (owner != null) {
+			for (L2Character TgMob : getKnownList().getKnownCharacters()) {
+				// get the mobs which have aggro on the this instance
+				if (TgMob instanceof L2Attackable) {
+					if (TgMob.isDead()) {
+						continue;
+					}
+					
+					AggroInfo info = ((L2Attackable) TgMob).getAggroList().get(this);
+					if (info != null) {
+						((L2Attackable) TgMob).addDamageHate(owner, info.getDamage(), info.getHate());
+					}
+				}
+			}
+		}
+		
+		DecayTaskManager.getInstance().add(this);
+		return true;
+	}
+	
+	public boolean doDie(L2Character killer, boolean decayed) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		if (!decayed) {
+			DecayTaskManager.getInstance().add(this);
+		}
+		return true;
+	}
+	
+	public void stopDecay() {
+		DecayTaskManager.getInstance().cancel(this);
+	}
+	
+	@Override
+	public void onDecay() {
+		deleteMe(_owner);
+	}
+	
+	@Override
+	public void broadcastStatusUpdate() {
+		super.broadcastStatusUpdate();
+		updateAndBroadcastStatus(1);
+	}
+	
+	public void deleteMe(L2PcInstance owner) {
+		if (owner != null) {
+			owner.sendPacket(new PetDelete(getSummonType(), getObjectId()));
+			final L2Party party = owner.getParty();
+			if (party != null) {
+				party.broadcastToPartyMembers(owner, new ExPartyPetWindowDelete(this));
+			}
+			
+			for (int itemId : owner.getAutoSoulShot()) {
+				String handler = ((L2EtcItem) ItemTable.getInstance().getTemplate(itemId)).getHandlerName();
+				if ((handler != null) && handler.contains("Beast")) {
+					owner.disableAutoShot(itemId);
+				}
+			}
+		}
+		
+		// pet will be deleted along with all his items
+		if (getInventory() != null) {
+			getInventory().destroyAllItems("pet deleted", getOwner(), this);
+		}
+		decayMe();
+		getKnownList().removeAllKnownObjects();
+		if (owner != null) {
+			owner.setPet(null);
+		}
+		super.deleteMe();
+	}
+	
+	public void unSummon(L2PcInstance owner) {
+		if (isVisible() && !isDead()) {
+			getAI().stopFollow();
+			if (owner != null) {
+				owner.sendPacket(new PetDelete(getSummonType(), getObjectId()));
+				final L2Party party = owner.getParty();
+				if (party != null) {
+					party.broadcastToPartyMembers(owner, new ExPartyPetWindowDelete(this));
+				}
+				
+				if ((getInventory() != null) && (getInventory().getSize() > 0)) {
+					getOwner().setPetInvItems(true);
+					sendPacket(SystemMessageId.ITEMS_IN_PET_INVENTORY);
+				} else {
+					getOwner().setPetInvItems(false);
+				}
+			}
+			abortAttack();
+			abortCast();
+			storeMe();
+			storeEffect(true);
+			if (owner != null) {
+				owner.setPet(null);
+			}
+			
+			// Stop AI tasks
+			if (hasAI()) {
+				getAI().stopAITask();
+			}
+			
+			stopAllEffects();
+			L2WorldRegion oldRegion = getWorldRegion();
+			decayMe();
+			if (oldRegion != null) {
+				oldRegion.removeFromZones(this);
+			}
+			getKnownList().removeAllKnownObjects();
+			setTarget(null);
+			if (owner != null) {
+				for (int itemId : owner.getAutoSoulShot()) {
+					String handler = ((L2EtcItem) ItemTable.getInstance().getTemplate(itemId)).getHandlerName();
+					if ((handler != null) && handler.contains("Beast")) {
+						owner.disableAutoShot(itemId);
+					}
+				}
+			}
+		}
+	}
+	
+	public int getAttackRange() {
+		return _attackRange;
+	}
+	
+	public void setAttackRange(int range) {
+		_attackRange = Math.max(range, 36);
+	}
+	
+	public void setFollowStatus(boolean state) {
+		_follow = state;
+		if (_follow) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, getOwner());
+		} else {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null);
+		}
+	}
+	
+	public boolean getFollowStatus() {
+		return _follow;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return (_owner != null) && _owner.isAutoAttackable(attacker);
+	}
+	
+	public int getControlObjectId() {
+		return 0;
+	}
+	
+	public L2Weapon getActiveWeapon() {
+		return null;
+	}
+	
+	@Override
+	public PetInventory getInventory() {
+		return null;
+	}
+	
+	public boolean isRestoreSummon() {
+		return _restoreSummon;
+	}
+	
+	public void setRestoreSummon(boolean val) {
+		_restoreSummon = val;
+	}
+	
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		return null;
+	}
+	
+	/**
+	 * Return True if the L2Summon is invulnerable or if the summoner is in spawn protection.
+	 */
+	@Override
+	public boolean isInvul() {
+		return super.isInvul() || getOwner().isSpawnProtected();
+	}
+	
+	/**
+	 * Return the L2Party object of its L2PcInstance owner or null.
+	 */
+	@Override
+	public L2Party getParty() {
+		if (_owner == null) {
+			return null;
+		}
+		
+		return _owner.getParty();
+	}
+	
+	/**
+	 * Return True if the L2Character has a Party in progress.
+	 */
+	@Override
+	public boolean isInParty() {
+		return (_owner != null) && _owner.isInParty();
+	}
+	
+	/**
+	 * Check if the active L2Skill can be casted.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Check if the target is correct</li>
+	 * <li>Check if the target is in the skill cast range</li>
+	 * <li>Check if the summon owns enough HP and MP to cast the skill</li>
+	 * <li>Check if all skills are enabled and this skill is enabled</li>
+	 * <li>Check if the skill is active</li>
+	 * <li>Notify the AI with AI_INTENTION_CAST and target</li>
+	 * </ul>
+	 * @param skill The L2Skill to use
+	 * @param forceUse used to force ATTACK on players
+	 * @param dontMove used to prevent movement, if not in range
+	 */
+	@Override
+	public boolean useMagic(Skill skill, boolean forceUse, boolean dontMove) {
+		// Null skill, dead summon or null owner are reasons to prevent casting.
+		if ((skill == null) || isDead() || (getOwner() == null)) {
+			return false;
+		}
+		
+		// Check if the skill is active
+		if (skill.isPassive()) {
+			// just ignore the passive skill request. why does the client send it anyway ??
+			return false;
+		}
+		
+		// If a skill is currently being used
+		if (isCastingNow()) {
+			return false;
+		}
+		
+		// Set current pet skill
+		getOwner().setCurrentPetSkill(skill, forceUse, dontMove);
+		
+		// Get the target for the skill
+		L2Object target = switch (skill.getTargetType()) {
+			// SELF should be cast even if no target has been found
+			case SELF -> this;
+			// Get the first target of the list
+			default -> {
+				final var targets = skill.getTargets(this);
+				yield targets.isEmpty() ? null : targets.get(0);
+			}
+		};
+		
+		// Check the validity of the target
+		if (target == null) {
+			sendPacket(SystemMessageId.TARGET_CANT_FOUND);
+			return false;
+		}
+		
+		// Check if this skill is enabled (e.g. reuse time)
+		if (isSkillDisabled(skill)) {
+			sendPacket(SystemMessageId.PET_SKILL_CANNOT_BE_USED_RECHARCHING);
+			return false;
+		}
+		
+		// Check if the summon has enough MP
+		if (getCurrentMp() < (getStat().getMpConsume1(skill) + getStat().getMpConsume2(skill))) {
+			// Send a System Message to the caster
+			sendPacket(SystemMessageId.NOT_ENOUGH_MP);
+			return false;
+		}
+		
+		// Check if the summon has enough HP
+		if (getCurrentHp() <= skill.getHpConsume()) {
+			// Send a System Message to the caster
+			sendPacket(SystemMessageId.NOT_ENOUGH_HP);
+			return false;
+		}
+		
+		if ((this != target) && skill.isPhysical() && //
+			(geodata().getPathFinding() > 0) && //
+			(PathFinding.getInstance().findPath(getX(), getY(), getZ(), target.getX(), target.getY(), target.getZ(), getInstanceId(), true) == null)) {
+			sendPacket(SystemMessageId.CANT_SEE_TARGET);
+			return false;
+		}
+		
+		// Check if this is bad magic skill
+		if (skill.isBad()) {
+			if (getOwner() == target) {
+				return false;
+			}
+			
+			// Summons can cast skills on NPCs inside peace zones.
+			if (isInsidePeaceZone(this, target) && !getOwner().getAccessLevel().allowPeaceAttack()) {
+				// If summon or target is in a peace zone, send a system message:
+				sendPacket(SystemMessageId.TARGET_IN_PEACEZONE);
+				return false;
+			}
+			
+			// If L2PcInstance is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed
+			if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getOwner().getSiegeState()) && (target.getActingPlayer() != getOwner())
+				&& (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) {
+				if (TerritoryWarManager.getInstance().isTWInProgress()) {
+					sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_A_MEMBER_OF_THE_SAME_TERRITORY);
+				} else {
+					sendPacket(SystemMessageId.FORCED_ATTACK_IS_IMPOSSIBLE_AGAINST_SIEGE_SIDE_TEMPORARY_ALLIED_MEMBERS);
+				}
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			// Check if the target is attackable
+			if (target.isDoor()) {
+				if (!target.isAutoAttackable(getOwner())) {
+					return false;
+				}
+			} else {
+				// Summons can cast skills on NPCs inside peace zones.
+				if (!target.canBeAttacked() && !getOwner().getAccessLevel().allowPeaceAttack()) {
+					return false;
+				}
+				
+				// Check if a Forced attack is in progress on non-attackable target
+				if (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (skill.getTargetType() != TargetType.SELF)) {
+					return false;
+				}
+			}
+		}
+		// Notify the AI with AI_INTENTION_CAST and target
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target);
+		return true;
+	}
+	
+	@Override
+	public void setIsImmobilized(boolean value) {
+		super.setIsImmobilized(value);
+		
+		if (value) {
+			_previousFollowStatus = getFollowStatus();
+			// if immobilized temporarily disable follow mode
+			if (_previousFollowStatus) {
+				setFollowStatus(false);
+			}
+		} else {
+			// if not more immobilized restore previous follow mode
+			setFollowStatus(_previousFollowStatus);
+		}
+	}
+	
+	public void setOwner(L2PcInstance newOwner) {
+		_owner = newOwner;
+	}
+	
+	@Override
+	public void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss) {
+		if (miss || (getOwner() == null)) {
+			return;
+		}
+		
+		// Prevents the double spam of system messages, if the target is the owning player.
+		if (target.getObjectId() != getOwner().getObjectId()) {
+			if (pcrit || mcrit) {
+				if (isServitor()) {
+					sendPacket(SystemMessageId.CRITICAL_HIT_BY_SUMMONED_MOB);
+				} else {
+					sendPacket(SystemMessageId.CRITICAL_HIT_BY_PET);
+				}
+			}
+			
+			if (getOwner().isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == getOwner().getOlympiadGameId())) {
+				OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage);
+			}
+			
+			final SystemMessage sm;
+			
+			if (target.isInvul() && !(target instanceof L2NpcInstance)) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.ATTACK_WAS_BLOCKED);
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
+				sm.addNpcName(this);
+				sm.addCharName(target);
+				sm.addInt(damage);
+			}
+			
+			sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, Skill skill) {
+		super.reduceCurrentHp(damage, attacker, skill);
+		if ((getOwner() != null) && (attacker != null)) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
+			sm.addNpcName(this);
+			sm.addCharName(attacker);
+			sm.addInt((int) damage);
+			sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public void doCast(Skill skill) {
+		final L2PcInstance actingPlayer = getActingPlayer();
+		if (!actingPlayer.checkPvpSkill(getTarget(), skill) && !actingPlayer.getAccessLevel().allowPeaceAttack()) {
+			// Send a System Message to the L2PcInstance
+			actingPlayer.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+			
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			actingPlayer.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		super.doCast(skill);
+	}
+	
+	@Override
+	public boolean isInCombat() {
+		return (getOwner() != null) && getOwner().isInCombat();
+	}
+	
+	@Override
+	public L2PcInstance getActingPlayer() {
+		return getOwner();
+	}
+	
+	@Override
+	public final void broadcastPacket(L2GameServerPacket mov) {
+		if (getOwner() != null) {
+			mov.setInvisible(getOwner().isInvisible());
+		}
+		super.broadcastPacket(mov);
+	}
+	
+	@Override
+	public final void broadcastPacket(L2GameServerPacket mov, int radiusInKnownlist) {
+		if (getOwner() != null) {
+			mov.setInvisible(getOwner().isInvisible());
+		}
+		super.broadcastPacket(mov, radiusInKnownlist);
+	}
+	
+	public void updateAndBroadcastStatus(int val) {
+		if (getOwner() == null) {
+			return;
+		}
+		
+		sendPacket(new PetInfo(this, val));
+		sendPacket(new PetStatusUpdate(this));
+		if (isVisible()) {
+			broadcastNpcInfo(val);
+		}
+		L2Party party = getOwner().getParty();
+		if (party != null) {
+			party.broadcastToPartyMembers(getOwner(), new ExPartyPetWindowUpdate(this));
+		}
+		updateEffectIcons(true);
+	}
+	
+	public void broadcastNpcInfo(int val) {
+		for (L2PcInstance player : getKnownList().getKnownPlayers().values()) {
+			if ((player == null) || (player == getOwner())) {
+				continue;
+			}
+			player.sendPacket(new SummonInfo(this, player, val));
+		}
+	}
+	
+	public boolean isHungry() {
+		return false;
+	}
+	
+	public int getWeapon() {
+		return 0;
+	}
+	
+	public int getArmor() {
+		return 0;
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		// Check if the L2PcInstance is the owner of the Pet
+		if (activeChar == getOwner()) {
+			activeChar.sendPacket(new PetInfo(this, 0));
+			// The PetInfo packet wipes the PartySpelled (list of active spells' icons). Re-add them
+			updateEffectIcons(true);
+			if (isPet()) {
+				activeChar.sendPacket(new PetItemList(getInventory().getItems()));
+			}
+		} else {
+			activeChar.sendPacket(new SummonInfo(this, activeChar, 0));
+		}
+	}
+	
+	@Override
+	public void onTeleported() {
+		super.onTeleported();
+		sendPacket(new TeleportToLocation(this, getX(), getY(), getZ(), getHeading()));
+	}
+	
+	@Override
+	public String toString() {
+		return super.toString() + "(" + getId() + ") Level: " + getLevel() + " Owner: " + getOwner();
+	}
+	
+	@Override
+	public boolean isUndead() {
+		return getTemplate().getRace() == Race.UNDEAD;
+	}
+	
+	/**
+	 * Change the summon's state.
+	 */
+	public void switchMode() {
+		// Do nothing.
+	}
+	
+	/**
+	 * Cancel the summon's action.
+	 */
+	public void cancelAction() {
+		if (!isMovementDisabled()) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+		}
+	}
+	
+	/**
+	 * Performs an attack to the owner's target.
+	 */
+	public void doAttack() {
+		if (getOwner() != null) {
+			final L2Object target = getOwner().getTarget();
+			if (target != null) {
+				setTarget(target);
+				getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
+			}
+		}
+	}
+	
+	/**
+	 * Verify if the summon can perform an attack.
+	 * @param ctrlPressed {@code true} if Ctrl key is pressed
+	 * @return {@code true} if the summon can attack, {@code false} otherwise
+	 */
+	public final boolean canAttack(boolean ctrlPressed) {
+		if (getOwner() == null) {
+			return false;
+		}
+		
+		final L2Object target = getOwner().getTarget();
+		if ((target == null) || (this == target) || (getOwner() == target)) {
+			return false;
+		}
+		
+		// Sin eater, Big Boom, Wyvern can't attack with attack button.
+		final int npcId = getId();
+		if (Util.contains(PASSIVE_SUMMONS, npcId)) {
+			getOwner().sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		if (isBetrayed()) {
+			sendPacket(SystemMessageId.PET_REFUSING_ORDER);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		if (isAttackingDisabled()) {
+			if (!isAttackingNow()) {
+				return false;
+			}
+			getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, target);
+		}
+		
+		if (isPet() && ((getLevel() - getOwner().getLevel()) > 20)) {
+			sendPacket(SystemMessageId.PET_TOO_HIGH_TO_CONTROL);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		if (getOwner().isInOlympiadMode() && !getOwner().isOlympiadStart()) {
+			// If owner is in Olympiad and the match isn't already start, send a Server->Client packet ActionFailed
+			getOwner().sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		if ((target.getActingPlayer() != null) && (getOwner().getSiegeState() > 0) && getOwner().isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeSide() == getOwner().getSiegeSide())) {
+			if (TerritoryWarManager.getInstance().isTWInProgress()) {
+				sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_A_MEMBER_OF_THE_SAME_TERRITORY);
+			} else {
+				sendPacket(SystemMessageId.FORCED_ATTACK_IS_IMPOSSIBLE_AGAINST_SIEGE_SIDE_TEMPORARY_ALLIED_MEMBERS);
+			}
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		if (!getOwner().getAccessLevel().allowPeaceAttack() && getOwner().isInsidePeaceZone(this, target)) {
+			sendPacket(SystemMessageId.TARGET_IN_PEACEZONE);
+			return false;
+		}
+		
+		if (isLockedTarget()) {
+			sendPacket(SystemMessageId.FAILED_CHANGE_TARGET);
+			return false;
+		}
+		
+		// Summons can attack NPCs even when the owner cannot.
+		if (!target.isAutoAttackable(getOwner()) && !ctrlPressed && !target.isNpc()) {
+			setFollowStatus(false);
+			getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, target);
+			sendPacket(SystemMessageId.INCORRECT_TARGET);
+			return false;
+		}
+		
+		// Siege golems AI doesn't support attacking other than doors/walls at the moment.
+		if (target.isDoor() && (getTemplate().getRace() != Race.SIEGE_WEAPON)) {
+			return false;
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public void sendPacket(L2GameServerPacket mov) {
+		if (getOwner() != null) {
+			getOwner().sendPacket(mov);
+		}
+	}
+	
+	@Override
+	public void sendPacket(SystemMessageId id) {
+		if (getOwner() != null) {
+			getOwner().sendPacket(id);
+		}
+	}
+	
+	@Override
+	public boolean isSummon() {
+		return true;
+	}
+	
+	@Override
+	public L2Summon getSummon() {
+		return this;
+	}
+	
+	@Override
+	public boolean isChargedShot(ShotType type) {
+		return (_shotsMask & type.getMask()) == type.getMask();
+	}
+	
+	@Override
+	public void setChargedShot(ShotType type, boolean charged) {
+		if (charged) {
+			_shotsMask |= type.getMask();
+		} else {
+			_shotsMask &= ~type.getMask();
+		}
+	}
+	
+	@Override
+	public void rechargeShots(boolean physical, boolean magic) {
+		L2ItemInstance item;
+		IItemHandler handler;
+		
+		if ((getOwner().getAutoSoulShot() == null) || getOwner().getAutoSoulShot().isEmpty()) {
+			return;
+		}
+		
+		for (int itemId : getOwner().getAutoSoulShot()) {
+			item = getOwner().getInventory().getItemByItemId(itemId);
+			
+			if (item != null) {
+				if (magic) {
+					if (item.getItem().getDefaultAction() == ActionType.SUMMON_SPIRITSHOT) {
+						handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
+						if (handler != null) {
+							handler.useItem(getOwner(), item, false);
+						}
+					}
+				}
+				
+				if (physical) {
+					if (item.getItem().getDefaultAction() == ActionType.SUMMON_SOULSHOT) {
+						handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
+						if (handler != null) {
+							handler.useItem(getOwner(), item, false);
+						}
+					}
+				}
+			} else {
+				getOwner().removeAutoSoulShot(itemId);
+			}
+		}
+	}
+	
+	@Override
+	public int getClanId() {
+		return (getOwner() != null) ? getOwner().getClanId() : 0;
+	}
+	
+	@Override
+	public int getAllyId() {
+		return (getOwner() != null) ? getOwner().getAllyId() : 0;
+	}
+	
+	public int getFormId() {
+		int formId = 0;
+		final int npcId = getId();
+		if ((npcId == 16041) || (npcId == 16042)) {
+			if (getLevel() > 69) {
+				formId = 3;
+			} else if (getLevel() > 64) {
+				formId = 2;
+			} else if (getLevel() > 59) {
+				formId = 1;
+			}
+		} else if ((npcId == 16025) || (npcId == 16037)) {
+			if (getLevel() > 69) {
+				formId = 3;
+			} else if (getLevel() > 64) {
+				formId = 2;
+			} else if (getLevel() > 59) {
+				formId = 1;
+			}
+		}
+		return formId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Tower.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Tower.java
new file mode 100644
index 00000000..edfa7640
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Tower.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+/**
+ * This class is a super-class for L2ControlTowerInstance and L2FlameTowerInstance.
+ * @author Zoey76
+ */
+public abstract class L2Tower extends L2Npc {
+	
+	public L2Tower(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setIsInvul(false);
+	}
+	
+	@Override
+	public boolean canBeAttacked() {
+		// Attackable during siege by attacker only
+		return ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress());
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		// Attackable during siege by attacker only
+		return ((attacker != null) && attacker.isPlayer() && (getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress() && getCastle().getSiege().checkIsAttacker(attacker.getClan()));
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if (!canTarget(player)) {
+			return;
+		}
+		
+		if (this != player.getTarget()) {
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			if (isAutoAttackable(player) && (Math.abs(player.getZ() - getZ()) < 100) && GeoData.getInstance().canSeeTarget(player, this)) {
+				// Notify the L2PcInstance AI with AI_INTENTION_INTERACT
+				player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+			}
+		}
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void onForcedAttack(L2PcInstance player) {
+		onAction(player);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java b/src/main/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
new file mode 100644
index 00000000..f80d4f27
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/L2Vehicle.java
@@ -0,0 +1,421 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.VehiclePathPoint;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.VehicleKnownList;
+import com.l2jserver.gameserver.model.actor.stat.VehicleStat;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author DS
+ */
+public abstract class L2Vehicle extends L2Character {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Vehicle.class);
+	
+	protected int _dockId = 0;
+	protected final List<L2PcInstance> _passengers = new CopyOnWriteArrayList<>();
+	protected Location _oustLoc = null;
+	private Runnable _engine = null;
+	
+	protected VehiclePathPoint[] _currentPath = null;
+	protected int _runState = 0;
+	
+	public L2Vehicle(int objectId, L2CharTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2Vehicle);
+		setIsFlying(true);
+	}
+	
+	public boolean isBoat() {
+		return false;
+	}
+	
+	public boolean isAirShip() {
+		return false;
+	}
+	
+	public boolean canBeControlled() {
+		return _engine == null;
+	}
+	
+	public void registerEngine(Runnable r) {
+		_engine = r;
+	}
+	
+	public void runEngine(int delay) {
+		if (_engine != null) {
+			ThreadPoolManager.getInstance().scheduleGeneral(_engine, delay);
+		}
+	}
+	
+	public void executePath(VehiclePathPoint[] path) {
+		_runState = 0;
+		_currentPath = path;
+		
+		if ((_currentPath != null) && (_currentPath.length > 0)) {
+			final VehiclePathPoint point = _currentPath[0];
+			if (point.getMoveSpeed() > 0) {
+				getStat().setMoveSpeed(point.getMoveSpeed());
+			}
+			if (point.getRotationSpeed() > 0) {
+				getStat().setRotationSpeed(point.getRotationSpeed());
+			}
+			
+			getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, point);
+			return;
+		}
+		getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+	}
+	
+	@Override
+	public boolean moveToNextRoutePoint() {
+		_move = null;
+		
+		if (_currentPath != null) {
+			_runState++;
+			if (_runState < _currentPath.length) {
+				final VehiclePathPoint point = _currentPath[_runState];
+				if (!isMovementDisabled()) {
+					if (point.getMoveSpeed() == 0) {
+						point.setHeading(point.getRotationSpeed());
+						teleToLocation(point, false);
+						_currentPath = null;
+					} else {
+						if (point.getMoveSpeed() > 0) {
+							getStat().setMoveSpeed(point.getMoveSpeed());
+						}
+						if (point.getRotationSpeed() > 0) {
+							getStat().setRotationSpeed(point.getRotationSpeed());
+						}
+						
+						MoveData m = new MoveData();
+						m.disregardingGeodata = false;
+						m.onGeodataPathIndex = -1;
+						m._xDestination = point.getX();
+						m._yDestination = point.getY();
+						m._zDestination = point.getZ();
+						m._heading = 0;
+						
+						final double distance = Math.hypot(point.getX() - getX(), point.getY() - getY());
+						if (distance > 1) {
+							setHeading(Util.calculateHeadingFrom(getX(), getY(), point.getX(), point.getY()));
+						}
+						
+						m._moveStartTime = GameTimeController.getInstance().getGameTicks();
+						_move = m;
+						
+						GameTimeController.getInstance().registerMovingObject(this);
+						return true;
+					}
+				}
+			} else {
+				_currentPath = null;
+			}
+		}
+		
+		runEngine(10);
+		return false;
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new VehicleKnownList(this));
+	}
+	
+	@Override
+	public VehicleStat getStat() {
+		return (VehicleStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new VehicleStat(this));
+	}
+	
+	public boolean isInDock() {
+		return _dockId > 0;
+	}
+	
+	public int getDockId() {
+		return _dockId;
+	}
+	
+	public void setInDock(int d) {
+		_dockId = d;
+	}
+	
+	public void setOustLoc(Location loc) {
+		_oustLoc = loc;
+	}
+	
+	public Location getOustLoc() {
+		return _oustLoc != null ? _oustLoc : MapRegionManager.getInstance().getTeleToLocation(this, TeleportWhereType.TOWN);
+	}
+	
+	public void oustPlayers() {
+		_passengers.forEach(this::oustPlayer);
+		_passengers.clear();
+	}
+	
+	public void oustPlayer(L2PcInstance player) {
+		player.setVehicle(null);
+		player.setInVehiclePosition(null);
+		removePassenger(player);
+	}
+	
+	public boolean addPassenger(L2PcInstance player) {
+		if ((player == null) || _passengers.contains(player)) {
+			return false;
+		}
+		
+		// already in other vehicle
+		if ((player.getVehicle() != null) && (player.getVehicle() != this)) {
+			return false;
+		}
+		
+		_passengers.add(player);
+		return true;
+	}
+	
+	public void removePassenger(L2PcInstance player) {
+		try {
+			_passengers.remove(player);
+		} catch (Exception e) {
+		}
+	}
+	
+	public boolean isEmpty() {
+		return _passengers.isEmpty();
+	}
+	
+	public List<L2PcInstance> getPassengers() {
+		return _passengers;
+	}
+	
+	public void broadcastToPassengers(L2GameServerPacket sm) {
+		for (L2PcInstance player : _passengers) {
+			if (player != null) {
+				player.sendPacket(sm);
+			}
+		}
+	}
+	
+	/**
+	 * Consume ticket(s) and teleport player from boat if no correct ticket
+	 * @param itemId Ticket itemId
+	 * @param count Ticket count
+	 * @param oustX
+	 * @param oustY
+	 * @param oustZ
+	 */
+	public void payForRide(int itemId, int count, int oustX, int oustY, int oustZ) {
+		final Collection<L2PcInstance> passengers = getKnownList().getKnownPlayersInRadius(1000);
+		if (!passengers.isEmpty()) {
+			L2ItemInstance ticket;
+			InventoryUpdate iu;
+			for (L2PcInstance player : passengers) {
+				if (player == null) {
+					continue;
+				}
+				if (player.isInBoat() && (player.getBoat() == this)) {
+					if (itemId > 0) {
+						ticket = player.getInventory().getItemByItemId(itemId);
+						if ((ticket == null) || (player.getInventory().destroyItem("Boat", ticket, count, player, this) == null)) {
+							player.sendPacket(SystemMessageId.NOT_CORRECT_BOAT_TICKET);
+							player.teleToLocation(new Location(oustX, oustY, oustZ), true);
+							continue;
+						}
+						iu = new InventoryUpdate();
+						iu.addModifiedItem(ticket);
+						player.sendPacket(iu);
+					}
+					addPassenger(player);
+				}
+			}
+		}
+	}
+	
+	@Override
+	public boolean updatePosition() {
+		final boolean result = super.updatePosition();
+		
+		for (L2PcInstance player : _passengers) {
+			if ((player != null) && (player.getVehicle() == this)) {
+				player.setXYZ(getX(), getY(), getZ());
+				player.revalidateZone(false);
+			}
+		}
+		
+		return result;
+	}
+	
+	@Override
+	public void teleToLocation(ILocational loc, boolean allowRandomOffset) {
+		if (isMoving()) {
+			stopMove(null, false);
+		}
+		
+		setIsTeleporting(true);
+		
+		getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+		
+		for (L2PcInstance player : _passengers) {
+			if (player != null) {
+				player.teleToLocation(loc, false);
+			}
+		}
+		
+		decayMe();
+		setXYZ(loc.getX(), loc.getY(), loc.getZ());
+		
+		// temporary fix for heading on teleports
+		if (loc.getHeading() != 0) {
+			setHeading(loc.getHeading());
+		}
+		
+		onTeleported();
+		revalidateZone(true);
+	}
+	
+	@Override
+	public void stopMove(Location loc, boolean updateKnownObjects) {
+		_move = null;
+		if (loc != null) {
+			setXYZ(loc.getX(), loc.getY(), loc.getZ());
+			setHeading(loc.getHeading());
+			revalidateZone(true);
+		}
+		
+		if (general().moveBasedKnownList() && updateKnownObjects) {
+			getKnownList().findObjects();
+		}
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		_engine = null;
+		
+		try {
+			if (isMoving()) {
+				stopMove(null);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Failed stopMove().", ex);
+		}
+		
+		try {
+			oustPlayers();
+		} catch (Exception ex) {
+			LOG.warn("Failed oustPlayers().", ex);
+		}
+		
+		final L2WorldRegion oldRegion = getWorldRegion();
+		
+		try {
+			decayMe();
+		} catch (Exception ex) {
+			LOG.warn("Failed decayMe().", ex);
+		}
+		
+		if (oldRegion != null) {
+			oldRegion.removeFromZones(this);
+		}
+		
+		try {
+			getKnownList().removeAllKnownObjects();
+		} catch (Exception ex) {
+			LOG.warn("Failed cleaning knownlist.", ex);
+		}
+		
+		// Remove L2Object object from _allObjects of L2World
+		L2World.getInstance().removeObject(this);
+		
+		return super.deleteMe();
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+	}
+	
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public int getLevel() {
+		return 0;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return false;
+	}
+	
+	@Override
+	public void detachAI() {
+	}
+	
+	@Override
+	public boolean isVehicle() {
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java b/src/main/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java
new file mode 100644
index 00000000..c1e980c4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/appearance/PcAppearance.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.appearance;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PcAppearance {
+	public static final int DEFAULT_TITLE_COLOR = 0xECF9A2;
+	
+	private L2PcInstance _owner;
+	
+	private byte _face;
+	
+	private byte _hairColor;
+	
+	private byte _hairStyle;
+	
+	private boolean _sex; // Female true(1)
+	
+	/** true if the player is invisible */
+	private boolean _ghostMode = false;
+	
+	/** The current visible name of this player, not necessarily the real one */
+	private String _visibleName;
+	
+	/** The current visible title of this player, not necessarily the real one */
+	private String _visibleTitle;
+	
+	/** The default name color is 0xFFFFFF. */
+	private int _nameColor = 0xFFFFFF;
+	
+	/** The default title color is 0xECF9A2. */
+	private int _titleColor = DEFAULT_TITLE_COLOR;
+	
+	public PcAppearance(byte face, byte hColor, byte hStyle, boolean sex) {
+		_face = face;
+		_hairColor = hColor;
+		_hairStyle = hStyle;
+		_sex = sex;
+	}
+	
+	/**
+	 * @param visibleName The visibleName to set.
+	 */
+	public final void setVisibleName(String visibleName) {
+		_visibleName = visibleName;
+	}
+	
+	/**
+	 * @return Returns the visibleName.
+	 */
+	public final String getVisibleName() {
+		if (_visibleName == null) {
+			return getOwner().getName();
+		}
+		return _visibleName;
+	}
+	
+	/**
+	 * @param visibleTitle The visibleTitle to set.
+	 */
+	public final void setVisibleTitle(String visibleTitle) {
+		_visibleTitle = visibleTitle;
+	}
+	
+	/**
+	 * @return Returns the visibleTitle.
+	 */
+	public final String getVisibleTitle() {
+		if (_visibleTitle == null) {
+			return getOwner().getTitle();
+		}
+		return _visibleTitle;
+	}
+	
+	public final byte getFace() {
+		return _face;
+	}
+	
+	/**
+	 * @param value
+	 */
+	public final void setFace(int value) {
+		_face = (byte) value;
+	}
+	
+	public final byte getHairColor() {
+		return _hairColor;
+	}
+	
+	/**
+	 * @param value
+	 */
+	public final void setHairColor(int value) {
+		_hairColor = (byte) value;
+	}
+	
+	public final byte getHairStyle() {
+		return _hairStyle;
+	}
+	
+	/**
+	 * @param value
+	 */
+	public final void setHairStyle(int value) {
+		_hairStyle = (byte) value;
+	}
+	
+	/**
+	 * @return true if char is female
+	 */
+	public final boolean getSex() {
+		return _sex;
+	}
+	
+	public final void setSex(boolean female) {
+		_sex = female;
+	}
+	
+	public void setGhostMode(boolean b) {
+		_ghostMode = b;
+	}
+	
+	public boolean isGhost() {
+		return _ghostMode;
+	}
+	
+	public int getNameColor() {
+		return _nameColor;
+	}
+	
+	public void setNameColor(int nameColor) {
+		if (nameColor < 0) {
+			return;
+		}
+		
+		_nameColor = nameColor;
+	}
+	
+	public void setNameColor(int red, int green, int blue) {
+		_nameColor = (red & 0xFF) + ((green & 0xFF) << 8) + ((blue & 0xFF) << 16);
+	}
+	
+	public int getTitleColor() {
+		return _titleColor;
+	}
+	
+	public void setTitleColor(int titleColor) {
+		if (titleColor < 0) {
+			return;
+		}
+		
+		_titleColor = titleColor;
+	}
+	
+	public void setTitleColor(int red, int green, int blue) {
+		_titleColor = (red & 0xFF) + ((green & 0xFF) << 8) + ((blue & 0xFF) << 16);
+	}
+	
+	/**
+	 * @param owner The owner to set.
+	 */
+	public void setOwner(L2PcInstance owner) {
+		_owner = owner;
+	}
+	
+	/**
+	 * @return Returns the owner.
+	 */
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java
new file mode 100644
index 00000000..d3fe52f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2AirShipInstance.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.ai.L2AirShipAI;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.AirShipManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Vehicle;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ExAirShipInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExGetOffAirShip;
+import com.l2jserver.gameserver.network.serverpackets.ExGetOnAirShip;
+import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationAirShip;
+import com.l2jserver.gameserver.network.serverpackets.ExStopMoveAirShip;
+
+/**
+ * Flying airships.
+ * @author DrHouse
+ * @author DS
+ */
+public class L2AirShipInstance extends L2Vehicle {
+	public L2AirShipInstance(int objectId, L2CharTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2AirShipInstance);
+		setAI(new L2AirShipAI(this));
+	}
+	
+	@Override
+	public boolean isAirShip() {
+		return true;
+	}
+	
+	public boolean isOwner(L2PcInstance player) {
+		return false;
+	}
+	
+	public int getOwnerId() {
+		return 0;
+	}
+	
+	public boolean isCaptain(L2PcInstance player) {
+		return false;
+	}
+	
+	public int getCaptainId() {
+		return 0;
+	}
+	
+	public int getHelmObjectId() {
+		return 0;
+	}
+	
+	public int getHelmItemId() {
+		return 0;
+	}
+	
+	public boolean setCaptain(L2PcInstance player) {
+		return false;
+	}
+	
+	public int getFuel() {
+		return 0;
+	}
+	
+	public void setFuel(int f) {
+		
+	}
+	
+	public int getMaxFuel() {
+		return 0;
+	}
+	
+	public void setMaxFuel(int mf) {
+		
+	}
+	
+	@Override
+	public int getId() {
+		return 0;
+	}
+	
+	@Override
+	public boolean moveToNextRoutePoint() {
+		final boolean result = super.moveToNextRoutePoint();
+		if (result) {
+			broadcastPacket(new ExMoveToLocationAirShip(this));
+		}
+		
+		return result;
+	}
+	
+	@Override
+	public boolean addPassenger(L2PcInstance player) {
+		if (!super.addPassenger(player)) {
+			return false;
+		}
+		
+		player.setVehicle(this);
+		player.setInVehiclePosition(new Location(0, 0, 0));
+		player.broadcastPacket(new ExGetOnAirShip(player, this));
+		player.getKnownList().removeAllKnownObjects();
+		player.setXYZ(getX(), getY(), getZ());
+		player.revalidateZone(true);
+		return true;
+	}
+	
+	@Override
+	public void oustPlayer(L2PcInstance player) {
+		super.oustPlayer(player);
+		final Location loc = getOustLoc();
+		if (player.isOnline()) {
+			player.broadcastPacket(new ExGetOffAirShip(player, this, loc.getX(), loc.getY(), loc.getZ()));
+			player.getKnownList().removeAllKnownObjects();
+			player.setXYZ(loc.getX(), loc.getY(), loc.getZ());
+			player.revalidateZone(true);
+		} else {
+			player.setXYZInvisible(loc.getX(), loc.getY(), loc.getZ());
+		}
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (!super.deleteMe()) {
+			return false;
+		}
+		
+		AirShipManager.getInstance().removeAirShip(this);
+		return true;
+	}
+	
+	@Override
+	public void stopMove(Location loc, boolean updateKnownObjects) {
+		super.stopMove(loc, updateKnownObjects);
+		
+		broadcastPacket(new ExStopMoveAirShip(this));
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+		broadcastPacket(new ExAirShipInfo(this));
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		if (isVisibleFor(activeChar)) {
+			activeChar.sendPacket(new ExAirShipInfo(this));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ArtefactInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ArtefactInstance.java
new file mode 100644
index 00000000..4cad9f3a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ArtefactInstance.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public final class L2ArtefactInstance extends L2Npc {
+	
+	public L2ArtefactInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ArtefactInstance);
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		getCastle().registerArtefact(this);
+	}
+	
+	/**
+	 * Return False.
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return false;
+	}
+	
+	@Override
+	public boolean canBeAttacked() {
+		return false;
+	}
+	
+	@Override
+	public void onForcedAttack(L2PcInstance player) {
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, Skill skill) {
+	}
+	
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, Skill skill) {
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
new file mode 100644
index 00000000..364a50c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java
@@ -0,0 +1,607 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static java.util.concurrent.TimeUnit.DAYS;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.AuctionManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.Auction;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+
+public final class L2AuctioneerInstance extends L2Npc {
+	private static final Logger LOG = LoggerFactory.getLogger(L2AuctioneerInstance.class);
+	
+	private static final int COND_ALL_FALSE = 0;
+	private static final int COND_BUSY_BECAUSE_OF_SIEGE = 1;
+	private static final int COND_REGULAR = 3;
+	
+	private int _currentPage = 1;
+	
+	private final Map<Integer, Auction> _pendingAuctions = new ConcurrentHashMap<>();
+	
+	public L2AuctioneerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2AuctioneerInstance);
+	}
+	
+	@Override
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		int condition = validateCondition(player);
+		if (condition <= COND_ALL_FALSE) {
+			// TODO: html
+			player.sendMessage("Wrong conditions.");
+			return;
+		} else if (condition == COND_BUSY_BECAUSE_OF_SIEGE) {
+			String filename = "data/html/auction/auction-busy.htm";
+			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+			html.setFile(player.getHtmlPrefix(), filename);
+			html.replace("%objectId%", String.valueOf(getObjectId()));
+			player.sendPacket(html);
+			return;
+		} else if (condition == COND_REGULAR) {
+			StringTokenizer st = new StringTokenizer(command, " ");
+			String actualCommand = st.nextToken(); // Get actual command
+			
+			String val = "";
+			if (st.hasMoreTokens()) {
+				val = st.nextToken();
+			}
+			
+			if (actualCommand.equalsIgnoreCase("auction")) {
+				if (val.isEmpty()) {
+					return;
+				}
+				
+				try {
+					int days = Integer.parseInt(val);
+					try {
+						SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+						long bid = 0;
+						if (st.hasMoreTokens()) {
+							bid = Math.min(Long.parseLong(st.nextToken()), character().getMaxAdena());
+						}
+						
+						Auction a = new Auction(player.getClan().getHideoutId(), player.getClan(), DAYS.toMillis(days), bid, ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getName());
+						if (_pendingAuctions.get(a.getId()) != null) {
+							_pendingAuctions.remove(a.getId());
+						}
+						
+						_pendingAuctions.put(a.getId(), a);
+						
+						String filename = "data/html/auction/AgitSale3.htm";
+						final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+						html.setFile(player.getHtmlPrefix(), filename);
+						html.replace("%x%", val);
+						html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
+						html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
+						html.replace("%AGIT_AUCTION_MIN%", String.valueOf(a.getStartingBid()));
+						html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getDesc());
+						html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_sale2");
+						html.replace("%objectId%", String.valueOf((getObjectId())));
+						player.sendPacket(html);
+					} catch (Exception e) {
+						player.sendMessage("Invalid bid!");
+					}
+				} catch (Exception e) {
+					player.sendMessage("Invalid auction duration!");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("confirmAuction")) {
+				try {
+					Auction a = _pendingAuctions.get(player.getClan().getHideoutId());
+					a.confirmAuction();
+					_pendingAuctions.remove(player.getClan().getHideoutId());
+				} catch (Exception e) {
+					player.sendMessage("Invalid auction");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("bidding")) {
+				if (val.isEmpty()) {
+					return;
+				}
+				
+				if (general().debug()) {
+					LOG.debug("bidding show successful");
+				}
+				
+				try {
+					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+					int auctionId = Integer.parseInt(val);
+					
+					if (general().debug()) {
+						LOG.debug("auction test started");
+					}
+					
+					String filename = "data/html/auction/AgitAuctionInfo.htm";
+					Auction a = AuctionManager.getInstance().getAuction(auctionId);
+					
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					if (a != null) {
+						html.replace("%AGIT_NAME%", a.getItemName());
+						html.replace("%OWNER_PLEDGE_NAME%", a.getSellerClanName());
+						html.replace("%OWNER_PLEDGE_MASTER%", a.getSellerName());
+						html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
+						html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
+						html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
+						html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
+						html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
+						html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
+						html.replace("%AGIT_AUCTION_COUNT%", String.valueOf(a.getBidders().size()));
+						html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
+						html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_list");
+						html.replace("%AGIT_LINK_BIDLIST%", "bypass -h npc_" + getObjectId() + "_bidlist " + a.getId());
+						html.replace("%AGIT_LINK_RE%", "bypass -h npc_" + getObjectId() + "_bid1 " + a.getId());
+					} else {
+						LOG.debug("Auctioneer Auction null for AuctionId : {}", auctionId);
+					}
+					
+					player.sendPacket(html);
+				} catch (Exception e) {
+					player.sendMessage("Invalid auction!");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("bid")) {
+				if (val.isEmpty()) {
+					return;
+				}
+				
+				try {
+					int auctionId = Integer.parseInt(val);
+					try {
+						long bid = 0;
+						if (st.hasMoreTokens()) {
+							bid = Math.min(Long.parseLong(st.nextToken()), character().getMaxAdena());
+						}
+						
+						AuctionManager.getInstance().getAuction(auctionId).setBid(player, bid);
+					} catch (Exception e) {
+						player.sendMessage("Invalid bid!");
+					}
+				} catch (Exception e) {
+					player.sendMessage("Invalid auction!");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("bid1")) {
+				if ((player.getClan() == null) || (player.getClan().getLevel() < 2)) {
+					player.sendPacket(SystemMessageId.AUCTION_ONLY_CLAN_LEVEL_2_HIGHER);
+					return;
+				}
+				
+				if (val.isEmpty()) {
+					return;
+				}
+				
+				if (((player.getClan().getAuctionBidAt() > 0) && (player.getClan().getAuctionBidAt() != Integer.parseInt(val))) || (player.getClan().getHideoutId() > 0)) {
+					player.sendPacket(SystemMessageId.ALREADY_SUBMITTED_BID);
+					return;
+				}
+				
+				try {
+					String filename = "data/html/auction/AgitBid1.htm";
+					
+					long minimumBid = AuctionManager.getInstance().getAuction(Integer.parseInt(val)).getHighestBidderMaxBid();
+					if (minimumBid == 0) {
+						minimumBid = AuctionManager.getInstance().getAuction(Integer.parseInt(val)).getStartingBid();
+					}
+					
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_bidding " + val);
+					html.replace("%PLEDGE_ADENA%", String.valueOf(player.getClan().getWarehouse().getAdena()));
+					html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(minimumBid));
+					html.replace("npc_%objectId%_bid", "npc_" + getObjectId() + "_bid " + val);
+					player.sendPacket(html);
+					return;
+				} catch (Exception e) {
+					player.sendMessage("Invalid auction!");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("list")) {
+				List<Auction> auctions = AuctionManager.getInstance().getAuctions();
+				SimpleDateFormat format = new SimpleDateFormat("yy/MM/dd");
+				// Limit for make new page, prevent client crash.
+				
+				int limit = 10;
+				int start;
+				int i = 1;
+				
+				if (val.isEmpty()) {
+					start = 1;
+					_currentPage = 1;
+				} else {
+					start = (limit * (Integer.parseInt(val) - 1)) + 1;
+					limit *= Integer.parseInt(val);
+					_currentPage = Integer.parseInt(val);
+				}
+				
+				if (general().debug()) {
+					LOG.debug("cmd list: auction test started");
+				}
+				
+				StringBuilder items = new StringBuilder();
+				items.append("<table width=280 border=0>");
+				
+				for (Auction a : auctions) {
+					if (a == null) {
+						continue;
+					}
+					
+					if (i > limit) {
+						break;
+					} else if (i < start) {
+						i++;
+						continue;
+					} else {
+						i++;
+					}
+					
+					items.append("<tr>");
+					items.append("<td width=70 align=left><font color=\"99B3FF\">");
+					items.append(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
+					items.append("</font></td>");
+					items.append("<td width=70 align=left><font color=\"FFFF99\"><a action=\"bypass -h npc_");
+					items.append(getObjectId());
+					items.append("_bidding ");
+					items.append(a.getId());
+					items.append("\">");
+					items.append(a.getItemName());
+					items.append("[");
+					items.append(AuctionManager.getInstance().getAuction(a.getId()).getBidders().size());
+					items.append("]</a></font></td>");
+					items.append("<td width=70 align=left>");
+					items.append(format.format(a.getEndDate()));
+					items.append("</td>");
+					items.append("<td width=70 align=left><font color=\"99FFFF\">");
+					items.append(a.getStartingBid());
+					items.append("</font></td>");
+					items.append("</tr>");
+					items.append("<tr><td height=5></td></tr>");
+				}
+				items.append("</table>");
+				
+				items.append("<table width=280 border=0>");
+				items.append("<tr>");
+				if (_currentPage > 1) {
+					items.append("<td width=80 align=left>");
+					items.append("<button action=\"bypass -h npc_");
+					items.append(getObjectId());
+					items.append("_list ");
+					items.append(_currentPage - 1);
+					items.append("\"");
+					items.append(" value=\"Previous\" width=80 height=27 back=\"L2UI_CT1.Button_DF_Down\" fore=\"L2UI_CT1.Button_DF\">");
+					items.append("</td>");
+				}
+				items.append("<td width=80 align=left>");
+				items.append("<button action=\"bypass -h npc_");
+				items.append(getObjectId());
+				items.append("_list ");
+				items.append(_currentPage + 1);
+				items.append("\"");
+				items.append(" value=\"Next\" width=80 height=27 back=\"L2UI_CT1.Button_DF_Down\" fore=\"L2UI_CT1.Button_DF\">");
+				items.append("</td>");
+				items.append("<td width=120></td>");
+				items.append("</tr>");
+				items.append("</table>");
+				
+				String filename = "data/html/auction/AgitAuctionList.htm";
+				
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), filename);
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
+				html.replace("%itemsField%", items.toString());
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("bidlist")) {
+				int auctionId;
+				if (val.isEmpty()) {
+					if (player.getClan().getAuctionBidAt() <= 0) {
+						return;
+					}
+					auctionId = player.getClan().getAuctionBidAt();
+				} else {
+					auctionId = Integer.parseInt(val);
+				}
+				
+				if (general().debug()) {
+					LOG.debug("cmd bidlist: auction test started");
+				}
+				
+				final var bidders = new StringBuilder();
+				for (var b : AuctionManager.getInstance().getAuction(auctionId).getBidders().values()) {
+					bidders.append("<tr><td>")
+						.append(b.getClanName())
+						.append("</td><td>")
+						.append(b.getName())
+						.append("</td><td>")
+						.append(b.getTimeBid().get(Calendar.YEAR))
+						.append("/")
+						.append(b.getTimeBid().get(Calendar.MONTH) + 1)
+						.append("/")
+						.append(b.getTimeBid().get(Calendar.DATE))
+						.append("</td><td>")
+						.append(b.getBid())
+						.append("</td>")
+						.append("</tr>");
+				}
+				
+				final var fileName = "data/html/auction/AgitBidderList.htm";
+				final var html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), fileName);
+				html.replace("%AGIT_LIST%", bidders.toString());
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_bidding " + auctionId);
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("selectedItems")) {
+				if ((player.getClan() != null) && (player.getClan().getHideoutId() == 0) && (player.getClan().getAuctionBidAt() > 0)) {
+					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+					String filename = "data/html/auction/AgitBidInfo.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					Auction a = AuctionManager.getInstance().getAuction(player.getClan().getAuctionBidAt());
+					if (a != null) {
+						html.replace("%AGIT_NAME%", a.getItemName());
+						html.replace("%OWNER_PLEDGE_NAME%", a.getSellerClanName());
+						html.replace("%OWNER_PLEDGE_MASTER%", a.getSellerName());
+						html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
+						html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
+						html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
+						html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
+						html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
+						html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
+						html.replace("%AGIT_AUCTION_MYBID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
+						html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
+						html.replace("%objectId%", String.valueOf(getObjectId()));
+						html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
+					} else {
+						LOG.warn("Auctioneer Auction null for AuctionBiddedAt : {}", player.getClan().getAuctionBidAt());
+					}
+					
+					player.sendPacket(html);
+					return;
+				} else if ((player.getClan() != null) && (AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null)) {
+					SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+					String filename = "data/html/auction/AgitSaleInfo.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					Auction a = AuctionManager.getInstance().getAuction(player.getClan().getHideoutId());
+					if (a != null) {
+						html.replace("%AGIT_NAME%", a.getItemName());
+						html.replace("%AGIT_OWNER_PLEDGE_NAME%", a.getSellerClanName());
+						html.replace("%OWNER_PLEDGE_MASTER%", a.getSellerName());
+						html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getGrade() * 10));
+						html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLease()));
+						html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getLocation());
+						html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
+						html.replace("%AGIT_AUCTION_REMAIN%", ((a.getEndDate() - System.currentTimeMillis()) / 3600000) + " hours " + (((a.getEndDate() - System.currentTimeMillis()) / 60000) % 60) + " minutes");
+						html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
+						html.replace("%AGIT_AUCTION_BIDCOUNT%", String.valueOf(a.getBidders().size()));
+						html.replace("%AGIT_AUCTION_DESC%", ClanHallManager.getInstance().getAuctionableHallById(a.getItemId()).getDesc());
+						html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
+						html.replace("%id%", String.valueOf(a.getId()));
+						html.replace("%objectId%", String.valueOf(getObjectId()));
+					} else {
+						LOG.warn("Auctioneer Auction null for getHasHideout : {}", player.getClan().getHideoutId());
+					}
+					
+					player.sendPacket(html);
+					return;
+				} else if ((player.getClan() != null) && (player.getClan().getHideoutId() != 0)) {
+					int ItemId = player.getClan().getHideoutId();
+					String filename = "data/html/auction/AgitInfo.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					if (ClanHallManager.getInstance().getAuctionableHallById(ItemId) != null) {
+						html.replace("%AGIT_NAME%", ClanHallManager.getInstance().getAuctionableHallById(ItemId).getName());
+						html.replace("%AGIT_OWNER_PLEDGE_NAME%", player.getClan().getName());
+						html.replace("%OWNER_PLEDGE_MASTER%", player.getClan().getLeaderName());
+						html.replace("%AGIT_SIZE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(ItemId).getGrade() * 10));
+						html.replace("%AGIT_LEASE%", String.valueOf(ClanHallManager.getInstance().getAuctionableHallById(ItemId).getLease()));
+						html.replace("%AGIT_LOCATION%", ClanHallManager.getInstance().getAuctionableHallById(ItemId).getLocation());
+						html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
+						html.replace("%objectId%", String.valueOf(getObjectId()));
+					} else {
+						LOG.warn("Clan Hall ID NULL : {} Can be caused by concurrent write in ClanHallManager", ItemId);
+					}
+					
+					player.sendPacket(html);
+					return;
+				} else if ((player.getClan() != null) && (player.getClan().getHideoutId() == 0)) {
+					player.sendPacket(SystemMessageId.NO_OFFERINGS_OWN_OR_MADE_BID_FOR);
+					return;
+				} else if (player.getClan() == null) {
+					player.sendPacket(SystemMessageId.CANNOT_PARTICIPATE_IN_AN_AUCTION);
+					return;
+				}
+			} else if (actualCommand.equalsIgnoreCase("cancelBid")) {
+				long bid = AuctionManager.getInstance().getAuction(player.getClan().getAuctionBidAt()).getBidders().get(player.getClanId()).getBid();
+				String filename = "data/html/auction/AgitBidCancel.htm";
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), filename);
+				html.replace("%AGIT_BID%", String.valueOf(bid));
+				html.replace("%AGIT_BID_REMAIN%", String.valueOf((long) (bid * 0.9)));
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
+				html.replace("%objectId%", String.valueOf(getObjectId()));
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("doCancelBid")) {
+				if (AuctionManager.getInstance().getAuction(player.getClan().getAuctionBidAt()) != null) {
+					AuctionManager.getInstance().getAuction(player.getClan().getAuctionBidAt()).cancelBid(player.getClanId());
+					player.sendPacket(SystemMessageId.CANCELED_BID);
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("cancelAuction")) {
+				if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION)) {
+					String filename = "data/html/auction/not_authorized.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					html.replace("%objectId%", String.valueOf(getObjectId()));
+					player.sendPacket(html);
+					return;
+				}
+				String filename = "data/html/auction/AgitSaleCancel.htm";
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), filename);
+				html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
+				html.replace("%objectId%", String.valueOf(getObjectId()));
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("doCancelAuction")) {
+				if (AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()) != null) {
+					AuctionManager.getInstance().getAuction(player.getClan().getHideoutId()).cancelAuction();
+					player.sendMessage("Your auction has been canceled");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("sale2")) {
+				String filename = "data/html/auction/AgitSale2.htm";
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), filename);
+				html.replace("%AGIT_LAST_PRICE%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_sale");
+				html.replace("%objectId%", String.valueOf(getObjectId()));
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("sale")) {
+				if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION)) {
+					String filename = "data/html/auction/not_authorized.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					html.replace("%objectId%", String.valueOf(getObjectId()));
+					player.sendPacket(html);
+					return;
+				}
+				String filename = "data/html/auction/AgitSale1.htm";
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), filename);
+				html.replace("%AGIT_DEPOSIT%", String.valueOf(ClanHallManager.getInstance().getClanHallByOwner(player.getClan()).getLease()));
+				html.replace("%AGIT_PLEDGE_ADENA%", String.valueOf(player.getClan().getWarehouse().getAdena()));
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
+				html.replace("%objectId%", String.valueOf(getObjectId()));
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("rebid")) {
+				SimpleDateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm");
+				if (!player.hasClanPrivilege(ClanPrivilege.CH_AUCTION)) {
+					String filename = "data/html/auction/not_authorized.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					html.replace("%objectId%", String.valueOf(getObjectId()));
+					player.sendPacket(html);
+					return;
+				}
+				try {
+					String filename = "data/html/auction/AgitBid2.htm";
+					final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+					html.setFile(player.getHtmlPrefix(), filename);
+					Auction a = AuctionManager.getInstance().getAuction(player.getClan().getAuctionBidAt());
+					if (a != null) {
+						html.replace("%AGIT_AUCTION_BID%", String.valueOf(a.getBidders().get(player.getClanId()).getBid()));
+						html.replace("%AGIT_AUCTION_MINBID%", String.valueOf(a.getStartingBid()));
+						html.replace("%AGIT_AUCTION_END%", format.format(a.getEndDate()));
+						html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_selectedItems");
+						html.replace("npc_%objectId%_bid1", "npc_" + getObjectId() + "_bid1 " + a.getId());
+					} else {
+						LOG.warn("Auctioneer Auction null for AuctionBiddedAt : {}", player.getClan().getAuctionBidAt());
+					}
+					
+					player.sendPacket(html);
+				} catch (Exception e) {
+					player.sendMessage("Invalid auction!");
+				}
+				return;
+			} else if (actualCommand.equalsIgnoreCase("location")) {
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				html.setFile(player.getHtmlPrefix(), "data/html/auction/location.htm");
+				html.replace("%location%", MapRegionManager.getInstance().getClosestTownName(player));
+				html.replace("%LOCATION%", getPictureName(player));
+				html.replace("%AGIT_LINK_BACK%", "bypass -h npc_" + getObjectId() + "_start");
+				player.sendPacket(html);
+				return;
+			} else if (actualCommand.equalsIgnoreCase("start")) {
+				showChatWindow(player);
+				return;
+			}
+		}
+		
+		super.onBypassFeedback(player, command);
+	}
+	
+	@Override
+	public void showChatWindow(L2PcInstance player) {
+		String filename;
+		int condition = validateCondition(player);
+		if (condition == COND_BUSY_BECAUSE_OF_SIEGE) {
+			filename = "data/html/auction/auction-busy.htm"; // Busy because of siege
+		} else {
+			filename = "data/html/auction/auction.htm";
+		}
+		
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename);
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		html.replace("%npcId%", String.valueOf(getId()));
+		html.replace("%npcname%", getName());
+		player.sendPacket(html);
+	}
+	
+	private int validateCondition(L2PcInstance player) {
+		if ((getCastle() != null) && (getCastle().getResidenceId() > 0)) {
+			if (getCastle().getSiege().isInProgress()) {
+				return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
+			}
+			return COND_REGULAR;
+		}
+		
+		return COND_ALL_FALSE;
+	}
+	
+	private String getPictureName(L2PcInstance plyr) {
+		int nearestTownId = MapRegionManager.getInstance().getMapRegionLocId(plyr);
+		return switch (nearestTownId) {
+			case 911 -> "GLUDIN";
+			case 912 -> "GLUDIO";
+			case 916 -> "DION";
+			case 918 -> "GIRAN";
+			case 1537 -> "RUNE";
+			case 1538 -> "GODARD";
+			case 1714 -> "SCHUTTGART";
+			default -> "ADEN";
+		};
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java
new file mode 100644
index 00000000..dbf63842
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BlockInstance.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.BlockCheckerEngine;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameChangePoints;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints;
+
+/**
+ * @author BiggBoss
+ */
+public class L2BlockInstance extends L2MonsterInstance {
+	private int _colorEffect;
+	
+	public L2BlockInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	/**
+	 * Will change the color of the block and update the appearance in the known players clients
+	 * @param attacker
+	 * @param holder
+	 * @param team
+	 */
+	public void changeColor(L2PcInstance attacker, ArenaParticipantsHolder holder, int team) {
+		// Do not update color while sending old info
+		synchronized (this) {
+			final BlockCheckerEngine event = holder.getEvent();
+			if (_colorEffect == 0x53) {
+				// Change color
+				_colorEffect = 0x00;
+				// BroadCast to all known players
+				this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
+				increaseTeamPointsAndSend(attacker, team, event);
+			} else {
+				// Change color
+				_colorEffect = 0x53;
+				// BroadCast to all known players
+				this.broadcastPacket(new AbstractNpcInfo.NpcInfo(this, attacker));
+				increaseTeamPointsAndSend(attacker, team, event);
+			}
+			// 30% chance to drop the event items
+			int random = Rnd.get(100);
+			// Bond
+			if ((random > 69) && (random <= 84)) {
+				dropItem(13787, event, attacker);
+			} else if (random > 84) {
+				dropItem(13788, event, attacker);
+			}
+		}
+	}
+	
+	/**
+	 * Sets if the block is red or blue. Mainly used in block spawn
+	 * @param isRed
+	 */
+	public void setRed(boolean isRed) {
+		_colorEffect = isRed ? 0x53 : 0x00;
+	}
+	
+	/**
+	 * @return {@code true} if the block is red at this moment, {@code false} otherwise
+	 */
+	@Override
+	public int getColorEffect() {
+		return _colorEffect;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		if (attacker instanceof L2PcInstance) {
+			return (attacker.getActingPlayer() != null) && (attacker.getActingPlayer().getBlockCheckerArena() > -1);
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		return false;
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if (!canTarget(player)) {
+			return;
+		}
+		
+		player.setLastFolkNPC(this);
+		
+		if (player.getTarget() != this) {
+			player.setTarget(this);
+			getAI(); // wake up ai
+		} else if (interact) {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	private void increaseTeamPointsAndSend(L2PcInstance player, int team, BlockCheckerEngine eng) {
+		eng.increasePlayerPoints(player, team);
+		
+		int timeLeft = (int) ((eng.getStarterTime() - System.currentTimeMillis()) / 1000);
+		boolean isRed = eng.getHolder().getRedPlayers().contains(player);
+		
+		ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints());
+		ExCubeGameExtendedChangePoints secretPoints = new ExCubeGameExtendedChangePoints(timeLeft, eng.getBluePoints(), eng.getRedPoints(), isRed, player, eng.getPlayerPoints(player, isRed));
+		
+		eng.getHolder().broadCastPacketToTeam(changePoints);
+		eng.getHolder().broadCastPacketToTeam(secretPoints);
+	}
+	
+	private void dropItem(int id, BlockCheckerEngine eng, L2PcInstance player) {
+		L2ItemInstance drop = ItemTable.getInstance().createItem("Loot", id, 1, player, this);
+		int x = getX() + Rnd.get(50);
+		int y = getY() + Rnd.get(50);
+		int z = getZ();
+		
+		drop.dropMe(this, x, y, z);
+		
+		eng.addNewDrop(drop);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java
new file mode 100644
index 00000000..72e4897b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.ai.L2BoatAI;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Vehicle;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.network.serverpackets.VehicleDeparture;
+import com.l2jserver.gameserver.network.serverpackets.VehicleInfo;
+import com.l2jserver.gameserver.network.serverpackets.VehicleStarted;
+
+/**
+ * @author Maktakien
+ * @author DS
+ */
+public class L2BoatInstance extends L2Vehicle {
+	
+	public L2BoatInstance(int objectId, L2CharTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2BoatInstance);
+		setAI(new L2BoatAI(this));
+	}
+	
+	@Override
+	public boolean isBoat() {
+		return true;
+	}
+	
+	@Override
+	public int getId() {
+		return 0;
+	}
+	
+	@Override
+	public boolean moveToNextRoutePoint() {
+		final boolean result = super.moveToNextRoutePoint();
+		if (result) {
+			broadcastPacket(new VehicleDeparture(this));
+		}
+		
+		return result;
+	}
+	
+	@Override
+	public void oustPlayer(L2PcInstance player) {
+		super.oustPlayer(player);
+		
+		final Location loc = getOustLoc();
+		if (player.isOnline()) {
+			player.teleToLocation(loc.getX(), loc.getY(), loc.getZ());
+		} else {
+			player.setXYZInvisible(loc.getX(), loc.getY(), loc.getZ()); // disconnects handling
+		}
+	}
+	
+	@Override
+	public void stopMove(Location loc, boolean updateKnownObjects) {
+		super.stopMove(loc, updateKnownObjects);
+		
+		broadcastPacket(new VehicleStarted(this, 0));
+		broadcastPacket(new VehicleInfo(this));
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		activeChar.sendPacket(new VehicleInfo(this));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java
new file mode 100644
index 00000000..c7450a11
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2CastleDoormenInstance.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2CastleDoormenInstance extends L2DoormenInstance {
+	public L2CastleDoormenInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2CastleDoormenInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ChestInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ChestInstance.java
new file mode 100644
index 00000000..a956549b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ChestInstance.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * This class manages all chest.
+ * @author Julian
+ */
+public final class L2ChestInstance extends L2MonsterInstance {
+	private volatile boolean _specialDrop;
+	
+	public L2ChestInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ChestInstance);
+		setIsNoRndWalk(true);
+		_specialDrop = false;
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		_specialDrop = false;
+		setMustRewardExpSp(true);
+	}
+	
+	public synchronized void setSpecialDrop() {
+		_specialDrop = true;
+	}
+	
+	@Override
+	public void doItemDrop(L2NpcTemplate npcTemplate, L2Character lastAttacker) {
+		int id = getTemplate().getId();
+		
+		if (!_specialDrop) {
+			if ((id >= 18265) && (id <= 18286)) {
+				id += 3536;
+			} else if ((id == 18287) || (id == 18288)) {
+				id = 21671;
+			} else if ((id == 18289) || (id == 18290)) {
+				id = 21694;
+			} else if ((id == 18291) || (id == 18292)) {
+				id = 21717;
+			} else if ((id == 18293) || (id == 18294)) {
+				id = 21740;
+			} else if ((id == 18295) || (id == 18296)) {
+				id = 21763;
+			} else if ((id == 18297) || (id == 18298)) {
+				id = 21786;
+			}
+		}
+		super.doItemDrop(NpcData.getInstance().getTemplate(id), lastAttacker);
+	}
+	
+	@Override
+	public boolean isMovementDisabled() {
+		return true;
+	}
+	
+	@Override
+	public boolean hasRandomAnimation() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java
new file mode 100644
index 00000000..994031e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallDoormenInstance.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2ClanHallDoormenInstance extends L2DoormenInstance {
+	/**
+	 * Creates a clan hall doorman.
+	 * @param template the doorman NPC template
+	 */
+	public L2ClanHallDoormenInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ClanHallDoormenInstance);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
new file mode 100644
index 00000000..8c363afe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallManagerInstance.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2ClanHallManagerInstance extends L2MerchantInstance {
+	
+	public L2ClanHallManagerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ClanHallManagerInstance);
+	}
+	
+	@Override
+	public boolean isWarehouse() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ColosseumFence.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ColosseumFence.java
new file mode 100644
index 00000000..8b434b8a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ColosseumFence.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.awt.Rectangle;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.network.serverpackets.ExColosseumFenceInfo;
+
+/**
+ * Colosseum Fence.
+ * @author HorridoJoho
+ */
+public final class L2ColosseumFence extends L2Object {
+	public enum FenceState {
+		HIDDEN, // the fene isn't shown at all
+		OPEN, // the 4 edges of the fence is shown only
+		CLOSED // full fence
+	}
+	
+	private final int _minZ;
+	private final int _maxZ;
+	private final FenceState _state;
+	private final Rectangle _bounds;
+	
+	private L2ColosseumFence(int objectId, int instanceId, int x, int y, int z, int minZ, int maxZ, int width, int height, FenceState state) {
+		super(objectId);
+		setInstanceId(instanceId);
+		setXYZ(x, y, z);
+		_minZ = minZ;
+		_maxZ = maxZ;
+		_state = state;
+		_bounds = new Rectangle(x - (width / 2), y - (height / 2), width, height);
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		activeChar.sendPacket(new ExColosseumFenceInfo(this));
+	}
+	
+	public int getFenceX() {
+		return _bounds.x;
+	}
+	
+	public int getFenceY() {
+		return _bounds.y;
+	}
+	
+	public int getFenceMinZ() {
+		return _minZ;
+	}
+	
+	public int getFenceMaxZ() {
+		return _maxZ;
+	}
+	
+	public int getFenceWidth() {
+		return _bounds.width;
+	}
+	
+	public int getFenceHeight() {
+		return _bounds.height;
+	}
+	
+	public FenceState getFenceState() {
+		return _state;
+	}
+	
+	@Override
+	public int getId() {
+		return getObjectId();
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return false;
+	}
+	
+	public boolean isInsideFence(int x, int y, int z) {
+		return (x >= _bounds.x) && (y >= _bounds.y) && (z >= _minZ) && (z <= _maxZ) && (x <= (_bounds.x + _bounds.width)) && (y <= (_bounds.y + _bounds.height));
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java
new file mode 100644
index 00000000..25b4231d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControlTowerInstance.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Tower;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * Class for Control Tower instance.
+ */
+public class L2ControlTowerInstance extends L2Tower {
+	private static final Logger LOG = LoggerFactory.getLogger(L2ControlTowerInstance.class);
+	
+	private volatile List<L2Spawn> _guards;
+	
+	/**
+	 * Creates a control tower.
+	 * @param template the control tower NPC template
+	 */
+	public L2ControlTowerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ControlTowerInstance);
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (getCastle().getSiege().isInProgress()) {
+			getCastle().getSiege().killedCT(this);
+			
+			if ((_guards != null) && !_guards.isEmpty()) {
+				for (L2Spawn spawn : _guards) {
+					try {
+						spawn.stopRespawn();
+						// spawn.getLastSpawn().doDie(spawn.getLastSpawn());
+					} catch (Exception e) {
+						LOG.warn("Error at L2ControlTowerInstance {}", e);
+					}
+				}
+				_guards.clear();
+			}
+		}
+		return super.doDie(killer);
+	}
+	
+	public void registerGuard(L2Spawn guard) {
+		getGuards().add(guard);
+	}
+	
+	private final List<L2Spawn> getGuards() {
+		if (_guards == null) {
+			synchronized (this) {
+				if (_guards == null) {
+					_guards = new CopyOnWriteArrayList<>();
+				}
+			}
+		}
+		return _guards;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableAirShipInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableAirShipInstance.java
new file mode 100644
index 00000000..27055adb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableAirShipInstance.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.concurrent.Future;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.stat.ControllableAirShipStat;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class L2ControllableAirShipInstance extends L2AirShipInstance {
+	private static final int HELM = 13556;
+	private static final int LOW_FUEL = 40;
+	
+	private int _fuel = 0;
+	private int _maxFuel = 0;
+	
+	private final int _ownerId;
+	private int _helmId;
+	private L2PcInstance _captain = null;
+	
+	private Future<?> _consumeFuelTask;
+	private Future<?> _checkTask;
+	
+	/**
+	 * Creates a controllable air ship.
+	 * @param template the controllable air ship template
+	 * @param ownerId the owner ID
+	 */
+	public L2ControllableAirShipInstance(int objectId, L2CharTemplate template, int ownerId) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ControllableAirShipInstance);
+		_ownerId = ownerId;
+		_helmId = IdFactory.getInstance().getNextId(); // not forget to release !
+	}
+	
+	@Override
+	public ControllableAirShipStat getStat() {
+		return (ControllableAirShipStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new ControllableAirShipStat(this));
+	}
+	
+	@Override
+	public boolean canBeControlled() {
+		return super.canBeControlled() && !isInDock();
+	}
+	
+	@Override
+	public boolean isOwner(L2PcInstance player) {
+		if (_ownerId == 0) {
+			return false;
+		}
+		
+		return (player.getClanId() == _ownerId) || (player.getObjectId() == _ownerId);
+	}
+	
+	@Override
+	public int getOwnerId() {
+		return _ownerId;
+	}
+	
+	@Override
+	public boolean isCaptain(L2PcInstance player) {
+		return (_captain != null) && (player == _captain);
+	}
+	
+	@Override
+	public int getCaptainId() {
+		return _captain != null ? _captain.getObjectId() : 0;
+	}
+	
+	@Override
+	public int getHelmObjectId() {
+		return _helmId;
+	}
+	
+	@Override
+	public int getHelmItemId() {
+		return HELM;
+	}
+	
+	@Override
+	public boolean setCaptain(L2PcInstance player) {
+		if (player == null) {
+			_captain = null;
+		} else {
+			if ((_captain == null) && (player.getAirShip() == this)) {
+				final int x = player.getInVehiclePosition().getX() - 0x16e;
+				final int y = player.getInVehiclePosition().getY();
+				final int z = player.getInVehiclePosition().getZ() - 0x6b;
+				if (((x * x) + (y * y) + (z * z)) > 2500) {
+					player.sendPacket(SystemMessageId.CANT_CONTROL_TOO_FAR);
+					return false;
+				}
+				// TODO: Missing message ID: 2739 Message: You cannot control the helm because you do not meet the requirements.
+				else if (player.isInCombat()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_BATTLE);
+					return false;
+				} else if (player.isSitting()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_SITTING_POSITION);
+					return false;
+				} else if (player.isStunned()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_YOU_ARE_PETRIFIED);
+					return false;
+				} else if (player.isCursedWeaponEquipped()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_A_CURSED_WEAPON_IS_EQUIPPED);
+					return false;
+				} else if (player.isFishing()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_FISHING);
+					return false;
+				} else if (player.isDead() || player.isFakeDeath()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHEN_YOU_ARE_DEAD);
+					return false;
+				} else if (player.isCastingNow()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_USING_A_SKILL);
+					return false;
+				} else if (player.isTransformed()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_TRANSFORMED);
+					return false;
+				} else if (player.isCombatFlagEquipped()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_HOLDING_A_FLAG);
+					return false;
+				} else if (player.isInDuel()) {
+					player.sendPacket(SystemMessageId.YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_DUEL);
+					return false;
+				}
+				_captain = player;
+				player.broadcastUserInfo();
+			} else {
+				return false;
+			}
+		}
+		updateAbnormalEffect();
+		return true;
+	}
+	
+	@Override
+	public int getFuel() {
+		return _fuel;
+	}
+	
+	@Override
+	public void setFuel(int f) {
+		final int old = _fuel;
+		_fuel = Math.min(Math.max(f, 0), _maxFuel);
+		
+		if ((_fuel == 0) && (old > 0)) {
+			broadcastToPassengers(SystemMessage.getSystemMessage(SystemMessageId.THE_AIRSHIP_FUEL_RUN_OUT));
+		} else if (_fuel < LOW_FUEL) {
+			broadcastToPassengers(SystemMessage.getSystemMessage(SystemMessageId.THE_AIRSHIP_FUEL_SOON_RUN_OUT));
+		}
+	}
+	
+	@Override
+	public int getMaxFuel() {
+		return _maxFuel;
+	}
+	
+	@Override
+	public void setMaxFuel(int mf) {
+		_maxFuel = mf;
+	}
+	
+	@Override
+	public void oustPlayer(L2PcInstance player) {
+		if (player == _captain) {
+			setCaptain(null); // no need to broadcast userinfo here
+		}
+		
+		super.oustPlayer(player);
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		_checkTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new CheckTask(), 60000, 10000);
+		_consumeFuelTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ConsumeFuelTask(), 60000, 60000);
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (!super.deleteMe()) {
+			return false;
+		}
+		
+		if (_checkTask != null) {
+			_checkTask.cancel(false);
+			_checkTask = null;
+		}
+		if (_consumeFuelTask != null) {
+			_consumeFuelTask.cancel(false);
+			_consumeFuelTask = null;
+		}
+		
+		broadcastPacket(new DeleteObject(_helmId));
+		return true;
+	}
+	
+	@Override
+	public void refreshID() {
+		super.refreshID();
+		IdFactory.getInstance().releaseId(_helmId);
+		_helmId = IdFactory.getInstance().getNextId();
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		super.sendInfo(activeChar);
+		if (_captain != null) {
+			_captain.sendInfo(activeChar);
+		}
+	}
+	
+	protected final class ConsumeFuelTask implements Runnable {
+		@Override
+		public void run() {
+			int fuel = getFuel();
+			if (fuel > 0) {
+				fuel -= 10;
+				if (fuel < 0) {
+					fuel = 0;
+				}
+				
+				setFuel(fuel);
+				updateAbnormalEffect();
+			}
+		}
+	}
+	
+	protected final class CheckTask implements Runnable {
+		@Override
+		public void run() {
+			if (isVisible() && isEmpty() && !isInDock()) {
+				// deleteMe() can't be called from CheckTask because task should not cancel itself
+				ThreadPoolManager.getInstance().executeGeneral(new DecayTask());
+			}
+		}
+	}
+	
+	protected final class DecayTask implements Runnable {
+		@Override
+		public void run() {
+			deleteMe();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableMobInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableMobInstance.java
new file mode 100644
index 00000000..890d3034
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ControllableMobInstance.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.ai.L2ControllableMobAI;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @author littlecrow
+ */
+public class L2ControllableMobInstance extends L2MonsterInstance {
+	private boolean isInvulnerable;
+	
+	public L2ControllableMobInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ControllableMobInstance);
+	}
+	
+	@Override
+	public boolean isAggressive() {
+		return true;
+	}
+	
+	@Override
+	public int getAggroRange() {
+		// force mobs to be aggro
+		return 500;
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		return new L2ControllableMobAI(this);
+	}
+	
+	@Override
+	public boolean isInvul() {
+		return isInvulnerable;
+	}
+	
+	public void setInvul(boolean isInvulnerable) {
+		this.isInvulnerable = isInvulnerable;
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		setAI(null);
+		return true;
+	}
+	
+	@Override
+	public void detachAI() {
+		// do nothing, AI of controllable mobs can't be detached automatically
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java
new file mode 100644
index 00000000..d560629c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2CubicInstance.java
@@ -0,0 +1,593 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.tasks.cubics.CubicAction;
+import com.l2jserver.gameserver.model.actor.tasks.cubics.CubicDisappear;
+import com.l2jserver.gameserver.model.actor.tasks.cubics.CubicHeal;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.entity.TvTEventTeam;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public final class L2CubicInstance implements IIdentifiable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2CubicInstance.class);
+	
+	// Type of Cubics
+	public static final int STORM_CUBIC = 1;
+	public static final int VAMPIRIC_CUBIC = 2;
+	public static final int LIFE_CUBIC = 3;
+	public static final int VIPER_CUBIC = 4;
+	public static final int POLTERGEIST_CUBIC = 5;
+	public static final int BINDING_CUBIC = 6;
+	public static final int AQUA_CUBIC = 7;
+	public static final int SPARK_CUBIC = 8;
+	public static final int ATTRACT_CUBIC = 9;
+	public static final int SMART_CUBIC_EVATEMPLAR = 10;
+	public static final int SMART_CUBIC_SHILLIENTEMPLAR = 11;
+	public static final int SMART_CUBIC_ARCANALORD = 12;
+	public static final int SMART_CUBIC_ELEMENTALMASTER = 13;
+	public static final int SMART_CUBIC_SPECTRALMASTER = 14;
+	
+	// Max range of cubic skills
+	// TODO: Check/fix the max range
+	public static final int MAX_MAGIC_RANGE = 900;
+	
+	// Cubic skills
+	public static final int SKILL_CUBIC_HEAL = 4051;
+	public static final int SKILL_CUBIC_CURE = 5579;
+	
+	private final L2PcInstance _owner;
+	private L2Character _target;
+	
+	private final int _cubicId;
+	private final int _cubicPower;
+	private final int _cubicDelay;
+	private final int _cubicSkillChance;
+	private final int _cubicMaxCount;
+	private boolean _active;
+	private final boolean _givenByOther;
+	
+	private final List<Skill> _skills = new ArrayList<>();
+	
+	private Future<?> _disappearTask;
+	private Future<?> _actionTask;
+	
+	public L2CubicInstance(L2PcInstance owner, int cubicId, int level, int cubicPower, int cubicDelay, int cubicSkillChance, int cubicMaxCount, int cubicDuration, boolean givenByOther) {
+		_owner = owner;
+		_cubicId = cubicId;
+		_cubicPower = cubicPower;
+		_cubicDelay = cubicDelay * 1000;
+		_cubicSkillChance = cubicSkillChance;
+		_cubicMaxCount = cubicMaxCount;
+		_active = false;
+		_givenByOther = givenByOther;
+		
+		switch (_cubicId) {
+			case STORM_CUBIC -> _skills.add(SkillData.getInstance().getSkill(4049, level));
+			case VAMPIRIC_CUBIC -> _skills.add(SkillData.getInstance().getSkill(4050, level));
+			case LIFE_CUBIC -> {
+				_skills.add(SkillData.getInstance().getSkill(4051, level));
+				doAction();
+			}
+			case VIPER_CUBIC -> _skills.add(SkillData.getInstance().getSkill(4052, level));
+			case POLTERGEIST_CUBIC -> {
+				_skills.add(SkillData.getInstance().getSkill(4053, level));
+				_skills.add(SkillData.getInstance().getSkill(4054, level));
+				_skills.add(SkillData.getInstance().getSkill(4055, level));
+			}
+			case BINDING_CUBIC -> _skills.add(SkillData.getInstance().getSkill(4164, level));
+			case AQUA_CUBIC -> _skills.add(SkillData.getInstance().getSkill(4165, level));
+			case SPARK_CUBIC -> _skills.add(SkillData.getInstance().getSkill(4166, level));
+			case ATTRACT_CUBIC -> {
+				_skills.add(SkillData.getInstance().getSkill(5115, level));
+				_skills.add(SkillData.getInstance().getSkill(5116, level));
+			}
+			case SMART_CUBIC_ARCANALORD -> {
+				_skills.add(SkillData.getInstance().getSkill(4051, 7));
+				_skills.add(SkillData.getInstance().getSkill(4165, 9));
+			}
+			case SMART_CUBIC_ELEMENTALMASTER -> {
+				_skills.add(SkillData.getInstance().getSkill(4049, 8));
+				_skills.add(SkillData.getInstance().getSkill(4166, 9));
+			}
+			case SMART_CUBIC_SPECTRALMASTER -> {
+				_skills.add(SkillData.getInstance().getSkill(4049, 8));
+				_skills.add(SkillData.getInstance().getSkill(4052, 6));
+			}
+			case SMART_CUBIC_EVATEMPLAR -> {
+				_skills.add(SkillData.getInstance().getSkill(4053, 8));
+				_skills.add(SkillData.getInstance().getSkill(4165, 9));
+			}
+			case SMART_CUBIC_SHILLIENTEMPLAR -> {
+				_skills.add(SkillData.getInstance().getSkill(4049, 8));
+				_skills.add(SkillData.getInstance().getSkill(5115, 4));
+			}
+		}
+		_disappearTask = ThreadPoolManager.getInstance().scheduleGeneral(new CubicDisappear(this), cubicDuration * 1000);
+	}
+	
+	public synchronized void doAction() {
+		if (_active) {
+			return;
+		}
+		_active = true;
+		
+		switch (_cubicId) {
+			case AQUA_CUBIC, BINDING_CUBIC, SPARK_CUBIC, STORM_CUBIC, POLTERGEIST_CUBIC, VAMPIRIC_CUBIC, VIPER_CUBIC, //
+				ATTRACT_CUBIC, SMART_CUBIC_ARCANALORD, SMART_CUBIC_ELEMENTALMASTER, SMART_CUBIC_SPECTRALMASTER, SMART_CUBIC_EVATEMPLAR, //
+				SMART_CUBIC_SHILLIENTEMPLAR -> _actionTask = ThreadPoolManager.getInstance()
+					.scheduleEffectAtFixedRate(new CubicAction(this, _cubicSkillChance), 0, _cubicDelay);
+			case LIFE_CUBIC -> _actionTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new CubicHeal(this), 0, _cubicDelay);
+		}
+	}
+	
+	@Override
+	public int getId() {
+		return _cubicId;
+	}
+	
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	public int getCubicPower() {
+		return _cubicPower;
+	}
+	
+	public L2Character getTarget() {
+		return _target;
+	}
+	
+	public void setTarget(L2Character target) {
+		_target = target;
+	}
+	
+	public List<Skill> getSkills() {
+		return _skills;
+	}
+	
+	public int getCubicMaxCount() {
+		return _cubicMaxCount;
+	}
+	
+	public void stopAction() {
+		_target = null;
+		if (_actionTask != null) {
+			_actionTask.cancel(true);
+			_actionTask = null;
+		}
+		_active = false;
+	}
+	
+	public void cancelDisappear() {
+		if (_disappearTask != null) {
+			_disappearTask.cancel(true);
+			_disappearTask = null;
+		}
+	}
+	
+	/** this sets the enemy target for a cubic */
+	public void getCubicTarget() {
+		try {
+			_target = null;
+			L2Object ownerTarget = _owner.getTarget();
+			if (ownerTarget == null) {
+				return;
+			}
+			// TvT event targeting
+			if (TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_owner.getObjectId())) {
+				TvTEventTeam enemyTeam = TvTEvent.getParticipantEnemyTeam(_owner.getObjectId());
+				
+				if (ownerTarget.getActingPlayer() != null) {
+					L2PcInstance target = ownerTarget.getActingPlayer();
+					if (enemyTeam.containsPlayer(target.getObjectId()) && !(target.isDead())) {
+						_target = (L2Character) ownerTarget;
+					}
+				}
+				return;
+			}
+			// Duel targeting
+			if (_owner.isInDuel()) {
+				L2PcInstance PlayerA = DuelManager.getInstance().getDuel(_owner.getDuelId()).getTeamLeaderA();
+				L2PcInstance PlayerB = DuelManager.getInstance().getDuel(_owner.getDuelId()).getTeamLeaderB();
+				
+				if (DuelManager.getInstance().getDuel(_owner.getDuelId()).isPartyDuel()) {
+					L2Party partyA = PlayerA.getParty();
+					L2Party partyB = PlayerB.getParty();
+					L2Party partyEnemy = null;
+					
+					if (partyA != null) {
+						if (partyA.getMembers().contains(_owner)) {
+							if (partyB != null) {
+								partyEnemy = partyB;
+							} else {
+								_target = PlayerB;
+							}
+						} else {
+							partyEnemy = partyA;
+						}
+					} else {
+						if (PlayerA == _owner) {
+							if (partyB != null) {
+								partyEnemy = partyB;
+							} else {
+								_target = PlayerB;
+							}
+						} else {
+							_target = PlayerA;
+						}
+					}
+					if ((_target == PlayerA) || (_target == PlayerB)) {
+						if (_target == ownerTarget) {
+							return;
+						}
+					}
+					if (partyEnemy != null) {
+						if (partyEnemy.getMembers().contains(ownerTarget)) {
+							_target = (L2Character) ownerTarget;
+						}
+						return;
+					}
+				}
+				if ((PlayerA != _owner) && (ownerTarget == PlayerA)) {
+					_target = PlayerA;
+					return;
+				}
+				if ((PlayerB != _owner) && (ownerTarget == PlayerB)) {
+					_target = PlayerB;
+					return;
+				}
+				_target = null;
+				return;
+			}
+			// Olympiad targeting
+			if (_owner.isInOlympiadMode()) {
+				if (_owner.isOlympiadStart()) {
+					if (ownerTarget.isPlayable()) {
+						final L2PcInstance targetPlayer = ownerTarget.getActingPlayer();
+						if ((targetPlayer != null) && (targetPlayer.getOlympiadGameId() == _owner.getOlympiadGameId()) && (targetPlayer.getOlympiadSide() != _owner.getOlympiadSide())) {
+							_target = (L2Character) ownerTarget;
+						}
+					}
+				}
+				return;
+			}
+			// test owners target if it is valid then use it
+			if (ownerTarget.isCharacter() && (ownerTarget != _owner.getSummon()) && (ownerTarget != _owner)) {
+				// target mob which has aggro on you or your summon
+				if (ownerTarget.isAttackable()) {
+					final L2Attackable attackable = (L2Attackable) ownerTarget;
+					if (attackable.isInAggroList(_owner) && !attackable.isDead()) {
+						_target = (L2Character) ownerTarget;
+						return;
+					}
+					if (_owner.hasSummon()) {
+						if (attackable.isInAggroList(_owner.getSummon()) && !attackable.isDead()) {
+							_target = (L2Character) ownerTarget;
+							return;
+						}
+					}
+				}
+				
+				// get target in pvp or in siege
+				L2PcInstance enemy = null;
+				
+				if (((_owner.getPvpFlag() > 0) && !_owner.isInsideZone(ZoneId.PEACE)) || _owner.isInsideZone(ZoneId.PVP)) {
+					if (!((L2Character) ownerTarget).isDead()) {
+						enemy = ownerTarget.getActingPlayer();
+					}
+					
+					if (enemy != null) {
+						boolean targetIt = true;
+						
+						if (_owner.getParty() != null) {
+							if (_owner.getParty().getMembers().contains(enemy)) {
+								targetIt = false;
+							} else if (_owner.getParty().getCommandChannel() != null) {
+								if (_owner.getParty().getCommandChannel().getMembers().contains(enemy)) {
+									targetIt = false;
+								}
+							}
+						}
+						if ((_owner.getClan() != null) && !_owner.isInsideZone(ZoneId.PVP)) {
+							if (_owner.getClan().isMember(enemy.getObjectId())) {
+								targetIt = false;
+							}
+							if ((_owner.getAllyId() > 0) && (enemy.getAllyId() > 0)) {
+								if (_owner.getAllyId() == enemy.getAllyId()) {
+									targetIt = false;
+								}
+							}
+						}
+						if ((enemy.getPvpFlag() == 0) && !enemy.isInsideZone(ZoneId.PVP)) {
+							targetIt = false;
+						}
+						if (enemy.isInsideZone(ZoneId.PEACE)) {
+							targetIt = false;
+						}
+						if ((_owner.getSiegeState() > 0) && (_owner.getSiegeState() == enemy.getSiegeState())) {
+							targetIt = false;
+						}
+						if (!enemy.isVisible()) {
+							targetIt = false;
+						}
+						
+						if (targetIt) {
+							_target = enemy;
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Error while get cubic target!", ex);
+		}
+	}
+	
+	public void useCubicContinuous(Skill skill, List<L2Object> targets) {
+		int index = 0;
+		for (var object : targets) {
+			if ((object == null) || !object.isCharacter()) {
+				continue;
+			}
+			
+			final var target = (L2Character) object;
+			if (target.isDead()) {
+				continue;
+			}
+			
+			if (skill.isBad()) {
+				byte shld = Formulas.calcShldUse(_owner, target, skill);
+				boolean acted = Formulas.calcCubicSkillSuccess(this, target, skill, shld);
+				if (!acted) {
+					_owner.sendPacket(SystemMessageId.ATTACK_FAILED);
+					continue;
+				}
+				
+			}
+			
+			// Apply effects
+			skill.applyEffects(_owner, target, index++, false, false, true, 0);
+		}
+	}
+	
+	public void useCubicMdam(Skill skill, List<L2Object> targets) {
+		for (var object : targets) {
+			if ((object == null) || !object.isCharacter()) {
+				continue;
+			}
+			
+			final var target = (L2Character) object;
+			if (target.isAlikeDead()) {
+				if (target.isPlayer()) {
+					target.stopFakeDeath(true);
+				} else {
+					continue;
+				}
+			}
+			
+			boolean mcrit = Formulas.calcMCrit(_owner.getMCriticalHit(target, skill));
+			byte shld = Formulas.calcShldUse(_owner, target, skill);
+			double damage = Formulas.calcMagicDam(this, target, skill, mcrit, shld);
+			
+			if (general().debug()) {
+				LOG.debug("L2SkillMdam: useCubicSkill() -> damage = " + damage);
+			}
+			
+			if (damage > 0) {
+				// Manage attack or cast break of the target (calculating rate, sending message...)
+				if (!target.isRaid() && Formulas.calcAtkBreak(target, damage)) {
+					target.breakAttack();
+					target.breakCast();
+				}
+				
+				// Shield Deflect Magic: If target is reflecting the skill then no damage is done.
+				if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, skill) > Rnd.get(100)) {
+					damage = 0;
+				} else {
+					_owner.sendDamageMessage(target, (int) damage, mcrit, false, false);
+					target.reduceCurrentHp(damage, _owner, skill);
+				}
+			}
+		}
+	}
+	
+	public void useCubicDrain(Skill skill, List<L2Object> targets) {
+		for (var object : targets) {
+			if ((object == null) || !object.isCharacter()) {
+				continue;
+			}
+			
+			final var target = (L2Character) object;
+			if (target.isAlikeDead()) {
+				continue;
+			}
+			
+			boolean mcrit = Formulas.calcMCrit(_owner.getMCriticalHit(target, skill));
+			byte shld = Formulas.calcShldUse(_owner, target, skill);
+			
+			double damage = Formulas.calcMagicDam(this, target, skill, mcrit, shld);
+			if (general().debug()) {
+				LOG.debug("L2SkillDrain: useCubicSkill() -> damage = " + damage);
+			}
+			
+			// TODO: Unhardcode fixed value
+			double hpAdd = (0.4 * damage);
+			L2PcInstance owner = _owner;
+			double hp = ((owner.getCurrentHp() + hpAdd) > owner.getMaxHp() ? owner.getMaxHp() : (owner.getCurrentHp() + hpAdd));
+			
+			owner.setCurrentHp(hp);
+			
+			// Check to see if we should damage the target
+			if ((damage > 0) && !target.isDead()) {
+				target.reduceCurrentHp(damage, _owner, skill);
+				
+				// Manage attack or cast break of the target (calculating rate, sending message...)
+				if (!target.isRaid() && Formulas.calcAtkBreak(target, damage)) {
+					target.breakAttack();
+					target.breakCast();
+				}
+				owner.sendDamageMessage(target, (int) damage, mcrit, false, false);
+			}
+		}
+	}
+	
+	public void useCubicDisabler(Skill skill, List<L2Object> targets) {
+		int index = 0;
+		for (var object : targets) {
+			if ((object == null) || !object.isCharacter()) {
+				continue;
+			}
+			
+			final var target = (L2Character) object;
+			if (target.isDead()) {
+				continue;
+			}
+			
+			byte shld = Formulas.calcShldUse(_owner, target, skill);
+			
+			if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT, L2EffectType.AGGRESSION)) {
+				if (Formulas.calcCubicSkillSuccess(this, target, skill, shld)) {
+					// Apply effects
+					skill.applyEffects(_owner, target, index++, false, false, true, 0);
+					
+					if (general().debug()) {
+						LOG.debug("Disablers: useCubicSkill() -> success");
+					}
+				} else {
+					if (general().debug()) {
+						LOG.debug("Disablers: useCubicSkill() -> failed");
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @param owner
+	 * @param target
+	 * @return true if the target is inside of the owner's max Cubic range
+	 */
+	public static boolean isInCubicRange(L2Character owner, L2Character target) {
+		if ((owner == null) || (target == null)) {
+			return false;
+		}
+		
+		int x, y, z;
+		// temporary range check until real behavior of cubics is known/coded
+		int range = MAX_MAGIC_RANGE;
+		
+		x = (owner.getX() - target.getX());
+		y = (owner.getY() - target.getY());
+		z = (owner.getZ() - target.getZ());
+		
+		return (((x * x) + (y * y) + (z * z)) <= (range * range));
+	}
+	
+	/** this sets the friendly target for a cubic */
+	public void cubicTargetForHeal() {
+		L2Character target = null;
+		double percentleft = 100.0;
+		L2Party party = _owner.getParty();
+		
+		// if owner is in a duel but not in a party duel, then it is the same as he does not have a party
+		if (_owner.isInDuel()) {
+			if (!DuelManager.getInstance().getDuel(_owner.getDuelId()).isPartyDuel()) {
+				party = null;
+			}
+		}
+		
+		if ((party != null) && !_owner.isInOlympiadMode()) {
+			// Get all visible objects in a spheric area near the L2Character
+			// Get a list of Party Members
+			for (L2Character partyMember : party.getMembers()) {
+				if (!partyMember.isDead()) {
+					// if party member not dead, check if he is in cast range of heal cubic
+					if (isInCubicRange(_owner, partyMember)) {
+						// member is in cubic casting range, check if he need heal and if he have
+						// the lowest HP
+						if (partyMember.getCurrentHp() < partyMember.getMaxHp()) {
+							if (percentleft > (partyMember.getCurrentHp() / partyMember.getMaxHp())) {
+								percentleft = (partyMember.getCurrentHp() / partyMember.getMaxHp());
+								target = partyMember;
+							}
+						}
+					}
+				}
+				if (partyMember.getSummon() != null) {
+					if (partyMember.getSummon().isDead()) {
+						continue;
+					}
+					
+					// If party member's pet not dead, check if it is in cast range of heal cubic.
+					if (!isInCubicRange(_owner, partyMember.getSummon())) {
+						continue;
+					}
+					
+					// member's pet is in cubic casting range, check if he need heal and if he have
+					// the lowest HP
+					if (partyMember.getSummon().getCurrentHp() < partyMember.getSummon().getMaxHp()) {
+						if (percentleft > (partyMember.getSummon().getCurrentHp() / partyMember.getSummon().getMaxHp())) {
+							percentleft = (partyMember.getSummon().getCurrentHp() / partyMember.getSummon().getMaxHp());
+							target = partyMember.getSummon();
+						}
+					}
+				}
+			}
+		} else {
+			if (_owner.getCurrentHp() < _owner.getMaxHp()) {
+				percentleft = (_owner.getCurrentHp() / _owner.getMaxHp());
+				target = _owner;
+			}
+			if (_owner.hasSummon()) {
+				if (!_owner.getSummon().isDead() && (_owner.getSummon().getCurrentHp() < _owner.getSummon().getMaxHp()) && (percentleft > (_owner.getSummon().getCurrentHp() / _owner.getSummon().getMaxHp())) && isInCubicRange(_owner, _owner.getSummon())) {
+					target = _owner.getSummon();
+				}
+			}
+		}
+		
+		_target = target;
+	}
+	
+	public boolean givenByOther() {
+		return _givenByOther;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java
new file mode 100644
index 00000000..7c2e7f78
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DecoyInstance.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Decoy;
+import com.l2jserver.gameserver.model.actor.knownlist.DecoyKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+
+public class L2DecoyInstance extends L2Decoy {
+	private int _totalLifeTime;
+	private int _timeRemaining;
+	private Future<?> _DecoyLifeTask;
+	private Future<?> _HateSpam;
+	
+	public L2DecoyInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, int totalLifeTime) {
+		super(objectId, template, owner);
+		setInstanceType(InstanceType.L2DecoyInstance);
+		_totalLifeTime = totalLifeTime;
+		_timeRemaining = _totalLifeTime;
+		int skillLevel = getTemplate().getDisplayId() - 13070;
+		_DecoyLifeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new DecoyLifetime(getOwner(), this), 1000, 1000);
+		_HateSpam = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new HateSpam(this, SkillData.getInstance().getSkill(5272, skillLevel)), 2000, 5000);
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		if (_HateSpam != null) {
+			_HateSpam.cancel(true);
+			_HateSpam = null;
+		}
+		_totalLifeTime = 0;
+		DecayTaskManager.getInstance().add(this);
+		return true;
+	}
+	
+	@Override
+	public DecoyKnownList getKnownList() {
+		return (DecoyKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new DecoyKnownList(this));
+	}
+	
+	static class DecoyLifetime implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(DecoyLifetime.class);
+		private final L2PcInstance _activeChar;
+		private final L2DecoyInstance _Decoy;
+		
+		DecoyLifetime(L2PcInstance activeChar, L2DecoyInstance Decoy) {
+			_activeChar = activeChar;
+			_Decoy = Decoy;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_Decoy.decTimeRemaining(1000);
+				double newTimeRemaining = _Decoy.getTimeRemaining();
+				if (newTimeRemaining < 0) {
+					_Decoy.unSummon(_activeChar);
+				}
+			} catch (Exception ex) {
+				LOG.error("Error running decoy lifetime task!", ex);
+			}
+		}
+	}
+	
+	private static class HateSpam implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(HateSpam.class);
+		private final L2DecoyInstance _activeChar;
+		private final Skill _skill;
+		
+		HateSpam(L2DecoyInstance activeChar, Skill Hate) {
+			_activeChar = activeChar;
+			_skill = Hate;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_activeChar.setTarget(_activeChar);
+				_activeChar.doCast(_skill);
+			} catch (Throwable ex) {
+				LOG.error("Error running decoy hate spam task!", ex);
+			}
+		}
+	}
+	
+	@Override
+	public void unSummon(L2PcInstance owner) {
+		if (_DecoyLifeTask != null) {
+			_DecoyLifeTask.cancel(true);
+			_DecoyLifeTask = null;
+		}
+		if (_HateSpam != null) {
+			_HateSpam.cancel(true);
+			_HateSpam = null;
+		}
+		super.unSummon(owner);
+	}
+	
+	public void decTimeRemaining(int value) {
+		_timeRemaining -= value;
+	}
+	
+	public int getTimeRemaining() {
+		return _timeRemaining;
+	}
+	
+	public int getTotalLifeTime() {
+		return _totalLifeTime;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java
new file mode 100644
index 00000000..2c3145de
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DefenderInstance.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.ai.L2FortSiegeGuardAI;
+import com.l2jserver.gameserver.ai.L2SiegeGuardAI;
+import com.l2jserver.gameserver.ai.L2SpecialSiegeGuardAI;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.knownlist.DefenderKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public class L2DefenderInstance extends L2Attackable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2DefenderInstance.class);
+	private Castle _castle = null; // the castle which the instance should defend
+	private Fort _fort = null; // the fortress which the instance should defend
+	private SiegableHall _hall = null; // the siegable hall which the instance should defend
+	
+	public L2DefenderInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2DefenderInstance);
+	}
+	
+	@Override
+	public DefenderKnownList getKnownList() {
+		return (DefenderKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new DefenderKnownList(this));
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		if ((getConquerableHall() == null) && (getCastle(10000) == null)) {
+			return new L2FortSiegeGuardAI(this);
+		} else if (getCastle(10000) != null) {
+			return new L2SiegeGuardAI(this);
+		}
+		return new L2SpecialSiegeGuardAI(this);
+	}
+	
+	/**
+	 * Return True if a siege is in progress and the L2Character attacker isn't a Defender.
+	 * @param attacker The L2Character that the L2SiegeGuardInstance try to attack
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		// Attackable during siege by all except defenders
+		if (!(attacker instanceof L2Playable)) {
+			return false;
+		}
+		
+		L2PcInstance player = attacker.getActingPlayer();
+		
+		// Check if siege is in progress
+		if (((_fort != null) && _fort.getZone().isActive()) || ((_castle != null) && _castle.getZone().isActive()) || ((_hall != null) && _hall.getSiegeZone().isActive())) {
+			int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0)));
+			
+			// Check if player is an enemy of this defender npc
+			return (player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1) && !TerritoryWarManager.getInstance().isAllyField(player, activeSiegeId)) || (player.getSiegeState() == 0));
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean hasRandomAnimation() {
+		return false;
+	}
+	
+	/**
+	 * This method forces guard to return to home location previously set
+	 */
+	@Override
+	public void returnHome() {
+		if (getWalkSpeed() <= 0) {
+			return;
+		}
+		if (getSpawn() == null) {
+			return;
+		}
+		if (!isInsideRadius(getSpawn(), 40, false, false)) {
+			if (general().debug()) {
+				LOG.debug("{} moving home", getObjectId());
+			}
+			setisReturningToSpawnPoint(true);
+			clearAggroList();
+			
+			if (hasAI()) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation());
+			}
+		}
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		
+		_fort = FortManager.getInstance().getFort(getX(), getY(), getZ());
+		_castle = CastleManager.getInstance().getCastle(getX(), getY(), getZ());
+		_hall = getConquerableHall();
+		if ((_fort == null) && (_castle == null) && (_hall == null)) {
+			LOG.warn("L2DefenderInstance spawned outside of Fortress, Castle or Siegable hall Zone! NpcId: {} x={} y={} z={}", getId(), getX(), getY(), getZ());
+		}
+	}
+	
+	/**
+	 * Custom onAction behaviour. Note that super() is not called because guards need extra check to see if a player should interact or ATTACK them when clicked.
+	 */
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if (!canTarget(player)) {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Check if the L2PcInstance already target the L2NpcInstance
+		if (this != player.getTarget()) {
+			if (general().debug()) {
+				LOG.debug("new target selected: {}", getObjectId());
+			}
+			
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			if (isAutoAttackable(player) && !isAlikeDead()) {
+				if (Math.abs(player.getZ() - getZ()) < 600) // this max height difference might need some tweaking
+				{
+					player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+				}
+			}
+			if (!isAutoAttackable(player)) {
+				if (!canInteract(player)) {
+					// Notify the L2PcInstance AI with AI_INTENTION_INTERACT
+					player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, this);
+				}
+			}
+		}
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void addDamageHate(L2Character attacker, int damage, long aggro) {
+		if (attacker == null) {
+			return;
+		}
+		
+		if (!(attacker instanceof L2DefenderInstance)) {
+			if ((damage == 0) && (aggro <= 1) && (attacker instanceof L2Playable)) {
+				L2PcInstance player = attacker.getActingPlayer();
+				// Check if siege is in progress
+				if (((_fort != null) && _fort.getZone().isActive()) || ((_castle != null) && _castle.getZone().isActive()) || ((_hall != null) && _hall.getSiegeZone().isActive())) {
+					int activeSiegeId = (_fort != null ? _fort.getResidenceId() : (_castle != null ? _castle.getResidenceId() : (_hall != null ? _hall.getId() : 0)));
+					if ((player != null) && (((player.getSiegeState() == 2) && player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1) && TerritoryWarManager.getInstance().isAllyField(player, activeSiegeId)))) {
+						return;
+					}
+				}
+			}
+			super.addDamageHate(attacker, damage, aggro);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
new file mode 100644
index 00000000..e168edc5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DoorInstance.java
@@ -0,0 +1,652 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.ai.L2DoorAI;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.knownlist.DoorKnownList;
+import com.l2jserver.gameserver.model.actor.stat.DoorStat;
+import com.l2jserver.gameserver.model.actor.status.DoorStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.DoorStatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.OnEventTrigger;
+import com.l2jserver.gameserver.network.serverpackets.StaticObject;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class L2DoorInstance extends L2Character {
+	private static final Logger LOG = LoggerFactory.getLogger(L2DoorInstance.class);
+	
+	public static final byte OPEN_BY_CLICK = 1;
+	public static final byte OPEN_BY_TIME = 2;
+	public static final byte OPEN_BY_ITEM = 4;
+	public static final byte OPEN_BY_SKILL = 8;
+	public static final byte OPEN_BY_CYCLE = 16;
+	
+	/** The castle index in the array of L2Castle this L2NpcInstance belongs to */
+	private int _castleIndex = -2;
+	/** The fort index in the array of L2Fort this L2NpcInstance belongs to */
+	private int _fortIndex = -2;
+	private ClanHall _clanHall;
+	private boolean _open;
+	private boolean _isAttackableDoor;
+	private boolean _isTargetable;
+	private int _meshindex = 1;
+	// used for autoclose on open
+	private Future<?> _autoCloseTask;
+	
+	public L2DoorInstance(int objectId, L2DoorTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2DoorInstance);
+		setIsInvul(false);
+		setLethalable(false);
+		_open = template.isOpenByDefault();
+		_isAttackableDoor = template.isAttackable();
+		_isTargetable = template.isTargetable();
+		
+		if (getGroupName() != null) {
+			DoorData.addDoorGroup(getGroupName(), getId());
+		}
+		
+		if (isOpenableByTime()) {
+			startTimerOpen();
+		}
+		
+		int clanhallId = template.getClanHallId();
+		if (clanhallId > 0) {
+			ClanHall hall = ClanHallManager.getInstance().getAllClanHalls().get(clanhallId);
+			if (hall != null) {
+				setClanHall(hall);
+				hall.getDoors().add(this);
+			}
+		}
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		return new L2DoorAI(this);
+	}
+	
+	private void startTimerOpen() {
+		int delay = _open ? getTemplate().getOpenTime() : getTemplate().getCloseTime();
+		if (getTemplate().getRandomTime() > 0) {
+			delay += Rnd.get(getTemplate().getRandomTime());
+		}
+		ThreadPoolManager.getInstance().scheduleGeneral(new TimerOpen(), delay * 1000);
+	}
+	
+	@Override
+	public final DoorKnownList getKnownList() {
+		return (DoorKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new DoorKnownList(this));
+	}
+	
+	@Override
+	public L2DoorTemplate getTemplate() {
+		return (L2DoorTemplate) super.getTemplate();
+		
+	}
+	
+	@Override
+	public final DoorStatus getStatus() {
+		return (DoorStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new DoorStatus(this));
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new DoorStat(this));
+	}
+	
+	@Override
+	public DoorStat getStat() {
+		return (DoorStat) super.getStat();
+	}
+	
+	/**
+	 * @return {@code true} if door is open-able by skill.
+	 */
+	public final boolean isOpenableBySkill() {
+		return (getTemplate().getOpenType() & OPEN_BY_SKILL) == OPEN_BY_SKILL;
+	}
+	
+	/**
+	 * @return {@code true} if door is open-able by item.
+	 */
+	public final boolean isOpenableByItem() {
+		return (getTemplate().getOpenType() & OPEN_BY_ITEM) == OPEN_BY_ITEM;
+	}
+	
+	/**
+	 * @return {@code true} if door is open-able by double-click.
+	 */
+	public final boolean isOpenableByClick() {
+		return (getTemplate().getOpenType() & OPEN_BY_CLICK) == OPEN_BY_CLICK;
+	}
+	
+	/**
+	 * @return {@code true} if door is open-able by time.
+	 */
+	public final boolean isOpenableByTime() {
+		return (getTemplate().getOpenType() & OPEN_BY_TIME) == OPEN_BY_TIME;
+	}
+	
+	/**
+	 * @return {@code true} if door is open-able by Field Cycle system.
+	 */
+	public final boolean isOpenableByCycle() {
+		return (getTemplate().getOpenType() & OPEN_BY_CYCLE) == OPEN_BY_CYCLE;
+	}
+	
+	@Override
+	public final int getLevel() {
+		return getTemplate().getLevel();
+	}
+	
+	/**
+	 * Gets the door ID.
+	 * @return the door ID
+	 */
+	@Override
+	public int getId() {
+		return getTemplate().getId();
+	}
+	
+	/**
+	 * @return Returns the open.
+	 */
+	public boolean getOpen() {
+		return _open;
+	}
+	
+	/**
+	 * @param open The open to set.
+	 */
+	public void setOpen(boolean open) {
+		_open = open;
+		if (getChildId() > 0) {
+			L2DoorInstance sibling = getSiblingDoor(getChildId());
+			if (sibling != null) {
+				sibling.notifyChildEvent(open);
+			} else {
+				LOG.warn("Cannot find child id: {}", getChildId());
+			}
+		}
+	}
+	
+	public boolean getIsAttackableDoor() {
+		return _isAttackableDoor;
+	}
+	
+	public boolean getIsShowHp() {
+		return getTemplate().isShowHp();
+	}
+	
+	public void setIsAttackableDoor(boolean val) {
+		_isAttackableDoor = val;
+	}
+	
+	public int getDamage() {
+		int dmg = 6 - (int) Math.ceil((getCurrentHp() / getMaxHp()) * 6);
+		if (dmg > 6) {
+			return 6;
+		}
+		return Math.max(dmg, 0);
+	}
+	
+	// TODO: Replace index with the castle id itself.
+	public final Castle getCastle() {
+		if (_castleIndex < 0) {
+			_castleIndex = CastleManager.getInstance().getCastleIndex(this);
+		}
+		if (_castleIndex < 0) {
+			return null;
+		}
+		return CastleManager.getInstance().getCastles().get(_castleIndex);
+	}
+	
+	// TODO: Replace index with the fort id itself.
+	public final Fort getFort() {
+		if (_fortIndex < 0) {
+			_fortIndex = FortManager.getInstance().getFortIndex(this);
+		}
+		if (_fortIndex < 0) {
+			return null;
+		}
+		return FortManager.getInstance().getForts().get(_fortIndex);
+	}
+	
+	public void setClanHall(ClanHall clanhall) {
+		_clanHall = clanhall;
+	}
+	
+	public ClanHall getClanHall() {
+		return _clanHall;
+	}
+	
+	public boolean isEnemy() {
+		if ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive() && getIsShowHp()) {
+			return true;
+		}
+		if ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive() && getIsShowHp()) {
+			return true;
+		}
+		return (getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).getSiegeZone().isActive() && getIsShowHp();
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		// Doors can`t be attacked by NPCs
+		if (!(attacker instanceof L2Playable)) {
+			return false;
+		}
+		
+		if (getIsAttackableDoor()) {
+			return true;
+		}
+		if (!getIsShowHp()) {
+			return false;
+		}
+		
+		L2PcInstance actingPlayer = attacker.getActingPlayer();
+		
+		if (getClanHall() != null) {
+			SiegableHall hall = (SiegableHall) getClanHall();
+			if (!hall.isSiegableHall()) {
+				return false;
+			}
+			return hall.isInSiege() && hall.getSiege().doorIsAutoAttackable() && hall.getSiege().checkIsAttacker(actingPlayer.getClan());
+		}
+		// Attackable only during siege by everyone (not owner)
+		boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getZone().isActive());
+		boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getZone().isActive());
+		int activeSiegeId = (getFort() != null ? getFort().getResidenceId() : (getCastle() != null ? getCastle().getResidenceId() : 0));
+		
+		if (TerritoryWarManager.getInstance().isTWInProgress()) {
+			return !TerritoryWarManager.getInstance().isAllyField(actingPlayer, activeSiegeId);
+		} else if (isFort) {
+			L2Clan clan = actingPlayer.getClan();
+			if ((clan != null) && (clan == getFort().getOwnerClan())) {
+				return false;
+			}
+		} else if (isCastle) {
+			L2Clan clan = actingPlayer.getClan();
+			if ((clan != null) && (clan.getId() == getCastle().getOwnerId())) {
+				return false;
+			}
+		}
+		return (isCastle || isFort);
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+	}
+	
+	/**
+	 * Return null.
+	 */
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public void broadcastStatusUpdate() {
+		Collection<L2PcInstance> knownPlayers = getKnownList().getKnownPlayers().values();
+		if (knownPlayers.isEmpty()) {
+			return;
+		}
+		
+		StaticObject su = new StaticObject(this, false);
+		StaticObject targetableSu = new StaticObject(this, true);
+		DoorStatusUpdate dsu = new DoorStatusUpdate(this);
+		OnEventTrigger oe = null;
+		if (getEmitter() > 0) {
+			oe = new OnEventTrigger(this, !getOpen());
+		}
+		
+		for (L2PcInstance player : knownPlayers) {
+			if ((player == null) || !isVisibleFor(player)) {
+				continue;
+			}
+			
+			if (player.isGM() || (((getCastle() != null) && (getCastle().getResidenceId() > 0)) || ((getFort() != null) && (getFort().getResidenceId() > 0)))) {
+				player.sendPacket(targetableSu);
+			} else {
+				player.sendPacket(su);
+			}
+			
+			player.sendPacket(dsu);
+			if (oe != null) {
+				player.sendPacket(oe);
+			}
+		}
+	}
+	
+	public final void openMe() {
+		if (getGroupName() != null) {
+			manageGroupOpen(true, getGroupName());
+			return;
+		}
+		setOpen(true);
+		broadcastStatusUpdate();
+		startAutoCloseTask();
+	}
+	
+	public final void closeMe() {
+		// remove close task
+		Future<?> oldTask = _autoCloseTask;
+		if (oldTask != null) {
+			_autoCloseTask = null;
+			oldTask.cancel(false);
+		}
+		if (getGroupName() != null) {
+			manageGroupOpen(false, getGroupName());
+			return;
+		}
+		setOpen(false);
+		broadcastStatusUpdate();
+	}
+	
+	private void manageGroupOpen(boolean open, String groupName) {
+		Set<Integer> set = DoorData.getDoorsByGroup(groupName);
+		L2DoorInstance first = null;
+		for (Integer id : set) {
+			L2DoorInstance door = getSiblingDoor(id);
+			if (first == null) {
+				first = door;
+			}
+			
+			if (door.getOpen() != open) {
+				door.setOpen(open);
+				door.broadcastStatusUpdate();
+			}
+		}
+		if ((first != null) && open) {
+			first.startAutoCloseTask(); // only one from group
+		}
+	}
+	
+	/**
+	 * Door notify child about open state change
+	 * @param open true if opened
+	 */
+	private void notifyChildEvent(boolean open) {
+		byte openThis = open ? getTemplate().getMasterDoorOpen() : getTemplate().getMasterDoorClose();
+		if (openThis == 1) {
+			openMe();
+		} else if (openThis == -1) {
+			closeMe();
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "[" + getTemplate().getId() + "](" + getObjectId() + ")";
+	}
+	
+	public String getDoorName() {
+		return getTemplate().getName();
+	}
+	
+	public int getX(int i) {
+		return getTemplate().getNodeX()[i];
+	}
+	
+	public int getY(int i) {
+		return getTemplate().getNodeY()[i];
+	}
+	
+	public int getZMin() {
+		return getTemplate().getNodeZ();
+	}
+	
+	public int getZMax() {
+		return getTemplate().getNodeZ() + getTemplate().getHeight();
+	}
+	
+	public List<L2DefenderInstance> getKnownDefenders() {
+		final List<L2DefenderInstance> result = new ArrayList<>();
+		for (L2Object obj : getKnownList().getKnownObjects().values()) {
+			if (obj instanceof L2DefenderInstance) {
+				result.add((L2DefenderInstance) obj);
+			}
+		}
+		return result;
+	}
+	
+	public void setMeshIndex(int mesh) {
+		_meshindex = mesh;
+	}
+	
+	public int getMeshIndex() {
+		return _meshindex;
+	}
+	
+	public int getEmitter() {
+		return getTemplate().getEmmiter();
+	}
+	
+	public boolean isWall() {
+		return getTemplate().isWall();
+	}
+	
+	public String getGroupName() {
+		return getTemplate().getGroupName();
+	}
+	
+	public int getChildId() {
+		return getTemplate().getChildDoorId();
+	}
+	
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, Skill skill) {
+		if (isWall() && (getInstanceId() == 0)) {
+			if (!attacker.isServitor()) {
+				return;
+			}
+			
+			final L2ServitorInstance servitor = (L2ServitorInstance) attacker;
+			if (servitor.getTemplate().getRace() != Race.SIEGE_WEAPON) {
+				return;
+			}
+		}
+		
+		super.reduceCurrentHp(damage, attacker, awake, isDOT, skill);
+	}
+	
+	@Override
+	public void reduceCurrentHpByDOT(double i, L2Character attacker, Skill skill) {
+		// doors can't be damaged by DOTs
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		boolean isFort = ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress());
+		boolean isCastle = ((getCastle() != null) && (getCastle().getResidenceId() > 0) && getCastle().getSiege().isInProgress());
+		boolean isHall = ((getClanHall() != null) && getClanHall().isSiegableHall() && ((SiegableHall) getClanHall()).isInSiege());
+		
+		if (isFort || isCastle || isHall) {
+			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.CASTLE_GATE_BROKEN_DOWN));
+		}
+		return true;
+	}
+	
+	@Override
+	public void moveToLocation(int x, int y, int z, int offset) {
+	}
+	
+	@Override
+	public void stopMove(Location loc) {
+	}
+	
+	@Override
+	public void doAttack(L2Character target) {
+	}
+	
+	@Override
+	public void doCast(Skill skill) {
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		if (isVisibleFor(activeChar)) {
+			if (getEmitter() > 0) {
+				activeChar.sendPacket(new OnEventTrigger(this, !getOpen()));
+			}
+			
+			activeChar.sendPacket(new StaticObject(this, activeChar.isGM()));
+		}
+	}
+	
+	public void setTargetable(boolean b) {
+		_isTargetable = b;
+		broadcastStatusUpdate();
+	}
+	
+	@Override
+	public boolean isTargetable() {
+		return _isTargetable;
+	}
+	
+	public boolean checkCollision() {
+		return getTemplate().isCheckCollision();
+	}
+	
+	/**
+	 * All doors are stored at DoorTable except instance doors
+	 * @param doorId
+	 * @return
+	 */
+	private L2DoorInstance getSiblingDoor(int doorId) {
+		if (getInstanceId() == 0) {
+			return DoorData.getInstance().getDoor(doorId);
+		}
+		
+		Instance inst = InstanceManager.getInstance().getInstance(getInstanceId());
+		if (inst != null) {
+			return inst.getDoor(doorId);
+		}
+		
+		return null; // 2 late
+	}
+	
+	private void startAutoCloseTask() {
+		if ((getTemplate().getCloseTime() < 0) || isOpenableByTime()) {
+			return;
+		}
+		Future<?> oldTask = _autoCloseTask;
+		if (oldTask != null) {
+			_autoCloseTask = null;
+			oldTask.cancel(false);
+		}
+		_autoCloseTask = ThreadPoolManager.getInstance().scheduleGeneral(new AutoClose(), getTemplate().getCloseTime() * 1000);
+	}
+	
+	class AutoClose implements Runnable {
+		@Override
+		public void run() {
+			if (getOpen()) {
+				closeMe();
+			}
+		}
+	}
+	
+	class TimerOpen implements Runnable {
+		@Override
+		public void run() {
+			boolean open = getOpen();
+			if (open) {
+				closeMe();
+			} else {
+				openMe();
+			}
+			
+			int delay = open ? getTemplate().getCloseTime() : getTemplate().getOpenTime();
+			if (getTemplate().getRandomTime() > 0) {
+				delay += Rnd.get(getTemplate().getRandomTime());
+			}
+			ThreadPoolManager.getInstance().scheduleGeneral(this, delay * 1000);
+		}
+	}
+	
+	@Override
+	public boolean isDoor() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java
new file mode 100644
index 00000000..31bf0dc5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2DoormenInstance.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2DoormenInstance extends L2NpcInstance {
+	public L2DoormenInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2DoormenInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2EffectPointInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2EffectPointInstance.java
new file mode 100644
index 00000000..3c5ba2b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2EffectPointInstance.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public class L2EffectPointInstance extends L2Npc {
+	private final L2PcInstance _owner;
+	
+	public L2EffectPointInstance(int objectId, L2NpcTemplate template, L2Character owner) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2EffectPointInstance);
+		setIsInvul(false);
+		_owner = owner == null ? null : owner.getActingPlayer();
+		if (owner != null) {
+			setInstanceId(owner.getInstanceId());
+		}
+	}
+	
+	@Override
+	public L2PcInstance getActingPlayer() {
+		return _owner;
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void onActionShift(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2EventMonsterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2EventMonsterInstance.java
new file mode 100644
index 00000000..43b5f711
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2EventMonsterInstance.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @author Gnacik
+ */
+public class L2EventMonsterInstance extends L2MonsterInstance {
+	// Block offensive skills usage on event mobs
+	// mainly for AoE skills, disallow kill many event mobs
+	// with one skill
+	public boolean block_skill_attack = false;
+	
+	// Event mobs should drop items to ground
+	// but item pickup must be protected to killer
+	// TODO: Some mobs need protect drop for spawner
+	public boolean drop_on_ground = false;
+	
+	public L2EventMonsterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2EventMobInstance);
+	}
+	
+	public void eventSetBlockOffensiveSkills(boolean value) {
+		block_skill_attack = value;
+	}
+	
+	public void eventSetDropOnGround(boolean value) {
+		drop_on_ground = value;
+	}
+	
+	public boolean eventDropOnGround() {
+		return drop_on_ground;
+	}
+	
+	public boolean eventSkillAttackBlocked() {
+		return block_skill_attack;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FeedableBeastInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FeedableBeastInstance.java
new file mode 100644
index 00000000..703cb333
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FeedableBeastInstance.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+// This class is here mostly for convenience and for avoidance of hardcoded IDs.
+// It refers to Beast (mobs) that can be attacked but can also be fed
+// For example, the Beast Farm's Alpen Buffalo.
+// This class is only truly used by the handlers in order to check the correctness
+// of the target.  However, no additional tasks are needed, since they are all
+// handled by scripted AI.
+public class L2FeedableBeastInstance extends L2MonsterInstance {
+	public L2FeedableBeastInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FeedableBeastInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalGuideInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalGuideInstance.java
new file mode 100644
index 00000000..2ac1b655
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalGuideInstance.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.sevenSigns;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Festival of Darkness Guide (Seven Signs)
+ * @author Tempy
+ */
+public final class L2FestivalGuideInstance extends L2Npc {
+	private final int _festivalType;
+	private final int _festivalOracle;
+	private final int _blueStonesNeeded;
+	private final int _greenStonesNeeded;
+	private final int _redStonesNeeded;
+	
+	/**
+	 * Creates a festival guide.
+	 * @param template the festival guide NPC template
+	 */
+	public L2FestivalGuideInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FestivalGiudeInstance);
+		
+		switch (getId()) {
+			case 31127, 31132 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_31;
+				_festivalOracle = SevenSigns.CABAL_DAWN;
+				_blueStonesNeeded = 900;
+				_greenStonesNeeded = 540;
+				_redStonesNeeded = 270;
+			}
+			case 31128, 31133 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_42;
+				_festivalOracle = SevenSigns.CABAL_DAWN;
+				_blueStonesNeeded = 1500;
+				_greenStonesNeeded = 900;
+				_redStonesNeeded = 450;
+			}
+			case 31129, 31134 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_53;
+				_festivalOracle = SevenSigns.CABAL_DAWN;
+				_blueStonesNeeded = 3000;
+				_greenStonesNeeded = 1800;
+				_redStonesNeeded = 900;
+			}
+			case 31130, 31135 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_64;
+				_festivalOracle = SevenSigns.CABAL_DAWN;
+				_blueStonesNeeded = 4500;
+				_greenStonesNeeded = 2700;
+				_redStonesNeeded = 1350;
+			}
+			case 31131, 31136 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_NONE;
+				_festivalOracle = SevenSigns.CABAL_DAWN;
+				_blueStonesNeeded = 6000;
+				_greenStonesNeeded = 3600;
+				_redStonesNeeded = 1800;
+			}
+			case 31137, 31142 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_31;
+				_festivalOracle = SevenSigns.CABAL_DUSK;
+				_blueStonesNeeded = 900;
+				_greenStonesNeeded = 540;
+				_redStonesNeeded = 270;
+			}
+			case 31138, 31143 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_42;
+				_festivalOracle = SevenSigns.CABAL_DUSK;
+				_blueStonesNeeded = 1500;
+				_greenStonesNeeded = 900;
+				_redStonesNeeded = 450;
+			}
+			case 31139, 31144 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_53;
+				_festivalOracle = SevenSigns.CABAL_DUSK;
+				_blueStonesNeeded = 3000;
+				_greenStonesNeeded = 1800;
+				_redStonesNeeded = 900;
+			}
+			case 31140, 31145 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_64;
+				_festivalOracle = SevenSigns.CABAL_DUSK;
+				_blueStonesNeeded = 4500;
+				_greenStonesNeeded = 2700;
+				_redStonesNeeded = 1350;
+			}
+			case 31141, 31146 -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_NONE;
+				_festivalOracle = SevenSigns.CABAL_DUSK;
+				_blueStonesNeeded = 6000;
+				_greenStonesNeeded = 3600;
+				_redStonesNeeded = 1800;
+			}
+			default -> {
+				_festivalType = SevenSignsFestival.FESTIVAL_LEVEL_MAX_NONE;
+				_festivalOracle = SevenSigns.CABAL_NULL;
+				_blueStonesNeeded = 0;
+				_greenStonesNeeded = 0;
+				_redStonesNeeded = 0;
+			}
+		}
+	}
+	
+	public int getFestivalType() {
+		return _festivalType;
+	}
+	
+	public int getFestivalOracle() {
+		return _festivalOracle;
+	}
+	
+	public int getStoneCount(int stoneType) {
+		return switch (stoneType) {
+			case SevenSigns.SEAL_STONE_BLUE_ID -> _blueStonesNeeded;
+			case SevenSigns.SEAL_STONE_GREEN_ID -> _greenStonesNeeded;
+			case SevenSigns.SEAL_STONE_RED_ID -> _redStonesNeeded;
+			default -> -1;
+		};
+	}
+	
+	public void showChatWindow(L2PcInstance player, int val, String suffix, boolean isDescription) {
+		final var filename = new StringBuilder(SevenSigns.SEVEN_SIGNS_HTML_PATH)
+			.append("festival/")
+			.append((isDescription) ? "desc_" : "festival_")
+			.append((suffix != null) ? val + suffix + ".htm" : val + ".htm");
+		
+		// Send a Server->Client NpcHtmlMessage containing the text of the L2NpcInstance to the L2PcInstance
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename.toString());
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		html.replace("%festivalType%", SevenSignsFestival.getFestivalName(_festivalType));
+		html.replace("%cycleMins%", String.valueOf(SevenSignsFestival.getInstance().getMinsToNextCycle()));
+		if (!isDescription && "2b".equals(val + suffix)) {
+			html.replace("%minFestivalPartyMembers%", String.valueOf(sevenSigns().getFestivalMinPlayer()));
+		}
+		
+		// If the stats or bonus table is required, construct them.
+		if (val == 5) {
+			html.replace("%statsTable%", getStatsTable());
+		}
+		if (val == 6) {
+			html.replace("%bonusTable%", getBonusTable());
+		}
+		
+		// festival's fee
+		if (val == 1) {
+			html.replace("%blueStoneNeeded%", String.valueOf(_blueStonesNeeded));
+			html.replace("%greenStoneNeeded%", String.valueOf(_greenStonesNeeded));
+			html.replace("%redStoneNeeded%", String.valueOf(_redStonesNeeded));
+		}
+		
+		player.sendPacket(html);
+		
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	private static String getStatsTable() {
+		final StringBuilder tableHtml = new StringBuilder(1000);
+		
+		// Get the scores for each of the festival level ranges (types).
+		for (int i = 0; i < 5; i++) {
+			int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i);
+			int duskScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DUSK, i);
+			String festivalName = SevenSignsFestival.getFestivalName(i);
+			String winningCabal = "Children of Dusk";
+			
+			if (dawnScore > duskScore) {
+				winningCabal = "Children of Dawn";
+			} else if (dawnScore == duskScore) {
+				winningCabal = "None";
+			}
+			
+			StringUtil.append(tableHtml, "<tr><td width=\"100\" align=\"center\">", festivalName, "</td><td align=\"center\" width=\"35\">", String.valueOf(duskScore), "</td><td align=\"center\" width=\"35\">", String.valueOf(dawnScore), "</td><td align=\"center\" width=\"130\">", winningCabal, "</td></tr>");
+		}
+		
+		return tableHtml.toString();
+	}
+	
+	private static String getBonusTable() {
+		final StringBuilder tableHtml = new StringBuilder(500);
+		
+		// Get the accumulated scores for each of the festival level ranges (types).
+		for (int i = 0; i < 5; i++) {
+			int accumScore = SevenSignsFestival.getInstance().getAccumulatedBonus(i);
+			String festivalName = SevenSignsFestival.getFestivalName(i);
+			
+			StringUtil.append(tableHtml, "<tr><td align=\"center\" width=\"150\">", festivalName, "</td><td align=\"center\" width=\"150\">", String.valueOf(accumScore), "</td></tr>");
+		}
+		
+		return tableHtml.toString();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalMonsterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalMonsterInstance.java
new file mode 100644
index 00000000..7689a10f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FestivalMonsterInstance.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+
+/**
+ * This class manages all attackable festival NPCs, spawned during the Festival of Darkness.
+ * @author Tempy
+ */
+public class L2FestivalMonsterInstance extends L2MonsterInstance {
+	protected int _bonusMultiplier = 1;
+	
+	public L2FestivalMonsterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FestivalMonsterInstance);
+	}
+	
+	public void setOfferingBonus(int bonusMultiplier) {
+		_bonusMultiplier = bonusMultiplier;
+	}
+	
+	/**
+	 * Return True if the attacker is not another L2FestivalMonsterInstance.
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return !(attacker instanceof L2FestivalMonsterInstance);
+	}
+	
+	/**
+	 * All mobs in the festival are aggressive, and have high aggro range.
+	 */
+	@Override
+	public boolean isAggressive() {
+		return true;
+	}
+	
+	/**
+	 * All mobs in the festival really don't need random animation.
+	 */
+	@Override
+	public boolean hasRandomAnimation() {
+		return false;
+	}
+	
+	/**
+	 * Actions:
+	 * <ul>
+	 * <li>Check if the killing object is a player, and then find the party they belong to.</li>
+	 * <li>Add a blood offering item to the leader of the party.</li>
+	 * <li>Update the party leader's inventory to show the new item addition.</li>
+	 * </ul>
+	 */
+	@Override
+	public void doItemDrop(L2Character lastAttacker) {
+		if (!(lastAttacker instanceof L2PcInstance killingChar)) {
+			return;
+		}
+		
+		L2Party associatedParty = killingChar.getParty();
+		if (associatedParty == null) {
+			return;
+		}
+		
+		L2PcInstance partyLeader = associatedParty.getLeader();
+		L2ItemInstance addedOfferings = partyLeader.getInventory().addItem("Sign", SevenSignsFestival.FESTIVAL_OFFERING_ID, _bonusMultiplier, partyLeader, this);
+		
+		InventoryUpdate iu = new InventoryUpdate();
+		
+		if (addedOfferings.getCount() != _bonusMultiplier) {
+			iu.addModifiedItem(addedOfferings);
+		} else {
+			iu.addNewItem(addedOfferings);
+		}
+		
+		partyLeader.sendPacket(iu);
+		
+		super.doItemDrop(lastAttacker); // Normal drop
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FlameTowerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FlameTowerInstance.java
new file mode 100644
index 00000000..782c5004
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FlameTowerInstance.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Tower;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * Flame Control Tower instance.
+ * @author JIV
+ */
+public class L2FlameTowerInstance extends L2Tower {
+	private int _upgradeLevel = 0;
+	private List<Integer> _zoneList;
+	
+	public L2FlameTowerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FlameTowerInstance);
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		enableZones(false);
+		return super.doDie(killer);
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		enableZones(false);
+		return super.deleteMe();
+	}
+	
+	public final void enableZones(boolean state) {
+		if ((_zoneList != null) && (_upgradeLevel != 0)) {
+			final int maxIndex = _upgradeLevel * 2;
+			for (int i = 0; i < maxIndex; i++) {
+				final L2ZoneType zone = ZoneManager.getInstance().getZoneById(_zoneList.get(i));
+				if (zone != null) {
+					zone.setEnabled(state);
+				}
+			}
+		}
+	}
+	
+	public final void setUpgradeLevel(int level) {
+		_upgradeLevel = level;
+	}
+	
+	public final void setZoneList(List<Integer> list) {
+		_zoneList = list;
+		enableZones(true);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FlyTerrainObjectInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FlyTerrainObjectInstance.java
new file mode 100644
index 00000000..9b336c4a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FlyTerrainObjectInstance.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public final class L2FlyTerrainObjectInstance extends L2Npc {
+	
+	public L2FlyTerrainObjectInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FlyTerrainObjectInstance);
+		setIsFlying(true);
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void onActionShift(L2PcInstance player) {
+		if (player.isGM()) {
+			super.onActionShift(player);
+		} else {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java
new file mode 100644
index 00000000..2f24fe67
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortCommanderInstance.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.model.FortSiegeSpawn;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+
+public class L2FortCommanderInstance extends L2DefenderInstance {
+	private static final Logger LOG = LoggerFactory.getLogger(L2FortCommanderInstance.class);
+	private boolean _canTalk;
+	
+	public L2FortCommanderInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FortCommanderInstance);
+		_canTalk = true;
+	}
+	
+	/**
+	 * Return True if a siege is in progress and the L2Character attacker isn't a Defender.
+	 * @param attacker The L2Character that the L2CommanderInstance try to attack
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		if (!(attacker instanceof L2PcInstance)) {
+			return false;
+		}
+		// Attackable during siege by all except defenders
+		return ((getFort() != null) && (getFort().getResidenceId() > 0) && getFort().getSiege().isInProgress() && !getFort().getSiege().checkIsDefender(attacker.getClan()));
+	}
+	
+	@Override
+	public void addDamageHate(L2Character attacker, int damage, long aggro) {
+		if (attacker == null) {
+			return;
+		}
+		
+		if (!(attacker instanceof L2FortCommanderInstance)) {
+			super.addDamageHate(attacker, damage, aggro);
+		}
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		if (getFort().getSiege().isInProgress()) {
+			getFort().getSiege().killedCommander(this);
+			
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * This method forces guard to return to home location previously set
+	 */
+	@Override
+	public void returnHome() {
+		if (!isInsideRadius(getSpawn(), 200, false, false)) {
+			if (general().debug()) {
+				LOG.debug("{} moving home", getObjectId());
+			}
+			setisReturningToSpawnPoint(true);
+			clearAggroList();
+			
+			if (hasAI()) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, getSpawn().getLocation());
+			}
+		}
+	}
+	
+	@Override
+	public final void addDamage(L2Character attacker, int damage, Skill skill) {
+		L2Spawn spawn = getSpawn();
+		if ((spawn != null) && canTalk()) {
+			List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId());
+			for (FortSiegeSpawn spawn2 : commanders) {
+				if (spawn2.getId() == spawn.getId()) {
+					NpcStringId npcString = null;
+					switch (spawn2.getMessageId()) {
+						case 1 -> npcString = NpcStringId.ATTACKING_THE_ENEMYS_REINFORCEMENTS_IS_NECESSARY_TIME_TO_DIE;
+						case 2 -> {
+							if (attacker instanceof L2Summon) {
+								attacker = ((L2Summon) attacker).getOwner();
+							}
+							npcString = NpcStringId.EVERYONE_CONCENTRATE_YOUR_ATTACKS_ON_S1_SHOW_THE_ENEMY_YOUR_RESOLVE;
+						}
+						case 3 -> npcString = NpcStringId.SPIRIT_OF_FIRE_UNLEASH_YOUR_POWER_BURN_THE_ENEMY;
+					}
+					if (npcString != null) {
+						NpcSay ns = new NpcSay(getObjectId(), Say2.NPC_SHOUT, getId(), npcString);
+						if (npcString.getParamCount() == 1) {
+							ns.addStringParameter(attacker.getName());
+						}
+						
+						broadcastPacket(ns);
+						setCanTalk(false);
+						ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTalkTask(), 10000);
+					}
+				}
+			}
+		}
+		super.addDamage(attacker, damage, skill);
+	}
+	
+	private class ScheduleTalkTask implements Runnable {
+		
+		public ScheduleTalkTask() {
+		}
+		
+		@Override
+		public void run() {
+			setCanTalk(true);
+		}
+	}
+	
+	void setCanTalk(boolean val) {
+		_canTalk = val;
+	}
+	
+	private boolean canTalk() {
+		return _canTalk;
+	}
+	
+	@Override
+	public boolean hasRandomAnimation() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java
new file mode 100644
index 00000000..27b24eed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortDoormenInstance.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2FortDoormenInstance extends L2DoormenInstance {
+	
+	public L2FortDoormenInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FortDoormenInstance);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java
new file mode 100644
index 00000000..203b645e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortLogisticsInstance.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.StringTokenizer;
+
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+
+/**
+ * @author Vice
+ * @author Zoey76
+ */
+public class L2FortLogisticsInstance extends L2MerchantInstance {
+	private static final int[] SUPPLY_BOX_IDS = {
+		35665,
+		35697,
+		35734,
+		35766,
+		35803,
+		35834,
+		35866,
+		35903,
+		35935,
+		35973,
+		36010,
+		36042,
+		36080,
+		36117,
+		36148,
+		36180,
+		36218,
+		36256,
+		36293,
+		36325,
+		36363
+	};
+	
+	public L2FortLogisticsInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FortLogisticsInstance);
+	}
+	
+	@Override
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		if (player.getLastFolkNPC().getObjectId() != getObjectId()) {
+			return;
+		}
+		
+		StringTokenizer st = new StringTokenizer(command, " ");
+		String actualCommand = st.nextToken(); // Get actual command
+		
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		if (actualCommand.equalsIgnoreCase("rewards")) {
+			if (isMyLord(player)) {
+				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-rewards.htm");
+				html.replace("%bloodoath%", String.valueOf(player.getClan().getBloodOathCount()));
+			} else {
+				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
+			}
+			html.replace("%objectId%", String.valueOf(getObjectId()));
+			player.sendPacket(html);
+		} else if (actualCommand.equalsIgnoreCase("blood")) {
+			if (isMyLord(player)) {
+				final int blood = player.getClan().getBloodOathCount();
+				if (blood > 0) {
+					player.addItem("Quest", 9910, blood, this, true);
+					player.getClan().resetBloodOathCount();
+					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-blood.htm");
+				} else {
+					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noblood.htm");
+				}
+			} else {
+				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
+			}
+			html.replace("%objectId%", String.valueOf(getObjectId()));
+			player.sendPacket(html);
+		} else if (actualCommand.equalsIgnoreCase("supplylvl")) {
+			if (getFort().getFortState() == 2) {
+				if (player.isClanLeader()) {
+					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supplylvl.htm");
+					html.replace("%supplylvl%", String.valueOf(getFort().getSupplyLvL()));
+				} else {
+					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
+				}
+			} else {
+				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-1.htm"); // TODO: Missing HTML?
+			}
+			html.replace("%objectId%", String.valueOf(getObjectId()));
+			player.sendPacket(html);
+		} else if (actualCommand.equalsIgnoreCase("supply")) {
+			if (isMyLord(player)) {
+				if (getFort().getSiege().isInProgress()) {
+					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-siege.htm");
+				} else {
+					final int level = getFort().getSupplyLvL();
+					if (level > 0) {
+						// spawn box
+						final var boxTemplate = NpcData.getInstance().getTemplate(SUPPLY_BOX_IDS[level - 1]);
+						final var objectId = IdFactory.getInstance().getNextId();
+						final var box = new L2MonsterInstance(objectId, boxTemplate);
+						box.setCurrentHp(box.getMaxHp());
+						box.setCurrentMp(box.getMaxMp());
+						box.setHeading(0);
+						box.spawnMe(getX() - 23, getY() + 41, getZ());
+						
+						getFort().setSupplyLvL(0);
+						getFort().saveFortVariables();
+						
+						html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-supply.htm");
+					} else {
+						html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-nosupply.htm");
+					}
+				}
+			} else {
+				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
+			}
+			html.replace("%objectId%", String.valueOf(getObjectId()));
+			player.sendPacket(html);
+		} else {
+			super.onBypassFeedback(player, command);
+		}
+	}
+	
+	@Override
+	public void showChatWindow(L2PcInstance player) {
+		showMessageWindow(player, 0);
+	}
+	
+	private void showMessageWindow(L2PcInstance player, int val) {
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+		
+		String filename;
+		
+		if (val == 0) {
+			filename = "data/html/fortress/logistics.htm";
+		} else {
+			filename = "data/html/fortress/logistics-" + val + ".htm";
+		}
+		
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename);
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		html.replace("%npcId%", String.valueOf(getId()));
+		if (getFort().getOwnerClan() != null) {
+			html.replace("%clanname%", getFort().getOwnerClan().getName());
+		} else {
+			html.replace("%clanname%", "NPC");
+		}
+		player.sendPacket(html);
+	}
+	
+	@Override
+	public String getHtmlPath(int npcId, int val) {
+		String pom;
+		if (val == 0) {
+			pom = "logistics";
+		} else {
+			pom = "logistics-" + val;
+		}
+		return "data/html/fortress/" + pom + ".htm";
+	}
+	
+	@Override
+	public boolean hasRandomAnimation() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java
new file mode 100644
index 00000000..ded67a24
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FortManagerInstance.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * Fortress Foreman implementation used for: Area Teleports, Support Magic, Clan Warehouse, Exp Loss Reduction
+ */
+public class L2FortManagerInstance extends L2MerchantInstance {
+	
+	public L2FortManagerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FortManagerInstance);
+	}
+	
+	@Override
+	public boolean isWarehouse() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FriendlyMobInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FriendlyMobInstance.java
new file mode 100644
index 00000000..15ab962e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2FriendlyMobInstance.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.knownlist.FriendlyMobKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * This class represents Friendly Mobs lying over the world.<br>
+ * These friendly mobs should only attack players with karma > 0 and it is always aggro, since it just attacks players with karma.
+ */
+public class L2FriendlyMobInstance extends L2Attackable {
+	
+	public L2FriendlyMobInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2FriendlyMobInstance);
+	}
+	
+	@Override
+	public final FriendlyMobKnownList getKnownList() {
+		return (FriendlyMobKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new FriendlyMobKnownList(this));
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		if (attacker instanceof L2PcInstance) {
+			return ((L2PcInstance) attacker).getKarma() > 0;
+		}
+		return false;
+	}
+	
+	@Override
+	public boolean isAggressive() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java
new file mode 100644
index 00000000..3b85e2a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2GrandBossInstance.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This class manages all Grand Bosses.
+ * @since 2006/06/16
+ */
+public final class L2GrandBossInstance extends L2MonsterInstance {
+	private static final int BOSS_MAINTENANCE_INTERVAL = 10000;
+	private boolean _useRaidCurse = true;
+	
+	public L2GrandBossInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2GrandBossInstance);
+		setIsRaid(true);
+		setLethalable(false);
+	}
+	
+	@Override
+	protected int getMaintenanceInterval() {
+		return BOSS_MAINTENANCE_INTERVAL;
+	}
+	
+	@Override
+	public void onSpawn() {
+		setIsNoRndWalk(true);
+		super.onSpawn();
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		L2PcInstance player = null;
+		
+		if (killer instanceof L2PcInstance) {
+			player = (L2PcInstance) killer;
+		} else if (killer instanceof L2Summon) {
+			player = ((L2Summon) killer).getOwner();
+		}
+		
+		if (player != null) {
+			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));
+			if (player.getParty() != null) {
+				for (L2PcInstance member : player.getParty().getMembers()) {
+					RaidBossPointsManager.getInstance().addPoints(member, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
+					if (member.isNoble()) {
+						Hero.getInstance().setRBkilled(member.getObjectId(), getId());
+					}
+				}
+			} else {
+				RaidBossPointsManager.getInstance().addPoints(player, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
+				if (player.isNoble()) {
+					Hero.getInstance().setRBkilled(player.getObjectId(), getId());
+				}
+			}
+		}
+		return true;
+	}
+	
+	@Override
+	public float getVitalityPoints(int damage) {
+		return -super.getVitalityPoints(damage) / 100;
+	}
+	
+	@Override
+	public boolean useVitalityRate() {
+		return false;
+	}
+	
+	public void setUseRaidCurse(boolean val) {
+		_useRaidCurse = val;
+	}
+	
+	@Override
+	public boolean giveRaidCurse() {
+		return _useRaidCurse;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java
new file mode 100644
index 00000000..805f31e6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2GuardInstance.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.knownlist.GuardKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcFirstTalk;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+
+/**
+ * This class manages all Guards in the world. It inherits all methods from L2Attackable and adds some more such as tracking PK and aggressive L2MonsterInstance.
+ */
+public class L2GuardInstance extends L2Attackable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2GuardInstance.class);
+	
+	public L2GuardInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2GuardInstance);
+	}
+	
+	@Override
+	public final GuardKnownList getKnownList() {
+		return (GuardKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new GuardKnownList(this));
+	}
+	
+	/**
+	 * Return True if the attacker is a L2MonsterInstance.
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return attacker instanceof L2MonsterInstance;
+	}
+	
+	/**
+	 * Set the home location of its L2GuardInstance.
+	 */
+	@Override
+	public void onSpawn() {
+		setIsNoRndWalk(true);
+		super.onSpawn();
+		
+		// check the region where this mob is, do not activate the AI if region is inactive.
+		L2WorldRegion region = L2World.getInstance().getRegion(getX(), getY());
+		if ((region != null) && (!region.isActive())) {
+			getAI().stopAITask();
+		}
+	}
+	
+	/**
+	 * Return the pathfile of the selected HTML file in function of the L2GuardInstance Identifier and of the page number.<br>
+	 * <B><U> Format of the pathfile </U> :</B>
+	 * <ul>
+	 * <li>if page number = 0 : <B>data/html/guard/12006.htm</B> (npcId-page number)</li>
+	 * <li>if page number > 0 : <B>data/html/guard/12006-1.htm</B> (npcId-page number)</li>
+	 * </ul>
+	 * @param npcId The Identifier of the L2NpcInstance whose text must be display
+	 * @param val The number of the page to display
+	 */
+	@Override
+	public String getHtmlPath(int npcId, int val) {
+		String pom;
+		if (val == 0) {
+			pom = "" + npcId;
+		} else {
+			pom = npcId + "-" + val;
+		}
+		return "data/html/guard/" + pom + ".htm";
+	}
+	
+	/**
+	 * Manage actions when a player click on the L2GuardInstance.<br>
+	 * <B><U> Actions on first click on the L2GuardInstance (Select it)</U> :</B>
+	 * <ul>
+	 * <li>Set the L2GuardInstance as target of the L2PcInstance player (if necessary)</li>
+	 * <li>Send a Server->Client packet MyTargetSelected to the L2PcInstance player (display the select window)</li>
+	 * <li>Set the L2PcInstance Intention to AI_INTENTION_IDLE</li>
+	 * <li>Send a Server->Client packet ValidateLocation to correct the L2GuardInstance position and heading on the client</li>
+	 * </ul>
+	 * <B><U> Actions on second click on the L2GuardInstance (Attack it/Interact with it)</U> :</B>
+	 * <ul>
+	 * <li>If L2PcInstance is in the _aggroList of the L2GuardInstance, set the L2PcInstance Intention to AI_INTENTION_ATTACK</li>
+	 * <li>If L2PcInstance is NOT in the _aggroList of the L2GuardInstance, set the L2PcInstance Intention to AI_INTENTION_INTERACT (after a distance verification) and show message</li>
+	 * </ul>
+	 * <B><U> Example of use </U> :</B>
+	 * <ul>
+	 * <li>Client packet : Action, AttackRequest</li>
+	 * </ul>
+	 * @param player The L2PcInstance that start an action on the L2GuardInstance
+	 */
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if (!canTarget(player)) {
+			return;
+		}
+		
+		// Check if the L2PcInstance already target the L2GuardInstance
+		if (getObjectId() != player.getTargetId()) {
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			// Check if the L2PcInstance is in the _aggroList of the L2GuardInstance
+			if (isInAggroList(player)) {
+				if (general().debug()) {
+					LOG.debug("{}: Attacked guard {}", player.getObjectId(), getObjectId());
+				}
+				
+				// Set the L2PcInstance Intention to AI_INTENTION_ATTACK
+				player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+			} else {
+				// Calculate the distance between the L2PcInstance and the L2NpcInstance
+				if (!canInteract(player)) {
+					// Set the L2PcInstance Intention to AI_INTENTION_INTERACT
+					player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, this);
+				} else {
+					// Send a Server->Client packet SocialAction to the all L2PcInstance on the _knownPlayer of the L2NpcInstance
+					// to display a social action of the L2GuardInstance on their client
+					broadcastPacket(new SocialAction(getObjectId(), Rnd.nextInt(8)));
+					
+					player.setLastFolkNPC(this);
+					
+					// Open a chat window on client with the text of the L2GuardInstance
+					if (hasListener(EventType.NPC_QUEST_START)) {
+						player.setLastQuestNpcObject(getObjectId());
+					}
+					
+					if (hasListener(EventType.NPC_FIRST_TALK)) {
+						EventDispatcher.getInstance().notifyEventAsync(new NpcFirstTalk(this, player), this);
+					} else {
+						showChatWindow(player, 0);
+					}
+				}
+			}
+		}
+		// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantInstance.java
new file mode 100644
index 00000000..429c3b28
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantInstance.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @since 2005/04/11 10:06:08
+ */
+public class L2MerchantInstance extends L2NpcInstance {
+	
+	public L2MerchantInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2MerchantInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java
new file mode 100644
index 00000000..ecf0e212
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2MonsterInstance.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.knownlist.MonsterKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.util.MinionList;
+
+/**
+ * This class manages all Monsters. L2MonsterInstance:
+ * <ul>
+ * <li>L2MinionInstance</li>
+ * <li>L2RaidBossInstance</li>
+ * <li>L2GrandBossInstance</li>
+ * </ul>
+ */
+public class L2MonsterInstance extends L2Attackable {
+	private static final int MONSTER_MAINTENANCE_INTERVAL = 1000;
+	
+	private L2MonsterInstance _master = null;
+	private volatile MinionList _minionList = null;
+	
+	protected ScheduledFuture<?> _maintenanceTask = null;
+	
+	public L2MonsterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2MonsterInstance);
+		setAutoAttackable(true);
+	}
+	
+	@Override
+	public final MonsterKnownList getKnownList() {
+		return (MonsterKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new MonsterKnownList(this));
+	}
+	
+	/**
+	 * Return True if the attacker is not another L2MonsterInstance.
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return super.isAutoAttackable(attacker) && ((attacker == null) || !attacker.isMonster()) && !isEventMob();
+	}
+	
+	@Override
+	public boolean isAggressive() {
+		return getTemplate().isAggressive() && !isEventMob();
+	}
+	
+	@Override
+	public void onSpawn() {
+		if (!isTeleporting()) {
+			if (getLeader() != null) {
+				setIsNoRndWalk(true);
+				setIsRaidMinion(getLeader().isRaid());
+				getLeader().getMinionList().onMinionSpawn(this);
+			}
+			
+			// delete spawned minions before dynamic minions spawned by script
+			if (hasMinions()) {
+				getMinionList().onMasterSpawn();
+			}
+			
+			startMaintenanceTask();
+		}
+		
+		// dynamic script-based minions spawned here, after all preparations.
+		super.onSpawn();
+	}
+	
+	@Override
+	public void onTeleported() {
+		super.onTeleported();
+		
+		if (hasMinions()) {
+			getMinionList().onMasterTeleported();
+		}
+	}
+	
+	protected int getMaintenanceInterval() {
+		return MONSTER_MAINTENANCE_INTERVAL;
+	}
+	
+	protected void startMaintenanceTask() {
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		if (_maintenanceTask != null) {
+			_maintenanceTask.cancel(false); // doesn't do it?
+			_maintenanceTask = null;
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (_maintenanceTask != null) {
+			_maintenanceTask.cancel(false);
+			_maintenanceTask = null;
+		}
+		
+		if (hasMinions()) {
+			getMinionList().onMasterDie(true);
+		}
+		
+		if (getLeader() != null) {
+			getLeader().getMinionList().onMinionDie(this, 0);
+		}
+		
+		return super.deleteMe();
+	}
+	
+	@Override
+	public L2MonsterInstance getLeader() {
+		return _master;
+	}
+	
+	public void setLeader(L2MonsterInstance leader) {
+		_master = leader;
+	}
+	
+	public boolean hasMinions() {
+		return _minionList != null;
+	}
+	
+	public MinionList getMinionList() {
+		if (_minionList == null) {
+			synchronized (this) {
+				if (_minionList == null) {
+					_minionList = new MinionList(this);
+				}
+			}
+		}
+		return _minionList;
+	}
+	
+	@Override
+	public boolean isMonster() {
+		return true;
+	}
+	
+	/**
+	 * @return true if this L2MonsterInstance (or its master) is registered in WalkingManager
+	 */
+	@Override
+	public boolean isWalker() {
+		return ((getLeader() == null) ? super.isWalker() : getLeader().isWalker());
+	}
+	
+	/**
+	 * @return {@code true} if this L2MonsterInstance is not raid minion, master state otherwise.
+	 */
+	@Override
+	public boolean giveRaidCurse() {
+		return (isRaidMinion() && (getLeader() != null)) ? getLeader().giveRaidCurse() : super.giveRaidCurse();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java
new file mode 100644
index 00000000..7ac6fd56
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2NpcBufferInstance.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.sql.impl.NpcBufferTable;
+import com.l2jserver.gameserver.data.sql.impl.NpcBufferTable.NpcBufferData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * The Class L2NpcBufferInstance.<br>
+ * Zoey76: TODO: Unhardcode as DP base script for NPC Buffers.
+ */
+public class L2NpcBufferInstance extends L2Npc {
+	private static final Logger LOG = LoggerFactory.getLogger(L2NpcBufferInstance.class);
+	
+	private static final Map<Integer, Integer> pageVal = new HashMap<>();
+	
+	public L2NpcBufferInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2NpcBufferInstance);
+	}
+	
+	@Override
+	public void showChatWindow(L2PcInstance player, int val) {
+		if (player == null) {
+			return;
+		}
+		
+		String htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/NpcBuffer.htm");
+		if (val > 0) {
+			htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/NpcBuffer-" + val + ".htm");
+		}
+		
+		if (htmContent != null) {
+			final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage(getObjectId());
+			npcHtmlMessage.setHtml(htmContent);
+			npcHtmlMessage.replace("%objectId%", String.valueOf(getObjectId()));
+			player.sendPacket(npcHtmlMessage);
+		}
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		// BypassValidation Exploit plug.
+		if ((player == null) || (player.getLastFolkNPC() == null) || (player.getLastFolkNPC().getObjectId() != getObjectId())) {
+			return;
+		}
+		
+		L2Character target = player;
+		if (command.startsWith("Pet")) {
+			if (!player.hasSummon()) // TODO: Should be hasPet() ?
+			{
+				player.sendPacket(SystemMessageId.DONT_HAVE_PET);
+				showChatWindow(player, 0); // 0 = main window
+				return;
+			}
+			target = player.getSummon();
+		}
+		
+		int npcId = getId();
+		if (command.startsWith("Chat")) {
+			int val = Integer.parseInt(command.substring(5));
+			
+			pageVal.put(player.getObjectId(), val);
+			
+			showChatWindow(player, val);
+		} else if (command.startsWith("Buff") || command.startsWith("PetBuff")) {
+			String[] buffGroupArray = command.substring(command.indexOf("Buff") + 5).split(" ");
+			
+			for (String buffGroupList : buffGroupArray) {
+				if (buffGroupList == null) {
+					LOG.warn("npcId = {} has no buffGroup set in the bypass for the buff selected.", npcId);
+					return;
+				}
+				
+				int buffGroup = Integer.parseInt(buffGroupList);
+				
+				final NpcBufferData npcBuffGroupInfo = NpcBufferTable.getInstance().getSkillInfo(npcId, buffGroup);
+				if (npcBuffGroupInfo == null) {
+					LOG.warn("npcId = {} Location: {}, {}, {} Player: {} has tried to use skill group ({}) not assigned to the NPC Buffer!", npcId, getX(), getY(), getZ(), player.getName(), buffGroup);
+					return;
+				}
+				
+				if (npcBuffGroupInfo.getFee().getId() != 0) {
+					L2ItemInstance itemInstance = player.getInventory().getItemByItemId(npcBuffGroupInfo.getFee().getId());
+					if ((itemInstance == null) || (!itemInstance.isStackable() && (player.getInventory().getInventoryItemCount(npcBuffGroupInfo.getFee().getId(), -1) < npcBuffGroupInfo.getFee().getCount()))) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL);
+						player.sendPacket(sm);
+						continue;
+					}
+					
+					if (itemInstance.isStackable()) {
+						if (!player.destroyItemByItemId("Npc Buffer", npcBuffGroupInfo.getFee().getId(), npcBuffGroupInfo.getFee().getCount(), player.getTarget(), true)) {
+							SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL);
+							player.sendPacket(sm);
+							continue;
+						}
+					} else {
+						for (int i = 0; i < npcBuffGroupInfo.getFee().getCount(); ++i) {
+							player.destroyItemByItemId("Npc Buffer", npcBuffGroupInfo.getFee().getId(), 1, player.getTarget(), true);
+						}
+					}
+				}
+				
+				final Skill skill = SkillData.getInstance().getSkill(npcBuffGroupInfo.getSkill().getSkillId(), npcBuffGroupInfo.getSkill().getSkillLvl());
+				if (skill != null) {
+					skill.applyEffects(player, target);
+				}
+			}
+			
+			showChatWindow(player, pageVal.get(player.getObjectId()));
+		} else if (command.startsWith("Heal") || command.startsWith("PetHeal")) {
+			if (!target.isInCombat() && !AttackStanceTaskManager.getInstance().hasAttackStanceTask(target)) {
+				String[] healArray = command.substring(command.indexOf("Heal") + 5).split(" ");
+				
+				for (String healType : healArray) {
+					if (healType.equalsIgnoreCase("HP")) {
+						target.setCurrentHp(target.getMaxHp());
+					} else if (healType.equalsIgnoreCase("MP")) {
+						target.setCurrentMp(target.getMaxMp());
+					} else if (healType.equalsIgnoreCase("CP")) {
+						target.setCurrentCp(target.getMaxCp());
+					}
+				}
+			}
+			showChatWindow(player, pageVal.get(player.getObjectId()));
+		} else if (command.startsWith("RemoveBuffs") || command.startsWith("PetRemoveBuffs")) {
+			target.stopAllEffectsExceptThoseThatLastThroughDeath();
+			showChatWindow(player, pageVal.get(player.getObjectId()));
+		} else {
+			super.onBypassFeedback(player, command);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java
new file mode 100644
index 00000000..2c03e071
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.status.FolkStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2NpcInstance extends L2Npc {
+	
+	public L2NpcInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2NpcInstance);
+		setIsInvul(false);
+	}
+	
+	@Override
+	public FolkStatus getStatus() {
+		return (FolkStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new FolkStatus(this));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java
new file mode 100644
index 00000000..a9d9137d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ObservationInstance.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+
+/**
+ * @author NightMarez
+ * @since 2005/03/27 15:29:32
+ */
+public final class L2ObservationInstance extends L2Npc {
+	
+	public L2ObservationInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2ObservationInstance);
+	}
+	
+	@Override
+	public void showChatWindow(L2PcInstance player, int val) {
+		String filename;
+		if (isInsideRadius(-79884, 86529, 0, 50, false, true) || isInsideRadius(-78858, 111358, 0, 50, false, true) || isInsideRadius(-76973, 87136, 0, 50, false, true) || isInsideRadius(-75850, 111968, 0, 50, false, true)) {
+			if (val == 0) {
+				filename = "data/html/observation/" + getId() + "-Oracle.htm";
+			} else {
+				filename = "data/html/observation/" + getId() + "-Oracle-" + val + ".htm";
+			}
+		} else {
+			if (val == 0) {
+				filename = "data/html/observation/" + getId() + ".htm";
+			} else {
+				filename = "data/html/observation/" + getId() + "-" + val + ".htm";
+			}
+		}
+		
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename);
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(html);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2OlympiadManagerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2OlympiadManagerInstance.java
new file mode 100644
index 00000000..4918c4e5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2OlympiadManagerInstance.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+
+/**
+ * Olympiad Manager instance.
+ * @author godson
+ */
+public class L2OlympiadManagerInstance extends L2Npc {
+	
+	public L2OlympiadManagerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2OlympiadManagerInstance);
+	}
+	
+	public void showChatWindow(L2PcInstance player, int val, String suffix) {
+		String filename = Olympiad.OLYMPIAD_HTML_PATH;
+		
+		filename += "noble_desc" + val;
+		filename += (suffix != null) ? suffix + ".htm" : ".htm";
+		
+		if (filename.equals(Olympiad.OLYMPIAD_HTML_PATH + "noble_desc0.htm")) {
+			filename = Olympiad.OLYMPIAD_HTML_PATH + "noble_main.htm";
+		}
+		
+		showChatWindow(player, filename);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
new file mode 100644
index 00000000..be5dff13
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
@@ -0,0 +1,10944 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.bbs.model.ForumType.MAIL;
+import static com.l2jserver.gameserver.bbs.model.ForumType.MEMO;
+import static com.l2jserver.gameserver.bbs.model.ForumVisibility.OWNER_ONLY;
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.clan;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.hunting;
+import static com.l2jserver.gameserver.config.Configuration.pvp;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+import static com.l2jserver.gameserver.config.Configuration.vitality;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_DECO;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_MULTI_ALLWEAPON;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION;
+import static com.l2jserver.gameserver.network.SystemMessageId.EQUIPMENT_S1_S2_REMOVED;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_DISARMED;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_EQUIPPED;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_S2_EQUIPPED;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_EARNED_S1_EXP_BONUS_S2_AND_S3_SP_BONUS_S4;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.helpers.MessageFormatter;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ItemsAutoDestroy;
+import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.RecipeController;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.agathion.repository.AgathionRepository;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.ai.L2PlayerAI;
+import com.l2jserver.gameserver.ai.L2SummonAI;
+import com.l2jserver.gameserver.bbs.model.Forum;
+import com.l2jserver.gameserver.bbs.service.ForumsBBSManager;
+import com.l2jserver.gameserver.cache.WarehouseCacheManager;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.sql.impl.CharSummonTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.data.xml.impl.FishData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.data.xml.impl.PlayerTemplateData;
+import com.l2jserver.gameserver.data.xml.impl.PlayerXpPercentLostData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+import com.l2jserver.gameserver.enums.PlayerAction;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.ShortcutType;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.enums.audio.Music;
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.CoupleManager;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.GrandBossManager;
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
+import com.l2jserver.gameserver.instancemanager.PunishmentManager;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.BlockList;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2AccessLevel;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.L2ContactList;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2Party.messageType;
+import com.l2jserver.gameserver.model.L2PetLevelData;
+import com.l2jserver.gameserver.model.L2PremiumItem;
+import com.l2jserver.gameserver.model.L2Radar;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.L2Request;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.Macro;
+import com.l2jserver.gameserver.model.MacroList;
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.ShortCuts;
+import com.l2jserver.gameserver.model.Shortcut;
+import com.l2jserver.gameserver.model.TeleportBookmark;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.TerritoryWard;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.UIKeysSettings;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Decoy;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.L2Vehicle;
+import com.l2jserver.gameserver.model.actor.appearance.PcAppearance;
+import com.l2jserver.gameserver.model.actor.knownlist.PcKnownList;
+import com.l2jserver.gameserver.model.actor.stat.PcStat;
+import com.l2jserver.gameserver.model.actor.status.PcStatus;
+import com.l2jserver.gameserver.model.actor.tasks.player.DismountTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.FameTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.GameGuardCheckTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.InventoryEnableTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.LookingForFishTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.PetFeedTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.PvPFlagTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.RentPetTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.ResetChargesTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.ResetSoulsTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.SitDownTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.StandUpTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.TeleportWatchdogTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.VitalityTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.WarnUserTakeBreakTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.WaterTask;
+import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
+import com.l2jserver.gameserver.model.actor.transform.Transform;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.base.ClassLevel;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+import com.l2jserver.gameserver.model.base.SubClass;
+import com.l2jserver.gameserver.model.effects.EffectFlag;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Duel;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.HuntingSystem;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.entity.L2Event;
+import com.l2jserver.gameserver.model.entity.RecommendationSystem;
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.events.Containers;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerEquipItem;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerFameChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerHennaRemove;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerKarmaChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLevelChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLogin;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLogout;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerPKChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerProfessionCancel;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerProfessionChange;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerPvPChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerPvPKill;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSit;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerStand;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTransform;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.fishing.L2Fish;
+import com.l2jserver.gameserver.model.fishing.L2Fishing;
+import com.l2jserver.gameserver.model.holders.AdditionalSkillHolder;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.PlayerEventHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillUseHolder;
+import com.l2jserver.gameserver.model.interfaces.IEventListener;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.itemcontainer.PcFreight;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.itemcontainer.PcRefund;
+import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse;
+import com.l2jserver.gameserver.model.itemcontainer.PetInventory;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.ActionType;
+import com.l2jserver.gameserver.model.items.type.ArmorType;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.multisell.PreparedListContainer;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
+import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
+import com.l2jserver.gameserver.model.punishment.PunishmentAffect;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.variables.AccountVariables;
+import com.l2jserver.gameserver.model.variables.PlayerVariables;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.model.zone.type.L2BossZone;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AbstractHtmlPacket;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ChangeWaitType;
+import com.l2jserver.gameserver.network.serverpackets.CharInfo;
+import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;
+import com.l2jserver.gameserver.network.serverpackets.ExBR_AgathionEnergyInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExDominionWarStart;
+import com.l2jserver.gameserver.network.serverpackets.ExDuelUpdateUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExFishingEnd;
+import com.l2jserver.gameserver.network.serverpackets.ExFishingStart;
+import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
+import com.l2jserver.gameserver.network.serverpackets.ExGetOnAirShip;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMode;
+import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
+import com.l2jserver.gameserver.network.serverpackets.ExSetCompassZoneCode;
+import com.l2jserver.gameserver.network.serverpackets.ExStartScenePlayer;
+import com.l2jserver.gameserver.network.serverpackets.ExStorageMaxCount;
+import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
+import com.l2jserver.gameserver.network.serverpackets.FriendStatusPacket;
+import com.l2jserver.gameserver.network.serverpackets.GameGuardQuery;
+import com.l2jserver.gameserver.network.serverpackets.GetOnVehicle;
+import com.l2jserver.gameserver.network.serverpackets.HennaInfo;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.LeaveWorld;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.MyTargetSelected;
+import com.l2jserver.gameserver.network.serverpackets.NicknameChanged;
+import com.l2jserver.gameserver.network.serverpackets.ObservationMode;
+import com.l2jserver.gameserver.network.serverpackets.ObservationReturn;
+import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PetInventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListDelete;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreListBuy;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreListSell;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreManageListBuy;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreManageListSell;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreMsgBuy;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreMsgSell;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopMsg;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopSellList;
+import com.l2jserver.gameserver.network.serverpackets.RelationChanged;
+import com.l2jserver.gameserver.network.serverpackets.Ride;
+import com.l2jserver.gameserver.network.serverpackets.ServerClose;
+import com.l2jserver.gameserver.network.serverpackets.SetupGauge;
+import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;
+import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
+import com.l2jserver.gameserver.network.serverpackets.SkillList;
+import com.l2jserver.gameserver.network.serverpackets.Snoop;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.StopMove;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.TargetSelected;
+import com.l2jserver.gameserver.network.serverpackets.TargetUnselected;
+import com.l2jserver.gameserver.network.serverpackets.TradeDone;
+import com.l2jserver.gameserver.network.serverpackets.TradeOtherDone;
+import com.l2jserver.gameserver.network.serverpackets.TradeStart;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+import com.l2jserver.gameserver.util.Broadcast;
+import com.l2jserver.gameserver.util.EnumIntBitmask;
+import com.l2jserver.gameserver.util.FloodProtectors;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * This class represents all player characters in the world.<br>
+ * There is always a client-thread connected to this (except if a player-store is activated upon logout).
+ */
+public final class L2PcInstance extends L2Playable {
+	
+	public static final int ID_NONE = -1;
+	public static final int REQUEST_TIMEOUT = 15;
+	private static final Logger LOG = LoggerFactory.getLogger(L2PcInstance.class);
+	private static final String COND_OVERRIDE_KEY = "cond_override";
+	// during fall validations will be disabled for 10 ms.
+	private static final int FALLING_VALIDATION_DELAY = 10000;
+	public final ReentrantLock soulShotLock = new ReentrantLock();
+	private final Queue<IEventListener> _eventListeners = new ConcurrentLinkedQueue<>();
+	private final String _accountName;
+	private final ReentrantLock _subclassLock = new ReentrantLock();
+	private final PcAppearance _appearance;
+	private final L2ContactList _contactList = new L2ContactList(this);
+	private final Map<Integer, TeleportBookmark> _tpbookmarks = new ConcurrentHashMap<>();
+	/** The table containing all L2RecipeList of the L2PcInstance */
+	private final Map<Integer, L2RecipeList> _dwarvenRecipeBook = new ConcurrentHashMap<>();
+	private final Map<Integer, L2RecipeList> _commonRecipeBook = new ConcurrentHashMap<>();
+	/** Premium Items */
+	private final Map<Integer, L2PremiumItem> _premiumItems = new ConcurrentHashMap<>();
+	/** Location before entering Observer Mode */
+	private final Location _lastLoc = new Location(0, 0, 0);
+	/** Stored from last ValidatePosition **/
+	private final Location _lastServerPosition = new Location(0, 0, 0);
+	private final PcInventory _inventory = new PcInventory(this);
+	private final PcFreight _freight = new PcFreight(this);
+	/** The table containing all Quests began by the L2PcInstance */
+	private final Map<String, QuestState> _quests = new ConcurrentHashMap<>();
+	/** The list containing all shortCuts of this player. */
+	private final ShortCuts _shortCuts = new ShortCuts(this);
+	/** The list containing all macros of this player. */
+	private final MacroList _macros = new MacroList(this);
+	private final Set<L2PcInstance> _snoopListener = ConcurrentHashMap.newKeySet(1);
+	private final Set<L2PcInstance> _snoopedPlayer = ConcurrentHashMap.newKeySet(1);
+	// TODO: This needs to be better integrated and saved/loaded
+	private final L2Radar _radar;
+	private final AtomicInteger _charges = new AtomicInteger();
+	private final L2Request _request = new L2Request(this);
+	private final Map<Integer, String> _chars = new LinkedHashMap<>();
+	/** Player's cubics. */
+	private final Map<Integer, L2CubicInstance> _cubics = new ConcurrentSkipListMap<>(); // TODO(Zoey76): This should be sorted in insert order.
+	/** Active shots. */
+	private final Set<Integer> _activeSoulShots = ConcurrentHashMap.newKeySet(1);
+	/** new loto ticket **/
+	private final int _loto[] = new int[5];
+	/** new race ticket **/
+	private final int _race[] = new int[2];
+	private final BlockList _blockList = new BlockList(this);
+	/** Last Html Npcs, 0 = last html was not bound to an npc */
+	private final int[] _htmlActionOriginObjectIds = new int[HtmlActionScope.values().length];
+	/** Bypass validations */
+	@SuppressWarnings("unchecked")
+	private final LinkedList<String>[] _htmlActionCaches = new LinkedList[HtmlActionScope.values().length];
+	private volatile Set<Integer> _friends;
+	private PartyDistributionType _partyDistributionType;
+	private L2GameClient _client;
+	private long _deleteTimer;
+	private Calendar _createDate = Calendar.getInstance();
+	private String _lang = null;
+	private String _htmlPrefix = null;
+	private volatile boolean _isOnline = false;
+	private long _onlineTime;
+	private long _onlineBeginTime;
+	private long _lastAccess;
+	private long _uptime;
+	private int _baseClass;
+	private int _activeClass;
+	private int _classIndex = 0;
+	/** data for mounted pets */
+	private int _controlItemId;
+	private L2PetLevelData _leveldata;
+	private int _curFeed;
+	private Future<?> _mountFeedTask;
+	private ScheduledFuture<?> _dismountTask;
+	private boolean _petItems = false;
+	/** The list of sub-classes this character has. */
+	private Map<Integer, SubClass> _subClasses;
+	/** The Experience of the L2PcInstance before the last Death Penalty */
+	private long _expBeforeDeath;
+	/** The Karma of the L2PcInstance (if higher than 0, the name of the L2PcInstance appears in red) */
+	private int _karma;
+	/** The number of player killed during a PvP (the player killed was PvP Flagged) */
+	private int _pvpKills;
+	/** The PK counter of the L2PcInstance (= Number of non PvP Flagged player killed) */
+	private int _pkKills;
+	/** The PvP Flag state of the L2PcInstance (0=White, 1=Purple) */
+	private byte _pvpFlag;
+	/** The Fame of this L2PcInstance */
+	private int _fame;
+	private ScheduledFuture<?> _fameTask;
+	/** Vitality recovery task */
+	private ScheduledFuture<?> _vitalityTask;
+	private volatile ScheduledFuture<?> _teleportWatchdog;
+	/** The Siege state of the L2PcInstance */
+	private byte _siegeState = 0;
+	/** The id of castle/fort which the L2PcInstance is registered for siege */
+	private int _siegeSide = 0;
+	private int _curWeightPenalty = 0;
+	private int _lastCompassZone; // the last compass zone update send to the client
+	private boolean _isIn7sDungeon = false;
+	private int _bookmarkslot = 0; // The Teleport Bookmark Slot
+	private boolean _canFeed;
+	private boolean _isInSiege;
+	private boolean _isInHideoutSiege = false;
+	/** Olympiad */
+	private boolean _inOlympiadMode = false;
+	private boolean _OlympiadStart = false;
+	private int _olympiadGameId = -1;
+	private int _olympiadSide = -1;
+	/** Olympiad buff count. */
+	private int _olyBuffsCount = 0;
+	/** Duel */
+	private DuelState _duelState = DuelState.NO_DUEL;
+	private int _duelId = 0;
+	/** Boat and AirShip */
+	private L2Vehicle _vehicle = null;
+	private Location _inVehiclePosition;
+	private ScheduledFuture<?> _taskforfish;
+	private MountType _mountType = MountType.NONE;
+	private int _mountNpcId;
+	private int _mountLevel;
+	/** Store object used to summon the strider you are mounting **/
+	private int _mountObjectID = 0;
+	private int _telemode = 0;
+	private boolean _inCrystallize;
+	private boolean _inCraftMode;
+	private long _offlineShopStart = 0;
+	private Transform _transformation;
+	private volatile Map<Integer, Skill> _transformSkills;
+	/** True if the L2PcInstance is sitting */
+	private boolean _waitTypeSitting;
+	private boolean _observerMode = false;
+	private final HuntingSystem _huntingSystem = new HuntingSystem(this);
+	private final RecommendationSystem _recSystem = new RecommendationSystem(this);
+	private PcWarehouse _warehouse;
+	private PcRefund _refund;
+	private PrivateStoreType _privateStoreType = PrivateStoreType.NONE;
+	private TradeList _activeTradeList;
+	private ItemContainer _activeWarehouse;
+	private volatile Map<Integer, L2ManufactureItem> _manufactureItems;
+	private String _storeName = "";
+	private TradeList _sellList;
+	private TradeList _buyList;
+	// Multisell
+	private PreparedListContainer _currentMultiSell = null;
+	/** Bitmask used to keep track of one-time/newbie quest rewards */
+	private int _newbie;
+	private boolean _noble = false;
+	private boolean _hero = false;
+	/** The L2FolkInstance corresponding to the last Folk which one the player talked. */
+	private L2Npc _lastFolkNpc = null;
+	/** Last NPC Id talked on a quest */
+	private int _questNpcObject = 0;
+	private L2Henna[] _henna = new L2Henna[3];
+	private int _hennaSTR;
+	private int _hennaINT;
+	private int _hennaDEX;
+	private int _hennaMEN;
+	private int _hennaWIT;
+	private int _hennaCON;
+	/** The L2Summon of the L2PcInstance */
+	private L2Summon _summon = null;
+	/** The L2Decoy of the L2PcInstance */
+	private L2Decoy _decoy = null;
+	/** The L2Trap of the L2PcInstance */
+	private L2TrapInstance _trap = null;
+	/** The L2Agathion of the L2PcInstance */
+	private int _agathionId = 0;
+	// apparently, a L2PcInstance CAN have both a summon AND a tamed beast at the same time!!
+	// after Freya players can control more than one tamed beast
+	private volatile Set<L2TamedBeastInstance> _tamedBeasts = null;
+	private boolean _minimapAllowed = false;
+	private int _partyroom = 0;
+	/** The Clan Identifier of the L2PcInstance */
+	private int _clanId;
+	/** The Clan object of the L2PcInstance */
+	private L2Clan _clan;
+	/** Apprentice and Sponsor IDs */
+	private int _apprentice = 0;
+	private int _sponsor = 0;
+	private long _clanJoinExpiryTime;
+	private long _clanCreateExpiryTime;
+	private int _powerGrade = 0;
+	private volatile EnumIntBitmask<ClanPrivilege> _clanPrivileges = new EnumIntBitmask<>(ClanPrivilege.class, false);
+	/** L2PcInstance's pledge class (knight, Baron, etc.) */
+	private int _pledgeClass = 0;
+	private int _pledgeType = 0;
+	/** Level at which the player joined the clan as an academy member */
+	private int _lvlJoinedAcademy = 0;
+	private int _wantsPeace = 0;
+	// Death Penalty Buff Level
+	private int _deathPenaltyBuffLevel = 0;
+	private volatile ScheduledFuture<?> _chargeTask = null;
+	// Absorbed Souls
+	private int _souls = 0;
+	private ScheduledFuture<?> _soulTask = null;
+	// WorldPosition used by TARGET_SIGNET_GROUND
+	private Location _currentSkillWorldPosition;
+	private L2AccessLevel _accessLevel;
+	private boolean _messageRefusal = false; // message refusal mode
+	private boolean _silenceMode = false; // silence mode
+	private List<Integer> _silenceModeExcluded; // silence mode
+	private boolean _dietMode = false; // ignore weight penalty
+	private boolean _tradeRefusal = false; // Trade refusal
+	private boolean _exchangeRefusal = false; // Exchange refusal
+	private L2Party _party;
+	// this is needed to find the inviting player for Party response
+	// there can only be one active party request at once
+	private L2PcInstance _activeRequester;
+	private long _requestExpireTime = 0;
+	private L2ItemInstance _arrowItem;
+	private L2ItemInstance _boltItem;
+	// Used for protection after teleport
+	private long _protectEndTime = 0;
+	private L2ItemInstance _lure = null;
+	private long _teleportProtectEndTime = 0;
+	// protects a char from aggro mobs when getting up from fake death
+	private long _recentFakeDeathEndTime = 0;
+	private boolean _isFakeDeath;
+	/** The fists L2Weapon of the L2PcInstance (used when no weapon is equipped) */
+	private L2Weapon _fistsWeaponItem;
+	private int _expertiseArmorPenalty = 0;
+	private int _expertiseWeaponPenalty = 0;
+	private int _expertisePenaltyBonus = 0;
+	private boolean _isEnchanting = false;
+	private int _activeEnchantItemId = ID_NONE;
+	private int _activeEnchantSupportItemId = ID_NONE;
+	private int _activeEnchantAttrItemId = ID_NONE;
+	private long _activeEnchantTimestamp = 0;
+	private boolean _inventoryDisable = false;
+	/** Event parameters */
+	private PlayerEventHolder eventStatus = null;
+	private byte _handysBlockCheckerEventArena = -1;
+	private L2Fishing _fishCombat;
+	private boolean _fishing = false;
+	private int _fishx = 0;
+	private int _fishy = 0;
+	private int _fishz = 0;
+	private ScheduledFuture<?> _taskRentPet;
+	private ScheduledFuture<?> _taskWater;
+	/**
+	 * Origin of the last incoming html action request.<br>
+	 * This can be used for HTMLs continuing the conversation with an npc.
+	 */
+	private int _lastHtmlActionOriginObjId;
+	private Forum _forumMail;
+	private Forum _forumMemo;
+	
+	/** Current skill in use. Note that L2Character has _lastSkillCast, but this has the button presses */
+	private SkillUseHolder _currentSkill;
+	private SkillUseHolder _currentPetSkill;
+	
+	/** Skills queued because a skill is already in progress */
+	private SkillUseHolder _queuedSkill;
+	
+	private int _cursedWeaponEquippedId = 0;
+	private boolean _combatFlagEquippedId = false;
+	
+	private boolean _canRevive = true;
+	private int _reviveRequested = 0;
+	private double _revivePower = 0;
+	private int _reviveRecovery = 0;
+	private boolean _revivePet = false;
+	
+	private double _cpUpdateIncCheck = .0;
+	private double _cpUpdateDecCheck = .0;
+	private double _cpUpdateInterval = .0;
+	private double _mpUpdateIncCheck = .0;
+	private double _mpUpdateDecCheck = .0;
+	private double _mpUpdateInterval = .0;
+	
+	/** Char Coords from Client */
+	private int _clientX;
+	private int _clientY;
+	private int _clientZ;
+	private int _clientHeading;
+	private volatile long _fallingTimestamp = 0;
+	private int _multiSocialTarget = 0;
+	private int _multiSociaAction = 0;
+	private int _movieId = 0;
+	private String _adminConfirmCmd = null;
+	private volatile long _lastItemAuctionInfoRequest = 0;
+	private Future<?> _PvPRegTask;
+	private long _pvpFlagLasts;
+	private long _notMoveUntil = 0;
+	/** Map containing all custom skills of this player. */
+	private Map<Integer, Skill> _customSkills = null;
+	private volatile int _actionMask;
+	private Map<Stats, Double> _servitorShare;
+	// Character UI
+	private UIKeysSettings _uiKeySettings;
+	/** Auto Loot Extension. */
+	private boolean _enableAutoLoot = false;
+	private boolean _enableAutoLootItem = false;
+	private boolean _enableAutoLootHerb = false;
+	// L2JMOD Wedding
+	private boolean _married = false;
+	private int _partnerId = 0;
+	private int _coupleId = 0;
+	private boolean _engagerequest = false;
+	private int _engageid = 0;
+	private boolean _marryrequest = false;
+	private boolean _marryaccepted = false;
+	// Save responder name for log it
+	private String _lastPetitionGmName = null;
+	private boolean _hasCharmOfCourage = false;
+	/** List of all QuestState instance that needs to be notified of this L2PcInstance's or its pet's death */
+	private volatile Set<QuestState> _notifyQuestOfDeathList;
+	/**
+	 * Used for AltGameSkillLearn to set a custom skill learning class Id.
+	 */
+	private ClassId _learningClass = getClassId();
+	private ScheduledFuture<?> _taskWarnUserTakeBreak;
+	private L2Fish _fish;
+	
+	/**
+	 * Creates a player.
+	 * @param objectId the object ID
+	 * @param classId the player's class ID
+	 * @param accountName the account name
+	 * @param app the player appearance
+	 */
+	public L2PcInstance(int objectId, int classId, String accountName, PcAppearance app) {
+		super(objectId, PlayerTemplateData.getInstance().getTemplate(classId));
+		setInstanceType(InstanceType.L2PcInstance);
+		super.initCharStatusUpdateValues();
+		initPcStatusUpdateValues();
+		
+		for (int i = 0; i < _htmlActionCaches.length; ++i) {
+			_htmlActionCaches[i] = new LinkedList<>();
+		}
+		
+		_accountName = accountName;
+		app.setOwner(this);
+		_appearance = app;
+		
+		// Create an AI
+		getAI();
+		
+		// Create a L2Radar object
+		_radar = new L2Radar(this);
+		
+		startVitalityTask();
+		
+		Formulas.addFuncsToNewPlayer(this);
+	}
+	
+	/**
+	 * Create a new L2PcInstance and add it in the characters table of the database.<br>
+	 * <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Create a new L2PcInstance with an account name</li>
+	 * <li>Set the name, the Hair Style, the Hair Color and the Face type of the L2PcInstance</li>
+	 * <li>Add the player in the characters table of the database</li>
+	 * </ul>
+	 * @param classId the player class ID
+	 * @param accountName The name of the L2PcInstance
+	 * @param name The name of the L2PcInstance
+	 * @param app the player's appearance
+	 * @return The L2PcInstance added to the database or null
+	 */
+	public static L2PcInstance create(int classId, String accountName, String name, PcAppearance app) {
+		// Create a new L2PcInstance with an account name
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var player = new L2PcInstance(objectId, classId, accountName, app);
+		// Set the name of the L2PcInstance
+		player.setName(name);
+		// Set Character's create time
+		player.setCreateDate(Calendar.getInstance());
+		// Set the base class ID to that of the actual class ID.
+		player.setBaseClass(player.getClassId());
+		// Kept for backwards compatibility.
+		player.setNewbie(1);
+		// Give 20 recommendations
+		player.getRecSystem().setLeft(20);
+		// Give one hour bonus for new chars
+		player.getRecSystem().setBonusTime(3600);
+		// Add the player in the characters table of the database
+		return DAOFactory.getInstance().getPlayerDAO().insert(player) ? player : null;
+	}
+	
+	/**
+	 * Restores a player from the database.
+	 * @param objectId the player's object ID
+	 * @return the player
+	 */
+	public static L2PcInstance load(int objectId) {
+		try {
+			final L2PcInstance player = DAOFactory.getInstance().getPlayerDAO().load(objectId);
+			if (player == null) {
+				return null;
+			}
+			
+			DAOFactory.getInstance().getPlayerDAO().loadCharacters(player);
+			
+			// Retrieve from the database all items of this L2PcInstance and add them to _inventory
+			player.getInventory().restore();
+			player.getFreight().restore();
+			if (!general().warehouseCache()) {
+				player.getWarehouse();
+			}
+			
+			// Retrieve from the database all secondary data of this L2PcInstance
+			// Note that Clan, Noblesse and Hero skills are given separately and not here.
+			// Retrieve from the database all skills of this L2PcInstance and add them to _skills
+			DAOFactory.getInstance().getSkillDAO().load(player);
+			
+			player._macros.restoreMe();
+			
+			player._shortCuts.restoreMe();
+			
+			DAOFactory.getInstance().getHennaDAO().load(player);
+			
+			DAOFactory.getInstance().getTeleportBookmarkDAO().load(player);
+			
+			DAOFactory.getInstance().getRecipeBookDAO().load(player, true);
+			
+			if (character().storeRecipeShopList()) {
+				DAOFactory.getInstance().getRecipeShopListDAO().load(player);
+			}
+			
+			DAOFactory.getInstance().getPremiumItemDAO().load(player);
+			
+			DAOFactory.getInstance().getItemDAO().loadPetInventory(player);
+			
+			// Reward auto-get skills and all available skills if auto-learn skills is true.
+			player.rewardSkills();
+			
+			DAOFactory.getInstance().getItemReuseDAO().load(player);
+			
+			// Buff and status icons
+			if (character().storeSkillCooltime()) {
+				player.restoreEffects();
+			}
+			
+			// Restore current CP, HP and MP values
+			if (player.getCurrentHp() < 0.5) {
+				player.setIsDead(true);
+				player.stopHpMpRegeneration();
+			}
+			
+			// Restore pet if exists in the world
+			player.setPet(L2World.getInstance().getPet(player.getObjectId()));
+			if (player.hasSummon()) {
+				player.getSummon().setOwner(player);
+			}
+			
+			// Update the overloaded status of the L2PcInstance
+			player.refreshOverloaded();
+			// Update the expertise status of the L2PcInstance
+			player.refreshExpertisePenalty();
+			
+			DAOFactory.getInstance().getFriendDAO().load(player);
+			
+			if (character().storeUISettings()) {
+				player.restoreUISettings();
+			}
+			
+			if (player.isGM()) {
+				final long masks = player.getVariables().getLong(COND_OVERRIDE_KEY, PcCondOverride.getAllExceptionsMask());
+				player.setOverrideCond(masks);
+			}
+			
+			// Starting recommendations give task, init Task give = 10 reco 2hs & 1 every 1hs.
+			player.getRecSystem().startGiveTask();
+			
+			// Load player's recommendations and bonus time
+			DAOFactory.getInstance().getRecommendationBonusDAO().load(player);
+			
+			return player;
+		} catch (Exception e) {
+			LOG.error("Failed loading character.", e);
+		}
+		return null;
+	}
+	
+	public void restoreStatusFromLoadedValues() {
+		setCurrentCp(getClient().getCharSelection().getCurrentCp());
+		setCurrentHp(getClient().getCharSelection().getCurrentHp());
+		setCurrentMp(getClient().getCharSelection().getCurrentMp());
+	}
+	
+	public boolean isSpawnProtected() {
+		return _protectEndTime > GameTimeController.getInstance().getGameTicks();
+	}
+	
+	public boolean isTeleportProtected() {
+		return _teleportProtectEndTime > GameTimeController.getInstance().getGameTicks();
+	}
+	
+	public long getPvpFlagLasts() {
+		return _pvpFlagLasts;
+	}
+	
+	public void setPvpFlagLasts(long time) {
+		_pvpFlagLasts = time;
+	}
+	
+	public void startPvPFlag() {
+		updatePvPFlag(1);
+		
+		if (_PvPRegTask == null) {
+			_PvPRegTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PvPFlagTask(this), 1000, 1000);
+		}
+	}
+	
+	public void stopPvpRegTask() {
+		if (_PvPRegTask != null) {
+			_PvPRegTask.cancel(true);
+			_PvPRegTask = null;
+		}
+	}
+	
+	public void stopPvPFlag() {
+		stopPvpRegTask();
+		
+		updatePvPFlag(0);
+		
+		_PvPRegTask = null;
+	}
+	
+	public String getAccountName() {
+		if (getClient() == null) {
+			return getAccountNamePlayer();
+		}
+		return getClient().getAccountName();
+	}
+	
+	public String getAccountNamePlayer() {
+		return _accountName;
+	}
+	
+	public Map<Integer, String> getAccountChars() {
+		return _chars;
+	}
+	
+	public int getRelation(L2PcInstance target) {
+		int result = 0;
+		
+		if (getClan() != null) {
+			result |= RelationChanged.RELATION_CLAN_MEMBER;
+			if (getClan() == target.getClan()) {
+				result |= RelationChanged.RELATION_CLAN_MATE;
+			}
+			if (getAllyId() != 0) {
+				result |= RelationChanged.RELATION_ALLY_MEMBER;
+			}
+		}
+		if (isClanLeader()) {
+			result |= RelationChanged.RELATION_LEADER;
+		}
+		if ((getParty() != null) && (getParty() == target.getParty())) {
+			result |= RelationChanged.RELATION_HAS_PARTY;
+			for (int i = 0; i < getParty().getMembers().size(); i++) {
+				if (getParty().getMembers().get(i) != this) {
+					continue;
+				}
+				switch (i) {
+					case 0 -> result |= RelationChanged.RELATION_PARTYLEADER; // 0x10
+					case 1 -> result |= RelationChanged.RELATION_PARTY4; // 0x8
+					case 2 -> result |= RelationChanged.RELATION_PARTY3 + RelationChanged.RELATION_PARTY2 + RelationChanged.RELATION_PARTY1; // 0x7
+					case 3 -> result |= RelationChanged.RELATION_PARTY3 + RelationChanged.RELATION_PARTY2; // 0x6
+					case 4 -> result |= RelationChanged.RELATION_PARTY3 + RelationChanged.RELATION_PARTY1; // 0x5
+					case 5 -> result |= RelationChanged.RELATION_PARTY3; // 0x4
+					case 6 -> result |= RelationChanged.RELATION_PARTY2 + RelationChanged.RELATION_PARTY1; // 0x3
+					case 7 -> result |= RelationChanged.RELATION_PARTY2; // 0x2
+					case 8 -> result |= RelationChanged.RELATION_PARTY1; // 0x1
+				}
+			}
+		}
+		if (getSiegeState() != 0) {
+			if (TerritoryWarManager.getInstance().getRegisteredTerritoryId(this) != 0) {
+				result |= RelationChanged.RELATION_TERRITORY_WAR;
+			} else {
+				result |= RelationChanged.RELATION_INSIEGE;
+				if (getSiegeState() != target.getSiegeState()) {
+					result |= RelationChanged.RELATION_ENEMY;
+				} else {
+					result |= RelationChanged.RELATION_ALLY;
+				}
+				if (getSiegeState() == 1) {
+					result |= RelationChanged.RELATION_ATTACKER;
+				}
+			}
+		}
+		if ((getClan() != null) && (target.getClan() != null)) {
+			if ((target.getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && (getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && target.getClan().isAtWarWith(getClan().getId())) {
+				result |= RelationChanged.RELATION_1SIDED_WAR;
+				if (getClan().isAtWarWith(target.getClan().getId())) {
+					result |= RelationChanged.RELATION_MUTUAL_WAR;
+				}
+			}
+		}
+		if (getBlockCheckerArena() != -1) {
+			result |= RelationChanged.RELATION_INSIEGE;
+			ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(getBlockCheckerArena());
+			if (holder.getPlayerTeam(this) == 0) {
+				result |= RelationChanged.RELATION_ENEMY;
+			} else {
+				result |= RelationChanged.RELATION_ALLY;
+			}
+			result |= RelationChanged.RELATION_ATTACKER;
+		}
+		return result;
+	}
+	
+	private void initPcStatusUpdateValues() {
+		_cpUpdateInterval = getMaxCp() / 352.0;
+		_cpUpdateIncCheck = getMaxCp();
+		_cpUpdateDecCheck = getMaxCp() - _cpUpdateInterval;
+		_mpUpdateInterval = getMaxMp() / 352.0;
+		_mpUpdateIncCheck = getMaxMp();
+		_mpUpdateDecCheck = getMaxMp() - _mpUpdateInterval;
+	}
+	
+	@Override
+	public PcKnownList getKnownList() {
+		return (PcKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new PcKnownList(this));
+	}
+	
+	@Override
+	public PcStat getStat() {
+		return (PcStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new PcStat(this));
+	}
+	
+	@Override
+	public PcStatus getStatus() {
+		return (PcStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new PcStatus(this));
+	}
+	
+	public PcAppearance getAppearance() {
+		return _appearance;
+	}
+	
+	/**
+	 * @return the base L2PcTemplate link to the L2PcInstance.
+	 */
+	public L2PcTemplate getBaseTemplate() {
+		return PlayerTemplateData.getInstance().getTemplate(_baseClass);
+	}
+	
+	/**
+	 * @return the L2PcTemplate link to the L2PcInstance.
+	 */
+	@Override
+	public L2PcTemplate getTemplate() {
+		return (L2PcTemplate) super.getTemplate();
+	}
+	
+	/**
+	 * @param newclass
+	 */
+	public void setTemplate(ClassId newclass) {
+		super.setTemplate(PlayerTemplateData.getInstance().getTemplate(newclass));
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		return new L2PlayerAI(this);
+	}
+	
+	/** Return the Level of the L2PcInstance. */
+	@Override
+	public int getLevel() {
+		if (isSubClassActive()) {
+			return getSubClasses().get(getClassIndex()).getStat().getLevel();
+		}
+		return getStat().getLevel();
+	}
+	
+	public int getBaseLevel() {
+		return getStat().getLevel();
+	}
+	
+	public long getBaseExp() {
+		return getStat().getExp();
+	}
+	
+	public int getBaseSp() {
+		return getStat().getSp();
+	}
+	
+	@Override
+	public double getLevelMod() {
+		if (isTransformed()) {
+			double levelMod = getTransformation().getLevelMod(this);
+			if (levelMod > -1) {
+				return levelMod;
+			}
+		}
+		return super.getLevelMod();
+	}
+	
+	/**
+	 * @return the _newbie rewards state of the L2PcInstance.
+	 */
+	public int getNewbie() {
+		return _newbie;
+	}
+	
+	/**
+	 * Set the _newbie rewards state of the L2PcInstance.
+	 * @param newbieRewards The Identifier of the _newbie state
+	 */
+	public void setNewbie(int newbieRewards) {
+		_newbie = newbieRewards;
+	}
+	
+	public void setBaseClass(int baseClass) {
+		_baseClass = baseClass;
+	}
+	
+	public boolean isInStoreMode() {
+		return getPrivateStoreType() != PrivateStoreType.NONE;
+	}
+	
+	public boolean isInCraftMode() {
+		return _inCraftMode;
+	}
+	
+	public void isInCraftMode(boolean b) {
+		_inCraftMode = b;
+	}
+	
+	/**
+	 * Manage Logout Task:
+	 * <ul>
+	 * <li>Remove player from world</li>
+	 * <li>Save player data into DB</li>
+	 * </ul>
+	 */
+	public void logout() {
+		logout(true);
+	}
+	
+	/**
+	 * Manage Logout Task:
+	 * <ul>
+	 * <li>Remove player from world</li>
+	 * <li>Save player data into DB</li>
+	 * </ul>
+	 * @param closeClient
+	 */
+	public void logout(boolean closeClient) {
+		try {
+			closeNetConnection(closeClient);
+		} catch (Exception ex) {
+			LOG.warn("Error trying to logout!", ex);
+		}
+	}
+	
+	/**
+	 * @return a table containing all Common L2RecipeList of the L2PcInstance.
+	 */
+	public L2RecipeList[] getCommonRecipeBook() {
+		return _commonRecipeBook.values().toArray(new L2RecipeList[_commonRecipeBook.size()]);
+	}
+	
+	/**
+	 * @return a table containing all Dwarf L2RecipeList of the L2PcInstance.
+	 */
+	public L2RecipeList[] getDwarvenRecipeBook() {
+		return _dwarvenRecipeBook.values().toArray(new L2RecipeList[_dwarvenRecipeBook.size()]);
+	}
+	
+	/**
+	 * Add a new L2RecipList to the table _commonrecipebook containing all L2RecipeList of the L2PcInstance
+	 * @param recipe The L2RecipeList to add to the _recipebook
+	 * @param saveToDb
+	 */
+	public void registerCommonRecipeList(L2RecipeList recipe, boolean saveToDb) {
+		_commonRecipeBook.put(recipe.getId(), recipe);
+		
+		if (saveToDb) {
+			DAOFactory.getInstance().getRecipeBookDAO().insert(this, recipe.getId(), false);
+		}
+	}
+	
+	/**
+	 * Add a new L2RecipList to the table _recipebook containing all L2RecipeList of the L2PcInstance
+	 * @param recipe The L2RecipeList to add to the _recipebook
+	 * @param saveToDb
+	 */
+	public void registerDwarvenRecipeList(L2RecipeList recipe, boolean saveToDb) {
+		_dwarvenRecipeBook.put(recipe.getId(), recipe);
+		
+		if (saveToDb) {
+			DAOFactory.getInstance().getRecipeBookDAO().insert(this, recipe.getId(), true);
+		}
+	}
+	
+	/**
+	 * @param recipeId The Identifier of the L2RecipeList to check in the player's recipe books
+	 * @return {@code true}if player has the recipe on Common or Dwarven Recipe book else returns {@code false}
+	 */
+	public boolean hasRecipeList(int recipeId) {
+		return _dwarvenRecipeBook.containsKey(recipeId) || _commonRecipeBook.containsKey(recipeId);
+	}
+	
+	/**
+	 * Tries to remove a L2RecipList from the table _DwarvenRecipeBook or from table _CommonRecipeBook, those table contain all L2RecipeList of the L2PcInstance
+	 * @param recipeId The Identifier of the L2RecipeList to remove from the _recipebook
+	 */
+	public void unregisterRecipeList(int recipeId) {
+		if (_dwarvenRecipeBook.remove(recipeId) != null) {
+			DAOFactory.getInstance().getRecipeBookDAO().delete(this, recipeId, true);
+		} else if (_commonRecipeBook.remove(recipeId) != null) {
+			DAOFactory.getInstance().getRecipeBookDAO().delete(this, recipeId, false);
+		} else {
+			LOG.warn("Attempted to remove unknown RecipeList: {}", recipeId);
+		}
+		
+		for (Shortcut sc : getAllShortCuts()) {
+			if ((sc != null) && (sc.getId() == recipeId) && (sc.getType() == ShortcutType.RECIPE)) {
+				deleteShortCut(sc.getSlot(), sc.getPage());
+			}
+		}
+	}
+	
+	/**
+	 * @return the Id for the last talked quest NPC.
+	 */
+	public int getLastQuestNpcObject() {
+		return _questNpcObject;
+	}
+	
+	public void setLastQuestNpcObject(int npcId) {
+		_questNpcObject = npcId;
+	}
+	
+	/**
+	 * @param quest The name of the quest
+	 * @return the QuestState object corresponding to the quest name.
+	 */
+	public QuestState getQuestState(String quest) {
+		return _quests.get(quest);
+	}
+	
+	/**
+	 * Add a QuestState to the table _quest containing all quests began by the L2PcInstance.
+	 * @param qs The QuestState to add to _quest
+	 */
+	public void setQuestState(QuestState qs) {
+		_quests.put(qs.getQuestName(), qs);
+	}
+	
+	/**
+	 * Verify if the player has the quest state.
+	 * @param quest the quest state to check
+	 * @return {@code true} if the player has the quest state, {@code false} otherwise
+	 */
+	public boolean hasQuestState(String quest) {
+		return _quests.containsKey(quest);
+	}
+	
+	/**
+	 * Verify if this player has completed the given quest.
+	 * @param quest to check if its completed or not.
+	 * @return {@code true} if the player has completed the given quest, {@code false} otherwise.
+	 */
+	public boolean hasQuestCompleted(String quest) {
+		final QuestState qs = _quests.get(quest);
+		return (qs != null) && qs.isCompleted();
+	}
+	
+	/**
+	 * Remove a QuestState from the table _quest containing all quests began by the L2PcInstance.
+	 * @param quest The name of the quest
+	 */
+	public void delQuestState(String quest) {
+		_quests.remove(quest);
+	}
+	
+	/**
+	 * Gets all the active quests.
+	 * @return a list of active quests
+	 */
+	public List<Quest> getAllActiveQuests() {
+		final List<Quest> quests = new LinkedList<>();
+		for (QuestState qs : _quests.values()) {
+			if ((qs == null) || (qs.getQuest() == null) || (!qs.isStarted() && !general().developer())) {
+				continue;
+			}
+			
+			// Ignore other scripts.
+			final int questId = qs.getQuest().getId();
+			if ((questId > 19999) || (questId < 1)) {
+				continue;
+			}
+			quests.add(qs.getQuest());
+		}
+		
+		return quests;
+	}
+	
+	public void processQuestEvent(String questName, String event) {
+		final Quest quest = QuestManager.getInstance().getQuest(questName);
+		if ((quest == null) || (event == null) || event.isEmpty()) {
+			return;
+		}
+		
+		if (getLastQuestNpcObject() > 0) {
+			final L2Object object = L2World.getInstance().findObject(getLastQuestNpcObject());
+			if (object.isNpc() && isInsideRadius(object, L2Npc.INTERACTION_DISTANCE, false, false)) {
+				final L2Npc npc = (L2Npc) object;
+				quest.notifyEvent(event, npc, this);
+			}
+		}
+	}
+	
+	/**
+	 * Add QuestState instance that is to be notified of L2PcInstance's death.
+	 * @param qs The QuestState that subscribe to this event
+	 */
+	public void addNotifyQuestOfDeath(QuestState qs) {
+		if (qs == null) {
+			return;
+		}
+		
+		if (!getNotifyQuestOfDeath().contains(qs)) {
+			getNotifyQuestOfDeath().add(qs);
+		}
+	}
+	
+	/**
+	 * Remove QuestState instance that is to be notified of L2PcInstance's death.
+	 * @param qs The QuestState that subscribe to this event
+	 */
+	public void removeNotifyQuestOfDeath(QuestState qs) {
+		if ((qs == null) || (_notifyQuestOfDeathList == null)) {
+			return;
+		}
+		
+		_notifyQuestOfDeathList.remove(qs);
+	}
+	
+	/**
+	 * Gets the quest states registered for notify of death of this player.
+	 * @return the quest states
+	 */
+	public Set<QuestState> getNotifyQuestOfDeath() {
+		if (_notifyQuestOfDeathList == null) {
+			synchronized (this) {
+				if (_notifyQuestOfDeathList == null) {
+					_notifyQuestOfDeathList = ConcurrentHashMap.newKeySet(1);
+				}
+			}
+		}
+		
+		return _notifyQuestOfDeathList;
+	}
+	
+	public boolean isNotifyQuestOfDeathEmpty() {
+		return (_notifyQuestOfDeathList == null) || _notifyQuestOfDeathList.isEmpty();
+	}
+	
+	/**
+	 * @return a table containing all L2ShortCut of the L2PcInstance.
+	 */
+	public Shortcut[] getAllShortCuts() {
+		return _shortCuts.getAllShortCuts();
+	}
+	
+	/**
+	 * @param slot The slot in which the shortCuts is equipped
+	 * @param page The page of shortCuts containing the slot
+	 * @return the L2ShortCut of the L2PcInstance corresponding to the position (page-slot).
+	 */
+	public Shortcut getShortCut(int slot, int page) {
+		return _shortCuts.getShortCut(slot, page);
+	}
+	
+	/**
+	 * Add a L2shortCut to the L2PcInstance _shortCuts
+	 * @param shortcut
+	 */
+	public void registerShortCut(Shortcut shortcut) {
+		_shortCuts.registerShortCut(shortcut);
+	}
+	
+	/**
+	 * Updates the shortcut bars with the new skill.
+	 * @param skillId the skill Id to search and update.
+	 * @param skillLevel the skill level to update.
+	 */
+	public void updateShortCuts(int skillId, int skillLevel) {
+		_shortCuts.updateShortCuts(skillId, skillLevel);
+	}
+	
+	/**
+	 * Delete the L2ShortCut corresponding to the position (page-slot) from the L2PcInstance _shortCuts.
+	 * @param slot
+	 * @param page
+	 */
+	public void deleteShortCut(int slot, int page) {
+		_shortCuts.deleteShortCut(slot, page);
+	}
+	
+	/**
+	 * @param macro the macro to add to this L2PcInstance.
+	 */
+	public void registerMacro(Macro macro) {
+		_macros.registerMacro(macro);
+	}
+	
+	/**
+	 * @param id the macro Id to delete.
+	 */
+	public void deleteMacro(int id) {
+		_macros.deleteMacro(id);
+	}
+	
+	/**
+	 * @return all L2Macro of the L2PcInstance.
+	 */
+	public MacroList getMacros() {
+		return _macros;
+	}
+	
+	/**
+	 * Get the siege state of the L2PcInstance.
+	 * @return 1 = attacker, 2 = defender, 0 = not involved
+	 */
+	@Override
+	public byte getSiegeState() {
+		return _siegeState;
+	}
+	
+	/**
+	 * Set the siege state of the L2PcInstance.
+	 * @param siegeState 1 = attacker, 2 = defender, 0 = not involved
+	 */
+	public void setSiegeState(byte siegeState) {
+		_siegeState = siegeState;
+	}
+	
+	public boolean isRegisteredOnThisSiegeField(int val) {
+		if ((_siegeSide != val) && ((_siegeSide < 81) || (_siegeSide > 89))) {
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public int getSiegeSide() {
+		return _siegeSide;
+	}
+	
+	/**
+	 * Set the siege Side of the L2PcInstance.
+	 * @param val
+	 */
+	public void setSiegeSide(int val) {
+		_siegeSide = val;
+	}
+	
+	@Override
+	public byte getPvpFlag() {
+		return _pvpFlag;
+	}
+	
+	/**
+	 * Set the PvP Flag of the L2PcInstance.
+	 * @param pvpFlag
+	 */
+	public void setPvpFlag(int pvpFlag) {
+		_pvpFlag = (byte) pvpFlag;
+	}
+	
+	@Override
+	public void updatePvPFlag(int value) {
+		if (getPvpFlag() == value) {
+			return;
+		}
+		setPvpFlag(value);
+		
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+		
+		// If this player has a pet update the pets pvp flag as well
+		if (hasSummon()) {
+			sendPacket(new RelationChanged(getSummon(), getRelation(this), false));
+		}
+		
+		Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		
+		for (L2PcInstance target : plrs) {
+			target.sendPacket(new RelationChanged(this, getRelation(target), isAutoAttackable(target)));
+			if (hasSummon()) {
+				target.sendPacket(new RelationChanged(getSummon(), getRelation(target), isAutoAttackable(target)));
+			}
+		}
+	}
+	
+	@Override
+	public void revalidateZone(boolean force) {
+		// Cannot validate if not in a world region (happens during teleport)
+		if (getWorldRegion() == null) {
+			return;
+		}
+		
+		// This function is called too often from movement code
+		if (force) {
+			_zoneValidateCounter = 4;
+		} else {
+			_zoneValidateCounter--;
+			if (_zoneValidateCounter < 0) {
+				_zoneValidateCounter = 4;
+			} else {
+				return;
+			}
+		}
+		
+		getWorldRegion().revalidateZones(this);
+		
+		if (general().allowWater()) {
+			checkWaterState();
+		}
+		
+		if (isInsideZone(ZoneId.ALTERED)) {
+			if (_lastCompassZone == ExSetCompassZoneCode.ALTERED_ZONE) {
+				return;
+			}
+			_lastCompassZone = ExSetCompassZoneCode.ALTERED_ZONE;
+			ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.ALTERED_ZONE);
+			sendPacket(cz);
+		} else if (isInsideZone(ZoneId.SIEGE)) {
+			if (_lastCompassZone == ExSetCompassZoneCode.SIEGE_WAR_ZONE_2) {
+				return;
+			}
+			_lastCompassZone = ExSetCompassZoneCode.SIEGE_WAR_ZONE_2;
+			ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SIEGE_WAR_ZONE_2);
+			sendPacket(cz);
+		} else if (isInsideZone(ZoneId.PVP)) {
+			if (_lastCompassZone == ExSetCompassZoneCode.PVP_ZONE) {
+				return;
+			}
+			_lastCompassZone = ExSetCompassZoneCode.PVP_ZONE;
+			ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PVP_ZONE);
+			sendPacket(cz);
+		} else if (isIn7sDungeon()) {
+			if (_lastCompassZone == ExSetCompassZoneCode.SEVEN_SIGNS_ZONE) {
+				return;
+			}
+			_lastCompassZone = ExSetCompassZoneCode.SEVEN_SIGNS_ZONE;
+			ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.SEVEN_SIGNS_ZONE);
+			sendPacket(cz);
+		} else if (isInsideZone(ZoneId.PEACE)) {
+			if (_lastCompassZone == ExSetCompassZoneCode.PEACE_ZONE) {
+				return;
+			}
+			_lastCompassZone = ExSetCompassZoneCode.PEACE_ZONE;
+			ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.PEACE_ZONE);
+			sendPacket(cz);
+		} else {
+			if (_lastCompassZone == ExSetCompassZoneCode.GENERAL_ZONE) {
+				return;
+			}
+			if (_lastCompassZone == ExSetCompassZoneCode.SIEGE_WAR_ZONE_2) {
+				updatePvPStatus();
+			}
+			_lastCompassZone = ExSetCompassZoneCode.GENERAL_ZONE;
+			ExSetCompassZoneCode cz = new ExSetCompassZoneCode(ExSetCompassZoneCode.GENERAL_ZONE);
+			sendPacket(cz);
+		}
+	}
+	
+	/**
+	 * @return True if the L2PcInstance can Craft Dwarven Recipes.
+	 */
+	public boolean hasDwarvenCraft() {
+		return getSkillLevel(CommonSkill.CREATE_DWARVEN.getId()) >= 1;
+	}
+	
+	public int getDwarvenCraft() {
+		return getSkillLevel(CommonSkill.CREATE_DWARVEN.getId());
+	}
+	
+	/**
+	 * @return True if the L2PcInstance can Craft Dwarven Recipes.
+	 */
+	public boolean hasCommonCraft() {
+		return getSkillLevel(CommonSkill.CREATE_COMMON.getId()) >= 1;
+	}
+	
+	public int getCommonCraft() {
+		return getSkillLevel(CommonSkill.CREATE_COMMON.getId());
+	}
+	
+	public boolean canCrystallize() {
+		return getSkillLevel(CommonSkill.CRYSTALLIZE.getId()) >= 1;
+	}
+	
+	/**
+	 * @return the PK counter of the L2PcInstance.
+	 */
+	public int getPkKills() {
+		return _pkKills;
+	}
+	
+	/**
+	 * Set the PK counter of the L2PcInstance.
+	 * @param pkKills
+	 */
+	public void setPkKills(int pkKills) {
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerPKChanged(this, _pkKills, pkKills), this);
+		_pkKills = pkKills;
+	}
+	
+	/**
+	 * @return the _deleteTimer of the L2PcInstance.
+	 */
+	public long getDeleteTimer() {
+		return _deleteTimer;
+	}
+	
+	/**
+	 * Set the _deleteTimer of the L2PcInstance.
+	 * @param deleteTimer
+	 */
+	public void setDeleteTimer(long deleteTimer) {
+		_deleteTimer = deleteTimer;
+	}
+	
+	public long getExpBeforeDeath() {
+		return _expBeforeDeath;
+	}
+	
+	/**
+	 * Set the exp of the L2PcInstance before a death
+	 * @param exp
+	 */
+	public void setExpBeforeDeath(long exp) {
+		_expBeforeDeath = exp;
+	}
+	
+	/**
+	 * Return the Karma of the L2PcInstance.
+	 */
+	@Override
+	public int getKarma() {
+		return _karma;
+	}
+	
+	/**
+	 * Set the Karma of the L2PcInstance and send a Server->Client packet StatusUpdate (broadcast).
+	 * @param karma
+	 */
+	public void setKarma(int karma) {
+		// Notify to scripts.
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerKarmaChanged(this, getKarma(), karma), this);
+		
+		if (karma < 0) {
+			karma = 0;
+		}
+		if ((_karma == 0) && (karma > 0)) {
+			Collection<L2Object> objs = getKnownList().getKnownObjects().values();
+			
+			for (L2Object object : objs) {
+				if (!(object instanceof L2GuardInstance)) {
+					continue;
+				}
+				
+				if (((L2GuardInstance) object).getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) {
+					((L2GuardInstance) object).getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+				}
+			}
+		} else if ((_karma > 0) && (karma == 0)) {
+			// Send a Server->Client StatusUpdate packet with Karma and PvP Flag to the L2PcInstance and all L2PcInstance to inform (broadcast)
+			setKarmaFlag(0);
+		}
+		
+		_karma = karma;
+		broadcastKarma();
+	}
+	
+	public int getExpertiseArmorPenalty() {
+		return _expertiseArmorPenalty;
+	}
+	
+	public int getExpertiseWeaponPenalty() {
+		return _expertiseWeaponPenalty;
+	}
+	
+	public int getExpertisePenaltyBonus() {
+		return _expertisePenaltyBonus;
+	}
+	
+	public void setExpertisePenaltyBonus(int bonus) {
+		_expertisePenaltyBonus = bonus;
+	}
+	
+	public int getWeightPenalty() {
+		if (_dietMode) {
+			return 0;
+		}
+		return _curWeightPenalty;
+	}
+	
+	/**
+	 * Update the overloaded status of the L2PcInstance.
+	 */
+	public void refreshOverloaded() {
+		int maxLoad = getMaxLoad();
+		if (maxLoad > 0) {
+			long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000L) / getMaxLoad());
+			int newWeightPenalty;
+			if ((weightproc < 500) || _dietMode) {
+				newWeightPenalty = 0;
+			} else if (weightproc < 666) {
+				newWeightPenalty = 1;
+			} else if (weightproc < 800) {
+				newWeightPenalty = 2;
+			} else if (weightproc < 1000) {
+				newWeightPenalty = 3;
+			} else {
+				newWeightPenalty = 4;
+			}
+			
+			if (_curWeightPenalty != newWeightPenalty) {
+				_curWeightPenalty = newWeightPenalty;
+				if ((newWeightPenalty > 0) && !_dietMode) {
+					addSkill(SkillData.getInstance().getSkill(4270, newWeightPenalty));
+					setIsOverloaded(getCurrentLoad() > maxLoad);
+				} else {
+					removeSkill(getKnownSkill(4270), false, true);
+					setIsOverloaded(false);
+				}
+				sendPacket(new UserInfo(this));
+				sendPacket(new EtcStatusUpdate(this));
+				broadcastPacket(new CharInfo(this));
+				broadcastPacket(new ExBrExtraUserInfo(this));
+			}
+		}
+	}
+	
+	public void refreshExpertisePenalty() {
+		if (!character().expertisePenalty()) {
+			return;
+		}
+		
+		final int expertiseLevel = getExpertiseLevel();
+		
+		int armorPenalty = 0;
+		int weaponPenalty = 0;
+		int crystaltype;
+		
+		for (L2ItemInstance item : getInventory().getItems()) {
+			if ((item != null) && item.isEquipped() && ((item.getItemType() != EtcItemType.ARROW) && (item.getItemType() != EtcItemType.BOLT))) {
+				crystaltype = item.getItem().getCrystalType().getId();
+				if (crystaltype > expertiseLevel) {
+					if (item.isWeapon() && (crystaltype > weaponPenalty)) {
+						weaponPenalty = crystaltype;
+					} else if (crystaltype > armorPenalty) {
+						armorPenalty = crystaltype;
+					}
+				}
+			}
+		}
+		
+		boolean changed = false;
+		final int bonus = getExpertisePenaltyBonus();
+		
+		// calc weapon penalty
+		weaponPenalty = weaponPenalty - expertiseLevel - bonus;
+		weaponPenalty = Math.min(Math.max(weaponPenalty, 0), 4);
+		
+		if ((getExpertiseWeaponPenalty() != weaponPenalty) || (getSkillLevel(CommonSkill.WEAPON_GRADE_PENALTY.getId()) != weaponPenalty)) {
+			_expertiseWeaponPenalty = weaponPenalty;
+			if (_expertiseWeaponPenalty > 0) {
+				addSkill(SkillData.getInstance().getSkill(CommonSkill.WEAPON_GRADE_PENALTY.getId(), _expertiseWeaponPenalty));
+			} else {
+				removeSkill(getKnownSkill(CommonSkill.WEAPON_GRADE_PENALTY.getId()), false, true);
+			}
+			changed = true;
+		}
+		
+		// calc armor penalty
+		armorPenalty = armorPenalty - expertiseLevel - bonus;
+		armorPenalty = Math.min(Math.max(armorPenalty, 0), 4);
+		
+		if ((getExpertiseArmorPenalty() != armorPenalty) || (getSkillLevel(CommonSkill.ARMOR_GRADE_PENALTY.getId()) != armorPenalty)) {
+			_expertiseArmorPenalty = armorPenalty;
+			if (_expertiseArmorPenalty > 0) {
+				addSkill(SkillData.getInstance().getSkill(CommonSkill.ARMOR_GRADE_PENALTY.getId(), _expertiseArmorPenalty));
+			} else {
+				removeSkill(getKnownSkill(CommonSkill.ARMOR_GRADE_PENALTY.getId()), false, true);
+			}
+			changed = true;
+		}
+		
+		if (changed) {
+			sendPacket(new EtcStatusUpdate(this));
+		}
+	}
+	
+	public void useEquippableItem(int objectId, boolean abortAttack) {
+		final var item = getInventory().getItemByObjectId(objectId);
+		if (item == null) {
+			return;
+		}
+		
+		L2ItemInstance[] items = null;
+		final boolean isEquiped = item.isEquipped();
+		final int oldInvLimit = getInventoryLimit();
+		SystemMessage sm = null;
+		
+		if (isEquiped) {
+			if (item.getEnchantLevel() > 0) {
+				sm = SystemMessage.getSystemMessage(EQUIPMENT_S1_S2_REMOVED);
+				sm.addInt(item.getEnchantLevel());
+				sm.addItemName(item);
+			} else {
+				sm = SystemMessage.getSystemMessage(S1_DISARMED);
+				sm.addItemName(item);
+			}
+			sendPacket(sm);
+			
+			int slot = getInventory().getSlotFromItem(item);
+			// we can't unequip talisman by body slot
+			if (slot == SLOT_DECO) {
+				items = getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
+			} else {
+				items = getInventory().unEquipItemInBodySlotAndRecord(slot);
+			}
+		} else {
+			items = getInventory().equipItemAndRecord(item);
+			
+			if (item.isEquipped()) {
+				if (item.getEnchantLevel() > 0) {
+					sm = SystemMessage.getSystemMessage(S1_S2_EQUIPPED);
+					sm.addInt(item.getEnchantLevel());
+					sm.addItemName(item);
+				} else {
+					sm = SystemMessage.getSystemMessage(S1_EQUIPPED);
+					sm.addItemName(item);
+				}
+				sendPacket(sm);
+				
+				// Consume mana - will start a task if required; returns if item is not a shadow item
+				item.decreaseMana(false);
+				
+				if ((item.getItem().getBodyPart() & SLOT_MULTI_ALLWEAPON) != 0) {
+					rechargeShots(true, true);
+				}
+			} else {
+				sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+			}
+		}
+		
+		refreshExpertisePenalty();
+		
+		broadcastUserInfo();
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		iu.addItems(Arrays.asList(items));
+		sendPacket(iu);
+		
+		if (abortAttack) {
+			abortAttack();
+		}
+		
+		if (getInventoryLimit() != oldInvLimit) {
+			sendPacket(new ExStorageMaxCount(this));
+		}
+		
+		// If item is agathion with energy, then send info to client.
+		final var agathionInfo = AgathionRepository.getInstance().getByItemId(item.getId());
+		if ((agathionInfo != null) && (agathionInfo.maxEnergy() > 0)) {
+			sendPacket(new ExBR_AgathionEnergyInfo(List.of(item)));
+		}
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerEquipItem(this, item), this);
+	}
+	
+	/**
+	 * @return the the PvP Kills of the L2PcInstance (Number of player killed during a PvP).
+	 */
+	public int getPvpKills() {
+		return _pvpKills;
+	}
+	
+	/**
+	 * Set the the PvP Kills of the L2PcInstance (Number of player killed during a PvP).
+	 * @param pvpKills
+	 */
+	public void setPvpKills(int pvpKills) {
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerPvPChanged(this, _pvpKills, pvpKills), this);
+		_pvpKills = pvpKills;
+	}
+	
+	/**
+	 * @return the Fame of this L2PcInstance
+	 */
+	public int getFame() {
+		return _fame;
+	}
+	
+	/**
+	 * Set the Fame of this L2PcInstane
+	 * @param fame
+	 */
+	public void setFame(int fame) {
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerFameChanged(this, _fame, fame), this);
+		_fame = (fame > character().getMaxPersonalFamePoints()) ? character().getMaxPersonalFamePoints() : fame;
+	}
+	
+	/**
+	 * @return the ClassId object of the L2PcInstance contained in L2PcTemplate.
+	 */
+	public ClassId getClassId() {
+		return getTemplate().getClassId();
+	}
+	
+	/**
+	 * Set the template of the L2PcInstance.
+	 * @param Id The Identifier of the L2PcTemplate to set to the L2PcInstance
+	 */
+	public void setClassId(int Id) {
+		if (!_subclassLock.tryLock()) {
+			return;
+		}
+		
+		try {
+			if ((getLvlJoinedAcademy() != 0) && (_clan != null) && (PlayerClass.values()[Id].getLevel() == ClassLevel.Third)) {
+				if (getLvlJoinedAcademy() <= 16) {
+					_clan.addReputationScore(clan().getCompleteAcademyMaxPoints(), true);
+				} else if (getLvlJoinedAcademy() >= 39) {
+					_clan.addReputationScore(clan().getCompleteAcademyMinPoints(), true);
+				} else {
+					_clan.addReputationScore((clan().getCompleteAcademyMaxPoints() - ((getLvlJoinedAcademy() - 16) * 20)), true);
+				}
+				setLvlJoinedAcademy(0);
+				// oust pledge member from the academy, cuz he has finished his 2nd class transfer
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_EXPELLED);
+				msg.addPcName(this);
+				_clan.broadcastToOnlineMembers(msg);
+				_clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(getName()));
+				_clan.removeClanMember(getObjectId(), 0);
+				sendPacket(SystemMessageId.ACADEMY_MEMBERSHIP_TERMINATED);
+				
+				// receive graduation gift
+				getInventory().addItem("Gift", 8181, 1, this, null); // give academy circlet
+			}
+			if (isSubClassActive()) {
+				getSubClasses().get(_classIndex).setClassId(Id);
+			}
+			setTarget(this);
+			broadcastPacket(new MagicSkillUse(this, 5103, 1, 1000, 0));
+			setClassTemplate(Id);
+			if (getClassId().level() == 3) {
+				sendPacket(SystemMessageId.THIRD_CLASS_TRANSFER);
+			} else {
+				sendPacket(SystemMessageId.CLASS_TRANSFER);
+			}
+			
+			// Update class icon in party and clan
+			if (isInParty()) {
+				getParty().broadcastPacket(new PartySmallWindowUpdate(this));
+			}
+			
+			if (getClan() != null) {
+				getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this));
+			}
+			
+			// Add AutoGet skills and normal skills and/or learnByFS depending on configurations.
+			rewardSkills();
+			
+			if (!canOverrideCond(PcCondOverride.SKILL_CONDITIONS) && character().decreaseSkillOnDelevel()) {
+				checkPlayerSkills();
+			}
+		} finally {
+			_subclassLock.unlock();
+		}
+	}
+	
+	/**
+	 * @return the custom skill learning class Id.
+	 */
+	public ClassId getLearningClass() {
+		return _learningClass;
+	}
+	
+	/**
+	 * @param learningClass the custom skill learning class Id to set.
+	 */
+	public void setLearningClass(ClassId learningClass) {
+		_learningClass = learningClass;
+	}
+	
+	/**
+	 * @return the Experience of the L2PcInstance.
+	 */
+	@Override
+	public long getExp() {
+		if (isSubClassActive()) {
+			return getSubClasses().get(getClassIndex()).getStat().getExp();
+		}
+		return getStat().getExp();
+	}
+	
+	/**
+	 * Set the Experience value of the L2PcInstance.
+	 * @param exp
+	 */
+	public void setExp(long exp) {
+		if (exp < 0) {
+			LOG.warn("For player {} is set negative amount of exp [{}]", this, exp, new IllegalArgumentException());
+			exp = 0;
+		}
+		getSubStat().setExp(exp);
+	}
+	
+	public void setLevel(int level) {
+		getSubStat().setLevel(Math.min(level, getMaxLevel()));
+	}
+	
+	public int getMaxLevel() {
+		return getSubStat().getMaxLevel();
+	}
+	
+	public int getMaxExpLevel() {
+		return getSubStat().getMaxExpLevel();
+	}
+	
+	private PcStat getSubStat() {
+		return isSubClassActive() ? getSubClasses().get(getClassIndex()).getStat() : getStat();
+	}
+	
+	@Override
+	public boolean addLevel(int value) {
+		if ((getLevel() + value) > getMaxLevel()) {
+			return false;
+		}
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerLevelChanged(this, getLevel(), getLevel() + value), this);
+		
+		boolean levelIncreased = getSubStat().addLevel(value);
+		onLevelChange(levelIncreased);
+		
+		return levelIncreased;
+	}
+	
+	@Override
+	public void onLevelChange(boolean levelIncreased) {
+		if (levelIncreased) {
+			setCurrentCp(getMaxCp());
+			setCurrentHp(getMaxHp());
+			setCurrentMp(getMaxMp());
+			broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));
+			sendPacket(SystemMessageId.YOU_INCREASED_YOUR_LEVEL);
+		} else {
+			if (!isGM() && character().decreaseSkillOnDelevel()) {
+				checkPlayerSkills();
+			}
+		}
+		
+		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
+		rewardSkills();
+		
+		if (getClan() != null) {
+			getClan().updateClanMember(this);
+			getClan().broadcastToOnlineMembers(new PledgeShowMemberListUpdate(this));
+		}
+		if (isInParty()) {
+			getParty().recalculatePartyLevel(); // Recalculate the party level
+		}
+		
+		if (isTransformed() || isInStance()) {
+			getTransformation().onLevelUp(this);
+		}
+		
+		// Synchronize level with pet if possible.
+		if (hasPet()) {
+			final L2PetInstance pet = (L2PetInstance) getSummon();
+			if (pet.getPetData().isSyncLevel() && (pet.getLevel() != getLevel())) {
+				pet.getStat().setLevel(getLevel());
+				pet.getStat().getExpForLevel(getLevel());
+				pet.setCurrentHp(pet.getMaxHp());
+				pet.setCurrentMp(pet.getMaxMp());
+				pet.broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));
+				pet.updateAndBroadcastStatus(1);
+			}
+		}
+		
+		// Get Nevit Blessing Points on level up
+		if (getActingPlayer().getHuntingSystem().isNevitBlessingActive()) {
+			getActingPlayer().getHuntingSystem().addPoints(hunting().getNevitLevelAcquirePoints2());
+		} else {
+			getActingPlayer().getHuntingSystem().addPoints(hunting().getNevitLevelAcquirePoints());
+		}
+		
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.LEVEL, getLevel());
+		su.addAttribute(StatusUpdate.MAX_CP, getMaxCp());
+		su.addAttribute(StatusUpdate.MAX_HP, getMaxHp());
+		su.addAttribute(StatusUpdate.MAX_MP, getMaxMp());
+		sendPacket(su);
+		
+		// Update the overloaded status of the L2PcInstance
+		refreshOverloaded();
+		// Update the expertise status of the L2PcInstance
+		refreshExpertisePenalty();
+		// Send a Server->Client packet UserInfo to the L2PcInstance
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+		sendPacket(new ExVoteSystemInfo(this));
+	}
+	
+	public int getActiveEnchantAttrItemId() {
+		return _activeEnchantAttrItemId;
+	}
+	
+	public void setActiveEnchantAttrItemId(int objectId) {
+		_activeEnchantAttrItemId = objectId;
+	}
+	
+	public int getActiveEnchantItemId() {
+		return _activeEnchantItemId;
+	}
+	
+	public void setActiveEnchantItemId(int objectId) {
+		// If we don't have a Enchant Item, we are not enchanting.
+		if (objectId == ID_NONE) {
+			setActiveEnchantSupportItemId(ID_NONE);
+			setActiveEnchantTimestamp(0);
+			setIsEnchanting(false);
+		}
+		_activeEnchantItemId = objectId;
+	}
+	
+	public int getActiveEnchantSupportItemId() {
+		return _activeEnchantSupportItemId;
+	}
+	
+	public void setActiveEnchantSupportItemId(int objectId) {
+		_activeEnchantSupportItemId = objectId;
+	}
+	
+	public long getActiveEnchantTimestamp() {
+		return _activeEnchantTimestamp;
+	}
+	
+	public void setActiveEnchantTimestamp(long val) {
+		_activeEnchantTimestamp = val;
+	}
+	
+	public void setIsEnchanting(boolean val) {
+		_isEnchanting = val;
+	}
+	
+	public boolean isEnchanting() {
+		return _isEnchanting;
+	}
+	
+	/**
+	 * @return the fists weapon of the L2PcInstance (used when no weapon is equipped).
+	 */
+	public L2Weapon getFistsWeaponItem() {
+		return _fistsWeaponItem;
+	}
+	
+	/**
+	 * Set the fists weapon of the L2PcInstance (used when no weapon is equiped).
+	 * @param weaponItem The fists L2Weapon to set to the L2PcInstance
+	 */
+	public void setFistsWeaponItem(L2Weapon weaponItem) {
+		_fistsWeaponItem = weaponItem;
+	}
+	
+	/**
+	 * @param classId
+	 * @return the fists weapon of the L2PcInstance Class (used when no weapon is equipped).
+	 */
+	public L2Weapon findFistsWeaponItem(int classId) {
+		L2Weapon weaponItem = null;
+		if ((classId >= 0x00) && (classId <= 0x09)) {
+			// human fighter fists
+			L2Item temp = ItemTable.getInstance().getTemplate(246);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x0a) && (classId <= 0x11)) {
+			// human mage fists
+			L2Item temp = ItemTable.getInstance().getTemplate(251);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x12) && (classId <= 0x18)) {
+			// elven fighter fists
+			L2Item temp = ItemTable.getInstance().getTemplate(244);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x19) && (classId <= 0x1e)) {
+			// elven mage fists
+			L2Item temp = ItemTable.getInstance().getTemplate(249);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x1f) && (classId <= 0x25)) {
+			// dark elven fighter fists
+			L2Item temp = ItemTable.getInstance().getTemplate(245);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x26) && (classId <= 0x2b)) {
+			// dark elven mage fists
+			L2Item temp = ItemTable.getInstance().getTemplate(250);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x2c) && (classId <= 0x30)) {
+			// orc fighter fists
+			L2Item temp = ItemTable.getInstance().getTemplate(248);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x31) && (classId <= 0x34)) {
+			// orc mage fists
+			L2Item temp = ItemTable.getInstance().getTemplate(252);
+			weaponItem = (L2Weapon) temp;
+		} else if ((classId >= 0x35) && (classId <= 0x39)) {
+			// dwarven fists
+			L2Item temp = ItemTable.getInstance().getTemplate(247);
+			weaponItem = (L2Weapon) temp;
+		}
+		
+		return weaponItem;
+	}
+	
+	/**
+	 * This method reward all AutoGet skills and Normal skills if Auto-Learn configuration is true.
+	 */
+	public void rewardSkills() {
+		// Give all normal skills if activated Auto-Learn is activated, included AutoGet skills.
+		if (character().autoLearnSkills()) {
+			giveAvailableSkills(character().autoLearnForgottenScrollSkills(), true);
+		} else {
+			giveAvailableAutoGetSkills();
+		}
+		
+		checkPlayerSkills();
+		checkItemRestriction();
+		sendSkillList();
+	}
+	
+	/**
+	 * Re-give all skills which aren't saved to database, like Noble, Hero, Clan Skills.<br>
+	 */
+	public void regiveTemporarySkills() {
+		// Do not call this on enterworld or char load
+		
+		// Add noble skills if noble
+		if (isNoble()) {
+			setNoble(true);
+		}
+		
+		// Add Hero skills if hero
+		if (isHero()) {
+			setHero(true);
+		}
+		
+		// Add clan skills
+		if (getClan() != null) {
+			L2Clan clan = getClan();
+			clan.addSkillEffects(this);
+			
+			if ((clan.getLevel() >= SiegeManager.getInstance().getSiegeClanMinLevel()) && isClanLeader()) {
+				SiegeManager.getInstance().addSiegeSkills(this);
+			}
+			if (getClan().getCastleId() > 0) {
+				CastleManager.getInstance().getCastleByOwner(getClan()).giveResidentialSkills(this);
+			}
+			if (getClan().getFortId() > 0) {
+				FortManager.getInstance().getFortByOwner(getClan()).giveResidentialSkills(this);
+			}
+		}
+		
+		// Reload passive skills from armors / jewels / weapons
+		getInventory().reloadEquippedItems();
+		
+		// Add Death Penalty Buff Level
+		restoreDeathPenaltyBuffLevel();
+	}
+	
+	/**
+	 * Give all available skills to the player.
+	 * @param includedByFs if {@code true} forgotten scroll skills present in the skill tree will be added
+	 * @param includeAutoGet if {@code true} auto-get skills present in the skill tree will be added
+	 * @return the amount of new skills earned
+	 */
+	public int giveAvailableSkills(boolean includedByFs, boolean includeAutoGet) {
+		int skillCounter = 0;
+		// Get available skills
+		Collection<Skill> skills = SkillTreesData.getInstance().getAllAvailableSkills(this, getClassId(), includedByFs, includeAutoGet);
+		List<Skill> skillsForStore = new ArrayList<>();
+		
+		for (Skill sk : skills) {
+			if (getKnownSkill(sk.getId()) == sk) {
+				continue;
+			}
+			
+			if (getSkillLevel(sk.getId()) == -1) {
+				skillCounter++;
+			}
+			
+			// fix when learning toggle skills
+			if (sk.isToggle() && isAffectedBySkill(sk.getId())) {
+				stopSkillEffects(true, sk.getId());
+			}
+			
+			addSkill(sk, false);
+			skillsForStore.add(sk);
+		}
+		
+		DAOFactory.getInstance().getSkillDAO().insert(this, -1, skillsForStore);
+		
+		if (character().autoLearnSkills() && (skillCounter > 0)) {
+			sendMessage("You have learned " + skillCounter + " new skills.");
+		}
+		return skillCounter;
+	}
+	
+	/**
+	 * Give all available auto-get skills to the player.
+	 */
+	public void giveAvailableAutoGetSkills() {
+		// Get available skills
+		final List<L2SkillLearn> autoGetSkills = SkillTreesData.getInstance().getAvailableAutoGetSkills(this);
+		final SkillData st = SkillData.getInstance();
+		Skill skill;
+		for (L2SkillLearn s : autoGetSkills) {
+			skill = st.getSkill(s.getSkillId(), s.getSkillLevel());
+			if (skill != null) {
+				addSkill(skill, true);
+			} else {
+				LOG.warn("Skipping null auto-get skill for player: {}", this);
+			}
+		}
+	}
+	
+	/**
+	 * @return the Race object of the L2PcInstance.
+	 */
+	@Override
+	public Race getRace() {
+		if (!isSubClassActive()) {
+			return getTemplate().getRace();
+		}
+		return PlayerTemplateData.getInstance().getTemplate(_baseClass).getRace();
+	}
+	
+	public L2Radar getRadar() {
+		return _radar;
+	}
+	
+	/* Return true if Hellbound minimap allowed */
+	public boolean isMinimapAllowed() {
+		return _minimapAllowed;
+	}
+	
+	/* Enable or disable minimap on Hellbound */
+	public void setMinimapAllowed(boolean b) {
+		_minimapAllowed = b;
+	}
+	
+	public void addSp(int sp) {
+		getSubStat().addSp(sp);
+	}
+	
+	@Override
+	public int getSp() {
+		return isSubClassActive() ? getSubClasses().get(getClassIndex()).getStat().getSp() : getStat().getSp();
+	}
+	
+	/**
+	 * Set the SP amount of the L2PcInstance.
+	 * @param sp
+	 */
+	public void setSp(int sp) {
+		if (sp < 0) {
+			sp = 0;
+		}
+		if (isSubClassActive()) {
+			getSubClasses().get(getClassIndex()).getStat().setSp(sp);
+		} else {
+			super.getStat().setSp(sp);
+		}
+	}
+	
+	/**
+	 * @param castleId
+	 * @return true if this L2PcInstance is a clan leader in ownership of the passed castle
+	 */
+	public boolean isCastleLord(int castleId) {
+		L2Clan clan = getClan();
+		
+		// player has clan and is the clan leader, check the castle info
+		if ((clan != null) && (clan.getLeader().getPlayerInstance() == this)) {
+			// if the clan has a castle and it is actually the queried castle, return true
+			Castle castle = CastleManager.getInstance().getCastleByOwner(clan);
+			if ((castle != null) && (castle == CastleManager.getInstance().getCastleById(castleId))) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * @return the Clan Identifier of the L2PcInstance.
+	 */
+	@Override
+	public int getClanId() {
+		return _clanId;
+	}
+	
+	/**
+	 * @return the Clan Crest Identifier of the L2PcInstance or 0.
+	 */
+	public int getClanCrestId() {
+		if (_clan != null) {
+			return _clan.getCrestId();
+		}
+		
+		return 0;
+	}
+	
+	/**
+	 * @return The Clan CrestLarge Identifier or 0
+	 */
+	public int getClanCrestLargeId() {
+		if ((_clan != null) && ((_clan.getCastleId() != 0) || (_clan.getHideoutId() != 0))) {
+			return _clan.getCrestLargeId();
+		}
+		return 0;
+	}
+	
+	public long getClanJoinExpiryTime() {
+		return _clanJoinExpiryTime;
+	}
+	
+	public void setClanJoinExpiryTime(long time) {
+		_clanJoinExpiryTime = time;
+	}
+	
+	public long getClanCreateExpiryTime() {
+		return _clanCreateExpiryTime;
+	}
+	
+	public void setClanCreateExpiryTime(long time) {
+		_clanCreateExpiryTime = time;
+	}
+	
+	/**
+	 * Return the PcInventory Inventory of the L2PcInstance contained in _inventory.
+	 */
+	@Override
+	public PcInventory getInventory() {
+		return _inventory;
+	}
+	
+	/**
+	 * Delete a ShortCut of the L2PcInstance _shortCuts.
+	 * @param objectId
+	 */
+	public void removeItemFromShortCut(int objectId) {
+		_shortCuts.deleteShortCutByObjectId(objectId);
+	}
+	
+	/**
+	 * @return True if the L2PcInstance is sitting.
+	 */
+	public boolean isSitting() {
+		return _waitTypeSitting;
+	}
+	
+	/**
+	 * Set _waitTypeSitting to given value
+	 * @param state
+	 */
+	public void setIsSitting(boolean state) {
+		_waitTypeSitting = state;
+	}
+	
+	/**
+	 * Sit down the L2PcInstance, set the AI Intention to AI_INTENTION_REST and send a Server->Client ChangeWaitType packet (broadcast)
+	 */
+	public void sitDown() {
+		sitDown(true);
+	}
+	
+	public void sitDown(boolean checkCast) {
+		final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new PlayerSit(this), this, TerminateReturn.class);
+		if ((terminate != null) && terminate.terminate()) {
+			return;
+		}
+		
+		if (checkCast && isCastingNow()) {
+			return;
+		}
+		
+		if (!_waitTypeSitting && !isAttackingDisabled() && !isOutOfControl() && !isImmobilized() && !isMoving()) {
+			breakAttack();
+			setIsSitting(true);
+			getAI().setIntention(CtrlIntention.AI_INTENTION_REST);
+			broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_SITTING));
+			// Schedule a sit down task to wait for the animation to finish
+			ThreadPoolManager.getInstance().scheduleGeneral(new SitDownTask(this), 2500);
+			startStunning();
+		}
+	}
+	
+	/**
+	 * Stand up the L2PcInstance, set the AI Intention to AI_INTENTION_IDLE and send a Server->Client ChangeWaitType packet (broadcast)
+	 */
+	public void standUp() {
+		final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new PlayerStand(this), Containers.Players(), TerminateReturn.class);
+		if ((terminate != null) && terminate.terminate()) {
+			return;
+		}
+		
+		if (_waitTypeSitting && !isInStoreMode() && !isAlikeDead()) {
+			if (getEffectList().isAffected(EffectFlag.RELAXING)) {
+				stopEffects(L2EffectType.RELAXING);
+			}
+			
+			broadcastPacket(new ChangeWaitType(this, ChangeWaitType.WT_STANDING));
+			// Schedule a stand up task to wait for the animation to finish
+			ThreadPoolManager.getInstance().scheduleGeneral(new StandUpTask(this), 2500);
+		}
+	}
+	
+	/**
+	 * @return the PcWarehouse object of the L2PcInstance.
+	 */
+	public PcWarehouse getWarehouse() {
+		if (_warehouse == null) {
+			_warehouse = new PcWarehouse(this);
+			_warehouse.restore();
+		}
+		if (general().warehouseCache()) {
+			WarehouseCacheManager.getInstance().addCacheTask(this);
+		}
+		return _warehouse;
+	}
+	
+	/**
+	 * Free memory used by Warehouse
+	 */
+	public void clearWarehouse() {
+		if (_warehouse != null) {
+			_warehouse.deleteMe();
+		}
+		_warehouse = null;
+	}
+	
+	/**
+	 * @return the PcFreight object of the L2PcInstance.
+	 */
+	public PcFreight getFreight() {
+		return _freight;
+	}
+	
+	/**
+	 * @return true if refund list is not empty
+	 */
+	public boolean hasRefund() {
+		return (_refund != null) && (_refund.getSize() > 0) && general().allowRefund();
+	}
+	
+	/**
+	 * @return refund object or create new if not exist
+	 */
+	public PcRefund getRefund() {
+		if (_refund == null) {
+			_refund = new PcRefund(this);
+		}
+		return _refund;
+	}
+	
+	/**
+	 * Clear refund
+	 */
+	public void clearRefund() {
+		if (_refund != null) {
+			_refund.deleteMe();
+		}
+		_refund = null;
+	}
+	
+	/**
+	 * @return the Adena amount of the L2PcInstance.
+	 */
+	public long getAdena() {
+		return _inventory.getAdena();
+	}
+	
+	/**
+	 * @return the Ancient Adena amount of the L2PcInstance.
+	 */
+	public long getAncientAdena() {
+		return _inventory.getAncientAdena();
+	}
+	
+	/**
+	 * Add adena to Inventory of the L2PcInstance and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int Quantity of adena to be added
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 */
+	public void addAdena(String process, long count, L2Object reference, boolean sendMessage) {
+		if (sendMessage) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
+			sm.addLong(count);
+			sendPacket(sm);
+		}
+		
+		if (count > 0) {
+			_inventory.addAdena(process, count, this, reference);
+			
+			// Send update packet
+			if (!general().forceInventoryUpdate()) {
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addItem(_inventory.getAdenaInstance());
+				sendPacket(iu);
+			} else {
+				sendPacket(new ItemList(this, false));
+			}
+		}
+	}
+	
+	/**
+	 * Reduce adena in Inventory of the L2PcInstance and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : long Quantity of adena to be reduced
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	public boolean reduceAdena(String process, long count, L2Object reference, boolean sendMessage) {
+		if (count > getAdena()) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			}
+			return false;
+		}
+		
+		if (count > 0) {
+			L2ItemInstance adenaItem = _inventory.getAdenaInstance();
+			if (!_inventory.reduceAdena(process, count, this, reference)) {
+				return false;
+			}
+			
+			// Send update packet
+			if (!general().forceInventoryUpdate()) {
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addItem(adenaItem);
+				sendPacket(iu);
+			} else {
+				sendPacket(new ItemList(this, false));
+			}
+			
+			if (sendMessage) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED_ADENA);
+				sm.addLong(count);
+				sendPacket(sm);
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Add ancient adena to Inventory of the L2PcInstance and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int Quantity of ancient adena to be added
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 */
+	public void addAncientAdena(String process, long count, L2Object reference, boolean sendMessage) {
+		if (sendMessage) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+			sm.addItemName(Inventory.ANCIENT_ADENA_ID);
+			sm.addLong(count);
+			sendPacket(sm);
+		}
+		
+		if (count > 0) {
+			_inventory.addAncientAdena(process, count, this, reference);
+			
+			if (!general().forceInventoryUpdate()) {
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addItem(_inventory.getAncientAdenaInstance());
+				sendPacket(iu);
+			} else {
+				sendPacket(new ItemList(this, false));
+			}
+		}
+	}
+	
+	/**
+	 * Reduce ancient adena in Inventory of the L2PcInstance and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : long Quantity of ancient adena to be reduced
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	public boolean reduceAncientAdena(String process, long count, L2Object reference, boolean sendMessage) {
+		if (count > getAncientAdena()) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			}
+			
+			return false;
+		}
+		
+		if (count > 0) {
+			L2ItemInstance ancientAdenaItem = _inventory.getAncientAdenaInstance();
+			if (!_inventory.reduceAncientAdena(process, count, this, reference)) {
+				return false;
+			}
+			
+			if (!general().forceInventoryUpdate()) {
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addItem(ancientAdenaItem);
+				sendPacket(iu);
+			} else {
+				sendPacket(new ItemList(this, false));
+			}
+			
+			if (sendMessage) {
+				if (count > 1) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+					sm.addItemName(Inventory.ANCIENT_ADENA_ID);
+					sm.addLong(count);
+					sendPacket(sm);
+				} else {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+					sm.addItemName(Inventory.ANCIENT_ADENA_ID);
+					sendPacket(sm);
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Adds item to inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be added
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 */
+	public void addItem(String process, L2ItemInstance item, L2Object reference, boolean sendMessage) {
+		if (item.getCount() > 0) {
+			// Sends message to client if requested
+			if (sendMessage) {
+				if (item.getCount() > 1) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2);
+					sm.addItemName(item);
+					sm.addLong(item.getCount());
+					sendPacket(sm);
+				} else if (item.getEnchantLevel() > 0) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_A_S1_S2);
+					sm.addInt(item.getEnchantLevel());
+					sm.addItemName(item);
+					sendPacket(sm);
+				} else {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1);
+					sm.addItemName(item);
+					sendPacket(sm);
+				}
+			}
+			
+			// Add the item to inventory
+			L2ItemInstance newitem = _inventory.addItem(process, item, this, reference);
+			
+			// Send inventory update packet
+			if (!general().forceInventoryUpdate()) {
+				InventoryUpdate playerIU = new InventoryUpdate();
+				playerIU.addItem(newitem);
+				sendPacket(playerIU);
+			} else {
+				sendPacket(new ItemList(this, false));
+			}
+			
+			// Update current load as well
+			StatusUpdate su = new StatusUpdate(this);
+			su.addAttribute(StatusUpdate.CUR_LOAD, getCurrentLoad());
+			sendPacket(su);
+			
+			// If over capacity, drop the item
+			if (!canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !_inventory.validateCapacity(0, item.isQuestItem()) && newitem.isDroppable() && (!newitem.isStackable() || (newitem.getLastChange() != L2ItemInstance.MODIFIED))) {
+				dropItem("InvDrop", newitem, null, true, true);
+			} else if (CursedWeaponsManager.getInstance().isCursed(newitem.getId())) {
+				CursedWeaponsManager.getInstance().activate(this, newitem);
+			}
+			
+			// Combat Flag
+			else if (FortSiegeManager.getInstance().isCombat(item.getId())) {
+				if (FortSiegeManager.getInstance().activateCombatFlag(this, item)) {
+					Fort fort = FortManager.getInstance().getFort(this);
+					fort.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.C1_ACQUIRED_THE_FLAG), getName());
+				}
+			}
+			// Territory Ward
+			else if ((item.getId() >= 13560) && (item.getId() <= 13568)) {
+				TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(item.getId() - 13479);
+				if (ward != null) {
+					ward.activate(this, item);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Equivalent to {@link #addItem(String, int, long, L2Object, boolean)} with parameters (process, itemId, 1, -1, reference, sendMessage)
+	 * @param process
+	 * @param itemId
+	 * @param reference
+	 * @param sendMessage
+	 * @return the new or updated item
+	 */
+	public L2ItemInstance addItem(String process, int itemId, L2Object reference, boolean sendMessage) {
+		return addItem(process, itemId, 1, -1, reference, sendMessage);
+	}
+	
+	/**
+	 * Equivalent to {@link #addItem(String, int, long, int, L2Object, boolean)} with parameters (process, itemId, count, -1, reference, sendMessage)
+	 * @param process
+	 * @param itemId
+	 * @param count
+	 * @param reference
+	 * @param sendMessage
+	 * @return the new or updated item
+	 */
+	public L2ItemInstance addItem(String process, int itemId, long count, L2Object reference, boolean sendMessage) {
+		return addItem(process, itemId, count, -1, reference, sendMessage);
+	}
+	
+	/**
+	 * Adds item to Inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item Identifier of the item to be added
+	 * @param count : long Quantity of items to be added
+	 * @param enchantLevel : int Enchant of the item; -1 to not modify on existing items, for new items use the default enchantLevel when -1
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return the new or updated item
+	 */
+	public L2ItemInstance addItem(String process, int itemId, long count, int enchantLevel, L2Object reference, boolean sendMessage) {
+		if (count > 0) {
+			final L2Item item = ItemTable.getInstance().getTemplate(itemId);
+			if (item == null) {
+				LOG.error("Item doesn't exist so cannot be added. Item ID: {}", itemId);
+				return null;
+			}
+			// Sends message to client if requested
+			if (sendMessage) {
+				if (count > 1) {
+					if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest")) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+						sm.addItemName(itemId);
+						sm.addLong(count);
+						sendPacket(sm);
+					} else {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2);
+						sm.addItemName(itemId);
+						sm.addLong(count);
+						sendPacket(sm);
+					}
+				} else {
+					if (process.equalsIgnoreCase("Sweeper") || process.equalsIgnoreCase("Quest")) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
+						sm.addItemName(itemId);
+						sendPacket(sm);
+					} else {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1);
+						sm.addItemName(itemId);
+						sendPacket(sm);
+					}
+				}
+			}
+			
+			// Auto-use herbs.
+			if (item.hasExImmediateEffect()) {
+				final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof L2EtcItem ? (L2EtcItem) item : null);
+				if (handler == null) {
+					LOG.warn("No item handler registered for Herb {}!", item);
+				} else {
+					final var objectId = IdFactory.getInstance().getNextId();
+					handler.useItem(this, new L2ItemInstance(objectId, itemId), false);
+				}
+			} else {
+				// Add the item to inventory
+				L2ItemInstance createdItem = _inventory.addItem(process, itemId, count, enchantLevel, this, reference);
+				
+				// If over capacity, drop the item
+				if (!canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !_inventory.validateCapacity(0, item.isQuestItem()) && createdItem.isDroppable() && (!createdItem.isStackable() || (createdItem.getLastChange() != L2ItemInstance.MODIFIED))) {
+					dropItem("InvDrop", createdItem, null, true);
+				} else if (CursedWeaponsManager.getInstance().isCursed(createdItem.getId())) {
+					CursedWeaponsManager.getInstance().activate(this, createdItem);
+				}
+				// Territory Ward
+				else if ((createdItem.getId() >= 13560) && (createdItem.getId() <= 13568)) {
+					TerritoryWard ward = TerritoryWarManager.getInstance().getTerritoryWard(createdItem.getId() - 13479);
+					if (ward != null) {
+						ward.activate(this, createdItem);
+					}
+				}
+				return createdItem;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @param process the process name
+	 * @param item the item holder
+	 * @param reference the reference object
+	 * @param sendMessage if {@code true} a system message will be sent
+	 */
+	public void addItem(String process, ItemHolder item, L2Object reference, boolean sendMessage) {
+		addItem(process, item.getId(), item.getCount(), reference, sendMessage);
+	}
+	
+	/**
+	 * Destroy item from inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be destroyed
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	public boolean destroyItem(String process, L2ItemInstance item, L2Object reference, boolean sendMessage) {
+		return destroyItem(process, item, item.getCount(), reference, sendMessage);
+	}
+	
+	/**
+	 * Destroy item from inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be destroyed
+	 * @param count
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	public boolean destroyItem(String process, L2ItemInstance item, long count, L2Object reference, boolean sendMessage) {
+		item = _inventory.destroyItem(process, item, count, this, reference);
+		
+		if (item == null) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			return false;
+		}
+		
+		// Send inventory update packet
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate playerIU = new InventoryUpdate();
+			playerIU.addItem(item);
+			sendPacket(playerIU);
+		} else {
+			sendPacket(new ItemList(this, false));
+		}
+		
+		// Update current load as well
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.CUR_LOAD, getCurrentLoad());
+		sendPacket(su);
+		
+		// Sends message to client if requested
+		if (sendMessage) {
+			if (count > 1) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+				sm.addItemName(item);
+				sm.addLong(count);
+				sendPacket(sm);
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+				sm.addItemName(item);
+				sendPacket(sm);
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Destroys item from inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	@Override
+	public boolean destroyItem(String process, int objectId, long count, L2Object reference, boolean sendMessage) {
+		L2ItemInstance item = _inventory.getItemByObjectId(objectId);
+		
+		if (item == null) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			
+			return false;
+		}
+		return destroyItem(process, item, count, reference, sendMessage);
+	}
+	
+	/**
+	 * Destroys shots from inventory without logging and only occasional saving to database. Sends a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	public boolean destroyItemWithoutTrace(String process, int objectId, long count, L2Object reference, boolean sendMessage) {
+		L2ItemInstance item = _inventory.getItemByObjectId(objectId);
+		
+		if ((item == null) || (item.getCount() < count)) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			
+			return false;
+		}
+		
+		return destroyItem(null, item, count, reference, sendMessage);
+	}
+	
+	/**
+	 * Destroy item from inventory by using its <B>itemId</B> and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	@Override
+	public boolean destroyItemByItemId(String process, int itemId, long count, L2Object reference, boolean sendMessage) {
+		if (itemId == Inventory.ADENA_ID) {
+			return reduceAdena(process, count, reference, sendMessage);
+		}
+		
+		L2ItemInstance item = _inventory.getItemByItemId(itemId);
+		
+		if ((item == null) || (item.getCount() < count) || (_inventory.destroyItemByItemId(process, itemId, count, this, reference) == null)) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			
+			return false;
+		}
+		
+		// Send inventory update packet
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate playerIU = new InventoryUpdate();
+			playerIU.addItem(item);
+			sendPacket(playerIU);
+		} else {
+			sendPacket(new ItemList(this, false));
+		}
+		
+		// Update current load as well
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.CUR_LOAD, getCurrentLoad());
+		sendPacket(su);
+		
+		// Sends message to client if requested
+		if (sendMessage) {
+			if (count > 1) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+				sm.addItemName(itemId);
+				sm.addLong(count);
+				sendPacket(sm);
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+				sm.addItemName(itemId);
+				sendPacket(sm);
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Transfers item to another ItemContainer and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Identifier of the item to be transfered
+	 * @param count : long Quantity of items to be transfered
+	 * @param target
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2Object reference) {
+		L2ItemInstance oldItem = checkItemManipulation(objectId, count, "transfer");
+		if (oldItem == null) {
+			return null;
+		}
+		L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, this, reference);
+		if (newItem == null) {
+			return null;
+		}
+		
+		// Send inventory update packet
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate playerIU = new InventoryUpdate();
+			
+			if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+				playerIU.addModifiedItem(oldItem);
+			} else {
+				playerIU.addRemovedItem(oldItem);
+			}
+			
+			sendPacket(playerIU);
+		} else {
+			sendPacket(new ItemList(this, false));
+		}
+		
+		// Update current load as well
+		StatusUpdate playerSU = new StatusUpdate(this);
+		playerSU.addAttribute(StatusUpdate.CUR_LOAD, getCurrentLoad());
+		sendPacket(playerSU);
+		
+		// Send target update packet
+		if (target instanceof PcInventory) {
+			L2PcInstance targetPlayer = ((PcInventory) target).getOwner();
+			
+			if (!general().forceInventoryUpdate()) {
+				InventoryUpdate playerIU = new InventoryUpdate();
+				
+				if (newItem.getCount() > count) {
+					playerIU.addModifiedItem(newItem);
+				} else {
+					playerIU.addNewItem(newItem);
+				}
+				
+				targetPlayer.sendPacket(playerIU);
+			} else {
+				targetPlayer.sendPacket(new ItemList(targetPlayer, false));
+			}
+			
+			// Update current load as well
+			playerSU = new StatusUpdate(targetPlayer);
+			playerSU.addAttribute(StatusUpdate.CUR_LOAD, targetPlayer.getCurrentLoad());
+			targetPlayer.sendPacket(playerSU);
+		} else if (target instanceof PetInventory) {
+			PetInventoryUpdate petIU = new PetInventoryUpdate();
+			
+			if (newItem.getCount() > count) {
+				petIU.addModifiedItem(newItem);
+			} else {
+				petIU.addNewItem(newItem);
+			}
+			
+			((PetInventory) target).getOwner().sendPacket(petIU);
+		}
+		return newItem;
+	}
+	
+	/**
+	 * Use instead of calling {@link #addItem(String, L2ItemInstance, L2Object, boolean)} and {@link #destroyItemByItemId(String, int, long, L2Object, boolean)}<br>
+	 * This method validates slots and weight limit, for stackable and non-stackable items.
+	 * @param process a generic string representing the process that is exchanging this items
+	 * @param reference the (probably NPC) reference, could be null
+	 * @param coinId the item Id of the item given on the exchange
+	 * @param cost the amount of items given on the exchange
+	 * @param rewardId the item received on the exchange
+	 * @param count the amount of items received on the exchange
+	 * @param sendMessage if {@code true} it will send messages to the acting player
+	 * @return {@code true} if the player successfully exchanged the items, {@code false} otherwise
+	 */
+	public boolean exchangeItemsById(String process, L2Object reference, int coinId, long cost, int rewardId, long count, boolean sendMessage) {
+		final PcInventory inv = getInventory();
+		if (!inv.validateCapacityByItemId(rewardId, count)) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.SLOTS_FULL);
+			}
+			return false;
+		}
+		
+		if (!inv.validateWeightByItemId(rewardId, count)) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			}
+			return false;
+		}
+		
+		if (destroyItemByItemId(process, coinId, cost, reference, sendMessage)) {
+			addItem(process, rewardId, count, reference, sendMessage);
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Drop item from inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process String Identifier of process triggering this action
+	 * @param item L2ItemInstance to be dropped
+	 * @param reference L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage boolean Specifies whether to send message to Client about this action
+	 * @param protectItem whether or not dropped item must be protected temporary against other players
+	 * @return boolean informing if the action was successful
+	 */
+	public boolean dropItem(String process, L2ItemInstance item, L2Object reference, boolean sendMessage, boolean protectItem) {
+		item = _inventory.dropItem(process, item, this, reference);
+		
+		if (item == null) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			
+			return false;
+		}
+		
+		item.dropMe(this, (getX() + Rnd.get(50)) - 25, (getY() + Rnd.get(50)) - 25, getZ() + 20);
+		
+		if ((general().getAutoDestroyDroppedItemAfter() > 0) && general().destroyPlayerDroppedItem() && !general().getProtectedItems().contains(item.getId())) {
+			if ((item.isEquipable() && general().destroyEquipableItem()) || !item.isEquipable()) {
+				ItemsAutoDestroy.getInstance().addItem(item);
+			}
+		}
+		
+		// protection against auto destroy dropped item
+		if (general().destroyPlayerDroppedItem()) {
+			if (!item.isEquipable() || (item.isEquipable() && general().destroyEquipableItem())) {
+				item.setProtected(false);
+			} else {
+				item.setProtected(true);
+			}
+		} else {
+			item.setProtected(true);
+		}
+		
+		// retail drop protection
+		if (protectItem) {
+			item.getDropProtection().protect(this);
+		}
+		
+		// Send inventory update packet
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate playerIU = new InventoryUpdate();
+			playerIU.addItem(item);
+			sendPacket(playerIU);
+		} else {
+			sendPacket(new ItemList(this, false));
+		}
+		
+		// Update current load as well
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.CUR_LOAD, getCurrentLoad());
+		sendPacket(su);
+		
+		// Sends message to client if requested
+		if (sendMessage) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DROPPED_S1);
+			sm.addItemName(item);
+			sendPacket(sm);
+		}
+		
+		return true;
+	}
+	
+	public boolean dropItem(String process, L2ItemInstance item, L2Object reference, boolean sendMessage) {
+		return dropItem(process, item, reference, sendMessage, false);
+	}
+	
+	/**
+	 * Drop item from inventory by using its <B>objectID</B> and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be dropped
+	 * @param count : long Quantity of items to be dropped
+	 * @param x : int coordinate for drop X
+	 * @param y : int coordinate for drop Y
+	 * @param z : int coordinate for drop Z
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @param protectItem
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	public L2ItemInstance dropItem(String process, int objectId, long count, int x, int y, int z, L2Object reference, boolean sendMessage, boolean protectItem) {
+		L2ItemInstance invitem = _inventory.getItemByObjectId(objectId);
+		L2ItemInstance item = _inventory.dropItem(process, objectId, count, this, reference);
+		
+		if (item == null) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			
+			return null;
+		}
+		
+		item.dropMe(this, x, y, z);
+		
+		if ((general().getAutoDestroyDroppedItemAfter() > 0) && general().destroyPlayerDroppedItem() && !general().getProtectedItems().contains(item.getId())) {
+			if ((item.isEquipable() && general().destroyEquipableItem()) || !item.isEquipable()) {
+				ItemsAutoDestroy.getInstance().addItem(item);
+			}
+		}
+		if (general().destroyPlayerDroppedItem()) {
+			if (!item.isEquipable() || (item.isEquipable() && general().destroyEquipableItem())) {
+				item.setProtected(false);
+			} else {
+				item.setProtected(true);
+			}
+		} else {
+			item.setProtected(true);
+		}
+		
+		// retail drop protection
+		if (protectItem) {
+			item.getDropProtection().protect(this);
+		}
+		
+		// Send inventory update packet
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate playerIU = new InventoryUpdate();
+			playerIU.addItem(invitem);
+			sendPacket(playerIU);
+		} else {
+			sendPacket(new ItemList(this, false));
+		}
+		
+		// Update current load as well
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.CUR_LOAD, getCurrentLoad());
+		sendPacket(su);
+		
+		// Sends message to client if requested
+		if (sendMessage) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DROPPED_S1);
+			sm.addItemName(item);
+			sendPacket(sm);
+		}
+		
+		return item;
+	}
+	
+	public L2ItemInstance checkItemManipulation(int objectId, long count, String action) {
+		// TODO: if we remove objects that are not visible from the L2World, we'll have to remove this check
+		if (L2World.getInstance().findObject(objectId) == null) {
+			LOG.warn("{} tried to {} item not available in L2World", this, action);
+			return null;
+		}
+		
+		L2ItemInstance item = getInventory().getItemByObjectId(objectId);
+		
+		if ((item == null) || (item.getOwnerId() != getObjectId())) {
+			LOG.warn("{} tried to {} item he is not owner of", this, action);
+			return null;
+		}
+		
+		if ((count < 0) || ((count > 1) && !item.isStackable())) {
+			LOG.warn("{} tried to {} item with invalid count: {}", this, action, count);
+			return null;
+		}
+		
+		if (count > item.getCount()) {
+			LOG.warn("{} tried to {} more items than he owns", this, action);
+			return null;
+		}
+		
+		// Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting
+		if ((hasSummon() && (getSummon().getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) {
+			if (general().debug()) {
+				LOG.debug("{} tried to {} item controling pet", this, action);
+			}
+			
+			return null;
+		}
+		
+		if (getActiveEnchantItemId() == objectId) {
+			if (general().debug()) {
+				LOG.debug("{} tried to {} an enchant scroll he was using", this, action);
+			}
+			return null;
+		}
+		
+		// We cannot put a Weapon with Augmention in WH while casting (Possible Exploit)
+		if (item.isAugmented() && (isCastingNow() || isCastingSimultaneouslyNow())) {
+			return null;
+		}
+		
+		return item;
+	}
+	
+	/**
+	 * Set _protectEndTime according settings.
+	 * @param protect
+	 */
+	public void setProtection(boolean protect) {
+		if (general().developer() && (protect || (_protectEndTime > 0))) {
+			LOG.debug("{}: Protection {} (currently {})", this, (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + //
+				(character().getPlayerSpawnProtection() * GameTimeController.TICKS_PER_SECOND)) : "OFF"), GameTimeController.getInstance().getGameTicks());
+		}
+		
+		_protectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (character().getPlayerSpawnProtection() * GameTimeController.TICKS_PER_SECOND) : 0;
+	}
+	
+	public void setTeleportProtection(boolean protect) {
+		if (general().developer() && (protect || (_teleportProtectEndTime > 0))) {
+			LOG.debug("{}: Tele Protection {} (currently {})", this, (protect ? "ON " + (GameTimeController.getInstance().getGameTicks() + //
+				(character().getPlayerTeleportProtection() * GameTimeController.TICKS_PER_SECOND)) : "OFF"), GameTimeController.getInstance().getGameTicks());
+		}
+		
+		_teleportProtectEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (character().getPlayerTeleportProtection() * GameTimeController.TICKS_PER_SECOND) : 0;
+	}
+	
+	public boolean isRecentFakeDeath() {
+		return _recentFakeDeathEndTime > GameTimeController.getInstance().getGameTicks();
+	}
+	
+	/**
+	 * Set protection from agro mobs when getting up from fake death, according settings.
+	 * @param protect
+	 */
+	public void setRecentFakeDeath(boolean protect) {
+		_recentFakeDeathEndTime = protect ? GameTimeController.getInstance().getGameTicks() + (character().getPlayerFakeDeathUpProtection() * GameTimeController.TICKS_PER_SECOND) : 0;
+	}
+	
+	public boolean isFakeDeath() {
+		return _isFakeDeath;
+	}
+	
+	public void setIsFakeDeath(boolean value) {
+		_isFakeDeath = value;
+	}
+	
+	@Override
+	public boolean isAlikeDead() {
+		return super.isAlikeDead() || isFakeDeath();
+	}
+	
+	/**
+	 * @return the client owner of this char.
+	 */
+	public L2GameClient getClient() {
+		return _client;
+	}
+	
+	public void setClient(L2GameClient client) {
+		_client = client;
+	}
+	
+	public String getIPAddress() {
+		String ip = "N/A";
+		if ((_client != null) && (_client.getConnectionAddress() != null)) {
+			ip = _client.getConnectionAddress().getHostAddress();
+		}
+		return ip;
+	}
+	
+	/**
+	 * Close the active connection with the client.
+	 * @param closeClient
+	 */
+	private void closeNetConnection(boolean closeClient) {
+		L2GameClient client = _client;
+		if (client != null) {
+			if (client.isDetached()) {
+				client.cleanMe(true);
+			} else {
+				if (!client.getConnection().isClosed()) {
+					if (closeClient) {
+						client.close(LeaveWorld.STATIC_PACKET);
+					} else {
+						client.close(ServerClose.STATIC_PACKET);
+					}
+				}
+			}
+		}
+	}
+	
+	public Location getCurrentSkillWorldPosition() {
+		return _currentSkillWorldPosition;
+	}
+	
+	public void setCurrentSkillWorldPosition(Location worldPosition) {
+		_currentSkillWorldPosition = worldPosition;
+	}
+	
+	@Override
+	public void enableSkill(Skill skill) {
+		super.enableSkill(skill);
+		removeTimeStamp(skill);
+	}
+	
+	@Override
+	public boolean checkDoCastConditions(Skill skill) {
+		if (!super.checkDoCastConditions(skill)) {
+			return false;
+		}
+		
+		if (inObserverMode()) {
+			return false;
+		}
+		
+		if (isInOlympiadMode() && skill.isBlockedInOlympiad()) {
+			sendPacket(SystemMessageId.THIS_SKILL_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
+			return false;
+		}
+		
+		// Check if the spell using charges or not in AirShip
+		if (((getCharges() < skill.getChargeConsume())) || (isInAirShip() && !skill.hasEffectType(L2EffectType.REFUEL_AIRSHIP))) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			sendPacket(sm);
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * Returns true if cp update should be done, false if not
+	 * @return boolean
+	 */
+	private boolean needCpUpdate() {
+		double currentCp = getCurrentCp();
+		
+		if ((currentCp <= 1.0) || (getMaxCp() < MAX_HP_BAR_PX)) {
+			return true;
+		}
+		
+		if ((currentCp <= _cpUpdateDecCheck) || (currentCp >= _cpUpdateIncCheck)) {
+			if (currentCp == getMaxCp()) {
+				_cpUpdateIncCheck = currentCp + 1;
+				_cpUpdateDecCheck = currentCp - _cpUpdateInterval;
+			} else {
+				double doubleMulti = currentCp / _cpUpdateInterval;
+				int intMulti = (int) doubleMulti;
+				
+				_cpUpdateDecCheck = _cpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti);
+				_cpUpdateIncCheck = _cpUpdateDecCheck + _cpUpdateInterval;
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Returns true if mp update should be done, false if not
+	 * @return boolean
+	 */
+	private boolean needMpUpdate() {
+		double currentMp = getCurrentMp();
+		
+		if ((currentMp <= 1.0) || (getMaxMp() < MAX_HP_BAR_PX)) {
+			return true;
+		}
+		
+		if ((currentMp <= _mpUpdateDecCheck) || (currentMp >= _mpUpdateIncCheck)) {
+			if (currentMp == getMaxMp()) {
+				_mpUpdateIncCheck = currentMp + 1;
+				_mpUpdateDecCheck = currentMp - _mpUpdateInterval;
+			} else {
+				double doubleMulti = currentMp / _mpUpdateInterval;
+				int intMulti = (int) doubleMulti;
+				
+				_mpUpdateDecCheck = _mpUpdateInterval * (doubleMulti < intMulti ? intMulti-- : intMulti);
+				_mpUpdateIncCheck = _mpUpdateDecCheck + _mpUpdateInterval;
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Send packet StatusUpdate with current HP,MP and CP to the L2PcInstance and only current HP, MP and Level to all other L2PcInstance of the Party. <B><U> Actions</U> :</B>
+	 * <li>Send the Server->Client packet StatusUpdate with current HP, MP and CP to this L2PcInstance</li><BR>
+	 * <li>Send the Server->Client packet PartySmallWindowUpdate with current HP, MP and Level to all other L2PcInstance of the Party</li> <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND current HP and MP to all L2PcInstance of the _statusListener</B></FONT>
+	 */
+	@Override
+	public void broadcastStatusUpdate() {
+		// TODO We mustn't send these informations to other players
+		// Send the Server->Client packet StatusUpdate with current HP and MP to all L2PcInstance that must be informed of HP/MP updates of this L2PcInstance
+		// super.broadcastStatusUpdate();
+		
+		// Send the Server->Client packet StatusUpdate with current HP, MP and CP to this L2PcInstance
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.MAX_HP, getMaxHp());
+		su.addAttribute(StatusUpdate.CUR_HP, (int) getCurrentHp());
+		su.addAttribute(StatusUpdate.MAX_MP, getMaxMp());
+		su.addAttribute(StatusUpdate.CUR_MP, (int) getCurrentMp());
+		su.addAttribute(StatusUpdate.MAX_CP, getMaxCp());
+		su.addAttribute(StatusUpdate.CUR_CP, (int) getCurrentCp());
+		sendPacket(su);
+		
+		final boolean needCpUpdate = needCpUpdate();
+		final boolean needHpUpdate = needHpUpdate();
+		
+		// Check if a party is in progress and party window update is usefull
+		if (isInParty() && (needCpUpdate || needHpUpdate || needMpUpdate())) {
+			getParty().broadcastToPartyMembers(this, new PartySmallWindowUpdate(this));
+		}
+		
+		if (isInOlympiadMode() && isOlympiadStart() && (needCpUpdate || needHpUpdate)) {
+			final OlympiadGameTask game = OlympiadGameManager.getInstance().getOlympiadTask(getOlympiadGameId());
+			if ((game != null) && game.isBattleStarted()) {
+				game.getZone().broadcastStatusUpdate(this);
+			}
+		}
+		
+		// In duel MP updated only with CP or HP
+		if (isInDuel() && (needCpUpdate || needHpUpdate)) {
+			DuelManager.getInstance().broadcastToOpposingTeam(this, new ExDuelUpdateUserInfo(this));
+		}
+	}
+	
+	/**
+	 * Send a Server->Client packet UserInfo to this L2PcInstance and CharInfo to all L2PcInstance in its _KnownPlayers. <B><U> Concept</U> :</B> Others L2PcInstance in the detection area of the L2PcInstance are identified in <B>_knownPlayers</B>. In order to inform other players of this
+	 * L2PcInstance state modifications, server just need to go through _knownPlayers to send Server->Client Packet <B><U> Actions</U> :</B>
+	 * <li>Send a Server->Client packet UserInfo to this L2PcInstance (Public and Private Data)</li>
+	 * <li>Send a Server->Client packet CharInfo to all L2PcInstance in _KnownPlayers of the L2PcInstance (Public data only)</li> <FONT COLOR=#FF0000><B> <U>Caution</U> : DON'T SEND UserInfo packet to other players instead of CharInfo packet. Indeed, UserInfo packet contains PRIVATE DATA as MaxHP,
+	 * STR, DEX...</B></FONT>
+	 */
+	public void broadcastUserInfo() {
+		// Send a Server->Client packet UserInfo to this L2PcInstance
+		sendPacket(new UserInfo(this));
+		
+		// Send a Server->Client packet CharInfo to all L2PcInstance in _KnownPlayers of the L2PcInstance
+		broadcastPacket(new CharInfo(this));
+		broadcastPacket(new ExBrExtraUserInfo(this));
+		if (TerritoryWarManager.getInstance().isTWInProgress() && (TerritoryWarManager.getInstance().checkIsRegistered(-1, getObjectId()) || TerritoryWarManager.getInstance().checkIsRegistered(-1, getClan()))) {
+			broadcastPacket(new ExDominionWarStart(this));
+		}
+	}
+	
+	public void broadcastTitleInfo() {
+		// Send a Server->Client packet UserInfo to this L2PcInstance
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+		
+		// Send a Server->Client packet TitleUpdate to all L2PcInstance in _KnownPlayers of the L2PcInstance
+		
+		broadcastPacket(new NicknameChanged(this));
+	}
+	
+	@Override
+	public void broadcastPacket(L2GameServerPacket mov) {
+		if (!(mov instanceof CharInfo)) {
+			sendPacket(mov);
+		}
+		
+		mov.setInvisible(isInvisible());
+		
+		final Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		for (L2PcInstance player : plrs) {
+			if ((player == null) || !isVisibleFor(player)) {
+				continue;
+			}
+			player.sendPacket(mov);
+			if (mov instanceof CharInfo) {
+				int relation = getRelation(player);
+				Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId());
+				if ((oldrelation != null) && (oldrelation != relation)) {
+					player.sendPacket(new RelationChanged(this, relation, isAutoAttackable(player)));
+					if (hasSummon()) {
+						player.sendPacket(new RelationChanged(getSummon(), relation, isAutoAttackable(player)));
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void broadcastPacket(L2GameServerPacket mov, int radiusInKnownlist) {
+		if (!(mov instanceof CharInfo)) {
+			sendPacket(mov);
+		}
+		
+		mov.setInvisible(isInvisible());
+		
+		Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		for (L2PcInstance player : plrs) {
+			if (player == null) {
+				continue;
+			}
+			if (isInsideRadius(player, radiusInKnownlist, false, false)) {
+				player.sendPacket(mov);
+				if (mov instanceof CharInfo) {
+					int relation = getRelation(player);
+					Integer oldrelation = getKnownList().getKnownRelations().get(player.getObjectId());
+					if ((oldrelation != null) && (oldrelation != relation)) {
+						player.sendPacket(new RelationChanged(this, relation, isAutoAttackable(player)));
+						if (hasSummon()) {
+							player.sendPacket(new RelationChanged(getSummon(), relation, isAutoAttackable(player)));
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * @return the Alliance Identifier of the L2PcInstance.
+	 */
+	@Override
+	public int getAllyId() {
+		if (_clan == null) {
+			return 0;
+		}
+		return _clan.getAllyId();
+	}
+	
+	public int getAllyCrestId() {
+		if (getClanId() == 0) {
+			return 0;
+		}
+		if (getClan().getAllyId() == 0) {
+			return 0;
+		}
+		return getClan().getAllyCrestId();
+	}
+	
+	public void queryGameGuard() {
+		if (getClient() != null) {
+			getClient().setGameGuardOk(false);
+			sendPacket(GameGuardQuery.STATIC_PACKET);
+		}
+		if (general().gameGuardEnforce()) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new GameGuardCheckTask(this), 30 * 1000);
+		}
+	}
+	
+	/**
+	 * Send a Server->Client packet StatusUpdate to the L2PcInstance.
+	 */
+	@Override
+	public void sendPacket(L2GameServerPacket packet) {
+		if (_client != null) {
+			_client.sendPacket(packet);
+		}
+	}
+	
+	/**
+	 * Send SystemMessage packet.
+	 * @param id SystemMessageId
+	 */
+	@Override
+	public void sendPacket(SystemMessageId id) {
+		sendPacket(SystemMessage.getSystemMessage(id));
+	}
+	
+	/**
+	 * Manage Interact Task with another L2PcInstance. <B><U> Actions</U> :</B>
+	 * <li>If the private store is a STORE_PRIVATE_SELL, send a Server->Client PrivateBuyListSell packet to the L2PcInstance</li>
+	 * <li>If the private store is a STORE_PRIVATE_BUY, send a Server->Client PrivateBuyListBuy packet to the L2PcInstance</li>
+	 * <li>If the private store is a STORE_PRIVATE_MANUFACTURE, send a Server->Client RecipeShopSellList packet to the L2PcInstance</li>
+	 * @param target The L2Character targeted
+	 */
+	public void doInteract(L2Character target) {
+		if (target instanceof L2PcInstance temp) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			
+			if ((temp.getPrivateStoreType() == PrivateStoreType.SELL) || (temp.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) {
+				sendPacket(new PrivateStoreListSell(this, temp));
+			} else if (temp.getPrivateStoreType() == PrivateStoreType.BUY) {
+				sendPacket(new PrivateStoreListBuy(this, temp));
+			} else if (temp.getPrivateStoreType() == PrivateStoreType.MANUFACTURE) {
+				sendPacket(new RecipeShopSellList(this, temp));
+			}
+			
+		} else {
+			target.onAction(this);
+		}
+	}
+	
+	/**
+	 * Manages AutoLoot Task.<br>
+	 * <ul>
+	 * <li>Send a system message to the player.</li>
+	 * <li>Add the item to the player's inventory.</li>
+	 * <li>Send a Server->Client packet InventoryUpdate to this player with NewItem (use a new slot) or ModifiedItem (increase amount).</li>
+	 * <li>Send a Server->Client packet StatusUpdate to this player with current weight.</li>
+	 * </ul>
+	 * <font color=#FF0000><B><U>Caution</U>: If a party is in progress, distribute the items between the party members!</b></font>
+	 * @param target the NPC dropping the item
+	 * @param itemId the item ID
+	 * @param itemCount the item count
+	 */
+	public void doAutoLoot(L2Attackable target, int itemId, long itemCount) {
+		if (isInParty() && !ItemTable.getInstance().getTemplate(itemId).hasExImmediateEffect()) {
+			getParty().distributeItem(this, itemId, itemCount, false, target);
+		} else if (itemId == Inventory.ADENA_ID) {
+			addAdena("Loot", itemCount, target, true);
+		} else {
+			addItem("Loot", itemId, itemCount, target, true);
+		}
+	}
+	
+	/**
+	 * Method overload for {@link L2PcInstance#doAutoLoot(L2Attackable, int, long)}
+	 * @param target the NPC dropping the item
+	 * @param item the item holder
+	 */
+	public void doAutoLoot(L2Attackable target, ItemHolder item) {
+		doAutoLoot(target, item.getId(), item.getCount());
+	}
+	
+	/**
+	 * Manage Pickup Task. <B><U> Actions</U> :</B>
+	 * <li>Send a Server->Client packet StopMove to this L2PcInstance</li>
+	 * <li>Remove the L2ItemInstance from the world and send server->client GetItem packets</li>
+	 * <li>Send a System Message to the L2PcInstance : YOU_PICKED_UP_S1_ADENA or YOU_PICKED_UP_S1_S2</li>
+	 * <li>Add the Item to the L2PcInstance inventory</li>
+	 * <li>Send a Server->Client packet InventoryUpdate to this L2PcInstance with NewItem (use a new slot) or ModifiedItem (increase amount)</li>
+	 * <li>Send a Server->Client packet StatusUpdate to this L2PcInstance with current weight</li> <FONT COLOR=#FF0000><B> <U>Caution</U> : If a Party is in progress, distribute Items between party members</B></FONT>
+	 * @param object The L2ItemInstance to pick up
+	 */
+	@Override
+	public void doPickupItem(L2Object object) {
+		if (isAlikeDead() || isFakeDeath() || isInvisible()) {
+			return;
+		}
+		
+		// Set the AI Intention to AI_INTENTION_IDLE
+		getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		
+		// Check if the L2Object to pick up is a L2ItemInstance
+		if (!(object.isItem())) {
+			// dont try to pickup anything that is not an item :)
+			LOG.warn("{} trying to pickup wrong target.", this, getTarget());
+			return;
+		}
+		
+		L2ItemInstance target = (L2ItemInstance) object;
+		
+		sendPacket(new StopMove(this));
+		
+		SystemMessage smsg = null;
+		synchronized (target) {
+			// Check if the target to pick up is visible
+			if (!target.isVisible()) {
+				// Send a Server->Client packet ActionFailed to this L2PcInstance
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if (!target.getDropProtection().tryPickUp(this)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
+				smsg.addItemName(target);
+				sendPacket(smsg);
+				return;
+			}
+			
+			if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.SLOTS_FULL);
+				return;
+			}
+			
+			if (isInvisible() && !canOverrideCond(PcCondOverride.ITEM_CONDITIONS)) {
+				return;
+			}
+			
+			if ((target.getOwnerId() != 0) && (target.getOwnerId() != getObjectId()) && !isInLooterParty(target.getOwnerId())) {
+				if (target.getId() == Inventory.ADENA_ID) {
+					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
+					smsg.addLong(target.getCount());
+				} else if (target.getCount() > 1) {
+					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S2_S1_S);
+					smsg.addItemName(target);
+					smsg.addLong(target.getCount());
+				} else {
+					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
+					smsg.addItemName(target);
+				}
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(smsg);
+				return;
+			}
+			
+			// You can pickup only 1 combat flag
+			if (FortSiegeManager.getInstance().isCombat(target.getId())) {
+				if (!FortSiegeManager.getInstance().checkIfCanPickup(this)) {
+					return;
+				}
+			}
+			
+			if ((target.getItemLootSchedule() != null) && ((target.getOwnerId() == getObjectId()) || isInLooterParty(target.getOwnerId()))) {
+				target.resetOwnerTimer();
+			}
+			
+			// Remove the L2ItemInstance from the world and send server->client GetItem packets
+			target.pickupMe(this);
+			if (general().saveDroppedItem()) {
+				ItemsOnGroundManager.getInstance().removeObject(target);
+			}
+		}
+		
+		// Auto use herbs - pick up
+		if (target.getItem().hasExImmediateEffect()) {
+			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
+			if (handler == null) {
+				LOG.warn("No item handler registered for item ID: {}.", target.getId());
+			} else {
+				handler.useItem(this, target, false);
+			}
+			ItemTable.getInstance().destroyItem("Consume", target, this, null);
+		}
+		// Cursed Weapons are not distributed
+		else if (CursedWeaponsManager.getInstance().isCursed(target.getId())) {
+			addItem("Pickup", target, null, true);
+		} else if (FortSiegeManager.getInstance().isCombat(target.getId())) {
+			addItem("Pickup", target, null, true);
+		} else {
+			// if item is instance of ArmorType or WeaponType broadcast an "Attention" system message
+			if ((target.getItemType() instanceof ArmorType) || (target.getItemType() instanceof WeaponType)) {
+				if (target.getEnchantLevel() > 0) {
+					smsg = SystemMessage.getSystemMessage(SystemMessageId.ANNOUNCEMENT_C1_PICKED_UP_S2_S3);
+					smsg.addPcName(this);
+					smsg.addInt(target.getEnchantLevel());
+					smsg.addItemName(target.getId());
+					broadcastPacket(smsg, 1400);
+				} else {
+					smsg = SystemMessage.getSystemMessage(SystemMessageId.ANNOUNCEMENT_C1_PICKED_UP_S2);
+					smsg.addPcName(this);
+					smsg.addItemName(target.getId());
+					broadcastPacket(smsg, 1400);
+				}
+			}
+			
+			// Check if a Party is in progress
+			if (isInParty()) {
+				getParty().distributeItem(this, target);
+			} else if ((target.getId() == Inventory.ADENA_ID) && (getInventory().getAdenaInstance() != null)) {
+				addAdena("Pickup", target.getCount(), null, true);
+				ItemTable.getInstance().destroyItem("Pickup", target, this, null);
+			} else {
+				addItem("Pickup", target, null, true);
+				// Auto-Equip arrows/bolts if player has a bow/crossbow and player picks up arrows/bolts.
+				final L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+				if (weapon != null) {
+					final L2EtcItem etcItem = target.getEtcItem();
+					if (etcItem != null) {
+						final EtcItemType itemType = etcItem.getItemType();
+						if ((weapon.getItemType() == WeaponType.BOW) && (itemType == EtcItemType.ARROW)) {
+							checkAndEquipArrows();
+						} else if ((weapon.getItemType() == WeaponType.CROSSBOW) && (itemType == EtcItemType.BOLT)) {
+							checkAndEquipBolts();
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void doAttack(L2Character target) {
+		super.doAttack(target);
+		setRecentFakeDeath(false);
+	}
+	
+	@Override
+	public void doCast(Skill skill) {
+		if (getCurrentSkill() != null) {
+			if (!checkUseMagicConditions(skill, getCurrentSkill().isCtrlPressed(), getCurrentSkill().isShiftPressed())) {
+				setIsCastingNow(false);
+				return;
+			}
+		}
+		super.doCast(skill);
+		setRecentFakeDeath(false);
+	}
+	
+	public boolean canOpenPrivateStore() {
+		return !isAlikeDead() && !isInOlympiadMode() && !isMounted() && !isInsideZone(ZoneId.NO_STORE) && !isCastingNow();
+	}
+	
+	public void tryOpenPrivateBuyStore() {
+		// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
+		if (canOpenPrivateStore()) {
+			if ((getPrivateStoreType() == PrivateStoreType.BUY) || (getPrivateStoreType() == PrivateStoreType.BUY_MANAGE)) {
+				setPrivateStoreType(PrivateStoreType.NONE);
+			}
+			if (getPrivateStoreType() == PrivateStoreType.NONE) {
+				if (isSitting()) {
+					standUp();
+				}
+				setPrivateStoreType(PrivateStoreType.BUY_MANAGE);
+				sendPacket(new PrivateStoreManageListBuy(this));
+			}
+		} else {
+			if (isInsideZone(ZoneId.NO_STORE)) {
+				sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);
+			}
+			sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	public void tryOpenPrivateSellStore(boolean isPackageSale) {
+		// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
+		if (canOpenPrivateStore()) {
+			if ((getPrivateStoreType() == PrivateStoreType.SELL) || (getPrivateStoreType() == PrivateStoreType.SELL_MANAGE) || (getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL)) {
+				setPrivateStoreType(PrivateStoreType.NONE);
+			}
+			
+			if (getPrivateStoreType() == PrivateStoreType.NONE) {
+				if (isSitting()) {
+					standUp();
+				}
+				setPrivateStoreType(PrivateStoreType.SELL_MANAGE);
+				sendPacket(new PrivateStoreManageListSell(this, isPackageSale));
+			}
+		} else {
+			if (isInsideZone(ZoneId.NO_STORE)) {
+				sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);
+			}
+			sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	public PreparedListContainer getMultiSell() {
+		return _currentMultiSell;
+	}
+	
+	public void setMultiSell(PreparedListContainer list) {
+		_currentMultiSell = list;
+	}
+	
+	@Override
+	public boolean isTransformed() {
+		return (_transformation != null) && !_transformation.isStance();
+	}
+	
+	public boolean isInStance() {
+		return (_transformation != null) && _transformation.isStance();
+	}
+	
+	public void transform(Transform transformation) {
+		if (_transformation != null) {
+			// You already polymorphed and cannot polymorph again.
+			SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+			sendPacket(msg);
+			return;
+		}
+		
+		setQueuedSkill(null, false, false);
+		if (isMounted()) {
+			// Get off the strider or something else if character is mounted
+			dismount();
+		}
+		
+		_transformation = transformation;
+		getEffectList().stopAllToggles();
+		transformation.onTransform(this);
+		sendSkillList();
+		sendPacket(new SkillCoolTime(this));
+		broadcastUserInfo();
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerTransform(this, transformation.getId()), this);
+	}
+	
+	@Override
+	public void untransform() {
+		if (_transformation != null) {
+			setQueuedSkill(null, false, false);
+			_transformation.onUntransform(this);
+			_transformation = null;
+			getEffectList().stopAllToggles(false);
+			getEffectList().stopSkillEffects(false, AbnormalType.TRANSFORM);
+			sendSkillList();
+			sendPacket(new SkillCoolTime(this));
+			broadcastUserInfo();
+			
+			// Notify to scripts
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerTransform(this, 0), this);
+		}
+	}
+	
+	@Override
+	public Transform getTransformation() {
+		return _transformation;
+	}
+	
+	/**
+	 * This returns the transformation Id of the current transformation. For example, if a player is transformed as a Buffalo, and then picks up the Zariche, the transform Id returned will be that of the Zariche, and NOT the Buffalo.
+	 * @return Transformation Id
+	 */
+	public int getTransformationId() {
+		return (isTransformed() ? getTransformation().getId() : 0);
+	}
+	
+	public int getTransformationDisplayId() {
+		return (isTransformed() ? getTransformation().getDisplayId() : 0);
+	}
+	
+	/**
+	 * Set a target. <B><U> Actions</U> :</B>
+	 * <ul>
+	 * <li>Remove the L2PcInstance from the _statusListener of the old target if it was a L2Character</li>
+	 * <li>Add the L2PcInstance to the _statusListener of the new target if it's a L2Character</li>
+	 * <li>Target the new L2Object (add the target to the L2PcInstance _target, _knownObject and L2PcInstance to _KnownObject of the L2Object)</li>
+	 * </ul>
+	 * @param newTarget The L2Object to target
+	 */
+	@Override
+	public void setTarget(L2Object newTarget) {
+		if (newTarget != null) {
+			boolean isInParty = (newTarget.isPlayer() && isInParty() && getParty().containsPlayer(newTarget.getActingPlayer()));
+			
+			// Prevents /target exploiting
+			if (!isInParty && (Math.abs(newTarget.getZ() - getZ()) > 1000)) {
+				newTarget = null;
+			}
+			
+			// Check if the new target is visible
+			if ((newTarget != null) && !isInParty && !newTarget.isVisible()) {
+				newTarget = null;
+			}
+			
+			// vehicles cant be targeted
+			if (!isGM() && (newTarget instanceof L2Vehicle)) {
+				newTarget = null;
+			}
+		}
+		
+		// Get the current target
+		L2Object oldTarget = getTarget();
+		
+		if (oldTarget != null) {
+			if (oldTarget.equals(newTarget)) // no target change?
+			{
+				// Validate location of the target.
+				if ((newTarget != null) && (newTarget.getObjectId() != getObjectId())) {
+					sendPacket(new ValidateLocation(newTarget));
+				}
+				return;
+			}
+			
+			// Remove the target from the status listener.
+			oldTarget.removeStatusListener(this);
+		}
+		
+		if (newTarget instanceof L2Character target) {
+			// Validate location of the new target.
+			if (newTarget.getObjectId() != getObjectId()) {
+				sendPacket(new ValidateLocation(target));
+			}
+			
+			// Show the client his new target.
+			sendPacket(new MyTargetSelected(this, target));
+			
+			// Register target to listen for hp changes.
+			target.addStatusListener(this);
+			
+			// Send max/current hp.
+			final StatusUpdate su = new StatusUpdate(target);
+			su.addAttribute(StatusUpdate.MAX_HP, target.getMaxHp());
+			su.addAttribute(StatusUpdate.CUR_HP, (int) target.getCurrentHp());
+			sendPacket(su);
+			
+			// To others the new target, and not yourself!
+			Broadcast.toKnownPlayers(this, new TargetSelected(getObjectId(), newTarget.getObjectId(), getX(), getY(), getZ()));
+		}
+		
+		// Target was removed?
+		if ((newTarget == null) && (getTarget() != null)) {
+			broadcastPacket(new TargetUnselected(this));
+		}
+		
+		// Target the new L2Object (add the target to the L2PcInstance _target, _knownObject and L2PcInstance to _KnownObject of the L2Object)
+		super.setTarget(newTarget);
+	}
+	
+	/**
+	 * Return the active weapon instance (always equiped in the right hand).
+	 */
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+	}
+	
+	/**
+	 * Return the active weapon item (always equiped in the right hand).
+	 */
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		L2ItemInstance weapon = getActiveWeaponInstance();
+		
+		if (weapon == null) {
+			return getFistsWeaponItem();
+		}
+		
+		return (L2Weapon) weapon.getItem();
+	}
+	
+	public L2ItemInstance getChestArmorInstance() {
+		return getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST);
+	}
+	
+	public L2ItemInstance getLegsArmorInstance() {
+		return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LEGS);
+	}
+	
+	public L2Armor getActiveChestArmorItem() {
+		L2ItemInstance armor = getChestArmorInstance();
+		
+		if (armor == null) {
+			return null;
+		}
+		
+		return (L2Armor) armor.getItem();
+	}
+	
+	public L2Armor getActiveLegsArmorItem() {
+		L2ItemInstance legs = getLegsArmorInstance();
+		
+		if (legs == null) {
+			return null;
+		}
+		
+		return (L2Armor) legs.getItem();
+	}
+	
+	public boolean isWearingHeavyArmor() {
+		L2ItemInstance legs = getLegsArmorInstance();
+		L2ItemInstance armor = getChestArmorInstance();
+		
+		if ((armor != null) && (legs != null)) {
+			if ((legs.getItemType() == ArmorType.HEAVY) && (armor.getItemType() == ArmorType.HEAVY)) {
+				return true;
+			}
+		}
+		if (armor != null) {
+			if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.HEAVY))) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isWearingLightArmor() {
+		L2ItemInstance legs = getLegsArmorInstance();
+		L2ItemInstance armor = getChestArmorInstance();
+		
+		if ((armor != null) && (legs != null)) {
+			if ((legs.getItemType() == ArmorType.LIGHT) && (armor.getItemType() == ArmorType.LIGHT)) {
+				return true;
+			}
+		}
+		if (armor != null) {
+			if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.LIGHT))) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isWearingMagicArmor() {
+		L2ItemInstance legs = getLegsArmorInstance();
+		L2ItemInstance armor = getChestArmorInstance();
+		
+		if ((armor != null) && (legs != null)) {
+			if ((legs.getItemType() == ArmorType.MAGIC) && (armor.getItemType() == ArmorType.MAGIC)) {
+				return true;
+			}
+		}
+		if (armor != null) {
+			if (((getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR) && (armor.getItemType() == ArmorType.MAGIC))) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isAutoLoot() {
+		return _enableAutoLoot;
+	}
+	
+	public void setAutoLoot(boolean val) {
+		_enableAutoLoot = val;
+	}
+	
+	public boolean isAutoLootItem() {
+		return _enableAutoLootItem;
+	}
+	
+	public void setAutoLootItem(boolean val) {
+		_enableAutoLootItem = val;
+	}
+	
+	public boolean isAutoLootHerb() {
+		return _enableAutoLootHerb;
+	}
+	
+	public void setAutoLootHerbs(boolean val) {
+		_enableAutoLootHerb = val;
+	}
+	
+	public boolean isMarried() {
+		return _married;
+	}
+	
+	public void setMarried(boolean state) {
+		_married = state;
+	}
+	
+	public boolean isEngageRequest() {
+		return _engagerequest;
+	}
+	
+	public void setEngageRequest(boolean state, int playerid) {
+		_engagerequest = state;
+		_engageid = playerid;
+	}
+	
+	public boolean isMarryRequest() {
+		return _marryrequest;
+	}
+	
+	public void setMarryRequest(boolean state) {
+		_marryrequest = state;
+	}
+	
+	public boolean isMarryAccepted() {
+		return _marryaccepted;
+	}
+	
+	public void setMarryAccepted(boolean state) {
+		_marryaccepted = state;
+	}
+	
+	public int getEngageId() {
+		return _engageid;
+	}
+	
+	public int getPartnerId() {
+		return _partnerId;
+	}
+	
+	public void setPartnerId(int partnerid) {
+		_partnerId = partnerid;
+	}
+	
+	public int getCoupleId() {
+		return _coupleId;
+	}
+	
+	public void setCoupleId(int coupleId) {
+		_coupleId = coupleId;
+	}
+	
+	public void engageAnswer(int answer) {
+		if (!_engagerequest) {
+			return;
+		} else if (_engageid == 0) {
+			return;
+		} else {
+			L2PcInstance ptarget = L2World.getInstance().getPlayer(_engageid);
+			setEngageRequest(false, 0);
+			if (ptarget != null) {
+				if (answer == 1) {
+					CoupleManager.getInstance().createCouple(ptarget, L2PcInstance.this);
+					ptarget.sendMessage("Request to Engage has been >ACCEPTED<");
+				} else {
+					ptarget.sendMessage("Request to Engage has been >DENIED<!");
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Return the secondary weapon instance (always equiped in the left hand).
+	 */
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+	}
+	
+	/**
+	 * Return the secondary L2Item item (always equiped in the left hand).<BR>
+	 * Arrows, Shield..<BR>
+	 */
+	@Override
+	public L2Item getSecondaryWeaponItem() {
+		L2ItemInstance item = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+		if (item != null) {
+			return item.getItem();
+		}
+		return null;
+	}
+	
+	/**
+	 * Kill the L2Character, Apply Death Penalty, Manage gain/loss Karma and Item Drop. <B><U> Actions</U> :</B>
+	 * <li>Reduce the Experience of the L2PcInstance in function of the calculated Death Penalty</li>
+	 * <li>If necessary, unsummon the Pet of the killed L2PcInstance</li>
+	 * <li>Manage Karma gain for attacker and Karam loss for the killed L2PcInstance</li>
+	 * <li>If the killed L2PcInstance has Karma, manage Drop Item</li>
+	 * <li>Kill the L2PcInstance</li>
+	 * @param killer
+	 */
+	@Override
+	public boolean doDie(L2Character killer) {
+		// Kill the L2PcInstance
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		if (killer != null) {
+			final L2PcInstance pk = killer.getActingPlayer();
+			if (pk != null) {
+				EventDispatcher.getInstance().notifyEventAsync(new PlayerPvPKill(pk, this), this);
+				
+				TvTEvent.onKill(killer, this);
+				
+				if (L2Event.isParticipant(pk)) {
+					pk.getEventStatus().getKills().add(this);
+				}
+			}
+			
+			broadcastStatusUpdate();
+			// Clear resurrect xp calculation
+			setExpBeforeDeath(0);
+			
+			// Issues drop of Cursed Weapon.
+			if (isCursedWeaponEquipped()) {
+				CursedWeaponsManager.getInstance().drop(_cursedWeaponEquippedId, killer);
+			} else if (isCombatFlagEquipped()) {
+				// TODO: Fort siege during TW??
+				if (TerritoryWarManager.getInstance().isTWInProgress()) {
+					TerritoryWarManager.getInstance().dropCombatFlag(this, true, false);
+				} else {
+					Fort fort = FortManager.getInstance().getFort(this);
+					if (fort != null) {
+						FortSiegeManager.getInstance().dropCombatFlag(this, fort.getResidenceId());
+					} else {
+						int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819));
+						getInventory().unEquipItemInBodySlot(slot);
+						destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true);
+					}
+				}
+			} else {
+				final boolean insidePvpZone = isInsideZone(ZoneId.PVP);
+				final boolean insideSiegeZone = isInsideZone(ZoneId.SIEGE);
+				if ((pk == null) || !pk.isCursedWeaponEquipped()) {
+					onDieDropItem(killer); // Check if any item should be dropped
+					
+					if (!insidePvpZone && !insideSiegeZone) {
+						if ((pk != null) && (pk.getClan() != null) && (getClan() != null) && !isAcademyMember() && !(pk.isAcademyMember())) {
+							if ((_clan.isAtWarWith(pk.getClanId()) && pk.getClan().isAtWarWith(_clan.getId())) || (isInSiege() && pk.isInSiege())) {
+								if (AntiFeedManager.getInstance().check(killer, this)) {
+									// when your reputation score is 0 or below, the other clan cannot acquire any reputation points
+									if (getClan().getReputationScore() > 0) {
+										pk.getClan().addReputationScore(clan().getReputationScorePerKill(), false);
+									}
+									// when the opposing sides reputation score is 0 or below, your clans reputation score does not decrease
+									if (pk.getClan().getReputationScore() > 0) {
+										_clan.takeReputationScore(clan().getReputationScorePerKill(), false);
+									}
+								}
+							}
+						}
+					}
+					// If player is Lucky shouldn't get penalized.
+					if (character().delevel() && !isLucky() && !(insideSiegeZone || insidePvpZone) && !getHuntingSystem().isNevitBlessingActive()) {
+						calculateDeathExpPenalty(killer, isAtWarWith(pk));
+					}
+				}
+			}
+		}
+		
+		if (isMounted()) {
+			stopFeed();
+		}
+		synchronized (this) {
+			if (isFakeDeath()) {
+				stopFakeDeath(true);
+			}
+		}
+		
+		// Unsummon Cubics
+		if (!_cubics.isEmpty()) {
+			for (L2CubicInstance cubic : _cubics.values()) {
+				cubic.stopAction();
+				cubic.cancelDisappear();
+			}
+			_cubics.clear();
+		}
+		
+		if (isChannelized()) {
+			getSkillChannelized().abortChannelization();
+		}
+		
+		if (isInParty() && getParty().isInDimensionalRift()) {
+			getParty().getDimensionalRift().getDeadPlayers().add(this);
+		}
+		
+		if (getAgathionId() != 0) {
+			setAgathionId(0);
+		}
+		
+		// calculate death penalty buff
+		calculateDeathPenaltyBuffLevel(killer);
+		
+		stopRentPet();
+		stopWaterTask();
+		
+		AntiFeedManager.getInstance().setLastDeathTime(getObjectId());
+		
+		return true;
+	}
+	
+	private void onDieDropItem(L2Character killer) {
+		if (L2Event.isParticipant(this) || (killer == null)) {
+			return;
+		}
+		
+		L2PcInstance pk = killer.getActingPlayer();
+		if ((getKarma() <= 0) && (pk != null) && (pk.getClan() != null) && (getClan() != null) && (pk.getClan().isAtWarWith(getClanId())
+		// || getClan().isAtWarWith(((L2PcInstance)killer).getClanId())
+		)) {
+			return;
+		}
+		
+		if ((!isInsideZone(ZoneId.PVP) || (pk == null)) && (!isGM() || pvp().canGMDropEquipment())) {
+			boolean isKarmaDrop = false;
+			boolean isKillerNpc = (killer instanceof L2Npc);
+			int pkLimit = pvp().getMinimumPKRequiredToDrop();
+			
+			int dropEquip = 0;
+			int dropEquipWeapon = 0;
+			int dropItem = 0;
+			int dropLimit = 0;
+			int dropPercent = 0;
+			
+			if ((getKarma() > 0) && (getPkKills() >= pkLimit)) {
+				isKarmaDrop = true;
+				dropPercent = rates().getKarmaRateDrop();
+				dropEquip = rates().getKarmaRateDropEquip();
+				dropEquipWeapon = rates().getKarmaRateDropEquipWeapon();
+				dropItem = rates().getKarmaRateDropItem();
+				dropLimit = rates().getKarmaDropLimit();
+			} else if (isKillerNpc && (getLevel() > 4) && !isFestivalParticipant()) {
+				dropPercent = rates().getPlayerRateDrop();
+				dropEquip = rates().getPlayerRateDropEquip();
+				dropEquipWeapon = rates().getPlayerRateDropEquipWeapon();
+				dropItem = rates().getPlayerRateDropItem();
+				dropLimit = rates().getPlayerDropLimit();
+			}
+			
+			if ((dropPercent > 0) && (Rnd.get(100) < dropPercent)) {
+				int dropCount = 0;
+				
+				int itemDropPercent = 0;
+				
+				for (L2ItemInstance itemDrop : getInventory().getItems()) {
+					// Don't drop:
+					// Adena
+					// Shadow Items
+					// Time Limited Items
+					// Quest Items
+					// Control Item of active pet
+					// Item listed in the non droppable item list
+					// Item listed in the non droppable pet item list
+					if (itemDrop.isShadowItem() || itemDrop.isTimeLimitedItem() || !itemDrop.isDroppable() || (itemDrop.getId() == Inventory.ADENA_ID) || //
+						(itemDrop.getItem().getType2() == ItemType2.QUEST) || (hasSummon() && (getSummon().getControlObjectId() == itemDrop.getObjectId())) || //
+						pvp().getNonDroppableItems().contains(itemDrop.getId()) || pvp().getPetItems().contains(itemDrop.getId())) {
+						continue;
+					}
+					
+					if (itemDrop.isEquipped()) {
+						// Set proper chance according to Item type of equipped Item
+						itemDropPercent = itemDrop.getItem().getType2() == ItemType2.WEAPON ? dropEquipWeapon : dropEquip;
+						getInventory().unEquipItemInSlot(itemDrop.getLocationSlot());
+					} else {
+						itemDropPercent = dropItem; // Item in inventory
+					}
+					
+					// NOTE: Each time an item is dropped, the chance of another item being dropped gets lesser (dropCount * 2)
+					if (Rnd.get(100) < itemDropPercent) {
+						dropItem("DieDrop", itemDrop, killer, true);
+						
+						if (isKarmaDrop) {
+							LOG.info("{} has karma and dropped id = {}, count = {}", this, itemDrop.getId(), itemDrop.getCount());
+						} else {
+							LOG.info("{} dropped id = {}, count = {}", this, itemDrop.getId(), itemDrop.getCount());
+						}
+						
+						if (++dropCount >= dropLimit) {
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public void onKillUpdatePvPKarma(L2Character target) {
+		if ((target == null) || !target.isPlayable()) {
+			return;
+		}
+		
+		L2PcInstance targetPlayer = target.getActingPlayer();
+		if ((targetPlayer == null) || (targetPlayer == this)) {
+			return;
+		}
+		
+		if (isCursedWeaponEquipped() && target.isPlayer()) {
+			CursedWeaponsManager.getInstance().increaseKills(_cursedWeaponEquippedId);
+			return;
+		}
+		
+		// If in duel and you kill (only can kill l2summon), do nothing
+		if (isInDuel() && targetPlayer.isInDuel()) {
+			return;
+		}
+		
+		// If in Arena, do nothing
+		if (isInsideZone(ZoneId.PVP) || targetPlayer.isInsideZone(ZoneId.PVP)) {
+			if ((getSiegeState() > 0) && (targetPlayer.getSiegeState() > 0) && (getSiegeState() != targetPlayer.getSiegeState())) {
+				final L2Clan killerClan = getClan();
+				final L2Clan targetClan = targetPlayer.getClan();
+				if ((killerClan != null) && (targetClan != null)) {
+					killerClan.addSiegeKill();
+					targetClan.addSiegeDeath();
+				}
+			}
+			return;
+		}
+		
+		// Check if it's pvp
+		if ((checkIfPvP(target) && (targetPlayer.getPvpFlag() != 0)) || (isInsideZone(ZoneId.PVP) && targetPlayer.isInsideZone(ZoneId.PVP))) {
+			increasePvpKills(target);
+		} else {
+			// Target player doesn't have pvp flag set check about wars
+			if ((targetPlayer.getClan() != null) && (getClan() != null) && getClan().isAtWarWith(targetPlayer.getClanId()) && targetPlayer.getClan().isAtWarWith(getClanId()) && (targetPlayer.getPledgeType() != L2Clan.SUBUNIT_ACADEMY) && (getPledgeType() != L2Clan.SUBUNIT_ACADEMY)) {
+				// 'Both way war' -> 'PvP Kill'
+				increasePvpKills(target);
+				return;
+			}
+			
+			// 'No war' or 'One way war' -> 'Normal PK'
+			if (targetPlayer.getKarma() > 0) {
+				// Target player has karma
+				if (pvp().awardPKKillPVPPoint()) {
+					increasePvpKills(target);
+				}
+			} else if (targetPlayer.getPvpFlag() == 0) {
+				// Target player doesn't have karma
+				increasePkKillsAndKarma(target);
+				stopPvPFlag();
+				// Unequip adventurer items
+				checkItemRestriction();
+			}
+		}
+	}
+	
+	/**
+	 * Increase the pvp kills count and send the info to the player
+	 * @param target
+	 */
+	public void increasePvpKills(L2Character target) {
+		if ((target instanceof L2PcInstance) && AntiFeedManager.getInstance().check(this, target)) {
+			setPvpKills(getPvpKills() + 1);
+			
+			// Send a Server->Client UserInfo packet to attacker with its Karma and PK Counter
+			sendPacket(new UserInfo(this));
+			sendPacket(new ExBrExtraUserInfo(this));
+		}
+	}
+	
+	/**
+	 * Increase pk count, karma and send the info to the player
+	 * @param target
+	 */
+	public void increasePkKillsAndKarma(L2Character target) {
+		// Only playables can increase karma/pk
+		if ((target == null) || !target.isPlayable()) {
+			return;
+		}
+		
+		// Calculate new karma. (calculate karma before incrase pk count!)
+		setKarma(getKarma() + Formulas.calculateKarmaGain(getPkKills(), target.isSummon()));
+		
+		// PK Points are increased only if you kill a player.
+		if (target.isPlayer()) {
+			setPkKills(getPkKills() + 1);
+		}
+		
+		// Update player's UI.
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+	}
+	
+	public void updatePvPStatus() {
+		if (isInsideZone(ZoneId.PVP)) {
+			return;
+		}
+		
+		setPvpFlagLasts(System.currentTimeMillis() + pvp().getPvPVsNormalTime());
+		
+		if (getPvpFlag() == 0) {
+			startPvPFlag();
+		}
+	}
+	
+	public void updatePvPStatus(L2Character target) {
+		L2PcInstance player_target = target.getActingPlayer();
+		
+		if (player_target == null) {
+			return;
+		}
+		
+		if ((isInDuel() && (player_target.getDuelId() == getDuelId()))) {
+			return;
+		}
+		if ((!isInsideZone(ZoneId.PVP) || !player_target.isInsideZone(ZoneId.PVP)) && (player_target.getKarma() == 0)) {
+			if (checkIfPvP(player_target)) {
+				setPvpFlagLasts(System.currentTimeMillis() + pvp().getPvPVsPvPTime());
+			} else {
+				setPvpFlagLasts(System.currentTimeMillis() + pvp().getPvPVsNormalTime());
+			}
+			if (getPvpFlag() == 0) {
+				startPvPFlag();
+			}
+		}
+	}
+	
+	/**
+	 * @return {@code true} if player has Lucky effect and is level 9 or less
+	 */
+	public boolean isLucky() {
+		return (getLevel() <= 9) && isAffectedBySkill(CommonSkill.LUCKY.getId());
+	}
+	
+	/**
+	 * Restore the specified % of experience this L2PcInstance has lost and sends a Server->Client StatusUpdate packet.
+	 * @param restorePercent
+	 */
+	public void restoreExp(double restorePercent) {
+		if (getExpBeforeDeath() > 0) {
+			getSubStat().addExp(Math.round(((getExpBeforeDeath() - getExp()) * restorePercent) / 100));
+			setExpBeforeDeath(0);
+		}
+	}
+	
+	@Override
+	public void addExpAndSp(long addToExp, int addToSp) {
+		addExpAndSp(addToExp, addToSp, false);
+	}
+	
+	/**
+	 * Used for quest no bonus and no pet consume
+	 * @param addToExp
+	 * @param addToSp
+	 */
+	public void addExpAndSpQuest(long addToExp, int addToSp) {
+		if (addToExp != 0) {
+			getSubStat().addExp(addToExp);
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_EXPERIENCE);
+			sm.addLong(addToExp);
+			sendPacket(sm);
+		}
+		
+		if (addToSp != 0) {
+			getSubStat().addSp(addToSp);
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_SP);
+			sm.addInt(addToSp);
+			sendPacket(sm);
+		}
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+	}
+	
+	public void removeExpAndSp(long removeFromExp, int removeFromSp) {
+		getSubStat().removeExp(removeFromExp);
+		getSubStat().removeSp(removeFromSp);
+		
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+	}
+	
+	public void addExpAndSp(long addToExp, int addToSp, boolean useBonuses) {
+		// Allowed to gain exp?
+		if (!getAccessLevel().canGainExp()) {
+			return;
+		}
+		changeKarma(addToExp);
+		
+		long baseExp = addToExp;
+		int baseSp = addToSp;
+		
+		if (useBonuses) {
+			addToExp *= getStat().getExpBonusMultiplier();
+			addToSp *= getStat().getSpBonusMultiplier();
+		}
+		
+		float ratioTakenByPlayer = 0;
+		
+		// if this player has a pet and it is in his range he takes from the owner's Exp, give the pet Exp now
+		if (hasPet() && Util.checkIfInShortRadius(character().getPartyRange(), this, getSummon(), false)) {
+			L2PetInstance pet = (L2PetInstance) getSummon();
+			ratioTakenByPlayer = pet.getPetLevelData().getOwnerExpTaken() / 100f;
+			
+			// only give exp/sp to the pet by taking from the owner if the pet has a non-zero, positive ratio
+			// allow possible customizations that would have the pet earning more than 100% of the owner's exp/sp
+			if (ratioTakenByPlayer > 1) {
+				ratioTakenByPlayer = 1;
+			}
+			
+			if (!pet.isDead()) {
+				pet.addExpAndSp((long) (addToExp * (1 - ratioTakenByPlayer)), (int) (addToSp * (1 - ratioTakenByPlayer)));
+			}
+			
+			// now adjust the max ratio to avoid the owner earning negative exp/sp
+			baseExp = (long) (addToExp * ratioTakenByPlayer);
+			baseSp = (int) (addToSp * ratioTakenByPlayer);
+			addToExp = (long) (addToExp * ratioTakenByPlayer);
+			addToSp = (int) (addToSp * ratioTakenByPlayer);
+		}
+		
+		final var gainedExp = getSubStat().addExp(addToExp);
+		getSubStat().addSp(addToSp);
+		
+		final var sm = SystemMessage.getSystemMessage(YOU_EARNED_S1_EXP_BONUS_S2_AND_S3_SP_BONUS_S4);
+		if (gainedExp) {
+			sm.addLong(addToExp);
+			sm.addLong(addToExp - baseExp);
+		} else {
+			sm.addLong(0);
+			sm.addLong(0);
+		}
+		sm.addInt(addToSp);
+		sm.addInt(addToSp - baseSp);
+		
+		sendPacket(sm);
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+	}
+	
+	public void removeExp(long exp) {
+		changeKarma(exp);
+		getSubStat().removeExp(exp);
+		
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+	}
+	
+	private void changeKarma(long exp) {
+		if (!isCursedWeaponEquipped() && (getKarma() > 0) && (isGM() || !isInsideZone(ZoneId.PVP))) {
+			int karmaLost = Formulas.calculateKarmaLost(this, exp);
+			if (karmaLost > 0) {
+				setKarma(getKarma() - karmaLost);
+				final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_KARMA_HAS_BEEN_CHANGED_TO_S1);
+				msg.addInt(getKarma());
+				sendPacket(msg);
+			}
+		}
+	}
+	
+	public boolean removeSp(int sp) {
+		return getSubStat().removeSp(sp);
+	}
+	
+	//
+	/**
+	 * Reduce the Experience (and level if necessary) of the L2PcInstance in function of the calculated Death Penalty.<BR>
+	 * <B><U> Actions</U> :</B>
+	 * <li>Calculate the Experience loss</li>
+	 * <li>Set the value of _expBeforeDeath</li>
+	 * <li>Set the new Experience value of the L2PcInstance and Decrease its level if necessary</li>
+	 * <li>Send a Server->Client StatusUpdate packet with its new Experience</li>
+	 * @param killer
+	 * @param atWar
+	 */
+	public void calculateDeathExpPenalty(L2Character killer, boolean atWar) {
+		final int lvl = getLevel();
+		double percentLost = PlayerXpPercentLostData.getInstance().getXpPercent(getLevel());
+		
+		if (killer != null) {
+			if (killer.isRaid()) {
+				percentLost *= calcStat(Stats.REDUCE_EXP_LOST_BY_RAID, 1);
+			} else if (killer.isMonster()) {
+				percentLost *= calcStat(Stats.REDUCE_EXP_LOST_BY_MOB, 1);
+			} else if (killer.isPlayable()) {
+				percentLost *= calcStat(Stats.REDUCE_EXP_LOST_BY_PVP, 1);
+			}
+		}
+		
+		if (getKarma() > 0) {
+			percentLost *= rates().getRateKarmaExpLost();
+		}
+		
+		// Calculate the Experience loss
+		long lostExp = 0;
+		if (!L2Event.isParticipant(this)) {
+			if (getHuntingSystem().isNevitBlessingActive()) {
+				lostExp = 0;
+			} else if (lvl < character().getMaxPlayerLevel()) {
+				lostExp = Math.round(((getStat().getExpForLevel(lvl + 1) - getStat().getExpForLevel(lvl)) * percentLost) / 100);
+			} else {
+				lostExp = Math.round(((getStat().getExpForLevel(character().getMaxPlayerLevel() + 1) - getStat().getExpForLevel(character().getMaxPlayerLevel())) * percentLost) / 100);
+			}
+		}
+		
+		if (isFestivalParticipant() || atWar) {
+			lostExp /= 4.0;
+		}
+		
+		setExpBeforeDeath(getExp());
+		
+		removeExp(lostExp);
+	}
+	
+	public boolean isPartyWaiting() {
+		return PartyMatchWaitingList.getInstance().getPlayers().contains(this);
+	}
+	
+	public int getPartyRoom() {
+		return _partyroom;
+	}
+	
+	public void setPartyRoom(int id) {
+		_partyroom = id;
+	}
+	
+	public boolean isInPartyMatchRoom() {
+		return _partyroom > 0;
+	}
+	
+	/**
+	 * Stop the HP/MP/CP Regeneration task. <B><U> Actions</U> :</B>
+	 * <li>Set the RegenActive flag to False</li>
+	 * <li>Stop the HP/MP/CP Regeneration task</li>
+	 */
+	public void stopAllTimers() {
+		stopHpMpRegeneration();
+		stopWarnUserTakeBreak();
+		stopWaterTask();
+		stopFeed();
+		DAOFactory.getInstance().getPetDAO().updateFood(this, _mountNpcId);
+		stopRentPet();
+		stopPvpRegTask();
+		stopSoulTask();
+		stopChargeTask();
+		stopFameTask();
+		stopVitalityTask();
+		getRecSystem().stopBonusTask(false);
+		getRecSystem().stopGiveTask();
+	}
+	
+	@Override
+	public L2Summon getSummon() {
+		return _summon;
+	}
+	
+	/**
+	 * @return the L2Decoy of the L2PcInstance or null.
+	 */
+	public L2Decoy getDecoy() {
+		return _decoy;
+	}
+	
+	/**
+	 * Set the L2Decoy of the L2PcInstance.
+	 * @param decoy
+	 */
+	public void setDecoy(L2Decoy decoy) {
+		_decoy = decoy;
+	}
+	
+	/**
+	 * @return the L2Trap of the L2PcInstance or null.
+	 */
+	public L2TrapInstance getTrap() {
+		return _trap;
+	}
+	
+	/**
+	 * Set the L2Trap of this L2PcInstance
+	 * @param trap
+	 */
+	public void setTrap(L2TrapInstance trap) {
+		_trap = trap;
+	}
+	
+	/**
+	 * Set the L2Summon of the L2PcInstance.
+	 * @param summon
+	 */
+	public void setPet(L2Summon summon) {
+		_summon = summon;
+	}
+	
+	/**
+	 * Gets the players tamed beasts.
+	 * @return the tamed beasts
+	 */
+	public Set<L2TamedBeastInstance> getTamedBeasts() {
+		if (_tamedBeasts == null) {
+			synchronized (this) {
+				if (_tamedBeasts == null) {
+					_tamedBeasts = ConcurrentHashMap.newKeySet(1);
+				}
+			}
+		}
+		return _tamedBeasts;
+	}
+	
+	/**
+	 * Verifies if the player has tamed beasts.
+	 * @return {@code true} if the player has tamed beasts
+	 */
+	public boolean hasTamedBeasts() {
+		return (_tamedBeasts != null) && !_tamedBeasts.isEmpty();
+	}
+	
+	/**
+	 * Adds a tamed beast to the player.
+	 * @param tamedBeast the tamed beast
+	 */
+	public void addTamedBeast(L2TamedBeastInstance tamedBeast) {
+		getTamedBeasts().add(tamedBeast);
+	}
+	
+	public void removeTamedBeast(L2TamedBeastInstance tamedBeast) {
+		if (hasTamedBeasts()) {
+			_tamedBeasts.remove(tamedBeast);
+		}
+	}
+	
+	/**
+	 * @return the L2PcInstance requester of a transaction (ex : FriendInvite, JoinAlly, JoinParty...).
+	 */
+	public L2Request getRequest() {
+		return _request;
+	}
+	
+	/**
+	 * @return the L2PcInstance requester of a transaction (ex : FriendInvite, JoinAlly, JoinParty...).
+	 */
+	public L2PcInstance getActiveRequester() {
+		L2PcInstance requester = _activeRequester;
+		if (requester != null) {
+			if (requester.isRequestExpired() && (_activeTradeList == null)) {
+				_activeRequester = null;
+			}
+		}
+		return _activeRequester;
+	}
+	
+	/**
+	 * Set the L2PcInstance requester of a transaction (ex : FriendInvite, JoinAlly, JoinParty...).
+	 * @param requester
+	 */
+	public void setActiveRequester(L2PcInstance requester) {
+		_activeRequester = requester;
+	}
+	
+	/**
+	 * @return True if a transaction is in progress.
+	 */
+	public boolean isProcessingRequest() {
+		return (getActiveRequester() != null) || (_requestExpireTime > GameTimeController.getInstance().getGameTicks());
+	}
+	
+	/**
+	 * @return True if a transaction is in progress.
+	 */
+	public boolean isProcessingTransaction() {
+		return (getActiveRequester() != null) || (_activeTradeList != null) || (_requestExpireTime > GameTimeController.getInstance().getGameTicks());
+	}
+	
+	/**
+	 * Select the Warehouse to be used in next activity.
+	 * @param partner
+	 */
+	public void onTransactionRequest(L2PcInstance partner) {
+		_requestExpireTime = GameTimeController.getInstance().getGameTicks() + (REQUEST_TIMEOUT * GameTimeController.TICKS_PER_SECOND);
+		partner.setActiveRequester(this);
+	}
+	
+	/**
+	 * Return true if last request is expired.
+	 * @return
+	 */
+	public boolean isRequestExpired() {
+		return !(_requestExpireTime > GameTimeController.getInstance().getGameTicks());
+	}
+	
+	/**
+	 * Select the Warehouse to be used in next activity.
+	 */
+	public void onTransactionResponse() {
+		_requestExpireTime = 0;
+	}
+	
+	/**
+	 * @return active Warehouse.
+	 */
+	public ItemContainer getActiveWarehouse() {
+		return _activeWarehouse;
+	}
+	
+	/**
+	 * Select the Warehouse to be used in next activity.
+	 * @param warehouse
+	 */
+	public void setActiveWarehouse(ItemContainer warehouse) {
+		_activeWarehouse = warehouse;
+	}
+	
+	/**
+	 * @return active TradeList.
+	 */
+	public TradeList getActiveTradeList() {
+		return _activeTradeList;
+	}
+	
+	/**
+	 * Select the TradeList to be used in next activity.
+	 * @param tradeList
+	 */
+	public void setActiveTradeList(TradeList tradeList) {
+		_activeTradeList = tradeList;
+	}
+	
+	public void onTradeStart(L2PcInstance partner) {
+		_activeTradeList = new TradeList(this);
+		_activeTradeList.setPartner(partner);
+		
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.BEGIN_TRADE_WITH_C1);
+		msg.addPcName(partner);
+		sendPacket(msg);
+		sendPacket(new TradeStart(this));
+	}
+	
+	public void onTradeConfirm(L2PcInstance partner) {
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_CONFIRMED_TRADE);
+		msg.addPcName(partner);
+		sendPacket(msg);
+		sendPacket(TradeOtherDone.STATIC_PACKET);
+	}
+	
+	public void onTradeCancel(L2PcInstance partner) {
+		if (_activeTradeList == null) {
+			return;
+		}
+		
+		_activeTradeList.lock();
+		_activeTradeList = null;
+		
+		sendPacket(new TradeDone(0));
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_CANCELED_TRADE);
+		msg.addPcName(partner);
+		sendPacket(msg);
+	}
+	
+	public void onTradeFinish(boolean successfull) {
+		_activeTradeList = null;
+		sendPacket(new TradeDone(1));
+		if (successfull) {
+			sendPacket(SystemMessageId.TRADE_SUCCESSFUL);
+		}
+	}
+	
+	public void startTrade(L2PcInstance partner) {
+		onTradeStart(partner);
+		partner.onTradeStart(this);
+	}
+	
+	public void cancelActiveTrade() {
+		if (_activeTradeList == null) {
+			return;
+		}
+		
+		L2PcInstance partner = _activeTradeList.getPartner();
+		if (partner != null) {
+			partner.onTradeCancel(this);
+		}
+		onTradeCancel(this);
+	}
+	
+	public boolean hasManufactureShop() {
+		return (_manufactureItems != null) && !_manufactureItems.isEmpty();
+	}
+	
+	/**
+	 * Get the manufacture items map of this player.
+	 * @return the the manufacture items map
+	 */
+	public Map<Integer, L2ManufactureItem> getManufactureItems() {
+		if (_manufactureItems == null) {
+			synchronized (this) {
+				if (_manufactureItems == null) {
+					_manufactureItems = Collections.synchronizedMap(new LinkedHashMap<>());
+				}
+			}
+		}
+		return _manufactureItems;
+	}
+	
+	/**
+	 * Get the store name, if any.
+	 * @return the store name
+	 */
+	public String getStoreName() {
+		return _storeName;
+	}
+	
+	/**
+	 * Set the store name.
+	 * @param name the store name to set
+	 */
+	public void setStoreName(String name) {
+		_storeName = name == null ? "" : name;
+	}
+	
+	/**
+	 * @return the _buyList object of the L2PcInstance.
+	 */
+	public TradeList getSellList() {
+		if (_sellList == null) {
+			_sellList = new TradeList(this);
+		}
+		return _sellList;
+	}
+	
+	/**
+	 * @return the _buyList object of the L2PcInstance.
+	 */
+	public TradeList getBuyList() {
+		if (_buyList == null) {
+			_buyList = new TradeList(this);
+		}
+		return _buyList;
+	}
+	
+	/**
+	 * <B><U> Values </U> :</B>
+	 * <li>0 : STORE_PRIVATE_NONE</li>
+	 * <li>1 : STORE_PRIVATE_SELL</li>
+	 * <li>2 : sellmanage</li><BR>
+	 * <li>3 : STORE_PRIVATE_BUY</li><BR>
+	 * <li>4 : buymanage</li><BR>
+	 * <li>5 : STORE_PRIVATE_MANUFACTURE</li><BR>
+	 * @return the Private Store type of the L2PcInstance.
+	 */
+	public PrivateStoreType getPrivateStoreType() {
+		return _privateStoreType;
+	}
+	
+	/**
+	 * Set the Private Store type of the L2PcInstance. <B><U> Values </U> :</B>
+	 * <li>0 : STORE_PRIVATE_NONE</li>
+	 * <li>1 : STORE_PRIVATE_SELL</li>
+	 * <li>2 : sellmanage</li><BR>
+	 * <li>3 : STORE_PRIVATE_BUY</li><BR>
+	 * <li>4 : buymanage</li><BR>
+	 * <li>5 : STORE_PRIVATE_MANUFACTURE</li><BR>
+	 * @param privateStoreType
+	 */
+	public void setPrivateStoreType(PrivateStoreType privateStoreType) {
+		_privateStoreType = privateStoreType;
+		
+		if (customs().offlineDisconnectFinished() && (privateStoreType == PrivateStoreType.NONE) && ((getClient() == null) || getClient().isDetached())) {
+			deleteMe();
+		}
+	}
+	
+	/**
+	 * @return the _clan object of the L2PcInstance.
+	 */
+	@Override
+	public L2Clan getClan() {
+		return _clan;
+	}
+	
+	/**
+	 * Set the _clan object, _clanId, _clanLeader Flag and title of the L2PcInstance.
+	 * @param clan
+	 */
+	public void setClan(L2Clan clan) {
+		_clan = clan;
+		if (clan == null) {
+			_clanId = 0;
+			_clanPrivileges = new EnumIntBitmask<>(ClanPrivilege.class, false);
+			_pledgeType = 0;
+			_powerGrade = 0;
+			_lvlJoinedAcademy = 0;
+			_apprentice = 0;
+			_sponsor = 0;
+			_activeWarehouse = null;
+			return;
+		}
+		
+		if (!clan.isMember(getObjectId())) {
+			// char has been kicked from clan
+			setClan(null);
+			return;
+		}
+		
+		_clanId = clan.getId();
+	}
+	
+	/**
+	 * @return True if the L2PcInstance is the leader of its clan.
+	 */
+	public boolean isClanLeader() {
+		if (getClan() == null) {
+			return false;
+		}
+		return getObjectId() == getClan().getLeaderId();
+	}
+	
+	/**
+	 * Reduce the number of arrows/bolts owned by the L2PcInstance and send it Server->Client Packet InventoryUpdate or ItemList (to unequip if the last arrow was consummed).
+	 */
+	@Override
+	protected void reduceArrowCount(boolean bolts) {
+		L2ItemInstance arrows = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+		
+		if (arrows == null) {
+			getInventory().unEquipItemInSlot(Inventory.PAPERDOLL_LHAND);
+			if (bolts) {
+				_boltItem = null;
+			} else {
+				_arrowItem = null;
+			}
+			sendPacket(new ItemList(this, false));
+			return;
+		}
+		
+		// Adjust item quantity
+		if (arrows.getCount() > 1) {
+			synchronized (arrows) {
+				arrows.changeCountWithoutTrace(-1, this, null);
+				arrows.setLastChange(L2ItemInstance.MODIFIED);
+				
+				// could do also without saving, but let's save approx once per second
+				if ((GameTimeController.getInstance().getGameTicks() % GameTimeController.TICKS_PER_SECOND) == 0) {
+					arrows.updateDatabase();
+				}
+				_inventory.refreshWeight();
+			}
+		} else {
+			// Destroy entire item and save to database
+			_inventory.destroyItem("Consume", arrows, this, null);
+			
+			getInventory().unEquipItemInSlot(Inventory.PAPERDOLL_LHAND);
+			if (bolts) {
+				_boltItem = null;
+			} else {
+				_arrowItem = null;
+			}
+			
+			sendPacket(new ItemList(this, false));
+			return;
+		}
+		
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addModifiedItem(arrows);
+			sendPacket(iu);
+		} else {
+			sendPacket(new ItemList(this, false));
+		}
+	}
+	
+	/**
+	 * Equip arrows needed in left hand and send a Server->Client packet ItemList to the L2PcINstance then return True.
+	 */
+	@Override
+	protected boolean checkAndEquipArrows() {
+		// Check if nothing is equiped in left hand
+		if (getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND) == null) {
+			// Get the L2ItemInstance of the arrows needed for this bow
+			_arrowItem = getInventory().findArrowForBow(getActiveWeaponItem());
+			if (_arrowItem != null) {
+				// Equip arrows needed in left hand
+				getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, _arrowItem);
+				
+				// Send a Server->Client packet ItemList to this L2PcINstance to update left hand equipement
+				ItemList il = new ItemList(this, false);
+				sendPacket(il);
+			}
+		} else {
+			// Get the L2ItemInstance of arrows equiped in left hand
+			_arrowItem = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+		}
+		return _arrowItem != null;
+	}
+	
+	/**
+	 * Equip bolts needed in left hand and send a Server->Client packet ItemList to the L2PcINstance then return True.
+	 */
+	@Override
+	protected boolean checkAndEquipBolts() {
+		// Check if nothing is equiped in left hand
+		if (getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND) == null) {
+			// Get the L2ItemInstance of the arrows needed for this bow
+			_boltItem = getInventory().findBoltForCrossBow(getActiveWeaponItem());
+			if (_boltItem != null) {
+				// Equip arrows needed in left hand
+				getInventory().setPaperdollItem(Inventory.PAPERDOLL_LHAND, _boltItem);
+				
+				// Send a Server->Client packet ItemList to this L2PcINstance to update left hand equipement
+				ItemList il = new ItemList(this, false);
+				sendPacket(il);
+			}
+		} else {
+			// Get the L2ItemInstance of arrows equiped in left hand
+			_boltItem = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+		}
+		return _boltItem != null;
+	}
+	
+	/**
+	 * Disarm the player's weapon.
+	 * @return {@code true} if the player was disarmed or doesn't have a weapon to disarm, {@code false} otherwise.
+	 */
+	public boolean disarmWeapons() {
+		// If there is no weapon to disarm then return true.
+		final L2ItemInstance wpn = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (wpn == null) {
+			return true;
+		}
+		
+		// Don't allow disarming a cursed weapon
+		if (isCursedWeaponEquipped()) {
+			return false;
+		}
+		
+		// Don't allow disarming a Combat Flag or Territory Ward.
+		if (isCombatFlagEquipped()) {
+			return false;
+		}
+		
+		// Don't allow disarming if the weapon is force equip.
+		if (wpn.getWeaponItem().isForceEquip()) {
+			return false;
+		}
+		
+		final L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
+		final InventoryUpdate iu = new InventoryUpdate();
+		for (L2ItemInstance itm : unequiped) {
+			iu.addModifiedItem(itm);
+		}
+		
+		sendPacket(iu);
+		abortAttack();
+		broadcastUserInfo();
+		
+		// This can be 0 if the user pressed the right mousebutton twice very fast.
+		if (unequiped.length > 0) {
+			final SystemMessage sm;
+			if (unequiped[0].getEnchantLevel() > 0) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+				sm.addInt(unequiped[0].getEnchantLevel());
+				sm.addItemName(unequiped[0]);
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+				sm.addItemName(unequiped[0]);
+			}
+			sendPacket(sm);
+		}
+		return true;
+	}
+	
+	/**
+	 * Disarm the player's shield.
+	 * @return {@code true}.
+	 */
+	public boolean disarmShield() {
+		L2ItemInstance sld = getInventory().getPaperdollItem(Inventory.PAPERDOLL_LHAND);
+		if (sld != null) {
+			L2ItemInstance[] unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart());
+			InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance itm : unequiped) {
+				iu.addModifiedItem(itm);
+			}
+			sendPacket(iu);
+			
+			abortAttack();
+			broadcastUserInfo();
+			
+			// this can be 0 if the user pressed the right mousebutton twice very fast
+			if (unequiped.length > 0) {
+				SystemMessage sm = null;
+				if (unequiped[0].getEnchantLevel() > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+					sm.addInt(unequiped[0].getEnchantLevel());
+					sm.addItemName(unequiped[0]);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+					sm.addItemName(unequiped[0]);
+				}
+				sendPacket(sm);
+			}
+		}
+		return true;
+	}
+	
+	public boolean mount(L2Summon pet) {
+		if (!disarmWeapons() || !disarmShield() || isTransformed()) {
+			return false;
+		}
+		
+		getEffectList().stopAllToggles();
+		setMount(pet.getId(), pet.getLevel());
+		setMountObjectID(pet.getControlObjectId());
+		startFeed(pet.getId());
+		broadcastPacket(new Ride(this));
+		
+		// Notify self and others about speed change
+		broadcastUserInfo();
+		
+		pet.unSummon(this);
+		return true;
+	}
+	
+	public boolean mount(int npcId, int controlItemObjId, boolean useFood) {
+		if (!disarmWeapons() || !disarmShield() || isTransformed()) {
+			return false;
+		}
+		
+		getEffectList().stopAllToggles();
+		setMount(npcId, getLevel());
+		setMountObjectID(controlItemObjId);
+		broadcastPacket(new Ride(this));
+		
+		// Notify self and others about speed change
+		broadcastUserInfo();
+		if (useFood) {
+			startFeed(npcId);
+		}
+		return true;
+	}
+	
+	public boolean mountPlayer(L2Summon pet) {
+		if ((pet != null) && pet.isMountable() && !isMounted() && !isBetrayed()) {
+			if (isDead()) {
+				// A strider cannot be ridden when dead
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_DEAD);
+				return false;
+			} else if (pet.isDead()) {
+				// A dead strider cannot be ridden.
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.DEAD_STRIDER_CANT_BE_RIDDEN);
+				return false;
+			} else if (pet.isInCombat() || pet.isRooted()) {
+				// A strider in battle cannot be ridden
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.STRIDER_IN_BATLLE_CANT_BE_RIDDEN);
+				return false;
+				
+			} else if (isInCombat()) {
+				// A strider cannot be ridden while in battle
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE);
+				return false;
+			} else if (isSitting()) {
+				// A strider can be ridden only when standing
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.STRIDER_CAN_BE_RIDDEN_ONLY_WHILE_STANDING);
+				return false;
+			} else if (isFishing()) {
+				// You can't mount, dismount, break and drop items while fishing
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.CANNOT_DO_WHILE_FISHING_2);
+				return false;
+			} else if (isTransformed() || isCursedWeaponEquipped()) {
+				// no message needed, player while transformed doesn't have mount action
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			} else if (getInventory().getItemByItemId(9819) != null) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				// FIXME: Wrong Message
+				sendMessage("You cannot mount a steed while holding a flag.");
+				return false;
+			} else if (pet.isHungry()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.HUNGRY_STRIDER_NOT_MOUNT);
+				return false;
+			} else if (!Util.checkIfInRange(200, this, pet, true)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.TOO_FAR_AWAY_FROM_FENRIR_TO_MOUNT);
+				return false;
+			} else if (!pet.isDead() && !isMounted()) {
+				mount(pet);
+			}
+		} else if (isRentedPet()) {
+			stopRentPet();
+		} else if (isMounted()) {
+			if ((getMountType() == MountType.WYVERN) && isInsideZone(ZoneId.NO_LANDING)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.NO_DISMOUNT_HERE);
+				return false;
+			} else if (isHungry()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.HUNGRY_STRIDER_NOT_MOUNT);
+				return false;
+			} else {
+				dismount();
+			}
+		}
+		return true;
+	}
+	
+	public boolean dismount() {
+		boolean wasFlying = isFlying();
+		
+		sendPacket(new SetupGauge(3, 0, 0));
+		int petId = _mountNpcId;
+		setMount(0, 0);
+		stopFeed();
+		if (wasFlying) {
+			removeSkill(CommonSkill.WYVERN_BREATH.getSkill());
+		}
+		broadcastPacket(new Ride(this));
+		setMountObjectID(0);
+		DAOFactory.getInstance().getPetDAO().updateFood(this, petId);
+		// Notify self and others about speed change
+		broadcastUserInfo();
+		return true;
+	}
+	
+	public long getUptime() {
+		return System.currentTimeMillis() - _uptime;
+	}
+	
+	public void setUptime(long time) {
+		_uptime = time;
+	}
+	
+	/**
+	 * Return True if the L2PcInstance is invulnerable.
+	 */
+	@Override
+	public boolean isInvul() {
+		return super.isInvul() || _isTeleporting;
+	}
+	
+	/**
+	 * Return True if the L2PcInstance has a Party in progress.
+	 */
+	@Override
+	public boolean isInParty() {
+		return _party != null;
+	}
+	
+	/**
+	 * Set the _party object of the L2PcInstance AND join it.
+	 * @param party
+	 */
+	public void joinParty(L2Party party) {
+		if (party != null) {
+			// First set the party otherwise this wouldn't be considered
+			// as in a party into the L2Character.updateEffectIcons() call.
+			_party = party;
+			party.addPartyMember(this);
+		}
+	}
+	
+	/**
+	 * Manage the Leave Party task of the L2PcInstance.
+	 */
+	public void leaveParty() {
+		if (isInParty()) {
+			_party.removePartyMember(this, messageType.Disconnected);
+			_party = null;
+		}
+	}
+	
+	/**
+	 * Return the _party object of the L2PcInstance.
+	 */
+	@Override
+	public L2Party getParty() {
+		return _party;
+	}
+	
+	/**
+	 * Set the _party object of the L2PcInstance (without joining it).
+	 * @param party
+	 */
+	public void setParty(L2Party party) {
+		_party = party;
+	}
+	
+	public PartyDistributionType getPartyDistributionType() {
+		return _partyDistributionType;
+	}
+	
+	public void setPartyDistributionType(PartyDistributionType pdt) {
+		_partyDistributionType = pdt;
+	}
+	
+	/**
+	 * Return True if the L2PcInstance is a GM.
+	 */
+	@Override
+	public boolean isGM() {
+		return getAccessLevel().isGm();
+	}
+	
+	public void setAccountAccesslevel(int level) {
+		LoginServerThread.getInstance().sendAccessLevel(getAccountName(), level);
+	}
+	
+	/**
+	 * @return the _accessLevel of the L2PcInstance.
+	 */
+	@Override
+	public L2AccessLevel getAccessLevel() {
+		if (general().everybodyHasAdminRights()) {
+			return AdminData.getInstance().getMasterAccessLevel();
+		} else if (_accessLevel == null) {
+			setAccessLevel(0);
+		}
+		return _accessLevel;
+	}
+	
+	/**
+	 * Set the access level for this player.
+	 * @param level the access level
+	 */
+	public void setAccessLevel(int level) {
+		_accessLevel = AdminData.getInstance().getAccessLevel(level);
+		
+		getAppearance().setNameColor(_accessLevel.getNameColor());
+		getAppearance().setTitleColor(_accessLevel.getTitleColor());
+		broadcastUserInfo();
+		
+		CharNameTable.getInstance().addName(this);
+		
+		if (!AdminData.getInstance().hasAccessLevel(level)) {
+			LOG.warn("Tried to set unregistered access level {} for {}. Setting access level without privileges!", level, this);
+		} else if (level > 0) {
+			LOG.info("{} access level set for character {}.", _accessLevel.getName(), this);
+		}
+	}
+	
+	/**
+	 * Update Stats of the L2PcInstance client side by sending Server->Client packet UserInfo/StatusUpdate to this L2PcInstance and CharInfo/StatusUpdate to all L2PcInstance in its _KnownPlayers (broadcast).
+	 * @param broadcastType
+	 */
+	public void updateAndBroadcastStatus(int broadcastType) {
+		refreshOverloaded();
+		refreshExpertisePenalty();
+		// Send a Server->Client packet UserInfo to this L2PcInstance and CharInfo to all L2PcInstance in its _KnownPlayers (broadcast)
+		if (broadcastType == 1) {
+			sendPacket(new UserInfo(this));
+			sendPacket(new ExBrExtraUserInfo(this));
+		}
+		if (broadcastType == 2) {
+			broadcastUserInfo();
+		}
+	}
+	
+	/**
+	 * Send a Server->Client StatusUpdate packet with Karma and PvP Flag to the L2PcInstance and all L2PcInstance to inform (broadcast).
+	 * @param flag
+	 */
+	public void setKarmaFlag(int flag) {
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+		Collection<L2PcInstance> plrs = getKnownList().getKnownPlayers().values();
+		for (L2PcInstance player : plrs) {
+			player.sendPacket(new RelationChanged(this, getRelation(player), isAutoAttackable(player)));
+			if (hasSummon()) {
+				player.sendPacket(new RelationChanged(getSummon(), getRelation(player), isAutoAttackable(player)));
+			}
+		}
+	}
+	
+	/**
+	 * Send a Server->Client StatusUpdate packet with Karma to the L2PcInstance and all L2PcInstance to inform (broadcast).
+	 */
+	public void broadcastKarma() {
+		StatusUpdate su = new StatusUpdate(this);
+		su.addAttribute(StatusUpdate.KARMA, getKarma());
+		sendPacket(su);
+		
+		for (L2PcInstance player : getKnownList().getKnownPlayers().values()) {
+			player.sendPacket(new RelationChanged(this, getRelation(player), isAutoAttackable(player)));
+			if (hasSummon()) {
+				player.sendPacket(new RelationChanged(getSummon(), getRelation(player), isAutoAttackable(player)));
+			}
+		}
+	}
+	
+	/**
+	 * Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout).
+	 * @param isOnline
+	 * @param updateInDb
+	 */
+	public void setOnlineStatus(boolean isOnline, boolean updateInDb) {
+		if (_isOnline != isOnline) {
+			_isOnline = isOnline;
+		}
+		
+		// Update the characters table of the database with online status and lastAccess (called when login and logout)
+		if (updateInDb) {
+			DAOFactory.getInstance().getPlayerDAO().updateOnlineStatus(this);
+		}
+	}
+	
+	public void setIsIn7sDungeon(boolean isIn7sDungeon) {
+		_isIn7sDungeon = isIn7sDungeon;
+	}
+	
+	public Forum getMail() {
+		if (_forumMail == null) {
+			final var mailRootForum = ForumsBBSManager.getInstance().getForumByName("MailRoot");
+			setMail(mailRootForum.getChildByName(getName()));
+			if (_forumMail == null) {
+				ForumsBBSManager.getInstance().create(getName(), mailRootForum, MAIL, OWNER_ONLY, getObjectId());
+				setMail(mailRootForum.getChildByName(getName()));
+			}
+		}
+		return _forumMail;
+	}
+	
+	public void setMail(Forum forum) {
+		_forumMail = forum;
+	}
+	
+	public Forum getMemo() {
+		if (_forumMemo == null) {
+			final var memoRootForum = ForumsBBSManager.getInstance().getForumByName("MemoRoot");
+			setMemo(memoRootForum.getChildByName(_accountName));
+			if (_forumMemo == null) {
+				ForumsBBSManager.getInstance().create(_accountName, memoRootForum, MEMO, OWNER_ONLY, getObjectId());
+				setMemo(memoRootForum.getChildByName(_accountName));
+			}
+		}
+		return _forumMemo;
+	}
+	
+	public void setMemo(Forum forum) {
+		_forumMemo = forum;
+	}
+	
+	public Map<Integer, L2PremiumItem> getPremiumItemList() {
+		return _premiumItems;
+	}
+	
+	/**
+	 * Update L2PcInstance stats in the characters table of the database.
+	 * @param storeActiveEffects
+	 */
+	public synchronized void store(boolean storeActiveEffects) {
+		DAOFactory.getInstance().getPlayerDAO().storeCharBase(this);
+		
+		DAOFactory.getInstance().getSubclassDAO().update(this);
+		
+		storeEffect(storeActiveEffects);
+		
+		DAOFactory.getInstance().getItemReuseDAO().insert(this);
+		
+		if (character().storeRecipeShopList()) {
+			DAOFactory.getInstance().getRecipeShopListDAO().delete(this);
+			DAOFactory.getInstance().getRecipeShopListDAO().insert(this);
+		}
+		
+		if (character().storeUISettings()) {
+			storeUISettings();
+		}
+		
+		SevenSigns.getInstance().saveSevenSignsData(getObjectId());
+		
+		final PlayerVariables vars = getScript(PlayerVariables.class);
+		if (vars != null) {
+			vars.storeMe();
+		}
+		
+		final AccountVariables aVars = getScript(AccountVariables.class);
+		if (aVars != null) {
+			aVars.storeMe();
+		}
+	}
+	
+	@Override
+	public void storeMe() {
+		store(true);
+	}
+	
+	@Override
+	public void storeEffect(boolean storeEffects) {
+		if (!character().storeSkillCooltime()) {
+			return;
+		}
+		
+		DAOFactory.getInstance().getPlayerSkillSaveDAO().delete(this);
+		
+		DAOFactory.getInstance().getPlayerSkillSaveDAO().insert(this, storeEffects);
+	}
+	
+	/**
+	 * @return True if the L2PcInstance is on line.
+	 */
+	public boolean isOnline() {
+		return _isOnline;
+	}
+	
+	public int isOnlineInt() {
+		if (_isOnline && (_client != null)) {
+			return _client.isDetached() ? 2 : 1;
+		}
+		return 0;
+	}
+	
+	/**
+	 * Verifies if the player is in offline mode.<br>
+	 * The offline mode may happen for different reasons:<br>
+	 * Abnormally: Player gets abruptly disconnected from server.<br>
+	 * Normally: The player gets into offline shop mode, only available by enabling the offline shop mod.
+	 * @return {@code true} if the player is in offline mode, {@code false} otherwise
+	 */
+	public boolean isInOfflineMode() {
+		return (_client == null) || _client.isDetached();
+	}
+	
+	public boolean isIn7sDungeon() {
+		return _isIn7sDungeon;
+	}
+	
+	@Override
+	public Skill addSkill(Skill newSkill) {
+		addCustomSkill(newSkill);
+		return super.addSkill(newSkill);
+	}
+	
+	/**
+	 * Add a skill to the L2PcInstance _skills and its Func objects to the calculator set of the L2PcInstance and save update in the character_skills table of the database. <B><U> Concept</U> :</B> All skills own by a L2PcInstance are identified in <B>_skills</B> <B><U> Actions</U> :</B>
+	 * <li>Replace oldSkill by newSkill or Add the newSkill</li>
+	 * <li>If an old skill has been replaced, remove all its Func objects of L2Character calculator set</li>
+	 * <li>Add Func objects of newSkill to the calculator set of the L2Character</li>
+	 * @param newSkill The L2Skill to add to the L2Character
+	 * @param store
+	 * @return The L2Skill replaced or null if just added a new L2Skill
+	 */
+	public Skill addSkill(Skill newSkill, boolean store) {
+		// Add a skill to the L2PcInstance _skills and its Func objects to the calculator set of the L2PcInstance
+		final Skill oldSkill = addSkill(newSkill);
+		// Add or update a L2PcInstance skill in the character_skills table of the database
+		if (store) {
+			storeSkill(newSkill, oldSkill, -1);
+		}
+		return oldSkill;
+	}
+	
+	@Override
+	public Skill removeSkill(Skill skill, boolean store) {
+		removeCustomSkill(skill);
+		return store ? removeSkill(skill) : super.removeSkill(skill, true);
+	}
+	
+	public Skill removeSkill(Skill skill, boolean store, boolean cancelEffect) {
+		removeCustomSkill(skill);
+		return store ? removeSkill(skill) : super.removeSkill(skill, cancelEffect);
+	}
+	
+	/**
+	 * Remove a skill from the L2Character and its Func objects from calculator set of the L2Character and save update in the character_skills table of the database. <B><U> Concept</U> :</B> All skills own by a L2Character are identified in <B>_skills</B> <B><U> Actions</U> :</B>
+	 * <li>Remove the skill from the L2Character _skills</li>
+	 * <li>Remove all its Func objects from the L2Character calculator set</li> <B><U> Overridden in </U> :</B>
+	 * <li>L2PcInstance : Save update in the character_skills table of the database</li>
+	 * @param skill The L2Skill to remove from the L2Character
+	 * @return The L2Skill removed
+	 */
+	public Skill removeSkill(Skill skill) {
+		removeCustomSkill(skill);
+		// Remove a skill from the L2Character and its Func objects from calculator set of the L2Character
+		final Skill oldSkill = super.removeSkill(skill, true);
+		if (oldSkill != null) {
+			DAOFactory.getInstance().getSkillDAO().delete(this, oldSkill);
+		}
+		
+		if ((getTransformationId() > 0) || isCursedWeaponEquipped()) {
+			return oldSkill;
+		}
+		
+		if (skill != null) {
+			for (Shortcut sc : getAllShortCuts()) {
+				if ((sc != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortcutType.SKILL) && !((skill.getId() >= 3080) && (skill.getId() <= 3259))) {
+					deleteShortCut(sc.getSlot(), sc.getPage());
+				}
+			}
+		}
+		return oldSkill;
+	}
+	
+	/**
+	 * Add or update a L2PcInstance skill in the character_skills table of the database.<br>
+	 * If newClassIndex > -1, the skill will be stored with that class index, not the current one.
+	 * @param newSkill
+	 * @param oldSkill
+	 * @param newClassIndex
+	 */
+	private void storeSkill(Skill newSkill, Skill oldSkill, int newClassIndex) {
+		final int classIndex = (newClassIndex > -1) ? newClassIndex : _classIndex;
+		if ((oldSkill != null) && (newSkill != null)) {
+			DAOFactory.getInstance().getSkillDAO().update(this, classIndex, newSkill, oldSkill);
+		} else if (newSkill != null) {
+			DAOFactory.getInstance().getSkillDAO().insert(this, classIndex, newSkill);
+		} else {
+			LOG.warn("Could not store new skill, it's null!");
+		}
+	}
+	
+	/**
+	 * Retrieve from the database all skill effects of this L2PcInstance and add them to the player.
+	 */
+	@Override
+	public void restoreEffects() {
+		DAOFactory.getInstance().getPlayerSkillSaveDAO().load(this);
+		
+		DAOFactory.getInstance().getPlayerSkillSaveDAO().delete(this);
+	}
+	
+	/**
+	 * @return the number of Henna empty slot of the L2PcInstance.
+	 */
+	public int getHennaEmptySlots() {
+		int totalSlots = 0;
+		if (getClassId().level() == 1) {
+			totalSlots = 2;
+		} else {
+			totalSlots = 3;
+		}
+		
+		for (int i = 0; i < 3; i++) {
+			if (_henna[i] != null) {
+				totalSlots--;
+			}
+		}
+		
+		if (totalSlots <= 0) {
+			return 0;
+		}
+		
+		return totalSlots;
+	}
+	
+	/**
+	 * Remove a henna from the player and updates the database.
+	 * @param slot
+	 * @return
+	 */
+	public boolean removeHenna(int slot) {
+		if ((slot < 1) || (slot > 3)) {
+			return false;
+		}
+		
+		slot--;
+		
+		L2Henna henna = _henna[slot];
+		if (henna == null) {
+			return false;
+		}
+		
+		_henna[slot] = null;
+		
+		DAOFactory.getInstance().getHennaDAO().delete(this, slot + 1);
+		
+		// Calculate Henna modifiers of this L2PcInstance
+		recalcHennaStats();
+		
+		// Send Server->Client HennaInfo packet to this L2PcInstance
+		sendPacket(new HennaInfo(this));
+		
+		// Send Server->Client UserInfo packet to this L2PcInstance
+		sendPacket(new UserInfo(this));
+		sendPacket(new ExBrExtraUserInfo(this));
+		// Add the recovered dyes to the player's inventory and notify them.
+		getInventory().addItem("Henna", henna.getDyeItemId(), henna.getCancelCount(), this, null);
+		reduceAdena("Henna", henna.getCancelFee(), this, false);
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+		sm.addItemName(henna.getDyeItemId());
+		sm.addLong(henna.getCancelCount());
+		sendPacket(sm);
+		sendPacket(SystemMessageId.SYMBOL_DELETED);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerHennaRemove(this, henna), this);
+		return true;
+	}
+	
+	/**
+	 * Adds a henna to the player and stores it into the database.
+	 * @param henna the henna to add to the player
+	 * @return {@code true} if the henna is added to the player, {@code false} otherwise
+	 */
+	public boolean addHenna(L2Henna henna) {
+		for (int i = 0; i < 3; i++) {
+			if (_henna[i] == null) {
+				_henna[i] = henna;
+				
+				// Calculate Henna modifiers of this L2PcInstance
+				recalcHennaStats();
+				
+				DAOFactory.getInstance().getHennaDAO().insert(this, henna, i + 1);
+				
+				// Send Server->Client HennaInfo packet to this L2PcInstance
+				sendPacket(new HennaInfo(this));
+				
+				// Send Server->Client UserInfo packet to this L2PcInstance
+				sendPacket(new UserInfo(this));
+				sendPacket(new ExBrExtraUserInfo(this));
+				
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new PlayerHennaRemove(this, henna), this);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Calculate Henna modifiers of this L2PcInstance.
+	 */
+	public void recalcHennaStats() {
+		_hennaINT = 0;
+		_hennaSTR = 0;
+		_hennaCON = 0;
+		_hennaMEN = 0;
+		_hennaWIT = 0;
+		_hennaDEX = 0;
+		
+		for (L2Henna h : _henna) {
+			if (h == null) {
+				continue;
+			}
+			
+			_hennaINT += ((_hennaINT + h.getStatINT()) > 5) ? 5 - _hennaINT : h.getStatINT();
+			_hennaSTR += ((_hennaSTR + h.getStatSTR()) > 5) ? 5 - _hennaSTR : h.getStatSTR();
+			_hennaMEN += ((_hennaMEN + h.getStatMEN()) > 5) ? 5 - _hennaMEN : h.getStatMEN();
+			_hennaCON += ((_hennaCON + h.getStatCON()) > 5) ? 5 - _hennaCON : h.getStatCON();
+			_hennaWIT += ((_hennaWIT + h.getStatWIT()) > 5) ? 5 - _hennaWIT : h.getStatWIT();
+			_hennaDEX += ((_hennaDEX + h.getStatDEX()) > 5) ? 5 - _hennaDEX : h.getStatDEX();
+		}
+	}
+	
+	/**
+	 * @param slot the character inventory henna slot.
+	 * @return the Henna of this L2PcInstance corresponding to the selected slot.
+	 */
+	public L2Henna getHenna(int slot) {
+		if ((slot < 1) || (slot > 3)) {
+			return null;
+		}
+		return _henna[slot - 1];
+	}
+	
+	/**
+	 * @return {@code true} if player has at least 1 henna symbol, {@code false} otherwise.
+	 */
+	public boolean hasHennas() {
+		for (L2Henna henna : _henna) {
+			if (henna != null) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @return the henna holder for this player.
+	 */
+	public L2Henna[] getHennaList() {
+		return _henna;
+	}
+	
+	/**
+	 * @return the INT Henna modifier of this L2PcInstance.
+	 */
+	public int getHennaStatINT() {
+		return _hennaINT;
+	}
+	
+	/**
+	 * @return the STR Henna modifier of this L2PcInstance.
+	 */
+	public int getHennaStatSTR() {
+		return _hennaSTR;
+	}
+	
+	/**
+	 * @return the CON Henna modifier of this L2PcInstance.
+	 */
+	public int getHennaStatCON() {
+		return _hennaCON;
+	}
+	
+	/**
+	 * @return the MEN Henna modifier of this L2PcInstance.
+	 */
+	public int getHennaStatMEN() {
+		return _hennaMEN;
+	}
+	
+	/**
+	 * @return the WIT Henna modifier of this L2PcInstance.
+	 */
+	public int getHennaStatWIT() {
+		return _hennaWIT;
+	}
+	
+	/**
+	 * @return the DEX Henna modifier of this L2PcInstance.
+	 */
+	public int getHennaStatDEX() {
+		return _hennaDEX;
+	}
+	
+	/**
+	 * Return True if the L2PcInstance is autoAttackable.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Check if the attacker isn't the L2PcInstance Pet</li>
+	 * <li>Check if the attacker is L2MonsterInstance</li>
+	 * <li>If the attacker is a L2PcInstance, check if it is not in the same party</li>
+	 * <li>Check if the L2PcInstance has Karma</li>
+	 * <li>If the attacker is a L2PcInstance, check if it is not in the same siege clan (Attacker, Defender)</li>
+	 * </ul>
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		if (attacker == null) {
+			return false;
+		}
+		
+		// Check if the attacker isn't the L2PcInstance Pet
+		if ((attacker == this) || (attacker == getSummon())) {
+			return false;
+		}
+		
+		// Friendly mobs doesnt attack players
+		if (attacker instanceof L2FriendlyMobInstance) {
+			return false;
+		}
+		
+		// Check if the attacker is a L2MonsterInstance
+		if (attacker.isMonster()) {
+			return true;
+		}
+		
+		// is AutoAttackable if both players are in the same duel and the duel is still going on
+		if (attacker.isPlayable() && (getDuelState() == DuelState.DUELLING) && (getDuelId() == attacker.getActingPlayer().getDuelId())) {
+			Duel duel = DuelManager.getInstance().getDuel(getDuelId());
+			if (duel.getTeamA().contains(this) && duel.getTeamA().contains(attacker)) {
+				return false;
+			} else if (duel.getTeamB().contains(this) && duel.getTeamB().contains(attacker)) {
+				return false;
+			}
+			return true;
+		}
+		
+		// Check if the attacker is not in the same party. NOTE: Party checks goes before oly checks in order to prevent patry member autoattack at oly.
+		if (isInParty() && getParty().getMembers().contains(attacker)) {
+			return false;
+		}
+		
+		// Check if the attacker is in olympia and olympia start
+		if (attacker.isPlayer() && attacker.getActingPlayer().isInOlympiadMode()) {
+			if (isInOlympiadMode() && isOlympiadStart() && (((L2PcInstance) attacker).getOlympiadGameId() == getOlympiadGameId())) {
+				return true;
+			}
+			return false;
+		}
+		
+		// Check if the attacker is in TvT and TvT is started
+		if (isOnEvent()) {
+			return true;
+		}
+		
+		// Check if the attacker is a L2Playable
+		if (attacker.isPlayable()) {
+			if (isInsideZone(ZoneId.PEACE)) {
+				return false;
+			}
+			
+			// Get L2PcInstance
+			L2PcInstance attackerPlayer = attacker.getActingPlayer();
+			
+			if (getClan() != null) {
+				Siege siege = SiegeManager.getInstance().getSiege(getX(), getY(), getZ());
+				if (siege != null) {
+					// Check if a siege is in progress and if attacker and the L2PcInstance aren't in the Defender clan
+					if (siege.checkIsDefender(attackerPlayer.getClan()) && siege.checkIsDefender(getClan())) {
+						return false;
+					}
+					
+					// Check if a siege is in progress and if attacker and the L2PcInstance aren't in the Attacker clan
+					if (siege.checkIsAttacker(attackerPlayer.getClan()) && siege.checkIsAttacker(getClan())) {
+						return false;
+					}
+				}
+				
+				// Check if clan is at war
+				if ((getClan() != null) && (attackerPlayer.getClan() != null) && getClan().isAtWarWith(attackerPlayer.getClanId()) && attackerPlayer.getClan().isAtWarWith(getClanId()) && (getWantsPeace() == 0) && (attackerPlayer.getWantsPeace() == 0) && !isAcademyMember()) {
+					return true;
+				}
+			}
+			
+			// Check if the L2PcInstance is in an arena, but NOT siege zone. NOTE: This check comes before clan/ally checks, but after party checks.
+			// This is done because in arenas, clan/ally members can autoattack if they arent in party.
+			if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && !(isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))) {
+				return true;
+			}
+			
+			// Check if the attacker is not in the same clan
+			if ((getClan() != null) && getClan().isMember(attacker.getObjectId())) {
+				return false;
+			}
+			
+			// Check if the attacker is not in the same ally
+			if (attacker.isPlayer() && (getAllyId() != 0) && (getAllyId() == attackerPlayer.getAllyId())) {
+				return false;
+			}
+			
+			// Now check again if the L2PcInstance is in pvp zone, but this time at siege PvP zone, applying clan/ally checks
+			if ((isInsideZone(ZoneId.PVP) && attackerPlayer.isInsideZone(ZoneId.PVP)) && (isInsideZone(ZoneId.SIEGE) && attackerPlayer.isInsideZone(ZoneId.SIEGE))) {
+				return true;
+			}
+		} else if (attacker instanceof L2DefenderInstance) {
+			if (getClan() != null) {
+				Siege siege = SiegeManager.getInstance().getSiege(this);
+				return ((siege != null) && siege.checkIsAttacker(getClan()));
+			}
+		}
+		
+		// Check if the L2PcInstance has Karma
+		if ((getKarma() > 0) || (getPvpFlag() > 0)) {
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Check if the active L2Skill can be casted.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Check if the skill isn't toggle and is offensive</li>
+	 * <li>Check if the target is in the skill cast range</li>
+	 * <li>Check if the skill is Spoil type and if the target isn't already spoiled</li>
+	 * <li>Check if the caster owns enough consumed Item, enough HP and MP to cast the skill</li>
+	 * <li>Check if the caster isn't sitting</li>
+	 * <li>Check if all skills are enabled and this skill is enabled</li>
+	 * <li>Check if the caster own the weapon needed</li>
+	 * <li>Check if the skill is active</li>
+	 * <li>Check if all casting conditions are completed</li>
+	 * <li>Notify the AI with AI_INTENTION_CAST and target</li>
+	 * </ul>
+	 * @param skill The L2Skill to use
+	 * @param forceUse used to force ATTACK on players
+	 * @param dontMove used to prevent movement, if not in range
+	 */
+	@Override
+	public boolean useMagic(Skill skill, boolean forceUse, boolean dontMove) {
+		// Check if the skill is active
+		if (skill.isPassive()) {
+			// just ignore the passive skill request. why does the client send it anyway ??
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// ************************************* Check Casting in Progress *******************************************
+		
+		// If a skill is currently being used, queue this one if this is not the same
+		if (isCastingNow()) {
+			SkillUseHolder currentSkill = getCurrentSkill();
+			// Check if new skill different from current skill in progress
+			if ((currentSkill != null) && (skill.getId() == currentSkill.getSkillId())) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			} else if (isSkillDisabled(skill)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			// Create a new SkillDat object and queue it in the player _queuedSkill
+			setQueuedSkill(skill, forceUse, dontMove);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		setIsCastingNow(true);
+		// Create a new SkillDat object and set the player _currentSkill
+		// This is used mainly to save & queue the button presses, since L2Character has
+		// _lastSkillCast which could otherwise replace it
+		setCurrentSkill(skill, forceUse, dontMove);
+		
+		if (getQueuedSkill() != null) {
+			setQueuedSkill(null, false, false);
+		}
+		
+		// Check if the target is correct and Notify the AI with AI_INTENTION_CAST and target
+		L2Object target = switch (skill.getTargetType()) {
+			// SELF should be cast even if no target has been found
+			case GROUND, SELF -> this;
+			// Get the first target of the list
+			default -> {
+				final var targets = skill.getTargets(this);
+				yield targets.isEmpty() ? null : targets.get(0);
+			}
+		};
+		
+		// Notify the AI with AI_INTENTION_CAST and target
+		getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target);
+		return true;
+	}
+	
+	private boolean checkUseMagicConditions(Skill skill, boolean forceUse, boolean dontMove) {
+		// ************************************* Check Player State *******************************************
+		
+		// Abnormal effects(ex : Stun, Sleep...) are checked in L2Character useMagic()
+		if (isOutOfControl() || isStunned() || isSleeping()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if the player is dead
+		if (isDead()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		if (isFishing() && !skill.hasEffectType(L2EffectType.FISHING, L2EffectType.FISHING_START)) {
+			// Only fishing skills are available
+			sendPacket(SystemMessageId.ONLY_FISHING_SKILLS_NOW);
+			return false;
+		}
+		
+		if (inObserverMode()) {
+			sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE);
+			abortCast();
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if the caster is sitting
+		if (isSitting()) {
+			// Send a System Message to the caster
+			sendPacket(SystemMessageId.CANT_MOVE_SITTING);
+			
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if the skill type is toggle.
+		if (skill.isToggle() && isAffectedBySkill(skill.getId())) {
+			stopSkillEffects(true, skill.getId());
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if the player uses "Fake Death" skill
+		// Note: do not check this before TOGGLE reset
+		if (isFakeDeath()) {
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// ************************************* Check Target *******************************************
+		// Create and set a L2Object containing the target of the skill
+		L2Object target = null;
+		TargetType sklTargetType = skill.getTargetType();
+		Location worldPosition = getCurrentSkillWorldPosition();
+		
+		if ((sklTargetType == TargetType.GROUND) && (worldPosition == null)) {
+			LOG.warn("WorldPosition is null for {}, {}", skill.getName(), this);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Target the player if skill type is AURA, PARTY, CLAN or SELF
+		target = switch (sklTargetType) {
+			case GROUND, SELF -> this;
+			case SUMMON -> getSummon();
+			default -> getTarget();
+		};
+		
+		// Check the validity of the target
+		if (target == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// skills can be used on Walls and Doors only during siege
+		if (target.isDoor()) {
+			final L2DoorInstance door = (L2DoorInstance) target;
+			
+			if ((door.getCastle() != null) && (door.getCastle().getResidenceId() > 0)) {
+				if (!door.getCastle().getSiege().isInProgress()) {
+					sendPacket(SystemMessageId.INCORRECT_TARGET);
+					return false;
+				}
+			} else if ((door.getFort() != null) && (door.getFort().getResidenceId() > 0)) {
+				if (!door.getFort().getSiege().isInProgress() || !door.getIsShowHp()) {
+					sendPacket(SystemMessageId.INCORRECT_TARGET);
+					return false;
+				}
+			}
+		}
+		
+		// Are the target and the player in the same duel?
+		if (isInDuel()) {
+			final L2PcInstance cha = target.getActingPlayer();
+			if ((cha != null) && (cha.getDuelId() != getDuelId())) {
+				sendMessage("You cannot do this while duelling.");
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+		}
+		
+		// ************************************* Check skill availability *******************************************
+		
+		// Check if this skill is enabled (ex : reuse time)
+		if (isSkillDisabled(skill)) {
+			final SystemMessage sm;
+			if (hasSkillReuse(skill.getReuseHashCode())) {
+				int remainingTime = (int) (getSkillRemainingReuseTime(skill.getReuseHashCode()) / 1000);
+				int hours = remainingTime / 3600;
+				int minutes = (remainingTime % 3600) / 60;
+				int seconds = (remainingTime % 60);
+				if (hours > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HOURS_S3_MINUTES_S4_SECONDS_REMAINING_FOR_REUSE_S1);
+					sm.addSkillName(skill);
+					sm.addInt(hours);
+					sm.addInt(minutes);
+				} else if (minutes > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTES_S3_SECONDS_REMAINING_FOR_REUSE_S1);
+					sm.addSkillName(skill);
+					sm.addInt(minutes);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_SECONDS_REMAINING_FOR_REUSE_S1);
+					sm.addSkillName(skill);
+				}
+				
+				sm.addInt(seconds);
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.S1_PREPARED_FOR_REUSE);
+				sm.addSkillName(skill);
+			}
+			
+			sendPacket(sm);
+			return false;
+		}
+		
+		// ************************************* Check casting conditions *******************************************
+		
+		// Check if all casting conditions are completed
+		if (!skill.checkCondition(this, target, false)) {
+			// Send a Server->Client packet ActionFailed to the L2PcInstance
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// ************************************* Check Skill Type *******************************************
+		
+		// Check if this is bad magic skill
+		if (skill.isBad()) {
+			if ((isInsidePeaceZone(this, target)) && !getAccessLevel().allowPeaceAttack()) {
+				// If L2Character or target is in a peace zone, send a system message TARGET_IN_PEACEZONE a Server->Client packet ActionFailed
+				sendPacket(SystemMessageId.TARGET_IN_PEACEZONE);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			if (isInOlympiadMode() && !isOlympiadStart()) {
+				// if L2PcInstance is in Olympia and the match isn't already start, send a Server->Client packet ActionFailed
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			if ((target.getActingPlayer() != null) && (getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (target.getActingPlayer().getSiegeState() == getSiegeState()) && (target.getActingPlayer() != this) && (target.getActingPlayer().getSiegeSide() == getSiegeSide())) {
+				if (TerritoryWarManager.getInstance().isTWInProgress()) {
+					sendPacket(SystemMessageId.YOU_CANNOT_ATTACK_A_MEMBER_OF_THE_SAME_TERRITORY);
+				} else {
+					sendPacket(SystemMessageId.FORCED_ATTACK_IS_IMPOSSIBLE_AGAINST_SIEGE_SIDE_TEMPORARY_ALLIED_MEMBERS);
+				}
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			if (!target.canBeAttacked() && !getAccessLevel().allowPeaceAttack() && !target.isDoor()) {
+				// If target is not attackable, send a Server->Client packet ActionFailed
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			// Check for Event Mob's
+			if ((target instanceof L2EventMonsterInstance) && ((L2EventMonsterInstance) target).eventSkillAttackBlocked()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+			
+			// Check if a Forced ATTACK is in progress on non-attackable target
+			if (!target.isAutoAttackable(this) && !forceUse) {
+				switch (sklTargetType) {
+					case SELF:
+					case GROUND:
+					case DOOR_TREASURE:
+						break;
+					default: // Send a Server->Client packet ActionFailed to the L2PcInstance
+						sendPacket(ActionFailed.STATIC_PACKET);
+						return false;
+				}
+			}
+			
+			// Check if the target is in the skill cast range
+			if (dontMove) {
+				// Calculate the distance between the L2PcInstance and the target
+				if (sklTargetType == TargetType.GROUND) {
+					if (!isInsideRadius(worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), skill.getCastRange() + getTemplate().getCollisionRadius(), false, false)) {
+						// Send a System Message to the caster
+						sendPacket(SystemMessageId.TARGET_TOO_FAR);
+						
+						// Send a Server->Client packet ActionFailed to the L2PcInstance
+						sendPacket(ActionFailed.STATIC_PACKET);
+						return false;
+					}
+				} else if ((skill.getCastRange() > 0) && !isInsideRadius(target, skill.getCastRange() + getTemplate().getCollisionRadius(), false, false)) {
+					// Send a System Message to the caster
+					sendPacket(SystemMessageId.TARGET_TOO_FAR);
+					
+					// Send a Server->Client packet ActionFailed to the L2PcInstance
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return false;
+				}
+			}
+		}
+		
+		// Check if the skill is a good magic, target is a monster and if force attack is set, if not then we don't want to cast.
+		if ((skill.getEffectPoint() > 0) && target.isMonster() && !forceUse) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return false;
+		}
+		
+		// Check if this is a Pvp skill and target isn't a non-flagged/non-karma player
+		switch (sklTargetType) {
+			case GROUND:
+			case SELF:
+			case ENEMY:
+				break;
+			default:
+				// Verify that player can attack a player or summon
+				if (target.isPlayable() && !getAccessLevel().allowPeaceAttack() && !checkPvpSkill(target, skill)) {
+					// Send a System Message to the player
+					sendPacket(SystemMessageId.INCORRECT_TARGET);
+					
+					// Send a Server->Client packet ActionFailed to the player
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return false;
+				}
+		}
+		
+		// GeoData Los Check here
+		if (skill.getCastRange() > 0) {
+			if (sklTargetType == TargetType.GROUND) {
+				if (!GeoData.getInstance().canSeeTarget(this, worldPosition)) {
+					sendPacket(SystemMessageId.CANT_SEE_TARGET);
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return false;
+				}
+			} else if (!GeoData.getInstance().canSeeTarget(this, target)) {
+				sendPacket(SystemMessageId.CANT_SEE_TARGET);
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return false;
+			}
+		}
+		
+		if ((skill.isFlyType()) && !GeoData.getInstance().canMove(this, target)) {
+			sendPacket(SystemMessageId.THE_TARGET_IS_LOCATED_WHERE_YOU_CANNOT_CHARGE);
+			return false;
+		}
+		
+		// finally, after passing all conditions
+		return true;
+	}
+	
+	public boolean isInLooterParty(int LooterId) {
+		L2PcInstance looter = L2World.getInstance().getPlayer(LooterId);
+		
+		// if L2PcInstance is in a CommandChannel
+		if (isInParty() && getParty().isInCommandChannel() && (looter != null)) {
+			return getParty().getCommandChannel().getMembers().contains(looter);
+		}
+		
+		if (isInParty() && (looter != null)) {
+			return getParty().getMembers().contains(looter);
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Check if the requested casting is a Pc->Pc skill cast and if it's a valid pvp condition
+	 * @param target L2Object instance containing the target
+	 * @param skill L2Skill instance with the skill being casted
+	 * @return {@code false} if the skill is a pvpSkill and target is not a valid pvp target, {@code true} otherwise.
+	 */
+	public boolean checkPvpSkill(L2Object target, Skill skill) {
+		if ((skill == null) || (target == null)) {
+			return false;
+		}
+		
+		if (!target.isPlayable()) {
+			return true;
+		}
+		
+		if (skill.isDebuff() || skill.hasEffectType(L2EffectType.STEAL_ABNORMAL) || skill.isBad()) {
+			final L2PcInstance targetPlayer = target.getActingPlayer();
+			
+			if ((targetPlayer == null) || (this == target)) {
+				return false;
+			}
+			
+			final boolean isCtrlPressed = (getCurrentSkill() != null) && getCurrentSkill().isCtrlPressed();
+			
+			// Peace Zone
+			if (target.isInsideZone(ZoneId.PEACE)) {
+				return false;
+			}
+			
+			// Siege
+			if ((getSiegeState() != 0) && (targetPlayer.getSiegeState() != 0)) {
+				// Register for same siege
+				if (getSiegeSide() == targetPlayer.getSiegeSide()) {
+					// Same side
+					if (getSiegeState() == targetPlayer.getSiegeState()) {
+						sendPacket(SystemMessageId.FORCED_ATTACK_IS_IMPOSSIBLE_AGAINST_SIEGE_SIDE_TEMPORARY_ALLIED_MEMBERS);
+						return false;
+					}
+				}
+			}
+			
+			// Duel
+			if (isInDuel() && targetPlayer.isInDuel()) {
+				if (getDuelId() == targetPlayer.getDuelId()) {
+					return true;
+				}
+			}
+			
+			// Party
+			if (isInParty() && targetPlayer.isInParty()) {
+				// Same Party
+				if (getParty().getLeader() == targetPlayer.getParty().getLeader()) {
+					if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target)) {
+						if (skill.isDamage()) {
+							return true;
+						}
+					}
+					return false;
+				} else if ((getParty().getCommandChannel() != null) && getParty().getCommandChannel().containsPlayer(targetPlayer)) {
+					if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target)) {
+						if (skill.isDamage()) {
+							return true;
+						}
+					}
+					return false;
+				}
+			}
+			
+			// You can debuff anyone except party members while in an arena...
+			if (isInsideZone(ZoneId.PVP) && targetPlayer.isInsideZone(ZoneId.PVP)) {
+				return true;
+			}
+			
+			// Olympiad
+			if (isInOlympiadMode() && targetPlayer.isInOlympiadMode()) {
+				if (getOlympiadGameId() == targetPlayer.getOlympiadGameId()) {
+					return true;
+				}
+			}
+			
+			final L2Clan aClan = getClan();
+			final L2Clan tClan = targetPlayer.getClan();
+			
+			if ((aClan != null) && (tClan != null)) {
+				if (aClan.isAtWarWith(tClan.getId()) && tClan.isAtWarWith(aClan.getId())) {
+					// Check if skill can do damage
+					if ((skill.isAOE() && (skill.getEffectRange() > 0)) && isCtrlPressed && (getTarget() == target)) {
+						return true;
+					}
+					return isCtrlPressed;
+				} else if ((getClanId() == targetPlayer.getClanId()) || ((getAllyId() > 0) && (getAllyId() == targetPlayer.getAllyId()))) {
+					// Check if skill can do damage
+					if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage()) {
+						return true;
+					}
+					return false;
+				}
+			}
+			
+			// On retail, it is impossible to debuff a "peaceful" player.
+			if ((targetPlayer.getPvpFlag() == 0) && (targetPlayer.getKarma() == 0)) {
+				// Check if skill can do damage
+				if ((skill.getEffectRange() > 0) && isCtrlPressed && (getTarget() == target) && skill.isDamage()) {
+					return true;
+				}
+				return false;
+			}
+			
+			if ((targetPlayer.getPvpFlag() > 0) || (targetPlayer.getKarma() > 0)) {
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * @return True if the L2PcInstance is a Mage.
+	 */
+	public boolean isMageClass() {
+		return getClassId().isMage();
+	}
+	
+	public boolean isMounted() {
+		return _mountType != MountType.NONE;
+	}
+	
+	public boolean checkLandingState() {
+		// Check if char is in a no landing zone
+		if (isInsideZone(ZoneId.NO_LANDING)) {
+			return true;
+		} else
+		// if this is a castle that is currently being sieged, and the rider is NOT a castle owner
+		// he cannot land.
+		// castle owner is the leader of the clan that owns the castle where the pc is
+		if (isInsideZone(ZoneId.SIEGE) && !((getClan() != null) && (CastleManager.getInstance().getCastle(this) == CastleManager.getInstance().getCastleByOwner(getClan())) && (this == getClan().getLeader().getPlayerInstance()))) {
+			return true;
+		}
+		
+		return false;
+	}
+	
+	// returns false if the change of mount type fails.
+	public void setMount(int npcId, int npcLevel) {
+		final MountType type = MountType.findByNpcId(npcId);
+		switch (type) {
+			case NONE -> setIsFlying(false);
+			case STRIDER -> {
+				if (isNoble()) {
+					addSkill(CommonSkill.STRIDER_SIEGE_ASSAULT.getSkill(), false);
+				}
+			}
+			case WYVERN -> setIsFlying(true);
+		}
+		
+		_mountType = type;
+		_mountNpcId = npcId;
+		_mountLevel = npcLevel;
+	}
+	
+	/**
+	 * @return the type of Pet mounted (0 : none, 1 : Strider, 2 : Wyvern, 3: Wolf).
+	 */
+	public MountType getMountType() {
+		return _mountType;
+	}
+	
+	@Override
+	public void stopAllEffects() {
+		super.stopAllEffects();
+		updateAndBroadcastStatus(2);
+	}
+	
+	@Override
+	public void stopAllEffectsExceptThoseThatLastThroughDeath() {
+		super.stopAllEffectsExceptThoseThatLastThroughDeath();
+		updateAndBroadcastStatus(2);
+	}
+	
+	public void stopAllEffectsNotStayOnSubclassChange() {
+		getEffectList().stopAllEffectsNotStayOnSubclassChange();
+		updateAndBroadcastStatus(2);
+	}
+	
+	public void stopCubics() {
+		if (!_cubics.isEmpty()) {
+			for (L2CubicInstance cubic : _cubics.values()) {
+				cubic.stopAction();
+				cubic.cancelDisappear();
+			}
+			_cubics.clear();
+			broadcastUserInfo();
+		}
+	}
+	
+	public void stopCubicsByOthers() {
+		if (!_cubics.isEmpty()) {
+			boolean broadcast = false;
+			for (L2CubicInstance cubic : _cubics.values()) {
+				if (cubic.givenByOther()) {
+					cubic.stopAction();
+					cubic.cancelDisappear();
+					_cubics.remove(cubic.getId());
+					broadcast = true;
+				}
+			}
+			if (broadcast) {
+				broadcastUserInfo();
+			}
+		}
+	}
+	
+	/**
+	 * Send a Server->Client packet UserInfo to this L2PcInstance and CharInfo to all L2PcInstance in its _KnownPlayers.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Others L2PcInstance in the detection area of the L2PcInstance are identified in <B>_knownPlayers</B>.<br>
+	 * In order to inform other players of this L2PcInstance state modifications, server just need to go through _knownPlayers to send Server->Client Packet<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Send a Server->Client packet UserInfo to this L2PcInstance (Public and Private Data)</li>
+	 * <li>Send a Server->Client packet CharInfo to all L2PcInstance in _KnownPlayers of the L2PcInstance (Public data only)</li>
+	 * </ul>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : DON'T SEND UserInfo packet to other players instead of CharInfo packet. Indeed, UserInfo packet contains PRIVATE DATA as MaxHP, STR, DEX...</B></FONT>
+	 */
+	@Override
+	public void updateAbnormalEffect() {
+		broadcastUserInfo();
+	}
+	
+	/**
+	 * Disable the Inventory and create a new task to enable it after 1.5s.
+	 * @param val
+	 */
+	public void setInventoryBlockingStatus(boolean val) {
+		_inventoryDisable = val;
+		if (val) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new InventoryEnableTask(this), 1500);
+		}
+	}
+	
+	/**
+	 * @return True if the Inventory is disabled.
+	 */
+	public boolean isInventoryDisabled() {
+		return _inventoryDisable;
+	}
+	
+	/**
+	 * Add a cubic to this player.
+	 * @param cubicId the cubic ID
+	 * @param level
+	 * @param cubicPower
+	 * @param cubicDelay
+	 * @param cubicSkillChance
+	 * @param cubicMaxCount
+	 * @param cubicDuration
+	 * @param givenByOther
+	 * @return the old cubic for this cubic ID if any, otherwise {@code null}
+	 */
+	public L2CubicInstance addCubic(int cubicId, int level, double cubicPower, int cubicDelay, int cubicSkillChance, int cubicMaxCount, int cubicDuration, boolean givenByOther) {
+		return _cubics.put(cubicId, new L2CubicInstance(this, cubicId, level, (int) cubicPower, cubicDelay, cubicSkillChance, cubicMaxCount, cubicDuration, givenByOther));
+	}
+	
+	/**
+	 * Get the player's cubics.
+	 * @return the cubics
+	 */
+	public Map<Integer, L2CubicInstance> getCubics() {
+		return _cubics;
+	}
+	
+	/**
+	 * Get the player cubic by cubic ID, if any.
+	 * @param cubicId the cubic ID
+	 * @return the cubic with the given cubic ID, {@code null} otherwise
+	 */
+	public L2CubicInstance getCubicById(int cubicId) {
+		return _cubics.get(cubicId);
+	}
+	
+	/**
+	 * @return the modifier corresponding to the Enchant Effect of the Active Weapon (Min : 127).
+	 */
+	public int getEnchantEffect() {
+		L2ItemInstance wpn = getActiveWeaponInstance();
+		
+		if (wpn == null) {
+			return 0;
+		}
+		
+		return Math.min(127, wpn.getEnchantLevel());
+	}
+	
+	/**
+	 * @return the _lastFolkNpc of the L2PcInstance corresponding to the last Folk wich one the player talked.
+	 */
+	public L2Npc getLastFolkNPC() {
+		return _lastFolkNpc;
+	}
+	
+	/**
+	 * Set the _lastFolkNpc of the L2PcInstance corresponding to the last Folk wich one the player talked.
+	 * @param folkNpc
+	 */
+	public void setLastFolkNPC(L2Npc folkNpc) {
+		_lastFolkNpc = folkNpc;
+	}
+	
+	/**
+	 * @return True if L2PcInstance is a participant in the Festival of Darkness.
+	 */
+	public boolean isFestivalParticipant() {
+		return SevenSignsFestival.getInstance().isParticipant(this);
+	}
+	
+	public void addAutoSoulShot(int itemId) {
+		_activeSoulShots.add(itemId);
+	}
+	
+	public boolean removeAutoSoulShot(int itemId) {
+		return _activeSoulShots.remove(itemId);
+	}
+	
+	public Set<Integer> getAutoSoulShot() {
+		return _activeSoulShots;
+	}
+	
+	@Override
+	public void rechargeShots(boolean physical, boolean magic) {
+		L2ItemInstance item;
+		IItemHandler handler;
+		
+		if ((_activeSoulShots == null) || _activeSoulShots.isEmpty()) {
+			return;
+		}
+		
+		for (int itemId : _activeSoulShots) {
+			item = getInventory().getItemByItemId(itemId);
+			
+			if (item != null) {
+				if (magic) {
+					if (item.getItem().getDefaultAction() == ActionType.SPIRITSHOT) {
+						handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
+						if (handler != null) {
+							handler.useItem(this, item, false);
+						}
+					}
+				}
+				
+				if (physical) {
+					if (item.getItem().getDefaultAction() == ActionType.SOULSHOT) {
+						handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
+						if (handler != null) {
+							handler.useItem(this, item, false);
+						}
+					}
+				}
+			} else {
+				removeAutoSoulShot(itemId);
+			}
+		}
+	}
+	
+	/**
+	 * Cancel autoshot for all shots matching crystaltype<BR>
+	 * {@link L2Item#getCrystalType()}
+	 * @param crystalType int type to disable
+	 */
+	public void disableAutoShotByCrystalType(int crystalType) {
+		for (int itemId : _activeSoulShots) {
+			if (ItemTable.getInstance().getTemplate(itemId).getCrystalType().getId() == crystalType) {
+				disableAutoShot(itemId);
+			}
+		}
+	}
+	
+	/**
+	 * Cancel autoshot use for shot itemId
+	 * @param itemId int id to disable
+	 * @return true if canceled.
+	 */
+	public boolean disableAutoShot(int itemId) {
+		if (_activeSoulShots.contains(itemId)) {
+			removeAutoSoulShot(itemId);
+			sendPacket(new ExAutoSoulShot(itemId, 0));
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED);
+			sm.addItemName(itemId);
+			sendPacket(sm);
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Cancel all autoshots for player
+	 */
+	public void disableAutoShotsAll() {
+		for (int itemId : _activeSoulShots) {
+			sendPacket(new ExAutoSoulShot(itemId, 0));
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED);
+			sm.addItemName(itemId);
+			sendPacket(sm);
+		}
+		_activeSoulShots.clear();
+	}
+	
+	public EnumIntBitmask<ClanPrivilege> getClanPrivileges() {
+		return _clanPrivileges;
+	}
+	
+	public void setClanPrivileges(EnumIntBitmask<ClanPrivilege> clanPrivileges) {
+		_clanPrivileges = clanPrivileges.clone();
+	}
+	
+	public boolean hasClanPrivilege(ClanPrivilege privilege) {
+		return _clanPrivileges.has(privilege);
+	}
+	
+	public int getPledgeClass() {
+		return _pledgeClass;
+	}
+	
+	// baron etc
+	public void setPledgeClass(int classId) {
+		_pledgeClass = classId;
+		checkItemRestriction();
+	}
+	
+	@Override
+	public int getPledgeType() {
+		return _pledgeType;
+	}
+	
+	public void setPledgeType(int typeId) {
+		_pledgeType = typeId;
+	}
+	
+	public int getApprentice() {
+		return _apprentice;
+	}
+	
+	public void setApprentice(int apprentice_id) {
+		_apprentice = apprentice_id;
+	}
+	
+	public int getSponsor() {
+		return _sponsor;
+	}
+	
+	public void setSponsor(int sponsor_id) {
+		_sponsor = sponsor_id;
+	}
+	
+	public int getBookMarkSlot() {
+		return _bookmarkslot;
+	}
+	
+	public void setBookMarkSlot(int slot) {
+		_bookmarkslot = slot;
+		sendPacket(new ExGetBookMarkInfoPacket(this));
+	}
+	
+	@Override
+	public void sendMessage(String message) {
+		sendPacket(SystemMessage.sendString(message));
+	}
+	
+	public void enterObserverMode(Location loc) {
+		setLastLocation();
+		
+		// Remove Hide.
+		getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
+		
+		_observerMode = true;
+		setTarget(null);
+		startStunning();
+		setIsInvul(true);
+		setInvisible(true);
+		sendPacket(new ObservationMode(loc));
+		
+		teleToLocation(loc, false);
+		
+		broadcastUserInfo();
+	}
+	
+	public void setLastLocation() {
+		_lastLoc.setXYZ(getX(), getY(), getZ());
+	}
+	
+	public void unsetLastLocation() {
+		_lastLoc.setXYZ(0, 0, 0);
+	}
+	
+	public void enterOlympiadObserverMode(Location loc, int id) {
+		if (hasSummon()) {
+			getSummon().unSummon(this);
+		}
+		
+		// Remove Hide.
+		getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
+		
+		if (!_cubics.isEmpty()) {
+			for (L2CubicInstance cubic : _cubics.values()) {
+				cubic.stopAction();
+				cubic.cancelDisappear();
+			}
+			_cubics.clear();
+		}
+		
+		if (getParty() != null) {
+			getParty().removePartyMember(this, messageType.Expelled);
+		}
+		
+		_olympiadGameId = id;
+		if (isSitting()) {
+			standUp();
+		}
+		if (!_observerMode) {
+			setLastLocation();
+		}
+		
+		_observerMode = true;
+		setTarget(null);
+		setIsInvul(true);
+		setInvisible(true);
+		teleToLocation(loc, false);
+		sendPacket(new ExOlympiadMode(3));
+		
+		broadcastUserInfo();
+	}
+	
+	public void leaveObserverMode() {
+		setTarget(null);
+		
+		teleToLocation(_lastLoc, false);
+		unsetLastLocation();
+		sendPacket(new ObservationReturn(getLocation()));
+		
+		stopStunning(false);
+		if (!isGM()) {
+			setInvisible(false);
+			setIsInvul(false);
+		}
+		if (hasAI()) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		}
+		
+		setFalling(); // prevent receive falling damage
+		_observerMode = false;
+		
+		broadcastUserInfo();
+	}
+	
+	public void leaveOlympiadObserverMode() {
+		if (_olympiadGameId == -1) {
+			return;
+		}
+		_olympiadGameId = -1;
+		_observerMode = false;
+		setTarget(null);
+		sendPacket(new ExOlympiadMode(0));
+		setInstanceId(0);
+		teleToLocation(_lastLoc, true);
+		if (!isGM()) {
+			setInvisible(false);
+			setIsInvul(false);
+		}
+		if (hasAI()) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		}
+		unsetLastLocation();
+		broadcastUserInfo();
+	}
+	
+	public int getOlympiadSide() {
+		return _olympiadSide;
+	}
+	
+	public void setOlympiadSide(int i) {
+		_olympiadSide = i;
+	}
+	
+	public int getOlympiadGameId() {
+		return _olympiadGameId;
+	}
+	
+	public void setOlympiadGameId(int id) {
+		_olympiadGameId = id;
+	}
+	
+	/**
+	 * Gets the player's olympiad buff count.
+	 * @return the olympiad's buff count
+	 */
+	public int getOlympiadBuffCount() {
+		return _olyBuffsCount;
+	}
+	
+	/**
+	 * Sets the player's olympiad buff count.
+	 * @param buffs the olympiad's buff count
+	 */
+	public void setOlympiadBuffCount(int buffs) {
+		_olyBuffsCount = buffs;
+	}
+	
+	public Location getLastLocation() {
+		return _lastLoc;
+	}
+	
+	public boolean inObserverMode() {
+		return _observerMode;
+	}
+	
+	public int getTeleMode() {
+		return _telemode;
+	}
+	
+	public void setTeleMode(int mode) {
+		_telemode = mode;
+	}
+	
+	public void setLoto(int i, int val) {
+		_loto[i] = val;
+	}
+	
+	public int getLoto(int i) {
+		return _loto[i];
+	}
+	
+	public void setRace(int i, int val) {
+		_race[i] = val;
+	}
+	
+	public int getRace(int i) {
+		return _race[i];
+	}
+	
+	public boolean getMessageRefusal() {
+		return _messageRefusal;
+	}
+	
+	public void setMessageRefusal(boolean mode) {
+		_messageRefusal = mode;
+		sendPacket(new EtcStatusUpdate(this));
+	}
+	
+	public boolean getDietMode() {
+		return _dietMode;
+	}
+	
+	public void setDietMode(boolean mode) {
+		_dietMode = mode;
+	}
+	
+	public boolean getTradeRefusal() {
+		return _tradeRefusal;
+	}
+	
+	public void setTradeRefusal(boolean mode) {
+		_tradeRefusal = mode;
+	}
+	
+	public boolean getExchangeRefusal() {
+		return _exchangeRefusal;
+	}
+	
+	public void setExchangeRefusal(boolean mode) {
+		_exchangeRefusal = mode;
+	}
+	
+	public BlockList getBlockList() {
+		return _blockList;
+	}
+	
+	public void setIsInOlympiadMode(boolean b) {
+		_inOlympiadMode = b;
+	}
+	
+	public void setIsOlympiadStart(boolean b) {
+		_OlympiadStart = b;
+	}
+	
+	public boolean isOlympiadStart() {
+		return _OlympiadStart;
+	}
+	
+	public boolean isHero() {
+		return _hero;
+	}
+	
+	public void setHero(boolean hero) {
+		if (hero && (_baseClass == _activeClass)) {
+			for (Skill skill : SkillTreesData.getInstance().getHeroSkillTree().values()) {
+				addSkill(skill, false); // Don't persist hero skills into database
+			}
+		} else {
+			for (Skill skill : SkillTreesData.getInstance().getHeroSkillTree().values()) {
+				removeSkill(skill, false, true); // Just remove skills from non-hero players
+			}
+		}
+		_hero = hero;
+		
+		sendSkillList();
+	}
+	
+	public boolean isInOlympiadMode() {
+		return _inOlympiadMode;
+	}
+	
+	@Override
+	public boolean isInDuel() {
+		return _duelState != DuelState.NO_DUEL;
+	}
+	
+	@Override
+	public int getDuelId() {
+		return _duelId;
+	}
+	
+	public DuelState getDuelState() {
+		return _duelState;
+	}
+	
+	public void setDuelState(DuelState mode) {
+		_duelState = mode;
+	}
+	
+	/**
+	 * Sets up the duel state using a non 0 duelId.
+	 * @param duelId 0=not in a duel
+	 */
+	public void setIsInDuel(int duelId) {
+		if (duelId > 0) {
+			_duelState = DuelState.DUELLING;
+			_duelId = duelId;
+		} else {
+			if (_duelState == DuelState.DEAD) {
+				enableAllSkills();
+				getStatus().startHpMpRegeneration();
+			}
+			_duelState = DuelState.NO_DUEL;
+			_duelId = 0;
+		}
+	}
+	
+	public boolean isNoble() {
+		return _noble;
+	}
+	
+	public void setNoble(boolean val) {
+		final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values();
+		if (val) {
+			for (Skill skill : nobleSkillTree) {
+				addSkill(skill, false);
+			}
+		} else {
+			for (Skill skill : nobleSkillTree) {
+				removeSkill(skill, false, true);
+			}
+		}
+		
+		_noble = val;
+		
+		sendSkillList();
+	}
+	
+	public int getLvlJoinedAcademy() {
+		return _lvlJoinedAcademy;
+	}
+	
+	public void setLvlJoinedAcademy(int lvl) {
+		_lvlJoinedAcademy = lvl;
+	}
+	
+	@Override
+	public boolean isAcademyMember() {
+		return _lvlJoinedAcademy > 0;
+	}
+	
+	@Override
+	public void setTeam(Team team) {
+		super.setTeam(team);
+		broadcastUserInfo();
+		if (hasSummon()) {
+			getSummon().broadcastStatusUpdate();
+		}
+	}
+	
+	public int getWantsPeace() {
+		return _wantsPeace;
+	}
+	
+	public void setWantsPeace(int wantsPeace) {
+		_wantsPeace = wantsPeace;
+	}
+	
+	public boolean isFishing() {
+		return _fishing;
+	}
+	
+	public void setFishing(boolean fishing) {
+		_fishing = fishing;
+	}
+	
+	public void sendSkillList() {
+		boolean isDisabled = false;
+		SkillList sl = new SkillList();
+		
+		for (Skill s : getAllSkills()) {
+			if (s == null) {
+				continue;
+			}
+			
+			if (((_transformation != null) && !s.isPassive()) || (hasTransformSkill(s.getId()) && s.isPassive())) {
+				continue;
+			}
+			if (getClan() != null) {
+				isDisabled = s.isClanSkill() && (getClan().getReputationScore() < 0);
+			}
+			
+			boolean isEnchantable = SkillData.getInstance().isEnchantable(s.getId());
+			if (isEnchantable) {
+				L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(s.getId());
+				if ((esl == null) || (s.getLevel() < esl.getBaseLevel())) {
+					isEnchantable = false;
+				}
+			}
+			
+			sl.addSkill(s.getDisplayId(), s.getDisplayLevel(), s.isPassive(), isDisabled, isEnchantable);
+		}
+		if (_transformation != null) {
+			Map<Integer, Integer> ts = new TreeMap<>();
+			
+			for (SkillHolder holder : _transformation.getTemplate(this).getSkills()) {
+				ts.putIfAbsent(holder.getSkillId(), holder.getSkillLvl());
+				
+				if (ts.get(holder.getSkillId()) < holder.getSkillLvl()) {
+					ts.put(holder.getSkillId(), holder.getSkillLvl());
+				}
+			}
+			
+			for (AdditionalSkillHolder holder : _transformation.getTemplate(this).getAdditionalSkills()) {
+				if (getLevel() >= holder.getMinLevel()) {
+					ts.putIfAbsent(holder.getSkillId(), holder.getSkillLvl());
+					if (ts.get(holder.getSkillId()) < holder.getSkillLvl()) {
+						ts.put(holder.getSkillId(), holder.getSkillLvl());
+					}
+				}
+			}
+			
+			// Add collection skills.
+			for (L2SkillLearn skill : SkillTreesData.getInstance().getCollectSkillTree().values()) {
+				if (getKnownSkill(skill.getSkillId()) != null) {
+					addTransformSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()));
+				}
+			}
+			
+			for (Entry<Integer, Integer> transformSkill : ts.entrySet()) {
+				Skill sk = SkillData.getInstance().getSkill(transformSkill.getKey(), transformSkill.getValue());
+				addTransformSkill(sk);
+				sl.addSkill(transformSkill.getKey(), transformSkill.getValue(), false, false, false);
+			}
+		}
+		sendPacket(sl);
+	}
+	
+	/**
+	 * 1. Add the specified class ID as a subclass (up to the maximum number of <b>three</b>) for this character.<BR>
+	 * 2. This method no longer changes the active _classIndex of the player. This is only done by the calling of setActiveClass() method as that should be the only way to do so.
+	 * @param classId
+	 * @param classIndex
+	 * @return boolean subclassAdded
+	 */
+	public boolean addSubClass(int classId, int classIndex) {
+		if (!_subclassLock.tryLock()) {
+			return false;
+		}
+		
+		try {
+			if ((getTotalSubClasses() == character().getMaxSubclass()) || (classIndex == 0)) {
+				return false;
+			}
+			
+			if (getSubClasses().containsKey(classIndex)) {
+				return false;
+			}
+			
+			// Note: Never change _classIndex in any method other than setActiveClass().
+			
+			SubClass newClass = new SubClass(this);
+			newClass.setClassId(classId);
+			newClass.setClassIndex(classIndex);
+			
+			if (!DAOFactory.getInstance().getSubclassDAO().insert(this, newClass)) {
+				return false;
+			}
+			
+			// Commit after database INSERT in case exception is thrown.
+			getSubClasses().put(newClass.getClassIndex(), newClass);
+			
+			final ClassId subTemplate = ClassId.getClassId(classId);
+			final Map<Integer, L2SkillLearn> skillTree = SkillTreesData.getInstance().getCompleteClassSkillTree(subTemplate);
+			final Map<Integer, Skill> prevSkillList = new HashMap<>();
+			for (L2SkillLearn skillInfo : skillTree.values()) {
+				if (skillInfo.getGetLevel() <= 40) {
+					Skill prevSkill = prevSkillList.get(skillInfo.getSkillId());
+					Skill newSkill = SkillData.getInstance().getSkill(skillInfo.getSkillId(), skillInfo.getSkillLevel());
+					
+					if ((prevSkill != null) && (prevSkill.getLevel() > newSkill.getLevel())) {
+						continue;
+					}
+					
+					prevSkillList.put(newSkill.getId(), newSkill);
+					storeSkill(newSkill, prevSkill, classIndex);
+				}
+			}
+			return true;
+		} finally {
+			_subclassLock.unlock();
+		}
+	}
+	
+	/**
+	 * 1. Completely erase all existence of the subClass linked to the classIndex.<br>
+	 * 2. Send over the newClassId to addSubClass() to create a new instance on this classIndex.<br>
+	 * 3. Upon Exception, revert the player to their BaseClass to avoid further problems.
+	 * @param classIndex the class index to delete
+	 * @param newClassId the new class Id
+	 * @return {@code true} if the sub-class was modified, {@code false} otherwise
+	 */
+	public boolean modifySubClass(int classIndex, int newClassId) {
+		if (!_subclassLock.tryLock()) {
+			return false;
+		}
+		
+		try {
+			DAOFactory.getInstance().getHennaDAO().deleteAll(this, classIndex);
+			
+			DAOFactory.getInstance().getSkillDAO().deleteAll(this, classIndex);
+			
+			DAOFactory.getInstance().getShortcutDAO().delete(this, classIndex);
+			
+			DAOFactory.getInstance().getPlayerSkillSaveDAO().delete(this, classIndex);
+			
+			DAOFactory.getInstance().getSubclassDAO().delete(this, classIndex);
+			
+			// Notify to scripts
+			int classId = getSubClasses().get(classIndex).getClassId();
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerProfessionCancel(this, classId), this);
+			
+			getSubClasses().remove(classIndex);
+		} finally {
+			_subclassLock.unlock();
+		}
+		
+		return addSubClass(newClassId, classIndex);
+	}
+	
+	public boolean isSubClassActive() {
+		return _classIndex > 0;
+	}
+	
+	public Map<Integer, SubClass> getSubClasses() {
+		if (_subClasses == null) {
+			_subClasses = new ConcurrentSkipListMap<>();
+		}
+		
+		return _subClasses;
+	}
+	
+	public int getTotalSubClasses() {
+		return getSubClasses().size();
+	}
+	
+	public int getBaseClass() {
+		return _baseClass;
+	}
+	
+	public void setBaseClass(ClassId classId) {
+		_baseClass = classId.ordinal();
+	}
+	
+	public int getActiveClass() {
+		return _activeClass;
+	}
+	
+	public void setActiveClass(int classId) {
+		_activeClass = classId;
+	}
+	
+	public int getClassIndex() {
+		return _classIndex;
+	}
+	
+	public void setClassIndex(int classIndex) {
+		_classIndex = classIndex;
+	}
+	
+	private void setClassTemplate(int classId) {
+		_activeClass = classId;
+		
+		final L2PcTemplate pcTemplate = PlayerTemplateData.getInstance().getTemplate(classId);
+		if (pcTemplate == null) {
+			LOG.error("Missing template for classId: {}", classId);
+			throw new Error();
+		}
+		// Set the template of the L2PcInstance
+		setTemplate(pcTemplate);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerProfessionChange(this, pcTemplate, isSubClassActive()), this);
+	}
+	
+	/**
+	 * Changes the character's class based on the given class index.<br>
+	 * An index of zero specifies the character's original (base) class, while indexes 1-3 specifies the character's sub-classes respectively.<br>
+	 * <font color="00FF00"/>WARNING: Use only on subclass change</font>
+	 * @param classIndex
+	 * @return
+	 */
+	public boolean changeActiveClass(int classIndex) {
+		if (!_subclassLock.tryLock()) {
+			return false;
+		}
+		
+		try {
+			// Cannot switch or change subclasses while transformed
+			if (_transformation != null) {
+				return false;
+			}
+			
+			// Remove active item skills before saving char to database
+			// because next time when choosing this class, weared items can
+			// be different
+			for (L2ItemInstance item : getInventory().getAugmentedItems()) {
+				if ((item != null) && item.isEquipped()) {
+					item.getAugmentation().removeBonus(this);
+				}
+			}
+			
+			// abort any kind of cast.
+			abortCast();
+			
+			if (isChannelized()) {
+				getSkillChannelized().abortChannelization();
+			}
+			
+			// 1. Call store() before modifying _classIndex to avoid skill effects rollover.
+			// 2. Register the correct _classId against applied 'classIndex'.
+			store(character().subclassStoreSkillCooltime());
+			
+			resetTimeStamps();
+			
+			// clear charges
+			_charges.set(0);
+			stopChargeTask();
+			
+			if (hasServitor()) {
+				getSummon().unSummon(this);
+			}
+			
+			if (classIndex == 0) {
+				setClassTemplate(getBaseClass());
+			} else {
+				try {
+					setClassTemplate(getSubClasses().get(classIndex).getClassId());
+				} catch (Exception e) {
+					LOG.warn("Could not switch {} sub class to class index {}, {}", this, classIndex, e);
+					return false;
+				}
+			}
+			
+			_classIndex = classIndex;
+			
+			setLearningClass(getClassId());
+			
+			if (isInParty()) {
+				getParty().recalculatePartyLevel();
+			}
+			
+			// Update the character's change in class status.
+			// 1. Remove any active cubics from the player.
+			// 2. Renovate the characters table in the database with the new class info, storing also buff/effect data.
+			// 3. Remove all existing skills.
+			// 4. Restore all the learned skills for the current class from the database.
+			// 5. Restore effect/buff data for the new class.
+			// 6. Restore henna data for the class, applying the new stat modifiers while removing existing ones.
+			// 7. Reset HP/MP/CP stats and send Server->Client character status packet to reflect changes.
+			// 8. Restore shortcut data related to this class.
+			// 9. Resend a class change animation effect to broadcast to all nearby players.
+			for (Skill oldSkill : getAllSkills()) {
+				removeSkill(oldSkill, false, true);
+			}
+			
+			stopAllEffectsExceptThoseThatLastThroughDeath();
+			stopAllEffectsNotStayOnSubclassChange();
+			stopCubics();
+			
+			DAOFactory.getInstance().getRecipeBookDAO().load(this, false);
+			
+			// Restore any Death Penalty Buff
+			restoreDeathPenaltyBuffLevel();
+			
+			DAOFactory.getInstance().getSkillDAO().load(this);
+			
+			rewardSkills();
+			regiveTemporarySkills();
+			
+			// Prevents some issues when changing between subclasses that shares skills
+			resetDisabledSkills();
+			
+			restoreEffects();
+			
+			sendPacket(new EtcStatusUpdate(this));
+			
+			// if player has quest 422: Repent Your Sins, remove it
+			QuestState st = getQuestState("Q00422_RepentYourSins");
+			if (st != null) {
+				st.exitQuest(true);
+			}
+			
+			for (int i = 0; i < 3; i++) {
+				_henna[i] = null;
+			}
+			
+			DAOFactory.getInstance().getHennaDAO().load(this);
+			
+			// Calculate henna modifiers of this player.
+			recalcHennaStats();
+			
+			sendPacket(new HennaInfo(this));
+			
+			if (getCurrentHp() > getMaxHp()) {
+				setCurrentHp(getMaxHp());
+			}
+			if (getCurrentMp() > getMaxMp()) {
+				setCurrentMp(getMaxMp());
+			}
+			if (getCurrentCp() > getMaxCp()) {
+				setCurrentCp(getMaxCp());
+			}
+			
+			refreshOverloaded();
+			refreshExpertisePenalty();
+			broadcastUserInfo();
+			
+			// Clear resurrect xp calculation
+			setExpBeforeDeath(0);
+			
+			_shortCuts.restoreMe();
+			sendPacket(new ShortCutInit(this));
+			
+			broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));
+			sendPacket(new SkillCoolTime(this));
+			sendPacket(new ExStorageMaxCount(this));
+			return true;
+		} finally {
+			_subclassLock.unlock();
+		}
+	}
+	
+	public boolean isLocked() {
+		return _subclassLock.isLocked();
+	}
+	
+	public void stopWarnUserTakeBreak() {
+		if (_taskWarnUserTakeBreak != null) {
+			_taskWarnUserTakeBreak.cancel(true);
+			_taskWarnUserTakeBreak = null;
+		}
+	}
+	
+	public void startWarnUserTakeBreak() {
+		if (_taskWarnUserTakeBreak == null) {
+			_taskWarnUserTakeBreak = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new WarnUserTakeBreakTask(this), 7200000, 7200000);
+		}
+	}
+	
+	public void stopRentPet() {
+		if (_taskRentPet != null) {
+			// if the rent of a wyvern expires while over a flying zone, tp to down before unmounting
+			if (checkLandingState() && (getMountType() == MountType.WYVERN)) {
+				teleToLocation(TeleportWhereType.TOWN);
+			}
+			
+			if (dismount()) // this should always be true now, since we teleported already
+			{
+				_taskRentPet.cancel(true);
+				_taskRentPet = null;
+			}
+		}
+	}
+	
+	public void startRentPet(int seconds) {
+		if (_taskRentPet == null) {
+			_taskRentPet = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RentPetTask(this), seconds * 1000L, seconds * 1000L);
+		}
+	}
+	
+	public boolean isRentedPet() {
+		if (_taskRentPet != null) {
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public void stopWaterTask() {
+		if (_taskWater != null) {
+			_taskWater.cancel(false);
+			_taskWater = null;
+			sendPacket(new SetupGauge(2, 0));
+		}
+	}
+	
+	public void startWaterTask() {
+		if (!isDead() && (_taskWater == null)) {
+			int timeinwater = (int) calcStat(Stats.BREATH, 60000, this, null);
+			
+			sendPacket(new SetupGauge(2, timeinwater));
+			_taskWater = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new WaterTask(this), timeinwater, 1000);
+		}
+	}
+	
+	public boolean isInWater() {
+		if (_taskWater != null) {
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public void checkWaterState() {
+		if (isInsideZone(ZoneId.WATER)) {
+			startWaterTask();
+		} else {
+			stopWaterTask();
+		}
+	}
+	
+	public void onPlayerEnter() {
+		startWarnUserTakeBreak();
+		
+		getHuntingSystem().onPlayerLogin();
+		
+		if (isGM()) {
+			if (isInvul()) {
+				sendMessage("Entering world in Invulnerable mode.");
+			}
+			if (isInvisible()) {
+				sendMessage("Entering world in Invisible mode.");
+			}
+			if (isSilenceMode()) {
+				sendMessage("Entering world in Silence mode.");
+			}
+		}
+		
+		revalidateZone(true);
+		
+		notifyFriends();
+		if (!canOverrideCond(PcCondOverride.SKILL_CONDITIONS) && character().decreaseSkillOnDelevel()) {
+			checkPlayerSkills();
+		}
+		
+		try {
+			for (L2ZoneType zone : ZoneManager.getInstance().getZones(this)) {
+				zone.onPlayerLoginInside(this);
+			}
+		} catch (Exception e) {
+			LOG.error("{}", e);
+		}
+		
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerLogin(this), this);
+	}
+	
+	public long getLastAccess() {
+		return _lastAccess;
+	}
+	
+	public void setLastAccess(long lastAccess) {
+		_lastAccess = lastAccess;
+	}
+	
+	@Override
+	public void doRevive() {
+		super.doRevive();
+		updateEffectIcons();
+		sendPacket(new EtcStatusUpdate(this));
+		_revivePet = false;
+		_reviveRequested = 0;
+		_revivePower = 0;
+		
+		if (isMounted()) {
+			startFeed(_mountNpcId);
+		}
+		if (isInParty() && getParty().isInDimensionalRift()) {
+			if (!DimensionalRiftManager.getInstance().checkIfInPeaceZone(getX(), getY(), getZ())) {
+				getParty().getDimensionalRift().memberResurrected(this);
+			}
+		}
+		if (getInstanceId() > 0) {
+			final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
+			if (instance != null) {
+				instance.cancelEjectDeadPlayer(this);
+			}
+		}
+	}
+	
+	@Override
+	public void setName(String value) {
+		super.setName(value);
+		if (general().cacheCharNames()) {
+			CharNameTable.getInstance().addName(this);
+		}
+	}
+	
+	@Override
+	public void doRevive(double revivePower) {
+		doRevive();
+		restoreExp(revivePower);
+	}
+	
+	public void reviveRequest(L2PcInstance reviver, Skill skill, boolean Pet, int resPower, int resRecovery) {
+		if (isResurrectionBlocked()) {
+			return;
+		}
+		
+		if (_reviveRequested == 1) {
+			if (_revivePet == Pet) {
+				reviver.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
+			} else {
+				if (Pet) {
+					reviver.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
+				} else {
+					reviver.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
+				}
+			}
+			return;
+		}
+		
+		if ((Pet && hasPet() && getSummon().isDead()) || (!Pet && isDead())) {
+			_reviveRequested = 1;
+			_reviveRecovery = resRecovery;
+			int restoreExp = 0;
+			
+			_revivePower = Formulas.calculateSkillResurrectRestorePercent(resPower, reviver);
+			restoreExp = (int) Math.round(((getExpBeforeDeath() - getExp()) * _revivePower) / 100);
+			_revivePet = Pet;
+			
+			if (hasCharmOfCourage()) {
+				ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.RESURRECT_USING_CHARM_OF_COURAGE.getId());
+				dlg.addTime(60000);
+				sendPacket(dlg);
+				return;
+			}
+			ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.RESURRECTION_REQUEST_BY_C1_FOR_S2_XP.getId());
+			dlg.addPcName(reviver);
+			dlg.addString(Integer.toString(Math.abs(restoreExp)));
+			sendPacket(dlg);
+		}
+	}
+	
+	public void reviveAnswer(int answer) {
+		if ((_reviveRequested != 1) || (!isDead() && !_revivePet) || (_revivePet && hasPet() && !getSummon().isDead())) {
+			return;
+		}
+		
+		if (answer == 1) {
+			if (!_revivePet) {
+				if (_revivePower != 0) {
+					doRevive(_revivePower);
+				} else {
+					doRevive();
+				}
+				
+				if (_reviveRecovery != 0) {
+					setCurrentHpMp(getMaxHp() * (_reviveRecovery / 100.0), getMaxMp() * (_reviveRecovery / 100.0));
+					setCurrentCp(0);
+				}
+			} else if (hasPet()) {
+				if (_revivePower != 0) {
+					getSummon().doRevive(_revivePower);
+				} else {
+					getSummon().doRevive();
+				}
+				
+				if (_reviveRecovery != 0) {
+					getSummon().setCurrentHpMp(getSummon().getMaxHp() * (_reviveRecovery / 100.0), getSummon().getMaxMp() * (_reviveRecovery / 100.0));
+				}
+			}
+		}
+		_revivePet = false;
+		_reviveRequested = 0;
+		_revivePower = 0;
+		_reviveRecovery = 0;
+	}
+	
+	public boolean isReviveRequested() {
+		return (_reviveRequested == 1);
+	}
+	
+	public boolean isRevivingPet() {
+		return _revivePet;
+	}
+	
+	public void removeReviving() {
+		_reviveRequested = 0;
+		_revivePower = 0;
+	}
+	
+	public void onActionRequest() {
+		if (isSpawnProtected()) {
+			sendPacket(SystemMessageId.YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS);
+			
+			if (character().restoreServitorOnReconnect() && !hasSummon() && CharSummonTable.getInstance().getServitors().containsKey(getObjectId())) {
+				CharSummonTable.getInstance().restoreServitor(this);
+			}
+			if (character().restorePetOnReconnect() && !hasSummon() && CharSummonTable.getInstance().getPets().containsKey(getObjectId())) {
+				CharSummonTable.getInstance().restorePet(this);
+			}
+		}
+		if (isTeleportProtected()) {
+			sendMessage("Teleport spawn protection ended.");
+		}
+		setProtection(false);
+		setTeleportProtection(false);
+	}
+	
+	/**
+	 * Expertise of the L2PcInstance (None=0, D=1, C=2, B=3, A=4, S=5, S80=6, S84=7)
+	 * @return int Expertise skill level.
+	 */
+	public int getExpertiseLevel() {
+		int level = getSkillLevel(239);
+		if (level < 0) {
+			level = 0;
+		}
+		return level;
+	}
+	
+	@Override
+	public void teleToLocation(ILocational loc, boolean allowRandomOffset) {
+		if ((getVehicle() != null) && !getVehicle().isTeleporting()) {
+			setVehicle(null);
+		}
+		
+		if (isFlyingMounted() && (loc.getZ() < -1005)) {
+			super.teleToLocation(loc.getX(), loc.getY(), -1005, loc.getHeading(), loc.getInstanceId());
+		}
+		
+		super.teleToLocation(loc, allowRandomOffset);
+	}
+	
+	@Override
+	public void onTeleported() {
+		super.onTeleported();
+		
+		if (isInAirShip()) {
+			getAirShip().sendInfo(this);
+		}
+		
+		// Force a revalidation
+		revalidateZone(true);
+		
+		checkItemRestriction();
+		
+		if ((character().getPlayerTeleportProtection() > 0) && !isInOlympiadMode()) {
+			setTeleportProtection(true);
+		}
+		
+		if (hasTamedBeasts()) {
+			for (L2TamedBeastInstance tamedBeast : _tamedBeasts) {
+				tamedBeast.deleteMe();
+			}
+			_tamedBeasts.clear();
+		}
+		
+		// Modify the position of the pet if necessary
+		final L2Summon summon = getSummon();
+		if (summon != null) {
+			summon.setFollowStatus(false);
+			summon.teleToLocation(getLocation(), false);
+			((L2SummonAI) summon.getAI()).setStartFollowController(true);
+			summon.setFollowStatus(true);
+			summon.updateAndBroadcastStatus(0);
+		}
+		
+		TvTEvent.onTeleported(this);
+	}
+	
+	@Override
+	public void setIsTeleporting(boolean teleport) {
+		setIsTeleporting(teleport, true);
+	}
+	
+	public void setIsTeleporting(boolean teleport, boolean useWatchDog) {
+		super.setIsTeleporting(teleport);
+		if (!useWatchDog) {
+			return;
+		}
+		if (teleport) {
+			if ((_teleportWatchdog == null) && (character().getTeleportWatchdogTimeout() > 0)) {
+				synchronized (this) {
+					if (_teleportWatchdog == null) {
+						_teleportWatchdog = ThreadPoolManager.getInstance().scheduleGeneral(new TeleportWatchdogTask(this), character().getTeleportWatchdogTimeout());
+					}
+				}
+			}
+		} else {
+			if (_teleportWatchdog != null) {
+				_teleportWatchdog.cancel(false);
+				_teleportWatchdog = null;
+			}
+		}
+	}
+	
+	public void setLastServerPosition(int x, int y, int z) {
+		_lastServerPosition.setXYZ(x, y, z);
+	}
+	
+	public Location getLastServerPosition() {
+		return _lastServerPosition;
+	}
+	
+	public int getLastServerDistance(int x, int y, int z) {
+		return (int) Util.calculateDistance(x, y, z, _lastServerPosition.getX(), _lastServerPosition.getY(), _lastServerPosition.getZ(), true, false);
+	}
+	
+	@Override
+	public void reduceCurrentHp(double value, L2Character attacker, boolean awake, boolean isDOT, Skill skill) {
+		getStatus().reduceHp(value, attacker, awake, isDOT, false, false);
+		
+		// notify the tamed beast of attacks
+		if (hasTamedBeasts()) {
+			for (L2TamedBeastInstance tamedBeast : _tamedBeasts) {
+				tamedBeast.onOwnerGotAttacked(attacker);
+			}
+		}
+	}
+	
+	public void broadcastSnoop(int type, String name, String _text) {
+		if (!_snoopListener.isEmpty()) {
+			Snoop sn = new Snoop(getObjectId(), getName(), type, name, _text);
+			
+			for (L2PcInstance pci : _snoopListener) {
+				if (pci != null) {
+					pci.sendPacket(sn);
+				}
+			}
+		}
+	}
+	
+	public void addSnooper(L2PcInstance pci) {
+		_snoopListener.add(pci);
+	}
+	
+	public void removeSnooper(L2PcInstance pci) {
+		_snoopListener.remove(pci);
+	}
+	
+	public void addSnooped(L2PcInstance pci) {
+		_snoopedPlayer.add(pci);
+	}
+	
+	public void removeSnooped(L2PcInstance pci) {
+		_snoopedPlayer.remove(pci);
+	}
+	
+	public void addHtmlAction(HtmlActionScope scope, String action) {
+		_htmlActionCaches[scope.ordinal()].add(action);
+	}
+	
+	public void clearHtmlActions(HtmlActionScope scope) {
+		_htmlActionCaches[scope.ordinal()].clear();
+	}
+	
+	public void setHtmlActionOriginObjectId(HtmlActionScope scope, int npcObjId) {
+		if (npcObjId < 0) {
+			throw new IllegalArgumentException();
+		}
+		
+		_htmlActionOriginObjectIds[scope.ordinal()] = npcObjId;
+	}
+	
+	public int getLastHtmlActionOriginId() {
+		return _lastHtmlActionOriginObjId;
+	}
+	
+	private boolean validateHtmlAction(Iterable<String> actionIter, String action) {
+		for (String cachedAction : actionIter) {
+			if (cachedAction.charAt(cachedAction.length() - 1) == AbstractHtmlPacket.VAR_PARAM_START_CHAR) {
+				if (action.startsWith(cachedAction.substring(0, cachedAction.length() - 1).trim())) {
+					return true;
+				}
+			} else if (cachedAction.equals(action)) {
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Check if the HTML action was sent in a HTML packet.<br>
+	 * If the HTML action was not sent for whatever reason, -1 is returned.<br>
+	 * Otherwise, the NPC object ID or 0 is returned.<br>
+	 * 0 means the HTML action was not bound to an NPC<br>
+	 * and no range checks need to be made.
+	 * @param action the HTML action to check
+	 * @return NPC object ID, 0 or -1
+	 */
+	public int validateHtmlAction(String action) {
+		for (int i = 0; i < _htmlActionCaches.length; ++i) {
+			if ((_htmlActionCaches[i] != null) && validateHtmlAction(_htmlActionCaches[i], action)) {
+				_lastHtmlActionOriginObjId = _htmlActionOriginObjectIds[i];
+				return _lastHtmlActionOriginObjId;
+			}
+		}
+		
+		return -1;
+	}
+	
+	/**
+	 * Performs following tests:
+	 * <ul>
+	 * <li>Inventory contains item</li>
+	 * <li>Item owner id == owner id</li>
+	 * <li>It isn't pet control item while mounting pet or pet summoned</li>
+	 * <li>It isn't active enchant item</li>
+	 * <li>It isn't cursed weapon/item</li>
+	 * <li>It isn't wear item</li>
+	 * </ul>
+	 * @param objectId item object id
+	 * @param action just for login purpose
+	 * @return
+	 */
+	public boolean validateItemManipulation(int objectId, String action) {
+		L2ItemInstance item = getInventory().getItemByObjectId(objectId);
+		
+		if ((item == null) || (item.getOwnerId() != getObjectId())) {
+			LOG.info("{} tried to {} item he is not owner of", this, action);
+			return false;
+		}
+		
+		// Pet is summoned and not the item that summoned the pet AND not the buggle from strider you're mounting
+		if ((hasSummon() && (getSummon().getControlObjectId() == objectId)) || (getMountObjectID() == objectId)) {
+			if (general().debug()) {
+				LOG.debug("{} tried to {} item controling pet", this, action);
+			}
+			
+			return false;
+		}
+		
+		if (getActiveEnchantItemId() == objectId) {
+			if (general().debug()) {
+				LOG.debug("{} tried to {} an enchant scroll he was using", this, action);
+			}
+			return false;
+		}
+		
+		if (CursedWeaponsManager.getInstance().isCursed(item.getId())) {
+			// can not trade a cursed weapon
+			return false;
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * @return Returns the inBoat.
+	 */
+	public boolean isInBoat() {
+		return (_vehicle != null) && _vehicle.isBoat();
+	}
+	
+	/**
+	 * @return
+	 */
+	public L2BoatInstance getBoat() {
+		return (L2BoatInstance) _vehicle;
+	}
+	
+	/**
+	 * @return Returns the inAirShip.
+	 */
+	public boolean isInAirShip() {
+		return (_vehicle != null) && _vehicle.isAirShip();
+	}
+	
+	/**
+	 * @return
+	 */
+	public L2AirShipInstance getAirShip() {
+		return (L2AirShipInstance) _vehicle;
+	}
+	
+	public L2Vehicle getVehicle() {
+		return _vehicle;
+	}
+	
+	public void setVehicle(L2Vehicle v) {
+		if ((v == null) && (_vehicle != null)) {
+			_vehicle.removePassenger(this);
+		}
+		
+		_vehicle = v;
+	}
+	
+	public boolean isInVehicle() {
+		return _vehicle != null;
+	}
+	
+	public boolean isInCrystallize() {
+		return _inCrystallize;
+	}
+	
+	public void setInCrystallize(boolean inCrystallize) {
+		_inCrystallize = inCrystallize;
+	}
+	
+	/**
+	 * @return
+	 */
+	public Location getInVehiclePosition() {
+		return _inVehiclePosition;
+	}
+	
+	public void setInVehiclePosition(Location pt) {
+		_inVehiclePosition = pt;
+	}
+	
+	/**
+	 * Manage the delete task of a L2PcInstance (Leave Party, Unsummon pet, Save its inventory in the database, Remove it from the world...).<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>If the L2PcInstance is in observer mode, set its position to its position before entering in observer mode</li>
+	 * <li>Set the online Flag to True or False and update the characters table of the database with online status and lastAccess</li>
+	 * <li>Stop the HP/MP/CP Regeneration task</li>
+	 * <li>Cancel Crafting, Attak or Cast</li>
+	 * <li>Remove the L2PcInstance from the world</li>
+	 * <li>Stop Party and Unsummon Pet</li>
+	 * <li>Update database with items in its inventory and remove them from the world</li>
+	 * <li>Remove all L2Object from _knownObjects and _knownPlayer of the L2Character then cancel Attak or Cast and notify AI</li>
+	 * <li>Close the connection with the client</li>
+	 * </ul>
+	 */
+	@Override
+	public boolean deleteMe() {
+		cleanup();
+		storeMe();
+		return super.deleteMe();
+	}
+	
+	private synchronized void cleanup() {
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerLogout(this), this);
+		
+		try {
+			for (L2ZoneType zone : ZoneManager.getInstance().getZones(this)) {
+				zone.onPlayerLogoutInside(this);
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout)
+		try {
+			if (!isOnline()) {
+				LOG.error("deleteMe() called on offline {}", this);
+			}
+			setOnlineStatus(false, true);
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		try {
+			if (general().enableBlockCheckerEvent() && (getBlockCheckerArena() != -1)) {
+				HandysBlockCheckerManager.getInstance().onDisconnect(this);
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		try {
+			_isOnline = false;
+			abortAttack();
+			abortCast();
+			stopMove(null);
+			setDebug(null);
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// remove combat flag
+		try {
+			if (getInventory().getItemByItemId(9819) != null) {
+				Fort fort = FortManager.getInstance().getFort(this);
+				if (fort != null) {
+					FortSiegeManager.getInstance().dropCombatFlag(this, fort.getResidenceId());
+				} else {
+					int slot = getInventory().getSlotFromItem(getInventory().getItemByItemId(9819));
+					getInventory().unEquipItemInBodySlot(slot);
+					destroyItem("CombatFlag", getInventory().getItemByItemId(9819), null, true);
+				}
+			} else if (isCombatFlagEquipped()) {
+				TerritoryWarManager.getInstance().dropCombatFlag(this, false, false);
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		try {
+			PartyMatchWaitingList.getInstance().removePlayer(this);
+			if (_partyroom != 0) {
+				PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(_partyroom);
+				if (room != null) {
+					room.deleteMember(this);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		try {
+			if (isFlying()) {
+				removeSkill(SkillData.getInstance().getSkill(4289, 1));
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// Recommendations must be saved before task (timer) is canceled
+		try {
+			getRecSystem().store();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		// Stop the HP/MP/CP Regeneration task (scheduled tasks)
+		try {
+			stopAllTimers();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		try {
+			setIsTeleporting(false);
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// Stop crafting, if in progress
+		try {
+			RecipeController.getInstance().requestMakeItemAbort(this);
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// Cancel Attak or Cast
+		try {
+			setTarget(null);
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		if (isChannelized()) {
+			getSkillChannelized().abortChannelization();
+		}
+		
+		// Hunting System
+		getHuntingSystem().onPlayerLogout();
+		
+		// Stop all toggles.
+		getEffectList().stopAllToggles();
+		
+		// Remove from world regions zones
+		final L2WorldRegion oldRegion = getWorldRegion();
+		if (oldRegion != null) {
+			oldRegion.removeFromZones(this);
+		}
+		
+		// Remove the L2PcInstance from the world
+		try {
+			decayMe();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// If a Party is in progress, leave it (and festival party)
+		if (isInParty()) {
+			try {
+				leaveParty();
+			} catch (Exception e) {
+				LOG.error("deleteMe() {}", e);
+			}
+		}
+		
+		if (OlympiadManager.getInstance().isRegistered(this) || (getOlympiadGameId() != -1)) {
+			OlympiadManager.getInstance().removeDisconnectedCompetitor(this);
+		}
+		
+		// If the L2PcInstance has Pet, unsummon it
+		if (hasSummon()) {
+			try {
+				getSummon().setRestoreSummon(true);
+				
+				getSummon().unSummon(this);
+				// Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline)
+				if (hasSummon()) {
+					getSummon().broadcastNpcInfo(0);
+				}
+			} catch (Exception e) {
+				LOG.error("deleteMe() {}", e);
+			} // returns pet to control item
+		}
+		
+		if (getClan() != null) {
+			// set the status for pledge member list to OFFLINE
+			try {
+				L2ClanMember clanMember = getClan().getClanMember(getObjectId());
+				if (clanMember != null) {
+					clanMember.setPlayerInstance(null);
+				}
+				
+			} catch (Exception e) {
+				LOG.error("deleteMe() {}", e);
+			}
+		}
+		
+		if (getActiveRequester() != null) {
+			// deals with sudden exit in the middle of transaction
+			setActiveRequester(null);
+			cancelActiveTrade();
+		}
+		
+		// If the L2PcInstance is a GM, remove it from the GM List
+		if (isGM()) {
+			try {
+				AdminData.getInstance().deleteGm(this);
+			} catch (Exception e) {
+				LOG.error("deleteMe() {}", e);
+			}
+		}
+		
+		try {
+			// Check if the L2PcInstance is in observer mode to set its position to its position
+			// before entering in observer mode
+			if (inObserverMode()) {
+				setLocationInvisible(_lastLoc);
+			}
+			
+			if (getVehicle() != null) {
+				getVehicle().oustPlayer(this);
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// remove player from instance and set spawn location if any
+		try {
+			final int instanceId = getInstanceId();
+			if ((instanceId != 0) && !general().restorePlayerInstance()) {
+				final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+				if (inst != null) {
+					inst.removePlayer(getObjectId());
+					final Location loc = inst.getExitLoc();
+					if (loc != null) {
+						final int x = loc.getX() + Rnd.get(-30, 30);
+						final int y = loc.getY() + Rnd.get(-30, 30);
+						setXYZInvisible(x, y, loc.getZ());
+						if (hasSummon()) // dead pet
+						{
+							getSummon().teleToLocation(loc, true);
+							getSummon().setInstanceId(0);
+						}
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// TvT Event removal
+		try {
+			TvTEvent.onLogout(this);
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// Update database with items in its inventory and remove them from the world
+		try {
+			getInventory().deleteMe();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		// Update database with items in its warehouse and remove them from the world
+		try {
+			clearWarehouse();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		if (general().warehouseCache()) {
+			WarehouseCacheManager.getInstance().remCacheTask(this);
+		}
+		
+		try {
+			getFreight().deleteMe();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		try {
+			clearRefund();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		if (isCursedWeaponEquipped()) {
+			try {
+				CursedWeaponsManager.getInstance().getCursedWeapon(_cursedWeaponEquippedId).setPlayer(null);
+			} catch (Exception e) {
+				LOG.error("deleteMe() {}", e);
+			}
+		}
+		
+		// Remove all L2Object from _knownObjects and _knownPlayer of the L2Character then cancel Attak or Cast and notify AI
+		try {
+			getKnownList().removeAllKnownObjects();
+		} catch (Exception e) {
+			LOG.error("deleteMe() {}", e);
+		}
+		
+		if (getClanId() > 0) {
+			getClan().broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(this), this);
+			// ClanTable.getInstance().getClan(getClanId()).broadcastToOnlineMembers(new PledgeShowMemberListAdd(this));
+		}
+		
+		for (L2PcInstance player : _snoopedPlayer) {
+			player.removeSnooper(this);
+		}
+		
+		for (L2PcInstance player : _snoopListener) {
+			player.removeSnooped(this);
+		}
+		
+		// Remove L2Object object from _allObjects of L2World
+		L2World.getInstance().removeObject(this);
+		L2World.getInstance().removeFromAllPlayers(this);
+		
+		try {
+			notifyFriends();
+			getBlockList().playerLogout();
+		} catch (Exception e) {
+			LOG.error("Exception on deleteMe() notifyFriends: {}", e);
+		}
+	}
+	
+	// startFishing() was stripped of any pre-fishing related checks, namely the fishing zone check.
+	// Also worthy of note is the fact the code to find the hook landing position was also striped.
+	// The stripped code was moved into fishing.java.
+	// In my opinion it makes more sense for it to be there since all other skill related checks were also there.
+	// Last but not least, moving the zone check there, fixed a bug where baits would always be consumed no matter if fishing actually took place.
+	// startFishing() now takes up 3 arguments, which are accurately described as being the hook landing coordinates.
+	public void startFishing(int _x, int _y, int _z) {
+		stopMove(null);
+		setIsImmobilized(true);
+		_fishing = true;
+		_fishx = _x;
+		_fishy = _y;
+		_fishz = _z;
+		// broadcastUserInfo();
+		// Starts fishing
+		int lvl = getRandomFishLvl();
+		int grade = getRandomFishGrade();
+		int group = getRandomFishGroup(grade);
+		List<L2Fish> fish = FishData.getInstance().getFish(lvl, group, grade);
+		if ((fish == null) || fish.isEmpty()) {
+			sendMessage("Error - Fish are not defined");
+			endFishing(false);
+			return;
+		}
+		// Use a copy constructor else the fish data may be over-written below
+		_fish = fish.get(Rnd.get(fish.size())).clone();
+		fish.clear();
+		sendPacket(SystemMessageId.CAST_LINE_AND_START_FISHING);
+		if (!GameTimeController.getInstance().isNight() && _lure.isNightLure()) {
+			_fish.setFishGroup(-1);
+		}
+		// sendMessage("Hook x,y: " + _x + "," + _y + " - Water Z, Player Z:" + _z + ", " + getZ()); //debug line, uncomment to show coordinates used in fishing.
+		broadcastPacket(new ExFishingStart(this, _fish.getFishGroup(), _x, _y, _z, _lure.isNightLure()));
+		sendPacket(Music.SF_P_01.getPacket());
+		startLookingForFishTask();
+	}
+	
+	public void stopLookingForFishTask() {
+		if (_taskforfish != null) {
+			_taskforfish.cancel(false);
+			_taskforfish = null;
+		}
+	}
+	
+	public void startLookingForFishTask() {
+		if (!isDead() && (_taskforfish == null)) {
+			int checkDelay = 0;
+			boolean isNoob = false;
+			boolean isUpperGrade = false;
+			
+			if (_lure != null) {
+				int lureid = _lure.getId();
+				isNoob = _fish.getFishGrade() == 0;
+				isUpperGrade = _fish.getFishGrade() == 2;
+				if ((lureid == 6519) || (lureid == 6522) || (lureid == 6525) || (lureid == 8505) || (lureid == 8508) || (lureid == 8511)) {
+					checkDelay = _fish.getGutsCheckTime() * 133;
+				} else if ((lureid == 6520) || (lureid == 6523) || (lureid == 6526) || ((lureid >= 8505) && (lureid <= 8513)) || ((lureid >= 7610) && (lureid <= 7613)) || ((lureid >= 7807) && (lureid <= 7809)) || ((lureid >= 8484) && (lureid <= 8486))) {
+					checkDelay = _fish.getGutsCheckTime() * 100;
+				} else if ((lureid == 6521) || (lureid == 6524) || (lureid == 6527) || (lureid == 8507) || (lureid == 8510) || (lureid == 8513)) {
+					checkDelay = _fish.getGutsCheckTime() * 66;
+				}
+			}
+			_taskforfish = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new LookingForFishTask(this, _fish.getStartCombatTime(), _fish.getFishGuts(), _fish.getFishGroup(), isNoob, isUpperGrade), 10000, checkDelay);
+		}
+	}
+	
+	private int getRandomFishGrade() {
+		return switch (_lure.getId()) {
+			case 7807: // green for beginners
+			case 7808: // purple for beginners
+			case 7809: // yellow for beginners
+			case 8486: // prize-winning for beginners
+				yield 0;
+			case 8485: // prize-winning luminous
+			case 8506: // green luminous
+			case 8509: // purple luminous
+			case 8512: // yellow luminous
+				yield 2;
+			default:
+				yield 1;
+		};
+	}
+	
+	private int getRandomFishGroup(int group) {
+		int check = Rnd.get(100);
+		int type = 1;
+		switch (group) {
+			case 0: // fish for novices
+				switch (_lure.getId()) {
+					case 7807: // green lure, preferred by fast-moving (nimble) fish (type 5)
+						if (check <= 54) {
+							type = 5;
+						} else if (check <= 77) {
+							type = 4;
+						} else {
+							type = 6;
+						}
+						break;
+					case 7808: // purple lure, preferred by fat fish (type 4)
+						if (check <= 54) {
+							type = 4;
+						} else if (check <= 77) {
+							type = 6;
+						} else {
+							type = 5;
+						}
+						break;
+					case 7809: // yellow lure, preferred by ugly fish (type 6)
+						if (check <= 54) {
+							type = 6;
+						} else if (check <= 77) {
+							type = 5;
+						} else {
+							type = 4;
+						}
+						break;
+					case 8486: // prize-winning fishing lure for beginners
+						if (check <= 33) {
+							type = 4;
+						} else if (check <= 66) {
+							type = 5;
+						} else {
+							type = 6;
+						}
+						break;
+				}
+				break;
+			case 1: // normal fish
+				switch (_lure.getId()) {
+					case 7610:
+					case 7611:
+					case 7612:
+					case 7613:
+						type = 3;
+						break;
+					case 6519: // all theese lures (green) are prefered by fast-moving (nimble) fish (type 1)
+					case 8505:
+					case 6520:
+					case 6521:
+					case 8507:
+						if (check <= 54) {
+							type = 1;
+						} else if (check <= 74) {
+							type = 0;
+						} else if (check <= 94) {
+							type = 2;
+						} else {
+							type = 3;
+						}
+						break;
+					case 6522: // all these lures (purple) are preferred by fat fish (type 0)
+					case 8508:
+					case 6523:
+					case 6524:
+					case 8510:
+						if (check <= 54) {
+							type = 0;
+						} else if (check <= 74) {
+							type = 1;
+						} else if (check <= 94) {
+							type = 2;
+						} else {
+							type = 3;
+						}
+						break;
+					case 6525: // all these lures (yellow) are preferred by ugly fish (type 2)
+					case 8511:
+					case 6526:
+					case 6527:
+					case 8513:
+						if (check <= 55) {
+							type = 2;
+						} else if (check <= 74) {
+							type = 1;
+						} else if (check <= 94) {
+							type = 0;
+						} else {
+							type = 3;
+						}
+						break;
+					case 8484: // prize-winning fishing lure
+						if (check <= 33) {
+							type = 0;
+						} else if (check <= 66) {
+							type = 1;
+						} else {
+							type = 2;
+						}
+						break;
+				}
+				break;
+			case 2: // upper grade fish, luminous lure
+				switch (_lure.getId()) {
+					case 8506: // green lure, preferred by fast-moving (nimble) fish (type 8)
+						if (check <= 54) {
+							type = 8;
+						} else if (check <= 77) {
+							type = 7;
+						} else {
+							type = 9;
+						}
+						break;
+					case 8509: // purple lure, preferred by fat fish (type 7)
+						if (check <= 54) {
+							type = 7;
+						} else if (check <= 77) {
+							type = 9;
+						} else {
+							type = 8;
+						}
+						break;
+					case 8512: // yellow lure, preferred by ugly fish (type 9)
+						if (check <= 54) {
+							type = 9;
+						} else if (check <= 77) {
+							type = 8;
+						} else {
+							type = 7;
+						}
+						break;
+					case 8485: // prize-winning fishing lure
+						if (check <= 33) {
+							type = 7;
+						} else if (check <= 66) {
+							type = 8;
+						} else {
+							type = 9;
+						}
+						break;
+				}
+		}
+		return type;
+	}
+	
+	private int getRandomFishLvl() {
+		int skilllvl = getSkillLevel(1315);
+		final BuffInfo info = getEffectList().getBuffInfoBySkillId(2274);
+		if (info != null) {
+			// TODO (Adry_85): Unhardcode
+			skilllvl = 0;
+			switch (info.getSkill().getLevel()) {
+				case 1 -> skilllvl = 2;
+				case 2 -> skilllvl = 5;
+				case 3 -> skilllvl = 8;
+				case 4 -> skilllvl = 11;
+				case 5 -> skilllvl = 14;
+				case 6 -> skilllvl = 17;
+				case 7 -> skilllvl = 20;
+				case 8 -> skilllvl = 23;
+			}
+		}
+		if (skilllvl <= 0) {
+			return 1;
+		}
+		int randomlvl;
+		int check = Rnd.get(100);
+		
+		if (check <= 50) {
+			randomlvl = skilllvl;
+		} else if (check <= 85) {
+			randomlvl = skilllvl - 1;
+			if (randomlvl <= 0) {
+				randomlvl = 1;
+			}
+		} else {
+			randomlvl = skilllvl + 1;
+			if (randomlvl > 27) {
+				randomlvl = 27;
+			}
+		}
+		
+		return randomlvl;
+	}
+	
+	public void startFishCombat(boolean isNoob, boolean isUpperGrade) {
+		_fishCombat = new L2Fishing(this, _fish, isNoob, isUpperGrade);
+	}
+	
+	public void endFishing(boolean win) {
+		_fishing = false;
+		_fishx = 0;
+		_fishy = 0;
+		_fishz = 0;
+		// broadcastUserInfo();
+		if (_fishCombat == null) {
+			sendPacket(SystemMessageId.BAIT_LOST_FISH_GOT_AWAY);
+		}
+		_fishCombat = null;
+		_lure = null;
+		// Ends fishing
+		broadcastPacket(new ExFishingEnd(win, this));
+		sendPacket(SystemMessageId.REEL_LINE_AND_STOP_FISHING);
+		setIsImmobilized(false);
+		stopLookingForFishTask();
+	}
+	
+	public L2Fishing getFishCombat() {
+		return _fishCombat;
+	}
+	
+	public int getFishx() {
+		return _fishx;
+	}
+	
+	public int getFishy() {
+		return _fishy;
+	}
+	
+	public int getFishz() {
+		return _fishz;
+	}
+	
+	public L2ItemInstance getLure() {
+		return _lure;
+	}
+	
+	public void setLure(L2ItemInstance lure) {
+		_lure = lure;
+	}
+	
+	public int getInventoryLimit() {
+		int ivlim;
+		if (isGM()) {
+			ivlim = character().getMaximumSlotsForGMPlayer();
+		} else if (getRace() == Race.DWARF) {
+			ivlim = character().getMaximumSlotsForDwarf();
+		} else {
+			ivlim = character().getMaximumSlotsForNoDwarf();
+		}
+		ivlim += (int) getStat().calcStat(Stats.INV_LIM, 0, null, null);
+		
+		return ivlim;
+	}
+	
+	public int getWareHouseLimit() {
+		int whlim;
+		if (getRace() == Race.DWARF) {
+			whlim = character().getMaximumWarehouseSlotsForDwarf();
+		} else {
+			whlim = character().getMaximumWarehouseSlotsForNoDwarf();
+		}
+		
+		whlim += (int) getStat().calcStat(Stats.WH_LIM, 0, null, null);
+		
+		return whlim;
+	}
+	
+	public int getPrivateSellStoreLimit() {
+		int pslim;
+		
+		if (getRace() == Race.DWARF) {
+			pslim = character().getMaxPvtStoreSellSlotsDwarf();
+		} else {
+			pslim = character().getMaxPvtStoreSellSlotsOther();
+		}
+		
+		pslim += (int) getStat().calcStat(Stats.P_SELL_LIM, 0, null, null);
+		
+		return pslim;
+	}
+	
+	public int getPrivateBuyStoreLimit() {
+		int pblim;
+		
+		if (getRace() == Race.DWARF) {
+			pblim = character().getMaxPvtStoreBuySlotsDwarf();
+		} else {
+			pblim = character().getMaxPvtStoreBuySlotsOther();
+		}
+		pblim += (int) getStat().calcStat(Stats.P_BUY_LIM, 0, null, null);
+		
+		return pblim;
+	}
+	
+	public int getDwarfRecipeLimit() {
+		int recdlim = character().getDwarfRecipeLimit();
+		recdlim += (int) getStat().calcStat(Stats.REC_D_LIM, 0, null, null);
+		return recdlim;
+	}
+	
+	public int getCommonRecipeLimit() {
+		int recclim = character().getCommonRecipeLimit();
+		recclim += (int) getStat().calcStat(Stats.REC_C_LIM, 0, null, null);
+		return recclim;
+	}
+	
+	public int getMountNpcId() {
+		return _mountNpcId;
+	}
+	
+	public int getMountLevel() {
+		return _mountLevel;
+	}
+	
+	public int getMountObjectID() {
+		return _mountObjectID;
+	}
+	
+	public void setMountObjectID(int newID) {
+		_mountObjectID = newID;
+	}
+	
+	/**
+	 * @return the current skill in use or return null.
+	 */
+	public SkillUseHolder getCurrentSkill() {
+		return _currentSkill;
+	}
+	
+	/**
+	 * Create a new SkillDat object and set the player _currentSkill.
+	 * @param currentSkill
+	 * @param ctrlPressed
+	 * @param shiftPressed
+	 */
+	public void setCurrentSkill(Skill currentSkill, boolean ctrlPressed, boolean shiftPressed) {
+		if (currentSkill == null) {
+			_currentSkill = null;
+			return;
+		}
+		_currentSkill = new SkillUseHolder(currentSkill, ctrlPressed, shiftPressed);
+	}
+	
+	/**
+	 * @return the current pet skill in use or return null.
+	 */
+	public SkillUseHolder getCurrentPetSkill() {
+		return _currentPetSkill;
+	}
+	
+	/**
+	 * Create a new SkillDat object and set the player _currentPetSkill.
+	 * @param currentSkill
+	 * @param ctrlPressed
+	 * @param shiftPressed
+	 */
+	public void setCurrentPetSkill(Skill currentSkill, boolean ctrlPressed, boolean shiftPressed) {
+		if (currentSkill == null) {
+			_currentPetSkill = null;
+			return;
+		}
+		_currentPetSkill = new SkillUseHolder(currentSkill, ctrlPressed, shiftPressed);
+	}
+	
+	public SkillUseHolder getQueuedSkill() {
+		return _queuedSkill;
+	}
+	
+	/**
+	 * Create a new SkillDat object and queue it in the player _queuedSkill.
+	 * @param queuedSkill
+	 * @param ctrlPressed
+	 * @param shiftPressed
+	 */
+	public void setQueuedSkill(Skill queuedSkill, boolean ctrlPressed, boolean shiftPressed) {
+		if (queuedSkill == null) {
+			_queuedSkill = null;
+			return;
+		}
+		_queuedSkill = new SkillUseHolder(queuedSkill, ctrlPressed, shiftPressed);
+	}
+	
+	/**
+	 * @return {@code true} if player is jailed, {@code false} otherwise.
+	 */
+	public boolean isJailed() {
+		return PunishmentManager.getInstance().hasPunishment(getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL) || PunishmentManager.getInstance().hasPunishment(getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.JAIL)
+			|| PunishmentManager.getInstance().hasPunishment(getIPAddress(), PunishmentAffect.IP, PunishmentType.JAIL);
+	}
+	
+	/**
+	 * @return {@code true} if player is chat banned, {@code false} otherwise.
+	 */
+	public boolean isChatBanned() {
+		return PunishmentManager.getInstance().hasPunishment(getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN) || PunishmentManager.getInstance().hasPunishment(getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.CHAT_BAN)
+			|| PunishmentManager.getInstance().hasPunishment(getIPAddress(), PunishmentAffect.IP, PunishmentType.CHAT_BAN);
+	}
+	
+	public void startFameTask(long delay, int fameFixRate) {
+		if ((getLevel() < 40) || (getClassId().level() < 2)) {
+			return;
+		}
+		if (_fameTask == null) {
+			_fameTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FameTask(this, fameFixRate), delay, delay);
+		}
+	}
+	
+	public void stopFameTask() {
+		if (_fameTask != null) {
+			_fameTask.cancel(false);
+			_fameTask = null;
+		}
+	}
+	
+	public void startVitalityTask() {
+		if (vitality().enabled() && (_vitalityTask == null)) {
+			_vitalityTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new VitalityTask(this), 1000, 60000);
+		}
+	}
+	
+	public void stopVitalityTask() {
+		if (_vitalityTask != null) {
+			_vitalityTask.cancel(false);
+			_vitalityTask = null;
+		}
+	}
+	
+	public int getPowerGrade() {
+		return _powerGrade;
+	}
+	
+	public void setPowerGrade(int power) {
+		_powerGrade = power;
+	}
+	
+	public boolean isCursedWeaponEquipped() {
+		return _cursedWeaponEquippedId != 0;
+	}
+	
+	public int getCursedWeaponEquippedId() {
+		return _cursedWeaponEquippedId;
+	}
+	
+	public void setCursedWeaponEquippedId(int value) {
+		_cursedWeaponEquippedId = value;
+	}
+	
+	public boolean isCombatFlagEquipped() {
+		return _combatFlagEquippedId;
+	}
+	
+	public void setCombatFlagEquipped(boolean value) {
+		_combatFlagEquippedId = value;
+	}
+	
+	/**
+	 * Returns the Number of Souls this L2PcInstance got.
+	 * @return
+	 */
+	public int getChargedSouls() {
+		return _souls;
+	}
+	
+	/**
+	 * Increase Souls
+	 * @param count
+	 */
+	public void increaseSouls(int count) {
+		_souls += count;
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SOUL_HAS_INCREASED_BY_S1_SO_IT_IS_NOW_AT_S2);
+		sm.addInt(count);
+		sm.addInt(_souls);
+		sendPacket(sm);
+		restartSoulTask();
+		sendPacket(new EtcStatusUpdate(this));
+	}
+	
+	/**
+	 * Decreases existing Souls.
+	 * @param count
+	 * @return consumed souls count
+	 */
+	public int decreaseSouls(int count) {
+		if (_souls == 0) {
+			return 0;
+		}
+		
+		int consumedSouls;
+		if (_souls <= count) {
+			consumedSouls = _souls;
+			_souls = 0;
+			stopSoulTask();
+		} else {
+			_souls -= count;
+			consumedSouls = count;
+			restartSoulTask();
+		}
+		
+		sendPacket(new EtcStatusUpdate(this));
+		return consumedSouls;
+	}
+	
+	/**
+	 * Clear out all Souls from this L2PcInstance
+	 */
+	public void clearSouls() {
+		_souls = 0;
+		stopSoulTask();
+		sendPacket(new EtcStatusUpdate(this));
+	}
+	
+	/**
+	 * Starts/Restarts the SoulTask to Clear Souls after 10 Mins.
+	 */
+	private void restartSoulTask() {
+		if (_soulTask != null) {
+			_soulTask.cancel(false);
+			_soulTask = null;
+		}
+		_soulTask = ThreadPoolManager.getInstance().scheduleGeneral(new ResetSoulsTask(this), 600000);
+		
+	}
+	
+	/**
+	 * Stops the Clearing Task.
+	 */
+	public void stopSoulTask() {
+		if (_soulTask != null) {
+			_soulTask.cancel(false);
+			_soulTask = null;
+		}
+	}
+	
+	public int getDeathPenaltyBuffLevel() {
+		return _deathPenaltyBuffLevel;
+	}
+	
+	public void setDeathPenaltyBuffLevel(int level) {
+		_deathPenaltyBuffLevel = level;
+	}
+	
+	public void calculateDeathPenaltyBuffLevel(L2Character killer) {
+		if (killer == null) {
+			LOG.warn("{} called calculateDeathPenaltyBuffLevel with killer null!", this);
+			return;
+		}
+		
+		if (isResurrectSpecialAffected() || isLucky() || isBlockedFromDeathPenalty() || isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE) || canOverrideCond(PcCondOverride.DEATH_PENALTY)) {
+			return;
+		}
+		double percent = 1.0;
+		
+		if (killer.isRaid()) {
+			percent *= calcStat(Stats.REDUCE_DEATH_PENALTY_BY_RAID, 1);
+		} else if (killer.isMonster()) {
+			percent *= calcStat(Stats.REDUCE_DEATH_PENALTY_BY_MOB, 1);
+		} else if (killer.isPlayable()) {
+			percent *= calcStat(Stats.REDUCE_DEATH_PENALTY_BY_PVP, 1);
+		}
+		
+		if (Rnd.get(1, 100) <= (character().getDeathPenaltyChance() * percent)) {
+			if (!killer.isPlayable() || (getKarma() > 0)) {
+				increaseDeathPenaltyBuffLevel();
+			}
+		}
+	}
+	
+	public void increaseDeathPenaltyBuffLevel() {
+		if (getDeathPenaltyBuffLevel() >= 15) {
+			return;
+		}
+		
+		if (getDeathPenaltyBuffLevel() != 0) {
+			Skill skill = SkillData.getInstance().getSkill(5076, getDeathPenaltyBuffLevel());
+			
+			if (skill != null) {
+				removeSkill(skill, true);
+			}
+		}
+		_deathPenaltyBuffLevel++;
+		addSkill(SkillData.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false);
+		sendPacket(new EtcStatusUpdate(this));
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DEATH_PENALTY_LEVEL_S1_ADDED);
+		sm.addInt(getDeathPenaltyBuffLevel());
+		sendPacket(sm);
+	}
+	
+	public void reduceDeathPenaltyBuffLevel() {
+		if (getDeathPenaltyBuffLevel() <= 0) {
+			return;
+		}
+		
+		Skill skill = SkillData.getInstance().getSkill(5076, getDeathPenaltyBuffLevel());
+		
+		if (skill != null) {
+			removeSkill(skill, true);
+		}
+		
+		_deathPenaltyBuffLevel--;
+		
+		if (getDeathPenaltyBuffLevel() > 0) {
+			addSkill(SkillData.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false);
+			sendPacket(new EtcStatusUpdate(this));
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DEATH_PENALTY_LEVEL_S1_ADDED);
+			sm.addInt(getDeathPenaltyBuffLevel());
+			sendPacket(sm);
+		} else {
+			sendPacket(new EtcStatusUpdate(this));
+			sendPacket(SystemMessageId.DEATH_PENALTY_LIFTED);
+		}
+	}
+	
+	public void restoreDeathPenaltyBuffLevel() {
+		if (getDeathPenaltyBuffLevel() > 0) {
+			addSkill(SkillData.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false);
+		}
+	}
+	
+	@Override
+	public L2PcInstance getActingPlayer() {
+		return this;
+	}
+	
+	@Override
+	public int getMaxLoad() {
+		return (int) calcStat(Stats.WEIGHT_LIMIT, Math.floor(BaseStats.CON.calcBonus(this) * 69000 * character().getWeightLimit()), this, null);
+	}
+	
+	@Override
+	public int getBonusWeightPenalty() {
+		return (int) calcStat(Stats.WEIGHT_PENALTY, 1, this, null);
+	}
+	
+	@Override
+	public int getCurrentLoad() {
+		return getInventory().getTotalWeight();
+	}
+	
+	@Override
+	public void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss) {
+		// Check if hit is missed
+		if (miss) {
+			if (target.isPlayer()) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_EVADED_C2_ATTACK);
+				sm.addPcName(target.getActingPlayer());
+				sm.addCharName(this);
+				target.sendPacket(sm);
+			}
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ATTACK_WENT_ASTRAY);
+			sm.addPcName(this);
+			sendPacket(sm);
+			return;
+		}
+		
+		// Check if hit is critical
+		if (pcrit) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAD_CRITICAL_HIT);
+			sm.addPcName(this);
+			sendPacket(sm);
+		}
+		if (mcrit) {
+			sendPacket(SystemMessageId.CRITICAL_HIT_MAGIC);
+		}
+		
+		if (isInOlympiadMode() && target.isPlayer() && target.getActingPlayer().isInOlympiadMode() && (target.getActingPlayer().getOlympiadGameId() == getOlympiadGameId())) {
+			OlympiadGameManager.getInstance().notifyCompetitorDamage(this, damage);
+		}
+		
+		final SystemMessage sm;
+		
+		if ((target.isInvul() || target.isHpBlocked()) && !target.isNpc()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ATTACK_WAS_BLOCKED);
+		} else if (target.isDoor() || (target instanceof L2ControlTowerInstance)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DID_S1_DMG);
+			sm.addInt(damage);
+		} else {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
+			sm.addPcName(this);
+			sm.addCharName(target);
+			sm.addInt(damage);
+		}
+		sendPacket(sm);
+	}
+	
+	public int getAgathionId() {
+		return _agathionId;
+	}
+	
+	public void setAgathionId(int npcId) {
+		_agathionId = npcId;
+	}
+	
+	public int getVitalityPoints() {
+		return getStat().getVitalityPoints();
+	}
+	
+	public int getVitalityLevel() {
+		return getStat().getVitalityLevel();
+	}
+	
+	public void setVitalityPoints(int points, boolean quiet) {
+		getStat().setVitalityPoints(points, quiet);
+	}
+	
+	public void updateVitalityPoints(float points, boolean useRates, boolean quiet) {
+		getStat().updateVitalityPoints(points, useRates, quiet);
+	}
+	
+	public void checkItemRestriction() {
+		for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) {
+			L2ItemInstance equippedItem = getInventory().getPaperdollItem(i);
+			if ((equippedItem != null) && !equippedItem.getItem().checkCondition(this, this, false)) {
+				getInventory().unEquipItemInSlot(i);
+				
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addModifiedItem(equippedItem);
+				sendPacket(iu);
+				
+				SystemMessage sm = null;
+				if (equippedItem.getItem().getBodyPart() == L2Item.SLOT_BACK) {
+					sendPacket(SystemMessageId.CLOAK_REMOVED_BECAUSE_ARMOR_SET_REMOVED);
+					return;
+				}
+				
+				if (equippedItem.getEnchantLevel() > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+					sm.addInt(equippedItem.getEnchantLevel());
+					sm.addItemName(equippedItem);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+					sm.addItemName(equippedItem);
+				}
+				sendPacket(sm);
+			}
+		}
+	}
+	
+	public void addTransformSkill(Skill sk) {
+		if (_transformSkills == null) {
+			synchronized (this) {
+				if (_transformSkills == null) {
+					_transformSkills = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		_transformSkills.put(sk.getId(), sk);
+		if (sk.isPassive()) {
+			addSkill(sk, false);
+		}
+	}
+	
+	public Skill getTransformSkill(int id) {
+		if (_transformSkills == null) {
+			return null;
+		}
+		return _transformSkills.get(id);
+	}
+	
+	public boolean hasTransformSkill(int id) {
+		if (_transformSkills == null) {
+			return false;
+		}
+		return _transformSkills.containsKey(id);
+	}
+	
+	public void removeAllTransformSkills() {
+		_transformSkills = null;
+	}
+	
+	protected void startFeed(int npcId) {
+		_canFeed = npcId > 0;
+		if (!isMounted()) {
+			return;
+		}
+		if (hasSummon()) {
+			setCurrentFeed(((L2PetInstance) getSummon()).getCurrentFed());
+			_controlItemId = getSummon().getControlObjectId();
+			sendPacket(new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume()));
+			if (!isDead()) {
+				_mountFeedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PetFeedTask(this), 10000, 10000);
+			}
+		} else if (_canFeed) {
+			setCurrentFeed(getMaxFeed());
+			SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
+			sendPacket(sg);
+			if (!isDead()) {
+				_mountFeedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new PetFeedTask(this), 10000, 10000);
+			}
+		}
+	}
+	
+	public void stopFeed() {
+		if (_mountFeedTask != null) {
+			_mountFeedTask.cancel(false);
+			_mountFeedTask = null;
+		}
+	}
+	
+	private L2PetLevelData getPetLevelData(int npcId) {
+		if (_leveldata == null) {
+			_leveldata = PetDataTable.getInstance().getPetData(npcId).getPetLevelData(getMountLevel());
+		}
+		return _leveldata;
+	}
+	
+	public int getCurrentFeed() {
+		return _curFeed;
+	}
+	
+	public void setCurrentFeed(int num) {
+		boolean lastHungryState = isHungry();
+		_curFeed = num > getMaxFeed() ? getMaxFeed() : num;
+		SetupGauge sg = new SetupGauge(3, (getCurrentFeed() * 10000) / getFeedConsume(), (getMaxFeed() * 10000) / getFeedConsume());
+		sendPacket(sg);
+		// broadcast move speed change when strider becomes hungry / full
+		if (lastHungryState != isHungry()) {
+			broadcastUserInfo();
+		}
+	}
+	
+	public int getFeedConsume() {
+		// if pet is attacking
+		if (isAttackingNow()) {
+			return getPetLevelData(_mountNpcId).getPetFeedBattle();
+		}
+		return getPetLevelData(_mountNpcId).getPetFeedNormal();
+	}
+	
+	private int getMaxFeed() {
+		return getPetLevelData(_mountNpcId).getPetMaxFeed();
+	}
+	
+	public boolean isHungry() {
+		return _canFeed ? (getCurrentFeed() < ((PetDataTable.getInstance().getPetData(getMountNpcId()).getHungryLimit() / 100f) * getPetLevelData(getMountNpcId()).getPetMaxFeed())) : false;
+	}
+	
+	public void enteredNoLanding(int delay) {
+		_dismountTask = ThreadPoolManager.getInstance().scheduleGeneral(new DismountTask(this), delay * 1000);
+	}
+	
+	public void exitedNoLanding() {
+		if (_dismountTask != null) {
+			_dismountTask.cancel(true);
+			_dismountTask = null;
+		}
+	}
+	
+	public void setIsInSiege(boolean b) {
+		_isInSiege = b;
+	}
+	
+	public boolean isInSiege() {
+		return _isInSiege;
+	}
+	
+	/**
+	 * @param isInHideoutSiege sets the value of {@link #_isInHideoutSiege}.
+	 */
+	public void setIsInHideoutSiege(boolean isInHideoutSiege) {
+		_isInHideoutSiege = isInHideoutSiege;
+	}
+	
+	/**
+	 * @return the value of {@link #_isInHideoutSiege}, {@code true} if the player is participing on a Hideout Siege, otherwise {@code false}.
+	 */
+	public boolean isInHideoutSiege() {
+		return _isInHideoutSiege;
+	}
+	
+	public FloodProtectors getFloodProtectors() {
+		return getClient().getFloodProtectors();
+	}
+	
+	public boolean isFlyingMounted() {
+		return (isTransformed() && (getTransformation().isFlying()));
+	}
+	
+	/**
+	 * Returns the Number of Charges this L2PcInstance got.
+	 * @return
+	 */
+	public int getCharges() {
+		return _charges.get();
+	}
+	
+	public void increaseCharges(int count, int max) {
+		if (_charges.get() >= max) {
+			sendPacket(SystemMessageId.FORCE_MAXLEVEL_REACHED);
+			return;
+		}
+		
+		// Charge clear task should be reset every time a charge is increased.
+		restartChargeTask();
+		
+		if (_charges.addAndGet(count) >= max) {
+			_charges.set(max);
+			sendPacket(SystemMessageId.FORCE_MAXLEVEL_REACHED);
+		} else {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FORCE_INCREASED_TO_S1);
+			sm.addInt(_charges.get());
+			sendPacket(sm);
+		}
+		
+		sendPacket(new EtcStatusUpdate(this));
+	}
+	
+	public boolean decreaseCharges(int count) {
+		if (_charges.get() < count) {
+			return false;
+		}
+		
+		// Charge clear task should be reset every time a charge is decreased and stopped when charges become 0.
+		if (_charges.addAndGet(-count) == 0) {
+			stopChargeTask();
+		} else {
+			restartChargeTask();
+		}
+		
+		sendPacket(new EtcStatusUpdate(this));
+		return true;
+	}
+	
+	public void clearCharges() {
+		_charges.set(0);
+		sendPacket(new EtcStatusUpdate(this));
+	}
+	
+	/**
+	 * Starts/Restarts the ChargeTask to Clear Charges after 10 Mins.
+	 */
+	private void restartChargeTask() {
+		if (_chargeTask != null) {
+			synchronized (this) {
+				if (_chargeTask != null) {
+					_chargeTask.cancel(false);
+				}
+			}
+		}
+		_chargeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ResetChargesTask(this), 600000);
+	}
+	
+	/**
+	 * Stops the Charges Clearing Task.
+	 */
+	public void stopChargeTask() {
+		if (_chargeTask != null) {
+			_chargeTask.cancel(false);
+			_chargeTask = null;
+		}
+	}
+	
+	public void teleportBookmarkModify(int id, int icon, String tag, String name) {
+		final TeleportBookmark bookmark = _tpbookmarks.get(id);
+		if (bookmark != null) {
+			bookmark.setIcon(icon);
+			bookmark.setTag(tag);
+			bookmark.setName(name);
+			
+			DAOFactory.getInstance().getTeleportBookmarkDAO().update(this, id, icon, tag, name);
+		}
+		
+		sendPacket(new ExGetBookMarkInfoPacket(this));
+	}
+	
+	public void teleportBookmarkDelete(int id) {
+		if (_tpbookmarks.remove(id) != null) {
+			sendPacket(new ExGetBookMarkInfoPacket(this));
+			
+			DAOFactory.getInstance().getTeleportBookmarkDAO().delete(this, id);
+		}
+	}
+	
+	public void teleportBookmarkGo(int id) {
+		if (!teleportBookmarkCondition(0)) {
+			return;
+		}
+		if (getInventory().getInventoryItemCount(13016, 0) == 0) {
+			sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM);
+			return;
+		}
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+		sm.addItemName(13016);
+		sendPacket(sm);
+		
+		final TeleportBookmark bookmark = _tpbookmarks.get(id);
+		if (bookmark != null) {
+			destroyItem("Consume", getInventory().getItemByItemId(13016).getObjectId(), 1, null, false);
+			teleToLocation(bookmark, false);
+		}
+		sendPacket(new ExGetBookMarkInfoPacket(this));
+	}
+	
+	public boolean teleportBookmarkCondition(int type) {
+		if (isInCombat()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE);
+			return false;
+		} else if (isInSiege() || (getSiegeState() != 0)) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING);
+			return false;
+		} else if (isInDuel()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL);
+			return false;
+		} else if (isFlying()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING);
+			return false;
+		} else if (isInOlympiadMode()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH);
+			return false;
+		} else if (isStunned()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_PARALYZED);
+			return false;
+		} else if (isDead()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_DEAD);
+			return false;
+		} else if ((type == 1) && (isIn7sDungeon() || (isInParty() && getParty().isInDimensionalRift()))) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA);
+			return false;
+		} else if (isInWater()) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_UNDERWATER);
+			return false;
+		} else if ((type == 1) && (isInsideZone(ZoneId.SIEGE) || isInsideZone(ZoneId.CLAN_HALL) || isInsideZone(ZoneId.JAIL) || isInsideZone(ZoneId.CASTLE) || isInsideZone(ZoneId.NO_SUMMON_FRIEND) || isInsideZone(ZoneId.FORT))) {
+			sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA);
+			return false;
+		} else if (isInsideZone(ZoneId.NO_BOOKMARK) || isInBoat() || isInAirShip()) {
+			if (type == 0) {
+				sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_IN_THIS_AREA);
+			} else if (type == 1) {
+				sendPacket(SystemMessageId.YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA);
+			}
+			return false;
+		}
+		/*
+		 * TODO: Instant Zone still not implemented else if (isInsideZone(ZoneId.INSTANT)) { sendPacket(SystemMessage.getSystemMessage(2357)); return; }
+		 */
+		else {
+			return true;
+		}
+	}
+	
+	public void teleportBookmarkAdd(int x, int y, int z, int icon, String tag, String name) {
+		if (!teleportBookmarkCondition(1)) {
+			return;
+		}
+		
+		if (_tpbookmarks.size() >= _bookmarkslot) {
+			sendPacket(SystemMessageId.YOU_HAVE_NO_SPACE_TO_SAVE_THE_TELEPORT_LOCATION);
+			return;
+		}
+		
+		if (getInventory().getInventoryItemCount(20033, 0) == 0) {
+			sendPacket(SystemMessageId.YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG);
+			return;
+		}
+		
+		int id;
+		for (id = 1; id <= _bookmarkslot; ++id) {
+			if (!_tpbookmarks.containsKey(id)) {
+				break;
+			}
+		}
+		_tpbookmarks.put(id, new TeleportBookmark(id, x, y, z, icon, tag, name));
+		
+		destroyItem("Consume", getInventory().getItemByItemId(20033).getObjectId(), 1, null, false);
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+		sm.addItemName(20033);
+		sendPacket(sm);
+		
+		sendPacket(new ExGetBookMarkInfoPacket(this));
+		
+		DAOFactory.getInstance().getTeleportBookmarkDAO().insert(this, id, x, y, z, icon, tag, name);
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		if (isInBoat()) {
+			setXYZ(getBoat().getLocation());
+			
+			activeChar.sendPacket(new CharInfo(this));
+			activeChar.sendPacket(new ExBrExtraUserInfo(this));
+			int relation1 = getRelation(activeChar);
+			int relation2 = activeChar.getRelation(this);
+			Integer oldrelation = getKnownList().getKnownRelations().get(activeChar.getObjectId());
+			if ((oldrelation != null) && (oldrelation != relation1)) {
+				activeChar.sendPacket(new RelationChanged(this, relation1, isAutoAttackable(activeChar)));
+				if (hasSummon()) {
+					activeChar.sendPacket(new RelationChanged(getSummon(), relation1, isAutoAttackable(activeChar)));
+				}
+			}
+			oldrelation = activeChar.getKnownList().getKnownRelations().get(getObjectId());
+			if ((oldrelation != null) && (oldrelation != relation2)) {
+				sendPacket(new RelationChanged(activeChar, relation2, activeChar.isAutoAttackable(this)));
+				if (activeChar.hasSummon()) {
+					sendPacket(new RelationChanged(activeChar.getSummon(), relation2, activeChar.isAutoAttackable(this)));
+				}
+			}
+			activeChar.sendPacket(new GetOnVehicle(getObjectId(), getBoat().getObjectId(), getInVehiclePosition()));
+		} else if (isInAirShip()) {
+			setXYZ(getAirShip().getLocation());
+			activeChar.sendPacket(new CharInfo(this));
+			activeChar.sendPacket(new ExBrExtraUserInfo(this));
+			int relation1 = getRelation(activeChar);
+			int relation2 = activeChar.getRelation(this);
+			Integer oldrelation = getKnownList().getKnownRelations().get(activeChar.getObjectId());
+			if ((oldrelation != null) && (oldrelation != relation1)) {
+				activeChar.sendPacket(new RelationChanged(this, relation1, isAutoAttackable(activeChar)));
+				if (hasSummon()) {
+					activeChar.sendPacket(new RelationChanged(getSummon(), relation1, isAutoAttackable(activeChar)));
+				}
+			}
+			oldrelation = activeChar.getKnownList().getKnownRelations().get(getObjectId());
+			if ((oldrelation != null) && (oldrelation != relation2)) {
+				sendPacket(new RelationChanged(activeChar, relation2, activeChar.isAutoAttackable(this)));
+				if (activeChar.hasSummon()) {
+					sendPacket(new RelationChanged(activeChar.getSummon(), relation2, activeChar.isAutoAttackable(this)));
+				}
+			}
+			activeChar.sendPacket(new ExGetOnAirShip(this, getAirShip()));
+		} else {
+			activeChar.sendPacket(new CharInfo(this));
+			activeChar.sendPacket(new ExBrExtraUserInfo(this));
+			int relation1 = getRelation(activeChar);
+			int relation2 = activeChar.getRelation(this);
+			Integer oldrelation = getKnownList().getKnownRelations().get(activeChar.getObjectId());
+			if ((oldrelation != null) && (oldrelation != relation1)) {
+				activeChar.sendPacket(new RelationChanged(this, relation1, isAutoAttackable(activeChar)));
+				if (hasSummon()) {
+					activeChar.sendPacket(new RelationChanged(getSummon(), relation1, isAutoAttackable(activeChar)));
+				}
+			}
+			oldrelation = activeChar.getKnownList().getKnownRelations().get(getObjectId());
+			if ((oldrelation != null) && (oldrelation != relation2)) {
+				sendPacket(new RelationChanged(activeChar, relation2, activeChar.isAutoAttackable(this)));
+				if (activeChar.hasSummon()) {
+					sendPacket(new RelationChanged(activeChar.getSummon(), relation2, activeChar.isAutoAttackable(this)));
+				}
+			}
+		}
+		
+		switch (getPrivateStoreType()) {
+			case SELL -> activeChar.sendPacket(new PrivateStoreMsgSell(this));
+			case PACKAGE_SELL -> activeChar.sendPacket(new ExPrivateStoreSetWholeMsg(this));
+			case BUY -> activeChar.sendPacket(new PrivateStoreMsgBuy(this));
+			case MANUFACTURE -> activeChar.sendPacket(new RecipeShopMsg(this));
+		}
+		if (isTransformed()) {
+			// Required double send for fix Mounted H5+
+			sendPacket(new CharInfo(activeChar));
+		}
+	}
+	
+	public void showQuestMovie(int id) {
+		if (_movieId > 0) {
+			return;
+		}
+		abortAttack();
+		abortCast();
+		stopMove(null);
+		_movieId = id;
+		sendPacket(new ExStartScenePlayer(id));
+	}
+	
+	public boolean isAllowedToEnchantSkills() {
+		if (isLocked()) {
+			return false;
+		}
+		if (isTransformed() || isInStance()) {
+			return false;
+		}
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(this)) {
+			return false;
+		}
+		if (isCastingNow() || isCastingSimultaneouslyNow()) {
+			return false;
+		}
+		if (isInBoat() || isInAirShip()) {
+			return false;
+		}
+		return true;
+	}
+	
+	/**
+	 * @return the _createDate of the L2PcInstance.
+	 */
+	public Calendar getCreateDate() {
+		return _createDate;
+	}
+	
+	/**
+	 * Set the _createDate of the L2PcInstance.
+	 * @param createDate
+	 */
+	public void setCreateDate(Calendar createDate) {
+		_createDate = createDate;
+	}
+	
+	/**
+	 * @return number of days to char birthday.
+	 */
+	public int checkBirthDay() {
+		Calendar now = Calendar.getInstance();
+		
+		// "Characters with a February 29 creation date will receive a gift on February 28."
+		if ((_createDate.get(Calendar.DAY_OF_MONTH) == 29) && (_createDate.get(Calendar.MONTH) == 1)) {
+			_createDate.add(Calendar.HOUR_OF_DAY, -24);
+		}
+		
+		if ((now.get(Calendar.MONTH) == _createDate.get(Calendar.MONTH)) && (now.get(Calendar.DAY_OF_MONTH) == _createDate.get(Calendar.DAY_OF_MONTH)) && (now.get(Calendar.YEAR) != _createDate.get(Calendar.YEAR))) {
+			return 0;
+		}
+		
+		int i;
+		for (i = 1; i < 6; i++) {
+			now.add(Calendar.HOUR_OF_DAY, 24);
+			if ((now.get(Calendar.MONTH) == _createDate.get(Calendar.MONTH)) && (now.get(Calendar.DAY_OF_MONTH) == _createDate.get(Calendar.DAY_OF_MONTH)) && (now.get(Calendar.YEAR) != _createDate.get(Calendar.YEAR))) {
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	public Set<Integer> getFriends() {
+		if (_friends == null) {
+			synchronized (this) {
+				if (_friends == null) {
+					_friends = ConcurrentHashMap.newKeySet(1);
+				}
+			}
+		}
+		return _friends;
+	}
+	
+	public boolean hasFriends() {
+		return (_friends != null) && !_friends.isEmpty();
+	}
+	
+	public boolean isFriend(int objectId) {
+		return hasFriends() && _friends.contains(objectId);
+	}
+	
+	public void addFriend(int objectId) {
+		getFriends().add(objectId);
+	}
+	
+	public void removeFriend(int objectId) {
+		if (hasFriends()) {
+			_friends.remove(objectId);
+		}
+	}
+	
+	private void notifyFriends() {
+		if (hasFriends()) {
+			final FriendStatusPacket pkt = new FriendStatusPacket(getObjectId());
+			for (int id : _friends) {
+				final L2PcInstance friend = L2World.getInstance().getPlayer(id);
+				if (friend != null) {
+					friend.sendPacket(pkt);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Verify if this player is in silence mode.
+	 * @return the {@code true} if this player is in silence mode, {@code false} otherwise
+	 */
+	public boolean isSilenceMode() {
+		return _silenceMode;
+	}
+	
+	/**
+	 * Set the silence mode.
+	 * @param mode the value
+	 */
+	public void setSilenceMode(boolean mode) {
+		_silenceMode = mode;
+		if (_silenceModeExcluded != null) {
+			_silenceModeExcluded.clear(); // Clear the excluded list on each setSilenceMode
+		}
+		sendPacket(new EtcStatusUpdate(this));
+	}
+	
+	/**
+	 * While at silenceMode, checks if this player blocks PMs for this user
+	 * @param playerObjId the player object Id
+	 * @return {@code true} if the given Id is not excluded and this player is in silence mode, {@code false} otherwise
+	 */
+	public boolean isSilenceMode(int playerObjId) {
+		if (character().silenceModeExclude() && _silenceMode && (_silenceModeExcluded != null)) {
+			return !_silenceModeExcluded.contains(playerObjId);
+		}
+		return _silenceMode;
+	}
+	
+	/**
+	 * Add a player to the "excluded silence mode" list.
+	 * @param playerObjId the player's object Id
+	 */
+	public void addSilenceModeExcluded(int playerObjId) {
+		if (_silenceModeExcluded == null) {
+			_silenceModeExcluded = new ArrayList<>(1);
+		}
+		_silenceModeExcluded.add(playerObjId);
+	}
+	
+	public double getCollisionRadius() {
+		if (isMounted() && (getMountNpcId() > 0)) {
+			return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionRadius();
+		} else if (isTransformed()) {
+			return getTransformation().getCollisionRadius(this);
+		}
+		return getAppearance().getSex() ? getBaseTemplate().getFCollisionRadiusFemale() : getBaseTemplate().getfCollisionRadius();
+	}
+	
+	public double getCollisionHeight() {
+		if (isMounted() && (getMountNpcId() > 0)) {
+			return NpcData.getInstance().getTemplate(getMountNpcId()).getfCollisionHeight();
+		} else if (isTransformed()) {
+			return getTransformation().getCollisionHeight(this);
+		}
+		return getAppearance().getSex() ? getBaseTemplate().getFCollisionHeightFemale() : getBaseTemplate().getfCollisionHeight();
+	}
+	
+	public int getClientX() {
+		return _clientX;
+	}
+	
+	public void setClientX(int val) {
+		_clientX = val;
+	}
+	
+	public int getClientY() {
+		return _clientY;
+	}
+	
+	public void setClientY(int val) {
+		_clientY = val;
+	}
+	
+	public int getClientZ() {
+		return _clientZ;
+	}
+	
+	public void setClientZ(int val) {
+		_clientZ = val;
+	}
+	
+	public int getClientHeading() {
+		return _clientHeading;
+	}
+	
+	public void setClientHeading(int val) {
+		_clientHeading = val;
+	}
+	
+	/**
+	 * @param z
+	 * @return true if character falling now on the start of fall return false for correct coord sync!
+	 */
+	public boolean isFalling(int z) {
+		if (isDead() || isFlying() || isFlyingMounted() || isInsideZone(ZoneId.WATER)) {
+			return false;
+		}
+		
+		if (System.currentTimeMillis() < _fallingTimestamp) {
+			return true;
+		}
+		
+		final int deltaZ = getZ() - z;
+		if (deltaZ <= getBaseTemplate().getSafeFallHeight()) {
+			return false;
+		}
+		
+		// If there is no geodata loaded for the place we are client Z correction might cause falling damage.
+		if (!GeoData.getInstance().hasGeo(getX(), getY())) {
+			return false;
+		}
+		
+		final int damage = (int) Formulas.calcFallDam(this, deltaZ);
+		if (damage > 0) {
+			reduceCurrentHp(Math.min(damage, getCurrentHp() - 1), null, false, true, null);
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FALL_DAMAGE_S1);
+			sm.addInt(damage);
+			sendPacket(sm);
+		}
+		
+		setFalling();
+		
+		return false;
+	}
+	
+	/**
+	 * Set falling timestamp
+	 */
+	public void setFalling() {
+		_fallingTimestamp = System.currentTimeMillis() + FALLING_VALIDATION_DELAY;
+	}
+	
+	/**
+	 * @return the _movieId
+	 */
+	public int getMovieId() {
+		return _movieId;
+	}
+	
+	public void setMovieId(int id) {
+		_movieId = id;
+	}
+	
+	/**
+	 * Update last item auction request timestamp to current
+	 */
+	public void updateLastItemAuctionRequest() {
+		_lastItemAuctionInfoRequest = System.currentTimeMillis();
+	}
+	
+	/**
+	 * @return true if receiving item auction requests<br>
+	 *         (last request was in 2 seconds before)
+	 */
+	public boolean isItemAuctionPolling() {
+		return (System.currentTimeMillis() - _lastItemAuctionInfoRequest) < 2000;
+	}
+	
+	@Override
+	public boolean isMovementDisabled() {
+		return super.isMovementDisabled() || (_movieId > 0);
+	}
+	
+	private void restoreUISettings() {
+		_uiKeySettings = new UIKeysSettings(getObjectId());
+	}
+	
+	private void storeUISettings() {
+		if (_uiKeySettings == null) {
+			return;
+		}
+		
+		if (!_uiKeySettings.isSaved()) {
+			_uiKeySettings.saveInDB();
+		}
+	}
+	
+	public UIKeysSettings getUISettings() {
+		return _uiKeySettings;
+	}
+	
+	public String getHtmlPrefix() {
+		if (!customs().multiLangEnable()) {
+			return null;
+		}
+		return _htmlPrefix;
+	}
+	
+	public String getLang() {
+		return _lang;
+	}
+	
+	public boolean setLang(String lang) {
+		boolean result = false;
+		if (customs().multiLangEnable()) {
+			if (customs().getMultiLangAllowed().contains(lang)) {
+				_lang = lang;
+				result = true;
+			} else {
+				_lang = customs().getMultiLangDefault();
+			}
+			
+			_htmlPrefix = "data/lang/" + _lang + "/";
+		} else {
+			_lang = null;
+			_htmlPrefix = null;
+		}
+		
+		return result;
+	}
+	
+	public long getOfflineStartTime() {
+		return _offlineShopStart;
+	}
+	
+	public void setOfflineStartTime(long time) {
+		_offlineShopStart = time;
+	}
+	
+	/**
+	 * Remove player from BossZones (used on char logout/exit)
+	 */
+	public void removeFromBossZone() {
+		try {
+			for (L2BossZone zone : GrandBossManager.getInstance().getZones().values()) {
+				zone.removePlayer(this);
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception on removeFromBossZone(): {}", e);
+		}
+	}
+	
+	/**
+	 * Check all player skills for skill level. If player level is lower than skill learn level - 9, skill level is decreased to next possible level.
+	 */
+	public void checkPlayerSkills() {
+		for (Entry<Integer, Skill> e : getSkills().entrySet()) {
+			final L2SkillLearn learn = SkillTreesData.getInstance().getClassSkill(e.getKey(), e.getValue().getLevel() % 100, getClassId());
+			if (learn != null) {
+				int lvlDiff = e.getKey() == CommonSkill.EXPERTISE.getId() ? 0 : 9;
+				if (getLevel() < (learn.getGetLevel() - lvlDiff)) {
+					deacreaseSkillLevel(e.getValue(), lvlDiff);
+				}
+			}
+		}
+	}
+	
+	private void deacreaseSkillLevel(Skill skill, int lvlDiff) {
+		int nextLevel = -1;
+		final Map<Integer, L2SkillLearn> skillTree = SkillTreesData.getInstance().getCompleteClassSkillTree(getClassId());
+		for (L2SkillLearn sl : skillTree.values()) {
+			if ((sl.getSkillId() == skill.getId()) && (nextLevel < sl.getSkillLevel()) && (getLevel() >= (sl.getGetLevel() - lvlDiff))) {
+				nextLevel = sl.getSkillLevel(); // next possible skill level
+			}
+		}
+		
+		if (nextLevel == -1) {
+			LOG.info("Removing {}, from {}", skill, this);
+			removeSkill(skill, true); // there is no lower skill
+		} else {
+			LOG.info("Decreasing {} to {} for {}", skill, nextLevel, this);
+			addSkill(SkillData.getInstance().getSkill(skill.getId(), nextLevel), true); // replace with lower one
+		}
+	}
+	
+	public boolean canMakeSocialAction() {
+		return ((getPrivateStoreType() == PrivateStoreType.NONE) && (getActiveRequester() == null) && !isAlikeDead() && !isAllSkillsDisabled() && !isCastingNow() && !isCastingSimultaneouslyNow() && (getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE));
+	}
+	
+	public void setMultiSocialAction(int id, int targetId) {
+		_multiSociaAction = id;
+		_multiSocialTarget = targetId;
+	}
+	
+	public int getMultiSociaAction() {
+		return _multiSociaAction;
+	}
+	
+	public int getMultiSocialTarget() {
+		return _multiSocialTarget;
+	}
+	
+	public Collection<TeleportBookmark> getTeleportBookmarks() {
+		return _tpbookmarks.values();
+	}
+	
+	public int getBookmarkslot() {
+		return _bookmarkslot;
+	}
+	
+	public int getQuestInventoryLimit() {
+		return character().getMaximumSlotsForQuestItems();
+	}
+	
+	public boolean canAttackCharacter(L2Character cha) {
+		if (cha instanceof L2Attackable) {
+			return true;
+		} else if (cha instanceof L2Playable) {
+			if (cha.isInsideZone(ZoneId.PVP) && !cha.isInsideZone(ZoneId.SIEGE)) {
+				return true;
+			}
+			
+			L2PcInstance target;
+			if (cha instanceof L2Summon) {
+				target = ((L2Summon) cha).getOwner();
+			} else {
+				target = (L2PcInstance) cha;
+			}
+			
+			if (isInDuel() && target.isInDuel() && (target.getDuelId() == getDuelId())) {
+				return true;
+			} else if (isInParty() && target.isInParty()) {
+				if (getParty() == target.getParty()) {
+					return false;
+				}
+				if (((getParty().getCommandChannel() != null) || (target.getParty().getCommandChannel() != null)) && (getParty().getCommandChannel() == target.getParty().getCommandChannel())) {
+					return false;
+				}
+			} else if ((getClan() != null) && (target.getClan() != null)) {
+				if (getClanId() == target.getClanId()) {
+					return false;
+				}
+				if (((getAllyId() > 0) || (target.getAllyId() > 0)) && (getAllyId() == target.getAllyId())) {
+					return false;
+				}
+				if (getClan().isAtWarWith(target.getClan().getId()) && target.getClan().isAtWarWith(getClan().getId())) {
+					return true;
+				}
+			} else if ((getClan() == null) || (target.getClan() == null)) {
+				if ((target.getPvpFlag() == 0) && (target.getKarma() == 0)) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Test if player inventory is under 90% capaity
+	 * @param includeQuestInv check also quest inventory
+	 * @return
+	 */
+	public boolean isInventoryUnder90(boolean includeQuestInv) {
+		return (getInventory().getSize(includeQuestInv) <= (getInventoryLimit() * 0.9));
+	}
+	
+	public boolean havePetInvItems() {
+		return _petItems;
+	}
+	
+	public void setPetInvItems(boolean haveit) {
+		_petItems = haveit;
+	}
+	
+	public String getAdminConfirmCmd() {
+		return _adminConfirmCmd;
+	}
+	
+	public void setAdminConfirmCmd(String adminConfirmCmd) {
+		_adminConfirmCmd = adminConfirmCmd;
+	}
+	
+	public int getBlockCheckerArena() {
+		return _handysBlockCheckerEventArena;
+	}
+	
+	public void setBlockCheckerArena(byte arena) {
+		_handysBlockCheckerEventArena = arena;
+	}
+	
+	/**
+	 * @return the hunting system controller for this player
+	 */
+	public HuntingSystem getHuntingSystem() {
+		return _huntingSystem;
+	}
+	
+	/**
+	 * @return the recommendation system controller for this player
+	 */
+	public RecommendationSystem getRecSystem() {
+		return _recSystem;
+	}
+	
+	public boolean hasAbnormalType(AbnormalType at) {
+		return getEffectList().getBuffInfoByAbnormalType(at) != null;
+	}
+	
+	public boolean hasAbnormalTypeVote() {
+		return hasAbnormalType(AbnormalType.VOTE);
+	}
+	
+	public String getLastPetitionGmName() {
+		return _lastPetitionGmName;
+	}
+	
+	public void setLastPetitionGmName(String gmName) {
+		_lastPetitionGmName = gmName;
+	}
+	
+	public L2ContactList getContactList() {
+		return _contactList;
+	}
+	
+	public void setEventStatus() {
+		eventStatus = new PlayerEventHolder(this);
+	}
+	
+	public PlayerEventHolder getEventStatus() {
+		return eventStatus;
+	}
+	
+	public void setEventStatus(PlayerEventHolder pes) {
+		eventStatus = pes;
+	}
+	
+	public long getNotMoveUntil() {
+		return _notMoveUntil;
+	}
+	
+	public void updateNotMoveUntil() {
+		_notMoveUntil = System.currentTimeMillis() + SECONDS.toMillis(character().getNpcTalkBlockingTime());
+	}
+	
+	@Override
+	public boolean isPlayer() {
+		return true;
+	}
+	
+	@Override
+	public boolean isChargedShot(ShotType type) {
+		final L2ItemInstance weapon = getActiveWeaponInstance();
+		return (weapon != null) && weapon.isChargedShot(type);
+	}
+	
+	@Override
+	public void setChargedShot(ShotType type, boolean charged) {
+		final L2ItemInstance weapon = getActiveWeaponInstance();
+		if (weapon != null) {
+			weapon.setChargedShot(type, charged);
+		}
+	}
+	
+	/**
+	 * @param skillId the display skill Id
+	 * @return the custom skill
+	 */
+	public Skill getCustomSkill(int skillId) {
+		return (_customSkills != null) ? _customSkills.get(skillId) : null;
+	}
+	
+	/**
+	 * Add a skill level to the custom skills map.
+	 * @param skill the skill to add
+	 */
+	private void addCustomSkill(Skill skill) {
+		if ((skill != null) && (skill.getDisplayId() != skill.getId())) {
+			if (_customSkills == null) {
+				_customSkills = new ConcurrentHashMap<>();
+			}
+			_customSkills.put(skill.getDisplayId(), skill);
+		}
+	}
+	
+	/**
+	 * Remove a skill level from the custom skill map.
+	 * @param skill the skill to remove
+	 */
+	private void removeCustomSkill(Skill skill) {
+		if ((skill != null) && (_customSkills != null) && (skill.getDisplayId() != skill.getId())) {
+			_customSkills.remove(skill.getDisplayId());
+		}
+	}
+	
+	/**
+	 * @return {@code true} if current player can revive and shows 'To Village' button upon death, {@code false} otherwise.
+	 */
+	@Override
+	public boolean canRevive() {
+		for (IEventListener listener : _eventListeners) {
+			if (listener.isOnEvent() && !listener.canRevive()) {
+				return false;
+			}
+		}
+		return _canRevive;
+	}
+	
+	/**
+	 * This method can prevent from displaying 'To Village' button upon death.
+	 * @param val
+	 */
+	@Override
+	public void setCanRevive(boolean val) {
+		_canRevive = val;
+	}
+	
+	/**
+	 * @return {@code true} if player is on event, {@code false} otherwise.
+	 */
+	@Override
+	public boolean isOnEvent() {
+		for (IEventListener listener : _eventListeners) {
+			if (listener.isOnEvent()) {
+				return true;
+			}
+		}
+		return super.isOnEvent();
+	}
+	
+	public boolean isBlockedFromExit() {
+		for (IEventListener listener : _eventListeners) {
+			if (listener.isOnEvent() && listener.isBlockingExit()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isBlockedFromDeathPenalty() {
+		for (IEventListener listener : _eventListeners) {
+			if (listener.isOnEvent() && listener.isBlockingDeathPenalty()) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public void addOverrideCond(PcCondOverride... excs) {
+		super.addOverrideCond(excs);
+		getVariables().set(COND_OVERRIDE_KEY, Long.toString(_exceptions));
+	}
+	
+	@Override
+	public void removeOverridedCond(PcCondOverride... excs) {
+		super.removeOverridedCond(excs);
+		getVariables().set(COND_OVERRIDE_KEY, Long.toString(_exceptions));
+	}
+	
+	/**
+	 * @return {@code true} if {@link PlayerVariables} instance is attached to current player's scripts, {@code false} otherwise.
+	 */
+	public boolean hasVariables() {
+		return getScript(PlayerVariables.class) != null;
+	}
+	
+	/**
+	 * @return {@link PlayerVariables} instance containing parameters regarding player.
+	 */
+	public PlayerVariables getVariables() {
+		final PlayerVariables vars = getScript(PlayerVariables.class);
+		return vars != null ? vars : addScript(new PlayerVariables(getObjectId()));
+	}
+	
+	/**
+	 * @return {@code true} if {@link AccountVariables} instance is attached to current player's scripts, {@code false} otherwise.
+	 */
+	public boolean hasAccountVariables() {
+		return getScript(AccountVariables.class) != null;
+	}
+	
+	/**
+	 * @return {@link AccountVariables} instance containing parameters regarding player.
+	 */
+	public AccountVariables getAccountVariables() {
+		final AccountVariables vars = getScript(AccountVariables.class);
+		return vars != null ? vars : addScript(new AccountVariables(getAccountName()));
+	}
+	
+	/**
+	 * Adds a event listener.
+	 * @param listener
+	 */
+	public void addEventListener(IEventListener listener) {
+		_eventListeners.add(listener);
+	}
+	
+	/**
+	 * Removes event listener
+	 * @param listener
+	 */
+	public void removeEventListener(IEventListener listener) {
+		_eventListeners.remove(listener);
+	}
+	
+	public void removeEventListener(Class<? extends IEventListener> clazz) {
+		_eventListeners.removeIf(e -> e.getClass() == clazz);
+	}
+	
+	public Collection<IEventListener> getEventListeners() {
+		return _eventListeners;
+	}
+	
+	@Override
+	public int getId() {
+		return getClassId().getId();
+	}
+	
+	public boolean isPartyBanned() {
+		return PunishmentManager.getInstance().hasPunishment(getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN);
+	}
+	
+	/**
+	 * @param act
+	 * @return {@code true} if action was added successfully, {@code false} otherwise.
+	 */
+	public boolean addAction(PlayerAction act) {
+		if (!hasAction(act)) {
+			_actionMask |= act.getMask();
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * @param act
+	 * @return {@code true} if action was removed successfully, {@code false} otherwise.
+	 */
+	public boolean removeAction(PlayerAction act) {
+		if (hasAction(act)) {
+			_actionMask &= ~act.getMask();
+			return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * @param act
+	 * @return {@code true} if action is present, {@code false} otherwise.
+	 */
+	public boolean hasAction(PlayerAction act) {
+		return (_actionMask & act.getMask()) == act.getMask();
+	}
+	
+	/**
+	 * Set true/false if character got Charm of Courage
+	 * @param val true/false
+	 */
+	public void setCharmOfCourage(boolean val) {
+		_hasCharmOfCourage = val;
+		
+	}
+	
+	/**
+	 * @return {@code true} if effect is present, {@code false} otherwise.
+	 */
+	public boolean hasCharmOfCourage() {
+		return _hasCharmOfCourage;
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player got war with the target, {@code false} otherwise.
+	 */
+	public boolean isAtWarWith(L2Character target) {
+		if (target == null) {
+			return false;
+		}
+		if ((_clan != null) && !isAcademyMember()) {
+			if ((target.getClan() != null) && !target.isAcademyMember()) {
+				return _clan.isAtWarWith(target.getClan());
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player in same party with the target, {@code false} otherwise.
+	 */
+	public boolean isInPartyWith(L2Character target) {
+		if (!isInParty() || !target.isInParty()) {
+			return false;
+		}
+		return getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId();
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player in same command channel with the target, {@code false} otherwise.
+	 */
+	public boolean isInCommandChannelWith(L2Character target) {
+		if (!isInParty() || !target.isInParty()) {
+			return false;
+		}
+		
+		if (!getParty().isInCommandChannel() || !target.getParty().isInCommandChannel()) {
+			return false;
+		}
+		return getParty().getCommandChannel().getLeaderObjectId() == target.getParty().getCommandChannel().getLeaderObjectId();
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player in same clan with the target, {@code false} otherwise.
+	 */
+	public boolean isInClanWith(L2Character target) {
+		if ((getClanId() == 0) || (target.getClanId() == 0)) {
+			return false;
+		}
+		return getClanId() == target.getClanId();
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player in same ally with the target, {@code false} otherwise.
+	 */
+	public boolean isInAllyWith(L2Character target) {
+		if ((getAllyId() == 0) || (target.getAllyId() == 0)) {
+			return false;
+		}
+		return getAllyId() == target.getAllyId();
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player at duel with the target, {@code false} otherwise.
+	 */
+	public boolean isInDuelWith(L2Character target) {
+		if (!isInDuel() || !target.isInDuel()) {
+			return false;
+		}
+		return getDuelId() == target.getDuelId();
+	}
+	
+	/**
+	 * @param target the target
+	 * @return {@code true} if this player is on same siege side with the target, {@code false} otherwise.
+	 */
+	public boolean isOnSameSiegeSideWith(L2Character target) {
+		return (getSiegeState() > 0) && isInsideZone(ZoneId.SIEGE) && (getSiegeState() == target.getSiegeState()) && (getSiegeSide() == target.getSiegeSide());
+	}
+	
+	public void setServitorShare(Map<Stats, Double> map) {
+		_servitorShare = map;
+	}
+	
+	public double getServitorShareBonus(Stats stat) {
+		if (_servitorShare == null) {
+			return 1.0d;
+		}
+		return _servitorShare.get(stat);
+	}
+	
+	public boolean canSummonTarget(L2PcInstance target) {
+		if (this == target) {
+			return false;
+		}
+		
+		if (target.isAlikeDead()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED);
+			sm.addPcName(target);
+			sendPacket(sm);
+			return false;
+		}
+		
+		if (target.isInStoreMode()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CURRENTLY_TRADING_OR_OPERATING_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED);
+			sm.addPcName(target);
+			sendPacket(sm);
+			return false;
+		}
+		
+		if (target.isRooted() || target.isInCombat()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED);
+			sm.addPcName(target);
+			sendPacket(sm);
+			return false;
+		}
+		
+		if (target.isInOlympiadMode() || OlympiadManager.getInstance().isRegisteredInComp(target)) {
+			sendPacket(SystemMessageId.YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_IN_OLYMPIAD);
+			return false;
+		}
+		
+		if (target.isFestivalParticipant() || target.isFlyingMounted() || target.isCombatFlagEquipped() || !TvTEvent.onEscapeUse(target.getObjectId())) {
+			sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
+			return false;
+		}
+		
+		if (target.inObserverMode()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_STATE_FORBIDS_SUMMONING);
+			sm.addCharName(target);
+			sendPacket(sm);
+			return false;
+		}
+		
+		if (target.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || target.isInsideZone(ZoneId.JAIL)) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IN_SUMMON_BLOCKING_AREA);
+			sm.addString(target.getName());
+			sendPacket(sm);
+			return false;
+		}
+		
+		if (isInsideZone(ZoneId.NO_SUMMON_FRIEND) || isInsideZone(ZoneId.JAIL) || isFlyingMounted()) {
+			sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
+			return false;
+		}
+		
+		if (getInstanceId() > 0) {
+			if (!general().allowSummonInInstance() || !InstanceManager.getInstance().getInstance(getInstanceId()).isSummonAllowed()) {
+				sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION);
+				return false;
+			}
+		}
+		
+		// TODO: on retail character can enter 7s dungeon with summon friend, but should be teleported away by mobs, because currently this is not working in L2J we do not allowing summoning.
+		if (isIn7sDungeon()) {
+			int targetCabal = SevenSigns.getInstance().getPlayerCabal(target.getObjectId());
+			if (SevenSigns.getInstance().isSealValidationPeriod()) {
+				if (targetCabal != SevenSigns.getInstance().getCabalHighestScore()) {
+					sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
+					return false;
+				}
+			} else if (targetCabal == SevenSigns.CABAL_NULL) {
+				sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public Map<Integer, TeleportBookmark> getTpbookmarks() {
+		return _tpbookmarks;
+	}
+	
+	public long getOnlineTime() {
+		return _onlineTime;
+	}
+	
+	public void setOnlineTime(long time) {
+		_onlineTime = time;
+		_onlineBeginTime = System.currentTimeMillis();
+	}
+	
+	public void setHenna(L2Henna[] henna) {
+		_henna = henna;
+	}
+	
+	public long getOnlineBeginTime() {
+		return _onlineBeginTime;
+	}
+	
+	public int getControlItemId() {
+		return _controlItemId;
+	}
+	
+	public void setControlItemId(int controlItemId) {
+		_controlItemId = controlItemId;
+	}
+	
+	// TODO(Zoey76): Improve this.
+	public void getDwarvenRecipeBookClear() {
+		_dwarvenRecipeBook.clear();
+	}
+	
+	public void debugFeature(String feature, String msg) {
+		msg = feature + " (" + getName() + ") " + msg;
+		LOG.debug(msg);
+		sendDebugMessage(msg);
+	}
+	
+	public void debugFeature(String feature, String msg, Object arg) {
+		msg = feature + " (" + getName() + ") " + msg;
+		var formatted = MessageFormatter.format(msg, arg);
+		LOG.debug(formatted.getMessage());
+		sendDebugMessage(formatted.getMessage());
+	}
+	
+	public void debugFeature(String feature, String msg, Object... args) {
+		msg = feature + " (" + getName() + ") " + msg;
+		var formatted = MessageFormatter.format(msg, args);
+		LOG.debug(formatted.getMessage());
+		sendDebugMessage(formatted.getMessage());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
new file mode 100644
index 00000000..24155972
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java
@@ -0,0 +1,1086 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import java.util.List;
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharSummonTable;
+import com.l2jserver.gameserver.data.sql.impl.SummonEffectsTable;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2PetData;
+import com.l2jserver.gameserver.model.L2PetLevelData;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.stat.PetStat;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.PetInventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExChangeNpcState;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PetInventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.StopMove;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+
+/**
+ * Pet.
+ */
+public class L2PetInstance extends L2Summon {
+	private static final Logger LOG = LoggerFactory.getLogger(L2PetInstance.class);
+	
+	private int _curFed;
+	private final PetInventory _inventory;
+	private final int _controlObjectId;
+	private boolean _respawned;
+	private final boolean _mountable;
+	private Future<?> _feedTask;
+	private L2PetData _data;
+	private L2PetLevelData _leveldata;
+	
+	/** The Experience before the last Death Penalty */
+	private long _expBeforeDeath = 0;
+	private int _curWeightPenalty = 0;
+	
+	protected boolean _bufferMode = true;
+	
+	/**
+	 * Creates a pet.
+	 * @param template the pet NPC template
+	 * @param owner the owner
+	 * @param control the summoning item
+	 */
+	public L2PetInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, L2ItemInstance control) {
+		this(objectId, template, owner, control, (byte) (template.getDisplayId() == 12564 ? owner.getLevel() : template.getLevel()));
+	}
+	
+	/**
+	 * Creates a pet.
+	 * @param template the pet NPC template
+	 * @param owner the pet NPC template
+	 * @param control the summoning item
+	 * @param level the level
+	 */
+	public L2PetInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, L2ItemInstance control, byte level) {
+		super(objectId, template, owner);
+		setInstanceType(InstanceType.L2PetInstance);
+		
+		_controlObjectId = control.getObjectId();
+		
+		getStat().setLevel(Math.max(level, getMinLevel()));
+		
+		_inventory = new PetInventory(this);
+		_inventory.restore();
+		
+		int npcId = template.getId();
+		_mountable = PetDataTable.isMountable(npcId);
+		getPetData();
+		getPetLevelData();
+	}
+	
+	public final L2PetLevelData getPetLevelData() {
+		if (_leveldata == null) {
+			_leveldata = PetDataTable.getInstance().getPetLevelData(getTemplate().getId(), getStat().getLevel());
+		}
+		
+		return _leveldata;
+	}
+	
+	public final L2PetData getPetData() {
+		if (_data == null) {
+			_data = PetDataTable.getInstance().getPetData(getTemplate().getId());
+		}
+		
+		return _data;
+	}
+	
+	public final void setPetData(L2PetLevelData value) {
+		_leveldata = value;
+	}
+	
+	/**
+	 * Manage Feeding Task.<BR>
+	 * Feed or kill the pet depending on hunger level.<br>
+	 * If pet has food in inventory and feed level drops below 55% then consume food from inventory.<br>
+	 * Send a broadcastStatusUpdate packet for this L2PetInstance
+	 */
+	class FeedTask implements Runnable {
+		private final Logger LOG = LoggerFactory.getLogger(FeedTask.class);
+		
+		@Override
+		public void run() {
+			try {
+				if ((getOwner() == null) || !getOwner().hasSummon() || (getOwner().getSummon().getObjectId() != getObjectId())) {
+					stopFeed();
+					return;
+				} else if (getCurrentFed() > getFeedConsume()) {
+					setCurrentFed(getCurrentFed() - getFeedConsume());
+				} else {
+					setCurrentFed(0);
+				}
+				
+				broadcastStatusUpdate();
+				
+				List<Integer> foodIds = getPetData().getFood();
+				if (foodIds.isEmpty()) {
+					if (isUncontrollable()) {
+						// Owl Monk remove PK
+						if ((getTemplate().getId() == 16050) && (getOwner() != null)) {
+							getOwner().setPkKills(Math.max(0, getOwner().getPkKills() - Rnd.get(1, 6)));
+						}
+						sendPacket(SystemMessageId.THE_HELPER_PET_LEAVING);
+						deleteMe(getOwner());
+					} else if (isHungry()) {
+						sendPacket(SystemMessageId.THERE_NOT_MUCH_TIME_REMAINING_UNTIL_HELPER_LEAVES);
+					}
+					return;
+				}
+				
+				L2ItemInstance food = null;
+				for (int id : foodIds) {
+					food = getInventory().getItemByItemId(id);
+					if (food != null) {
+						break;
+					}
+				}
+				
+				if ((food != null) && isHungry()) {
+					final IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem());
+					if (handler != null) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY);
+						sm.addItemName(food.getId());
+						sendPacket(sm);
+						handler.useItem(L2PetInstance.this, food, false);
+					}
+				}
+				
+				if (isUncontrollable()) {
+					sendPacket(SystemMessageId.YOUR_PET_IS_STARVING_AND_WILL_NOT_OBEY_UNTIL_IT_GETS_ITS_FOOD_FEED_YOUR_PET);
+				}
+			} catch (Exception e) {
+				LOG.error("Pet [ObjectId: {}] a feed task error has occurred", getObjectId(), e);
+			}
+		}
+		
+		private int getFeedConsume() {
+			// if pet is attacking
+			if (isAttackingNow()) {
+				return getPetLevelData().getPetFeedBattle();
+			}
+			return getPetLevelData().getPetFeedNormal();
+		}
+	}
+	
+	public synchronized static L2PetInstance spawnPet(L2NpcTemplate template, L2PcInstance owner, L2ItemInstance control) {
+		if (L2World.getInstance().getPet(owner.getObjectId()) != null) {
+			return null; // owner has a pet listed in world
+		}
+		
+		final var data = PetDataTable.getInstance().getPetData(template.getId());
+		final var pet = DAOFactory.getInstance().getPetDAO().load(control, template, owner);
+		if (pet != null) {
+			pet.setTitle(owner.getName());
+			if (data.isSyncLevel() && (pet.getLevel() != owner.getLevel())) {
+				pet.getStat().setLevel(owner.getLevel());
+				pet.getStat().setExp(pet.getStat().getExpForLevel(owner.getLevel()));
+			}
+			L2World.getInstance().addPet(owner.getObjectId(), pet);
+		}
+		return pet;
+	}
+	
+	@Override
+	public PetStat getStat() {
+		return (PetStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new PetStat(this));
+	}
+	
+	public boolean isRespawned() {
+		return _respawned;
+	}
+	
+	public void setRespawned(boolean respawned) {
+		_respawned = respawned;
+	}
+	
+	@Override
+	public int getSummonType() {
+		return 2;
+	}
+	
+	@Override
+	public int getControlObjectId() {
+		return _controlObjectId;
+	}
+	
+	public L2ItemInstance getControlItem() {
+		return getOwner().getInventory().getItemByObjectId(_controlObjectId);
+	}
+	
+	public int getCurrentFed() {
+		return _curFed;
+	}
+	
+	public void setCurrentFed(int num) {
+		if (num <= 0) {
+			sendPacket(new ExChangeNpcState(getObjectId(), 0x64));
+		} else if (_curFed <= 0) {
+			sendPacket(new ExChangeNpcState(getObjectId(), 0x65));
+		}
+		_curFed = Math.min(num, getMaxFed());
+	}
+	
+	/**
+	 * Returns the pet's currently equipped weapon instance (if any).
+	 */
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		for (L2ItemInstance item : getInventory().getItems()) {
+			if ((item.getItemLocation() == ItemLocation.PET_EQUIP) && (item.getItem().getBodyPart() == L2Item.SLOT_R_HAND)) {
+				return item;
+			}
+		}
+		
+		return null;
+	}
+	
+	/**
+	 * Returns the pet's currently equipped weapon (if any).
+	 */
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		L2ItemInstance weapon = getActiveWeaponInstance();
+		
+		if (weapon == null) {
+			return null;
+		}
+		
+		return (L2Weapon) weapon.getItem();
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		// temporary? unavailable
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		// temporary? unavailable
+		return null;
+	}
+	
+	@Override
+	public PetInventory getInventory() {
+		return _inventory;
+	}
+	
+	/**
+	 * Destroys item from inventory and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	@Override
+	public boolean destroyItem(String process, int objectId, long count, L2Object reference, boolean sendMessage) {
+		L2ItemInstance item = _inventory.destroyItem(process, objectId, count, getOwner(), reference);
+		
+		if (item == null) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			
+			return false;
+		}
+		
+		// Send Pet inventory update packet
+		PetInventoryUpdate petIU = new PetInventoryUpdate();
+		petIU.addItem(item);
+		sendPacket(petIU);
+		
+		if (sendMessage) {
+			if (count > 1) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+				sm.addItemName(item.getId());
+				sm.addLong(count);
+				sendPacket(sm);
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+				sm.addItemName(item.getId());
+				sendPacket(sm);
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Destroy item from inventory by using its <B>itemId</B> and send a Server->Client InventoryUpdate packet to the L2PcInstance.
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param reference : L2Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @param sendMessage : boolean Specifies whether to send message to Client about this action
+	 * @return boolean informing if the action was successful
+	 */
+	@Override
+	public boolean destroyItemByItemId(String process, int itemId, long count, L2Object reference, boolean sendMessage) {
+		L2ItemInstance item = _inventory.destroyItemByItemId(process, itemId, count, getOwner(), reference);
+		
+		if (item == null) {
+			if (sendMessage) {
+				sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			}
+			return false;
+		}
+		
+		// Send Pet inventory update packet
+		PetInventoryUpdate petIU = new PetInventoryUpdate();
+		petIU.addItem(item);
+		sendPacket(petIU);
+		
+		if (sendMessage) {
+			if (count > 1) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+				sm.addItemName(item.getId());
+				sm.addLong(count);
+				sendPacket(sm);
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+				sm.addItemName(item.getId());
+				sendPacket(sm);
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public void doPickupItem(L2Object object) {
+		if (isDead()) {
+			return;
+		}
+		
+		getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		broadcastPacket(new StopMove(this));
+		
+		if (!(object instanceof L2ItemInstance)) {
+			// dont try to pickup anything that is not an item :)
+			LOG.warn("{} trying to pickup wrong target. {}", this, object);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		boolean follow = getFollowStatus();
+		final L2ItemInstance target = (L2ItemInstance) object;
+		
+		// Cursed weapons
+		if (CursedWeaponsManager.getInstance().isCursed(target.getId())) {
+			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
+			smsg.addItemName(target.getId());
+			sendPacket(smsg);
+			return;
+		} else if (FortSiegeManager.getInstance().isCombat(target.getId())) {
+			return;
+		}
+		
+		SystemMessage sm;
+		synchronized (target) {
+			// Check if the target to pick up is visible
+			if (!target.isVisible()) {
+				// Send a Server->Client packet ActionFailed to this L2PcInstance
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if (!target.getDropProtection().tryPickUp(this)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
+				sm.addItemName(target);
+				sendPacket(sm);
+				return;
+			}
+			
+			if (((isInParty() && (getParty().getDistributionType() == PartyDistributionType.FINDERS_KEEPERS)) || !isInParty()) && !_inventory.validateCapacity(target)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS);
+				return;
+			}
+			
+			if ((target.getOwnerId() != 0) && (target.getOwnerId() != getOwner().getObjectId()) && !getOwner().isInLooterParty(target.getOwnerId())) {
+				if (target.getId() == Inventory.ADENA_ID) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
+					sm.addLong(target.getCount());
+				} else if (target.getCount() > 1) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S2_S1_S);
+					sm.addItemName(target);
+					sm.addLong(target.getCount());
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1);
+					sm.addItemName(target);
+				}
+				sendPacket(ActionFailed.STATIC_PACKET);
+				sendPacket(sm);
+				return;
+			}
+			
+			if ((target.getItemLootSchedule() != null) && ((target.getOwnerId() == getOwner().getObjectId()) || getOwner().isInLooterParty(target.getOwnerId()))) {
+				target.resetOwnerTimer();
+			}
+			
+			// Remove from the ground!
+			target.pickupMe(this);
+			
+			if (general().saveDroppedItem()) {
+				ItemsOnGroundManager.getInstance().removeObject(target);
+			}
+		}
+		
+		// Herbs
+		if (target.getItem().hasExImmediateEffect()) {
+			IItemHandler handler = ItemHandler.getInstance().getHandler(target.getEtcItem());
+			if (handler == null) {
+				LOG.warn("No item handler registered for item ID: {}.", target.getId());
+			} else {
+				handler.useItem(this, target, false);
+			}
+			
+			ItemTable.getInstance().destroyItem("Consume", target, getOwner(), null);
+			broadcastStatusUpdate();
+		} else {
+			if (target.getId() == Inventory.ADENA_ID) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1_ADENA);
+				sm.addLong(target.getCount());
+				sendPacket(sm);
+			} else if (target.getEnchantLevel() > 0) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1_S2);
+				sm.addInt(target.getEnchantLevel());
+				sm.addItemName(target);
+				sendPacket(sm);
+			} else if (target.getCount() > 1) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S2_S1_S);
+				sm.addLong(target.getCount());
+				sm.addItemName(target);
+				sendPacket(sm);
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1);
+				sm.addItemName(target);
+				sendPacket(sm);
+			}
+			
+			// If owner is in party and it isn't finders keepers, distribute the item instead of stealing it -.-
+			if (getOwner().isInParty() && (getOwner().getParty().getDistributionType() != PartyDistributionType.FINDERS_KEEPERS)) {
+				getOwner().getParty().distributeItem(getOwner(), target);
+			} else {
+				final L2ItemInstance item = getInventory().addItem("Pickup", target, getOwner(), this);
+				// sendPacket(new PetItemList(getInventory().getItems()));
+				sendPacket(new PetInventoryUpdate(item));
+			}
+		}
+		
+		getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		
+		if (follow) {
+			followOwner();
+		}
+	}
+	
+	@Override
+	public void deleteMe(L2PcInstance owner) {
+		getInventory().transferItemsToOwner();
+		super.deleteMe(owner);
+		destroyControlItem(owner, false); // this should also delete the pet from the db
+		CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId());
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		L2PcInstance owner = getOwner();
+		if ((owner != null) && !owner.isInDuel() && (!isInsideZone(ZoneId.PVP) || isInsideZone(ZoneId.SIEGE))) {
+			deathPenalty();
+		}
+		if (!super.doDie(killer, true)) {
+			return false;
+		}
+		stopFeed();
+		sendPacket(SystemMessageId.MAKE_SURE_YOU_RESSURECT_YOUR_PET_WITHIN_24_HOURS);
+		DecayTaskManager.getInstance().add(this);
+		// do not decrease exp if is in duel, arena
+		return true;
+	}
+	
+	@Override
+	public void doRevive() {
+		getOwner().removeReviving();
+		
+		super.doRevive();
+		
+		// stopDecay
+		DecayTaskManager.getInstance().cancel(this);
+		startFeed();
+		if (!isHungry()) {
+			setRunning();
+		}
+		getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+	}
+	
+	@Override
+	public void doRevive(double revivePower) {
+		// Restore the pet's lost experience,
+		// depending on the % return of the skill used (based on its power).
+		restoreExp(revivePower);
+		doRevive();
+	}
+	
+	/**
+	 * Transfers item to another inventory
+	 * @param process string identifier of process triggering this action
+	 * @param objectId Item Identifier of the item to be transferred
+	 * @param count Quantity of items to be transferred
+	 * @param target
+	 * @param actor the player requesting the item transfer
+	 * @param reference Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	public L2ItemInstance transferItem(String process, int objectId, long count, Inventory target, L2PcInstance actor, L2Object reference) {
+		L2ItemInstance oldItem = getInventory().getItemByObjectId(objectId);
+		L2ItemInstance playerOldItem = target.getItemByItemId(oldItem.getId());
+		L2ItemInstance newItem = getInventory().transferItem(process, objectId, count, target, actor, reference);
+		
+		if (newItem == null) {
+			return null;
+		}
+		
+		// Send inventory update packet
+		PetInventoryUpdate petIU = new PetInventoryUpdate();
+		if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+			petIU.addModifiedItem(oldItem);
+		} else {
+			petIU.addRemovedItem(oldItem);
+		}
+		sendPacket(petIU);
+		
+		// Send target update packet
+		if (!newItem.isStackable()) {
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addNewItem(newItem);
+			sendPacket(iu);
+		} else if (playerOldItem != null) {
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addModifiedItem(newItem);
+			sendPacket(iu);
+		}
+		return newItem;
+	}
+	
+	/**
+	 * Remove the Pet from DB and its associated item from the player inventory
+	 * @param owner The owner from whose inventory we should delete the item
+	 * @param evolve
+	 */
+	public void destroyControlItem(L2PcInstance owner, boolean evolve) {
+		// remove the pet instance from world
+		L2World.getInstance().removePet(owner.getObjectId());
+		
+		// delete from inventory
+		try {
+			L2ItemInstance removedItem;
+			if (evolve) {
+				removedItem = owner.getInventory().destroyItem("Evolve", getControlObjectId(), 1, getOwner(), this);
+			} else {
+				removedItem = owner.getInventory().destroyItem("PetDestroy", getControlObjectId(), 1, getOwner(), this);
+				if (removedItem != null) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+					sm.addItemName(removedItem);
+					owner.sendPacket(sm);
+				}
+			}
+			
+			if (removedItem == null) {
+				LOG.warn("Couldn't destroy pet control item for {} pet: {} evolve: {}", owner, this, evolve);
+			} else {
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addRemovedItem(removedItem);
+				
+				owner.sendPacket(iu);
+				
+				StatusUpdate su = new StatusUpdate(owner);
+				su.addAttribute(StatusUpdate.CUR_LOAD, owner.getCurrentLoad());
+				owner.sendPacket(su);
+				
+				owner.broadcastUserInfo();
+				
+				L2World.getInstance().removeObject(removedItem);
+			}
+		} catch (Exception ex) {
+			LOG.error("Error destroying control item for pet {} and player {}!", this, owner, ex);
+		}
+		
+		// Pet control item no longer exists, delete the pet from the database.
+		DAOFactory.getInstance().getPetDAO().delete(this);
+	}
+	
+	public void dropAllItems() {
+		try {
+			for (L2ItemInstance item : getInventory().getItems()) {
+				dropItemHere(item);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Error dropping all items for pet {}!", this, ex);
+		}
+	}
+	
+	public void dropItemHere(L2ItemInstance dropit, boolean protect) {
+		dropit = getInventory().dropItem("Drop", dropit.getObjectId(), dropit.getCount(), getOwner(), this);
+		
+		if (dropit != null) {
+			if (protect) {
+				dropit.getDropProtection().protect(getOwner());
+			}
+			LOG.info("Item id to drop: {} amount: {}", dropit.getId(), dropit.getCount());
+			dropit.dropMe(this, getX(), getY(), getZ() + 100);
+		}
+	}
+	
+	public void dropItemHere(L2ItemInstance dropit) {
+		dropItemHere(dropit, false);
+	}
+	
+	/**
+	 * @return Returns the mount able.
+	 */
+	@Override
+	public boolean isMountable() {
+		return _mountable;
+	}
+	
+	@Override
+	public final void stopSkillEffects(boolean removed, int skillId) {
+		super.stopSkillEffects(removed, skillId);
+		SummonEffectsTable.getInstance().removePetEffects(getControlObjectId(), skillId);
+	}
+	
+	@Override
+	public void storeMe() {
+		if (getControlObjectId() == 0) {
+			// this is a summon, not a pet, don't store anything
+			return;
+		}
+		
+		if (!character().restorePetOnReconnect()) {
+			setRestoreSummon(false);
+		}
+		
+		if (!isRespawned()) {
+			DAOFactory.getInstance().getPetDAO().insert(this);
+		} else {
+			DAOFactory.getInstance().getPetDAO().update(this);
+		}
+		
+		setRespawned(true);
+		
+		if (isRestoreSummon()) {
+			CharSummonTable.getInstance().getPets().put(getOwner().getObjectId(), getControlObjectId());
+		} else {
+			CharSummonTable.getInstance().getPets().remove(getOwner().getObjectId());
+		}
+		
+		final L2ItemInstance itemInst = getControlItem();
+		if ((itemInst != null) && (itemInst.getEnchantLevel() != getStat().getLevel())) {
+			itemInst.setEnchantLevel(getStat().getLevel());
+			itemInst.updateDatabase();
+		}
+	}
+	
+	@Override
+	public void storeEffect(boolean storeEffects) {
+		if (!character().summonStoreSkillCooltime()) {
+			return;
+		}
+		
+		// Clear list for overwrite
+		SummonEffectsTable.getInstance().clearPetEffects(getControlObjectId());
+		
+		DAOFactory.getInstance().getPetSkillSaveDAO().insert(this, storeEffects);
+	}
+	
+	@Override
+	public void restoreEffects() {
+		DAOFactory.getInstance().getPetSkillSaveDAO().load(this);
+		SummonEffectsTable.getInstance().applyPetEffects(this, getControlObjectId());
+	}
+	
+	public synchronized void stopFeed() {
+		if (_feedTask != null) {
+			_feedTask.cancel(false);
+			_feedTask = null;
+		}
+	}
+	
+	public synchronized void startFeed() {
+		stopFeed();
+		
+		if (!isDead() && (getOwner().getSummon() == this)) {
+			_feedTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FeedTask(), 10000, 10000);
+		}
+	}
+	
+	@Override
+	public int getMaxLoad() {
+		return (int) calcStat(Stats.WEIGHT_LIMIT, Math.floor(BaseStats.CON.calcBonus(this) * 34500 * character().getWeightLimit()), this, null);
+	}
+	
+	@Override
+	public int getBonusWeightPenalty() {
+		return (int) calcStat(Stats.WEIGHT_PENALTY, 1, this, null);
+	}
+	
+	@Override
+	public int getCurrentLoad() {
+		return getInventory().getTotalWeight();
+	}
+	
+	@Override
+	public synchronized void unSummon(L2PcInstance owner) {
+		stopFeed();
+		stopHpMpRegeneration();
+		super.unSummon(owner);
+		
+		if (!isDead()) {
+			if (getInventory() != null) {
+				getInventory().deleteMe();
+			}
+			L2World.getInstance().removePet(owner.getObjectId());
+		}
+	}
+	
+	/**
+	 * Restore the specified % of experience this L2PetInstance has lost.<BR>
+	 * <BR>
+	 * @param restorePercent
+	 */
+	public void restoreExp(double restorePercent) {
+		if (_expBeforeDeath > 0) {
+			// Restore the specified % of lost experience.
+			getStat().addExp(Math.round(((_expBeforeDeath - getStat().getExp()) * restorePercent) / 100));
+			_expBeforeDeath = 0;
+		}
+	}
+	
+	private void deathPenalty() {
+		// TODO: Need Correct Penalty
+		
+		int lvl = getStat().getLevel();
+		double percentLost = (-0.07 * lvl) + 6.5;
+		
+		// Calculate the Experience loss
+		long lostExp = Math.round(((getStat().getExpForLevel(lvl + 1) - getStat().getExpForLevel(lvl)) * percentLost) / 100);
+		
+		// Get the Experience before applying penalty
+		_expBeforeDeath = getStat().getExp();
+		
+		// Set the new Experience value of the L2PetInstance
+		getStat().removeExp(lostExp);
+	}
+	
+	public void addExp(long exp) {
+		getStat().addExp(exp);
+	}
+	
+	public long getExpForLevel(int level) {
+		return getStat().getExpForLevel(level);
+	}
+	
+	@Override
+	public void addExpAndSp(long addToExp, int addToSp) {
+		getStat().addExpAndSp(Math.round(addToExp * (isSinEater() ? rates().getSinEaterXpRate() : rates().getPetXpRate())), addToSp);
+	}
+	
+	public boolean isSinEater() {
+		return getId() == 12564;
+	}
+	
+	@Override
+	public long getExpForThisLevel() {
+		return getStat().getExpForLevel(getLevel());
+	}
+	
+	@Override
+	public long getExpForNextLevel() {
+		return getStat().getExpForLevel(getLevel() + 1);
+	}
+	
+	@Override
+	public final boolean addLevel(int value) {
+		if ((getLevel() + value) > getStat().getMaxLevel()) {
+			return false;
+		}
+		
+		boolean levelIncreased = getStat().addLevel(value);
+		onLevelChange(levelIncreased);
+		return levelIncreased;
+	}
+	
+	@Override
+	public long getExp() {
+		return getStat().getExp();
+	}
+	
+	public void setExp(long exp) {
+		getStat().setExp(exp);
+	}
+	
+	public void setSp(int sp) {
+		getStat().setSp(sp);
+	}
+	
+	@Override
+	public void onLevelChange(boolean levelIncreased) {
+		StatusUpdate su = new StatusUpdate(getStat().getActiveChar());
+		su.addAttribute(StatusUpdate.LEVEL, getLevel());
+		su.addAttribute(StatusUpdate.MAX_HP, getMaxHp());
+		su.addAttribute(StatusUpdate.MAX_MP, getMaxMp());
+		getStat().getActiveChar().broadcastPacket(su);
+		if (levelIncreased) {
+			getStat().getActiveChar().broadcastPacket(new SocialAction(getObjectId(), SocialAction.LEVEL_UP));
+		}
+		// Send a Server->Client packet PetInfo to the L2PcInstance
+		getStat().getActiveChar().updateAndBroadcastStatus(1);
+		
+		if (getStat().getActiveChar().getControlItem() != null) {
+			getStat().getActiveChar().getControlItem().setEnchantLevel(getLevel());
+		}
+	}
+	
+	@Override
+	public final int getLevel() {
+		return getStat().getLevel();
+	}
+	
+	@Override
+	public int getMinLevel() {
+		return PetDataTable.getInstance().getPetMinLevel((this).getTemplate().getId());
+	}
+	
+	public int getMaxFed() {
+		return getStat().getMaxFeed();
+	}
+	
+	@Override
+	public int getCriticalHit(L2Character target, Skill skill) {
+		return getStat().getCriticalHit(target, skill);
+	}
+	
+	public void updateRefOwner(L2PcInstance owner) {
+		int oldOwnerId = getOwner().getObjectId();
+		
+		setOwner(owner);
+		L2World.getInstance().removePet(oldOwnerId);
+		L2World.getInstance().addPet(oldOwnerId, this);
+	}
+	
+	public int getInventoryLimit() {
+		return npc().getMaximumSlotsForPet();
+	}
+	
+	public void refreshOverloaded() {
+		int maxLoad = getMaxLoad();
+		if (maxLoad > 0) {
+			long weightproc = (((getCurrentLoad() - getBonusWeightPenalty()) * 1000L) / maxLoad);
+			int newWeightPenalty;
+			if ((weightproc < 500) || getOwner().getDietMode()) {
+				newWeightPenalty = 0;
+			} else if (weightproc < 666) {
+				newWeightPenalty = 1;
+			} else if (weightproc < 800) {
+				newWeightPenalty = 2;
+			} else if (weightproc < 1000) {
+				newWeightPenalty = 3;
+			} else {
+				newWeightPenalty = 4;
+			}
+			
+			if (_curWeightPenalty != newWeightPenalty) {
+				_curWeightPenalty = newWeightPenalty;
+				if (newWeightPenalty > 0) {
+					addSkill(SkillData.getInstance().getSkill(4270, newWeightPenalty));
+					setIsOverloaded(getCurrentLoad() >= maxLoad);
+				} else {
+					removeSkill(getKnownSkill(4270), true);
+					setIsOverloaded(false);
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void updateAndBroadcastStatus(int val) {
+		refreshOverloaded();
+		super.updateAndBroadcastStatus(val);
+	}
+	
+	@Override
+	public final boolean isHungry() {
+		return getCurrentFed() < ((getPetData().getHungryLimit() / 100f) * getPetLevelData().getPetMaxFeed());
+	}
+	
+	/**
+	 * Verifies if a pet can be controlled by it's owner.<br>
+	 * Starving pets cannot be controlled.
+	 * @return {@code true} if the per cannot be controlled
+	 */
+	public boolean isUncontrollable() {
+		return getCurrentFed() <= 0;
+	}
+	
+	@Override
+	public final int getWeapon() {
+		L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND);
+		if (weapon != null) {
+			return weapon.getId();
+		}
+		return 0;
+	}
+	
+	@Override
+	public final int getArmor() {
+		L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST);
+		if (weapon != null) {
+			return weapon.getId();
+		}
+		return 0;
+	}
+	
+	public final int getJewel() {
+		L2ItemInstance weapon = getInventory().getPaperdollItem(Inventory.PAPERDOLL_NECK);
+		if (weapon != null) {
+			return weapon.getId();
+		}
+		return 0;
+	}
+	
+	@Override
+	public short getSoulShotsPerHit() {
+		return getPetLevelData().getPetSoulShot();
+	}
+	
+	@Override
+	public short getSpiritShotsPerHit() {
+		return getPetLevelData().getPetSpiritShot();
+	}
+	
+	@Override
+	public void setName(String name) {
+		final L2ItemInstance controlItem = getControlItem();
+		if (controlItem != null) {
+			if (controlItem.getCustomType2() == (name == null ? 1 : 0)) {
+				// name not set yet
+				controlItem.setCustomType2(name != null ? 1 : 0);
+				controlItem.updateDatabase();
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addModifiedItem(controlItem);
+				sendPacket(iu);
+			}
+		} else {
+			LOG.warn("Pet control item null, for pet: {}", toString());
+		}
+		super.setName(name);
+	}
+	
+	public boolean canEatFoodId(int itemId) {
+		return _data.getFood().contains(itemId);
+	}
+	
+	@Override
+	public boolean isPet() {
+		return true;
+	}
+	
+	@Override
+	public final double getRunSpeed() {
+		return super.getRunSpeed() * (isUncontrollable() ? 0.5d : 1.0d);
+	}
+	
+	@Override
+	public final double getWalkSpeed() {
+		return super.getWalkSpeed() * (isUncontrollable() ? 0.5d : 1.0d);
+	}
+	
+	@Override
+	public final double getMovementSpeedMultiplier() {
+		return super.getMovementSpeedMultiplier() * (isUncontrollable() ? 0.5d : 1.0d);
+	}
+	
+	@Override
+	public final double getMoveSpeed() {
+		if (isInsideZone(ZoneId.WATER)) {
+			return isRunning() ? getSwimRunSpeed() : getSwimWalkSpeed();
+		}
+		return isRunning() ? getRunSpeed() : getWalkSpeed();
+	}
+	
+	/**
+	 * Verify if this pet is in support mode.
+	 * @return {@code true} if this baby pet is in support mode, {@code false} otherwise
+	 */
+	public boolean isInSupportMode() {
+		return _bufferMode;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java
new file mode 100644
index 00000000..861c8760
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2PetManagerInstance.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2PetManagerInstance extends L2MerchantInstance {
+	
+	public L2PetManagerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2PetManagerInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2QuestGuardInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2QuestGuardInstance.java
new file mode 100644
index 00000000..d52b8fc3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2QuestGuardInstance.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAttack;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableKill;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * This class extends Guard class for quests, that require tracking of onAttack and onKill events from monsters' attacks.
+ * @author GKR
+ */
+public final class L2QuestGuardInstance extends L2GuardInstance {
+	private boolean _isAutoAttackable = true;
+	private boolean _isPassive = false;
+	
+	/**
+	 * Creates a quest guard.
+	 * @param template the quest guard NPC template
+	 */
+	public L2QuestGuardInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2QuestGuardInstance);
+	}
+	
+	@Override
+	public void addDamage(L2Character attacker, int damage, Skill skill) {
+		super.addDamage(attacker, damage, skill);
+		
+		if (attacker instanceof L2Attackable) {
+			EventDispatcher.getInstance().notifyEventAsync(new AttackableAttack(null, this, damage, skill, false), this);
+		}
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		// Kill the L2NpcInstance (the corpse disappeared after 7 seconds)
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		if (killer instanceof L2Attackable) {
+			// Delayed notification
+			EventDispatcher.getInstance().notifyEventAsyncDelayed(new AttackableKill(null, this, false), this, _onKillDelay);
+		}
+		return true;
+	}
+	
+	@Override
+	public void addDamageHate(L2Character attacker, int damage, long aggro) {
+		if (!_isPassive && !(attacker instanceof L2PcInstance)) {
+			super.addDamageHate(attacker, damage, aggro);
+		}
+	}
+	
+	public void setPassive(boolean state) {
+		_isPassive = state;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return _isAutoAttackable && !(attacker instanceof L2PcInstance);
+	}
+	
+	@Override
+	public void setAutoAttackable(boolean state) {
+		_isAutoAttackable = state;
+	}
+	
+	public boolean isPassive() {
+		return _isPassive;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java
new file mode 100644
index 00000000..613b2625
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java
@@ -0,0 +1,457 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.MonsterRace;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.audio.Music;
+import com.l2jserver.gameserver.enums.audio.Sound;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.knownlist.RaceManagerKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.MonRaceInfo;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+public class L2RaceManagerInstance extends L2Npc {
+	public static final int LANES = 8;
+	public static final int WINDOW_START = 0;
+	
+	private static List<L2RaceManagerInstance> _managers;
+	protected static int _raceNumber = 4;
+	
+	// Time Constants
+	private static final long SECOND = 1000;
+	private static final long MINUTE = 60 * SECOND;
+	
+	private static int _minutes = 5;
+	
+	// States
+	private static final int ACCEPTING_BETS = 0;
+	private static final int WAITING = 1;
+	private static final int STARTING_RACE = 2;
+	private static final int RACE_END = 3;
+	private static int _state = RACE_END;
+	
+	protected static final int[][] _codes = {
+		{
+			-1,
+			0
+		},
+		{
+			0,
+			15322
+		},
+		{
+			13765,
+			-1
+		}
+	};
+	private static boolean _notInitialized = true;
+	protected static MonRaceInfo _packet;
+	protected static final int[] _cost = {
+		100,
+		500,
+		1000,
+		5000,
+		10000,
+		20000,
+		50000,
+		100000
+	};
+	
+	public L2RaceManagerInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2RaceManagerInstance);
+		if (_notInitialized) {
+			_notInitialized = false;
+			
+			_managers = new ArrayList<>();
+			
+			ThreadPoolManager s = ThreadPoolManager.getInstance();
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_AVAILABLE_FOR_S1_RACE), 0, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_NOW_AVAILABLE_FOR_S1_RACE), 30 * SECOND, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_AVAILABLE_FOR_S1_RACE), MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_NOW_AVAILABLE_FOR_S1_RACE), MINUTE + (30 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES), 2 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES), 3 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES), 4 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES), 5 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES), 6 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_S1_TICKET_SALES_CLOSED), 7 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_S2_BEGINS_IN_S1_MINUTES), 7 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_S2_BEGINS_IN_S1_MINUTES), 8 * MINUTE, 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_S1_BEGINS_IN_30_SECONDS), (8 * MINUTE) + (30 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_S1_COUNTDOWN_IN_FIVE_SECONDS), (8 * MINUTE) + (50 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS), (8 * MINUTE) + (55 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS), (8 * MINUTE) + (56 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS), (8 * MINUTE) + (57 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS), (8 * MINUTE) + (58 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS), (8 * MINUTE) + (59 * SECOND), 10 * MINUTE);
+			s.scheduleGeneralAtFixedRate(new Announcement(SystemMessageId.MONSRACE_RACE_START), 9 * MINUTE, 10 * MINUTE);
+		}
+		_managers.add(this);
+	}
+	
+	@Override
+	public final RaceManagerKnownList getKnownList() {
+		return (RaceManagerKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new RaceManagerKnownList(this));
+	}
+	
+	class Announcement implements Runnable {
+		private final SystemMessageId _type;
+		
+		public Announcement(SystemMessageId pType) {
+			_type = pType;
+		}
+		
+		@Override
+		public void run() {
+			makeAnnouncement(_type);
+		}
+	}
+	
+	public void makeAnnouncement(SystemMessageId type) {
+		SystemMessage sm = SystemMessage.getSystemMessage(type);
+		switch (type.getId()) {
+			case 816: // SystemMessageId.MONSRACE_TICKETS_AVAILABLE_FOR_S1_RACE
+			case 817: // SystemMessageId.MONSRACE_TICKETS_NOW_AVAILABLE_FOR_S1_RACE
+				if (_state != ACCEPTING_BETS) {// _log.info("Race Initializing");
+					_state = ACCEPTING_BETS;
+					startRace();
+				} // else{_log.info("Race open");}
+				sm.addInt(_raceNumber);
+				break;
+			case 818: // SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES
+			case 820: // SystemMessageId.MONSRACE_S2_BEGINS_IN_S1_MINUTES
+			case 823: // SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS
+				sm.addInt(_minutes);
+				if (type.getId() == 820) {
+					sm.addInt(_raceNumber);
+				}
+				_minutes--;
+				break;
+			case 819: // SystemMessageId.MONSRACE_S1_TICKET_SALES_CLOSED
+				sm.addInt(_raceNumber);
+				_state = WAITING;
+				_minutes = 2;
+				break;
+			case 821: // SystemMessageId.MONSRACE_S1_BEGINS_IN_30_SECONDS
+			case 822: // SystemMessageId.MONSRACE_S1_COUNTDOWN_IN_FIVE_SECONDS
+			case 825: // SystemMessageId.MONSRACE_S1_RACE_END
+				sm.addInt(_raceNumber);
+				_minutes = 5;
+				break;
+			case 826: // SystemMessageId.MONSRACE_FIRST_PLACE_S1_SECOND_S2
+				_state = RACE_END;
+				sm.addInt(MonsterRace.getInstance().getFirstPlace());
+				sm.addInt(MonsterRace.getInstance().getSecondPlace());
+				break;
+		}
+		
+		broadcast(sm);
+		
+		if (type == SystemMessageId.MONSRACE_RACE_START) {
+			_state = STARTING_RACE;
+			startRace();
+			_minutes = 5;
+		}
+	}
+	
+	protected void broadcast(L2GameServerPacket pkt) {
+		for (L2RaceManagerInstance manager : _managers) {
+			if (!manager.isDead()) {
+				Broadcast.toKnownPlayers(manager, pkt);
+			}
+		}
+	}
+	
+	public void sendMonsterInfo() {
+		broadcast(_packet);
+	}
+	
+	private void startRace() {
+		MonsterRace race = MonsterRace.getInstance();
+		if (_state == STARTING_RACE) {
+			PlaySound SRace = Music.S_RACE.getPacket();
+			broadcast(SRace);
+			// TODO find correct sender 121209259, 12125, 182487, -3559
+			PlaySound SRace2 = Sound.ITEMSOUND2_RACE_START.getPacket();
+			broadcast(SRace2);
+			_packet = new MonRaceInfo(_codes[1][0], _codes[1][1], race.getMonsters(), race.getSpeeds());
+			sendMonsterInfo();
+			
+			ThreadPoolManager.getInstance().scheduleGeneral(new RunRace(), 5000);
+		} else {
+			race.newRace();
+			race.newSpeeds();
+			_packet = new MonRaceInfo(_codes[0][0], _codes[0][1], race.getMonsters(), race.getSpeeds());
+			sendMonsterInfo();
+		}
+	}
+	
+	@Override
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		if (command.startsWith("BuyTicket") && (_state != ACCEPTING_BETS)) {
+			player.sendPacket(SystemMessageId.MONSRACE_TICKETS_NOT_AVAILABLE);
+			command = "Chat 0";
+		}
+		if (command.startsWith("ShowOdds") && (_state == ACCEPTING_BETS)) {
+			player.sendPacket(SystemMessageId.MONSRACE_NO_PAYOUT_INFO);
+			command = "Chat 0";
+		}
+		
+		if (command.startsWith("BuyTicket")) {
+			int val = Integer.parseInt(command.substring(10));
+			if (val == 0) {
+				player.setRace(0, 0);
+				player.setRace(1, 0);
+			}
+			if (((val == 10) && (player.getRace(0) == 0)) || ((val == 20) && (player.getRace(0) == 0) && (player.getRace(1) == 0))) {
+				val = 0;
+			}
+			showBuyTicket(player, val);
+		} else if (command.equals("ShowOdds")) {
+			showOdds(player);
+		} else if (command.equals("ShowInfo")) {
+			showMonsterInfo(player);
+		} else if (command.equals("calculateWin")) {
+			// displayCalculateWinnings(player);
+		} else if (command.equals("viewHistory")) {
+			// displayHistory(player);
+		} else {
+			// getKnownList().removeKnownObject(player);
+			super.onBypassFeedback(player, command);
+		}
+	}
+	
+	public void showOdds(L2PcInstance player) {
+		if (_state == ACCEPTING_BETS) {
+			return;
+		}
+		int npcId = getTemplate().getId();
+		String filename, search;
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		filename = getHtmlPath(npcId, 5);
+		html.setFile(player.getHtmlPrefix(), filename);
+		for (int i = 0; i < 8; i++) {
+			int n = i + 1;
+			search = "Mob" + n;
+			html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName());
+		}
+		html.replace("1race", String.valueOf(_raceNumber));
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(html);
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	public void showMonsterInfo(L2PcInstance player) {
+		int npcId = getTemplate().getId();
+		String filename, search;
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		filename = getHtmlPath(npcId, 6);
+		html.setFile(player.getHtmlPrefix(), filename);
+		for (int i = 0; i < 8; i++) {
+			int n = i + 1;
+			search = "Mob" + n;
+			html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName());
+		}
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(html);
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	public void showBuyTicket(L2PcInstance player, int val) {
+		if (_state != ACCEPTING_BETS) {
+			return;
+		}
+		int npcId = getTemplate().getId();
+		SystemMessage sm;
+		String filename, search, replace;
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		if (val < 10) {
+			filename = getHtmlPath(npcId, 2);
+			html.setFile(player.getHtmlPrefix(), filename);
+			for (int i = 0; i < 8; i++) {
+				int n = i + 1;
+				search = "Mob" + n;
+				html.replace(search, MonsterRace.getInstance().getMonsters()[i].getTemplate().getName());
+			}
+			search = "No1";
+			if (val == 0) {
+				html.replace(search, "");
+			} else {
+				html.replace(search, "" + val);
+				player.setRace(0, val);
+			}
+		} else if (val < 20) {
+			if (player.getRace(0) == 0) {
+				return;
+			}
+			filename = getHtmlPath(npcId, 3);
+			html.setFile(player.getHtmlPrefix(), filename);
+			html.replace("0place", "" + player.getRace(0));
+			search = "Mob1";
+			replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
+			html.replace(search, replace);
+			search = "0adena";
+			if (val == 10) {
+				html.replace(search, "");
+			} else {
+				html.replace(search, "" + _cost[val - 11]);
+				player.setRace(1, val - 10);
+			}
+		} else if (val == 20) {
+			if ((player.getRace(0) == 0) || (player.getRace(1) == 0)) {
+				return;
+			}
+			filename = getHtmlPath(npcId, 4);
+			html.setFile(player.getHtmlPrefix(), filename);
+			html.replace("0place", "" + player.getRace(0));
+			search = "Mob1";
+			replace = MonsterRace.getInstance().getMonsters()[player.getRace(0) - 1].getTemplate().getName();
+			html.replace(search, replace);
+			search = "0adena";
+			int price = _cost[player.getRace(1) - 1];
+			html.replace(search, "" + price);
+			search = "0tax";
+			int tax = 0;
+			html.replace(search, "" + tax);
+			search = "0total";
+			int total = price + tax;
+			html.replace(search, "" + total);
+		} else {
+			if ((player.getRace(0) == 0) || (player.getRace(1) == 0)) {
+				return;
+			}
+			int ticket = player.getRace(0);
+			int priceId = player.getRace(1);
+			if (!player.reduceAdena("Race", _cost[priceId - 1], this, true)) {
+				return;
+			}
+			player.setRace(0, 0);
+			player.setRace(1, 0);
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_S2);
+			sm.addInt(_raceNumber);
+			sm.addItemName(4443);
+			player.sendPacket(sm);
+			final var objectId = IdFactory.getInstance().getNextId();
+			final var item = new L2ItemInstance(objectId, 4443);
+			item.setCount(1);
+			item.setEnchantLevel(_raceNumber);
+			item.setCustomType1(ticket);
+			item.setCustomType2(_cost[priceId - 1] / 100);
+			player.getInventory().addItem("Race", item, player, this);
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addItem(item);
+			final var adenaupdate = player.getInventory().getItemByItemId(Inventory.ADENA_ID);
+			iu.addModifiedItem(adenaupdate);
+			player.sendPacket(iu);
+			return;
+		}
+		html.replace("1race", String.valueOf(_raceNumber));
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(html);
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	public static class Race {
+		private final Info[] _info;
+		
+		public Race(Info[] pInfo) {
+			_info = pInfo;
+		}
+		
+		public Info getLaneInfo(int lane) {
+			return _info[lane];
+		}
+		
+		public static class Info {
+			private final int _id;
+			private final int _place;
+			private final int _odds;
+			private final int _payout;
+			
+			public Info(int pId, int pPlace, int pOdds, int pPayout) {
+				_id = pId;
+				_place = pPlace;
+				_odds = pOdds;
+				_payout = pPayout;
+			}
+			
+			public int getId() {
+				return _id;
+			}
+			
+			public int getOdds() {
+				return _odds;
+			}
+			
+			public int getPayout() {
+				return _payout;
+			}
+			
+			public int getPlace() {
+				return _place;
+			}
+		}
+		
+	}
+	
+	class RunRace implements Runnable {
+		@Override
+		public void run() {
+			_packet = new MonRaceInfo(_codes[2][0], _codes[2][1], MonsterRace.getInstance().getMonsters(), MonsterRace.getInstance().getSpeeds());
+			sendMonsterInfo();
+			ThreadPoolManager.getInstance().scheduleGeneral(new RunEnd(), 30000);
+		}
+	}
+	
+	class RunEnd implements Runnable {
+		@Override
+		public void run() {
+			makeAnnouncement(SystemMessageId.MONSRACE_FIRST_PLACE_S1_SECOND_S2);
+			makeAnnouncement(SystemMessageId.MONSRACE_S1_RACE_END);
+			_raceNumber++;
+			
+			for (int i = 0; i < 8; i++) {
+				broadcast(new DeleteObject(MonsterRace.getInstance().getMonsters()[i]));
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java
new file mode 100644
index 00000000..2e0040be
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
+import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This class manages all RaidBoss.<br>
+ * In a group mob, there are one master called RaidBoss and several slaves called Minions.
+ */
+public class L2RaidBossInstance extends L2MonsterInstance {
+	private static final int RAID_BOSS_MAINTENANCE_INTERVAL = 30000; // 30 sec
+	
+	private RaidBossSpawnManager.StatusEnum _raidStatus;
+	private boolean _useRaidCurse = true;
+	
+	public L2RaidBossInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2RaidBossInstance);
+		setIsRaid(true);
+		setLethalable(false);
+	}
+	
+	@Override
+	public void onSpawn() {
+		setIsNoRndWalk(true);
+		super.onSpawn();
+	}
+	
+	@Override
+	protected int getMaintenanceInterval() {
+		return RAID_BOSS_MAINTENANCE_INTERVAL;
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		final L2PcInstance player = killer.getActingPlayer();
+		if (player != null) {
+			broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.RAID_WAS_SUCCESSFUL));
+			if (player.getParty() != null) {
+				for (L2PcInstance member : player.getParty().getMembers()) {
+					RaidBossPointsManager.getInstance().addPoints(member, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
+					if (member.isNoble()) {
+						Hero.getInstance().setRBkilled(member.getObjectId(), getId());
+					}
+				}
+			} else {
+				RaidBossPointsManager.getInstance().addPoints(player, getId(), (getLevel() / 2) + Rnd.get(-5, 5));
+				if (player.isNoble()) {
+					Hero.getInstance().setRBkilled(player.getObjectId(), getId());
+				}
+			}
+		}
+		
+		RaidBossSpawnManager.getInstance().updateStatus(this, true);
+		return true;
+	}
+	
+	/**
+	 * Spawn all minions at a regular interval Also if boss is too far from home location at the time of this check, teleport it home.
+	 */
+	@Override
+	protected void startMaintenanceTask() {
+		_maintenanceTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this::checkAndReturnToSpawn, 60000, getMaintenanceInterval() + Rnd.get(5000));
+	}
+	
+	protected void checkAndReturnToSpawn() {
+		if (isDead() || isMovementDisabled() || !canReturnToSpawnPoint()) {
+			return;
+		}
+		
+		final L2Spawn spawn = getSpawn();
+		if (spawn == null) {
+			return;
+		}
+		
+		final int spawnX = spawn.getX();
+		final int spawnY = spawn.getY();
+		final int spawnZ = spawn.getZ();
+		
+		if (!isInCombat() && !isMovementDisabled()) {
+			if (!isInsideRadius(spawnX, spawnY, spawnZ, Math.max(npc().getMaxDriftRange(), 200), true, false)) {
+				teleToLocation(spawnX, spawnY, spawnZ, false);
+			}
+		}
+	}
+	
+	public void setRaidStatus(RaidBossSpawnManager.StatusEnum status) {
+		_raidStatus = status;
+	}
+	
+	public RaidBossSpawnManager.StatusEnum getRaidStatus() {
+		return _raidStatus;
+	}
+	
+	@Override
+	public float getVitalityPoints(int damage) {
+		return -super.getVitalityPoints(damage) / 100;
+	}
+	
+	@Override
+	public boolean useVitalityRate() {
+		return false;
+	}
+	
+	public void setUseRaidCurse(boolean val) {
+		_useRaidCurse = val;
+	}
+	
+	@Override
+	public boolean giveRaidCurse() {
+		return _useRaidCurse;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RiftInvaderInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RiftInvaderInstance.java
new file mode 100644
index 00000000..b8a18ac5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2RiftInvaderInstance.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public class L2RiftInvaderInstance extends L2MonsterInstance {
+	// Not longer needed since rift monster targeting control now is handled by the room zones for any mob
+	public L2RiftInvaderInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2RiftInvaderInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java
new file mode 100644
index 00000000..ca67b3c3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherMonsterInstance.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.concurrent.Future;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+
+/**
+ * Sepulcher Monster.
+ * @author sandman
+ */
+public class L2SepulcherMonsterInstance extends L2MonsterInstance {
+	protected static final SkillHolder FAKE_PETRIFICATION = new SkillHolder(4616, 1);
+	
+	public int mysteriousBoxId = 0;
+	
+	protected Future<?> _victimSpawnKeyBoxTask = null;
+	protected Future<?> _victimShout = null;
+	protected Future<?> _changeImmortalTask = null;
+	protected Future<?> _onDeadEventTask = null;
+	
+	public L2SepulcherMonsterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2SepulcherMonsterInstance);
+		setShowSummonAnimation(true);
+		switch (template.getId()) {
+			case 25339, 25342, 25346, 25349 -> setIsRaid(true);
+		}
+	}
+	
+	@Override
+	public void onSpawn() {
+		setShowSummonAnimation(false);
+		switch (getId()) {
+			case 18150:
+			case 18151:
+			case 18152:
+			case 18153:
+			case 18154:
+			case 18155:
+			case 18156:
+			case 18157:
+				if (_victimSpawnKeyBoxTask != null) {
+					_victimSpawnKeyBoxTask.cancel(true);
+				}
+				_victimSpawnKeyBoxTask = ThreadPoolManager.getInstance().scheduleEffect(new VictimSpawnKeyBox(this), 300000);
+				if (_victimShout != null) {
+					_victimShout.cancel(true);
+				}
+				_victimShout = ThreadPoolManager.getInstance().scheduleEffect(new VictimShout(this), 5000);
+				break;
+			case 18196:
+			case 18197:
+			case 18198:
+			case 18199:
+			case 18200:
+			case 18201:
+			case 18202:
+			case 18203:
+			case 18204:
+			case 18205:
+			case 18206:
+			case 18207:
+			case 18208:
+			case 18209:
+			case 18210:
+			case 18211:
+			case 18256:
+				break;
+			case 18231:
+			case 18232:
+			case 18233:
+			case 18234:
+			case 18235:
+			case 18236:
+			case 18237:
+			case 18238:
+			case 18239:
+			case 18240:
+			case 18241:
+			case 18242:
+			case 18243:
+				if (_changeImmortalTask != null) {
+					_changeImmortalTask.cancel(true);
+				}
+				_changeImmortalTask = ThreadPoolManager.getInstance().scheduleEffect(new ChangeImmortal(this), 1600);
+				break;
+			case 25339:
+			case 25342:
+			case 25346:
+			case 25349:
+				setIsRaid(true);
+				break;
+		}
+		super.onSpawn();
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		switch (getId()) {
+			case 18120:
+			case 18121:
+			case 18122:
+			case 18123:
+			case 18124:
+			case 18125:
+			case 18126:
+			case 18127:
+			case 18128:
+			case 18129:
+			case 18130:
+			case 18131:
+			case 18149:
+			case 18158:
+			case 18159:
+			case 18160:
+			case 18161:
+			case 18162:
+			case 18163:
+			case 18164:
+			case 18165:
+			case 18183:
+			case 18184:
+			case 18212:
+			case 18213:
+			case 18214:
+			case 18215:
+			case 18216:
+			case 18217:
+			case 18218:
+			case 18219:
+				if (_onDeadEventTask != null) {
+					_onDeadEventTask.cancel(true);
+				}
+				_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+				break;
+			
+			case 18150:
+			case 18151:
+			case 18152:
+			case 18153:
+			case 18154:
+			case 18155:
+			case 18156:
+			case 18157:
+				if (_victimSpawnKeyBoxTask != null) {
+					_victimSpawnKeyBoxTask.cancel(true);
+					_victimSpawnKeyBoxTask = null;
+				}
+				if (_victimShout != null) {
+					_victimShout.cancel(true);
+					_victimShout = null;
+				}
+				if (_onDeadEventTask != null) {
+					_onDeadEventTask.cancel(true);
+				}
+				_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+				break;
+			
+			case 18141:
+			case 18142:
+			case 18143:
+			case 18144:
+			case 18145:
+			case 18146:
+			case 18147:
+			case 18148:
+				if (FourSepulchersManager.getInstance().isViscountMobsAnnihilated(mysteriousBoxId)) {
+					if (_onDeadEventTask != null) {
+						_onDeadEventTask.cancel(true);
+					}
+					_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+				}
+				break;
+			
+			case 18220:
+			case 18221:
+			case 18222:
+			case 18223:
+			case 18224:
+			case 18225:
+			case 18226:
+			case 18227:
+			case 18228:
+			case 18229:
+			case 18230:
+			case 18231:
+			case 18232:
+			case 18233:
+			case 18234:
+			case 18235:
+			case 18236:
+			case 18237:
+			case 18238:
+			case 18239:
+			case 18240:
+				if (FourSepulchersManager.getInstance().isDukeMobsAnnihilated(mysteriousBoxId)) {
+					if (_onDeadEventTask != null) {
+						_onDeadEventTask.cancel(true);
+					}
+					_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 3500);
+				}
+				break;
+			
+			case 25339:
+			case 25342:
+			case 25346:
+			case 25349:
+				if (_onDeadEventTask != null) {
+					_onDeadEventTask.cancel(true);
+				}
+				_onDeadEventTask = ThreadPoolManager.getInstance().scheduleEffect(new OnDeadEvent(this), 8500);
+				break;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (_victimSpawnKeyBoxTask != null) {
+			_victimSpawnKeyBoxTask.cancel(true);
+			_victimSpawnKeyBoxTask = null;
+		}
+		if (_onDeadEventTask != null) {
+			_onDeadEventTask.cancel(true);
+			_onDeadEventTask = null;
+		}
+		
+		return super.deleteMe();
+	}
+	
+	private class VictimShout implements Runnable {
+		private final L2SepulcherMonsterInstance _activeChar;
+		
+		public VictimShout(L2SepulcherMonsterInstance activeChar) {
+			_activeChar = activeChar;
+		}
+		
+		@Override
+		public void run() {
+			if (_activeChar.isDead()) {
+				return;
+			}
+			
+			if (!_activeChar.isVisible()) {
+				return;
+			}
+			
+			broadcastPacket(new NpcSay(getObjectId(), 0, getId(), "forgive me!!"));
+		}
+	}
+	
+	private class VictimSpawnKeyBox implements Runnable {
+		private final L2SepulcherMonsterInstance _activeChar;
+		
+		public VictimSpawnKeyBox(L2SepulcherMonsterInstance activeChar) {
+			_activeChar = activeChar;
+		}
+		
+		@Override
+		public void run() {
+			if (_activeChar.isDead()) {
+				return;
+			}
+			
+			if (!_activeChar.isVisible()) {
+				return;
+			}
+			
+			FourSepulchersManager.getInstance().spawnKeyBox(_activeChar);
+			broadcastPacket(new NpcSay(getObjectId(), 0, getId(), "Many thanks for rescue me."));
+			if (_victimShout != null) {
+				_victimShout.cancel(true);
+			}
+			
+		}
+	}
+	
+	private static class OnDeadEvent implements Runnable {
+		L2SepulcherMonsterInstance _activeChar;
+		
+		public OnDeadEvent(L2SepulcherMonsterInstance activeChar) {
+			_activeChar = activeChar;
+		}
+		
+		@Override
+		public void run() {
+			switch (_activeChar.getId()) {
+				case 18120, 18121, 18122, 18123, 18124, 18125, 18126, 18127, 18128, 18129, 18130, 18131, 18149, 18158, 18159, 18160, 18161, 18162, 18163, 18164, 18165, 18183, 18184, 18212, 18213, 18214, 18215, 18216, 18217, 18218, 18219 -> FourSepulchersManager.getInstance().spawnKeyBox(_activeChar);
+				case 18150, 18151, 18152, 18153, 18154, 18155, 18156, 18157 -> FourSepulchersManager.getInstance().spawnExecutionerOfHalisha(_activeChar);
+				case 18141, 18142, 18143, 18144, 18145, 18146, 18147, 18148 -> FourSepulchersManager.getInstance().spawnMonster(_activeChar.mysteriousBoxId);
+				case 18220, 18221, 18222, 18223, 18224, 18225, 18226, 18227, 18228, 18229, 18230, 18231, 18232, 18233, 18234, 18235, 18236, 18237, 18238, 18239, 18240 -> FourSepulchersManager.getInstance().spawnArchonOfHalisha(_activeChar.mysteriousBoxId);
+				case 25339, 25342, 25346, 25349 -> FourSepulchersManager.getInstance().spawnEmperorsGraveNpc(_activeChar.mysteriousBoxId);
+			}
+		}
+	}
+	
+	private static class ChangeImmortal implements Runnable {
+		L2SepulcherMonsterInstance activeChar;
+		
+		public ChangeImmortal(L2SepulcherMonsterInstance mob) {
+			activeChar = mob;
+		}
+		
+		@Override
+		public void run() {
+			// Invulnerable by petrification
+			FAKE_PETRIFICATION.getSkill().applyEffects(activeChar, activeChar);
+		}
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
new file mode 100644
index 00000000..5e5ab5a6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SepulcherNpcInstance.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.FourSepulchersManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcFirstTalk;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Sepulcher.
+ * @author sandman
+ */
+public class L2SepulcherNpcInstance extends L2Npc {
+	private static final Logger LOG = LoggerFactory.getLogger(L2SepulcherNpcInstance.class);
+	protected Future<?> _closeTask = null;
+	protected Future<?> _spawnNextMysteriousBoxTask = null;
+	protected Future<?> _spawnMonsterTask = null;
+	
+	private static final String HTML_FILE_PATH = "data/html/SepulcherNpc/";
+	private static final int HALLS_KEY = 7260;
+	
+	public L2SepulcherNpcInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2SepulcherNpcInstance);
+		setShowSummonAnimation(true);
+		
+		if (_closeTask != null) {
+			_closeTask.cancel(true);
+		}
+		if (_spawnNextMysteriousBoxTask != null) {
+			_spawnNextMysteriousBoxTask.cancel(true);
+		}
+		if (_spawnMonsterTask != null) {
+			_spawnMonsterTask.cancel(true);
+		}
+		_closeTask = null;
+		_spawnNextMysteriousBoxTask = null;
+		_spawnMonsterTask = null;
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		setShowSummonAnimation(false);
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (_closeTask != null) {
+			_closeTask.cancel(true);
+			_closeTask = null;
+		}
+		if (_spawnNextMysteriousBoxTask != null) {
+			_spawnNextMysteriousBoxTask.cancel(true);
+			_spawnNextMysteriousBoxTask = null;
+		}
+		if (_spawnMonsterTask != null) {
+			_spawnMonsterTask.cancel(true);
+			_spawnMonsterTask = null;
+		}
+		return super.deleteMe();
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if (!canTarget(player)) {
+			return;
+		}
+		
+		// Check if the L2PcInstance already target the L2NpcInstance
+		if (this != player.getTarget()) {
+			if (general().debug()) {
+				LOG.debug("new target selected: {}", getObjectId());
+			}
+			
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			// Check if the player is attackable (without a forced attack) and
+			// isn't dead
+			if (isAutoAttackable(player) && !isAlikeDead()) {
+				// Check the height difference
+				if (Math.abs(player.getZ() - getZ()) < 400) // this max height
+				// difference might
+				// need some tweaking
+				{
+					// Set the L2PcInstance Intention to AI_INTENTION_ATTACK
+					player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+				} else {
+					// Send a Server->Client packet ActionFailed (target is out
+					// of attack range) to the L2PcInstance player
+					player.sendPacket(ActionFailed.STATIC_PACKET);
+				}
+			}
+			
+			if (!isAutoAttackable(player)) {
+				// Calculate the distance between the L2PcInstance and the
+				// L2NpcInstance
+				if (!canInteract(player)) {
+					// Notify the L2PcInstance AI with AI_INTENTION_INTERACT
+					player.getAI().setIntention(CtrlIntention.AI_INTENTION_INTERACT, this);
+				} else {
+					// Send a Server->Client packet SocialAction to the all
+					// L2PcInstance on the _knownPlayer of the L2NpcInstance
+					// to display a social action of the L2NpcInstance on their
+					// client
+					SocialAction sa = new SocialAction(getObjectId(), Rnd.get(8));
+					broadcastPacket(sa);
+					
+					doAction(player);
+				}
+			}
+			// Send a Server->Client ActionFailed to the L2PcInstance in order
+			// to avoid that the client wait another packet
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	private void doAction(L2PcInstance player) {
+		if (isDead()) {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		switch (getId()) {
+			case 31468, 31469, 31470, 31471, 31472, 31473, 31474, 31475, 31476, 31477, 31478, 31479, 31480, 31481, 31482, 31483, 31484, 31485, 31486, 31487 -> {
+				setIsInvul(false);
+				reduceCurrentHp(getMaxHp() + 1, player, null);
+				if (_spawnMonsterTask != null) {
+					_spawnMonsterTask.cancel(true);
+				}
+				_spawnMonsterTask = ThreadPoolManager.getInstance().scheduleEffect(new SpawnMonster(getId()), 3500);
+			}
+			case 31455, 31456, 31457, 31458, 31459, 31460, 31461, 31462, 31463, 31464, 31465, 31466, 31467 -> {
+				setIsInvul(false);
+				reduceCurrentHp(getMaxHp() + 1, player, null);
+				if ((player.getParty() != null) && !player.getParty().isLeader(player)) {
+					player = player.getParty().getLeader();
+				}
+				player.addItem("Quest", HALLS_KEY, 1, player, true);
+			}
+			default -> {
+				if (hasListener(EventType.NPC_QUEST_START)) {
+					player.setLastQuestNpcObject(getObjectId());
+				}
+				
+				if (hasListener(EventType.NPC_FIRST_TALK)) {
+					EventDispatcher.getInstance().notifyEventAsync(new NpcFirstTalk(this, player), this);
+				} else {
+					showChatWindow(player, 0);
+				}
+			}
+		}
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public String getHtmlPath(int npcId, int val) {
+		String pom;
+		if (val == 0) {
+			pom = "" + npcId;
+		} else {
+			pom = npcId + "-" + val;
+		}
+		return HTML_FILE_PATH + pom + ".htm";
+	}
+	
+	@Override
+	public void showChatWindow(L2PcInstance player, int val) {
+		String filename = getHtmlPath(getId(), val);
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), filename);
+		html.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(html);
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		if (isBusy()) {
+			final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+			html.setFile(player.getHtmlPrefix(), "data/html/npcbusy.htm");
+			html.replace("%busymessage%", getBusyMessage());
+			html.replace("%npcname%", getName());
+			html.replace("%playername%", player.getName());
+			player.sendPacket(html);
+		} else if (command.startsWith("Chat")) {
+			int val = 0;
+			try {
+				val = Integer.parseInt(command.substring(5));
+			} catch (Exception ex) {
+				
+			}
+			showChatWindow(player, val);
+		} else if (command.startsWith("open_gate")) {
+			L2ItemInstance hallsKey = player.getInventory().getItemByItemId(HALLS_KEY);
+			if (hallsKey == null) {
+				showHtmlFile(player, "Gatekeeper-no.htm");
+			} else if (FourSepulchersManager.getInstance().isAttackTime()) {
+				switch (getId()) {
+					case 31929:
+					case 31934:
+					case 31939:
+					case 31944:
+						FourSepulchersManager.getInstance().spawnShadow(getId());
+					default: {
+						openNextDoor(getId());
+						if (player.getParty() != null) {
+							for (L2PcInstance mem : player.getParty().getMembers()) {
+								if ((mem != null) && (mem.getInventory().getItemByItemId(HALLS_KEY) != null)) {
+									mem.destroyItemByItemId("Quest", HALLS_KEY, mem.getInventory().getItemByItemId(HALLS_KEY).getCount(), mem, true);
+								}
+							}
+						} else {
+							player.destroyItemByItemId("Quest", HALLS_KEY, hallsKey.getCount(), player, true);
+						}
+					}
+				}
+			}
+		} else {
+			super.onBypassFeedback(player, command);
+		}
+	}
+	
+	public void openNextDoor(int npcId) {
+		int doorId = FourSepulchersManager.getInstance().getHallGateKeepers().get(npcId);
+		DoorData _doorTable = DoorData.getInstance();
+		_doorTable.getDoor(doorId).openMe();
+		
+		if (_closeTask != null) {
+			_closeTask.cancel(true);
+		}
+		_closeTask = ThreadPoolManager.getInstance().scheduleEffect(new CloseNextDoor(doorId), 10000);
+		if (_spawnNextMysteriousBoxTask != null) {
+			_spawnNextMysteriousBoxTask.cancel(true);
+		}
+		_spawnNextMysteriousBoxTask = ThreadPoolManager.getInstance().scheduleEffect(new SpawnNextMysteriousBox(npcId), 0);
+	}
+	
+	private static class CloseNextDoor implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(CloseNextDoor.class);
+		final DoorData _DoorTable = DoorData.getInstance();
+		
+		private final int _DoorId;
+		
+		public CloseNextDoor(int doorId) {
+			_DoorId = doorId;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_DoorTable.getDoor(_DoorId).closeMe();
+			} catch (Exception ex) {
+				LOG.warn("Error running task close next door!", ex);
+			}
+		}
+	}
+	
+	private static class SpawnNextMysteriousBox implements Runnable {
+		private final int _NpcId;
+		
+		public SpawnNextMysteriousBox(int npcId) {
+			_NpcId = npcId;
+		}
+		
+		@Override
+		public void run() {
+			FourSepulchersManager.getInstance().spawnMysteriousBox(_NpcId);
+		}
+	}
+	
+	private static class SpawnMonster implements Runnable {
+		private final int _NpcId;
+		
+		public SpawnMonster(int npcId) {
+			_NpcId = npcId;
+		}
+		
+		@Override
+		public void run() {
+			FourSepulchersManager.getInstance().spawnMonster(_NpcId);
+		}
+	}
+	
+	public void sayInShout(NpcStringId msg) {
+		if (msg == null) {
+			return;// wrong usage
+		}
+		
+		final CreatureSay creatureSay = new CreatureSay(0, Say2.NPC_SHOUT, getName(), msg);
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			if (Util.checkIfInRange(15000, player, this, true)) {
+				player.sendPacket(creatureSay);
+			}
+		}
+	}
+	
+	public void showHtmlFile(L2PcInstance player, String file) {
+		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+		html.setFile(player.getHtmlPrefix(), "data/html/SepulcherNpc/" + file);
+		html.replace("%npcname%", getName());
+		player.sendPacket(html);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
new file mode 100644
index 00000000..d9198915
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2ServitorInstance.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.concurrent.Future;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharSummonTable;
+import com.l2jserver.gameserver.data.sql.impl.SummonEffectsTable;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SetSummonRemainTime;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Servitor.
+ * @author UnAfraid
+ */
+public class L2ServitorInstance extends L2Summon implements Runnable {
+	private float _expMultiplier = 0;
+	private ItemHolder _itemConsume;
+	private int _lifeTime;
+	private int _lifeTimeRemaining;
+	private int _consumeItemInterval;
+	private int _consumeItemIntervalRemaining;
+	protected Future<?> _summonLifeTask;
+	
+	private int _referenceSkill;
+	
+	public L2ServitorInstance(int objectId, L2NpcTemplate template, L2PcInstance owner) {
+		super(objectId, template, owner);
+		setInstanceType(InstanceType.L2ServitorInstance);
+		setShowSummonAnimation(true);
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		if (_summonLifeTask == null) {
+			_summonLifeTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this, 0, 5000);
+		}
+	}
+	
+	@Override
+	public final int getLevel() {
+		return (getTemplate() != null ? getTemplate().getLevel() : 0);
+	}
+	
+	@Override
+	public int getSummonType() {
+		return 1;
+	}
+	
+	public void setExpMultiplier(float expMultiplier) {
+		_expMultiplier = expMultiplier;
+	}
+	
+	public float getExpMultiplier() {
+		return _expMultiplier;
+	}
+	
+	public void setItemConsume(ItemHolder item) {
+		_itemConsume = item;
+	}
+	
+	public ItemHolder getItemConsume() {
+		return _itemConsume;
+	}
+	
+	public void setItemConsumeInterval(int interval) {
+		_consumeItemInterval = interval;
+		_consumeItemIntervalRemaining = interval;
+	}
+	
+	public int getItemConsumeInterval() {
+		return _consumeItemInterval;
+	}
+	
+	public void setLifeTime(int lifeTime) {
+		_lifeTime = lifeTime;
+		_lifeTimeRemaining = lifeTime;
+	}
+	
+	public int getLifeTime() {
+		return _lifeTime;
+	}
+	
+	public void setLifeTimeRemaining(int time) {
+		_lifeTimeRemaining = time;
+	}
+	
+	public int getLifeTimeRemaining() {
+		return _lifeTimeRemaining;
+	}
+	
+	public void setReferenceSkill(int skillId) {
+		_referenceSkill = skillId;
+	}
+	
+	public int getReferenceSkill() {
+		return _referenceSkill;
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		if (_summonLifeTask != null) {
+			_summonLifeTask.cancel(false);
+		}
+		
+		CharSummonTable.getInstance().removeServitor(getOwner());
+		return true;
+		
+	}
+	
+	@Override
+	public void doPickupItem(L2Object object) {
+		
+	}
+	
+	@Override
+	public final void stopSkillEffects(boolean removed, int skillId) {
+		super.stopSkillEffects(removed, skillId);
+		SummonEffectsTable.getInstance().removeServitorEffects(getOwner(), getReferenceSkill(), skillId);
+	}
+	
+	@Override
+	public void storeMe() {
+		if ((_referenceSkill == 0) || isDead()) {
+			return;
+		}
+		
+		if (character().restoreServitorOnReconnect()) {
+			CharSummonTable.getInstance().saveSummon(this);
+		}
+	}
+	
+	@Override
+	public void storeEffect(boolean storeEffects) {
+		if (!character().summonStoreSkillCooltime()) {
+			return;
+		}
+		
+		if ((getOwner() == null) || getOwner().isInOlympiadMode()) {
+			return;
+		}
+		
+		// Clear list for overwrite
+		SummonEffectsTable.getInstance().clearServitorEffects(getOwner(), getReferenceSkill());
+		
+		DAOFactory.getInstance().getServitorSkillSaveDAO().insert(this, storeEffects);
+	}
+	
+	@Override
+	public void restoreEffects() {
+		if (getOwner().isInOlympiadMode()) {
+			return;
+		}
+		
+		DAOFactory.getInstance().getServitorSkillSaveDAO().load(this);
+		
+		SummonEffectsTable.getInstance().applyServitorEffects(this, getOwner(), getReferenceSkill());
+	}
+	
+	@Override
+	public void unSummon(L2PcInstance owner) {
+		if (_summonLifeTask != null) {
+			_summonLifeTask.cancel(false);
+		}
+		
+		super.unSummon(owner);
+		
+		if (!_restoreSummon) {
+			CharSummonTable.getInstance().removeServitor(owner);
+		}
+	}
+	
+	@Override
+	public boolean destroyItem(String process, int objectId, long count, L2Object reference, boolean sendMessage) {
+		return getOwner().destroyItem(process, objectId, count, reference, sendMessage);
+	}
+	
+	@Override
+	public boolean destroyItemByItemId(String process, int itemId, long count, L2Object reference, boolean sendMessage) {
+		return getOwner().destroyItemByItemId(process, itemId, count, reference, sendMessage);
+	}
+	
+	@Override
+	public byte getAttackElement() {
+		if (getOwner() != null) {
+			return getOwner().getAttackElement();
+		}
+		return super.getAttackElement();
+	}
+	
+	@Override
+	public int getAttackElementValue(byte attackAttribute) {
+		if (getOwner() != null) {
+			return (getOwner().getAttackElementValue(attackAttribute));
+		}
+		return super.getAttackElementValue(attackAttribute);
+	}
+	
+	@Override
+	public int getDefenseElementValue(byte defenseAttribute) {
+		if (getOwner() != null) {
+			return (getOwner().getDefenseElementValue(defenseAttribute));
+		}
+		return super.getDefenseElementValue(defenseAttribute);
+	}
+	
+	@Override
+	public boolean isServitor() {
+		return true;
+	}
+	
+	@Override
+	public void run() {
+		int usedTime = 5000;
+		_lifeTimeRemaining -= usedTime;
+		
+		if (isDead() || !isVisible()) {
+			if (_summonLifeTask != null) {
+				_summonLifeTask.cancel(false);
+			}
+			return;
+		}
+		
+		// check if the summon's lifetime has ran out
+		if (_lifeTimeRemaining < 0) {
+			sendPacket(SystemMessageId.SERVITOR_PASSED_AWAY);
+			unSummon(getOwner());
+			return;
+		}
+		
+		if (_consumeItemInterval > 0) {
+			_consumeItemIntervalRemaining -= usedTime;
+			
+			// check if it is time to consume another item
+			if ((_consumeItemIntervalRemaining <= 0) && (getItemConsume().getCount() > 0) && (getItemConsume().getId() > 0) && !isDead()) {
+				if (destroyItemByItemId("Consume", getItemConsume().getId(), getItemConsume().getCount(), this, false)) {
+					final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.SUMMONED_MOB_USES_S1);
+					msg.addItemName(getItemConsume().getId());
+					sendPacket(msg);
+					
+					// Reset
+					_consumeItemIntervalRemaining = _consumeItemInterval;
+				} else {
+					sendPacket(SystemMessageId.SERVITOR_DISAPPEARED_NOT_ENOUGH_ITEMS);
+					unSummon(getOwner());
+				}
+			}
+		}
+		
+		sendPacket(new SetSummonRemainTime(getLifeTime(), _lifeTimeRemaining));
+		updateEffectIcons();
+	}
+	
+	@Override
+	public double getMAtk(L2Character target, Skill skill) {
+		return super.getMAtk(target, skill) + (getActingPlayer().getMAtk(target, skill) * (getActingPlayer().getServitorShareBonus(Stats.MAGIC_ATTACK) - 1.0));
+	}
+	
+	@Override
+	public double getMDef(L2Character target, Skill skill) {
+		return super.getMDef(target, skill) + (getActingPlayer().getMDef(target, skill) * (getActingPlayer().getServitorShareBonus(Stats.MAGIC_DEFENCE) - 1.0));
+	}
+	
+	@Override
+	public double getPAtk(L2Character target) {
+		return super.getPAtk(target) + (getActingPlayer().getPAtk(target) * (getActingPlayer().getServitorShareBonus(Stats.POWER_ATTACK) - 1.0));
+	}
+	
+	@Override
+	public double getPDef(L2Character target) {
+		return super.getPDef(target) + (getActingPlayer().getPDef(target) * (getActingPlayer().getServitorShareBonus(Stats.POWER_DEFENCE) - 1.0));
+	}
+	
+	@Override
+	public int getMAtkSpd() {
+		return (int) (super.getMAtkSpd() + (getActingPlayer().getMAtkSpd() * (getActingPlayer().getServitorShareBonus(Stats.MAGIC_ATTACK_SPEED) - 1.0)));
+	}
+	
+	@Override
+	public int getMaxHp() {
+		return (int) (super.getMaxHp() + (getActingPlayer().getMaxHp() * (getActingPlayer().getServitorShareBonus(Stats.MAX_HP) - 1.0)));
+	}
+	
+	@Override
+	public int getMaxMp() {
+		return (int) (super.getMaxMp() + (getActingPlayer().getMaxMp() * (getActingPlayer().getServitorShareBonus(Stats.MAX_MP) - 1.0)));
+	}
+	
+	@Override
+	public int getCriticalHit(L2Character target, Skill skill) {
+		return (int) (super.getCriticalHit(target, skill) + ((getActingPlayer().getCriticalHit(target, skill)) * (getActingPlayer().getServitorShareBonus(Stats.CRITICAL_RATE) - 1.0)));
+	}
+	
+	@Override
+	public double getPAtkSpd() {
+		return super.getPAtkSpd() + (getActingPlayer().getPAtkSpd() * (getActingPlayer().getServitorShareBonus(Stats.POWER_ATTACK_SPEED) - 1.0));
+	}
+	
+	@Override
+	public int getMaxRecoverableHp() {
+		return (int) calcStat(Stats.MAX_RECOVERABLE_HP, getMaxHp());
+	}
+	
+	@Override
+	public int getMaxRecoverableMp() {
+		return (int) calcStat(Stats.MAX_RECOVERABLE_MP, getMaxMp());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java
new file mode 100644
index 00000000..91cc1c60
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2SiegeFlagInstance.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.status.SiegeFlagStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.entity.Siegable;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class L2SiegeFlagInstance extends L2Npc {
+	private final L2Clan _clan;
+	private Siegable _siege;
+	private final boolean _isAdvanced;
+	private boolean _canTalk;
+	
+	public L2SiegeFlagInstance(int objectId, L2PcInstance player, L2NpcTemplate template, boolean advanced, boolean outPost) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2SiegeFlagInstance);
+		
+		if (TerritoryWarManager.getInstance().isTWInProgress()) {
+			_clan = player.getClan();
+			_canTalk = false;
+			if (_clan == null) {
+				deleteMe();
+			}
+			if (outPost) {
+				_isAdvanced = false;
+				setIsInvul(true);
+			} else {
+				_isAdvanced = advanced;
+				setIsInvul(false);
+			}
+			getStatus();
+			return;
+		}
+		_clan = player.getClan();
+		_canTalk = true;
+		_siege = SiegeManager.getInstance().getSiege(player.getX(), player.getY(), player.getZ());
+		if (_siege == null) {
+			_siege = FortSiegeManager.getInstance().getSiege(player.getX(), player.getY(), player.getZ());
+		}
+		if (_siege == null) {
+			_siege = ClanHallSiegeManager.getInstance().getSiege(player);
+		}
+		if ((_clan == null) || (_siege == null)) {
+			throw new NullPointerException(getClass().getSimpleName() + ": Initialization failed.");
+		}
+		
+		L2SiegeClan sc = _siege.getAttackerClan(_clan);
+		if (sc == null) {
+			throw new NullPointerException(getClass().getSimpleName() + ": Cannot find siege clan.");
+		}
+		
+		sc.addFlag(this);
+		_isAdvanced = advanced;
+		getStatus();
+		setIsInvul(false);
+	}
+	
+	@Override
+	public boolean canBeAttacked() {
+		return !(isInvul() || isHpBlocked());
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return !(isInvul() || isHpBlocked());
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		if ((_siege != null) && (_clan != null)) {
+			L2SiegeClan sc = _siege.getAttackerClan(_clan);
+			if (sc != null) {
+				sc.removeFlag(this);
+			}
+		} else if (_clan != null) {
+			TerritoryWarManager.getInstance().removeClanFlag(_clan);
+		}
+		return true;
+	}
+	
+	@Override
+	public void onForcedAttack(L2PcInstance player) {
+		onAction(player);
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if ((player == null) || !canTarget(player)) {
+			return;
+		}
+		
+		// Check if the L2PcInstance already target the L2NpcInstance
+		if (this != player.getTarget()) {
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			if (isAutoAttackable(player) && (Math.abs(player.getZ() - getZ()) < 100)) {
+				player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+			} else {
+				// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+	
+	public boolean isAdvancedHeadquarter() {
+		return _isAdvanced;
+	}
+	
+	@Override
+	public SiegeFlagStatus getStatus() {
+		return (SiegeFlagStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new SiegeFlagStatus(this));
+	}
+	
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, Skill skill) {
+		super.reduceCurrentHp(damage, attacker, skill);
+		if (canTalk()) {
+			if (((getCastle() != null) && getCastle().getSiege().isInProgress()) || ((getFort() != null) && getFort().getSiege().isInProgress()) || ((getConquerableHall() != null) && getConquerableHall().isInSiege())) {
+				if (_clan != null) {
+					// send warning to owners of headquarters that theirs base is under attack
+					_clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.BASE_UNDER_ATTACK));
+					setCanTalk(false);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTalkTask(), 20000);
+				}
+			}
+		}
+	}
+	
+	private class ScheduleTalkTask implements Runnable {
+		
+		public ScheduleTalkTask() {
+		}
+		
+		@Override
+		public void run() {
+			setCanTalk(true);
+		}
+	}
+	
+	void setCanTalk(boolean val) {
+		_canTalk = val;
+	}
+	
+	private boolean canTalk() {
+		return _canTalk;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2StaticObjectInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2StaticObjectInstance.java
new file mode 100644
index 00000000..67061b81
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2StaticObjectInstance.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.knownlist.StaticObjectKnownList;
+import com.l2jserver.gameserver.model.actor.stat.StaticObjStat;
+import com.l2jserver.gameserver.model.actor.status.StaticObjStatus;
+import com.l2jserver.gameserver.model.actor.templates.L2CharTemplate;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.ShowTownMap;
+import com.l2jserver.gameserver.network.serverpackets.StaticObject;
+
+/**
+ * Static Object instance.
+ * @author godson
+ */
+public final class L2StaticObjectInstance extends L2Character {
+	/** The interaction distance of the L2StaticObjectInstance */
+	public static final int INTERACTION_DISTANCE = 150;
+	public static final int MAP = 0;
+	public static final int CHAIR_THRONE = 1;
+	public static final int SIGNBOARD = 2;
+	public static final int FLAGPOLE = 3;
+	
+	private final int _staticObjectId;
+	private int _meshIndex = 0; // 0 - static objects, alternate static objects
+	private int _type = -1; // 0 - map signs, 1 - throne , 2 - arena signs, 3 - flagpole
+	private ShowTownMap _map;
+	
+	public L2StaticObjectInstance(int objectId, L2CharTemplate template, int staticId) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2StaticObjectInstance);
+		_staticObjectId = staticId;
+	}
+	
+	@Override
+	protected L2CharacterAI initAI() {
+		return null;
+	}
+	
+	@Override
+	public int getId() {
+		return _staticObjectId;
+	}
+	
+	@Override
+	public StaticObjectKnownList getKnownList() {
+		return (StaticObjectKnownList) super.getKnownList();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new StaticObjectKnownList(this));
+	}
+	
+	@Override
+	public StaticObjStat getStat() {
+		return (StaticObjStat) super.getStat();
+	}
+	
+	@Override
+	public void initCharStat() {
+		setStat(new StaticObjStat(this));
+	}
+	
+	@Override
+	public StaticObjStatus getStatus() {
+		return (StaticObjStatus) super.getStatus();
+	}
+	
+	@Override
+	public void initCharStatus() {
+		setStatus(new StaticObjStatus(this));
+	}
+	
+	public int getType() {
+		return _type;
+	}
+	
+	public void setType(int type) {
+		_type = type;
+	}
+	
+	public void setMap(String texture, int x, int y) {
+		_map = new ShowTownMap("town_map." + texture, x, y);
+	}
+	
+	public ShowTownMap getMap() {
+		return _map;
+	}
+	
+	@Override
+	public int getLevel() {
+		return 1;
+	}
+	
+	@Override
+	public L2ItemInstance getActiveWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		return null;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return false;
+	}
+	
+	/**
+	 * Set the meshIndex of the object.<br>
+	 * <B><U> Values </U> :</B>
+	 * <ul>
+	 * <li>default textures : 0</li>
+	 * <li>alternate textures : 1</li>
+	 * </ul>
+	 * @param meshIndex
+	 */
+	public void setMeshIndex(int meshIndex) {
+		_meshIndex = meshIndex;
+		this.broadcastPacket(new StaticObject(this));
+	}
+	
+	/**
+	 * <B><U> Values </U> :</B>
+	 * <ul>
+	 * <li>default textures : 0</li>
+	 * <li>alternate textures : 1</li>
+	 * </ul>
+	 * @return the meshIndex of the object
+	 */
+	public int getMeshIndex() {
+		return _meshIndex;
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		activeChar.sendPacket(new StaticObject(this));
+	}
+	
+	@Override
+	public void moveToLocation(int x, int y, int z, int offset) {
+	}
+	
+	@Override
+	public void stopMove(Location loc) {
+	}
+	
+	@Override
+	public void doAttack(L2Character target) {
+	}
+	
+	@Override
+	public void doCast(Skill skill) {
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
new file mode 100644
index 00000000..9138ae80
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TamedBeastInstance.java
@@ -0,0 +1,485 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Future;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.StopMove;
+
+// While a tamed beast behaves a lot like a pet (ingame) and does have
+// an owner, in all other aspects, it acts like a mob.
+// In addition, it can be fed in order to increase its duration.
+// This class handles the running tasks, AI, and feed of the mob.
+// The (mostly optional) AI on feeding the spawn is handled by the datapack ai script
+public final class L2TamedBeastInstance extends L2FeedableBeastInstance {
+	private int _foodSkillId;
+	private static final int MAX_DISTANCE_FROM_HOME = 30000;
+	private static final int MAX_DISTANCE_FROM_OWNER = 2000;
+	private static final int MAX_DURATION = 1200000; // 20 minutes
+	private static final int DURATION_CHECK_INTERVAL = 60000; // 1 minute
+	private static final int DURATION_INCREASE_INTERVAL = 20000; // 20 secs (gained upon feeding)
+	private static final int BUFF_INTERVAL = 5000; // 5 seconds
+	private int _remainingTime = MAX_DURATION;
+	private int _homeX, _homeY, _homeZ;
+	protected L2PcInstance _owner;
+	private Future<?> _buffTask = null;
+	private Future<?> _durationCheckTask = null;
+	protected boolean _isFreyaBeast;
+	private List<Skill> _beastSkills = null;
+	
+	public L2TamedBeastInstance(int objectId, int npcTemplateId) {
+		super(objectId, NpcData.getInstance().getTemplate(npcTemplateId));
+		setInstanceType(InstanceType.L2TamedBeastInstance);
+		setHome(this);
+	}
+	
+	public L2TamedBeastInstance(int objectId, int npcTemplateId, L2PcInstance owner, int foodSkillId, int x, int y, int z) {
+		super(objectId, NpcData.getInstance().getTemplate(npcTemplateId));
+		_isFreyaBeast = false;
+		setInstanceType(InstanceType.L2TamedBeastInstance);
+		setCurrentHp(getMaxHp());
+		setCurrentMp(getMaxMp());
+		setOwner(owner);
+		setFoodType(foodSkillId);
+		setHome(x, y, z);
+		spawnMe(x, y, z);
+	}
+	
+	public L2TamedBeastInstance(int objectId, int npcTemplateId, L2PcInstance owner, int food, int x, int y, int z, boolean isFreyaBeast) {
+		super(objectId, NpcData.getInstance().getTemplate(npcTemplateId));
+		_isFreyaBeast = isFreyaBeast;
+		setInstanceType(InstanceType.L2TamedBeastInstance);
+		setCurrentHp(getMaxHp());
+		setCurrentMp(getMaxMp());
+		setFoodType(food);
+		setHome(x, y, z);
+		spawnMe(x, y, z);
+		setOwner(owner);
+		if (isFreyaBeast) {
+			getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner);
+		}
+	}
+	
+	public void onReceiveFood() {
+		// Eating food extends the duration by 20secs, to a max of 20minutes
+		_remainingTime = _remainingTime + DURATION_INCREASE_INTERVAL;
+		if (_remainingTime > MAX_DURATION) {
+			_remainingTime = MAX_DURATION;
+		}
+	}
+	
+	public Location getHome() {
+		return new Location(_homeX, _homeY, _homeZ);
+	}
+	
+	public void setHome(int x, int y, int z) {
+		_homeX = x;
+		_homeY = y;
+		_homeZ = z;
+	}
+	
+	public void setHome(L2Character c) {
+		setHome(c.getX(), c.getY(), c.getZ());
+	}
+	
+	public int getRemainingTime() {
+		return _remainingTime;
+	}
+	
+	public void setRemainingTime(int duration) {
+		_remainingTime = duration;
+	}
+	
+	public int getFoodType() {
+		return _foodSkillId;
+	}
+	
+	public void setFoodType(int foodItemId) {
+		if (foodItemId > 0) {
+			_foodSkillId = foodItemId;
+			
+			// start the duration checks
+			// start the buff tasks
+			if (_durationCheckTask != null) {
+				_durationCheckTask.cancel(true);
+			}
+			_durationCheckTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new CheckDuration(this), DURATION_CHECK_INTERVAL, DURATION_CHECK_INTERVAL);
+		}
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		if (!super.doDie(killer)) {
+			return false;
+		}
+		
+		getAI().stopFollow();
+		if (_buffTask != null) {
+			_buffTask.cancel(true);
+		}
+		if (_durationCheckTask != null) {
+			_durationCheckTask.cancel(true);
+		}
+		
+		if (_owner != null) {
+			_owner.removeTamedBeast(this);
+		}
+		_buffTask = null;
+		_durationCheckTask = null;
+		_owner = null;
+		_foodSkillId = 0;
+		_remainingTime = 0;
+		return true;
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return !_isFreyaBeast;
+	}
+	
+	public boolean isFreyaBeast() {
+		return _isFreyaBeast;
+	}
+	
+	public void addBeastSkill(Skill skill) {
+		if (_beastSkills == null) {
+			_beastSkills = new CopyOnWriteArrayList<>();
+		}
+		_beastSkills.add(skill);
+	}
+	
+	public void castBeastSkills() {
+		if ((_owner == null) || (_beastSkills == null)) {
+			return;
+		}
+		int delay = 100;
+		for (Skill skill : _beastSkills) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new buffCast(skill), delay);
+			delay += (100 + skill.getHitTime());
+		}
+		ThreadPoolManager.getInstance().scheduleGeneral(new buffCast(null), delay);
+	}
+	
+	private class buffCast implements Runnable {
+		private final Skill _skill;
+		
+		public buffCast(Skill skill) {
+			_skill = skill;
+		}
+		
+		@Override
+		public void run() {
+			if (_skill == null) {
+				getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner);
+			} else {
+				sitCastAndFollow(_skill, _owner);
+			}
+		}
+	}
+	
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	public void setOwner(L2PcInstance owner) {
+		if (owner != null) {
+			_owner = owner;
+			setTitle(owner.getName());
+			// broadcast the new title
+			setShowSummonAnimation(true);
+			broadcastPacket(new AbstractNpcInfo.NpcInfo(this, owner));
+			
+			owner.addTamedBeast(this);
+			
+			// always and automatically follow the owner.
+			getAI().startFollow(_owner, 100);
+			
+			if (!_isFreyaBeast) {
+				// instead of calculating this value each time, let's get this now and pass it on
+				int totalBuffsAvailable = 0;
+				for (Skill skill : getTemplate().getSkills().values()) {
+					// if the skill is a buff, check if the owner has it already [ owner.getEffect(L2Skill skill) ]
+					if (skill.isContinuous() && !skill.isDebuff()) {
+						totalBuffsAvailable++;
+					}
+				}
+				
+				// start the buff tasks
+				if (_buffTask != null) {
+					_buffTask.cancel(true);
+				}
+				_buffTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new CheckOwnerBuffs(this, totalBuffsAvailable), BUFF_INTERVAL, BUFF_INTERVAL);
+			}
+		} else {
+			deleteMe(); // despawn if no owner
+		}
+	}
+	
+	public boolean isTooFarFromHome() {
+		return !isInsideRadius(_homeX, _homeY, _homeZ, MAX_DISTANCE_FROM_HOME, true, true);
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (_buffTask != null) {
+			_buffTask.cancel(true);
+		}
+		_durationCheckTask.cancel(true);
+		stopHpMpRegeneration();
+		
+		if (_owner != null) {
+			_owner.removeTamedBeast(this);
+		}
+		setTarget(null);
+		_buffTask = null;
+		_durationCheckTask = null;
+		_owner = null;
+		_foodSkillId = 0;
+		_remainingTime = 0;
+		
+		// remove the spawn
+		return super.deleteMe();
+	}
+	
+	// notification triggered by the owner when the owner is attacked.
+	// tamed mobs will heal/recharge or debuff the enemy according to their skills
+	public void onOwnerGotAttacked(L2Character attacker) {
+		// check if the owner is no longer around...if so, despawn
+		if ((_owner == null) || !_owner.isOnline()) {
+			deleteMe();
+			return;
+		}
+		// if the owner is too far away, stop anything else and immediately run towards the owner.
+		if (!_owner.isInsideRadius(this, MAX_DISTANCE_FROM_OWNER, true, true)) {
+			getAI().startFollow(_owner);
+			return;
+		}
+		// if the owner is dead, do nothing...
+		if (_owner.isDead() || _isFreyaBeast) {
+			return;
+		}
+		
+		// if the tamed beast is currently in the middle of casting, let it complete its skill...
+		if (isCastingNow()) {
+			return;
+		}
+		
+		float HPRatio = ((float) _owner.getCurrentHp()) / _owner.getMaxHp();
+		
+		// if the owner has a lot of HP, then debuff the enemy with a random debuff among the available skills
+		// use of more than one debuff at this moment is acceptable
+		if (HPRatio >= 0.8) {
+			for (Skill skill : getTemplate().getSkills().values()) {
+				// if the skill is a debuff, check if the attacker has it already [ attacker.getEffect(L2Skill skill) ]
+				if (skill.isDebuff() && (Rnd.get(3) < 1) && ((attacker != null) && attacker.isAffectedBySkill(skill.getId()))) {
+					sitCastAndFollow(skill, attacker);
+				}
+			}
+		}
+		// for HP levels between 80% and 50%, do not react to attack events (so that MP can regenerate a bit)
+		// for lower HP ranges, heal or recharge the owner with 1 skill use per attack.
+		else if (HPRatio < 0.5) {
+			int chance = 1;
+			if (HPRatio < 0.25) {
+				chance = 2;
+			}
+			
+			// if the owner has a lot of HP, then debuff the enemy with a random debuff among the available skills
+			for (Skill skill : getTemplate().getSkills().values()) {
+				// if the skill is a buff, check if the owner has it already [ owner.getEffect(L2Skill skill) ]
+				if ((Rnd.get(5) < chance) && skill.hasEffectType(L2EffectType.CP, L2EffectType.HP, L2EffectType.MANAHEAL_BY_LEVEL, L2EffectType.MANAHEAL_PERCENT)) {
+					sitCastAndFollow(skill, _owner);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Prepare and cast a skill:<br>
+	 * First smoothly prepare the beast for casting, by abandoning other actions.<br>
+	 * Next, call super.doCast(skill) in order to actually cast the spell.<br>
+	 * Finally, return to auto-following the owner.
+	 * @param skill
+	 * @param target
+	 */
+	protected void sitCastAndFollow(Skill skill, L2Character target) {
+		stopMove(null);
+		broadcastPacket(new StopMove(this));
+		getAI().setIntention(AI_INTENTION_IDLE);
+		
+		setTarget(target);
+		doCast(skill);
+		getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _owner);
+	}
+	
+	private static class CheckDuration implements Runnable {
+		private final L2TamedBeastInstance _tamedBeast;
+		
+		CheckDuration(L2TamedBeastInstance tamedBeast) {
+			_tamedBeast = tamedBeast;
+		}
+		
+		@Override
+		public void run() {
+			int foodTypeSkillId = _tamedBeast.getFoodType();
+			L2PcInstance owner = _tamedBeast.getOwner();
+			
+			L2ItemInstance item = null;
+			if (_tamedBeast._isFreyaBeast) {
+				item = owner.getInventory().getItemByItemId(foodTypeSkillId);
+				if ((item != null) && (item.getCount() >= 1)) {
+					owner.destroyItem("BeastMob", item, 1, _tamedBeast, true);
+					_tamedBeast.broadcastPacket(new SocialAction(_tamedBeast.getObjectId(), 3));
+				} else {
+					_tamedBeast.deleteMe();
+				}
+			} else {
+				_tamedBeast.setRemainingTime(_tamedBeast.getRemainingTime() - DURATION_CHECK_INTERVAL);
+				// I tried to avoid this as much as possible...but it seems I can't avoid hardcoding
+				// ids further, except by carrying an additional variable just for these two lines...
+				// Find which food item needs to be consumed.
+				if (foodTypeSkillId == 2188) {
+					item = owner.getInventory().getItemByItemId(6643);
+				} else if (foodTypeSkillId == 2189) {
+					item = owner.getInventory().getItemByItemId(6644);
+				}
+				
+				// if the owner has enough food, call the item handler (use the food and triffer all necessary actions)
+				if ((item != null) && (item.getCount() >= 1)) {
+					L2Object oldTarget = owner.getTarget();
+					owner.setTarget(_tamedBeast);
+					
+					// emulate a call to the owner using food, but bypass all checks for range, etc
+					// this also causes a call to the AI tasks handling feeding, which may call onReceiveFood as required.
+					owner.callSkill(SkillData.getInstance().getSkill(foodTypeSkillId, 1), List.of(_tamedBeast));
+					owner.setTarget(oldTarget);
+				} else {
+					// if the owner has no food, the beast immediately despawns, except when it was only
+					// newly spawned. Newly spawned beasts can last up to 5 minutes
+					if (_tamedBeast.getRemainingTime() < (MAX_DURATION - 300000)) {
+						_tamedBeast.setRemainingTime(-1);
+					}
+				}
+				// There are too many conflicting reports about whether distance from home should be taken into consideration. Disabled for now.
+				// if (_tamedBeast.isTooFarFromHome())
+				// _tamedBeast.setRemainingTime(-1);
+				
+				if (_tamedBeast.getRemainingTime() <= 0) {
+					_tamedBeast.deleteMe();
+				}
+			}
+		}
+	}
+	
+	private class CheckOwnerBuffs implements Runnable {
+		private final L2TamedBeastInstance _tamedBeast;
+		private final int _numBuffs;
+		
+		CheckOwnerBuffs(L2TamedBeastInstance tamedBeast, int numBuffs) {
+			_tamedBeast = tamedBeast;
+			_numBuffs = numBuffs;
+		}
+		
+		@Override
+		public void run() {
+			L2PcInstance owner = _tamedBeast.getOwner();
+			
+			// check if the owner is no longer around...if so, despawn
+			if ((owner == null) || !owner.isOnline()) {
+				deleteMe();
+				return;
+			}
+			// if the owner is too far away, stop anything else and immediately run towards the owner.
+			if (!isInsideRadius(owner, MAX_DISTANCE_FROM_OWNER, true, true)) {
+				getAI().startFollow(owner);
+				return;
+			}
+			// if the owner is dead, do nothing...
+			if (owner.isDead()) {
+				return;
+			}
+			// if the tamed beast is currently casting a spell, do not interfere (do not attempt to cast anything new yet).
+			if (isCastingNow()) {
+				return;
+			}
+			
+			int totalBuffsOnOwner = 0;
+			int i = 0;
+			int rand = Rnd.get(_numBuffs);
+			Skill buffToGive = null;
+			
+			// get this npc's skills: getSkills()
+			for (Skill skill : _tamedBeast.getTemplate().getSkills().values()) {
+				// if the skill is a buff, check if the owner has it already [ owner.getEffect(L2Skill skill) ]
+				if (skill.isContinuous() && !skill.isDebuff()) {
+					if (i++ == rand) {
+						buffToGive = skill;
+					}
+					if (owner.isAffectedBySkill(skill.getId())) {
+						totalBuffsOnOwner++;
+					}
+				}
+			}
+			// if the owner has less than 60% of this beast's available buff, cast a random buff
+			if (((_numBuffs * 2) / 3) > totalBuffsOnOwner) {
+				_tamedBeast.sitCastAndFollow(buffToGive, owner);
+			}
+			getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, _tamedBeast.getOwner());
+		}
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if ((player == null) || !canTarget(player)) {
+			return;
+		}
+		
+		// Check if the L2PcInstance already target the L2NpcInstance
+		if (this != player.getTarget()) {
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			if (isAutoAttackable(player) && (Math.abs(player.getZ() - getZ()) < 100)) {
+				player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+			} else {
+				// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java
new file mode 100644
index 00000000..8a78f717
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TeleporterInstance.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @author NightMarez
+ */
+public final class L2TeleporterInstance extends L2Npc {
+	
+	public L2TeleporterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2TeleporterInstance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TerrainObjectInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TerrainObjectInstance.java
new file mode 100644
index 00000000..955709ad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TerrainObjectInstance.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public final class L2TerrainObjectInstance extends L2Npc {
+	
+	public L2TerrainObjectInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2TerrainObjectInstance);
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		player.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	@Override
+	public void onActionShift(L2PcInstance player) {
+		if (player.isGM()) {
+			super.onActionShift(player);
+		} else {
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TerritoryWardInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TerritoryWardInstance.java
new file mode 100644
index 00000000..b4bfee62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TerritoryWardInstance.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class L2TerritoryWardInstance extends L2Attackable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2TerritoryWardInstance.class);
+	
+	public L2TerritoryWardInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		
+		disableCoreAI(true);
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		if (isInvul()) {
+			return false;
+		}
+		if ((getCastle() == null) || !getCastle().getZone().isActive()) {
+			return false;
+		}
+		
+		final L2PcInstance actingPlayer = attacker.getActingPlayer();
+		if (actingPlayer == null) {
+			return false;
+		}
+		if (actingPlayer.getSiegeSide() == 0) {
+			return false;
+		}
+		return !TerritoryWarManager.getInstance().isAllyField(actingPlayer, getCastle().getResidenceId());
+	}
+	
+	@Override
+	public boolean hasRandomAnimation() {
+		return false;
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		
+		if (getCastle() == null) {
+			LOG.warn("L2TerritoryWardInstance({}) spawned outside Castle Zone!", getName());
+		}
+	}
+	
+	@Override
+	public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, Skill skill) {
+		if ((skill != null) || !TerritoryWarManager.getInstance().isTWInProgress()) {
+			return;
+		}
+		
+		final L2PcInstance actingPlayer = attacker.getActingPlayer();
+		if (actingPlayer == null) {
+			return;
+		}
+		if (actingPlayer.isCombatFlagEquipped()) {
+			return;
+		}
+		if (actingPlayer.getSiegeSide() == 0) {
+			return;
+		}
+		if (getCastle() == null) {
+			return;
+		}
+		if (TerritoryWarManager.getInstance().isAllyField(actingPlayer, getCastle().getResidenceId())) {
+			return;
+		}
+		
+		super.reduceCurrentHp(damage, attacker, awake, isDOT, skill);
+	}
+	
+	@Override
+	public void reduceCurrentHpByDOT(double i, L2Character attacker, Skill skill) {
+		// wards can't be damaged by DOTs
+	}
+	
+	@Override
+	public boolean doDie(L2Character killer) {
+		// Kill the L2NpcInstance (the corpse disappeared after 7 seconds)
+		if (!super.doDie(killer) || (getCastle() == null) || !TerritoryWarManager.getInstance().isTWInProgress()) {
+			return false;
+		}
+		
+		if (killer instanceof L2PcInstance) {
+			if ((killer.getSiegeSide() > 0) && !((L2PcInstance) killer).isCombatFlagEquipped()) {
+				((L2PcInstance) killer).addItem("Pickup", getId() - 23012, 1, null, false);
+			} else {
+				TerritoryWarManager.getInstance().getTerritoryWard(getId() - 36491).spawnMe();
+			}
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1_WARD_HAS_BEEN_DESTROYED_C2_HAS_THE_WARD);
+			sm.addString(getName().replace(" Ward", ""));
+			sm.addPcName((L2PcInstance) killer);
+			TerritoryWarManager.getInstance().announceToParticipants(sm, 0, 0);
+		} else {
+			TerritoryWarManager.getInstance().getTerritoryWard(getId() - 36491).spawnMe();
+		}
+		decayMe();
+		return true;
+	}
+	
+	@Override
+	public void onForcedAttack(L2PcInstance player) {
+		onAction(player);
+	}
+	
+	@Override
+	public void onAction(L2PcInstance player, boolean interact) {
+		if ((player == null) || !canTarget(player)) {
+			return;
+		}
+		
+		// Check if the L2PcInstance already target the L2NpcInstance
+		if (this != player.getTarget()) {
+			// Set the target of the L2PcInstance player
+			player.setTarget(this);
+		} else if (interact) {
+			if (isAutoAttackable(player) && (Math.abs(player.getZ() - getZ()) < 100)) {
+				player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, this);
+			} else {
+				// Send a Server->Client ActionFailed to the L2PcInstance in order to avoid that the client wait another packet
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java
new file mode 100644
index 00000000..e183da96
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java
@@ -0,0 +1,405 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.TrapAction;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.knownlist.TrapKnownList;
+import com.l2jserver.gameserver.model.actor.tasks.npc.trap.TrapTask;
+import com.l2jserver.gameserver.model.actor.tasks.npc.trap.TrapTriggerTask;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.trap.OnTrapAction;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo.TrapInfo;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+
+/**
+ * Trap instance.
+ * @author Zoey76
+ */
+public final class L2TrapInstance extends L2Npc {
+	private static final int TICK = 1000; // 1s
+	private boolean _hasLifeTime;
+	private boolean _isInArena = false;
+	private boolean _isTriggered;
+	private final int _lifeTime;
+	private L2PcInstance _owner;
+	private final List<Integer> _playersWhoDetectedMe = new ArrayList<>();
+	private final SkillHolder _skill;
+	private int _remainingTime;
+	// Tasks
+	private ScheduledFuture<?> _trapTask = null;
+	
+	/**
+	 * Creates a trap.
+	 * @param template the trap NPC template
+	 * @param lifeTime the life time
+	 */
+	public L2TrapInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, int instanceId, int lifeTime) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2TrapInstance);
+		setInstanceId(instanceId);
+		setName(template.getName());
+		setIsInvul(false);
+		
+		_owner = owner;
+		_isTriggered = false;
+		_skill = getTemplate().getParameters().getObject("trap_skill", SkillHolder.class);
+		_hasLifeTime = lifeTime >= 0;
+		_lifeTime = lifeTime != 0 ? lifeTime : 30000;
+		_remainingTime = _lifeTime;
+		if (_skill != null) {
+			_trapTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new TrapTask(this), TICK, TICK);
+		}
+	}
+	
+	public L2TrapInstance(int objectId, L2NpcTemplate template, L2PcInstance owner, int lifeTime) {
+		this(objectId, template, owner, owner.getInstanceId(), lifeTime);
+	}
+	
+	public L2TrapInstance(int objectId, L2NpcTemplate template, int instanceId, int lifeTime) {
+		this(objectId, template, null, instanceId, lifeTime);
+	}
+	
+	@Override
+	public void broadcastPacket(L2GameServerPacket mov) {
+		for (L2PcInstance player : getKnownList().getKnownPlayers().values()) {
+			if ((player != null) && (_isTriggered || isVisibleFor(player))) {
+				player.sendPacket(mov);
+			}
+		}
+	}
+	
+	@Override
+	public void broadcastPacket(L2GameServerPacket mov, int radiusInKnownlist) {
+		for (L2PcInstance player : getKnownList().getKnownPlayers().values()) {
+			if ((player != null) && isInsideRadius(player, radiusInKnownlist, false, false) && (_isTriggered || isVisibleFor(player))) {
+				player.sendPacket(mov);
+			}
+		}
+	}
+	
+	/**
+	 * Verify if the character can see the trap.
+	 * @param cha the character to verify
+	 * @return {@code true} if the character can see the trap, {@code false} otherwise
+	 */
+	@Override
+	public boolean isVisibleFor(final L2Character cha) {
+		if ((cha != null) && _playersWhoDetectedMe.contains(cha.getObjectId())) {
+			return true;
+		}
+		
+		if ((_owner == null) || (cha == null)) {
+			return false;
+		}
+		if (cha == _owner) {
+			return true;
+		}
+		
+		if (cha instanceof L2PcInstance player) {
+			// observers can't see trap
+			if (player.inObserverMode()) {
+				return false;
+			}
+			
+			// olympiad competitors can't see trap
+			if (_owner.isInOlympiadMode() && player.isInOlympiadMode() && (player.getOlympiadSide() != _owner.getOlympiadSide())) {
+				return false;
+			}
+		}
+		
+		if (_isInArena) {
+			return true;
+		}
+		
+		return isOwnerInSameParty(cha);
+	}
+	
+	/**
+	 * Checks whether a character is a potential target for the trap.
+	 * @param target The character we're checking against
+	 * @return {@code true} if the character is a valid target, {@code false} otherwise
+	 */
+	public boolean checkTarget(L2Character target) {
+		// Range seems to be reduced from Freya(300) to H5(150)
+		if (!target.isInsideRadius(this, 150, false, false)) {
+			return false;
+		}
+		
+		if (!Skill.checkForAreaOffensiveSkills(this, target, _skill.getSkill(), _isInArena)) {
+			return false;
+		}
+		
+		// observers
+		if (target.isPlayer() && target.getActingPlayer().inObserverMode()) {
+			return false;
+		}
+		
+		// olympiad own team and their summons not attacked
+		if ((_owner != null) && _owner.isInOlympiadMode()) {
+			final L2PcInstance player = target.getActingPlayer();
+			if ((player != null) && player.isInOlympiadMode() && (player.getOlympiadSide() == _owner.getOlympiadSide())) {
+				return false;
+			}
+		}
+		
+		if (_isInArena) {
+			return true;
+		}
+		
+		// trap owned by players not attack non-flagged players
+		if (_owner != null) {
+			if (target instanceof L2Attackable) {
+				return true;
+			}
+			
+			final L2PcInstance player = target.getActingPlayer();
+			return (player != null) && ((player.getPvpFlag() != 0) || (player.getKarma() != 0));
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if (_owner != null) {
+			_owner.setTrap(null);
+			_owner = null;
+		}
+		return super.deleteMe();
+	}
+	
+	@Override
+	public L2PcInstance getActingPlayer() {
+		return _owner;
+	}
+	
+	@Override
+	public L2Weapon getActiveWeaponItem() {
+		return null;
+	}
+	
+	public int getKarma() {
+		return _owner != null ? _owner.getKarma() : 0;
+	}
+	
+	@Override
+	public TrapKnownList getKnownList() {
+		return (TrapKnownList) super.getKnownList();
+	}
+	
+	/**
+	 * Get the owner of this trap.
+	 * @return the owner
+	 */
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	public byte getPvpFlag() {
+		return _owner != null ? _owner.getPvpFlag() : 0;
+	}
+	
+	@Override
+	public L2ItemInstance getSecondaryWeaponInstance() {
+		return null;
+	}
+	
+	@Override
+	public L2Weapon getSecondaryWeaponItem() {
+		return null;
+	}
+	
+	public Skill getSkill() {
+		return _skill.getSkill();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new TrapKnownList(this));
+	}
+	
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		if ((attacker == null) || (attacker == _owner) || isOwnerInSameParty(attacker)) {
+			return false;
+		}
+		
+		return isVisibleFor(attacker);
+	}
+	
+	@Override
+	public boolean isTrap() {
+		return true;
+	}
+	
+	/**
+	 * Checks is triggered
+	 * @return True if trap is triggered.
+	 */
+	public boolean isTriggered() {
+		return _isTriggered;
+	}
+	
+	@Override
+	public void onSpawn() {
+		super.onSpawn();
+		_isInArena = isInsideZone(ZoneId.PVP) && !isInsideZone(ZoneId.SIEGE);
+		_playersWhoDetectedMe.clear();
+	}
+	
+	@Override
+	public void sendDamageMessage(L2Character target, int damage, boolean mcrit, boolean pcrit, boolean miss) {
+		if (miss || (_owner == null)) {
+			return;
+		}
+		
+		if (_owner.isInOlympiadMode() && (target instanceof L2PcInstance) && ((L2PcInstance) target).isInOlympiadMode() && (((L2PcInstance) target).getOlympiadGameId() == _owner.getOlympiadGameId())) {
+			OlympiadGameManager.getInstance().notifyCompetitorDamage(getOwner(), damage);
+		}
+		
+		if ((target.isInvul() || target.isHpBlocked()) && !target.isNpc()) {
+			_owner.sendPacket(SystemMessageId.ATTACK_WAS_BLOCKED);
+		} else {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
+			sm.addCharName(this);
+			sm.addCharName(target);
+			sm.addInt(damage);
+			_owner.sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		if (_isTriggered || isVisibleFor(activeChar)) {
+			activeChar.sendPacket(new TrapInfo(this, activeChar));
+		}
+	}
+	
+	public void setDetected(L2Character detector) {
+		if (_isInArena) {
+			if (detector.isPlayable()) {
+				sendInfo(detector.getActingPlayer());
+			}
+			return;
+		}
+		
+		if ((_owner != null) && (_owner.getPvpFlag() == 0) && (_owner.getKarma() == 0)) {
+			return;
+		}
+		
+		_playersWhoDetectedMe.add(detector.getObjectId());
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new OnTrapAction(this, detector, TrapAction.TRAP_DETECTED), this);
+		
+		if (detector.isPlayable()) {
+			sendInfo(detector.getActingPlayer());
+		}
+	}
+	
+	public void stopDecay() {
+		DecayTaskManager.getInstance().cancel(this);
+	}
+	
+	/**
+	 * Trigger the trap.
+	 * @param target the target
+	 */
+	public void triggerTrap(L2Character target) {
+		if (_trapTask != null) {
+			_trapTask.cancel(true);
+			_trapTask = null;
+		}
+		
+		_isTriggered = true;
+		broadcastPacket(new TrapInfo(this, null));
+		setTarget(target);
+		
+		EventDispatcher.getInstance().notifyEventAsync(new OnTrapAction(this, target, TrapAction.TRAP_TRIGGERED), this);
+		
+		ThreadPoolManager.getInstance().scheduleGeneral(new TrapTriggerTask(this), 500);
+	}
+	
+	public void unSummon() {
+		if (_trapTask != null) {
+			_trapTask.cancel(true);
+			_trapTask = null;
+		}
+		
+		if (_owner != null) {
+			_owner.setTrap(null);
+			_owner = null;
+		}
+		
+		if (isVisible() && !isDead()) {
+			if (getWorldRegion() != null) {
+				getWorldRegion().removeFromZones(this);
+			}
+			
+			deleteMe();
+		}
+	}
+	
+	@Override
+	public void updateAbnormalEffect() {
+		
+	}
+	
+	public boolean hasLifeTime() {
+		return _hasLifeTime;
+	}
+	
+	public void setHasLifeTime(boolean val) {
+		_hasLifeTime = val;
+	}
+	
+	public int getRemainingTime() {
+		return _remainingTime;
+	}
+	
+	public void setRemainingTime(int time) {
+		_remainingTime = time;
+	}
+	
+	public int getLifeTime() {
+		return _lifeTime;
+	}
+	
+	private boolean isOwnerInSameParty(final L2Character character) {
+		return character.isInParty() && _owner.isInParty() && (character.getParty().getLeaderObjectId() == _owner.getParty().getLeaderObjectId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDElfInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDElfInstance.java
new file mode 100644
index 00000000..8258be23
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDElfInstance.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterDElfInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterDElfInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfRace(Race.DARK_ELF);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDwarfInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDwarfInstance.java
new file mode 100644
index 00000000..47cb49f6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterDwarfInstance.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterDwarfInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterDwarfInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfRace(Race.DWARF);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterFighterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterFighterInstance.java
new file mode 100644
index 00000000..0a83f2ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterFighterInstance.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.ClassType;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterFighterInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterFighterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfRace(Race.HUMAN) || pclass.isOfRace(Race.ELF);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterTeachType(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		
+		return pclass.isOfType(ClassType.Fighter);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
new file mode 100644
index 00000000..f6fa9b51
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java
@@ -0,0 +1,913 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.clan;
+import static com.l2jserver.gameserver.model.base.AcquireSkillType.PLEDGE;
+import static com.l2jserver.gameserver.network.SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1;
+
+import java.util.Iterator;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Clan.SubPledge;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+import com.l2jserver.gameserver.model.base.SubClass;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Village Master instance.
+ * @since 2005/03/29 23:15:15
+ */
+public class L2VillageMasterInstance extends L2NpcInstance {
+	private static final Logger LOG = LoggerFactory.getLogger(L2VillageMasterInstance.class);
+	
+	public L2VillageMasterInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2VillageMasterInstance);
+	}
+	
+	@Override
+	public String getHtmlPath(int npcId, int val) {
+		String pom;
+		if (val == 0) {
+			pom = "" + npcId;
+		} else {
+			pom = npcId + "-" + val;
+		}
+		return "data/html/villagemaster/" + pom + ".htm";
+	}
+	
+	@Override
+	public void onBypassFeedback(L2PcInstance player, String command) {
+		final var st = new StringTokenizer(command, " ");
+		switch (st.nextToken()) {
+			case "create_clan" -> {
+				if (st.hasMoreTokens()) {
+					final String clanName = st.nextToken();
+					if (st.hasMoreTokens() || !isValidName(clanName)) {
+						player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT);
+						return;
+					}
+					ClanTable.getInstance().createClan(player, clanName);
+				}
+			}
+			case "create_academy" -> {
+				if (st.hasMoreTokens()) {
+					createSubPledge(player, st.nextToken(), null, L2Clan.SUBUNIT_ACADEMY, 5);
+				}
+			}
+			case "rename_pledge" -> {
+				if (st.countTokens() > 1) {
+					renameSubPledge(player, Integer.parseInt(st.nextToken()), st.nextToken());
+				}
+			}
+			case "create_royal" -> {
+				if (st.countTokens() > 1) {
+					createSubPledge(player, st.nextToken(), st.nextToken(), L2Clan.SUBUNIT_ROYAL1, 6);
+				}
+			}
+			case "create_knight" -> {
+				if (st.countTokens() > 1) {
+					createSubPledge(player, st.nextToken(), st.nextToken(), L2Clan.SUBUNIT_KNIGHT1, 7);
+				}
+			}
+			case "assign_subpl_leader" -> {
+				if (st.countTokens() > 1) {
+					assignSubPledgeLeader(player, st.nextToken(), st.nextToken());
+				}
+			}
+			case "create_ally" -> {
+				if (!player.isClanLeader()) {
+					player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_CREATE_ALLIANCE);
+				} else {
+					if (st.hasMoreTokens()) {
+						player.getClan().createAlly(player, st.nextToken());
+					}
+				}
+			}
+			case "dissolve_ally" -> player.getClan().dissolveAlly(player);
+			case "dissolve_clan" -> dissolveClan(player, player.getClanId());
+			case "change_clan_leader" -> {
+				if (!player.isClanLeader()) {
+					player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+					return;
+				}
+				
+				if (!st.hasMoreTokens()) {
+					break;
+				}
+				
+				final String newLeaderName = st.nextToken();
+				
+				if (player.getName().equalsIgnoreCase(newLeaderName)) {
+					return;
+				}
+				
+				final L2Clan clan = player.getClan();
+				final L2ClanMember member = clan.getClanMember(newLeaderName);
+				if (member == null) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DOES_NOT_EXIST);
+					sm.addString(newLeaderName);
+					player.sendPacket(sm);
+					return;
+				}
+				
+				if (!member.isOnline()) {
+					player.sendPacket(SystemMessageId.INVITED_USER_NOT_ONLINE);
+					return;
+				}
+				
+				// To avoid clans with null clan leader, academy members shouldn't be eligible for clan leader.
+				if (member.getPlayerInstance().isAcademyMember()) {
+					player.sendPacket(SystemMessageId.RIGHT_CANT_TRANSFERRED_TO_ACADEMY_MEMBER);
+					return;
+				}
+				
+				if (character().clanLeaderInstantActivation()) {
+					clan.setNewLeader(member);
+				} else {
+					final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
+					if (clan.getNewLeaderId() == 0) {
+						clan.setNewLeaderId(member.getObjectId(), true);
+						msg.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/village_master/Clan/9000-07-success.htm");
+					} else {
+						msg.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/village_master/Clan/9000-07-in-progress.htm");
+					}
+					player.sendPacket(msg);
+				}
+			}
+			case "cancel_clan_leader_change" -> {
+				if (!player.isClanLeader()) {
+					player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+					return;
+				}
+				
+				final L2Clan clan = player.getClan();
+				final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
+				if (clan.getNewLeaderId() != 0) {
+					clan.setNewLeaderId(0, true);
+					msg.setFile(player.getHtmlPrefix(), "com/l2jserver/datapack/village_master/Clan/9000-07-canceled.htm");
+				} else {
+					msg.setHtml("<html><body>You don't have clan leader delegation applications submitted yet!</body></html>");
+				}
+				
+				player.sendPacket(msg);
+			}
+			case "recover_clan" -> recoverClan(player, player.getClanId());
+			case "increase_clan_level" -> {
+				if (player.getClan().levelUpClan(player)) {
+					player.broadcastPacket(new MagicSkillUse(player, 5103, 1, 0, 0));
+					player.broadcastPacket(new MagicSkillLaunched(player, 5103, 1));
+				}
+			}
+			case "learn_clan_skills" -> showPledgeSkillList(player);
+			case "Subclass" -> {
+				// Subclasses may not be changed while a skill is in use.
+				if (player.isCastingNow() || player.isAllSkillsDisabled()) {
+					player.sendPacket(SystemMessageId.SUBCLASS_NO_CHANGE_OR_CREATE_WHILE_SKILL_IN_USE);
+					return;
+				}
+				final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
+				// Subclasses may not be changed while a transformated state.
+				if (player.getTransformation() != null) {
+					html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_NoTransformed.htm");
+					player.sendPacket(html);
+					return;
+				}
+				// Subclasses may not be changed while a summon is active.
+				if (player.hasSummon()) {
+					html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_NoSummon.htm");
+					player.sendPacket(html);
+					return;
+				}
+				// Subclasses may not be changed while you have exceeded your inventory limit.
+				if (!player.isInventoryUnder90(true)) {
+					player.sendPacket(SystemMessageId.NOT_SUBCLASS_WHILE_INVENTORY_FULL);
+					return;
+				}
+				// Subclasses may not be changed while a you are over your weight limit.
+				if (player.getWeightPenalty() >= 2) {
+					player.sendPacket(SystemMessageId.NOT_SUBCLASS_WHILE_OVERWEIGHT);
+					return;
+				}
+				
+				int cmdChoice = 0;
+				int paramOne = 0;
+				int paramTwo = 0;
+				try {
+					cmdChoice = Integer.parseInt(command.substring(9, 10).trim());
+					
+					int endIndex = command.indexOf(' ', 11);
+					if (endIndex == -1) {
+						endIndex = command.length();
+					}
+					
+					if (command.length() > 11) {
+						paramOne = Integer.parseInt(command.substring(11, endIndex).trim());
+						if (command.length() > endIndex) {
+							paramTwo = Integer.parseInt(command.substring(endIndex).trim());
+						}
+					}
+				} catch (Exception NumberFormatException) {
+					LOG.warn("Wrong numeric values for command {}", command);
+				}
+				
+				Set<PlayerClass> subsAvailable;
+				switch (cmdChoice) {
+					case 0: // Subclass change menu
+						html.setFile(player.getHtmlPrefix(), getSubClassMenu(player.getRace()));
+						break;
+					case 1: // Add Subclass - Initial
+						// Avoid giving player an option to add a new sub class, if they have max sub-classes already.
+						if (player.getTotalSubClasses() >= character().getMaxSubclass()) {
+							html.setFile(player.getHtmlPrefix(), getSubClassFail());
+							break;
+						}
+						
+						subsAvailable = getAvailableSubClasses(player);
+						if ((subsAvailable != null) && !subsAvailable.isEmpty()) {
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Add.htm");
+							final var list = new StringBuilder(200);
+							for (var subClass : subsAvailable) {
+								list.append("<a action=\"bypass -h npc_%objectId%_Subclass 4 ")
+									.append(String.valueOf(subClass.ordinal()))
+									.append("\" msg=\"1268;")
+									.append(ClassListData.getInstance().getClass(subClass.ordinal()).getClassName())
+									.append("\">")
+									.append(ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode())
+									.append("</a><br>");
+							}
+							html.replace("%list%", list.toString());
+						} else {
+							if ((player.getRace() == Race.ELF) || (player.getRace() == Race.DARK_ELF)) {
+								html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Fail_Elves.htm");
+								player.sendPacket(html);
+							} else if (player.getRace() == Race.KAMAEL) {
+								html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Fail_Kamael.htm");
+								player.sendPacket(html);
+							} else {
+								// TODO: Retail message
+								player.sendMessage("There are no sub classes available at this time.");
+							}
+							return;
+						}
+						break;
+					case 2: // Change Class - Initial
+						if (player.getSubClasses().isEmpty()) {
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ChangeNo.htm");
+						} else {
+							final StringBuilder content2 = StringUtil.startAppend(200);
+							if (checkVillageMaster(player.getBaseClass())) {
+								StringUtil.append(content2, "<a action=\"bypass -h npc_%objectId%_Subclass 5 0\">", ClassListData.getInstance().getClass(player.getBaseClass()).getClientCode(), "</a><br>");
+							}
+							
+							for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();) {
+								SubClass subClass = subList.next();
+								if (checkVillageMaster(subClass.getClassDefinition())) {
+									StringUtil.append(content2, "<a action=\"bypass -h npc_%objectId%_Subclass 5 ", String.valueOf(subClass.getClassIndex()), "\">", ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode(), "</a><br>");
+								}
+							}
+							
+							if (!content2.isEmpty()) {
+								html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Change.htm");
+								html.replace("%list%", content2.toString());
+							} else {
+								html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ChangeNotFound.htm");
+							}
+						}
+						break;
+					case 3: // Change/Cancel Subclass - Initial
+						if ((player.getSubClasses() == null) || player.getSubClasses().isEmpty()) {
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyEmpty.htm");
+							break;
+						}
+						
+						// custom value
+						if (player.getTotalSubClasses() > 3) {
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyCustom.htm");
+							final StringBuilder content3 = StringUtil.startAppend(200);
+							int classIndex = 1;
+							
+							for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();) {
+								SubClass subClass = subList.next();
+								
+								StringUtil.append(content3, "Sub-class ", String.valueOf(classIndex++), "<br>", "<a action=\"bypass -h npc_%objectId%_Subclass 6 ", String.valueOf(subClass.getClassIndex()), "\">", ClassListData.getInstance().getClass(subClass.getClassId()).getClientCode(), "</a><br>");
+							}
+							html.replace("%list%", content3.toString());
+						} else {
+							// retail html contain only 3 subclasses
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Modify.htm");
+							if (player.getSubClasses().containsKey(1)) {
+								html.replace("%sub1%", ClassListData.getInstance().getClass(player.getSubClasses().get(1).getClassId()).getClientCode());
+							} else {
+								html.replace("<a action=\"bypass -h npc_%objectId%_Subclass 6 1\">%sub1%</a><br>", "");
+							}
+							
+							if (player.getSubClasses().containsKey(2)) {
+								html.replace("%sub2%", ClassListData.getInstance().getClass(player.getSubClasses().get(2).getClassId()).getClientCode());
+							} else {
+								html.replace("<a action=\"bypass -h npc_%objectId%_Subclass 6 2\">%sub2%</a><br>", "");
+							}
+							
+							if (player.getSubClasses().containsKey(3)) {
+								html.replace("%sub3%", ClassListData.getInstance().getClass(player.getSubClasses().get(3).getClassId()).getClientCode());
+							} else {
+								html.replace("<a action=\"bypass -h npc_%objectId%_Subclass 6 3\">%sub3%</a><br>", "");
+							}
+						}
+						break;
+					case 4: // Add Subclass - Action (Subclass 4 x[x])
+						// If the character is less than level 75 on any of their previously chosen classes then disallow them to change to their most recently added sub-class choice.
+						if (!player.getFloodProtectors().getSubclass().tryPerformAction("add subclass")) {
+							LOG.warn("Player {} has performed a subclass change too fast", player.getName());
+							return;
+						}
+						
+						boolean allowAddition = player.getTotalSubClasses() < character().getMaxSubclass();
+						
+						if (player.getLevel() < 75) {
+							allowAddition = false;
+						}
+						
+						if (allowAddition) {
+							if (!player.getSubClasses().isEmpty()) {
+								for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();) {
+									SubClass subClass = subList.next();
+									
+									if (subClass.getLevel() < 75) {
+										allowAddition = false;
+										break;
+									}
+								}
+							}
+						}
+						
+						// If quest checking is enabled, verify if the character has completed the Mimir's Elixir (Path to Subclass)
+						// and Fate's Whisper (A Grade Weapon) quests by checking for instances of their unique reward items.
+						// If they both exist, remove both unique items and continue with adding the sub-class.
+						if (allowAddition && !character().subclassWithoutQuests()) {
+							allowAddition = checkQuests(player);
+						}
+						
+						if (allowAddition && isValidNewSubClass(player, paramOne)) {
+							if (!player.addSubClass(paramOne, player.getTotalSubClasses() + 1)) {
+								return;
+							}
+							
+							player.changeActiveClass(player.getTotalSubClasses());
+							
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_AddOk.htm");
+							
+							player.sendPacket(SystemMessageId.ADD_NEW_SUBCLASS); // Subclass added.
+						} else {
+							html.setFile(player.getHtmlPrefix(), getSubClassFail());
+						}
+						break;
+					case 5: // Change Class - Action
+						// If the character is less than level 75 on any of their previously chosen classes then disallow them to change to their most recently added sub-class choice. Note: paramOne = classIndex
+						if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) {
+							LOG.warn("Player {} has performed a subclass change too fast", player.getName());
+							return;
+						}
+						
+						if (player.getClassIndex() == paramOne) {
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_Current.htm");
+							break;
+						}
+						
+						if (paramOne == 0) {
+							if (!checkVillageMaster(player.getBaseClass())) {
+								return;
+							}
+						} else {
+							try {
+								if (!checkVillageMaster(player.getSubClasses().get(paramOne).getClassDefinition())) {
+									return;
+								}
+							} catch (NullPointerException e) {
+								return;
+							}
+						}
+						
+						player.changeActiveClass(paramOne);
+						player.sendPacket(SystemMessageId.SUBCLASS_TRANSFER_COMPLETED); // Transfer completed.
+						return;
+					case 6: // Change/Cancel Subclass - Choice
+						// validity check
+						if ((paramOne < 1) || (paramOne > character().getMaxSubclass())) {
+							return;
+						}
+						
+						subsAvailable = getAvailableSubClasses(player);
+						// another validity check
+						if ((subsAvailable == null) || subsAvailable.isEmpty()) {
+							// TODO: Retail message
+							player.sendMessage("There are no sub classes available at this time.");
+							return;
+						}
+						
+						final StringBuilder content6 = StringUtil.startAppend(200);
+						for (PlayerClass subClass : subsAvailable) {
+							StringUtil.append(content6, "<a action=\"bypass -h npc_%objectId%_Subclass 7 ", String.valueOf(paramOne), " ", String.valueOf(subClass.ordinal()), "\" msg=\"1445;", "\">", ClassListData.getInstance().getClass(subClass.ordinal()).getClientCode(), "</a><br>");
+						}
+						
+						switch (paramOne) {
+							case 1 -> html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice1.htm");
+							case 2 -> html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice2.htm");
+							case 3 -> html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice3.htm");
+							default -> html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyChoice.htm");
+						}
+						html.replace("%list%", content6.toString());
+						break;
+					case 7: // Change Subclass - Action
+						// Warning: the information about this subclass will be removed from the subclass list even if false!
+						if (!player.getFloodProtectors().getSubclass().tryPerformAction("change class")) {
+							LOG.warn("Player {} has performed a subclass change too fast", player.getName());
+							return;
+						}
+						
+						if (!isValidNewSubClass(player, paramTwo)) {
+							return;
+						}
+						
+						if (player.modifySubClass(paramOne, paramTwo)) {
+							player.abortCast();
+							player.stopAllEffectsExceptThoseThatLastThroughDeath(); // all effects from old subclass stopped!
+							player.stopAllEffectsNotStayOnSubclassChange();
+							player.stopCubics();
+							player.changeActiveClass(paramOne);
+							
+							html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/SubClass_ModifyOk.htm");
+							html.replace("%name%", ClassListData.getInstance().getClass(paramTwo).getClientCode());
+							
+							player.sendPacket(SystemMessageId.ADD_NEW_SUBCLASS); // Subclass added.
+						} else {
+							// This isn't good! modifySubClass() removed subclass from memory we must update _classIndex!
+							// Else IndexOutOfBoundsException can turn up some place down the line along with other seemingly unrelated problems.
+							player.changeActiveClass(0); // Also updates _classIndex plus switching _classid to baseclass.
+							
+							player.sendMessage("The sub class could not be added, you have been reverted to your base class.");
+							return;
+						}
+						break;
+				}
+				html.replace("%objectId%", String.valueOf(getObjectId()));
+				player.sendPacket(html);
+			}
+			default -> super.onBypassFeedback(player, command);
+		}
+	}
+	
+	protected String getSubClassMenu(Race race) {
+		if (character().subclassEverywhere() || (race != Race.KAMAEL)) {
+			return "data/html/villagemaster/SubClass.htm";
+		}
+		
+		return "data/html/villagemaster/SubClass_NoOther.htm";
+	}
+	
+	protected String getSubClassFail() {
+		return "data/html/villagemaster/SubClass_Fail.htm";
+	}
+	
+	protected boolean checkQuests(L2PcInstance player) {
+		return player.isNoble() || player.hasQuestCompleted("Q00234_FatesWhisper") || player.hasQuestCompleted("Q00235_MimirsElixir");
+	}
+	
+	/**
+	 * Returns list of available subclasses Base class and already used subclasses removed
+	 */
+	private Set<PlayerClass> getAvailableSubClasses(L2PcInstance player) {
+		// get player base class
+		final int currentBaseId = player.getBaseClass();
+		final ClassId baseCID = ClassId.getClassId(currentBaseId);
+		
+		// we need 2nd occupation ID
+		final int baseClassId;
+		if (baseCID.level() > 2) {
+			baseClassId = baseCID.getParent().ordinal();
+		} else {
+			baseClassId = currentBaseId;
+		}
+		
+		// If the race of your main class is Elf or Dark Elf, you may not select each class as a subclass to the other class.
+		// If the race of your main class is Kamael, you may not subclass any other race If the race of your main class is NOT Kamael,
+		// you may not subclass any Kamael class You may not select Overlord and Warsmith class as a subclass.
+		// You may not select a similar class as the subclass.
+		// The occupations classified as similar classes are as follows: Treasure Hunter, Plainswalker and Abyss Walker Hawkeye,
+		// Silver Ranger and Phantom Ranger Paladin, Dark Avenger, Temple Knight
+		// and Shillien Knight Warlocks, Elemental Summoner and Phantom Summoner Elder and Shillien Elder Swordsinger and Bladedancer Sorcerer,
+		// Spellsinger and Spellhowler Also, Kamael have a special, hidden 4 subclass, the inspector, which can only be taken if you have already completed the other two Kamael subclasses
+		Set<PlayerClass> availSubs = PlayerClass.values()[baseClassId].getAvailableSubclasses(player);
+		
+		if ((availSubs != null) && !availSubs.isEmpty()) {
+			for (Iterator<PlayerClass> availSub = availSubs.iterator(); availSub.hasNext();) {
+				PlayerClass pclass = availSub.next();
+				
+				// check for the village master
+				if (!checkVillageMaster(pclass)) {
+					availSub.remove();
+					continue;
+				}
+				
+				// scan for already used subclasses
+				int availClassId = pclass.ordinal();
+				ClassId cid = ClassId.getClassId(availClassId);
+				SubClass prevSubClass;
+				ClassId subClassId;
+				for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();) {
+					prevSubClass = subList.next();
+					subClassId = ClassId.getClassId(prevSubClass.getClassId());
+					
+					if (subClassId.equalsOrChildOf(cid)) {
+						availSub.remove();
+						break;
+					}
+				}
+			}
+		}
+		
+		return availSubs;
+	}
+	
+	/**
+	 * Check new subclass classId for validity (villagemaster race/type, is not contains in previous subclasses, is contains in allowed subclasses) Base class not added into allowed subclasses.
+	 */
+	private boolean isValidNewSubClass(L2PcInstance player, int classId) {
+		if (!checkVillageMaster(classId)) {
+			return false;
+		}
+		
+		final ClassId cid = ClassId.values()[classId];
+		SubClass sub;
+		ClassId subClassId;
+		for (Iterator<SubClass> subList = iterSubClasses(player); subList.hasNext();) {
+			sub = subList.next();
+			subClassId = ClassId.values()[sub.getClassId()];
+			
+			if (subClassId.equalsOrChildOf(cid)) {
+				return false;
+			}
+		}
+		
+		// get player base class
+		final int currentBaseId = player.getBaseClass();
+		final ClassId baseCID = ClassId.getClassId(currentBaseId);
+		
+		// we need 2nd occupation ID
+		final int baseClassId;
+		if (baseCID.level() > 2) {
+			baseClassId = baseCID.getParent().ordinal();
+		} else {
+			baseClassId = currentBaseId;
+		}
+		
+		Set<PlayerClass> availSubs = PlayerClass.values()[baseClassId].getAvailableSubclasses(player);
+		if ((availSubs == null) || availSubs.isEmpty()) {
+			return false;
+		}
+		
+		boolean found = false;
+		for (PlayerClass pclass : availSubs) {
+			if (pclass.ordinal() == classId) {
+				found = true;
+				break;
+			}
+		}
+		return found;
+	}
+	
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		return true;
+	}
+	
+	protected boolean checkVillageMasterTeachType(PlayerClass pclass) {
+		return true;
+	}
+	
+	/**
+	 * Returns true if this classId allowed for master
+	 */
+	public final boolean checkVillageMaster(int classId) {
+		return checkVillageMaster(PlayerClass.values()[classId]);
+	}
+	
+	/**
+	 * Returns true if this PlayerClass is allowed for master
+	 */
+	private boolean checkVillageMaster(PlayerClass pclass) {
+		if (character().subclassEverywhere()) {
+			return true;
+		}
+		
+		return checkVillageMasterRace(pclass) && checkVillageMasterTeachType(pclass);
+	}
+	
+	private static Iterator<SubClass> iterSubClasses(L2PcInstance player) {
+		return player.getSubClasses().values().iterator();
+	}
+	
+	private static void dissolveClan(L2PcInstance player, int clanId) {
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		final L2Clan clan = player.getClan();
+		if (clan.getAllyId() != 0) {
+			player.sendPacket(SystemMessageId.CANNOT_DISPERSE_THE_CLANS_IN_ALLY);
+			return;
+		}
+		if (clan.isAtWar()) {
+			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_WAR);
+			return;
+		}
+		if ((clan.getCastleId() != 0) || (clan.getHideoutId() != 0) || (clan.getFortId() != 0)) {
+			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_OWNING_CLAN_HALL_OR_CASTLE);
+			return;
+		}
+		
+		for (Castle castle : CastleManager.getInstance().getCastles()) {
+			if (SiegeManager.getInstance().checkIsRegistered(clan, castle.getResidenceId())) {
+				player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_SIEGE);
+				return;
+			}
+		}
+		for (Fort fort : FortManager.getInstance().getForts()) {
+			if (FortSiegeManager.getInstance().checkIsRegistered(clan, fort.getResidenceId())) {
+				player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_SIEGE);
+				return;
+			}
+		}
+		
+		if (player.isInsideZone(ZoneId.SIEGE)) {
+			player.sendPacket(SystemMessageId.CANNOT_DISSOLVE_WHILE_IN_SIEGE);
+			return;
+		}
+		if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) {
+			player.sendPacket(SystemMessageId.DISSOLUTION_IN_PROGRESS);
+			return;
+		}
+		
+		clan.setDissolvingExpiryTime(System.currentTimeMillis() + character().getDaysToPassToDissolveAClan());
+		clan.updateClanInDB();
+		
+		// The clan leader should take the XP penalty of a full death.
+		player.calculateDeathExpPenalty(null, false);
+		ClanTable.getInstance().scheduleRemoveClan(clan.getId());
+	}
+	
+	private static void recoverClan(L2PcInstance player, int clanId) {
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		final L2Clan clan = player.getClan();
+		clan.setDissolvingExpiryTime(0);
+		clan.updateClanInDB();
+	}
+	
+	private static void createSubPledge(L2PcInstance player, String clanName, String leaderName, int pledgeType, int minClanLvl) {
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		final L2Clan clan = player.getClan();
+		if (clan.getLevel() < minClanLvl) {
+			if (pledgeType == L2Clan.SUBUNIT_ACADEMY) {
+				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN_ACADEMY);
+			} else {
+				player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_MILITARY_UNIT);
+			}
+			
+			return;
+		}
+		if (!isValidName(clanName) || (clanName.length() < 2)) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT);
+			return;
+		}
+		if (clanName.length() > ClanTable.CLAN_NAME_MAX_LENGTH) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_TOO_LONG);
+			return;
+		}
+		
+		for (L2Clan tempClan : ClanTable.getInstance().getClans()) {
+			if (tempClan.getSubPledge(clanName) != null) {
+				if (pledgeType == L2Clan.SUBUNIT_ACADEMY) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ALREADY_EXISTS);
+					sm.addString(clanName);
+					player.sendPacket(sm);
+				} else {
+					player.sendPacket(SystemMessageId.ANOTHER_MILITARY_UNIT_IS_ALREADY_USING_THAT_NAME);
+				}
+				
+				return;
+			}
+		}
+		
+		if (pledgeType != L2Clan.SUBUNIT_ACADEMY) {
+			if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) {
+				if (pledgeType >= L2Clan.SUBUNIT_KNIGHT1) {
+					player.sendPacket(SystemMessageId.CAPTAIN_OF_ORDER_OF_KNIGHTS_CANNOT_BE_APPOINTED);
+				} else if (pledgeType >= L2Clan.SUBUNIT_ROYAL1) {
+					player.sendPacket(SystemMessageId.CAPTAIN_OF_ROYAL_GUARD_CANNOT_BE_APPOINTED);
+				}
+				
+				return;
+			}
+		}
+		
+		final int leaderId = pledgeType != L2Clan.SUBUNIT_ACADEMY ? clan.getClanMember(leaderName).getObjectId() : 0;
+		
+		if (clan.createSubPledge(player, pledgeType, leaderId, clanName) == null) {
+			return;
+		}
+		
+		SystemMessage sm;
+		if (pledgeType == L2Clan.SUBUNIT_ACADEMY) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S1S_CLAN_ACADEMY_HAS_BEEN_CREATED);
+			sm.addString(player.getClan().getName());
+		} else if (pledgeType >= L2Clan.SUBUNIT_KNIGHT1) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_KNIGHTS_OF_S1_HAVE_BEEN_CREATED);
+			sm.addString(player.getClan().getName());
+		} else if (pledgeType >= L2Clan.SUBUNIT_ROYAL1) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_ROYAL_GUARD_OF_S1_HAVE_BEEN_CREATED);
+			sm.addString(player.getClan().getName());
+		} else {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_CREATED);
+		}
+		player.sendPacket(sm);
+		
+		if (pledgeType != L2Clan.SUBUNIT_ACADEMY) {
+			final L2ClanMember leaderSubPledge = clan.getClanMember(leaderName);
+			final L2PcInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+			if (leaderPlayer != null) {
+				leaderPlayer.setPledgeClass(L2ClanMember.calculatePledgeClass(leaderPlayer));
+				leaderPlayer.sendPacket(new UserInfo(leaderPlayer));
+				leaderPlayer.sendPacket(new ExBrExtraUserInfo(leaderPlayer));
+			}
+		}
+	}
+	
+	private static void renameSubPledge(L2PcInstance player, int pledgeType, String pledgeName) {
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		final L2Clan clan = player.getClan();
+		final SubPledge subPledge = player.getClan().getSubPledge(pledgeType);
+		
+		if (subPledge == null) {
+			player.sendMessage("Pledge don't exists.");
+			return;
+		}
+		if (!isValidName(pledgeName) || (pledgeName.length() < 2)) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT);
+			return;
+		}
+		if (pledgeName.length() > ClanTable.CLAN_NAME_MAX_LENGTH) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_TOO_LONG);
+			return;
+		}
+		
+		subPledge.setName(pledgeName);
+		clan.updateSubPledgeInDB(subPledge.getId());
+		clan.broadcastClanStatus();
+		player.sendMessage("Pledge name changed.");
+	}
+	
+	private static void assignSubPledgeLeader(L2PcInstance player, String clanName, String leaderName) {
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		if (leaderName.length() > 16) {
+			player.sendPacket(SystemMessageId.NAMING_CHARNAME_UP_TO_16CHARS);
+			return;
+		}
+		if (player.getName().equals(leaderName)) {
+			player.sendPacket(SystemMessageId.CAPTAIN_OF_ROYAL_GUARD_CANNOT_BE_APPOINTED);
+			return;
+		}
+		
+		final L2Clan clan = player.getClan();
+		final SubPledge subPledge = player.getClan().getSubPledge(clanName);
+		
+		if ((null == subPledge) || (subPledge.getId() == L2Clan.SUBUNIT_ACADEMY)) {
+			player.sendPacket(SystemMessageId.CLAN_NAME_INCORRECT);
+			return;
+		}
+		if ((clan.getClanMember(leaderName) == null) || (clan.getClanMember(leaderName).getPledgeType() != 0)) {
+			if (subPledge.getId() >= L2Clan.SUBUNIT_KNIGHT1) {
+				player.sendPacket(SystemMessageId.CAPTAIN_OF_ORDER_OF_KNIGHTS_CANNOT_BE_APPOINTED);
+			} else if (subPledge.getId() >= L2Clan.SUBUNIT_ROYAL1) {
+				player.sendPacket(SystemMessageId.CAPTAIN_OF_ROYAL_GUARD_CANNOT_BE_APPOINTED);
+			}
+			
+			return;
+		}
+		
+		subPledge.setLeaderId(clan.getClanMember(leaderName).getObjectId());
+		clan.updateSubPledgeInDB(subPledge.getId());
+		
+		final L2ClanMember leaderSubPledge = clan.getClanMember(leaderName);
+		final L2PcInstance leaderPlayer = leaderSubPledge.getPlayerInstance();
+		if (leaderPlayer != null) {
+			leaderPlayer.setPledgeClass(L2ClanMember.calculatePledgeClass(leaderPlayer));
+			leaderPlayer.sendPacket(new UserInfo(leaderPlayer));
+			leaderPlayer.sendPacket(new ExBrExtraUserInfo(leaderPlayer));
+		}
+		
+		clan.broadcastClanStatus();
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_SELECTED_AS_CAPTAIN_OF_S2);
+		sm.addString(leaderName);
+		sm.addString(clanName);
+		clan.broadcastToOnlineMembers(sm);
+	}
+	
+	/**
+	 * this displays PledgeSkillList to the player.
+	 */
+	public static void showPledgeSkillList(L2PcInstance player) {
+		// TODO(Zoey76): Unhardcode in Clan script.
+		if (!player.isClanLeader()) {
+			final NpcHtmlMessage html = new NpcHtmlMessage();
+			html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NotClanLeader.htm");
+			player.sendPacket(html);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final var skills = SkillTreesData.getInstance().getAvailablePledgeSkills(player.getClan());
+		if (skills.isEmpty()) {
+			if (player.getClan().getLevel() < 8) {
+				final var sm = SystemMessage.getSystemMessage(DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
+				if (player.getClan().getLevel() < 5) {
+					sm.addInt(5);
+				} else {
+					sm.addInt(player.getClan().getLevel() + 1);
+				}
+				player.sendPacket(sm);
+			} else {
+				final var html = new NpcHtmlMessage();
+				html.setFile(player.getHtmlPrefix(), "data/html/villagemaster/NoMoreSkills.htm");
+				player.sendPacket(html);
+			}
+		} else {
+			player.sendPacket(new AcquireSkillList(PLEDGE, skills));
+		}
+	}
+	
+	private static boolean isValidName(String name) {
+		return clan().getClanNameTemplate().matcher(name).matches();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterKamaelInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterKamaelInstance.java
new file mode 100644
index 00000000..a8668a56
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterKamaelInstance.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterKamaelInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterKamaelInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected String getSubClassMenu(Race race) {
+		if (character().subclassEverywhere() || (race == Race.KAMAEL)) {
+			return "data/html/villagemaster/SubClass.htm";
+		}
+		
+		return "data/html/villagemaster/SubClass_NoKamael.htm";
+	}
+	
+	@Override
+	protected String getSubClassFail() {
+		return "data/html/villagemaster/SubClass_Fail_Kamael.htm";
+	}
+	
+	@Override
+	protected boolean checkQuests(L2PcInstance player) {
+		return player.isNoble() || player.hasQuestCompleted("Q00234_FatesWhisper") || player.hasQuestCompleted("Q00236_SeedsOfChaos");
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfRace(Race.KAMAEL);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterMysticInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterMysticInstance.java
new file mode 100644
index 00000000..33d3e531
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterMysticInstance.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.ClassType;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterMysticInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterMysticInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfRace(Race.HUMAN) || pclass.isOfRace(Race.ELF);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterTeachType(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfType(ClassType.Mystic);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterOrcInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterOrcInstance.java
new file mode 100644
index 00000000..57b0eca1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterOrcInstance.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterOrcInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterOrcInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		
+		return pclass.isOfRace(Race.ORC);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterPriestInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterPriestInstance.java
new file mode 100644
index 00000000..9c7a4664
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterPriestInstance.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.base.ClassType;
+import com.l2jserver.gameserver.model.base.PlayerClass;
+
+public final class L2VillageMasterPriestInstance extends L2VillageMasterInstance {
+	
+	public L2VillageMasterPriestInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterRace(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		
+		return pclass.isOfRace(Race.HUMAN) || pclass.isOfRace(Race.ELF);
+	}
+	
+	@Override
+	protected boolean checkVillageMasterTeachType(PlayerClass pclass) {
+		if (pclass == null) {
+			return false;
+		}
+		return pclass.isOfType(ClassType.Priest);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2WarehouseInstance.java b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2WarehouseInstance.java
new file mode 100644
index 00000000..e8af3cc0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/instance/L2WarehouseInstance.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+public final class L2WarehouseInstance extends L2NpcInstance {
+	
+	public L2WarehouseInstance(int objectId, L2NpcTemplate template) {
+		super(objectId, template);
+		setInstanceType(InstanceType.L2WarehouseInstance);
+	}
+	
+	@Override
+	public boolean isWarehouse() {
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java
new file mode 100644
index 00000000..2b3998de
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class AttackableKnownList extends NpcKnownList {
+	public AttackableKnownList(L2Attackable activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		// Remove the L2Object from the _aggrolist of the L2Attackable
+		if (object instanceof L2Character) {
+			getActiveChar().getAggroList().remove(object);
+		}
+		// Set the L2Attackable Intention to AI_INTENTION_IDLE
+		final Collection<L2PcInstance> known = getKnownPlayers().values();
+		
+		// FIXME: This is a temporary solution && support for Walking Manager
+		if (getActiveChar().hasAI() && known.isEmpty() && !getActiveChar().isWalker()) {
+			getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null);
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public L2Attackable getActiveChar() {
+		return (L2Attackable) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		return getDistanceToWatchObject(object) + 500;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		if (!(object instanceof L2Character)) {
+			return 0;
+		}
+		
+		if (object.isPlayable()) {
+			return object.getKnownList().getDistanceToWatchObject(getActiveObject());
+		}
+		return Math.max(300, Math.max(getActiveChar().getAggroRange(), getActiveChar().getTemplate().getClanHelpRange()));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java
new file mode 100644
index 00000000..c1efbba9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java
@@ -0,0 +1,232 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.Util;
+
+public class CharKnownList extends ObjectKnownList {
+	private volatile Map<Integer, L2PcInstance> _knownPlayers;
+	private volatile Map<Integer, L2Summon> _knownSummons;
+	private volatile Map<Integer, Integer> _knownRelations;
+	
+	public CharKnownList(L2Character activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		if (object.isPlayer()) {
+			getKnownPlayers().put(object.getObjectId(), object.getActingPlayer());
+			getKnownRelations().put(object.getObjectId(), -1);
+		} else if (object.isSummon()) {
+			getKnownSummons().put(object.getObjectId(), (L2Summon) object);
+		}
+		return true;
+	}
+	
+	/**
+	 * @param player The L2PcInstance to search in _knownPlayer
+	 * @return {@code true} if the player is in _knownPlayer of the character, {@code false} otherwise
+	 */
+	public final boolean knowsThePlayer(L2PcInstance player) {
+		return (getActiveChar() == player) || getKnownPlayers().containsKey(player.getObjectId());
+	}
+	
+	/** Remove all L2Object from _knownObjects and _knownPlayer of the L2Character then cancel Attack or Cast and notify AI. */
+	@Override
+	public final void removeAllKnownObjects() {
+		super.removeAllKnownObjects();
+		getKnownPlayers().clear();
+		getKnownRelations().clear();
+		getKnownSummons().clear();
+		
+		// Set _target of the L2Character to null
+		// Cancel Attack or Cast
+		getActiveChar().setTarget(null);
+		
+		// Cancel AI Task
+		if (getActiveChar().hasAI()) {
+			getActiveChar().setAI(null);
+		}
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		if (!forget) // on forget objects removed by iterator
+		{
+			if (object.isPlayer()) {
+				getKnownPlayers().remove(object.getObjectId());
+				getKnownRelations().remove(object.getObjectId());
+			} else if (object.isSummon()) {
+				getKnownSummons().remove(object.getObjectId());
+			}
+		}
+		
+		// If object is targeted by the L2Character, cancel Attack or Cast
+		if (object == getActiveChar().getTarget()) {
+			getActiveChar().setTarget(null);
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public void forgetObjects(boolean fullCheck) {
+		if (!fullCheck) {
+			final Iterator<L2PcInstance> pIter = getKnownPlayers().values().iterator();
+			while (pIter.hasNext()) {
+				L2PcInstance player = pIter.next();
+				if (player == null) {
+					pIter.remove();
+				} else if (!player.isVisible() || !Util.checkIfInShortRadius(getDistanceToForgetObject(player), getActiveObject(), player, true)) {
+					pIter.remove();
+					removeKnownObject(player, true);
+					getKnownRelations().remove(player.getObjectId());
+					getKnownObjects().remove(player.getObjectId());
+				}
+			}
+			
+			final Iterator<L2Summon> sIter = getKnownSummons().values().iterator();
+			while (sIter.hasNext()) {
+				L2Summon summon = sIter.next();
+				if (summon == null) {
+					sIter.remove();
+				} else if (getActiveChar().isPlayer() && (summon.getOwner() == getActiveChar())) {
+					continue;
+				} else if (!summon.isVisible() || !Util.checkIfInShortRadius(getDistanceToForgetObject(summon), getActiveObject(), summon, true)) {
+					sIter.remove();
+					removeKnownObject(summon, true);
+					getKnownObjects().remove(summon.getObjectId());
+				}
+			}
+			
+			return;
+		}
+		// Go through knownObjects
+		final Iterator<L2Object> oIter = getKnownObjects().values().iterator();
+		while (oIter.hasNext()) {
+			L2Object object = oIter.next();
+			if (object == null) {
+				oIter.remove();
+			} else if (!object.isVisible() || !Util.checkIfInShortRadius(getDistanceToForgetObject(object), getActiveObject(), object, true)) {
+				oIter.remove();
+				removeKnownObject(object, true);
+				
+				if (object.isPlayer()) {
+					getKnownPlayers().remove(object.getObjectId());
+					getKnownRelations().remove(object.getObjectId());
+				} else if (object.isSummon()) {
+					getKnownSummons().remove(object.getObjectId());
+				}
+			}
+		}
+	}
+	
+	public L2Character getActiveChar() {
+		return (L2Character) super.getActiveObject();
+	}
+	
+	public List<L2Character> getKnownCharacters() {
+		List<L2Character> result = new LinkedList<>();
+		for (L2Object obj : getKnownObjects().values()) {
+			if (obj instanceof L2Character) {
+				result.add((L2Character) obj);
+			}
+		}
+		return result;
+	}
+	
+	public List<L2Character> getKnownCharactersInRadius(long radius) {
+		List<L2Character> result = new LinkedList<>();
+		for (L2Object obj : getKnownObjects().values()) {
+			if (obj instanceof L2Character) {
+				if (Util.checkIfInRange((int) radius, getActiveChar(), obj, true)) {
+					result.add((L2Character) obj);
+				}
+			}
+		}
+		return result;
+	}
+	
+	public final List<L2PcInstance> getKnownPlayersInRadius(long radius) {
+		List<L2PcInstance> result = new LinkedList<>();
+		for (L2PcInstance player : getKnownPlayers().values()) {
+			if (Util.checkIfInRange((int) radius, getActiveChar(), player, true)) {
+				result.add(player);
+			}
+		}
+		return result;
+	}
+	
+	public final Map<Integer, L2PcInstance> getKnownPlayers() {
+		if (_knownPlayers == null) {
+			synchronized (this) {
+				if (_knownPlayers == null) {
+					_knownPlayers = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return _knownPlayers;
+	}
+	
+	public final Map<Integer, Integer> getKnownRelations() {
+		if (_knownRelations == null) {
+			synchronized (this) {
+				if (_knownRelations == null) {
+					_knownRelations = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return _knownRelations;
+	}
+	
+	public final Map<Integer, L2Summon> getKnownSummons() {
+		if (_knownSummons == null) {
+			synchronized (this) {
+				if (_knownSummons == null) {
+					_knownSummons = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return _knownSummons;
+	}
+	
+	@Override
+	public final String toString() {
+		return getActiveChar() + " Known Objects " + getKnownObjects();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DecoyKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DecoyKnownList.java
new file mode 100644
index 00000000..49cdd869
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DecoyKnownList.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Decoy;
+
+public class DecoyKnownList extends CharKnownList {
+	public DecoyKnownList(L2Decoy activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final L2Decoy getActiveChar() {
+		return (L2Decoy) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if ((object == getActiveChar().getOwner()) || (object == getActiveChar().getTarget())) {
+			return 6000;
+		}
+		return 3000;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		return 1500;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java
new file mode 100644
index 00000000..0a402104
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DefenderKnownList.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+
+public class DefenderKnownList extends AttackableKnownList {
+	public DefenderKnownList(L2DefenderInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		Castle castle = getActiveChar().getCastle();
+		Fort fortress = getActiveChar().getFort();
+		SiegableHall hall = getActiveChar().getConquerableHall();
+		// Check if siege is in progress
+		if (((fortress != null) && fortress.getZone().isActive()) || ((castle != null) && castle.getZone().isActive()) || ((hall != null) && hall.getSiegeZone().isActive())) {
+			L2PcInstance player = null;
+			if (object.isPlayable()) {
+				player = object.getActingPlayer();
+			}
+			int activeSiegeId = (fortress != null ? fortress.getResidenceId() : (castle != null ? castle.getResidenceId() : hall != null ? hall.getId() : 0));
+			
+			// Check if player is an enemy of this defender npc
+			if ((player != null) && (((player.getSiegeState() == 2) && !player.isRegisteredOnThisSiegeField(activeSiegeId)) || ((player.getSiegeState() == 1) && !TerritoryWarManager.getInstance().isAllyField(player, activeSiegeId)) || (player.getSiegeState() == 0))) {
+				if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) {
+					getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+				}
+			}
+		}
+		return true;
+	}
+	
+	@Override
+	public final L2DefenderInstance getActiveChar() {
+		return (L2DefenderInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DoorKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DoorKnownList.java
new file mode 100644
index 00000000..0a2d16eb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/DoorKnownList.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+public class DoorKnownList extends CharKnownList {
+	public DoorKnownList(L2DoorInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final L2DoorInstance getActiveChar() {
+		return (L2DoorInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if (object instanceof L2DefenderInstance) {
+			return 800;
+		} else if (!object.isPlayer()) {
+			return 0;
+		}
+		
+		return 4000;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		if (object instanceof L2DefenderInstance) {
+			return 600;
+		} else if (!object.isPlayer()) {
+			return 0;
+		}
+		return 3500;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/FriendlyMobKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/FriendlyMobKnownList.java
new file mode 100644
index 00000000..f23602d6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/FriendlyMobKnownList.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2FriendlyMobInstance;
+
+public class FriendlyMobKnownList extends AttackableKnownList {
+	public FriendlyMobKnownList(L2FriendlyMobInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		if (object.isPlayer() && (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE)) {
+			getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+		}
+		
+		return true;
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		if (!(object instanceof L2Character)) {
+			return true;
+		}
+		
+		if (getActiveChar().hasAI()) {
+			getActiveChar().getAI().notifyEvent(CtrlEvent.EVT_FORGET_OBJECT, object);
+			if (getActiveChar().getTarget() == object) {
+				getActiveChar().setTarget(null);
+			}
+		}
+		
+		if (getActiveChar().isVisible() && getKnownPlayers().isEmpty() && getKnownSummons().isEmpty()) {
+			getActiveChar().clearAggroList();
+			if (getActiveChar().hasAI()) {
+				getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null);
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public final L2FriendlyMobInstance getActiveChar() {
+		return (L2FriendlyMobInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/GuardKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/GuardKnownList.java
new file mode 100644
index 00000000..09d3afe6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/GuardKnownList.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2GuardInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+
+public class GuardKnownList extends AttackableKnownList {
+	private static final Logger LOG = LoggerFactory.getLogger(GuardKnownList.class);
+	
+	public GuardKnownList(L2GuardInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		if (object.isPlayer()) {
+			// Check if the object added is a L2PcInstance that owns Karma
+			if (object.getActingPlayer().getKarma() > 0) {
+				if (general().debug()) {
+					LOG.debug("{}: PK {} entered scan range", getActiveChar().getObjectId(), object.getObjectId());
+				}
+				
+				// Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
+				if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) {
+					getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+				}
+			}
+		} else if ((npc().guardAttackAggroMob() && getActiveChar().isInActiveRegion()) && object.isMonster()) {
+			// Check if the object added is an aggressive L2MonsterInstance
+			if (((L2MonsterInstance) object).isAggressive()) {
+				if (general().debug()) {
+					LOG.debug("{}: Aggressive mob {} entered scan range", getActiveChar().getObjectId(), object.getObjectId());
+				}
+				
+				// Set the L2GuardInstance Intention to AI_INTENTION_ACTIVE
+				if (getActiveChar().getAI().getIntention() == CtrlIntention.AI_INTENTION_IDLE) {
+					getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		// Check if the aggression list of this guard is empty.
+		if (getActiveChar().getAggroList().isEmpty()) {
+			// Set the L2GuardInstance to AI_INTENTION_IDLE
+			if (getActiveChar().hasAI() && !getActiveChar().isWalker()) {
+				getActiveChar().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null);
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public final L2GuardInstance getActiveChar() {
+		return (L2GuardInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/MonsterKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/MonsterKnownList.java
new file mode 100644
index 00000000..df6b7883
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/MonsterKnownList.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2CharacterAI;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class MonsterKnownList extends AttackableKnownList {
+	public MonsterKnownList(L2MonsterInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		final L2CharacterAI ai = getActiveChar().getAI(); // force AI creation
+		
+		// Set the L2MonsterInstance Intention to AI_INTENTION_ACTIVE if the state was AI_INTENTION_IDLE
+		if ((object instanceof L2PcInstance) && (ai != null) && (ai.getIntention() == CtrlIntention.AI_INTENTION_IDLE)) {
+			ai.setIntention(CtrlIntention.AI_INTENTION_ACTIVE, null);
+		}
+		
+		return true;
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		if (!(object instanceof L2Character)) {
+			return true;
+		}
+		
+		if (getActiveChar().hasAI()) {
+			// Notify the L2MonsterInstance AI with EVT_FORGET_OBJECT
+			getActiveChar().getAI().notifyEvent(CtrlEvent.EVT_FORGET_OBJECT, object);
+		}
+		
+		if (getActiveChar().isVisible() && getKnownPlayers().isEmpty() && getKnownSummons().isEmpty()) {
+			// Clear the _aggroList of the L2MonsterInstance
+			getActiveChar().clearAggroList();
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public final L2MonsterInstance getActiveChar() {
+		return (L2MonsterInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/NpcKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/NpcKnownList.java
new file mode 100644
index 00000000..0a6ab62c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/NpcKnownList.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2FestivalGuideInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcCreatureSee;
+
+public class NpcKnownList extends CharKnownList {
+	private ScheduledFuture<?> _trackingTask = null;
+	
+	public NpcKnownList(L2Npc activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		if (getActiveObject().isNpc() && (object instanceof L2Character)) {
+			EventDispatcher.getInstance().notifyEventAsync(new NpcCreatureSee(getActiveChar(), (L2Character) object), getActiveChar());
+		}
+		return true;
+	}
+	
+	@Override
+	public L2Npc getActiveChar() {
+		return (L2Npc) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		return getDistanceToWatchObject(object) + 500;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		if (!(object instanceof L2Character)) {
+			return 0;
+		}
+		
+		if (object instanceof L2FestivalGuideInstance) {
+			return 4000;
+		}
+		
+		if (object.isPlayable()) {
+			return 1500;
+		}
+		
+		return 500;
+	}
+	
+	// Support for Walking monsters aggro
+	public void startTrackingTask() {
+		if ((_trackingTask == null) && (getActiveChar().getAggroRange() > 0)) {
+			_trackingTask = ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new TrackingTask(), 2000, 2000);
+		}
+	}
+	
+	// Support for Walking monsters aggro
+	public void stopTrackingTask() {
+		if (_trackingTask != null) {
+			_trackingTask.cancel(true);
+			_trackingTask = null;
+		}
+	}
+	
+	// Support for Walking monsters aggro
+	protected class TrackingTask implements Runnable {
+		@Override
+		public void run() {
+			if (!getActiveChar().isAttackable()) {
+				return;
+			}
+			
+			final L2Attackable monster = (L2Attackable) getActiveChar();
+			if (monster.getAI().getIntention() != CtrlIntention.AI_INTENTION_MOVE_TO) {
+				return;
+			}
+			
+			for (L2PcInstance pl : getKnownPlayers().values()) {
+				if (!pl.isDead() && !pl.isInvul() && pl.isInsideRadius(monster, monster.getAggroRange(), true, false) && (monster.isMonster() || (monster.isInstanceTypes(InstanceType.L2GuardInstance) && (pl.getKarma() > 0)))) {
+					// Send aggroRangeEnter
+					if (monster.getHating(pl) == 0) {
+						monster.addDamageHate(pl, 0, 0);
+					}
+					
+					// Skip attack for other targets, if one is already chosen for attack
+					if ((monster.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && !monster.isCoreAIDisabled()) {
+						WalkingManager.getInstance().stopMoving(getActiveChar(), false, true);
+						monster.addDamageHate(pl, 0, 100);
+						monster.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, pl, null);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/NullKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/NullKnownList.java
new file mode 100644
index 00000000..003f8623
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/NullKnownList.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+public class NullKnownList extends ObjectKnownList {
+	public NullKnownList(L2Object activeObject) {
+		super(activeObject);
+	}
+	
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		return false;
+	}
+	
+	@Override
+	public L2Object getActiveObject() {
+		return super.getActiveObject();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		return 0;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		return 0;
+	}
+	
+	@Override
+	public void removeAllKnownObjects() {
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/ObjectKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/ObjectKnownList.java
new file mode 100644
index 00000000..a8a900ad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/ObjectKnownList.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.util.Util;
+
+public class ObjectKnownList {
+	private final L2Object _activeObject;
+	private volatile Map<Integer, L2Object> _knownObjects;
+	
+	public ObjectKnownList(L2Object activeObject) {
+		_activeObject = activeObject;
+	}
+	
+	public boolean addKnownObject(L2Object object) {
+		if (object == null) {
+			return false;
+		}
+		
+		// Instance -1 is for GMs that can see everything on all instances
+		if ((getActiveObject().getInstanceId() != -1) && (object.getInstanceId() != getActiveObject().getInstanceId())) {
+			return false;
+		}
+		
+		// Check if the object is an L2PcInstance in ghost mode
+		if (object.isPlayer() && object.getActingPlayer().getAppearance().isGhost()) {
+			return false;
+		}
+		
+		// Check if already know object
+		if (knowsObject(object)) {
+			return false;
+		}
+		
+		// Check if object is not inside distance to watch object
+		if (!Util.checkIfInShortRadius(getDistanceToWatchObject(object), getActiveObject(), object, true)) {
+			return false;
+		}
+		
+		return (getKnownObjects().put(object.getObjectId(), object) == null);
+	}
+	
+	public final boolean knowsObject(L2Object object) {
+		if (object == null) {
+			return false;
+		}
+		
+		return (getActiveObject() == object) || getKnownObjects().containsKey(object.getObjectId());
+	}
+	
+	/**
+	 * Remove all L2Object from _knownObjects
+	 */
+	public void removeAllKnownObjects() {
+		getKnownObjects().clear();
+	}
+	
+	public final boolean removeKnownObject(L2Object object) {
+		return removeKnownObject(object, false);
+	}
+	
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (object == null) {
+			return false;
+		}
+		
+		if (forget) {
+			return true;
+		}
+		
+		return getKnownObjects().remove(object.getObjectId()) != null;
+	}
+	
+	/**
+	 * Used only in Config.MOVE_BASED_KNOWNLIST and does not support guards seeing moving monsters
+	 */
+	public final void findObjects() {
+		final L2WorldRegion worldRegion = getActiveObject().getWorldRegion();
+		if (worldRegion == null) {
+			return;
+		}
+		
+		if (getActiveObject().isPlayable()) {
+			for (L2WorldRegion surroundingRegion : worldRegion.getSurroundingRegions()) // offer members of this and surrounding regions
+			{
+				for (L2Object object : surroundingRegion.getVisibleObjects().values()) {
+					if (object != getActiveObject()) {
+						addKnownObject(object);
+						if (object instanceof L2Character) {
+							object.getKnownList().addKnownObject(getActiveObject());
+						}
+					}
+				}
+			}
+		} else if (getActiveObject() instanceof L2Character) {
+			for (L2WorldRegion surroundingRegion : worldRegion.getSurroundingRegions()) // offer members of this and surrounding regions
+			{
+				if (surroundingRegion.isActive()) {
+					for (L2Object object : surroundingRegion.getVisiblePlayable().values()) {
+						if (object != getActiveObject()) {
+							addKnownObject(object);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Remove invisible and too far L2Object from _knowObject and if necessary from _knownPlayers of the L2Character
+	 * @param fullCheck
+	 */
+	public void forgetObjects(boolean fullCheck) {
+		final Iterator<L2Object> oIter = getKnownObjects().values().iterator();
+		while (oIter.hasNext()) {
+			final L2Object object = oIter.next();
+			if (!fullCheck && !object.isPlayable()) {
+				continue;
+			}
+			
+			// Remove all objects invisible or too far
+			if (!object.isVisible() || !Util.checkIfInShortRadius(getDistanceToForgetObject(object), getActiveObject(), object, true)) {
+				oIter.remove();
+				removeKnownObject(object, true);
+			}
+		}
+	}
+	
+	public L2Object getActiveObject() {
+		return _activeObject;
+	}
+	
+	public int getDistanceToForgetObject(L2Object object) {
+		return 0;
+	}
+	
+	public int getDistanceToWatchObject(L2Object object) {
+		return 0;
+	}
+	
+	/**
+	 * @return the _knownObjects containing all L2Object known by the L2Character.
+	 */
+	public final Map<Integer, L2Object> getKnownObjects() {
+		if (_knownObjects == null) {
+			synchronized (this) {
+				if (_knownObjects == null) {
+					_knownObjects = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return _knownObjects;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/PcKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/PcKnownList.java
new file mode 100644
index 00000000..0b38b5f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/PcKnownList.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
+import com.l2jserver.gameserver.network.serverpackets.SpawnItem;
+
+public class PcKnownList extends PlayableKnownList {
+	public PcKnownList(L2PcInstance activeChar) {
+		super(activeChar);
+	}
+	
+	/**
+	 * Add a visible L2Object to L2PcInstance _knownObjects and _knownPlayer (if necessary) and send Server-Client Packets needed to inform the L2PcInstance of its state and actions in progress.<BR>
+	 * <BR>
+	 * <B><U> object is a L2ItemInstance </U> :</B><BR>
+	 * <BR>
+	 * <li>Send Server-Client Packet DropItem/SpawnItem to the L2PcInstance</li><BR>
+	 * <BR>
+	 * <B><U> object is a L2DoorInstance </U> :</B><BR>
+	 * <BR>
+	 * <li>Send Server-Client Packets DoorInfo and DoorStatusUpdate to the L2PcInstance</li>
+	 * <li>Send Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance</li><BR>
+	 * <BR>
+	 * <B><U> object is a L2NpcInstance </U> :</B><BR>
+	 * <BR>
+	 * <li>Send Server-Client Packet NpcInfo to the L2PcInstance</li>
+	 * <li>Send Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance</li><BR>
+	 * <BR>
+	 * <B><U> object is a L2Summon </U> :</B><BR>
+	 * <BR>
+	 * <li>Send Server-Client Packet NpcInfo/PetItemList (if the L2PcInstance is the owner) to the L2PcInstance</li>
+	 * <li>Send Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance</li><BR>
+	 * <BR>
+	 * <B><U> object is a L2PcInstance </U> :</B><BR>
+	 * <BR>
+	 * <li>Send Server-Client Packet CharInfo to the L2PcInstance</li>
+	 * <li>If the object has a private store, Send Server-Client Packet PrivateStoreMsgSell to the L2PcInstance</li>
+	 * <li>Send Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance</li><BR>
+	 * <BR>
+	 * @param object The L2Object to add to _knownObjects and _knownPlayer
+	 */
+	@Override
+	public boolean addKnownObject(L2Object object) {
+		if (!super.addKnownObject(object)) {
+			return false;
+		}
+		
+		if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item")) {
+			// if (object.getPolytype().equals("item"))
+			getActiveChar().sendPacket(new SpawnItem(object));
+			// else if (object.getPolytype().equals("npc"))
+			// sendPacket(new NpcInfoPoly(object, this));
+		} else {
+			if (object.isVisibleFor(getActiveChar())) {
+				object.sendInfo(getActiveChar());
+				
+				if (object instanceof L2Character obj) {
+					// Update the state of the L2Character object client side by sending Server->Client packet MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance
+					if (obj.hasAI()) {
+						obj.getAI().describeStateToPlayer(getActiveChar());
+					}
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Remove a L2Object from L2PcInstance _knownObjects and _knownPlayer (if necessary) and send Server-Client Packet DeleteObject to the L2PcInstance.<BR>
+	 * <BR>
+	 * @param object The L2Object to remove from _knownObjects and _knownPlayer
+	 */
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		if (object instanceof L2AirShipInstance airShip) {
+			if ((airShip.getCaptainId() != 0) && (airShip.getCaptainId() != getActiveChar().getObjectId())) {
+				getActiveChar().sendPacket(new DeleteObject(airShip.getCaptainId()));
+			}
+			if (airShip.getHelmObjectId() != 0) {
+				getActiveChar().sendPacket(new DeleteObject(airShip.getHelmObjectId()));
+			}
+		}
+		
+		// Send Server-Client Packet DeleteObject to the L2PcInstance
+		getActiveChar().sendPacket(new DeleteObject(object));
+		
+		if (general().checkKnownList() && (object instanceof L2Npc) && getActiveChar().isGM()) {
+			getActiveChar().sendMessage("Removed NPC: " + object.getName());
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public final L2PcInstance getActiveChar() {
+		return (L2PcInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if (object.isVehicle()) {
+			return 10000;
+		}
+		return getDistanceToWatchObject(object) + 500;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		if (object.isVehicle()) {
+			return 9000;
+		}
+		
+		final int knownlistSize = getKnownObjects().size();
+		if ((knownlistSize <= 3) && !object.isAttackable()) {
+			return 4500; // Empty fields
+		}
+		if ((knownlistSize <= 10) && !object.isAttackable()) {
+			return 4000; // Empty fields
+		}
+		if ((knownlistSize <= 20) && !object.isAttackable()) {
+			return 3400;
+		}
+		if (knownlistSize <= 30) {
+			return 2900;
+		}
+		if (knownlistSize <= 40) {
+			return 2300;
+		}
+		return 3000; // Siege, TOI, City
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/PlayableKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/PlayableKnownList.java
new file mode 100644
index 00000000..a5fd8978
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/PlayableKnownList.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.actor.L2Playable;
+
+public class PlayableKnownList extends CharKnownList {
+	public PlayableKnownList(L2Playable activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2Playable getActiveChar() {
+		return (L2Playable) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/RaceManagerKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/RaceManagerKnownList.java
new file mode 100644
index 00000000..decd1369
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/RaceManagerKnownList.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.MonsterRace;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2RaceManagerInstance;
+import com.l2jserver.gameserver.network.serverpackets.DeleteObject;
+
+public class RaceManagerKnownList extends NpcKnownList {
+	public RaceManagerKnownList(L2RaceManagerInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	protected boolean removeKnownObject(L2Object object, boolean forget) {
+		if (!super.removeKnownObject(object, forget)) {
+			return false;
+		}
+		
+		if (object.isPlayer()) {
+			for (int i = 0; i < 8; i++) {
+				object.sendPacket(new DeleteObject(MonsterRace.getInstance().getMonsters()[i]));
+			}
+		}
+		
+		return true;
+	}
+	
+	@Override
+	public L2RaceManagerInstance getActiveChar() {
+		return (L2RaceManagerInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/StaticObjectKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/StaticObjectKnownList.java
new file mode 100644
index 00000000..2ea67846
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/StaticObjectKnownList.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+
+public class StaticObjectKnownList extends CharKnownList {
+	public StaticObjectKnownList(L2StaticObjectInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final L2StaticObjectInstance getActiveChar() {
+		return (L2StaticObjectInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if (object instanceof L2DefenderInstance) {
+			return 800;
+		}
+		if (!object.isPlayer()) {
+			return 0;
+		}
+		
+		return 4000;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		if (object instanceof L2DefenderInstance) {
+			return 600;
+		}
+		if (!object.isPlayer()) {
+			return 0;
+		}
+		return 2000;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/SummonKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/SummonKnownList.java
new file mode 100644
index 00000000..db8a9a0f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/SummonKnownList.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+public class SummonKnownList extends PlayableKnownList {
+	public SummonKnownList(L2Summon activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final L2Summon getActiveChar() {
+		return (L2Summon) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if ((object == getActiveChar().getOwner()) || (object == getActiveChar().getTarget())) {
+			return 6000;
+		}
+		return 3000;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		return 1500;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/TrapKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/TrapKnownList.java
new file mode 100644
index 00000000..d9eb5f56
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/TrapKnownList.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+
+public class TrapKnownList extends NpcKnownList {
+	public TrapKnownList(L2TrapInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final L2TrapInstance getActiveChar() {
+		return (L2TrapInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if ((object == getActiveChar().getActingPlayer()) || (object == getActiveChar().getTarget())) {
+			return 6000;
+		}
+		
+		return 3000;
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		return 1500;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/VehicleKnownList.java b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/VehicleKnownList.java
new file mode 100644
index 00000000..e1c10c90
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/knownlist/VehicleKnownList.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.knownlist;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class VehicleKnownList extends CharKnownList {
+	public VehicleKnownList(L2Character activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public int getDistanceToForgetObject(L2Object object) {
+		if (!object.isPlayer()) {
+			return 0;
+		}
+		
+		return object.getKnownList().getDistanceToForgetObject(getActiveObject());
+	}
+	
+	@Override
+	public int getDistanceToWatchObject(L2Object object) {
+		if (!object.isPlayer()) {
+			return 0;
+		}
+		
+		return object.getKnownList().getDistanceToWatchObject(getActiveObject());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/poly/ObjectPoly.java b/src/main/java/com/l2jserver/gameserver/model/actor/poly/ObjectPoly.java
new file mode 100644
index 00000000..7b0c95ac
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/poly/ObjectPoly.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.poly;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+public class ObjectPoly {
+	private final L2Object _activeObject;
+	private int _polyId;
+	private String _polyType;
+	
+	public ObjectPoly(L2Object activeObject) {
+		_activeObject = activeObject;
+	}
+	
+	public void setPolyInfo(String polyType, String polyId) {
+		setPolyId(Integer.parseInt(polyId));
+		setPolyType(polyType);
+	}
+	
+	public final L2Object getActiveObject() {
+		return _activeObject;
+	}
+	
+	public final boolean isMorphed() {
+		return getPolyType() != null;
+	}
+	
+	public final int getPolyId() {
+		return _polyId;
+	}
+	
+	public final void setPolyId(int value) {
+		_polyId = value;
+	}
+	
+	public final String getPolyType() {
+		return _polyType;
+	}
+	
+	public final void setPolyType(String value) {
+		_polyType = value;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java
new file mode 100644
index 00000000..63ba1840
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java
@@ -0,0 +1,629 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.Arrays;
+
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Calculator;
+import com.l2jserver.gameserver.model.stats.MoveType;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.TraitType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+public class CharStat {
+	private final L2Character _activeChar;
+	private int _level = 1;
+	private final float[] _attackTraits = new float[TraitType.values().length];
+	private final int[] _attackTraitsCount = new int[TraitType.values().length];
+	private final float[] _defenceTraits = new float[TraitType.values().length];
+	private final int[] _defenceTraitsCount = new int[TraitType.values().length];
+	private final int[] _traitsInvul = new int[TraitType.values().length];
+	
+	public CharStat(L2Character activeChar) {
+		_activeChar = activeChar;
+		Arrays.fill(_attackTraits, 1.0f);
+		Arrays.fill(_defenceTraits, 1.0f);
+	}
+	
+	public final double calcStat(Stats stat, double init) {
+		return calcStat(stat, init, null, null);
+	}
+	
+	/**
+	 * Calculate the new value of the state with modifiers that will be applied on the targeted L2Character.<BR>
+	 * <B><U> Concept</U> :</B><BR A L2Character owns a table of Calculators called <B>_calculators</B>. Each Calculator (a calculator per state) own a table of Func object. A Func object is a mathematical function that permit to calculate the modifier of a state (ex : REGENERATE_HP_RATE...) : <BR>
+	 * FuncAtkAccuracy -> Math.sqrt(_player.getDEX())*6+_player.getLevel()<BR>
+	 * When the calc method of a calculator is launched, each mathematical function is called according to its priority <B>_order</B>.<br>
+	 * Indeed, Func with lowest priority order is executed first and Funcs with the same order are executed in unspecified order.<br>
+	 * The result of the calculation is stored in the value property of an Env class instance.<br>
+	 * @param stat The stat to calculate the new value with modifiers
+	 * @param initVal The initial value of the stat before applying modifiers
+	 * @param target The L2Character whose properties will be used in the calculation (ex : CON, INT...)
+	 * @param skill The L2Skill whose properties will be used in the calculation (ex : Level...)
+	 * @return
+	 */
+	public final double calcStat(Stats stat, double initVal, L2Character target, Skill skill) {
+		double value = initVal;
+		if (stat == null) {
+			return value;
+		}
+		
+		final int id = stat.ordinal();
+		final Calculator c = _activeChar.getCalculators()[id];
+		
+		// If no Func object found, no modifier is applied
+		if ((c == null) || (c.size() == 0)) {
+			return value;
+		}
+		
+		// Apply transformation stats.
+		if (getActiveChar().isPlayer() && getActiveChar().isTransformed()) {
+			double val = getActiveChar().getTransformation().getStat(getActiveChar().getActingPlayer(), stat);
+			if (val > 0) {
+				value = val;
+			}
+		}
+		
+		// Launch the calculation
+		value = c.calc(_activeChar, target, skill, value);
+		
+		// avoid some troubles with negative stats (some stats should never be negative)
+		if (value <= 0) {
+			switch (stat) {
+				case MAX_HP, MAX_MP, MAX_CP, MAGIC_DEFENCE, POWER_DEFENCE, POWER_ATTACK, MAGIC_ATTACK, POWER_ATTACK_SPEED, MAGIC_ATTACK_SPEED, SHIELD_DEFENCE, STAT_CON, STAT_DEX, STAT_INT, STAT_MEN, STAT_STR, STAT_WIT -> value = 1.0;
+			}
+		}
+		return value;
+	}
+	
+	/**
+	 * @return the Accuracy (base+modifier) of the L2Character in function of the Weapon Expertise Penalty.
+	 */
+	public int getAccuracy() {
+		return (int) Math.round(calcStat(Stats.ACCURACY_COMBAT, 0, null, null));
+	}
+	
+	public L2Character getActiveChar() {
+		return _activeChar;
+	}
+	
+	/**
+	 * @return the Attack Speed multiplier (base+modifier) of the L2Character to get proper animations.
+	 */
+	public final float getAttackSpeedMultiplier() {
+		return (float) (((1.1) * getPAtkSpd()) / _activeChar.getTemplate().getBasePAtkSpd());
+	}
+	
+	/**
+	 * @return the CON of the L2Character (base+modifier).
+	 */
+	public final int getCON() {
+		return (int) calcStat(Stats.STAT_CON, _activeChar.getTemplate().getBaseCON());
+	}
+	
+	/**
+	 * @param target
+	 * @param init
+	 * @return the Critical Damage rate (base+modifier) of the L2Character.
+	 */
+	public final double getCriticalDmg(L2Character target, double init) {
+		return calcStat(Stats.CRITICAL_DAMAGE, init, target, null);
+	}
+	
+	/**
+	 * @param target
+	 * @param skill
+	 * @return the Critical Hit rate (base+modifier) of the L2Character.
+	 */
+	public int getCriticalHit(L2Character target, Skill skill) {
+		double val = (int) calcStat(Stats.CRITICAL_RATE, _activeChar.getTemplate().getBaseCritRate(), target, skill);
+		if (!_activeChar.canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			val = Math.min(val, character().getMaxPCritRate());
+		}
+		return (int) (val + .5);
+	}
+	
+	/**
+	 * @param base
+	 * @return the Critical Hit Pos rate of the L2Character
+	 */
+	public int getCriticalHitPos(int base) {
+		return (int) calcStat(Stats.CRITICAL_RATE_POS, base);
+	}
+	
+	/**
+	 * @return the DEX of the L2Character (base+modifier).
+	 */
+	public final int getDEX() {
+		return (int) calcStat(Stats.STAT_DEX, _activeChar.getTemplate().getBaseDEX());
+	}
+	
+	/**
+	 * @param target
+	 * @return the Attack Evasion rate (base+modifier) of the L2Character.
+	 */
+	public int getEvasionRate(L2Character target) {
+		int val = (int) Math.round(calcStat(Stats.EVASION_RATE, 0, target, null));
+		if (!_activeChar.canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			val = Math.min(val, character().getMaxEvasion());
+		}
+		return val;
+	}
+	
+	/**
+	 * @return the INT of the L2Character (base+modifier).
+	 */
+	public int getINT() {
+		return (int) calcStat(Stats.STAT_INT, _activeChar.getTemplate().getBaseINT());
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public void setLevel(int value) {
+		_level = value;
+	}
+	
+	/**
+	 * @param skill
+	 * @return the Magical Attack range (base+modifier) of the L2Character.
+	 */
+	public final int getMagicalAttackRange(Skill skill) {
+		if (skill != null) {
+			return (int) calcStat(Stats.MAGIC_ATTACK_RANGE, skill.getCastRange(), null, skill);
+		}
+		
+		return _activeChar.getTemplate().getBaseAttackRange();
+	}
+	
+	public int getMaxCp() {
+		return (int) calcStat(Stats.MAX_CP, _activeChar.getTemplate().getBaseCpMax());
+	}
+	
+	public int getMaxRecoverableCp() {
+		return (int) calcStat(Stats.MAX_RECOVERABLE_CP, getMaxCp());
+	}
+	
+	public int getMaxHp() {
+		return (int) calcStat(Stats.MAX_HP, _activeChar.getTemplate().getBaseHpMax());
+	}
+	
+	public int getMaxRecoverableHp() {
+		return (int) calcStat(Stats.MAX_RECOVERABLE_HP, getMaxHp());
+	}
+	
+	public int getMaxMp() {
+		return (int) calcStat(Stats.MAX_MP, _activeChar.getTemplate().getBaseMpMax());
+	}
+	
+	public int getMaxRecoverableMp() {
+		return (int) calcStat(Stats.MAX_RECOVERABLE_MP, getMaxMp());
+	}
+	
+	/**
+	 * Return the MAtk (base+modifier) of the L2Character.<br>
+	 * <B><U>Example of use</U>: Calculate Magic damage
+	 * @param target The L2Character targeted by the skill
+	 * @param skill The L2Skill used against the target
+	 * @return
+	 */
+	public double getMAtk(L2Character target, Skill skill) {
+		float bonusAtk = 1;
+		if (customs().championEnable() && _activeChar.isChampion()) {
+			bonusAtk = customs().getChampionAtk();
+		}
+		if (_activeChar.isRaid()) {
+			bonusAtk *= npc().getRaidMAttackMultiplier();
+		}
+		// Calculate modifiers Magic Attack
+		return calcStat(Stats.MAGIC_ATTACK, _activeChar.getTemplate().getBaseMAtk() * bonusAtk, target, skill);
+	}
+	
+	/**
+	 * @return the MAtk Speed (base+modifier) of the L2Character in function of the Armour Expertise Penalty.
+	 */
+	public int getMAtkSpd() {
+		float bonusSpdAtk = 1;
+		if (customs().championEnable() && _activeChar.isChampion()) {
+			bonusSpdAtk = customs().getChampionSpdAtk();
+		}
+		
+		double val = calcStat(Stats.MAGIC_ATTACK_SPEED, _activeChar.getTemplate().getBaseMAtkSpd() * bonusSpdAtk);
+		if (!_activeChar.canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			val = Math.min(val, character().getMaxMAtkSpeed());
+		}
+		return (int) val;
+	}
+	
+	/**
+	 * @param target
+	 * @param skill
+	 * @return the Magic Critical Hit rate (base+modifier) of the L2Character.
+	 */
+	public final int getMCriticalHit(L2Character target, Skill skill) {
+		int val = (int) calcStat(Stats.MCRITICAL_RATE, 1, target, skill) * 10;
+		if (!_activeChar.canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			val = Math.min(val, character().getMaxMCritRate());
+		}
+		return val;
+	}
+	
+	/**
+	 * <B><U>Example of use </U>: Calculate Magic damage.
+	 * @param target The L2Character targeted by the skill
+	 * @param skill The L2Skill used against the target
+	 * @return the MDef (base+modifier) of the L2Character against a skill in function of abnormal effects in progress.
+	 */
+	public double getMDef(L2Character target, Skill skill) {
+		// Get the base MDef of the L2Character
+		double defence = _activeChar.getTemplate().getBaseMDef();
+		
+		// Calculate modifier for Raid Bosses
+		if (_activeChar.isRaid()) {
+			defence *= npc().getRaidMDefenceMultiplier();
+		}
+		// Calculate modifiers Magic Attack
+		return calcStat(Stats.MAGIC_DEFENCE, defence, target, skill);
+	}
+	
+	/**
+	 * @return the MEN of the L2Character (base+modifier).
+	 */
+	public final int getMEN() {
+		return (int) calcStat(Stats.STAT_MEN, _activeChar.getTemplate().getBaseMEN());
+	}
+	
+	public double getMovementSpeedMultiplier() {
+		double baseSpeed;
+		if (_activeChar.isInsideZone(ZoneId.WATER)) {
+			baseSpeed = getBaseMoveSpeed(_activeChar.isRunning() ? MoveType.FAST_SWIM : MoveType.SLOW_SWIM);
+		} else {
+			baseSpeed = getBaseMoveSpeed(_activeChar.isRunning() ? MoveType.RUN : MoveType.WALK);
+		}
+		return getMoveSpeed() * (1. / baseSpeed);
+	}
+	
+	/**
+	 * @return the RunSpeed (base+modifier) of the L2Character in function of the Armour Expertise Penalty.
+	 */
+	public double getRunSpeed() {
+		final double baseRunSpd = _activeChar.isInsideZone(ZoneId.WATER) ? getSwimRunSpeed() : getBaseMoveSpeed(MoveType.RUN);
+		if (baseRunSpd <= 0) {
+			return 0;
+		}
+		
+		return calcStat(Stats.MOVE_SPEED, baseRunSpd, null, null);
+	}
+	
+	/**
+	 * @return the WalkSpeed (base+modifier) of the L2Character.
+	 */
+	public double getWalkSpeed() {
+		final double baseWalkSpd = _activeChar.isInsideZone(ZoneId.WATER) ? getSwimWalkSpeed() : getBaseMoveSpeed(MoveType.WALK);
+		if (baseWalkSpd <= 0) {
+			return 0;
+		}
+		
+		return calcStat(Stats.MOVE_SPEED, baseWalkSpd);
+	}
+	
+	/**
+	 * @return the SwimRunSpeed (base+modifier) of the L2Character.
+	 */
+	public double getSwimRunSpeed() {
+		final double baseRunSpd = getBaseMoveSpeed(MoveType.FAST_SWIM);
+		if (baseRunSpd <= 0) {
+			return 0;
+		}
+		
+		return calcStat(Stats.MOVE_SPEED, baseRunSpd, null, null);
+	}
+	
+	/**
+	 * @return the SwimWalkSpeed (base+modifier) of the L2Character.
+	 */
+	public double getSwimWalkSpeed() {
+		final double baseWalkSpd = getBaseMoveSpeed(MoveType.SLOW_SWIM);
+		if (baseWalkSpd <= 0) {
+			return 0;
+		}
+		
+		return calcStat(Stats.MOVE_SPEED, baseWalkSpd);
+	}
+	
+	/**
+	 * @param type movement type
+	 * @return the base move speed of given movement type.
+	 */
+	public double getBaseMoveSpeed(MoveType type) {
+		return _activeChar.getTemplate().getBaseMoveSpeed(type);
+	}
+	
+	/**
+	 * @return the RunSpeed (base+modifier) or WalkSpeed (base+modifier) of the L2Character in function of the movement type.
+	 */
+	public double getMoveSpeed() {
+		if (_activeChar.isInsideZone(ZoneId.WATER)) {
+			return _activeChar.isRunning() ? getSwimRunSpeed() : getSwimWalkSpeed();
+		}
+		return _activeChar.isRunning() ? getRunSpeed() : getWalkSpeed();
+	}
+	
+	/**
+	 * @param skill
+	 * @return the MReuse rate (base+modifier) of the L2Character.
+	 */
+	public final double getMReuseRate(Skill skill) {
+		return calcStat(Stats.MAGIC_REUSE_RATE, 1, null, skill);
+	}
+	
+	/**
+	 * @param target
+	 * @return the PAtk (base+modifier) of the L2Character.
+	 */
+	public double getPAtk(L2Character target) {
+		float bonusAtk = 1;
+		if (customs().championEnable() && _activeChar.isChampion()) {
+			bonusAtk = customs().getChampionAtk();
+		}
+		if (_activeChar.isRaid()) {
+			bonusAtk *= npc().getRaidPAttackMultiplier();
+		}
+		return calcStat(Stats.POWER_ATTACK, _activeChar.getTemplate().getBasePAtk() * bonusAtk, target, null);
+	}
+	
+	/**
+	 * @return the PAtk Speed (base+modifier) of the L2Character in function of the Armour Expertise Penalty.
+	 */
+	public double getPAtkSpd() {
+		float bonusAtk = 1;
+		if (customs().championEnable() && _activeChar.isChampion()) {
+			bonusAtk = customs().getChampionSpdAtk();
+		}
+		return Math.round(calcStat(Stats.POWER_ATTACK_SPEED, _activeChar.getTemplate().getBasePAtkSpd() * bonusAtk, null, null));
+	}
+	
+	/**
+	 * @param target
+	 * @return the PDef (base+modifier) of the L2Character.
+	 */
+	public double getPDef(L2Character target) {
+		return calcStat(Stats.POWER_DEFENCE, (_activeChar.isRaid()) ? _activeChar.getTemplate().getBasePDef() * npc().getRaidPDefenceMultiplier() : _activeChar.getTemplate().getBasePDef(), target, null);
+	}
+	
+	/**
+	 * @return the Physical Attack range (base+modifier) of the L2Character.
+	 */
+	public final int getPhysicalAttackRange() {
+		final L2Weapon weapon = _activeChar.getActiveWeaponItem();
+		int baseAttackRange;
+		if (_activeChar.isTransformed() && _activeChar.isPlayer()) {
+			baseAttackRange = _activeChar.getTransformation().getBaseAttackRange(_activeChar.getActingPlayer());
+		} else if (weapon != null) {
+			baseAttackRange = weapon.getBaseAttackRange();
+		} else {
+			baseAttackRange = _activeChar.getTemplate().getBaseAttackRange();
+		}
+		
+		return (int) calcStat(Stats.POWER_ATTACK_RANGE, baseAttackRange, null, null);
+	}
+	
+	public int getPhysicalAttackAngle() {
+		final L2Weapon weapon = _activeChar.getActiveWeaponItem();
+		final int baseAttackAngle;
+		if (weapon != null) {
+			baseAttackAngle = weapon.getBaseAttackAngle();
+		} else {
+			baseAttackAngle = 120;
+		}
+		return baseAttackAngle;
+	}
+	
+	/**
+	 * @param target
+	 * @return the weapon reuse modifier.
+	 */
+	public final double getWeaponReuseModifier(L2Character target) {
+		return calcStat(Stats.ATK_REUSE, 1, target, null);
+	}
+	
+	/**
+	 * @return the ShieldDef rate (base+modifier) of the L2Character.
+	 */
+	public final int getShldDef() {
+		return (int) calcStat(Stats.SHIELD_DEFENCE, 0);
+	}
+	
+	/**
+	 * @return the STR of the L2Character (base+modifier).
+	 */
+	public final int getSTR() {
+		return (int) calcStat(Stats.STAT_STR, _activeChar.getTemplate().getBaseSTR());
+	}
+	
+	/**
+	 * @return the WIT of the L2Character (base+modifier).
+	 */
+	public final int getWIT() {
+		return (int) calcStat(Stats.STAT_WIT, _activeChar.getTemplate().getBaseWIT());
+	}
+	
+	/**
+	 * @param skill
+	 * @return the mpConsume.
+	 */
+	public final int getMpConsume2(Skill skill) {
+		if (skill == null) {
+			return 1;
+		}
+		double mpConsume2 = skill.getMpConsume2();
+		double nextDanceMpCost = Math.ceil(skill.getMpConsume2() / 2.);
+		if (skill.isDance()) {
+			if (character().danceConsumeAdditionalMP() && (_activeChar != null) && (_activeChar.getDanceCount() > 0)) {
+				mpConsume2 += _activeChar.getDanceCount() * nextDanceMpCost;
+			}
+		}
+		
+		mpConsume2 = calcStat(Stats.MP_CONSUME, mpConsume2, null, skill);
+		
+		if (skill.isDance()) {
+			return (int) calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume2);
+		} else if (skill.isMagic()) {
+			return (int) calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume2);
+		} else {
+			return (int) calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume2);
+		}
+	}
+	
+	/**
+	 * @param skill
+	 * @return the mpConsume1.
+	 */
+	public final int getMpConsume1(Skill skill) {
+		if (skill == null) {
+			return 1;
+		}
+		
+		return (int) calcStat(Stats.MP_CONSUME, skill.getMpConsume1(), null, skill);
+	}
+	
+	public byte getAttackElement() {
+		L2ItemInstance weaponInstance = _activeChar.getActiveWeaponInstance();
+		// 1st order - weapon element
+		if ((weaponInstance != null) && (weaponInstance.getAttackElementType() >= 0)) {
+			return weaponInstance.getAttackElementType();
+		}
+		
+		// temp fix starts
+		int tempVal = 0;
+		int[] stats = {
+			0,
+			0,
+			0,
+			0,
+			0,
+			0
+		};
+		
+		byte returnVal = -2;
+		stats[0] = (int) calcStat(Stats.FIRE_POWER, _activeChar.getTemplate().getBaseFire());
+		stats[1] = (int) calcStat(Stats.WATER_POWER, _activeChar.getTemplate().getBaseWater());
+		stats[2] = (int) calcStat(Stats.WIND_POWER, _activeChar.getTemplate().getBaseWind());
+		stats[3] = (int) calcStat(Stats.EARTH_POWER, _activeChar.getTemplate().getBaseEarth());
+		stats[4] = (int) calcStat(Stats.HOLY_POWER, _activeChar.getTemplate().getBaseHoly());
+		stats[5] = (int) calcStat(Stats.DARK_POWER, _activeChar.getTemplate().getBaseDark());
+		
+		for (byte x = 0; x < 6; x++) {
+			if (stats[x] > tempVal) {
+				returnVal = x;
+				tempVal = stats[x];
+			}
+		}
+		
+		return returnVal;
+		// temp fix ends
+		
+		/*
+		 * uncomment me once deadlocks in getAllEffects() fixed return _activeChar.getElementIdFromEffects();
+		 */
+	}
+	
+	public int getAttackElementValue(byte attackAttribute) {
+		return switch (attackAttribute) {
+			case Elementals.FIRE -> (int) calcStat(Stats.FIRE_POWER, _activeChar.getTemplate().getBaseFire());
+			case Elementals.WATER -> (int) calcStat(Stats.WATER_POWER, _activeChar.getTemplate().getBaseWater());
+			case Elementals.WIND -> (int) calcStat(Stats.WIND_POWER, _activeChar.getTemplate().getBaseWind());
+			case Elementals.EARTH -> (int) calcStat(Stats.EARTH_POWER, _activeChar.getTemplate().getBaseEarth());
+			case Elementals.HOLY -> (int) calcStat(Stats.HOLY_POWER, _activeChar.getTemplate().getBaseHoly());
+			case Elementals.DARK -> (int) calcStat(Stats.DARK_POWER, _activeChar.getTemplate().getBaseDark());
+			default -> 0;
+		};
+	}
+	
+	public int getDefenseElementValue(byte defenseAttribute) {
+		return switch (defenseAttribute) {
+			case Elementals.FIRE -> (int) calcStat(Stats.FIRE_RES, _activeChar.getTemplate().getBaseFireRes());
+			case Elementals.WATER -> (int) calcStat(Stats.WATER_RES, _activeChar.getTemplate().getBaseWaterRes());
+			case Elementals.WIND -> (int) calcStat(Stats.WIND_RES, _activeChar.getTemplate().getBaseWindRes());
+			case Elementals.EARTH -> (int) calcStat(Stats.EARTH_RES, _activeChar.getTemplate().getBaseEarthRes());
+			case Elementals.HOLY -> (int) calcStat(Stats.HOLY_RES, _activeChar.getTemplate().getBaseHolyRes());
+			case Elementals.DARK -> (int) calcStat(Stats.DARK_RES, _activeChar.getTemplate().getBaseDarkRes());
+			default -> (int) _activeChar.getTemplate().getBaseElementRes();
+		};
+	}
+	
+	public float getAttackTrait(TraitType traitType) {
+		return _attackTraits[traitType.getId()];
+	}
+	
+	public float[] getAttackTraits() {
+		return _attackTraits;
+	}
+	
+	public boolean hasAttackTrait(TraitType traitType) {
+		return _attackTraitsCount[traitType.getId()] > 0;
+	}
+	
+	public int[] getAttackTraitsCount() {
+		return _attackTraitsCount;
+	}
+	
+	public float getDefenceTrait(TraitType traitType) {
+		return _defenceTraits[traitType.getId()];
+	}
+	
+	public float[] getDefenceTraits() {
+		return _defenceTraits;
+	}
+	
+	public boolean hasDefenceTrait(TraitType traitType) {
+		return _defenceTraitsCount[traitType.getId()] > 0;
+	}
+	
+	public int[] getDefenceTraitsCount() {
+		return _defenceTraitsCount;
+	}
+	
+	public boolean isTraitInvul(TraitType traitType) {
+		return _traitsInvul[traitType.getId()] > 0;
+	}
+	
+	public int[] getTraitsInvul() {
+		return _traitsInvul;
+	}
+	
+	/**
+	 * Gets the maximum buff count.
+	 * @return the maximum buff count
+	 */
+	public int getMaxBuffCount() {
+		return (int) calcStat(Stats.ENLARGE_ABNORMAL_SLOT, character().getMaxBuffAmount());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/ControllableAirShipStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/ControllableAirShipStat.java
new file mode 100644
index 00000000..8eab8e08
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/ControllableAirShipStat.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance;
+
+public class ControllableAirShipStat extends VehicleStat {
+	public ControllableAirShipStat(L2ControllableAirShipInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2ControllableAirShipInstance getActiveChar() {
+		return (L2ControllableAirShipInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public double getMoveSpeed() {
+		if (getActiveChar().isInDock() || (getActiveChar().getFuel() > 0)) {
+			return super.getMoveSpeed();
+		}
+		return super.getMoveSpeed() * 0.05f;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/DoorStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/DoorStat.java
new file mode 100644
index 00000000..e681e71e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/DoorStat.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+/**
+ * @author malyelfik
+ */
+public class DoorStat extends CharStat {
+	private int _upgradeHpRatio = 1;
+	
+	public DoorStat(L2DoorInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2DoorInstance getActiveChar() {
+		return (L2DoorInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public int getMaxHp() {
+		return super.getMaxHp() * _upgradeHpRatio;
+	}
+	
+	public void setUpgradeHpRatio(int ratio) {
+		_upgradeHpRatio = ratio;
+	}
+	
+	public int getUpgradeHpRatio() {
+		return _upgradeHpRatio;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java
new file mode 100644
index 00000000..0864ddb0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+public class NpcStat extends CharStat {
+	public NpcStat(L2Npc activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public int getLevel() {
+		return getActiveChar().getTemplate().getLevel();
+	}
+	
+	@Override
+	public L2Npc getActiveChar() {
+		return (L2Npc) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java
new file mode 100644
index 00000000..b4b8668e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.hunting;
+import static com.l2jserver.gameserver.config.Configuration.vitality;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.model.L2PetLevelData;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.transform.TransformTemplate;
+import com.l2jserver.gameserver.model.stats.MoveType;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventPointInfoPacket;
+import com.l2jserver.gameserver.network.serverpackets.ExVitalityPointInfo;
+
+public class PcStat extends PlayableStat {
+	private int _oldMaxHp; // stats watch
+	private int _oldMaxMp; // stats watch
+	private int _oldMaxCp; // stats watch
+	private float _vitalityPoints = 1;
+	private int _nevitPoints = 0;
+	private int _huntingBonusTime = 0;
+	private int _nevitBlessingTime = 0;
+	private byte _vitalityLevel = 0;
+	private long _startingXp;
+	/** Player's maximum cubic count. */
+	private int _maxCubicCount = 1;
+	/** Player's maximum talisman count. */
+	private final AtomicInteger _talismanSlots = new AtomicInteger();
+	private boolean _cloakSlot = false;
+	
+	public static final int[] VITALITY_LEVELS = {
+		240,
+		2000,
+		13000,
+		17000,
+		20000
+	};
+	
+	public static final int MAX_VITALITY_POINTS = VITALITY_LEVELS[4];
+	public static final int MIN_VITALITY_POINTS = 1;
+	
+	public PcStat(L2PcInstance activeChar) {
+		super(activeChar);
+	}
+	
+	public void setStartingExp(long value) {
+		if (general().enableBotReportButton()) {
+			_startingXp = value;
+		}
+	}
+	
+	public long getStartingExp() {
+		return _startingXp;
+	}
+	
+	/**
+	 * Gets the maximum cubic count.
+	 * @return the maximum cubic count
+	 */
+	public int getMaxCubicCount() {
+		return _maxCubicCount;
+	}
+	
+	/**
+	 * Sets the maximum cubic count.
+	 * @param cubicCount the maximum cubic count
+	 */
+	public void setMaxCubicCount(int cubicCount) {
+		_maxCubicCount = cubicCount;
+	}
+	
+	/**
+	 * Gets the maximum talisman count.
+	 * @return the maximum talisman count
+	 */
+	public int getTalismanSlots() {
+		return _talismanSlots.get();
+	}
+	
+	public void addTalismanSlots(int count) {
+		_talismanSlots.addAndGet(count);
+	}
+	
+	public boolean canEquipCloak() {
+		return _cloakSlot;
+	}
+	
+	public void setCloakSlotStatus(boolean cloakSlot) {
+		_cloakSlot = cloakSlot;
+	}
+	
+	@Override
+	public final int getMaxCp() {
+		// Get the Max CP (base+modifier) of the L2PcInstance
+		int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_CP, getActiveChar().getTemplate().getBaseCpMax(getActiveChar().getLevel()));
+		if (val != _oldMaxCp) {
+			_oldMaxCp = val;
+			
+			// Launch a regen task if the new Max CP is higher than the old one
+			if (getActiveChar().getStatus().getCurrentCp() != val) {
+				getActiveChar().getStatus().setCurrentCp(getActiveChar().getStatus().getCurrentCp()); // trigger start of regeneration
+			}
+		}
+		return val;
+	}
+	
+	@Override
+	public final int getMaxHp() {
+		// Get the Max HP (base+modifier) of the L2PcInstance
+		int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_HP, getActiveChar().getTemplate().getBaseHpMax(getActiveChar().getLevel()));
+		if (val != _oldMaxHp) {
+			_oldMaxHp = val;
+			
+			// Launch a regen task if the new Max HP is higher than the old one
+			if (getActiveChar().getStatus().getCurrentHp() != val) {
+				getActiveChar().getStatus().setCurrentHp(getActiveChar().getStatus().getCurrentHp()); // trigger start of regeneration
+			}
+		}
+		
+		return val;
+	}
+	
+	@Override
+	public final int getMaxMp() {
+		// Get the Max MP (base+modifier) of the L2PcInstance
+		int val = (getActiveChar() == null) ? 1 : (int) calcStat(Stats.MAX_MP, getActiveChar().getTemplate().getBaseMpMax(getActiveChar().getLevel()));
+		
+		if (val != _oldMaxMp) {
+			_oldMaxMp = val;
+			
+			// Launch a regen task if the new Max MP is higher than the old one
+			if (getActiveChar().getStatus().getCurrentMp() != val) {
+				getActiveChar().getStatus().setCurrentMp(getActiveChar().getStatus().getCurrentMp()); // trigger start of regeneration
+			}
+		}
+		
+		return val;
+	}
+	
+	/**
+	 * @param type movement type
+	 * @return the base move speed of given movement type.
+	 */
+	@Override
+	public double getBaseMoveSpeed(MoveType type) {
+		final L2PcInstance player = getActiveChar();
+		if (player.isTransformed()) {
+			final TransformTemplate template = player.getTransformation().getTemplate(player);
+			if (template != null) {
+				return template.getBaseMoveSpeed(type);
+			}
+		} else if (player.isMounted()) {
+			final L2PetLevelData data = PetDataTable.getInstance().getPetLevelData(player.getMountNpcId(), player.getMountLevel());
+			if (data != null) {
+				return data.getSpeedOnRide(type);
+			}
+		}
+		return super.getBaseMoveSpeed(type);
+	}
+	
+	@Override
+	public double getRunSpeed() {
+		double val = super.getRunSpeed() + character().getRunSpeedBoost();
+		
+		// Apply max run speed cap.
+		if ((val > character().getMaxRunSpeed()) && !getActiveChar().canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			return character().getMaxRunSpeed();
+		}
+		
+		// Check for mount penalties
+		if (getActiveChar().isMounted()) {
+			// if level diff with mount >= 10, it decreases move speed by 50%
+			if ((getActiveChar().getMountLevel() - getActiveChar().getLevel()) >= 10) {
+				val /= 2;
+			}
+			// if mount is hungry, it decreases move speed by 50%
+			if (getActiveChar().isHungry()) {
+				val /= 2;
+			}
+		}
+		
+		return val;
+	}
+	
+	@Override
+	public double getWalkSpeed() {
+		double val = super.getWalkSpeed() + character().getRunSpeedBoost();
+		
+		// Apply max run speed cap.
+		if ((val > character().getMaxRunSpeed()) && !getActiveChar().canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			return character().getMaxRunSpeed();
+		}
+		
+		if (getActiveChar().isMounted()) {
+			// if level diff with mount >= 10, it decreases move speed by 50%
+			if ((getActiveChar().getMountLevel() - getActiveChar().getLevel()) >= 10) {
+				val /= 2;
+			}
+			// if mount is hungry, it decreases move speed by 50%
+			if (getActiveChar().isHungry()) {
+				val /= 2;
+			}
+		}
+		
+		return val;
+	}
+	
+	@Override
+	public double getPAtkSpd() {
+		double val = super.getPAtkSpd();
+		
+		if ((val > character().getMaxPAtkSpeed()) && !getActiveChar().canOverrideCond(PcCondOverride.MAX_STATS_VALUE)) {
+			return character().getMaxPAtkSpeed();
+		}
+		
+		return val;
+	}
+	
+	private void updateVitalityLevel(boolean quiet) {
+		final byte level;
+		
+		if (_vitalityPoints <= VITALITY_LEVELS[0]) {
+			level = 0;
+		} else if (_vitalityPoints <= VITALITY_LEVELS[1]) {
+			level = 1;
+		} else if (_vitalityPoints <= VITALITY_LEVELS[2]) {
+			level = 2;
+		} else if (_vitalityPoints <= VITALITY_LEVELS[3]) {
+			level = 3;
+		} else {
+			level = 4;
+		}
+		
+		if (!quiet && (level != _vitalityLevel)) {
+			if (level < _vitalityLevel) {
+				// Gain Nevit Points on Decrease Vitality Level
+				getActiveChar().getHuntingSystem().addPoints(hunting().getNevitDecreaseVitalityAcquirePoints());
+				getActiveChar().sendPacket(SystemMessageId.VITALITY_HAS_DECREASED);
+			} else {
+				getActiveChar().sendPacket(SystemMessageId.VITALITY_HAS_INCREASED);
+			}
+			if (level == 0) {
+				getActiveChar().sendPacket(SystemMessageId.VITALITY_IS_EXHAUSTED);
+			} else if (level == 4) {
+				getActiveChar().sendPacket(SystemMessageId.VITALITY_IS_AT_MAXIMUM);
+			}
+		}
+		
+		_vitalityLevel = level;
+	}
+	
+	/*
+	 * Return current vitality points in integer format
+	 */
+	public int getVitalityPoints() {
+		return (int) _vitalityPoints;
+	}
+	
+	/*
+	 * Set current vitality points to this value if quiet = true - does not send system messages
+	 */
+	public void setVitalityPoints(int points, boolean quiet) {
+		points = Math.min(Math.max(points, MIN_VITALITY_POINTS), MAX_VITALITY_POINTS);
+		if (points == _vitalityPoints) {
+			return;
+		}
+		
+		_vitalityPoints = points;
+		updateVitalityLevel(quiet);
+		getActiveChar().sendPacket(new ExVitalityPointInfo(getVitalityPoints()));
+	}
+	
+	public synchronized void updateVitalityPoints(float points, boolean useRates, boolean quiet) {
+		if ((points == 0) || !vitality().enabled()) {
+			return;
+		}
+		
+		if (useRates) {
+			if (getActiveChar().isLucky()) {
+				return;
+			}
+			
+			// vitality consumed
+			if (points < 0) {
+				int stat = (int) calcStat(Stats.VITALITY_CONSUME_RATE, 1, getActiveChar(), null);
+				
+				if (getActiveChar().getHuntingSystem().isNevitBlessingActive()) {
+					stat = -10; // Increase Vitality During Blessing
+				}
+				
+				if (stat == 0) {
+					return;
+				}
+				if (stat < 0) {
+					points = -points;
+				}
+			}
+			
+			// vitality increased
+			if (points > 0) {
+				points *= vitality().getRateVitalityGain();
+			} else {
+				// vitality decreased
+				points *= vitality().getRateVitalityLost();
+			}
+		}
+		
+		if (points > 0) {
+			points = Math.min(_vitalityPoints + points, MAX_VITALITY_POINTS);
+		} else {
+			points = Math.max(_vitalityPoints + points, MIN_VITALITY_POINTS);
+		}
+		
+		if (Math.abs(points - _vitalityPoints) <= 1e-6) {
+			return;
+		}
+		
+		_vitalityPoints = points;
+		updateVitalityLevel(quiet);
+	}
+	
+	public double getVitalityMultiplier() {
+		double vitality = 1.0;
+		if (vitality().enabled()) {
+			switch (getVitalityLevel()) {
+				case 1 -> vitality = vitality().getRateVitalityLevel1();
+				case 2 -> vitality = vitality().getRateVitalityLevel2();
+				case 3 -> vitality = vitality().getRateVitalityLevel3();
+				case 4 -> vitality = vitality().getRateVitalityLevel4();
+			}
+		}
+		return vitality;
+	}
+	
+	public byte getVitalityLevel() {
+		if (getActiveChar().getHuntingSystem().isNevitBlessingActive()) {
+			return 4;
+		}
+		return _vitalityLevel;
+	}
+	
+	/*
+	 * Return current nevit points in integer format
+	 */
+	public int getNevitBlessingPoints() {
+		return _nevitPoints;
+	}
+	
+	/*
+	 * Set current nevit blessing points
+	 */
+	public void setNevitBlessingPoints(int points) {
+		_nevitPoints = points;
+		getActiveChar().sendPacket(new ExNevitAdventPointInfoPacket(getNevitBlessingPoints()));
+	}
+	
+	public int getHuntingBonusTime() {
+		return _huntingBonusTime;
+	}
+	
+	public void setHuntingBonusTime(int time) {
+		_huntingBonusTime = time;
+	}
+	
+	public int getNevitBlessingTime() {
+		return _nevitBlessingTime;
+	}
+	
+	public void setNevitBlessingTime(int time) {
+		_nevitBlessingTime = time;
+	}
+	
+	public double getExpBonusMultiplier() {
+		double bonus = 1.0;
+		double hunting = 1.0;
+		
+		// Bonus from Vitality System
+		double vitality = getVitalityMultiplier();
+		
+		// Bonus from Nevit's Blessing / Nevit's Hunting
+		double nevits = getActiveChar().getHuntingSystem().getNevitHourglassMultiplier();
+		
+		// Bonus exp from skills
+		double bonusExp = 1 + (calcStat(Stats.BONUS_EXP, 0, null, null) / 100);
+		
+		if (vitality > 1.0) {
+			bonus += (vitality - 1);
+		}
+		if (nevits > 1.0) {
+			bonus += (nevits - 1);
+		}
+		if (hunting > 1.0) {
+			bonus += (hunting - 1);
+		}
+		if (bonusExp > 1) {
+			bonus += (bonusExp - 1);
+		}
+		
+		// Check for abnormal bonuses
+		bonus = Math.max(bonus, 1);
+		bonus = Math.min(bonus, character().getMaxExpBonus());
+		
+		return bonus;
+	}
+	
+	public double getSpBonusMultiplier() {
+		double bonus = 1.0;
+		double hunting = 1.0;
+		
+		// Bonus from Vitality System
+		double vitality = getVitalityMultiplier();
+		
+		// Bonus from Nevit's Blessing / Nevit's Hunting
+		double nevits = getActiveChar().getHuntingSystem().getNevitHourglassMultiplier();
+		
+		// Bonus sp from skills
+		double bonusSp = 1 + (calcStat(Stats.BONUS_SP, 0, null, null) / 100);
+		
+		if (vitality > 1.0) {
+			bonus += (vitality - 1);
+		}
+		if (nevits > 1.0) {
+			bonus += (nevits - 1);
+		}
+		if (hunting > 1.0) {
+			bonus += (hunting - 1);
+		}
+		if (bonusSp > 1) {
+			bonus += (bonusSp - 1);
+		}
+		
+		// Check for abnormal bonuses
+		bonus = Math.max(bonus, 1);
+		bonus = Math.min(bonus, character().getMaxSpBonus());
+		
+		return bonus;
+	}
+	
+	@Override
+	public int getMaxLevel() {
+		return getActiveChar().isSubClassActive() ? character().getMaxSubclassLevel() : character().getMaxPlayerLevel();
+	}
+	
+	@Override
+	public int getMaxExpLevel() {
+		return getActiveChar().isSubClassActive() ? character().getMaxSubclassLevel() + 1 : character().getMaxPlayerLevel() + 1;
+	}
+	
+	@Override
+	public final L2PcInstance getActiveChar() {
+		return (L2PcInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java
new file mode 100644
index 00000000..59882ae7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+public class PetStat extends SummonStat {
+	public PetStat(L2PetInstance activeChar) {
+		super(activeChar);
+	}
+	
+	public boolean addExp(int value) {
+		if (getActiveChar().isUncontrollable() || !super.addExp(value)) {
+			return false;
+		}
+		
+		getActiveChar().updateAndBroadcastStatus(1);
+		// The PetInfo packet wipes the PartySpelled (list of active spells' icons). Re-add them
+		getActiveChar().updateEffectIcons(true);
+		
+		return true;
+	}
+	
+	public boolean addExpAndSp(long addToExp, int addToSp) {
+		if (getActiveChar().isUncontrollable() || !addExp(addToExp)) {
+			return false;
+		}
+		
+		// Not used in H5
+		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_EARNED_S1_EXP).addLong(addToExp);
+		getActiveChar().updateAndBroadcastStatus(1);
+		return true;
+	}
+	
+	@Override
+	public final long getExpForLevel(int level) {
+		try {
+			return PetDataTable.getInstance().getPetLevelData(getActiveChar().getId(), Math.min(level, getMaxExpLevel())).getPetMaxExp();
+		} catch (NullPointerException e) {
+			if (getActiveChar() != null) {
+				LOG.warn("Pet objectId:{}, NpcId:{}, level:{} is missing data from pets_stats table!", getActiveChar().getObjectId(), getActiveChar().getId(), level);
+			}
+			throw e;
+		}
+	}
+	
+	@Override
+	public void setLevel(int value) {
+		getActiveChar().setPetData(PetDataTable.getInstance().getPetLevelData(getActiveChar().getTemplate().getId(), value));
+		if (getActiveChar().getPetLevelData() == null) {
+			throw new IllegalArgumentException("No pet data for npc: " + getActiveChar().getTemplate().getId() + " level: " + value);
+		}
+		getActiveChar().stopFeed();
+		super.setLevel(value);
+		
+		getActiveChar().startFeed();
+		
+		if (getActiveChar().getControlItem() != null) {
+			getActiveChar().getControlItem().setEnchantLevel(getLevel());
+		}
+	}
+	
+	@Override
+	public int getMaxLevel() {
+		return character().getMaxPetLevel();
+	}
+	
+	@Override
+	public int getMaxExpLevel() {
+		return character().getMaxPetLevel() + 1;
+	}
+	
+	@Override
+	public L2PetInstance getActiveChar() {
+		return (L2PetInstance) super.getActiveChar();
+	}
+	
+	public final int getFeedBattle() {
+		return getActiveChar().getPetLevelData().getPetFeedBattle();
+	}
+	
+	public final int getFeedNormal() {
+		return getActiveChar().getPetLevelData().getPetFeedNormal();
+	}
+	
+	public final int getMaxFeed() {
+		return getActiveChar().getPetLevelData().getPetMaxFeed();
+	}
+	
+	@Override
+	public int getMaxHp() {
+		return (int) calcStat(Stats.MAX_HP, getActiveChar().getPetLevelData().getPetMaxHP(), null, null);
+	}
+	
+	@Override
+	public int getMaxMp() {
+		return (int) calcStat(Stats.MAX_MP, getActiveChar().getPetLevelData().getPetMaxMP(), null, null);
+	}
+	
+	@Override
+	public double getMAtk(L2Character target, Skill skill) {
+		return calcStat(Stats.MAGIC_ATTACK, getActiveChar().getPetLevelData().getPetMAtk(), target, skill);
+	}
+	
+	@Override
+	public double getMDef(L2Character target, Skill skill) {
+		return calcStat(Stats.MAGIC_DEFENCE, getActiveChar().getPetLevelData().getPetMDef(), target, skill);
+	}
+	
+	@Override
+	public double getPAtk(L2Character target) {
+		return calcStat(Stats.POWER_ATTACK, getActiveChar().getPetLevelData().getPetPAtk(), target, null);
+	}
+	
+	@Override
+	public double getPDef(L2Character target) {
+		return calcStat(Stats.POWER_DEFENCE, getActiveChar().getPetLevelData().getPetPDef(), target, null);
+	}
+	
+	@Override
+	public double getPAtkSpd() {
+		double val = super.getPAtkSpd();
+		if (getActiveChar().isHungry()) {
+			val = val / 2;
+		}
+		return val;
+	}
+	
+	@Override
+	public int getMAtkSpd() {
+		int val = super.getMAtkSpd();
+		if (getActiveChar().isHungry()) {
+			val = val / 2;
+		}
+		return val;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java
new file mode 100644
index 00000000..6cedb3d6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.playable.PlayableExpChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLevelChanged;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.model.zone.type.L2SwampZone;
+
+public class PlayableStat extends CharStat {
+	protected static final Logger LOG = LoggerFactory.getLogger(PlayableStat.class);
+	
+	private final AtomicLong _exp = new AtomicLong();
+	private final AtomicInteger _sp = new AtomicInteger();
+	
+	public PlayableStat(L2Playable activeChar) {
+		super(activeChar);
+	}
+	
+	public long getExp() {
+		return _exp.get();
+	}
+	
+	public int getSp() {
+		return _sp.get();
+	}
+	
+	public void setExp(long exp) {
+		_exp.set(exp);
+	}
+	
+	public void setSp(int sp) {
+		_sp.set(sp);
+	}
+	
+	/**
+	 * Contains only under zero check
+	 */
+	public boolean removeExp(long exp) {
+		final long currentExp = getExp();
+		if (currentExp < exp) {
+			_exp.addAndGet(-currentExp);
+		} else {
+			_exp.addAndGet(-exp);
+		}
+		syncExpLevel(false);
+		return true;
+	}
+	
+	/**
+	 * Contains only under zero check
+	 */
+	public boolean removeSp(int sp) {
+		final int currentSp = getSp();
+		if (currentSp < sp) {
+			_sp.addAndGet(-currentSp);
+		} else {
+			_sp.addAndGet(-sp);
+		}
+		return true;
+	}
+	
+	public boolean addExp(long value) {
+		final long currentExp = getExp();
+		final long totalExp = currentExp + value;
+		final var term = EventDispatcher.getInstance().notifyEvent(new PlayableExpChanged(getActiveChar(), currentExp, totalExp), getActiveChar(), TerminateReturn.class);
+		if ((term != null) && term.terminate()) {
+			return false;
+		}
+		
+		if ((totalExp < 0) || ((value > 0) && (currentExp == (getExpForLevel(getMaxExpLevel()) - 1)))) {
+			return true;
+		}
+		
+		if (totalExp >= getExpForLevel(getMaxExpLevel())) {
+			value = (getExpForLevel(getMaxExpLevel()) - 1 - currentExp);
+		}
+		
+		if (_exp.addAndGet(value) >= getExpForLevel(getLevel() + 1)) {
+			syncExpLevel(true);
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Check if level need to be increased / decreased
+	 * @param isExpIncreased
+	 */
+	private void syncExpLevel(boolean isExpIncreased) {
+		int minimumLevel = getActiveChar().getMinLevel();
+		long currentExp = getExp();
+		int maxLevel = getMaxLevel();
+		int currentLevel = getLevel();
+		
+		if (isExpIncreased) {
+			for (int tmp = currentLevel; tmp <= maxLevel; tmp++) {
+				if (currentExp >= getExpForLevel(tmp)) {
+					if (currentExp >= getExpForLevel(tmp + 1)) {
+						continue;
+					}
+					if (tmp < minimumLevel) {
+						tmp = minimumLevel;
+					}
+					
+					if (tmp != currentLevel) {
+						int newLevel = tmp - currentLevel;
+						EventDispatcher.getInstance().notifyEventAsync(new PlayerLevelChanged(getActiveChar().getActingPlayer(), currentLevel, newLevel), getActiveChar());
+						getActiveChar().addLevel(newLevel);
+					}
+					break;
+				}
+			}
+		} else {
+			for (int tmp = currentLevel; tmp >= minimumLevel; tmp--) {
+				if (currentExp < getExpForLevel(tmp)) {
+					if (currentExp < getExpForLevel(tmp - 1)) {
+						continue;
+					}
+					--tmp;
+					if (tmp < minimumLevel) {
+						tmp = minimumLevel;
+					}
+					
+					if (tmp != currentLevel) {
+						int newLevel = tmp - currentLevel;
+						EventDispatcher.getInstance().notifyEventAsync(new PlayerLevelChanged(getActiveChar().getActingPlayer(), currentLevel, newLevel), getActiveChar());
+						getActiveChar().addLevel(newLevel);
+					}
+					break;
+				}
+			}
+		}
+	}
+	
+	public boolean addSp(int sp) {
+		if (sp < 0) {
+			LOG.warn("addSp accepts only positive numbers!");
+			return false;
+		}
+		int currentSp = getSp();
+		if (currentSp == Integer.MAX_VALUE) {
+			return false;
+		}
+		
+		if (sp > (Integer.MAX_VALUE - currentSp)) {
+			_sp.set(Integer.MAX_VALUE);
+		} else {
+			_sp.addAndGet(sp);
+		}
+		return true;
+	}
+	
+	public boolean addLevel(int value) {
+		final int currentLevel = getLevel();
+		if ((currentLevel + value) > getMaxLevel()) {
+			if (currentLevel < getMaxLevel()) {
+				value = getMaxLevel() - currentLevel;
+			} else {
+				return false;
+			}
+		}
+		
+		boolean levelIncreased = ((currentLevel + value) > currentLevel);
+		value += currentLevel;
+		setLevel(value);
+		
+		// Sync up exp with current level
+		if ((getExp() >= getExpForLevel(getLevel() + 1)) || (getExpForLevel(getLevel()) > getExp())) {
+			setExp(getExpForLevel(getLevel()));
+		}
+		
+		if (!levelIncreased) {
+			return false;
+		}
+		
+		getActiveChar().getStatus().setCurrentHp(getActiveChar().getStat().getMaxHp());
+		getActiveChar().getStatus().setCurrentMp(getActiveChar().getStat().getMaxMp());
+		
+		return true;
+	}
+	
+	/**
+	 * Get required exp for specific level
+	 */
+	public long getExpForLevel(int level) {
+		return ExperienceData.getInstance().getExpForLevel(level);
+	}
+	
+	/**
+	 * Get maximum level that playable can reach.<br>
+	 * <B><U> Overridden in </U> :</B>
+	 * <li>PcStat</li>
+	 * <li>PetStat</li>
+	 */
+	public int getMaxLevel() {
+		// Dummy method
+		return character().getMaxPlayerLevel();
+	}
+	
+	/**
+	 * Get maximum level of experience is max level +1 for get (100%).
+	 */
+	public int getMaxExpLevel() {
+		return character().getMaxPlayerLevel() + 1;
+	}
+	
+	@Override
+	public L2Playable getActiveChar() {
+		return (L2Playable) super.getActiveChar();
+	}
+	
+	@Override
+	public double getRunSpeed() {
+		if (getActiveChar().isInsideZone(ZoneId.SWAMP)) {
+			final L2SwampZone zone = ZoneManager.getInstance().getZone(getActiveChar(), L2SwampZone.class);
+			if (zone != null) {
+				return super.getRunSpeed() * zone.getMoveBonus();
+			}
+		}
+		return super.getRunSpeed();
+	}
+	
+	@Override
+	public double getWalkSpeed() {
+		if (getActiveChar().isInsideZone(ZoneId.SWAMP)) {
+			final L2SwampZone zone = ZoneManager.getInstance().getZone(getActiveChar(), L2SwampZone.class);
+			if (zone != null) {
+				return super.getWalkSpeed() * zone.getMoveBonus();
+			}
+		}
+		return super.getWalkSpeed();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/StaticObjStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/StaticObjStat.java
new file mode 100644
index 00000000..38e10303
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/StaticObjStat.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+
+public class StaticObjStat extends CharStat {
+	public StaticObjStat(L2StaticObjectInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2StaticObjectInstance getActiveChar() {
+		return (L2StaticObjectInstance) super.getActiveChar();
+	}
+	
+	@Override
+	public final int getLevel() {
+		return getActiveChar().getLevel();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/SummonStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/SummonStat.java
new file mode 100644
index 00000000..f8aa281e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/SummonStat.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+public class SummonStat extends PlayableStat {
+	public SummonStat(L2Summon activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2Summon getActiveChar() {
+		return (L2Summon) super.getActiveChar();
+	}
+	
+	@Override
+	public int getMaxBuffCount() {
+		return getActiveChar().getOwner().getStat().getMaxBuffCount();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/stat/VehicleStat.java b/src/main/java/com/l2jserver/gameserver/model/actor/stat/VehicleStat.java
new file mode 100644
index 00000000..22172561
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/stat/VehicleStat.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import com.l2jserver.gameserver.model.actor.L2Vehicle;
+
+public class VehicleStat extends CharStat {
+	private float _moveSpeed = 0;
+	private int _rotationSpeed = 0;
+	
+	public VehicleStat(L2Vehicle activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public double getMoveSpeed() {
+		return _moveSpeed;
+	}
+	
+	public final void setMoveSpeed(float speed) {
+		_moveSpeed = speed;
+	}
+	
+	public final double getRotationSpeed() {
+		return _rotationSpeed;
+	}
+	
+	public final void setRotationSpeed(int speed) {
+		_rotationSpeed = speed;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/AttackableStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/AttackableStatus.java
new file mode 100644
index 00000000..f9e9f223
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/AttackableStatus.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class AttackableStatus extends NpcStatus {
+	public AttackableStatus(L2Attackable activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHpConsumption) {
+		if (getActiveChar().isDead()) {
+			return;
+		}
+		
+		if (value > 0) {
+			if (getActiveChar().isOverhit()) {
+				getActiveChar().setOverhitValues(attacker, value);
+			} else {
+				getActiveChar().overhitEnabled(false);
+			}
+		} else {
+			getActiveChar().overhitEnabled(false);
+		}
+		
+		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
+		
+		if (!getActiveChar().isDead()) {
+			// And the attacker's hit didn't kill the mob, clear the over-hit flag
+			getActiveChar().overhitEnabled(false);
+		}
+	}
+	
+	@Override
+	public L2Attackable getActiveChar() {
+		return (L2Attackable) super.getActiveChar();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java
new file mode 100644
index 00000000..1145f727
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/CharStatus.java
@@ -0,0 +1,373 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.stats.Formulas;
+
+public class CharStatus {
+	protected static final Logger LOG = LoggerFactory.getLogger(CharStatus.class);
+	
+	private final L2Character _activeChar;
+	
+	private double _currentHp = 0; // Current HP of the L2Character
+	private double _currentMp = 0; // Current MP of the L2Character
+	
+	/** Array containing all clients that need to be notified about hp/mp updates of the L2Character */
+	private Set<L2Character> _statusListener;
+	
+	private Future<?> _regTask;
+	
+	protected byte _flagsRegenActive = 0;
+	
+	protected static final byte REGEN_FLAG_CP = 4;
+	private static final byte REGEN_FLAG_HP = 1;
+	private static final byte REGEN_FLAG_MP = 2;
+	
+	public CharStatus(L2Character activeChar) {
+		_activeChar = activeChar;
+	}
+	
+	/**
+	 * Add the object to the list of L2Character that must be informed of HP/MP updates of this L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Each L2Character owns a list called <B>_statusListener</B> that contains all L2PcInstance to inform of HP/MP updates.<br>
+	 * Players who must be informed are players that target this L2Character.<br>
+	 * When a RegenTask is in progress sever just need to go through this list to send Server->Client packet StatusUpdate.<br>
+	 * <B><U>Example of use</U>:</B>
+	 * <ul>
+	 * <li>Target a PC or NPC</li>
+	 * <ul>
+	 * @param object L2Character to add to the listener
+	 */
+	public final void addStatusListener(L2Character object) {
+		if (object == getActiveChar()) {
+			return;
+		}
+		
+		getStatusListener().add(object);
+	}
+	
+	/**
+	 * Remove the object from the list of L2Character that must be informed of HP/MP updates of this L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Each L2Character owns a list called <B>_statusListener</B> that contains all L2PcInstance to inform of HP/MP updates.<br>
+	 * Players who must be informed are players that target this L2Character.<br>
+	 * When a RegenTask is in progress sever just need to go through this list to send Server->Client packet StatusUpdate.<br>
+	 * <B><U>Example of use </U>:</B>
+	 * <ul>
+	 * <li>Untarget a PC or NPC</li>
+	 * </ul>
+	 * @param object L2Character to add to the listener
+	 */
+	public final void removeStatusListener(L2Character object) {
+		getStatusListener().remove(object);
+	}
+	
+	/**
+	 * Return the list of L2Character that must be informed of HP/MP updates of this L2Character.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * Each L2Character owns a list called <B>_statusListener</B> that contains all L2PcInstance to inform of HP/MP updates.<br>
+	 * Players who must be informed are players that target this L2Character.<br>
+	 * When a RegenTask is in progress sever just need to go through this list to send Server->Client packet StatusUpdate.
+	 * @return The list of L2Character to inform or null if empty
+	 */
+	public final Set<L2Character> getStatusListener() {
+		if (_statusListener == null) {
+			_statusListener = ConcurrentHashMap.newKeySet();
+		}
+		return _statusListener;
+	}
+	
+	// place holder, only PcStatus has CP
+	public void reduceCp(int value) {
+	}
+	
+	/**
+	 * Reduce the current HP of the L2Character and launch the doDie Task if necessary.
+	 */
+	public void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	public void reduceHp(double value, L2Character attacker, boolean isHpConsumption) {
+		reduceHp(value, attacker, true, false, isHpConsumption);
+	}
+	
+	public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) {
+		if (getActiveChar().isDead()) {
+			return;
+		}
+		
+		// invul handling
+		if ((getActiveChar().isInvul() || getActiveChar().isHpBlocked()) && !(isDOT || isHPConsumption)) {
+			return;
+		}
+		
+		if (attacker != null) {
+			final L2PcInstance attackerPlayer = attacker.getActingPlayer();
+			if ((attackerPlayer != null) && attackerPlayer.isGM() && !attackerPlayer.getAccessLevel().canGiveDamage()) {
+				return;
+			}
+		}
+		
+		if (!isDOT && !isHPConsumption) {
+			getActiveChar().stopEffectsOnDamage(awake);
+			if (getActiveChar().isStunned() && (Rnd.get(10) == 0)) {
+				getActiveChar().stopStunning(true);
+			}
+		}
+		
+		if (value > 0) {
+			setCurrentHp(Math.max(getCurrentHp() - value, 0));
+		}
+		
+		if ((getActiveChar().getCurrentHp() < 0.5) && getActiveChar().isMortal()) // Die
+		{
+			getActiveChar().abortAttack();
+			getActiveChar().abortCast();
+			
+			if (general().debug()) {
+				LOG.debug("char is dead.");
+			}
+			
+			getActiveChar().doDie(attacker);
+		}
+	}
+	
+	public void reduceMp(double value) {
+		setCurrentMp(Math.max(getCurrentMp() - value, 0));
+	}
+	
+	/**
+	 * Start the HP/MP/CP Regeneration task.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Calculate the regen task period</li>
+	 * <li>Launch the HP/MP/CP Regeneration task with Medium priority</li>
+	 * </ul>
+	 */
+	public final synchronized void startHpMpRegeneration() {
+		if ((_regTask == null) && !getActiveChar().isDead()) {
+			if (general().debug()) {
+				LOG.debug("HP/MP regen started");
+			}
+			
+			// Get the Regeneration period
+			int period = Formulas.getRegeneratePeriod(getActiveChar());
+			
+			// Create the HP/MP/CP Regeneration task
+			_regTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new RegenTask(), period, period);
+		}
+	}
+	
+	/**
+	 * Stop the HP/MP/CP Regeneration task.<br>
+	 * <B><U>Actions</U>:</B>
+	 * <ul>
+	 * <li>Set the RegenActive flag to False</li>
+	 * <li>Stop the HP/MP/CP Regeneration task</li>
+	 * </ul>
+	 */
+	public final synchronized void stopHpMpRegeneration() {
+		if (_regTask != null) {
+			if (general().debug()) {
+				LOG.debug("HP/MP regen stop");
+			}
+			
+			// Stop the HP/MP/CP Regeneration task
+			_regTask.cancel(false);
+			_regTask = null;
+			
+			// Set the RegenActive flag to false
+			_flagsRegenActive = 0;
+		}
+	}
+	
+	// place holder, only PcStatus has CP
+	public double getCurrentCp() {
+		return 0;
+	}
+	
+	// place holder, only PcStatus has CP
+	public void setCurrentCp(double newCp) {
+	}
+	
+	public final double getCurrentHp() {
+		return _currentHp;
+	}
+	
+	public final void setCurrentHp(double newHp) {
+		setCurrentHp(newHp, true);
+	}
+	
+	/**
+	 * Sets the current hp of this character.
+	 * @param newHp the new hp
+	 * @param broadcastPacket if true StatusUpdate packet will be broadcasted.
+	 * @return @{code true} if hp was changed, @{code false} otherwise.
+	 */
+	public boolean setCurrentHp(double newHp, boolean broadcastPacket) {
+		// Get the Max HP of the L2Character
+		int currentHp = (int) getCurrentHp();
+		final double maxHp = getActiveChar().getMaxHp();
+		
+		synchronized (this) {
+			if (getActiveChar().isDead()) {
+				return false;
+			}
+			
+			if (newHp >= maxHp) {
+				// Set the RegenActive flag to false
+				_currentHp = maxHp;
+				_flagsRegenActive &= ~REGEN_FLAG_HP;
+				
+				// Stop the HP/MP/CP Regeneration task
+				if (_flagsRegenActive == 0) {
+					stopHpMpRegeneration();
+				}
+			} else {
+				// Set the RegenActive flag to true
+				_currentHp = newHp;
+				_flagsRegenActive |= REGEN_FLAG_HP;
+				
+				// Start the HP/MP/CP Regeneration task with Medium priority
+				startHpMpRegeneration();
+			}
+		}
+		
+		boolean hpWasChanged = currentHp != _currentHp;
+		
+		// Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		if (hpWasChanged && broadcastPacket) {
+			getActiveChar().broadcastStatusUpdate();
+		}
+		
+		return hpWasChanged;
+	}
+	
+	public final void setCurrentHpMp(double newHp, double newMp) {
+		boolean hpOrMpWasChanged = setCurrentHp(newHp, false);
+		hpOrMpWasChanged |= setCurrentMp(newMp, false);
+		if (hpOrMpWasChanged) {
+			getActiveChar().broadcastStatusUpdate();
+		}
+	}
+	
+	public final double getCurrentMp() {
+		return _currentMp;
+	}
+	
+	public final void setCurrentMp(double newMp) {
+		setCurrentMp(newMp, true);
+	}
+	
+	/**
+	 * Sets the current mp of this character.
+	 * @param newMp the new mp
+	 * @param broadcastPacket if true StatusUpdate packet will be broadcasted.
+	 * @return @{code true} if mp was changed, @{code false} otherwise.
+	 */
+	public final boolean setCurrentMp(double newMp, boolean broadcastPacket) {
+		// Get the Max MP of the L2Character
+		int currentMp = (int) getCurrentMp();
+		final int maxMp = getActiveChar().getMaxMp();
+		
+		synchronized (this) {
+			if (getActiveChar().isDead()) {
+				return false;
+			}
+			
+			if (newMp >= maxMp) {
+				// Set the RegenActive flag to false
+				_currentMp = maxMp;
+				_flagsRegenActive &= ~REGEN_FLAG_MP;
+				
+				// Stop the HP/MP/CP Regeneration task
+				if (_flagsRegenActive == 0) {
+					stopHpMpRegeneration();
+				}
+			} else {
+				// Set the RegenActive flag to true
+				_currentMp = newMp;
+				_flagsRegenActive |= REGEN_FLAG_MP;
+				
+				// Start the HP/MP/CP Regeneration task with Medium priority
+				startHpMpRegeneration();
+			}
+		}
+		
+		boolean mpWasChanged = currentMp != _currentMp;
+		
+		// Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		if (mpWasChanged && broadcastPacket) {
+			getActiveChar().broadcastStatusUpdate();
+		}
+		
+		return mpWasChanged;
+	}
+	
+	protected void doRegeneration() {
+		// Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate
+		if (getCurrentHp() < getActiveChar().getMaxRecoverableHp()) {
+			setCurrentHp(getCurrentHp() + Formulas.calcHpRegen(getActiveChar()), false);
+		}
+		
+		// Modify the current MP of the L2Character and broadcast Server->Client packet StatusUpdate
+		if (getCurrentMp() < getActiveChar().getMaxRecoverableMp()) {
+			setCurrentMp(getCurrentMp() + Formulas.calcMpRegen(getActiveChar()), false);
+		}
+		
+		if ((getCurrentHp() >= getActiveChar().getMaxRecoverableHp()) && (getCurrentMp() >= getActiveChar().getMaxMp())) {
+			stopHpMpRegeneration();
+		}
+		
+		if (getActiveChar().isInActiveRegion()) {
+			getActiveChar().broadcastStatusUpdate();
+		}
+	}
+	
+	/** Task of HP/MP regeneration */
+	class RegenTask implements Runnable {
+		@Override
+		public void run() {
+			try {
+				doRegeneration();
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	public L2Character getActiveChar() {
+		return _activeChar;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/DoorStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/DoorStatus.java
new file mode 100644
index 00000000..d320fe19
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/DoorStatus.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+public class DoorStatus extends CharStatus {
+	public DoorStatus(L2DoorInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2DoorInstance getActiveChar() {
+		return (L2DoorInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/FolkStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/FolkStatus.java
new file mode 100644
index 00000000..67342137
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/FolkStatus.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import static com.l2jserver.gameserver.config.Configuration.clanhall;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2ClanHallManagerInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+
+public class FolkStatus extends NpcStatus {
+	public FolkStatus(L2Npc activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHpConsumption) {
+	}
+	
+	@Override
+	public final void reduceMp(double value) {
+		// If Clan Hall buff are free and it's a Clan Hall Manager MP won't get reduced.
+		if (clanhall().mpBuffFree() && (getActiveChar() instanceof L2ClanHallManagerInstance)) {
+			return;
+		}
+		super.reduceMp(value);
+	}
+	
+	@Override
+	public L2NpcInstance getActiveChar() {
+		return (L2NpcInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/NpcStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/NpcStatus.java
new file mode 100644
index 00000000..f48cba23
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/NpcStatus.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class NpcStatus extends CharStatus {
+	public NpcStatus(L2Npc activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	@Override
+	public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHpConsumption) {
+		if (getActiveChar().isDead()) {
+			return;
+		}
+		
+		if (attacker != null) {
+			final L2PcInstance attackerPlayer = attacker.getActingPlayer();
+			if ((attackerPlayer != null) && attackerPlayer.isInDuel()) {
+				attackerPlayer.setDuelState(DuelState.INTERRUPTED);
+			}
+			
+			// Add attackers to npc's attacker list
+			getActiveChar().addAttackerToAttackByList(attacker);
+		}
+		
+		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
+	}
+	
+	@Override
+	public L2Npc getActiveChar() {
+		return (L2Npc) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java
new file mode 100644
index 00000000..8ff14cac
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.stat.PcStat;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+public class PcStatus extends PlayableStatus {
+	private double _currentCp = 0; // Current CP of the L2PcInstance
+	
+	public PcStatus(L2PcInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final void reduceCp(int value) {
+		if (getCurrentCp() > value) {
+			setCurrentCp(getCurrentCp() - value);
+		} else {
+			setCurrentCp(0);
+		}
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false, false);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) {
+		reduceHp(value, attacker, awake, isDOT, isHPConsumption, false);
+	}
+	
+	public final void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption, boolean ignoreCP) {
+		if (getActiveChar().isDead()) {
+			return;
+		}
+		
+		// If OFFLINE_MODE_NO_DAMAGE is enabled and player is offline and he is in store/craft mode, no damage is taken.
+		if (customs().offlineModeNoDamage() && (getActiveChar().getClient() != null) && getActiveChar().getClient().isDetached()
+			&& ((customs().offlineTradeEnable() && ((getActiveChar().getPrivateStoreType() == PrivateStoreType.SELL) || (getActiveChar().getPrivateStoreType() == PrivateStoreType.BUY)))
+				|| (customs().offlineCraftEnable() && (getActiveChar().isInCraftMode() || (getActiveChar().getPrivateStoreType() == PrivateStoreType.MANUFACTURE))))) {
+			return;
+		}
+		
+		if ((getActiveChar().isInvul() || getActiveChar().isHpBlocked()) && !(isDOT || isHPConsumption)) {
+			return;
+		}
+		
+		if (!isHPConsumption) {
+			getActiveChar().stopEffectsOnDamage(awake);
+			// Attacked players in craft/shops stand up.
+			if (getActiveChar().isInCraftMode() || getActiveChar().isInStoreMode()) {
+				getActiveChar().setPrivateStoreType(PrivateStoreType.NONE);
+				getActiveChar().standUp();
+				getActiveChar().broadcastUserInfo();
+			} else if (getActiveChar().isSitting()) {
+				getActiveChar().standUp();
+			}
+			
+			if (!isDOT) {
+				if (getActiveChar().isStunned() && (Rnd.get(10) == 0)) {
+					getActiveChar().stopStunning(true);
+				}
+			}
+		}
+		
+		int fullValue = (int) value;
+		int tDmg = 0;
+		
+		if ((attacker != null) && (attacker != getActiveChar())) {
+			final L2PcInstance attackerPlayer = attacker.getActingPlayer();
+			
+			if (attackerPlayer != null) {
+				if (attackerPlayer.isGM() && !attackerPlayer.getAccessLevel().canGiveDamage()) {
+					return;
+				}
+				
+				if (getActiveChar().isInDuel()) {
+					if (getActiveChar().getDuelState() == DuelState.DEAD) {
+						return;
+					} else if (getActiveChar().getDuelState() == DuelState.WINNER) {
+						return;
+					}
+					
+					// cancel duel if player got hit by another player, that is not part of the duel
+					if (attackerPlayer.getDuelId() != getActiveChar().getDuelId()) {
+						getActiveChar().setDuelState(DuelState.INTERRUPTED);
+					}
+				}
+			}
+			
+			// Check and calculate transferred damage
+			final L2Summon summon = getActiveChar().getSummon();
+			if (getActiveChar().hasServitor() && Util.checkIfInRange(1000, getActiveChar(), summon, true)) {
+				tDmg = ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_PERCENT, 0, null, null)) / 100;
+				
+				// Only transfer dmg up to current HP, it should not be killed
+				tDmg = Math.min((int) summon.getCurrentHp() - 1, tDmg);
+				if (tDmg > 0) {
+					summon.reduceCurrentHp(tDmg, attacker, null);
+					value -= tDmg;
+					fullValue = (int) value; // reduce the announced value here as player will get a message about summon damage
+				}
+			}
+			
+			int mpDam = ((int) value * (int) getActiveChar().getStat().calcStat(Stats.MANA_SHIELD_PERCENT, 0, null, null)) / 100;
+			if (mpDam > 0) {
+				mpDam = (int) (value - mpDam);
+				if (mpDam > getActiveChar().getCurrentMp()) {
+					getActiveChar().sendPacket(SystemMessageId.MP_BECAME_0_ARCANE_SHIELD_DISAPPEARING);
+					getActiveChar().stopSkillEffects(true, 1556);
+					value = mpDam - getActiveChar().getCurrentMp();
+					getActiveChar().setCurrentMp(0);
+				} else {
+					getActiveChar().reduceCurrentMp(mpDam);
+					SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP);
+					smsg.addInt(mpDam);
+					getActiveChar().sendPacket(smsg);
+					return;
+				}
+			}
+			
+			final L2PcInstance caster = getActiveChar().getTransferringDamageTo();
+			if ((caster != null) && (getActiveChar().getParty() != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && (getActiveChar() != caster) && getActiveChar().getParty().getMembers().contains(caster)) {
+				int transferDmg = ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100;
+				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
+				if (transferDmg > 0) {
+					int membersInRange = 0;
+					for (L2PcInstance member : caster.getParty().getMembers()) {
+						if (Util.checkIfInRange(1000, member, caster, false) && (member != caster)) {
+							membersInRange++;
+						}
+					}
+					
+					if ((attacker instanceof L2Playable) && (caster.getCurrentCp() > 0)) {
+						if (caster.getCurrentCp() > transferDmg) {
+							caster.getStatus().reduceCp(transferDmg);
+						} else {
+							transferDmg = (int) (transferDmg - caster.getCurrentCp());
+							caster.getStatus().reduceCp((int) caster.getCurrentCp());
+						}
+					}
+					
+					if (membersInRange > 0) {
+						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
+						value -= transferDmg;
+						fullValue = (int) value;
+					}
+				}
+			}
+			
+			if (!ignoreCP && (attacker instanceof L2Playable)) {
+				if (getCurrentCp() >= value) {
+					setCurrentCp(getCurrentCp() - value); // Set Cp to diff of Cp vs value
+					value = 0; // No need to subtract anything from Hp
+				} else {
+					value -= getCurrentCp(); // Get diff from value vs Cp; will apply diff to Hp
+					setCurrentCp(0, false); // Set Cp to 0
+				}
+			}
+			
+			if ((fullValue > 0) && !isDOT) {
+				// Send a System Message to the L2PcInstance
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
+				smsg.addString(getActiveChar().getName());
+				smsg.addCharName(attacker);
+				smsg.addInt(fullValue);
+				getActiveChar().sendPacket(smsg);
+				
+				if ((tDmg > 0) && (attackerPlayer != null)) {
+					smsg = SystemMessage.getSystemMessage(SystemMessageId.GIVEN_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_SERVITOR);
+					smsg.addInt(fullValue);
+					smsg.addInt(tDmg);
+					attackerPlayer.sendPacket(smsg);
+				}
+			}
+		}
+		
+		if (value > 0) {
+			value = getCurrentHp() - value;
+			if (value <= 0) {
+				if (getActiveChar().isInDuel()) {
+					getActiveChar().disableAllSkills();
+					stopHpMpRegeneration();
+					if (attacker != null) {
+						attacker.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+						attacker.sendPacket(ActionFailed.STATIC_PACKET);
+						attacker.setTarget(null);
+						attacker.abortAttack();
+					}
+					
+					// let the DuelManager know of his defeat
+					DuelManager.getInstance().onPlayerDefeat(getActiveChar());
+					value = 1;
+				} else {
+					value = 0;
+				}
+			}
+			setCurrentHp(value);
+		}
+		
+		if ((getActiveChar().getCurrentHp() < 0.5) && !isHPConsumption) {
+			getActiveChar().abortAttack();
+			getActiveChar().abortCast();
+			
+			if (getActiveChar().isInOlympiadMode()) {
+				stopHpMpRegeneration();
+				getActiveChar().setIsDead(true);
+				getActiveChar().setIsPendingRevive(true);
+				if (getActiveChar().hasSummon()) {
+					getActiveChar().getSummon().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE, null);
+				}
+				return;
+			}
+			
+			getActiveChar().doDie(attacker);
+		}
+	}
+	
+	@Override
+	public final double getCurrentCp() {
+		return _currentCp;
+	}
+	
+	@Override
+	public final void setCurrentCp(double newCp) {
+		setCurrentCp(newCp, true);
+	}
+	
+	public final void setCurrentCp(double newCp, boolean broadcastPacket) {
+		// Get the Max CP of the L2Character
+		int currentCp = (int) getCurrentCp();
+		int maxCp = getActiveChar().getStat().getMaxCp();
+		
+		synchronized (this) {
+			if (getActiveChar().isDead()) {
+				return;
+			}
+			
+			if (newCp < 0) {
+				newCp = 0;
+			}
+			
+			if (newCp >= maxCp) {
+				// Set the RegenActive flag to false
+				_currentCp = maxCp;
+				_flagsRegenActive &= ~REGEN_FLAG_CP;
+				
+				// Stop the HP/MP/CP Regeneration task
+				if (_flagsRegenActive == 0) {
+					stopHpMpRegeneration();
+				}
+			} else {
+				// Set the RegenActive flag to true
+				_currentCp = newCp;
+				_flagsRegenActive |= REGEN_FLAG_CP;
+				
+				// Start the HP/MP/CP Regeneration task with Medium priority
+				startHpMpRegeneration();
+			}
+		}
+		
+		// Send the Server->Client packet StatusUpdate with current HP and MP to all other L2PcInstance to inform
+		if ((currentCp != _currentCp) && broadcastPacket) {
+			getActiveChar().broadcastStatusUpdate();
+		}
+	}
+	
+	@Override
+	protected void doRegeneration() {
+		final PcStat charstat = getActiveChar().getStat();
+		
+		// Modify the current CP of the L2Character and broadcast Server->Client packet StatusUpdate
+		if (getCurrentCp() < charstat.getMaxRecoverableCp()) {
+			setCurrentCp(getCurrentCp() + Formulas.calcCpRegen(getActiveChar()), false);
+		}
+		
+		// Modify the current HP of the L2Character and broadcast Server->Client packet StatusUpdate
+		if (getCurrentHp() < charstat.getMaxRecoverableHp()) {
+			setCurrentHp(getCurrentHp() + Formulas.calcHpRegen(getActiveChar()), false);
+		}
+		
+		// Modify the current MP of the L2Character and broadcast Server->Client packet StatusUpdate
+		if (getCurrentMp() < charstat.getMaxRecoverableMp()) {
+			setCurrentMp(getCurrentMp() + Formulas.calcMpRegen(getActiveChar()), false);
+		}
+		
+		getActiveChar().broadcastStatusUpdate(); // send the StatusUpdate packet
+	}
+	
+	@Override
+	public L2PcInstance getActiveChar() {
+		return (L2PcInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java
new file mode 100644
index 00000000..ff6675e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class PetStatus extends SummonStatus {
+	private int _currentFed = 0; // Current Fed of the L2PetInstance
+	
+	public PetStatus(L2PetInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	@Override
+	public final void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHpConsumption) {
+		if (getActiveChar().isDead()) {
+			return;
+		}
+		
+		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
+		
+		if (attacker != null) {
+			if (!isDOT && (getActiveChar().getOwner() != null)) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_RECEIVED_S2_DAMAGE_BY_C1);
+				sm.addCharName(attacker);
+				sm.addInt((int) value);
+				getActiveChar().sendPacket(sm);
+			}
+			getActiveChar().getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, attacker);
+		}
+	}
+	
+	public int getCurrentFed() {
+		return _currentFed;
+	}
+	
+	public void setCurrentFed(int value) {
+		_currentFed = value;
+	}
+	
+	@Override
+	public L2PetInstance getActiveChar() {
+		return (L2PetInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/PlayableStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/PlayableStatus.java
new file mode 100644
index 00000000..975a8b1b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/PlayableStatus.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.model.actor.L2Playable;
+
+public class PlayableStatus extends CharStatus {
+	public PlayableStatus(L2Playable activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2Playable getActiveChar() {
+		return (L2Playable) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/SiegeFlagStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/SiegeFlagStatus.java
new file mode 100644
index 00000000..9584427f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/SiegeFlagStatus.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+
+public class SiegeFlagStatus extends NpcStatus {
+	public SiegeFlagStatus(L2SiegeFlagInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	@Override
+	public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHpConsumption) {
+		if (getActiveChar().isAdvancedHeadquarter()) {
+			value /= 2.;
+		}
+		
+		super.reduceHp(value, attacker, awake, isDOT, isHpConsumption);
+	}
+	
+	@Override
+	public L2SiegeFlagInstance getActiveChar() {
+		return (L2SiegeFlagInstance) super.getActiveChar();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/StaticObjStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/StaticObjStatus.java
new file mode 100644
index 00000000..52c93839
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/StaticObjStatus.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+
+public class StaticObjStatus extends CharStatus {
+	public StaticObjStatus(L2StaticObjectInstance activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public L2StaticObjectInstance getActiveChar() {
+		return (L2StaticObjectInstance) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/status/SummonStatus.java b/src/main/java/com/l2jserver/gameserver/model/actor/status/SummonStatus.java
new file mode 100644
index 00000000..55c4a181
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/status/SummonStatus.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.status;
+
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.util.Util;
+
+public class SummonStatus extends PlayableStatus {
+	public SummonStatus(L2Summon activeChar) {
+		super(activeChar);
+	}
+	
+	@Override
+	public void reduceHp(double value, L2Character attacker) {
+		reduceHp(value, attacker, true, false, false);
+	}
+	
+	@Override
+	public void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT, boolean isHPConsumption) {
+		if ((attacker == null) || getActiveChar().isDead()) {
+			return;
+		}
+		
+		final L2PcInstance attackerPlayer = attacker.getActingPlayer();
+		if ((attackerPlayer != null) && ((getActiveChar().getOwner() == null) || (getActiveChar().getOwner().getDuelId() != attackerPlayer.getDuelId()))) {
+			attackerPlayer.setDuelState(DuelState.INTERRUPTED);
+		}
+		
+		final L2PcInstance caster = getActiveChar().getTransferringDamageTo();
+		if (getActiveChar().getOwner().getParty() != null) {
+			if ((caster != null) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead() && getActiveChar().getParty().getMembers().contains(caster)) {
+				int transferDmg = ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100;
+				transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
+				if (transferDmg > 0) {
+					int membersInRange = 0;
+					for (L2PcInstance member : caster.getParty().getMembers()) {
+						if (Util.checkIfInRange(1000, member, caster, false) && (member != caster)) {
+							membersInRange++;
+						}
+					}
+					if ((attacker instanceof L2Playable) && (caster.getCurrentCp() > 0)) {
+						if (caster.getCurrentCp() > transferDmg) {
+							caster.getStatus().reduceCp(transferDmg);
+						} else {
+							transferDmg = (int) (transferDmg - caster.getCurrentCp());
+							caster.getStatus().reduceCp((int) caster.getCurrentCp());
+						}
+					}
+					if (membersInRange > 0) {
+						caster.reduceCurrentHp(transferDmg / membersInRange, attacker, null);
+						value -= transferDmg;
+					}
+				}
+			}
+		} else if ((caster != null) && (caster == getActiveChar().getOwner()) && Util.checkIfInRange(1000, getActiveChar(), caster, true) && !caster.isDead()) {
+			// when no party, transfer only to owner (caster)
+			int transferDmg = ((int) value * (int) getActiveChar().getStat().calcStat(Stats.TRANSFER_DAMAGE_TO_PLAYER, 0, null, null)) / 100;
+			transferDmg = Math.min((int) caster.getCurrentHp() - 1, transferDmg);
+			if (transferDmg > 0) {
+				if ((attacker instanceof L2Playable) && (caster.getCurrentCp() > 0)) {
+					if (caster.getCurrentCp() > transferDmg) {
+						caster.getStatus().reduceCp(transferDmg);
+					} else {
+						transferDmg = (int) (transferDmg - caster.getCurrentCp());
+						caster.getStatus().reduceCp((int) caster.getCurrentCp());
+					}
+				}
+				
+				caster.reduceCurrentHp(transferDmg, attacker, null);
+				value -= transferDmg;
+			}
+		}
+		super.reduceHp(value, attacker, awake, isDOT, isHPConsumption);
+	}
+	
+	@Override
+	public L2Summon getActiveChar() {
+		return (L2Summon) super.getActiveChar();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java
new file mode 100644
index 00000000..78ebce41
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/attackable/CommandChannelTimer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.attackable;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+
+/**
+ * @author xban1x
+ */
+public final class CommandChannelTimer implements Runnable {
+	private final L2Attackable _attackable;
+	
+	public CommandChannelTimer(L2Attackable attackable) {
+		_attackable = attackable;
+	}
+	
+	@Override
+	public void run() {
+		if (_attackable == null) {
+			return;
+		}
+		
+		if ((System.currentTimeMillis() - _attackable.getCommandChannelLastAttack()) > character().getRaidLootRightsInterval()) {
+			_attackable.setCommandChannelTimer(null);
+			_attackable.setFirstCommandChannelAttacked(null);
+			_attackable.setCommandChannelLastAttack(0);
+		} else {
+			ThreadPoolManager.getInstance().scheduleGeneral(this, 10000); // 10sec
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/attackable/OnKillNotifyTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/attackable/OnKillNotifyTask.java
new file mode 100644
index 00000000..a377dc02
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/attackable/OnKillNotifyTask.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.attackable;
+
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+
+/**
+ * @author xban1x
+ */
+public final class OnKillNotifyTask implements Runnable {
+	private final L2Attackable _attackable;
+	private final Quest _quest;
+	private final L2PcInstance _killer;
+	private final boolean _isSummon;
+	
+	public OnKillNotifyTask(L2Attackable attackable, Quest quest, L2PcInstance killer, boolean isSummon) {
+		_attackable = attackable;
+		_quest = quest;
+		_killer = killer;
+		_isSummon = isSummon;
+	}
+	
+	@Override
+	public void run() {
+		if ((_quest != null) && (_attackable != null) && (_killer != null)) {
+			_quest.onKill(_attackable, _killer, _isSummon);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/FlyToLocationTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/FlyToLocationTask.java
new file mode 100644
index 00000000..41059236
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/FlyToLocationTask.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.character;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.network.serverpackets.FlyToLocation;
+import com.l2jserver.gameserver.network.serverpackets.FlyToLocation.FlyType;
+
+/**
+ * Task dedicated to fly a player to the location
+ * @author xban1x
+ */
+public final class FlyToLocationTask implements Runnable {
+	private final L2Character _character;
+	private final Location _targetLocation;
+	private final FlyType _type;
+	
+	public FlyToLocationTask(L2Character character, L2Object target, FlyType type) {
+		_character = character;
+		_targetLocation = target.getLocation();
+		_type = type;
+	}
+	
+	@Override
+	public void run() {
+		if (_character != null) {
+			_character.broadcastPacket(new FlyToLocation(_character, _targetLocation, _type));
+			_character.setLocation(_targetLocation);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/HitTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/HitTask.java
new file mode 100644
index 00000000..02cc46c7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/HitTask.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.character;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Task launching the function onHitTimer().<br>
+ * <B><U>Actions</U>:</B>
+ * <ul>
+ * <li>If the attacker/target is dead or use fake death, notify the AI with EVT_CANCEL and send a Server->Client packet ActionFailed (if attacker is a L2PcInstance)</li>
+ * <li>If attack isn't aborted, send a message system (critical hit, missed...) to attacker/target if they are L2PcInstance</li>
+ * <li>If attack isn't aborted and hit isn't missed, reduce HP of the target and calculate reflection damage to reduce HP of attacker if necessary</li>
+ * <li>if attack isn't aborted and hit isn't missed, manage attack or cast break of the target (calculating rate, sending message...)</li>
+ * </ul>
+ * @author xban1x
+ */
+public final class HitTask implements Runnable {
+	private final L2Character _character;
+	private final L2Character _hitTarget;
+	private final int _damage;
+	private final boolean _crit;
+	private final boolean _miss;
+	private final byte _shld;
+	private final boolean _soulshot;
+	
+	public HitTask(L2Character character, L2Character target, int damage, boolean crit, boolean miss, boolean soulshot, byte shld) {
+		_character = character;
+		_hitTarget = target;
+		_damage = damage;
+		_crit = crit;
+		_shld = shld;
+		_miss = miss;
+		_soulshot = soulshot;
+	}
+	
+	@Override
+	public void run() {
+		if (_character != null) {
+			_character.onHitTimer(_hitTarget, _damage, _crit, _miss, _soulshot, _shld);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/MagicUseTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/MagicUseTask.java
new file mode 100644
index 00000000..5afa401e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/MagicUseTask.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.character;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Task dedicated to magic use of character
+ * @author xban1x
+ */
+public final class MagicUseTask implements Runnable {
+	private final L2Character _character;
+	private List<L2Object> _targets;
+	private final Skill _skill;
+	private int _count;
+	private int _skillTime;
+	private int _phase;
+	private final boolean _simultaneously;
+	
+	public MagicUseTask(L2Character character, List<L2Object> targets, Skill s, int hit, boolean simultaneous) {
+		_character = character;
+		_targets = targets;
+		_skill = s;
+		_count = 0;
+		_phase = 1;
+		_skillTime = hit;
+		_simultaneously = simultaneous;
+	}
+	
+	@Override
+	public void run() {
+		if (_character == null) {
+			return;
+		}
+		switch (_phase) {
+			case 1 -> _character.onMagicLaunchedTimer(this);
+			case 2 -> _character.onMagicHitTimer(this);
+			case 3 -> _character.onMagicFinalizer(this);
+		}
+	}
+	
+	public int getCount() {
+		return _count;
+	}
+	
+	public int getPhase() {
+		return _phase;
+	}
+	
+	public Skill getSkill() {
+		return _skill;
+	}
+	
+	public int getSkillTime() {
+		return _skillTime;
+	}
+	
+	public List<L2Object> getTargets() {
+		return _targets;
+	}
+	
+	public boolean isSimultaneous() {
+		return _simultaneously;
+	}
+	
+	public void setCount(int count) {
+		_count = count;
+	}
+	
+	public void setPhase(int phase) {
+		_phase = phase;
+	}
+	
+	public void setSkillTime(int skillTime) {
+		_skillTime = skillTime;
+	}
+	
+	public void setTargets(List<L2Object> targets) {
+		_targets = targets;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/NotifyAITask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/NotifyAITask.java
new file mode 100644
index 00000000..3f20751e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/NotifyAITask.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.character;
+
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Task dedicated to notify character's AI
+ * @author xban1x
+ */
+public final class NotifyAITask implements Runnable {
+	private final L2Character _character;
+	private final CtrlEvent _event;
+	
+	public NotifyAITask(L2Character character, CtrlEvent event) {
+		_character = character;
+		_event = event;
+	}
+	
+	@Override
+	public void run() {
+		if (_character != null) {
+			_character.getAI().notifyEvent(_event);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/QueuedMagicUseTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/QueuedMagicUseTask.java
new file mode 100644
index 00000000..c930f18a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/character/QueuedMagicUseTask.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.character;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Task dedicated to queued magic use of character
+ * @author xban1x
+ */
+public final class QueuedMagicUseTask implements Runnable {
+	private final L2PcInstance _currPlayer;
+	private final Skill _queuedSkill;
+	private final boolean _isCtrlPressed;
+	private final boolean _isShiftPressed;
+	
+	public QueuedMagicUseTask(L2PcInstance currPlayer, Skill queuedSkill, boolean isCtrlPressed, boolean isShiftPressed) {
+		_currPlayer = currPlayer;
+		_queuedSkill = queuedSkill;
+		_isCtrlPressed = isCtrlPressed;
+		_isShiftPressed = isShiftPressed;
+	}
+	
+	@Override
+	public void run() {
+		if (_currPlayer != null) {
+			_currPlayer.useMagic(_queuedSkill, _isCtrlPressed, _isShiftPressed);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java
new file mode 100644
index 00000000..32c73c3e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicAction.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.cubics;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * Cubic action task.
+ * @author Zoey76
+ */
+public final class CubicAction implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(CubicAction.class);
+	
+	private final L2CubicInstance _cubic;
+	private final AtomicInteger _currentCount = new AtomicInteger();
+	private final int _chance;
+	
+	public CubicAction(L2CubicInstance cubic, int chance) {
+		_cubic = cubic;
+		_chance = chance;
+	}
+	
+	@Override
+	public void run() {
+		if (_cubic == null) {
+			return;
+		}
+		
+		try {
+			if (_cubic.getOwner().isDead() || !_cubic.getOwner().isOnline()) {
+				_cubic.stopAction();
+				_cubic.getOwner().getCubics().remove(_cubic.getId());
+				_cubic.getOwner().broadcastUserInfo();
+				_cubic.cancelDisappear();
+				return;
+			}
+			
+			if (!AttackStanceTaskManager.getInstance().hasAttackStanceTask(_cubic.getOwner())) {
+				if (_cubic.getOwner().hasSummon()) {
+					if (!AttackStanceTaskManager.getInstance().hasAttackStanceTask(_cubic.getOwner().getSummon())) {
+						_cubic.stopAction();
+						return;
+					}
+				} else {
+					_cubic.stopAction();
+					return;
+				}
+			}
+			
+			// The cubic has already reached its limit and it will stay idle until its duration ends.
+			if ((_cubic.getCubicMaxCount() > -1) && (_currentCount.get() >= _cubic.getCubicMaxCount())) {
+				_cubic.stopAction();
+				return;
+			}
+			
+			// Smart Cubic debuff cancel is 100%
+			boolean useCubicCure = false;
+			if ((_cubic.getId() >= L2CubicInstance.SMART_CUBIC_EVATEMPLAR) && (_cubic.getId() <= L2CubicInstance.SMART_CUBIC_SPECTRALMASTER)) {
+				for (BuffInfo info : _cubic.getOwner().getEffectList().getDebuffs()) {
+					if (!info.getSkill().isIrreplaceableBuff()) {
+						useCubicCure = true;
+						info.getEffected().getEffectList().stopSkillEffects(true, info.getSkill());
+					}
+				}
+			}
+			
+			if (useCubicCure) {
+				// Smart Cubic debuff cancel is needed, no other skill is used in this activation period
+				MagicSkillUse msu = new MagicSkillUse(_cubic.getOwner(), _cubic.getOwner(), L2CubicInstance.SKILL_CUBIC_CURE, 1, 0, 0);
+				_cubic.getOwner().broadcastPacket(msu);
+				
+				// The cubic has done an action, increase the current count
+				_currentCount.incrementAndGet();
+			} else if (Rnd.get(1, 100) < _chance) {
+				final Skill skill = _cubic.getSkills().get(Rnd.get(_cubic.getSkills().size()));
+				if (skill == null) {
+					return;
+				}
+				
+				if (skill.getId() == L2CubicInstance.SKILL_CUBIC_HEAL) {
+					// friendly skill, so we look a target in owner's party
+					_cubic.cubicTargetForHeal();
+				} else {
+					// offensive skill, we look for an enemy target
+					_cubic.getCubicTarget();
+					if (!L2CubicInstance.isInCubicRange(_cubic.getOwner(), _cubic.getTarget())) {
+						_cubic.setTarget(null);
+					}
+				}
+				L2Character target = _cubic.getTarget();
+				if ((target != null) && !target.isDead()) {
+					if (general().debug()) {
+						LOG.info("Action.run();");
+						LOG.info("Cubic ID: {} Target: {} distance: {}", _cubic.getId(), target.getName(), target.calculateDistance(_cubic.getOwner(), true, false));
+					}
+					
+					_cubic.getOwner().broadcastPacket(new MagicSkillUse(_cubic.getOwner(), target, skill.getId(), skill.getLevel(), 0, 0));
+					
+					final List<L2Object> targets = List.of(target);
+					
+					if (skill.isContinuous()) {
+						_cubic.useCubicContinuous(skill, targets);
+					} else {
+						skill.activateSkill(_cubic, targets);
+					}
+					
+					if (skill.hasEffectType(L2EffectType.MAGICAL_ATTACK)) {
+						_cubic.useCubicMdam(skill, targets);
+					} else if (skill.hasEffectType(L2EffectType.HP_DRAIN)) {
+						_cubic.useCubicDrain(skill, targets);
+					} else if (skill.hasEffectType(L2EffectType.STUN, L2EffectType.ROOT)) {
+						_cubic.useCubicDisabler(skill, targets);
+					} else if (skill.hasEffectType(L2EffectType.DMG_OVER_TIME)) {
+						_cubic.useCubicContinuous(skill, targets);
+					} else if (skill.hasEffectType(L2EffectType.AGGRESSION)) {
+						_cubic.useCubicDisabler(skill, targets);
+					}
+					
+					// The cubic has done an action, increase the current count
+					_currentCount.incrementAndGet();
+				}
+			}
+		} catch (Exception e) {
+			LOG.error(e.getMessage(), e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicDisappear.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicDisappear.java
new file mode 100644
index 00000000..d3f67b4f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicDisappear.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.cubics;
+
+import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
+
+/**
+ * Cubic disappear task.
+ * @author Zoey76
+ */
+public final class CubicDisappear implements Runnable {
+	private final L2CubicInstance _cubic;
+	
+	public CubicDisappear(L2CubicInstance cubic) {
+		_cubic = cubic;
+	}
+	
+	@Override
+	public void run() {
+		if (_cubic != null) {
+			_cubic.stopAction();
+			_cubic.getOwner().getCubics().remove(_cubic.getId());
+			_cubic.getOwner().broadcastUserInfo();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java
new file mode 100644
index 00000000..e758fc60
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/cubics/CubicHeal.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.cubics;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+
+/**
+ * Cubic heal task.
+ * @author Zoey76
+ */
+public class CubicHeal implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(CubicHeal.class);
+	
+	private final L2CubicInstance _cubic;
+	
+	public CubicHeal(L2CubicInstance cubic) {
+		_cubic = cubic;
+	}
+	
+	@Override
+	public void run() {
+		if (_cubic == null) {
+			return;
+		}
+		
+		if (_cubic.getOwner().isDead() || !_cubic.getOwner().isOnline()) {
+			_cubic.stopAction();
+			_cubic.getOwner().getCubics().remove(_cubic.getId());
+			_cubic.getOwner().broadcastUserInfo();
+			_cubic.cancelDisappear();
+			return;
+		}
+		
+		try {
+			final Skill skill = _cubic.getSkills().stream().filter(s -> s.getId() == L2CubicInstance.SKILL_CUBIC_HEAL).findFirst().orElse(null);
+			if (skill == null) {
+				return;
+			}
+			
+			_cubic.cubicTargetForHeal();
+			final L2Character target = _cubic.getTarget();
+			if ((target != null) && !target.isDead()) {
+				skill.activateSkill(_cubic, List.of(target));
+				_cubic.getOwner().broadcastPacket(new MagicSkillUse(_cubic.getOwner(), target, skill.getId(), skill.getLevel(), 0, 0));
+			}
+		} catch (Exception e) {
+			LOG.error(e.getMessage(), e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTask.java
new file mode 100644
index 00000000..f4854754
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTask.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.npc.trap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+
+/**
+ * Trap task.
+ * @author Zoey76
+ */
+public class TrapTask implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(TrapTask.class);
+	
+	private static final int TICK = 1000; // 1s
+	private final L2TrapInstance _trap;
+	
+	public TrapTask(L2TrapInstance trap) {
+		_trap = trap;
+	}
+	
+	@Override
+	public void run() {
+		try {
+			if (!_trap.isTriggered()) {
+				if (_trap.hasLifeTime()) {
+					_trap.setRemainingTime(_trap.getRemainingTime() - TICK);
+					if (_trap.getRemainingTime() < (_trap.getLifeTime() - 15000)) {
+						_trap.broadcastPacket(new SocialAction(_trap.getObjectId(), 2));
+					}
+					if (_trap.getRemainingTime() <= 0) {
+						// TODO(Zoey76): Handle ex AURA, FRONT_AURA, BEHIND_AURA skills.
+						// _trap.triggerTrap(_trap);
+						_trap.unSummon();
+						return;
+					}
+				}
+				
+				for (L2Character target : _trap.getKnownList().getKnownCharacters()) {
+					if (_trap.checkTarget(target)) {
+						_trap.triggerTrap(target);
+						break;
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error(e.getMessage(), e);
+			_trap.unSummon();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTriggerTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTriggerTask.java
new file mode 100644
index 00000000..ef81e5f6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapTriggerTask.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.npc.trap;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+
+/**
+ * Trap trigger task.
+ * @author Zoey76
+ */
+public class TrapTriggerTask implements Runnable {
+	private final L2TrapInstance _trap;
+	
+	public TrapTriggerTask(L2TrapInstance trap) {
+		_trap = trap;
+	}
+	
+	@Override
+	public void run() {
+		try {
+			_trap.doCast(_trap.getSkill());
+			ThreadPoolManager.getInstance().scheduleGeneral(new TrapUnsummonTask(_trap), _trap.getSkill().getHitTime() + 300);
+		} catch (Exception e) {
+			_trap.unSummon();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapUnsummonTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapUnsummonTask.java
new file mode 100644
index 00000000..03f37c4b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/trap/TrapUnsummonTask.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.npc.trap;
+
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+
+/**
+ * Trap unsummon task.
+ * @author Zoey76
+ */
+public class TrapUnsummonTask implements Runnable {
+	private final L2TrapInstance _trap;
+	
+	public TrapUnsummonTask(L2TrapInstance trap) {
+		_trap = trap;
+	}
+	
+	@Override
+	public void run() {
+		_trap.unSummon();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/walker/ArrivedTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/walker/ArrivedTask.java
new file mode 100644
index 00000000..05738d3a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/npc/walker/ArrivedTask.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.npc.walker;
+
+import com.l2jserver.gameserver.instancemanager.WalkingManager;
+import com.l2jserver.gameserver.model.WalkInfo;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * Walker arrive task.
+ * @author GKR
+ */
+public class ArrivedTask implements Runnable {
+	private final WalkInfo _walk;
+	private final L2Npc _npc;
+	
+	public ArrivedTask(L2Npc npc, WalkInfo walk) {
+		_npc = npc;
+		_walk = walk;
+	}
+	
+	@Override
+	public void run() {
+		_walk.setBlocked(false);
+		WalkingManager.getInstance().startMoving(_npc, _walk.getRoute().getName());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/DismountTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/DismountTask.java
new file mode 100644
index 00000000..15cca3fb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/DismountTask.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to dismount player from pet.
+ * @author UnAfraid
+ */
+public class DismountTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public DismountTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.dismount();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java
new file mode 100644
index 00000000..d64d57a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Task dedicated to reward player with fame while standing on siege zone.
+ * @author UnAfraid
+ */
+public class FameTask implements Runnable {
+	private final L2PcInstance _player;
+	private final int _value;
+	
+	public FameTask(L2PcInstance player, int value) {
+		_player = player;
+		_value = value;
+	}
+	
+	@Override
+	public void run() {
+		if ((_player == null) || (_player.isDead() && !character().fameForDeadPlayers())) {
+			return;
+		}
+		if (((_player.getClient() == null) || _player.getClient().isDetached()) && !customs().offlineFame()) {
+			return;
+		}
+		_player.setFame(_player.getFame() + _value);
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_REPUTATION_SCORE);
+		sm.addInt(_value);
+		_player.sendPacket(sm);
+		_player.sendPacket(new UserInfo(_player));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java
new file mode 100644
index 00000000..ea6b4ce4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/GameGuardCheckTask.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.LeaveWorld;
+
+/**
+ * Task dedicated to verify client's game guard.
+ * @author UnAfraid
+ */
+public class GameGuardCheckTask implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(GameGuardCheckTask.class);
+	
+	private final L2PcInstance _player;
+	
+	public GameGuardCheckTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if ((_player != null)) {
+			L2GameClient client = _player.getClient();
+			if ((client != null) && !client.isAuthedGG() && _player.isOnline()) {
+				AdminData.getInstance().broadcastMessageToGMs("Client " + client + " failed to reply GameGuard query and is being kicked!");
+				LOG.info("Client {} failed to reply GameGuard query and is being kicked!", client);
+				
+				client.close(LeaveWorld.STATIC_PACKET);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
new file mode 100644
index 00000000..d9f80387
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/IllegalPlayerActionTask.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
+import com.l2jserver.gameserver.instancemanager.PunishmentManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.punishment.PunishmentAffect;
+import com.l2jserver.gameserver.model.punishment.PunishmentTask;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+
+/**
+ * Task that handles illegal player actions.
+ */
+public final class IllegalPlayerActionTask implements Runnable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger("audit");
+	
+	private final String _message;
+	
+	private final IllegalActionPunishmentType _punishment;
+	
+	private final L2PcInstance _actor;
+	
+	public IllegalPlayerActionTask(L2PcInstance actor, String message, IllegalActionPunishmentType punishment) {
+		_message = message;
+		_punishment = punishment;
+		_actor = actor;
+		
+		switch (punishment) {
+			case KICK -> _actor.sendMessage("You will be kicked for illegal action, GM informed.");
+			case KICK_BAN -> {
+				if (!_actor.isGM()) {
+					_actor.setAccessLevel(-1);
+					_actor.setAccountAccesslevel(-1);
+				}
+				_actor.sendMessage("You are banned for illegal action, GM informed.");
+			}
+			case JAIL -> {
+				_actor.sendMessage("Illegal action performed!");
+				_actor.sendMessage("You will be teleported to GM Consultation Service area and jailed.");
+			}
+		}
+	}
+	
+	@Override
+	public void run() {
+		LOG.info("Illegal action [{}] by player {}, action taken {}!", _message, _actor, _punishment);
+		
+		AdminData.getInstance().broadcastMessageToGMs(_message);
+		if (!_actor.isGM()) {
+			switch (_punishment) {
+				case BROADCAST -> {
+				}
+				case KICK -> _actor.logout(false);
+				case KICK_BAN -> PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN, System.currentTimeMillis() + general().getDefaultPunishParam(), _message, getClass().getSimpleName()));
+				case JAIL -> PunishmentManager.getInstance().startPunishment(new PunishmentTask(_actor.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + general().getDefaultPunishParam(), _message, getClass().getSimpleName()));
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/InventoryEnableTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/InventoryEnableTask.java
new file mode 100644
index 00000000..5a8a30a8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/InventoryEnableTask.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to enable player's inventory.
+ * @author UnAfraid
+ */
+public class InventoryEnableTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public InventoryEnableTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.setInventoryBlockingStatus(false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java
new file mode 100644
index 00000000..ed0bf659
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/LookingForFishTask.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated for looking for fish.
+ * @author UnAfraid
+ */
+public class LookingForFishTask implements Runnable {
+	private final L2PcInstance _player;
+	private final boolean _isNoob, _isUpperGrade;
+	private final int _fishGroup;
+	private final double _fishGutsCheck;
+	private final long _endTaskTime;
+	
+	public LookingForFishTask(L2PcInstance player, int startCombatTime, double fishGutsCheck, int fishGroup, boolean isNoob, boolean isUpperGrade) {
+		_player = player;
+		_fishGutsCheck = fishGutsCheck;
+		_endTaskTime = System.currentTimeMillis() + (startCombatTime * 1000) + 10000;
+		_fishGroup = fishGroup;
+		_isNoob = isNoob;
+		_isUpperGrade = isUpperGrade;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			if (System.currentTimeMillis() >= _endTaskTime) {
+				_player.endFishing(false);
+				return;
+			}
+			if (_fishGroup == -1) {
+				return;
+			}
+			int check = Rnd.get(100);
+			if (_fishGutsCheck > check) {
+				_player.stopLookingForFishTask();
+				_player.startFishCombat(_isNoob, _isUpperGrade);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java
new file mode 100644
index 00000000..3ea1a5e3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/PetFeedTask.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Task dedicated for feeding player's pet.
+ * @author UnAfraid
+ */
+public class PetFeedTask implements Runnable {
+	private static final Logger _log = LoggerFactory.getLogger(PetFeedTask.class);
+	
+	private final L2PcInstance _player;
+	
+	public PetFeedTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		try {
+			if (!_player.isMounted() || (_player.getMountNpcId() == 0) || (PetDataTable.getInstance().getPetData(_player.getMountNpcId()) == null)) {
+				_player.stopFeed();
+				return;
+			}
+			
+			if (_player.getCurrentFeed() > _player.getFeedConsume()) {
+				// eat
+				_player.setCurrentFeed(_player.getCurrentFeed() - _player.getFeedConsume());
+			} else {
+				// go back to pet control item, or simply said, unsummon it
+				_player.setCurrentFeed(0);
+				_player.stopFeed();
+				_player.dismount();
+				_player.sendPacket(SystemMessageId.OUT_OF_FEED_MOUNT_CANCELED);
+				return;
+			}
+			
+			final List<Integer> foodIds = PetDataTable.getInstance().getPetData(_player.getMountNpcId()).getFood();
+			if (foodIds.isEmpty()) {
+				return;
+			}
+			
+			L2ItemInstance food = null;
+			for (int id : foodIds) {
+				// TODO: possibly pet inv?
+				food = _player.getInventory().getItemByItemId(id);
+				if (food != null) {
+					break;
+				}
+			}
+			
+			if ((food != null) && _player.isHungry()) {
+				IItemHandler handler = ItemHandler.getInstance().getHandler(food.getEtcItem());
+				if (handler != null) {
+					handler.useItem(_player, food, false);
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY);
+					sm.addItemName(food.getId());
+					_player.sendPacket(sm);
+				}
+			}
+		} catch (Exception e) {
+			_log.error("Could not feed mounted Pet NPC ID {}, a feed task error has occurred", _player.getMountNpcId(), e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/PvPFlagTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/PvPFlagTask.java
new file mode 100644
index 00000000..9c43bae9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/PvPFlagTask.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to update player's current pvp status.
+ * @author UnAfraid
+ */
+public class PvPFlagTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public PvPFlagTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player == null) {
+			return;
+		}
+		
+		if (System.currentTimeMillis() > _player.getPvpFlagLasts()) {
+			_player.stopPvPFlag();
+		} else if (System.currentTimeMillis() > (_player.getPvpFlagLasts() - 20000)) {
+			_player.updatePvPFlag(2);
+		} else {
+			_player.updatePvPFlag(1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoBonusTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoBonusTask.java
new file mode 100644
index 00000000..776e8097
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoBonusTask.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import java.util.Objects;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ * @author Maneco2
+ * @since 2.6.3.0
+ */
+public class RecoBonusTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public RecoBonusTask(L2PcInstance player) {
+		Objects.requireNonNull(player);
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		_player.getRecSystem().finishBonusTask();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoGiveTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoGiveTask.java
new file mode 100644
index 00000000..8c75ffb8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoGiveTask.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Task dedicated to increase player's recommendation bonus.
+ * @author UnAfraid
+ */
+public class RecoGiveTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public RecoGiveTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			// 10 recommendations to give out after 2 hours of being logged in
+			// 1 more recommendation to give out every hour after that.
+			int recoToGive = 1;
+			if (!_player.getRecSystem().isTwoHoursGiven()) {
+				recoToGive = 10;
+				_player.getRecSystem().setTwoHoursGiven(true);
+			}
+			
+			_player.getRecSystem().setLeft(_player.getRecSystem().getLeft() + recoToGive);
+			
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATIONS);
+			sm.addInt(recoToGive);
+			_player.sendPacket(sm);
+			_player.sendPacket(new UserInfo(_player));
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RentPetTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RentPetTask.java
new file mode 100644
index 00000000..c12b3f85
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/RentPetTask.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to dismount player from rented pet.
+ * @author UnAfraid
+ */
+public class RentPetTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public RentPetTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.stopRentPet();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/ResetChargesTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/ResetChargesTask.java
new file mode 100644
index 00000000..67e9104f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/ResetChargesTask.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to reset player's current charges.
+ * @author UnAfraid
+ */
+public class ResetChargesTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public ResetChargesTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.clearCharges();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/ResetSoulsTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/ResetSoulsTask.java
new file mode 100644
index 00000000..05230588
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/ResetSoulsTask.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to reset player's current souls.
+ * @author UnAfraid
+ */
+public class ResetSoulsTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public ResetSoulsTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.clearSouls();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/SitDownTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/SitDownTask.java
new file mode 100644
index 00000000..0a1fea3c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/SitDownTask.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to put player to sit down.
+ * @author UnAfraid
+ */
+public class SitDownTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public SitDownTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.stopStunning(false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/StandUpTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/StandUpTask.java
new file mode 100644
index 00000000..2dbd9d7a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/StandUpTask.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated to put player to stand up.
+ * @author UnAfraid
+ */
+public class StandUpTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public StandUpTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			_player.setIsSitting(false);
+			_player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/TeleportTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/TeleportTask.java
new file mode 100644
index 00000000..5a191714
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/TeleportTask.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ */
+public class TeleportTask implements Runnable {
+	private final L2PcInstance _activeChar;
+	private final Location _loc;
+	
+	public TeleportTask(L2PcInstance player, Location loc) {
+		_activeChar = player;
+		_loc = loc;
+	}
+	
+	@Override
+	public void run() {
+		if ((_activeChar != null) && _activeChar.isOnline()) {
+			_activeChar.teleToLocation(_loc, true);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/TeleportWatchdogTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/TeleportWatchdogTask.java
new file mode 100644
index 00000000..2e7e59ee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/TeleportWatchdogTask.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Task dedicated watch for player teleportation.
+ * @author UnAfraid
+ */
+public class TeleportWatchdogTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public TeleportWatchdogTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if ((_player == null) || !_player.isTeleporting()) {
+			return;
+		}
+		_player.onTeleported();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/VitalityTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/VitalityTask.java
new file mode 100644
index 00000000..4dc4fa95
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/VitalityTask.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import static com.l2jserver.gameserver.config.Configuration.vitality;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.stat.PcStat;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.ExVitalityPointInfo;
+
+/**
+ * Task dedicated to reward player with vitality.
+ * @author UnAfraid
+ */
+public class VitalityTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public VitalityTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (!_player.isInsideZone(ZoneId.PEACE)) {
+			return;
+		}
+		
+		if (_player.getVitalityPoints() >= PcStat.MAX_VITALITY_POINTS) {
+			return;
+		}
+		
+		_player.updateVitalityPoints(vitality().getRateRecoveryPeaceZone(), false, false);
+		_player.sendPacket(new ExVitalityPointInfo(_player.getVitalityPoints()));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java
new file mode 100644
index 00000000..246bea55
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/WarnUserTakeBreakTask.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Task dedicated to warn user to take a break.
+ * @author UnAfraid
+ */
+public class WarnUserTakeBreakTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public WarnUserTakeBreakTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			if (_player.isOnline()) {
+				_player.sendPacket(SystemMessageId.PLAYING_FOR_LONG_TIME);
+			} else {
+				_player.stopWarnUserTakeBreak();
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java
new file mode 100644
index 00000000..cc859dec
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.tasks.player;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Task dedicated to make damage to the player while drowning.
+ * @author UnAfraid
+ */
+public class WaterTask implements Runnable {
+	private final L2PcInstance _player;
+	
+	public WaterTask(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public void run() {
+		if (_player != null) {
+			double reduceHp = _player.getMaxHp() / 100.0;
+			
+			if (reduceHp < 1) {
+				reduceHp = 1;
+			}
+			
+			_player.reduceCurrentHp(reduceHp, _player, false, false, null);
+			// reduced hp, because not rest
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DROWN_DAMAGE_S1);
+			sm.addInt((int) reduceHp);
+			_player.sendPacket(sm);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2CharTemplate.java b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2CharTemplate.java
new file mode 100644
index 00000000..8ea95d7a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2CharTemplate.java
@@ -0,0 +1,585 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.templates;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.MoveType;
+
+/**
+ * Character template.
+ * @author Zoey76
+ */
+public class L2CharTemplate extends ListenersContainer {
+	// BaseStats
+	private int _baseSTR;
+	private int _baseCON;
+	private int _baseDEX;
+	private int _baseINT;
+	private int _baseWIT;
+	private int _baseMEN;
+	private float _baseHpMax;
+	private float _baseCpMax;
+	private float _baseMpMax;
+	private float _baseHpReg;
+	private float _baseMpReg;
+	private int _basePAtk;
+	private int _baseMAtk;
+	private int _basePDef;
+	private int _baseMDef;
+	private int _basePAtkSpd;
+	private int _baseMAtkSpd;
+	private int _baseAttackRange;
+	private int _randomDamage;
+	private WeaponType _baseAttackType;
+	private int _baseShldDef;
+	private int _baseShldRate;
+	private int _baseCritRate;
+	private int _baseMCritRate;
+	private int _baseReuseDelay;
+	// SpecialStats
+	private int _baseBreath;
+	private int _baseFire;
+	private int _baseWind;
+	private int _baseWater;
+	private int _baseEarth;
+	private int _baseHoly;
+	private int _baseDark;
+	private double _baseFireRes;
+	private double _baseWindRes;
+	private double _baseWaterRes;
+	private double _baseEarthRes;
+	private double _baseHolyRes;
+	private double _baseDarkRes;
+	private double _baseElementRes;
+	/** For client info use {@link #_fCollisionRadius} */
+	private int _collisionRadius;
+	/** For client info use {@link #_fCollisionHeight} */
+	private int _collisionHeight;
+	
+	private double _fCollisionRadius;
+	private double _fCollisionHeight;
+	
+	private final double[] _moveType = new double[MoveType.values().length];
+	/** The creature's race. */
+	private Race _race;
+	
+	public L2CharTemplate(StatsSet set) {
+		set(set);
+	}
+	
+	public void set(StatsSet set) {
+		// Base stats
+		_baseSTR = set.getInt("baseSTR", 0);
+		_baseCON = set.getInt("baseCON", 0);
+		_baseDEX = set.getInt("baseDEX", 0);
+		_baseINT = set.getInt("baseINT", 0);
+		_baseWIT = set.getInt("baseWIT", 0);
+		_baseMEN = set.getInt("baseMEN", 0);
+		_baseHpMax = set.getFloat("baseHpMax", 0);
+		_baseCpMax = set.getFloat("baseCpMax", 0);
+		_baseMpMax = set.getFloat("baseMpMax", 0);
+		_baseHpReg = set.getFloat("baseHpReg", 0);
+		_baseMpReg = set.getFloat("baseMpReg", 0);
+		_basePAtk = set.getInt("basePAtk", 0);
+		_baseMAtk = set.getInt("baseMAtk", 0);
+		_basePDef = set.getInt("basePDef", 0);
+		_baseMDef = set.getInt("baseMDef", 0);
+		_basePAtkSpd = set.getInt("basePAtkSpd", 300);
+		_baseMAtkSpd = set.getInt("baseMAtkSpd", 333);
+		_baseShldDef = set.getInt("baseShldDef", 0);
+		_baseAttackRange = set.getInt("baseAtkRange", 40);
+		_randomDamage = set.getInt("baseRndDam", 0);
+		_baseAttackType = set.getEnum("baseAtkType", WeaponType.class, WeaponType.FIST);
+		_baseShldRate = set.getInt("baseShldRate", 0);
+		_baseCritRate = set.getInt("baseCritRate", 4);
+		_baseMCritRate = set.getInt("baseMCritRate", 0);
+		_baseReuseDelay = set.getInt("reuseDelay", 0);
+		
+		// SpecialStats
+		_baseBreath = set.getInt("baseBreath", 100);
+		_baseFire = set.getInt("baseFire", 0);
+		_baseWind = set.getInt("baseWind", 0);
+		_baseWater = set.getInt("baseWater", 0);
+		_baseEarth = set.getInt("baseEarth", 0);
+		_baseHoly = set.getInt("baseHoly", 0);
+		_baseDark = set.getInt("baseDark", 0);
+		_baseFireRes = set.getInt("baseFireRes", 0);
+		_baseWindRes = set.getInt("baseWindRes", 0);
+		_baseWaterRes = set.getInt("baseWaterRes", 0);
+		_baseEarthRes = set.getInt("baseEarthRes", 0);
+		_baseHolyRes = set.getInt("baseHolyRes", 0);
+		_baseDarkRes = set.getInt("baseDarkRes", 0);
+		_baseElementRes = set.getInt("baseElementRes", 0);
+		
+		// Geometry
+		_fCollisionHeight = set.getDouble("collisionHeight", 0);
+		_fCollisionRadius = set.getDouble("collisionRadius", 0);
+		_collisionRadius = (int) _fCollisionRadius;
+		_collisionHeight = (int) _fCollisionHeight;
+		
+		// speed.
+		Arrays.fill(_moveType, 1);
+		setBaseMoveSpeed(MoveType.RUN, set.getDouble("baseRunSpd", 120));
+		setBaseMoveSpeed(MoveType.WALK, set.getDouble("baseWalkSpd", 50));
+		setBaseMoveSpeed(MoveType.FAST_SWIM, set.getDouble("baseSwimRunSpd", getBaseMoveSpeed(MoveType.RUN)));
+		setBaseMoveSpeed(MoveType.SLOW_SWIM, set.getDouble("baseSwimWalkSpd", getBaseMoveSpeed(MoveType.WALK)));
+		setBaseMoveSpeed(MoveType.FAST_FLY, set.getDouble("baseFlyRunSpd", getBaseMoveSpeed(MoveType.RUN)));
+		setBaseMoveSpeed(MoveType.SLOW_FLY, set.getDouble("baseFlyWalkSpd", getBaseMoveSpeed(MoveType.WALK)));
+	}
+	
+	/**
+	 * @return the baseHpMax
+	 */
+	public float getBaseHpMax() {
+		return _baseHpMax;
+	}
+	
+	/**
+	 * @return the _baseFire
+	 */
+	public int getBaseFire() {
+		return _baseFire;
+	}
+	
+	/**
+	 * @return the _baseWind
+	 */
+	public int getBaseWind() {
+		return _baseWind;
+	}
+	
+	/**
+	 * @return the _baseWater
+	 */
+	public int getBaseWater() {
+		return _baseWater;
+	}
+	
+	/**
+	 * @return the _baseEarth
+	 */
+	public int getBaseEarth() {
+		return _baseEarth;
+	}
+	
+	/**
+	 * @return the _baseHoly
+	 */
+	public int getBaseHoly() {
+		return _baseHoly;
+	}
+	
+	/**
+	 * @return the _baseDark
+	 */
+	public int getBaseDark() {
+		return _baseDark;
+	}
+	
+	/**
+	 * @return the _baseFireRes
+	 */
+	public double getBaseFireRes() {
+		return _baseFireRes;
+	}
+	
+	/**
+	 * @return the _baseWindRes
+	 */
+	public double getBaseWindRes() {
+		return _baseWindRes;
+	}
+	
+	/**
+	 * @return the _baseWaterRes
+	 */
+	public double getBaseWaterRes() {
+		return _baseWaterRes;
+	}
+	
+	/**
+	 * @return the _baseEarthRes
+	 */
+	public double getBaseEarthRes() {
+		return _baseEarthRes;
+	}
+	
+	/**
+	 * @return the _baseHolyRes
+	 */
+	public double getBaseHolyRes() {
+		return _baseHolyRes;
+	}
+	
+	/**
+	 * @return the _baseDarkRes
+	 */
+	public double getBaseDarkRes() {
+		return _baseDarkRes;
+	}
+	
+	/**
+	 * @return the _baseElementRes
+	 */
+	public double getBaseElementRes() {
+		return _baseElementRes;
+	}
+	
+	/**
+	 * @return the baseSTR
+	 */
+	public int getBaseSTR() {
+		return _baseSTR;
+	}
+	
+	/**
+	 * @return the baseCON
+	 */
+	public int getBaseCON() {
+		return _baseCON;
+	}
+	
+	/**
+	 * @return the baseDEX
+	 */
+	public int getBaseDEX() {
+		return _baseDEX;
+	}
+	
+	/**
+	 * @return the baseINT
+	 */
+	public int getBaseINT() {
+		return _baseINT;
+	}
+	
+	/**
+	 * @return the baseWIT
+	 */
+	public int getBaseWIT() {
+		return _baseWIT;
+	}
+	
+	/**
+	 * @return the baseMEN
+	 */
+	public int getBaseMEN() {
+		return _baseMEN;
+	}
+	
+	/**
+	 * @return the baseCpMax
+	 */
+	public float getBaseCpMax() {
+		return _baseCpMax;
+	}
+	
+	/**
+	 * @return the baseMpMax
+	 */
+	public float getBaseMpMax() {
+		return _baseMpMax;
+	}
+	
+	/**
+	 * @return the baseHpReg
+	 */
+	public float getBaseHpReg() {
+		return _baseHpReg;
+	}
+	
+	/**
+	 * @return the baseMpReg
+	 */
+	public float getBaseMpReg() {
+		return _baseMpReg;
+	}
+	
+	/**
+	 * @return the basePAtk
+	 */
+	public int getBasePAtk() {
+		return _basePAtk;
+	}
+	
+	/**
+	 * @return the baseMAtk
+	 */
+	public int getBaseMAtk() {
+		return _baseMAtk;
+	}
+	
+	/**
+	 * @return the basePDef
+	 */
+	public int getBasePDef() {
+		return _basePDef;
+	}
+	
+	/**
+	 * @return the baseMDef
+	 */
+	public int getBaseMDef() {
+		return _baseMDef;
+	}
+	
+	/**
+	 * @return the basePAtkSpd
+	 */
+	public int getBasePAtkSpd() {
+		return _basePAtkSpd;
+	}
+	
+	/**
+	 * @return the baseMAtkSpd
+	 */
+	public int getBaseMAtkSpd() {
+		return _baseMAtkSpd;
+	}
+	
+	/**
+	 * @return the random damage
+	 */
+	public int getRandomDamage() {
+		return _randomDamage;
+	}
+	
+	/**
+	 * @return the baseShldDef
+	 */
+	public int getBaseShldDef() {
+		return _baseShldDef;
+	}
+	
+	/**
+	 * @return the baseShldRate
+	 */
+	public int getBaseShldRate() {
+		return _baseShldRate;
+	}
+	
+	/**
+	 * @return the baseCritRate
+	 */
+	public int getBaseCritRate() {
+		return _baseCritRate;
+	}
+	
+	/**
+	 * @return the baseMCritRate
+	 */
+	public int getBaseMCritRate() {
+		return _baseMCritRate;
+	}
+	
+	/**
+	 * @return the baseReuseDelay
+	 */
+	public int getBaseReuseDelay() {
+		return _baseReuseDelay;
+	}
+	
+	public void setBaseMoveSpeed(MoveType type, double val) {
+		_moveType[type.ordinal()] = val;
+	}
+	
+	public double getBaseMoveSpeed(MoveType mt) {
+		return _moveType[mt.ordinal()];
+	}
+	
+	/**
+	 * @return the baseBreath
+	 */
+	public int getBaseBreath() {
+		return _baseBreath;
+	}
+	
+	/**
+	 * @return the collisionRadius
+	 */
+	public int getCollisionRadius() {
+		return _collisionRadius;
+	}
+	
+	/**
+	 * @return the collisionHeight
+	 */
+	public int getCollisionHeight() {
+		return _collisionHeight;
+	}
+	
+	/**
+	 * @return the fCollisionRadius
+	 */
+	public double getfCollisionRadius() {
+		return _fCollisionRadius;
+	}
+	
+	/**
+	 * @return the fCollisionHeight
+	 */
+	public double getfCollisionHeight() {
+		return _fCollisionHeight;
+	}
+	
+	/**
+	 * @param baseFire the baseFire to set
+	 */
+	public void setBaseFire(int baseFire) {
+		_baseFire = baseFire;
+	}
+	
+	/**
+	 * @param baseWater the baseWater to set
+	 */
+	public void setBaseWater(int baseWater) {
+		_baseWater = baseWater;
+	}
+	
+	/**
+	 * @param baseEarth the baseEarth to set
+	 */
+	public void setBaseEarth(int baseEarth) {
+		_baseEarth = baseEarth;
+	}
+	
+	/**
+	 * @param baseWind the baseWind to set
+	 */
+	public void setBaseWind(int baseWind) {
+		_baseWind = baseWind;
+	}
+	
+	/**
+	 * @param baseHoly the baseHoly to set
+	 */
+	public void setBaseHoly(int baseHoly) {
+		_baseHoly = baseHoly;
+	}
+	
+	/**
+	 * @param baseDark the baseDark to set
+	 */
+	public void setBaseDark(int baseDark) {
+		_baseDark = baseDark;
+	}
+	
+	/**
+	 * @param baseFireRes the baseFireRes to set
+	 */
+	public void setBaseFireRes(double baseFireRes) {
+		_baseFireRes = baseFireRes;
+	}
+	
+	/**
+	 * @param baseWaterRes the baseWaterRes to set
+	 */
+	public void setBaseWaterRes(double baseWaterRes) {
+		_baseWaterRes = baseWaterRes;
+	}
+	
+	/**
+	 * @param baseEarthRes the baseEarthRes to set
+	 */
+	public void setBaseEarthRes(double baseEarthRes) {
+		_baseEarthRes = baseEarthRes;
+	}
+	
+	/**
+	 * @param baseWindRes the baseWindRes to set
+	 */
+	public void setBaseWindRes(double baseWindRes) {
+		_baseWindRes = baseWindRes;
+	}
+	
+	/**
+	 * @param baseHolyRes the baseHolyRes to set
+	 */
+	public void setBaseHolyRes(double baseHolyRes) {
+		_baseHolyRes = baseHolyRes;
+	}
+	
+	/**
+	 * @param baseDarkRes the baseDarkRes to set
+	 */
+	public void setBaseDarkRes(double baseDarkRes) {
+		_baseDarkRes = baseDarkRes;
+	}
+	
+	/**
+	 * @param baseElementRes
+	 */
+	public void setBaseElementRes(double baseElementRes) {
+		_baseElementRes = baseElementRes;
+	}
+	
+	/**
+	 * @return the base attack type (Sword, Fist, Blunt, etc..)
+	 */
+	public WeaponType getBaseAttackType() {
+		return _baseAttackType;
+	}
+	
+	/**
+	 * Sets base attack type.
+	 * @param type
+	 */
+	public void setBaseAttackType(WeaponType type) {
+		_baseAttackType = type;
+	}
+	
+	/**
+	 * @return the baseAtkRange
+	 */
+	public int getBaseAttackRange() {
+		return _baseAttackRange;
+	}
+	
+	/**
+	 * Sets base attack range.
+	 * @param val
+	 */
+	public void setBaseAttackRange(int val) {
+		_baseAttackRange = val;
+	}
+	
+	/**
+	 * Overridden in L2NpcTemplate
+	 * @return the characters skills
+	 */
+	public Map<Integer, Skill> getSkills() {
+		return Collections.emptyMap();
+	}
+	
+	public Race getRace() {
+		return _race;
+	}
+	
+	public void setRace(Race race) {
+		_race = race;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java
new file mode 100644
index 00000000..99cbc69a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2DoorTemplate.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.templates;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
+/**
+ * Doors template.
+ * @author JIV
+ */
+public class L2DoorTemplate extends L2CharTemplate implements IIdentifiable {
+	private final int _doorId;
+	private final int[] _nodeX;
+	private final int[] _nodeY;
+	private final int _nodeZ;
+	private final int _height;
+	private final int _posX;
+	private final int _posY;
+	private final int _posZ;
+	private final int _emmiter;
+	private final int _childDoorId;
+	private final String _name;
+	private final String _groupName;
+	private final boolean _showHp;
+	private final boolean _isWall;
+	// -1 close, 0 nothing, 1 open
+	private final byte _masterDoorClose;
+	private final byte _masterDoorOpen;
+	
+	private final boolean _isTargetable;
+	private final boolean _default_status;
+	
+	private int _openTime;
+	private int _randomTime;
+	private final int _closeTime;
+	private final int _level;
+	private final int _openType;
+	private final boolean _checkCollision;
+	private final boolean _isAttackableDoor;
+	private final int _clanhallId;
+	private final boolean _stealth;
+	
+	public L2DoorTemplate(StatsSet set) {
+		super(set);
+		_doorId = set.getInt("id");
+		_name = set.getString("name");
+		
+		// position
+		String[] pos = set.getString("pos").split(";");
+		_posX = Integer.parseInt(pos[0]);
+		_posY = Integer.parseInt(pos[1]);
+		_posZ = Integer.parseInt(pos[2]);
+		_height = set.getInt("height");
+		_nodeZ = set.getInt("nodeZ");
+		_nodeX = new int[4]; // 4 * x
+		_nodeY = new int[4]; // 4 * y
+		for (int i = 0; i < 4; i++) {
+			String[] split = set.getString("node" + (i + 1)).split(",");
+			_nodeX[i] = Integer.parseInt(split[0]);
+			_nodeY[i] = Integer.parseInt(split[1]);
+		}
+		
+		// optional
+		_emmiter = set.getInt("emitter_id", 0);
+		_showHp = set.getBoolean("hp_showable", true);
+		_isWall = set.getBoolean("is_wall", false);
+		_groupName = set.getString("group", null);
+		
+		_childDoorId = set.getInt("child_id_event", -1);
+		// true if door is opening
+		String masterevent = set.getString("master_close_event", "act_nothing");
+		_masterDoorClose = (byte) (masterevent.equals("act_open") ? 1 : masterevent.equals("act_close") ? -1 : 0);
+		
+		masterevent = set.getString("master_open_event", "act_nothing");
+		_masterDoorOpen = (byte) (masterevent.equals("act_open") ? 1 : masterevent.equals("act_close") ? -1 : 0);
+		
+		_isTargetable = set.getBoolean("targetable", true);
+		_default_status = set.getString("default_status", "close").equals("open");
+		_closeTime = set.getInt("close_time", -1);
+		_level = set.getInt("level", 0);
+		_openType = set.getInt("open_method", 0);
+		_checkCollision = set.getBoolean("check_collision", true);
+		if ((_openType & L2DoorInstance.OPEN_BY_TIME) == L2DoorInstance.OPEN_BY_TIME) {
+			_openTime = set.getInt("open_time");
+			_randomTime = set.getInt("random_time", -1);
+		}
+		_isAttackableDoor = set.getBoolean("is_attackable", false);
+		_clanhallId = set.getInt("clanhall_id", 0);
+		_stealth = set.getBoolean("stealth", false);
+	}
+	
+	/**
+	 * Gets the door ID.
+	 * @return the door ID
+	 */
+	@Override
+	public int getId() {
+		return _doorId;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int[] getNodeX() {
+		return _nodeX;
+	}
+	
+	public int[] getNodeY() {
+		return _nodeY;
+	}
+	
+	public int getNodeZ() {
+		return _nodeZ;
+	}
+	
+	public int getHeight() {
+		return _height;
+	}
+	
+	public int getX() {
+		return _posX;
+	}
+	
+	public int getY() {
+		return _posY;
+	}
+	
+	public int getZ() {
+		return _posZ;
+	}
+	
+	public int getEmmiter() {
+		return _emmiter;
+	}
+	
+	public int getChildDoorId() {
+		return _childDoorId;
+	}
+	
+	public String getGroupName() {
+		return _groupName;
+	}
+	
+	public boolean isShowHp() {
+		return _showHp;
+	}
+	
+	public boolean isWall() {
+		return _isWall;
+	}
+	
+	public byte getMasterDoorOpen() {
+		return _masterDoorOpen;
+	}
+	
+	public byte getMasterDoorClose() {
+		return _masterDoorClose;
+	}
+	
+	public boolean isTargetable() {
+		return _isTargetable;
+	}
+	
+	public boolean isOpenByDefault() {
+		return _default_status;
+	}
+	
+	public int getOpenTime() {
+		return _openTime;
+	}
+	
+	public int getRandomTime() {
+		return _randomTime;
+	}
+	
+	public int getCloseTime() {
+		return _closeTime;
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public int getOpenType() {
+		return _openType;
+	}
+	
+	public boolean isCheckCollision() {
+		return _checkCollision;
+	}
+	
+	public boolean isAttackable() {
+		return _isAttackableDoor;
+	}
+	
+	public int getClanHallId() {
+		return _clanhallId;
+	}
+	
+	public boolean isStealth() {
+		return _stealth;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java
new file mode 100644
index 00000000..5399cdf5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.templates;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.enums.AISkillScope;
+import com.l2jserver.gameserver.enums.AIType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.Sex;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.DropListScope;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * NPC template.
+ * @author NosBit
+ */
+public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable {
+	private int _id;
+	private int _displayId;
+	private byte _level;
+	private String _type;
+	private String _name;
+	private boolean _usingServerSideName;
+	private String _title;
+	private boolean _usingServerSideTitle;
+	private StatsSet _parameters;
+	private Sex _sex;
+	private int _chestId;
+	private int _rhandId;
+	private int _lhandId;
+	private int _weaponEnchant;
+	private double _expRate;
+	private double _sp;
+	private double _raidPoints;
+	private boolean _unique;
+	private boolean _attackable;
+	private boolean _targetable;
+	private boolean _undying;
+	private boolean _showName;
+	private boolean _flying;
+	private boolean _canMove;
+	private boolean _noSleepMode;
+	private boolean _passableDoor;
+	private boolean _hasSummoner;
+	private boolean _canBeSown;
+	private int _corpseTime;
+	private AIType _aiType;
+	private int _aggroRange;
+	private int _clanHelpRange;
+	private boolean _isChaos;
+	private boolean _isAggressive;
+	private int _soulShot;
+	private int _spiritShot;
+	private int _soulShotChance;
+	private int _spiritShotChance;
+	private int _minSkillChance;
+	private int _maxSkillChance;
+	private Map<Integer, Skill> _skills;
+	private Map<AISkillScope, List<Skill>> _aiSkillLists;
+	private Set<Integer> _clans;
+	private Set<Integer> _ignoreClanNpcIds;
+	private Map<DropListScope, List<IDropItem>> _dropLists;
+	private double _collisionRadiusGrown;
+	private double _collisionHeightGrown;
+	
+	/**
+	 * Constructor of L2Character.
+	 * @param set The StatsSet object to transfer data to the method
+	 */
+	public L2NpcTemplate(StatsSet set) {
+		super(set);
+	}
+	
+	@Override
+	public void set(StatsSet set) {
+		super.set(set);
+		_id = set.getInt("id");
+		_displayId = set.getInt("displayId", _id);
+		_level = set.getByte("level", (byte) 70);
+		_type = set.getString("type", "L2Npc");
+		_name = set.getString("name", "");
+		_usingServerSideName = set.getBoolean("usingServerSideName", false);
+		_title = set.getString("title", "");
+		_usingServerSideTitle = set.getBoolean("usingServerSideTitle", false);
+		setRace(set.getEnum("race", Race.class, Race.NONE));
+		_sex = set.getEnum("sex", Sex.class, Sex.ETC);
+		
+		_chestId = set.getInt("chestId", 0);
+		_rhandId = set.getInt("rhandId", 0);
+		_lhandId = set.getInt("lhandId", 0);
+		_weaponEnchant = set.getInt("weaponEnchant", 0);
+		
+		_expRate = set.getDouble("expRate", 0);
+		_sp = set.getDouble("sp", 0);
+		_raidPoints = set.getDouble("raidPoints", 0);
+		
+		_unique = set.getBoolean("unique", false);
+		_attackable = set.getBoolean("attackable", true);
+		_targetable = set.getBoolean("targetable", true);
+		_undying = set.getBoolean("undying", true);
+		_showName = set.getBoolean("showName", true);
+		_flying = set.getBoolean("flying", false);
+		_canMove = set.getBoolean("canMove", true);
+		_noSleepMode = set.getBoolean("noSleepMode", false);
+		_passableDoor = set.getBoolean("passableDoor", false);
+		_hasSummoner = set.getBoolean("hasSummoner", false);
+		_canBeSown = set.getBoolean("canBeSown", false);
+		
+		_corpseTime = set.getInt("corpseTime", npc().getDefaultCorpseTime());
+		
+		_aiType = set.getEnum("aiType", AIType.class, AIType.FIGHTER);
+		_aggroRange = set.getInt("aggroRange", 0);
+		_clanHelpRange = set.getInt("clanHelpRange", 0);
+		_isChaos = set.getBoolean("isChaos", false);
+		_isAggressive = set.getBoolean("isAggressive", true);
+		
+		_soulShot = set.getInt("soulShot", 0);
+		_spiritShot = set.getInt("spiritShot", 0);
+		_soulShotChance = set.getInt("shotShotChance", 0);
+		_spiritShotChance = set.getInt("spiritShotChance", 0);
+		
+		_minSkillChance = set.getInt("minSkillChance", 7);
+		_maxSkillChance = set.getInt("maxSkillChance", 15);
+		
+		_collisionRadiusGrown = set.getDouble("collisionRadiusGrown", 0);
+		_collisionHeightGrown = set.getDouble("collisionHeightGrown", 0);
+	}
+	
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	public int getDisplayId() {
+		return _displayId;
+	}
+	
+	public byte getLevel() {
+		return _level;
+	}
+	
+	public String getType() {
+		return _type;
+	}
+	
+	public boolean isType(String type) {
+		return getType().equalsIgnoreCase(type);
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public boolean isUsingServerSideName() {
+		return _usingServerSideName;
+	}
+	
+	public String getTitle() {
+		return _title;
+	}
+	
+	public boolean isUsingServerSideTitle() {
+		return _usingServerSideTitle;
+	}
+	
+	public StatsSet getParameters() {
+		return _parameters;
+	}
+	
+	public void setParameters(StatsSet set) {
+		_parameters = set;
+	}
+	
+	public Sex getSex() {
+		return _sex;
+	}
+	
+	public int getChestId() {
+		return _chestId;
+	}
+	
+	public int getRHandId() {
+		return _rhandId;
+	}
+	
+	public int getLHandId() {
+		return _lhandId;
+	}
+	
+	public int getWeaponEnchant() {
+		return _weaponEnchant;
+	}
+	
+	public double getExpRate() {
+		return _expRate;
+	}
+	
+	public double getSP() {
+		return _sp;
+	}
+	
+	public double getRaidPoints() {
+		return _raidPoints;
+	}
+	
+	public boolean isUnique() {
+		return _unique;
+	}
+	
+	public boolean isAttackable() {
+		return _attackable;
+	}
+	
+	public boolean isTargetable() {
+		return _targetable;
+	}
+	
+	public boolean isUndying() {
+		return _undying;
+	}
+	
+	public boolean isShowName() {
+		return _showName;
+	}
+	
+	public boolean isFlying() {
+		return _flying;
+	}
+	
+	public boolean canMove() {
+		return _canMove;
+	}
+	
+	public boolean isNoSleepMode() {
+		return _noSleepMode;
+	}
+	
+	public boolean isPassableDoor() {
+		return _passableDoor;
+	}
+	
+	public boolean hasSummoner() {
+		return _hasSummoner;
+	}
+	
+	public boolean canBeSown() {
+		return _canBeSown;
+	}
+	
+	public int getCorpseTime() {
+		return _corpseTime;
+	}
+	
+	public AIType getAIType() {
+		return _aiType;
+	}
+	
+	public int getAggroRange() {
+		return _aggroRange;
+	}
+	
+	public int getClanHelpRange() {
+		return _clanHelpRange;
+	}
+	
+	public boolean isChaos() {
+		return _isChaos;
+	}
+	
+	public boolean isAggressive() {
+		return _isAggressive;
+	}
+	
+	public int getSoulShot() {
+		return _soulShot;
+	}
+	
+	public int getSpiritShot() {
+		return _spiritShot;
+	}
+	
+	public int getSoulShotChance() {
+		return _soulShotChance;
+	}
+	
+	public int getSpiritShotChance() {
+		return _spiritShotChance;
+	}
+	
+	public int getMinSkillChance() {
+		return _minSkillChance;
+	}
+	
+	public int getMaxSkillChance() {
+		return _maxSkillChance;
+	}
+	
+	@Override
+	public Map<Integer, Skill> getSkills() {
+		return _skills;
+	}
+	
+	public void setSkills(Map<Integer, Skill> skills) {
+		_skills = skills != null ? Collections.unmodifiableMap(skills) : Collections.emptyMap();
+	}
+	
+	public List<Skill> getAISkills(AISkillScope aiSkillScope) {
+		return _aiSkillLists.getOrDefault(aiSkillScope, Collections.emptyList());
+	}
+	
+	public void setAISkillLists(Map<AISkillScope, List<Skill>> aiSkillLists) {
+		_aiSkillLists = aiSkillLists != null ? Collections.unmodifiableMap(aiSkillLists) : Collections.emptyMap();
+	}
+	
+	public Set<Integer> getClans() {
+		return _clans;
+	}
+	
+	/**
+	 * @param clans A sorted array of clan ids
+	 */
+	public void setClans(Set<Integer> clans) {
+		_clans = clans != null ? Collections.unmodifiableSet(clans) : null;
+	}
+	
+	/**
+	 * @param clanName clan name to check if it belongs to this NPC template clans.
+	 * @param clanNames clan names to check if they belong to this NPC template clans.
+	 * @return {@code true} if at least one of the clan names belong to this NPC template clans, {@code false} otherwise.
+	 */
+	public boolean isClan(String clanName, String... clanNames) {
+		// Using local variable for the sake of reloading since it can be turned to null.
+		final var clans = _clans;
+		
+		if (clans == null) {
+			return false;
+		}
+		
+		int clanId = NpcData.getInstance().getClanId("ALL");
+		if (clans.contains(clanId)) {
+			return true;
+		}
+		
+		clanId = NpcData.getInstance().getClanId(clanName);
+		if (clans.contains(clanId)) {
+			return true;
+		}
+		
+		for (String name : clanNames) {
+			clanId = NpcData.getInstance().getClanId(name);
+			if (clans.contains(clanId)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @param clans A set of clan names to check if they belong to this NPC template clans.
+	 * @return {@code true} if at least one of the clan names belong to this NPC template clans, {@code false} otherwise.
+	 */
+	public boolean isClan(Set<Integer> clans) {
+		// Using local variable for the sake of reloading since it can be turned to null.
+		final Set<Integer> clanSet = _clans;
+		
+		if ((clanSet == null) || (clans == null)) {
+			return false;
+		}
+		
+		int clanId = NpcData.getInstance().getClanId("ALL");
+		if (clanSet.contains(clanId)) {
+			return true;
+		}
+		
+		for (Integer id : clans) {
+			if (clanSet.contains(id)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public Set<Integer> getIgnoreClanNpcIds() {
+		return _ignoreClanNpcIds;
+	}
+	
+	/**
+	 * @param ignoreClanNpcIds the ignore clan npc ids
+	 */
+	public void setIgnoreClanNpcIds(Set<Integer> ignoreClanNpcIds) {
+		_ignoreClanNpcIds = ignoreClanNpcIds != null ? Collections.unmodifiableSet(ignoreClanNpcIds) : null;
+	}
+	
+	public Map<DropListScope, List<IDropItem>> getDropLists() {
+		return _dropLists;
+	}
+	
+	public void setDropLists(Map<DropListScope, List<IDropItem>> dropLists) {
+		_dropLists = dropLists != null ? Collections.unmodifiableMap(dropLists) : null;
+	}
+	
+	public List<IDropItem> getDropList(DropListScope dropListScope) {
+		final var dropLists = _dropLists;
+		return dropLists != null ? dropLists.get(dropListScope) : null;
+	}
+	
+	public Collection<ItemHolder> calculateDrops(DropListScope dropListScope, L2Character victim, L2Character killer) {
+		final var dropList = getDropList(dropListScope);
+		if (dropList == null) {
+			return null;
+		}
+		
+		Collection<ItemHolder> calculatedDrops = null;
+		for (var dropItem : dropList) {
+			final var drops = dropItem.calculateDrops(victim, killer);
+			if ((drops == null) || drops.isEmpty()) {
+				continue;
+			}
+			
+			if (calculatedDrops == null) {
+				calculatedDrops = new LinkedList<>();
+			}
+			
+			calculatedDrops.addAll(drops);
+		}
+		
+		return calculatedDrops;
+	}
+	
+	public double getCollisionRadiusGrown() {
+		return _collisionRadiusGrown;
+	}
+	
+	public double getCollisionHeightGrown() {
+		return _collisionHeightGrown;
+	}
+	
+	@Override
+	public String toString() {
+		return getName() + " [" + getId() + "]";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2PcTemplate.java b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2PcTemplate.java
new file mode 100644
index 00000000..bcf93671
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/templates/L2PcTemplate.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.templates;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+
+/**
+ * @author mkizub
+ * @author Zoey76
+ */
+public class L2PcTemplate extends L2CharTemplate {
+	private final ClassId _classId;
+	
+	private final float[] _baseHp;
+	private final float[] _baseMp;
+	private final float[] _baseCp;
+	
+	private final double[] _baseHpReg;
+	private final double[] _baseMpReg;
+	private final double[] _baseCpReg;
+	
+	private final double _fCollisionHeightFemale;
+	private final double _fCollisionRadiusFemale;
+	
+	private final int _baseSafeFallHeight;
+	
+	private final Map<Integer, Integer> _baseSlotDef;
+	
+	public L2PcTemplate(StatsSet set) {
+		super(set);
+		_classId = ClassId.getClassId(set.getInt("classId"));
+		setRace(_classId.getRace());
+		_baseHp = new float[character().getMaxPlayerLevel() + 1];
+		_baseMp = new float[character().getMaxPlayerLevel() + 1];
+		_baseCp = new float[character().getMaxPlayerLevel() + 1];
+		_baseHpReg = new double[character().getMaxPlayerLevel() + 1];
+		_baseMpReg = new double[character().getMaxPlayerLevel() + 1];
+		_baseCpReg = new double[character().getMaxPlayerLevel() + 1];
+		
+		_baseSlotDef = new HashMap<>(12);
+		_baseSlotDef.put(Inventory.PAPERDOLL_CHEST, set.getInt("basePDefchest", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_LEGS, set.getInt("basePDeflegs", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_HEAD, set.getInt("basePDefhead", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_FEET, set.getInt("basePDeffeet", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_GLOVES, set.getInt("basePDefgloves", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_UNDER, set.getInt("basePDefunderwear", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_CLOAK, set.getInt("basePDefcloak", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_REAR, set.getInt("baseMDefrear", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_LEAR, set.getInt("baseMDeflear", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_RFINGER, set.getInt("baseMDefrfinger", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_LFINGER, set.getInt("baseMDefrfinger", 0));
+		_baseSlotDef.put(Inventory.PAPERDOLL_NECK, set.getInt("baseMDefneck", 0));
+		
+		_fCollisionRadiusFemale = set.getDouble("collisionFemaleradius");
+		_fCollisionHeightFemale = set.getDouble("collisionFemaleheight");
+		
+		_baseSafeFallHeight = set.getInt("baseSafeFall", 333);
+	}
+	
+	/**
+	 * @return the template class Id.
+	 */
+	public ClassId getClassId() {
+		return _classId;
+	}
+	
+	/**
+	 * Sets the value of level upgain parameter.
+	 * @param paramName name of parameter
+	 * @param level corresponding character level
+	 * @param val value of parameter
+	 */
+	public void setUpgainValue(String paramName, int level, double val) {
+		switch (paramName) {
+			case "hp" -> _baseHp[level] = (float) val;
+			case "mp" -> _baseMp[level] = (float) val;
+			case "cp" -> _baseCp[level] = (float) val;
+			case "hpRegen" -> _baseHpReg[level] = val;
+			case "mpRegen" -> _baseMpReg[level] = val;
+			case "cpRegen" -> _baseCpReg[level] = val;
+		}
+	}
+	
+	/**
+	 * @param level character level to return value
+	 * @return the baseHpMax for given character level
+	 */
+	public float getBaseHpMax(int level) {
+		return _baseHp[level];
+	}
+	
+	/**
+	 * @param level character level to return value
+	 * @return the baseMpMax for given character level
+	 */
+	public float getBaseMpMax(int level) {
+		return _baseMp[level];
+	}
+	
+	/**
+	 * @param level character level to return value
+	 * @return the baseCpMax for given character level
+	 */
+	public float getBaseCpMax(int level) {
+		return _baseCp[level];
+	}
+	
+	/**
+	 * @param level character level to return value
+	 * @return the base HP Regeneration for given character level
+	 */
+	public double getBaseHpRegen(int level) {
+		return _baseHpReg[level];
+	}
+	
+	/**
+	 * @param level character level to return value
+	 * @return the base MP Regeneration for given character level
+	 */
+	public double getBaseMpRegen(int level) {
+		return _baseMpReg[level];
+	}
+	
+	/**
+	 * @param level character level to return value
+	 * @return the base HP Regeneration for given character level
+	 */
+	public double getBaseCpRegen(int level) {
+		return _baseCpReg[level];
+	}
+	
+	/**
+	 * @param slotId id of inventory slot to return value
+	 * @return defence value of character for EMPTY given slot
+	 */
+	public int getBaseDefBySlot(int slotId) {
+		return _baseSlotDef.getOrDefault(slotId, 0);
+	}
+	
+	/**
+	 * @return the template collision height for female characters.
+	 */
+	public double getFCollisionHeightFemale() {
+		return _fCollisionHeightFemale;
+	}
+	
+	/**
+	 * @return the template collision radius for female characters.
+	 */
+	public double getFCollisionRadiusFemale() {
+		return _fCollisionRadiusFemale;
+	}
+	
+	/**
+	 * @return the safe fall height.
+	 */
+	public int getSafeFallHeight() {
+		return _baseSafeFallHeight;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/transform/Transform.java b/src/main/java/com/l2jserver/gameserver/model/actor/transform/Transform.java
new file mode 100644
index 00000000..519d2b74
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/transform/Transform.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.transform;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.AdditionalItemHolder;
+import com.l2jserver.gameserver.model.holders.AdditionalSkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+
+/**
+ * @author UnAfraid
+ */
+public final class Transform implements IIdentifiable {
+	private final int _id;
+	private final int _displayId;
+	private final TransformType _type;
+	private final boolean _canSwim;
+	private final int _spawnHeight;
+	private final boolean _canAttack;
+	private final String _name;
+	private final String _title;
+	
+	private TransformTemplate _maleTemplate;
+	private TransformTemplate _femaleTemplate;
+	
+	public Transform(StatsSet set) {
+		_id = set.getInt("id");
+		_displayId = set.getInt("displayId", _id);
+		_type = set.getEnum("type", TransformType.class, TransformType.COMBAT);
+		_canSwim = set.getInt("can_swim", 0) == 1;
+		_canAttack = set.getInt("normal_attackable", 1) == 1;
+		_spawnHeight = set.getInt("spawn_height", 0);
+		_name = set.getString("setName", null);
+		_title = set.getString("setTitle", null);
+	}
+	
+	/**
+	 * Gets the transformation ID.
+	 * @return the transformation ID
+	 */
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	public int getDisplayId() {
+		return _displayId;
+	}
+	
+	public TransformType getType() {
+		return _type;
+	}
+	
+	public boolean canSwim() {
+		return _canSwim;
+	}
+	
+	public boolean canAttack() {
+		return _canAttack;
+	}
+	
+	public int getSpawnHeight() {
+		return _spawnHeight;
+	}
+	
+	/**
+	 * @return name that's going to be set to the player while is transformed with current transformation
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * @return title that's going to be set to the player while is transformed with current transformation
+	 */
+	public String getTitle() {
+		return _title;
+	}
+	
+	public TransformTemplate getTemplate(L2PcInstance player) {
+		return player != null ? (player.getAppearance().getSex() ? _femaleTemplate : _maleTemplate) : null;
+	}
+	
+	public void setTemplate(boolean male, TransformTemplate template) {
+		if (male) {
+			_maleTemplate = template;
+		} else {
+			_femaleTemplate = template;
+		}
+	}
+	
+	/**
+	 * @return {@code true} if transform type is mode change, {@code false} otherwise
+	 */
+	public boolean isStance() {
+		return _type == TransformType.MODE_CHANGE;
+	}
+	
+	/**
+	 * @return {@code true} if transform type is combat, {@code false} otherwise
+	 */
+	public boolean isCombat() {
+		return _type == TransformType.COMBAT;
+	}
+	
+	/**
+	 * @return {@code true} if transform type is non combat, {@code false} otherwise
+	 */
+	public boolean isNonCombat() {
+		return _type == TransformType.NON_COMBAT;
+	}
+	
+	/**
+	 * @return {@code true} if transform type is flying, {@code false} otherwise
+	 */
+	public boolean isFlying() {
+		return _type == TransformType.FLYING;
+	}
+	
+	/**
+	 * @return {@code true} if transform type is cursed, {@code false} otherwise
+	 */
+	public boolean isCursed() {
+		return _type == TransformType.CURSED;
+	}
+	
+	/**
+	 * @return {@code true} if transform type is raiding, {@code false} otherwise
+	 */
+	public boolean isRiding() {
+		return _type == TransformType.RIDING_MODE;
+	}
+	
+	/**
+	 * @return {@code true} if transform type is pure stat, {@code false} otherwise
+	 */
+	public boolean isPureStats() {
+		return _type == TransformType.PURE_STAT;
+	}
+	
+	public double getCollisionHeight(L2PcInstance player) {
+		final TransformTemplate template = getTemplate(player);
+		return template != null ? template.getCollisionHeight() : player.getCollisionHeight();
+	}
+	
+	public double getCollisionRadius(L2PcInstance player) {
+		final TransformTemplate template = getTemplate(player);
+		return template != null ? template.getCollisionRadius() : player.getCollisionRadius();
+	}
+	
+	public int getBaseAttackRange(L2PcInstance player) {
+		final TransformTemplate template = getTemplate(player);
+		return template != null ? template.getBaseAttackRange() : player.getTemplate().getBaseAttackRange();
+	}
+	
+	public void onTransform(L2PcInstance player) {
+		final TransformTemplate template = getTemplate(player);
+		if (template != null) {
+			// Start flying.
+			if (isFlying()) {
+				player.setIsFlying(true);
+			}
+			
+			if (getName() != null) {
+				player.getAppearance().setVisibleName(getName());
+			}
+			if (getTitle() != null) {
+				player.getAppearance().setVisibleTitle(getTitle());
+			}
+			
+			// Set inventory blocks if needed.
+			if (!template.getAdditionalItems().isEmpty()) {
+				final List<Integer> allowed = new ArrayList<>();
+				final List<Integer> notAllowed = new ArrayList<>();
+				for (AdditionalItemHolder holder : template.getAdditionalItems()) {
+					if (holder.isAllowedToUse()) {
+						allowed.add(holder.getId());
+					} else {
+						notAllowed.add(holder.getId());
+					}
+				}
+				
+				if (!allowed.isEmpty()) {
+					final int[] items = new int[allowed.size()];
+					for (int i = 0; i < items.length; i++) {
+						items[i] = allowed.get(i);
+					}
+					player.getInventory().setInventoryBlock(items, 1);
+				}
+				
+				if (!notAllowed.isEmpty()) {
+					final int[] items = new int[notAllowed.size()];
+					for (int i = 0; i < items.length; i++) {
+						items[i] = notAllowed.get(i);
+					}
+					player.getInventory().setInventoryBlock(items, 2);
+				}
+			}
+			
+			// Send basic action list.
+			if (template.hasBasicActionList()) {
+				player.sendPacket(template.getBasicActionList());
+			}
+		}
+	}
+	
+	public void onUntransform(L2PcInstance player) {
+		final TransformTemplate template = getTemplate(player);
+		if (template != null) {
+			// Stop flying.
+			if (isFlying()) {
+				player.setIsFlying(false);
+			}
+			
+			if (getName() != null) {
+				player.getAppearance().setVisibleName(null);
+			}
+			if (getTitle() != null) {
+				player.getAppearance().setVisibleTitle(null);
+			}
+			
+			// Remove common skills.
+			if (!template.getSkills().isEmpty()) {
+				for (SkillHolder holder : template.getSkills()) {
+					final Skill skill = holder.getSkill();
+					if (!SkillTreesData.getInstance().isSkillAllowed(player, skill)) {
+						player.removeSkill(skill, false, skill.isPassive());
+					}
+				}
+			}
+			
+			// Remove skills depending on level.
+			if (!template.getAdditionalSkills().isEmpty()) {
+				for (AdditionalSkillHolder holder : template.getAdditionalSkills()) {
+					final Skill skill = holder.getSkill();
+					if ((player.getLevel() >= holder.getMinLevel()) && !SkillTreesData.getInstance().isSkillAllowed(player, skill)) {
+						player.removeSkill(skill, false, skill.isPassive());
+					}
+				}
+			}
+			
+			// Remove transformation skills.
+			player.removeAllTransformSkills();
+			
+			// Remove inventory blocks if needed.
+			if (!template.getAdditionalItems().isEmpty()) {
+				player.getInventory().unblock();
+			}
+			
+			player.sendPacket(ExBasicActionList.STATIC_PACKET);
+		}
+	}
+	
+	public void onLevelUp(L2PcInstance player) {
+		final TransformTemplate template = getTemplate(player);
+		if (template != null) {
+			// Add skills depending on level.
+			if (!template.getAdditionalSkills().isEmpty()) {
+				for (AdditionalSkillHolder holder : template.getAdditionalSkills()) {
+					if (player.getLevel() >= holder.getMinLevel()) {
+						if (player.getSkillLevel(holder.getSkillId()) < holder.getSkillLvl()) {
+							player.addSkill(holder.getSkill(), false);
+							player.addTransformSkill(holder.getSkill());
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public double getStat(L2PcInstance player, Stats stats) {
+		double val = 0;
+		final TransformTemplate template = getTemplate(player);
+		if (template != null) {
+			val = template.getStats(stats);
+			final TransformLevelData data = template.getData(player.getLevel());
+			if (data != null) {
+				val = data.getStats(stats);
+			}
+		}
+		return val;
+	}
+	
+	/**
+	 * @param player
+	 * @param slot
+	 * @return
+	 */
+	public int getBaseDefBySlot(L2PcInstance player, int slot) {
+		final TransformTemplate template = getTemplate(player);
+		if (template != null) {
+			return template.getDefense(slot);
+		}
+		return player.getTemplate().getBaseDefBySlot(slot);
+	}
+	
+	/**
+	 * @param player
+	 * @return
+	 */
+	public double getLevelMod(L2PcInstance player) {
+		double val = -1;
+		final TransformTemplate template = getTemplate(player);
+		if (template != null) {
+			final TransformLevelData data = template.getData(player.getLevel());
+			if (data != null) {
+				val = data.getLevelMod();
+			}
+		}
+		return val;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformLevelData.java b/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformLevelData.java
new file mode 100644
index 00000000..1b793a3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformLevelData.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.transform;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * @author UnAfraid
+ */
+public final class TransformLevelData {
+	private final int _level;
+	private final double _levelMod;
+	private Map<Integer, Double> _stats;
+	
+	public TransformLevelData(StatsSet set) {
+		_level = set.getInt("val");
+		_levelMod = set.getDouble("levelMod");
+		addStats(Stats.MAX_HP, set.getDouble("hp"));
+		addStats(Stats.MAX_MP, set.getDouble("mp"));
+		addStats(Stats.MAX_CP, set.getDouble("cp"));
+		addStats(Stats.REGENERATE_HP_RATE, set.getDouble("hpRegen"));
+		addStats(Stats.REGENERATE_MP_RATE, set.getDouble("mpRegen"));
+		addStats(Stats.REGENERATE_CP_RATE, set.getDouble("cpRegen"));
+	}
+	
+	private void addStats(Stats stat, double val) {
+		if (_stats == null) {
+			_stats = new HashMap<>();
+		}
+		_stats.put(stat.ordinal(), val);
+	}
+	
+	public double getStats(Stats stats) {
+		if ((_stats == null) || !_stats.containsKey(stats.ordinal())) {
+			return 0;
+		}
+		return _stats.get(stats.ordinal());
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public double getLevelMod() {
+		return _levelMod;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformTemplate.java b/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformTemplate.java
new file mode 100644
index 00000000..4f06b250
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformTemplate.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.transform;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.holders.AdditionalItemHolder;
+import com.l2jserver.gameserver.model.holders.AdditionalSkillHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.stats.MoveType;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+
+/**
+ * @author UnAfraid
+ */
+public final class TransformTemplate {
+	private final double _collisionRadius;
+	private final double _collisionHeight;
+	private final WeaponType _baseAttackType;
+	private final int _baseAttackRange;
+	private final double _baseRandomDamage;
+	private List<SkillHolder> _skills;
+	private List<AdditionalSkillHolder> _additionalSkills;
+	private List<AdditionalItemHolder> _additionalItems;
+	private Map<Integer, Integer> _baseDefense;
+	private Map<Integer, Double> _baseStats;
+	private Map<Integer, Double> _baseSpeed;
+	
+	private ExBasicActionList _list;
+	private final Map<Integer, TransformLevelData> _data = new LinkedHashMap<>(100);
+	
+	public TransformTemplate(StatsSet set) {
+		_collisionRadius = set.getDouble("radius", 0);
+		_collisionHeight = set.getDouble("height", 0);
+		_baseAttackType = set.getEnum("attackType", WeaponType.class, WeaponType.FIST);
+		_baseAttackRange = set.getInt("range", 40);
+		_baseRandomDamage = set.getDouble("randomDamage", 0);
+		
+		addSpeed(MoveType.WALK, set.getDouble("walk", 0));
+		addSpeed(MoveType.RUN, set.getDouble("run", 0));
+		addSpeed(MoveType.SLOW_SWIM, set.getDouble("waterWalk", 0));
+		addSpeed(MoveType.FAST_SWIM, set.getDouble("waterRun", 0));
+		addSpeed(MoveType.SLOW_FLY, set.getDouble("flyWalk", 0));
+		addSpeed(MoveType.FAST_FLY, set.getDouble("flyRun", 0));
+		
+		addStats(Stats.POWER_ATTACK, set.getDouble("pAtk", 0));
+		addStats(Stats.MAGIC_ATTACK, set.getDouble("mAtk", 0));
+		addStats(Stats.POWER_ATTACK_RANGE, set.getInt("range", 0));
+		addStats(Stats.POWER_ATTACK_SPEED, set.getInt("attackSpeed", 0));
+		addStats(Stats.CRITICAL_RATE, set.getInt("critRate", 0));
+		addStats(Stats.STAT_STR, set.getInt("str", 0));
+		addStats(Stats.STAT_INT, set.getInt("int", 0));
+		addStats(Stats.STAT_CON, set.getInt("con", 0));
+		addStats(Stats.STAT_DEX, set.getInt("dex", 0));
+		addStats(Stats.STAT_WIT, set.getInt("wit", 0));
+		addStats(Stats.STAT_MEN, set.getInt("men", 0));
+		
+		addDefense(Inventory.PAPERDOLL_CHEST, set.getInt("chest", 0));
+		addDefense(Inventory.PAPERDOLL_LEGS, set.getInt("legs", 0));
+		addDefense(Inventory.PAPERDOLL_HEAD, set.getInt("head", 0));
+		addDefense(Inventory.PAPERDOLL_FEET, set.getInt("feet", 0));
+		addDefense(Inventory.PAPERDOLL_GLOVES, set.getInt("gloves", 0));
+		addDefense(Inventory.PAPERDOLL_UNDER, set.getInt("underwear", 0));
+		addDefense(Inventory.PAPERDOLL_CLOAK, set.getInt("cloak", 0));
+		addDefense(Inventory.PAPERDOLL_REAR, set.getInt("rear", 0));
+		addDefense(Inventory.PAPERDOLL_LEAR, set.getInt("lear", 0));
+		addDefense(Inventory.PAPERDOLL_RFINGER, set.getInt("rfinger", 0));
+		addDefense(Inventory.PAPERDOLL_LFINGER, set.getInt("lfinger", 0));
+		addDefense(Inventory.PAPERDOLL_NECK, set.getInt("neck", 0));
+	}
+	
+	private void addSpeed(MoveType type, double val) {
+		if (_baseSpeed == null) {
+			_baseSpeed = new HashMap<>();
+		}
+		_baseSpeed.put(type.ordinal(), val);
+	}
+	
+	public double getBaseMoveSpeed(MoveType type) {
+		if ((_baseSpeed == null) || !_baseSpeed.containsKey(type.ordinal())) {
+			return 0;
+		}
+		return _baseSpeed.get(type.ordinal());
+	}
+	
+	private void addDefense(int type, int val) {
+		if (_baseDefense == null) {
+			_baseDefense = new HashMap<>();
+		}
+		_baseDefense.put(type, val);
+	}
+	
+	public int getDefense(int type) {
+		if ((_baseDefense == null) || !_baseDefense.containsKey(type)) {
+			return 0;
+		}
+		return _baseDefense.get(type);
+	}
+	
+	private void addStats(Stats stats, double val) {
+		if (_baseStats == null) {
+			_baseStats = new HashMap<>();
+		}
+		_baseStats.put(stats.ordinal(), val);
+	}
+	
+	public double getStats(Stats stats) {
+		if ((_baseStats == null) || !_baseStats.containsKey(stats.ordinal())) {
+			return 0;
+		}
+		return _baseStats.get(stats.ordinal());
+	}
+	
+	public double getCollisionRadius() {
+		return _collisionRadius;
+	}
+	
+	public double getCollisionHeight() {
+		return _collisionHeight;
+	}
+	
+	public WeaponType getBaseAttackType() {
+		return _baseAttackType;
+	}
+	
+	public int getBaseAttackRange() {
+		return _baseAttackRange;
+	}
+	
+	public double getBaseRandomDamage() {
+		return _baseRandomDamage;
+	}
+	
+	public void addSkill(SkillHolder holder) {
+		if (_skills == null) {
+			_skills = new ArrayList<>();
+		}
+		_skills.add(holder);
+	}
+	
+	public List<SkillHolder> getSkills() {
+		return _skills != null ? _skills : Collections.emptyList();
+	}
+	
+	public void addAdditionalSkill(AdditionalSkillHolder holder) {
+		if (_additionalSkills == null) {
+			_additionalSkills = new ArrayList<>();
+		}
+		_additionalSkills.add(holder);
+	}
+	
+	public List<AdditionalSkillHolder> getAdditionalSkills() {
+		return _additionalSkills != null ? _additionalSkills : Collections.emptyList();
+	}
+	
+	public void addAdditionalItem(AdditionalItemHolder holder) {
+		if (_additionalItems == null) {
+			_additionalItems = new ArrayList<>();
+		}
+		_additionalItems.add(holder);
+	}
+	
+	public List<AdditionalItemHolder> getAdditionalItems() {
+		return _additionalItems != null ? _additionalItems : Collections.emptyList();
+	}
+	
+	public void setBasicActionList(ExBasicActionList list) {
+		_list = list;
+	}
+	
+	public ExBasicActionList getBasicActionList() {
+		return _list;
+	}
+	
+	public boolean hasBasicActionList() {
+		return _list != null;
+	}
+	
+	public void addLevelData(TransformLevelData data) {
+		_data.put(data.getLevel(), data);
+	}
+	
+	public TransformLevelData getData(int level) {
+		return _data.get(level);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformType.java b/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformType.java
new file mode 100644
index 00000000..f7761799
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/actor/transform/TransformType.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.transform;
+
+/**
+ * @author UnAfraid
+ */
+public enum TransformType {
+	MODE_CHANGE,
+	NON_COMBAT,
+	CURSED,
+	RIDING_MODE,
+	PURE_STAT,
+	FLYING,
+	COMBAT
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/announce/Announcement.java b/src/main/java/com/l2jserver/gameserver/model/announce/Announcement.java
new file mode 100644
index 00000000..f8b27e04
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/announce/Announcement.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.announce;
+
+import static java.sql.Statement.RETURN_GENERATED_KEYS;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+
+/**
+ * Announcement.
+ * @author UnAfraid
+ */
+public class Announcement implements IAnnouncement {
+	private static final Logger LOG = LoggerFactory.getLogger(Announcement.class);
+	
+	private static final String INSERT_QUERY = "INSERT INTO announcements (type, content, author) VALUES (?, ?, ?)";
+	private static final String UPDATE_QUERY = "UPDATE announcements SET type = ?, content = ?, author = ? WHERE id = ?";
+	private static final String DELETE_QUERY = "DELETE FROM announcements WHERE id = ?";
+	
+	protected int _id;
+	
+	private AnnouncementType _type;
+	
+	private String _content;
+	
+	private String _author;
+	
+	public Announcement(AnnouncementType type, String content, String author) {
+		_type = type;
+		_content = content;
+		_author = author;
+	}
+	
+	public Announcement(int id, AnnouncementType type, String content, String author) {
+		this(type, content, author);
+		_id = id;
+	}
+	
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	@Override
+	public AnnouncementType getType() {
+		return _type;
+	}
+	
+	@Override
+	public void setType(AnnouncementType type) {
+		_type = type;
+	}
+	
+	@Override
+	public String getContent() {
+		return _content;
+	}
+	
+	@Override
+	public void setContent(String content) {
+		_content = content;
+	}
+	
+	@Override
+	public String getAuthor() {
+		return _author;
+	}
+	
+	@Override
+	public void setAuthor(String author) {
+		_author = author;
+	}
+	
+	@Override
+	public boolean isValid() {
+		return true;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_QUERY, RETURN_GENERATED_KEYS)) {
+			ps.setInt(1, _type.ordinal());
+			ps.setString(2, _content);
+			ps.setString(3, _author);
+			ps.execute();
+			try (var rs = ps.getGeneratedKeys()) {
+				if (rs.next()) {
+					_id = rs.getInt(1);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't store announcement: ", e);
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean updateMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_QUERY)) {
+			ps.setInt(1, _type.ordinal());
+			ps.setString(2, _content);
+			ps.setString(3, _author);
+			ps.setInt(4, _id);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Couldn't store announcement: ", e);
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(DELETE_QUERY)) {
+			ps.setInt(1, _id);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Couldn't remove announcement: ", e);
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/announce/AnnouncementType.java b/src/main/java/com/l2jserver/gameserver/model/announce/AnnouncementType.java
new file mode 100644
index 00000000..bef85981
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/announce/AnnouncementType.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.announce;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author UnAfraid
+ */
+public enum AnnouncementType {
+	NORMAL,
+	CRITICAL,
+	EVENT,
+	AUTO_NORMAL,
+	AUTO_CRITICAL;
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AnnouncementType.class);
+	
+	public static AnnouncementType findById(int id) {
+		for (AnnouncementType type : values()) {
+			if (type.ordinal() == id) {
+				return type;
+			}
+		}
+		LOG.warn("Nonexistent id specified: {}!", id, new IllegalStateException());
+		return NORMAL;
+	}
+	
+	public static AnnouncementType findByName(String name) {
+		for (AnnouncementType type : values()) {
+			if (type.name().equalsIgnoreCase(name)) {
+				return type;
+			}
+		}
+		LOG.warn("Nonexistent name specified: {}!", name, new IllegalStateException());
+		return NORMAL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/announce/AutoAnnouncement.java b/src/main/java/com/l2jserver/gameserver/model/announce/AutoAnnouncement.java
new file mode 100644
index 00000000..0ac0d4b5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/announce/AutoAnnouncement.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.announce;
+
+import static java.sql.Statement.RETURN_GENERATED_KEYS;
+
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * Auto-announcements.
+ * @author UnAfraid
+ */
+public final class AutoAnnouncement extends Announcement implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(AutoAnnouncement.class);
+	
+	private static final String INSERT_QUERY = "INSERT INTO announcements (`type`, `content`, `author`, `initial`, `delay`, `repeat`) VALUES (?, ?, ?, ?, ?, ?)";
+	private static final String UPDATE_QUERY = "UPDATE announcements SET `type` = ?, `content` = ?, `author` = ?, `initial` = ?, `delay` = ?, `repeat` = ? WHERE id = ?";
+	
+	private long _initial;
+	private long _delay;
+	private int _repeat;
+	private int _currentState;
+	
+	private ScheduledFuture<?> _task;
+	
+	public AutoAnnouncement(AnnouncementType type, String content, String author, long initial, long delay, int repeat) {
+		super(type, content, author);
+		_initial = initial;
+		_delay = delay;
+		_repeat = repeat;
+		restartMe();
+	}
+	
+	public long getInitial() {
+		return _initial;
+	}
+	
+	public void setInitial(long initial) {
+		_initial = initial;
+	}
+	
+	public long getDelay() {
+		return _delay;
+	}
+	
+	public void setDelay(long delay) {
+		_delay = delay;
+	}
+	
+	public int getRepeat() {
+		return _repeat;
+	}
+	
+	public void setRepeat(int repeat) {
+		_repeat = repeat;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_QUERY, RETURN_GENERATED_KEYS)) {
+			ps.setInt(1, getType().ordinal());
+			ps.setString(2, getContent());
+			ps.setString(3, getAuthor());
+			ps.setLong(4, getInitial());
+			ps.setLong(5, getDelay());
+			ps.setInt(6, getRepeat());
+			ps.execute();
+			try (var rs = ps.getGeneratedKeys()) {
+				if (rs.next()) {
+					_id = rs.getInt(1);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't store announcement: ", e);
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean updateMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_QUERY)) {
+			ps.setInt(1, getType().ordinal());
+			ps.setString(2, getContent());
+			ps.setString(3, getAuthor());
+			ps.setLong(4, getInitial());
+			ps.setLong(5, getDelay());
+			ps.setLong(6, getRepeat());
+			ps.setLong(7, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Couldn't update announcement: ", e);
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		if ((_task != null) && !_task.isCancelled()) {
+			_task.cancel(false);
+		}
+		return super.deleteMe();
+	}
+	
+	public void restartMe() {
+		if ((_task != null) && !_task.isCancelled()) {
+			_task.cancel(false);
+		}
+		_currentState = _repeat;
+		_task = ThreadPoolManager.getInstance().scheduleGeneral(this, _initial);
+	}
+	
+	@Override
+	public void run() {
+		if ((_currentState == -1) || (_currentState > 0)) {
+			for (String content : getContent().split(Configuration.EOL)) {
+				Broadcast.toAllOnlinePlayers(content, (getType() == AnnouncementType.AUTO_CRITICAL));
+			}
+			
+			if (_currentState != -1) {
+				_currentState--;
+			}
+			
+			_task = ThreadPoolManager.getInstance().scheduleGeneral(this, _delay);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/announce/EventAnnouncement.java b/src/main/java/com/l2jserver/gameserver/model/announce/EventAnnouncement.java
new file mode 100644
index 00000000..67017675
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/announce/EventAnnouncement.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.announce;
+
+import java.util.Date;
+
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.script.DateRange;
+
+/**
+ * @author UnAfraid
+ */
+public class EventAnnouncement implements IAnnouncement {
+	private final int _id;
+	private final DateRange _range;
+	private String _content;
+	
+	public EventAnnouncement(DateRange range, String content) {
+		_id = IdFactory.getInstance().getNextId();
+		_range = range;
+		_content = content;
+	}
+	
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	@Override
+	public AnnouncementType getType() {
+		return AnnouncementType.EVENT;
+	}
+	
+	@Override
+	public void setType(AnnouncementType type) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean isValid() {
+		return _range.isWithinRange(new Date());
+	}
+	
+	@Override
+	public String getContent() {
+		return _content;
+	}
+	
+	@Override
+	public void setContent(String content) {
+		_content = content;
+	}
+	
+	@Override
+	public String getAuthor() {
+		return "N/A";
+	}
+	
+	@Override
+	public void setAuthor(String author) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean deleteMe() {
+		IdFactory.getInstance().releaseId(_id);
+		return true;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		return true;
+	}
+	
+	@Override
+	public boolean updateMe() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/announce/IAnnouncement.java b/src/main/java/com/l2jserver/gameserver/model/announce/IAnnouncement.java
new file mode 100644
index 00000000..ef53b5db
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/announce/IAnnouncement.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.announce;
+
+import com.l2jserver.gameserver.model.interfaces.IDeletable;
+import com.l2jserver.gameserver.model.interfaces.IStorable;
+import com.l2jserver.gameserver.model.interfaces.IUpdatable;
+
+/**
+ * @author UnAfraid
+ */
+public interface IAnnouncement extends IStorable, IUpdatable, IDeletable {
+	int getId();
+	
+	AnnouncementType getType();
+	
+	void setType(AnnouncementType type);
+	
+	boolean isValid();
+	
+	String getContent();
+	
+	void setContent(String content);
+	
+	String getAuthor();
+	
+	void setAuthor(String author);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/AcquireSkillType.java b/src/main/java/com/l2jserver/gameserver/model/base/AcquireSkillType.java
new file mode 100644
index 00000000..e9fe9965
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/AcquireSkillType.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+/**
+ * Skill Learn types.
+ * @author Zoey76
+ */
+public enum AcquireSkillType {
+	CLASS,
+	FISHING,
+	PLEDGE,
+	SUBPLEDGE,
+	TRANSFORM,
+	TRANSFER,
+	SUBCLASS,
+	COLLECT;
+	
+	public static AcquireSkillType getAcquireSkillType(int id) {
+		return values()[id];
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/ClassId.java b/src/main/java/com/l2jserver/gameserver/model/base/ClassId.java
new file mode 100644
index 00000000..c3d85c6a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/ClassId.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
+/**
+ * This class defines all classes (ex : human fighter, darkFighter...) that a player can chose.<br>
+ * Data:
+ * <ul>
+ * <li>id : The Identifier of the class</li>
+ * <li>isMage : True if the class is a mage class</li>
+ * <li>race : The race of this class</li>
+ * <li>parent : The parent ClassId or null if this class is the root</li>
+ * </ul>
+ * @since 2005/03/27 15:29:33
+ */
+public enum ClassId implements IIdentifiable {
+	fighter(0x00, false, Race.HUMAN, null),
+	
+	warrior(0x01, false, Race.HUMAN, fighter),
+	gladiator(0x02, false, Race.HUMAN, warrior),
+	warlord(0x03, false, Race.HUMAN, warrior),
+	knight(0x04, false, Race.HUMAN, fighter),
+	paladin(0x05, false, Race.HUMAN, knight),
+	darkAvenger(0x06, false, Race.HUMAN, knight),
+	rogue(0x07, false, Race.HUMAN, fighter),
+	treasureHunter(0x08, false, Race.HUMAN, rogue),
+	hawkeye(0x09, false, Race.HUMAN, rogue),
+	
+	mage(0x0a, true, Race.HUMAN, null),
+	wizard(0x0b, true, Race.HUMAN, mage),
+	sorceror(0x0c, true, Race.HUMAN, wizard),
+	necromancer(0x0d, true, Race.HUMAN, wizard),
+	warlock(0x0e, true, true, Race.HUMAN, wizard),
+	cleric(0x0f, true, Race.HUMAN, mage),
+	bishop(0x10, true, Race.HUMAN, cleric),
+	prophet(0x11, true, Race.HUMAN, cleric),
+	
+	elvenFighter(0x12, false, Race.ELF, null),
+	elvenKnight(0x13, false, Race.ELF, elvenFighter),
+	templeKnight(0x14, false, Race.ELF, elvenKnight),
+	swordSinger(0x15, false, Race.ELF, elvenKnight),
+	elvenScout(0x16, false, Race.ELF, elvenFighter),
+	plainsWalker(0x17, false, Race.ELF, elvenScout),
+	silverRanger(0x18, false, Race.ELF, elvenScout),
+	
+	elvenMage(0x19, true, Race.ELF, null),
+	elvenWizard(0x1a, true, Race.ELF, elvenMage),
+	spellsinger(0x1b, true, Race.ELF, elvenWizard),
+	elementalSummoner(0x1c, true, true, Race.ELF, elvenWizard),
+	oracle(0x1d, true, Race.ELF, elvenMage),
+	elder(0x1e, true, Race.ELF, oracle),
+	
+	darkFighter(0x1f, false, Race.DARK_ELF, null),
+	palusKnight(0x20, false, Race.DARK_ELF, darkFighter),
+	shillienKnight(0x21, false, Race.DARK_ELF, palusKnight),
+	bladedancer(0x22, false, Race.DARK_ELF, palusKnight),
+	assassin(0x23, false, Race.DARK_ELF, darkFighter),
+	abyssWalker(0x24, false, Race.DARK_ELF, assassin),
+	phantomRanger(0x25, false, Race.DARK_ELF, assassin),
+	
+	darkMage(0x26, true, Race.DARK_ELF, null),
+	darkWizard(0x27, true, Race.DARK_ELF, darkMage),
+	spellhowler(0x28, true, Race.DARK_ELF, darkWizard),
+	phantomSummoner(0x29, true, true, Race.DARK_ELF, darkWizard),
+	shillienOracle(0x2a, true, Race.DARK_ELF, darkMage),
+	shillenElder(0x2b, true, Race.DARK_ELF, shillienOracle),
+	
+	orcFighter(0x2c, false, Race.ORC, null),
+	orcRaider(0x2d, false, Race.ORC, orcFighter),
+	destroyer(0x2e, false, Race.ORC, orcRaider),
+	orcMonk(0x2f, false, Race.ORC, orcFighter),
+	tyrant(0x30, false, Race.ORC, orcMonk),
+	
+	orcMage(0x31, true, Race.ORC, null),
+	orcShaman(0x32, true, Race.ORC, orcMage),
+	overlord(0x33, true, Race.ORC, orcShaman),
+	warcryer(0x34, true, Race.ORC, orcShaman),
+	
+	dwarvenFighter(0x35, false, Race.DWARF, null),
+	scavenger(0x36, false, Race.DWARF, dwarvenFighter),
+	bountyHunter(0x37, false, Race.DWARF, scavenger),
+	artisan(0x38, false, Race.DWARF, dwarvenFighter),
+	warsmith(0x39, false, Race.DWARF, artisan),
+	
+	/*
+	 * Dummy Entries (id's already in decimal format) btw FU NCSoft for the amount of work you put me through to do this!! <START>
+	 */
+	dummyEntry1(58, false, null, null),
+	dummyEntry2(59, false, null, null),
+	dummyEntry3(60, false, null, null),
+	dummyEntry4(61, false, null, null),
+	dummyEntry5(62, false, null, null),
+	dummyEntry6(63, false, null, null),
+	dummyEntry7(64, false, null, null),
+	dummyEntry8(65, false, null, null),
+	dummyEntry9(66, false, null, null),
+	dummyEntry10(67, false, null, null),
+	dummyEntry11(68, false, null, null),
+	dummyEntry12(69, false, null, null),
+	dummyEntry13(70, false, null, null),
+	dummyEntry14(71, false, null, null),
+	dummyEntry15(72, false, null, null),
+	dummyEntry16(73, false, null, null),
+	dummyEntry17(74, false, null, null),
+	dummyEntry18(75, false, null, null),
+	dummyEntry19(76, false, null, null),
+	dummyEntry20(77, false, null, null),
+	dummyEntry21(78, false, null, null),
+	dummyEntry22(79, false, null, null),
+	dummyEntry23(80, false, null, null),
+	dummyEntry24(81, false, null, null),
+	dummyEntry25(82, false, null, null),
+	dummyEntry26(83, false, null, null),
+	dummyEntry27(84, false, null, null),
+	dummyEntry28(85, false, null, null),
+	dummyEntry29(86, false, null, null),
+	dummyEntry30(87, false, null, null),
+	/*
+	 * <END> Of Dummy entries
+	 */
+	
+	/*
+	 * Now the bad boys! new class ids :)) (3rd classes)
+	 */
+	duelist(0x58, false, Race.HUMAN, gladiator),
+	dreadnought(0x59, false, Race.HUMAN, warlord),
+	phoenixKnight(0x5a, false, Race.HUMAN, paladin),
+	hellKnight(0x5b, false, Race.HUMAN, darkAvenger),
+	sagittarius(0x5c, false, Race.HUMAN, hawkeye),
+	adventurer(0x5d, false, Race.HUMAN, treasureHunter),
+	archmage(0x5e, true, Race.HUMAN, sorceror),
+	soultaker(0x5f, true, Race.HUMAN, necromancer),
+	arcanaLord(0x60, true, true, Race.HUMAN, warlock),
+	cardinal(0x61, true, Race.HUMAN, bishop),
+	hierophant(0x62, true, Race.HUMAN, prophet),
+	
+	evaTemplar(0x63, false, Race.ELF, templeKnight),
+	swordMuse(0x64, false, Race.ELF, swordSinger),
+	windRider(0x65, false, Race.ELF, plainsWalker),
+	moonlightSentinel(0x66, false, Race.ELF, silverRanger),
+	mysticMuse(0x67, true, Race.ELF, spellsinger),
+	elementalMaster(0x68, true, true, Race.ELF, elementalSummoner),
+	evaSaint(0x69, true, Race.ELF, elder),
+	
+	shillienTemplar(0x6a, false, Race.DARK_ELF, shillienKnight),
+	spectralDancer(0x6b, false, Race.DARK_ELF, bladedancer),
+	ghostHunter(0x6c, false, Race.DARK_ELF, abyssWalker),
+	ghostSentinel(0x6d, false, Race.DARK_ELF, phantomRanger),
+	stormScreamer(0x6e, true, Race.DARK_ELF, spellhowler),
+	spectralMaster(0x6f, true, true, Race.DARK_ELF, phantomSummoner),
+	shillienSaint(0x70, true, Race.DARK_ELF, shillenElder),
+	
+	titan(0x71, false, Race.ORC, destroyer),
+	grandKhavatari(0x72, false, Race.ORC, tyrant),
+	dominator(0x73, true, Race.ORC, overlord),
+	doomcryer(0x74, true, Race.ORC, warcryer),
+	
+	fortuneSeeker(0x75, false, Race.DWARF, bountyHunter),
+	maestro(0x76, false, Race.DWARF, warsmith),
+	
+	dummyEntry31(0x77, false, null, null),
+	dummyEntry32(0x78, false, null, null),
+	dummyEntry33(0x79, false, null, null),
+	dummyEntry34(0x7a, false, null, null),
+	
+	maleSoldier(0x7b, false, Race.KAMAEL, null),
+	femaleSoldier(0x7C, false, Race.KAMAEL, null),
+	trooper(0x7D, false, Race.KAMAEL, maleSoldier),
+	warder(0x7E, false, Race.KAMAEL, femaleSoldier),
+	berserker(0x7F, false, Race.KAMAEL, trooper),
+	maleSoulbreaker(0x80, false, Race.KAMAEL, trooper),
+	femaleSoulbreaker(0x81, false, Race.KAMAEL, warder),
+	arbalester(0x82, false, Race.KAMAEL, warder),
+	doombringer(0x83, false, Race.KAMAEL, berserker),
+	maleSoulhound(0x84, false, Race.KAMAEL, maleSoulbreaker),
+	femaleSoulhound(0x85, false, Race.KAMAEL, femaleSoulbreaker),
+	trickster(0x86, false, Race.KAMAEL, arbalester),
+	inspector(0x87, false, Race.KAMAEL, warder), // DS: yes, both male/female inspectors use skills from warder
+	judicator(0x88, false, Race.KAMAEL, inspector);
+	
+	/** The Identifier of the Class */
+	private final int _id;
+	
+	/** True if the class is a mage class */
+	private final boolean _isMage;
+	
+	/** True if the class is a summoner class */
+	private final boolean _isSummoner;
+	
+	/** The Race object of the class */
+	private final Race _race;
+	
+	/** The parent ClassId or null if this class is a root */
+	private final ClassId _parent;
+	
+	/**
+	 * Class constructor.
+	 * @param pId the class Id.
+	 * @param pIsMage {code true} if the class is mage class.
+	 * @param race the race related to the class.
+	 * @param pParent the parent class Id.
+	 */
+	ClassId(int pId, boolean pIsMage, Race race, ClassId pParent) {
+		_id = pId;
+		_isMage = pIsMage;
+		_isSummoner = false;
+		_race = race;
+		_parent = pParent;
+	}
+	
+	/**
+	 * Class constructor.
+	 * @param pId the class Id.
+	 * @param pIsMage {code true} if the class is mage class.
+	 * @param pIsSummoner {code true} if the class is summoner class.
+	 * @param race the race related to the class.
+	 * @param pParent the parent class Id.
+	 */
+	ClassId(int pId, boolean pIsMage, boolean pIsSummoner, Race race, ClassId pParent) {
+		_id = pId;
+		_isMage = pIsMage;
+		_isSummoner = pIsSummoner;
+		_race = race;
+		_parent = pParent;
+	}
+	
+	/**
+	 * Gets the ID of the class.
+	 * @return the ID of the class
+	 */
+	@Override
+	public final int getId() {
+		return _id;
+	}
+	
+	/**
+	 * @return {code true} if the class is a mage class.
+	 */
+	public final boolean isMage() {
+		return _isMage;
+	}
+	
+	/**
+	 * @return {code true} if the class is a summoner class.
+	 */
+	public final boolean isSummoner() {
+		return _isSummoner;
+	}
+	
+	/**
+	 * @return the Race object of the class.
+	 */
+	public final Race getRace() {
+		return _race;
+	}
+	
+	/**
+	 * @param cid the parent ClassId to check.
+	 * @return {code true} if this Class is a child of the selected ClassId.
+	 */
+	public final boolean childOf(ClassId cid) {
+		if (_parent == null) {
+			return false;
+		}
+		
+		if (_parent == cid) {
+			return true;
+		}
+		
+		return _parent.childOf(cid);
+		
+	}
+	
+	/**
+	 * @param cid the parent ClassId to check.
+	 * @return {code true} if this Class is equal to the selected ClassId or a child of the selected ClassId.
+	 */
+	public final boolean equalsOrChildOf(ClassId cid) {
+		return (this == cid) || childOf(cid);
+	}
+	
+	/**
+	 * @return the child level of this Class (0=root, 1=child leve 1...)
+	 */
+	public final int level() {
+		if (_parent == null) {
+			return 0;
+		}
+		
+		return 1 + _parent.level();
+	}
+	
+	public final ClassId getParent() {
+		return _parent;
+	}
+	
+	public static ClassId getClassId(int cId) {
+		try {
+			return ClassId.values()[cId];
+		} catch (Exception e) {
+			return null;
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/ClassInfo.java b/src/main/java/com/l2jserver/gameserver/model/base/ClassInfo.java
new file mode 100644
index 00000000..ac784e29
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/ClassInfo.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+import java.util.regex.Matcher;
+
+/**
+ * This class will hold the information of the player classes.
+ * @author Zoey76
+ */
+public final class ClassInfo {
+	private final ClassId _classId;
+	private final String _className;
+	private final ClassId _parentClassId;
+	
+	/**
+	 * Constructor for ClassInfo.
+	 * @param classId the class ID
+	 * @param className the in game class name
+	 * @param parentClassId the parent class for the given {@code classId}
+	 */
+	public ClassInfo(ClassId classId, String className, ClassId parentClassId) {
+		_classId = classId;
+		_className = className;
+		_parentClassId = parentClassId;
+	}
+	
+	public ClassId getClassId() {
+		return _classId;
+	}
+	
+	public String getClassName() {
+		return _className;
+	}
+	
+	private int getClassClientId() {
+		int classClientId = _classId.getId();
+		if ((classClientId >= 0) && (classClientId <= 57)) {
+			classClientId += 247;
+		} else if ((classClientId >= 88) && (classClientId <= 118)) {
+			classClientId += 1071;
+		} else if ((classClientId >= 123) && (classClientId <= 136)) {
+			classClientId += 1438;
+		}
+		return classClientId;
+	}
+	
+	/**
+	 * @return the class client ID formatted to be displayed on a HTML.
+	 */
+	public String getClientCode() {
+		return "&$" + getClassClientId() + ";";
+	}
+	
+	public String getEscapedClientCode() {
+		return Matcher.quoteReplacement(getClientCode());
+	}
+	
+	public ClassId getParentClassId() {
+		return _parentClassId;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/ClassLevel.java b/src/main/java/com/l2jserver/gameserver/model/base/ClassLevel.java
new file mode 100644
index 00000000..ce13b9be
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/ClassLevel.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+/**
+ * @since 2004/06/27 08:12:59
+ */
+public enum ClassLevel {
+	First,
+	Second,
+	Third,
+	Fourth
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/ClassType.java b/src/main/java/com/l2jserver/gameserver/model/base/ClassType.java
new file mode 100644
index 00000000..40dc1797
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/ClassType.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+/**
+ * ClassType Enum
+ * @author Tempy
+ */
+public enum ClassType {
+	Fighter,
+	Mystic,
+	Priest
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/PlayerClass.java b/src/main/java/com/l2jserver/gameserver/model/base/PlayerClass.java
new file mode 100644
index 00000000..16c71aaa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/PlayerClass.java
@@ -0,0 +1,313 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.model.base.ClassLevel.First;
+import static com.l2jserver.gameserver.model.base.ClassLevel.Fourth;
+import static com.l2jserver.gameserver.model.base.ClassLevel.Second;
+import static com.l2jserver.gameserver.model.base.ClassLevel.Third;
+import static com.l2jserver.gameserver.model.base.ClassType.Fighter;
+import static com.l2jserver.gameserver.model.base.ClassType.Mystic;
+import static com.l2jserver.gameserver.model.base.ClassType.Priest;
+
+import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.Set;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author luisantonioa
+ */
+public enum PlayerClass {
+	HumanFighter(Race.HUMAN, Fighter, First),
+	Warrior(Race.HUMAN, Fighter, Second),
+	Gladiator(Race.HUMAN, Fighter, Third),
+	Warlord(Race.HUMAN, Fighter, Third),
+	HumanKnight(Race.HUMAN, Fighter, Second),
+	Paladin(Race.HUMAN, Fighter, Third),
+	DarkAvenger(Race.HUMAN, Fighter, Third),
+	Rogue(Race.HUMAN, Fighter, Second),
+	TreasureHunter(Race.HUMAN, Fighter, Third),
+	Hawkeye(Race.HUMAN, Fighter, Third),
+	HumanMystic(Race.HUMAN, Mystic, First),
+	HumanWizard(Race.HUMAN, Mystic, Second),
+	Sorceror(Race.HUMAN, Mystic, Third),
+	Necromancer(Race.HUMAN, Mystic, Third),
+	Warlock(Race.HUMAN, Mystic, Third),
+	Cleric(Race.HUMAN, Priest, Second),
+	Bishop(Race.HUMAN, Priest, Third),
+	Prophet(Race.HUMAN, Priest, Third),
+	
+	ElvenFighter(Race.ELF, Fighter, First),
+	ElvenKnight(Race.ELF, Fighter, Second),
+	TempleKnight(Race.ELF, Fighter, Third),
+	Swordsinger(Race.ELF, Fighter, Third),
+	ElvenScout(Race.ELF, Fighter, Second),
+	Plainswalker(Race.ELF, Fighter, Third),
+	SilverRanger(Race.ELF, Fighter, Third),
+	ElvenMystic(Race.ELF, Mystic, First),
+	ElvenWizard(Race.ELF, Mystic, Second),
+	Spellsinger(Race.ELF, Mystic, Third),
+	ElementalSummoner(Race.ELF, Mystic, Third),
+	ElvenOracle(Race.ELF, Priest, Second),
+	ElvenElder(Race.ELF, Priest, Third),
+	
+	DarkElvenFighter(Race.DARK_ELF, Fighter, First),
+	PalusKnight(Race.DARK_ELF, Fighter, Second),
+	ShillienKnight(Race.DARK_ELF, Fighter, Third),
+	Bladedancer(Race.DARK_ELF, Fighter, Third),
+	Assassin(Race.DARK_ELF, Fighter, Second),
+	AbyssWalker(Race.DARK_ELF, Fighter, Third),
+	PhantomRanger(Race.DARK_ELF, Fighter, Third),
+	DarkElvenMystic(Race.DARK_ELF, Mystic, First),
+	DarkElvenWizard(Race.DARK_ELF, Mystic, Second),
+	Spellhowler(Race.DARK_ELF, Mystic, Third),
+	PhantomSummoner(Race.DARK_ELF, Mystic, Third),
+	ShillienOracle(Race.DARK_ELF, Priest, Second),
+	ShillienElder(Race.DARK_ELF, Priest, Third),
+	
+	OrcFighter(Race.ORC, Fighter, First),
+	OrcRaider(Race.ORC, Fighter, Second),
+	Destroyer(Race.ORC, Fighter, Third),
+	OrcMonk(Race.ORC, Fighter, Second),
+	Tyrant(Race.ORC, Fighter, Third),
+	OrcMystic(Race.ORC, Mystic, First),
+	OrcShaman(Race.ORC, Mystic, Second),
+	Overlord(Race.ORC, Mystic, Third),
+	Warcryer(Race.ORC, Mystic, Third),
+	
+	DwarvenFighter(Race.DWARF, Fighter, First),
+	DwarvenScavenger(Race.DWARF, Fighter, Second),
+	BountyHunter(Race.DWARF, Fighter, Third),
+	DwarvenArtisan(Race.DWARF, Fighter, Second),
+	Warsmith(Race.DWARF, Fighter, Third),
+	
+	dummyEntry1(null, null, null),
+	dummyEntry2(null, null, null),
+	dummyEntry3(null, null, null),
+	dummyEntry4(null, null, null),
+	dummyEntry5(null, null, null),
+	dummyEntry6(null, null, null),
+	dummyEntry7(null, null, null),
+	dummyEntry8(null, null, null),
+	dummyEntry9(null, null, null),
+	dummyEntry10(null, null, null),
+	dummyEntry11(null, null, null),
+	dummyEntry12(null, null, null),
+	dummyEntry13(null, null, null),
+	dummyEntry14(null, null, null),
+	dummyEntry15(null, null, null),
+	dummyEntry16(null, null, null),
+	dummyEntry17(null, null, null),
+	dummyEntry18(null, null, null),
+	dummyEntry19(null, null, null),
+	dummyEntry20(null, null, null),
+	dummyEntry21(null, null, null),
+	dummyEntry22(null, null, null),
+	dummyEntry23(null, null, null),
+	dummyEntry24(null, null, null),
+	dummyEntry25(null, null, null),
+	dummyEntry26(null, null, null),
+	dummyEntry27(null, null, null),
+	dummyEntry28(null, null, null),
+	dummyEntry29(null, null, null),
+	dummyEntry30(null, null, null),
+	/*
+	 * (3rd classes)
+	 */
+	duelist(Race.HUMAN, Fighter, Fourth),
+	dreadnought(Race.HUMAN, Fighter, Fourth),
+	phoenixKnight(Race.HUMAN, Fighter, Fourth),
+	hellKnight(Race.HUMAN, Fighter, Fourth),
+	sagittarius(Race.HUMAN, Fighter, Fourth),
+	adventurer(Race.HUMAN, Fighter, Fourth),
+	archmage(Race.HUMAN, Mystic, Fourth),
+	soultaker(Race.HUMAN, Mystic, Fourth),
+	arcanaLord(Race.HUMAN, Mystic, Fourth),
+	cardinal(Race.HUMAN, Priest, Fourth),
+	hierophant(Race.HUMAN, Priest, Fourth),
+	
+	evaTemplar(Race.ELF, Fighter, Fourth),
+	swordMuse(Race.ELF, Fighter, Fourth),
+	windRider(Race.ELF, Fighter, Fourth),
+	moonlightSentinel(Race.ELF, Fighter, Fourth),
+	mysticMuse(Race.ELF, Mystic, Fourth),
+	elementalMaster(Race.ELF, Mystic, Fourth),
+	evaSaint(Race.ELF, Priest, Fourth),
+	
+	shillienTemplar(Race.DARK_ELF, Fighter, Fourth),
+	spectralDancer(Race.DARK_ELF, Fighter, Fourth),
+	ghostHunter(Race.DARK_ELF, Fighter, Fourth),
+	ghostSentinel(Race.DARK_ELF, Fighter, Fourth),
+	stormScreamer(Race.DARK_ELF, Mystic, Fourth),
+	spectralMaster(Race.DARK_ELF, Mystic, Fourth),
+	shillienSaint(Race.DARK_ELF, Priest, Fourth),
+	
+	titan(Race.ORC, Fighter, Fourth),
+	grandKhavatari(Race.ORC, Fighter, Fourth),
+	dominator(Race.ORC, Mystic, Fourth),
+	doomcryer(Race.ORC, Mystic, Fourth),
+	
+	fortuneSeeker(Race.DWARF, Fighter, Fourth),
+	maestro(Race.DWARF, Fighter, Fourth),
+	
+	dummyEntry31(null, null, null),
+	dummyEntry32(null, null, null),
+	dummyEntry33(null, null, null),
+	dummyEntry34(null, null, null),
+	
+	maleSoldier(Race.KAMAEL, Fighter, First),
+	femaleSoldier(Race.KAMAEL, Fighter, First),
+	trooper(Race.KAMAEL, Fighter, Second),
+	warder(Race.KAMAEL, Fighter, Second),
+	berserker(Race.KAMAEL, Fighter, Third),
+	maleSoulbreaker(Race.KAMAEL, Fighter, Third),
+	femaleSoulbreaker(Race.KAMAEL, Fighter, Third),
+	arbalester(Race.KAMAEL, Fighter, Third),
+	doombringer(Race.KAMAEL, Fighter, Fourth),
+	maleSoulhound(Race.KAMAEL, Fighter, Fourth),
+	femaleSoulhound(Race.KAMAEL, Fighter, Fourth),
+	trickster(Race.KAMAEL, Fighter, Fourth),
+	inspector(Race.KAMAEL, Fighter, Third),
+	judicator(Race.KAMAEL, Fighter, Fourth);
+	
+	private final Race _race;
+	private final ClassLevel _level;
+	private final ClassType _type;
+	
+	private static final Set<PlayerClass> mainSubclassSet;
+	private static final Set<PlayerClass> neverSubclassed = EnumSet.of(Overlord, Warsmith);
+	
+	private static final Set<PlayerClass> subclasseSet1 = EnumSet.of(DarkAvenger, Paladin, TempleKnight, ShillienKnight);
+	private static final Set<PlayerClass> subclasseSet2 = EnumSet.of(TreasureHunter, AbyssWalker, Plainswalker);
+	private static final Set<PlayerClass> subclasseSet3 = EnumSet.of(Hawkeye, SilverRanger, PhantomRanger);
+	private static final Set<PlayerClass> subclasseSet4 = EnumSet.of(Warlock, ElementalSummoner, PhantomSummoner);
+	private static final Set<PlayerClass> subclasseSet5 = EnumSet.of(Sorceror, Spellsinger, Spellhowler);
+	
+	private static final EnumMap<PlayerClass, Set<PlayerClass>> subclassSetMap = new EnumMap<>(PlayerClass.class);
+	
+	static {
+		Set<PlayerClass> subclasses = getSet(null, Third);
+		subclasses.removeAll(neverSubclassed);
+		
+		mainSubclassSet = subclasses;
+		
+		subclassSetMap.put(DarkAvenger, subclasseSet1);
+		subclassSetMap.put(Paladin, subclasseSet1);
+		subclassSetMap.put(TempleKnight, subclasseSet1);
+		subclassSetMap.put(ShillienKnight, subclasseSet1);
+		
+		subclassSetMap.put(TreasureHunter, subclasseSet2);
+		subclassSetMap.put(AbyssWalker, subclasseSet2);
+		subclassSetMap.put(Plainswalker, subclasseSet2);
+		
+		subclassSetMap.put(Hawkeye, subclasseSet3);
+		subclassSetMap.put(SilverRanger, subclasseSet3);
+		subclassSetMap.put(PhantomRanger, subclasseSet3);
+		
+		subclassSetMap.put(Warlock, subclasseSet4);
+		subclassSetMap.put(ElementalSummoner, subclasseSet4);
+		subclassSetMap.put(PhantomSummoner, subclasseSet4);
+		
+		subclassSetMap.put(Sorceror, subclasseSet5);
+		subclassSetMap.put(Spellsinger, subclasseSet5);
+		subclassSetMap.put(Spellhowler, subclasseSet5);
+	}
+	
+	PlayerClass(Race race, ClassType pType, ClassLevel pLevel) {
+		_race = race;
+		_level = pLevel;
+		_type = pType;
+	}
+	
+	public final Set<PlayerClass> getAvailableSubclasses(L2PcInstance player) {
+		Set<PlayerClass> subclasses = null;
+		
+		if (_level == Third) {
+			if (player.getRace() != Race.KAMAEL) {
+				subclasses = EnumSet.copyOf(mainSubclassSet);
+				
+				subclasses.remove(this);
+				
+				switch (player.getRace()) {
+					case ELF -> subclasses.removeAll(getSet(Race.DARK_ELF, Third));
+					case DARK_ELF -> subclasses.removeAll(getSet(Race.ELF, Third));
+				}
+				
+				subclasses.removeAll(getSet(Race.KAMAEL, Third));
+				
+				Set<PlayerClass> unavailableClasses = subclassSetMap.get(this);
+				
+				if (unavailableClasses != null) {
+					subclasses.removeAll(unavailableClasses);
+				}
+				
+			} else {
+				subclasses = getSet(Race.KAMAEL, Third);
+				subclasses.remove(this);
+				// Check sex, male subclasses female and vice versa
+				// If server owner set MaxSubclass > 3 some kamael's cannot take 4 sub
+				// So, in that situation we must skip sex check
+				if (character().getMaxSubclass() <= 3) {
+					if (player.getAppearance().getSex()) {
+						subclasses.removeAll(EnumSet.of(femaleSoulbreaker));
+					} else {
+						subclasses.removeAll(EnumSet.of(maleSoulbreaker));
+					}
+				}
+				if (!player.getSubClasses().containsKey(2) || (player.getSubClasses().get(2).getLevel() < 75)) {
+					subclasses.removeAll(EnumSet.of(inspector));
+				}
+			}
+		}
+		return subclasses;
+	}
+	
+	public static EnumSet<PlayerClass> getSet(Race race, ClassLevel level) {
+		EnumSet<PlayerClass> allOf = EnumSet.noneOf(PlayerClass.class);
+		
+		for (PlayerClass playerClass : EnumSet.allOf(PlayerClass.class)) {
+			if ((race == null) || playerClass.isOfRace(race)) {
+				if ((level == null) || playerClass.isOfLevel(level)) {
+					allOf.add(playerClass);
+				}
+			}
+		}
+		return allOf;
+	}
+	
+	public final boolean isOfRace(Race pRace) {
+		return _race == pRace;
+	}
+	
+	public final boolean isOfType(ClassType pType) {
+		return _type == pType;
+	}
+	
+	public final boolean isOfLevel(ClassLevel pLevel) {
+		return _level == pLevel;
+	}
+	
+	public final ClassLevel getLevel() {
+		return _level;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/PlayerState.java b/src/main/java/com/l2jserver/gameserver/model/base/PlayerState.java
new file mode 100644
index 00000000..a2eb9c12
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/PlayerState.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+public enum PlayerState {
+	RESTING,
+	MOVING,
+	RUNNING,
+	STANDING,
+	FLYING,
+	BEHIND,
+	FRONT,
+	CHAOTIC,
+	OLYMPIAD
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/SocialClass.java b/src/main/java/com/l2jserver/gameserver/model/base/SocialClass.java
new file mode 100644
index 00000000..e6c2acda
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/SocialClass.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+/**
+ * Enumerated for Social Classes.
+ * @author Zoey76
+ */
+public enum SocialClass {
+	VAGABOND,
+	VASSAL,
+	APPRENTICE,
+	HEIR,
+	KNIGHT,
+	ELDER,
+	BARON,
+	VISCOUNT,
+	COUNT,
+	MARQUIS,
+	DUKE,
+	GRAND_DUKE,
+	DISTINGUISHED_KING,
+	EMPEROR
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/base/SubClass.java b/src/main/java/com/l2jserver/gameserver/model/base/SubClass.java
new file mode 100644
index 00000000..b4401568
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/base/SubClass.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.base;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.stat.PcStat;
+
+/**
+ * Character Sub-Class Definition <BR>
+ * Used to store key information about a character's sub-class.
+ * @author Zealar
+ */
+public final class SubClass {
+	private PlayerClass _class;
+	private int _classIndex = 1;
+	private final PcStat _stats;
+	
+	public SubClass(L2PcInstance activeChar) {
+		_stats = new PcStat(activeChar);
+		_stats.setExp(ExperienceData.getInstance().getExpForLevel(character().getBaseSubclassLevel()));
+		_stats.setLevel(character().getBaseSubclassLevel());
+	}
+	
+	public PlayerClass getClassDefinition() {
+		return _class;
+	}
+	
+	public void setClassIndex(int classIndex) {
+		_classIndex = classIndex;
+	}
+	
+	/**
+	 * First Sub-Class is index 1.
+	 * @return int _classIndex
+	 */
+	public int getClassIndex() {
+		return _classIndex;
+	}
+	
+	public void setClassId(int classId) {
+		_class = PlayerClass.values()[classId];
+	}
+	
+	public int getClassId() {
+		return _class.ordinal();
+	}
+	
+	public long getExp() {
+		return _stats.getExp();
+	}
+	
+	public int getLevel() {
+		return _stats.getLevel();
+	}
+	
+	public int getSp() {
+		return _stats.getSp();
+	}
+	
+	public void setSp(int sp) {
+		_stats.setSp(sp);
+	}
+	
+	public void setExp(long exp) {
+		_stats.setExp(exp);
+	}
+	
+	public void setLevel(int level) {
+		_stats.setLevel(level);
+	}
+	
+	public void addExp(long exp) {
+		_stats.addExp(exp);
+	}
+	
+	public PcStat getStat() {
+		return _stats;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/buylist/L2BuyList.java b/src/main/java/com/l2jserver/gameserver/model/buylist/L2BuyList.java
new file mode 100644
index 00000000..3b044e3c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/buylist/L2BuyList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.buylist;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author NosBit
+ */
+public final class L2BuyList {
+	private final int _listId;
+	private final Map<Integer, Product> _products = new LinkedHashMap<>();
+	private Set<Integer> _allowedNpcs = null;
+	
+	public L2BuyList(int listId) {
+		_listId = listId;
+	}
+	
+	public int getListId() {
+		return _listId;
+	}
+	
+	public Collection<Product> getProducts() {
+		return _products.values();
+	}
+	
+	public Product getProductByItemId(int itemId) {
+		return _products.get(itemId);
+	}
+	
+	public void addProduct(Product product) {
+		_products.put(product.getItemId(), product);
+	}
+	
+	public void addAllowedNpc(int npcId) {
+		if (_allowedNpcs == null) {
+			_allowedNpcs = new HashSet<>();
+		}
+		_allowedNpcs.add(npcId);
+	}
+	
+	public boolean isNpcAllowed(int npcId) {
+		if (_allowedNpcs == null) {
+			return false;
+		}
+		return _allowedNpcs.contains(npcId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/buylist/Product.java b/src/main/java/com/l2jserver/gameserver/model/buylist/Product.java
new file mode 100644
index 00000000..9d92936c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/buylist/Product.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.buylist;
+
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.items.L2Item;
+
+/**
+ * @author NosBit
+ */
+public final class Product {
+	private static final Logger LOG = LoggerFactory.getLogger(Product.class);
+	
+	private final int _buyListId;
+	
+	private final L2Item _item;
+	
+	private final long _price;
+	
+	private final double _baseTax;
+	
+	private final long _restockDelay;
+	
+	private final long _maxCount;
+	
+	private AtomicLong _count = null;
+	
+	private ScheduledFuture<?> _restockTask = null;
+	
+	public Product(int buyListId, L2Item item, long price, double baseTax, long restockDelay, long maxCount) {
+		_buyListId = buyListId;
+		_item = item;
+		_price = price;
+		_baseTax = baseTax;
+		_restockDelay = restockDelay * 60000;
+		_maxCount = maxCount;
+		if (hasLimitedStock()) {
+			_count = new AtomicLong(maxCount);
+		}
+	}
+	
+	public int getBuyListId() {
+		return _buyListId;
+	}
+	
+	public L2Item getItem() {
+		return _item;
+	}
+	
+	public int getItemId() {
+		return getItem().getId();
+	}
+	
+	public long getPrice() {
+		return _price;
+	}
+	
+	public double getBaseTax() {
+		return _baseTax;
+	}
+	
+	public long getRestockDelay() {
+		return _restockDelay;
+	}
+	
+	public long getMaxCount() {
+		return _maxCount;
+	}
+	
+	public long getCount() {
+		if (_count == null) {
+			return 0;
+		}
+		long count = _count.get();
+		return count > 0 ? count : 0;
+	}
+	
+	public void setCount(long currentCount) {
+		if (_count == null) {
+			_count = new AtomicLong();
+		}
+		_count.set(currentCount);
+	}
+	
+	public boolean decreaseCount(long val) {
+		if (_count == null) {
+			return false;
+		}
+		if ((_restockTask == null) || _restockTask.isDone()) {
+			_restockTask = ThreadPoolManager.getInstance().scheduleGeneral(new RestockTask(), getRestockDelay());
+		}
+		boolean result = _count.addAndGet(-val) >= 0;
+		save();
+		return result;
+	}
+	
+	public boolean hasLimitedStock() {
+		return getMaxCount() > -1;
+	}
+	
+	public void restartRestockTask(long nextRestockTime) {
+		long remainTime = nextRestockTime - System.currentTimeMillis();
+		if (remainTime > 0) {
+			_restockTask = ThreadPoolManager.getInstance().scheduleGeneral(new RestockTask(), remainTime);
+		} else {
+			restock();
+		}
+	}
+	
+	public void restock() {
+		setCount(getMaxCount());
+		save();
+	}
+	
+	protected final class RestockTask implements Runnable {
+		@Override
+		public void run() {
+			restock();
+		}
+	}
+	
+	private void save() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO `buylists`(`buylist_id`, `item_id`, `count`, `next_restock_time`) VALUES(?, ?, ?, ?) ON DUPLICATE KEY UPDATE `count` = ?, `next_restock_time` = ?")) {
+			ps.setInt(1, getBuyListId());
+			ps.setInt(2, getItemId());
+			ps.setLong(3, getCount());
+			ps.setLong(5, getCount());
+			if ((_restockTask != null) && (_restockTask.getDelay(TimeUnit.MILLISECONDS) > 0)) {
+				long nextRestockTime = System.currentTimeMillis() + _restockTask.getDelay(TimeUnit.MILLISECONDS);
+				ps.setLong(4, nextRestockTime);
+				ps.setLong(6, nextRestockTime);
+			} else {
+				ps.setLong(4, 0);
+				ps.setLong(6, 0);
+			}
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Failed to save Product buylist_id:{} item_id:{}", getBuyListId(), getItemId(), e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/cleft/CleftCombatAerialTarget.java b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftCombatAerialTarget.java
new file mode 100644
index 00000000..71230eb7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftCombatAerialTarget.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.cleft;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public final class CleftCombatAerialTarget {
+	private final int _id;
+	private final String _name;
+	
+	public CleftCombatAerialTarget(int id, String name) {
+		_id = id;
+		_name = name;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/cleft/CleftMatch.java b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftMatch.java
new file mode 100644
index 00000000..df7de840
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftMatch.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.cleft;
+
+import com.l2jserver.gameserver.enums.Team;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public final class CleftMatch {
+	private final int _minTeamMembers;
+	private final boolean _isBalanced;
+	private final CleftTeam _blueTeam;
+	private final CleftTeam _redTeam;
+	
+	public CleftMatch(int minTeamMembers, boolean isBalanced) {
+		_minTeamMembers = minTeamMembers;
+		_isBalanced = isBalanced;
+		_blueTeam = new CleftTeam(Team.BLUE);
+		_redTeam = new CleftTeam(Team.RED);
+	}
+	
+	public int getMinTeamMembers() {
+		return _minTeamMembers;
+	}
+	
+	public boolean isBalanced() {
+		return _isBalanced;
+	}
+	
+	public CleftTeam getBlueTeam() {
+		return _blueTeam;
+	}
+	
+	public CleftTeam getRedTeam() {
+		return _redTeam;
+	}
+	
+	public int getRemainingSeconds() {
+		// TODO:
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/cleft/CleftParticipant.java b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftParticipant.java
new file mode 100644
index 00000000..8d631651
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftParticipant.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.cleft;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public final class CleftParticipant {
+	private volatile L2PcInstance _player;
+	private volatile CleftTeam _team;
+	private final AtomicInteger _kills;
+	private final AtomicInteger _deaths;
+	private final AtomicInteger _towers;
+	
+	public CleftParticipant(L2PcInstance player, CleftTeam team) {
+		Objects.requireNonNull(player);
+		Objects.requireNonNull(team);
+		
+		_player = player;
+		_team = team;
+		_kills = new AtomicInteger(0);
+		_deaths = new AtomicInteger(0);
+		_towers = new AtomicInteger(0);
+	}
+	
+	public CleftParticipant(L2PcInstance player, CleftTeam team, int kills, int deaths, int towers) {
+		this(player, team);
+		_kills.set(kills);
+		_deaths.set(deaths);
+		_towers.set(towers);
+	}
+	
+	public void setPlayer(L2PcInstance player) {
+		Objects.requireNonNull(player);
+		_player = player;
+	}
+	
+	public void setTeam(CleftTeam team) {
+		Objects.requireNonNull(team);
+		_team = team;
+	}
+	
+	public int addKill() {
+		return _kills.incrementAndGet();
+	}
+	
+	public int addDeath() {
+		return _deaths.incrementAndGet();
+	}
+	
+	public int addTower() {
+		return _towers.incrementAndGet();
+	}
+	
+	public L2PcInstance getPlayer() {
+		return _player;
+	}
+	
+	public CleftTeam getTeam() {
+		return _team;
+	}
+	
+	public int getKills() {
+		return _kills.get();
+	}
+	
+	public int getDeaths() {
+		return _deaths.get();
+	}
+	
+	public int getTowers() {
+		return _towers.get();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/cleft/CleftTeam.java b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftTeam.java
new file mode 100644
index 00000000..f6fc5795
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftTeam.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.cleft;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public final class CleftTeam {
+	private final Team _team;
+	private final Map<Integer, CleftParticipant> _participants;
+	private final AtomicInteger _points;
+	private CleftCombatAerialTarget _combatAerialTarget;
+	
+	public CleftTeam(Team team) {
+		Objects.requireNonNull(team);
+		if (team == Team.NONE) {
+			throw new IllegalArgumentException("Team.NONE not allowed!");
+		}
+		
+		_team = team;
+		_participants = Collections.synchronizedMap(new LinkedHashMap<>());
+		_points = new AtomicInteger(0);
+	}
+	
+	public CleftTeam(Team team, Map<Integer, CleftParticipant> participants, int points) {
+		this(team);
+		_participants.putAll(participants);
+		_points.set(points);
+	}
+	
+	public void addPoints(int points) {
+		_points.addAndGet(points);
+	}
+	
+	public void addParticipant(L2PcInstance player) {
+		_participants.put(player.getObjectId(), new CleftParticipant(player, this));
+	}
+	
+	public CleftParticipant removeParticipant(L2PcInstance player) {
+		return _participants.remove(player.getObjectId());
+	}
+	
+	public void setCombarAerialTarget(int id, String name) {
+		_combatAerialTarget = new CleftCombatAerialTarget(id, name);
+	}
+	
+	public Team getTeam() {
+		return _team;
+	}
+	
+	public Map<Integer, CleftParticipant> getParticipants() {
+		return Collections.unmodifiableMap(_participants);
+	}
+	
+	public int getPoints() {
+		return _points.get();
+	}
+	
+	public CleftCombatAerialTarget getCombatAerialTarget() {
+		return _combatAerialTarget;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/cleft/CleftTowerType.java b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftTowerType.java
new file mode 100644
index 00000000..bfb9d073
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/cleft/CleftTowerType.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.cleft;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public enum CleftTowerType {
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/clientstrings/Builder.java b/src/main/java/com/l2jserver/gameserver/model/clientstrings/Builder.java
new file mode 100644
index 00000000..6883a4c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/clientstrings/Builder.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.clientstrings;
+
+import java.util.ArrayList;
+
+/**
+ * @author Forsaiken
+ * @author Zoey76
+ */
+public abstract class Builder {
+	public abstract String toString(final Object param);
+	
+	public abstract String toString(final Object... params);
+	
+	public abstract int getIndex();
+	
+	public static Builder newBuilder(final String text) {
+		final ArrayList<Builder> builders = new ArrayList<>();
+		
+		int index1 = 0, index2 = 0, paramId, subTextLen;
+		
+		final char[] array = text.toCharArray();
+		final int arrayLength = array.length;
+		
+		char c, c2, c3;
+		for (; index1 < arrayLength; index1++) {
+			c = array[index1];
+			if ((c == '$') && (index1 < (arrayLength - 2))) {
+				c2 = array[index1 + 1];
+				if ((c2 == 'c') || (c2 == 's') || (c2 == 'p') || (c2 == 'C') || (c2 == 'S') || (c2 == 'P')) {
+					c3 = array[index1 + 2];
+					if (Character.isDigit(c3)) {
+						paramId = Character.getNumericValue(c3);
+						subTextLen = index1 - index2;
+						if (subTextLen != 0) {
+							builders.add(new BuilderText(new String(array, index2, subTextLen)));
+						}
+						
+						builders.add(new BuilderObject(paramId));
+						index1 += 2;
+						index2 = index1 + 1;
+					}
+				}
+			}
+		}
+		
+		if (arrayLength >= index1) {
+			subTextLen = index1 - index2;
+			if (subTextLen != 0) {
+				builders.add(new BuilderText(new String(array, index2, subTextLen)));
+			}
+		}
+		
+		if (builders.size() == 1) {
+			return builders.get(0);
+		}
+		return new BuilderContainer(builders.toArray(new Builder[builders.size()]));
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderContainer.java b/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderContainer.java
new file mode 100644
index 00000000..617a2c10
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderContainer.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.clientstrings;
+
+/**
+ * @author Forsaiken
+ */
+final class BuilderContainer extends Builder {
+	private final Builder[] _builders;
+	
+	BuilderContainer(final Builder[] builders) {
+		_builders = builders;
+	}
+	
+	@Override
+	public String toString(final Object param) {
+		return toString(new Object[] {
+			param
+		});
+	}
+	
+	@Override
+	public final String toString(final Object... params) {
+		final int buildersLength = _builders.length;
+		final int paramsLength = params.length;
+		final String[] builds = new String[buildersLength];
+		
+		int buildTextLen = 0;
+		if (paramsLength != 0) {
+			for (int i = buildersLength; i-- > 0;) {
+				var builder = _builders[i];
+				var paramIndex = builder.getIndex();
+				var build = (paramIndex != -1) && (paramIndex < paramsLength) ? builder.toString(params[paramIndex]) : builder.toString();
+				buildTextLen += build.length();
+				builds[i] = build;
+			}
+		} else {
+			for (int i = buildersLength; i-- > 0;) {
+				var build = _builders[i].toString();
+				buildTextLen += build.length();
+				builds[i] = build;
+			}
+		}
+		
+		final var sb = new StringBuilder(buildTextLen);
+		for (int i = 0; i < buildersLength; i++) {
+			sb.append(builds[i]);
+		}
+		return sb.toString();
+	}
+	
+	@Override
+	public int getIndex() {
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderObject.java b/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderObject.java
new file mode 100644
index 00000000..782d41b7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderObject.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.clientstrings;
+
+/**
+ * @author Forsaiken
+ */
+final class BuilderObject extends Builder {
+	private final int _index;
+	
+	BuilderObject(final int id) {
+		if ((id < 1) || (id > 9)) {
+			throw new RuntimeException("Illegal Id: " + id);
+		}
+		_index = id - 1;
+	}
+	
+	@Override
+	public String toString(final Object param) {
+		return param == null ? "null" : param.toString();
+	}
+	
+	@Override
+	public final String toString(final Object... params) {
+		if ((params == null) || (params.length == 0)) {
+			return "null";
+		}
+		return params[0].toString();
+	}
+	
+	@Override
+	public int getIndex() {
+		return _index;
+	}
+	
+	@Override
+	public String toString() {
+		return "[PARAM-" + (_index + 1) + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderText.java b/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderText.java
new file mode 100644
index 00000000..f64946f1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/clientstrings/BuilderText.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.clientstrings;
+
+/**
+ * @author Forsaiken
+ */
+final class BuilderText extends Builder {
+	private final String _text;
+	
+	BuilderText(final String text) {
+		_text = text;
+	}
+	
+	@Override
+	public String toString(final Object param) {
+		return toString();
+	}
+	
+	@Override
+	public final String toString(final Object... params) {
+		return toString();
+	}
+	
+	@Override
+	public int getIndex() {
+		return -1;
+	}
+	
+	@Override
+	public String toString() {
+		return _text;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/clientstrings/Localization.java b/src/main/java/com/l2jserver/gameserver/model/clientstrings/Localization.java
new file mode 100644
index 00000000..d514d090
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/clientstrings/Localization.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.clientstrings;
+
+/**
+ * Localization.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class Localization {
+	private final String lang;
+	private final Builder builder;
+	
+	public Localization(String lang, String text) {
+		this.lang = lang;
+		this.builder = Builder.newBuilder(text);
+	}
+	
+	public String getLanguage() {
+		return lang;
+	}
+	
+	public final String build(Object... params) {
+		return builder.toString(params);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/Condition.java b/src/main/java/com/l2jserver/gameserver/model/conditions/Condition.java
new file mode 100644
index 00000000..9b4be10f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/Condition.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class Condition.
+ * @author mkizub
+ */
+public abstract class Condition implements ConditionListener {
+	private ConditionListener _listener;
+	private String _msg;
+	private int _msgId;
+	private boolean _addName = false;
+	private boolean _result;
+	
+	/**
+	 * Sets the message.
+	 * @param msg the new message
+	 */
+	public final void setMessage(String msg) {
+		_msg = msg;
+	}
+	
+	/**
+	 * Gets the message.
+	 * @return the message
+	 */
+	public final String getMessage() {
+		return _msg;
+	}
+	
+	/**
+	 * Sets the message id.
+	 * @param msgId the new message id
+	 */
+	public final void setMessageId(int msgId) {
+		_msgId = msgId;
+	}
+	
+	/**
+	 * Gets the message id.
+	 * @return the message id
+	 */
+	public final int getMessageId() {
+		return _msgId;
+	}
+	
+	/**
+	 * Adds the name.
+	 */
+	public final void addName() {
+		_addName = true;
+	}
+	
+	/**
+	 * Checks if is adds the name.
+	 * @return true, if is adds the name
+	 */
+	public final boolean isAddName() {
+		return _addName;
+	}
+	
+	/**
+	 * Sets the listener.
+	 * @param listener the new listener
+	 */
+	void setListener(ConditionListener listener) {
+		_listener = listener;
+		notifyChanged();
+	}
+	
+	/**
+	 * Gets the listener.
+	 * @return the listener
+	 */
+	final ConditionListener getListener() {
+		return _listener;
+	}
+	
+	public final boolean test(L2Character caster, L2Character target, Skill skill) {
+		return test(caster, target, skill, null);
+	}
+	
+	public final boolean test(L2Character caster, L2Character target, L2Item item) {
+		return test(caster, target, null, null);
+	}
+	
+	public final boolean test(L2Character caster, L2Character target, Skill skill, L2Item item) {
+		boolean res = testImpl(caster, target, skill, item);
+		if ((_listener != null) && (res != _result)) {
+			_result = res;
+			notifyChanged();
+		}
+		return res;
+	}
+	
+	/**
+	 * Test the condition.
+	 * @param effector the effector
+	 * @param effected the effected
+	 * @param skill the skill
+	 * @param item the item
+	 * @return {@code true} if successful, {@code false} otherwise
+	 */
+	public abstract boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item);
+	
+	@Override
+	public void notifyChanged() {
+		if (_listener != null) {
+			_listener.notifyChanged();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionCategoryType.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionCategoryType.java
new file mode 100644
index 00000000..79df9138
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionCategoryType.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.Set;
+
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Condition Category Type implementation.
+ * @author Adry_85
+ */
+public class ConditionCategoryType extends Condition {
+	private final Set<CategoryType> _categoryTypes;
+	
+	public ConditionCategoryType(Set<CategoryType> categoryTypes) {
+		_categoryTypes = categoryTypes;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		for (CategoryType type : _categoryTypes) {
+			if (effector.isInCategory(type)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionChangeWeapon.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionChangeWeapon.java
new file mode 100644
index 00000000..3a76efc7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionChangeWeapon.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Change Weapon condition.
+ * @author nBd
+ */
+public class ConditionChangeWeapon extends Condition {
+	private final boolean _required;
+	
+	public ConditionChangeWeapon(boolean required) {
+		_required = required;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		
+		if (_required) {
+			final L2Weapon weaponItem = effector.getActiveWeaponItem();
+			if (weaponItem == null) {
+				return false;
+			}
+			
+			if (weaponItem.getChangeWeaponId() == 0) {
+				return false;
+			}
+			return !effector.getActingPlayer().isEnchanting();
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionCheckAbnormal.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionCheckAbnormal.java
new file mode 100644
index 00000000..6464ad18
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionCheckAbnormal.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Check abnormal type and level.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class ConditionCheckAbnormal extends Condition {
+	private final AbnormalType type;
+	private final int level;
+	private final boolean present;
+	
+	public ConditionCheckAbnormal(AbnormalType type, int level, boolean present) {
+		this.type = type;
+		this.level = level;
+		this.present = present;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final var info = effected.getEffectList().getBuffInfoByAbnormalType(type);
+		return present == ((info != null) && (level <= info.getSkill().getAbnormalLvl()));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionGameChance.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionGameChance.java
new file mode 100644
index 00000000..eb8ed2f3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionGameChance.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionGameChance.
+ * @author Advi
+ */
+public class ConditionGameChance extends Condition {
+	private final int _chance;
+	
+	public ConditionGameChance(int chance) {
+		_chance = chance;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return Rnd.get(100) < _chance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionGameTime.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionGameTime.java
new file mode 100644
index 00000000..acf8324f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionGameTime.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionGameTime.
+ * @author mkizub
+ */
+public class ConditionGameTime extends Condition {
+	
+	public enum CheckGameTime {
+		NIGHT
+	}
+	
+	private final CheckGameTime _check;
+	private final boolean _required;
+	
+	public ConditionGameTime(CheckGameTime check, boolean required) {
+		_check = check;
+		_required = required;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (_check == CheckGameTime.NIGHT) {
+			return GameTimeController.getInstance().isNight() == _required;
+		}
+		return !_required;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionInventory.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionInventory.java
new file mode 100644
index 00000000..534a6639
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionInventory.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionInventory.
+ * @author mkizub
+ */
+public abstract class ConditionInventory extends Condition {
+	
+	protected final int _slot;
+	
+	public ConditionInventory(int slot) {
+		_slot = slot;
+	}
+	
+	@Override
+	public abstract boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionItemId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionItemId.java
new file mode 100644
index 00000000..45444c40
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionItemId.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionItemId.
+ * @author mkizub
+ */
+public final class ConditionItemId extends Condition {
+	private final int _itemId;
+	
+	public ConditionItemId(int itemId) {
+		_itemId = itemId;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (item != null) && (item.getId() == _itemId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionListener.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionListener.java
new file mode 100644
index 00000000..32338fce
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionListener.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+/**
+ * The listener interface for receiving condition events.<br>
+ * The class that is interested in processing a condition event implements this interface,<br>
+ * and the object created with that class is registered with a component using the component's<br>
+ * <code>addConditionListener<code> method.<br>
+ * When the condition event occurs, that object's appropriate method is invoked.
+ * @author mkizub
+ */
+public interface ConditionListener {
+	
+	void notifyChanged();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicAnd.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicAnd.java
new file mode 100644
index 00000000..2e525696
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicAnd.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionLogicAnd.
+ * @author mkizub
+ */
+public class ConditionLogicAnd extends Condition {
+	private static final Condition[] EMPTY_CONDITIONS = new Condition[0];
+	public Condition[] conditions = EMPTY_CONDITIONS;
+	
+	public void add(Condition condition) {
+		if (condition == null) {
+			return;
+		}
+		if (getListener() != null) {
+			condition.setListener(this);
+		}
+		final int len = conditions.length;
+		final Condition[] tmp = new Condition[len + 1];
+		System.arraycopy(conditions, 0, tmp, 0, len);
+		tmp[len] = condition;
+		conditions = tmp;
+	}
+	
+	@Override
+	void setListener(ConditionListener listener) {
+		if (listener != null) {
+			for (Condition c : conditions) {
+				c.setListener(this);
+			}
+		} else {
+			for (Condition c : conditions) {
+				c.setListener(null);
+			}
+		}
+		super.setListener(listener);
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		for (Condition c : conditions) {
+			if (!c.test(effector, effected, skill, item)) {
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicNot.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicNot.java
new file mode 100644
index 00000000..23b354dd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicNot.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionLogicNot.
+ * @author mkizub
+ */
+public class ConditionLogicNot extends Condition {
+	private final Condition _condition;
+	
+	public ConditionLogicNot(Condition condition) {
+		_condition = condition;
+		if (getListener() != null) {
+			_condition.setListener(this);
+		}
+	}
+	
+	@Override
+	void setListener(ConditionListener listener) {
+		if (listener != null) {
+			_condition.setListener(this);
+		} else {
+			_condition.setListener(null);
+		}
+		super.setListener(listener);
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return !_condition.test(effector, effected, skill, item);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicOr.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicOr.java
new file mode 100644
index 00000000..5df09fa3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionLogicOr.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionLogicOr.
+ * @author mkizub
+ */
+public class ConditionLogicOr extends Condition {
+	private static final Condition[] EMPTY_CONDITIONS = new Condition[0];
+	public Condition[] conditions = EMPTY_CONDITIONS;
+	
+	public void add(Condition condition) {
+		if (condition == null) {
+			return;
+		}
+		if (getListener() != null) {
+			condition.setListener(this);
+		}
+		final int len = conditions.length;
+		final Condition[] tmp = new Condition[len + 1];
+		System.arraycopy(conditions, 0, tmp, 0, len);
+		tmp[len] = condition;
+		conditions = tmp;
+	}
+	
+	@Override
+	void setListener(ConditionListener listener) {
+		if (listener != null) {
+			for (Condition c : conditions) {
+				c.setListener(this);
+			}
+		} else {
+			for (Condition c : conditions) {
+				c.setListener(null);
+			}
+		}
+		super.setListener(listener);
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		for (Condition c : conditions) {
+			if (c.test(effector, effected, skill, item)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionMinDistance.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionMinDistance.java
new file mode 100644
index 00000000..c8eb1f7c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionMinDistance.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionMinDistance.
+ * @author Didldak
+ */
+public class ConditionMinDistance extends Condition {
+	private final int _sqDistance;
+	
+	public ConditionMinDistance(int sqDistance) {
+		_sqDistance = sqDistance;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effected != null) && (effector.calculateDistance(effected, true, true) >= _sqDistance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpCompanion.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpCompanion.java
new file mode 100644
index 00000000..c53ed2cd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpCompanion.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.model.conditions.ConditionOpCompanion.CompanionType.PET;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_CANNOT_BE_USED;
+import static com.l2jserver.gameserver.network.serverpackets.SystemMessage.getSystemMessage;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Operator Companion condition.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class ConditionOpCompanion extends Condition {
+	private final CompanionType type;
+	
+	public ConditionOpCompanion(String type) {
+		this.type = CompanionType.valueOf(type);
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (type == PET) {
+			if (!effected.isPet()) {
+				effector.sendPacket(getSystemMessage(S1_CANNOT_BE_USED).addSkillName(skill));
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	public enum CompanionType {
+		PET
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpExistNpc.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpExistNpc.java
new file mode 100644
index 00000000..e10ade93
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpExistNpc.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.Set;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Exist NPC condition.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class ConditionOpExistNpc extends Condition {
+	
+	private final Set<Integer> npcIds;
+	private final int radius;
+	private final boolean present;
+	
+	public ConditionOpExistNpc(Set<Integer> npcIds, int radius, boolean present) {
+		this.npcIds = npcIds;
+		this.radius = radius;
+		this.present = present;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean isPresent = false;
+		for (var obj : L2World.getInstance().getVisibleObjects(effector, radius)) {
+			if (!obj.isNpc()) {
+				continue;
+			}
+			
+			if (npcIds.contains(obj.getId())) {
+				isPresent = true;
+				break;
+			}
+		}
+		return isPresent == present;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpResurrection.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpResurrection.java
new file mode 100644
index 00000000..6fbbb93f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionOpResurrection.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.model.zone.ZoneId.SIEGE;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_BE_RESURRECTED_DURING_SIEGE;
+import static com.l2jserver.gameserver.network.SystemMessageId.REJECT_RESURRECTION;
+import static com.l2jserver.gameserver.network.SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Operator Resurrection condition.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class ConditionOpResurrection extends Condition {
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effected == null) || !(effected.isPlayer() || effected.isPet()) || !effected.isDead()) {
+			return false;
+		}
+		
+		if (effected.isResurrectionBlocked()) {
+			effector.sendPacket(REJECT_RESURRECTION);
+			return false;
+		}
+		
+		final L2PcInstance player = effected.getActingPlayer();
+		if (effected.isPlayer() && player.isReviveRequested()) {
+			effector.sendPacket(RES_HAS_ALREADY_BEEN_PROPOSED);
+			return false;
+		}
+		
+		if (effected.isPet() && player.isRevivingPet()) {
+			effector.sendPacket(RES_HAS_ALREADY_BEEN_PROPOSED);
+			return false;
+		}
+		
+		if (player.isInsideZone(SIEGE) && !player.isInSiege()) {
+			effector.sendPacket(CANNOT_BE_RESURRECTED_DURING_SIEGE);
+			return false;
+		}
+		
+		if (player.isFestivalParticipant()) {
+			effector.sendMessage("You may not resurrect participants in a festival.");
+			return false;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveEffectId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveEffectId.java
new file mode 100644
index 00000000..af62be29
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveEffectId.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionPlayerActiveEffectId.
+ */
+public class ConditionPlayerActiveEffectId extends Condition {
+	
+	private final int _effectId;
+	private final int _effectLvl;
+	
+	public ConditionPlayerActiveEffectId(int effectId) {
+		_effectId = effectId;
+		_effectLvl = -1;
+	}
+	
+	public ConditionPlayerActiveEffectId(int effectId, int effectLevel) {
+		_effectId = effectId;
+		_effectLvl = effectLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final BuffInfo info = effector.getEffectList().getBuffInfoBySkillId(_effectId);
+		return ((info != null) && ((_effectLvl == -1) || (_effectLvl <= info.getSkill().getLevel())));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveSkillId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveSkillId.java
new file mode 100644
index 00000000..e7a7ce4b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerActiveSkillId.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionPlayerActiveSkillId.
+ * @author DrHouse
+ */
+public class ConditionPlayerActiveSkillId extends Condition {
+	private final int _skillId;
+	private final int _skillLevel;
+	
+	public ConditionPlayerActiveSkillId(int skillId) {
+		_skillId = skillId;
+		_skillLevel = -1;
+	}
+	
+	public ConditionPlayerActiveSkillId(int skillId, int skillLevel) {
+		_skillId = skillId;
+		_skillLevel = skillLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		for (Skill sk : effector.getAllSkills()) {
+			if (sk != null) {
+				if (sk.getId() == _skillId) {
+					if ((_skillLevel == -1) || (_skillLevel <= sk.getLevel())) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionEnergy.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionEnergy.java
new file mode 100644
index 00000000..7eb4a6a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionEnergy.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.PAPERDOLL_LBRACELET;
+
+import com.l2jserver.gameserver.agathion.repository.AgathionRepository;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Condition agathion energy.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ConditionPlayerAgathionEnergy extends Condition {
+	
+	private final int energy;
+	
+	public ConditionPlayerAgathionEnergy(int energy) {
+		this.energy = energy;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (!effector.isPlayer()) {
+			return false;
+		}
+		
+		final var player = effector.getActingPlayer();
+		final var agathionInfo = AgathionRepository.getInstance().getByNpcId(player.getAgathionId());
+		if ((agathionInfo == null) || (agathionInfo.maxEnergy() <= 0)) {
+			return false;
+		}
+		
+		final var agathionItem = player.getInventory().getPaperdollItem(PAPERDOLL_LBRACELET);
+		if ((agathionItem == null) || (agathionInfo.itemId() != agathionItem.getId())) {
+			return false;
+		}
+		return agathionItem.getAgathionRemainingEnergy() >= energy;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionId.java
new file mode 100644
index 00000000..06fc3da3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerAgathionId.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Condition Player Agathion Id.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ConditionPlayerAgathionId extends Condition {
+	
+	private final int _agathionId;
+	
+	public ConditionPlayerAgathionId(int agathionId) {
+		_agathionId = agathionId;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return effector.isPlayer() && (effector.getActingPlayer().getAgathionId() == _agathionId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerBaseStats.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerBaseStats.java
new file mode 100644
index 00000000..8046dc20
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerBaseStats.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionPlayerBaseStats.
+ * @author mkizub
+ */
+public class ConditionPlayerBaseStats extends Condition {
+	
+	private final BaseStat _stat;
+	private final int _value;
+	
+	/**
+	 * Instantiates a new condition player base stats.
+	 * @param player the player
+	 * @param stat the stat
+	 * @param value the value
+	 */
+	public ConditionPlayerBaseStats(L2Character player, BaseStat stat, int value) {
+		_stat = stat;
+		_value = value;
+	}
+	
+	/**
+	 * Test impl.
+	 * @return true, if successful
+	 */
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		final L2PcInstance player = effector.getActingPlayer();
+		return switch (_stat) {
+			case Int -> player.getINT() >= _value;
+			case Str -> player.getSTR() >= _value;
+			case Con -> player.getCON() >= _value;
+			case Dex -> player.getDEX() >= _value;
+			case Men -> player.getMEN() >= _value;
+			case Wit -> player.getWIT() >= _value;
+		};
+	}
+}
+
+enum BaseStat {
+	Int,
+	Str,
+	Con,
+	Dex,
+	Men,
+	Wit
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCallPc.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCallPc.java
new file mode 100644
index 00000000..b220aa9d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCallPc.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Player Call Pc condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCallPc extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCallPc(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean canCallPlayer = true;
+		final L2PcInstance player = effector.getActingPlayer();
+		
+		if (player == null) {
+			canCallPlayer = false;
+		} else if (player.isInOlympiadMode()) {
+			player.sendPacket(SystemMessageId.YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION);
+			canCallPlayer = false;
+		} else if (player.inObserverMode()) {
+			canCallPlayer = false;
+		} else if (!TvTEvent.onEscapeUse(player.getObjectId())) {
+			player.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
+			canCallPlayer = false;
+		} else if (player.isInsideZone(ZoneId.NO_SUMMON_FRIEND) || player.isInsideZone(ZoneId.JAIL) || player.isFlyingMounted()) {
+			player.sendPacket(SystemMessageId.YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING);
+			canCallPlayer = false;
+		}
+		return (_val == canCallPlayer);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanCreateBase.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanCreateBase.java
new file mode 100644
index 00000000..8b5ce447
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanCreateBase.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.config.Configuration.fortSiege;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Player Can Create Base condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanCreateBase extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanCreateBase(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return !_val;
+		}
+		
+		final L2PcInstance player = effector.getActingPlayer();
+		boolean canCreateBase = true;
+		if (player.isAlikeDead() || player.isCursedWeaponEquipped() || (player.getClan() == null)) {
+			canCreateBase = false;
+		}
+		
+		final Castle castle = CastleManager.getInstance().getCastle(player);
+		final Fort fort = FortManager.getInstance().getFort(player);
+		final SystemMessage sm;
+		if ((castle == null) && (fort == null)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			canCreateBase = false;
+		} else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress())) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			canCreateBase = false;
+		} else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()) == null))) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			canCreateBase = false;
+		} else if (!player.isClanLeader()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			canCreateBase = false;
+		} else if (((castle != null) && (castle.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= SiegeManager.getInstance().getFlagMaxCount())) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClan()).getNumFlags() >= fortSiege().getMaxFlags()))) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			canCreateBase = false;
+		} else if (!player.isInsideZone(ZoneId.HQ)) {
+			player.sendPacket(SystemMessageId.NOT_SET_UP_BASE_HERE);
+			canCreateBase = false;
+		}
+		return (_val == canCreateBase);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java
new file mode 100644
index 00000000..00a1e8aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Player Can Create Outpost condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanCreateOutpost extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanCreateOutpost(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return !_val;
+		}
+		
+		final L2PcInstance player = effector.getActingPlayer();
+		boolean canCreateOutpost = true;
+		if (player.isAlikeDead() || player.isCursedWeaponEquipped() || (player.getClan() == null)) {
+			canCreateOutpost = false;
+		}
+		
+		final Castle castle = CastleManager.getInstance().getCastle(player);
+		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((castle == null) && (fort == null)) {
+			canCreateOutpost = false;
+		}
+		
+		if (((fort != null) && (fort.getResidenceId() == 0)) || ((castle != null) && (castle.getResidenceId() == 0))) {
+			player.sendMessage("You must be on fort or castle ground to construct an outpost or flag.");
+			canCreateOutpost = false;
+		} else if (((fort != null) && !fort.getZone().isActive()) || ((castle != null) && !castle.getZone().isActive())) {
+			player.sendMessage("You can only construct an outpost or flag on siege field.");
+			canCreateOutpost = false;
+		} else if (!player.isClanLeader()) {
+			player.sendMessage("You must be a clan leader to construct an outpost or flag.");
+			canCreateOutpost = false;
+		} else if (TerritoryWarManager.getInstance().getHQForClan(player.getClan()) != null) {
+			player.sendPacket(SystemMessageId.NOT_ANOTHER_HEADQUARTERS);
+			canCreateOutpost = false;
+		} else if (TerritoryWarManager.getInstance().getFlagForClan(player.getClan()) != null) {
+			player.sendPacket(SystemMessageId.A_FLAG_IS_ALREADY_BEING_DISPLAYED_ANOTHER_FLAG_CANNOT_BE_DISPLAYED);
+			canCreateOutpost = false;
+		} else if (!player.isInsideZone(ZoneId.HQ)) {
+			player.sendPacket(SystemMessageId.NOT_SET_UP_BASE_HERE);
+			canCreateOutpost = false;
+		}
+		return (_val == canCreateOutpost);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanEscape.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanEscape.java
new file mode 100644
index 00000000..120f8bc4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanEscape.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.instancemanager.GrandBossManager;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Player Can Escape condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanEscape extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanEscape(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean canTeleport = true;
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player == null) {
+			canTeleport = false;
+		} else if (!TvTEvent.onEscapeUse(player.getObjectId())) {
+			canTeleport = false;
+		} else if (player.isInDuel()) {
+			canTeleport = false;
+		} else if (player.isAfraid()) {
+			canTeleport = false;
+		} else if (player.isCombatFlagEquipped()) {
+			canTeleport = false;
+		} else if (player.isFlying() || player.isFlyingMounted()) {
+			canTeleport = false;
+		} else if (player.isInOlympiadMode()) {
+			canTeleport = false;
+		} else if ((GrandBossManager.getInstance().getZone(player) != null) && !player.canOverrideCond(PcCondOverride.SKILL_CONDITIONS)) {
+			canTeleport = false;
+		}
+		return (_val == canTeleport);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java
new file mode 100644
index 00000000..6e8eaea7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanRefuelAirship.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Player Can Refuel Airship condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanRefuelAirship extends Condition {
+	private final int _val;
+	
+	public ConditionPlayerCanRefuelAirship(int val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean canRefuelAirship = true;
+		final L2PcInstance player = effector.getActingPlayer();
+		if ((player == null) || (player.getAirShip() == null) || !(player.getAirShip() instanceof L2ControllableAirShipInstance) || ((player.getAirShip().getFuel() + _val) > player.getAirShip().getMaxFuel())) {
+			canRefuelAirship = false;
+		}
+		return canRefuelAirship;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummon.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummon.java
new file mode 100644
index 00000000..ac5a7c93
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummon.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.data.sql.impl.CharSummonTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Player Can Summon condition implementation.
+ * @author Zoey76
+ */
+public class ConditionPlayerCanSummon extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanSummon(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player == null) {
+			return false;
+		}
+		
+		boolean canSummon = true;
+		if (character().restoreServitorOnReconnect() && CharSummonTable.getInstance().getServitors().containsKey(player.getObjectId())) {
+			player.sendPacket(SystemMessageId.SUMMON_ONLY_ONE);
+			canSummon = false;
+		} else if (character().restorePetOnReconnect() && CharSummonTable.getInstance().getPets().containsKey(player.getObjectId())) {
+			player.sendPacket(SystemMessageId.SUMMON_ONLY_ONE);
+			canSummon = false;
+		} else if (player.hasSummon()) {
+			player.sendPacket(SystemMessageId.SUMMON_ONLY_ONE);
+			canSummon = false;
+		} else if (player.isFlyingMounted() || player.isMounted()) {
+			canSummon = false;
+		}
+		return (_val == canSummon);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java
new file mode 100644
index 00000000..6939e969
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Player Can Summon Siege Golem implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanSummonSiegeGolem extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanSummonSiegeGolem(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return !_val;
+		}
+		
+		final L2PcInstance player = effector.getActingPlayer();
+		boolean canSummonSiegeGolem = true;
+		if (player.isAlikeDead() || player.isCursedWeaponEquipped() || (player.getClan() == null)) {
+			canSummonSiegeGolem = false;
+		}
+		
+		final Castle castle = CastleManager.getInstance().getCastle(player);
+		final Fort fort = FortManager.getInstance().getFort(player);
+		if ((castle == null) && (fort == null)) {
+			canSummonSiegeGolem = false;
+		}
+		
+		if (((fort != null) && (fort.getResidenceId() == 0)) || ((castle != null) && (castle.getResidenceId() == 0))) {
+			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			canSummonSiegeGolem = false;
+		} else if (((castle != null) && !castle.getSiege().isInProgress()) || ((fort != null) && !fort.getSiege().isInProgress())) {
+			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			canSummonSiegeGolem = false;
+		} else if ((player.getClanId() != 0) && (((castle != null) && (castle.getSiege().getAttackerClan(player.getClanId()) == null)) || ((fort != null) && (fort.getSiege().getAttackerClan(player.getClanId()) == null)))) {
+			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			canSummonSiegeGolem = false;
+		} else if ((SevenSigns.getInstance().checkSummonConditions(player))) {
+			canSummonSiegeGolem = false;
+		}
+		return (_val == canSummonSiegeGolem);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSweep.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSweep.java
new file mode 100644
index 00000000..6d8856d1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanSweep.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.network.SystemMessageId.SWEEPER_FAILED_TARGET_NOT_SPOILED;
+
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Checks Sweeper conditions:
+ * <ul>
+ * <li>Minimum checks, player not null, skill not null.</li>
+ * <li>Checks if the target isn't null, is dead and spoiled.</li>
+ * <li>Checks if the sweeper player is the target spoiler, or is in the spoiler party.</li>
+ * <li>Checks if the corpse is too old.</li>
+ * <li>Checks inventory limit and weight max load won't be exceed after sweep.</li>
+ * </ul>
+ * If two or more conditions aren't meet at the same time, one message per condition will be shown.
+ * @author Zoey76
+ */
+public class ConditionPlayerCanSweep extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanSweep(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean canSweep = false;
+		final var sweeper = effector.getActingPlayer();
+		if (sweeper != null) {
+			if (skill != null) {
+				final var targets = skill.getTargets(sweeper);
+				for (var object : targets) {
+					if (!object.isAttackable()) {
+						continue;
+					}
+					
+					final var target = (L2Attackable) object;
+					if (!target.isDead()) {
+						continue;
+					}
+					
+					if (target.isSpoiled()) {
+						canSweep = target.checkSpoilOwner(sweeper, true);
+						canSweep &= !target.isOldCorpse(sweeper, npc().getCorpseConsumeSkillAllowedTimeBeforeDecay(), true);
+						canSweep &= sweeper.getInventory().checkInventorySlotsAndWeight(target.getSpoilLootItems(), true, true);
+					} else {
+						sweeper.sendPacket(SWEEPER_FAILED_TARGET_NOT_SPOILED);
+					}
+				}
+			}
+		}
+		return (_val == canSweep);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
new file mode 100644
index 00000000..5a8ac5dc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeCastle.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Player Can Take Castle condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanTakeCastle extends Condition {
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return false;
+		}
+		
+		final L2PcInstance player = effector.getActingPlayer();
+		
+		if (player.isAlikeDead() || player.isCursedWeaponEquipped() || !player.isClanLeader()) {
+			return false;
+		}
+		
+		Castle castle = CastleManager.getInstance().getCastle(player);
+		SystemMessage sm;
+		if ((castle == null) || (castle.getResidenceId() <= 0) || !castle.getSiege().isInProgress() || (castle.getSiege().getAttackerClan(player.getClan()) == null)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			return false;
+		} else if (!castle.getArtefacts().contains(effected)) {
+			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			return false;
+		} else if (!Util.checkIfInRange(skill.getCastRange(), player, effected, true)) {
+			player.sendPacket(SystemMessageId.DIST_TOO_FAR_CASTING_STOPPED);
+			return false;
+		}
+		castle.getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.OPPONENT_STARTED_ENGRAVING), false);
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeFort.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeFort.java
new file mode 100644
index 00000000..a196a343
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTakeFort.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Player Can Take Fort condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanTakeFort extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanTakeFort(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return !_val;
+		}
+		
+		final L2PcInstance player = effector.getActingPlayer();
+		boolean canTakeFort = true;
+		if (player.isAlikeDead() || player.isCursedWeaponEquipped() || !player.isClanLeader()) {
+			canTakeFort = false;
+		}
+		
+		final Fort fort = FortManager.getInstance().getFort(player);
+		final SystemMessage sm;
+		if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(skill);
+			player.sendPacket(sm);
+			canTakeFort = false;
+		} else if (fort.getFlagPole() != effected) {
+			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			canTakeFort = false;
+		} else if (!Util.checkIfInRange(200, player, effected, true)) {
+			player.sendPacket(SystemMessageId.DIST_TOO_FAR_CASTING_STOPPED);
+			canTakeFort = false;
+		}
+		return (_val == canTakeFort);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTransform.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTransform.java
new file mode 100644
index 00000000..710ee33d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanTransform.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Player Can Transform condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanTransform extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanTransform(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean canTransform = true;
+		final L2PcInstance player = effector.getActingPlayer();
+		if ((player == null) || player.isAlikeDead() || player.isCursedWeaponEquipped()) {
+			canTransform = false;
+		} else if (player.isSitting()) {
+			player.sendPacket(SystemMessageId.CANNOT_TRANSFORM_WHILE_SITTING);
+			canTransform = false;
+		} else if (player.isTransformed() || player.isInStance()) {
+			player.sendPacket(SystemMessageId.YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN);
+			canTransform = false;
+		} else if (player.isInWater()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER);
+			canTransform = false;
+		} else if (player.isFlyingMounted() || player.isMounted()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_POLYMORPH_WHILE_RIDING_A_PET);
+			canTransform = false;
+		}
+		return (_val == canTransform);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanUntransform.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanUntransform.java
new file mode 100644
index 00000000..ba8cb5dd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCanUntransform.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Player Can Untransform condition implementation.
+ * @author Adry_85
+ */
+public class ConditionPlayerCanUntransform extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCanUntransform(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean canUntransform = true;
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player == null) {
+			canUntransform = false;
+		} else if (player.isAlikeDead() || player.isCursedWeaponEquipped()) {
+			canUntransform = false;
+		} else if ((player.isTransformed() || player.isInStance()) && player.isFlyingMounted() && !player.isInsideZone(ZoneId.LANDING)) {
+			player.sendPacket(SystemMessageId.TOO_HIGH_TO_PERFORM_THIS_ACTION); // TODO: check if message is retail like.
+			canUntransform = false;
+		}
+		return (_val == canUntransform);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCharges.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCharges.java
new file mode 100644
index 00000000..1e74da0c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCharges.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Player charges condition.
+ */
+public class ConditionPlayerCharges extends Condition {
+	private final int _charges;
+	
+	public ConditionPlayerCharges(int charges) {
+		_charges = charges;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getCharges() >= _charges);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java
new file mode 100644
index 00000000..60d5bf93
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Class Id restriction condition.
+ */
+public class ConditionPlayerClassIdRestriction extends Condition {
+	private final List<Integer> _classIds;
+	
+	public ConditionPlayerClassIdRestriction(List<Integer> classId) {
+		_classIds = classId;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector.getActingPlayer() != null) && (_classIds.contains(effector.getActingPlayer().getClassId().getId()));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCloakStatus.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCloakStatus.java
new file mode 100644
index 00000000..1af07bbe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCloakStatus.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Cloak status condition.
+ */
+public class ConditionPlayerCloakStatus extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerCloakStatus(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getInventory().canEquipCloak() == _val);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCp.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCp.java
new file mode 100644
index 00000000..0e4546ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerCp.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * CP condition.
+ */
+public class ConditionPlayerCp extends Condition {
+	
+	private final int _cp;
+	
+	public ConditionPlayerCp(int cp) {
+		_cp = cp;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector != null) && (((effector.getCurrentCp() * 100) / effector.getMaxCp()) >= _cp);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerFlyMounted.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerFlyMounted.java
new file mode 100644
index 00000000..ddfebc3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerFlyMounted.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Fly mounted condition.
+ * @author kerberos
+ */
+public class ConditionPlayerFlyMounted extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerFlyMounted(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector.getActingPlayer() == null) || (effector.getActingPlayer().isFlyingMounted() == _val);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerGrade.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerGrade.java
new file mode 100644
index 00000000..35807b07
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerGrade.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Grade condition.
+ * @author Gigiikun
+ */
+public final class ConditionPlayerGrade extends Condition {
+	// conditional values
+	public static final int COND_NO_GRADE = 0x0001;
+	public static final int COND_D_GRADE = 0x0002;
+	public static final int COND_C_GRADE = 0x0004;
+	public static final int COND_B_GRADE = 0x0008;
+	public static final int COND_A_GRADE = 0x0010;
+	public static final int COND_S_GRADE = 0x0020;
+	public static final int COND_S80_GRADE = 0x0040;
+	public static final int COND_S84_GRADE = 0x0080;
+	
+	private final int _value;
+	
+	public ConditionPlayerGrade(int value) {
+		_value = value;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector.getActingPlayer() != null) && (_value == (byte) effector.getActingPlayer().getExpertiseLevel());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasAgathion.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasAgathion.java
new file mode 100644
index 00000000..9de121a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasAgathion.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Condition has agathion.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ConditionPlayerHasAgathion extends Condition {
+	
+	private final boolean expectedValue;
+	
+	public ConditionPlayerHasAgathion(boolean expectedValue) {
+		this.expectedValue = expectedValue;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return expectedValue == (effector.isPlayer() && (effector.getActingPlayer().getAgathionId() > 0));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasCastle.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasCastle.java
new file mode 100644
index 00000000..54a5b564
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasCastle.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Has castle condition.
+ * @author MrPoke
+ */
+public final class ConditionPlayerHasCastle extends Condition {
+	
+	private final int _castle;
+	
+	public ConditionPlayerHasCastle(int castle) {
+		_castle = castle;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		
+		final L2Clan clan = effector.getActingPlayer().getClan();
+		if (clan == null) {
+			return _castle == 0;
+		}
+		
+		// Any castle
+		if (_castle == -1) {
+			return clan.getCastleId() > 0;
+		}
+		return clan.getCastleId() == _castle;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasClanHall.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasClanHall.java
new file mode 100644
index 00000000..27c197aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasClanHall.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Has clan hall condition.
+ * @author MrPoke
+ */
+public final class ConditionPlayerHasClanHall extends Condition {
+	private final List<Integer> _clanHalls;
+	
+	public ConditionPlayerHasClanHall(List<Integer> clanHalls) {
+		_clanHalls = clanHalls;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		
+		final L2Clan clan = effector.getActingPlayer().getClan();
+		if (clan == null) {
+			return ((_clanHalls.size() == 1) && (_clanHalls.get(0) == 0));
+		}
+		
+		// All Clan Hall
+		if ((_clanHalls.size() == 1) && (_clanHalls.get(0) == -1)) {
+			return clan.getHideoutId() > 0;
+		}
+		return _clanHalls.contains(clan.getHideoutId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFort.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFort.java
new file mode 100644
index 00000000..2602d13e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasFort.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Has fort condition.
+ * @author MrPoke
+ */
+public final class ConditionPlayerHasFort extends Condition {
+	private final int _fort;
+	
+	public ConditionPlayerHasFort(int fort) {
+		_fort = fort;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		
+		final L2Clan clan = effector.getActingPlayer().getClan();
+		if (clan == null) {
+			return _fort == 0;
+		}
+		
+		// Any fortress
+		if (_fort == -1) {
+			return clan.getFortId() > 0;
+		}
+		return clan.getFortId() == _fort;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java
new file mode 100644
index 00000000..cf490567
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasPet.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Has pet condition.
+ */
+public class ConditionPlayerHasPet extends Condition {
+	private final List<Integer> _controlItemIds;
+	
+	public ConditionPlayerHasPet(List<Integer> itemIds) {
+		if ((itemIds.size() == 1) && (itemIds.get(0) == 0)) {
+			_controlItemIds = null;
+		} else {
+			_controlItemIds = itemIds;
+		}
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector.getActingPlayer() == null) || (!(effector.getActingPlayer().getSummon() instanceof L2PetInstance))) {
+			return false;
+		}
+		
+		if (_controlItemIds == null) {
+			return true;
+		}
+		
+		final L2ItemInstance controlItem = ((L2PetInstance) effector.getActingPlayer().getSummon()).getControlItem();
+		return (controlItem != null) && _controlItemIds.contains(controlItem.getId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasServitor.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasServitor.java
new file mode 100644
index 00000000..5688c58b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHasServitor.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Has servitor condition.
+ * @author Zealar
+ */
+public class ConditionPlayerHasServitor extends Condition {
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector.getActingPlayer() == null)) {
+			return false;
+		}
+		
+		if (!effector.getActingPlayer().hasSummon()) {
+			effector.sendPacket(SystemMessageId.CANNOT_USE_SKILL_WITHOUT_SERVITOR);
+			return false;
+		}
+		
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHp.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHp.java
new file mode 100644
index 00000000..3dedf89d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerHp.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * HP condition.
+ * @author mr
+ */
+public class ConditionPlayerHp extends Condition {
+	private final int _hp;
+	
+	public ConditionPlayerHp(int hp) {
+		_hp = hp;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector != null) && (((effector.getCurrentHp() * 100) / effector.getMaxHp()) <= _hp);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInsideZoneId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInsideZoneId.java
new file mode 100644
index 00000000..bf7aadf5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInsideZoneId.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * Inside zone Id condition.
+ * @author UnAfraid
+ */
+public class ConditionPlayerInsideZoneId extends Condition {
+	private final List<Integer> _zones;
+	
+	public ConditionPlayerInsideZoneId(List<Integer> zones) {
+		_zones = zones;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		
+		for (L2ZoneType zone : ZoneManager.getInstance().getZones(effector)) {
+			if (_zones.contains(zone.getId())) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInstanceId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInstanceId.java
new file mode 100644
index 00000000..cc8833c3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInstanceId.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.ArrayList;
+
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Instance Id condition.
+ */
+public class ConditionPlayerInstanceId extends Condition {
+	private final ArrayList<Integer> _instanceIds;
+	
+	public ConditionPlayerInstanceId(ArrayList<Integer> instanceIds) {
+		_instanceIds = instanceIds;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		
+		final int instanceId = effector.getInstanceId();
+		if (instanceId <= 0) {
+			return false; // player not in instance
+		}
+		
+		final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(effector.getActingPlayer());
+		if ((world == null) || (world.getInstanceId() != instanceId)) {
+			return false; // player in the different instance
+		}
+		return _instanceIds.contains(world.getTemplateId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInvSize.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInvSize.java
new file mode 100644
index 00000000..10303a62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerInvSize.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Inventory size condition.
+ * @author Kerberos
+ */
+public class ConditionPlayerInvSize extends Condition {
+	
+	private final int _size;
+	
+	public ConditionPlayerInvSize(int size) {
+		_size = size;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() != null) {
+			return effector.getActingPlayer().getInventory().getSize(false) <= (effector.getActingPlayer().getInventoryLimit() - _size);
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsClanLeader.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsClanLeader.java
new file mode 100644
index 00000000..1157d6a6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsClanLeader.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Clan leader condition.
+ */
+public class ConditionPlayerIsClanLeader extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerIsClanLeader(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		return (effector.getActingPlayer().isClanLeader() == _val);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsHero.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsHero.java
new file mode 100644
index 00000000..61b71b6d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerIsHero.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Hero condition.
+ */
+public class ConditionPlayerIsHero extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerIsHero(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		return (effector.getActingPlayer().isHero() == _val);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLandingZone.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLandingZone.java
new file mode 100644
index 00000000..b51f1664
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLandingZone.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * Landing zone condition.
+ * @author kerberos
+ */
+public class ConditionPlayerLandingZone extends Condition {
+	
+	private final boolean _val;
+	
+	public ConditionPlayerLandingZone(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return effector.isInsideZone(ZoneId.LANDING) == _val;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevel.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevel.java
new file mode 100644
index 00000000..f7f7bae1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevel.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Level condition.
+ * @author mkizub
+ */
+public class ConditionPlayerLevel extends Condition {
+	private final int _level;
+	
+	public ConditionPlayerLevel(int level) {
+		_level = level;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return effector.getLevel() >= _level;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevelRange.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevelRange.java
new file mode 100644
index 00000000..7b4d4aff
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerLevelRange.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Level range condition.
+ * @author Zoey76
+ */
+public class ConditionPlayerLevelRange extends Condition {
+	
+	private final int minimumLevel;
+	
+	private final int maximumLevel;
+	
+	public ConditionPlayerLevelRange(int minimumLevel, int maximumLevel) {
+		this.minimumLevel = minimumLevel;
+		this.maximumLevel = maximumLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final int level = effector.getLevel();
+		return (level >= minimumLevel) && (level <= maximumLevel);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerMp.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerMp.java
new file mode 100644
index 00000000..7fabfea1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerMp.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * MP condition.
+ */
+public class ConditionPlayerMp extends Condition {
+	private final int _mp;
+	
+	public ConditionPlayerMp(int mp) {
+		_mp = mp;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return ((effector.getCurrentMp() * 100) / effector.getMaxMp()) <= _mp;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPkCount.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPkCount.java
new file mode 100644
index 00000000..e19de502
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPkCount.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * PK count condition.
+ */
+public class ConditionPlayerPkCount extends Condition {
+	public final int _pk;
+	
+	public ConditionPlayerPkCount(int pk) {
+		_pk = pk;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		return effector.getActingPlayer().getPkKills() <= _pk;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPledgeClass.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPledgeClass.java
new file mode 100644
index 00000000..9ffc937d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerPledgeClass.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Pledge class condition.
+ * @author MrPoke
+ */
+public final class ConditionPlayerPledgeClass extends Condition {
+	private final int _pledgeClass;
+	
+	public ConditionPlayerPledgeClass(int pledgeClass) {
+		_pledgeClass = pledgeClass;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null)) {
+			return false;
+		}
+		return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRace.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRace.java
new file mode 100644
index 00000000..d0855ce8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRace.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.Set;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Race condition.
+ * @author Zoey76
+ */
+public class ConditionPlayerRace extends Condition {
+	private final Set<Race> races;
+	
+	public ConditionPlayerRace(Race[] races) {
+		this.races = Set.of(races);
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return effector.isPlayer() && races.contains(effector.getActingPlayer().getRace());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java
new file mode 100644
index 00000000..7e95260a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Exist NPC condition.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public class ConditionPlayerRangeFromNpc extends Condition {
+	
+	private final int[] _npcIds;
+	
+	private final int _radius;
+	
+	private final boolean _val;
+	
+	public ConditionPlayerRangeFromNpc(int[] npcIds, int radius, boolean val) {
+		_npcIds = npcIds;
+		_radius = radius;
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		boolean existNpc = false;
+		if ((_npcIds != null) && (_npcIds.length > 0) && (_radius > 0)) {
+			for (L2Character target : effector.getKnownList().getKnownCharactersInRadius(_radius)) {
+				if (target.isNpc() && Util.contains(_npcIds, target.getId())) {
+					existNpc = true;
+					break;
+				}
+			}
+		}
+		return existNpc == _val;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSex.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSex.java
new file mode 100644
index 00000000..500ca3bd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSex.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Sex condition.
+ */
+public class ConditionPlayerSex extends Condition {
+	// male 0 female 1
+	private final int _sex;
+	
+	public ConditionPlayerSex(int sex) {
+		_sex = sex;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSiegeSide.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSiegeSide.java
new file mode 100644
index 00000000..6cb99e3e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSiegeSide.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Siege side condition.
+ */
+public class ConditionPlayerSiegeSide extends Condition {
+	private final int _siegeSide;
+	
+	public ConditionPlayerSiegeSide(int side) {
+		_siegeSide = side;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return false;
+		}
+		return effector.getActingPlayer().getSiegeSide() == _siegeSide;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSouls.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSouls.java
new file mode 100644
index 00000000..447a1454
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSouls.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Souls condition.
+ */
+public class ConditionPlayerSouls extends Condition {
+	private final int _souls;
+	
+	public ConditionPlayerSouls(int souls) {
+		_souls = souls;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getChargedSouls() >= _souls);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerState.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerState.java
new file mode 100644
index 00000000..e375e221
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerState.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.PlayerState;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * State condition.
+ * @author mkizub
+ */
+public class ConditionPlayerState extends Condition {
+	private final PlayerState _check;
+	private final boolean _required;
+	
+	public ConditionPlayerState(PlayerState check, boolean required) {
+		_check = check;
+		_required = required;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final L2PcInstance player = effector.getActingPlayer();
+		switch (_check) {
+			case RESTING:
+				if (player != null) {
+					return (player.isSitting() == _required);
+				}
+				return !_required;
+			case MOVING:
+				return effector.isMoving() == _required;
+			case RUNNING:
+				return effector.isRunning() == _required;
+			case STANDING:
+				if (player != null) {
+					return (_required != (player.isSitting() || player.isMoving()));
+				}
+				return (_required != effector.isMoving());
+			case FLYING:
+				return (effector.isFlying() == _required);
+			case BEHIND:
+				return (effector.isBehindTarget() == _required);
+			case FRONT:
+				return (effector.isInFrontOfTarget() == _required);
+			case CHAOTIC:
+				if (player != null) {
+					return ((player.getKarma() > 0) == _required);
+				}
+				return !_required;
+			case OLYMPIAD:
+				if (player != null) {
+					return (player.isInOlympiadMode() == _required);
+				}
+				return !_required;
+		}
+		return !_required;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSubclass.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSubclass.java
new file mode 100644
index 00000000..fd6b0860
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerSubclass.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Subclass condition.
+ */
+public class ConditionPlayerSubclass extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerSubclass(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return true;
+		}
+		return effector.getActingPlayer().isSubClassActive() == _val;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTransformationId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTransformationId.java
new file mode 100644
index 00000000..957d1898
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTransformationId.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * This condition becomes true whether the player is transformed and the transformation Id match the parameter or<br>
+ * the parameter is -1 which returns true if player is transformed regardless the transformation Id.
+ * @author Zoey76
+ */
+public class ConditionPlayerTransformationId extends Condition {
+	private final int _id;
+	
+	public ConditionPlayerTransformationId(int id) {
+		_id = id;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final L2PcInstance player = effector.getActingPlayer();
+		if (player == null) {
+			return false;
+		}
+		if (_id == -1) {
+			return player.isTransformed();
+		}
+		return player.getTransformationId() == _id;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTvTEvent.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTvTEvent.java
new file mode 100644
index 00000000..5e983073
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerTvTEvent.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * TvT Event condition.
+ */
+public class ConditionPlayerTvTEvent extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerTvTEvent(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final L2PcInstance player = effector.getActingPlayer();
+		if ((player == null) || !TvTEvent.isStarted()) {
+			return !_val;
+		}
+		return (TvTEvent.isPlayerParticipant(player.getObjectId()) == _val);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerVehicleMounted.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerVehicleMounted.java
new file mode 100644
index 00000000..1f797f8a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerVehicleMounted.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Vehicle mounted condition.
+ * @author Nyaran
+ */
+public class ConditionPlayerVehicleMounted extends Condition {
+	private final boolean _val;
+	
+	public ConditionPlayerVehicleMounted(boolean val) {
+		_val = val;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector.getActingPlayer() == null) {
+			return true;
+		}
+		return (effector.getActingPlayer().isInVehicle() == _val);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java
new file mode 100644
index 00000000..be236829
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionPlayerWeight.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Weight condition.
+ * @author Kerberos
+ */
+public class ConditionPlayerWeight extends Condition {
+	
+	private final int _weight;
+	
+	public ConditionPlayerWeight(int weight) {
+		_weight = weight;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final L2PcInstance player = effector.getActingPlayer();
+		if ((player != null) && (player.getMaxLoad() > 0)) {
+			int weightproc = (((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad());
+			return (weightproc < _weight) || player.getDietMode();
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java
new file mode 100644
index 00000000..b1908b2b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSiegeZone.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Siege zone condition.
+ * @author Gigiikun
+ */
+public final class ConditionSiegeZone extends Condition {
+	// conditional values
+	public static final int COND_NOT_ZONE = 0x0001;
+	public static final int COND_CAST_ATTACK = 0x0002;
+	public static final int COND_CAST_DEFEND = 0x0004;
+	public static final int COND_CAST_NEUTRAL = 0x0008;
+	public static final int COND_FORT_ATTACK = 0x0010;
+	public static final int COND_FORT_DEFEND = 0x0020;
+	public static final int COND_FORT_NEUTRAL = 0x0040;
+	public static final int COND_TW_CHANNEL = 0x0080;
+	public static final int COND_TW_PROGRESS = 0x0100;
+	
+	private final int _value;
+	private final boolean _self;
+	
+	public ConditionSiegeZone(int value, boolean self) {
+		_value = value;
+		_self = self;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		L2Character target = _self ? effector : effected;
+		Castle castle = CastleManager.getInstance().getCastle(target);
+		Fort fort = FortManager.getInstance().getFort(target);
+		
+		if (((_value & COND_TW_PROGRESS) != 0) && !TerritoryWarManager.getInstance().isTWInProgress()) {
+			return false;
+		} else if (((_value & COND_TW_CHANNEL) != 0) && !TerritoryWarManager.getInstance().isTWChannelOpen()) {
+			return false;
+		} else if ((castle == null) && (fort == null)) {
+			return (_value & COND_NOT_ZONE) != 0;
+		}
+		if (castle != null) {
+			return checkIfOk(target, castle, _value);
+		}
+		return checkIfOk(target, fort, _value);
+	}
+	
+	/**
+	 * Check if ok.
+	 * @param activeChar the active char
+	 * @param castle the castle
+	 * @param value the value
+	 * @return true, if successful
+	 */
+	public static boolean checkIfOk(L2Character activeChar, Castle castle, int value) {
+		if (!(activeChar instanceof L2PcInstance player)) {
+			return false;
+		}
+		
+		if (((castle == null) || (castle.getResidenceId() <= 0))) {
+			return (value & COND_NOT_ZONE) != 0;
+		} else if (!castle.getZone().isActive()) {
+			return (value & COND_NOT_ZONE) != 0;
+		} else if (((value & COND_CAST_ATTACK) != 0) && player.isRegisteredOnThisSiegeField(castle.getResidenceId()) && (player.getSiegeState() == 1)) {
+			return true;
+		} else if (((value & COND_CAST_DEFEND) != 0) && player.isRegisteredOnThisSiegeField(castle.getResidenceId()) && (player.getSiegeState() == 2)) {
+			return true;
+		} else {
+			return ((value & COND_CAST_NEUTRAL) != 0) && (player.getSiegeState() == 0);
+		}
+	}
+	
+	/**
+	 * Check if ok.
+	 * @param activeChar the active char
+	 * @param fort the fort
+	 * @param value the value
+	 * @return true, if successful
+	 */
+	public static boolean checkIfOk(L2Character activeChar, Fort fort, int value) {
+		if (!(activeChar instanceof L2PcInstance player)) {
+			return false;
+		}
+		
+		if (((fort == null) || (fort.getResidenceId() <= 0))) {
+			return (value & COND_NOT_ZONE) != 0;
+		} else if (!fort.getZone().isActive()) {
+			return (value & COND_NOT_ZONE) != 0;
+		} else if (((value & COND_FORT_ATTACK) != 0) && player.isRegisteredOnThisSiegeField(fort.getResidenceId()) && (player.getSiegeState() == 1)) {
+			return true;
+		} else if (((value & COND_FORT_DEFEND) != 0) && player.isRegisteredOnThisSiegeField(fort.getResidenceId()) && (player.getSiegeState() == 2)) {
+			return true;
+		} else {
+			return ((value & COND_FORT_NEUTRAL) != 0) && (player.getSiegeState() == 0);
+		}
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemId.java
new file mode 100644
index 00000000..73a28ea4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemId.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Slot item Id condition.
+ * @author mkizub
+ */
+public final class ConditionSlotItemId extends ConditionInventory {
+	private final int _itemId;
+	private final int _enchantLevel;
+	
+	public ConditionSlotItemId(int slot, int itemId, int enchantLevel) {
+		super(slot);
+		_itemId = itemId;
+		_enchantLevel = enchantLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return false;
+		}
+		
+		final L2ItemInstance itemSlot = effector.getInventory().getPaperdollItem(_slot);
+		if (itemSlot == null) {
+			return _itemId == 0;
+		}
+		return (itemSlot.getId() == _itemId) && (itemSlot.getEnchantLevel() >= _enchantLevel);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemType.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemType.java
new file mode 100644
index 00000000..93784edd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionSlotItemType.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Slot item type condition.
+ * @author mkizub
+ */
+public final class ConditionSlotItemType extends ConditionInventory {
+	private final int _mask;
+	
+	public ConditionSlotItemType(int slot, int mask) {
+		super(slot);
+		_mask = mask;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return false;
+		}
+		
+		final L2ItemInstance itemSlot = effector.getInventory().getPaperdollItem(_slot);
+		if (itemSlot == null) {
+			return false;
+		}
+		return (itemSlot.getItem().getItemMask() & _mask) != 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAbnormal.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAbnormal.java
new file mode 100644
index 00000000..b3c8b996
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAbnormal.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target abnormal condition.
+ * @author janiii
+ */
+public class ConditionTargetAbnormal extends Condition {
+	private final int _abnormalId;
+	
+	public ConditionTargetAbnormal(int abnormalId) {
+		_abnormalId = abnormalId;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effected.getAbnormalVisualEffects() & _abnormalId) != 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveEffectId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveEffectId.java
new file mode 100644
index 00000000..d4a7118f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveEffectId.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target active effect Id condition.
+ */
+public class ConditionTargetActiveEffectId extends Condition {
+	private final int _effectId;
+	private final int _effectLvl;
+	
+	public ConditionTargetActiveEffectId(int effectId) {
+		_effectId = effectId;
+		_effectLvl = -1;
+	}
+	
+	public ConditionTargetActiveEffectId(int effectId, int effectLevel) {
+		_effectId = effectId;
+		_effectLvl = effectLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final BuffInfo info = effected.getEffectList().getBuffInfoBySkillId(_effectId);
+		return (info != null) && ((_effectLvl == -1) || (_effectLvl <= info.getSkill().getLevel()));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveSkillId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveSkillId.java
new file mode 100644
index 00000000..9f6c8fe3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetActiveSkillId.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target active skill Id condition.
+ */
+public class ConditionTargetActiveSkillId extends Condition {
+	private final int _skillId;
+	private final int _skillLevel;
+	
+	public ConditionTargetActiveSkillId(int skillId) {
+		_skillId = skillId;
+		_skillLevel = -1;
+	}
+	
+	public ConditionTargetActiveSkillId(int skillId, int skillLevel) {
+		_skillId = skillId;
+		_skillLevel = skillLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		for (Skill sk : effected.getAllSkills()) {
+			if (sk != null) {
+				if (sk.getId() == _skillId) {
+					if ((_skillLevel == -1) || (_skillLevel <= sk.getLevel())) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAggro.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAggro.java
new file mode 100644
index 00000000..71ce92d3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetAggro.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target aggro condition.
+ * @author mkizub
+ */
+public class ConditionTargetAggro extends Condition {
+	
+	private final boolean _isAggro;
+	
+	public ConditionTargetAggro(boolean isAggro) {
+		_isAggro = isAggro;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effected instanceof L2MonsterInstance) {
+			return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
+		}
+		if (effected instanceof L2PcInstance) {
+			return ((L2PcInstance) effected).getKarma() > 0;
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetClassIdRestriction.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetClassIdRestriction.java
new file mode 100644
index 00000000..2c5a3718
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetClassIdRestriction.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target class Id restriction condition.
+ */
+public class ConditionTargetClassIdRestriction extends Condition {
+	private final List<Integer> _classIds;
+	
+	public ConditionTargetClassIdRestriction(List<Integer> classId) {
+		_classIds = classId;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (!(effected instanceof L2PcInstance)) {
+			return false;
+		}
+		return (_classIds.contains((effected.getActingPlayer()).getClassId().getId()));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetInvSize.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetInvSize.java
new file mode 100644
index 00000000..5f3f2378
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetInvSize.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target inventory size condition.
+ * @author Zoey76
+ */
+public class ConditionTargetInvSize extends Condition {
+	private final int _size;
+	
+	public ConditionTargetInvSize(int size) {
+		_size = size;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effected != null) && effected.isPlayer()) {
+			final L2PcInstance target = effected.getActingPlayer();
+			return target.getInventory().getSize(false) <= (target.getInventoryLimit() - _size);
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevel.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevel.java
new file mode 100644
index 00000000..d906be90
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevel.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target level condition.
+ * @author mkizub
+ */
+public class ConditionTargetLevel extends Condition {
+	
+	private final int _level;
+	
+	public ConditionTargetLevel(int level) {
+		_level = level;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effected == null) {
+			return false;
+		}
+		return effected.getLevel() >= _level;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevelRange.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevelRange.java
new file mode 100644
index 00000000..730fb45a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetLevelRange.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target level range condition.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public class ConditionTargetLevelRange extends Condition {
+	private final int minimumLevel;
+	
+	private final int maximumLevel;
+	
+	public ConditionTargetLevelRange(int minimumLevel, int maximumLevel) {
+		this.minimumLevel = minimumLevel;
+		this.maximumLevel = maximumLevel;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effected == null) {
+			return false;
+		}
+		final int level = effected.getLevel();
+		return (level >= minimumLevel) && (level <= maximumLevel);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyParty.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyParty.java
new file mode 100644
index 00000000..b93a889b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyParty.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_USE_ON_YOURSELF;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_CANNOT_BE_USED;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Condition Target My Party.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ConditionTargetMyParty extends Condition {
+	
+	private static final String EXCEPT_ME = "EXCEPT_ME";
+	
+	private final String type;
+	
+	public ConditionTargetMyParty(String type) {
+		this.type = type;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		final var player = effector.getActingPlayer();
+		if (player == null) {
+			return false;
+		}
+		
+		if (EXCEPT_ME.equals(type) && (player == effected)) {
+			effector.sendPacket(CANNOT_USE_ON_YOURSELF);
+			return false;
+		}
+		
+		if (player.isInParty()) {
+			if (!player.isInPartyWith(effected)) {
+				effector.sendPacket(SystemMessage.getSystemMessage(S1_CANNOT_BE_USED).addSkillName(skill));
+				return false;
+			}
+		} else {
+			final var effectedPlayer = effected.getActingPlayer();
+			if (player != effectedPlayer) {
+				effector.sendPacket(SystemMessage.getSystemMessage(S1_CANNOT_BE_USED).addSkillName(skill));
+				return false;
+			}
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNone.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNone.java
new file mode 100644
index 00000000..2486b56e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNone.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * None condition.
+ * @author mkizub
+ */
+public class ConditionTargetNone extends Condition {
+	
+	public ConditionTargetNone() {
+		// Do nothing.
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effected == null);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcId.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcId.java
new file mode 100644
index 00000000..8f23ff62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcId.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target NPC Id condition.
+ */
+public class ConditionTargetNpcId extends Condition {
+	private final List<Integer> _npcIds;
+	
+	public ConditionTargetNpcId(List<Integer> npcIds) {
+		_npcIds = npcIds;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effected != null) && (effected.isNpc() || effected.isDoor())) {
+			return _npcIds.contains(effected.getId());
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcType.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcType.java
new file mode 100644
index 00000000..7b836b0d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetNpcType.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target NPC type condition.
+ */
+public class ConditionTargetNpcType extends Condition {
+	private final InstanceType[] _npcType;
+	
+	public ConditionTargetNpcType(InstanceType[] type) {
+		_npcType = type;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effected == null) {
+			return false;
+		}
+		return effected.getInstanceType().isTypes(_npcType);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetPlayable.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetPlayable.java
new file mode 100644
index 00000000..7e98aa33
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetPlayable.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target playable condition.
+ * @author DS
+ */
+public class ConditionTargetPlayable extends Condition {
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (effected instanceof L2Playable);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetRace.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetRace.java
new file mode 100644
index 00000000..97d427b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetRace.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target race condition.
+ * @author Zealar
+ */
+public class ConditionTargetRace extends Condition {
+	private final Race _race;
+	
+	public ConditionTargetRace(Race race) {
+		_race = race;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return _race == effected.getRace();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java
new file mode 100644
index 00000000..c06cc239
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target uses weapon kind condition.
+ * @author mkizub
+ */
+public class ConditionTargetUsesWeaponKind extends Condition {
+	private final int _weaponMask;
+	
+	public ConditionTargetUsesWeaponKind(int weaponMask) {
+		_weaponMask = weaponMask;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effected == null) {
+			return false;
+		}
+		
+		L2Weapon weapon = effected.getActiveWeaponItem();
+		if (weapon == null) {
+			return false;
+		}
+		
+		return (weapon.getItemType().mask() & _weaponMask) != 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java
new file mode 100644
index 00000000..2aae1c03
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionTargetWeight.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * The Class ConditionTargetWeight.
+ * @author Zoey76
+ */
+public class ConditionTargetWeight extends Condition {
+	private final int _weight;
+	
+	/**
+	 * Instantiates a new condition player weight.
+	 * @param weight the weight
+	 */
+	public ConditionTargetWeight(int weight) {
+		_weight = weight;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effected != null) && effected.isPlayer()) {
+			final L2PcInstance target = effected.getActingPlayer();
+			if (!target.getDietMode() && (target.getMaxLoad() > 0)) {
+				int weightproc = (((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad());
+				return (weightproc < _weight);
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java
new file mode 100644
index 00000000..856df8a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingItemType.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.ArmorType;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Using item type condition.
+ * @author mkizub
+ */
+public final class ConditionUsingItemType extends Condition {
+	private final boolean _armor;
+	private final int _mask;
+	
+	public ConditionUsingItemType(int mask) {
+		_mask = mask;
+		_armor = (_mask & (ArmorType.MAGIC.mask() | ArmorType.LIGHT.mask() | ArmorType.HEAVY.mask())) != 0;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (effector == null) {
+			return false;
+		}
+		
+		if (!effector.isPlayer()) {
+			return !_armor && ((_mask & effector.getAttackType().mask()) != 0);
+		}
+		
+		final Inventory inv = effector.getInventory();
+		// If ConditionUsingItemType is one between Light, Heavy or Magic
+		if (_armor) {
+			// Get the itemMask of the worn chest (if exists)
+			L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
+			if (chest == null) {
+				return false;
+			}
+			int chestMask = chest.getItem().getItemMask();
+			
+			// If chest armor is different from the condition one return false
+			if ((_mask & chestMask) == 0) {
+				return false;
+			}
+			
+			// So from here, chest armor matches conditions
+			
+			int chestBodyPart = chest.getItem().getBodyPart();
+			// return True if chest armor is a Full Armor
+			if (chestBodyPart == L2Item.SLOT_FULL_ARMOR) {
+				return true;
+			}
+			// check legs armor
+			L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
+			if (legs == null) {
+				return false;
+			}
+			int legMask = legs.getItem().getItemMask();
+			// return true if legs armor matches too
+			return (_mask & legMask) != 0;
+		}
+		return (_mask & inv.getWearedMask()) != 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSkill.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSkill.java
new file mode 100644
index 00000000..d723d749
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSkill.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Using skill condition.
+ * @author mkizub
+ */
+public final class ConditionUsingSkill extends Condition {
+	private final int _skillId;
+	
+	public ConditionUsingSkill(int skillId) {
+		_skillId = skillId;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if (skill == null) {
+			return false;
+		}
+		return skill.getId() == _skillId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSlotType.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSlotType.java
new file mode 100644
index 00000000..a9a58c13
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionUsingSlotType.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Using slot type condition.
+ * @author NosBit
+ */
+public class ConditionUsingSlotType extends Condition {
+	private final int _mask;
+	
+	public ConditionUsingSlotType(int mask) {
+		_mask = mask;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		if ((effector == null) || !effector.isPlayer()) {
+			return false;
+		}
+		
+		return (effector.getActiveWeaponItem().getBodyPart() & _mask) != 0;
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionWithSkill.java b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionWithSkill.java
new file mode 100644
index 00000000..88d0ad11
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/conditions/ConditionWithSkill.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * With skill condition.
+ * @author Steuf
+ */
+public class ConditionWithSkill extends Condition {
+	private final boolean _skill;
+	
+	public ConditionWithSkill(boolean skill) {
+		_skill = skill;
+	}
+	
+	@Override
+	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item) {
+		return (skill != null) == _skill;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/DropListScope.java b/src/main/java/com/l2jserver/gameserver/model/drops/DropListScope.java
new file mode 100644
index 00000000..a941e513
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/DropListScope.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import com.l2jserver.gameserver.model.drops.strategy.IAmountMultiplierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IChanceMultiplierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IGroupedItemDropCalculationStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IKillerChanceModifierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IPreciseDeterminationStrategy;
+
+/**
+ * @author NosBit
+ */
+public enum DropListScope implements IDropItemFactory, IGroupedDropItemFactory {
+	DEATH((itemId, min, max, chance) -> new GeneralDropItem(itemId, min, max, chance, IAmountMultiplierStrategy.DROP, IChanceMultiplierStrategy.DROP), GroupedGeneralDropItem::new),
+	CORPSE((itemId, min, max, chance) -> new GeneralDropItem(itemId, min, max, chance, IAmountMultiplierStrategy.SPOIL, IChanceMultiplierStrategy.SPOIL), DEATH),
+	
+	/**
+	 * This droplist scope isn't affected by ANY rates, nor Champion, etc...
+	 */
+	STATIC(
+		(itemId, min, max, chance) -> new GeneralDropItem(itemId, min, max, chance, IAmountMultiplierStrategy.STATIC, IChanceMultiplierStrategy.STATIC, IPreciseDeterminationStrategy.ALWAYS, IKillerChanceModifierStrategy.NO_RULES),
+		chance -> new GroupedGeneralDropItem(chance, IGroupedItemDropCalculationStrategy.DEFAULT_STRATEGY, IKillerChanceModifierStrategy.NO_RULES, IPreciseDeterminationStrategy.ALWAYS)),
+	QUEST((itemId, min, max, chance) -> new GeneralDropItem(itemId, min, max, chance, IAmountMultiplierStrategy.QUEST, IChanceMultiplierStrategy.QUEST, IPreciseDeterminationStrategy.ALWAYS, IKillerChanceModifierStrategy.NO_RULES), STATIC);
+	
+	private final IDropItemFactory _factory;
+	private final IGroupedDropItemFactory _groupFactory;
+	
+	DropListScope(IDropItemFactory factory, IGroupedDropItemFactory groupFactory) {
+		_factory = factory;
+		_groupFactory = groupFactory;
+	}
+	
+	@Override
+	public IDropItem newDropItem(int itemId, long min, long max, double chance) {
+		return _factory.newDropItem(itemId, min, max, chance);
+	}
+	
+	@Override
+	public GroupedGeneralDropItem newGroupedDropItem(double chance) {
+		return _groupFactory.newGroupedDropItem(chance);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/GeneralDropItem.java b/src/main/java/com/l2jserver/gameserver/model/drops/GeneralDropItem.java
new file mode 100644
index 00000000..b7bcd596
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/GeneralDropItem.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.strategy.IAmountMultiplierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IChanceMultiplierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IDropCalculationStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IKillerChanceModifierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.INonGroupedKillerChanceModifierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IPreciseDeterminationStrategy;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author NosBit
+ */
+public final class GeneralDropItem implements IDropItem {
+	private final int _itemId;
+	private final long _min;
+	private final long _max;
+	private final double _chance;
+	
+	protected final IAmountMultiplierStrategy _amountStrategy;
+	protected final IChanceMultiplierStrategy _chanceStrategy;
+	protected final IPreciseDeterminationStrategy _preciseStrategy;
+	protected final INonGroupedKillerChanceModifierStrategy _killerStrategy;
+	protected final IDropCalculationStrategy _dropCalculationStrategy;
+	
+	/**
+	 * @param itemId the item id
+	 * @param min the min count
+	 * @param max the max count
+	 * @param chance the chance of this drop item
+	 */
+	public GeneralDropItem(int itemId, long min, long max, double chance) {
+		this(itemId, min, max, chance, 1, 1);
+	}
+	
+	public GeneralDropItem(int itemId, long min, long max, double chance, double defaultAmountMultiplier, double defaultChanceMultiplier) {
+		this(itemId, min, max, defaultChanceMultiplier, IAmountMultiplierStrategy.DEFAULT_STRATEGY(defaultAmountMultiplier), IChanceMultiplierStrategy.DEFAULT_STRATEGY(defaultChanceMultiplier));
+	}
+	
+	public GeneralDropItem(int itemId, long min, long max, double chance, IAmountMultiplierStrategy amountMultiplierStrategy, IChanceMultiplierStrategy chanceMultiplierStrategy) {
+		this(itemId, min, max, chance, amountMultiplierStrategy, chanceMultiplierStrategy, IPreciseDeterminationStrategy.DEFAULT, IKillerChanceModifierStrategy.DEFAULT_NONGROUP_STRATEGY);
+	}
+	
+	public GeneralDropItem(int itemId, long min, long max, double chance, IAmountMultiplierStrategy amountMultiplierStrategy, IChanceMultiplierStrategy chanceMultiplierStrategy, IPreciseDeterminationStrategy preciseStrategy, INonGroupedKillerChanceModifierStrategy killerStrategy) {
+		this(itemId, min, max, chance, amountMultiplierStrategy, chanceMultiplierStrategy, preciseStrategy, killerStrategy, IDropCalculationStrategy.DEFAULT_STRATEGY);
+	}
+	
+	public GeneralDropItem(int itemId, long min, long max, double chance, IAmountMultiplierStrategy amountMultiplierStrategy, IChanceMultiplierStrategy chanceMultiplierStrategy, IPreciseDeterminationStrategy preciseStrategy, INonGroupedKillerChanceModifierStrategy killerStrategy, IDropCalculationStrategy dropCalculationStrategy) {
+		_itemId = itemId;
+		_min = min;
+		_max = max;
+		_chance = chance;
+		_amountStrategy = amountMultiplierStrategy;
+		_chanceStrategy = chanceMultiplierStrategy;
+		_preciseStrategy = preciseStrategy;
+		_killerStrategy = killerStrategy;
+		_dropCalculationStrategy = dropCalculationStrategy;
+		
+	}
+	
+	/**
+	 * @return the _amountStrategy
+	 */
+	public IAmountMultiplierStrategy getAmountStrategy() {
+		return _amountStrategy;
+	}
+	
+	/**
+	 * @return the _chanceStrategy
+	 */
+	public IChanceMultiplierStrategy getChanceStrategy() {
+		return _chanceStrategy;
+	}
+	
+	/**
+	 * @return the _preciseStrategy
+	 */
+	public IPreciseDeterminationStrategy getPreciseStrategy() {
+		return _preciseStrategy;
+	}
+	
+	/**
+	 * @return the _killerStrategy
+	 */
+	public INonGroupedKillerChanceModifierStrategy getKillerChanceModifierStrategy() {
+		return _killerStrategy;
+	}
+	
+	/**
+	 * @return the _dropCalculationStrategy
+	 */
+	public IDropCalculationStrategy getDropCalculationStrategy() {
+		return _dropCalculationStrategy;
+	}
+	
+	/**
+	 * Gets the item id
+	 * @return the item id
+	 */
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	/**
+	 * Gets the base min drop count
+	 * @return the min
+	 */
+	public long getMin() {
+		return _min;
+	}
+	
+	/**
+	 * Gets the min drop count modified by server rates
+	 * @param victim the victim who drops the item
+	 * @return the min modified by any rates.
+	 */
+	public long getMin(L2Character victim) {
+		return (long) (getMin() * getAmountMultiplier(victim));
+	}
+	
+	/**
+	 * Gets the base max drop count
+	 * @return the max
+	 */
+	public long getMax() {
+		return _max;
+	}
+	
+	/**
+	 * Gets the max drop count modified by server rates
+	 * @param victim the victim who drops the item
+	 * @return the max modified by any rates.
+	 */
+	public long getMax(L2Character victim) {
+		return (long) (getMax() * getAmountMultiplier(victim));
+	}
+	
+	/**
+	 * Gets the chance of this drop item.
+	 * @return the chance
+	 */
+	public double getChance() {
+		return _chance;
+	}
+	
+	/**
+	 * Gets the general chance to drop this item modified by rates. <br>
+	 * This shall be used in calculating chance within drop groups.
+	 * @param victim the victim who drops the item
+	 * @return the chance modified by any rates.
+	 */
+	public double getChance(L2Character victim) {
+		return getChance() * getChanceMultiplier(victim);
+	}
+	
+	/**
+	 * Gets the chance of dropping this item for current killer and victim (modified by server rates and another rules based on killer) <br>
+	 * This shall be used to calculate chance outside of drop groups.
+	 * @param victim the victim who drops the item
+	 * @param killer who kills the victim
+	 * @return a chance to drop modified by deep blue drop rules
+	 */
+	public double getChance(L2Character victim, L2Character killer) {
+		return (getKillerChanceModifier(victim, killer) * getChance(victim));
+	}
+	
+	@Override
+	public List<ItemHolder> calculateDrops(L2Character victim, L2Character killer) {
+		return _dropCalculationStrategy.calculateDrops(this, victim, killer);
+	}
+	
+	/**
+	 * @return <code>true</code> if chance over 100% should be handled
+	 */
+	public boolean isPreciseCalculated() {
+		return _preciseStrategy.isPreciseCalculated(this);
+	}
+	
+	/**
+	 * This handles by default deep blue drop rules. It may also be used to handle another drop chance rules based on killer
+	 * @param victim the victim who drops the item
+	 * @param killer who kills the victim
+	 * @return a number between 0 and 1 (usually)
+	 */
+	protected double getKillerChanceModifier(L2Character victim, L2Character killer) {
+		return _killerStrategy.getKillerChanceModifier(this, victim, killer);
+	}
+	
+	/**
+	 * This gets standard server rates for this item
+	 * @param victim who drops the item
+	 * @return
+	 */
+	protected double getAmountMultiplier(L2Character victim) {
+		return _amountStrategy.getAmountMultiplier(this, victim);
+	}
+	
+	/**
+	 * This gets standard server rates for this item
+	 * @param victim who drops the item
+	 * @return
+	 */
+	protected double getChanceMultiplier(L2Character victim) {
+		return _chanceStrategy.getChanceMultiplier(this, victim);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java b/src/main/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java
new file mode 100644
index 00000000..9c12f712
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/GroupedGeneralDropItem.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.drops.strategy.IKillerChanceModifierStrategy.NO_RULES;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.strategy.IAmountMultiplierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IChanceMultiplierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IGroupedItemDropCalculationStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IKillerChanceModifierStrategy;
+import com.l2jserver.gameserver.model.drops.strategy.IPreciseDeterminationStrategy;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author NosBit
+ */
+public final class GroupedGeneralDropItem implements IDropItem {
+	
+	private final double _chance;
+	private List<GeneralDropItem> _items;
+	protected final IGroupedItemDropCalculationStrategy _dropCalculationStrategy;
+	protected final IKillerChanceModifierStrategy _killerChanceModifierStrategy;
+	protected final IPreciseDeterminationStrategy _preciseStrategy;
+	
+	/**
+	 * @param chance the chance of this drop item.
+	 */
+	public GroupedGeneralDropItem(double chance) {
+		this(chance, general().preciseDropMultipleGroupRolls() ? IGroupedItemDropCalculationStrategy.PRECISE_MULTIPLE_GROUP_ROLLS : IGroupedItemDropCalculationStrategy.DEFAULT_STRATEGY, IKillerChanceModifierStrategy.DEFAULT_STRATEGY, IPreciseDeterminationStrategy.DEFAULT);
+	}
+	
+	/**
+	 * @param chance the chance of this drop item.
+	 * @param dropStrategy to calculate drops.
+	 * @param killerStrategy
+	 * @param preciseStrategy
+	 */
+	public GroupedGeneralDropItem(double chance, IGroupedItemDropCalculationStrategy dropStrategy, IKillerChanceModifierStrategy killerStrategy, IPreciseDeterminationStrategy preciseStrategy) {
+		_chance = chance;
+		_dropCalculationStrategy = dropStrategy;
+		_killerChanceModifierStrategy = killerStrategy;
+		_preciseStrategy = preciseStrategy;
+	}
+	
+	/**
+	 * Gets the chance of this drop item.
+	 * @return the chance
+	 */
+	public double getChance() {
+		return _chance;
+	}
+	
+	/**
+	 * Gets the items.
+	 * @return the items
+	 */
+	public List<GeneralDropItem> getItems() {
+		return _items;
+	}
+	
+	/**
+	 * @return the strategy
+	 */
+	public IGroupedItemDropCalculationStrategy getDropCalculationStrategy() {
+		return _dropCalculationStrategy;
+	}
+	
+	/**
+	 * @return the _killerChanceModifierStrategy
+	 */
+	public IKillerChanceModifierStrategy getKillerChanceModifierStrategy() {
+		return _killerChanceModifierStrategy;
+	}
+	
+	/**
+	 * @return the _preciseStrategy
+	 */
+	public IPreciseDeterminationStrategy getPreciseStrategy() {
+		return _preciseStrategy;
+	}
+	
+	/**
+	 * Sets an item list to this drop item.
+	 * @param items the item list
+	 */
+	public void setItems(List<GeneralDropItem> items) {
+		_items = Collections.unmodifiableList(items);
+	}
+	
+	/**
+	 * Returns a list of items in the group with chance multiplied by chance of the group
+	 * @return the list of items with modified chances
+	 */
+	public List<GeneralDropItem> extractMe() {
+		List<GeneralDropItem> items = new ArrayList<>();
+		for (final GeneralDropItem item : getItems()) {
+			// precise and killer strategies of the group
+			items.add(new GeneralDropItem(item.getItemId(), item.getMin(), item.getMax(), (item.getChance() * getChance()) / 100, item.getAmountStrategy(), item.getChanceStrategy(), getPreciseStrategy(), getKillerChanceModifierStrategy(), item.getDropCalculationStrategy()));
+		}
+		return items;
+	}
+	
+	/**
+	 * statically normalizes a group, useful when need to convert legacy SQL data
+	 * @return a new group with items, which have a sum of getChance() of 100%
+	 */
+	public GroupedGeneralDropItem normalizeMe() {
+		double sumchance = 0;
+		for (GeneralDropItem item : getItems()) {
+			sumchance += (item.getChance() * getChance()) / 100;
+		}
+		final double sumchance1 = sumchance;
+		GroupedGeneralDropItem group = new GroupedGeneralDropItem(sumchance1, getDropCalculationStrategy(), NO_RULES, getPreciseStrategy());
+		List<GeneralDropItem> items = new ArrayList<>();
+		for (final GeneralDropItem item : getItems()) {
+			// modify only the chance, leave all other rules intact
+			items.add(new GeneralDropItem(item.getItemId(), item.getMin(), item.getMax(), (item.getChance() * getChance()) / sumchance1, item.getAmountStrategy(), item.getChanceStrategy(), item.getPreciseStrategy(), item.getKillerChanceModifierStrategy(), item.getDropCalculationStrategy()));
+		}
+		group.setItems(items);
+		return group;
+	}
+	
+	/**
+	 * Creates a normalized group taking into account all drop modifiers, needed when handling a group which has items with different chance rates
+	 * @param victim
+	 * @param killer
+	 * @return a new normalized group with all drop modifiers applied
+	 */
+	public GroupedGeneralDropItem normalizeMe(L2Character victim, L2Character killer) {
+		return normalizeMe(victim, killer, true, 1);
+	}
+	
+	/**
+	 * Creates a normalized group taking into account all drop modifiers, needed when handling a group which has items with different chance rates
+	 * @param victim
+	 * @param killer
+	 * @param chanceModifier an additional chance modifier
+	 * @return a new normalized group with all drop modifiers applied
+	 */
+	public GroupedGeneralDropItem normalizeMe(L2Character victim, L2Character killer, double chanceModifier) {
+		return normalizeMe(victim, killer, true, chanceModifier);
+	}
+	
+	/**
+	 * Creates a normalized group taking into account all drop modifiers, needed when handling a group which has items with different chance rates
+	 * @param victim
+	 * @return a new normalized group with all victim modifiers applied
+	 */
+	public GroupedGeneralDropItem normalizeMe(L2Character victim) {
+		return normalizeMe(victim, null, false, 1);
+	}
+	
+	/**
+	 * Creates a normalized group taking into account all drop modifiers, needed when handling a group which has items with different chance rates
+	 * @param victim
+	 * @param chanceModifier an additional chance modifier
+	 * @return a new normalized group with all victim modifiers applied
+	 */
+	public GroupedGeneralDropItem normalizeMe(L2Character victim, double chanceModifier) {
+		return normalizeMe(victim, null, false, chanceModifier);
+	}
+	
+	/**
+	 * Creates a normalized group taking into account all drop modifiers, needed when handling a group which has items with different chance rates
+	 * @param victim
+	 * @param killer
+	 * @param applyKillerModifier if to modify chance by {@link GroupedGeneralDropItem#getKillerChanceModifier(L2Character, L2Character)}
+	 * @param chanceModifier an additional chance modifier
+	 * @return a new normalized group with all drop modifiers applied
+	 */
+	private GroupedGeneralDropItem normalizeMe(L2Character victim, L2Character killer, boolean applyKillerModifier, double chanceModifier) {
+		if (applyKillerModifier) {
+			chanceModifier *= (getKillerChanceModifier(victim, killer));
+		}
+		double sumchance = 0;
+		for (GeneralDropItem item : getItems()) {
+			sumchance += (item.getChance(victim) * getChance() * chanceModifier) / 100;
+		}
+		
+		// to discard further deep blue calculations
+		GroupedGeneralDropItem group = new GroupedGeneralDropItem(sumchance, getDropCalculationStrategy(), NO_RULES, getPreciseStrategy());
+		List<GeneralDropItem> items = new ArrayList<>();
+		for (GeneralDropItem item : getItems()) {
+			// the item is made almost "static"
+			items.add(new GeneralDropItem(item.getItemId(), item.getMin(victim), item.getMax(victim), //
+				(item.getChance(victim) * getChance() * chanceModifier) / sumchance, //
+				IAmountMultiplierStrategy.STATIC, IChanceMultiplierStrategy.STATIC, getPreciseStrategy(), //
+				NO_RULES, item.getDropCalculationStrategy()));
+		}
+		group.setItems(items);
+		return group;
+		
+	}
+	
+	@Override
+	public List<ItemHolder> calculateDrops(L2Character victim, L2Character killer) {
+		return _dropCalculationStrategy.calculateDrops(this, victim, killer);
+	}
+	
+	/**
+	 * This handles by default deep blue drop rules. It may also be used to handle another drop chance rules based on killer
+	 * @param victim the victim who drops the item
+	 * @param killer who kills the victim
+	 * @return a number between 0 and 1 (usually)
+	 */
+	public double getKillerChanceModifier(L2Character victim, L2Character killer) {
+		return _killerChanceModifierStrategy.getKillerChanceModifier(this, victim, killer);
+	}
+	
+	public boolean isPreciseCalculated() {
+		return _preciseStrategy.isPreciseCalculated(this);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/IDropItem.java b/src/main/java/com/l2jserver/gameserver/model/drops/IDropItem.java
new file mode 100644
index 00000000..75f8ea62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/IDropItem.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author NosBit
+ */
+public interface IDropItem {
+	
+	/**
+	 * Calculates drops of this drop item.
+	 * @param victim the victim
+	 * @param killer the killer
+	 * @return {@code null} or empty collection if there are no drops, a collection containing all items to drop otherwise
+	 */
+	List<ItemHolder> calculateDrops(L2Character victim, L2Character killer);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/IDropItemFactory.java b/src/main/java/com/l2jserver/gameserver/model/drops/IDropItemFactory.java
new file mode 100644
index 00000000..4118c9f0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/IDropItemFactory.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IDropItemFactory {
+	/**
+	 * @param itemId the item id
+	 * @param min the min count
+	 * @param max the max count
+	 * @param chance the chance of this drop item
+	 * @return the drop item created by this factory
+	 */
+	IDropItem newDropItem(int itemId, long min, long max, double chance);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/IGroupedDropItemFactory.java b/src/main/java/com/l2jserver/gameserver/model/drops/IGroupedDropItemFactory.java
new file mode 100644
index 00000000..393a0e1a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/IGroupedDropItemFactory.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IGroupedDropItemFactory {
+	GroupedGeneralDropItem newGroupedDropItem(double chance);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java
new file mode 100644
index 00000000..e334b979
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IAmountMultiplierStrategy.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IAmountMultiplierStrategy {
+	IAmountMultiplierStrategy DROP = DEFAULT_STRATEGY(rates().getDeathDropAmountMultiplier());
+	IAmountMultiplierStrategy SPOIL = DEFAULT_STRATEGY(rates().getCorpseDropAmountMultiplier());
+	IAmountMultiplierStrategy STATIC = (item, victim) -> 1;
+	IAmountMultiplierStrategy QUEST = DEFAULT_STRATEGY(rates().getQuestDropAmountMultiplier());
+	
+	static IAmountMultiplierStrategy DEFAULT_STRATEGY(final double defaultMultiplier) {
+		return (item, victim) -> {
+			double multiplier = 1;
+			if (victim.isChampion()) {
+				multiplier *= item.getItemId() != Inventory.ADENA_ID ? customs().getChampionRewardsAmount() : customs().getChampionAdenasRewardsAmount();
+			}
+			
+			Float dropAmountMultiplier = rates().getDropAmountMultiplierByItemId().get(item.getItemId());
+			if (dropAmountMultiplier != null) {
+				multiplier *= dropAmountMultiplier;
+			} else if (ItemTable.getInstance().getTemplate(item.getItemId()).hasExImmediateEffect()) {
+				multiplier *= rates().getHerbDropAmountMultiplier();
+			} else if (victim.isRaid()) {
+				multiplier *= rates().getRaidDropAmountMultiplier();
+			} else {
+				multiplier *= defaultMultiplier;
+			}
+			return multiplier;
+		};
+	}
+	
+	double getAmountMultiplier(GeneralDropItem item, L2Character victim);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java
new file mode 100644
index 00000000..b20a57c9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IChanceMultiplierStrategy.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IChanceMultiplierStrategy {
+	IChanceMultiplierStrategy DROP = DEFAULT_STRATEGY(rates().getDeathDropChanceMultiplier());
+	IChanceMultiplierStrategy SPOIL = DEFAULT_STRATEGY(rates().getCorpseDropChanceMultiplier());
+	IChanceMultiplierStrategy STATIC = (item, victim) -> 1;
+	
+	IChanceMultiplierStrategy QUEST = (item, victim) -> {
+		double championmult;
+		if ((item.getItemId() == Inventory.ADENA_ID) || (item.getItemId() == Inventory.ANCIENT_ADENA_ID)) {
+			championmult = customs().getChampionAdenasRewardsChance();
+		} else {
+			championmult = customs().getChampionRewardsChance();
+		}
+		
+		return (customs().championEnable() && (victim != null) && victim.isChampion()) ? (rates().getQuestDropChanceMultiplier() * championmult) : rates().getQuestDropChanceMultiplier();
+	};
+	
+	static IChanceMultiplierStrategy DEFAULT_STRATEGY(final double defaultMultiplier) {
+		return (item, victim) -> {
+			float multiplier = 1;
+			if (victim.isChampion()) {
+				multiplier *= item.getItemId() != Inventory.ADENA_ID ? customs().getChampionRewardsChance() : customs().getChampionAdenasRewardsChance();
+			}
+			Float dropChanceMultiplier = rates().getDropChanceMultiplierByItemId().get(item.getItemId());
+			if (dropChanceMultiplier != null) {
+				multiplier *= dropChanceMultiplier;
+			} else if (ItemTable.getInstance().getTemplate(item.getItemId()).hasExImmediateEffect()) {
+				multiplier *= rates().getHerbDropChanceMultiplier();
+			} else if (victim.isRaid()) {
+				multiplier *= rates().getRaidDropChanceMultiplier();
+			} else {
+				multiplier *= defaultMultiplier;
+			}
+			return multiplier;
+		};
+	}
+	
+	double getChanceMultiplier(GeneralDropItem item, L2Character victim);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java
new file mode 100644
index 00000000..16c863d7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategy.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import java.util.List;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IDropCalculationStrategy {
+	IDropCalculationStrategy DEFAULT_STRATEGY = (item, victim, killer) -> {
+		double chance = item.getChance(victim, killer);
+		if (chance > (Rnd.nextDouble() * 100)) {
+			int amountMultiply = 1;
+			if (item.isPreciseCalculated() && (chance > 100)) {
+				amountMultiply = (int) chance / 100;
+				if ((chance % 100) > (Rnd.nextDouble() * 100)) {
+					amountMultiply++;
+				}
+			}
+			
+			return List.of(new ItemHolder(item.getItemId(), Rnd.get(item.getMin(victim), item.getMax(victim)) * amountMultiply));
+		}
+		
+		return null;
+	};
+	
+	List<ItemHolder> calculateDrops(GeneralDropItem item, L2Character victim, L2Character killer);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java
new file mode 100644
index 00000000..1f8cbbf8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IGroupedItemDropCalculationStrategy.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IGroupedItemDropCalculationStrategy {
+	Logger LOG = LoggerFactory.getLogger(IGroupedItemDropCalculationStrategy.class);
+	/**
+	 * The default strategy used in L2J to calculate drops. When the group's chance raises over 100% and group has precise calculation, the dropped item's amount increases.
+	 */
+	IGroupedItemDropCalculationStrategy DEFAULT_STRATEGY = new IGroupedItemDropCalculationStrategy() {
+		private final Map<GroupedGeneralDropItem, GeneralDropItem> singleItemCache = new ConcurrentHashMap<>();
+		
+		private GeneralDropItem getSingleItem(GroupedGeneralDropItem dropItem) {
+			final GeneralDropItem item1 = dropItem.getItems().iterator().next();
+			singleItemCache.putIfAbsent(dropItem, new GeneralDropItem(item1.getItemId(), item1.getMin(), item1.getMax(), (item1.getChance() * dropItem.getChance()) / 100, //
+				item1.getAmountStrategy(), item1.getChanceStrategy(), dropItem.getPreciseStrategy(), dropItem.getKillerChanceModifierStrategy(), item1.getDropCalculationStrategy()));
+			return singleItemCache.get(dropItem);
+		}
+		
+		@Override
+		public List<ItemHolder> calculateDrops(GroupedGeneralDropItem dropItem, L2Character victim, L2Character killer) {
+			if (dropItem.getItems().size() == 1) {
+				return getSingleItem(dropItem).calculateDrops(victim, killer);
+			}
+			
+			GroupedGeneralDropItem normalized = dropItem.normalizeMe(victim, killer);
+			if (normalized.getChance() > (Rnd.nextDouble() * 100)) {
+				final double random = (Rnd.nextDouble() * 100);
+				double totalChance = 0;
+				for (GeneralDropItem item2 : normalized.getItems()) {
+					// Grouped item chance rates should not be modified (the whole magic was already done by normalizing thus the items' chance sum is always 100%).
+					totalChance += item2.getChance();
+					if (totalChance > random) {
+						int amountMultiply = 1;
+						if (dropItem.isPreciseCalculated() && (normalized.getChance() >= 100)) {
+							amountMultiply = (int) (normalized.getChance()) / 100;
+							if ((normalized.getChance() % 100) > (Rnd.nextDouble() * 100)) {
+								amountMultiply++;
+							}
+						}
+						
+						return Collections.singletonList(new ItemHolder(item2.getItemId(), Rnd.get(item2.getMin(victim), item2.getMax(victim)) * amountMultiply));
+					}
+				}
+			}
+			return null;
+		}
+	};
+	
+	/**
+	 * This strategy calculates a group's drop by calculating drops of its individual items and merging its results.
+	 */
+	IGroupedItemDropCalculationStrategy DISBAND_GROUP = (item, victim, killer) -> {
+		List<ItemHolder> dropped = new ArrayList<>();
+		for (IDropItem dropItem : item.extractMe()) {
+			dropped.addAll(dropItem.calculateDrops(victim, killer));
+		}
+		return dropped.isEmpty() ? null : dropped;
+	};
+	
+	/**
+	 * This strategy when group has precise calculation rolls multiple times over group to determine drops when group's chance raises over 100% instead of just multiplying the dropped item's amount. Thus it can produce different items from group at once.
+	 */
+	IGroupedItemDropCalculationStrategy PRECISE_MULTIPLE_GROUP_ROLLS = (item, victim, killer) -> {
+		if (!item.isPreciseCalculated()) {
+			// if item hasn't precise calculation there's no change from DEFAULT_STRATEGY
+			return DEFAULT_STRATEGY.calculateDrops(item, victim, victim);
+		}
+		GroupedGeneralDropItem newItem = new GroupedGeneralDropItem(item.getChance(), DEFAULT_STRATEGY, item.getKillerChanceModifierStrategy(), IPreciseDeterminationStrategy.NEVER);
+		newItem.setItems(item.getItems());
+		GroupedGeneralDropItem normalized = newItem.normalizeMe(victim, killer);
+		// Let's determine the number of rolls.
+		int rolls = (int) (normalized.getChance() / 100);
+		if ((Rnd.nextDouble() * 100) < (normalized.getChance() % 100)) {
+			rolls++;
+		}
+		
+		List<ItemHolder> dropped = new ArrayList<>(rolls);
+		for (int i = 0; i < rolls; i++) {
+			// As further normalizing on already normalized drop group does nothing, we can just pass the calculation to DEFAULT_STRATEGY with precise calculation disabled as we handle it.
+			List<ItemHolder> drops = normalized.calculateDrops(victim, killer);
+			if (drops != null) {
+				dropped.addAll(drops);
+			}
+		}
+		
+		if (general().preciseDropMultipleRollsAggregateDrops()) {
+			Map<Integer, Long> countByItemId = new HashMap<>();
+			for (ItemHolder drop : dropped) {
+				Long currentCount = countByItemId.getOrDefault(drop.getId(), 0L);
+				countByItemId.put(drop.getId(), currentCount + drop.getCount());
+			}
+			
+			dropped.clear();
+			for (Map.Entry<Integer, Long> entry : countByItemId.entrySet()) {
+				dropped.add(new ItemHolder(entry.getKey(), entry.getValue()));
+			}
+		}
+		
+		return dropped.isEmpty() ? null : dropped;
+	};
+	
+	List<ItemHolder> calculateDrops(GroupedGeneralDropItem item, L2Character victim, L2Character killer);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java
new file mode 100644
index 00000000..cdf29bcb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IKillerChanceModifierStrategy.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IKillerChanceModifierStrategy extends INonGroupedKillerChanceModifierStrategy {
+	IKillerChanceModifierStrategy DEFAULT_STRATEGY = (item, victim, killer) -> {
+		int levelDifference = victim.getLevel() - killer.getLevel();
+		if ((victim.isRaid()) && npc().useDeepBlueDropRulesRaid()) {
+			// FIXME: Config?
+			return Math.max(0, Math.min(1, (levelDifference * 0.15) + 1));
+		} else if (npc().useDeepBlueDropRules()) {
+			
+			return Util.map(levelDifference, -npc().getDropItemMaxLevelDifference(), -npc().getDropItemMinLevelDifference(), npc().getDropItemMinLevelGapChance(), 100.0) / 100;
+		}
+		return 1;
+	};
+	INonGroupedKillerChanceModifierStrategy DEFAULT_NONGROUP_STRATEGY = (item, victim, killer) -> {
+		if (((!(victim.isRaid())) && npc().useDeepBlueDropRules()) || ((victim.isRaid()) && npc().useDeepBlueDropRulesRaid())) {
+			int levelDifference = victim.getLevel() - killer.getLevel();
+			if (item.getItemId() == Inventory.ADENA_ID) {
+				return Util.map(levelDifference, -npc().getDropAdenaMaxLevelDifference(), -npc().getDropAdenaMinLevelDifference(), npc().getDropAdenaMinLevelGapChance(), 100.0) / 100;
+			}
+			return Util.map(levelDifference, -npc().getDropItemMaxLevelDifference(), -npc().getDropItemMinLevelDifference(), npc().getDropItemMinLevelGapChance(), 100.0) / 100;
+		}
+		return 1;
+	};
+	
+	IKillerChanceModifierStrategy NO_RULES = (item, victim, killer) -> 1;
+	
+	double getKillerChanceModifier(IDropItem item, L2Character victim, L2Character killer);
+	
+	@Override
+	default double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer) {
+		return getKillerChanceModifier((IDropItem) item, victim, killer);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java
new file mode 100644
index 00000000..cfe2a38a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/INonGroupedKillerChanceModifierStrategy.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+
+/**
+ * @author Battlecruiser
+ */
+public interface INonGroupedKillerChanceModifierStrategy {
+	double getKillerChanceModifier(GeneralDropItem item, L2Character victim, L2Character killer);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java
new file mode 100644
index 00000000..cd90910b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/drops/strategy/IPreciseDeterminationStrategy.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.drops.IDropItem;
+
+/**
+ * @author Battlecruiser
+ */
+public interface IPreciseDeterminationStrategy {
+	IPreciseDeterminationStrategy ALWAYS = dropItem -> true;
+	
+	IPreciseDeterminationStrategy DEFAULT = dropItem -> general().preciseDropCalculation();
+	
+	IPreciseDeterminationStrategy NEVER = dropItem -> false;
+	
+	/**
+	 * @param dropItem
+	 * @return <code>true</code> if drop calculation strategy should use precise rules
+	 */
+	boolean isPreciseCalculated(IDropItem dropItem);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/effects/AbstractEffect.java b/src/main/java/com/l2jserver/gameserver/model/effects/AbstractEffect.java
new file mode 100644
index 00000000..2a9b01ce
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/effects/AbstractEffect.java
@@ -0,0 +1,267 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.effects;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.handler.EffectHandler;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+
+/**
+ * Abstract effect implementation.<br>
+ * Instant effects should not override {@link #onExit(BuffInfo)}.<br>
+ * Instant effects should not override {@link #canStart(BuffInfo)}, all checks should be done {@link #onStart(BuffInfo)}.<br>
+ * Do not call super class methods {@link #onStart(BuffInfo)} nor {@link #onExit(BuffInfo)}.
+ * @since <a href="http://trac.l2jserver.com/changeset/6249">Changeset 6249</a> the "effect steal constructor" is deprecated.
+ * @author Zoey76
+ */
+public abstract class AbstractEffect {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractEffect.class);
+	
+	// Conditions
+	/** Attach condition. */
+	private final Condition _attachCond;
+	// Apply condition
+	// private final Condition _applyCond; // TODO: Use or cleanup.
+	private List<FuncTemplate> _funcTemplates;
+	/** Effect name. */
+	private final String _name;
+	/** Ticks. */
+	private int _ticks;
+	
+	/**
+	 * Abstract effect constructor.
+	 * @param attachCond the attach condition
+	 * @param applyCond the apply condition
+	 * @param set the attributes
+	 * @param params the parameters
+	 */
+	protected AbstractEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
+		_attachCond = attachCond;
+		// _applyCond = applyCond;
+		_name = set.getString("name");
+	}
+	
+	/**
+	 * Creates an effect given the parameters.
+	 * @param attachCond the attach condition
+	 * @param applyCond the apply condition
+	 * @param set the attributes
+	 * @param params the parameters
+	 * @return the new effect
+	 */
+	public static AbstractEffect createEffect(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) {
+		final var name = set.getString("name");
+		final var handler = EffectHandler.getInstance().getHandler(name);
+		if (handler == null) {
+			LOG.warn("Requested unexistent effect handler {} in skill Id {}!", name, set.getInt("id"));
+			return null;
+		}
+		
+		try {
+			final var constructor = handler.getConstructor(Condition.class, Condition.class, StatsSet.class, StatsSet.class);
+			return constructor.newInstance(attachCond, applyCond, set, params);
+		} catch (NoSuchMethodException | SecurityException ex) {
+			LOG.warn("Requested unexistent constructor for effect handler {} in skill Id {}!", name, set.getInt("id"), ex);
+		} catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException ex) {
+			LOG.warn("Unable to initialize effect handler {} in skill Id {}!", name, set.getInt("id"), ex);
+		}
+		return null;
+	}
+	
+	/**
+	 * Tests the attach condition.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param skill the skill
+	 * @return {@code true} if there isn't a condition to test or it's passed, {@code false} otherwise
+	 */
+	public boolean testConditions(L2Character caster, L2Character target, Skill skill) {
+		return (_attachCond == null) || _attachCond.test(caster, target, skill);
+	}
+	
+	/**
+	 * Attaches a function template.
+	 * @param f the function
+	 */
+	public void attach(FuncTemplate f) {
+		if (_funcTemplates == null) {
+			_funcTemplates = new ArrayList<>(1);
+		}
+		_funcTemplates.add(f);
+	}
+	
+	/**
+	 * Gets the effect name.
+	 * @return the name
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Gets the effect ticks
+	 * @return the ticks
+	 */
+	public int getTicks() {
+		return _ticks;
+	}
+	
+	/**
+	 * Sets the effect ticks
+	 * @param ticks the ticks
+	 */
+	protected void setTicks(int ticks) {
+		_ticks = ticks;
+	}
+	
+	public double getTicksMultiplier() {
+		return (getTicks() * character().getEffectTickRatio()) / 1000f;
+	}
+	
+	public List<FuncTemplate> getFuncTemplates() {
+		return _funcTemplates;
+	}
+	
+	/**
+	 * Calculates whether this effects land or not.<br>
+	 * If it lands will be scheduled and added to the character effect list.<br>
+	 * Override in effect implementation to change behavior. <br>
+	 * <b>Warning:</b> Must be used only for instant effects continuous effects will not call this they have their success handled by activate_rate.
+	 * @param info the buff info
+	 * @return {@code true} if this effect land, {@code false} otherwise
+	 */
+	public boolean calcSuccess(BuffInfo info) {
+		return true;
+	}
+	
+	/**
+	 * Get this effect's type.<br>
+	 * TODO: Remove.
+	 * @return the effect type
+	 */
+	public L2EffectType getEffectType() {
+		return L2EffectType.NONE;
+	}
+	
+	/**
+	 * Verify if the buff can start.<br>
+	 * Used for continuous effects.
+	 * @param info the buff info
+	 * @return {@code true} if all the start conditions are meet, {@code false} otherwise
+	 */
+	public boolean canStart(BuffInfo info) {
+		return true;
+	}
+	
+	/**
+	 * Called on effect start.
+	 * @param info the buff info
+	 */
+	public void onStart(BuffInfo info) {
+		
+	}
+	
+	/**
+	 * Called on each tick.<br>
+	 * If the abnormal time is lesser than zero it will last forever.
+	 * @param info the buff info
+	 * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed
+	 */
+	public boolean onActionTime(BuffInfo info) {
+		return false;
+	}
+	
+	/**
+	 * Called when the effect is exited.
+	 * @param info the buff info
+	 */
+	public void onExit(BuffInfo info) {
+		
+	}
+	
+	/**
+	 * Get this effect's stats functions.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param skill the skill
+	 * @return a list of stat functions.
+	 */
+	public List<AbstractFunction> getStatFuncs(L2Character caster, L2Character target, Skill skill) {
+		if (getFuncTemplates() == null) {
+			return List.of();
+		}
+		
+		final var functions = new ArrayList<AbstractFunction>(getFuncTemplates().size());
+		for (var functionTemplate : getFuncTemplates()) {
+			final var function = functionTemplate.getFunc(caster, target, skill, this);
+			if (function != null) {
+				functions.add(function);
+			}
+		}
+		return functions;
+	}
+	
+	/**
+	 * Get the effect flags.
+	 * @return bit flag for current effect
+	 */
+	public int getEffectFlags() {
+		return EffectFlag.NONE.getMask();
+	}
+	
+	@Override
+	public String toString() {
+		return "Effect " + _name;
+	}
+	
+	public void decreaseForce() {
+		
+	}
+	
+	public void increaseEffect() {
+		
+	}
+	
+	public boolean checkCondition(Object obj) {
+		return true;
+	}
+	
+	/**
+	 * Verify if this effect is an instant effect.
+	 * @return {@code true} if this effect is instant, {@code false} otherwise
+	 */
+	public boolean isInstant() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/effects/EffectFlag.java b/src/main/java/com/l2jserver/gameserver/model/effects/EffectFlag.java
new file mode 100644
index 00000000..9b20eed9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/effects/EffectFlag.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.effects;
+
+/**
+ * @author UnAfraid
+ */
+public enum EffectFlag {
+	NONE,
+	BLOCK_BUFF,
+	BLOCK_DEBUFF,
+	BLOCK_HP,
+	BLOCK_MP,
+	RESURRECTION_SPECIAL,
+	NOBLESS_BLESSING,
+	SILENT_MOVE,
+	PROTECTION_BLESSING,
+	RELAXING,
+	FEAR,
+	CONFUSED,
+	MUTED,
+	PSYCHICAL_MUTED,
+	PSYCHICAL_ATTACK_MUTED,
+	DISARMED,
+	ROOTED,
+	SLEEP,
+	STUNNED,
+	BETRAYED,
+	SINGLE_TARGET,
+	BLOCK_RESURRECTION,
+	SERVITOR_SHARE;
+	
+	public int getMask() {
+		return 1 << ordinal();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/effects/EffectTaskInfo.java b/src/main/java/com/l2jserver/gameserver/model/effects/EffectTaskInfo.java
new file mode 100644
index 00000000..55c0398d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/effects/EffectTaskInfo.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.effects;
+
+import java.util.concurrent.ScheduledFuture;
+
+/**
+ * Effect Task Info DTO.
+ * @author Zoey76
+ */
+public class EffectTaskInfo {
+	private final EffectTickTask _effectTask;
+	private final ScheduledFuture<?> _scheduledFuture;
+	
+	public EffectTaskInfo(EffectTickTask effectTask, ScheduledFuture<?> scheduledFuture) {
+		_effectTask = effectTask;
+		_scheduledFuture = scheduledFuture;
+	}
+	
+	public EffectTickTask getEffectTask() {
+		return _effectTask;
+	}
+	
+	public ScheduledFuture<?> getScheduledFuture() {
+		return _scheduledFuture;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/effects/EffectTickTask.java b/src/main/java/com/l2jserver/gameserver/model/effects/EffectTickTask.java
new file mode 100644
index 00000000..79437633
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/effects/EffectTickTask.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.effects;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+/**
+ * Effect tick task.
+ * @author Zoey76
+ */
+public class EffectTickTask implements Runnable {
+	private final BuffInfo _info;
+	private final AbstractEffect _effect;
+	private final AtomicInteger _tickCount = new AtomicInteger();
+	
+	public EffectTickTask(BuffInfo info, AbstractEffect effect) {
+		_info = info;
+		_effect = effect;
+	}
+	
+	public BuffInfo getBuffInfo() {
+		return _info;
+	}
+	
+	public AbstractEffect getEffect() {
+		return _effect;
+	}
+	
+	public int getTickCount() {
+		return _tickCount.get();
+	}
+	
+	@Override
+	public void run() {
+		_info.onTick(_effect, _tickCount.incrementAndGet());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/effects/L2EffectType.java b/src/main/java/com/l2jserver/gameserver/model/effects/L2EffectType.java
new file mode 100644
index 00000000..302f999e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/effects/L2EffectType.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.effects;
+
+/**
+ * Effect types.
+ * @author nBd
+ */
+public enum L2EffectType {
+	AGGRESSION,
+	BUFF,
+	BONUS_TIME_LIMIT_UP,
+	CHAT_BLOCK,
+	CP,
+	DEBUFF,
+	DISPEL,
+	DMG_OVER_TIME,
+	FAKE_DEATH,
+	FEAR,
+	FISHING,
+	FISHING_START,
+	HATE,
+	HP,
+	HP_DRAIN,
+	MAGICAL_ATTACK,
+	MANAHEAL_BY_LEVEL,
+	MANAHEAL_PERCENT,
+	MUTE,
+	NOBLESSE_BLESSING,
+	NONE,
+	PHYSICAL_ATTACK,
+	REBALANCE_HP,
+	REFUEL_AIRSHIP,
+	RELAXING,
+	RESURRECTION,
+	RESURRECTION_SPECIAL,
+	ROOT,
+	SLEEP,
+	STEAL_ABNORMAL,
+	STUN,
+	SUMMON,
+	SUMMON_NPC,
+	TELEPORT,
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/AbstractResidence.java b/src/main/java/com/l2jserver/gameserver/model/entity/AbstractResidence.java
new file mode 100644
index 00000000..903373ee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/AbstractResidence.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+import com.l2jserver.gameserver.model.zone.type.L2ResidenceZone;
+
+/**
+ * @author xban1x
+ */
+public abstract class AbstractResidence extends ListenersContainer implements INamable {
+	private final int _residenceId;
+	private String _name;
+	
+	private L2ResidenceZone _zone = null;
+	private final List<SkillHolder> _residentialSkills = new ArrayList<>();
+	
+	public AbstractResidence(int residenceId) {
+		_residenceId = residenceId;
+		initResidentialSkills();
+	}
+	
+	protected abstract void load();
+	
+	protected abstract void initResidenceZone();
+	
+	protected void initResidentialSkills() {
+		final List<L2SkillLearn> residentialSkills = SkillTreesData.getInstance().getAvailableResidentialSkills(getResidenceId());
+		for (L2SkillLearn s : residentialSkills) {
+			_residentialSkills.add(new SkillHolder(s.getSkillId(), s.getSkillLevel()));
+		}
+	}
+	
+	public final int getResidenceId() {
+		return _residenceId;
+	}
+	
+	@Override
+	public final String getName() {
+		return _name;
+	}
+	
+	// TODO: Remove it later when both castles and forts are loaded from same table.
+	public final void setName(String name) {
+		_name = name;
+	}
+	
+	public L2ResidenceZone getResidenceZone() {
+		return _zone;
+	}
+	
+	protected void setResidenceZone(L2ResidenceZone zone) {
+		_zone = zone;
+	}
+	
+	public final List<SkillHolder> getResidentialSkills() {
+		return _residentialSkills;
+	}
+	
+	public void giveResidentialSkills(L2PcInstance player) {
+		if (!_residentialSkills.isEmpty()) {
+			for (SkillHolder sh : _residentialSkills) {
+				player.addSkill(sh.getSkill(), false);
+			}
+		}
+	}
+	
+	public void removeResidentialSkills(L2PcInstance player) {
+		if (!_residentialSkills.isEmpty()) {
+			for (SkillHolder sh : _residentialSkills) {
+				player.removeSkill(sh.getSkill(), false);
+			}
+		}
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		return (obj instanceof AbstractResidence) && (((AbstractResidence) obj).getResidenceId() == getResidenceId());
+	}
+	
+	@Override
+	public String toString() {
+		return getName() + "(" + getResidenceId() + ")";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Auction.java b/src/main/java/com/l2jserver/gameserver/model/entity/Auction.java
new file mode 100644
index 00000000..4da90e38
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Auction.java
@@ -0,0 +1,495 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+
+import java.util.Calendar;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.enums.AuctionItemType;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.AuctionManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public class Auction {
+	protected static final Logger LOG = LoggerFactory.getLogger(Auction.class);
+	
+	private final int _id;
+	private long _endDate;
+	private int _highestBidderId = 0;
+	private String _highestBidderName = "";
+	private long _highestBidderMaxBid = 0;
+	private int _itemId = 0;
+	private String _itemName = "";
+	private int _itemObjectId = 0;
+	private final long _itemQuantity = 0;
+	private String _itemType = "";
+	private int _sellerId = 0;
+	private String _sellerClanName = "";
+	private String _sellerName = "";
+	private long _currentBid = 0;
+	private long _startingBid = 0;
+	
+	private final Map<Integer, Bidder> _bidders = new ConcurrentHashMap<>();
+	
+	private static final String[] ItemTypeName = {
+		"ClanHall"
+	};
+	
+	public static class Bidder {
+		private final String _name; // TODO replace with objid
+		private final String _clanName;
+		private long _bid;
+		private final Calendar _timeBid;
+		
+		public Bidder(String name, String clanName, long bid, long timeBid) {
+			_name = name;
+			_clanName = clanName;
+			_bid = bid;
+			_timeBid = Calendar.getInstance();
+			_timeBid.setTimeInMillis(timeBid);
+		}
+		
+		public String getName() {
+			return _name;
+		}
+		
+		public String getClanName() {
+			return _clanName;
+		}
+		
+		public long getBid() {
+			return _bid;
+		}
+		
+		public Calendar getTimeBid() {
+			return _timeBid;
+		}
+		
+		public void setTimeBid(long timeBid) {
+			_timeBid.setTimeInMillis(timeBid);
+		}
+		
+		public void setBid(long bid) {
+			_bid = bid;
+		}
+	}
+	
+	public class AutoEndTask implements Runnable {
+		public AutoEndTask() {
+		}
+		
+		@Override
+		public void run() {
+			try {
+				endAuction();
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	public Auction(int auctionId) {
+		_id = auctionId;
+		load();
+		startAutoTask();
+	}
+	
+	public Auction(int itemId, L2Clan Clan, long delay, long bid, String name) {
+		_id = itemId;
+		_endDate = System.currentTimeMillis() + delay;
+		_itemId = itemId;
+		_itemName = name;
+		_itemType = "ClanHall";
+		_sellerId = Clan.getLeaderId();
+		_sellerName = Clan.getLeaderName();
+		_sellerClanName = Clan.getName();
+		_startingBid = bid;
+	}
+	
+	private void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("Select * from auction where id = ?")) {
+			ps.setInt(1, getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					_currentBid = rs.getLong("currentBid");
+					_endDate = rs.getLong("endDate");
+					_itemId = rs.getInt("itemId");
+					_itemName = rs.getString("itemName");
+					_itemObjectId = rs.getInt("itemObjectId");
+					_itemType = rs.getString("itemType");
+					_sellerId = rs.getInt("sellerId");
+					_sellerClanName = rs.getString("sellerClanName");
+					_sellerName = rs.getString("sellerName");
+					_startingBid = rs.getLong("startingBid");
+				}
+			}
+			loadBid();
+		} catch (Exception e) {
+			LOG.warn("Exception: Auction.load(): {}", e.getMessage(), e);
+		}
+	}
+	
+	private void loadBid() {
+		_highestBidderId = 0;
+		_highestBidderName = "";
+		_highestBidderMaxBid = 0;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT bidderId, bidderName, maxBid, clan_name, time_bid FROM auction_bid WHERE auctionId = ? ORDER BY maxBid DESC")) {
+			ps.setInt(1, getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					if (rs.isFirst()) {
+						_highestBidderId = rs.getInt("bidderId");
+						_highestBidderName = rs.getString("bidderName");
+						_highestBidderMaxBid = rs.getLong("maxBid");
+					}
+					_bidders.put(rs.getInt("bidderId"), new Bidder(rs.getString("bidderName"), rs.getString("clan_name"), rs.getLong("maxBid"), rs.getLong("time_bid")));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: Auction.loadBid(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/** Task Manage */
+	private void startAutoTask() {
+		long currentTime = System.currentTimeMillis();
+		long taskDelay = 0;
+		if (_endDate <= currentTime) {
+			_endDate = currentTime + (7 * 24 * 3600000);
+			saveAuctionDate();
+		} else {
+			taskDelay = _endDate - currentTime;
+		}
+		ThreadPoolManager.getInstance().scheduleGeneral(new AutoEndTask(), taskDelay);
+	}
+	
+	public static String getItemTypeName(AuctionItemType value) {
+		return ItemTypeName[value.ordinal()];
+	}
+	
+	private void saveAuctionDate() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("Update auction set endDate = ? where id = ?")) {
+			ps.setLong(1, _endDate);
+			ps.setInt(2, _id);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: saveAuctionDate(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Set a bid
+	 */
+	public synchronized void setBid(L2PcInstance bidder, long bid) {
+		long requiredAdena = bid;
+		if (getHighestBidderName().equals(bidder.getClan().getLeaderName())) {
+			requiredAdena = bid - getHighestBidderMaxBid();
+		}
+		if (((getHighestBidderId() > 0) && (bid > getHighestBidderMaxBid())) || ((getHighestBidderId() == 0) && (bid >= getStartingBid()))) {
+			if (takeItem(bidder, requiredAdena)) {
+				updateInDB(bidder, bid);
+				bidder.getClan().setAuctionBidAt(_id, true);
+				return;
+			}
+		}
+		if ((bid < getStartingBid()) || (bid <= getHighestBidderMaxBid())) {
+			bidder.sendPacket(SystemMessageId.BID_PRICE_MUST_BE_HIGHER);
+		}
+	}
+	
+	/**
+	 * Returns the item to the clan warehouse.
+	 * @param clanName the clan name
+	 * @param quantity the Adena value
+	 * @param penalty if {@code true} fees are applied
+	 */
+	private void returnItem(String clanName, long quantity, boolean penalty) {
+		if (penalty) {
+			quantity *= 0.9; // take 10% tax fee if needed
+		}
+		
+		final L2Clan clan = ClanTable.getInstance().getClanByName(clanName);
+		if (clan == null) {
+			LOG.warn("Clan {} doesn't exist!", clanName);
+			return;
+		}
+		
+		final ItemContainer cwh = clan.getWarehouse();
+		if (cwh == null) {
+			LOG.warn("There has been a problem with {}'s clan warehouse!", clanName);
+			return;
+		}
+		
+		// avoid overflow on return
+		final long limit = character().getMaxAdena() - cwh.getAdena();
+		quantity = Math.min(quantity, limit);
+		
+		cwh.addItem("Outbidded", ADENA_ID, quantity, null, null);
+	}
+	
+	/**
+	 * Take Item in WHC
+	 */
+	private boolean takeItem(L2PcInstance bidder, long quantity) {
+		if ((bidder.getClan() != null) && (bidder.getClan().getWarehouse().getAdena() >= quantity)) {
+			bidder.getClan().getWarehouse().destroyItemByItemId("Buy", ADENA_ID, quantity, bidder, bidder);
+			return true;
+		}
+		bidder.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_IN_CWH);
+		return false;
+	}
+	
+	/**
+	 * Update auction in DB
+	 */
+	private void updateInDB(L2PcInstance bidder, long bid) {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			if (_bidders.get(bidder.getClanId()) != null) {
+				try (var ps = con.prepareStatement("UPDATE auction_bid SET bidderId=?, bidderName=?, maxBid=?, time_bid=? WHERE auctionId=? AND bidderId=?")) {
+					ps.setInt(1, bidder.getClanId());
+					ps.setString(2, bidder.getClan().getLeaderName());
+					ps.setLong(3, bid);
+					ps.setLong(4, System.currentTimeMillis());
+					ps.setInt(5, getId());
+					ps.setInt(6, bidder.getClanId());
+					ps.execute();
+				}
+			} else {
+				try (var ps = con.prepareStatement("INSERT INTO auction_bid (id, auctionId, bidderId, bidderName, maxBid, clan_name, time_bid) VALUES (?, ?, ?, ?, ?, ?, ?)")) {
+					ps.setInt(1, IdFactory.getInstance().getNextId());
+					ps.setInt(2, getId());
+					ps.setInt(3, bidder.getClanId());
+					ps.setString(4, bidder.getName());
+					ps.setLong(5, bid);
+					ps.setString(6, bidder.getClan().getName());
+					ps.setLong(7, System.currentTimeMillis());
+					ps.execute();
+				}
+				if (L2World.getInstance().getPlayer(_highestBidderName) != null) {
+					L2World.getInstance().getPlayer(_highestBidderName).sendMessage("You have been out bidded");
+				}
+			}
+			
+			_highestBidderId = bidder.getClanId();
+			_highestBidderMaxBid = bid;
+			_highestBidderName = bidder.getClan().getLeaderName();
+			if (_bidders.get(_highestBidderId) == null) {
+				_bidders.put(_highestBidderId, new Bidder(_highestBidderName, bidder.getClan().getName(), bid, Calendar.getInstance().getTimeInMillis()));
+			} else {
+				_bidders.get(_highestBidderId).setBid(bid);
+				_bidders.get(_highestBidderId).setTimeBid(Calendar.getInstance().getTimeInMillis());
+			}
+			bidder.sendPacket(SystemMessageId.BID_IN_CLANHALL_AUCTION);
+		} catch (Exception e) {
+			LOG.error("Exception: Auction.updateInDB(L2PcInstance bidder, int bid): {}", e.getMessage(), e);
+		}
+	}
+	
+	private void removeBids() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=?")) {
+			ps.setInt(1, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Auction.deleteFromDB(): {}", e.getMessage(), e);
+		}
+		
+		for (Bidder b : _bidders.values()) {
+			if (ClanTable.getInstance().getClanByName(b.getClanName()).getHideoutId() == 0) {
+				returnItem(b.getClanName(), b.getBid(), true); // 10 % tax
+			} else {
+				if (L2World.getInstance().getPlayer(b.getName()) != null) {
+					L2World.getInstance().getPlayer(b.getName()).sendMessage("Congratulation you have won ClanHall!");
+				}
+			}
+			ClanTable.getInstance().getClanByName(b.getClanName()).setAuctionBidAt(0, true);
+		}
+		_bidders.clear();
+	}
+	
+	public void deleteAuctionFromDB() {
+		AuctionManager.getInstance().getAuctions().remove(this);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM auction WHERE itemId=?")) {
+			ps.setInt(1, _itemId);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Auction.deleteFromDB(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public void endAuction() {
+		if (ClanHallManager.getInstance().loaded()) {
+			if ((_highestBidderId == 0) && (_sellerId == 0)) {
+				startAutoTask();
+				return;
+			}
+			if ((_highestBidderId == 0) && (_sellerId > 0)) {
+				// If seller haven't sold ClanHall, auction removed, THIS MUST BE CONFIRMED
+				int aucId = AuctionManager.getInstance().getAuctionIndex(_id);
+				AuctionManager.getInstance().getAuctions().remove(aucId);
+				return;
+			}
+			if (_sellerId > 0) {
+				returnItem(_sellerClanName, _highestBidderMaxBid, true);
+				returnItem(_sellerClanName, ClanHallManager.getInstance().getAuctionableHallById(_itemId).getLease(), false);
+			}
+			deleteAuctionFromDB();
+			L2Clan Clan = ClanTable.getInstance().getClanByName(_bidders.get(_highestBidderId).getClanName());
+			_bidders.remove(_highestBidderId);
+			Clan.setAuctionBidAt(0, true);
+			removeBids();
+			ClanHallManager.getInstance().setOwner(_itemId, Clan);
+		} else {
+			// Task waiting ClanHallManager is loaded every 3s
+			ThreadPoolManager.getInstance().scheduleGeneral(new AutoEndTask(), 3000);
+		}
+	}
+	
+	/**
+	 * Cancel bid
+	 */
+	public synchronized void cancelBid(int bidder) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM auction_bid WHERE auctionId=? AND bidderId=?")) {
+			ps.setInt(1, getId());
+			ps.setInt(2, bidder);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Auction.cancelBid(String bidder): {}", e.getMessage(), e);
+		}
+		
+		returnItem(_bidders.get(bidder).getClanName(), _bidders.get(bidder).getBid(), true);
+		ClanTable.getInstance().getClanByName(_bidders.get(bidder).getClanName()).setAuctionBidAt(0, true);
+		_bidders.clear();
+		loadBid();
+	}
+	
+	/** Cancel auction */
+	public void cancelAuction() {
+		deleteAuctionFromDB();
+		removeBids();
+	}
+	
+	/** Confirm an auction */
+	public void confirmAuction() {
+		AuctionManager.getInstance().getAuctions().add(this);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO auction (id, sellerId, sellerName, sellerClanName, itemType, itemId, itemObjectId, itemName, itemQuantity, startingBid, currentBid, endDate) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)")) {
+			ps.setInt(1, getId());
+			ps.setInt(2, _sellerId);
+			ps.setString(3, _sellerName);
+			ps.setString(4, _sellerClanName);
+			ps.setString(5, _itemType);
+			ps.setInt(6, _itemId);
+			ps.setInt(7, _itemObjectId);
+			ps.setString(8, _itemName);
+			ps.setLong(9, _itemQuantity);
+			ps.setLong(10, _startingBid);
+			ps.setLong(11, _currentBid);
+			ps.setLong(12, _endDate);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Auction.load(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public final int getId() {
+		return _id;
+	}
+	
+	public final long getCurrentBid() {
+		return _currentBid;
+	}
+	
+	public final long getEndDate() {
+		return _endDate;
+	}
+	
+	public final int getHighestBidderId() {
+		return _highestBidderId;
+	}
+	
+	public final String getHighestBidderName() {
+		return _highestBidderName;
+	}
+	
+	public final long getHighestBidderMaxBid() {
+		return _highestBidderMaxBid;
+	}
+	
+	public final int getItemId() {
+		return _itemId;
+	}
+	
+	public final String getItemName() {
+		return _itemName;
+	}
+	
+	public final int getItemObjectId() {
+		return _itemObjectId;
+	}
+	
+	public final long getItemQuantity() {
+		return _itemQuantity;
+	}
+	
+	public final String getItemType() {
+		return _itemType;
+	}
+	
+	public final int getSellerId() {
+		return _sellerId;
+	}
+	
+	public final String getSellerName() {
+		return _sellerName;
+	}
+	
+	public final String getSellerClanName() {
+		return _sellerClanName;
+	}
+	
+	public final long getStartingBid() {
+		return _startingBid;
+	}
+	
+	public final Map<Integer, Bidder> getBidders() {
+		return _bidders;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java b/src/main/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java
new file mode 100644
index 00000000..d9f98e56
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/BlockCheckerEngine.java
@@ -0,0 +1,652 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameChangePoints;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameCloseUI;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameEnd;
+import com.l2jserver.gameserver.network.serverpackets.ExCubeGameExtendedChangePoints;
+import com.l2jserver.gameserver.network.serverpackets.RelationChanged;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author BiggBoss
+ */
+public final class BlockCheckerEngine {
+	private static final Logger LOG = LoggerFactory.getLogger(BlockCheckerEngine.class);
+	
+	// The object which holds all basic members info
+	private ArenaParticipantsHolder _holder;
+	// Maps to hold player of each team and his points
+	private final Map<L2PcInstance, Integer> _redTeamPoints = new ConcurrentHashMap<>();
+	private final Map<L2PcInstance, Integer> _blueTeamPoints = new ConcurrentHashMap<>();
+	// The initial points of the event
+	private int _redPoints = 15;
+	private int _bluePoints = 15;
+	// Current used arena
+	private int _arena = -1;
+	// All blocks
+	private final List<L2Spawn> _spawns = new CopyOnWriteArrayList<>();
+	// Sets if the red team won the event at the end of this (used for packets)
+	private boolean _isRedWinner;
+	// Time when the event starts. Used on packet sending
+	private long _startedTime;
+	// The needed arena coordinates
+	// Arena X: team1X, team1Y, team2X, team2Y, ArenaCenterX, ArenaCenterY
+	private static final int[][] _arenaCoordinates = {
+		// Arena 0 - Team 1 XY, Team 2 XY - CENTER XY
+		{
+			-58368,
+			-62745,
+			-57751,
+			-62131,
+			-58053,
+			-62417
+		},
+		// Arena 1 - Team 1 XY, Team 2 XY - CENTER XY
+		{
+			-58350,
+			-63853,
+			-57756,
+			-63266,
+			-58053,
+			-63551
+		},
+		// Arena 2 - Team 1 XY, Team 2 XY - CENTER XY
+		{
+			-57194,
+			-63861,
+			-56580,
+			-63249,
+			-56886,
+			-63551
+		},
+		// Arena 3 - Team 1 XY, Team 2 XY - CENTER XY
+		{
+			-57200,
+			-62727,
+			-56584,
+			-62115,
+			-56850,
+			-62391
+		}
+	};
+	// Common z coordinate
+	private static final int _zCoord = -2405;
+	// List of dropped items in event (for later deletion)
+	private final List<L2ItemInstance> _drops = new CopyOnWriteArrayList<>();
+	// Default arena
+	private static final byte DEFAULT_ARENA = -1;
+	// Event is started
+	private boolean _isStarted = false;
+	// Event end
+	private ScheduledFuture<?> _task;
+	// Preserve from exploit reward by logging out
+	private boolean _abnormalEnd = false;
+	
+	public BlockCheckerEngine(ArenaParticipantsHolder holder, int arena) {
+		_holder = holder;
+		if ((arena > -1) && (arena < 4)) {
+			_arena = arena;
+		}
+		
+		for (L2PcInstance player : holder.getRedPlayers()) {
+			_redTeamPoints.put(player, 0);
+		}
+		for (L2PcInstance player : holder.getBluePlayers()) {
+			_blueTeamPoints.put(player, 0);
+		}
+	}
+	
+	/**
+	 * Updates the player holder before the event starts to synchronize all info
+	 */
+	public void updatePlayersOnStart(ArenaParticipantsHolder holder) {
+		_holder = holder;
+	}
+	
+	/**
+	 * Returns the current holder object of this object engine
+	 * @return HandysBlockCheckerManager.ArenaParticipantsHolder
+	 */
+	public ArenaParticipantsHolder getHolder() {
+		return _holder;
+	}
+	
+	/**
+	 * Will return the id of the arena used by this event
+	 * @return false;
+	 */
+	public int getArena() {
+		return _arena;
+	}
+	
+	/**
+	 * Returns the time when the event started
+	 * @return long
+	 */
+	public long getStarterTime() {
+		return _startedTime;
+	}
+	
+	/**
+	 * Returns the current red team points
+	 * @return int
+	 */
+	public int getRedPoints() {
+		synchronized (this) {
+			return _redPoints;
+		}
+	}
+	
+	/**
+	 * Returns the current blue team points
+	 * @return int
+	 */
+	public int getBluePoints() {
+		synchronized (this) {
+			return _bluePoints;
+		}
+	}
+	
+	/**
+	 * Returns the player points
+	 */
+	public int getPlayerPoints(L2PcInstance player, boolean isRed) {
+		if (!_redTeamPoints.containsKey(player) && !_blueTeamPoints.containsKey(player)) {
+			return 0;
+		}
+		
+		if (isRed) {
+			return _redTeamPoints.get(player);
+		}
+		return _blueTeamPoints.get(player);
+	}
+	
+	/**
+	 * Increases player points for his teams
+	 */
+	public synchronized void increasePlayerPoints(L2PcInstance player, int team) {
+		if (player == null) {
+			return;
+		}
+		
+		if (team == 0) {
+			int points = _redTeamPoints.get(player) + 1;
+			_redTeamPoints.put(player, points);
+			_redPoints++;
+			_bluePoints--;
+		} else {
+			int points = _blueTeamPoints.get(player) + 1;
+			_blueTeamPoints.put(player, points);
+			_bluePoints++;
+			_redPoints--;
+		}
+	}
+	
+	/**
+	 * Will add a new drop into the list of dropped items
+	 */
+	public void addNewDrop(L2ItemInstance item) {
+		if (item != null) {
+			_drops.add(item);
+		}
+	}
+	
+	/**
+	 * Will return true if the event is already started
+	 */
+	public boolean isStarted() {
+		return _isStarted;
+	}
+	
+	/**
+	 * Will send all packets for the event members with the relation info
+	 */
+	private void broadcastRelationChanged(L2PcInstance plr) {
+		for (L2PcInstance p : _holder.getAllPlayers()) {
+			p.sendPacket(new RelationChanged(plr, plr.getRelation(p), plr.isAutoAttackable(p)));
+		}
+	}
+	
+	/**
+	 * Called when a there is an empty team. The event will end.
+	 */
+	public void endEventAbnormally() {
+		try {
+			synchronized (this) {
+				_isStarted = false;
+				
+				if (_task != null) {
+					_task.cancel(true);
+				}
+				
+				_abnormalEnd = true;
+				
+				ThreadPoolManager.getInstance().executeGeneral(new EndEvent());
+				
+				if (general().debug()) {
+					LOG.info("Handys Block Checker Event at arena {} ended due lack of players!", _arena);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Couldn't end Block Checker event at {}", _arena, e);
+		}
+	}
+	
+	/**
+	 * This inner class set-ups all player and arena parameters to start the event
+	 */
+	public class StartEvent implements Runnable {
+		// In event used skills
+		private final Skill _freeze, _transformationRed, _transformationBlue;
+		// Common and unparametizer packet
+		private final ExCubeGameCloseUI _closeUserInterface = new ExCubeGameCloseUI();
+		
+		public StartEvent() {
+			// Initialize all used skills
+			_freeze = SkillData.getInstance().getSkill(6034, 1);
+			_transformationRed = SkillData.getInstance().getSkill(6035, 1);
+			_transformationBlue = SkillData.getInstance().getSkill(6036, 1);
+		}
+		
+		/**
+		 * Will set up all player parameters and port them to their respective location based on their teams
+		 */
+		private void setUpPlayers() {
+			// Set current arena as being used
+			HandysBlockCheckerManager.getInstance().setArenaBeingUsed(_arena);
+			
+			// Initialize packets avoiding create a new one per player
+			_redPoints = _spawns.size() / 2;
+			_bluePoints = _spawns.size() / 2;
+			final ExCubeGameChangePoints initialPoints = new ExCubeGameChangePoints(300, _bluePoints, _redPoints);
+			ExCubeGameExtendedChangePoints clientSetUp;
+			
+			for (L2PcInstance player : _holder.getAllPlayers()) {
+				if (player == null) {
+					continue;
+				}
+				
+				// Send the secret client packet set up
+				boolean isRed = _holder.getRedPlayers().contains(player);
+				
+				clientSetUp = new ExCubeGameExtendedChangePoints(300, _bluePoints, _redPoints, isRed, player, 0);
+				player.sendPacket(clientSetUp);
+				
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+				
+				// Teleport Player - Array access
+				// Team 0 * 2 = 0; 0 = 0, 0 + 1 = 1.
+				// Team 1 * 2 = 2; 2 = 2, 2 + 1 = 3
+				int tc = _holder.getPlayerTeam(player) * 2;
+				// Get x and y coordinates
+				int x = _arenaCoordinates[_arena][tc];
+				int y = _arenaCoordinates[_arena][tc + 1];
+				player.teleToLocation(x, y, _zCoord);
+				// Set the player team
+				if (isRed) {
+					_redTeamPoints.put(player, 0);
+					player.setTeam(Team.RED);
+				} else {
+					_blueTeamPoints.put(player, 0);
+					player.setTeam(Team.BLUE);
+				}
+				player.stopAllEffects();
+				
+				if (player.hasSummon()) {
+					player.getSummon().unSummon(player);
+				}
+				
+				// Give the player start up effects
+				// Freeze
+				_freeze.applyEffects(player, player);
+				// Transformation
+				if (_holder.getPlayerTeam(player) == 0) {
+					_transformationRed.applyEffects(player, player);
+				} else {
+					_transformationBlue.applyEffects(player, player);
+				}
+				// Set the current player arena
+				player.setBlockCheckerArena((byte) _arena);
+				player.setInsideZone(ZoneId.PVP, true);
+				// Send needed packets
+				player.sendPacket(initialPoints);
+				player.sendPacket(_closeUserInterface);
+				// ExBasicActionList
+				player.sendPacket(ExBasicActionList.STATIC_PACKET);
+				broadcastRelationChanged(player);
+			}
+		}
+		
+		@Override
+		public void run() {
+			// Wrong arena passed, stop event
+			if (_arena == -1) {
+				LOG.error("Couldn't set up the arena Id for the Block Checker event, cancelling event...");
+				return;
+			}
+			_isStarted = true;
+			// Spawn the blocks
+			ThreadPoolManager.getInstance().executeGeneral(new SpawnRound(16, 1));
+			// Start up player parameters
+			setUpPlayers();
+			// Set the started time
+			_startedTime = System.currentTimeMillis() + 300000;
+		}
+	}
+	
+	/**
+	 * This class spawns the second round of boxes and schedules the event end
+	 */
+	private class SpawnRound implements Runnable {
+		int _numOfBoxes;
+		int _round;
+		
+		SpawnRound(int numberOfBoxes, int round) {
+			_numOfBoxes = numberOfBoxes;
+			_round = round;
+		}
+		
+		@Override
+		public void run() {
+			if (!_isStarted) {
+				return;
+			}
+			
+			// Schedule second spawn round
+			// Schedule third spawn round
+			// Schedule Event End Count Down
+			switch (_round) {
+				case 1 -> _task = ThreadPoolManager.getInstance().scheduleGeneral(new SpawnRound(20, 2), 60000);
+				case 2 -> _task = ThreadPoolManager.getInstance().scheduleGeneral(new SpawnRound(14, 3), 60000);
+				case 3 -> _task = ThreadPoolManager.getInstance().scheduleGeneral(new EndEvent(), 180000);
+			}
+			// random % 2, if == 0 will spawn a red block
+			// if != 0, will spawn a blue block
+			byte random = 2;
+			// Spawn blocks
+			try {
+				// Creates 50 new blocks
+				for (int i = 0; i < _numOfBoxes; i++) {
+					final L2Spawn spawn = new L2Spawn(18672);
+					spawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
+					spawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
+					spawn.setZ(_zCoord);
+					spawn.setAmount(1);
+					spawn.setHeading(1);
+					spawn.setRespawnDelay(1);
+					SpawnTable.getInstance().addNewSpawn(spawn, false);
+					spawn.init();
+					L2BlockInstance block = (L2BlockInstance) spawn.getLastSpawn();
+					// switch color
+					block.setRed((random % 2) == 0);
+					
+					block.disableCoreAI(true);
+					_spawns.add(spawn);
+					random++;
+				}
+			} catch (Exception e) {
+				LOG.warn(e.getMessage(), e);
+			}
+			
+			// Spawn the block carrying girl
+			if ((_round == 1) || (_round == 2)) {
+				try {
+					final L2Spawn girlSpawn = new L2Spawn(18676);
+					girlSpawn.setX(_arenaCoordinates[_arena][4] + Rnd.get(-400, 400));
+					girlSpawn.setY(_arenaCoordinates[_arena][5] + Rnd.get(-400, 400));
+					girlSpawn.setZ(_zCoord);
+					girlSpawn.setAmount(1);
+					girlSpawn.setHeading(1);
+					girlSpawn.setRespawnDelay(1);
+					SpawnTable.getInstance().addNewSpawn(girlSpawn, false);
+					girlSpawn.init();
+					// Schedule his deletion after 9 secs of spawn
+					ThreadPoolManager.getInstance().scheduleGeneral(new CarryingGirlUnspawn(girlSpawn), 9000);
+				} catch (Exception e) {
+					LOG.warn("Couldn't Spawn Block Checker NPCs! Wrong instance type at npc table?", e);
+				}
+			}
+			
+			_redPoints += _numOfBoxes / 2;
+			_bluePoints += _numOfBoxes / 2;
+			
+			int timeLeft = (int) ((getStarterTime() - System.currentTimeMillis()) / 1000);
+			ExCubeGameChangePoints changePoints = new ExCubeGameChangePoints(timeLeft, getBluePoints(), getRedPoints());
+			getHolder().broadCastPacketToTeam(changePoints);
+		}
+	}
+	
+	private static class CarryingGirlUnspawn implements Runnable {
+		private final L2Spawn _spawn;
+		
+		protected CarryingGirlUnspawn(L2Spawn spawn) {
+			_spawn = spawn;
+		}
+		
+		@Override
+		public void run() {
+			if (_spawn == null) {
+				LOG.warn("HBCE: Block Carrying Girl is null");
+				return;
+			}
+			SpawnTable.getInstance().deleteSpawn(_spawn, false);
+			_spawn.stopRespawn();
+			_spawn.getLastSpawn().deleteMe();
+		}
+	}
+	
+	/*
+	 * private class CountDown implements Runnable {
+	 * @Override public void run() { _holder.broadCastPacketToTeam(SystemMessage.getSystemMessage(SystemMessageId.BLOCK_CHECKER_ENDS_5)); ThreadPoolManager.getInstance().scheduleGeneral(new EndEvent(), 5000); } }
+	 */
+	
+	/**
+	 * This class erase all event parameters on player and port them back near Handy. Also, unspawn blocks, runs a garbage collector and set as free the used arena
+	 */
+	protected class EndEvent implements Runnable {
+		// Garbage collector and arena free setter
+		private void clearMe() {
+			HandysBlockCheckerManager.getInstance().clearPaticipantQueueByArenaId(_arena);
+			_holder.clearPlayers();
+			_blueTeamPoints.clear();
+			_redTeamPoints.clear();
+			HandysBlockCheckerManager.getInstance().setArenaFree(_arena);
+			
+			for (L2Spawn spawn : _spawns) {
+				spawn.stopRespawn();
+				spawn.getLastSpawn().deleteMe();
+				SpawnTable.getInstance().deleteSpawn(spawn, false);
+			}
+			_spawns.clear();
+			
+			for (L2ItemInstance item : _drops) {
+				// a player has it, it will be deleted later
+				if (!item.isVisible() || (item.getOwnerId() != 0)) {
+					continue;
+				}
+				
+				item.decayMe();
+				L2World.getInstance().removeObject(item);
+			}
+			_drops.clear();
+		}
+		
+		/**
+		 * Reward players after event. Tie - No Reward
+		 */
+		private void rewardPlayers() {
+			if (_redPoints == _bluePoints) {
+				return;
+			}
+			
+			_isRedWinner = _redPoints > _bluePoints;
+			
+			if (_isRedWinner) {
+				rewardAsWinner(true);
+				rewardAsLooser(false);
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.TEAM_C1_WON);
+				msg.addString("Red Team");
+				_holder.broadCastPacketToTeam(msg);
+			} else {
+				rewardAsWinner(false);
+				rewardAsLooser(true);
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.TEAM_C1_WON);
+				msg.addString("Blue Team");
+				_holder.broadCastPacketToTeam(msg);
+			}
+		}
+		
+		/**
+		 * Reward the specified team as a winner team 1) Higher score - 8 extra 2) Higher score - 5 extra
+		 */
+		private void rewardAsWinner(boolean isRed) {
+			Map<L2PcInstance, Integer> tempPoints = isRed ? _redTeamPoints : _blueTeamPoints;
+			
+			// Main give
+			for (Entry<L2PcInstance, Integer> points : tempPoints.entrySet()) {
+				if (points.getKey() == null) {
+					continue;
+				}
+				
+				if (points.getValue() >= 10) {
+					points.getKey().addItem("Block Checker", 13067, 2, points.getKey(), true);
+				} else {
+					tempPoints.remove(points.getKey());
+				}
+			}
+			
+			int first = 0, second = 0;
+			L2PcInstance winner1 = null, winner2 = null;
+			for (Entry<L2PcInstance, Integer> entry : tempPoints.entrySet()) {
+				L2PcInstance pc = entry.getKey();
+				int pcPoints = entry.getValue();
+				if (pcPoints > first) {
+					// Move old data
+					second = first;
+					winner2 = winner1;
+					// Set new data
+					first = pcPoints;
+					winner1 = pc;
+				} else if (pcPoints > second) {
+					second = pcPoints;
+					winner2 = pc;
+				}
+			}
+			if (winner1 != null) {
+				winner1.addItem("Block Checker", 13067, 8, winner1, true);
+			}
+			if (winner2 != null) {
+				winner2.addItem("Block Checker", 13067, 5, winner2, true);
+			}
+		}
+		
+		/**
+		 * Will reward the looser team with the predefined rewards Player got >= 10 points: 2 coins Player got < 10 points: 0 coins
+		 */
+		private void rewardAsLooser(boolean isRed) {
+			Map<L2PcInstance, Integer> tempPoints = isRed ? _redTeamPoints : _blueTeamPoints;
+			
+			for (Entry<L2PcInstance, Integer> entry : tempPoints.entrySet()) {
+				L2PcInstance player = entry.getKey();
+				if ((player != null) && (entry.getValue() >= 10)) {
+					player.addItem("Block Checker", 13067, 2, player, true);
+				}
+			}
+		}
+		
+		/**
+		 * Teleport players back, give status back and send final packet
+		 */
+		private void setPlayersBack() {
+			final ExCubeGameEnd end = new ExCubeGameEnd(_isRedWinner);
+			
+			for (L2PcInstance player : _holder.getAllPlayers()) {
+				if (player == null) {
+					continue;
+				}
+				
+				player.stopAllEffects();
+				// Remove team aura
+				player.setTeam(Team.NONE);
+				// Set default arena
+				player.setBlockCheckerArena(DEFAULT_ARENA);
+				// Remove the event items
+				PcInventory inv = player.getInventory();
+				if (inv.getItemByItemId(13787) != null) {
+					long count = inv.getInventoryItemCount(13787, 0);
+					inv.destroyItemByItemId("Handys Block Checker", 13787, count, player, player);
+				}
+				if (inv.getItemByItemId(13788) != null) {
+					long count = inv.getInventoryItemCount(13788, 0);
+					inv.destroyItemByItemId("Handys Block Checker", 13788, count, player, player);
+				}
+				broadcastRelationChanged(player);
+				// Teleport Back
+				player.teleToLocation(-57478, -60367, -2370);
+				player.setInsideZone(ZoneId.PVP, false);
+				// Send end packet
+				player.sendPacket(end);
+				player.broadcastUserInfo();
+			}
+		}
+		
+		@Override
+		public void run() {
+			if (!_abnormalEnd) {
+				rewardPlayers();
+			}
+			setPlayersBack();
+			clearMe();
+			_isStarted = false;
+			_abnormalEnd = false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Castle.java b/src/main/java/com/l2jserver/gameserver/model/entity/Castle.java
new file mode 100644
index 00000000..e39bba65
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Castle.java
@@ -0,0 +1,956 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.clan;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.audio.Music;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.TowerSpawn;
+import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.type.L2CastleZone;
+import com.l2jserver.gameserver.model.zone.type.L2ResidenceTeleportZone;
+import com.l2jserver.gameserver.model.zone.type.L2SiegeZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class Castle extends AbstractResidence {
+	private static final Logger LOG = LoggerFactory.getLogger(Castle.class);
+	
+	private final List<L2DoorInstance> _doors = new ArrayList<>();
+	private int _ownerId = 0;
+	private Siege _siege = null;
+	private Calendar _siegeDate;
+	private boolean _isTimeRegistrationOver = true; // true if Castle Lords set the time, or 24h is elapsed after the siege
+	private Calendar _siegeTimeRegistrationEndDate; // last siege end date + 1 day
+	private int _taxPercent = 0;
+	private double _taxRate = 0;
+	private int _nextTaxPercent = 0;
+	private long _nextTaxTime = 0;
+	private long _treasury = 0;
+	private boolean _showNpcCrest = false;
+	private L2SiegeZone _zone = null;
+	private L2ResidenceTeleportZone _teleZone;
+	private L2Clan _formerOwner = null;
+	private final List<L2ArtefactInstance> _artefacts = new ArrayList<>(1);
+	private final Map<Integer, CastleFunction> _function;
+	private int _ticketBuyCount = 0;
+	
+	/** Castle Functions */
+	public static final int FUNC_RESTORE_HP = 1;
+	public static final int FUNC_RESTORE_MP = 2;
+	public static final int FUNC_RESTORE_CP = 3;
+	public static final int FUNC_RESTORE_EXP = 4;
+	public static final int FUNC_TELEPORT = 5;
+	public static final int FUNC_BROADCAST = 6;
+	public static final int FUNC_DECO_CURTAINS = 7;
+	public static final int FUNC_DECO_HANGING = 8;
+	public static final int FUNC_SUPPORT = 9;
+	public static final int FUNC_DECO_OUTERFLAG = 10;
+	public static final int FUNC_DECO_FRONTPLATEFORM = 11;
+	public static final int FUNC_ITEM_CREATE = 12;
+	
+	public class CastleFunction {
+		private final int _type;
+		private int _lvl;
+		protected int _fee;
+		protected int _tempFee;
+		private final long _rate;
+		private long _endDate;
+		protected boolean _inDebt;
+		public boolean _cwh;
+		
+		public CastleFunction(int type, int lvl, int lease, int tempLease, long rate, long time, boolean cwh) {
+			_type = type;
+			_lvl = lvl;
+			_fee = lease;
+			_tempFee = tempLease;
+			_rate = rate;
+			_endDate = time;
+			initializeTask(cwh);
+		}
+		
+		public int getType() {
+			return _type;
+		}
+		
+		public int getLvl() {
+			return _lvl;
+		}
+		
+		public int getLease() {
+			return _fee;
+		}
+		
+		public long getRate() {
+			return _rate;
+		}
+		
+		public long getEndTime() {
+			return _endDate;
+		}
+		
+		public void setLvl(int lvl) {
+			_lvl = lvl;
+		}
+		
+		public void setLease(int lease) {
+			_fee = lease;
+		}
+		
+		public void setEndTime(long time) {
+			_endDate = time;
+		}
+		
+		private void initializeTask(boolean cwh) {
+			if (getOwnerId() <= 0) {
+				return;
+			}
+			long currentTime = System.currentTimeMillis();
+			if (_endDate > currentTime) {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime);
+			} else {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), 0);
+			}
+		}
+		
+		private class FunctionTask implements Runnable {
+			public FunctionTask(boolean cwh) {
+				_cwh = cwh;
+			}
+			
+			@Override
+			public void run() {
+				try {
+					if (getOwnerId() <= 0) {
+						return;
+					}
+					if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) {
+						int fee = _fee;
+						if (getEndTime() == -1) {
+							fee = _tempFee;
+						}
+						
+						setEndTime(System.currentTimeMillis() + getRate());
+						dbSave();
+						if (_cwh) {
+							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null);
+						}
+						ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(true), getRate());
+					} else {
+						removeFunction(getType());
+					}
+				} catch (Exception e) {
+					LOG.error(e.getMessage(), e);
+				}
+			}
+		}
+		
+		public void dbSave() {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("REPLACE INTO castle_functions (castle_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) {
+				ps.setInt(1, getResidenceId());
+				ps.setInt(2, getType());
+				ps.setInt(3, getLvl());
+				ps.setInt(4, getLease());
+				ps.setLong(5, getRate());
+				ps.setLong(6, getEndTime());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.error("Exception: Castle.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	public Castle(int castleId) {
+		super(castleId);
+		load();
+		/*
+		 * if (getResidenceId() == 7 || castleId == 9) // Goddard and Schuttgart _nbArtifact = 2;
+		 */
+		_function = new ConcurrentHashMap<>();
+		initResidenceZone();
+		if (getOwnerId() != 0) {
+			loadFunctions();
+			loadDoorUpgrade();
+		}
+	}
+	
+	/**
+	 * Return function with id
+	 * @param type
+	 * @return
+	 */
+	public CastleFunction getFunction(int type) {
+		return _function.get(type);
+	}
+	
+	public synchronized void engrave(L2Clan clan, L2Object target) {
+		if (!_artefacts.contains(target)) {
+			return;
+		}
+		setOwner(clan);
+		final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_ENGRAVED_RULER);
+		msg.addString(clan.getName());
+		getSiege().announceToPlayer(msg, true);
+	}
+	
+	/**
+	 * Add amount to castle instance's treasury (warehouse).
+	 */
+	public void addToTreasury(long amount) {
+		// check if owned
+		if (getOwnerId() <= 0) {
+			return;
+		}
+		
+		if (getName().equalsIgnoreCase("Schuttgart") || getName().equalsIgnoreCase("Goddard")) {
+			Castle rune = CastleManager.getInstance().getCastle("rune");
+			if (rune != null) {
+				long runeTax = (long) (amount * rune.getTaxRate());
+				if (rune.getOwnerId() > 0) {
+					rune.addToTreasury(runeTax);
+				}
+				amount -= runeTax;
+			}
+		}
+		if (!getName().equalsIgnoreCase("aden") && !getName().equalsIgnoreCase("Rune") && !getName().equalsIgnoreCase("Schuttgart") && !getName().equalsIgnoreCase("Goddard")) // If current castle instance is not Aden, Rune, Goddard or Schuttgart.
+		{
+			Castle aden = CastleManager.getInstance().getCastle("aden");
+			if (aden != null) {
+				long adenTax = (long) (amount * aden.getTaxRate()); // Find out what Aden gets from the current castle instance's income
+				if (aden.getOwnerId() > 0) {
+					aden.addToTreasury(adenTax); // Only bother to really add the tax to the treasury if not npc owned
+				}
+				
+				amount -= adenTax; // Subtract Aden's income from current castle instance's income
+			}
+		}
+		
+		addToTreasuryNoTax(amount);
+	}
+	
+	/**
+	 * Add amount to castle instance's treasury (warehouse), no tax paying.
+	 */
+	public boolean addToTreasuryNoTax(long amount) {
+		if (getOwnerId() <= 0) {
+			return false;
+		}
+		
+		if (amount < 0) {
+			amount *= -1;
+			if (_treasury < amount) {
+				return false;
+			}
+			_treasury -= amount;
+		} else {
+			if ((_treasury + amount) > character().getMaxAdena()) {
+				_treasury = character().getMaxAdena();
+			} else {
+				_treasury += amount;
+			}
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET treasury = ? WHERE id = ?")) {
+			ps.setLong(1, getTreasury());
+			ps.setInt(2, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		return true;
+	}
+	
+	/**
+	 * Move non clan members off castle area and to nearest town.
+	 */
+	public void banishForeigners() {
+		getResidenceZone().banishForeigners(getOwnerId());
+	}
+	
+	/**
+	 * Return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(int x, int y, int z) {
+		return getZone().isInsideZone(x, y, z);
+	}
+	
+	public L2SiegeZone getZone() {
+		if (_zone == null) {
+			for (L2SiegeZone zone : ZoneManager.getInstance().getAllZones(L2SiegeZone.class)) {
+				if (zone.getSiegeObjectId() == getResidenceId()) {
+					_zone = zone;
+					break;
+				}
+			}
+		}
+		return _zone;
+	}
+	
+	@Override
+	public L2CastleZone getResidenceZone() {
+		return (L2CastleZone) super.getResidenceZone();
+	}
+	
+	public L2ResidenceTeleportZone getTeleZone() {
+		if (_teleZone == null) {
+			for (L2ResidenceTeleportZone zone : ZoneManager.getInstance().getAllZones(L2ResidenceTeleportZone.class)) {
+				if (zone.getResidenceId() == getResidenceId()) {
+					_teleZone = zone;
+					break;
+				}
+			}
+		}
+		return _teleZone;
+	}
+	
+	public void oustAllPlayers() {
+		getTeleZone().oustAllPlayers();
+	}
+	
+	/**
+	 * Get the objects distance to this castle
+	 */
+	public double getDistance(L2Object obj) {
+		return getZone().getDistanceToZone(obj);
+	}
+	
+	public void closeDoor(L2PcInstance activeChar, int doorId) {
+		openCloseDoor(activeChar, doorId, false);
+	}
+	
+	public void openDoor(L2PcInstance activeChar, int doorId) {
+		openCloseDoor(activeChar, doorId, true);
+	}
+	
+	public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) {
+		if (activeChar.getClanId() != getOwnerId()) {
+			return;
+		}
+		
+		L2DoorInstance door = getDoor(doorId);
+		if (door != null) {
+			if (open) {
+				door.openMe();
+			} else {
+				door.closeMe();
+			}
+		}
+	}
+	
+	// This method is used to begin removing all castle upgrades
+	public void removeUpgrade() {
+		removeDoorUpgrade();
+		removeTrapUpgrade();
+		for (Integer fc : _function.keySet()) {
+			removeFunction(fc);
+		}
+		_function.clear();
+	}
+	
+	// This method updates the castle tax rate
+	public void setOwner(L2Clan clan) {
+		// Remove old owner
+		if ((getOwnerId() > 0) && ((clan == null) || (clan.getId() != getOwnerId()))) {
+			L2Clan oldOwner = ClanTable.getInstance().getClan(getOwnerId()); // Try to find clan instance
+			if (oldOwner != null) {
+				if (_formerOwner == null) {
+					_formerOwner = oldOwner;
+					if (character().removeCastleCirclets()) {
+						CastleManager.getInstance().removeCirclet(_formerOwner, getResidenceId());
+					}
+				}
+				try {
+					L2PcInstance oldleader = oldOwner.getLeader().getPlayerInstance();
+					if (oldleader != null) {
+						if (oldleader.getMountType() == MountType.WYVERN) {
+							oldleader.dismount();
+						}
+					}
+				} catch (Exception e) {
+					LOG.warn("Exception in setOwner: {}", e.getMessage(), e);
+				}
+				oldOwner.setCastleId(0); // Unset has castle flag for old owner
+				for (L2PcInstance member : oldOwner.getOnlineMembers(0)) {
+					removeResidentialSkills(member);
+					member.sendSkillList();
+				}
+			}
+		}
+		
+		updateOwnerInDB(clan); // Update in database
+		setShowNpcCrest(false);
+		
+		// if clan have fortress, remove it
+		if ((clan != null) && (clan.getFortId() > 0)) {
+			FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
+		}
+		
+		if (getSiege().isInProgress()) {
+			getSiege().midVictory(); // Mid-victory phase of siege
+		}
+		
+		TerritoryWarManager.getInstance().getTerritory(getResidenceId()).setOwnerClan(clan);
+		
+		if (clan != null) {
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				giveResidentialSkills(member);
+				member.sendSkillList();
+			}
+		}
+	}
+	
+	public void removeOwner(L2Clan clan) {
+		if (clan != null) {
+			_formerOwner = clan;
+			if (character().removeCastleCirclets()) {
+				CastleManager.getInstance().removeCirclet(_formerOwner, getResidenceId());
+			}
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				removeResidentialSkills(member);
+				member.sendSkillList();
+			}
+			clan.setCastleId(0);
+			clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+		}
+		
+		updateOwnerInDB(null);
+		if (getSiege().isInProgress()) {
+			getSiege().midVictory();
+		}
+		
+		for (Integer fc : _function.keySet()) {
+			removeFunction(fc);
+		}
+		_function.clear();
+	}
+	
+	public void setTaxPercent(int taxPercent) {
+		_taxPercent = taxPercent;
+		_taxRate = _taxPercent / 100.0;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET taxPercent = ? WHERE id = ?")) {
+			ps.setInt(1, taxPercent);
+			ps.setInt(2, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	public void setNextTaxPercent(int taxPercent) {
+		_nextTaxPercent = taxPercent;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET next_tax = ? WHERE id = ?")) {
+			ps.setInt(1, taxPercent);
+			ps.setInt(2, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Respawn all doors on castle grounds.
+	 */
+	public void spawnDoor() {
+		spawnDoor(false);
+	}
+	
+	/**
+	 * Respawn all doors on castle grounds<BR>
+	 * <BR>
+	 * @param isDoorWeak
+	 */
+	public void spawnDoor(boolean isDoorWeak) {
+		for (L2DoorInstance door : _doors) {
+			if (door.isDead()) {
+				door.doRevive();
+				door.setCurrentHp((isDoorWeak) ? (door.getMaxHp() / 2.0) : (door.getMaxHp()));
+			}
+			
+			if (door.getOpen()) {
+				door.closeMe();
+			}
+		}
+	}
+	
+	@Override
+	protected void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("SELECT * FROM castle WHERE id = ?");
+			var ps2 = con.prepareStatement("SELECT clan_id FROM clan_data WHERE hasCastle = ?")) {
+			ps1.setInt(1, getResidenceId());
+			try (var rs = ps1.executeQuery()) {
+				while (rs.next()) {
+					setName(rs.getString("name"));
+					
+					_siegeDate = Calendar.getInstance();
+					_siegeDate.setTimeInMillis(rs.getLong("siegeDate"));
+					_siegeTimeRegistrationEndDate = Calendar.getInstance();
+					_siegeTimeRegistrationEndDate.setTimeInMillis(rs.getLong("regTimeEnd"));
+					_isTimeRegistrationOver = rs.getBoolean("regTimeOver");
+					
+					_taxPercent = rs.getInt("taxPercent");
+					_nextTaxPercent = rs.getInt("next_tax");
+					_nextTaxTime = rs.getLong("next_tax_time");
+					_treasury = rs.getLong("treasury");
+					
+					_showNpcCrest = rs.getBoolean("showNpcCrest");
+					
+					_ticketBuyCount = rs.getInt("ticketBuyCount");
+				}
+			}
+			_taxRate = _taxPercent / 100.0;
+			
+			ps2.setInt(1, getResidenceId());
+			try (var rs = ps2.executeQuery()) {
+				while (rs.next()) {
+					_ownerId = rs.getInt("clan_id");
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: loadCastleData(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/** Load All Functions */
+	private void loadFunctions() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM castle_functions WHERE castle_id = ?")) {
+			ps.setInt(1, getResidenceId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					_function.put(rs.getInt("type"), new CastleFunction(rs.getInt("type"), rs.getInt("lvl"), rs.getInt("lease"), 0, rs.getLong("rate"), rs.getLong("endTime"), true));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Exception: Castle.loadFunctions(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Remove function In List and in DB
+	 */
+	public void removeFunction(int functionType) {
+		_function.remove(functionType);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM castle_functions WHERE castle_id=? AND type=?")) {
+			ps.setInt(1, getResidenceId());
+			ps.setInt(2, functionType);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Castle.removeFunctions(int functionType): {}", e.getMessage(), e);
+		}
+	}
+	
+	public boolean updateFunctions(L2PcInstance player, int type, int lvl, int lease, long rate, boolean addNew) {
+		if (player == null) {
+			return false;
+		}
+		if (lease > 0) {
+			if (!player.destroyItemByItemId("Consume", Inventory.ADENA_ID, lease, null, true)) {
+				return false;
+			}
+		}
+		if (addNew) {
+			_function.put(type, new CastleFunction(type, lvl, lease, 0, rate, 0, false));
+		} else {
+			if ((lvl == 0) && (lease == 0)) {
+				removeFunction(type);
+			} else {
+				int diffLease = lease - _function.get(type).getLease();
+				if (diffLease > 0) {
+					_function.remove(type);
+					_function.put(type, new CastleFunction(type, lvl, lease, 0, rate, -1, false));
+				} else {
+					_function.get(type).setLease(lease);
+					_function.get(type).setLvl(lvl);
+					_function.get(type).dbSave();
+				}
+			}
+		}
+		return true;
+	}
+	
+	public void activateInstance() {
+		loadDoor();
+	}
+	
+	// This method loads castle door data from database
+	private void loadDoor() {
+		for (L2DoorInstance door : DoorData.getInstance().getDoors()) {
+			if ((door.getCastle() != null) && (door.getCastle().getResidenceId() == getResidenceId())) {
+				_doors.add(door);
+			}
+		}
+	}
+	
+	// This method loads castle door upgrade data from database
+	private void loadDoorUpgrade() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM castle_doorupgrade WHERE castleId=?")) {
+			ps.setInt(1, getResidenceId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					setDoorUpgrade(rs.getInt("doorId"), rs.getInt("ratio"), false);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: loadCastleDoorUpgrade(): {}", e.getMessage(), e);
+		}
+	}
+	
+	private void removeDoorUpgrade() {
+		for (L2DoorInstance door : _doors) {
+			door.getStat().setUpgradeHpRatio(1);
+			door.setCurrentHp(door.getCurrentHp());
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM castle_doorupgrade WHERE castleId=?")) {
+			ps.setInt(1, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: removeDoorUpgrade(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public void setDoorUpgrade(int doorId, int ratio, boolean save) {
+		final L2DoorInstance door = (getDoors().isEmpty()) ? DoorData.getInstance().getDoor(doorId) : getDoor(doorId);
+		if (door == null) {
+			return;
+		}
+		
+		door.getStat().setUpgradeHpRatio(ratio);
+		door.setCurrentHp(door.getMaxHp());
+		
+		if (save) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("REPLACE INTO castle_doorupgrade (doorId, ratio, castleId) values (?,?,?)")) {
+				ps.setInt(1, doorId);
+				ps.setInt(2, ratio);
+				ps.setInt(3, getResidenceId());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Exception: setDoorUpgrade(int doorId, int ratio, int castleId): {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	private void updateOwnerInDB(L2Clan clan) {
+		if (clan != null) {
+			_ownerId = clan.getId(); // Update owner id property
+		} else {
+			_ownerId = 0; // Remove owner
+			CastleManorManager.getInstance().resetManorData(getResidenceId());
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			// Need to remove has castle flag from clan_data, should be checked from castle table.
+			try (var ps = con.prepareStatement("UPDATE clan_data SET hasCastle = 0 WHERE hasCastle = ?")) {
+				ps.setInt(1, getResidenceId());
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("UPDATE clan_data SET hasCastle = ? WHERE clan_id = ?")) {
+				ps.setInt(1, getResidenceId());
+				ps.setInt(2, getOwnerId());
+				ps.execute();
+			}
+			
+			// Announce to clan members
+			if (clan != null) {
+				clan.setCastleId(getResidenceId()); // Set has castle flag for new owner
+				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+				clan.broadcastToOnlineMembers(Music.SIEGE_VICTORY.getPacket());
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: updateOwnerInDB(L2Clan clan): {}", e.getMessage(), e);
+		}
+	}
+	
+	public L2DoorInstance getDoor(int doorId) {
+		if (doorId <= 0) {
+			return null;
+		}
+		
+		for (L2DoorInstance door : getDoors()) {
+			if (door.getId() == doorId) {
+				return door;
+			}
+		}
+		return null;
+	}
+	
+	public List<L2DoorInstance> getDoors() {
+		return _doors;
+	}
+	
+	public int getOwnerId() {
+		return _ownerId;
+	}
+	
+	public L2Clan getOwner() {
+		return (_ownerId != 0) ? ClanTable.getInstance().getClan(_ownerId) : null;
+	}
+	
+	public Siege getSiege() {
+		if (_siege == null) {
+			_siege = new Siege(this);
+		}
+		return _siege;
+	}
+	
+	public Calendar getSiegeDate() {
+		return _siegeDate;
+	}
+	
+	public boolean getIsTimeRegistrationOver() {
+		return _isTimeRegistrationOver;
+	}
+	
+	public void setIsTimeRegistrationOver(boolean val) {
+		_isTimeRegistrationOver = val;
+	}
+	
+	public Calendar getTimeRegistrationOverDate() {
+		if (_siegeTimeRegistrationEndDate == null) {
+			_siegeTimeRegistrationEndDate = Calendar.getInstance();
+		}
+		return _siegeTimeRegistrationEndDate;
+	}
+	
+	public int getTaxPercent() {
+		return _taxPercent;
+	}
+	
+	public double getTaxRate() {
+		return _taxRate;
+	}
+	
+	public int getNextTaxPercent() {
+		return _nextTaxPercent;
+	}
+	
+	public long getNextTaxTime() {
+		return _nextTaxTime;
+	}
+	
+	public long getTreasury() {
+		return _treasury;
+	}
+	
+	public boolean getShowNpcCrest() {
+		return _showNpcCrest;
+	}
+	
+	public void setShowNpcCrest(boolean showNpcCrest) {
+		if (_showNpcCrest != showNpcCrest) {
+			_showNpcCrest = showNpcCrest;
+			updateShowNpcCrest();
+		}
+	}
+	
+	public void updateClansReputation() {
+		if (_formerOwner != null) {
+			if (_formerOwner != ClanTable.getInstance().getClan(getOwnerId())) {
+				int maxreward = Math.max(0, _formerOwner.getReputationScore());
+				_formerOwner.takeReputationScore(clan().getLoseCastlePoints(), true);
+				L2Clan owner = ClanTable.getInstance().getClan(getOwnerId());
+				if (owner != null) {
+					owner.addReputationScore(Math.min(clan().getTakeCastlePoints(), maxreward), true);
+				}
+			} else {
+				_formerOwner.addReputationScore(clan().getCastleDefendedPoints(), true);
+			}
+		} else {
+			L2Clan owner = ClanTable.getInstance().getClan(getOwnerId());
+			if (owner != null) {
+				owner.addReputationScore(clan().getTakeCastlePoints(), true);
+			}
+		}
+	}
+	
+	public void updateShowNpcCrest() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET showNpcCrest = ? WHERE id = ?")) {
+			ps.setBoolean(1, getShowNpcCrest());
+			ps.setInt(2, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.info("Error saving showNpcCrest for castle " + getName() + ": " + e.getMessage());
+		}
+	}
+	
+	@Override
+	public void giveResidentialSkills(L2PcInstance player) {
+		Territory territory = TerritoryWarManager.getInstance().getTerritory(getResidenceId());
+		if ((territory != null) && territory.getOwnedWardIds().contains(getResidenceId() + 80)) {
+			for (int wardId : territory.getOwnedWardIds()) {
+				final List<L2SkillLearn> territorySkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
+				for (L2SkillLearn s : territorySkills) {
+					final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
+					if (sk != null) {
+						player.addSkill(sk, false);
+					} else {
+						LOG.warn("Trying to add a null skill for Territory Ward Id: {}, skill Id: {} level: {}!", wardId, s.getSkillId(), s.getSkillLevel());
+					}
+				}
+			}
+		}
+		super.giveResidentialSkills(player);
+	}
+	
+	@Override
+	public void removeResidentialSkills(L2PcInstance player) {
+		if (TerritoryWarManager.getInstance().getTerritory(getResidenceId()) != null) {
+			for (int wardId : TerritoryWarManager.getInstance().getTerritory(getResidenceId()).getOwnedWardIds()) {
+				final List<L2SkillLearn> territorySkills = SkillTreesData.getInstance().getAvailableResidentialSkills(wardId);
+				for (L2SkillLearn s : territorySkills) {
+					final Skill sk = SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel());
+					if (sk != null) {
+						player.removeSkill(sk, false, true);
+					} else {
+						LOG.warn("Trying to remove a null skill for Territory Ward Id: {}, skill Id: {} level: {}!", wardId, s.getSkillId(), s.getSkillLevel());
+					}
+				}
+			}
+		}
+		super.removeResidentialSkills(player);
+	}
+	
+	/**
+	 * Register Artefact to castle
+	 */
+	public void registerArtefact(L2ArtefactInstance artefact) {
+		_artefacts.add(artefact);
+	}
+	
+	public List<L2ArtefactInstance> getArtefacts() {
+		return _artefacts;
+	}
+	
+	/**
+	 * @return the tickets exchanged for this castle
+	 */
+	public int getTicketBuyCount() {
+		return _ticketBuyCount;
+	}
+	
+	/**
+	 * Set the exchanged tickets count.<br>
+	 * Performs database update.
+	 * @param count the ticket count to set
+	 */
+	public void setTicketBuyCount(int count) {
+		_ticketBuyCount = count;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET ticketBuyCount = ? WHERE id = ?")) {
+			ps.setInt(1, _ticketBuyCount);
+			ps.setInt(2, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	public int getTrapUpgradeLevel(int towerIndex) {
+		final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex);
+		return (spawn != null) ? spawn.getUpgradeLevel() : 0;
+	}
+	
+	public void setTrapUpgrade(int towerIndex, int level, boolean save) {
+		if (save) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("REPLACE INTO castle_trapupgrade (castleId, towerIndex, level) values (?,?,?)")) {
+				ps.setInt(1, getResidenceId());
+				ps.setInt(2, towerIndex);
+				ps.setInt(3, level);
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Exception: setTrapUpgradeLevel(int towerIndex, int level, int castleId): {}", e.getMessage(), e);
+			}
+		}
+		final TowerSpawn spawn = SiegeManager.getInstance().getFlameTowers(getResidenceId()).get(towerIndex);
+		if (spawn != null) {
+			spawn.setUpgradeLevel(level);
+		}
+	}
+	
+	private void removeTrapUpgrade() {
+		for (TowerSpawn ts : SiegeManager.getInstance().getFlameTowers(getResidenceId())) {
+			ts.setUpgradeLevel(0);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM castle_trapupgrade WHERE castleId=?")) {
+			ps.setInt(1, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: removeDoorUpgrade(): {}", e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	protected void initResidenceZone() {
+		for (L2CastleZone zone : ZoneManager.getInstance().getAllZones(L2CastleZone.class)) {
+			if (zone.getResidenceId() == getResidenceId()) {
+				setResidenceZone(zone);
+				break;
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/ClanHall.java b/src/main/java/com/l2jserver/gameserver/model/entity/ClanHall.java
new file mode 100644
index 00000000..c17967ab
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/ClanHall.java
@@ -0,0 +1,438 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
+
+public abstract class ClanHall {
+	private static final Logger LOG = LoggerFactory.getLogger(ClanHall.class);
+	
+	private final int _clanHallId;
+	private ArrayList<L2DoorInstance> _doors;
+	private final String _name;
+	private int _ownerId;
+	private final String _desc;
+	private final String _location;
+	private L2ClanHallZone _zone;
+	protected boolean _isFree = true;
+	private final Map<Integer, ClanHallFunction> _functions;
+	
+	/** Clan Hall Functions */
+	public static final int FUNC_RESTORE_HP = 1;
+	public static final int FUNC_RESTORE_MP = 2;
+	public static final int FUNC_RESTORE_CP = 3;
+	public static final int FUNC_RESTORE_EXP = 4;
+	public static final int FUNC_TELEPORT = 5;
+	public static final int FUNC_BROADCAST = 6;
+	public static final int FUNC_DECO_CURTAINS = 7;
+	public static final int FUNC_DECO_HANGING = 8;
+	public static final int FUNC_SUPPORT = 9;
+	public static final int FUNC_DECO_OUTERFLAG = 10;
+	public static final int FUNC_DECO_FRONTPLATEFORM = 11;
+	public static final int FUNC_ITEM_CREATE = 12;
+	
+	public class ClanHallFunction {
+		private final int _type;
+		private int _lvl;
+		protected int _fee;
+		protected int _tempFee;
+		private final long _rate;
+		private long _endDate;
+		protected boolean _inDebt;
+		public boolean _cwh; // first activating clanhall function is paid from player inventory, any others from clan warehouse
+		
+		public ClanHallFunction(int type, int lvl, int lease, int tempLease, long rate, long time, boolean cwh) {
+			_type = type;
+			_lvl = lvl;
+			_fee = lease;
+			_tempFee = tempLease;
+			_rate = rate;
+			_endDate = time;
+			initializeTask(cwh);
+		}
+		
+		public int getType() {
+			return _type;
+		}
+		
+		public int getLvl() {
+			return _lvl;
+		}
+		
+		public int getLease() {
+			return _fee;
+		}
+		
+		public long getRate() {
+			return _rate;
+		}
+		
+		public long getEndTime() {
+			return _endDate;
+		}
+		
+		public void setLvl(int lvl) {
+			_lvl = lvl;
+		}
+		
+		public void setLease(int lease) {
+			_fee = lease;
+		}
+		
+		public void setEndTime(long time) {
+			_endDate = time;
+		}
+		
+		private void initializeTask(boolean cwh) {
+			if (_isFree) {
+				return;
+			}
+			long currentTime = System.currentTimeMillis();
+			if (_endDate > currentTime) {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime);
+			} else {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), 0);
+			}
+		}
+		
+		private class FunctionTask implements Runnable {
+			public FunctionTask(boolean cwh) {
+				_cwh = cwh;
+			}
+			
+			@Override
+			public void run() {
+				try {
+					if (_isFree) {
+						return;
+					}
+					if ((ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= _fee) || !_cwh) {
+						int fee = _fee;
+						if (getEndTime() == -1) {
+							fee = _tempFee;
+						}
+						
+						setEndTime(System.currentTimeMillis() + getRate());
+						dbSave();
+						if (_cwh) {
+							ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_function_fee", Inventory.ADENA_ID, fee, null, null);
+						}
+						ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(true), getRate());
+					} else {
+						removeFunction(getType());
+					}
+				} catch (Exception e) {
+					LOG.error(e.getMessage(), e);
+				}
+			}
+		}
+		
+		public void dbSave() {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("REPLACE INTO clanhall_functions (hall_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) {
+				ps.setInt(1, getId());
+				ps.setInt(2, getType());
+				ps.setInt(3, getLvl());
+				ps.setInt(4, getLease());
+				ps.setLong(5, getRate());
+				ps.setLong(6, getEndTime());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.error("Exception: ClanHall.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	public ClanHall(StatsSet set) {
+		_clanHallId = set.getInt("id");
+		_name = set.getString("name");
+		_ownerId = set.getInt("ownerId");
+		_desc = set.getString("desc");
+		_location = set.getString("location");
+		_functions = new ConcurrentHashMap<>();
+		
+		if (_ownerId > 0) {
+			L2Clan clan = ClanTable.getInstance().getClan(_ownerId);
+			if (clan != null) {
+				clan.setHideoutId(getId());
+			} else {
+				free();
+			}
+		}
+	}
+	
+	/**
+	 * @return Id Of Clan hall
+	 */
+	public final int getId() {
+		return _clanHallId;
+	}
+	
+	/**
+	 * @return the Clan Hall name.
+	 */
+	public final String getName() {
+		return _name;
+	}
+	
+	/**
+	 * @return OwnerId
+	 */
+	public final int getOwnerId() {
+		return _ownerId;
+	}
+	
+	/**
+	 * @return Desc
+	 */
+	public final String getDesc() {
+		return _desc;
+	}
+	
+	/**
+	 * @return Location
+	 */
+	public final String getLocation() {
+		return _location;
+	}
+	
+	/**
+	 * @return all DoorInstance
+	 */
+	public final ArrayList<L2DoorInstance> getDoors() {
+		if (_doors == null) {
+			_doors = new ArrayList<>();
+		}
+		return _doors;
+	}
+	
+	public final L2DoorInstance getDoor(int doorId) {
+		if (doorId <= 0) {
+			return null;
+		}
+		for (L2DoorInstance door : getDoors()) {
+			if (door.getId() == doorId) {
+				return door;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @param type
+	 * @return function with id
+	 */
+	public ClanHallFunction getFunction(int type) {
+		return _functions.get(type);
+	}
+	
+	/**
+	 * Sets this clan halls zone
+	 */
+	public void setZone(L2ClanHallZone zone) {
+		_zone = zone;
+	}
+	
+	/**
+	 * @return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(int x, int y, int z) {
+		return getZone().isInsideZone(x, y, z);
+	}
+	
+	/**
+	 * @return the zone of this clan hall
+	 */
+	public L2ClanHallZone getZone() {
+		return _zone;
+	}
+	
+	/** Free this clan hall */
+	public void free() {
+		_ownerId = 0;
+		_isFree = true;
+		for (Integer fc : _functions.keySet()) {
+			removeFunction(fc);
+		}
+		_functions.clear();
+		updateDb();
+	}
+	
+	/**
+	 * Set owner if clan hall is free
+	 */
+	public void setOwner(L2Clan clan) {
+		// Verify that this ClanHall is Free and Clan isn't null
+		if ((_ownerId > 0) || (clan == null)) {
+			return;
+		}
+		_ownerId = clan.getId();
+		_isFree = false;
+		clan.setHideoutId(getId());
+		// Announce to Online member new ClanHall
+		clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+		updateDb();
+	}
+	
+	/**
+	 * Open or Close Door
+	 */
+	public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) {
+		if ((activeChar != null) && (activeChar.getClanId() == getOwnerId())) {
+			openCloseDoor(doorId, open);
+		}
+	}
+	
+	public void openCloseDoor(int doorId, boolean open) {
+		openCloseDoor(getDoor(doorId), open);
+	}
+	
+	public void openCloseDoor(L2DoorInstance door, boolean open) {
+		if (door != null) {
+			if (open) {
+				door.openMe();
+			} else {
+				door.closeMe();
+			}
+		}
+	}
+	
+	public void openCloseDoors(L2PcInstance activeChar, boolean open) {
+		if ((activeChar != null) && (activeChar.getClanId() == getOwnerId())) {
+			openCloseDoors(open);
+		}
+	}
+	
+	public void openCloseDoors(boolean open) {
+		for (L2DoorInstance door : getDoors()) {
+			if (door != null) {
+				if (open) {
+					door.openMe();
+				} else {
+					door.closeMe();
+				}
+			}
+		}
+	}
+	
+	public void banishForeigners() {
+		if (_zone != null) {
+			_zone.banishForeigners(getOwnerId());
+		} else {
+			LOG.warn("Zone is null for clan hall: {} {}", getId(), getName());
+		}
+	}
+	
+	protected void loadFunctions() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM clanhall_functions WHERE hall_id = ?")) {
+			ps.setInt(1, getId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					_functions.put(rs.getInt("type"), new ClanHallFunction(rs.getInt("type"), rs.getInt("lvl"), rs.getInt("lease"), 0, rs.getLong("rate"), rs.getLong("endTime"), true));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Exception: ClanHall.loadFunctions(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Remove function In List and in DB
+	 */
+	public void removeFunction(int functionType) {
+		_functions.remove(functionType);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM clanhall_functions WHERE hall_id=? AND type=?")) {
+			ps.setInt(1, getId());
+			ps.setInt(2, functionType);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: ClanHall.removeFunctions(int functionType): {}", e.getMessage(), e);
+		}
+	}
+	
+	public boolean updateFunctions(L2PcInstance player, int type, int lvl, int lease, long rate, boolean addNew) {
+		if (player == null) {
+			return false;
+		}
+		
+		if (lease > 0) {
+			if (!player.destroyItemByItemId("Consume", Inventory.ADENA_ID, lease, null, true)) {
+				return false;
+			}
+		}
+		if (addNew) {
+			_functions.put(type, new ClanHallFunction(type, lvl, lease, 0, rate, 0, false));
+		} else {
+			if ((lvl == 0) && (lease == 0)) {
+				removeFunction(type);
+			} else {
+				int diffLease = lease - _functions.get(type).getLease();
+				if (diffLease > 0) {
+					_functions.remove(type);
+					_functions.put(type, new ClanHallFunction(type, lvl, lease, 0, rate, -1, false));
+				} else {
+					_functions.get(type).setLease(lease);
+					_functions.get(type).setLvl(lvl);
+					_functions.get(type).dbSave();
+				}
+			}
+		}
+		return true;
+	}
+	
+	public int getGrade() {
+		return 0;
+	}
+	
+	public long getPaidUntil() {
+		return 0;
+	}
+	
+	public int getLease() {
+		return 0;
+	}
+	
+	public boolean isSiegableHall() {
+		return false;
+	}
+	
+	public boolean isFree() {
+		return _isFree;
+	}
+	
+	public abstract void updateDb();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Couple.java b/src/main/java/com/l2jserver/gameserver/model/entity/Couple.java
new file mode 100644
index 00000000..424f324b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Couple.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author evill33t
+ */
+public class Couple {
+	private static final Logger LOG = LoggerFactory.getLogger(Couple.class);
+	
+	private int _Id = 0;
+	private int _player1Id = 0;
+	private int _player2Id = 0;
+	private boolean _married = false;
+	private Calendar _affiancedDate;
+	private Calendar _weddingDate;
+	
+	public Couple(int coupleId) {
+		_Id = coupleId;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM mods_wedding WHERE id = ?")) {
+			ps.setInt(1, _Id);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					_player1Id = rs.getInt("player1Id");
+					_player2Id = rs.getInt("player2Id");
+					_married = rs.getBoolean("married");
+					
+					_affiancedDate = Calendar.getInstance();
+					_affiancedDate.setTimeInMillis(rs.getLong("affianceDate"));
+					
+					_weddingDate = Calendar.getInstance();
+					_weddingDate.setTimeInMillis(rs.getLong("weddingDate"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Exception: Couple.load(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public Couple(L2PcInstance player1, L2PcInstance player2) {
+		int _tempPlayer1Id = player1.getObjectId();
+		int _tempPlayer2Id = player2.getObjectId();
+		
+		_player1Id = _tempPlayer1Id;
+		_player2Id = _tempPlayer2Id;
+		
+		_affiancedDate = Calendar.getInstance();
+		_affiancedDate.setTimeInMillis(Calendar.getInstance().getTimeInMillis());
+		
+		_weddingDate = Calendar.getInstance();
+		_weddingDate.setTimeInMillis(Calendar.getInstance().getTimeInMillis());
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO mods_wedding (id, player1Id, player2Id, married, affianceDate, weddingDate) VALUES (?, ?, ?, ?, ?, ?)")) {
+			_Id = IdFactory.getInstance().getNextId();
+			ps.setInt(1, _Id);
+			ps.setInt(2, _player1Id);
+			ps.setInt(3, _player2Id);
+			ps.setBoolean(4, false);
+			ps.setLong(5, _affiancedDate.getTimeInMillis());
+			ps.setLong(6, _weddingDate.getTimeInMillis());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Could not create couple: {}", e.getMessage(), e);
+		}
+	}
+	
+	public void marry() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE mods_wedding set married = ?, weddingDate = ? where id = ?")) {
+			ps.setBoolean(1, true);
+			_weddingDate = Calendar.getInstance();
+			ps.setLong(2, _weddingDate.getTimeInMillis());
+			ps.setInt(3, _Id);
+			ps.execute();
+			_married = true;
+		} catch (Exception e) {
+			LOG.error("Could not marry: {}", e.getMessage(), e);
+		}
+	}
+	
+	public void divorce() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM mods_wedding WHERE id=?")) {
+			ps.setInt(1, _Id);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Couple.divorce(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public final int getId() {
+		return _Id;
+	}
+	
+	public final int getPlayer1Id() {
+		return _player1Id;
+	}
+	
+	public final int getPlayer2Id() {
+		return _player2Id;
+	}
+	
+	public final boolean getMarried() {
+		return _married;
+	}
+	
+	public final Calendar getAffiancedDate() {
+		return _affiancedDate;
+	}
+	
+	public final Calendar getWeddingDate() {
+		return _weddingDate;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java b/src/main/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java
new file mode 100644
index 00000000..db40944b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/DimensionalRift.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.Future;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.network.serverpackets.Earthquake;
+
+/**
+ * Thanks to L2Fortress and balancer.ru - kombat
+ */
+public class DimensionalRift {
+	protected byte _type;
+	protected L2Party _party;
+	protected List<Byte> _completedRooms = new ArrayList<>();
+	private static final long seconds_5 = 5000L;
+	
+	protected byte jumps_current = 0;
+	private final int MAX_DISTANCE = 1500;
+	
+	private Timer teleporterTimer;
+	private TimerTask teleporterTimerTask;
+	private Timer spawnTimer;
+	private TimerTask spawnTimerTask;
+	
+	private Future<?> earthQuakeTask;
+	
+	protected byte _chosenRoom;
+	protected List<L2PcInstance> _deadPlayers = new CopyOnWriteArrayList<>();
+	protected List<L2PcInstance> _waitingRoomPlayers = new CopyOnWriteArrayList<>();
+	private boolean isBossRoom = false;
+	
+	private final int Q00635_IntoTheDimensionalRift = 635;
+	
+	public DimensionalRift(L2Npc npc, L2Party party, byte type, byte room) {
+		DimensionalRiftManager.getInstance().getRoom(type, room).setParty(party);
+		
+		_type = type;
+		_party = party;
+		_chosenRoom = room;
+		party.setDimensionalRift(this);
+		for (L2PcInstance pc : party.getMembers()) {
+			final Quest q635 = QuestManager.getInstance().getQuest(Q00635_IntoTheDimensionalRift);
+			if (q635 != null) {
+				QuestState qs = pc.getQuestState(q635.getName());
+				if (qs == null) {
+					qs = q635.newQuestState(pc);
+				}
+				if (!qs.isStarted()) {
+					qs.setState(State.STARTED, true);
+				}
+			}
+			
+			if (npc.calculateDistance(pc, true, false) <= MAX_DISTANCE) {
+				teleportToRoom(pc, room);
+			} else {
+				_waitingRoomPlayers.add(pc);
+			}
+		}
+		
+		createSpawnTimer(_chosenRoom);
+		createTeleporterTimer(true);
+	}
+	
+	public byte getType() {
+		return _type;
+	}
+	
+	public byte getCurrentRoom() {
+		return _chosenRoom;
+	}
+	
+	protected void createTeleporterTimer(final boolean reasonTP) {
+		if (_party == null) {
+			return;
+		}
+		
+		if (teleporterTimerTask != null) {
+			teleporterTimerTask.cancel();
+			teleporterTimerTask = null;
+		}
+		
+		if (teleporterTimer != null) {
+			teleporterTimer.cancel();
+			teleporterTimer = null;
+		}
+		
+		if (earthQuakeTask != null) {
+			earthQuakeTask.cancel(false);
+			earthQuakeTask = null;
+		}
+		
+		teleporterTimer = new Timer();
+		teleporterTimerTask = new TimerTask() {
+			@Override
+			public void run() {
+				if (_chosenRoom > -1) {
+					DimensionalRiftManager.getInstance().getRoom(_type, _chosenRoom).unspawn().setParty(null);
+				}
+				
+				if (reasonTP && (jumps_current < getMaxJumps()) && (_party.getMemberCount() > _deadPlayers.size() + _waitingRoomPlayers.size())) {
+					jumps_current++;
+					
+					_completedRooms.add(_chosenRoom);
+					_chosenRoom = -1;
+					
+					for (L2PcInstance p : _party.getMembers()) {
+						if (!_waitingRoomPlayers.contains(p)) {
+							teleportToNextRoom(p);
+						}
+					}
+					
+					createTeleporterTimer(true);
+					createSpawnTimer(_chosenRoom);
+				} else {
+					for (L2PcInstance p : _party.getMembers()) {
+						if (!_waitingRoomPlayers.contains(p)) {
+							teleportToWaitingRoom(p);
+						}
+					}
+					
+					killRift();
+					cancel();
+				}
+			}
+		};
+		
+		if (reasonTP) {
+			long jumpTime = calcTimeToNextJump();
+			teleporterTimer.schedule(teleporterTimerTask, jumpTime); // Teleporter task, 8-10 minutes
+			
+			earthQuakeTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> {
+				for (L2PcInstance p : _party.getMembers()) {
+					if (!_waitingRoomPlayers.contains(p)) {
+						p.sendPacket(new Earthquake(p.getX(), p.getY(), p.getZ(), 65, 9));
+					}
+				}
+			}, jumpTime - 7000);
+		} else {
+			teleporterTimer.schedule(teleporterTimerTask, seconds_5); // incorrect party member invited.
+		}
+	}
+	
+	public void createSpawnTimer(final byte room) {
+		if (spawnTimerTask != null) {
+			spawnTimerTask.cancel();
+			spawnTimerTask = null;
+		}
+		
+		if (spawnTimer != null) {
+			spawnTimer.cancel();
+			spawnTimer = null;
+		}
+		
+		spawnTimer = new Timer();
+		spawnTimerTask = new TimerTask() {
+			@Override
+			public void run() {
+				DimensionalRiftManager.getInstance().getRoom(_type, room).spawn();
+			}
+		};
+		
+		spawnTimer.schedule(spawnTimerTask, general().getRiftSpawnDelay());
+	}
+	
+	public void partyMemberInvited() {
+		createTeleporterTimer(false);
+	}
+	
+	public void partyMemberExited(L2PcInstance player) {
+		_deadPlayers.remove(player);
+		_waitingRoomPlayers.remove(player);
+		
+		killRift();
+	}
+	
+	public void manualTeleport(L2PcInstance player) {
+		if (!player.isInParty() || !player.getParty().isInDimensionalRift()) {
+			return;
+		}
+		
+		DimensionalRiftManager.getInstance().getRoom(_type, _chosenRoom).unspawn().setParty(null);
+		_completedRooms.add(_chosenRoom);
+		_chosenRoom = -1;
+		
+		for (L2PcInstance p : _party.getMembers()) {
+			if (!_waitingRoomPlayers.contains(p)) {
+				teleportToNextRoom(p);
+			}
+		}
+		
+		DimensionalRiftManager.getInstance().getRoom(_type, _chosenRoom).setParty(player.getParty());
+		
+		createSpawnTimer(_chosenRoom);
+		createTeleporterTimer(true);
+	}
+	
+	public void manualExitRift(L2PcInstance player) {
+		if (!player.isInParty() || !player.getParty().isInDimensionalRift()) {
+			return;
+		}
+		
+		for (L2PcInstance p : player.getParty().getMembers()) {
+			if (!_waitingRoomPlayers.contains(p)) {
+				teleportToWaitingRoom(p);
+			}
+		}
+		
+		killRift();
+	}
+	
+	protected void teleportToNextRoom(L2PcInstance player) {
+		if (_chosenRoom == -1) {
+			List<Byte> emptyRooms;
+			do {
+				emptyRooms = DimensionalRiftManager.getInstance().getFreeRooms(_type);
+				// Do not tp in the same room a second time
+				emptyRooms.removeAll(_completedRooms);
+				// If no room left, find any empty
+				if (emptyRooms.isEmpty()) {
+					emptyRooms = DimensionalRiftManager.getInstance().getFreeRooms(_type);
+				}
+				_chosenRoom = emptyRooms.get(Rnd.get(1, emptyRooms.size()) - 1);
+			}
+			while (DimensionalRiftManager.getInstance().getRoom(_type, _chosenRoom).getParty() != null);
+		}
+		
+		DimensionalRiftManager.getInstance().getRoom(_type, _chosenRoom).setParty(player.getParty());
+		checkBossRoom(_chosenRoom);
+		
+		teleportToRoom(player, _chosenRoom);
+	}
+	
+	protected void teleportToWaitingRoom(L2PcInstance player) {
+		DimensionalRiftManager.getInstance().teleportToWaitingRoom(player);
+	}
+	
+	public void killRift() {
+		_completedRooms.clear();
+		
+		if (_party != null) {
+			_party.setDimensionalRift(null);
+		}
+		
+		_party = null;
+		_waitingRoomPlayers = null;
+		_deadPlayers = null;
+		
+		if (earthQuakeTask != null) {
+			earthQuakeTask.cancel(false);
+			earthQuakeTask = null;
+		}
+		
+		DimensionalRiftManager.getInstance().getRoom(_type, _chosenRoom).unspawn().setParty(null);
+		DimensionalRiftManager.getInstance().killRift(this);
+	}
+	
+	public Timer getTeleportTimer() {
+		return teleporterTimer;
+	}
+	
+	public TimerTask getTeleportTimerTask() {
+		return teleporterTimerTask;
+	}
+	
+	public Timer getSpawnTimer() {
+		return spawnTimer;
+	}
+	
+	public TimerTask getSpawnTimerTask() {
+		return spawnTimerTask;
+	}
+	
+	public void setTeleportTimer(Timer t) {
+		teleporterTimer = t;
+	}
+	
+	public void setTeleportTimerTask(TimerTask tt) {
+		teleporterTimerTask = tt;
+	}
+	
+	public void setSpawnTimer(Timer t) {
+		spawnTimer = t;
+	}
+	
+	public void setSpawnTimerTask(TimerTask st) {
+		spawnTimerTask = st;
+	}
+	
+	private long calcTimeToNextJump() {
+		final int time = Rnd.get((int) general().getAutoJumpsDelayMin(), (int) general().getAutoJumpsDelayMax());
+		if (isBossRoom) {
+			return (long) (time * general().getBossRoomTimeMultiply());
+		}
+		return time;
+	}
+	
+	public void memberDead(L2PcInstance player) {
+		if (!_deadPlayers.contains(player)) {
+			_deadPlayers.add(player);
+		}
+	}
+	
+	public void memberResurrected(L2PcInstance player) {
+		_deadPlayers.remove(player);
+	}
+	
+	public List<L2PcInstance> getDeadPlayers() {
+		return _deadPlayers;
+	}
+	
+	public List<L2PcInstance> getWaitingRoomPlayers() {
+		return _waitingRoomPlayers;
+	}
+	
+	public void checkBossRoom(byte room) {
+		isBossRoom = DimensionalRiftManager.getInstance().getRoom(_type, room).isBossRoom();
+	}
+	
+	public Location getRoomCoord(byte room) {
+		return DimensionalRiftManager.getInstance().getRoom(_type, room).getTeleportCoordinates();
+	}
+	
+	public int getMaxJumps() {
+		if ((general().getMaxRiftJumps() <= 8) && (general().getMaxRiftJumps() >= 1)) {
+			return general().getMaxRiftJumps();
+		}
+		
+		return 4;
+	}
+	
+	private void teleportToRoom(L2PcInstance player, byte room) {
+		Location coords = getRoomCoord(room);
+		player.teleToLocation(coords.getX() + Rnd.get(-150, 150), coords.getY() + Rnd.get(-150, 150), coords.getZ());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Duel.java b/src/main/java/com/l2jserver/gameserver/model/entity/Duel.java
new file mode 100644
index 00000000..ce003bf6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Duel.java
@@ -0,0 +1,660 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.DuelResult;
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.enums.audio.Music;
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExDuelEnd;
+import com.l2jserver.gameserver.network.serverpackets.ExDuelReady;
+import com.l2jserver.gameserver.network.serverpackets.ExDuelStart;
+import com.l2jserver.gameserver.network.serverpackets.ExDuelUpdateUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.PlaySound;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Zealar
+ */
+public class Duel {
+	protected static final Logger LOG = LoggerFactory.getLogger(Duel.class);
+	
+	private static final PlaySound B04_S01 = Music.B04_S01.getPacket();
+	
+	private static final int PARTY_DUEL_DURATION = 300;
+	private static final int PARTY_DUEL_PREPARE_TIME = 30;
+	private static final int PARTY_DUEL_TELEPORT_BACK_TIME = 10 * 1000;
+	private static final int PLAYER_DUEL_DURATION = 120;
+	private static final int DUEL_PREPARE_TIME = 5;
+	
+	private final int _duelId;
+	private final List<L2PcInstance> _teamA;
+	private final L2PcInstance _leaderA;
+	private final List<L2PcInstance> _teamB;
+	private final L2PcInstance _leaderB;
+	private final boolean _partyDuel;
+	private final Calendar _duelEndTime;
+	private int _surrenderRequest = 0;
+	private int _countdown;
+	private final Map<Integer, PlayerCondition> _playerConditions = new ConcurrentHashMap<>();
+	private int _duelInstanceId;
+	
+	public Duel(L2PcInstance playerA, L2PcInstance playerB, boolean partyDuel, int duelId) {
+		_duelId = duelId;
+		if (partyDuel) {
+			_leaderA = playerA;
+			_leaderB = playerB;
+			_teamA = new ArrayList<>(playerA.getParty().getMembers());
+			_teamB = new ArrayList<>(playerB.getParty().getMembers());
+		} else {
+			_leaderA = playerA;
+			_leaderB = playerB;
+			
+			_teamA = new ArrayList<>();
+			_teamB = new ArrayList<>();
+			
+			_teamA.add(playerA);
+			_teamB.add(playerB);
+		}
+		_partyDuel = partyDuel;
+		
+		_duelEndTime = Calendar.getInstance();
+		_duelEndTime.add(Calendar.SECOND, _partyDuel ? PARTY_DUEL_DURATION : PLAYER_DUEL_DURATION);
+		
+		savePlayerConditions();
+		if (_partyDuel) {
+			_countdown = PARTY_DUEL_PREPARE_TIME;
+			teleportPlayers();
+		} else {
+			_countdown = DUEL_PREPARE_TIME;
+		}
+		// Schedule duel start
+		ThreadPoolManager.getInstance().scheduleGeneral(new DuelPreparationTask(this), _countdown - 3);
+	}
+	
+	public static class PlayerCondition {
+		private final L2PcInstance _player;
+		private L2Summon _summon;
+		private final double _hp;
+		private final double _mp;
+		private final double _cp;
+		private final boolean _paDuel;
+		private Location _loc;
+		private final List<BuffInfo> _playerEffects;
+		private List<BuffInfo> _petEffects;
+		
+		public PlayerCondition(L2PcInstance player, boolean partyDuel) {
+			_player = player;
+			_hp = _player.getCurrentHp();
+			_mp = _player.getCurrentMp();
+			_cp = _player.getCurrentCp();
+			_paDuel = partyDuel;
+			
+			_playerEffects = new ArrayList<>(player.getEffectList().getEffects());
+			
+			if (_paDuel) {
+				_loc = _player.getLocation();
+			}
+			
+			if (player.hasSummon()) {
+				_summon = player.getSummon();
+				_petEffects = new ArrayList<>(player.getSummon().getEffectList().getEffects());
+			}
+		}
+		
+		public void restoreCondition() {
+			if (_player == null) {
+				return;
+			}
+			_player.setCurrentHp(_hp);
+			_player.setCurrentMp(_mp);
+			_player.setCurrentCp(_cp);
+			
+			_player.setIsInDuel(0);
+			_player.setTeam(Team.NONE);
+			_player.broadcastUserInfo();
+			
+			if (_paDuel) {
+				teleportBack();
+			}
+			_player.getEffectList().stopAllEffects();
+			for (BuffInfo skill : _playerEffects) {
+				if ((skill != null) && (skill.getTime() > 0)) {
+					skill.getSkill().applyEffects(_player, _player, true, skill.getTime());
+				}
+			}
+			if (_player.hasSummon()) {
+				_player.getSummon().getEffectList().stopAllEffects();
+				if ((_summon != null) && (_summon == _player.getSummon())) {
+					for (BuffInfo skill : _petEffects) {
+						if ((skill != null) && (skill.getTime() > 0)) {
+							skill.getSkill().applyEffects(_summon, _summon, true, skill.getTime());
+						}
+					}
+				}
+			}
+		}
+		
+		public void teleportBack() {
+			_player.teleToLocation(_loc);
+		}
+		
+		public L2PcInstance getPlayer() {
+			return _player;
+		}
+	}
+	
+	public static class DuelPreparationTask implements Runnable {
+		private final Duel _duel;
+		
+		public DuelPreparationTask(Duel duel) {
+			_duel = duel;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				if (_duel.countdown() > 0) // duel not started yet - continue countdown
+				{
+					ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
+				} else {
+					_duel.startDuel();
+				}
+			} catch (Exception e) {
+				LOG.error("There has been a problem while running a duel start task!", e);
+			}
+		}
+	}
+	
+	public class DuelClockTask implements Runnable {
+		private final Duel _duel;
+		
+		public DuelClockTask(Duel duel) {
+			_duel = duel;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				if (_duel.checkEndDuelCondition() == DuelResult.CONTINUE) {
+					ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
+				} else {
+					endDuel();
+				}
+			} catch (Exception e) {
+				LOG.error("There has been a problem while running a duel task!", e);
+			}
+		}
+	}
+	
+	/**
+	 * Starts the duel
+	 */
+	public void startDuel() {
+		// Set duel state and team
+		
+		// Send duel packets
+		broadcastToTeam1(ExDuelReady.PARTY_DUEL);
+		broadcastToTeam2(ExDuelReady.PARTY_DUEL);
+		broadcastToTeam1(ExDuelStart.PARTY_DUEL);
+		broadcastToTeam2(ExDuelStart.PARTY_DUEL);
+		
+		for (L2PcInstance temp : _teamA) {
+			temp.cancelActiveTrade();
+			temp.setIsInDuel(_duelId);
+			temp.setTeam(Team.BLUE);
+			temp.broadcastUserInfo();
+			broadcastToTeam2(new ExDuelUpdateUserInfo(temp));
+		}
+		for (L2PcInstance temp : _teamB) {
+			temp.cancelActiveTrade();
+			temp.setIsInDuel(_duelId);
+			temp.setTeam(Team.RED);
+			temp.broadcastUserInfo();
+			broadcastToTeam1(new ExDuelUpdateUserInfo(temp));
+		}
+		
+		if (_partyDuel) {
+			// Close doors chickens cannot run from the destiny
+			for (L2DoorInstance door : InstanceManager.getInstance().getInstance(getDuelInstanceId()).getDoors()) {
+				if ((door != null) && door.getOpen()) {
+					door.closeMe();
+				}
+			}
+		}
+		
+		// play sound
+		broadcastToTeam1(B04_S01);
+		broadcastToTeam2(B04_S01);
+		
+		// start dueling task
+		ThreadPoolManager.getInstance().scheduleGeneral(new DuelClockTask(this), 1000);
+	}
+	
+	/**
+	 * Stops all players from attacking. Used for duel timeout / interrupt.
+	 */
+	private void stopFighting() {
+		for (L2PcInstance temp : _teamA) {
+			temp.abortCast();
+			temp.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			temp.setTarget(null);
+			temp.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+		for (L2PcInstance temp : _teamB) {
+			temp.abortCast();
+			temp.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			temp.setTarget(null);
+			temp.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	/**
+	 * Save the current player condition: hp, mp, cp, location
+	 */
+	public void savePlayerConditions() {
+		for (L2PcInstance player : _teamA) {
+			_playerConditions.put(player.getObjectId(), new PlayerCondition(player, _partyDuel));
+		}
+		for (L2PcInstance player : _teamB) {
+			_playerConditions.put(player.getObjectId(), new PlayerCondition(player, _partyDuel));
+		}
+	}
+	
+	/**
+	 * Restore player conditions
+	 */
+	public void restorePlayerConditions() {
+		// restore player conditions
+		ThreadPoolManager.getInstance().scheduleGeneral(() -> _playerConditions.values().forEach(PlayerCondition::restoreCondition), _partyDuel ? PARTY_DUEL_TELEPORT_BACK_TIME : 1000);
+		
+		ThreadPoolManager.getInstance().scheduleGeneral(this::clear, _partyDuel ? PARTY_DUEL_TELEPORT_BACK_TIME : 1000);
+	}
+	
+	/**
+	 * Get the duel id
+	 * @return id
+	 */
+	public int getId() {
+		return _duelId;
+	}
+	
+	/**
+	 * Gets duel instance id.
+	 * @return id the duel id
+	 */
+	public int getDuelInstanceId() {
+		return _duelInstanceId;
+	}
+	
+	/**
+	 * Returns the remaining time
+	 * @return remaining time
+	 */
+	public int getRemainingTime() {
+		return (int) (_duelEndTime.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
+	}
+	
+	/**
+	 * Get the team that requested the duel
+	 * @return duel requester
+	 */
+	public List<L2PcInstance> getTeamA() {
+		return _teamA;
+	}
+	
+	/**
+	 * Get the team that was challenged
+	 * @return challenged team
+	 */
+	public List<L2PcInstance> getTeamB() {
+		return _teamB;
+	}
+	
+	/**
+	 * Get the team that requested the duel
+	 * @return duel requester
+	 */
+	public L2PcInstance getTeamLeaderA() {
+		return _leaderA;
+	}
+	
+	/**
+	 * Get the team that was challenged
+	 * @return challenged team
+	 */
+	public L2PcInstance getTeamLeaderB() {
+		return _leaderB;
+	}
+	
+	/**
+	 * Get the duel looser
+	 * @return looser
+	 */
+	public List<L2PcInstance> getLooser() {
+		if ((_leaderA == null) || (_leaderB == null)) {
+			return null;
+		}
+		if (_leaderA.getDuelState() == DuelState.WINNER) {
+			return _teamB;
+		} else if (_leaderB.getDuelState() == DuelState.WINNER) {
+			return _teamA;
+		}
+		return null;
+	}
+	
+	/**
+	 * Returns whether this is a party duel or not
+	 * @return is party duel
+	 */
+	public boolean isPartyDuel() {
+		return _partyDuel;
+	}
+	
+	/**
+	 * Teleports all players to a party duel instance.
+	 */
+	public void teleportPlayers() {
+		if (!_partyDuel) {
+			return;
+		}
+		
+		_duelInstanceId = InstanceManager.getInstance().createDynamicInstance("PartyDuel.xml");
+		
+		Instance instance = InstanceManager.getInstance().getInstance(_duelInstanceId);
+		
+		int i = 0;
+		for (L2PcInstance player : _teamA) {
+			Location loc = instance.getEnterLocs().get(i++);
+			
+			player.teleToLocation(loc.getX(), loc.getY(), loc.getZ(), 0, _duelInstanceId, 0);
+		}
+		
+		i = 9;
+		for (L2PcInstance player : _teamB) {
+			Location loc = instance.getEnterLocs().get(i++);
+			player.teleToLocation(loc.getX(), loc.getY(), loc.getZ(), 0, _duelInstanceId, 0);
+		}
+	}
+	
+	/**
+	 * Broadcast a packet to the challenger team
+	 * @param packet
+	 */
+	public void broadcastToTeam1(L2GameServerPacket packet) {
+		if ((_teamA == null) || _teamA.isEmpty()) {
+			return;
+		}
+		
+		for (L2PcInstance temp : _teamA) {
+			temp.sendPacket(packet);
+		}
+	}
+	
+	/**
+	 * Broadcast a packet to the challenged team
+	 * @param packet
+	 */
+	public void broadcastToTeam2(L2GameServerPacket packet) {
+		if ((_teamB == null) || _teamB.isEmpty()) {
+			return;
+		}
+		
+		for (L2PcInstance temp : _teamB) {
+			temp.sendPacket(packet);
+		}
+	}
+	
+	/**
+	 * Playback the bow animation for all looser
+	 */
+	private void playKneelAnimation() {
+		List<L2PcInstance> looser = getLooser();
+		
+		if (looser == null) {
+			return;
+		}
+		
+		for (L2PcInstance temp : looser) {
+			temp.broadcastPacket(new SocialAction(temp.getObjectId(), 7));
+		}
+	}
+	
+	/**
+	 * Do the countdown and send message to players if necessary
+	 * @return current count
+	 */
+	int countdown() {
+		if (--_countdown > 3) {
+			return _countdown;
+		}
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DUEL_WILL_BEGIN_IN_S1_SECONDS);
+		if (_countdown > 0) {
+			sm.addInt(_countdown);
+		} else {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.LET_THE_DUEL_BEGIN);
+		}
+		
+		broadcastToTeam1(sm);
+		broadcastToTeam2(sm);
+		
+		return _countdown;
+	}
+	
+	/**
+	 * The duel has reached a state in which it can no longer continue
+	 */
+	void endDuel() {
+		// Send end duel packet
+		final ExDuelEnd duelEnd = _partyDuel ? ExDuelEnd.PARTY_DUEL : ExDuelEnd.PLAYER_DUEL;
+		broadcastToTeam1(duelEnd);
+		broadcastToTeam2(duelEnd);
+		playKneelAnimation();
+		sendEndMessages();
+		restorePlayerConditions();
+	}
+	
+	/**
+	 * Clear current duel from DuelManager
+	 */
+	private void clear() {
+		InstanceManager.getInstance().destroyInstance(getDuelInstanceId());
+		DuelManager.getInstance().removeDuel(this);
+	}
+	
+	/**
+	 * Send required messages for duel end
+	 */
+	private void sendEndMessages() {
+		SystemMessage sm = null;
+		switch (checkEndDuelCondition()) {
+			case TEAM_1_WIN, TEAM_2_SURRENDER -> {
+				if (_partyDuel) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_HAS_WON_THE_DUEL);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_DUEL);
+				}
+				sm.addString(_leaderA.getName());
+			}
+			case TEAM_1_SURRENDER, TEAM_2_WIN -> {
+				if (_partyDuel) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_HAS_WON_THE_DUEL);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_DUEL);
+				}
+				sm.addString(_leaderB.getName());
+			}
+			case CANCELED, TIMEOUT -> {
+				stopFighting();
+				sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DUEL_HAS_ENDED_IN_A_TIE);
+			}
+		}
+		broadcastToTeam1(sm);
+		broadcastToTeam2(sm);
+	}
+	
+	/**
+	 * Did a situation occur in which the duel has to be ended?
+	 * @return DuelResult duel status
+	 */
+	DuelResult checkEndDuelCondition() {
+		// one of the players might leave during duel
+		if ((_teamA == null) || (_teamB == null)) {
+			return DuelResult.CANCELED;
+		}
+		
+		// got a duel surrender request?
+		if (_surrenderRequest != 0) {
+			if (_surrenderRequest == 1) {
+				return DuelResult.TEAM_1_SURRENDER;
+			}
+			return DuelResult.TEAM_2_SURRENDER;
+		}
+		// duel timed out
+		else if (getRemainingTime() <= 0) {
+			return DuelResult.TIMEOUT;
+		}
+		// Has a player been declared winner yet?
+		else if (_leaderA.getDuelState() == DuelState.WINNER) {
+			// If there is a Winner already there should be no more fighting going on
+			stopFighting();
+			return DuelResult.TEAM_1_WIN;
+		} else if (_leaderB.getDuelState() == DuelState.WINNER) {
+			// If there is a Winner already there should be no more fighting going on
+			stopFighting();
+			return DuelResult.TEAM_2_WIN;
+		}
+		
+		// More end duel conditions for 1on1 duels
+		else if (!_partyDuel) {
+			// Duel was interrupted e.g.: player was attacked by mobs / other players
+			if ((_leaderA.getDuelState() == DuelState.INTERRUPTED) || (_leaderB.getDuelState() == DuelState.INTERRUPTED)) {
+				return DuelResult.CANCELED;
+			}
+			
+			// Are the players too far apart?
+			if (!_leaderA.isInsideRadius(_leaderB, 2000, false, false)) {
+				return DuelResult.CANCELED;
+			}
+			
+			// is one of the players in a Siege, Peace or PvP zone?
+			if (_leaderA.isInsideZone(ZoneId.PEACE) || _leaderB.isInsideZone(ZoneId.PEACE) || _leaderA.isInsideZone(ZoneId.SIEGE) || _leaderB.isInsideZone(ZoneId.SIEGE) || _leaderA.isInsideZone(ZoneId.PVP) || _leaderB.isInsideZone(ZoneId.PVP)) {
+				return DuelResult.CANCELED;
+			}
+		}
+		
+		return DuelResult.CONTINUE;
+	}
+	
+	/**
+	 * Register a surrender request
+	 * @param player the player that surrenders.
+	 */
+	public void doSurrender(L2PcInstance player) {
+		// already received a surrender request
+		if ((_surrenderRequest != 0) || _partyDuel) {
+			return;
+		}
+		
+		// stop the fight
+		stopFighting();
+		
+		if (player == _leaderA) {
+			_surrenderRequest = 1;
+			_leaderA.setDuelState(DuelState.DEAD);
+			_leaderB.setDuelState(DuelState.WINNER);
+		} else if (player == _leaderB) {
+			_surrenderRequest = 2;
+			_leaderB.setDuelState(DuelState.DEAD);
+			_leaderA.setDuelState(DuelState.WINNER);
+		}
+	}
+	
+	/**
+	 * This function is called whenever a player was defeated in a duel
+	 * @param player the player defeated.
+	 */
+	public void onPlayerDefeat(L2PcInstance player) {
+		// Set player as defeated
+		player.setDuelState(DuelState.DEAD);
+		player.setTeam(Team.NONE);
+		
+		if (_partyDuel) {
+			boolean teamDefeated = true;
+			
+			boolean isInTeamA = true;
+			
+			if (_teamA.contains(player)) {
+				for (L2PcInstance temp : _teamA) {
+					if (temp.getDuelState() == DuelState.DUELLING) {
+						teamDefeated = false;
+						break;
+					}
+				}
+			} else if (_teamB.contains(player)) {
+				isInTeamA = false;
+				for (L2PcInstance temp : _teamB) {
+					if (temp.getDuelState() == DuelState.DUELLING) {
+						teamDefeated = false;
+						break;
+					}
+				}
+			}
+			if (teamDefeated) {
+				List<L2PcInstance> winners = (isInTeamA ? _teamB : _teamA);
+				for (L2PcInstance temp : winners) {
+					temp.setDuelState(DuelState.WINNER);
+				}
+			}
+		} else {
+			if ((player != _leaderA) && (player != _leaderB)) {
+				LOG.warn("Error in onPlayerDefeat(): player is not part of this 1vs1 duel!");
+			}
+			
+			if (_leaderA == player) {
+				_leaderB.setDuelState(DuelState.WINNER);
+			} else {
+				_leaderA.setDuelState(DuelState.WINNER);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Fort.java b/src/main/java/com/l2jserver/gameserver/model/entity/Fort.java
new file mode 100644
index 00000000..42006eda
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Fort.java
@@ -0,0 +1,1045 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.clan;
+import static com.l2jserver.gameserver.config.Configuration.fortress;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.FortUpdater;
+import com.l2jserver.gameserver.FortUpdater.UpdaterType;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.StaticObjectData;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.audio.Music;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.zone.type.L2FortZone;
+import com.l2jserver.gameserver.model.zone.type.L2SiegeZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class Fort extends AbstractResidence {
+	private static final Logger LOG = LoggerFactory.getLogger(Fort.class);
+	
+	private final List<L2DoorInstance> _doors = new ArrayList<>();
+	private L2StaticObjectInstance _flagPole = null;
+	private volatile FortSiege _siege = null;
+	private Calendar _siegeDate;
+	private Calendar _lastOwnedTime;
+	private L2SiegeZone _zone;
+	private int _ownerId = 0;
+	private L2Clan _fortOwner = null;
+	private int _fortType = 0;
+	private int _state = 0;
+	private int _castleId = 0;
+	private int _supplyLvL = 0;
+	private final Map<Integer, FortFunction> _function;
+	private final ScheduledFuture<?>[] _FortUpdater = new ScheduledFuture<?>[2];
+	
+	// Spawn Data
+	private boolean _isSuspiciousMerchantSpawned = false;
+	private final List<L2Spawn> _siegeNpcs = new CopyOnWriteArrayList<>();
+	private final List<L2Spawn> _npcCommanders = new CopyOnWriteArrayList<>();
+	private final List<L2Spawn> _specialEnvoys = new CopyOnWriteArrayList<>();
+	
+	private final Map<Integer, Integer> _envoyCastles = new HashMap<>(2);
+	private final Set<Integer> _availableCastles = new HashSet<>(1);
+	
+	/** Fortress Functions */
+	public static final int FUNC_RESTORE_HP = 1;
+	public static final int FUNC_RESTORE_MP = 2;
+	public static final int FUNC_RESTORE_CP = 3;
+	public static final int FUNC_RESTORE_EXP = 4;
+	public static final int FUNC_TELEPORT = 5;
+	public static final int FUNC_BROADCAST = 6;
+	public static final int FUNC_DECO_CURTAINS = 7;
+	public static final int FUNC_DECO_HANGING = 8;
+	public static final int FUNC_SUPPORT = 9;
+	public static final int FUNC_DECO_OUTERFLAG = 10;
+	public static final int FUNC_DECO_FRONTPLATEFORM = 11;
+	public static final int FUNC_ITEM_CREATE = 12;
+	
+	public class FortFunction {
+		private final int _type;
+		private int _lvl;
+		protected int _fee;
+		protected int _tempFee;
+		private final long _rate;
+		private long _endDate;
+		protected boolean _inDebt;
+		public boolean _cwh;
+		
+		public FortFunction(int type, int lvl, int lease, int tempLease, long rate, long time, boolean cwh) {
+			_type = type;
+			_lvl = lvl;
+			_fee = lease;
+			_tempFee = tempLease;
+			_rate = rate;
+			_endDate = time;
+			initializeTask(cwh);
+		}
+		
+		public int getType() {
+			return _type;
+		}
+		
+		public int getLvl() {
+			return _lvl;
+		}
+		
+		public int getLease() {
+			return _fee;
+		}
+		
+		public long getRate() {
+			return _rate;
+		}
+		
+		public long getEndTime() {
+			return _endDate;
+		}
+		
+		public void setLvl(int lvl) {
+			_lvl = lvl;
+		}
+		
+		public void setLease(int lease) {
+			_fee = lease;
+		}
+		
+		public void setEndTime(long time) {
+			_endDate = time;
+		}
+		
+		private void initializeTask(boolean cwh) {
+			if (getOwnerClan() == null) {
+				return;
+			}
+			long currentTime = System.currentTimeMillis();
+			if (_endDate > currentTime) {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), _endDate - currentTime);
+			} else {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(cwh), 0);
+			}
+		}
+		
+		private class FunctionTask implements Runnable {
+			public FunctionTask(boolean cwh) {
+				_cwh = cwh;
+			}
+			
+			@Override
+			public void run() {
+				try {
+					if (getOwnerClan() == null) {
+						return;
+					}
+					if ((getOwnerClan().getWarehouse().getAdena() >= _fee) || !_cwh) {
+						int fee = _fee;
+						if (getEndTime() == -1) {
+							fee = _tempFee;
+						}
+						
+						setEndTime(System.currentTimeMillis() + getRate());
+						dbSave();
+						if (_cwh) {
+							getOwnerClan().getWarehouse().destroyItemByItemId("CS_function_fee", Inventory.ADENA_ID, fee, null, null);
+						}
+						ThreadPoolManager.getInstance().scheduleGeneral(new FunctionTask(true), getRate());
+					} else {
+						removeFunction(getType());
+					}
+				} catch (Throwable t) {
+					LOG.warn(t.getMessage(), t);
+				}
+			}
+		}
+		
+		public void dbSave() {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement("REPLACE INTO fort_functions (fort_id, type, lvl, lease, rate, endTime) VALUES (?,?,?,?,?,?)")) {
+				ps.setInt(1, getResidenceId());
+				ps.setInt(2, getType());
+				ps.setInt(3, getLvl());
+				ps.setInt(4, getLease());
+				ps.setLong(5, getRate());
+				ps.setLong(6, getEndTime());
+				ps.execute();
+			} catch (Exception e) {
+				LOG.error("Exception: Fort.updateFunctions(int type, int lvl, int lease, long rate, long time, boolean addNew): {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	public Fort(int fortId) {
+		super(fortId);
+		load();
+		loadFlagPoles();
+		_function = new ConcurrentHashMap<>();
+		if (getOwnerClan() != null) {
+			setVisibleFlag(true);
+			loadFunctions();
+		}
+		initResidenceZone();
+		initNpcs(); // load and spawn npcs (Always spawned)
+		initSiegeNpcs(); // load suspicious merchants (Despawned 10mins before siege)
+		// spawnSuspiciousMerchant();// spawn suspicious merchants
+		initNpcCommanders(); // npc Commanders (not monsters) (Spawned during siege)
+		spawnNpcCommanders(); // spawn npc Commanders
+		initSpecialEnvoys(); // envoys from castles (Spawned after fort taken)
+		if ((getOwnerClan() != null) && (getFortState() == 0)) {
+			spawnSpecialEnvoys();
+		}
+	}
+	
+	/**
+	 * Return function with id
+	 */
+	public FortFunction getFunction(int type) {
+		return _function.get(type);
+	}
+	
+	public void endOfSiege(L2Clan clan) {
+		ThreadPoolManager.getInstance().executeAi(new EndFortressSiege(this, clan));
+	}
+	
+	/**
+	 * Move non clan members off fort area and to nearest town.<BR>
+	 * <BR>
+	 */
+	public void banishForeigners() {
+		getResidenceZone().banishForeigners(getOwnerClan().getId());
+	}
+	
+	/**
+	 * @return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(int x, int y, int z) {
+		return getZone().isInsideZone(x, y, z);
+	}
+	
+	public L2SiegeZone getZone() {
+		if (_zone == null) {
+			for (L2SiegeZone zone : ZoneManager.getInstance().getAllZones(L2SiegeZone.class)) {
+				if (zone.getSiegeObjectId() == getResidenceId()) {
+					_zone = zone;
+					break;
+				}
+			}
+		}
+		return _zone;
+	}
+	
+	@Override
+	public L2FortZone getResidenceZone() {
+		return (L2FortZone) super.getResidenceZone();
+	}
+	
+	/**
+	 * Get the objects distance to this fort
+	 */
+	public double getDistance(L2Object obj) {
+		return getZone().getDistanceToZone(obj);
+	}
+	
+	public void closeDoor(L2PcInstance activeChar, int doorId) {
+		openCloseDoor(activeChar, doorId, false);
+	}
+	
+	public void openDoor(L2PcInstance activeChar, int doorId) {
+		openCloseDoor(activeChar, doorId, true);
+	}
+	
+	public void openCloseDoor(L2PcInstance activeChar, int doorId, boolean open) {
+		if (activeChar.getClan() != getOwnerClan()) {
+			return;
+		}
+		
+		L2DoorInstance door = getDoor(doorId);
+		if (door != null) {
+			if (open) {
+				door.openMe();
+			} else {
+				door.closeMe();
+			}
+		}
+	}
+	
+	// This method is used to begin removing all fort upgrades
+	public void removeUpgrade() {
+		removeDoorUpgrade();
+	}
+	
+	/**
+	 * This method will set owner for Fort
+	 * @param clan
+	 * @param updateClansReputation
+	 * @return
+	 */
+	public boolean setOwner(L2Clan clan, boolean updateClansReputation) {
+		if (clan == null) {
+			LOG.warn("Updating Fort owner with null clan!!!");
+			return false;
+		}
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED);
+		sm.addCastleId(getResidenceId());
+		getSiege().announceToPlayer(sm);
+		
+		final L2Clan oldowner = getOwnerClan();
+		if ((oldowner != null) && (clan != oldowner)) {
+			// Remove points from old owner
+			updateClansReputation(oldowner, true);
+			try {
+				L2PcInstance oldleader = oldowner.getLeader().getPlayerInstance();
+				if (oldleader != null) {
+					if (oldleader.getMountType() == MountType.WYVERN) {
+						oldleader.dismount();
+					}
+				}
+			} catch (Exception e) {
+				LOG.warn("Exception in setOwner: {}", e.getMessage(), e);
+			}
+			removeOwner(true);
+		}
+		setFortState(0, 0); // initialize fort state
+		
+		// if clan already have castle, don't store him in fortress
+		if (clan.getCastleId() > 0) {
+			getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.NPCS_RECAPTURED_FORTRESS));
+			return false;
+		}
+		
+		// Give points to new owner
+		if (updateClansReputation) {
+			updateClansReputation(clan, false);
+		}
+		
+		spawnSpecialEnvoys();
+		// if clan have already fortress, remove it
+		if (clan.getFortId() > 0) {
+			FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
+		}
+		
+		setSupplyLvL(0);
+		setOwnerClan(clan);
+		updateOwnerInDB(); // Update in database
+		saveFortVariables();
+		
+		if (getSiege().isInProgress()) {
+			getSiege().endSiege();
+		}
+		
+		for (L2PcInstance member : clan.getOnlineMembers(0)) {
+			giveResidentialSkills(member);
+			member.sendSkillList();
+		}
+		return true;
+	}
+	
+	public void removeOwner(boolean updateDB) {
+		L2Clan clan = getOwnerClan();
+		if (clan != null) {
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				removeResidentialSkills(member);
+				member.sendSkillList();
+			}
+			clan.setFortId(0);
+			clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+			setOwnerClan(null);
+			setSupplyLvL(0);
+			saveFortVariables();
+			removeAllFunctions();
+			if (updateDB) {
+				updateOwnerInDB();
+			}
+		}
+	}
+	
+	public void raiseSupplyLvL() {
+		_supplyLvL++;
+		if (_supplyLvL > fortress().getMaxSupplyLevel()) {
+			_supplyLvL = fortress().getMaxSupplyLevel();
+		}
+	}
+	
+	public void setSupplyLvL(int val) {
+		if (val <= fortress().getMaxSupplyLevel()) {
+			_supplyLvL = val;
+		}
+	}
+	
+	public int getSupplyLvL() {
+		return _supplyLvL;
+	}
+	
+	public void saveFortVariables() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE fort SET supplyLvL=? WHERE id = ?")) {
+			ps.setInt(1, _supplyLvL);
+			ps.setInt(2, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: saveFortVariables(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Show or hide flag inside flag pole.
+	 */
+	public void setVisibleFlag(boolean val) {
+		L2StaticObjectInstance flagPole = getFlagPole();
+		if (flagPole != null) {
+			flagPole.setMeshIndex(val ? 1 : 0);
+		}
+	}
+	
+	/**
+	 * Respawn all doors on fort grounds.
+	 */
+	public void resetDoors() {
+		for (L2DoorInstance door : _doors) {
+			if (door.getOpen()) {
+				door.closeMe();
+			}
+			if (door.isDead()) {
+				door.doRevive();
+			}
+			if (door.getCurrentHp() < door.getMaxHp()) {
+				door.setCurrentHp(door.getMaxHp());
+			}
+		}
+		loadDoorUpgrade(); // Check for any upgrade the doors may have
+	}
+	
+	public void upgradeDoor(int doorId, int hp, int pDef, int mDef) {
+		L2DoorInstance door = getDoor(doorId);
+		if (door != null) {
+			door.setCurrentHp(door.getMaxHp() + hp);
+			
+			saveDoorUpgrade(doorId, hp, pDef, mDef);
+		}
+	}
+	
+	// This method loads fort
+	@Override
+	protected void load() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM fort WHERE id = ?")) {
+			ps.setInt(1, getResidenceId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					setName(rs.getString("name"));
+					
+					_siegeDate = Calendar.getInstance();
+					_lastOwnedTime = Calendar.getInstance();
+					_siegeDate.setTimeInMillis(rs.getLong("siegeDate"));
+					_lastOwnedTime.setTimeInMillis(rs.getLong("lastOwnedTime"));
+					_ownerId = rs.getInt("owner");
+					_fortType = rs.getInt("fortType");
+					_state = rs.getInt("state");
+					_castleId = rs.getInt("castleId");
+					_supplyLvL = rs.getInt("supplyLvL");
+				}
+			}
+			if (_ownerId > 0) {
+				final var clan = ClanTable.getInstance().getClan(_ownerId);
+				clan.setFortId(getResidenceId());
+				setOwnerClan(clan);
+				int runCount = getOwnedTime() / (int) MILLISECONDS.toSeconds(fortress().getPeriodicUpdateFrequency());
+				long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis();
+				while (initial > fortress().getPeriodicUpdateFrequency()) {
+					initial -= fortress().getPeriodicUpdateFrequency();
+				}
+				initial = fortress().getPeriodicUpdateFrequency() - initial;
+				if ((fortress().getMaxKeepTime() <= 0) || (getOwnedTime() < (fortress().getMaxKeepTime() * 3600))) {
+					_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.PERIODIC_UPDATE), initial, fortress().getPeriodicUpdateFrequency()); // Schedule owner tasks to start running
+					if (fortress().getMaxKeepTime() > 0) {
+						_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
+					}
+				} else {
+					_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneral(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 60000); // Schedule owner tasks to remove owner
+				}
+			} else {
+				setOwnerClan(null);
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: loadFortData(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/** Load All Functions */
+	private void loadFunctions() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM fort_functions WHERE fort_id = ?")) {
+			ps.setInt(1, getResidenceId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					_function.put(rs.getInt("type"), new FortFunction(rs.getInt("type"), rs.getInt("lvl"), rs.getInt("lease"), 0, rs.getLong("rate"), rs.getLong("endTime"), true));
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Exception: Fort.loadFunctions(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Remove function In List and in DB
+	 */
+	public void removeFunction(int functionType) {
+		_function.remove(functionType);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM fort_functions WHERE fort_id=? AND type=?")) {
+			ps.setInt(1, getResidenceId());
+			ps.setInt(2, functionType);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Exception: Fort.removeFunctions(int functionType): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Remove all fort functions.
+	 */
+	private void removeAllFunctions() {
+		for (int id : _function.keySet()) {
+			removeFunction(id);
+		}
+	}
+	
+	public boolean updateFunctions(L2PcInstance player, int type, int lvl, int lease, long rate, boolean addNew) {
+		if (player == null) {
+			return false;
+		}
+		if (lease > 0) {
+			if (!player.destroyItemByItemId("Consume", Inventory.ADENA_ID, lease, null, true)) {
+				return false;
+			}
+		}
+		if (addNew) {
+			_function.put(type, new FortFunction(type, lvl, lease, 0, rate, 0, false));
+		} else {
+			if ((lvl == 0) && (lease == 0)) {
+				removeFunction(type);
+			} else {
+				int diffLease = lease - _function.get(type).getLease();
+				if (diffLease > 0) {
+					_function.remove(type);
+					_function.put(type, new FortFunction(type, lvl, lease, 0, rate, -1, false));
+				} else {
+					_function.get(type).setLease(lease);
+					_function.get(type).setLvl(lvl);
+					_function.get(type).dbSave();
+				}
+			}
+		}
+		return true;
+	}
+	
+	public void activateInstance() {
+		loadDoor();
+	}
+	
+	// This method loads fort door data from database
+	private void loadDoor() {
+		for (L2DoorInstance door : DoorData.getInstance().getDoors()) {
+			if ((door.getFort() != null) && (door.getFort().getResidenceId() == getResidenceId())) {
+				_doors.add(door);
+			}
+		}
+	}
+	
+	private void loadFlagPoles() {
+		for (L2StaticObjectInstance obj : StaticObjectData.getInstance().getStaticObjects()) {
+			if ((obj.getType() == 3) && obj.getName().startsWith(getName())) {
+				_flagPole = obj;
+				break;
+			}
+		}
+		if (_flagPole == null) {
+			throw new NullPointerException("Can't find flagpole for Fort " + this);
+		}
+	}
+	
+	private void loadDoorUpgrade() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM fort_doorupgrade WHERE fortId = ?")) {
+			ps.setInt(1, getResidenceId());
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					upgradeDoor(rs.getInt("id"), rs.getInt("hp"), rs.getInt("pDef"), rs.getInt("mDef"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: loadFortDoorUpgrade(): {}", e.getMessage(), e);
+		}
+	}
+	
+	private void removeDoorUpgrade() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM fort_doorupgrade WHERE fortId = ?")) {
+			ps.setInt(1, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: removeDoorUpgrade(): {}", e.getMessage(), e);
+		}
+	}
+	
+	private void saveDoorUpgrade(int doorId, int hp, int pDef, int mDef) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO fort_doorupgrade (doorId, hp, pDef, mDef) VALUES (?,?,?,?)")) {
+			ps.setInt(1, doorId);
+			ps.setInt(2, hp);
+			ps.setInt(3, pDef);
+			ps.setInt(4, mDef);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: saveDoorUpgrade(int doorId, int hp, int pDef, int mDef): {}", e.getMessage(), e);
+		}
+	}
+	
+	private void updateOwnerInDB() {
+		L2Clan clan = getOwnerClan();
+		int clanId = 0;
+		if (clan != null) {
+			clanId = clan.getId();
+			_lastOwnedTime.setTimeInMillis(System.currentTimeMillis());
+		} else {
+			_lastOwnedTime.setTimeInMillis(0);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE fort SET owner=?,lastOwnedTime=?,state=?,castleId=? WHERE id = ?")) {
+			ps.setInt(1, clanId);
+			ps.setLong(2, _lastOwnedTime.getTimeInMillis());
+			ps.setInt(3, 0);
+			ps.setInt(4, 0);
+			ps.setInt(5, getResidenceId());
+			ps.execute();
+			
+			// Announce to clan members
+			if (clan != null) {
+				clan.setFortId(getResidenceId()); // Set has fort flag for new owner
+				SystemMessage sm;
+				sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CLAN_IS_VICTORIOUS_IN_THE_FORTRESS_BATTLE_OF_S2);
+				sm.addString(clan.getName());
+				sm.addCastleId(getResidenceId());
+				L2World.getInstance().getPlayers().forEach(p -> p.sendPacket(sm));
+				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+				clan.broadcastToOnlineMembers(Music.SIEGE_VICTORY.getPacket());
+				if (_FortUpdater[0] != null) {
+					_FortUpdater[0].cancel(false);
+				}
+				if (_FortUpdater[1] != null) {
+					_FortUpdater[1].cancel(false);
+				}
+				_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.PERIODIC_UPDATE), fortress().getPeriodicUpdateFrequency(), fortress().getPeriodicUpdateFrequency()); // Schedule owner tasks to start running
+				if (fortress().getMaxKeepTime() > 0) {
+					_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owner
+				}
+			} else {
+				if (_FortUpdater[0] != null) {
+					_FortUpdater[0].cancel(false);
+				}
+				_FortUpdater[0] = null;
+				if (_FortUpdater[1] != null) {
+					_FortUpdater[1].cancel(false);
+				}
+				_FortUpdater[1] = null;
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: updateOwnerInDB(L2Clan clan): {}", e.getMessage(), e);
+		}
+	}
+	
+	public int getOwnerId() {
+		return _ownerId;
+	}
+	
+	public L2Clan getOwnerClan() {
+		return _fortOwner;
+	}
+	
+	public void setOwnerClan(L2Clan clan) {
+		setVisibleFlag(clan != null);
+		_fortOwner = clan;
+	}
+	
+	public L2DoorInstance getDoor(int doorId) {
+		if (doorId <= 0) {
+			return null;
+		}
+		
+		for (L2DoorInstance door : getDoors()) {
+			if (door.getId() == doorId) {
+				return door;
+			}
+		}
+		return null;
+	}
+	
+	public List<L2DoorInstance> getDoors() {
+		return _doors;
+	}
+	
+	public L2StaticObjectInstance getFlagPole() {
+		return _flagPole;
+	}
+	
+	public FortSiege getSiege() {
+		if (_siege == null) {
+			synchronized (this) {
+				if (_siege == null) {
+					_siege = new FortSiege(this);
+				}
+			}
+		}
+		return _siege;
+	}
+	
+	public Calendar getSiegeDate() {
+		return _siegeDate;
+	}
+	
+	public void setSiegeDate(Calendar siegeDate) {
+		_siegeDate = siegeDate;
+	}
+	
+	public int getOwnedTime() {
+		if (_lastOwnedTime.getTimeInMillis() == 0) {
+			return 0;
+		}
+		
+		return (int) ((System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis()) / 1000);
+	}
+	
+	public int getTimeTillRebelArmy() {
+		if (_lastOwnedTime.getTimeInMillis() == 0) {
+			return 0;
+		}
+		
+		return (int) (((_lastOwnedTime.getTimeInMillis() + (fortress().getMaxKeepTime() * 3600000L)) - System.currentTimeMillis()) / 1000L);
+	}
+	
+	public long getTimeTillNextFortUpdate() {
+		if (_FortUpdater[0] == null) {
+			return 0;
+		}
+		return _FortUpdater[0].getDelay(TimeUnit.SECONDS);
+	}
+	
+	public void updateClansReputation(L2Clan owner, boolean removePoints) {
+		if (owner != null) {
+			if (removePoints) {
+				owner.takeReputationScore(clan().getLoseFortPoints(), true);
+			} else {
+				owner.addReputationScore(clan().getTakeFortPoints(), true);
+			}
+		}
+	}
+	
+	private static class EndFortressSiege implements Runnable {
+		private final Fort _f;
+		private final L2Clan _clan;
+		
+		public EndFortressSiege(Fort f, L2Clan clan) {
+			_f = f;
+			_clan = clan;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_f.setOwner(_clan, true);
+			} catch (Exception e) {
+				LOG.warn("Exception in endFortressSiege {}", e.getMessage(), e);
+			}
+		}
+		
+	}
+	
+	/**
+	 * @return Returns state of fortress.<BR>
+	 *         <BR>
+	 *         0 - not decided yet<BR>
+	 *         1 - independent<BR>
+	 *         2 - contracted with castle<BR>
+	 */
+	public int getFortState() {
+		return _state;
+	}
+	
+	/**
+	 * @param state
+	 *            <ul>
+	 *            <li>0 - not decided yet</li>
+	 *            <li>1 - independent</li>
+	 *            <li>2 - contracted with castle</li>
+	 *            </ul>
+	 * @param castleId the Id of the contracted castle (0 if no contract with any castle)
+	 */
+	public void setFortState(int state, int castleId) {
+		_state = state;
+		_castleId = castleId;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE fort SET state=?,castleId=? WHERE id = ?")) {
+			ps.setInt(1, getFortState());
+			ps.setInt(2, getContractedCastleId());
+			ps.setInt(3, getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: setFortState(int state, int castleId): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * @return the fortress type (0 - small (3 commanders), 1 - big (4 commanders + control room))
+	 */
+	public int getFortType() {
+		return _fortType;
+	}
+	
+	/**
+	 * @param npcId the Id of the ambassador NPC
+	 * @return the Id of the castle this ambassador represents
+	 */
+	public int getCastleIdByAmbassador(int npcId) {
+		return _envoyCastles.get(npcId);
+	}
+	
+	/**
+	 * @param npcId the Id of the ambassador NPC
+	 * @return the castle this ambassador represents
+	 */
+	public Castle getCastleByAmbassador(int npcId) {
+		return CastleManager.getInstance().getCastleById(getCastleIdByAmbassador(npcId));
+	}
+	
+	/**
+	 * @return the Id of the castle contracted with this fortress
+	 */
+	public int getContractedCastleId() {
+		return _castleId;
+	}
+	
+	/**
+	 * @return the castle contracted with this fortress ({@code null} if no contract with any castle)
+	 */
+	public Castle getContractedCastle() {
+		return CastleManager.getInstance().getCastleById(getContractedCastleId());
+	}
+	
+	/**
+	 * Check if this is a border fortress (associated with multiple castles).
+	 * @return {@code true} if this is a border fortress (associated with more than one castle), {@code false} otherwise
+	 */
+	public boolean isBorderFortress() {
+		return _availableCastles.size() > 1;
+	}
+	
+	/**
+	 * @return the amount of barracks in this fortress
+	 */
+	public int getFortSize() {
+		return getFortType() == 0 ? 3 : 5;
+	}
+	
+	public void spawnSuspiciousMerchant() {
+		if (_isSuspiciousMerchantSpawned) {
+			return;
+		}
+		_isSuspiciousMerchantSpawned = true;
+		
+		for (L2Spawn spawnDat : _siegeNpcs) {
+			spawnDat.doSpawn();
+			spawnDat.startRespawn();
+		}
+	}
+	
+	public void despawnSuspiciousMerchant() {
+		if (!_isSuspiciousMerchantSpawned) {
+			return;
+		}
+		_isSuspiciousMerchantSpawned = false;
+		
+		for (L2Spawn spawnDat : _siegeNpcs) {
+			spawnDat.stopRespawn();
+			spawnDat.getLastSpawn().deleteMe();
+		}
+	}
+	
+	public void spawnNpcCommanders() {
+		for (L2Spawn spawnDat : _npcCommanders) {
+			spawnDat.doSpawn();
+			spawnDat.startRespawn();
+		}
+	}
+	
+	public void despawnNpcCommanders() {
+		for (L2Spawn spawnDat : _npcCommanders) {
+			spawnDat.stopRespawn();
+			spawnDat.getLastSpawn().deleteMe();
+		}
+	}
+	
+	public void spawnSpecialEnvoys() {
+		for (L2Spawn spawnDat : _specialEnvoys) {
+			spawnDat.doSpawn();
+		}
+	}
+	
+	private void initNpcs() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM fort_spawnlist WHERE fortId = ? AND spawnType = ?")) {
+			ps.setInt(1, getResidenceId());
+			ps.setInt(2, 0);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
+					spawnDat.setAmount(1);
+					spawnDat.setX(rs.getInt("x"));
+					spawnDat.setY(rs.getInt("y"));
+					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setHeading(rs.getInt("heading"));
+					spawnDat.setRespawnDelay(60);
+					SpawnTable.getInstance().addNewSpawn(spawnDat, false);
+					spawnDat.doSpawn();
+					spawnDat.startRespawn();
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Fort {} initNpcs: Spawn could not be initialized: {}", getResidenceId(), e.getMessage(), e);
+		}
+	}
+	
+	private void initSiegeNpcs() {
+		_siegeNpcs.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT id, npcId, x, y, z, heading FROM fort_spawnlist WHERE fortId = ? AND spawnType = ? ORDER BY id")) {
+			ps.setInt(1, getResidenceId());
+			ps.setInt(2, 2);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
+					spawnDat.setAmount(1);
+					spawnDat.setX(rs.getInt("x"));
+					spawnDat.setY(rs.getInt("y"));
+					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setHeading(rs.getInt("heading"));
+					spawnDat.setRespawnDelay(60);
+					_siegeNpcs.add(spawnDat);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Fort {} initSiegeNpcs: Spawn could not be initialized: {}", getResidenceId(), e.getMessage(), e);
+		}
+	}
+	
+	private void initNpcCommanders() {
+		_npcCommanders.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT id, npcId, x, y, z, heading FROM fort_spawnlist WHERE fortId = ? AND spawnType = ? ORDER BY id")) {
+			ps.setInt(1, getResidenceId());
+			ps.setInt(2, 1);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
+					spawnDat.setAmount(1);
+					spawnDat.setX(rs.getInt("x"));
+					spawnDat.setY(rs.getInt("y"));
+					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setHeading(rs.getInt("heading"));
+					spawnDat.setRespawnDelay(60);
+					_npcCommanders.add(spawnDat);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Fort {} initNpcCommanders: Spawn could not be initialized: {}", getResidenceId(), e.getMessage(), e);
+		}
+	}
+	
+	private void initSpecialEnvoys() {
+		_specialEnvoys.clear();
+		_envoyCastles.clear();
+		_availableCastles.clear();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT id, npcId, x, y, z, heading, castleId FROM fort_spawnlist WHERE fortId = ? AND spawnType = ? ORDER BY id")) {
+			ps.setInt(1, getResidenceId());
+			ps.setInt(2, 3);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final int castleId = rs.getInt("castleId");
+					final L2Spawn spawnDat = new L2Spawn(rs.getInt("npcId"));
+					spawnDat.setAmount(1);
+					spawnDat.setX(rs.getInt("x"));
+					spawnDat.setY(rs.getInt("y"));
+					spawnDat.setZ(rs.getInt("z"));
+					spawnDat.setHeading(rs.getInt("heading"));
+					spawnDat.setRespawnDelay(60);
+					_specialEnvoys.add(spawnDat);
+					_envoyCastles.put(spawnDat.getId(), castleId);
+					_availableCastles.add(castleId);
+				}
+			}
+		} catch (Exception e) {
+			// problem with initializing spawn, go to next one
+			LOG.warn("Fort {} initSpecialEnvoys: Spawn could not be initialized: {}", getResidenceId(), e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	protected void initResidenceZone() {
+		for (L2FortZone zone : ZoneManager.getInstance().getAllZones(L2FortZone.class)) {
+			if (zone.getResidenceId() == getResidenceId()) {
+				setResidenceZone(zone);
+				break;
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/FortSiege.java b/src/main/java/com/l2jserver/gameserver/model/entity/FortSiege.java
new file mode 100644
index 00000000..2f79ca1e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/FortSiege.java
@@ -0,0 +1,1018 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.fortSiege;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.enums.FortTeleportWhoType;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeGuardManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.CombatFlag;
+import com.l2jserver.gameserver.model.FortSiegeSpawn;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FortCommanderInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.sieges.fort.FortSiegeFinish;
+import com.l2jserver.gameserver.model.events.impl.sieges.fort.FortSiegeStart;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class FortSiege implements Siegable {
+	private static final Logger LOG = LoggerFactory.getLogger(FortSiege.class);
+	
+	// SQL
+	private static final String DELETE_FORT_SIEGECLANS_BY_CLAN_ID = "DELETE FROM fortsiege_clans WHERE fort_id = ? AND clan_id = ?";
+	
+	private static final String DELETE_FORT_SIEGECLANS = "DELETE FROM fortsiege_clans WHERE fort_id = ?";
+	
+	private class ScheduleEndSiegeTask implements Runnable {
+		@Override
+		public void run() {
+			if (!isInProgress()) {
+				return;
+			}
+			
+			try {
+				_siegeEnd = null;
+				endSiege();
+			} catch (Exception e) {
+				LOG.warn("Exception: ScheduleEndSiegeTask() for Fort: {} {}", _fort.getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	public class ScheduleStartSiegeTask implements Runnable {
+		private final Fort _fortInst;
+		private final int _time;
+		
+		public ScheduleStartSiegeTask(int time) {
+			_fortInst = _fort;
+			_time = time;
+		}
+		
+		@Override
+		public void run() {
+			if (isInProgress()) {
+				return;
+			}
+			
+			try {
+				final SystemMessage sm;
+				if (_time == 3600) // 1hr remains
+				{
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(600), 3000000); // Prepare task for 10 minutes left.
+				} else if (_time == 600) // 10min remains
+				{
+					getFort().despawnSuspiciousMerchant();
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(10);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(300), 300000); // Prepare task for 5 minutes left.
+				} else if (_time == 300) // 5min remains
+				{
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(5);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(60), 240000); // Prepare task for 1 minute left.
+				} else if (_time == 60) // 1min remains
+				{
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(1);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(30), 30000); // Prepare task for 30 seconds left.
+				} else if (_time == 30) // 30seconds remains
+				{
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(30);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(10), 20000); // Prepare task for 10 seconds left.
+				} else if (_time == 10) // 10seconds remains
+				{
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(10);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(5), 5000); // Prepare task for 5 seconds left.
+				} else if (_time == 5) // 5seconds remains
+				{
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(5);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(1), 4000); // Prepare task for 1 seconds left.
+				} else if (_time == 1) // 1seconds remains
+				{
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
+					sm.addInt(1);
+					announceToPlayer(sm);
+					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(0), 1000); // Prepare task start siege.
+				} else if (_time == 0)// start siege
+				{
+					_fortInst.getSiege().startSiege();
+				} else {
+					LOG.warn("Exception: ScheduleStartSiegeTask(): unknown siege time: {}", _time);
+				}
+			} catch (Exception e) {
+				LOG.warn("Exception: ScheduleStartSiegeTask() for Fort: {} {}", _fortInst.getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	private class ScheduleSuspiciousMerchantSpawn implements Runnable {
+		@Override
+		public void run() {
+			if (isInProgress()) {
+				return;
+			}
+			
+			try {
+				_fort.spawnSuspiciousMerchant();
+			} catch (Exception e) {
+				LOG.warn("Exception: ScheduleSuspicoiusMerchantSpawn() for Fort: {} {}", _fort.getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	public class ScheduleSiegeRestore implements Runnable {
+		@Override
+		public void run() {
+			if (!isInProgress()) {
+				return;
+			}
+			
+			try {
+				_siegeRestore = null;
+				resetSiege();
+				announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.BARRACKS_FUNCTION_RESTORED));
+			} catch (Exception e) {
+				LOG.warn("Exception: ScheduleSiegeRestore() for Fort: {} {}", _fort.getName(), e.getMessage(), e);
+			}
+		}
+	}
+	
+	private final List<L2SiegeClan> _attackerClans = new CopyOnWriteArrayList<>();
+	
+	// Fort setting
+	private final List<L2Spawn> _commanders = new CopyOnWriteArrayList<>();
+	private final Fort _fort;
+	private boolean _isInProgress = false;
+	private FortSiegeGuardManager _siegeGuardManager;
+	private ScheduledFuture<?> _siegeEnd = null;
+	private ScheduledFuture<?> _siegeRestore = null;
+	private ScheduledFuture<?> _siegeStartTask = null;
+	
+	public FortSiege(Fort fort) {
+		_fort = fort;
+		
+		checkAutoTask();
+		FortSiegeManager.getInstance().addSiege(this);
+	}
+	
+	/**
+	 * When siege ends.
+	 */
+	@Override
+	public void endSiege() {
+		if (isInProgress()) {
+			_isInProgress = false; // Flag so that siege instance can be started
+			removeFlags(); // Removes all flags. Note: Remove flag before teleporting players
+			unSpawnFlags();
+			
+			updatePlayerSiegeStateFlags(true);
+			
+			int ownerId = -1;
+			if (getFort().getOwnerClan() != null) {
+				ownerId = getFort().getOwnerClan().getId();
+			}
+			getFort().getZone().banishForeigners(ownerId);
+			getFort().getZone().setIsActive(false);
+			getFort().getZone().updateZoneStatusForCharactersInside();
+			getFort().getZone().setSiegeInstance(null);
+			
+			saveFortSiege(); // Save fort specific data
+			clearSiegeClan(); // Clear siege clan from db
+			removeCommanders(); // Remove commander from this fort
+			
+			getFort().spawnNpcCommanders(); // Spawn NPC commanders
+			getSiegeGuardManager().unspawnSiegeGuard(); // Remove all spawned siege guard from this fort
+			getFort().resetDoors(); // Respawn door to fort
+			
+			// Prepare 3hr task for suspicious merchant respawn
+			ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSuspiciousMerchantSpawn(), MINUTES.toMillis(fortSiege().getSuspiciousMerchantRespawnDelay()));
+			setSiegeDateTime(true); // store suspicious merchant spawn in DB
+			
+			if (_siegeEnd != null) {
+				_siegeEnd.cancel(true);
+				_siegeEnd = null;
+			}
+			if (_siegeRestore != null) {
+				_siegeRestore.cancel(true);
+				_siegeRestore = null;
+			}
+			
+			if ((getFort().getOwnerClan() != null) && (getFort().getFlagPole().getMeshIndex() == 0)) {
+				getFort().setVisibleFlag(true);
+			}
+			
+			LOG.info("Siege of {} fort finished.", getFort().getName());
+			
+			// Notify to scripts.
+			EventDispatcher.getInstance().notifyEventAsync(new FortSiegeFinish(this), getFort());
+		}
+	}
+	
+	/**
+	 * When siege starts
+	 */
+	@Override
+	public void startSiege() {
+		if (!isInProgress()) {
+			if (_siegeStartTask != null) // used admin command "admin_startfortsiege"
+			{
+				_siegeStartTask.cancel(true);
+				getFort().despawnSuspiciousMerchant();
+			}
+			_siegeStartTask = null;
+			
+			if (getAttackerClans().isEmpty()) {
+				return;
+			}
+			
+			_isInProgress = true; // Flag so that same siege instance cannot be started again
+			
+			loadSiegeClan(); // Load siege clan from db
+			updatePlayerSiegeStateFlags(false);
+			teleportPlayer(FortTeleportWhoType.Attacker, TeleportWhereType.TOWN); // Teleport to the closest town
+			
+			getFort().despawnNpcCommanders(); // Despawn NPC commanders
+			spawnCommanders(); // Spawn commanders
+			getFort().resetDoors(); // Spawn door
+			spawnSiegeGuard(); // Spawn siege guard
+			getFort().setVisibleFlag(false);
+			getFort().getZone().setSiegeInstance(this);
+			getFort().getZone().setIsActive(true);
+			getFort().getZone().updateZoneStatusForCharactersInside();
+			
+			// Schedule a task to prepare auto siege end
+			_siegeEnd = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(), fortSiege().getSiegeLength());
+			
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN);
+			sm.addCastleId(getFort().getResidenceId());
+			announceToPlayer(sm);
+			saveFortSiege();
+			
+			LOG.info("Siege of {} fort started.", getFort().getName());
+			
+			// Notify to scripts.
+			EventDispatcher.getInstance().notifyEventAsync(new FortSiegeStart(this), getFort());
+		}
+	}
+	
+	/**
+	 * Announce to player.
+	 * @param sm the system message to send to player
+	 */
+	public void announceToPlayer(SystemMessage sm) {
+		// announce messages only for participants
+		L2Clan clan;
+		for (L2SiegeClan siegeclan : getAttackerClans()) {
+			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				member.sendPacket(sm);
+			}
+		}
+		if (getFort().getOwnerClan() != null) {
+			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				if (member != null) {
+					member.sendPacket(sm);
+				}
+			}
+		}
+	}
+	
+	public void announceToPlayer(SystemMessage sm, String s) {
+		sm.addString(s);
+		announceToPlayer(sm);
+	}
+	
+	public void updatePlayerSiegeStateFlags(boolean clear) {
+		L2Clan clan;
+		for (L2SiegeClan siegeclan : getAttackerClans()) {
+			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				if (clear) {
+					member.setSiegeState((byte) 0);
+					member.setSiegeSide(0);
+					member.setIsInSiege(false);
+					member.stopFameTask();
+				} else {
+					member.setSiegeState((byte) 1);
+					member.setSiegeSide(getFort().getResidenceId());
+					if (checkIfInZone(member)) {
+						member.setIsInSiege(true);
+						member.startFameTask(character().getFortressZoneFameTaskFrequency(), character().getFortressZoneFameAcquirePoints());
+					}
+				}
+				member.broadcastUserInfo();
+			}
+		}
+		if (getFort().getOwnerClan() != null) {
+			clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				if (member == null) {
+					continue;
+				}
+				
+				if (clear) {
+					member.setSiegeState((byte) 0);
+					member.setSiegeSide(0);
+					member.setIsInSiege(false);
+					member.stopFameTask();
+				} else {
+					member.setSiegeState((byte) 2);
+					member.setSiegeSide(getFort().getResidenceId());
+					if (checkIfInZone(member)) {
+						member.setIsInSiege(true);
+						member.startFameTask(character().getFortressZoneFameTaskFrequency(), character().getFortressZoneFameAcquirePoints());
+					}
+				}
+				member.broadcastUserInfo();
+			}
+		}
+	}
+	
+	/**
+	 * @return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(L2Object object) {
+		return checkIfInZone(object.getX(), object.getY(), object.getZ());
+	}
+	
+	/**
+	 * @return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(int x, int y, int z) {
+		return (isInProgress() && (getFort().checkIfInZone(x, y, z))); // Fort zone during siege
+	}
+	
+	/**
+	 * @param clan The L2Clan of the player
+	 * @return true if clan is attacker
+	 */
+	@Override
+	public boolean checkIsAttacker(L2Clan clan) {
+		return (getAttackerClan(clan) != null);
+	}
+	
+	/**
+	 * @param clan The L2Clan of the player
+	 * @return true if clan is defender
+	 */
+	@Override
+	public boolean checkIsDefender(L2Clan clan) {
+		return (clan != null) && (getFort().getOwnerClan() == clan);
+	}
+	
+	/** Clear all registered siege clans from database for fort */
+	public void clearSiegeClan() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM fortsiege_clans WHERE fort_id=?")) {
+			ps.setInt(1, getFort().getResidenceId());
+			ps.execute();
+			
+			if (getFort().getOwnerClan() != null) {
+				try (PreparedStatement delete = con.prepareStatement("DELETE FROM fortsiege_clans WHERE clan_id=?")) {
+					delete.setInt(1, getFort().getOwnerClan().getId());
+					delete.execute();
+				}
+			}
+			
+			getAttackerClans().clear();
+			
+			// if siege is in progress, end siege
+			if (isInProgress()) {
+				endSiege();
+			}
+			
+			// if siege isn't in progress (1hr waiting time till siege starts), cancel waiting time
+			if (_siegeStartTask != null) {
+				_siegeStartTask.cancel(true);
+				_siegeStartTask = null;
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: clearSiegeClan(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/** Set the date for the next siege. */
+	private void clearSiegeDate() {
+		getFort().getSiegeDate().setTimeInMillis(0);
+	}
+	
+	/**
+	 * @return list of L2PcInstance registered as attacker in the zone.
+	 */
+	@Override
+	public List<L2PcInstance> getAttackersInZone() {
+		final List<L2PcInstance> players = new LinkedList<>();
+		for (L2SiegeClan siegeclan : getAttackerClans()) {
+			L2Clan clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			for (L2PcInstance player : clan.getOnlineMembers(0)) {
+				if (player.isInSiege()) {
+					players.add(player);
+				}
+			}
+		}
+		return players;
+	}
+	
+	/**
+	 * @return list of L2PcInstance in the zone.
+	 */
+	public List<L2PcInstance> getPlayersInZone() {
+		return getFort().getZone().getPlayersInside();
+	}
+	
+	/**
+	 * @return list of L2PcInstance owning the fort in the zone.
+	 */
+	public List<L2PcInstance> getOwnersInZone() {
+		final List<L2PcInstance> players = new LinkedList<>();
+		if (getFort().getOwnerClan() != null) {
+			L2Clan clan = ClanTable.getInstance().getClan(getFort().getOwnerClan().getId());
+			if (clan != getFort().getOwnerClan()) {
+				return null;
+			}
+			
+			for (L2PcInstance player : clan.getOnlineMembers(0)) {
+				if (player.isInSiege()) {
+					players.add(player);
+				}
+			}
+		}
+		return players;
+	}
+	
+	/**
+	 * TODO: To DP AI<br>
+	 * Commander was killed
+	 */
+	public void killedCommander(L2FortCommanderInstance instance) {
+		if (!_commanders.isEmpty() && (getFort() != null)) {
+			L2Spawn spawn = instance.getSpawn();
+			if (spawn != null) {
+				List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId());
+				for (FortSiegeSpawn spawn2 : commanders) {
+					if (spawn2.getId() == spawn.getId()) {
+						NpcStringId npcString = switch (spawn2.getMessageId()) {
+							case 1 -> NpcStringId.YOU_MAY_HAVE_BROKEN_OUR_ARROWS_BUT_YOU_WILL_NEVER_BREAK_OUR_WILL_ARCHERS_RETREAT;
+							case 2 -> NpcStringId.AIIEEEE_COMMAND_CENTER_THIS_IS_GUARD_UNIT_WE_NEED_BACKUP_RIGHT_AWAY;
+							case 3 -> NpcStringId.AT_LAST_THE_MAGIC_FIELD_THAT_PROTECTS_THE_FORTRESS_HAS_WEAKENED_VOLUNTEERS_STAND_BACK;
+							case 4 -> NpcStringId.I_FEEL_SO_MUCH_GRIEF_THAT_I_CANT_EVEN_TAKE_CARE_OF_MYSELF_THERE_ISNT_ANY_REASON_FOR_ME_TO_STAY_HERE_ANY_LONGER;
+							default -> null;
+						};
+						if (npcString != null) {
+							instance.broadcastPacket(new NpcSay(instance.getObjectId(), Say2.NPC_SHOUT, instance.getId(), npcString));
+						}
+					}
+				}
+				_commanders.remove(spawn);
+				if (_commanders.isEmpty()) {
+					// spawn fort flags
+					spawnFlag(getFort().getResidenceId());
+					// cancel door/commanders respawn
+					if (_siegeRestore != null) {
+						_siegeRestore.cancel(true);
+					}
+					// open doors in main building
+					for (L2DoorInstance door : getFort().getDoors()) {
+						if (door.getIsShowHp()) {
+							continue;
+						}
+						
+						// TODO this also opens control room door at big fort
+						door.openMe();
+					}
+					getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.ALL_BARRACKS_OCCUPIED));
+				}
+				// schedule restoring doors/commanders respawn
+				else if (_siegeRestore == null) {
+					getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.SEIZED_BARRACKS));
+					_siegeRestore = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSiegeRestore(), MINUTES.toMillis(fortSiege().getCountDownLength()));
+				} else {
+					getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.SEIZED_BARRACKS));
+				}
+			} else {
+				LOG.warn("FortSiege.killedCommander(): killed commander, but commander not registered for fortress. NpcId: {} FortId: {}", instance.getId(), getFort().getResidenceId());
+			}
+		}
+	}
+	
+	/**
+	 * Remove the flag that was killed
+	 */
+	public void killedFlag(L2Npc flag) {
+		if (flag == null) {
+			return;
+		}
+		
+		for (L2SiegeClan clan : getAttackerClans()) {
+			if (clan.removeFlag(flag)) {
+				return;
+			}
+		}
+	}
+	
+	/**
+	 * Register clan as attacker.<BR>
+	 * @param player The L2PcInstance of the player trying to register.
+	 * @param checkConditions True if should be checked conditions, false otherwise
+	 * @return Number that defines what happened. <BR>
+	 *         0 - Player don't have clan.<BR>
+	 *         1 - Player don't have enough adena to register.<BR>
+	 *         2 - Is not right time to register Fortress now.<BR>
+	 *         3 - Players clan is already registered to siege.<BR>
+	 *         4 - Players clan is successfully registered to siege.
+	 */
+	public int addAttacker(L2PcInstance player, boolean checkConditions) {
+		if (player.getClan() == null) {
+			return 0; // Player dont have clan
+		}
+		
+		if (checkConditions) {
+			if (getFort().getSiege().getAttackerClans().isEmpty() && (player.getInventory().getAdena() < 250000)) {
+				return 1; // Player dont havee enough adena to register
+			}
+			
+			else if ((System.currentTimeMillis() < TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().getIsRegistrationOver()) {
+				return 2; // Is not right time to register Fortress now
+			}
+			
+			if ((System.currentTimeMillis() > TerritoryWarManager.getInstance().getTWStartTimeInMillis()) && TerritoryWarManager.getInstance().isTWChannelOpen()) {
+				return 2; // Is not right time to register Fortress now
+			}
+			
+			for (Fort fort : FortManager.getInstance().getForts()) {
+				if (fort.getSiege().getAttackerClan(player.getClanId()) != null) {
+					return 3; // Players clan is already registred to siege
+				}
+				
+				if ((fort.getOwnerClan() == player.getClan()) && (fort.getSiege().isInProgress() || (fort.getSiege()._siegeStartTask != null))) {
+					return 3; // Players clan is already registred to siege
+				}
+			}
+		}
+		
+		saveSiegeClan(player.getClan());
+		if (getAttackerClans().size() == 1) {
+			if (checkConditions) {
+				player.reduceAdena("FortressSiege", 250000, null, true);
+			}
+			startAutoTask(true);
+		}
+		return 4; // Players clan is successfully registred to siege
+	}
+	
+	/**
+	 * Remove clan from siege
+	 * @param clan The clan being removed
+	 */
+	public void removeAttacker(L2Clan clan) {
+		if ((clan == null) || (clan.getFortId() == getFort().getResidenceId()) || !FortSiegeManager.getInstance().checkIsRegistered(clan, getFort().getResidenceId())) {
+			return;
+		}
+		removeSiegeClan(clan.getId());
+	}
+	
+	/**
+	 * This function does not do any checks and should not be called from bypass !
+	 */
+	private void removeSiegeClan(int clanId) {
+		final String query = (clanId != 0) ? DELETE_FORT_SIEGECLANS_BY_CLAN_ID : DELETE_FORT_SIEGECLANS;
+		try (Connection con = ConnectionFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement(query)) {
+			ps.setInt(1, getFort().getResidenceId());
+			if (clanId != 0) {
+				ps.setInt(2, clanId);
+			}
+			ps.execute();
+			
+			loadSiegeClan();
+			if (getAttackerClans().isEmpty()) {
+				if (isInProgress()) {
+					endSiege();
+				} else {
+					saveFortSiege(); // Clear siege time in DB
+				}
+				
+				if (_siegeStartTask != null) {
+					_siegeStartTask.cancel(true);
+					_siegeStartTask = null;
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception on removeSiegeClan: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Start the auto tasks
+	 */
+	private void checkAutoTask() {
+		if (_siegeStartTask != null) {
+			return;
+		}
+		
+		final long delay = getFort().getSiegeDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+		
+		if (delay < 0) {
+			// siege time in past
+			saveFortSiege();
+			clearSiegeClan(); // remove all clans
+			// spawn suspicious merchant immediately
+			ThreadPoolManager.getInstance().executeGeneral(new ScheduleSuspiciousMerchantSpawn());
+		} else {
+			loadSiegeClan();
+			if (getAttackerClans().isEmpty()) {
+				// no attackers - waiting for suspicious merchant spawn
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSuspiciousMerchantSpawn(), delay);
+			} else {
+				// preparing start siege task
+				if (delay > 3600000) // more than hour, how this can happens ? spawn suspicious merchant
+				{
+					ThreadPoolManager.getInstance().executeGeneral(new ScheduleSuspiciousMerchantSpawn());
+					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(3600), delay - 3600000);
+				}
+				if (delay > 600000) // more than 10 min, spawn suspicious merchant
+				{
+					ThreadPoolManager.getInstance().executeGeneral(new ScheduleSuspiciousMerchantSpawn());
+					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(600), delay - 600000);
+				} else if (delay > 300000) {
+					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(300), delay - 300000);
+				} else if (delay > 60000) {
+					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(60), delay - 60000);
+				} else {
+					// lower than 1 min, set to 1 min
+					_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(60), 0);
+				}
+				
+				LOG.info("Siege of {} fort: {}", getFort().getName(), getFort().getSiegeDate().getTime());
+			}
+		}
+	}
+	
+	/**
+	 * Start the auto task
+	 */
+	private void startAutoTask(boolean setTime) {
+		if (_siegeStartTask != null) {
+			return;
+		}
+		
+		if (setTime) {
+			setSiegeDateTime(false);
+		}
+		
+		if (getFort().getOwnerClan() != null) {
+			getFort().getOwnerClan().broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.A_FORTRESS_IS_UNDER_ATTACK));
+		}
+		
+		// Execute siege auto start
+		_siegeStartTask = ThreadPoolManager.getInstance().scheduleGeneral(new FortSiege.ScheduleStartSiegeTask(3600), 0);
+	}
+	
+	/**
+	 * Teleport players
+	 * @param teleportWho
+	 * @param teleportWhere
+	 */
+	public void teleportPlayer(FortTeleportWhoType teleportWho, TeleportWhereType teleportWhere) {
+		List<L2PcInstance> players = switch (teleportWho) {
+			case Owner -> getOwnersInZone();
+			case Attacker -> getAttackersInZone();
+			default -> getPlayersInZone();
+		};
+		
+		for (L2PcInstance player : players) {
+			if (player.canOverrideCond(PcCondOverride.FORTRESS_CONDITIONS) || player.isJailed()) {
+				continue;
+			}
+			
+			player.teleToLocation(teleportWhere);
+		}
+	}
+	
+	/**
+	 * Add clan as attacker
+	 */
+	private void addAttacker(int clanId) {
+		getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list
+	}
+	
+	/**
+	 * @return {@code true} if the clan has already registered to a siege for the same day, {@code false} otherwise.
+	 */
+	public boolean checkIfAlreadyRegisteredForSameDay(L2Clan clan) {
+		for (FortSiege siege : FortSiegeManager.getInstance().getSieges()) {
+			if (siege == this) {
+				continue;
+			}
+			
+			if (siege.getSiegeDate().get(Calendar.DAY_OF_WEEK) == getSiegeDate().get(Calendar.DAY_OF_WEEK)) {
+				if (siege.checkIsAttacker(clan)) {
+					return true;
+				}
+				if (siege.checkIsDefender(clan)) {
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	private void setSiegeDateTime(boolean merchant) {
+		Calendar newDate = Calendar.getInstance();
+		if (merchant) {
+			newDate.add(Calendar.MINUTE, fortSiege().getSuspiciousMerchantRespawnDelay());
+		} else {
+			newDate.add(Calendar.MINUTE, 60);
+		}
+		getFort().setSiegeDate(newDate);
+		saveSiegeDate();
+	}
+	
+	/** Load siege clans. */
+	private void loadSiegeClan() {
+		getAttackerClans().clear();
+		try (Connection con = ConnectionFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("SELECT clan_id FROM fortsiege_clans WHERE fort_id=?")) {
+			ps.setInt(1, getFort().getResidenceId());
+			try (ResultSet rs = ps.executeQuery()) {
+				while (rs.next()) {
+					addAttacker(rs.getInt("clan_id"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception: loadSiegeClan(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/** Remove commanders. */
+	private void removeCommanders() {
+		if (!_commanders.isEmpty()) {
+			// Remove all instance of commanders for this fort
+			for (L2Spawn spawn : _commanders) {
+				if (spawn != null) {
+					spawn.stopRespawn();
+					if (spawn.getLastSpawn() != null) {
+						spawn.getLastSpawn().deleteMe();
+					}
+				}
+			}
+			_commanders.clear();
+		}
+	}
+	
+	/** Remove all flags. */
+	private void removeFlags() {
+		for (L2SiegeClan sc : getAttackerClans()) {
+			if (sc != null) {
+				sc.removeFlags();
+			}
+		}
+	}
+	
+	/** Save fort siege related to database. */
+	private void saveFortSiege() {
+		clearSiegeDate(); // clear siege date
+		saveSiegeDate(); // Save the new date
+	}
+	
+	/** Save siege date to database. */
+	private void saveSiegeDate() {
+		try (Connection con = ConnectionFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("UPDATE fort SET siegeDate = ? WHERE id = ?")) {
+			ps.setLong(1, getSiegeDate().getTimeInMillis());
+			ps.setInt(2, getFort().getResidenceId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: saveSiegeDate(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Save registration to database.
+	 */
+	private void saveSiegeClan(L2Clan clan) {
+		if (getAttackerClans().size() >= fortSiege().getAttackerMaxClans()) {
+			return;
+		}
+		
+		try (Connection con = ConnectionFactory.getInstance().getConnection();
+			PreparedStatement ps = con.prepareStatement("INSERT INTO fortsiege_clans (clan_id,fort_id) values (?,?)")) {
+			ps.setInt(1, clan.getId());
+			ps.setInt(2, getFort().getResidenceId());
+			ps.execute();
+			
+			addAttacker(clan.getId());
+		} catch (Exception e) {
+			LOG.warn("Exception: saveSiegeClan(L2Clan clan): {}", e.getMessage(), e);
+		}
+	}
+	
+	/** Spawn commanders. */
+	private void spawnCommanders() {
+		// Set commanders array size if one does not exist
+		try {
+			_commanders.clear();
+			for (FortSiegeSpawn _sp : FortSiegeManager.getInstance().getCommanderSpawnList(getFort().getResidenceId())) {
+				final L2Spawn spawnDat = new L2Spawn(_sp.getId());
+				spawnDat.setAmount(1);
+				spawnDat.setX(_sp.getLocation().getX());
+				spawnDat.setY(_sp.getLocation().getY());
+				spawnDat.setZ(_sp.getLocation().getZ());
+				spawnDat.setHeading(_sp.getLocation().getHeading());
+				spawnDat.setRespawnDelay(60);
+				spawnDat.doSpawn();
+				spawnDat.stopRespawn();
+				_commanders.add(spawnDat);
+			}
+		} catch (Exception e) {
+			// problem with initializing spawn, go to next one
+			LOG.warn("FortSiege.spawnCommander: Spawn could not be initialized: {}", e.getMessage(), e);
+		}
+	}
+	
+	private void spawnFlag(int Id) {
+		for (CombatFlag cf : FortSiegeManager.getInstance().getFlagList(Id)) {
+			cf.spawnMe();
+		}
+	}
+	
+	private void unSpawnFlags() {
+		if (FortSiegeManager.getInstance().getFlagList(getFort().getResidenceId()) == null) {
+			return;
+		}
+		
+		for (CombatFlag cf : FortSiegeManager.getInstance().getFlagList(getFort().getResidenceId())) {
+			cf.unSpawnMe();
+		}
+	}
+	
+	/**
+	 * Spawn siege guard.
+	 */
+	private void spawnSiegeGuard() {
+		getSiegeGuardManager().spawnSiegeGuard();
+	}
+	
+	@Override
+	public final L2SiegeClan getAttackerClan(L2Clan clan) {
+		if (clan == null) {
+			return null;
+		}
+		
+		return getAttackerClan(clan.getId());
+	}
+	
+	@Override
+	public final L2SiegeClan getAttackerClan(int clanId) {
+		for (L2SiegeClan sc : getAttackerClans()) {
+			if ((sc != null) && (sc.getClanId() == clanId)) {
+				return sc;
+			}
+		}
+		
+		return null;
+	}
+	
+	@Override
+	public final List<L2SiegeClan> getAttackerClans() {
+		return _attackerClans;
+	}
+	
+	public final Fort getFort() {
+		return _fort;
+	}
+	
+	public final boolean isInProgress() {
+		return _isInProgress;
+	}
+	
+	@Override
+	public final Calendar getSiegeDate() {
+		return getFort().getSiegeDate();
+	}
+	
+	@Override
+	public List<L2Npc> getFlag(L2Clan clan) {
+		if (clan != null) {
+			L2SiegeClan sc = getAttackerClan(clan);
+			if (sc != null) {
+				return sc.getFlag();
+			}
+		}
+		
+		return null;
+	}
+	
+	public final FortSiegeGuardManager getSiegeGuardManager() {
+		if (_siegeGuardManager == null) {
+			_siegeGuardManager = new FortSiegeGuardManager(getFort());
+		}
+		
+		return _siegeGuardManager;
+	}
+	
+	public void resetSiege() {
+		// reload commanders and repair doors
+		removeCommanders();
+		spawnCommanders();
+		getFort().resetDoors();
+	}
+	
+	public List<L2Spawn> getCommanders() {
+		return _commanders;
+	}
+	
+	@Override
+	public L2SiegeClan getDefenderClan(int clanId) {
+		return null;
+	}
+	
+	@Override
+	public L2SiegeClan getDefenderClan(L2Clan clan) {
+		return null;
+	}
+	
+	@Override
+	public List<L2SiegeClan> getDefenderClans() {
+		return null;
+	}
+	
+	@Override
+	public boolean giveFame() {
+		return true;
+	}
+	
+	@Override
+	public int getFameFrequency() {
+		return (int) character().getFortressZoneFameTaskFrequency();
+	}
+	
+	@Override
+	public int getFameAmount() {
+		return character().getFortressZoneFameAcquirePoints();
+	}
+	
+	@Override
+	public void updateSiege() {
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Hero.java b/src/main/java/com/l2jserver/gameserver/model/entity/Hero.java
new file mode 100644
index 00000000..c50e0d5d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Hero.java
@@ -0,0 +1,814 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.clan;
+
+import java.sql.PreparedStatement;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.ClassListData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Hero entity.
+ * @author godson
+ */
+public class Hero {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Hero.class);
+	
+	private static final String GET_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId AND heroes.played = 1";
+	private static final String GET_ALL_HEROES = "SELECT heroes.charId, characters.char_name, heroes.class_id, heroes.count, heroes.played, heroes.claimed FROM heroes, characters WHERE characters.charId = heroes.charId";
+	private static final String UPDATE_ALL = "UPDATE heroes SET played = 0";
+	private static final String INSERT_HERO = "INSERT INTO heroes (charId, class_id, count, played, claimed) VALUES (?,?,?,?,?)";
+	private static final String UPDATE_HERO = "UPDATE heroes SET count = ?, played = ?, claimed = ? WHERE charId = ?";
+	private static final String GET_CLAN_ALLY = "SELECT characters.clanid AS clanid, coalesce(clan_data.ally_Id, 0) AS allyId FROM characters LEFT JOIN clan_data ON clan_data.clan_id = characters.clanid WHERE characters.charId = ?";
+	// delete hero items
+	private static final String DELETE_ITEMS = "DELETE FROM items WHERE item_id IN (6842, 6611, 6612, 6613, 6614, 6615, 6616, 6617, 6618, 6619, 6620, 6621, 9388, 9389, 9390) AND owner_id NOT IN (SELECT charId FROM characters WHERE accesslevel > 0)";
+	
+	private static final Map<Integer, StatsSet> HEROES = new ConcurrentHashMap<>();
+	private static final Map<Integer, StatsSet> COMPLETE_HEROES = new ConcurrentHashMap<>();
+	
+	private static final Map<Integer, StatsSet> HERO_COUNTS = new ConcurrentHashMap<>();
+	private static final Map<Integer, List<StatsSet>> HERO_FIGHTS = new ConcurrentHashMap<>();
+	
+	private static final Map<Integer, List<StatsSet>> HERO_DIARY = new ConcurrentHashMap<>();
+	private static final Map<Integer, String> HERO_MESSAGE = new ConcurrentHashMap<>();
+	
+	public static final String COUNT = "count";
+	public static final String PLAYED = "played";
+	public static final String CLAIMED = "claimed";
+	public static final String CLAN_NAME = "clan_name";
+	public static final String CLAN_CREST = "clan_crest";
+	public static final String ALLY_NAME = "ally_name";
+	public static final String ALLY_CREST = "ally_crest";
+	
+	public static final int ACTION_RAID_KILLED = 1;
+	public static final int ACTION_HERO_GAINED = 2;
+	public static final int ACTION_CASTLE_TAKEN = 3;
+	
+	protected Hero() {
+		init();
+	}
+	
+	private void init() {
+		HEROES.clear();
+		COMPLETE_HEROES.clear();
+		HERO_COUNTS.clear();
+		HERO_FIGHTS.clear();
+		HERO_DIARY.clear();
+		HERO_MESSAGE.clear();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s1 = con.createStatement();
+			var rs1 = s1.executeQuery(GET_HEROES);
+			var ps = con.prepareStatement(GET_CLAN_ALLY);
+			var s2 = con.createStatement();
+			var rs2 = s2.executeQuery(GET_ALL_HEROES)) {
+			while (rs1.next()) {
+				StatsSet hero = new StatsSet();
+				int charId = rs1.getInt(Olympiad.CHAR_ID);
+				hero.set(Olympiad.CHAR_NAME, rs1.getString(Olympiad.CHAR_NAME));
+				hero.set(Olympiad.CLASS_ID, rs1.getInt(Olympiad.CLASS_ID));
+				hero.set(COUNT, rs1.getInt(COUNT));
+				hero.set(PLAYED, rs1.getInt(PLAYED));
+				hero.set(CLAIMED, rs1.getBoolean(CLAIMED));
+				
+				loadFights(charId);
+				loadDiary(charId);
+				loadMessage(charId);
+				
+				processHeroes(ps, charId, hero);
+				
+				HEROES.put(charId, hero);
+			}
+			
+			while (rs2.next()) {
+				StatsSet hero = new StatsSet();
+				int charId = rs2.getInt(Olympiad.CHAR_ID);
+				hero.set(Olympiad.CHAR_NAME, rs2.getString(Olympiad.CHAR_NAME));
+				hero.set(Olympiad.CLASS_ID, rs2.getInt(Olympiad.CLASS_ID));
+				hero.set(COUNT, rs2.getInt(COUNT));
+				hero.set(PLAYED, rs2.getInt(PLAYED));
+				hero.set(CLAIMED, rs2.getBoolean(CLAIMED));
+				
+				processHeroes(ps, charId, hero);
+				
+				COMPLETE_HEROES.put(charId, hero);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Couldn't load Heroes!", ex);
+		}
+		
+		LOG.info("Loaded {} Heroes.", HEROES.size());
+		LOG.info("Loaded {} all time Heroes.", COMPLETE_HEROES.size());
+	}
+	
+	private void processHeroes(PreparedStatement ps, int charId, StatsSet hero) throws Exception {
+		ps.setInt(1, charId);
+		try (var rs = ps.executeQuery()) {
+			if (rs.next()) {
+				int clanId = rs.getInt("clanid");
+				int allyId = rs.getInt("allyId");
+				String clanName = "";
+				String allyName = "";
+				int clanCrest = 0;
+				int allyCrest = 0;
+				if (clanId > 0) {
+					clanName = ClanTable.getInstance().getClan(clanId).getName();
+					clanCrest = ClanTable.getInstance().getClan(clanId).getCrestId();
+					if (allyId > 0) {
+						allyName = ClanTable.getInstance().getClan(clanId).getAllyName();
+						allyCrest = ClanTable.getInstance().getClan(clanId).getAllyCrestId();
+					}
+				}
+				hero.set(CLAN_CREST, clanCrest);
+				hero.set(CLAN_NAME, clanName);
+				hero.set(ALLY_CREST, allyCrest);
+				hero.set(ALLY_NAME, allyName);
+			}
+			ps.clearParameters();
+		}
+	}
+	
+	private String calcFightTime(long FightTime) {
+		String format = String.format("%%0%dd", 2);
+		FightTime = FightTime / 1000;
+		String seconds = String.format(format, FightTime % 60);
+		String minutes = String.format(format, (FightTime % 3600) / 60);
+		return minutes + ":" + seconds;
+	}
+	
+	/**
+	 * Restore hero message from Db.
+	 * @param charId
+	 */
+	public void loadMessage(int charId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT message FROM heroes WHERE charId=?")) {
+			ps.setInt(1, charId);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					HERO_MESSAGE.put(charId, rs.getString("message"));
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not load Hero message for player Id {}!", charId, ex);
+		}
+	}
+	
+	public void loadDiary(int charId) {
+		final List<StatsSet> diary = new ArrayList<>();
+		int diaryEntries = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM  heroes_diary WHERE charId=? ORDER BY time")) {
+			ps.setInt(1, charId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					StatsSet _diaryentry = new StatsSet();
+					
+					long time = rs.getLong("time");
+					int action = rs.getInt("action");
+					int param = rs.getInt("param");
+					
+					String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(time));
+					_diaryentry.set("date", date);
+					
+					if (action == ACTION_RAID_KILLED) {
+						L2NpcTemplate template = NpcData.getInstance().getTemplate(param);
+						if (template != null) {
+							_diaryentry.set("action", template.getName() + " was defeated");
+						}
+					} else if (action == ACTION_HERO_GAINED) {
+						_diaryentry.set("action", "Gained Hero status");
+					} else if (action == ACTION_CASTLE_TAKEN) {
+						Castle castle = CastleManager.getInstance().getCastleById(param);
+						if (castle != null) {
+							_diaryentry.set("action", castle.getName() + " Castle was successfully taken");
+						}
+					}
+					diary.add(_diaryentry);
+					diaryEntries++;
+				}
+			}
+			HERO_DIARY.put(charId, diary);
+			
+			LOG.info("Loaded {} diary entries for Hero {}.", diaryEntries, CharNameTable.getInstance().getNameById(charId));
+		} catch (Exception ex) {
+			LOG.warn("Could not load Hero Diary for player Id {}!", charId, ex);
+		}
+	}
+	
+	public void loadFights(int charId) {
+		final List<StatsSet> fights = new ArrayList<>();
+		StatsSet heroCountData = new StatsSet();
+		Calendar data = Calendar.getInstance();
+		data.set(Calendar.DAY_OF_MONTH, 1);
+		data.set(Calendar.HOUR_OF_DAY, 0);
+		data.set(Calendar.MINUTE, 0);
+		data.set(Calendar.MILLISECOND, 0);
+		
+		long from = data.getTimeInMillis();
+		int numberOfFights = 0;
+		int _victorys = 0;
+		int _losses = 0;
+		int _draws = 0;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT * FROM olympiad_fights WHERE (charOneId=? OR charTwoId=?) AND start<? ORDER BY start")) {
+			ps.setInt(1, charId);
+			ps.setInt(2, charId);
+			ps.setLong(3, from);
+			try (var rs = ps.executeQuery()) {
+				int charOneId;
+				int charOneClass;
+				int charTwoId;
+				int charTwoClass;
+				int winner;
+				long start;
+				long time;
+				int classed;
+				while (rs.next()) {
+					charOneId = rs.getInt("charOneId");
+					charOneClass = rs.getInt("charOneClass");
+					charTwoId = rs.getInt("charTwoId");
+					charTwoClass = rs.getInt("charTwoClass");
+					winner = rs.getInt("winner");
+					start = rs.getLong("start");
+					time = rs.getLong("time");
+					classed = rs.getInt("classed");
+					
+					if (charId == charOneId) {
+						String name = CharNameTable.getInstance().getNameById(charTwoId);
+						String cls = ClassListData.getInstance().getClass(charTwoClass).getClientCode();
+						if (name != null) {
+							StatsSet fight = new StatsSet();
+							fight.set("oponent", name);
+							fight.set("oponentclass", cls);
+							
+							fight.set("time", calcFightTime(time));
+							String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start));
+							fight.set("start", date);
+							
+							fight.set("classed", classed);
+							if (winner == 1) {
+								fight.set("result", "<font color=\"00ff00\">victory</font>");
+								_victorys++;
+							} else if (winner == 2) {
+								fight.set("result", "<font color=\"ff0000\">loss</font>");
+								_losses++;
+							} else if (winner == 0) {
+								fight.set("result", "<font color=\"ffff00\">draw</font>");
+								_draws++;
+							}
+							
+							fights.add(fight);
+							
+							numberOfFights++;
+						}
+					} else if (charId == charTwoId) {
+						String name = CharNameTable.getInstance().getNameById(charOneId);
+						String cls = ClassListData.getInstance().getClass(charOneClass).getClientCode();
+						if (name != null) {
+							StatsSet fight = new StatsSet();
+							fight.set("oponent", name);
+							fight.set("oponentclass", cls);
+							
+							fight.set("time", calcFightTime(time));
+							String date = (new SimpleDateFormat("yyyy-MM-dd HH:mm")).format(new Date(start));
+							fight.set("start", date);
+							
+							fight.set("classed", classed);
+							if (winner == 1) {
+								fight.set("result", "<font color=\"ff0000\">loss</font>");
+								_losses++;
+							} else if (winner == 2) {
+								fight.set("result", "<font color=\"00ff00\">victory</font>");
+								_victorys++;
+							} else if (winner == 0) {
+								fight.set("result", "<font color=\"ffff00\">draw</font>");
+								_draws++;
+							}
+							
+							fights.add(fight);
+							
+							numberOfFights++;
+						}
+					}
+				}
+			}
+			
+			heroCountData.set("victory", _victorys);
+			heroCountData.set("draw", _draws);
+			heroCountData.set("loss", _losses);
+			
+			HERO_COUNTS.put(charId, heroCountData);
+			HERO_FIGHTS.put(charId, fights);
+			
+			LOG.info("Loaded {} fights for Hero {}.", numberOfFights, CharNameTable.getInstance().getNameById(charId));
+		} catch (Exception ex) {
+			LOG.warn("Could not load Hero fights history for player Id {}!", charId, ex);
+		}
+	}
+	
+	public Map<Integer, StatsSet> getHeroes() {
+		return HEROES;
+	}
+	
+	public int getHeroByClass(int classId) {
+		for (Entry<Integer, StatsSet> e : HEROES.entrySet()) {
+			if (e.getValue().getInt(Olympiad.CLASS_ID) == classId) {
+				return e.getKey();
+			}
+		}
+		return 0;
+	}
+	
+	public void resetData() {
+		HERO_DIARY.clear();
+		HERO_FIGHTS.clear();
+		HERO_COUNTS.clear();
+		HERO_MESSAGE.clear();
+	}
+	
+	public void showHeroDiary(L2PcInstance activeChar, int heroclass, int charid, int page) {
+		final int perpage = 10;
+		
+		final List<StatsSet> mainList = HERO_DIARY.get(charid);
+		if (mainList != null) {
+			final NpcHtmlMessage diaryReply = new NpcHtmlMessage();
+			final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/olympiad/herodiary.htm");
+			final String heroMessage = HERO_MESSAGE.get(charid);
+			if ((htmContent != null) && (heroMessage != null)) {
+				diaryReply.setHtml(htmContent);
+				diaryReply.replace("%heroname%", CharNameTable.getInstance().getNameById(charid));
+				diaryReply.replace("%message%", heroMessage);
+				diaryReply.disableValidation();
+				
+				if (!mainList.isEmpty()) {
+					final List<StatsSet> list = new ArrayList<>(mainList);
+					Collections.reverse(list);
+					
+					boolean color = true;
+					final StringBuilder fList = new StringBuilder(500);
+					int counter = 0;
+					int breakat = 0;
+					for (int i = ((page - 1) * perpage); i < list.size(); i++) {
+						breakat = i;
+						StatsSet diaryEntry = list.get(i);
+						StringUtil.append(fList, "<tr><td>");
+						if (color) {
+							StringUtil.append(fList, "<table width=270 bgcolor=\"131210\">");
+						} else {
+							StringUtil.append(fList, "<table width=270>");
+						}
+						StringUtil.append(fList, "<tr><td width=270><font color=\"LEVEL\">" + diaryEntry.getString("date") + ":xx</font></td></tr>");
+						StringUtil.append(fList, "<tr><td width=270>" + diaryEntry.getString("action") + "</td></tr>");
+						StringUtil.append(fList, "<tr><td>&nbsp;</td></tr></table>");
+						StringUtil.append(fList, "</td></tr>");
+						color = !color;
+						counter++;
+						if (counter >= perpage) {
+							break;
+						}
+					}
+					
+					if (breakat < (list.size() - 1)) {
+						diaryReply.replace("%buttprev%", "<button value=\"Prev\" action=\"bypass _diary?class=" + heroclass + "&page=" + (page + 1) + "\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
+					} else {
+						diaryReply.replace("%buttprev%", "");
+					}
+					
+					if (page > 1) {
+						diaryReply.replace("%buttnext%", "<button value=\"Next\" action=\"bypass _diary?class=" + heroclass + "&page=" + (page - 1) + "\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
+					} else {
+						diaryReply.replace("%buttnext%", "");
+					}
+					
+					diaryReply.replace("%list%", fList.toString());
+				} else {
+					diaryReply.replace("%list%", "");
+					diaryReply.replace("%buttprev%", "");
+					diaryReply.replace("%buttnext%", "");
+				}
+				
+				activeChar.sendPacket(diaryReply);
+			}
+		}
+	}
+	
+	public void showHeroFights(L2PcInstance activeChar, int heroclass, int charid, int page) {
+		final int perpage = 20;
+		int _win = 0;
+		int _loss = 0;
+		int _draw = 0;
+		
+		final List<StatsSet> heroFights = HERO_FIGHTS.get(charid);
+		if (heroFights != null) {
+			final NpcHtmlMessage FightReply = new NpcHtmlMessage();
+			final String htmContent = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/olympiad/herohistory.htm");
+			if (htmContent != null) {
+				FightReply.setHtml(htmContent);
+				FightReply.replace("%heroname%", CharNameTable.getInstance().getNameById(charid));
+				
+				if (!heroFights.isEmpty()) {
+					final StatsSet heroCount = HERO_COUNTS.get(charid);
+					if (heroCount != null) {
+						_win = heroCount.getInt("victory");
+						_loss = heroCount.getInt("loss");
+						_draw = heroCount.getInt("draw");
+					}
+					
+					boolean color = true;
+					final StringBuilder fList = new StringBuilder(500);
+					int counter = 0;
+					int breakat = 0;
+					for (int i = ((page - 1) * perpage); i < heroFights.size(); i++) {
+						breakat = i;
+						StatsSet fight = heroFights.get(i);
+						StringUtil.append(fList, "<tr><td>");
+						if (color) {
+							StringUtil.append(fList, "<table width=270 bgcolor=\"131210\">");
+						} else {
+							StringUtil.append(fList, "<table width=270>");
+						}
+						StringUtil.append(fList, "<tr><td width=220><font color=\"LEVEL\">" + fight.getString("start") + "</font>&nbsp;&nbsp;" + fight.getString("result") + //
+							"</td><td width=50 align=right>" + (fight.getInt("classed") > 0 ? "<font color=\"FFFF99\">cls</font>" : "<font color=\"999999\">non-cls<font>") + "</td></tr>");
+						StringUtil.append(fList, "<tr><td width=220>vs " + fight.getString("oponent") + " (" + fight.getString("oponentclass") + ")</td><td width=50 align=right>(" + fight.getString("time") + ")</td></tr>");
+						StringUtil.append(fList, "<tr><td colspan=2>&nbsp;</td></tr></table>");
+						StringUtil.append(fList, "</td></tr>");
+						color = !color;
+						counter++;
+						if (counter >= perpage) {
+							break;
+						}
+					}
+					
+					if (breakat < (heroFights.size() - 1)) {
+						FightReply.replace("%buttprev%", "<button value=\"Prev\" action=\"bypass _match?class=" + heroclass + "&page=" + (page + 1) + "\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
+					} else {
+						FightReply.replace("%buttprev%", "");
+					}
+					
+					if (page > 1) {
+						FightReply.replace("%buttnext%", "<button value=\"Next\" action=\"bypass _match?class=" + heroclass + "&page=" + (page - 1) + "\" width=60 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\">");
+					} else {
+						FightReply.replace("%buttnext%", "");
+					}
+					
+					FightReply.replace("%list%", fList.toString());
+				} else {
+					FightReply.replace("%list%", "");
+					FightReply.replace("%buttprev%", "");
+					FightReply.replace("%buttnext%", "");
+				}
+				
+				FightReply.replace("%win%", String.valueOf(_win));
+				FightReply.replace("%draw%", String.valueOf(_draw));
+				FightReply.replace("%loos%", String.valueOf(_loss));
+				
+				activeChar.sendPacket(FightReply);
+			}
+		}
+	}
+	
+	public synchronized void computeNewHeroes(List<StatsSet> newHeroes) {
+		updateHeroes(true);
+		
+		for (Integer objectId : HEROES.keySet()) {
+			final L2PcInstance player = L2World.getInstance().getPlayer(objectId);
+			if (player == null) {
+				continue;
+			}
+			
+			player.setHero(false);
+			
+			for (int i = 0; i < Inventory.PAPERDOLL_TOTALSLOTS; i++) {
+				L2ItemInstance equippedItem = player.getInventory().getPaperdollItem(i);
+				if ((equippedItem != null) && equippedItem.isHeroItem()) {
+					player.getInventory().unEquipItemInSlot(i);
+				}
+			}
+			
+			final InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance item : player.getInventory().getItems()) {
+				if ((item != null) && item.isHeroItem()) {
+					player.destroyItem("Hero", item, null, true);
+					iu.addRemovedItem(item);
+				}
+			}
+			
+			if (!iu.getItems().isEmpty()) {
+				player.sendPacket(iu);
+			}
+			
+			player.broadcastUserInfo();
+		}
+		
+		deleteItemsInDb();
+		
+		HEROES.clear();
+		
+		if (newHeroes.isEmpty()) {
+			return;
+		}
+		
+		for (StatsSet hero : newHeroes) {
+			int charId = hero.getInt(Olympiad.CHAR_ID);
+			
+			if (COMPLETE_HEROES.containsKey(charId)) {
+				StatsSet oldHero = COMPLETE_HEROES.get(charId);
+				int count = oldHero.getInt(COUNT);
+				oldHero.set(COUNT, count + 1);
+				oldHero.set(PLAYED, 1);
+				oldHero.set(CLAIMED, false);
+				HEROES.put(charId, oldHero);
+			} else {
+				StatsSet newHero = new StatsSet();
+				newHero.set(Olympiad.CHAR_NAME, hero.getString(Olympiad.CHAR_NAME));
+				newHero.set(Olympiad.CLASS_ID, hero.getInt(Olympiad.CLASS_ID));
+				newHero.set(COUNT, 1);
+				newHero.set(PLAYED, 1);
+				newHero.set(CLAIMED, false);
+				HEROES.put(charId, newHero);
+			}
+		}
+		
+		updateHeroes(false);
+	}
+	
+	public void updateHeroes(boolean setDefault) {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			if (setDefault) {
+				try (var s = con.createStatement()) {
+					s.executeUpdate(UPDATE_ALL);
+				}
+			} else {
+				StatsSet hero;
+				int heroId;
+				for (Entry<Integer, StatsSet> entry : HEROES.entrySet()) {
+					hero = entry.getValue();
+					heroId = entry.getKey();
+					if (!COMPLETE_HEROES.containsKey(heroId)) {
+						try (var insert = con.prepareStatement(INSERT_HERO)) {
+							insert.setInt(1, heroId);
+							insert.setInt(2, hero.getInt(Olympiad.CLASS_ID));
+							insert.setInt(3, hero.getInt(COUNT));
+							insert.setInt(4, hero.getInt(PLAYED));
+							insert.setBoolean(5, hero.getBoolean(CLAIMED));
+							insert.execute();
+						}
+						
+						try (var statement = con.prepareStatement(GET_CLAN_ALLY)) {
+							statement.setInt(1, heroId);
+							try (var rs = statement.executeQuery()) {
+								if (rs.next()) {
+									int clanId = rs.getInt("clanid");
+									int allyId = rs.getInt("allyId");
+									
+									String clanName = "";
+									String allyName = "";
+									int clanCrest = 0;
+									int allyCrest = 0;
+									
+									if (clanId > 0) {
+										clanName = ClanTable.getInstance().getClan(clanId).getName();
+										clanCrest = ClanTable.getInstance().getClan(clanId).getCrestId();
+										
+										if (allyId > 0) {
+											allyName = ClanTable.getInstance().getClan(clanId).getAllyName();
+											allyCrest = ClanTable.getInstance().getClan(clanId).getAllyCrestId();
+										}
+									}
+									
+									hero.set(CLAN_CREST, clanCrest);
+									hero.set(CLAN_NAME, clanName);
+									hero.set(ALLY_CREST, allyCrest);
+									hero.set(ALLY_NAME, allyName);
+								}
+							}
+						}
+						HEROES.put(heroId, hero);
+						
+						COMPLETE_HEROES.put(heroId, hero);
+					} else {
+						try (var statement = con.prepareStatement(UPDATE_HERO)) {
+							statement.setInt(1, hero.getInt(COUNT));
+							statement.setInt(2, hero.getInt(PLAYED));
+							statement.setBoolean(3, hero.getBoolean(CLAIMED));
+							statement.setInt(4, heroId);
+							statement.execute();
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not update Heroes!", ex);
+		}
+	}
+	
+	public void setHeroGained(int charId) {
+		setDiaryData(charId, ACTION_HERO_GAINED, 0);
+	}
+	
+	public void setRBkilled(int charId, int npcId) {
+		setDiaryData(charId, ACTION_RAID_KILLED, npcId);
+		
+		final L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
+		final List<StatsSet> list = HERO_DIARY.get(charId);
+		if ((list != null) && (template != null)) {
+			// Prepare new data
+			final StatsSet diaryEntry = new StatsSet();
+			final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis()));
+			diaryEntry.set("date", date);
+			diaryEntry.set("action", template.getName() + " was defeated");
+			// Add to old list
+			list.add(diaryEntry);
+		}
+	}
+	
+	public void setCastleTaken(int charId, int castleId) {
+		setDiaryData(charId, ACTION_CASTLE_TAKEN, castleId);
+		
+		final Castle castle = CastleManager.getInstance().getCastleById(castleId);
+		final List<StatsSet> list = HERO_DIARY.get(charId);
+		if ((list != null) && (castle != null)) {
+			// Prepare new data
+			final StatsSet diaryEntry = new StatsSet();
+			final String date = (new SimpleDateFormat("yyyy-MM-dd HH")).format(new Date(System.currentTimeMillis()));
+			diaryEntry.set("date", date);
+			diaryEntry.set("action", castle.getName() + " Castle was successfully taken");
+			// Add to old list
+			list.add(diaryEntry);
+		}
+	}
+	
+	public void setDiaryData(int charId, int action, int param) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO heroes_diary (charId, time, action, param) values(?,?,?,?)")) {
+			ps.setInt(1, charId);
+			ps.setLong(2, System.currentTimeMillis());
+			ps.setInt(3, action);
+			ps.setInt(4, param);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error saving diary data!", ex);
+		}
+	}
+	
+	/**
+	 * Set new hero message for hero
+	 * @param player the player instance
+	 * @param message String to set
+	 */
+	public void setHeroMessage(L2PcInstance player, String message) {
+		HERO_MESSAGE.put(player.getObjectId(), message);
+	}
+	
+	/**
+	 * Update hero message in database
+	 * @param charId the character Id
+	 */
+	public void saveHeroMessage(int charId) {
+		if (HERO_MESSAGE.containsKey(charId)) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE heroes SET message=? WHERE charId=?;")) {
+			ps.setString(1, HERO_MESSAGE.get(charId));
+			ps.setInt(2, charId);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error updating Hero message!", ex);
+		}
+	}
+	
+	private void deleteItemsInDb() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate(DELETE_ITEMS);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error deleting Hero items!", ex);
+		}
+	}
+	
+	/**
+	 * Saving task for {@link Hero}<BR>
+	 * Save all hero messages to DB.
+	 */
+	public void shutdown() {
+		HERO_MESSAGE.keySet().forEach(this::saveHeroMessage);
+	}
+	
+	/**
+	 * Verifies if the given object ID belongs to a claimed hero.
+	 * @param objectId the player's object ID to verify
+	 * @return {@code true} if there are heroes and the player is in the list, {@code false} otherwise
+	 */
+	public boolean isHero(int objectId) {
+		return HEROES.containsKey(objectId) && HEROES.get(objectId).getBoolean(CLAIMED);
+	}
+	
+	/**
+	 * Verifies if the given object ID belongs to an unclaimed hero.
+	 * @param objectId the player's object ID to verify
+	 * @return {@code true} if player is unclaimed hero
+	 */
+	public boolean isUnclaimedHero(int objectId) {
+		return HEROES.containsKey(objectId) && !HEROES.get(objectId).getBoolean(CLAIMED);
+	}
+	
+	/**
+	 * Claims the hero status for the given player.
+	 * @param player the player to become hero
+	 */
+	public void claimHero(L2PcInstance player) {
+		StatsSet hero = HEROES.get(player.getObjectId());
+		if (hero == null) {
+			hero = new StatsSet();
+			HEROES.put(player.getObjectId(), hero);
+		}
+		
+		hero.set(CLAIMED, true);
+		
+		final L2Clan clan = player.getClan();
+		if ((clan != null) && (clan.getLevel() >= 5)) {
+			clan.addReputationScore(clan().getHeroPoints(), true);
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_BECAME_HERO_AND_GAINED_S2_REPUTATION_POINTS);
+			sm.addString(CharNameTable.getInstance().getNameById(player.getObjectId()));
+			sm.addInt(clan().getHeroPoints());
+			clan.broadcastToOnlineMembers(sm);
+		}
+		
+		player.setHero(true);
+		player.broadcastPacket(new SocialAction(player.getObjectId(), 20016)); // Hero Animation
+		player.sendPacket(new UserInfo(player));
+		player.sendPacket(new ExBrExtraUserInfo(player));
+		player.broadcastUserInfo();
+		// Set Gained hero and reload data
+		setHeroGained(player.getObjectId());
+		loadFights(player.getObjectId());
+		loadDiary(player.getObjectId());
+		HERO_MESSAGE.put(player.getObjectId(), "");
+		
+		updateHeroes(false);
+	}
+	
+	public static Hero getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final Hero INSTANCE = new Hero();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/HuntingSystem.java b/src/main/java/com/l2jserver/gameserver/model/entity/HuntingSystem.java
new file mode 100644
index 00000000..380f41ab
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/HuntingSystem.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.hunting;
+
+import java.util.Calendar;
+import java.util.Objects;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventEffect;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventPointInfoPacket;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventTimeChange;
+
+/**
+ * @author Maneco2
+ * @since 2.6.3.0
+ */
+public class HuntingSystem {
+	
+	private static final int ADDITIONAL_NEVIT_POINTS = 2;
+	private static final int HUNTING_BONUS_REFRESH_RATE = 10;
+	
+	private final L2PcInstance _activeChar;
+	private ScheduledFuture<?> _huntingBonusTask;
+	private ScheduledFuture<?> _nevitBlessingTimeTask;
+	private boolean _message25;
+	private boolean _message50;
+	private boolean _message75;
+	
+	public HuntingSystem(L2PcInstance player) {
+		Objects.requireNonNull(player);
+		_activeChar = player;
+	}
+	
+	public void onPlayerLogin() {
+		final Calendar cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 6);
+		cal.set(Calendar.MINUTE, 30);
+		cal.set(Calendar.SECOND, 0);
+		cal.set(Calendar.MILLISECOND, 0);
+		
+		// Reset Hunting System
+		if ((getActiveChar().getLastAccess() < (cal.getTimeInMillis() / 1000L)) && (System.currentTimeMillis() > cal.getTimeInMillis())) {
+			setHuntingBonusTime(0);
+		}
+		
+		// Send Hunting Bonus UI Packets
+		getActiveChar().sendPacket(new ExNevitAdventPointInfoPacket(getNevitBlessingPoints()));
+		getActiveChar().sendPacket(new ExNevitAdventTimeChange(getHuntingBonusTime(), true));
+		
+		checkNevitBlessingEffect(getNevitBlessingTime());
+		
+		checkSystemMessageSend();
+	}
+	
+	public void onPlayerLogout() {
+		stopNevitBlessingEffectTask(true);
+		stopHuntingBonusTask(false);
+	}
+	
+	public void addPoints(int val) {
+		setNevitBlessingPoints(getNevitBlessingPoints() + val);
+		
+		if (getNevitBlessingPoints() > hunting().getNevitBlessingMaxPoints()) {
+			setNevitBlessingPoints(0);
+			checkNevitBlessingEffect(hunting().getNevitBlessingEffetcTime());
+		}
+		
+		checkSystemMessageSend();
+	}
+	
+	public void startHuntingSystemTask() {
+		if ((_huntingBonusTask == null) && (((getHuntingBonusTime() < hunting().getHuntingBonusMaxTime()) || !hunting().getHuntingBonusLimit()))) {
+			_huntingBonusTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new HuntingBonusTask(), 1000, 10000);
+			if (hunting().getHuntingBonusLimit()) {
+				getActiveChar().sendPacket(new ExNevitAdventTimeChange(getHuntingBonusTime(), false));
+			}
+		}
+	}
+	
+	public class HuntingBonusTask implements Runnable {
+		@Override
+		public void run() {
+			setHuntingBonusTime(getHuntingBonusTime() + HUNTING_BONUS_REFRESH_RATE);
+			if ((getHuntingBonusTime() >= hunting().getHuntingBonusMaxTime()) && hunting().getHuntingBonusLimit()) {
+				setHuntingBonusTime(hunting().getHuntingBonusMaxTime());
+				stopHuntingBonusTask(true);
+				return;
+			}
+			
+			if (hunting().getHuntingBonusLimit()) {
+				getActiveChar().sendPacket(new ExNevitAdventTimeChange(getHuntingBonusTime(), false));
+			}
+			
+			addPoints(ADDITIONAL_NEVIT_POINTS);
+			if (getNevitBlessingTime() > 0) {
+				addPoints(hunting().getNevitRegularPoints());
+			} else {
+				addPoints(hunting().getNevitRegularPoints2());
+			}
+		}
+	}
+	
+	public class NevitEffectEnd implements Runnable {
+		@Override
+		public void run() {
+			setNevitBlessingTime(0);
+			getActiveChar().sendPacket(new ExNevitAdventEffect(0));
+			getActiveChar().sendPacket(new ExNevitAdventPointInfoPacket(getNevitBlessingPoints()));
+			getActiveChar().sendPacket(SystemMessageId.NEVITS_ADVENT_BLESSING_HAS_ENDED);
+			getActiveChar().stopAbnormalVisualEffect(true, AbnormalVisualEffect.NEVIT_ADVENT);
+			stopNevitBlessingEffectTask(false);
+		}
+	}
+	
+	public void checkNevitBlessingEffect(int value) {
+		if (getNevitBlessingTime() > 0) {
+			stopNevitBlessingEffectTask(false);
+			value = getNevitBlessingTime();
+		}
+		
+		if (value > 0) {
+			final int percent = calcPercent(getNevitBlessingPoints());
+			if (percent < 25) {
+				_message25 = false;
+				_message50 = false;
+				_message75 = false;
+			}
+			setNevitBlessingTime(value);
+			getActiveChar().sendPacket(new ExNevitAdventEffect(value));
+			getActiveChar().sendPacket(SystemMessageId.THE_ANGEL_NEVIT_HAS_BLESSED_YOU_FROM_ABOVE);
+			getActiveChar().startAbnormalVisualEffect(true, AbnormalVisualEffect.NEVIT_ADVENT);
+			_nevitBlessingTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new NevitEffectEnd(), value * 1000L);
+		}
+	}
+	
+	public void stopHuntingBonusTask(boolean sendPacket) {
+		if (_huntingBonusTask != null) {
+			_huntingBonusTask.cancel(true);
+			_huntingBonusTask = null;
+		}
+		
+		if (sendPacket) {
+			getActiveChar().sendPacket(new ExNevitAdventTimeChange(getHuntingBonusTime(), true));
+		}
+	}
+	
+	public void stopNevitBlessingEffectTask(boolean value) {
+		if (_nevitBlessingTimeTask != null) {
+			if (value) {
+				int time = (int) _nevitBlessingTimeTask.getDelay(TimeUnit.SECONDS);
+				if (time > 0) {
+					setNevitBlessingTime(time);
+				} else {
+					setNevitBlessingTime(0);
+				}
+			}
+			_nevitBlessingTimeTask.cancel(true);
+			_nevitBlessingTimeTask = null;
+		}
+	}
+	
+	public void checkSystemMessageSend() {
+		final int percent = calcPercent(getNevitBlessingPoints());
+		if (percent >= 75) {
+			if (!_message75) {
+				_message75 = true;
+				getActiveChar().sendPacket(SystemMessageId.NEVITS_ADVENT_BLESSING_SHINES_STRONGLY_FROM_ABOVE);
+			}
+		} else if (percent >= 50) {
+			if (!_message50) {
+				_message50 = true;
+				getActiveChar().sendPacket(SystemMessageId.YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT);
+			}
+		} else if (percent >= 25) {
+			if (!_message25) {
+				_message25 = true;
+				getActiveChar().sendPacket(SystemMessageId.YOU_ARE_STARTING_TO_FEEL_THE_EFFECTS_OF_NEVITS_ADVENT_BLESSING);
+			}
+		}
+	}
+	
+	public boolean isNevitBlessingActive() {
+		return ((_nevitBlessingTimeTask != null) && (_nevitBlessingTimeTask.getDelay(TimeUnit.SECONDS) > 0));
+	}
+	
+	public boolean isHuntingBonusTaskActive() {
+		return (_nevitBlessingTimeTask != null);
+	}
+	
+	public static int calcPercent(int points) {
+		return (int) ((100.0 / hunting().getNevitBlessingMaxPoints()) * points);
+	}
+	
+	public L2PcInstance getActiveChar() {
+		return _activeChar;
+	}
+	
+	public int getNevitBlessingPoints() {
+		return getActiveChar().getStat().getNevitBlessingPoints();
+	}
+	
+	public void setNevitBlessingPoints(int points) {
+		getActiveChar().getStat().setNevitBlessingPoints(points);
+	}
+	
+	public int getHuntingBonusTime() {
+		return getActiveChar().getStat().getHuntingBonusTime();
+	}
+	
+	public void setHuntingBonusTime(int time) {
+		getActiveChar().getStat().setHuntingBonusTime(time);
+	}
+	
+	public int getNevitBlessingTime() {
+		return getActiveChar().getStat().getNevitBlessingTime();
+	}
+	
+	public void setNevitBlessingTime(int time) {
+		getActiveChar().getStat().setNevitBlessingTime(time);
+	}
+	
+	public double getNevitHourglassMultiplier() {
+		return (getActiveChar().getRecSystem().getBonusTime() > 0) || getActiveChar().hasAbnormalTypeVote() ? RecoBonus.getRecoMultiplier(getActiveChar()) : 0;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Instance.java b/src/main/java/com/l2jserver/gameserver/model/entity/Instance.java
new file mode 100644
index 00000000..d1d995e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Instance.java
@@ -0,0 +1,793 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.DayOfWeek;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.enums.InstanceReenterType;
+import com.l2jserver.gameserver.enums.InstanceRemoveBuffType;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2DoorTemplate;
+import com.l2jserver.gameserver.model.holders.InstanceReenterTimeHolder;
+import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * Main class for game instances.
+ * @author evill33t
+ * @author GodKratos
+ */
+public final class Instance {
+	private static final Logger LOG = LoggerFactory.getLogger(Instance.class);
+	
+	private final int _id;
+	private String _name;
+	private int _ejectTime = (int) general().getEjectDeadPlayerTime();
+	/** Allow random walk for NPCs, global parameter. */
+	private boolean _allowRandomWalk = true;
+	private final List<Integer> _players = new CopyOnWriteArrayList<>();
+	private final List<L2Npc> _npcs = new CopyOnWriteArrayList<>();
+	private final Map<Integer, L2DoorInstance> _doors = new ConcurrentHashMap<>();
+	private final Map<String, List<L2Spawn>> _manualSpawn = new HashMap<>();
+	// private StartPosType _enterLocationOrder; TODO implement me
+	private List<Location> _enterLocations = null;
+	private Location _exitLocation = null;
+	private boolean _allowSummon = true;
+	private long _emptyDestroyTime = -1;
+	private long _lastLeft = -1;
+	private final long _instanceStartTime;
+	private long _instanceEndTime = -1;
+	private boolean _isPvPInstance = false;
+	private boolean _showTimer = false;
+	private boolean _isTimerIncrease = true;
+	private String _timerText = "";
+	// Instance reset data
+	private InstanceReenterType _type = InstanceReenterType.NONE;
+	private final List<InstanceReenterTimeHolder> _resetData = new ArrayList<>();
+	// Instance remove buffs data
+	private InstanceRemoveBuffType _removeBuffType = InstanceRemoveBuffType.NONE;
+	private final List<Integer> _exceptionList = new ArrayList<>();
+	
+	private ScheduledFuture<?> _checkTimeUpTask = null;
+	private final Map<Integer, ScheduledFuture<?>> _ejectDeadTasks = new ConcurrentHashMap<>();
+	
+	public Instance(int id) {
+		_id = id;
+		_instanceStartTime = System.currentTimeMillis();
+	}
+	
+	public Instance(int id, String name) {
+		_id = id;
+		_name = name;
+		_instanceStartTime = System.currentTimeMillis();
+	}
+	
+	/**
+	 * @return the ID of this instance.
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * @return the name of this instance
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	public void setName(String name) {
+		_name = name;
+	}
+	
+	/**
+	 * @return the eject time
+	 */
+	public int getEjectTime() {
+		return _ejectTime;
+	}
+	
+	/**
+	 * @param ejectTime the player eject time upon death
+	 */
+	public void setEjectTime(int ejectTime) {
+		_ejectTime = ejectTime;
+	}
+	
+	/**
+	 * @return whether summon friend type skills are allowed for this instance
+	 */
+	public boolean isSummonAllowed() {
+		return _allowSummon;
+	}
+	
+	/**
+	 * Sets the status for the instance for summon friend type skills
+	 */
+	public void setAllowSummon(boolean b) {
+		_allowSummon = b;
+	}
+	
+	/**
+	 * Returns true if entire instance is PvP zone
+	 */
+	public boolean isPvPInstance() {
+		return _isPvPInstance;
+	}
+	
+	/**
+	 * Sets PvP zone status of the instance
+	 */
+	public void setPvPInstance(boolean b) {
+		_isPvPInstance = b;
+	}
+	
+	/**
+	 * Set the instance duration task
+	 * @param duration in milliseconds
+	 */
+	public void setDuration(long duration) {
+		if (_checkTimeUpTask != null) {
+			_checkTimeUpTask.cancel(true);
+		}
+		
+		_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new CheckTimeUp(duration), 500);
+		_instanceEndTime = System.currentTimeMillis() + duration + 500;
+	}
+	
+	/**
+	 * Set time before empty instance will be removed
+	 * @param time in milliseconds
+	 */
+	public void setEmptyDestroyTime(long time) {
+		_emptyDestroyTime = time;
+	}
+	
+	/**
+	 * Checks if the player exists within this instance
+	 * @param objectId id of the player
+	 * @return true if player exists in instance
+	 */
+	public boolean containsPlayer(int objectId) {
+		return _players.contains(objectId);
+	}
+	
+	/**
+	 * Adds the specified player to the instance
+	 * @param objectId Players object ID
+	 */
+	public void addPlayer(int objectId) {
+		_players.add(objectId);
+	}
+	
+	/**
+	 * Removes the specified player from the instance list.
+	 * @param objectId the player's object Id
+	 */
+	public void removePlayer(Integer objectId) {
+		_players.remove(objectId);
+		if (_players.isEmpty() && (_emptyDestroyTime >= 0)) {
+			_lastLeft = System.currentTimeMillis();
+			setDuration((int) (_instanceEndTime - System.currentTimeMillis() - 500));
+		}
+	}
+	
+	public void addNpc(L2Npc npc) {
+		_npcs.add(npc);
+	}
+	
+	public void removeNpc(L2Npc npc) {
+		if (npc.getSpawn() != null) {
+			npc.getSpawn().stopRespawn();
+		}
+		_npcs.remove(npc);
+	}
+	
+	/**
+	 * Adds a door into the instance
+	 * @param doorId - from doors.xml
+	 * @param set - StatsSet for initializing door
+	 */
+	public void addDoor(int doorId, StatsSet set) {
+		if (_doors.containsKey(doorId)) {
+			LOG.warn("Door ID {} already exists in instance {}", doorId, getId());
+			return;
+		}
+		
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var template = new L2DoorTemplate(set);
+		final var door = new L2DoorInstance(objectId, template);
+		door.setInstanceId(getId());
+		door.setCurrentHp(door.getMaxHp());
+		door.spawnMe(door.getTemplate().getX(), door.getTemplate().getY(), door.getTemplate().getZ());
+		_doors.put(doorId, door);
+	}
+	
+	public List<Integer> getPlayers() {
+		return _players;
+	}
+	
+	public List<L2Npc> getNpcs() {
+		return _npcs;
+	}
+	
+	public Collection<L2DoorInstance> getDoors() {
+		return _doors.values();
+	}
+	
+	public L2DoorInstance getDoor(int id) {
+		return _doors.get(id);
+	}
+	
+	public long getInstanceEndTime() {
+		return _instanceEndTime;
+	}
+	
+	public long getInstanceStartTime() {
+		return _instanceStartTime;
+	}
+	
+	public boolean isShowTimer() {
+		return _showTimer;
+	}
+	
+	public boolean isTimerIncrease() {
+		return _isTimerIncrease;
+	}
+	
+	public String getTimerText() {
+		return _timerText;
+	}
+	
+	/**
+	 * @return the spawn location for this instance to be used when enter in instance
+	 */
+	public List<Location> getEnterLocs() {
+		return _enterLocations;
+	}
+	
+	/**
+	 * Sets the spawn location for this instance to be used when enter in instance
+	 */
+	public void addEnterLoc(Location loc) {
+		_enterLocations.add(loc);
+	}
+	
+	/**
+	 * @return the spawn location for this instance to be used when leaving the instance
+	 */
+	public Location getExitLoc() {
+		return _exitLocation;
+	}
+	
+	/**
+	 * Sets the spawn location for this instance to be used when leaving the instance
+	 */
+	public void setExitLoc(Location loc) {
+		_exitLocation = loc;
+	}
+	
+	public void removePlayers() {
+		for (Integer objectId : _players) {
+			final L2PcInstance player = L2World.getInstance().getPlayer(objectId);
+			if ((player != null) && (player.getInstanceId() == getId())) {
+				player.setInstanceId(0);
+				if (getExitLoc() != null) {
+					player.teleToLocation(getExitLoc(), true);
+				} else {
+					player.teleToLocation(TeleportWhereType.TOWN);
+				}
+			}
+		}
+		_players.clear();
+	}
+	
+	public void removeNpcs() {
+		for (L2Npc mob : _npcs) {
+			if (mob != null) {
+				if (mob.getSpawn() != null) {
+					mob.getSpawn().stopRespawn();
+				}
+				mob.deleteMe();
+			}
+		}
+		_npcs.clear();
+		_manualSpawn.clear();
+	}
+	
+	public void removeDoors() {
+		for (L2DoorInstance door : _doors.values()) {
+			if (door != null) {
+				L2WorldRegion region = door.getWorldRegion();
+				door.decayMe();
+				
+				if (region != null) {
+					region.removeVisibleObject(door);
+				}
+				
+				door.getKnownList().removeAllKnownObjects();
+				L2World.getInstance().removeObject(door);
+			}
+		}
+		_doors.clear();
+	}
+	
+	/**
+	 * Spawns group of instance NPC's
+	 * @param groupName - name of group from XML definition to spawn
+	 * @return list of spawned NPC's
+	 */
+	public List<L2Npc> spawnGroup(String groupName) {
+		List<L2Npc> ret = null;
+		if (_manualSpawn.containsKey(groupName)) {
+			final List<L2Spawn> manualSpawn = _manualSpawn.get(groupName);
+			ret = new ArrayList<>(manualSpawn.size());
+			
+			for (L2Spawn spawnDat : manualSpawn) {
+				ret.add(spawnDat.doSpawn());
+			}
+		} else {
+			LOG.warn("{}: cannot spawn NPCs, wrong group name: {}", getName(), groupName);
+		}
+		
+		return ret;
+	}
+	
+	public void loadInstanceTemplate(String filename) {
+		File xml = new File(server().getDatapackRoot(), "data/instances/" + filename);
+		
+		try {
+			DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+			factory.setValidating(false);
+			factory.setIgnoringComments(true);
+			var doc = factory.newDocumentBuilder().parse(xml);
+			
+			for (Node n = doc.getFirstChild(); n != null; n = n.getNextSibling()) {
+				if ("instance".equalsIgnoreCase(n.getNodeName())) {
+					parseInstance(n);
+				}
+			}
+		} catch (IOException e) {
+			LOG.warn("Can not find {}! {}", xml.getAbsolutePath(), e.getMessage(), e);
+		} catch (Exception e) {
+			LOG.warn("Error while loading {} ! {}", xml.getAbsolutePath(), e.getMessage(), e);
+		}
+	}
+	
+	private void parseInstance(Node n) throws Exception {
+		_name = n.getAttributes().getNamedItem("name").getNodeValue();
+		Node a = n.getAttributes().getNamedItem("ejectTime");
+		if (a != null) {
+			_ejectTime = 1000 * Integer.parseInt(a.getNodeValue());
+		}
+		a = n.getAttributes().getNamedItem("allowRandomWalk");
+		if (a != null) {
+			_allowRandomWalk = Boolean.parseBoolean(a.getNodeValue());
+		}
+		Node first = n.getFirstChild();
+		for (n = first; n != null; n = n.getNextSibling()) {
+			switch (n.getNodeName().toLowerCase()) {
+				case "activitytime" -> {
+					a = n.getAttributes().getNamedItem("val");
+					if (a != null) {
+						_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new CheckTimeUp(Integer.parseInt(a.getNodeValue()) * 60000), 15000);
+						_instanceEndTime = System.currentTimeMillis() + (Long.parseLong(a.getNodeValue()) * 60000) + 15000;
+					}
+				}
+				case "allowsummon" -> {
+					a = n.getAttributes().getNamedItem("val");
+					if (a != null) {
+						setAllowSummon(Boolean.parseBoolean(a.getNodeValue()));
+					}
+				}
+				case "emptydestroytime" -> {
+					a = n.getAttributes().getNamedItem("val");
+					if (a != null) {
+						_emptyDestroyTime = Long.parseLong(a.getNodeValue()) * 1000;
+					}
+				}
+				case "showtimer" -> {
+					a = n.getAttributes().getNamedItem("val");
+					if (a != null) {
+						_showTimer = Boolean.parseBoolean(a.getNodeValue());
+					}
+					a = n.getAttributes().getNamedItem("increase");
+					if (a != null) {
+						_isTimerIncrease = Boolean.parseBoolean(a.getNodeValue());
+					}
+					a = n.getAttributes().getNamedItem("text");
+					if (a != null) {
+						_timerText = a.getNodeValue();
+					}
+				}
+				case "pvpinstance" -> {
+					a = n.getAttributes().getNamedItem("val");
+					if (a != null) {
+						setPvPInstance(Boolean.parseBoolean(a.getNodeValue()));
+					}
+				}
+				case "doorlist" -> {
+					for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+						if ("door".equalsIgnoreCase(d.getNodeName())) {
+							int doorId = Integer.parseInt(d.getAttributes().getNamedItem("doorId").getNodeValue());
+							StatsSet set = new StatsSet();
+							set.add(DoorData.getInstance().getDoorTemplate(doorId));
+							for (Node bean = d.getFirstChild(); bean != null; bean = bean.getNextSibling()) {
+								if ("set".equalsIgnoreCase(bean.getNodeName())) {
+									NamedNodeMap attrs = bean.getAttributes();
+									String setname = attrs.getNamedItem("name").getNodeValue();
+									String value = attrs.getNamedItem("val").getNodeValue();
+									set.set(setname, value);
+								}
+							}
+							addDoor(doorId, set);
+						}
+					}
+				}
+				case "spawnlist" -> {
+					for (Node group = n.getFirstChild(); group != null; group = group.getNextSibling()) {
+						if ("group".equalsIgnoreCase(group.getNodeName())) {
+							String spawnGroup = group.getAttributes().getNamedItem("name").getNodeValue();
+							List<L2Spawn> manualSpawn = new ArrayList<>();
+							for (Node d = group.getFirstChild(); d != null; d = d.getNextSibling()) {
+								int respawnRandom = 0, delay = -1;
+								Boolean allowRandomWalk = null;
+								String areaName = null;
+								int globalMapId = 0;
+								
+								if ("spawn".equalsIgnoreCase(d.getNodeName())) {
+									int npcId = Integer.parseInt(d.getAttributes().getNamedItem("npcId").getNodeValue());
+									int x = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
+									int y = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
+									int z = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
+									int heading = Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue());
+									int respawn = Integer.parseInt(d.getAttributes().getNamedItem("respawn").getNodeValue());
+									
+									Node node = d.getAttributes().getNamedItem("onKillDelay");
+									if (node != null) {
+										delay = Integer.parseInt(node.getNodeValue());
+									}
+									
+									node = d.getAttributes().getNamedItem("respawnRandom");
+									if (node != null) {
+										respawnRandom = Integer.parseInt(node.getNodeValue());
+									}
+									
+									node = d.getAttributes().getNamedItem("allowRandomWalk");
+									if (d.getAttributes().getNamedItem("allowRandomWalk") != null) {
+										allowRandomWalk = Boolean.valueOf(node.getNodeValue());
+									}
+									
+									node = d.getAttributes().getNamedItem("areaName");
+									if (d.getAttributes().getNamedItem("areaName") != null) {
+										areaName = node.getNodeValue();
+									}
+									
+									node = d.getAttributes().getNamedItem("globalMapId");
+									if (node != null) {
+										globalMapId = Integer.parseInt(node.getNodeValue());
+									}
+									
+									final L2Spawn spawnDat = new L2Spawn(npcId);
+									spawnDat.setX(x);
+									spawnDat.setY(y);
+									spawnDat.setZ(z);
+									spawnDat.setAmount(1);
+									spawnDat.setHeading(heading);
+									spawnDat.setRespawnDelay(respawn, respawnRandom);
+									if (respawn == 0) {
+										spawnDat.stopRespawn();
+									} else {
+										spawnDat.startRespawn();
+									}
+									spawnDat.setInstanceId(getId());
+									if (allowRandomWalk == null) {
+										spawnDat.setIsNoRndWalk(!_allowRandomWalk);
+									} else {
+										spawnDat.setIsNoRndWalk(!allowRandomWalk);
+									}
+									
+									spawnDat.setAreaName(areaName);
+									spawnDat.setGlobalMapId(globalMapId);
+									
+									if (spawnGroup.equals("general")) {
+										final L2Npc spawned = spawnDat.doSpawn();
+										if ((delay >= 0) && (spawned instanceof L2Attackable)) {
+											((L2Attackable) spawned).setOnKillDelay(delay);
+										}
+									} else {
+										manualSpawn.add(spawnDat);
+									}
+								}
+							}
+							
+							if (!manualSpawn.isEmpty()) {
+								_manualSpawn.put(spawnGroup, manualSpawn);
+							}
+						}
+					}
+				}
+				case "exitpoint" -> {
+					int x = Integer.parseInt(n.getAttributes().getNamedItem("x").getNodeValue());
+					int y = Integer.parseInt(n.getAttributes().getNamedItem("y").getNodeValue());
+					int z = Integer.parseInt(n.getAttributes().getNamedItem("z").getNodeValue());
+					_exitLocation = new Location(x, y, z);
+				}
+				case "spawnpoints" -> {
+					_enterLocations = new ArrayList<>();
+					for (Node loc = n.getFirstChild(); loc != null; loc = loc.getNextSibling()) {
+						if (loc.getNodeName().equals("Location")) {
+							try {
+								int x = Integer.parseInt(loc.getAttributes().getNamedItem("x").getNodeValue());
+								int y = Integer.parseInt(loc.getAttributes().getNamedItem("y").getNodeValue());
+								int z = Integer.parseInt(loc.getAttributes().getNamedItem("z").getNodeValue());
+								_enterLocations.add(new Location(x, y, z));
+							} catch (Exception e) {
+								LOG.warn("Error parsing instance xml: {}", e.getMessage(), e);
+							}
+						}
+					}
+				}
+				case "reenter" -> {
+					a = n.getAttributes().getNamedItem("additionStyle");
+					if (a != null) {
+						_type = InstanceReenterType.valueOf(a.getNodeValue());
+					}
+					
+					for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+						DayOfWeek day = null;
+						int hour = -1;
+						int minute = -1;
+						
+						if ("reset".equalsIgnoreCase(d.getNodeName())) {
+							a = d.getAttributes().getNamedItem("time");
+							if (a != null) {
+								long time = Long.parseLong(a.getNodeValue());
+								if (time > 0) {
+									_resetData.add(new InstanceReenterTimeHolder(time));
+									break;
+								}
+							} else {
+								a = d.getAttributes().getNamedItem("day");
+								if (a != null) {
+									day = DayOfWeek.valueOf(a.getNodeValue().toUpperCase());
+								}
+								
+								a = d.getAttributes().getNamedItem("hour");
+								if (a != null) {
+									hour = Integer.parseInt(a.getNodeValue());
+								}
+								
+								a = d.getAttributes().getNamedItem("minute");
+								if (a != null) {
+									minute = Integer.parseInt(a.getNodeValue());
+								}
+								_resetData.add(new InstanceReenterTimeHolder(day, hour, minute));
+							}
+						}
+					}
+				}
+				case "removebuffs" -> {
+					a = n.getAttributes().getNamedItem("type");
+					if (a != null) {
+						_removeBuffType = InstanceRemoveBuffType.valueOf(a.getNodeValue().toUpperCase());
+					}
+					
+					for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+						if ("skill".equalsIgnoreCase(d.getNodeName())) {
+							a = d.getAttributes().getNamedItem("id");
+							if (a != null) {
+								_exceptionList.add(Integer.parseInt(a.getNodeValue()));
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	private void doCheckTimeUp(long remaining) {
+		CreatureSay cs = null;
+		long timeLeft;
+		int interval;
+		
+		if (_players.isEmpty() && (_emptyDestroyTime == 0)) {
+			remaining = 0;
+			interval = 500;
+		} else if (_players.isEmpty() && (_emptyDestroyTime > 0)) {
+			
+			long emptyTimeLeft = (_lastLeft + _emptyDestroyTime) - System.currentTimeMillis();
+			if (emptyTimeLeft <= 0) {
+				interval = 0;
+				remaining = 0;
+			} else if ((remaining > 300000) && (emptyTimeLeft > 300000)) {
+				interval = 300000;
+				remaining = remaining - 300000;
+			} else if ((remaining > 60000) && (emptyTimeLeft > 60000)) {
+				interval = 60000;
+				remaining = remaining - 60000;
+			} else if ((remaining > 30000) && (emptyTimeLeft > 30000)) {
+				interval = 30000;
+				remaining = remaining - 30000;
+			} else {
+				interval = 10000;
+				remaining = remaining - 10000;
+			}
+		} else if (remaining > 300000) {
+			timeLeft = remaining / 60000;
+			interval = 300000;
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DUNGEON_EXPIRES_IN_S1_MINUTES);
+			sm.addString(Long.toString(timeLeft));
+			Broadcast.toPlayersInInstance(sm, getId());
+			remaining = remaining - 300000;
+		} else if (remaining > 60000) {
+			timeLeft = remaining / 60000;
+			interval = 60000;
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DUNGEON_EXPIRES_IN_S1_MINUTES);
+			sm.addString(Long.toString(timeLeft));
+			Broadcast.toPlayersInInstance(sm, getId());
+			remaining = remaining - 60000;
+		} else if (remaining > 30000) {
+			timeLeft = remaining / 1000;
+			interval = 30000;
+			cs = new CreatureSay(0, Say2.ALLIANCE, "Notice", timeLeft + " seconds left.");
+			remaining = remaining - 30000;
+		} else {
+			timeLeft = remaining / 1000;
+			interval = 10000;
+			cs = new CreatureSay(0, Say2.ALLIANCE, "Notice", timeLeft + " seconds left.");
+			remaining = remaining - 10000;
+		}
+		if (cs != null) {
+			for (Integer objectId : _players) {
+				final L2PcInstance player = L2World.getInstance().getPlayer(objectId);
+				if ((player != null) && (player.getInstanceId() == getId())) {
+					player.sendPacket(cs);
+				}
+			}
+		}
+		cancelTimer();
+		if (remaining >= 10000) {
+			_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new CheckTimeUp(remaining), interval);
+		} else {
+			_checkTimeUpTask = ThreadPoolManager.getInstance().scheduleGeneral(new TimeUp(), interval);
+		}
+	}
+	
+	public void cancelTimer() {
+		if (_checkTimeUpTask != null) {
+			_checkTimeUpTask.cancel(true);
+		}
+	}
+	
+	public void cancelEjectDeadPlayer(L2PcInstance player) {
+		final ScheduledFuture<?> task = _ejectDeadTasks.remove(player.getObjectId());
+		if (task != null) {
+			task.cancel(true);
+		}
+	}
+	
+	public void addEjectDeadTask(L2PcInstance player) {
+		if ((player != null)) {
+			_ejectDeadTasks.put(player.getObjectId(), ThreadPoolManager.getInstance().scheduleGeneral(() -> {
+				if (player.isDead() && (player.getInstanceId() == getId())) {
+					player.setInstanceId(0);
+					if (getExitLoc() != null) {
+						player.teleToLocation(getExitLoc(), true);
+					} else {
+						player.teleToLocation(TeleportWhereType.TOWN);
+					}
+				}
+			}, _ejectTime));
+		}
+	}
+	
+	/**
+	 * @param killer the character that killed the {@code victim}
+	 * @param victim the character that was killed by the {@code killer}
+	 */
+	public void notifyDeath(L2Character killer, L2Character victim) {
+		final InstanceWorld instance = InstanceManager.getInstance().getPlayerWorld(victim.getActingPlayer());
+		if (instance != null) {
+			instance.onDeath(killer, victim);
+		}
+	}
+	
+	public class CheckTimeUp implements Runnable {
+		private final long _remaining;
+		
+		public CheckTimeUp(long remaining) {
+			_remaining = remaining;
+		}
+		
+		@Override
+		public void run() {
+			doCheckTimeUp(_remaining);
+		}
+	}
+	
+	public class TimeUp implements Runnable {
+		@Override
+		public void run() {
+			InstanceManager.getInstance().destroyInstance(getId());
+		}
+	}
+	
+	public InstanceReenterType getReenterType() {
+		return _type;
+	}
+	
+	public void setReenterType(InstanceReenterType type) {
+		_type = type;
+	}
+	
+	public List<InstanceReenterTimeHolder> getReenterData() {
+		return _resetData;
+	}
+	
+	public boolean isRemoveBuffEnabled() {
+		return getRemoveBuffType() != InstanceRemoveBuffType.NONE;
+	}
+	
+	public InstanceRemoveBuffType getRemoveBuffType() {
+		return _removeBuffType;
+	}
+	
+	public List<Integer> getBuffExceptionList() {
+		return _exceptionList;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/L2Event.java b/src/main/java/com/l2jserver/gameserver/model/entity/L2Event.java
new file mode 100644
index 00000000..5b704030
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/L2Event.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.PlayerEventHolder;
+import com.l2jserver.gameserver.network.serverpackets.CharInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * @author Nik
+ * @since 2011/05/17 21:51:39
+ */
+public class L2Event {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Event.class);
+	
+	public static EventState eventState = EventState.OFF;
+	public static String _eventName = "";
+	public static String _eventCreator = "";
+	public static String _eventInfo = "";
+	public static int _teamsNumber = 0;
+	public static final Map<Integer, String> _teamNames = new ConcurrentHashMap<>();
+	public static final List<L2PcInstance> _registeredPlayers = new CopyOnWriteArrayList<>();
+	public static final Map<Integer, List<L2PcInstance>> _teams = new ConcurrentHashMap<>();
+	public static int _npcId = 0;
+	private static final Map<L2PcInstance, PlayerEventHolder> _connectionLossData = new ConcurrentHashMap<>();
+	
+	public enum EventState {
+		OFF, // Not running
+		STANDBY, // Waiting for participants to register
+		ON // Registration is over and the event has started.
+	}
+	
+	/**
+	 * @return The team ID where the player is in, or -1 if player is null or team not found.
+	 */
+	public static int getPlayerTeamId(L2PcInstance player) {
+		if (player == null) {
+			return -1;
+		}
+		
+		for (Entry<Integer, List<L2PcInstance>> team : _teams.entrySet()) {
+			if (team.getValue().contains(player)) {
+				return team.getKey();
+			}
+		}
+		
+		return -1;
+	}
+	
+	public static List<L2PcInstance> getTopNKillers(int n) {
+		final Map<L2PcInstance, Integer> tmp = new HashMap<>();
+		for (List<L2PcInstance> teamList : _teams.values()) {
+			for (L2PcInstance player : teamList) {
+				if (player.getEventStatus() == null) {
+					continue;
+				}
+				tmp.put(player, player.getEventStatus().getKills().size());
+			}
+		}
+		
+		sortByValue(tmp);
+		
+		// If the map size is less than "n", n will be as much as the map size
+		if (tmp.size() <= n) {
+			return new ArrayList<>(tmp.keySet());
+		}
+		
+		final List<L2PcInstance> toReturn = new ArrayList<>(tmp.keySet());
+		return toReturn.subList(1, n);
+	}
+	
+	public static void showEventHtml(L2PcInstance player, String objectid) {
+		// TODO: work on this
+		if (eventState == EventState.STANDBY) {
+			try {
+				final String htmContent;
+				final NpcHtmlMessage html = new NpcHtmlMessage(Integer.parseInt(objectid));
+				
+				if (_registeredPlayers.contains(player)) {
+					htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participating.htm");
+				} else {
+					htmContent = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/mods/EventEngine/Participation.htm");
+				}
+				
+				if (htmContent != null) {
+					html.setHtml(htmContent);
+				}
+				
+				html.replace("%objectId%", objectid); // Yeah, we need this.
+				html.replace("%eventName%", _eventName);
+				html.replace("%eventCreator%", _eventCreator);
+				html.replace("%eventInfo%", _eventInfo);
+				player.sendPacket(html);
+			} catch (Exception e) {
+				LOG.warn("Exception on showEventHtml(): {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	/**
+	 * Spawns an event participation NPC near the player. The npc id used to spawning is L2Event._npcId
+	 * @param target
+	 */
+	public static void spawnEventNpc(L2PcInstance target) {
+		try {
+			final L2Spawn spawn = new L2Spawn(_npcId);
+			spawn.setX(target.getX() + 50);
+			spawn.setY(target.getY() + 50);
+			spawn.setZ(target.getZ());
+			spawn.setAmount(1);
+			spawn.setHeading(target.getHeading());
+			spawn.stopRespawn();
+			SpawnTable.getInstance().addNewSpawn(spawn, false);
+			
+			spawn.init();
+			spawn.getLastSpawn().setCurrentHp(999999999);
+			spawn.getLastSpawn().setTitle(_eventName);
+			spawn.getLastSpawn().setEventMob(true);
+			// spawn.getLastSpawn().decayMe();
+			// spawn.getLastSpawn().spawnMe(spawn.getLastSpawn().getX(), spawn.getLastSpawn().getY(), spawn.getLastSpawn().getZ());
+			
+			spawn.getLastSpawn().broadcastPacket(new MagicSkillUse(spawn.getLastSpawn(), spawn.getLastSpawn(), 1034, 1, 1, 1));
+			
+			// _npcs.add(spawn.getLastSpawn());
+			
+		} catch (Exception e) {
+			LOG.warn("Exception on spawn(): {}", e.getMessage(), e);
+		}
+		
+	}
+	
+	/**
+	 * Zoey76: TODO: Rewrite this in a way that doesn't iterate over all spawns.
+	 */
+	public static void unspawnEventNpcs() {
+		SpawnTable.getInstance().forEachSpawn(spawn -> {
+			L2Npc npc = spawn.getLastSpawn();
+			if ((npc != null) && npc.isEventMob()) {
+				npc.deleteMe();
+				spawn.stopRespawn();
+				SpawnTable.getInstance().deleteSpawn(spawn, false);
+			}
+			return true;
+		});
+	}
+	
+	/**
+	 * @param player
+	 * @return False: If player is null, his event status is null or the event state is off. True: if the player is inside the _registeredPlayers list while the event state is STANDBY. If the event state is ON, it will check if the player is inside in one of the teams.
+	 */
+	public static boolean isParticipant(L2PcInstance player) {
+		if ((player == null) || (player.getEventStatus() == null)) {
+			return false;
+		}
+		
+		switch (eventState) {
+			case OFF:
+				return false;
+			case STANDBY:
+				return _registeredPlayers.contains(player);
+			case ON:
+				for (List<L2PcInstance> teamList : _teams.values()) {
+					if (teamList.contains(player)) {
+						return true;
+					}
+				}
+		}
+		return false;
+		
+	}
+	
+	/**
+	 * Adds the player to the list of participants. If the event state is NOT STANDBY, the player wont be registered.
+	 */
+	public static void registerPlayer(L2PcInstance player) {
+		if (eventState != EventState.STANDBY) {
+			player.sendMessage("The registration period for this event is over.");
+			return;
+		}
+		
+		if ((customs().getDualboxCheckMaxL2EventParticipantsPerIP() == 0) || AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.L2EVENT_ID, player, customs().getDualboxCheckMaxL2EventParticipantsPerIP())) {
+			_registeredPlayers.add(player);
+		} else {
+			player.sendMessage("You have reached the maximum allowed participants per IP.");
+		}
+	}
+	
+	/**
+	 * Removes the player from the participating players and the teams and restores his init stats before he registered at the event (loc, pvp, pk, title etc)
+	 */
+	public static void removeAndResetPlayer(L2PcInstance player) {
+		
+		try {
+			if (isParticipant(player)) {
+				if (player.isDead()) {
+					player.restoreExp(100.0);
+					player.doRevive();
+					player.setCurrentHpMp(player.getMaxHp(), player.getMaxMp());
+					player.setCurrentCp(player.getMaxCp());
+				}
+				
+				player.getPoly().setPolyInfo(null, "1");
+				player.decayMe();
+				player.spawnMe(player.getX(), player.getY(), player.getZ());
+				CharInfo info1 = new CharInfo(player);
+				player.broadcastPacket(info1);
+				UserInfo info2 = new UserInfo(player);
+				player.sendPacket(info2);
+				player.broadcastPacket(new ExBrExtraUserInfo(player));
+				
+				player.stopTransformation(true);
+			}
+			
+			if (player.getEventStatus() != null) {
+				player.getEventStatus().restorePlayerStats();
+			}
+			
+			player.setEventStatus(null);
+			
+			_registeredPlayers.remove(player);
+			int teamId = getPlayerTeamId(player);
+			if (_teams.containsKey(teamId)) {
+				_teams.get(teamId).remove(player);
+			}
+		} catch (Exception e) {
+			LOG.warn("Error at unregisterAndResetPlayer in the event:{}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * The player's event status will be saved at _connectionLossData
+	 */
+	public static void savePlayerEventStatus(L2PcInstance player) {
+		_connectionLossData.put(player, player.getEventStatus());
+	}
+	
+	/**
+	 * If _connectionLossData contains the player, it will restore the player's event status. Also it will remove the player from the _connectionLossData.
+	 */
+	public static void restorePlayerEventStatus(L2PcInstance player) {
+		if (_connectionLossData.containsKey(player)) {
+			player.setEventStatus(_connectionLossData.get(player));
+			_connectionLossData.remove(player);
+		}
+	}
+	
+	/**
+	 * If the event is ON or STANDBY, it will not start. Sets the event state to STANDBY and spawns registration NPCs
+	 * @return a string with information if the event participation has been successfully started or not.
+	 */
+	public static String startEventParticipation() {
+		try {
+			switch (eventState) {
+				case ON:
+					return "Cannot start event, it is already on.";
+				case STANDBY:
+					return "Cannot start event, it is on standby mode.";
+				case OFF: // Event is off, so no problem turning it on.
+					eventState = EventState.STANDBY;
+					break;
+			}
+			
+			// Register the event at AntiFeedManager and clean it for just in case if the event is already registered.
+			AntiFeedManager.getInstance().registerEvent(AntiFeedManager.L2EVENT_ID);
+			AntiFeedManager.getInstance().clear(AntiFeedManager.L2EVENT_ID);
+			
+			// Just in case
+			unspawnEventNpcs();
+			_registeredPlayers.clear();
+			// _npcs.clear();
+			
+			if (NpcData.getInstance().getTemplate(_npcId) == null) {
+				return "Cannot start event, invalid npc id.";
+			}
+			
+			try (FileReader fr = new FileReader(server().getDatapackRoot() + "/data/events/" + _eventName);
+				BufferedReader br = new BufferedReader(fr)) {
+				_eventCreator = br.readLine();
+				_eventInfo = br.readLine();
+			}
+			
+			List<L2PcInstance> temp = new LinkedList<>();
+			for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+				if (!player.isOnline()) {
+					continue;
+				}
+				
+				if (!temp.contains(player)) {
+					spawnEventNpc(player);
+					temp.add(player);
+				}
+				for (L2PcInstance playertemp : player.getKnownList().getKnownPlayers().values()) {
+					if ((Math.abs(playertemp.getX() - player.getX()) < 1000) && (Math.abs(playertemp.getY() - player.getY()) < 1000) && (Math.abs(playertemp.getZ() - player.getZ()) < 1000)) {
+						temp.add(playertemp);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+			return "Cannot start event participation, an error has occurred.";
+		}
+		
+		return "The event participation has been successfully started.";
+	}
+	
+	/**
+	 * If the event is ON or OFF, it will not start. Sets the event state to ON, creates the teams, adds the registered players ordered by level at the teams and adds a new event status to the players.
+	 * @return a string with information if the event has been successfully started or not.
+	 */
+	public static String startEvent() {
+		try {
+			switch (eventState) {
+				case ON:
+					return "Cannot start event, it is already on.";
+				case STANDBY:
+					eventState = EventState.ON;
+					break;
+				case OFF: // Event is off, so no problem turning it on.
+					return "Cannot start event, it is off. Participation start is required.";
+			}
+			
+			// Clean the things we will use, just in case.
+			unspawnEventNpcs();
+			_teams.clear();
+			_connectionLossData.clear();
+			
+			// Insert empty lists at _teams.
+			for (int i = 0; i < _teamsNumber; i++) {
+				_teams.put(i + 1, new CopyOnWriteArrayList<>());
+			}
+			
+			int i = 0;
+			while (!_registeredPlayers.isEmpty()) {
+				// Get the player with the biggest level
+				int max = 0;
+				L2PcInstance biggestLvlPlayer = null;
+				for (L2PcInstance player : _registeredPlayers) {
+					if (player == null) {
+						continue;
+					}
+					
+					if (max < player.getLevel()) {
+						max = player.getLevel();
+						biggestLvlPlayer = player;
+					}
+				}
+				
+				if (biggestLvlPlayer == null) {
+					continue;
+				}
+				
+				_registeredPlayers.remove(biggestLvlPlayer);
+				_teams.get(i + 1).add(biggestLvlPlayer);
+				biggestLvlPlayer.setEventStatus();
+				i = (i + 1) % _teamsNumber;
+			}
+			
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+			return "Cannot start event, an error has occurred.";
+		}
+		
+		return "The event has been successfully started.";
+	}
+	
+	/**
+	 * If the event state is OFF, it will not finish. Sets the event state to OFF, unregisters and resets the players, unspawns and clers the event NPCs, clears the teams, registered players, connection loss data, sets the teams number to 0, sets the event name to empty.
+	 * @return a string with information if the event has been successfully stopped or not.
+	 */
+	public static String finishEvent() {
+		switch (eventState) {
+			case OFF:
+				return "Cannot finish event, it is already off.";
+			case STANDBY:
+				for (L2PcInstance player : _registeredPlayers) {
+					removeAndResetPlayer(player);
+				}
+				
+				unspawnEventNpcs();
+				// _npcs.clear();
+				_registeredPlayers.clear();
+				_teams.clear();
+				_connectionLossData.clear();
+				_teamsNumber = 0;
+				_eventName = "";
+				eventState = EventState.OFF;
+				return "The event has been stopped at STANDBY mode, all players unregistered and all event npcs unspawned.";
+			case ON:
+				for (List<L2PcInstance> teamList : _teams.values()) {
+					for (L2PcInstance player : teamList) {
+						removeAndResetPlayer(player);
+					}
+				}
+				
+				eventState = EventState.OFF;
+				AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
+				unspawnEventNpcs(); // Just in case
+				// _npcs.clear();
+				_registeredPlayers.clear();
+				_teams.clear();
+				_connectionLossData.clear();
+				_teamsNumber = 0;
+				_eventName = "";
+				_npcId = 0;
+				_eventCreator = "";
+				_eventInfo = "";
+				return "The event has been stopped, all players unregistered and all event npcs unspawned.";
+		}
+		
+		return "The event has been successfully finished.";
+	}
+	
+	private static Map<L2PcInstance, Integer> sortByValue(Map<L2PcInstance, Integer> unsortMap) {
+		final List<Entry<L2PcInstance, Integer>> list = new LinkedList<>(unsortMap.entrySet());
+		
+		list.sort(Entry.comparingByValue());
+		
+		final Map<L2PcInstance, Integer> sortedMap = new LinkedHashMap<>();
+		for (Entry<L2PcInstance, Integer> entry : list) {
+			sortedMap.put(entry.getKey(), entry.getValue());
+		}
+		return sortedMap;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Message.java b/src/main/java/com/l2jserver/gameserver/model/entity/Message.java
new file mode 100644
index 00000000..b09d7f84
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Message.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.itemcontainer.Mail;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public class Message {
+	private static final int EXPIRATION = 360; // 15 days
+	private static final int COD_EXPIRATION = 12; // 12 hours
+	
+	private static final int UNLOAD_ATTACHMENTS_INTERVAL = 900000; // 15-30 mins
+	
+	// post state
+	public static final int DELETED = 0;
+	public static final int READED = 1;
+	public static final int REJECTED = 2;
+	
+	private final int _messageId, _senderId, _receiverId;
+	private final long _expiration;
+	private String _senderName = null;
+	private String _receiverName = null;
+	private final String _subject, _content;
+	private boolean _unread, _returned;
+	private int _sendBySystem;
+	private boolean _deletedBySender;
+	private boolean _deletedByReceiver;
+	private final long _reqAdena;
+	private boolean _hasAttachments;
+	private Mail _attachments = null;
+	private ScheduledFuture<?> _unloadTask = null;
+	
+	public enum SendBySystem {
+		PLAYER,
+		NEWS,
+		NONE,
+		ALEGRIA
+	}
+	
+	/*
+	 * Constructor for restoring from DB.
+	 */
+	public Message(ResultSet rset) throws SQLException {
+		_messageId = rset.getInt("messageId");
+		_senderId = rset.getInt("senderId");
+		_receiverId = rset.getInt("receiverId");
+		_subject = rset.getString("subject");
+		_content = rset.getString("content");
+		_expiration = rset.getLong("expiration");
+		_reqAdena = rset.getLong("reqAdena");
+		_hasAttachments = rset.getBoolean("hasAttachments");
+		_unread = rset.getBoolean("isUnread");
+		_deletedBySender = rset.getBoolean("isDeletedBySender");
+		_deletedByReceiver = rset.getBoolean("isDeletedByReceiver");
+		_sendBySystem = rset.getInt("sendBySystem");
+		_returned = rset.getBoolean("isReturned");
+	}
+	
+	/*
+	 * This constructor used for creating new message.
+	 */
+	public Message(int senderId, int receiverId, boolean isCod, String subject, String text, long reqAdena) {
+		_messageId = IdFactory.getInstance().getNextId();
+		_senderId = senderId;
+		_receiverId = receiverId;
+		_subject = subject;
+		_content = text;
+		_expiration = (isCod ? System.currentTimeMillis() + (COD_EXPIRATION * 3600000) : System.currentTimeMillis() + (EXPIRATION * 3600000));
+		_hasAttachments = false;
+		_unread = true;
+		_deletedBySender = false;
+		_deletedByReceiver = false;
+		_reqAdena = reqAdena;
+	}
+	
+	/*
+	 * This constructor used for System Mails
+	 */
+	public Message(int receiverId, String subject, String content, SendBySystem sendBySystem) {
+		_messageId = IdFactory.getInstance().getNextId();
+		_senderId = -1;
+		_receiverId = receiverId;
+		_subject = subject;
+		_content = content;
+		_expiration = System.currentTimeMillis() + (EXPIRATION * 3600000);
+		_reqAdena = 0;
+		_hasAttachments = false;
+		_unread = true;
+		_deletedBySender = true;
+		_deletedByReceiver = false;
+		_sendBySystem = sendBySystem.ordinal();
+		_returned = false;
+	}
+	
+	/*
+	 * This constructor used for auto-generation of the "return attachments" message
+	 */
+	public Message(Message msg) {
+		_messageId = IdFactory.getInstance().getNextId();
+		_senderId = msg.getSenderId();
+		_receiverId = msg.getSenderId();
+		_subject = "";
+		_content = "";
+		_expiration = System.currentTimeMillis() + (EXPIRATION * 3600000);
+		_unread = true;
+		_deletedBySender = true;
+		_deletedByReceiver = false;
+		_sendBySystem = SendBySystem.NONE.ordinal();
+		_returned = true;
+		_reqAdena = 0;
+		_hasAttachments = true;
+		_attachments = msg.getAttachments();
+		msg.removeAttachments();
+		_attachments.setNewMessageId(_messageId);
+		_unloadTask = ThreadPoolManager.getInstance().scheduleGeneral(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
+	}
+	
+	public static PreparedStatement getStatement(Message msg, Connection con) throws SQLException {
+		PreparedStatement stmt = con.prepareStatement("INSERT INTO messages (messageId, senderId, receiverId, subject, content, expiration, reqAdena, hasAttachments, isUnread, isDeletedBySender, isDeletedByReceiver, sendBySystem, isReturned) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+		
+		stmt.setInt(1, msg._messageId);
+		stmt.setInt(2, msg._senderId);
+		stmt.setInt(3, msg._receiverId);
+		stmt.setString(4, msg._subject);
+		stmt.setString(5, msg._content);
+		stmt.setLong(6, msg._expiration);
+		stmt.setLong(7, msg._reqAdena);
+		stmt.setBoolean(8, msg._hasAttachments);
+		stmt.setBoolean(9, msg._unread);
+		stmt.setBoolean(10, msg._deletedBySender);
+		stmt.setBoolean(11, msg._deletedByReceiver);
+		stmt.setString(12, String.valueOf(msg._sendBySystem));
+		stmt.setBoolean(13, msg._returned);
+		
+		return stmt;
+	}
+	
+	public final int getId() {
+		return _messageId;
+	}
+	
+	public final int getSenderId() {
+		return _senderId;
+	}
+	
+	public final int getReceiverId() {
+		return _receiverId;
+	}
+	
+	public final String getSenderName() {
+		if (_senderName == null) {
+			if (_sendBySystem != 0) {
+				return "****";
+			}
+			
+			_senderName = CharNameTable.getInstance().getNameById(_senderId);
+			if (_senderName == null) {
+				_senderName = "";
+			}
+		}
+		return _senderName;
+	}
+	
+	public final String getReceiverName() {
+		if (_receiverName == null) {
+			_receiverName = CharNameTable.getInstance().getNameById(_receiverId);
+			if (_receiverName == null) {
+				_receiverName = "";
+			}
+		}
+		return _receiverName;
+	}
+	
+	public final String getSubject() {
+		return _subject;
+	}
+	
+	public final String getContent() {
+		return _content;
+	}
+	
+	public final boolean isLocked() {
+		return _reqAdena > 0;
+	}
+	
+	public final long getExpiration() {
+		return _expiration;
+	}
+	
+	public final int getExpirationSeconds() {
+		return (int) (_expiration / 1000);
+	}
+	
+	public final boolean isUnread() {
+		return _unread;
+	}
+	
+	public final void markAsRead() {
+		if (_unread) {
+			_unread = false;
+			MailManager.getInstance().markAsReadInDb(_messageId);
+		}
+	}
+	
+	public final boolean isDeletedBySender() {
+		return _deletedBySender;
+	}
+	
+	public final void setDeletedBySender() {
+		if (!_deletedBySender) {
+			_deletedBySender = true;
+			if (_deletedByReceiver) {
+				MailManager.getInstance().deleteMessageInDb(_messageId);
+			} else {
+				MailManager.getInstance().markAsDeletedBySenderInDb(_messageId);
+			}
+		}
+	}
+	
+	public final boolean isDeletedByReceiver() {
+		return _deletedByReceiver;
+	}
+	
+	public final void setDeletedByReceiver() {
+		if (!_deletedByReceiver) {
+			_deletedByReceiver = true;
+			if (_deletedBySender) {
+				MailManager.getInstance().deleteMessageInDb(_messageId);
+			} else {
+				MailManager.getInstance().markAsDeletedByReceiverInDb(_messageId);
+			}
+		}
+	}
+	
+	public final int getSendBySystem() {
+		return _sendBySystem;
+	}
+	
+	public final boolean isReturned() {
+		return _returned;
+	}
+	
+	public final void setIsReturned(boolean val) {
+		_returned = val;
+	}
+	
+	public final long getReqAdena() {
+		return _reqAdena;
+	}
+	
+	public final synchronized Mail getAttachments() {
+		if (!_hasAttachments) {
+			return null;
+		}
+		
+		if (_attachments == null) {
+			_attachments = new Mail(_senderId, _messageId);
+			_attachments.restore();
+			_unloadTask = ThreadPoolManager.getInstance().scheduleGeneral(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
+		}
+		return _attachments;
+	}
+	
+	public final boolean hasAttachments() {
+		return _hasAttachments;
+	}
+	
+	public final synchronized void removeAttachments() {
+		if (_attachments != null) {
+			_attachments = null;
+			_hasAttachments = false;
+			MailManager.getInstance().removeAttachmentsInDb(_messageId);
+			if (_unloadTask != null) {
+				_unloadTask.cancel(false);
+			}
+		}
+	}
+	
+	public final synchronized Mail createAttachments() {
+		if (_hasAttachments || (_attachments != null)) {
+			return null;
+		}
+		
+		_attachments = new Mail(_senderId, _messageId);
+		_hasAttachments = true;
+		_unloadTask = ThreadPoolManager.getInstance().scheduleGeneral(new AttachmentsUnloadTask(this), UNLOAD_ATTACHMENTS_INTERVAL + Rnd.get(UNLOAD_ATTACHMENTS_INTERVAL));
+		return _attachments;
+	}
+	
+	protected final synchronized void unloadAttachments() {
+		if (_attachments != null) {
+			_attachments.deleteMe();
+			_attachments = null;
+		}
+	}
+	
+	static class AttachmentsUnloadTask implements Runnable {
+		private Message _msg;
+		
+		AttachmentsUnloadTask(Message msg) {
+			_msg = msg;
+		}
+		
+		@Override
+		public void run() {
+			if (_msg != null) {
+				_msg.unloadAttachments();
+				_msg = null;
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/RecoBonus.java b/src/main/java/com/l2jserver/gameserver/model/entity/RecoBonus.java
new file mode 100644
index 00000000..6e17dee9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/RecoBonus.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public final class RecoBonus {
+	private static final int[][] _recoBonus = {
+		{
+			25,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50
+		},
+		{
+			16,
+			33,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50
+		},
+		{
+			12,
+			25,
+			37,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50
+		},
+		{
+			10,
+			20,
+			30,
+			40,
+			50,
+			50,
+			50,
+			50,
+			50,
+			50
+		},
+		{
+			8,
+			16,
+			25,
+			33,
+			41,
+			50,
+			50,
+			50,
+			50,
+			50
+		},
+		{
+			7,
+			14,
+			21,
+			28,
+			35,
+			42,
+			50,
+			50,
+			50,
+			50
+		},
+		{
+			6,
+			12,
+			18,
+			25,
+			31,
+			37,
+			43,
+			50,
+			50,
+			50
+		},
+		{
+			5,
+			11,
+			16,
+			22,
+			27,
+			33,
+			38,
+			44,
+			50,
+			50
+		},
+		{
+			5,
+			10,
+			15,
+			20,
+			25,
+			30,
+			35,
+			40,
+			45,
+			50
+		}
+	};
+	
+	public static int getRecoBonus(L2PcInstance activeChar) {
+		if ((activeChar != null) && activeChar.isOnline() && (activeChar.getRecSystem().getHave() != 0)) {
+			final int lvl = activeChar.getLevel() / 10;
+			final int exp = (Math.min(100, activeChar.getRecSystem().getHave()) - 1) / 10;
+			
+			return _recoBonus[lvl][exp];
+		}
+		return 0;
+	}
+	
+	public static double getRecoMultiplier(L2PcInstance activeChar) {
+		double multiplier = 1.0;
+		final double bonus = getRecoBonus(activeChar);
+		if (bonus > 0) {
+			multiplier += (bonus / 100);
+		}
+		return multiplier;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/RecommendationSystem.java b/src/main/java/com/l2jserver/gameserver/model/entity/RecommendationSystem.java
new file mode 100644
index 00000000..2d65c89b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/RecommendationSystem.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.Objects;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.tasks.player.RecoBonusTask;
+import com.l2jserver.gameserver.model.actor.tasks.player.RecoGiveTask;
+import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
+
+/**
+ * Recommendation System.
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public class RecommendationSystem {
+	private final L2PcInstance _player;
+	
+	/** Recommendation task time */
+	private int _recoBonusTime;
+	/** number of recommendation obtained by other players */
+	private int _recomHave;
+	/** number of recommendations the player can give to other players. */
+	private int _recomLeft;
+	/** Recommendation task */
+	private ScheduledFuture<?> _recoGiveTask;
+	/** Recommendation Two Hours bonus **/
+	private boolean _recoTwoHoursGiven = false;
+	/** recommendation bonus time end task */
+	private ScheduledFuture<?> _recoBonusTask;
+	/** recommendation bonus time paused by peace zone entrance */
+	private boolean _recoBonusPeacePause = true;
+	/** count of recommendation bonus time pauses by other mechanisms than peace zone entrance */
+	private final AtomicInteger _recoBonusOtherPause = new AtomicInteger(0);
+	
+	public RecommendationSystem(L2PcInstance player) {
+		Objects.requireNonNull(player);
+		_player = player;
+	}
+	
+	/** Update L2PcInstance Recommendations data. */
+	public void store() {
+		DAOFactory.getInstance().getRecommendationBonusDAO().insert(_player, getBonusTime());
+	}
+	
+	/** Start timer to give recommendations left */
+	public void startGiveTask() {
+		if (_recoGiveTask == null) {
+			_recoGiveTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new RecoGiveTask(_player), 7200000, 3600000);
+		}
+	}
+	
+	/** Stop timer to give recommendations left */
+	public void stopGiveTask() {
+		if (_recoGiveTask != null) {
+			_recoGiveTask.cancel(false);
+			_recoGiveTask = null;
+		}
+	}
+	
+	/**
+	 * Method to start the recommentation bonus task. Actions which usually resume the recommendation bonus time just have to call this method, specifying if it is from xpSpGain or other mechanisms.<br>
+	 * <br>
+	 * <b>All checks for the recommendation bonus timer are inside this method, no outside checks allowed!</b>
+	 * @param xpSpGain Whether the start is coming from xpSpGain or other mechanisms.
+	 */
+	public void startBonusTask(boolean xpSpGain) {
+		if (xpSpGain) {
+			_player.debugFeature("RecBonus", "Set peace pause flag to false.");
+			_recoBonusPeacePause = false;
+		} else {
+			int newCount = _recoBonusOtherPause.updateAndGet(i -> i > 0 ? i - 1 : 0);
+			_player.debugFeature("RecBonus", "Decrement count of other pauses to {}", newCount);
+		}
+		
+		if (getBonusTime() <= 0) {
+			_player.debugFeature("RecBonus", "Not scheduling task because bonus time is {}.", getBonusTime());
+			_player.sendPacket(new ExVoteSystemInfo(_player));
+			return;
+		}
+		
+		if (_recoBonusPeacePause) {
+			_player.debugFeature("RecBonus", "Not scheduling task because it was paused by peace.");
+			return;
+		}
+		
+		if (_recoBonusOtherPause.get() > 0) {
+			_player.debugFeature("RecBonus", "Not scheduling task because it was paused by other mechanisms than peace.");
+			return;
+		}
+		
+		if (isBonusTaskActive()) {
+			_player.debugFeature("RecBonus", "Not scheduling task because it was already scheduled.");
+			return;
+		}
+		
+		scheduleBonusTask(getBonusTime());
+		
+		_player.debugFeature("RecBonus", "Starting task.");
+		_player.sendPacket(new ExVoteSystemInfo(_player));
+	}
+	
+	/**
+	 * Method to stop the recommentation bonus task. Actions which usually suspenmd the recommendation bonus time just have to call this method, specifying if it is from entering a pace zone or other mechanisms.<br>
+	 * <br>
+	 * <b>All checks for the recommendation bonus timer are inside this method, no outside checks allowed!</b>
+	 * @param peaceZone Whether the stop is coming from entering a peace zone or other mechanisms.
+	 */
+	public void stopBonusTask(boolean peaceZone) {
+		if (peaceZone) {
+			_player.debugFeature("RecBonus", "Set peace pause flag to true.");
+			_recoBonusPeacePause = true;
+		} else {
+			int newCount = _recoBonusOtherPause.incrementAndGet();
+			_player.debugFeature("RecBonus", "Increment count of other pauses to {}", newCount);
+		}
+		
+		if (!isBonusTaskActive()) {
+			_player.debugFeature("RecBonus", "Not stopping task because it is not started.");
+			_player.sendPacket(new ExVoteSystemInfo(_player));
+			return;
+		}
+		
+		int remainingTime = getBonusTime();
+		cancelBonusTask();
+		setBonusTime(remainingTime);
+		
+		_player.debugFeature("RecBonus", "Stopping task.");
+		_player.sendPacket(new ExVoteSystemInfo(_player));
+	}
+	
+	/**
+	 * Method to be called by task which gets fired when the recommendation bonus time is up.
+	 */
+	public void finishBonusTask() {
+		cancelBonusTask();
+		setBonusTime(0);
+		
+		_player.debugFeature("RecBonus", "Finishing task.");
+		_player.sendPacket(new ExVoteSystemInfo(_player));
+	}
+	
+	/**
+	 * Give a recommendation to another player.
+	 * @param target the target to recommend
+	 */
+	public void give(L2PcInstance target) {
+		target.getRecSystem().incHave();
+		decLeft();
+	}
+	
+	/** Increment the number of recommendation received by other player */
+	protected void incHave() {
+		if (_recomHave < 255) {
+			_recomHave++;
+		}
+	}
+	
+	/** Decrement the number of recommendation that the player can give. */
+	protected void decLeft() {
+		if (_recomLeft > 0) {
+			_recomLeft--;
+		}
+	}
+	
+	/**
+	 * Set the number of recommendations received by other players
+	 * @param value recommendations received by other players
+	 */
+	public void setHave(int value) {
+		_recomHave = Math.min(Math.max(value, 0), 255);
+	}
+	
+	/**
+	 * Set the number of recommendations the player can give to other players
+	 * @param value recommendations the player can give to other players
+	 */
+	public void setLeft(int value) {
+		_recomLeft = Math.min(Math.max(value, 0), 255);
+	}
+	
+	public void setTwoHoursGiven(boolean val) {
+		_recoTwoHoursGiven = val;
+	}
+	
+	public void setBonusTime(int time) {
+		if (isBonusTaskActive()) {
+			cancelBonusTask();
+			scheduleBonusTask(time);
+		}
+		
+		_recoBonusTime = time;
+	}
+	
+	/** @return remaining recommendation bonus time */
+	public int getBonusTime() {
+		if (isBonusTaskActive()) {
+			return (int) Math.max(0, _recoBonusTask.getDelay(TimeUnit.SECONDS));
+		}
+		
+		return _recoBonusTime;
+	}
+	
+	/** @return recommendation bonus percentage */
+	public int getBonus() {
+		return (getBonusTime() > 0) || _player.hasAbnormalTypeVote() ? RecoBonus.getRecoBonus(_player) : 0;
+	}
+	
+	/** @return recommendations received by other players */
+	public int getHave() {
+		return _recomHave;
+	}
+	
+	/** @return recommendations the player can give to other players */
+	public int getLeft() {
+		return _recomLeft;
+	}
+	
+	/** @return Whether the recommendation bonus timer is paused */
+	public boolean isBonusPaused() {
+		return ((getBonusTime() > 0) && _recoBonusPeacePause) || (_recoBonusOtherPause.get() > 0);
+	}
+	
+	/** @return Whether the recommendation bonus end timer was scheduled */
+	public boolean isBonusTaskActive() {
+		return (_recoBonusTask != null) && !_recoBonusTask.isCancelled() && !_recoBonusTask.isDone();
+	}
+	
+	public boolean isTwoHoursGiven() {
+		return _recoTwoHoursGiven;
+	}
+	
+	private void scheduleBonusTask(int delay) {
+		_recoBonusTask = ThreadPoolManager.getInstance().scheduleGeneral(new RecoBonusTask(_player), delay * 1000);
+	}
+	
+	private void cancelBonusTask() {
+		_recoBonusTask.cancel(true);
+		_recoBonusTask = null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Siegable.java b/src/main/java/com/l2jserver/gameserver/model/entity/Siegable.java
new file mode 100644
index 00000000..c85102f6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Siegable.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.Calendar;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author JIV
+ */
+public interface Siegable {
+	void startSiege();
+	
+	void endSiege();
+	
+	L2SiegeClan getAttackerClan(int clanId);
+	
+	L2SiegeClan getAttackerClan(L2Clan clan);
+	
+	List<L2SiegeClan> getAttackerClans();
+	
+	List<L2PcInstance> getAttackersInZone();
+	
+	boolean checkIsAttacker(L2Clan clan);
+	
+	L2SiegeClan getDefenderClan(int clanId);
+	
+	L2SiegeClan getDefenderClan(L2Clan clan);
+	
+	List<L2SiegeClan> getDefenderClans();
+	
+	boolean checkIsDefender(L2Clan clan);
+	
+	List<L2Npc> getFlag(L2Clan clan);
+	
+	Calendar getSiegeDate();
+	
+	boolean giveFame();
+	
+	int getFameFrequency();
+	
+	int getFameAmount();
+	
+	void updateSiege();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/Siege.java b/src/main/java/com/l2jserver/gameserver/model/entity/Siege.java
new file mode 100644
index 00000000..f4273af2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/Siege.java
@@ -0,0 +1,1372 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.SiegeScheduleData;
+import com.l2jserver.gameserver.enums.SiegeTeleportWhoType;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.MercTicketManager;
+import com.l2jserver.gameserver.instancemanager.SiegeGuardManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.SiegeScheduleDate;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.TowerSpawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2ControlTowerInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2FlameTowerInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeFinish;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeOwnerChange;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeStart;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.RelationChanged;
+import com.l2jserver.gameserver.network.serverpackets.SiegeInfo;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.Broadcast;
+
+public class Siege implements Siegable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Siege.class);
+	
+	public static final byte OWNER = -1;
+	public static final byte DEFENDER = 0;
+	public static final byte ATTACKER = 1;
+	public static final byte DEFENDER_NOT_APPROVED = 2;
+	
+	private int _controlTowerCount;
+	
+	public class ScheduleEndSiegeTask implements Runnable {
+		private final Castle _castleInst;
+		
+		public ScheduleEndSiegeTask(Castle pCastle) {
+			_castleInst = pCastle;
+		}
+		
+		@Override
+		public void run() {
+			if (!isInProgress()) {
+				return;
+			}
+			
+			long timeRemaining = _siegeEndDate.getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+			if (timeRemaining > 3600000) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HOURS_UNTIL_SIEGE_CONCLUSION);
+				sm.addInt(2);
+				announceToPlayer(sm, true);
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left.
+			} else if (timeRemaining > 600000) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION);
+				sm.addInt((int) timeRemaining / 60000);
+				announceToPlayer(sm, true);
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
+			} else if (timeRemaining > 300000) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION);
+				sm.addInt((int) timeRemaining / 60000);
+				announceToPlayer(sm, true);
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
+			} else if (timeRemaining > 10000) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION);
+				sm.addInt((int) timeRemaining / 60000);
+				announceToPlayer(sm, true);
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
+			} else if (timeRemaining > 0) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CASTLE_SIEGE_S1_SECONDS_LEFT);
+				sm.addInt((int) timeRemaining / 1000);
+				announceToPlayer(sm, true);
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
+			} else {
+				_castleInst.getSiege().endSiege();
+			}
+		}
+	}
+	
+	public class ScheduleStartSiegeTask implements Runnable {
+		private final Castle _castleInst;
+		
+		public ScheduleStartSiegeTask(Castle pCastle) {
+			_castleInst = pCastle;
+		}
+		
+		@Override
+		public void run() {
+			_scheduledStartSiegeTask.cancel(false);
+			if (isInProgress()) {
+				return;
+			}
+			
+			if (!getIsTimeRegistrationOver()) {
+				long regTimeRemaining = getTimeRegistrationOverDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+				if (regTimeRemaining > 0) {
+					_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), regTimeRemaining);
+					return;
+				}
+				endTimeRegistration(true);
+			}
+			
+			long timeRemaining = getSiegeDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis();
+			if (timeRemaining > 86400000) {
+				_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 86400000); // Prepare task for 24 before siege start to end registration
+			} else if (timeRemaining > 13600000) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REGISTRATION_TERM_FOR_S1_ENDED);
+				sm.addCastleId(getCastle().getResidenceId());
+				Broadcast.toAllOnlinePlayers(sm);
+				_isRegistrationOver = true;
+				clearSiegeWaitingClan();
+				_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 13600000); // Prepare task for 1 hr left before siege start.
+			} else if (timeRemaining > 600000) {
+				_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
+			} else if (timeRemaining > 300000) {
+				_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
+			} else if (timeRemaining > 10000) {
+				_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
+			} else if (timeRemaining > 0) {
+				_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
+			} else {
+				_castleInst.getSiege().startSiege();
+			}
+		}
+	}
+	
+	// must support Concurrent Modifications
+	private final List<L2SiegeClan> _attackerClans = new CopyOnWriteArrayList<>();
+	private final List<L2SiegeClan> _defenderClans = new CopyOnWriteArrayList<>();
+	private final List<L2SiegeClan> _defenderWaitingClans = new CopyOnWriteArrayList<>();
+	
+	// Castle setting
+	private final List<L2ControlTowerInstance> _controlTowers = new ArrayList<>();
+	private final List<L2FlameTowerInstance> _flameTowers = new ArrayList<>();
+	private final Castle _castle;
+	private boolean _isInProgress = false;
+	private boolean _isNormalSide = true; // true = Atk is Atk, false = Atk is Def
+	protected boolean _isRegistrationOver = false;
+	protected Calendar _siegeEndDate;
+	private SiegeGuardManager _siegeGuardManager;
+	protected ScheduledFuture<?> _scheduledStartSiegeTask = null;
+	protected int _firstOwnerClanId = -1;
+	
+	public Siege(Castle castle) {
+		_castle = castle;
+		_siegeGuardManager = new SiegeGuardManager(getCastle());
+		
+		startAutoTask();
+	}
+	
+	@Override
+	public void endSiege() {
+		if (isInProgress()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_OF_S1_HAS_ENDED);
+			sm.addCastleId(getCastle().getResidenceId());
+			Broadcast.toAllOnlinePlayers(sm);
+			
+			if (getCastle().getOwnerId() > 0) {
+				L2Clan clan = ClanTable.getInstance().getClan(getCastle().getOwnerId());
+				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_VICTORIOUS_OVER_S2_S_SIEGE);
+				sm.addString(clan.getName());
+				sm.addCastleId(getCastle().getResidenceId());
+				Broadcast.toAllOnlinePlayers(sm);
+				
+				if (clan.getId() == _firstOwnerClanId) {
+					// Owner is unchanged
+					clan.increaseBloodAllianceCount();
+				} else {
+					getCastle().setTicketBuyCount(0);
+					for (L2ClanMember member : clan.getMembers()) {
+						if (member != null) {
+							L2PcInstance player = member.getPlayerInstance();
+							if ((player != null) && player.isNoble()) {
+								Hero.getInstance().setCastleTaken(player.getObjectId(), getCastle().getResidenceId());
+							}
+						}
+					}
+				}
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_S1_DRAW);
+				sm.addCastleId(getCastle().getResidenceId());
+				Broadcast.toAllOnlinePlayers(sm);
+			}
+			
+			for (L2SiegeClan attackerClan : getAttackerClans()) {
+				final L2Clan clan = ClanTable.getInstance().getClan(attackerClan.getClanId());
+				if (clan == null) {
+					continue;
+				}
+				
+				clan.clearSiegeKills();
+				clan.clearSiegeDeaths();
+			}
+			
+			for (L2SiegeClan defenderClan : getDefenderClans()) {
+				final L2Clan clan = ClanTable.getInstance().getClan(defenderClan.getClanId());
+				if (clan == null) {
+					continue;
+				}
+				
+				clan.clearSiegeKills();
+				clan.clearSiegeDeaths();
+			}
+			
+			getCastle().updateClansReputation();
+			removeFlags(); // Removes all flags. Note: Remove flag before teleporting players
+			teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the second closest town
+			_isInProgress = false; // Flag so that siege instance can be started
+			updatePlayerSiegeStateFlags(true);
+			saveCastleSiege(); // Save castle specific data
+			clearSiegeClan(); // Clear siege clan from db
+			removeTowers(); // Remove all towers from this castle
+			_siegeGuardManager.unspawnSiegeGuard(); // Remove all spawned siege guard from this castle
+			if (getCastle().getOwnerId() > 0) {
+				_siegeGuardManager.removeMercs();
+			}
+			getCastle().spawnDoor(); // Respawn door to castle
+			getCastle().getZone().setIsActive(false);
+			getCastle().getZone().updateZoneStatusForCharactersInside();
+			getCastle().getZone().setSiegeInstance(null);
+			
+			// Notify to scripts.
+			EventDispatcher.getInstance().notifyEventAsync(new CastleSiegeFinish(this), getCastle());
+		}
+	}
+	
+	private void removeDefender(L2SiegeClan sc) {
+		if (sc != null) {
+			getDefenderClans().remove(sc);
+		}
+	}
+	
+	private void removeAttacker(L2SiegeClan sc) {
+		if (sc != null) {
+			getAttackerClans().remove(sc);
+		}
+	}
+	
+	private void addDefender(L2SiegeClan sc, SiegeClanType type) {
+		if (sc == null) {
+			return;
+		}
+		sc.setType(type);
+		getDefenderClans().add(sc);
+	}
+	
+	private void addAttacker(L2SiegeClan sc) {
+		if (sc == null) {
+			return;
+		}
+		sc.setType(SiegeClanType.ATTACKER);
+		getAttackerClans().add(sc);
+	}
+	
+	/**
+	 * When control of castle changed during siege.
+	 */
+	public void midVictory() {
+		// Siege still in progress
+		if (isInProgress()) {
+			if (getCastle().getOwnerId() > 0) {
+				_siegeGuardManager.removeMercs(); // Remove all merc entry from db
+			}
+			
+			// If defender doesn't exist (Pc vs Npc) and only 1 attacker
+			if (getDefenderClans().isEmpty() && (getAttackerClans().size() == 1)) {
+				L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId());
+				removeAttacker(sc_newowner);
+				addDefender(sc_newowner, SiegeClanType.OWNER);
+				endSiege();
+				return;
+			}
+			if (getCastle().getOwnerId() > 0) {
+				int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId();
+				// If defender doesn't exist (Pc vs Npc) and only an alliance attacks
+				if (getDefenderClans().isEmpty()) {
+					// The player's clan is in an alliance
+					if (allyId != 0) {
+						boolean allinsamealliance = true;
+						for (L2SiegeClan sc : getAttackerClans()) {
+							if (sc != null) {
+								if (ClanTable.getInstance().getClan(sc.getClanId()).getAllyId() != allyId) {
+									allinsamealliance = false;
+								}
+							}
+						}
+						if (allinsamealliance) {
+							L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId());
+							removeAttacker(sc_newowner);
+							addDefender(sc_newowner, SiegeClanType.OWNER);
+							endSiege();
+							return;
+						}
+					}
+				}
+				
+				for (L2SiegeClan sc : getDefenderClans()) {
+					if (sc != null) {
+						removeDefender(sc);
+						addAttacker(sc);
+					}
+				}
+				
+				L2SiegeClan sc_newowner = getAttackerClan(getCastle().getOwnerId());
+				removeAttacker(sc_newowner);
+				addDefender(sc_newowner, SiegeClanType.OWNER);
+				
+				// The player's clan is in an alliance
+				for (L2Clan clan : ClanTable.getInstance().getClanAllies(allyId)) {
+					final L2SiegeClan sc = getAttackerClan(clan.getId());
+					if (sc != null) {
+						removeAttacker(sc);
+						addDefender(sc, SiegeClanType.DEFENDER);
+					}
+				}
+				teleportPlayer(SiegeTeleportWhoType.Attacker, TeleportWhereType.SIEGEFLAG); // Teleport to the second closest town
+				teleportPlayer(SiegeTeleportWhoType.Spectator, TeleportWhereType.TOWN); // Teleport to the second closest town
+				
+				removeDefenderFlags(); // Removes defenders' flags
+				getCastle().removeUpgrade(); // Remove all castle upgrade
+				getCastle().spawnDoor(true); // Respawn door to castle but make them weaker (50% hp)
+				removeTowers(); // Remove all towers from this castle
+				_controlTowerCount = 0;// Each new siege midvictory CT are completely respawned.
+				spawnControlTower();
+				spawnFlameTower();
+				updatePlayerSiegeStateFlags(false);
+				
+				// Notify to scripts.
+				EventDispatcher.getInstance().notifyEventAsync(new CastleSiegeOwnerChange(this), getCastle());
+			}
+		}
+	}
+	
+	@Override
+	public void startSiege() {
+		if (!isInProgress()) {
+			_firstOwnerClanId = getCastle().getOwnerId();
+			
+			if (getAttackerClans().isEmpty()) {
+				SystemMessage sm;
+				if (_firstOwnerClanId <= 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SIEGE_WAS_CANCELED_BECAUSE_NO_CLANS_PARTICIPATED);
+					final L2Clan ownerClan = ClanTable.getInstance().getClan(_firstOwnerClanId);
+					ownerClan.increaseBloodAllianceCount();
+				}
+				sm.addCastleId(getCastle().getResidenceId());
+				Broadcast.toAllOnlinePlayers(sm);
+				saveCastleSiege();
+				return;
+			}
+			
+			_isNormalSide = true; // Atk is now atk
+			_isInProgress = true; // Flag so that same siege instance cannot be started again
+			
+			loadSiegeClan(); // Load siege clan from db
+			updatePlayerSiegeStateFlags(false);
+			teleportPlayer(SiegeTeleportWhoType.NotOwner, TeleportWhereType.TOWN); // Teleport to the closest town
+			_controlTowerCount = 0;
+			spawnControlTower(); // Spawn control tower
+			spawnFlameTower(); // Spawn control tower
+			getCastle().spawnDoor(); // Spawn door
+			spawnSiegeGuard(); // Spawn siege guard
+			MercTicketManager.getInstance().deleteTickets(getCastle().getResidenceId()); // remove the tickets from the ground
+			getCastle().getZone().setSiegeInstance(this);
+			getCastle().getZone().setIsActive(true);
+			getCastle().getZone().updateZoneStatusForCharactersInside();
+			
+			// Schedule a task to prepare auto siege end
+			_siegeEndDate = Calendar.getInstance();
+			_siegeEndDate.add(Calendar.MINUTE, SiegeManager.getInstance().getSiegeLength());
+			ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(getCastle()), 1000); // Prepare auto end task
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_OF_S1_HAS_STARTED);
+			sm.addCastleId(getCastle().getResidenceId());
+			Broadcast.toAllOnlinePlayers(sm);
+			
+			// Notify to scripts.
+			EventDispatcher.getInstance().notifyEventAsync(new CastleSiegeStart(this), getCastle());
+		}
+	}
+	
+	/**
+	 * Announce to player.
+	 * @param message The SystemMessage to send to player
+	 * @param bothSides True - broadcast to both attackers and defenders. False - only to defenders.
+	 */
+	public void announceToPlayer(SystemMessage message, boolean bothSides) {
+		for (L2SiegeClan siegeClans : getDefenderClans()) {
+			L2Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				member.sendPacket(message);
+			}
+		}
+		
+		if (bothSides) {
+			for (L2SiegeClan siegeClans : getAttackerClans()) {
+				L2Clan clan = ClanTable.getInstance().getClan(siegeClans.getClanId());
+				for (L2PcInstance member : clan.getOnlineMembers(0)) {
+					if (member != null) {
+						member.sendPacket(message);
+					}
+				}
+			}
+		}
+	}
+	
+	public void updatePlayerSiegeStateFlags(boolean clear) {
+		L2Clan clan;
+		for (L2SiegeClan siegeclan : getAttackerClans()) {
+			if (siegeclan == null) {
+				continue;
+			}
+			
+			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				if (clear) {
+					member.setSiegeState((byte) 0);
+					member.setSiegeSide(0);
+					member.setIsInSiege(false);
+					member.stopFameTask();
+				} else {
+					member.setSiegeState((byte) 1);
+					member.setSiegeSide(getCastle().getResidenceId());
+					if (checkIfInZone(member)) {
+						member.setIsInSiege(true);
+						member.startFameTask(character().getCastleZoneFameTaskFrequency(), character().getCastleZoneFameAcquirePoints());
+					}
+				}
+				member.sendPacket(new UserInfo(member));
+				member.sendPacket(new ExBrExtraUserInfo(member));
+				for (L2PcInstance player : member.getKnownList().getKnownPlayers().values()) {
+					if (player == null) {
+						continue;
+					}
+					
+					player.sendPacket(new RelationChanged(member, member.getRelation(player), member.isAutoAttackable(player)));
+					if (member.hasSummon()) {
+						player.sendPacket(new RelationChanged(member.getSummon(), member.getRelation(player), member.isAutoAttackable(player)));
+					}
+				}
+			}
+		}
+		for (L2SiegeClan siegeclan : getDefenderClans()) {
+			if (siegeclan == null) {
+				continue;
+			}
+			
+			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			for (L2PcInstance member : clan.getOnlineMembers(0)) {
+				if (member == null) {
+					continue;
+				}
+				
+				if (clear) {
+					member.setSiegeState((byte) 0);
+					member.setSiegeSide(0);
+					member.setIsInSiege(false);
+					member.stopFameTask();
+				} else {
+					member.setSiegeState((byte) 2);
+					member.setSiegeSide(getCastle().getResidenceId());
+					if (checkIfInZone(member)) {
+						member.setIsInSiege(true);
+						member.startFameTask(character().getCastleZoneFameTaskFrequency(), character().getCastleZoneFameAcquirePoints());
+					}
+				}
+				member.sendPacket(new UserInfo(member));
+				member.sendPacket(new ExBrExtraUserInfo(member));
+				
+				for (L2PcInstance player : member.getKnownList().getKnownPlayers().values()) {
+					if (player == null) {
+						continue;
+					}
+					player.sendPacket(new RelationChanged(member, member.getRelation(player), member.isAutoAttackable(player)));
+					if (member.hasSummon()) {
+						player.sendPacket(new RelationChanged(member.getSummon(), member.getRelation(player), member.isAutoAttackable(player)));
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Approve clan as defender for siege<BR>
+	 * <BR>
+	 * @param clanId The int of player's clan id
+	 */
+	public void approveSiegeDefenderClan(int clanId) {
+		if (clanId <= 0) {
+			return;
+		}
+		saveSiegeClan(ClanTable.getInstance().getClan(clanId), DEFENDER, true);
+		loadSiegeClan();
+	}
+	
+	/**
+	 * @param object
+	 * @return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(L2Object object) {
+		return checkIfInZone(object.getX(), object.getY(), object.getZ());
+	}
+	
+	/**
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @return true if object is inside the zone
+	 */
+	public boolean checkIfInZone(int x, int y, int z) {
+		return (isInProgress() && (getCastle().checkIfInZone(x, y, z))); // Castle zone during siege
+	}
+	
+	/**
+	 * Return true if clan is attacker<BR>
+	 * <BR>
+	 * @param clan The L2Clan of the player
+	 */
+	@Override
+	public boolean checkIsAttacker(L2Clan clan) {
+		return (getAttackerClan(clan) != null);
+	}
+	
+	/**
+	 * Return true if clan is defender<BR>
+	 * <BR>
+	 * @param clan The L2Clan of the player
+	 */
+	@Override
+	public boolean checkIsDefender(L2Clan clan) {
+		return (getDefenderClan(clan) != null);
+	}
+	
+	/**
+	 * @param clan The L2Clan of the player
+	 * @return true if clan is defender waiting approval
+	 */
+	public boolean checkIsDefenderWaiting(L2Clan clan) {
+		return (getDefenderWaitingClan(clan) != null);
+	}
+	
+	/** Clear all registered siege clans from database for castle */
+	public void clearSiegeClan() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=?")) {
+			ps.setInt(1, getCastle().getResidenceId());
+			ps.execute();
+			
+			if (getCastle().getOwnerId() > 0) {
+				try (var delete = con.prepareStatement("DELETE FROM siege_clans WHERE clan_id=?")) {
+					delete.setInt(1, getCastle().getOwnerId());
+					delete.execute();
+				}
+			}
+			
+			getAttackerClans().clear();
+			getDefenderClans().clear();
+			getDefenderWaitingClans().clear();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error clearing siege clans!", ex);
+		}
+	}
+	
+	/** Clear all siege clans waiting for approval from database for castle */
+	public void clearSiegeWaitingClan() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and type = 2")) {
+			ps.setInt(1, getCastle().getResidenceId());
+			ps.execute();
+			
+			getDefenderWaitingClans().clear();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error clearing siege waiting clans!", ex);
+		}
+	}
+	
+	/** Return list of L2PcInstance registered as attacker in the zone. */
+	@Override
+	public List<L2PcInstance> getAttackersInZone() {
+		List<L2PcInstance> players = new ArrayList<>();
+		L2Clan clan;
+		for (L2SiegeClan siegeclan : getAttackerClans()) {
+			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			for (L2PcInstance player : clan.getOnlineMembers(0)) {
+				if (player.isInSiege()) {
+					players.add(player);
+				}
+			}
+		}
+		return players;
+	}
+	
+	/**
+	 * @return list of L2PcInstance in the zone.
+	 */
+	public List<L2PcInstance> getPlayersInZone() {
+		return getCastle().getZone().getPlayersInside();
+	}
+	
+	/**
+	 * @return list of L2PcInstance owning the castle in the zone.
+	 */
+	public List<L2PcInstance> getOwnersInZone() {
+		List<L2PcInstance> players = new ArrayList<>();
+		L2Clan clan;
+		for (L2SiegeClan siegeclan : getDefenderClans()) {
+			clan = ClanTable.getInstance().getClan(siegeclan.getClanId());
+			if (clan.getId() != getCastle().getOwnerId()) {
+				continue;
+			}
+			for (L2PcInstance player : clan.getOnlineMembers(0)) {
+				if (player.isInSiege()) {
+					players.add(player);
+				}
+			}
+		}
+		return players;
+	}
+	
+	/**
+	 * @return list of L2PcInstance not registered as attacker or defender in the zone.
+	 */
+	public List<L2PcInstance> getSpectatorsInZone() {
+		List<L2PcInstance> players = new ArrayList<>();
+		
+		for (L2PcInstance player : getCastle().getZone().getPlayersInside()) {
+			if (player == null) {
+				continue;
+			}
+			
+			if (!player.isInSiege()) {
+				players.add(player);
+			}
+		}
+		return players;
+	}
+	
+	/**
+	 * Control Tower was killed
+	 * @param ct
+	 */
+	public void killedCT(L2Npc ct) {
+		_controlTowerCount--;
+		if (_controlTowerCount < 0) {
+			_controlTowerCount = 0;
+		}
+	}
+	
+	/**
+	 * Remove the flag that was killed
+	 * @param flag
+	 */
+	public void killedFlag(L2Npc flag) {
+		if (flag == null) {
+			return;
+		}
+		for (L2SiegeClan clan : getAttackerClans()) {
+			if (clan.removeFlag(flag)) {
+				return;
+			}
+		}
+	}
+	
+	/**
+	 * Display list of registered clans
+	 * @param player
+	 */
+	public void listRegisterClan(L2PcInstance player) {
+		player.sendPacket(new SiegeInfo(getCastle()));
+	}
+	
+	/**
+	 * Register clan as attacker<BR>
+	 * <BR>
+	 * @param player The L2PcInstance of the player trying to register
+	 */
+	public void registerAttacker(L2PcInstance player) {
+		registerAttacker(player, false);
+	}
+	
+	public void registerAttacker(L2PcInstance player, boolean force) {
+		if (player.getClan() == null) {
+			return;
+		}
+		int allyId = 0;
+		if (getCastle().getOwnerId() != 0) {
+			allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId();
+		}
+		if (allyId != 0) {
+			if ((player.getClan().getAllyId() == allyId) && !force) {
+				player.sendPacket(SystemMessageId.CANNOT_ATTACK_ALLIANCE_CASTLE);
+				return;
+			}
+		}
+		
+		if (force) {
+			if (SiegeManager.getInstance().checkIsRegistered(player.getClan(), getCastle().getResidenceId())) {
+				player.sendPacket(SystemMessageId.ALREADY_REQUESTED_SIEGE_BATTLE);
+			} else {
+				saveSiegeClan(player.getClan(), ATTACKER, false); // Save to database
+			}
+			return;
+		}
+		
+		if (checkIfCanRegister(player, ATTACKER)) {
+			saveSiegeClan(player.getClan(), ATTACKER, false); // Save to database
+		}
+	}
+	
+	/**
+	 * Register a clan as defender.
+	 * @param player the player to register
+	 */
+	public void registerDefender(L2PcInstance player) {
+		registerDefender(player, false);
+	}
+	
+	public void registerDefender(L2PcInstance player, boolean force) {
+		if (getCastle().getOwnerId() <= 0) {
+			player.sendMessage("You cannot register as a defender because " + getCastle().getName() + " is owned by NPC.");
+			return;
+		}
+		
+		if (force) {
+			if (SiegeManager.getInstance().checkIsRegistered(player.getClan(), getCastle().getResidenceId())) {
+				player.sendPacket(SystemMessageId.ALREADY_REQUESTED_SIEGE_BATTLE);
+			} else {
+				saveSiegeClan(player.getClan(), DEFENDER_NOT_APPROVED, false); // Save to database
+			}
+			return;
+		}
+		
+		if (checkIfCanRegister(player, DEFENDER_NOT_APPROVED)) {
+			saveSiegeClan(player.getClan(), DEFENDER_NOT_APPROVED, false); // Save to database
+		}
+	}
+	
+	/**
+	 * Remove clan from siege<BR>
+	 * <BR>
+	 * @param clanId The int of player's clan id
+	 */
+	public void removeSiegeClan(int clanId) {
+		if (clanId <= 0) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM siege_clans WHERE castle_id=? and clan_id=?")) {
+			ps.setInt(1, getCastle().getResidenceId());
+			ps.setInt(2, clanId);
+			ps.execute();
+			
+			loadSiegeClan();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error removing clan from siege!", ex);
+		}
+	}
+	
+	/**
+	 * Remove clan from siege.
+	 * @param clan clan being removed
+	 */
+	public void removeSiegeClan(L2Clan clan) {
+		if ((clan == null) || (clan.getCastleId() == getCastle().getResidenceId()) || !SiegeManager.getInstance().checkIsRegistered(clan, getCastle().getResidenceId())) {
+			return;
+		}
+		removeSiegeClan(clan.getId());
+	}
+	
+	/**
+	 * Remove clan from siege<BR>
+	 * <BR>
+	 * @param player The L2PcInstance of player/clan being removed
+	 */
+	public void removeSiegeClan(L2PcInstance player) {
+		removeSiegeClan(player.getClan());
+	}
+	
+	public void startAutoTask() {
+		correctSiegeDateTime();
+		
+		LOG.info("Siege of {}: {}.", getCastle().getName(), getCastle().getSiegeDate().getTime());
+		
+		loadSiegeClan();
+		
+		// Schedule siege auto start
+		if (_scheduledStartSiegeTask != null) {
+			_scheduledStartSiegeTask.cancel(false);
+		}
+		_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
+	}
+	
+	/**
+	 * Teleport players
+	 * @param teleportWho
+	 * @param teleportWhere
+	 */
+	public void teleportPlayer(SiegeTeleportWhoType teleportWho, TeleportWhereType teleportWhere) {
+		final List<L2PcInstance> players;
+		switch (teleportWho) {
+			case Owner -> players = getOwnersInZone();
+			case NotOwner -> {
+				players = getPlayersInZone();
+				players.removeIf(player -> (player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId())));
+			}
+			case Attacker -> players = getAttackersInZone();
+			case Spectator -> players = getSpectatorsInZone();
+			default -> players = Collections.emptyList();
+		}
+		
+		for (L2PcInstance player : players) {
+			if (player.canOverrideCond(PcCondOverride.CASTLE_CONDITIONS) || player.isJailed()) {
+				continue;
+			}
+			player.teleToLocation(teleportWhere);
+		}
+	}
+	
+	/**
+	 * Add clan as attacker.
+	 * @param clanId The int of clan's id
+	 */
+	private void addAttacker(int clanId) {
+		getAttackerClans().add(new L2SiegeClan(clanId, SiegeClanType.ATTACKER)); // Add registered attacker to attacker list
+	}
+	
+	/**
+	 * Add clan as defender<BR>
+	 * <BR>
+	 * @param clanId The int of clan's id
+	 */
+	private void addDefender(int clanId) {
+		getDefenderClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER)); // Add registered defender to defender list
+	}
+	
+	/**
+	 * <p>
+	 * Add clan as defender with the specified type
+	 * </p>
+	 * @param clanId The int of clan's id
+	 * @param type the type of the clan
+	 */
+	private void addDefender(int clanId, SiegeClanType type) {
+		getDefenderClans().add(new L2SiegeClan(clanId, type));
+	}
+	
+	/**
+	 * Add clan as defender waiting approval<BR>
+	 * <BR>
+	 * @param clanId The int of clan's id
+	 */
+	private void addDefenderWaiting(int clanId) {
+		getDefenderWaitingClans().add(new L2SiegeClan(clanId, SiegeClanType.DEFENDER_PENDING)); // Add registered defender to defender list
+	}
+	
+	/**
+	 * @param player The L2PcInstance of the player trying to register
+	 * @param typeId -1 = owner 0 = defender, 1 = attacker, 2 = defender waiting
+	 * @return true if the player can register.
+	 */
+	private boolean checkIfCanRegister(L2PcInstance player, byte typeId) {
+		if (getIsRegistrationOver()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DEADLINE_FOR_SIEGE_S1_PASSED);
+			sm.addCastleId(getCastle().getResidenceId());
+			player.sendPacket(sm);
+		} else if (isInProgress()) {
+			player.sendPacket(SystemMessageId.NOT_SIEGE_REGISTRATION_TIME2);
+		} else if ((player.getClan() == null) || (player.getClan().getLevel() < SiegeManager.getInstance().getSiegeClanMinLevel())) {
+			player.sendPacket(SystemMessageId.ONLY_CLAN_LEVEL_5_ABOVE_MAY_SIEGE);
+		} else if (player.getClan().getId() == getCastle().getOwnerId()) {
+			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING);
+		} else if (player.getClan().getCastleId() > 0) {
+			player.sendPacket(SystemMessageId.CLAN_THAT_OWNS_CASTLE_CANNOT_PARTICIPATE_OTHER_SIEGE);
+		} else if (SiegeManager.getInstance().checkIsRegistered(player.getClan(), getCastle().getResidenceId())) {
+			player.sendPacket(SystemMessageId.ALREADY_REQUESTED_SIEGE_BATTLE);
+		} else if (checkIfAlreadyRegisteredForSameDay(player.getClan())) {
+			player.sendPacket(SystemMessageId.APPLICATION_DENIED_BECAUSE_ALREADY_SUBMITTED_A_REQUEST_FOR_ANOTHER_SIEGE_BATTLE);
+		} else if ((typeId == ATTACKER) && (getAttackerClans().size() >= SiegeManager.getInstance().getAttackerMaxClans())) {
+			player.sendPacket(SystemMessageId.ATTACKER_SIDE_FULL);
+		} else if (((typeId == DEFENDER) || (typeId == DEFENDER_NOT_APPROVED) || (typeId == OWNER)) && ((getDefenderClans().size() + getDefenderWaitingClans().size()) >= SiegeManager.getInstance().getDefenderMaxClans())) {
+			player.sendPacket(SystemMessageId.DEFENDER_SIDE_FULL);
+		} else {
+			return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * @param clan The L2Clan of the player trying to register
+	 * @return true if the clan has already registered to a siege for the same day.
+	 */
+	public boolean checkIfAlreadyRegisteredForSameDay(L2Clan clan) {
+		for (Siege siege : SiegeManager.getInstance().getSieges()) {
+			if (siege == this) {
+				continue;
+			}
+			if (siege.getSiegeDate().get(Calendar.DAY_OF_WEEK) == getSiegeDate().get(Calendar.DAY_OF_WEEK)) {
+				if (siege.checkIsAttacker(clan)) {
+					return true;
+				}
+				if (siege.checkIsDefender(clan)) {
+					return true;
+				}
+				if (siege.checkIsDefenderWaiting(clan)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Return the correct siege date as Calendar.<BR>
+	 * <BR>
+	 */
+	public void correctSiegeDateTime() {
+		boolean corrected = false;
+		
+		if (getCastle().getSiegeDate().getTimeInMillis() < Calendar.getInstance().getTimeInMillis()) {
+			// Since siege has past reschedule it to the next one
+			// This is usually caused by server being down
+			corrected = true;
+			setNextSiegeDate();
+		}
+		
+		if (corrected) {
+			saveSiegeDate();
+		}
+	}
+	
+	/** Load siege clans. */
+	private void loadSiegeClan() {
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT clan_id,type FROM siege_clans where castle_id=?")) {
+			getAttackerClans().clear();
+			getDefenderClans().clear();
+			getDefenderWaitingClans().clear();
+			
+			// Add castle owner as defender (add owner first so that they are on the top of the defender list)
+			if (getCastle().getOwnerId() > 0) {
+				addDefender(getCastle().getOwnerId(), SiegeClanType.OWNER);
+			}
+			
+			ps.setInt(1, getCastle().getResidenceId());
+			try (var rs = ps.executeQuery()) {
+				int typeId;
+				while (rs.next()) {
+					typeId = rs.getInt("type");
+					if (typeId == DEFENDER) {
+						addDefender(rs.getInt("clan_id"));
+					} else if (typeId == ATTACKER) {
+						addAttacker(rs.getInt("clan_id"));
+					} else if (typeId == DEFENDER_NOT_APPROVED) {
+						addDefenderWaiting(rs.getInt("clan_id"));
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error loading siege clans!", ex);
+		}
+	}
+	
+	/** Remove all spawned towers. */
+	private void removeTowers() {
+		for (L2FlameTowerInstance ct : _flameTowers) {
+			ct.deleteMe();
+		}
+		
+		for (L2ControlTowerInstance ct : _controlTowers) {
+			ct.deleteMe();
+		}
+		
+		_flameTowers.clear();
+		_controlTowers.clear();
+	}
+	
+	/** Remove all flags. */
+	private void removeFlags() {
+		for (L2SiegeClan sc : getAttackerClans()) {
+			if (sc != null) {
+				sc.removeFlags();
+			}
+		}
+		for (L2SiegeClan sc : getDefenderClans()) {
+			if (sc != null) {
+				sc.removeFlags();
+			}
+		}
+	}
+	
+	/** Remove flags from defenders. */
+	private void removeDefenderFlags() {
+		for (L2SiegeClan sc : getDefenderClans()) {
+			if (sc != null) {
+				sc.removeFlags();
+			}
+		}
+	}
+	
+	/** Save castle siege related to database. */
+	private void saveCastleSiege() {
+		setNextSiegeDate(); // Set the next set date for 2 weeks from now
+		// Schedule Time registration end
+		getTimeRegistrationOverDate().setTimeInMillis(Calendar.getInstance().getTimeInMillis());
+		getTimeRegistrationOverDate().add(Calendar.DAY_OF_MONTH, 1);
+		getCastle().setIsTimeRegistrationOver(false);
+		
+		saveSiegeDate(); // Save the new date
+		startAutoTask(); // Prepare auto start siege and end registration
+	}
+	
+	/** Save siege date to database. */
+	public void saveSiegeDate() {
+		if (_scheduledStartSiegeTask != null) {
+			_scheduledStartSiegeTask.cancel(true);
+			_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new Siege.ScheduleStartSiegeTask(getCastle()), 1000);
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET siegeDate = ?, regTimeEnd = ?, regTimeOver = ?  WHERE id = ?")) {
+			ps.setLong(1, getSiegeDate().getTimeInMillis());
+			ps.setLong(2, getTimeRegistrationOverDate().getTimeInMillis());
+			ps.setBoolean(3, getIsTimeRegistrationOver());
+			ps.setInt(4, getCastle().getResidenceId());
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.warn("There has been an error saving siege date!", ex);
+		}
+	}
+	
+	/**
+	 * Save registration to database.
+	 * @param clan The L2Clan of player
+	 * @param typeId -1 = owner 0 = defender, 1 = attacker, 2 = defender waiting
+	 * @param isUpdateRegistration
+	 */
+	private void saveSiegeClan(L2Clan clan, byte typeId, boolean isUpdateRegistration) {
+		if (clan.getCastleId() > 0) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			if ((typeId == DEFENDER) || (typeId == DEFENDER_NOT_APPROVED) || (typeId == OWNER)) {
+				if ((getDefenderClans().size() + getDefenderWaitingClans().size()) >= SiegeManager.getInstance().getDefenderMaxClans()) {
+					return;
+				}
+			} else {
+				if (getAttackerClans().size() >= SiegeManager.getInstance().getAttackerMaxClans()) {
+					return;
+				}
+			}
+			
+			if (!isUpdateRegistration) {
+				try (var ps = con.prepareStatement("INSERT INTO siege_clans (clan_id,castle_id,type,castle_owner) values (?,?,?,0)")) {
+					ps.setInt(1, clan.getId());
+					ps.setInt(2, getCastle().getResidenceId());
+					ps.setInt(3, typeId);
+					ps.execute();
+				}
+			} else {
+				try (var ps = con.prepareStatement("UPDATE siege_clans SET type = ? WHERE castle_id = ? AND clan_id = ?")) {
+					ps.setInt(1, typeId);
+					ps.setInt(2, getCastle().getResidenceId());
+					ps.setInt(3, clan.getId());
+					ps.execute();
+				}
+			}
+			
+			if ((typeId == DEFENDER) || (typeId == OWNER)) {
+				addDefender(clan.getId());
+			} else if (typeId == ATTACKER) {
+				addAttacker(clan.getId());
+			} else if (typeId == DEFENDER_NOT_APPROVED) {
+				addDefenderWaiting(clan.getId());
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error saving siege clan!", ex);
+		}
+	}
+	
+	/** Set the date for the next siege. */
+	private void setNextSiegeDate() {
+		final Calendar cal = getCastle().getSiegeDate();
+		if (cal.getTimeInMillis() < System.currentTimeMillis()) {
+			cal.setTimeInMillis(System.currentTimeMillis());
+		}
+		
+		for (SiegeScheduleDate holder : SiegeScheduleData.getInstance().getScheduleDates()) {
+			cal.set(Calendar.DAY_OF_WEEK, holder.getDay());
+			cal.set(Calendar.HOUR_OF_DAY, holder.getHour());
+			cal.set(Calendar.MINUTE, 0);
+			cal.set(Calendar.SECOND, 0);
+			if (cal.before(Calendar.getInstance())) {
+				cal.add(Calendar.WEEK_OF_YEAR, 2);
+			}
+			
+			if (CastleManager.getInstance().getSiegeDates(cal.getTimeInMillis()) < holder.getMaxConcurrent()) {
+				CastleManager.getInstance().registerSiegeDate(getCastle().getResidenceId(), cal.getTimeInMillis());
+				break;
+			}
+		}
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ANNOUNCED_SIEGE_TIME);
+		sm.addCastleId(getCastle().getResidenceId());
+		Broadcast.toAllOnlinePlayers(sm);
+		
+		_isRegistrationOver = false; // Allow registration for next siege
+	}
+	
+	/**
+	 * Spawn control tower.
+	 */
+	private void spawnControlTower() {
+		for (TowerSpawn ts : SiegeManager.getInstance().getControlTowers(getCastle().getResidenceId())) {
+			try {
+				final L2Spawn spawn = new L2Spawn(ts.getId());
+				spawn.setLocation(ts.getLocation());
+				_controlTowers.add((L2ControlTowerInstance) spawn.doSpawn());
+			} catch (Exception ex) {
+				LOG.warn("There has been an error spawning control tower Id {}!", ts.getId(), ex);
+			}
+		}
+		_controlTowerCount = _controlTowers.size();
+	}
+	
+	/**
+	 * Spawn flame tower.
+	 */
+	private void spawnFlameTower() {
+		for (TowerSpawn ts : SiegeManager.getInstance().getFlameTowers(getCastle().getResidenceId())) {
+			try {
+				final L2Spawn spawn = new L2Spawn(ts.getId());
+				spawn.setLocation(ts.getLocation());
+				final L2FlameTowerInstance tower = (L2FlameTowerInstance) spawn.doSpawn();
+				tower.setUpgradeLevel(ts.getUpgradeLevel());
+				tower.setZoneList(ts.getZoneList());
+				_flameTowers.add(tower);
+			} catch (Exception ex) {
+				LOG.warn("There has been an error spawning flame tower Id {}!", ts.getId(), ex);
+			}
+		}
+	}
+	
+	private void spawnSiegeGuard() {
+		getSiegeGuardManager().spawnSiegeGuard();
+		
+		// Register guard to the closest Control Tower
+		// When CT dies, so do all the guards that it controls
+		for (L2Spawn spawn : getSiegeGuardManager().getSiegeGuardSpawn()) {
+			if (spawn == null) {
+				continue;
+			}
+			
+			L2ControlTowerInstance closestCt = null;
+			double distanceClosest = Integer.MAX_VALUE;
+			
+			for (L2ControlTowerInstance ct : _controlTowers) {
+				if (ct == null) {
+					continue;
+				}
+				
+				double distance = ct.calculateDistance(spawn, true, true);
+				
+				if (distance < distanceClosest) {
+					closestCt = ct;
+					distanceClosest = distance;
+				}
+			}
+			if (closestCt != null) {
+				closestCt.registerGuard(spawn);
+			}
+		}
+	}
+	
+	@Override
+	public final L2SiegeClan getAttackerClan(L2Clan clan) {
+		if (clan == null) {
+			return null;
+		}
+		return getAttackerClan(clan.getId());
+	}
+	
+	@Override
+	public final L2SiegeClan getAttackerClan(int clanId) {
+		for (L2SiegeClan sc : getAttackerClans()) {
+			if ((sc != null) && (sc.getClanId() == clanId)) {
+				return sc;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public final List<L2SiegeClan> getAttackerClans() {
+		if (_isNormalSide) {
+			return _attackerClans;
+		}
+		return _defenderClans;
+	}
+	
+	public final int getAttackerRespawnDelay() {
+		return (SiegeManager.getInstance().getAttackerRespawnDelay());
+	}
+	
+	public final Castle getCastle() {
+		return _castle;
+	}
+	
+	@Override
+	public final L2SiegeClan getDefenderClan(L2Clan clan) {
+		if (clan == null) {
+			return null;
+		}
+		return getDefenderClan(clan.getId());
+	}
+	
+	@Override
+	public final L2SiegeClan getDefenderClan(int clanId) {
+		for (L2SiegeClan sc : getDefenderClans()) {
+			if ((sc != null) && (sc.getClanId() == clanId)) {
+				return sc;
+			}
+		}
+		return null;
+	}
+	
+	@Override
+	public final List<L2SiegeClan> getDefenderClans() {
+		if (_isNormalSide) {
+			return _defenderClans;
+		}
+		return _attackerClans;
+	}
+	
+	public final L2SiegeClan getDefenderWaitingClan(L2Clan clan) {
+		if (clan == null) {
+			return null;
+		}
+		return getDefenderWaitingClan(clan.getId());
+	}
+	
+	public final L2SiegeClan getDefenderWaitingClan(int clanId) {
+		for (L2SiegeClan sc : getDefenderWaitingClans()) {
+			if ((sc != null) && (sc.getClanId() == clanId)) {
+				return sc;
+			}
+		}
+		return null;
+	}
+	
+	public final List<L2SiegeClan> getDefenderWaitingClans() {
+		return _defenderWaitingClans;
+	}
+	
+	public final boolean isInProgress() {
+		return _isInProgress;
+	}
+	
+	public final boolean getIsRegistrationOver() {
+		return _isRegistrationOver;
+	}
+	
+	public final boolean getIsTimeRegistrationOver() {
+		return getCastle().getIsTimeRegistrationOver();
+	}
+	
+	@Override
+	public final Calendar getSiegeDate() {
+		return getCastle().getSiegeDate();
+	}
+	
+	public final Calendar getTimeRegistrationOverDate() {
+		return getCastle().getTimeRegistrationOverDate();
+	}
+	
+	public void endTimeRegistration(boolean automatic) {
+		getCastle().setIsTimeRegistrationOver(true);
+		if (!automatic) {
+			saveSiegeDate();
+		}
+	}
+	
+	@Override
+	public List<L2Npc> getFlag(L2Clan clan) {
+		if (clan != null) {
+			L2SiegeClan sc = getAttackerClan(clan);
+			if (sc != null) {
+				return sc.getFlag();
+			}
+		}
+		return null;
+	}
+	
+	public final SiegeGuardManager getSiegeGuardManager() {
+		if (_siegeGuardManager == null) {
+			_siegeGuardManager = new SiegeGuardManager(getCastle());
+		}
+		return _siegeGuardManager;
+	}
+	
+	public int getControlTowerCount() {
+		return _controlTowerCount;
+	}
+	
+	@Override
+	public boolean giveFame() {
+		return true;
+	}
+	
+	@Override
+	public int getFameFrequency() {
+		return (int) character().getCastleZoneFameTaskFrequency();
+	}
+	
+	@Override
+	public int getFameAmount() {
+		return character().getCastleZoneFameAcquirePoints();
+	}
+	
+	@Override
+	public void updateSiege() {
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/TvTEvent.java b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEvent.java
new file mode 100644
index 00000000..e13bc5a7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEvent.java
@@ -0,0 +1,921 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.tvt;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventFinish;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventKill;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventRegistrationStart;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventStart;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * TvT Event.
+ * @author HorridoJoho
+ */
+public class TvTEvent {
+	enum EventState {
+		INACTIVE,
+		INACTIVATING,
+		PARTICIPATING,
+		STARTING,
+		STARTED,
+		REWARDING
+	}
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TvTEvent.class);
+	
+	/** html path **/
+	private static final String HTML_PATH = "com/l2jserver/datapack/custom/events/TvT/TvTManager/";
+	/** The teams of the TvTEvent. */
+	private static final TvTEventTeam[] _teams = new TvTEventTeam[2];
+	/** The state of the TvTEvent. */
+	private static EventState _state = EventState.INACTIVE;
+	/** The spawn of the participation npc. */
+	private static L2Spawn _npcSpawn = null;
+	/** The npc instance of the participation npc. */
+	private static L2Npc _lastNpcSpawn = null;
+	/** Instance Id. */
+	private static int _TvTEventInstance = 0;
+	
+	private TvTEvent() {
+		// Prevent external initialization.
+	}
+	
+	/** Teams initializing. */
+	public static void init() {
+		AntiFeedManager.getInstance().registerEvent(AntiFeedManager.TVT_ID);
+		_teams[0] = new TvTEventTeam(tvt().getTeam1Name(), tvt().getTeam1Loc());
+		_teams[1] = new TvTEventTeam(tvt().getTeam2Name(), tvt().getTeam2Loc());
+	}
+	
+	/**
+	 * Starts the participation of the TvTEvent<br>
+	 * 1. Get L2NpcTemplate by ParticipationNpcId<br>
+	 * 2. Try to spawn a new npc of it
+	 * @return true if success, otherwise false
+	 */
+	public static boolean startParticipation() {
+		try {
+			_npcSpawn = new L2Spawn(tvt().getParticipationNpcId());
+			_npcSpawn.setLocation(tvt().getParticipationNpcLoc());
+			_npcSpawn.setAmount(1);
+			_npcSpawn.setRespawnDelay(1);
+			// later no need to delete spawn from db, we don't store it (false)
+			SpawnTable.getInstance().addNewSpawn(_npcSpawn, false);
+			_npcSpawn.init();
+			_lastNpcSpawn = _npcSpawn.getLastSpawn();
+			_lastNpcSpawn.setCurrentHp(_lastNpcSpawn.getMaxHp());
+			_lastNpcSpawn.setTitle("TvT Event Participation");
+			_lastNpcSpawn.isAggressive();
+			_lastNpcSpawn.decayMe();
+			_lastNpcSpawn.spawnMe(_npcSpawn.getLastSpawn().getX(), _npcSpawn.getLastSpawn().getY(), _npcSpawn.getLastSpawn().getZ());
+			_lastNpcSpawn.broadcastPacket(new MagicSkillUse(_lastNpcSpawn, _lastNpcSpawn, 1034, 1, 1, 1));
+		} catch (Exception e) {
+			LOG.warn("TvTEventEngine[TvTEvent.startParticipation()]: exception: {}", e.getMessage(), e);
+			return false;
+		}
+		
+		setState(EventState.PARTICIPATING);
+		EventDispatcher.getInstance().notifyEventAsync(new TvTEventRegistrationStart());
+		return true;
+	}
+	
+	private static int highestLevelPcInstanceOf(Map<Integer, L2PcInstance> players) {
+		int maxLevel = Integer.MIN_VALUE, maxLevelId = -1;
+		for (L2PcInstance player : players.values()) {
+			if (player.getLevel() >= maxLevel) {
+				maxLevel = player.getLevel();
+				maxLevelId = player.getObjectId();
+			}
+		}
+		return maxLevelId;
+	}
+	
+	/**
+	 * Starts the TvTEvent fight<br>
+	 * 1. Set state EventState.STARTING<br>
+	 * 2. Close doors specified in configs<br>
+	 * 3. Abort if not enough participants(return false)<br>
+	 * 4. Set state EventState.STARTED<br>
+	 * 5. Teleport all participants to team spot
+	 * @return true if success, otherwise false
+	 */
+	public static boolean startFight() {
+		// Set state to STARTING
+		setState(EventState.STARTING);
+		
+		// Randomize and balance team distribution
+		Map<Integer, L2PcInstance> allParticipants = new HashMap<>();
+		allParticipants.putAll(_teams[0].getParticipatedPlayers());
+		allParticipants.putAll(_teams[1].getParticipatedPlayers());
+		_teams[0].cleanMe();
+		_teams[1].cleanMe();
+		
+		L2PcInstance player;
+		Iterator<L2PcInstance> iter;
+		if (needParticipationFee()) {
+			iter = allParticipants.values().iterator();
+			while (iter.hasNext()) {
+				player = iter.next();
+				if (!hasParticipationFee(player)) {
+					iter.remove();
+				}
+			}
+		}
+		
+		int[] balance = {
+			0,
+			0
+		};
+		int priority = 0;
+		int highestLevelPlayerId;
+		L2PcInstance highestLevelPlayer;
+		// TODO: allParticipants should be sorted by level instead of using highestLevelPcInstanceOf for every fetch
+		while (!allParticipants.isEmpty()) {
+			// Priority team gets one player
+			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
+			highestLevelPlayer = allParticipants.get(highestLevelPlayerId);
+			allParticipants.remove(highestLevelPlayerId);
+			_teams[priority].addPlayer(highestLevelPlayer);
+			balance[priority] += highestLevelPlayer.getLevel();
+			// Exiting if no more players
+			if (allParticipants.isEmpty()) {
+				break;
+			}
+			// The other team gets one player
+			// TODO: Code not dry
+			priority = 1 - priority;
+			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
+			highestLevelPlayer = allParticipants.get(highestLevelPlayerId);
+			allParticipants.remove(highestLevelPlayerId);
+			_teams[priority].addPlayer(highestLevelPlayer);
+			balance[priority] += highestLevelPlayer.getLevel();
+			// Recalculating priority
+			priority = balance[0] > balance[1] ? 1 : 0;
+		}
+		
+		// Check for enough participants
+		if ((_teams[0].getParticipatedPlayerCount() < tvt().getMinPlayersInTeams()) || (_teams[1].getParticipatedPlayerCount() < tvt().getMinPlayersInTeams())) {
+			// Set state INACTIVE
+			setState(EventState.INACTIVE);
+			// Cleanup of teams
+			_teams[0].cleanMe();
+			_teams[1].cleanMe();
+			// Unspawn the event NPC
+			unSpawnNpc();
+			AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
+			return false;
+		}
+		
+		if (needParticipationFee()) {
+			iter = _teams[0].getParticipatedPlayers().values().iterator();
+			while (iter.hasNext()) {
+				player = iter.next();
+				if (!payParticipationFee(player)) {
+					iter.remove();
+				}
+			}
+			iter = _teams[1].getParticipatedPlayers().values().iterator();
+			while (iter.hasNext()) {
+				player = iter.next();
+				if (!payParticipationFee(player)) {
+					iter.remove();
+				}
+			}
+		}
+		
+		if (tvt().instanced()) {
+			try {
+				_TvTEventInstance = InstanceManager.getInstance().createDynamicInstance(tvt().getInstanceFile());
+				InstanceManager.getInstance().getInstance(_TvTEventInstance).setAllowSummon(false);
+				InstanceManager.getInstance().getInstance(_TvTEventInstance).setPvPInstance(true);
+				InstanceManager.getInstance().getInstance(_TvTEventInstance).setEmptyDestroyTime(tvt().getStartLeaveTeleportDelay() + 60000L);
+			} catch (Exception e) {
+				_TvTEventInstance = 0;
+				LOG.warn("TvTEventEngine[TvTEvent.createDynamicInstance]: exception: {}", e.getMessage(), e);
+			}
+		}
+		
+		// Opens all doors
+		openDoors(tvt().getDoorsToOpen());
+		// Closes all doors
+		closeDoors(tvt().getDoorsToClose());
+		// Set state STARTED
+		setState(EventState.STARTED);
+		
+		// Iterate over all teams
+		for (TvTEventTeam team : _teams) {
+			// Iterate over all participated player instances in this team
+			for (L2PcInstance playerInstance : team.getParticipatedPlayers().values()) {
+				if (playerInstance != null) {
+					// Disable player revival.
+					playerInstance.setCanRevive(false);
+					// Teleporter implements Runnable and starts itself
+					new TvTEventTeleporter(playerInstance, team.getLocation(), false, false);
+				}
+			}
+		}
+		
+		// Notify to scripts.
+		EventDispatcher.getInstance().notifyEventAsync(new TvTEventStart());
+		return true;
+	}
+	
+	/**
+	 * Calculates the TvTEvent reward<br>
+	 * 1. If both teams are at a tie(points equals), send it as system message to all participants, if one of the teams have 0 participants left online abort rewarding<br>
+	 * 2. Wait till teams are not at a tie anymore<br>
+	 * 3. Set state EventState.REWARDING<br>
+	 * 4. Reward team with more points<br>
+	 * 5. Show win html to wining team participants
+	 * @return winning team name
+	 */
+	public static String calculateRewards() {
+		if (_teams[0].getPoints() == _teams[1].getPoints()) {
+			// Check if one of the teams have no more players left
+			if ((_teams[0].getParticipatedPlayerCount() == 0) || (_teams[1].getParticipatedPlayerCount() == 0)) {
+				// set state to rewarding
+				setState(EventState.REWARDING);
+				// return here, the fight can't be completed
+				return "TvT Event: Event has ended. No team won due to inactivity!";
+			}
+			
+			// Both teams have equals points
+			sysMsgToAllParticipants("TvT Event: Event has ended, both teams have tied.");
+			if (tvt().rewardTeamTie()) {
+				rewardTeam(_teams[0]);
+				rewardTeam(_teams[1]);
+				return "TvT Event: Event has ended with both teams tying.";
+			}
+			return "TvT Event: Event has ended with both teams tying.";
+		}
+		
+		// Set state REWARDING so nobody can point anymore
+		setState(EventState.REWARDING);
+		
+		// Get team which has more points
+		TvTEventTeam team = _teams[_teams[0].getPoints() > _teams[1].getPoints() ? 0 : 1];
+		rewardTeam(team);
+		
+		// Notify to scripts.
+		EventDispatcher.getInstance().notifyEventAsync(new TvTEventFinish());
+		return "TvT Event: Event finish. Team " + team.getName() + " won with " + team.getPoints() + " kills.";
+	}
+	
+	private static void rewardTeam(TvTEventTeam team) {
+		for (L2PcInstance player : team.getParticipatedPlayers().values()) {
+			if (player == null) {
+				continue;
+			}
+			
+			for (ItemHolder item : tvt().getReward()) {
+				player.addItem("TvT Reward", item, null, true);
+			}
+			
+			final NpcHtmlMessage npcHtmlMessage = new NpcHtmlMessage();
+			npcHtmlMessage.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), HTML_PATH + "Reward.html"));
+			player.sendPacket(npcHtmlMessage);
+		}
+	}
+	
+	/**
+	 * Stops the TvTEvent fight<br>
+	 * 1. Set state EventState.INACTIVATING<br>
+	 * 2. Remove tvt npc from world<br>
+	 * 3. Open doors specified in configs<br>
+	 * 4. Teleport all participants back to participation npc location<br>
+	 * 5. Teams cleaning<br>
+	 * 6. Set state EventState.INACTIVE
+	 */
+	public static void stopFight() {
+		// Set state INACTIVATING
+		setState(EventState.INACTIVATING);
+		// Unspawn event npc
+		unSpawnNpc();
+		// Opens all doors
+		openDoors(tvt().getDoorsToClose());
+		// Closes all doors
+		closeDoors(tvt().getDoorsToOpen());
+		
+		for (TvTEventTeam team : _teams) {
+			for (L2PcInstance player : team.getParticipatedPlayers().values()) {
+				if (player == null) {
+					continue;
+				}
+				
+				// Enable player revival.
+				player.setCanRevive(true);
+				// Teleport back.
+				new TvTEventTeleporter(player, tvt().getParticipationNpcLoc(), false, false);
+			}
+		}
+		
+		// Cleanup of teams
+		_teams[0].cleanMe();
+		_teams[1].cleanMe();
+		// Set state INACTIVE
+		setState(EventState.INACTIVE);
+		AntiFeedManager.getInstance().clear(AntiFeedManager.TVT_ID);
+	}
+	
+	/**
+	 * Adds a player to a TvTEvent team<br>
+	 * 1. Calculate the id of the team in which the player should be added<br>
+	 * 2. Add the player to the calculated team
+	 * @param playerInstance as L2PcInstance
+	 * @return boolean: true if success, otherwise false
+	 */
+	public static synchronized boolean addParticipant(L2PcInstance playerInstance) {
+		if (playerInstance == null) {
+			return false;
+		}
+		
+		byte teamId;
+		
+		// Check to which team the player should be added
+		if (_teams[0].getParticipatedPlayerCount() == _teams[1].getParticipatedPlayerCount()) {
+			teamId = (byte) (Rnd.get(2));
+		} else {
+			teamId = (byte) (_teams[0].getParticipatedPlayerCount() > _teams[1].getParticipatedPlayerCount() ? 1 : 0);
+		}
+		playerInstance.addEventListener(new TvTEventListener(playerInstance));
+		return _teams[teamId].addPlayer(playerInstance);
+	}
+	
+	/**
+	 * Removes a TvTEvent player from it's team<br>
+	 * 1. Get team id of the player<br>
+	 * 2. Remove player from it's team
+	 * @param playerObjectId
+	 * @return true if success, otherwise false
+	 */
+	public static boolean removeParticipant(int playerObjectId) {
+		// Get the teamId of the player
+		byte teamId = getParticipantTeamId(playerObjectId);
+		
+		// Check if the player is participant
+		if (teamId != -1) {
+			// Remove the player from team
+			_teams[teamId].removePlayer(playerObjectId);
+			
+			final L2PcInstance player = L2World.getInstance().getPlayer(playerObjectId);
+			if (player != null) {
+				player.removeEventListener(TvTEventListener.class);
+			}
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public static boolean needParticipationFee() {
+		return (tvt().getParticipationFee() != null) && (tvt().getParticipationFee().getId() > 0);
+	}
+	
+	public static boolean hasParticipationFee(L2PcInstance player) {
+		return player.getInventory().getInventoryItemCount(tvt().getParticipationFee().getId(), -1) >= tvt().getParticipationFee().getCount();
+	}
+	
+	public static boolean payParticipationFee(L2PcInstance playerInstance) {
+		return playerInstance.destroyItemByItemId("TvT Participation Fee", tvt().getParticipationFee().getId(), tvt().getParticipationFee().getCount(), _lastNpcSpawn, true);
+	}
+	
+	public static String getParticipationFee() {
+		int itemId = tvt().getParticipationFee().getId();
+		long itemNum = tvt().getParticipationFee().getCount();
+		
+		if ((itemId == 0) || (itemNum == 0)) {
+			return "-";
+		}
+		
+		return StringUtil.concat(String.valueOf(itemNum), " ", ItemTable.getInstance().getTemplate(itemId).getName());
+	}
+	
+	/**
+	 * Send a SystemMessage to all participated players<br>
+	 * 1. Send the message to all players of team number one<br>
+	 * 2. Send the message to all players of team number two
+	 * @param message the message
+	 */
+	public static void sysMsgToAllParticipants(String message) {
+		for (L2PcInstance playerInstance : _teams[0].getParticipatedPlayers().values()) {
+			if (playerInstance != null) {
+				playerInstance.sendMessage(message);
+			}
+		}
+		
+		for (L2PcInstance playerInstance : _teams[1].getParticipatedPlayers().values()) {
+			if (playerInstance != null) {
+				playerInstance.sendMessage(message);
+			}
+		}
+	}
+	
+	private static L2DoorInstance getDoor(int doorId) {
+		L2DoorInstance door = null;
+		if (_TvTEventInstance <= 0) {
+			door = DoorData.getInstance().getDoor(doorId);
+		} else {
+			final Instance inst = InstanceManager.getInstance().getInstance(_TvTEventInstance);
+			if (inst != null) {
+				door = inst.getDoor(doorId);
+			}
+		}
+		return door;
+	}
+	
+	/**
+	 * Close doors specified in configs
+	 * @param doors
+	 */
+	private static void closeDoors(List<Integer> doors) {
+		for (int doorId : doors) {
+			final L2DoorInstance doorInstance = getDoor(doorId);
+			if (doorInstance != null) {
+				doorInstance.closeMe();
+			}
+		}
+	}
+	
+	/**
+	 * Open doors specified in configs
+	 * @param doors
+	 */
+	private static void openDoors(List<Integer> doors) {
+		for (int doorId : doors) {
+			final L2DoorInstance doorInstance = getDoor(doorId);
+			if (doorInstance != null) {
+				doorInstance.openMe();
+			}
+		}
+	}
+	
+	/**
+	 * UnSpawns the TvTEvent npc
+	 */
+	private static void unSpawnNpc() {
+		// Delete the npc
+		_lastNpcSpawn.deleteMe();
+		SpawnTable.getInstance().deleteSpawn(_lastNpcSpawn.getSpawn(), false);
+		// Stop respawning of the npc
+		_npcSpawn.stopRespawn();
+		_npcSpawn = null;
+		_lastNpcSpawn = null;
+	}
+	
+	/**
+	 * Called when a player logs in.
+	 * @param playerInstance the player
+	 */
+	public static void onLogin(L2PcInstance playerInstance) {
+		if ((playerInstance == null) || (!isStarting() && !isStarted())) {
+			return;
+		}
+		
+		byte teamId = getParticipantTeamId(playerInstance.getObjectId());
+		
+		if (teamId == -1) {
+			return;
+		}
+		
+		_teams[teamId].addPlayer(playerInstance);
+		new TvTEventTeleporter(playerInstance, _teams[teamId].getLocation(), true, false);
+	}
+	
+	/**
+	 * Called when a player logs out.
+	 * @param playerInstance the player
+	 */
+	public static void onLogout(L2PcInstance playerInstance) {
+		if ((playerInstance != null) && (isStarting() || isStarted() || isParticipating())) {
+			if (removeParticipant(playerInstance.getObjectId())) {
+				final var loc = tvt().getParticipationNpcLoc();
+				playerInstance.setXYZInvisible((loc.getX() + Rnd.get(101)) - 50, (loc.getY() + Rnd.get(101)) - 50, loc.getZ());
+			}
+		}
+	}
+	
+	/**
+	 * Called on every onAction in L2PcInstance.
+	 * @param playerInstance
+	 * @param targetedPlayerObjectId
+	 * @return true if player is allowed to target, otherwise false
+	 */
+	public static boolean onAction(L2PcInstance playerInstance, int targetedPlayerObjectId) {
+		if ((playerInstance == null) || !isStarted()) {
+			return true;
+		}
+		
+		if (playerInstance.isGM()) {
+			return true;
+		}
+		
+		byte playerTeamId = getParticipantTeamId(playerInstance.getObjectId());
+		byte targetedPlayerTeamId = getParticipantTeamId(targetedPlayerObjectId);
+		
+		if (((playerTeamId != -1) && (targetedPlayerTeamId == -1)) || ((playerTeamId == -1) && (targetedPlayerTeamId != -1))) {
+			return false;
+		}
+		
+		return (targetedPlayerTeamId == -1) || (playerTeamId != targetedPlayerTeamId) || //
+			(playerInstance.getObjectId() == targetedPlayerObjectId) || tvt().allowTargetTeamMember();
+	}
+	
+	/**
+	 * Called on every scroll use.
+	 * @param playerObjectId
+	 * @return true if player is allowed to use scroll, otherwise false
+	 */
+	public static boolean onScrollUse(int playerObjectId) {
+		if (!isStarted()) {
+			return true;
+		}
+		return !isPlayerParticipant(playerObjectId) || tvt().allowScroll();
+	}
+	
+	/**
+	 * Called on every potion use.
+	 * @param playerObjectId
+	 * @return true if player is allowed to use potions, otherwise false
+	 */
+	public static boolean onPotionUse(int playerObjectId) {
+		if (!isStarted()) {
+			return true;
+		}
+		return !isPlayerParticipant(playerObjectId) || tvt().allowPotion();
+	}
+	
+	/**
+	 * Called on every escape use.
+	 * @param playerObjectId
+	 * @return true if player is not in tvt event, otherwise false
+	 */
+	public static boolean onEscapeUse(int playerObjectId) {
+		if (!isStarted()) {
+			return true;
+		}
+		return !isPlayerParticipant(playerObjectId);
+	}
+	
+	/**
+	 * Called on every summon item use.
+	 * @param playerObjectId
+	 * @return true if player is allowed to summon by item, otherwise false
+	 */
+	public static boolean onItemSummon(int playerObjectId) {
+		if (!isStarted()) {
+			return true;
+		}
+		return !isPlayerParticipant(playerObjectId) || tvt().allowTargetTeamMember();
+	}
+	
+	/**
+	 * Is called when a player is killed.
+	 * @param killerCharacter as L2Character
+	 * @param killedPlayerInstance as L2PcInstance
+	 */
+	public static void onKill(L2Character killerCharacter, L2PcInstance killedPlayerInstance) {
+		if ((killedPlayerInstance == null) || !isStarted()) {
+			return;
+		}
+		
+		byte killedTeamId = getParticipantTeamId(killedPlayerInstance.getObjectId());
+		
+		if (killedTeamId == -1) {
+			return;
+		}
+		
+		new TvTEventTeleporter(killedPlayerInstance, _teams[killedTeamId].getLocation(), false, false);
+		
+		if (killerCharacter == null) {
+			return;
+		}
+		
+		L2PcInstance killerPlayerInstance;
+		
+		if ((killerCharacter instanceof L2PetInstance) || (killerCharacter instanceof L2ServitorInstance)) {
+			killerPlayerInstance = ((L2Summon) killerCharacter).getOwner();
+			
+			if (killerPlayerInstance == null) {
+				return;
+			}
+		} else if (killerCharacter instanceof L2PcInstance) {
+			killerPlayerInstance = (L2PcInstance) killerCharacter;
+		} else {
+			return;
+		}
+		
+		byte killerTeamId = getParticipantTeamId(killerPlayerInstance.getObjectId());
+		
+		if ((killerTeamId != -1) && (killerTeamId != killedTeamId)) {
+			TvTEventTeam killerTeam = _teams[killerTeamId];
+			
+			killerTeam.increasePoints();
+			
+			CreatureSay cs = new CreatureSay(killerPlayerInstance.getObjectId(), Say2.TELL, killerPlayerInstance.getName(), "I have killed " + killedPlayerInstance.getName() + "!");
+			
+			for (L2PcInstance playerInstance : _teams[killerTeamId].getParticipatedPlayers().values()) {
+				if (playerInstance != null) {
+					playerInstance.sendPacket(cs);
+				}
+			}
+			
+			// Notify to scripts.
+			EventDispatcher.getInstance().notifyEventAsync(new TvTEventKill(killerPlayerInstance, killedPlayerInstance, killerTeam));
+		}
+	}
+	
+	/**
+	 * Called on Appearing packet received (player finished teleporting).
+	 * @param playerInstance
+	 */
+	public static void onTeleported(L2PcInstance playerInstance) {
+		if (!isStarted() || (playerInstance == null) || !isPlayerParticipant(playerInstance.getObjectId())) {
+			return;
+		}
+		
+		if (playerInstance.isMageClass()) {
+			for (SkillHolder skillHolder : tvt().getMageBuffs()) {
+				Skill skill = skillHolder.getSkill();
+				if (skill != null) {
+					skill.applyEffects(playerInstance, playerInstance);
+				}
+			}
+		} else {
+			for (SkillHolder skillHolder : tvt().getFighterBuffs()) {
+				Skill skill = skillHolder.getSkill();
+				if (skill != null) {
+					skill.applyEffects(playerInstance, playerInstance);
+				}
+			}
+		}
+	}
+	
+	public static boolean checkForTvTSkill(L2PcInstance source, L2PcInstance target, Skill skill) {
+		if (!isStarted()) {
+			return true;
+		}
+		// TvT is started
+		final int sourcePlayerId = source.getObjectId();
+		final int targetPlayerId = target.getObjectId();
+		final boolean isSourceParticipant = isPlayerParticipant(sourcePlayerId);
+		final boolean isTargetParticipant = isPlayerParticipant(targetPlayerId);
+		
+		// both players not participating
+		if (!isSourceParticipant && !isTargetParticipant) {
+			return true;
+		}
+		// one player not participating
+		if (!(isSourceParticipant && isTargetParticipant)) {
+			return false;
+		}
+		// players in the different teams ?
+		if (getParticipantTeamId(sourcePlayerId) != getParticipantTeamId(targetPlayerId)) {
+			return skill.isBad();
+		}
+		return true;
+	}
+	
+	/**
+	 * Sets the TvTEvent state.
+	 * @param state as EventState
+	 */
+	private static void setState(EventState state) {
+		synchronized (_state) {
+			_state = state;
+		}
+	}
+	
+	/**
+	 * Is TvTEvent inactive?
+	 * @return true if event is inactive(waiting for next event cycle), otherwise false
+	 */
+	public static boolean isInactive() {
+		boolean isInactive;
+		
+		synchronized (_state) {
+			isInactive = _state == EventState.INACTIVE;
+		}
+		
+		return isInactive;
+	}
+	
+	/**
+	 * Is TvTEvent in inactivating?.
+	 * @return true if event is in inactivating progress, otherwise false
+	 */
+	public static boolean isInactivating() {
+		boolean isInactivating;
+		
+		synchronized (_state) {
+			isInactivating = _state == EventState.INACTIVATING;
+		}
+		
+		return isInactivating;
+	}
+	
+	/**
+	 * Is TvTEvent in participation?.
+	 * @return true if event is in participation progress, otherwise false
+	 */
+	public static boolean isParticipating() {
+		boolean isParticipating;
+		
+		synchronized (_state) {
+			isParticipating = _state == EventState.PARTICIPATING;
+		}
+		
+		return isParticipating;
+	}
+	
+	/**
+	 * Is TvTEvent starting?
+	 * @return true if event is starting up(setting up fighting spot, teleport players etc.), otherwise false
+	 */
+	public static boolean isStarting() {
+		boolean isStarting;
+		
+		synchronized (_state) {
+			isStarting = _state == EventState.STARTING;
+		}
+		
+		return isStarting;
+	}
+	
+	/**
+	 * Is TvTEvent started?
+	 * @return true if event is started, otherwise false
+	 */
+	public static boolean isStarted() {
+		boolean isStarted;
+		
+		synchronized (_state) {
+			isStarted = _state == EventState.STARTED;
+		}
+		
+		return isStarted;
+	}
+	
+	/**
+	 * Is TvTEvent rewarding?
+	 * @return true if event is currently rewarding, otherwise false
+	 */
+	public static boolean isRewarding() {
+		boolean isRewarding;
+		
+		synchronized (_state) {
+			isRewarding = _state == EventState.REWARDING;
+		}
+		
+		return isRewarding;
+	}
+	
+	/**
+	 * Returns the team id of a player, if player is not participant it returns -1
+	 * @param playerObjectId
+	 * @return team name of the given playerName, if not in event -1
+	 */
+	public static byte getParticipantTeamId(int playerObjectId) {
+		return (byte) (_teams[0].containsPlayer(playerObjectId) ? 0 : (_teams[1].containsPlayer(playerObjectId) ? 1 : -1));
+	}
+	
+	/**
+	 * Returns the team of a player, if player is not participant it returns null
+	 * @param playerObjectId
+	 * @return team of the given playerObjectId, if not in event null
+	 */
+	public static TvTEventTeam getParticipantTeam(int playerObjectId) {
+		return (_teams[0].containsPlayer(playerObjectId) ? _teams[0] : (_teams[1].containsPlayer(playerObjectId) ? _teams[1] : null));
+	}
+	
+	/**
+	 * Returns the enemy team of a player, if player is not participant it returns null
+	 * @param playerObjectId
+	 * @return enemy team of the given playerObjectId, if not in event null
+	 */
+	public static TvTEventTeam getParticipantEnemyTeam(int playerObjectId) {
+		return (_teams[0].containsPlayer(playerObjectId) ? _teams[1] : (_teams[1].containsPlayer(playerObjectId) ? _teams[0] : null));
+	}
+	
+	/**
+	 * Returns the team coordinates in which the player is in, if player is not in a team return null
+	 * @param playerObjectId
+	 * @return coordinates of teams, 2 elements, index 0 for team 1 and index 1 for team 2
+	 */
+	public static Location getParticipantTeamCoordinates(int playerObjectId) {
+		return _teams[0].containsPlayer(playerObjectId) ? _teams[0].getLocation() : (_teams[1].containsPlayer(playerObjectId) ? _teams[1].getLocation() : null);
+	}
+	
+	/**
+	 * Is given player participant of the event?
+	 * @param playerObjectId
+	 * @return true if player is participant, otherwise false
+	 */
+	public static boolean isPlayerParticipant(int playerObjectId) {
+		if (!isParticipating() && !isStarting() && !isStarted()) {
+			return false;
+		}
+		
+		return _teams[0].containsPlayer(playerObjectId) || _teams[1].containsPlayer(playerObjectId);
+	}
+	
+	/**
+	 * Returns participated player count.
+	 * @return amount of players registered in the event
+	 */
+	public static int getParticipatedPlayersCount() {
+		if (!isParticipating() && !isStarting() && !isStarted()) {
+			return 0;
+		}
+		
+		return _teams[0].getParticipatedPlayerCount() + _teams[1].getParticipatedPlayerCount();
+	}
+	
+	/**
+	 * Returns teams names.
+	 * @return names of teams, 2 elements, index 0 for team 1 and index 1 for team 2
+	 */
+	public static String[] getTeamNames() {
+		return new String[] {
+			_teams[0].getName(),
+			_teams[1].getName()
+		};
+	}
+	
+	/**
+	 * Returns player count of both teams.
+	 * @return player count of teams, 2 elements, index 0 for team 1 and index 1 for team 2
+	 */
+	public static int[] getTeamsPlayerCounts() {
+		return new int[] {
+			_teams[0].getParticipatedPlayerCount(),
+			_teams[1].getParticipatedPlayerCount()
+		};
+	}
+	
+	/**
+	 * Returns points count of both teams.
+	 * @return int[]: points of teams, 2 elements, index 0 for team 1 and index 1 for team 2
+	 */
+	public static int[] getTeamsPoints() {
+		return new int[] {
+			_teams[0].getPoints(),
+			_teams[1].getPoints()
+		};
+	}
+	
+	public static int getTvTEventInstance() {
+		return _TvTEventInstance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventListener.java b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventListener.java
new file mode 100644
index 00000000..52c074b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventListener.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IEventListener;
+
+/**
+ * @author UnAfraid
+ */
+public final class TvTEventListener implements IEventListener {
+	private final L2PcInstance _player;
+	
+	protected TvTEventListener(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	public boolean isOnEvent() {
+		return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(getPlayer().getObjectId());
+	}
+	
+	@Override
+	public boolean isBlockingExit() {
+		return true;
+	}
+	
+	@Override
+	public boolean isBlockingDeathPenalty() {
+		return true;
+	}
+	
+	@Override
+	public boolean canRevive() {
+		return false;
+	}
+	
+	@Override
+	public L2PcInstance getPlayer() {
+		return _player;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventPlayer.java b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventPlayer.java
new file mode 100644
index 00000000..7b21935f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventPlayer.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ */
+public class TvTEventPlayer {
+	private final L2PcInstance _player;
+	
+	protected TvTEventPlayer(L2PcInstance player) {
+		_player = player;
+	}
+	
+	public boolean isOnEvent() {
+		return TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(getPlayer().getObjectId());
+	}
+	
+	public boolean isBlockingExit() {
+		return true;
+	}
+	
+	public boolean isBlockingDeathPenalty() {
+		return true;
+	}
+	
+	public boolean canRevive() {
+		return false;
+	}
+	
+	public L2PcInstance getPlayer() {
+		return _player;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventTeam.java b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventTeam.java
new file mode 100644
index 00000000..ab365781
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventTeam.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * TvT event team.
+ * @author HorridoJoho
+ */
+public class TvTEventTeam {
+	/** The name of the team. */
+	private final String _name;
+	/** The team spot coordinates. */
+	private final Location _loc;
+	/** The points of the team. */
+	private short _points;
+	/** Name and instance of all participated players in map. */
+	private final Map<Integer, L2PcInstance> _participatedPlayers = new ConcurrentHashMap<>();
+	
+	public TvTEventTeam(String name, Location loc) {
+		_name = name;
+		_loc = loc;
+		_points = 0;
+	}
+	
+	/**
+	 * Adds a player to the team.
+	 * @param playerInstance as L2PcInstance
+	 * @return boolean: true if success, otherwise false
+	 */
+	public boolean addPlayer(L2PcInstance playerInstance) {
+		if (playerInstance == null) {
+			return false;
+		}
+		
+		_participatedPlayers.put(playerInstance.getObjectId(), playerInstance);
+		
+		return true;
+	}
+	
+	/**
+	 * Removes a player from the team
+	 * @param playerObjectId
+	 */
+	public void removePlayer(int playerObjectId) {
+		_participatedPlayers.remove(playerObjectId);
+	}
+	
+	/**
+	 * Increases the points of the team.
+	 */
+	public void increasePoints() {
+		++_points;
+	}
+	
+	/**
+	 * Cleanup the team and make it ready for adding players again.
+	 */
+	public void cleanMe() {
+		_participatedPlayers.clear();
+		_points = 0;
+	}
+	
+	/**
+	 * Is given player in this team?
+	 * @param playerObjectId
+	 * @return boolean: true if player is in this team, otherwise false
+	 */
+	public boolean containsPlayer(int playerObjectId) {
+		return _participatedPlayers.containsKey(playerObjectId);
+	}
+	
+	/**
+	 * Returns the name of the team.
+	 * @return String: name of the team
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Returns the coordinates of the team spot.
+	 * @return team coordinates
+	 */
+	public Location getLocation() {
+		return _loc;
+	}
+	
+	/**
+	 * Returns the points of the team.
+	 * @return short: team points
+	 */
+	public short getPoints() {
+		return _points;
+	}
+	
+	/**
+	 * Returns name and instance of all participated players in Map.
+	 * @return map of players in this team
+	 */
+	public Map<Integer, L2PcInstance> getParticipatedPlayers() {
+		return _participatedPlayers;
+	}
+	
+	/**
+	 * Returns player count of this team.
+	 * @return number of players in team
+	 */
+	public int getParticipatedPlayerCount() {
+		return _participatedPlayers.size();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java
new file mode 100644
index 00000000..22b5183a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/TvTEventTeleporter.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.tvt;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class TvTEventTeleporter implements Runnable {
+	/** The instance of the player to teleport */
+	private final L2PcInstance _playerInstance;
+	/** Coordinates of the spot to teleport to */
+	private final Location _loc;
+	/** Admin removed this player from event */
+	private final boolean _adminRemove;
+	
+	/**
+	 * Initialize the teleporter and start the delayed task.
+	 * @param playerInstance
+	 * @param loc
+	 * @param fastSchedule
+	 * @param adminRemove
+	 */
+	public TvTEventTeleporter(L2PcInstance playerInstance, Location loc, boolean fastSchedule, boolean adminRemove) {
+		_playerInstance = playerInstance;
+		_loc = loc;
+		_adminRemove = adminRemove;
+		
+		long delay = TvTEvent.isStarted() ? tvt().getRespawnTeleportDelay() : tvt().getStartLeaveTeleportDelay();
+		ThreadPoolManager.getInstance().scheduleGeneral(this, fastSchedule ? 0 : delay);
+	}
+	
+	/**
+	 * The task method to teleport the player<br>
+	 * 1. Unsummon pet if there is one<br>
+	 * 2. Remove all effects<br>
+	 * 3. Revive and full heal the player<br>
+	 * 4. Teleport the player<br>
+	 * 5. Broadcast status and user info
+	 */
+	@Override
+	public void run() {
+		if (_playerInstance == null) {
+			return;
+		}
+		
+		L2Summon summon = _playerInstance.getSummon();
+		
+		if (summon != null) {
+			summon.unSummon(_playerInstance);
+		}
+		
+		final var effectRemoval = tvt().getEffectsRemoval();
+		if ((effectRemoval == 0) || ((effectRemoval == 1) && ((_playerInstance.getTeam() == Team.NONE) || (_playerInstance.isInDuel() && (_playerInstance.getDuelState() != DuelState.INTERRUPTED))))) {
+			_playerInstance.stopAllEffectsExceptThoseThatLastThroughDeath();
+		}
+		
+		if (_playerInstance.isInDuel()) {
+			_playerInstance.setDuelState(DuelState.INTERRUPTED);
+		}
+		
+		int TvTInstance = TvTEvent.getTvTEventInstance();
+		if (TvTInstance != 0) {
+			if (TvTEvent.isStarted() && !_adminRemove) {
+				_playerInstance.setInstanceId(TvTInstance);
+			} else {
+				_playerInstance.setInstanceId(0);
+			}
+		} else {
+			_playerInstance.setInstanceId(0);
+		}
+		
+		_playerInstance.doRevive();
+		_playerInstance.teleToLocation(_loc, true);
+		
+		if (TvTEvent.isStarted() && !_adminRemove) {
+			int teamId = TvTEvent.getParticipantTeamId(_playerInstance.getObjectId()) + 1;
+			switch (teamId) {
+				case 0 -> _playerInstance.setTeam(Team.NONE);
+				case 1 -> _playerInstance.setTeam(Team.BLUE);
+				case 2 -> _playerInstance.setTeam(Team.RED);
+			}
+		} else {
+			_playerInstance.setTeam(Team.NONE);
+		}
+		
+		_playerInstance.setCurrentCp(_playerInstance.getMaxCp());
+		_playerInstance.setCurrentHp(_playerInstance.getMaxHp());
+		_playerInstance.setCurrentMp(_playerInstance.getMaxMp());
+		
+		_playerInstance.broadcastStatusUpdate();
+		_playerInstance.broadcastUserInfo();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/TvTManager.java b/src/main/java/com/l2jserver/gameserver/model/entity/TvTManager.java
new file mode 100644
index 00000000..73a7e264
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/TvTManager.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity;
+
+import static com.l2jserver.gameserver.config.Configuration.tvt;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.util.Calendar;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * TVT Manager.
+ * @author HorridoJoho
+ */
+public class TvTManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TvTManager.class);
+	
+	private TvTStartTask _task;
+	
+	protected TvTManager() {
+		if (tvt().enabled()) {
+			TvTEvent.init();
+			
+			scheduleEventStart();
+			LOG.info("Started.");
+		} else {
+			LOG.info("Engine is disabled.");
+		}
+	}
+	
+	public static TvTManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	public void scheduleEventStart() {
+		try {
+			Calendar currentTime = Calendar.getInstance();
+			Calendar nextStartTime = null;
+			for (String timeOfDay : tvt().getInterval()) {
+				// Creating a Calendar object from the specified interval value
+				var testStartTime = Calendar.getInstance();
+				testStartTime.setLenient(true);
+				String[] splitTimeOfDay = timeOfDay.split(":");
+				testStartTime.set(Calendar.HOUR_OF_DAY, Integer.parseInt(splitTimeOfDay[0]));
+				testStartTime.set(Calendar.MINUTE, Integer.parseInt(splitTimeOfDay[1]));
+				// If the date is in the past, make it the next day (Example: Checking for "1:00", when the time is 23:57.)
+				if (testStartTime.getTimeInMillis() < currentTime.getTimeInMillis()) {
+					testStartTime.add(Calendar.DAY_OF_MONTH, 1);
+				}
+				// Check for the test date to be the minimum (smallest in the specified list)
+				if ((nextStartTime == null) || (testStartTime.getTimeInMillis() < nextStartTime.getTimeInMillis())) {
+					nextStartTime = testStartTime;
+				}
+			}
+			if (nextStartTime != null) {
+				_task = new TvTStartTask(nextStartTime.getTimeInMillis());
+				ThreadPoolManager.getInstance().executeGeneral(_task);
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error figuring out a start time. Check TvTEventInterval in config file.", ex);
+		}
+	}
+	
+	/**
+	 * Method to start participation
+	 */
+	public void startReg() {
+		if (!TvTEvent.startParticipation()) {
+			Broadcast.toAllOnlinePlayers("TvT Event: Event was cancelled.");
+			LOG.warn("There has been an error spawning event NPC for participation.");
+			
+			scheduleEventStart();
+		} else {
+			Broadcast.toAllOnlinePlayers("TvT Event: Registration opened for " + tvt().getParticipationTime() + " minute(s).");
+			
+			// schedule registration end
+			_task.setStartTime(System.currentTimeMillis() + (60000L * tvt().getParticipationTime()));
+			ThreadPoolManager.getInstance().executeGeneral(_task);
+		}
+	}
+	
+	/**
+	 * Method to start the fight
+	 */
+	public void startEvent() {
+		if (!TvTEvent.startFight()) {
+			Broadcast.toAllOnlinePlayers("TvT Event: Event cancelled due to lack of Participation.");
+			LOG.info("Lack of registration, abort event.");
+			
+			scheduleEventStart();
+		} else {
+			TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting participants to an arena in " + MILLISECONDS.toSeconds(tvt().getStartLeaveTeleportDelay()) + " second(s).");
+			_task.setStartTime(System.currentTimeMillis() + (60000L * tvt().getRunningTime()));
+			ThreadPoolManager.getInstance().executeGeneral(_task);
+		}
+	}
+	
+	/**
+	 * Method to end the event and reward
+	 */
+	public void endEvent() {
+		Broadcast.toAllOnlinePlayers(TvTEvent.calculateRewards());
+		TvTEvent.sysMsgToAllParticipants("TvT Event: Teleporting back to the registration npc in " + MILLISECONDS.toSeconds(tvt().getStartLeaveTeleportDelay()) + " second(s).");
+		TvTEvent.stopFight();
+		
+		scheduleEventStart();
+	}
+	
+	public void skipDelay() {
+		if (_task.nextRun.cancel(false)) {
+			_task.setStartTime(System.currentTimeMillis());
+			ThreadPoolManager.getInstance().executeGeneral(_task);
+		}
+	}
+	
+	/**
+	 * Class for TvT cycles
+	 */
+	class TvTStartTask implements Runnable {
+		private long _startTime;
+		public ScheduledFuture<?> nextRun;
+		
+		public TvTStartTask(long startTime) {
+			_startTime = startTime;
+		}
+		
+		public void setStartTime(long startTime) {
+			_startTime = startTime;
+		}
+		
+		@Override
+		public void run() {
+			int delay = (int) Math.round((_startTime - System.currentTimeMillis()) / 1000.0);
+			
+			if (delay > 0) {
+				announce(delay);
+			}
+			
+			int nextMsg = 0;
+			if (delay > 3600) {
+				nextMsg = delay - 3600;
+			} else if (delay > 1800) {
+				nextMsg = delay - 1800;
+			} else if (delay > 900) {
+				nextMsg = delay - 900;
+			} else if (delay > 600) {
+				nextMsg = delay - 600;
+			} else if (delay > 300) {
+				nextMsg = delay - 300;
+			} else if (delay > 60) {
+				nextMsg = delay - 60;
+			} else if (delay > 5) {
+				nextMsg = delay - 5;
+			} else if (delay > 0) {
+				nextMsg = delay;
+			} else {
+				// start
+				if (TvTEvent.isInactive()) {
+					startReg();
+				} else if (TvTEvent.isParticipating()) {
+					startEvent();
+				} else {
+					endEvent();
+				}
+			}
+			
+			if (delay > 0) {
+				nextRun = ThreadPoolManager.getInstance().scheduleGeneral(this, nextMsg * 1000);
+			}
+		}
+		
+		private void announce(long time) {
+			if ((time >= 3600) && ((time % 3600) == 0)) {
+				if (TvTEvent.isParticipating()) {
+					Broadcast.toAllOnlinePlayers("TvT Event: " + (time / 60 / 60) + " hour(s) until registration is closed!");
+				} else if (TvTEvent.isStarted()) {
+					TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60 / 60) + " hour(s) until event is finished!");
+				}
+			} else if (time >= 60) {
+				if (TvTEvent.isParticipating()) {
+					Broadcast.toAllOnlinePlayers("TvT Event: " + (time / 60) + " minute(s) until registration is closed!");
+				} else if (TvTEvent.isStarted()) {
+					TvTEvent.sysMsgToAllParticipants("TvT Event: " + (time / 60) + " minute(s) until the event is finished!");
+				}
+			} else {
+				if (TvTEvent.isParticipating()) {
+					Broadcast.toAllOnlinePlayers("TvT Event: " + time + " second(s) until registration is closed!");
+				} else if (TvTEvent.isStarted()) {
+					TvTEvent.sysMsgToAllParticipants("TvT Event: " + time + " second(s) until the event is finished!");
+				}
+			}
+		}
+	}
+	
+	private static class SingletonHolder {
+		protected static final TvTManager INSTANCE = new TvTManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java
new file mode 100644
index 00000000..79f41b56
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity.clanhall;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.AuctionManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class AuctionableHall extends ClanHall {
+	private static final Logger LOG = LoggerFactory.getLogger(AuctionableHall.class);
+	
+	private long _paidUntil;
+	private final int _grade;
+	private boolean _paid;
+	private final int _lease;
+	private final int _chRate = 604800000;
+	
+	public AuctionableHall(StatsSet set) {
+		super(set);
+		_paidUntil = set.getLong("paidUntil");
+		_grade = set.getInt("grade");
+		_paid = set.getBoolean("paid");
+		_lease = set.getInt("lease");
+		
+		if (getOwnerId() != 0) {
+			_isFree = false;
+			initializeTask(false);
+			loadFunctions();
+		}
+	}
+	
+	/**
+	 * @return if clanHall is paid or not
+	 */
+	public boolean getPaid() {
+		return _paid;
+	}
+	
+	/** Return lease */
+	@Override
+	public int getLease() {
+		return _lease;
+	}
+	
+	/** Return PaidUntil */
+	@Override
+	public long getPaidUntil() {
+		return _paidUntil;
+	}
+	
+	/** Return Grade */
+	@Override
+	public int getGrade() {
+		return _grade;
+	}
+	
+	@Override
+	public void free() {
+		super.free();
+		_paidUntil = 0;
+		_paid = false;
+	}
+	
+	@Override
+	public void setOwner(L2Clan clan) {
+		super.setOwner(clan);
+		_paidUntil = System.currentTimeMillis();
+		initializeTask(true);
+	}
+	
+	/**
+	 * Initialize Fee Task
+	 */
+	private void initializeTask(boolean forced) {
+		long currentTime = System.currentTimeMillis();
+		if (_paidUntil > currentTime) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - currentTime);
+		} else if (!_paid && !forced) {
+			if ((System.currentTimeMillis() + (3600000 * 24)) <= (_paidUntil + _chRate)) {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), System.currentTimeMillis() + (3600000 * 24));
+			} else {
+				ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), (_paidUntil + _chRate) - System.currentTimeMillis());
+			}
+		} else {
+			ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), 0);
+		}
+	}
+	
+	/** Fee Task */
+	protected class FeeTask implements Runnable {
+		private static final Logger LOG = LoggerFactory.getLogger(FeeTask.class);
+		
+		@Override
+		public void run() {
+			try {
+				long _time = System.currentTimeMillis();
+				
+				if (isFree()) {
+					return;
+				}
+				
+				if (_paidUntil > _time) {
+					ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - _time);
+					return;
+				}
+				
+				L2Clan Clan = ClanTable.getInstance().getClan(getOwnerId());
+				if (ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().getAdena() >= getLease()) {
+					if (_paidUntil != 0) {
+						while (_paidUntil <= _time) {
+							_paidUntil += _chRate;
+						}
+					} else {
+						_paidUntil = _time + _chRate;
+					}
+					ClanTable.getInstance().getClan(getOwnerId()).getWarehouse().destroyItemByItemId("CH_rental_fee", Inventory.ADENA_ID, getLease(), null, null);
+					ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _paidUntil - _time);
+					_paid = true;
+					updateDb();
+				} else {
+					_paid = false;
+					if (_time > (_paidUntil + _chRate)) {
+						if (ClanHallManager.getInstance().loaded()) {
+							AuctionManager.getInstance().initNPC(getId());
+							ClanHallManager.getInstance().setFree(getId());
+							Clan.broadcastToOnlineMembers(SystemMessage.getSystemMessage(SystemMessageId.THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED));
+						} else {
+							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), 3000);
+						}
+					} else {
+						updateDb();
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+						sm.addInt(getLease());
+						Clan.broadcastToOnlineMembers(sm);
+						if ((_time + (3600000 * 24)) <= (_paidUntil + _chRate)) {
+							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), _time + (3600000 * 24));
+						} else {
+							ThreadPoolManager.getInstance().scheduleGeneral(new FeeTask(), (_paidUntil + _chRate) - _time);
+						}
+						
+					}
+				}
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	@Override
+	public void updateDb() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE clanhall SET ownerId=?, paidUntil=?, paid=? WHERE id=?")) {
+			ps.setInt(1, getOwnerId());
+			ps.setLong(2, getPaidUntil());
+			ps.setInt(3, (getPaid()) ? 1 : 0);
+			ps.setInt(4, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: updateOwnerInDB(L2Clan clan): {}", e.getMessage(), e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
new file mode 100644
index 00000000..ed65ab94
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity.clanhall;
+
+import static com.l2jserver.gameserver.config.Configuration.clanhall;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Siegable;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * @author BiggBoss
+ */
+public abstract class ClanHallSiegeEngine extends Quest implements Siegable {
+	
+	public static final Logger _log = LoggerFactory.getLogger(ClanHallSiegeEngine.class);
+	
+	private static final String SQL_LOAD_ATTACKERS = "SELECT attacker_id FROM clanhall_siege_attackers WHERE clanhall_id = ?";
+	
+	private static final String SQL_SAVE_ATTACKERS = "INSERT INTO clanhall_siege_attackers VALUES (?,?)";
+	
+	private static final String SQL_LOAD_GUARDS = "SELECT * FROM clanhall_siege_guards WHERE clanHallId = ?";
+	
+	public static final int FORTRESS_RESSISTANCE = 21;
+	
+	public static final int DEVASTATED_CASTLE = 34;
+	
+	public static final int BANDIT_STRONGHOLD = 35;
+	
+	public static final int RAINBOW_SPRINGS = 62;
+	
+	public static final int BEAST_FARM = 63;
+	
+	public static final int FORTRESS_OF_DEAD = 64;
+	
+	private final Map<Integer, L2SiegeClan> _attackers = new ConcurrentHashMap<>();
+	
+	private List<L2Spawn> _guards;
+	
+	public SiegableHall _hall;
+	
+	public ScheduledFuture<?> _siegeTask;
+	
+	public boolean _missionAccomplished = false;
+	
+	public ClanHallSiegeEngine(int hallId) {
+		_hall = ClanHallSiegeManager.getInstance().getSiegableHall(hallId);
+		_hall.setSiege(this);
+		
+		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);
+		_log.info("{} siege scheduled for {}.", _hall.getName(), getSiegeDate().getTime());
+		loadAttackers();
+	}
+	
+	public void loadAttackers() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SQL_LOAD_ATTACKERS)) {
+			ps.setInt(1, _hall.getId());
+			try (var rset = ps.executeQuery()) {
+				while (rset.next()) {
+					final int id = rset.getInt("attacker_id");
+					L2SiegeClan clan = new L2SiegeClan(id, SiegeClanType.ATTACKER);
+					_attackers.put(id, clan);
+				}
+			}
+		} catch (Exception e) {
+			_log.warn("Could not load siege attackers!", e);
+		}
+	}
+	
+	public final void saveAttackers() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM clanhall_siege_attackers WHERE clanhall_id = ?")) {
+			ps.setInt(1, _hall.getId());
+			ps.execute();
+			
+			if (_attackers.size() > 0) {
+				try (var insert = con.prepareStatement(SQL_SAVE_ATTACKERS)) {
+					for (L2SiegeClan clan : _attackers.values()) {
+						insert.setInt(1, _hall.getId());
+						insert.setInt(2, clan.getClanId());
+						insert.execute();
+						insert.clearParameters();
+					}
+				}
+			}
+			_log.info("Successfully saved attackers to database.");
+		} catch (Exception e) {
+			_log.warn("Couldn't save attacker list!", e);
+		}
+	}
+	
+	public final void loadGuards() {
+		if (_guards == null) {
+			_guards = new ArrayList<>();
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(SQL_LOAD_GUARDS)) {
+				ps.setInt(1, _hall.getId());
+				try (var rset = ps.executeQuery()) {
+					while (rset.next()) {
+						final L2Spawn spawn = new L2Spawn(rset.getInt("npcId"));
+						spawn.setX(rset.getInt("x"));
+						spawn.setY(rset.getInt("y"));
+						spawn.setZ(rset.getInt("z"));
+						spawn.setHeading(rset.getInt("heading"));
+						spawn.setRespawnDelay(rset.getInt("respawnDelay"));
+						spawn.setAmount(1);
+						_guards.add(spawn);
+					}
+				}
+			} catch (Exception e) {
+				_log.warn("Couldn't load siege guards!", e);
+			}
+		}
+	}
+	
+	private void spawnSiegeGuards() {
+		for (L2Spawn guard : _guards) {
+			guard.init();
+		}
+	}
+	
+	private void unSpawnSiegeGuards() {
+		if (_guards != null) {
+			for (L2Spawn guard : _guards) {
+				guard.stopRespawn();
+				if (guard.getLastSpawn() != null) {
+					guard.getLastSpawn().deleteMe();
+				}
+			}
+		}
+	}
+	
+	@Override
+	public List<L2Npc> getFlag(L2Clan clan) {
+		List<L2Npc> result = null;
+		L2SiegeClan sClan = getAttackerClan(clan);
+		if (sClan != null) {
+			result = sClan.getFlag();
+		}
+		return result;
+	}
+	
+	public final Map<Integer, L2SiegeClan> getAttackers() {
+		return _attackers;
+	}
+	
+	@Override
+	public boolean checkIsAttacker(L2Clan clan) {
+		if (clan == null) {
+			return false;
+		}
+		
+		return _attackers.containsKey(clan.getId());
+	}
+	
+	@Override
+	public boolean checkIsDefender(L2Clan clan) {
+		return false;
+	}
+	
+	@Override
+	public L2SiegeClan getAttackerClan(int clanId) {
+		return _attackers.get(clanId);
+	}
+	
+	@Override
+	public L2SiegeClan getAttackerClan(L2Clan clan) {
+		return getAttackerClan(clan.getId());
+	}
+	
+	@Override
+	public List<L2SiegeClan> getAttackerClans() {
+		return new ArrayList<>(_attackers.values());
+	}
+	
+	@Override
+	public List<L2PcInstance> getAttackersInZone() {
+		final List<L2PcInstance> attackers = new ArrayList<>();
+		for (L2PcInstance pc : _hall.getSiegeZone().getPlayersInside()) {
+			final L2Clan clan = pc.getClan();
+			if ((clan != null) && _attackers.containsKey(clan.getId())) {
+				attackers.add(pc);
+			}
+		}
+		return attackers;
+	}
+	
+	@Override
+	public L2SiegeClan getDefenderClan(int clanId) {
+		return null;
+	}
+	
+	@Override
+	public L2SiegeClan getDefenderClan(L2Clan clan) {
+		return null;
+	}
+	
+	@Override
+	public List<L2SiegeClan> getDefenderClans() {
+		return null;
+	}
+	
+	public void prepareOwner() {
+		if (_hall.getOwnerId() > 0) {
+			final L2SiegeClan clan = new L2SiegeClan(_hall.getOwnerId(), SiegeClanType.ATTACKER);
+			_attackers.put(clan.getClanId(), new L2SiegeClan(clan.getClanId(), SiegeClanType.ATTACKER));
+		}
+		
+		_hall.free();
+		_hall.banishForeigners();
+		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.REGISTRATION_TERM_FOR_S1_ENDED);
+		msg.addString(getName());
+		Broadcast.toAllOnlinePlayers(msg);
+		_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
+		
+		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeStarts(), 3600000);
+	}
+	
+	@Override
+	public void startSiege() {
+		if ((_attackers.size() < 1) && (_hall.getId() != 21)) // Fortress of resistance don't have attacker list
+		{
+			onSiegeEnds();
+			_attackers.clear();
+			_hall.updateNextSiege();
+			_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getSiegeDate().getTimeInMillis());
+			_hall.updateSiegeStatus(SiegeStatus.WAITING_BATTLE);
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST);
+			sm.addString(_hall.getName());
+			Broadcast.toAllOnlinePlayers(sm);
+			return;
+		}
+		
+		_hall.spawnDoor();
+		loadGuards();
+		spawnSiegeGuards();
+		_hall.updateSiegeZone(true);
+		
+		final byte state = 1;
+		for (L2SiegeClan sClan : _attackers.values()) {
+			final L2Clan clan = ClanTable.getInstance().getClan(sClan.getClanId());
+			if (clan == null) {
+				continue;
+			}
+			
+			for (L2PcInstance pc : clan.getOnlineMembers(0)) {
+				pc.setSiegeState(state);
+				pc.broadcastUserInfo();
+				pc.setIsInHideoutSiege(true);
+			}
+		}
+		
+		_hall.updateSiegeStatus(SiegeStatus.RUNNING);
+		onSiegeStarts();
+		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new SiegeEnds(), _hall.getSiegeLength());
+	}
+	
+	@Override
+	public void endSiege() {
+		SystemMessage end = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_OF_S1_HAS_ENDED);
+		end.addString(_hall.getName());
+		Broadcast.toAllOnlinePlayers(end);
+		
+		L2Clan winner = getWinner();
+		if (_missionAccomplished && (winner != null)) {
+			_hall.setOwner(winner);
+			winner.setHideoutId(_hall.getId());
+			var finalMsg = SystemMessage.getSystemMessage(SystemMessageId.CLAN_S1_VICTORIOUS_OVER_S2_S_SIEGE);
+			finalMsg.addString(winner.getName());
+			finalMsg.addString(_hall.getName());
+			Broadcast.toAllOnlinePlayers(finalMsg);
+		} else {
+			var finalMsg = SystemMessage.getSystemMessage(SystemMessageId.SIEGE_S1_DRAW);
+			finalMsg.addString(_hall.getName());
+			Broadcast.toAllOnlinePlayers(finalMsg);
+		}
+		_missionAccomplished = false;
+		
+		_hall.updateSiegeZone(false);
+		_hall.updateNextSiege();
+		_hall.spawnDoor(false);
+		_hall.banishForeigners();
+		
+		final byte state = 0;
+		for (L2SiegeClan sClan : _attackers.values()) {
+			final L2Clan clan = ClanTable.getInstance().getClan(sClan.getClanId());
+			if (clan == null) {
+				continue;
+			}
+			
+			for (L2PcInstance player : clan.getOnlineMembers(0)) {
+				player.setSiegeState(state);
+				player.broadcastUserInfo();
+				player.setIsInHideoutSiege(false);
+			}
+		}
+		
+		// Update pvp flag for winners when siege zone becomes inactive
+		for (L2Character chr : _hall.getSiegeZone().getCharactersInside()) {
+			if ((chr != null) && chr.isPlayer()) {
+				chr.getActingPlayer().startPvPFlag();
+			}
+		}
+		
+		_attackers.clear();
+		
+		onSiegeEnds();
+		
+		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - System.currentTimeMillis() - 3600000);
+		_log.info("Siege of {} scheduled for {}.", _hall.getName(), _hall.getSiegeDate().getTime());
+		
+		_hall.updateSiegeStatus(SiegeStatus.REGISTERING);
+		unSpawnSiegeGuards();
+	}
+	
+	@Override
+	public void updateSiege() {
+		cancelSiegeTask();
+		_siegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new PrepareOwner(), _hall.getNextSiegeTime() - 3600000);
+		_log.info("{} siege scheduled for {}.", _hall.getName(), _hall.getSiegeDate().getTime());
+	}
+	
+	public void cancelSiegeTask() {
+		if (_siegeTask != null) {
+			_siegeTask.cancel(false);
+		}
+	}
+	
+	@Override
+	public Calendar getSiegeDate() {
+		return _hall.getSiegeDate();
+	}
+	
+	@Override
+	public boolean giveFame() {
+		return clanhall().enableFame();
+	}
+	
+	@Override
+	public int getFameAmount() {
+		return clanhall().getFameAmount();
+	}
+	
+	@Override
+	public int getFameFrequency() {
+		return clanhall().getFameFrequency();
+	}
+	
+	public final void broadcastNpcSay(final L2Npc npc, final int type, final NpcStringId messageId) {
+		final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getId(), messageId);
+		final int sourceRegion = MapRegionManager.getInstance().getMapRegionLocId(npc);
+		for (L2PcInstance pc : L2World.getInstance().getPlayers()) {
+			if ((pc != null) && (MapRegionManager.getInstance().getMapRegionLocId(pc) == sourceRegion)) {
+				pc.sendPacket(npcSay);
+			}
+		}
+	}
+	
+	public Location getInnerSpawnLoc(L2PcInstance player) {
+		return null;
+	}
+	
+	public boolean canPlantFlag() {
+		return true;
+	}
+	
+	public boolean doorIsAutoAttackable() {
+		return true;
+	}
+	
+	public void onSiegeStarts() {
+	}
+	
+	public void onSiegeEnds() {
+	}
+	
+	public abstract L2Clan getWinner();
+	
+	public class PrepareOwner implements Runnable {
+		@Override
+		public void run() {
+			prepareOwner();
+		}
+	}
+	
+	public class SiegeStarts implements Runnable {
+		@Override
+		public void run() {
+			startSiege();
+		}
+	}
+	
+	public class SiegeEnds implements Runnable {
+		@Override
+		public void run() {
+			endSiege();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java
new file mode 100644
index 00000000..0f1b06f4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/SiegableHall.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity.clanhall;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.L2SiegeClan.SiegeClanType;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.zone.type.L2SiegableHallZone;
+import com.l2jserver.gameserver.model.zone.type.L2SiegeZone;
+import com.l2jserver.gameserver.network.serverpackets.SiegeInfo;
+
+/**
+ * @author BiggBoss
+ */
+public final class SiegableHall extends ClanHall {
+	private static final Logger LOG = LoggerFactory.getLogger(SiegableHall.class);
+	
+	private static final String SQL_SAVE = "UPDATE siegable_clanhall SET ownerId=?, nextSiege=? WHERE clanHallId=?";
+	
+	private Calendar _nextSiege;
+	
+	private final long _siegeLength;
+	
+	private final int[] _scheduleConfig = {
+		7,
+		0,
+		0,
+		12,
+		0
+	};
+	
+	private SiegeStatus _status = SiegeStatus.REGISTERING;
+	
+	private L2SiegeZone _siegeZone;
+	
+	private ClanHallSiegeEngine _siege;
+	
+	public SiegableHall(StatsSet set) {
+		super(set);
+		_siegeLength = set.getLong("siegeLength");
+		String[] rawSchConfig = set.getString("scheduleConfig").split(";");
+		if (rawSchConfig.length == 5) {
+			for (int i = 0; i < 5; i++) {
+				try {
+					_scheduleConfig[i] = Integer.parseInt(rawSchConfig[i]);
+				} catch (Exception e) {
+					LOG.warn("{}: Wrong schedule_config parameters!", getName());
+				}
+			}
+		} else {
+			LOG.warn("{}: Wrong schedule_config value in siegable_halls table, using default (7 days)", getName());
+		}
+		
+		_nextSiege = Calendar.getInstance();
+		long nextSiege = set.getLong("nextSiege");
+		if ((nextSiege - System.currentTimeMillis()) < 0) {
+			updateNextSiege();
+		} else {
+			_nextSiege.setTimeInMillis(nextSiege);
+		}
+		
+		if (getOwnerId() != 0) {
+			_isFree = false;
+			loadFunctions();
+		}
+	}
+	
+	public void spawnDoor() {
+		spawnDoor(false);
+	}
+	
+	public void spawnDoor(boolean isDoorWeak) {
+		for (L2DoorInstance door : getDoors()) {
+			if (door.isDead()) {
+				door.doRevive();
+				if (isDoorWeak) {
+					door.setCurrentHp(door.getMaxHp() / 2.0);
+				} else {
+					door.setCurrentHp(door.getMaxHp());
+				}
+			}
+			
+			if (door.getOpen()) {
+				door.closeMe();
+			}
+		}
+	}
+	
+	@Override
+	public void updateDb() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SQL_SAVE)) {
+			ps.setInt(1, getOwnerId());
+			ps.setLong(2, getNextSiegeTime());
+			ps.setInt(3, getId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn("Exception: SiegableHall.updateDb(): {}", e.getMessage(), e);
+		}
+	}
+	
+	public void setSiege(final ClanHallSiegeEngine siegable) {
+		_siege = siegable;
+		_siegeZone.setSiegeInstance(siegable);
+	}
+	
+	public ClanHallSiegeEngine getSiege() {
+		return _siege;
+	}
+	
+	public Calendar getSiegeDate() {
+		return _nextSiege;
+	}
+	
+	public long getNextSiegeTime() {
+		return _nextSiege.getTimeInMillis();
+	}
+	
+	public long getSiegeLength() {
+		return _siegeLength;
+	}
+	
+	public void setNextSiegeDate(long date) {
+		_nextSiege.setTimeInMillis(date);
+	}
+	
+	public void setNextSiegeDate(final Calendar c) {
+		_nextSiege = c;
+	}
+	
+	public void updateNextSiege() {
+		Calendar c = Calendar.getInstance();
+		c.add(Calendar.DAY_OF_YEAR, _scheduleConfig[0]);
+		c.add(Calendar.MONTH, _scheduleConfig[1]);
+		c.add(Calendar.YEAR, _scheduleConfig[2]);
+		c.set(Calendar.HOUR_OF_DAY, _scheduleConfig[3]);
+		c.set(Calendar.MINUTE, _scheduleConfig[4]);
+		c.set(Calendar.SECOND, 0);
+		setNextSiegeDate(c);
+		updateDb();
+	}
+	
+	public void addAttacker(final L2Clan clan) {
+		if (getSiege() != null) {
+			getSiege().getAttackers().put(clan.getId(), new L2SiegeClan(clan.getId(), SiegeClanType.ATTACKER));
+		}
+	}
+	
+	public void removeAttacker(final L2Clan clan) {
+		if (getSiege() != null) {
+			getSiege().getAttackers().remove(clan.getId());
+		}
+	}
+	
+	public boolean isRegistered(L2Clan clan) {
+		if (getSiege() == null) {
+			return false;
+		}
+		
+		return getSiege().checkIsAttacker(clan);
+	}
+	
+	public SiegeStatus getSiegeStatus() {
+		return _status;
+	}
+	
+	public boolean isRegistering() {
+		return _status == SiegeStatus.REGISTERING;
+	}
+	
+	public boolean isInSiege() {
+		return _status == SiegeStatus.RUNNING;
+	}
+	
+	public boolean isWaitingBattle() {
+		return _status == SiegeStatus.WAITING_BATTLE;
+	}
+	
+	public void updateSiegeStatus(SiegeStatus status) {
+		_status = status;
+	}
+	
+	public L2SiegeZone getSiegeZone() {
+		return _siegeZone;
+	}
+	
+	public void setSiegeZone(L2SiegeZone zone) {
+		_siegeZone = zone;
+	}
+	
+	public void updateSiegeZone(boolean active) {
+		_siegeZone.setIsActive(active);
+	}
+	
+	public void showSiegeInfo(L2PcInstance player) {
+		player.sendPacket(new SiegeInfo(this));
+	}
+	
+	@Override
+	public boolean isSiegableHall() {
+		return true;
+	}
+	
+	@Override
+	public L2SiegableHallZone getZone() {
+		return (L2SiegableHallZone) super.getZone();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/SiegeStatus.java b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/SiegeStatus.java
new file mode 100644
index 00000000..9513fb57
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/entity/clanhall/SiegeStatus.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.entity.clanhall;
+
+/**
+ * @author BiggBoss
+ */
+public enum SiegeStatus {
+	REGISTERING,
+	WAITING_BATTLE,
+	RUNNING
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java b/src/main/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java
new file mode 100644
index 00000000..77906439
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/event/LongTimeEvent.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.event;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.EventDroplist;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.announce.EventAnnouncement;
+import com.l2jserver.gameserver.model.drops.DropListScope;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.script.DateRange;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * Parent class for long time events.<br>
+ * Maintains config reading, spawn of NPC's, adding of event's drop.
+ * @author GKR
+ */
+public class LongTimeEvent extends Quest {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(LongTimeEvent.class);
+	
+	private String _eventName;
+	
+	// Messages
+	private String _onEnterMsg = "Event is in process";
+	protected String _endMsg = "Event ends!";
+	
+	private DateRange _eventPeriod = null;
+	private DateRange _dropPeriod;
+	
+	// NPC's to spawm and their spawn points
+	private final List<NpcSpawn> _spawnList = new ArrayList<>();
+	
+	// Drop data for event
+	private final List<GeneralDropItem> _dropList = new ArrayList<>();
+	
+	private static class NpcSpawn {
+		protected final Location loc;
+		protected final int npcId;
+		
+		protected NpcSpawn(int pNpcId, Location spawnLoc) {
+			loc = spawnLoc;
+			npcId = pNpcId;
+		}
+	}
+	
+	public LongTimeEvent() {
+		loadConfig();
+		
+		if (_eventPeriod != null) {
+			if (_eventPeriod.isWithinRange(new Date())) {
+				startEvent();
+				LOG.info("Event {} active till {}.", _eventName, _eventPeriod.getEndDate());
+			} else if (_eventPeriod.getStartDate().after(new Date())) {
+				long delay = _eventPeriod.getStartDate().getTime() - System.currentTimeMillis();
+				ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStart(), delay);
+				LOG.info("Event {} will be started at {}.", _eventName, _eventPeriod.getStartDate());
+			} else {
+				LOG.info("Event {} has passed... Ignored.", _eventName);
+			}
+		}
+	}
+	
+	/**
+	 * Load event configuration file
+	 */
+	private void loadConfig() {
+		File configFile = new File(server().getDatapackRoot(), "data/events/" + getName() + ".xml");
+		try {
+			DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+			DocumentBuilder db = dbf.newDocumentBuilder();
+			Document doc = db.parse(configFile);
+			if (!doc.getDocumentElement().getNodeName().equalsIgnoreCase("event")) {
+				throw new NullPointerException("WARNING!!! " + getName() + " event: bad config file!");
+			}
+			_eventName = doc.getDocumentElement().getAttributes().getNamedItem("name").getNodeValue();
+			String period = doc.getDocumentElement().getAttributes().getNamedItem("active").getNodeValue();
+			_eventPeriod = DateRange.parse(period, new SimpleDateFormat("dd MM yyyy", Locale.US));
+			
+			if (doc.getDocumentElement().getAttributes().getNamedItem("dropPeriod") != null) {
+				String dropPeriod = doc.getDocumentElement().getAttributes().getNamedItem("dropPeriod").getNodeValue();
+				_dropPeriod = DateRange.parse(dropPeriod, new SimpleDateFormat("dd MM yyyy", Locale.US));
+				// Check if drop period is within range of event period
+				if (!_eventPeriod.isWithinRange(_dropPeriod.getStartDate()) || !_eventPeriod.isWithinRange(_dropPeriod.getEndDate())) {
+					_dropPeriod = _eventPeriod;
+				}
+			} else {
+				_dropPeriod = _eventPeriod; // Drop period, if not specified, assumes all event period.
+			}
+			
+			if (_eventPeriod == null) {
+				throw new NullPointerException("WARNING!!! " + getName() + " event: illegal event period");
+			}
+			
+			Date today = new Date();
+			
+			if (_eventPeriod.getStartDate().after(today) || _eventPeriod.isWithinRange(today)) {
+				Node first = doc.getDocumentElement().getFirstChild();
+				for (Node n = first; n != null; n = n.getNextSibling()) {
+					// Loading droplist
+					if (n.getNodeName().equalsIgnoreCase("droplist")) {
+						for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+							if (d.getNodeName().equalsIgnoreCase("add")) {
+								try {
+									int itemId = Integer.parseInt(d.getAttributes().getNamedItem("item").getNodeValue());
+									int minCount = Integer.parseInt(d.getAttributes().getNamedItem("min").getNodeValue());
+									int maxCount = Integer.parseInt(d.getAttributes().getNamedItem("max").getNodeValue());
+									String chance = d.getAttributes().getNamedItem("chance").getNodeValue();
+									int finalChance = 0;
+									
+									if (!chance.isEmpty() && chance.endsWith("%")) {
+										finalChance = Integer.parseInt(chance.substring(0, chance.length() - 1)) * 10000;
+									}
+									
+									if (ItemTable.getInstance().getTemplate(itemId) == null) {
+										LOG.warn("{} event: {} is wrong item id, item was not added in droplist", getName(), itemId);
+										continue;
+									}
+									
+									if (minCount > maxCount) {
+										LOG.warn("{} event: item {} - min greater than max, item was not added in droplist", getName(), itemId);
+										continue;
+									}
+									
+									if ((finalChance < 10000) || (finalChance > 1000000)) {
+										LOG.warn("{} event: item {} - incorrect drop chance, item was not added in droplist", getName(), itemId);
+										continue;
+									}
+									
+									_dropList.add((GeneralDropItem) DropListScope.STATIC.newDropItem(itemId, minCount, maxCount, finalChance));
+								} catch (NumberFormatException nfe) {
+									LOG.warn("Wrong number format in config.xml droplist block for {} event", getName());
+								}
+							}
+						}
+					} else if (n.getNodeName().equalsIgnoreCase("spawnlist")) {
+						// Loading spawnlist
+						for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+							if (d.getNodeName().equalsIgnoreCase("add")) {
+								try {
+									int npcId = Integer.parseInt(d.getAttributes().getNamedItem("npc").getNodeValue());
+									int xPos = Integer.parseInt(d.getAttributes().getNamedItem("x").getNodeValue());
+									int yPos = Integer.parseInt(d.getAttributes().getNamedItem("y").getNodeValue());
+									int zPos = Integer.parseInt(d.getAttributes().getNamedItem("z").getNodeValue());
+									int heading = d.getAttributes().getNamedItem("heading").getNodeValue() != null ? Integer.parseInt(d.getAttributes().getNamedItem("heading").getNodeValue()) : 0;
+									
+									if (NpcData.getInstance().getTemplate(npcId) == null) {
+										LOG.warn("{} event: {} is wrong NPC id, NPC was not added in spawnlist.", getName(), npcId);
+										continue;
+									}
+									
+									_spawnList.add(new NpcSpawn(npcId, new Location(xPos, yPos, zPos, heading)));
+								} catch (NumberFormatException nfe) {
+									LOG.warn("Wrong number format in config.xml spawnlist block for {} event.", getName());
+								}
+							}
+						}
+					} else if (n.getNodeName().equalsIgnoreCase("messages")) {
+						// Loading Messages
+						for (Node d = n.getFirstChild(); d != null; d = d.getNextSibling()) {
+							if (d.getNodeName().equalsIgnoreCase("add")) {
+								String msgType = d.getAttributes().getNamedItem("type").getNodeValue();
+								String msgText = d.getAttributes().getNamedItem("text").getNodeValue();
+								if ((msgType != null) && (msgText != null)) {
+									if (msgType.equalsIgnoreCase("onEnd")) {
+										_endMsg = msgText;
+									} else if (msgType.equalsIgnoreCase("onEnter")) {
+										_onEnterMsg = msgText;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("{} event: error reading {}!", getName(), configFile.getAbsolutePath(), ex);
+		}
+	}
+	
+	/**
+	 * Maintenance event start - adds global drop, spawns event NPC's, shows start announcement.
+	 */
+	protected void startEvent() {
+		long currentTime = System.currentTimeMillis();
+		// Add drop
+		if (_dropList != null) {
+			if (currentTime < _dropPeriod.getEndDate().getTime()) {
+				for (GeneralDropItem drop : _dropList) {
+					EventDroplist.getInstance().addGlobalDrop(drop.getItemId(), drop.getMin(), drop.getMax(), (int) drop.getChance(), _dropPeriod);
+				}
+			}
+		}
+		
+		// Add spawns
+		long millisToEventEnd = _eventPeriod.getEndDate().getTime() - currentTime;
+		if (_spawnList != null) {
+			for (NpcSpawn spawn : _spawnList) {
+				addSpawn(spawn.npcId, spawn.loc.getX(), spawn.loc.getY(), spawn.loc.getZ(), spawn.loc.getHeading(), false, millisToEventEnd, false);
+			}
+		}
+		
+		// Send message on begin
+		Broadcast.toAllOnlinePlayers(_onEnterMsg);
+		
+		// Add announce for entering players
+		AnnouncementsTable.getInstance().addAnnouncement(new EventAnnouncement(_eventPeriod, _onEnterMsg));
+		
+		// Schedule event end (now only for message sending)
+		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEnd(), millisToEventEnd);
+	}
+	
+	/**
+	 * @return event period
+	 */
+	public DateRange getEventPeriod() {
+		return _eventPeriod;
+	}
+	
+	/**
+	 * @return {@code true} if now is event period
+	 */
+	public boolean isEventPeriod() {
+		return _eventPeriod.isWithinRange(new Date());
+	}
+	
+	/**
+	 * @return {@code true} if now is drop period
+	 */
+	public boolean isDropPeriod() {
+		return _dropPeriod.isWithinRange(new Date());
+	}
+	
+	protected class ScheduleStart implements Runnable {
+		@Override
+		public void run() {
+			startEvent();
+		}
+	}
+	
+	protected class ScheduleEnd implements Runnable {
+		@Override
+		public void run() {
+			// Send message on end
+			Broadcast.toAllOnlinePlayers(_endMsg);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/AbstractScript.java b/src/main/java/com/l2jserver/gameserver/model/events/AbstractScript.java
new file mode 100644
index 00000000..778986cd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/AbstractScript.java
@@ -0,0 +1,2543 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+import static com.l2jserver.gameserver.model.events.EventType.CASTLE_SIEGE_FINISH;
+import static com.l2jserver.gameserver.model.events.EventType.CASTLE_SIEGE_OWNER_CHANGE;
+import static com.l2jserver.gameserver.model.events.EventType.CASTLE_SIEGE_START;
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_KILL;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_CAN_BE_SEEN;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_EVENT_RECEIVED;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_FIRST_TALK;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_HATE;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_QUEST_START;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_TALK;
+import static com.l2jserver.gameserver.model.events.EventType.OLYMPIAD_MATCH_RESULT;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LOGOUT;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PROFESSION_CANCEL;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PROFESSION_CHANGE;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SUMMON_SPAWN;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SUMMON_TALK;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.CASTLE;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.GLOBAL;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.NPC;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.OLYMPIAD;
+import static com.l2jserver.gameserver.model.quest.QuestDroplist.singleDropItem;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.commons.util.Util;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.audio.IAudio;
+import com.l2jserver.gameserver.enums.audio.Sound;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.model.events.annotations.Id;
+import com.l2jserver.gameserver.model.events.annotations.Ids;
+import com.l2jserver.gameserver.model.events.annotations.NpcLevelRange;
+import com.l2jserver.gameserver.model.events.annotations.NpcLevelRanges;
+import com.l2jserver.gameserver.model.events.annotations.Priority;
+import com.l2jserver.gameserver.model.events.annotations.Range;
+import com.l2jserver.gameserver.model.events.annotations.Ranges;
+import com.l2jserver.gameserver.model.events.annotations.RegisterEvent;
+import com.l2jserver.gameserver.model.events.annotations.RegisterType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureKill;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcCanBeSeen;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcEventReceived;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcFirstTalk;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableHate;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLogout;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerProfessionCancel;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerProfessionChange;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSummonSpawn;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSummonTalk;
+import com.l2jserver.gameserver.model.events.impl.olympiad.OlympiadMatchResult;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeFinish;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeOwnerChange;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeStart;
+import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
+import com.l2jserver.gameserver.model.events.listeners.AnnotationEventListener;
+import com.l2jserver.gameserver.model.events.listeners.ConsumerEventListener;
+import com.l2jserver.gameserver.model.events.listeners.DummyEventListener;
+import com.l2jserver.gameserver.model.events.listeners.FunctionEventListener;
+import com.l2jserver.gameserver.model.events.listeners.RunnableEventListener;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.QuestItemChanceHolder;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.INamable;
+import com.l2jserver.gameserver.model.interfaces.IPositionable;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+import com.l2jserver.gameserver.model.quest.QuestDroplist;
+import com.l2jserver.gameserver.model.quest.QuestDroplist.QuestDropInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.scripting.ScriptManager;
+import com.l2jserver.gameserver.util.MinionList;
+
+/**
+ * Abstract script.
+ * @author KenM
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public abstract class AbstractScript implements INamable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractScript.class);
+	
+	private final Map<ListenerRegisterType, Set<Integer>> _registeredIds = new ConcurrentHashMap<>();
+	
+	private final List<AbstractEventListener> _listeners = new CopyOnWriteArrayList<>();
+	
+	private boolean _isActive;
+	
+	public AbstractScript() {
+		initializeAnnotationListeners();
+	}
+	
+	private void initializeAnnotationListeners() {
+		final List<Integer> ids = new ArrayList<>();
+		for (Method method : getClass().getMethods()) {
+			if (method.isAnnotationPresent(RegisterEvent.class) && method.isAnnotationPresent(RegisterType.class)) {
+				final RegisterEvent listener = method.getAnnotation(RegisterEvent.class);
+				final RegisterType regType = method.getAnnotation(RegisterType.class);
+				
+				final ListenerRegisterType type = regType.value();
+				final EventType eventType = listener.value();
+				if (method.getParameterCount() != 1) {
+					LOG.warn("Non properly defined annotation listener on method {} expected parameter count is 1 but found {}!", method.getName(), method.getParameterCount());
+					continue;
+				}
+				
+				if (!eventType.isEventClass(method.getParameterTypes()[0])) {
+					LOG.warn("Non properly defined annotation listener on method {} expected parameter to be type of {} but found {}!", method.getName(), eventType.getEventClass().getSimpleName(), method.getParameterTypes()[0].getSimpleName());
+					continue;
+				}
+				
+				if (!eventType.isReturnClass(method.getReturnType())) {
+					LOG.warn("Non properly defined annotation listener on method {} expected return type to be one of {} but found {}", method.getName(), Arrays.toString(eventType.getReturnClasses()), method.getReturnType().getSimpleName());
+					continue;
+				}
+				
+				int priority = 0;
+				
+				// Clear the list
+				ids.clear();
+				
+				// Scan for possible ID filters
+				for (Annotation annotation : method.getAnnotations()) {
+					if (annotation instanceof Id npc) {
+						for (int id : npc.value()) {
+							ids.add(id);
+						}
+					} else if (annotation instanceof Ids npcs) {
+						for (Id npc : npcs.value()) {
+							for (int id : npc.value()) {
+								ids.add(id);
+							}
+						}
+					} else if (annotation instanceof Range range) {
+						if (range.from() > range.to()) {
+							LOG.warn("Wrong {} from is higher then to!", annotation.getClass().getSimpleName());
+							continue;
+						}
+						
+						for (int id = range.from(); id <= range.to(); id++) {
+							ids.add(id);
+						}
+					} else if (annotation instanceof Ranges ranges) {
+						for (Range range : ranges.value()) {
+							if (range.from() > range.to()) {
+								LOG.warn("Wrong {} from is higher then to!", annotation.getClass().getSimpleName());
+								continue;
+							}
+							
+							for (int id = range.from(); id <= range.to(); id++) {
+								ids.add(id);
+							}
+						}
+					} else if (annotation instanceof NpcLevelRange range) {
+						if (range.from() > range.to()) {
+							LOG.warn("Wrong {} from is higher then to!", annotation.getClass().getSimpleName());
+							continue;
+						} else if (type != NPC) {
+							LOG.warn("ListenerRegisterType {} for {} NPC is expected!", type, annotation.getClass().getSimpleName());
+							continue;
+						}
+						
+						for (int level = range.from(); level <= range.to(); level++) {
+							final List<L2NpcTemplate> templates = NpcData.getInstance().getAllOfLevel(level);
+							templates.forEach(t -> ids.add(t.getId()));
+						}
+					} else if (annotation instanceof NpcLevelRanges ranges) {
+						for (NpcLevelRange range : ranges.value()) {
+							if (range.from() > range.to()) {
+								LOG.warn("Wrong {} from is higher then to!", annotation.getClass().getSimpleName());
+								continue;
+							} else if (type != NPC) {
+								LOG.warn("ListenerRegisterType {} for {} NPC is expected!", type, annotation.getClass().getSimpleName());
+								continue;
+							}
+							
+							for (int level = range.from(); level <= range.to(); level++) {
+								final List<L2NpcTemplate> templates = NpcData.getInstance().getAllOfLevel(level);
+								templates.forEach(t -> ids.add(t.getId()));
+							}
+						}
+					} else if (annotation instanceof Priority p) {
+						priority = p.value();
+					}
+				}
+				
+				if (!ids.isEmpty()) {
+					_registeredIds.putIfAbsent(type, ConcurrentHashMap.newKeySet(ids.size()));
+					
+					_registeredIds.get(type).addAll(ids);
+				}
+				
+				registerAnnotation(method, eventType, type, priority, ids);
+			}
+		}
+	}
+	
+	public void setActive(boolean status) {
+		_isActive = status;
+	}
+	
+	public boolean isActive() {
+		return _isActive;
+	}
+	
+	public abstract boolean reload();
+	
+	/**
+	 * Unloads all listeners registered by this class.
+	 * @return {@code true}
+	 */
+	public boolean unload() {
+		_listeners.forEach(AbstractEventListener::unregisterMe);
+		_listeners.clear();
+		return true;
+	}
+	
+	public abstract ScriptManager<?> getManager();
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when L2Attackable dies from a player with return type.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> addCreatureKillId(Function<CreatureKill, ? extends AbstractEventReturn> callback, int... npcIds) {
+		return registerFunction(callback, CREATURE_KILL, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when L2Attackable dies from a player.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCreatureKillId(Consumer<CreatureKill> callback, int... npcIds) {
+		return registerConsumer(callback, CREATURE_KILL, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Attackable} dies from a {@link L2PcInstance}.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCreatureKillId(Consumer<CreatureKill> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, CREATURE_KILL, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk to {@link L2Npc} for first time.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<NpcFirstTalk> callback, int... npcIds) {
+		return registerConsumer(callback, NPC_FIRST_TALK, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk to {@link L2Npc} for first time.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcFirstTalkId(Consumer<NpcFirstTalk> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, NPC_FIRST_TALK, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk to {@link L2Npc}.
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcTalkId(Collection<Integer> npcIds) {
+		return registerDummy(NPC_TALK, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk to {@link L2Npc}.
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcTalkId(int... npcIds) {
+		return registerDummy(NPC_TALK, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk to {@link L2Npc} and must receive quest state.
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcQuestStartId(int... npcIds) {
+		return registerDummy(NPC_QUEST_START, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk to {@link L2Npc} and must receive quest state.
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcQuestStartId(Collection<Integer> npcIds) {
+		return registerDummy(NPC_QUEST_START, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} receives event from another {@link L2Npc}
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcEventReceivedId(Consumer<NpcEventReceived> callback, int... npcIds) {
+		return registerConsumer(callback, NPC_EVENT_RECEIVED, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} receives event from another {@link L2Npc}
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcEventReceivedId(Consumer<NpcEventReceived> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, NPC_EVENT_RECEIVED, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcHateId(Consumer<AttackableHate> callback, int... npcIds) {
+		return registerConsumer(callback, NPC_HATE, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcHateId(Consumer<AttackableHate> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, NPC_HATE, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> addNpcHateId(Function<AttackableHate, TerminateReturn> callback, int... npcIds) {
+		return registerFunction(callback, NPC_HATE, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> addNpcHateId(Function<AttackableHate, TerminateReturn> callback, Collection<Integer> npcIds) {
+		return registerFunction(callback, NPC_HATE, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcCanBeSeenId(Consumer<NpcCanBeSeen> callback, int... npcIds) {
+		return registerConsumer(callback, NPC_CAN_BE_SEEN, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcCanBeSeenId(Consumer<NpcCanBeSeen> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, NPC_CAN_BE_SEEN, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcCanBeSeenId(Function<NpcCanBeSeen, TerminateReturn> callback, int... npcIds) {
+		return registerFunction(callback, NPC_CAN_BE_SEEN, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2Npc} is about to hate and start attacking a creature.
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setNpcCanBeSeenId(Function<NpcCanBeSeen, TerminateReturn> callback, Collection<Integer> npcIds) {
+		return registerFunction(callback, NPC_CAN_BE_SEEN, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} summons a servitor or a pet
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerSummonSpawnId(Consumer<PlayerSummonSpawn> callback, int... npcIds) {
+		return registerConsumer(callback, PLAYER_SUMMON_SPAWN, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} summons a servitor or a pet
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerSummonSpawnId(Consumer<PlayerSummonSpawn> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, PLAYER_SUMMON_SPAWN, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk with a servitor or a pet
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerSummonTalkId(Consumer<PlayerSummonTalk> callback, int... npcIds) {
+		return registerConsumer(callback, PLAYER_SUMMON_TALK, NPC, npcIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} talk with a servitor or a pet
+	 * @param callback
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerSummonTalkId(Consumer<PlayerSummonSpawn> callback, Collection<Integer> npcIds) {
+		return registerConsumer(callback, PLAYER_SUMMON_TALK, NPC, npcIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when {@link L2PcInstance} summons a servitor or a pet
+	 * @param callback
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerLogoutId(Consumer<PlayerLogout> callback) {
+		return registerConsumer(callback, PLAYER_LOGOUT, GLOBAL);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when Olympiad match finishes.
+	 * @param callback the event callback
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setOlympiadMatchResult(Consumer<OlympiadMatchResult> callback) {
+		return registerConsumer(callback, OLYMPIAD_MATCH_RESULT, OLYMPIAD);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when castle siege begins
+	 * @param callback the event callback
+	 * @param castleIds the castle Ids
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCastleSiegeStartId(Consumer<CastleSiegeStart> callback, int... castleIds) {
+		return registerConsumer(callback, CASTLE_SIEGE_START, CASTLE, castleIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when castle siege begins
+	 * @param callback the event callback
+	 * @param castleIds the castle Ids
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCastleSiegeStartId(Consumer<CastleSiegeStart> callback, Collection<Integer> castleIds) {
+		return registerConsumer(callback, CASTLE_SIEGE_START, CASTLE, castleIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when Castle owner has changed during a siege
+	 * @param callback
+	 * @param castleIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCastleSiegeOwnerChangeId(Consumer<CastleSiegeOwnerChange> callback, int... castleIds) {
+		return registerConsumer(callback, CASTLE_SIEGE_OWNER_CHANGE, CASTLE, castleIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when Castle owner has changed during a siege
+	 * @param callback
+	 * @param castleIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCastleSiegeOwnerChangeId(Consumer<CastleSiegeOwnerChange> callback, Collection<Integer> castleIds) {
+		return registerConsumer(callback, CASTLE_SIEGE_OWNER_CHANGE, CASTLE, castleIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when castle siege ends
+	 * @param callback
+	 * @param castleIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCastleSiegeFinishId(Consumer<CastleSiegeFinish> callback, int... castleIds) {
+		return registerConsumer(callback, CASTLE_SIEGE_FINISH, CASTLE, castleIds);
+	}
+	
+	/**
+	 * Provides instant callback operation when castle siege ends
+	 * @param callback
+	 * @param castleIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setCastleSiegeFinishId(Consumer<CastleSiegeFinish> callback, Collection<Integer> castleIds) {
+		return registerConsumer(callback, CASTLE_SIEGE_FINISH, CASTLE, castleIds);
+	}
+	
+	// ---------------------------------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Provides instant callback operation when player's profession has changed.
+	 * @param callback
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerProfessionChangeId(Consumer<PlayerProfessionChange> callback) {
+		return registerConsumer(callback, PLAYER_PROFESSION_CHANGE, GLOBAL);
+	}
+	
+	/**
+	 * Provides instant callback operation when player's cancel profession
+	 * @param callback
+	 * @return
+	 */
+	protected final List<AbstractEventListener> setPlayerProfessionCancelId(Consumer<PlayerProfessionCancel> callback) {
+		return registerConsumer(callback, PLAYER_PROFESSION_CANCEL, GLOBAL);
+	}
+	
+	// --------------------------------------------------------------------------------------------------
+	// --------------------------------Default listener register methods---------------------------------
+	// --------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Method that registers Function type of listeners (Listeners that need parameters but doesn't return objects)
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerConsumer(Consumer<? extends BaseEvent> callback, EventType type, ListenerRegisterType registerType, int... npcIds) {
+		return registerListener(container -> new ConsumerEventListener(container, type, callback, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers Function type of listeners (Listeners that need parameters but doesn't return objects)
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerConsumer(Consumer<? extends BaseEvent> callback, EventType type, ListenerRegisterType registerType, Collection<Integer> npcIds) {
+		return registerListener(container -> new ConsumerEventListener(container, type, callback, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers Function type of listeners (Listeners that need parameters and return objects)
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerFunction(Function<? extends BaseEvent, ? extends AbstractEventReturn> callback, EventType type, ListenerRegisterType registerType, int... npcIds) {
+		return registerListener(container -> new FunctionEventListener(container, type, callback, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers Function type of listeners (Listeners that need parameters and return objects)
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerFunction(Function<? extends BaseEvent, ? extends AbstractEventReturn> callback, EventType type, ListenerRegisterType registerType, Collection<Integer> npcIds) {
+		return registerListener(container -> new FunctionEventListener(container, type, callback, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers runnable type of listeners (Listeners that doesn't need parameters or return objects).
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerRunnable(Runnable callback, EventType type, ListenerRegisterType registerType, int... npcIds) {
+		return registerListener(container -> new RunnableEventListener(container, type, callback, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers runnable type of listeners (Listeners that doesn't need parameters or return objects).
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerRunnable(Runnable callback, EventType type, ListenerRegisterType registerType, Collection<Integer> npcIds) {
+		return registerListener(container -> new RunnableEventListener(container, type, callback, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers runnable type of listeners (Listeners that doesn't need parameters or return objects).
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param priority
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerAnnotation(Method callback, EventType type, ListenerRegisterType registerType, int priority, int... npcIds) {
+		return registerListener(container -> new AnnotationEventListener(container, type, callback, this, priority), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers runnable type of listeners (Listeners that doesn't need parameters or return objects).
+	 * @param callback
+	 * @param type
+	 * @param registerType
+	 * @param priority
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerAnnotation(Method callback, EventType type, ListenerRegisterType registerType, int priority, Collection<Integer> npcIds) {
+		return registerListener(container -> new AnnotationEventListener(container, type, callback, this, priority), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers dummy type of listeners (Listeners doesn't get notification but just used to check if their type present or not).
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerDummy(EventType type, ListenerRegisterType registerType, int... npcIds) {
+		return registerListener(container -> new DummyEventListener(container, type, this), registerType, npcIds);
+	}
+	
+	/**
+	 * Method that registers dummy type of listeners (Listeners doesn't get notification but just used to check if their type present or not).
+	 * @param type
+	 * @param registerType
+	 * @param npcIds
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerDummy(EventType type, ListenerRegisterType registerType, Collection<Integer> npcIds) {
+		return registerListener(container -> new DummyEventListener(container, type, this), registerType, npcIds);
+	}
+	
+	// --------------------------------------------------------------------------------------------------
+	// --------------------------------------Register methods--------------------------------------------
+	// --------------------------------------------------------------------------------------------------
+	
+	/**
+	 * Generic listener register method
+	 * @param action
+	 * @param registerType
+	 * @param ids
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerListener(Function<ListenersContainer, AbstractEventListener> action, ListenerRegisterType registerType, int... ids) {
+		final List<AbstractEventListener> listeners = new ArrayList<>(ids.length > 0 ? ids.length : 1);
+		if (ids.length > 0) {
+			for (int id : ids) {
+				switch (registerType) {
+					case NPC -> {
+						final L2NpcTemplate template = NpcData.getInstance().getTemplate(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case ZONE -> {
+						final L2ZoneType template = ZoneManager.getInstance().getZoneById(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case ITEM -> {
+						final L2Item template = ItemTable.getInstance().getTemplate(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case CASTLE -> {
+						final Castle template = CastleManager.getInstance().getCastleById(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case FORTRESS -> {
+						final Fort template = FortManager.getInstance().getFortById(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					default -> LOG.warn("Unhandled register type {}", registerType);
+				}
+				
+				_registeredIds.putIfAbsent(registerType, ConcurrentHashMap.newKeySet(1));
+				_registeredIds.get(registerType).add(id);
+			}
+		} else {
+			switch (registerType) {
+				case OLYMPIAD -> {
+					final Olympiad template = Olympiad.getInstance();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL -> {
+					final ListenersContainer template = Containers.Global();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL_NPCS -> {
+					final ListenersContainer template = Containers.Npcs();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL_MONSTERS -> {
+					final ListenersContainer template = Containers.Monsters();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL_PLAYERS -> {
+					final ListenersContainer template = Containers.Players();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+			}
+		}
+		
+		_listeners.addAll(listeners);
+		return listeners;
+	}
+	
+	/**
+	 * Generic listener register method
+	 * @param action
+	 * @param registerType
+	 * @param ids
+	 * @return
+	 */
+	protected final List<AbstractEventListener> registerListener(Function<ListenersContainer, AbstractEventListener> action, ListenerRegisterType registerType, Collection<Integer> ids) {
+		final List<AbstractEventListener> listeners = new ArrayList<>(!ids.isEmpty() ? ids.size() : 1);
+		if (!ids.isEmpty()) {
+			for (int id : ids) {
+				switch (registerType) {
+					case NPC -> {
+						final L2NpcTemplate template = NpcData.getInstance().getTemplate(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case ZONE -> {
+						final L2ZoneType template = ZoneManager.getInstance().getZoneById(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case ITEM -> {
+						final L2Item template = ItemTable.getInstance().getTemplate(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case CASTLE -> {
+						final Castle template = CastleManager.getInstance().getCastleById(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					case FORTRESS -> {
+						final Fort template = FortManager.getInstance().getFortById(id);
+						if (template != null) {
+							listeners.add(template.addListener(action.apply(template)));
+						}
+					}
+					default -> LOG.warn("Unhandled register type {}", registerType);
+				}
+			}
+			
+			_registeredIds.putIfAbsent(registerType, ConcurrentHashMap.newKeySet(ids.size()));
+			_registeredIds.get(registerType).addAll(ids);
+		} else {
+			switch (registerType) {
+				case OLYMPIAD -> {
+					final Olympiad template = Olympiad.getInstance();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL -> {
+					final ListenersContainer template = Containers.Global();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL_NPCS -> {
+					final ListenersContainer template = Containers.Npcs();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL_MONSTERS -> {
+					final ListenersContainer template = Containers.Monsters();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+				case GLOBAL_PLAYERS -> {
+					final ListenersContainer template = Containers.Players();
+					listeners.add(template.addListener(action.apply(template)));
+				}
+			}
+		}
+		_listeners.addAll(listeners);
+		return listeners;
+	}
+	
+	public Set<Integer> getRegisteredIds(ListenerRegisterType type) {
+		return _registeredIds.getOrDefault(type, Collections.emptySet());
+	}
+	
+	public List<AbstractEventListener> getListeners() {
+		return _listeners;
+	}
+	
+	/**
+	 * Show an on-screen message to the player.
+	 * @param player the player to display the message to
+	 * @param text the message to display
+	 * @param time the duration of the message in milliseconds
+	 */
+	public static void showOnScreenMsg(L2PcInstance player, String text, int time) {
+		player.sendPacket(new ExShowScreenMessage(text, time));
+	}
+	
+	/**
+	 * Show an on-screen message to the player.
+	 * @param player the player to display the message to
+	 * @param npcString the NPC string to display
+	 * @param position the position of the message on the screen
+	 * @param time the duration of the message in milliseconds
+	 * @param params values of parameters to replace in the NPC String (like S1, C1 etc.)
+	 */
+	public static void showOnScreenMsg(L2PcInstance player, NpcStringId npcString, int position, int time, String... params) {
+		player.sendPacket(new ExShowScreenMessage(npcString, position, time, params));
+	}
+	
+	/**
+	 * Show an on-screen message to the player.
+	 * @param player the player to display the message to
+	 * @param systemMsg the system message to display
+	 * @param position the position of the message on the screen
+	 * @param time the duration of the message in milliseconds
+	 * @param params values of parameters to replace in the system message (like S1, C1 etc.)
+	 */
+	public static void showOnScreenMsg(L2PcInstance player, SystemMessageId systemMsg, int position, int time, String... params) {
+		player.sendPacket(new ExShowScreenMessage(systemMsg, position, time, params));
+	}
+	
+	/**
+	 * Show an on-screen message to the player.
+	 * @param player the player to display the message to
+	 * @param msgPosType the position of the message on the screen
+	 * @param unk1 unknown value
+	 * @param fontSize font size (normal, small)
+	 * @param unk2 unknown value
+	 * @param unk3 unknown value
+	 * @param showEffect if {@true} then it will show an effect
+	 * @param time the duration of the message in milliseconds
+	 * @param fade if {@true} then it will fade
+	 * @param npcStringId the NPC string to display
+	 * @param params values of parameters to replace in the NPC String
+	 */
+	public static void showOnScreenMsgFStr(L2PcInstance player, int msgPosType, int unk1, int fontSize, int unk2, int unk3, boolean showEffect, int time, boolean fade, NpcStringId npcStringId, String... params) {
+		player.sendPacket(new ExShowScreenMessage(2, -1, msgPosType, unk1, fontSize, unk2, unk3, showEffect, time, fade, null, npcStringId, params));
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param pos the object containing the spawn location coordinates
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, IPositionable pos) {
+		return addSpawn(npcId, pos.getX(), pos.getY(), pos.getZ(), pos.getHeading(), false, 0, false, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param summoner the NPC that requires this spawn
+	 * @param npcId the ID of the NPC to spawn
+	 * @param pos the object containing the spawn location coordinates
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @return the {@link L2Npc} object of the newly spawned NPC, {@code null} if the NPC doesn't exist
+	 */
+	public static L2Npc addSpawn(L2Npc summoner, int npcId, IPositionable pos, boolean randomOffset, long despawnDelay) {
+		return addSpawn(summoner, npcId, pos.getX(), pos.getY(), pos.getZ(), pos.getHeading(), randomOffset, despawnDelay, false, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param pos the object containing the spawn location coordinates
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on NPC spawn
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, IPositionable pos, boolean isSummonSpawn) {
+		return addSpawn(npcId, pos.getX(), pos.getY(), pos.getZ(), pos.getHeading(), false, 0, isSummonSpawn, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param pos the object containing the spawn location coordinates
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, IPositionable pos, boolean randomOffset, long despawnDelay) {
+		return addSpawn(npcId, pos.getX(), pos.getY(), pos.getZ(), pos.getHeading(), randomOffset, despawnDelay, false, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param pos the object containing the spawn location coordinates
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on NPC spawn
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, IPositionable pos, boolean randomOffset, long despawnDelay, boolean isSummonSpawn) {
+		return addSpawn(npcId, pos.getX(), pos.getY(), pos.getZ(), pos.getHeading(), randomOffset, despawnDelay, isSummonSpawn, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param pos the object containing the spawn location coordinates
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on NPC spawn
+	 * @param instanceId the ID of the instance to spawn the NPC in (0 - the open world)
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable)
+	 * @see #addSpawn(int, IPositionable, boolean)
+	 * @see #addSpawn(int, IPositionable, boolean, long)
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, IPositionable pos, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId) {
+		return addSpawn(npcId, pos.getX(), pos.getY(), pos.getZ(), pos.getHeading(), randomOffset, despawnDelay, isSummonSpawn, instanceId);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param x the X coordinate of the spawn location
+	 * @param y the Y coordinate of the spawn location
+	 * @param z the Z coordinate (height) of the spawn location
+	 * @param heading the heading of the NPC
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay) {
+		return addSpawn(npcId, x, y, z, heading, randomOffset, despawnDelay, false, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param x the X coordinate of the spawn location
+	 * @param y the Y coordinate of the spawn location
+	 * @param z the Z coordinate (height) of the spawn location
+	 * @param heading the heading of the NPC
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on NPC spawn
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean, int)
+	 */
+	public static L2Npc addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn) {
+		return addSpawn(npcId, x, y, z, heading, randomOffset, despawnDelay, isSummonSpawn, 0);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param npcId the ID of the NPC to spawn
+	 * @param x the X coordinate of the spawn location
+	 * @param y the Y coordinate of the spawn location
+	 * @param z the Z coordinate (height) of the spawn location
+	 * @param heading the heading of the NPC
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on NPC spawn
+	 * @param instanceId the ID of the instance to spawn the NPC in (0 - the open world)
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
+	 */
+	public static L2Npc addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId) {
+		return addSpawn(null, npcId, x, y, z, heading, randomOffset, despawnDelay, isSummonSpawn, instanceId);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified NPC.
+	 * @param summoner the NPC that requires this spawn
+	 * @param npcId the ID of the NPC to spawn
+	 * @param x the X coordinate of the spawn location
+	 * @param y the Y coordinate of the spawn location
+	 * @param z the Z coordinate (height) of the spawn location
+	 * @param heading the heading of the NPC
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the NPC is despawned (0 - only despawned on server shutdown)
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on NPC spawn
+	 * @param instanceId the ID of the instance to spawn the NPC in (0 - the open world)
+	 * @return the {@link L2Npc} object of the newly spawned NPC or {@code null} if the NPC doesn't exist
+	 * @see #addSpawn(int, IPositionable, boolean, long, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long)
+	 * @see #addSpawn(int, int, int, int, int, boolean, long, boolean)
+	 */
+	public static L2Npc addSpawn(L2Npc summoner, int npcId, int x, int y, int z, int heading, boolean randomOffset, long despawnDelay, boolean isSummonSpawn, int instanceId) {
+		try {
+			if ((x == 0) && (y == 0)) {
+				LOG.error("addSpawn(): invalid spawn coordinates for NPC #{}!", npcId);
+				return null;
+			}
+			
+			if (randomOffset) {
+				int offset = Rnd.get(50, 100);
+				if (Rnd.nextBoolean()) {
+					offset *= -1;
+				}
+				x += offset;
+				
+				offset = Rnd.get(50, 100);
+				if (Rnd.nextBoolean()) {
+					offset *= -1;
+				}
+				y += offset;
+			}
+			
+			final var spawn = new L2Spawn(npcId);
+			spawn.setInstanceId(instanceId);
+			spawn.setHeading(heading);
+			spawn.setX(x);
+			spawn.setY(y);
+			spawn.setZ(z);
+			spawn.stopRespawn();
+			
+			final var npc = spawn.spawnOne(isSummonSpawn);
+			if (despawnDelay > 0) {
+				npc.scheduleDespawn(despawnDelay);
+			}
+			
+			if (summoner != null) {
+				summoner.addSummonedNpc(npc);
+			}
+			return npc;
+		} catch (Exception ex) {
+			LOG.warn("Could not spawn NPC #{}", npcId, ex);
+		}
+		return null;
+	}
+	
+	/**
+	 * @param trapId
+	 * @param x
+	 * @param y
+	 * @param z
+	 * @param heading
+	 * @param skill
+	 * @param instanceId
+	 * @return
+	 */
+	public L2TrapInstance addTrap(int trapId, int x, int y, int z, int heading, Skill skill, int instanceId) {
+		final var template = NpcData.getInstance().getTemplate(trapId);
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var trap = new L2TrapInstance(objectId, template, instanceId, -1);
+		trap.setCurrentHp(trap.getMaxHp());
+		trap.setCurrentMp(trap.getMaxMp());
+		trap.setIsMortal(false);
+		trap.setHeading(heading);
+		trap.spawnMe(x, y, z);
+		return trap;
+	}
+	
+	/**
+	 * @param master
+	 * @param minionId
+	 * @return
+	 */
+	public L2Npc addMinion(L2MonsterInstance master, int minionId) {
+		return MinionList.spawnMinion(master, minionId);
+	}
+	
+	/**
+	 * Get the amount of an item in player's inventory.
+	 * @param player the player whose inventory to check
+	 * @param itemId the ID of the item whose amount to get
+	 * @return the amount of the specified item in player's inventory
+	 */
+	public static long getQuestItemsCount(L2PcInstance player, int itemId) {
+		return player.getInventory().getInventoryItemCount(itemId, -1);
+	}
+	
+	/**
+	 * Get the total amount of all specified items in player's inventory.
+	 * @param player the player whose inventory to check
+	 * @param itemIds a list of IDs of items whose amount to get
+	 * @return the summary amount of all listed items in player's inventory
+	 */
+	public long getQuestItemsCount(L2PcInstance player, int... itemIds) {
+		long count = 0;
+		for (L2ItemInstance item : player.getInventory().getItems()) {
+			if (item == null) {
+				continue;
+			}
+			
+			for (int itemId : itemIds) {
+				if (item.getId() == itemId) {
+					try {
+						count = Math.addExact(count, item.getCount());
+					} catch (ArithmeticException ae) {
+						count = Long.MAX_VALUE;
+						break;
+					}
+				}
+			}
+		}
+		return count;
+	}
+	
+	/**
+	 * Check if the player has the specified item in his inventory.
+	 * @param player the player whose inventory to check for the specified item
+	 * @param item the {@link ItemHolder} object containing the ID and count of the item to check
+	 * @return {@code true} if the player has the required count of the item
+	 */
+	protected static boolean hasItem(L2PcInstance player, ItemHolder item) {
+		return hasItem(player, item, true);
+	}
+	
+	/**
+	 * Check if the player has the required count of the specified item in his inventory.
+	 * @param player the player whose inventory to check for the specified item
+	 * @param item the {@link ItemHolder} object containing the ID and count of the item to check
+	 * @param checkCount if {@code true}, check if each item is at least of the count specified in the ItemHolder,<br>
+	 *            otherwise check only if the player has the item at all
+	 * @return {@code true} if the player has the item
+	 */
+	protected static boolean hasItem(L2PcInstance player, ItemHolder item, boolean checkCount) {
+		if (item == null) {
+			return false;
+		}
+		if (checkCount) {
+			return (getQuestItemsCount(player, item.getId()) >= item.getCount());
+		}
+		return hasQuestItems(player, item.getId());
+	}
+	
+	protected static boolean hasItemsAtLimit(L2PcInstance player, QuestItemChanceHolder... items) {
+		if (items == null) {
+			return false;
+		}
+		
+		return Arrays.stream(items).allMatch(item -> getQuestItemsCount(player, item.getId()) >= item.getLimit());
+	}
+	
+	/**
+	 * Check if the player has all the specified items in his inventory and, if necessary, if their count is also as required.
+	 * @param player the player whose inventory to check for the specified item
+	 * @param checkCount if {@code true}, check if each item is at least of the count specified in the ItemHolder,<br>
+	 *            otherwise check only if the player has the item at all
+	 * @param itemList a list of {@link ItemHolder} objects containing the IDs of the items to check
+	 * @return {@code true} if the player has all the items from the list
+	 */
+	protected static boolean hasAllItems(L2PcInstance player, boolean checkCount, ItemHolder... itemList) {
+		if ((itemList == null) || (itemList.length == 0)) {
+			return false;
+		}
+		for (ItemHolder item : itemList) {
+			if (!hasItem(player, item, checkCount)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Check for an item in player's inventory.
+	 * @param player the player whose inventory to check for quest items
+	 * @param itemId the ID of the item to check for
+	 * @return {@code true} if the item exists in player's inventory, {@code false} otherwise
+	 */
+	public static boolean hasQuestItems(L2PcInstance player, int itemId) {
+		return (player.getInventory().getItemByItemId(itemId) != null);
+	}
+	
+	/**
+	 * Check for multiple items in player's inventory.
+	 * @param player the player whose inventory to check for quest items
+	 * @param itemIds a list of item IDs to check for
+	 * @return {@code true} if all items exist in player's inventory, {@code false} otherwise
+	 */
+	public static boolean hasQuestItems(L2PcInstance player, int... itemIds) {
+		if ((itemIds == null) || (itemIds.length == 0)) {
+			return false;
+		}
+		final PcInventory inv = player.getInventory();
+		for (int itemId : itemIds) {
+			if (inv.getItemByItemId(itemId) == null) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Check for multiple items in player's inventory.
+	 * @param player the player whose inventory to check for quest items
+	 * @param itemIds a list of item IDs to check for
+	 * @return {@code true} if at least one item exist in player's inventory, {@code false} otherwise
+	 */
+	public boolean hasAtLeastOneQuestItem(L2PcInstance player, int... itemIds) {
+		final PcInventory inv = player.getInventory();
+		for (int itemId : itemIds) {
+			if (inv.getItemByItemId(itemId) != null) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Get the enchantment level of an item in player's inventory.
+	 * @param player the player whose item to check
+	 * @param itemId the ID of the item whose enchantment level to get
+	 * @return the enchantment level of the item or 0 if the item was not found
+	 */
+	public static int getEnchantLevel(L2PcInstance player, int itemId) {
+		final L2ItemInstance enchantedItem = player.getInventory().getItemByItemId(itemId);
+		if (enchantedItem == null) {
+			return 0;
+		}
+		return enchantedItem.getEnchantLevel();
+	}
+	
+	/**
+	 * Give Adena to the player.
+	 * @param player the player to whom to give the Adena
+	 * @param count the amount of Adena to give
+	 * @param applyRates if {@code true} quest rates will be applied to the amount
+	 */
+	public static void giveAdena(L2PcInstance player, long count, boolean applyRates) {
+		if (applyRates) {
+			rewardItems(player, Inventory.ADENA_ID, count);
+		} else {
+			giveItems(player, Inventory.ADENA_ID, count);
+		}
+	}
+	
+	/**
+	 * Give a reward to player using multipliers.
+	 * @param player the player to whom to give the item
+	 * @param holder
+	 */
+	public static void rewardItems(L2PcInstance player, ItemHolder holder) {
+		rewardItems(player, holder.getId(), holder.getCount());
+	}
+	
+	/**
+	 * Give a reward to player using multipliers.
+	 * @param player the player to whom to give the item
+	 * @param itemId the ID of the item to give
+	 * @param count the amount of items to give
+	 */
+	public static void rewardItems(L2PcInstance player, int itemId, long count) {
+		if (count <= 0) {
+			return;
+		}
+		
+		final L2Item item = ItemTable.getInstance().getTemplate(itemId);
+		if (item == null) {
+			return;
+		}
+		
+		try {
+			if (itemId == Inventory.ADENA_ID) {
+				count *= rates().getRateQuestRewardAdena();
+			} else if (rates().useQuestRewardMultipliers()) {
+				if (item instanceof L2EtcItem etc) {
+					switch (etc.getItemType()) {
+						case POTION -> count *= rates().getRateQuestRewardPotion();
+						case SCRL_ENCHANT_WP, SCRL_ENCHANT_AM, SCROLL -> count *= rates().getRateQuestRewardScroll();
+						case RECIPE -> count *= rates().getRateQuestRewardRecipe();
+						case MATERIAL -> count *= rates().getRateQuestRewardMaterial();
+						default -> count *= rates().getRateQuestReward();
+					}
+				}
+			} else {
+				count *= rates().getRateQuestReward();
+			}
+		} catch (Exception e) {
+			count = Long.MAX_VALUE;
+		}
+		
+		// Add items to player's inventory
+		final L2ItemInstance itemInstance = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (itemInstance == null) {
+			return;
+		}
+		
+		sendItemGetMessage(player, itemInstance, count);
+	}
+	
+	/**
+	 * Send the system message and the status update packets to the player.
+	 * @param player the player that has got the item
+	 * @param item the item obtain by the player
+	 * @param count the item count
+	 */
+	private static void sendItemGetMessage(L2PcInstance player, L2ItemInstance item, long count) {
+		// If item for reward is gold, send message of gold reward to client
+		if (item.getId() == Inventory.ADENA_ID) {
+			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
+			smsg.addLong(count);
+			player.sendPacket(smsg);
+		}
+		// Otherwise, send message of object reward to client
+		else {
+			if (count > 1) {
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+				smsg.addItemName(item);
+				smsg.addLong(count);
+				player.sendPacket(smsg);
+			} else {
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
+				smsg.addItemName(item);
+				player.sendPacket(smsg);
+			}
+		}
+		// send packets
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+	}
+	
+	/**
+	 * Give item/reward to the player
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 */
+	public static void giveItems(L2PcInstance player, int itemId, long count) {
+		giveItems(player, itemId, count, 0);
+	}
+	
+	/**
+	 * Give item/reward to the player
+	 * @param player
+	 * @param holder
+	 */
+	protected static void giveItems(L2PcInstance player, ItemHolder holder) {
+		giveItems(player, holder.getId(), holder.getCount());
+	}
+	
+	/**
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 * @param enchantlevel
+	 */
+	public static void giveItems(L2PcInstance player, int itemId, long count, int enchantlevel) {
+		if (count <= 0) {
+			return;
+		}
+		
+		// Add items to player's inventory
+		final L2ItemInstance item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (item == null) {
+			return;
+		}
+		
+		// set enchant level for item if that item is not adena
+		if ((enchantlevel > 0) && (itemId != Inventory.ADENA_ID)) {
+			item.setEnchantLevel(enchantlevel);
+		}
+		
+		sendItemGetMessage(player, item, count);
+	}
+	
+	/**
+	 * @param player
+	 * @param itemId
+	 * @param count
+	 * @param attributeId
+	 * @param attributeLevel
+	 */
+	public static void giveItems(L2PcInstance player, int itemId, long count, byte attributeId, int attributeLevel) {
+		if (count <= 0) {
+			return;
+		}
+		
+		// Add items to player's inventory
+		final L2ItemInstance item = player.getInventory().addItem("Quest", itemId, count, player, player.getTarget());
+		if (item == null) {
+			return;
+		}
+		
+		// set enchant level for item if that item is not adena
+		if ((attributeId >= 0) && (attributeLevel > 0)) {
+			item.setElementAttr(attributeId, attributeLevel);
+			if (item.isEquipped()) {
+				item.updateElementAttrBonus(player);
+			}
+			
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addModifiedItem(item);
+			player.sendPacket(iu);
+		}
+		
+		sendItemGetMessage(player, item, count);
+	}
+	
+	/**
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	@Deprecated
+	public static boolean giveItemRandomly(L2PcInstance player, int itemId, long amountToGive, long limit, double dropChance, boolean playSound) {
+		return giveItemRandomly(player, null, player, singleDropItem(itemId, amountToGive, amountToGive, dropChance * 100), limit, playSound);
+	}
+	
+	/**
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	@Deprecated
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, int itemId, long amountToGive, long limit, double dropChance, boolean playSound) {
+		return giveItemRandomly(player, npc, player, singleDropItem(itemId, amountToGive, amountToGive, dropChance * 100), limit, playSound);
+	}
+	
+	/**
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	@Deprecated
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, int itemId, long minAmount, long maxAmount, long limit, double dropChance, boolean playSound) {
+		return giveItemRandomly(player, npc, player, singleDropItem(itemId, minAmount, maxAmount, dropChance * 100), limit, playSound);
+	}
+	
+	/**
+	 * For one-off use when no {@link QuestDroplist} has been created.
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, int itemId, boolean playSound) {
+		return giveItemRandomly(player, npc, player, singleDropItem(itemId, 1, 1, 100.0), 0, playSound);
+	}
+	
+	/**
+	 * For one-off use when no {@link QuestDroplist} has been created.
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, QuestItemChanceHolder questItem, boolean playSound) {
+		return giveItemRandomly(player, npc, player, singleDropItem(questItem), questItem.getLimit(), playSound);
+	}
+	
+	/**
+	 * For use with {@link QuestDroplist} elements.
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, QuestDropInfo dropInfo, boolean playSound) {
+		if (dropInfo == null) {
+			return false;
+		}
+		return giveItemRandomly(player, npc, player, dropInfo.drop(), dropInfo.getLimit(), playSound);
+	}
+	
+	/**
+	 * @see AbstractScript#giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound)
+	 */
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, IDropItem dropItem, long limit, boolean playSound) {
+		return giveItemRandomly(player, npc, player, dropItem, limit, playSound);
+	}
+	
+	/**
+	 * Give the specified player a random amount of items if he is lucky enough.<br>
+	 * Not recommended to use this for non-stacking items.
+	 * @param player the player to give the item(s) to
+	 * @param npc the NPC that "dropped" the item (can be null)
+	 * @param killer the player who killed the NPC
+	 * @param dropItem the item or item group to drop
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached. 0 - no limit.
+	 * @param playSound if true, plays ItemSound.quest_itemget when items are given and ItemSound.quest_middle when the limit is reached
+	 * @return {@code true} if limit > 0 and the limit was reached or if limit <= 0 and items were given; {@code false} in all other cases
+	 */
+	public static boolean giveItemRandomly(L2PcInstance player, L2Npc npc, L2PcInstance killer, IDropItem dropItem, long limit, boolean playSound) {
+		if (dropItem == null) {
+			return false;
+		}
+		
+		List<ItemHolder> drops = dropItem.calculateDrops(npc, killer);
+		if ((drops == null) || drops.isEmpty()) {
+			return false;
+		}
+		
+		ItemHolder drop = drops.get(0);
+		
+		final long currentCount = getQuestItemsCount(player, drop.getId());
+		
+		if ((limit > 0) && (currentCount >= limit)) {
+			return true;
+		}
+		
+		long amountToGive = drop.getCount();
+		// Inventory slot check (almost useless for non-stacking items)
+		if ((amountToGive > 0) && player.getInventory().validateCapacityByItemId(drop.getId())) {
+			if ((limit > 0) && ((currentCount + amountToGive) > limit)) {
+				amountToGive = limit - currentCount;
+			}
+			
+			// Give the item to player
+			L2ItemInstance item = player.addItem("Quest", drop.getId(), amountToGive, npc, true);
+			if (item != null) {
+				// limit reached (if there is no limit, this block doesn't execute)
+				if ((currentCount + amountToGive) == limit) {
+					if (playSound) {
+						playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE);
+					}
+					return true;
+				}
+				
+				if (playSound) {
+					playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+				}
+				// if there is no limit, return true every time an item is given
+				return limit <= 0;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Gives an item to the player
+	 * @param player
+	 * @param item
+	 * @param victim the character that "dropped" the item
+	 * @return <code>true</code> if at least one item was given, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim) {
+		List<ItemHolder> items = item.calculateDrops(victim, player);
+		if ((items == null) || items.isEmpty()) {
+			return false;
+		}
+		giveItems(player, items);
+		return true;
+	}
+	
+	/**
+	 * Gives an item to the player
+	 * @param player
+	 * @param items
+	 */
+	protected static void giveItems(L2PcInstance player, List<ItemHolder> items) {
+		for (ItemHolder item : items) {
+			giveItems(player, item);
+		}
+		
+	}
+	
+	/**
+	 * Gives an item to the player
+	 * @param player
+	 * @param item
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached.
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, ItemHolder item, long limit) {
+		long maxToGive = limit - player.getInventory().getInventoryItemCount(item.getId(), -1);
+		if (maxToGive <= 0) {
+			return false;
+		}
+		giveItems(player, item.getId(), Math.min(maxToGive, item.getCount()));
+		return true;
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, ItemHolder item, long limit, boolean playSound) {
+		boolean drop = giveItems(player, item, limit);
+		if (drop && playSound) {
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+		}
+		return drop;
+	}
+	
+	/**
+	 * @param player
+	 * @param items
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached.
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, List<ItemHolder> items, long limit) {
+		boolean b = false;
+		for (ItemHolder item : items) {
+			b |= giveItems(player, item, limit);
+		}
+		return b;
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, List<ItemHolder> items, long limit, boolean playSound) {
+		boolean drop = giveItems(player, items, limit);
+		if (drop && playSound) {
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+		}
+		return drop;
+	}
+	
+	/**
+	 * @param player
+	 * @param items
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached. If a no limit for an itemId is specified, item will always be given
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, List<ItemHolder> items, Map<Integer, Long> limit) {
+		return giveItems(player, items, Util.mapToFunction(limit));
+	}
+	
+	/**
+	 * @param player
+	 * @param items
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached. If a no limit for an itemId is specified, item will always be given
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, List<ItemHolder> items, Function<Integer, Long> limit) {
+		boolean b = false;
+		for (ItemHolder item : items) {
+			if (limit != null) {
+				Long longLimit = limit.apply(item.getId());
+				// null -> no limit specified for that item id. This trick is to avoid limit.apply() be called twice (once for the null check)
+				if (longLimit != null) {
+					b |= giveItems(player, item, longLimit);
+					continue; // the item is given, continue with next
+				}
+			}
+			// da BIG else
+			// no limit specified here (either limit or limit.apply(item.getId()) is null)
+			b = true;
+			giveItems(player, item);
+			
+		}
+		return b;
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, List<ItemHolder> items, Function<Integer, Long> limit, boolean playSound) {
+		boolean drop = giveItems(player, items, limit);
+		if (drop && playSound) {
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+		}
+		return drop;
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, List<ItemHolder> items, Map<Integer, Long> limit, boolean playSound) {
+		return giveItems(player, items, Util.mapToFunction(limit), playSound);
+	}
+	
+	/**
+	 * @param player
+	 * @param item
+	 * @param victim the character that "dropped" the item
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached.
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, int limit) {
+		return giveItems(player, item.calculateDrops(victim, player), limit);
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, int limit, boolean playSound) {
+		boolean drop = giveItems(player, item, victim, limit);
+		if (drop && playSound) {
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+		}
+		return drop;
+	}
+	
+	/**
+	 * @param player
+	 * @param item
+	 * @param victim the character that "dropped" the item
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached. If a no limit for an itemId is specified, item will always be given
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, Map<Integer, Long> limit) {
+		return giveItems(player, item.calculateDrops(victim, player), limit);
+	}
+	
+	/**
+	 * @param player
+	 * @param item
+	 * @param victim the character that "dropped" the item
+	 * @param limit the maximum amount of items the player can have. Won't give more if this limit is reached. If a no limit for an itemId is specified, item will always be given
+	 * @return <code>true</code> if at least one item was given to the player, <code>false</code> otherwise
+	 */
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, Function<Integer, Long> limit) {
+		return giveItems(player, item.calculateDrops(victim, player), limit);
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, Map<Integer, Long> limit, boolean playSound) {
+		return giveItems(player, item, victim, Util.mapToFunction(limit), playSound);
+	}
+	
+	protected static boolean giveItems(L2PcInstance player, IDropItem item, L2Character victim, Function<Integer, Long> limit, boolean playSound) {
+		boolean drop = giveItems(player, item, victim, limit);
+		if (drop && playSound) {
+			playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+		}
+		return drop;
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, Collection<ItemHolder> items, Function<Integer, Long> limit, boolean playSound) {
+		Map<L2PcInstance, Map<Integer, Long>> rewardedCounts = calculateDistribution(players, items, limit);
+		// now give the calculated items to the players
+		giveItems(rewardedCounts, playSound);
+		return rewardedCounts;
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, Collection<ItemHolder> items, Map<Integer, Long> limit, boolean playSound) {
+		return distributeItems(players, items, Util.mapToFunction(limit), playSound);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, Collection<ItemHolder> items, long limit, boolean playSound) {
+		return distributeItems(players, items, _ -> limit, playSound);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param item the items to distribute
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Long> distributeItems(Collection<L2PcInstance> players, ItemHolder item, long limit, boolean playSound) {
+		Map<L2PcInstance, Map<Integer, Long>> distribution = distributeItems(players, Collections.singletonList(item), limit, playSound);
+		Map<L2PcInstance, Long> returnMap = new HashMap<>();
+		for (Entry<L2PcInstance, Map<Integer, Long>> entry : distribution.entrySet()) {
+			for (Entry<Integer, Long> entry2 : entry.getValue().entrySet()) {
+				returnMap.put(entry.getKey(), entry2.getValue());
+			}
+		}
+		return returnMap;
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param killer the one who "kills" the victim
+	 * @param victim the character that "dropped" the item
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, IDropItem items, L2Character killer, L2Character victim, Function<Integer, Long> limit, boolean playSound) {
+		return distributeItems(players, items.calculateDrops(victim, killer), limit, playSound);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param killer the one who "kills" the victim
+	 * @param victim the character that "dropped" the item
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, IDropItem items, L2Character killer, L2Character victim, Map<Integer, Long> limit, boolean playSound) {
+		return distributeItems(players, items.calculateDrops(victim, killer), limit, playSound);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param killer the one who "kills" the victim
+	 * @param victim the character that "dropped" the item
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, IDropItem items, L2Character killer, L2Character victim, long limit, boolean playSound) {
+		return distributeItems(players, items.calculateDrops(victim, killer), limit, playSound);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param killer the one who "kills" the victim
+	 * @param victim the character that "dropped" the item
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @param smartDrop true if to not calculate a drop, which can't be given to any player 'cause of limits
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, final GroupedGeneralDropItem items, L2Character killer, L2Character victim, Function<Integer, Long> limit, boolean playSound, boolean smartDrop) {
+		GroupedGeneralDropItem toDrop;
+		if (smartDrop) {
+			toDrop = new GroupedGeneralDropItem(items.getChance(), items.getDropCalculationStrategy(), items.getKillerChanceModifierStrategy(), items.getPreciseStrategy());
+			List<GeneralDropItem> dropItems = new LinkedList<>(items.getItems());
+			ITEM_LOOP:
+			for (Iterator<GeneralDropItem> it = dropItems.iterator(); it.hasNext();) {
+				GeneralDropItem item = it.next();
+				for (L2PcInstance player : players) {
+					int itemId = item.getItemId();
+					if (player.getInventory().getInventoryItemCount(itemId, -1, true) < avoidNull(limit, itemId)) {
+						// we can give this item to this player
+						continue ITEM_LOOP;
+					}
+				}
+				// there's nobody to give this item to
+				it.remove();
+			}
+			toDrop.setItems(dropItems);
+			toDrop = toDrop.normalizeMe(victim, killer);
+		} else {
+			toDrop = items;
+		}
+		return distributeItems(players, toDrop, killer, victim, limit, playSound);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param killer the one who "kills" the victim
+	 * @param victim the character that "dropped" the item
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @param smartDrop true if to not calculate a drop, which can't be given to any player
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, final GroupedGeneralDropItem items, L2Character killer, L2Character victim, Map<Integer, Long> limit, boolean playSound, boolean smartDrop) {
+		return distributeItems(players, items, killer, victim, Util.mapToFunction(limit), playSound, smartDrop);
+	}
+	
+	/**
+	 * Distributes items to players equally
+	 * @param players the players to whom the items will be distributed
+	 * @param items the items to distribute
+	 * @param killer the one who "kills" the victim
+	 * @param victim the character that "dropped" the item
+	 * @param limit the limit what single player can have of each item
+	 * @param playSound if to play sound if a player gets at least one item
+	 * @param smartDrop true if to not calculate a drop, which can't be given to any player
+	 * @return the counts of each items given to each player
+	 */
+	protected static Map<L2PcInstance, Map<Integer, Long>> distributeItems(Collection<L2PcInstance> players, final GroupedGeneralDropItem items, L2Character killer, L2Character victim, long limit, boolean playSound, boolean smartDrop) {
+		return distributeItems(players, items, killer, victim, _ -> limit, playSound, smartDrop);
+	}
+	
+	/**
+	 * @param players
+	 * @param items
+	 * @param limit
+	 * @return
+	 */
+	private static Map<L2PcInstance, Map<Integer, Long>> calculateDistribution(Collection<L2PcInstance> players, Collection<ItemHolder> items, Function<Integer, Long> limit) {
+		Map<L2PcInstance, Map<Integer, Long>> rewardedCounts = new HashMap<>();
+		for (L2PcInstance player : players) {
+			rewardedCounts.put(player, new HashMap<>());
+		}
+		NEXT_ITEM:
+		for (ItemHolder item : items) {
+			long equaldist = item.getCount() / players.size();
+			long randomdist = item.getCount() % players.size();
+			List<L2PcInstance> toDist = new ArrayList<>(players);
+			do // this must happen at least once in order to get away already full players (and then equaldist can become nonzero)
+			{
+				for (Iterator<L2PcInstance> it = toDist.iterator(); it.hasNext();) {
+					L2PcInstance player = it.next();
+					if (!rewardedCounts.get(player).containsKey(item.getId())) {
+						rewardedCounts.get(player).put(item.getId(), 0L);
+					}
+					long maxGive = avoidNull(limit, item.getId()) - player.getInventory().getInventoryItemCount(item.getId(), -1, true) - rewardedCounts.get(player).get(item.getId());
+					long toGive = equaldist;
+					if (equaldist >= maxGive) {
+						toGive = maxGive;
+						randomdist += (equaldist - maxGive); // overflown items are available to next players
+						it.remove(); // this player is already full
+					}
+					rewardedCounts.get(player).put(item.getId(), rewardedCounts.get(player).get(item.getId()) + toGive);
+				}
+				if (toDist.isEmpty()) {
+					// there's no one to give items anymore, all players will be full when we give the items
+					continue NEXT_ITEM;
+				}
+				equaldist = randomdist / toDist.size(); // the rest of items may be allowed to be equally distributed between remaining players
+				randomdist %= toDist.size();
+			}
+			while (equaldist > 0);
+			while (randomdist > 0) {
+				if (toDist.isEmpty()) {
+					// we don't have any player left
+					continue NEXT_ITEM;
+				}
+				L2PcInstance player = toDist.get(getRandom(toDist.size()));
+				// avoid null return
+				long maxGive = avoidNull(limit, item.getId()) - limit.apply(item.getId()) - player.getInventory().getInventoryItemCount(item.getId(), -1, true) - rewardedCounts.get(player).get(item.getId());
+				if (maxGive > 0) {
+					// we can add an item to player
+					// so we add one item to player
+					rewardedCounts.get(player).put(item.getId(), rewardedCounts.get(player).get(item.getId()) + 1);
+					randomdist--;
+				}
+				toDist.remove(player); // Either way this player isn't allowable for next random award
+			}
+		}
+		return rewardedCounts;
+	}
+	
+	/**
+	 * This function is for avoidance null returns in function limits
+	 * @param <T> the type of function arg
+	 * @param function the function
+	 * @param arg the argument
+	 * @return {@link Long#MAX_VALUE} if function.apply(arg) is null, function.apply(arg) otherwise
+	 */
+	private static <T> long avoidNull(Function<T, Long> function, T arg) {
+		Long longLimit = function.apply(arg);
+		return longLimit == null ? Long.MAX_VALUE : longLimit;
+	}
+	
+	/**
+	 * Distributes items to players
+	 * @param rewardedCounts A scheme of distribution items (the structure is: Map<player Map<itemId, count>>)
+	 * @param playSound if to play sound if a player gets at least one item
+	 */
+	private static void giveItems(Map<L2PcInstance, Map<Integer, Long>> rewardedCounts, boolean playSound) {
+		for (Entry<L2PcInstance, Map<Integer, Long>> entry : rewardedCounts.entrySet()) {
+			L2PcInstance player = entry.getKey();
+			boolean playPlayerSound = false;
+			for (Entry<Integer, Long> item : entry.getValue().entrySet()) {
+				if (item.getValue() >= 0) {
+					playPlayerSound = true;
+					giveItems(player, item.getKey(), item.getValue());
+				}
+			}
+			if (playSound && playPlayerSound) {
+				playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET);
+			}
+		}
+	}
+	
+	/**
+	 * Take an amount of a specified item from player's inventory.
+	 * @param player the player whose item to take
+	 * @param itemId the ID of the item to take
+	 * @param amount the amount to take
+	 * @return {@code true} if any items were taken, {@code false} otherwise
+	 */
+	public static boolean takeItems(L2PcInstance player, int itemId, long amount) {
+		final List<L2ItemInstance> items = player.getInventory().getItemsByItemId(itemId);
+		if (amount < 0) {
+			items.forEach(i -> takeItem(player, i, i.getCount()));
+		} else {
+			long currentCount = 0;
+			for (L2ItemInstance i : items) {
+				long toDelete = i.getCount();
+				if ((currentCount + toDelete) > amount) {
+					toDelete = amount - currentCount;
+				}
+				takeItem(player, i, toDelete);
+				currentCount += toDelete;
+			}
+		}
+		return true;
+	}
+	
+	private static boolean takeItem(L2PcInstance player, L2ItemInstance item, long toDelete) {
+		if (item.isEquipped()) {
+			final L2ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(item.getItem().getBodyPart());
+			final InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance itm : unequiped) {
+				iu.addModifiedItem(itm);
+			}
+			player.sendPacket(iu);
+			player.broadcastUserInfo();
+		}
+		return player.destroyItemByItemId("Quest", item.getId(), toDelete, player, true);
+	}
+	
+	/**
+	 * Take a set amount of a specified item from player's inventory.
+	 * @param player the player whose item to take
+	 * @param holder the {@link ItemHolder} object containing the ID and count of the item to take
+	 * @return {@code true} if the item was taken, {@code false} otherwise
+	 */
+	protected static boolean takeItem(L2PcInstance player, ItemHolder holder) {
+		if (holder == null) {
+			return false;
+		}
+		return takeItems(player, holder.getId(), holder.getCount());
+	}
+	
+	/**
+	 * Take a set amount of all specified items from player's inventory.
+	 * @param player the player whose items to take
+	 * @param itemList the list of {@link ItemHolder} objects containing the IDs and counts of the items to take
+	 * @return {@code true} if all items were taken, {@code false} otherwise
+	 */
+	protected static boolean takeAllItems(L2PcInstance player, ItemHolder... itemList) {
+		if ((itemList == null) || (itemList.length == 0)) {
+			return false;
+		}
+		// first check if the player has all items to avoid taking half the items from the list
+		if (!hasAllItems(player, true, itemList)) {
+			return false;
+		}
+		for (ItemHolder item : itemList) {
+			// this should never be false, but just in case
+			if (!takeItem(player, item)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Take an amount of all specified items from player's inventory.
+	 * @param player the player whose items to take
+	 * @param amount the amount to take of each item
+	 * @param itemIds a list or an array of IDs of the items to take
+	 * @return {@code true} if all items were taken, {@code false} otherwise
+	 */
+	public static boolean takeItems(L2PcInstance player, int amount, int... itemIds) {
+		boolean check = true;
+		if (itemIds != null) {
+			for (int item : itemIds) {
+				check &= takeItems(player, item, amount);
+			}
+		}
+		return check;
+	}
+	
+	/**
+	 * Send a packet in order to play a sound to the player.
+	 * @param player the player whom to send the packet
+	 * @param sound the {@link IAudio} object of the sound to play
+	 */
+	public static void playSound(L2PcInstance player, IAudio sound) {
+		player.sendPacket(sound.getPacket());
+	}
+	
+	/**
+	 * Add EXP and SP as quest reward.
+	 * @param player the player whom to reward with the EXP/SP
+	 * @param exp the amount of EXP to give to the player
+	 * @param sp the amount of SP to give to the player
+	 */
+	public static void addExpAndSp(L2PcInstance player, long exp, int sp) {
+		player.addExpAndSpQuest((long) (exp * rates().getRateQuestRewardXP()), (int) (sp * rates().getRateQuestRewardSP()));
+	}
+	
+	public static double getRandom() {
+		return Rnd.get();
+	}
+	
+	/**
+	 * Get a random integer from 0 (inclusive) to {@code max} (exclusive).<br>
+	 * Use this method instead of importing {@link com.l2jserver.commons.util.Rnd} utility.
+	 * @param max the maximum value for randomization
+	 * @return a random integer number from 0 to {@code max - 1}
+	 */
+	public static int getRandom(int max) {
+		return Rnd.get(max);
+	}
+	
+	/**
+	 * Get a random integer from {@code min} (inclusive) to {@code max} (inclusive).<br>
+	 * Use this method instead of importing {@link com.l2jserver.commons.util.Rnd} utility.
+	 * @param min the minimum value for randomization
+	 * @param max the maximum value for randomization
+	 * @return a random integer number from {@code min} to {@code max}
+	 */
+	public static int getRandom(int min, int max) {
+		return Rnd.get(min, max);
+	}
+	
+	/**
+	 * Get a random boolean.<br>
+	 * Use this method instead of importing {@link com.l2jserver.commons.util.Rnd} utility.
+	 * @return {@code true} or {@code false} randomly
+	 */
+	public static boolean getRandomBoolean() {
+		return Rnd.nextBoolean();
+	}
+	
+	/**
+	 * Get the ID of the item equipped in the specified inventory slot of the player.
+	 * @param player the player whose inventory to check
+	 * @param slot the location in the player's inventory to check
+	 * @return the ID of the item equipped in the specified inventory slot or 0 if the slot is empty or item is {@code null}.
+	 */
+	public static int getItemEquipped(L2PcInstance player, int slot) {
+		return player.getInventory().getPaperdollItemId(slot);
+	}
+	
+	/**
+	 * @return the number of ticks from the {@link com.l2jserver.gameserver.GameTimeController}.
+	 */
+	public static int getGameTicks() {
+		return GameTimeController.getInstance().getGameTicks();
+	}
+	
+	/**
+	 * Execute a procedure for each player depending on the parameters.
+	 * @param player the player on which the procedure will be executed
+	 * @param npc the related NPC
+	 * @param isSummon {@code true} if the event that called this method was originated by the player's summon, {@code false} otherwise
+	 * @param includeParty if {@code true}, #actionForEachPlayer(L2PcInstance, L2Npc, boolean) will be called with the player's party members
+	 * @param includeCommandChannel if {@code true}, {@link #actionForEachPlayer(L2PcInstance, L2Npc, boolean)} will be called with the player's command channel members
+	 * @see #actionForEachPlayer(L2PcInstance, L2Npc, boolean)
+	 */
+	public final void executeForEachPlayer(L2PcInstance player, final L2Npc npc, final boolean isSummon, boolean includeParty, boolean includeCommandChannel) {
+		if ((includeParty || includeCommandChannel) && player.isInParty()) {
+			if (includeCommandChannel && player.getParty().isInCommandChannel()) {
+				player.getParty().getCommandChannel().forEachMember(member -> {
+					actionForEachPlayer(member, npc, isSummon);
+					return true;
+				});
+			} else if (includeParty) {
+				player.getParty().forEachMember(member -> {
+					actionForEachPlayer(member, npc, isSummon);
+					return true;
+				});
+			}
+		} else {
+			actionForEachPlayer(player, npc, isSummon);
+		}
+	}
+	
+	/**
+	 * Overridable method called from {@link #executeForEachPlayer(L2PcInstance, L2Npc, boolean, boolean, boolean)}
+	 * @param player the player on which the action will be run
+	 * @param npc the NPC related to this action
+	 * @param isSummon {@code true} if the event that called this method was originated by the player's summon
+	 */
+	public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon) {
+		// To be overridden in quest scripts.
+	}
+	
+	/**
+	 * Open a door if it is present on the instance and it's not open.
+	 * @param doorId the ID of the door to open
+	 * @param instanceId the ID of the instance the door is in (0 if the door is not inside an instance)
+	 */
+	public void openDoor(int doorId, int instanceId) {
+		final var door = getDoor(doorId, instanceId);
+		if (door == null) {
+			LOG.warn("Called openDoor({}, {}); but door wasn't found!", doorId, instanceId);
+		} else if (!door.getOpen()) {
+			door.openMe();
+		}
+	}
+	
+	/**
+	 * Close a door if it is present in a specified the instance and its open.
+	 * @param doorId the ID of the door to close
+	 * @param instanceId the ID of the instance the door is in (0 if the door is not inside an instance)
+	 */
+	public void closeDoor(int doorId, int instanceId) {
+		final var door = getDoor(doorId, instanceId);
+		if (door == null) {
+			LOG.warn("Called closeDoor({}, {}); but door wasn't found!", doorId, instanceId);
+		} else if (door.getOpen()) {
+			door.closeMe();
+		}
+	}
+	
+	/**
+	 * Retrieve a door from an instance or the real world.
+	 * @param doorId the ID of the door to get
+	 * @param instanceId the ID of the instance the door is in (0 if the door is not inside an instance)
+	 * @return the found door or {@code null} if no door with that ID and instance ID was found
+	 */
+	public L2DoorInstance getDoor(int doorId, int instanceId) {
+		L2DoorInstance door = null;
+		if (instanceId <= 0) {
+			door = DoorData.getInstance().getDoor(doorId);
+		} else {
+			final Instance inst = InstanceManager.getInstance().getInstance(instanceId);
+			if (inst != null) {
+				door = inst.getDoor(doorId);
+			}
+		}
+		return door;
+	}
+	
+	/**
+	 * Teleport a player into/out of an instance.
+	 * @param player the player to teleport
+	 * @param loc the {@link Location} object containing the destination coordinates
+	 * @param instanceId the ID of the instance to teleport the player to (0 to teleport out of an instance)
+	 */
+	public void teleportPlayer(L2PcInstance player, Location loc, int instanceId) {
+		teleportPlayer(player, loc, instanceId, true);
+	}
+	
+	/**
+	 * Teleport a player into/out of an instance.
+	 * @param player the player to teleport
+	 * @param loc the {@link Location} object containing the destination coordinates
+	 * @param instanceId the ID of the instance to teleport the player to (0 to teleport out of an instance)
+	 * @param allowRandomOffset if {@code true}, will randomize the teleport coordinates by +/- MaxOffsetOnTeleport
+	 */
+	public void teleportPlayer(L2PcInstance player, Location loc, int instanceId, boolean allowRandomOffset) {
+		player.teleToLocation(loc, instanceId, allowRandomOffset ? character().getMaxOffsetOnTeleport() : 0);
+	}
+	
+	/**
+	 * Monster is running and attacking the playable.
+	 * @param npc the NPC that performs the attack
+	 * @param creature the target of the attack
+	 */
+	protected void addAttackDesire(L2Npc npc, L2Character creature) {
+		addAttackDesire(npc, creature, 999);
+	}
+	
+	/**
+	 * Monster is running and attacking the target.
+	 * @param npc the NPC that performs the attack
+	 * @param creature the target of the attack
+	 * @param desire the desire to perform the attack
+	 */
+	protected void addAttackDesire(L2Npc npc, L2Character creature, long desire) {
+		if (npc instanceof L2Attackable attackable) {
+			attackable.addDamageHate(creature, 0, desire);
+		}
+		npc.setIsRunning(true);
+		npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, creature);
+	}
+	
+	/**
+	 * Adds desire to move to the given NPC.
+	 * @param npc the NPC
+	 * @param loc the location
+	 * @param desire the desire
+	 */
+	protected void addMoveToDesire(L2Npc npc, Location loc, int desire) {
+		npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, loc);
+	}
+	
+	/**
+	 * Instantly cast a skill upon the given target.
+	 * @param npc the caster NPC
+	 * @param target the target of the cast
+	 * @param skill the skill to cast
+	 */
+	protected void castSkill(L2Npc npc, L2Playable target, SkillHolder skill) {
+		npc.setTarget(target);
+		npc.doCast(skill.getSkill());
+	}
+	
+	/**
+	 * Instantly cast a skill upon the given target.
+	 * @param npc the caster NPC
+	 * @param target the target of the cast
+	 * @param skill the skill to cast
+	 */
+	protected void castSkill(L2Npc npc, L2Playable target, Skill skill) {
+		npc.setTarget(target);
+		npc.doCast(skill);
+	}
+	
+	/**
+	 * Adds the desire to cast a skill to the given NPC.
+	 * @param npc the NPC who casts the skill
+	 * @param target the skill target
+	 * @param skill the skill to cast
+	 * @param desire the desire to cast the skill
+	 */
+	protected void addSkillCastDesire(L2Npc npc, L2Character target, SkillHolder skill, long desire) {
+		addSkillCastDesire(npc, target, skill.getSkill(), desire);
+	}
+	
+	/**
+	 * Adds the desire to cast a skill to the given NPC.
+	 * @param npc the NPC who casts the skill
+	 * @param target the skill target
+	 * @param skill the skill to cast
+	 * @param desire the desire to cast the skill
+	 */
+	protected void addSkillCastDesire(L2Npc npc, L2Character target, Skill skill, long desire) {
+		if (npc instanceof L2Attackable attackable) {
+			attackable.addDamageHate(target, 0, desire);
+		}
+		npc.setTarget(target);
+		npc.getAI().setIntention(CtrlIntention.AI_INTENTION_CAST, skill, target);
+	}
+	
+	/**
+	 * Sends the special camera packet to the player.
+	 * @param player the player
+	 * @param creature the watched creature
+	 * @param force
+	 * @param angle1
+	 * @param angle2
+	 * @param time
+	 * @param range
+	 * @param duration
+	 * @param relYaw
+	 * @param relPitch
+	 * @param isWide
+	 * @param relAngle
+	 */
+	public static void specialCamera(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle) {
+		player.sendPacket(new SpecialCamera(creature, force, angle1, angle2, time, range, duration, relYaw, relPitch, isWide, relAngle));
+	}
+	
+	/**
+	 * Sends the special camera packet to the player.
+	 * @param player
+	 * @param creature
+	 * @param force
+	 * @param angle1
+	 * @param angle2
+	 * @param time
+	 * @param duration
+	 * @param relYaw
+	 * @param relPitch
+	 * @param isWide
+	 * @param relAngle
+	 */
+	public static void specialCameraEx(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int duration, int relYaw, int relPitch, int isWide, int relAngle) {
+		player.sendPacket(new SpecialCamera(creature, player, force, angle1, angle2, time, duration, relYaw, relPitch, isWide, relAngle));
+	}
+	
+	/**
+	 * Sends the special camera packet to the player.
+	 * @param player
+	 * @param creature
+	 * @param force
+	 * @param angle1
+	 * @param angle2
+	 * @param time
+	 * @param range
+	 * @param duration
+	 * @param relYaw
+	 * @param relPitch
+	 * @param isWide
+	 * @param relAngle
+	 * @param unk
+	 */
+	public static void specialCamera3(L2PcInstance player, L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle, int unk) {
+		player.sendPacket(new SpecialCamera(creature, force, angle1, angle2, time, range, duration, relYaw, relPitch, isWide, relAngle, unk));
+	}
+	
+	/**
+	 * Displays a radar marker for the specified player at the given coordinates.
+	 * @param player the player
+	 * @param x the X coordinate of the radar marker
+	 * @param y the Y coordinate of the radar marker
+	 * @param z the Z coordinate of the radar marker
+	 * @param type the type of the radar marker
+	 */
+	public void showRadar(L2PcInstance player, int x, int y, int z, int type) {
+		player.getRadar().showRadar(x, y, z, type);
+	}
+	
+	/**
+	 * Deletes a specific radar marker for the specified player at the given coordinates.
+	 * @param player the player
+	 * @param x the X coordinate of the radar marker
+	 * @param y the Y coordinate of the radar marker
+	 * @param z the Z coordinate of the radar marker
+	 * @param type the type of the radar marker
+	 */
+	public void deleteRadar(L2PcInstance player, int x, int y, int z, int type) {
+		player.getRadar().deleteRadar(x, y, z, type);
+	}
+	
+	/**
+	 * Deletes all radar markers of a specific type for the specified player.
+	 * @param player the player
+	 * @param type the type of radar markers to delete
+	 */
+	public void deleteAllRadar(L2PcInstance player, int type) {
+		player.getRadar().deleteAllRadar(type);
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/Containers.java b/src/main/java/com/l2jserver/gameserver/model/events/Containers.java
new file mode 100644
index 00000000..17d67e61
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/Containers.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+/**
+ * @author UnAfraid
+ */
+public class Containers {
+	private static final ListenersContainer _globalContainer = new ListenersContainer();
+	private static final ListenersContainer _globalNpcsContainer = new ListenersContainer();
+	private static final ListenersContainer _globalMonstersContainer = new ListenersContainer();
+	private static final ListenersContainer _globalPlayersContainer = new ListenersContainer();
+	
+	protected Containers() {
+		
+	}
+	
+	public static ListenersContainer Global() {
+		return _globalContainer;
+	}
+	
+	public static ListenersContainer Npcs() {
+		return _globalNpcsContainer;
+	}
+	
+	public static ListenersContainer Monsters() {
+		return _globalMonstersContainer;
+	}
+	
+	public static ListenersContainer Players() {
+		return _globalPlayersContainer;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/EventDispatcher.java b/src/main/java/com/l2jserver/gameserver/model/events/EventDispatcher.java
new file mode 100644
index 00000000..1cd46170
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/EventDispatcher.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+import java.util.Queue;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * @author UnAfraid
+ */
+public final class EventDispatcher {
+	private static final Logger LOG = LoggerFactory.getLogger(EventDispatcher.class);
+	
+	private EventDispatcher() {
+	}
+	
+	public <T extends AbstractEventReturn> T notifyEvent(BaseEvent event) {
+		return notifyEvent(event, null, null);
+	}
+	
+	public <T extends AbstractEventReturn> T notifyEvent(BaseEvent event, Class<T> callbackClass) {
+		return notifyEvent(event, null, callbackClass);
+	}
+	
+	public <T extends AbstractEventReturn> T notifyEvent(BaseEvent event, ListenersContainer container) {
+		return notifyEvent(event, container, null);
+	}
+	
+	public <T extends AbstractEventReturn> T notifyEvent(BaseEvent event, ListenersContainer container, Class<T> callbackClass) {
+		try {
+			return Containers.Global().hasListener(event.getType()) || ((container != null) && container.hasListener(event.getType())) ? notifyEventImpl(event, container, callbackClass) : null;
+		} catch (Exception e) {
+			LOG.warn("Couldn't notify event {}", event.getClass().getSimpleName(), e);
+		}
+		return null;
+	}
+	
+	/**
+	 * Executing current listener notification asynchronously
+	 * @param event
+	 * @param containers
+	 */
+	public void notifyEventAsync(BaseEvent event, ListenersContainer... containers) {
+		if (event == null) {
+			throw new NullPointerException("Event cannot be null!");
+		}
+		
+		boolean hasListeners = Containers.Global().hasListener(event.getType());
+		if (!hasListeners) {
+			for (ListenersContainer container : containers) {
+				if (container.hasListener(event.getType())) {
+					hasListeners = true;
+					break;
+				}
+			}
+		}
+		
+		if (hasListeners) {
+			ThreadPoolManager.getInstance().executeEvent(() -> notifyEventToMultipleContainers(event, containers, null));
+		}
+	}
+	
+	/**
+	 * Scheduling current listener notification asynchronously after specified delay.
+	 * @param event
+	 * @param container
+	 * @param delay
+	 */
+	public void notifyEventAsyncDelayed(BaseEvent event, ListenersContainer container, long delay) {
+		if (Containers.Global().hasListener(event.getType()) || container.hasListener(event.getType())) {
+			ThreadPoolManager.getInstance().scheduleEvent(() -> notifyEvent(event, container, null), delay);
+		}
+	}
+	
+	/**
+	 * Scheduling current listener notification asynchronously after specified delay.
+	 * @param event
+	 * @param container
+	 * @param delay
+	 * @param unit
+	 */
+	public void notifyEventAsyncDelayed(BaseEvent event, ListenersContainer container, long delay, TimeUnit unit) {
+		if (Containers.Global().hasListener(event.getType()) || container.hasListener(event.getType())) {
+			ThreadPoolManager.getInstance().scheduleEvent(() -> notifyEvent(event, container, null), delay, unit);
+		}
+	}
+	
+	/**
+	 * @param <T>
+	 * @param event
+	 * @param containers
+	 * @param callbackClass
+	 * @return
+	 */
+	private <T extends AbstractEventReturn> T notifyEventToMultipleContainers(BaseEvent event, ListenersContainer[] containers, Class<T> callbackClass) {
+		if (event == null) {
+			throw new NullPointerException("Event cannot be null!");
+		}
+		
+		try {
+			T callback = null;
+			if (containers != null) {
+				// Local listeners container first.
+				for (ListenersContainer container : containers) {
+					if ((callback == null) || !callback.abort()) {
+						callback = notifyToListeners(container.getListeners(event.getType()), event, callbackClass, callback);
+					}
+				}
+			}
+			
+			// Global listener container.
+			if ((callback == null) || !callback.abort()) {
+				callback = notifyToListeners(Containers.Global().getListeners(event.getType()), event, callbackClass, callback);
+			}
+			
+			return callback;
+		} catch (Exception e) {
+			LOG.warn("Couldn't notify event {}", event.getClass().getSimpleName(), e);
+		}
+		return null;
+	}
+	
+	/**
+	 * @param <T>
+	 * @param event
+	 * @param container
+	 * @param callbackClass
+	 * @return {@link AbstractEventReturn} object that may keep data from the first listener, or last that breaks notification.
+	 */
+	private <T extends AbstractEventReturn> T notifyEventImpl(BaseEvent event, ListenersContainer container, Class<T> callbackClass) {
+		if (event == null) {
+			throw new NullPointerException("Event cannot be null!");
+		}
+		
+		T callback = null;
+		// Local listener container first.
+		if (container != null) {
+			callback = notifyToListeners(container.getListeners(event.getType()), event, callbackClass, callback);
+		}
+		
+		// Global listener container.
+		if ((callback == null) || !callback.abort()) {
+			callback = notifyToListeners(Containers.Global().getListeners(event.getType()), event, callbackClass, callback);
+		}
+		
+		return callback;
+	}
+	
+	/**
+	 * @param <T>
+	 * @param listeners
+	 * @param event
+	 * @param returnBackClass
+	 * @param callback
+	 * @return
+	 */
+	private <T extends AbstractEventReturn> T notifyToListeners(Queue<AbstractEventListener> listeners, BaseEvent event, Class<T> returnBackClass, T callback) {
+		for (AbstractEventListener listener : listeners) {
+			try {
+				final T rb = listener.executeEvent(event, returnBackClass);
+				if (rb == null) {
+					continue;
+				}
+				
+				if ((callback == null) || rb.override()) {
+					// Let's check if this listener wants to override previous return object or we simply don't have one
+					callback = rb;
+				} else if (rb.abort()) {
+					// This listener wants to abort the notification to others.
+					break;
+				}
+			} catch (Exception e) {
+				LOG.warn("Exception during notification of event: {} listener: {}", event.getClass().getSimpleName(), listener.getClass().getSimpleName(), e);
+			}
+		}
+		
+		return callback;
+	}
+	
+	public static EventDispatcher getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final EventDispatcher _instance = new EventDispatcher();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/EventType.java b/src/main/java/com/l2jserver/gameserver/model/events/EventType.java
new file mode 100644
index 00000000..fb00e004
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/EventType.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureAttack;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureAttackAvoid;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureAttacked;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureDamageDealt;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureDamageReceived;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureKill;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureSkillUse;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureTeleported;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureZoneEnter;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureZoneExit;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcCanBeSeen;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcCreatureSee;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcEventReceived;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcFirstTalk;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcManorBypass;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveNodeArrived;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveRouteFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillSee;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSpawn;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcTeleport;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAggroRangeEnter;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAttack;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableHate;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableKill;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.FactionCall;
+import com.l2jserver.gameserver.model.events.impl.character.playable.PlayableExpChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerAugment;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerBypass;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerChat;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerCreate;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerDelete;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerDlgAnswer;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerEquipItem;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerFameChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerHennaAdd;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerHennaRemove;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerKarmaChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLearnSkillRequested;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLevelChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLogin;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLogout;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerMenuSelected;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerOneSkillSelected;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerPKChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerProfessionCancel;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerProfessionChange;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerPvPChanged;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerPvPKill;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerQuestAccepted;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerRestore;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSelect;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSit;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSkillLearned;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSummonSpawn;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSummonTalk;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTeleportRequest;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTransform;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorial;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialClientEvent;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialCmd;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialQuestionMark;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanCreate;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanDestroy;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanJoin;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanLeaderChange;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanLeave;
+import com.l2jserver.gameserver.model.events.impl.character.player.clan.PlayerClanLevelUp;
+import com.l2jserver.gameserver.model.events.impl.character.player.clanwh.PlayerClanWHItemAdd;
+import com.l2jserver.gameserver.model.events.impl.character.player.clanwh.PlayerClanWHItemDestroy;
+import com.l2jserver.gameserver.model.events.impl.character.player.clanwh.PlayerClanWHItemTransfer;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemAdd;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemDestroy;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemDrop;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemPickup;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemTransfer;
+import com.l2jserver.gameserver.model.events.impl.character.trap.OnTrapAction;
+import com.l2jserver.gameserver.model.events.impl.clan.ClanWarFinish;
+import com.l2jserver.gameserver.model.events.impl.clan.ClanWarStart;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventFinish;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventKill;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventRegistrationStart;
+import com.l2jserver.gameserver.model.events.impl.events.TvTEventStart;
+import com.l2jserver.gameserver.model.events.impl.item.ItemBypass;
+import com.l2jserver.gameserver.model.events.impl.item.ItemCreate;
+import com.l2jserver.gameserver.model.events.impl.item.ItemTalk;
+import com.l2jserver.gameserver.model.events.impl.olympiad.OlympiadMatchResult;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeFinish;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeOwnerChange;
+import com.l2jserver.gameserver.model.events.impl.sieges.castle.CastleSiegeStart;
+import com.l2jserver.gameserver.model.events.impl.sieges.fort.FortSiegeFinish;
+import com.l2jserver.gameserver.model.events.impl.sieges.fort.FortSiegeStart;
+import com.l2jserver.gameserver.model.events.returns.ChatFilterReturn;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Event type.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public enum EventType {
+	// Attackable events
+	ATTACKABLE_AGGRO_RANGE_ENTER(AttackableAggroRangeEnter.class, void.class),
+	ATTACKABLE_ATTACK(AttackableAttack.class, void.class),
+	FACTION_CALL(FactionCall.class, void.class),
+	ATTACKABLE_KILL(AttackableKill.class, void.class),
+	
+	// Castle events
+	CASTLE_SIEGE_FINISH(CastleSiegeFinish.class, void.class),
+	CASTLE_SIEGE_OWNER_CHANGE(CastleSiegeOwnerChange.class, void.class),
+	CASTLE_SIEGE_START(CastleSiegeStart.class, void.class),
+	
+	// Clan events
+	CLAN_WAR_FINISH(ClanWarFinish.class, void.class),
+	CLAN_WAR_START(ClanWarStart.class, void.class),
+	
+	// Creature events
+	CREATURE_ATTACK(CreatureAttack.class, void.class, TerminateReturn.class),
+	CREATURE_ATTACK_AVOID(CreatureAttackAvoid.class, void.class, void.class),
+	CREATURE_ATTACKED(CreatureAttacked.class, void.class, TerminateReturn.class),
+	CREATURE_DAMAGE_RECEIVED(CreatureDamageReceived.class, void.class),
+	CREATURE_DAMAGE_DEALT(CreatureDamageDealt.class, void.class),
+	CREATURE_KILL(CreatureKill.class, void.class, TerminateReturn.class),
+	CREATURE_SKILL_USE(CreatureSkillUse.class, void.class, TerminateReturn.class),
+	CREATURE_TELEPORTED(CreatureTeleported.class, void.class),
+	CREATURE_ZONE_ENTER(CreatureZoneEnter.class, void.class),
+	CREATURE_ZONE_EXIT(CreatureZoneExit.class, void.class),
+	
+	// Fortress events
+	FORT_SIEGE_FINISH(FortSiegeFinish.class, void.class),
+	FORT_SIEGE_START(FortSiegeStart.class, void.class),
+	
+	// Item events
+	ITEM_BYPASS(ItemBypass.class, void.class),
+	ITEM_CREATE(ItemCreate.class, void.class),
+	ITEM_TALK(ItemTalk.class, void.class),
+	
+	// NPC events
+	NPC_CAN_BE_SEEN(NpcCanBeSeen.class, void.class, TerminateReturn.class),
+	NPC_CREATURE_SEE(NpcCreatureSee.class, void.class),
+	NPC_EVENT_RECEIVED(NpcEventReceived.class, void.class),
+	NPC_FIRST_TALK(NpcFirstTalk.class, void.class),
+	NPC_HATE(AttackableHate.class, void.class, TerminateReturn.class),
+	NPC_MOVE_FINISHED(NpcMoveFinished.class, void.class),
+	NPC_MOVE_NODE_ARRIVED(NpcMoveNodeArrived.class, void.class),
+	NPC_MOVE_ROUTE_FINISHED(NpcMoveRouteFinished.class, void.class),
+	NPC_QUEST_START(null, void.class),
+	NPC_SKILL_FINISHED(NpcSkillFinished.class, void.class),
+	NPC_SKILL_SEE(NpcSkillSee.class, void.class),
+	NPC_SPAWN(NpcSpawn.class, void.class),
+	NPC_TALK(null, void.class),
+	NPC_TELEPORT(NpcTeleport.class, void.class),
+	NPC_MANOR_BYPASS(NpcManorBypass.class, void.class),
+	
+	// Olympiad events
+	OLYMPIAD_MATCH_RESULT(OlympiadMatchResult.class, void.class),
+	
+	// Playable events
+	PLAYABLE_EXP_CHANGED(PlayableExpChanged.class, void.class, TerminateReturn.class),
+	
+	// Player events
+	PLAYER_AUGMENT(PlayerAugment.class, void.class),
+	PLAYER_BYPASS(PlayerBypass.class, void.class),
+	PLAYER_CHAT(PlayerChat.class, void.class, ChatFilterReturn.class),
+	
+	// Tutorial events
+	PLAYER_TUTORIAL(PlayerTutorial.class, void.class, void.class),
+	PLAYER_TUTORIAL_CMD(PlayerTutorialCmd.class, void.class, void.class),
+	PLAYER_TUTORIAL_CLIENT_EVENT(PlayerTutorialClientEvent.class, void.class, void.class),
+	PLAYER_TUTORIAL_QUESTION_MARK(PlayerTutorialQuestionMark.class, void.class, void.class),
+	
+	// Clan events
+	PLAYER_CLAN_CREATE(PlayerClanCreate.class, void.class),
+	PLAYER_CLAN_DESTROY(PlayerClanDestroy.class, void.class),
+	PLAYER_CLAN_JOIN(PlayerClanJoin.class, void.class),
+	PLAYER_CLAN_LEADER_CHANGE(PlayerClanLeaderChange.class, void.class),
+	PLAYER_CLAN_LEAVE(PlayerClanLeave.class, void.class),
+	PLAYER_CLAN_LEVEL_UP(PlayerClanLevelUp.class, void.class),
+	// Clan warehouse events
+	PLAYER_CLAN_WH_ITEM_ADD(PlayerClanWHItemAdd.class, void.class),
+	PLAYER_CLAN_WH_ITEM_DESTROY(PlayerClanWHItemDestroy.class, void.class),
+	PLAYER_CLAN_WH_ITEM_TRANSFER(PlayerClanWHItemTransfer.class, void.class),
+	PLAYER_CREATE(PlayerCreate.class, void.class),
+	PLAYER_DELETE(PlayerDelete.class, void.class),
+	PLAYER_DLG_ANSWER(PlayerDlgAnswer.class, void.class, TerminateReturn.class),
+	PLAYER_EQUIP_ITEM(PlayerEquipItem.class, void.class),
+	PLAYER_FAME_CHANGED(PlayerFameChanged.class, void.class),
+	// Henna events
+	PLAYER_HENNA_ADD(PlayerHennaAdd.class, void.class),
+	PLAYER_HENNA_REMOVE(PlayerHennaRemove.class, void.class),
+	// Inventory events
+	PLAYER_ITEM_ADD(PlayerItemAdd.class, void.class),
+	PLAYER_ITEM_DESTROY(PlayerItemDestroy.class, void.class),
+	PLAYER_ITEM_DROP(PlayerItemDrop.class, void.class),
+	PLAYER_ITEM_PICKUP(PlayerItemPickup.class, void.class),
+	PLAYER_ITEM_TRANSFER(PlayerItemTransfer.class, void.class),
+	// Other players events
+	PLAYER_KARMA_CHANGED(PlayerKarmaChanged.class, void.class),
+	PLAYER_LEVEL_CHANGED(PlayerLevelChanged.class, void.class),
+	PLAYER_LOGIN(PlayerLogin.class, void.class),
+	PLAYER_LOGOUT(PlayerLogout.class, void.class),
+	PLAYER_PK_CHANGED(PlayerPKChanged.class, void.class),
+	PLAYER_PROFESSION_CHANGE(PlayerProfessionChange.class, void.class),
+	PLAYER_PROFESSION_CANCEL(PlayerProfessionCancel.class, void.class),
+	PLAYER_PVP_CHANGED(PlayerPvPChanged.class, void.class),
+	PLAYER_PVP_KILL(PlayerPvPKill.class, void.class),
+	PLAYER_RESTORE(PlayerRestore.class, void.class),
+	PLAYER_SELECT(PlayerSelect.class, void.class, TerminateReturn.class),
+	PLAYER_SIT(PlayerSit.class, TerminateReturn.class),
+	PLAYER_LEARN_SKILL_REQUESTED(PlayerLearnSkillRequested.class, void.class),
+	PLAYER_ONE_SKILL_SELECTED(PlayerOneSkillSelected.class, void.class),
+	PLAYER_SKILL_LEARNED(PlayerSkillLearned.class, void.class),
+	PLAYER_MENU_SELECTED(PlayerMenuSelected.class, void.class),
+	PLAYER_QUEST_ACCEPTED(PlayerQuestAccepted.class, void.class),
+	PLAYER_TELEPORT_REQUEST(PlayerTeleportRequest.class, void.class),
+	PLAYER_STAND(PlayerSit.class, TerminateReturn.class),
+	PLAYER_SUMMON_SPAWN(PlayerSummonSpawn.class, void.class),
+	PLAYER_SUMMON_TALK(PlayerSummonTalk.class, void.class),
+	PLAYER_TRANSFORM(PlayerTransform.class, void.class),
+	
+	// Trap events
+	TRAP_ACTION(OnTrapAction.class, void.class),
+	
+	// TvT events.
+	TVT_EVENT_FINISH(TvTEventFinish.class, void.class),
+	TVT_EVENT_KILL(TvTEventKill.class, void.class),
+	TVT_EVENT_REGISTRATION_START(TvTEventRegistrationStart.class, void.class),
+	TVT_EVENT_START(TvTEventStart.class, void.class);
+	
+	private final Class<? extends BaseEvent> eventClass;
+	private final Class<?>[] returnClass;
+	
+	EventType(Class<? extends BaseEvent> eventClass, Class<?>... returnClass) {
+		this.eventClass = eventClass;
+		this.returnClass = returnClass;
+	}
+	
+	public Class<? extends BaseEvent> getEventClass() {
+		return eventClass;
+	}
+	
+	public Class<?>[] getReturnClasses() {
+		return returnClass;
+	}
+	
+	public boolean isEventClass(Class<?> clazz) {
+		return eventClass == clazz;
+	}
+	
+	public boolean isReturnClass(Class<?> clazz) {
+		return Util.contains(returnClass, clazz);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/ListenerRegisterType.java b/src/main/java/com/l2jserver/gameserver/model/events/ListenerRegisterType.java
new file mode 100644
index 00000000..ab552286
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/ListenerRegisterType.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+/**
+ * @author UnAfraid
+ */
+public enum ListenerRegisterType {
+	NPC,
+	ZONE,
+	ITEM,
+	CASTLE,
+	FORTRESS,
+	OLYMPIAD,
+	GLOBAL,
+	GLOBAL_NPCS,
+	GLOBAL_MONSTERS,
+	GLOBAL_PLAYERS
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/ListenersContainer.java b/src/main/java/com/l2jserver/gameserver/model/events/ListenersContainer.java
new file mode 100644
index 00000000..a8bd3330
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/ListenersContainer.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.function.Predicate;
+
+import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
+import com.l2jserver.gameserver.util.EmptyQueue;
+
+/**
+ * @author UnAfraid
+ */
+public class ListenersContainer {
+	private volatile Map<EventType, Queue<AbstractEventListener>> _listeners = null;
+	
+	/**
+	 * Registers listener for a callback when specified event is executed.
+	 * @param listener
+	 * @return
+	 */
+	public AbstractEventListener addListener(AbstractEventListener listener) {
+		if (listener == null) {
+			throw new NullPointerException("Listener cannot be null!");
+		}
+		getListeners().computeIfAbsent(listener.getType(), _ -> new PriorityBlockingQueue<>()).add(listener);
+		return listener;
+	}
+	
+	/**
+	 * Unregisters listener for a callback when specified event is executed.
+	 * @param listener
+	 * @return
+	 */
+	public AbstractEventListener removeListener(AbstractEventListener listener) {
+		if (listener == null) {
+			throw new NullPointerException("Listener cannot be null!");
+		}
+		
+		final var listeners = _listeners;
+		if (listeners == null) {
+			throw new NullPointerException("Listeners container is not initialized!");
+		}
+		
+		final var queue = listeners.get(listener.getType());
+		if (queue == null) {
+			throw new IllegalAccessError("Listeners container doesn't had " + listener.getType() + " event type added!");
+		}
+		
+		queue.remove(listener);
+		return listener;
+	}
+	
+	/**
+	 * @param type
+	 * @return {@code List} of {@link AbstractEventListener} by the specified type
+	 */
+	public Queue<AbstractEventListener> getListeners(EventType type) {
+		final var listeners = _listeners;
+		return (listeners != null) ? listeners.getOrDefault(type, EmptyQueue.emptyQueue()) : EmptyQueue.emptyQueue();
+	}
+	
+	public void removeListenerIf(EventType type, Predicate<? super AbstractEventListener> filter) {
+		getListeners(type).stream().filter(filter).forEach(AbstractEventListener::unregisterMe);
+	}
+	
+	public void removeListenerIf(Predicate<? super AbstractEventListener> filter) {
+		final var listeners = _listeners;
+		if (listeners != null) {
+			listeners.values().forEach(queue -> queue.stream().filter(filter).forEach(AbstractEventListener::unregisterMe));
+		}
+	}
+	
+	public boolean hasListener(EventType type) {
+		return !getListeners(type).isEmpty();
+	}
+	
+	/**
+	 * Creates the listeners container map if doesn't exists.
+	 * @return the listeners container map.
+	 */
+	private Map<EventType, Queue<AbstractEventListener>> getListeners() {
+		var listeners = _listeners;
+		if (listeners == null) {
+			synchronized (this) {
+				listeners = _listeners;
+				if (listeners == null) {
+					_listeners = listeners = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		return listeners;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/Id.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Id.java
new file mode 100644
index 00000000..9d0cdc93
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Id.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Repeatable(Ids.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Id {
+	int[] value();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/Ids.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Ids.java
new file mode 100644
index 00000000..c16b3f4f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Ids.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Ids {
+	Id[] value();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/NpcLevelRange.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/NpcLevelRange.java
new file mode 100644
index 00000000..6ae4b7df
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/NpcLevelRange.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Repeatable(NpcLevelRanges.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface NpcLevelRange {
+	int from();
+	
+	int to();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/NpcLevelRanges.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/NpcLevelRanges.java
new file mode 100644
index 00000000..762768ef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/NpcLevelRanges.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface NpcLevelRanges {
+	NpcLevelRange[] value();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/Priority.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Priority.java
new file mode 100644
index 00000000..9a84d168
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Priority.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Priority {
+	int value() default 0;
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/Range.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Range.java
new file mode 100644
index 00000000..32cfe428
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Range.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Repeatable(Ranges.class)
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Range {
+	int from();
+	
+	int to();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/Ranges.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Ranges.java
new file mode 100644
index 00000000..bc7bd123
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/Ranges.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author UnAfraid
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Ranges {
+	Range[] value();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/RegisterEvent.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/RegisterEvent.java
new file mode 100644
index 00000000..6d093555
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/RegisterEvent.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.l2jserver.gameserver.model.events.EventType;
+
+/**
+ * @author UnAfraid
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface RegisterEvent {
+	EventType value();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/annotations/RegisterType.java b/src/main/java/com/l2jserver/gameserver/model/events/annotations/RegisterType.java
new file mode 100644
index 00000000..dd4a4d52
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/annotations/RegisterType.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.l2jserver.gameserver.model.events.ListenerRegisterType;
+
+/**
+ * @author UnAfraid
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface RegisterType {
+	ListenerRegisterType value();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/BaseEvent.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/BaseEvent.java
new file mode 100644
index 00000000..501d6338
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/BaseEvent.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl;
+
+import com.l2jserver.gameserver.model.events.EventType;
+
+/**
+ * Base Event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public interface BaseEvent {
+	EventType getType();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttack.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttack.java
new file mode 100644
index 00000000..c5eff85c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttack.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ATTACK;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Creature Attack event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureAttack(L2Character attacker, L2Character target) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_ATTACK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttackAvoid.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttackAvoid.java
new file mode 100644
index 00000000..393a7ee1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttackAvoid.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ATTACK_AVOID;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Creature Attack Avoid event.
+ * @author Zealar
+ * @author Zoey76
+ */
+public record CreatureAttackAvoid(L2Character attacker, L2Character target, boolean damageOverTime) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_ATTACK_AVOID;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttacked.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttacked.java
new file mode 100644
index 00000000..de5226e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureAttacked.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ATTACKED;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Creature Attacked event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureAttacked(L2Character attacker, L2Character target) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_ATTACKED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureDamageDealt.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureDamageDealt.java
new file mode 100644
index 00000000..95e55394
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureDamageDealt.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_DAMAGE_DEALT;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Creature Damage Dealt event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureDamageDealt(L2Character attacker, L2Character target, double damage, Skill skill, boolean critical, boolean damageOverTime, boolean isReflect) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_DAMAGE_DEALT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureDamageReceived.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureDamageReceived.java
new file mode 100644
index 00000000..033c8a31
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureDamageReceived.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_DAMAGE_RECEIVED;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Creature Damage Received event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureDamageReceived(L2Character attacker, L2Character target, double damage, Skill skill, boolean critical, boolean damageOverTime, boolean isReflect) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_DAMAGE_RECEIVED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureKill.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureKill.java
new file mode 100644
index 00000000..a0bcadbc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureKill.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_KILL;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Creature Kill event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureKill(L2Character attacker, L2Character target) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_KILL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureSkillUse.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureSkillUse.java
new file mode 100644
index 00000000..2c4b0f4d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureSkillUse.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_SKILL_USE;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Creature Skill Use event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureSkillUse(L2Character caster, Skill skill, boolean simultaneously, L2Character target, List<L2Object> targets) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_SKILL_USE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureTeleported.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureTeleported.java
new file mode 100644
index 00000000..069aa043
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureTeleported.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_TELEPORTED;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Creature Teleported event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureTeleported(L2Character creature) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_TELEPORTED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureZoneEnter.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureZoneEnter.java
new file mode 100644
index 00000000..91ed2cd5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureZoneEnter.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ZONE_ENTER;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * Creature Zone Enter event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureZoneEnter(L2Character creature, L2ZoneType zone) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_ZONE_ENTER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureZoneExit.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureZoneExit.java
new file mode 100644
index 00000000..402465ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/CreatureZoneExit.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character;
+
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ZONE_EXIT;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * Creature Zone Exit event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CreatureZoneExit(L2Character creature, L2ZoneType zone) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CREATURE_ZONE_EXIT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcCanBeSeen.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcCanBeSeen.java
new file mode 100644
index 00000000..f1d67acd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcCanBeSeen.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_CAN_BE_SEEN;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Can Be Seen event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcCanBeSeen(L2Npc npc, L2Character character) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_CAN_BE_SEEN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcCreatureSee.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcCreatureSee.java
new file mode 100644
index 00000000..b247b936
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcCreatureSee.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_CREATURE_SEE;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * NPC Creature See event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcCreatureSee(L2Npc npc, L2Character creature) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_CREATURE_SEE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcEventReceived.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcEventReceived.java
new file mode 100644
index 00000000..0fd35bcf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcEventReceived.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_EVENT_RECEIVED;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Event Received event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcEventReceived(String eventName, L2Npc sender, L2Npc receiver, L2Object reference, int arg1, int arg2) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_EVENT_RECEIVED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcFirstTalk.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcFirstTalk.java
new file mode 100644
index 00000000..5e142709
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcFirstTalk.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_FIRST_TALK;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc First Talk event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcFirstTalk(L2Npc npc, L2PcInstance player) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_FIRST_TALK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcManorBypass.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcManorBypass.java
new file mode 100644
index 00000000..4cce711c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcManorBypass.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MANOR_BYPASS;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Manor Bypass event.
+ * @author malyelfik
+ * @author Zoey76
+ */
+public record NpcManorBypass(L2PcInstance player, L2Character target, int request, int manorId, boolean nextPeriod) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_MANOR_BYPASS;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveFinished.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveFinished.java
new file mode 100644
index 00000000..597a3b3d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveFinished.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MOVE_FINISHED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Move Finished event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcMoveFinished(L2Npc npc) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_MOVE_FINISHED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveNodeArrived.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveNodeArrived.java
new file mode 100644
index 00000000..e99f7037
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveNodeArrived.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MOVE_NODE_ARRIVED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Move Node Arrived event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcMoveNodeArrived(L2Npc npc) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_MOVE_NODE_ARRIVED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveRouteFinished.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveRouteFinished.java
new file mode 100644
index 00000000..be1caf7e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcMoveRouteFinished.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MOVE_ROUTE_FINISHED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Move Route Finished event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcMoveRouteFinished(L2Npc npc) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_MOVE_ROUTE_FINISHED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSkillFinished.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSkillFinished.java
new file mode 100644
index 00000000..1d66f8ed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSkillFinished.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_SKILL_FINISHED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * NPC Skill Finished event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcSkillFinished(L2Npc npc, L2PcInstance player, Skill skill) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_SKILL_FINISHED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSkillSee.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSkillSee.java
new file mode 100644
index 00000000..094dfa52
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSkillSee.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_SKILL_SEE;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Npc Skill See event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, List<L2Object> targets, boolean isSummon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_SKILL_SEE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSpawn.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSpawn.java
new file mode 100644
index 00000000..2fd8eeb6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcSpawn.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_SPAWN;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Spawn event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record NpcSpawn(L2Npc npc) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_SPAWN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcTeleport.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcTeleport.java
new file mode 100644
index 00000000..03cccc4f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/NpcTeleport.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_TELEPORT;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Npc Teleport event.
+ * @author Zealar
+ * @author Zoey76
+ */
+public record NpcTeleport(L2Npc npc) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_TELEPORT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableAggroRangeEnter.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableAggroRangeEnter.java
new file mode 100644
index 00000000..58d924e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableAggroRangeEnter.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc.attackable;
+
+import static com.l2jserver.gameserver.model.events.EventType.ATTACKABLE_AGGRO_RANGE_ENTER;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Attackable Aggro Range Enter event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record AttackableAggroRangeEnter(L2Npc npc, L2PcInstance player, boolean isSummon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return ATTACKABLE_AGGRO_RANGE_ENTER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableAttack.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableAttack.java
new file mode 100644
index 00000000..6da76f3a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableAttack.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc.attackable;
+
+import static com.l2jserver.gameserver.model.events.EventType.ATTACKABLE_ATTACK;
+
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Attackable Attack event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record AttackableAttack(L2PcInstance attacker, L2Attackable target, int damage, Skill skill, boolean isSummon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return ATTACKABLE_ATTACK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableHate.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableHate.java
new file mode 100644
index 00000000..f61382b9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableHate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc.attackable;
+
+import static com.l2jserver.gameserver.model.events.EventType.NPC_HATE;
+
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Attackable Hate event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record AttackableHate(L2Attackable npc, L2PcInstance player, boolean isSummon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return NPC_HATE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableKill.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableKill.java
new file mode 100644
index 00000000..4bce72b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/AttackableKill.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc.attackable;
+
+import static com.l2jserver.gameserver.model.events.EventType.ATTACKABLE_KILL;
+
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Attackable Kill event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record AttackableKill(L2PcInstance attacker, L2Attackable target, boolean isSummon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return ATTACKABLE_KILL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/FactionCall.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/FactionCall.java
new file mode 100644
index 00000000..a40e2861
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/npc/attackable/FactionCall.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.npc.attackable;
+
+import static com.l2jserver.gameserver.model.events.EventType.FACTION_CALL;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Faction Call event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record FactionCall(L2Npc npc, L2Npc caller, L2PcInstance attacker, boolean isSummon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return FACTION_CALL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/playable/PlayableExpChanged.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/playable/PlayableExpChanged.java
new file mode 100644
index 00000000..d7868e62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/playable/PlayableExpChanged.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.playable;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYABLE_EXP_CHANGED;
+
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Playable Exp Changed event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayableExpChanged(L2Playable player, long oldExp, long newExp) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYABLE_EXP_CHANGED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerAugment.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerAugment.java
new file mode 100644
index 00000000..7cc09561
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerAugment.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_AUGMENT;
+
+import com.l2jserver.gameserver.model.L2Augmentation;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Augment event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerAugment(L2PcInstance player, L2ItemInstance item, L2Augmentation augmentation, boolean isAugment) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_AUGMENT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerBypass.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerBypass.java
new file mode 100644
index 00000000..4027b606
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerBypass.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_BYPASS;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Bypass event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerBypass(L2PcInstance player, String command) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_BYPASS;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerChat.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerChat.java
new file mode 100644
index 00000000..0925e7cd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerChat.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CHAT;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Chat event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerChat(L2PcInstance player, L2PcInstance target, String text, int chatType) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CHAT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerCreate.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerCreate.java
new file mode 100644
index 00000000..c4bdd3fb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerCreate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CREATE;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Player Create event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerCreate(L2PcInstance player, int objectId, String name, L2GameClient client) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CREATE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerDelete.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerDelete.java
new file mode 100644
index 00000000..a599b342
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerDelete.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_DELETE;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Player Delete event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerDelete(int objectId, String name, L2GameClient client) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_DELETE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerDlgAnswer.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerDlgAnswer.java
new file mode 100644
index 00000000..2e7df676
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerDlgAnswer.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_DLG_ANSWER;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Dlg Answer event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerDlgAnswer(L2PcInstance player, int messageId, int answer, int requesterId) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_DLG_ANSWER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerEquipItem.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerEquipItem.java
new file mode 100644
index 00000000..5c1f238e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerEquipItem.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_EQUIP_ITEM;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Equip Item event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerEquipItem(L2PcInstance player, L2ItemInstance item) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_EQUIP_ITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerFameChanged.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerFameChanged.java
new file mode 100644
index 00000000..c2cf4394
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerFameChanged.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_FAME_CHANGED;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Fame Changed event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerFameChanged(L2PcInstance player, int oldFame, int newFame) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_FAME_CHANGED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerHennaAdd.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerHennaAdd.java
new file mode 100644
index 00000000..99116c53
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerHennaAdd.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_HENNA_ADD;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * Player Henna Add event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerHennaAdd(L2PcInstance player, L2Henna henna) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_HENNA_ADD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerHennaRemove.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerHennaRemove.java
new file mode 100644
index 00000000..0fcd7641
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerHennaRemove.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_HENNA_REMOVE;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * Player Henna Remove event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerHennaRemove(L2PcInstance player, L2Henna henna) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_HENNA_REMOVE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerKarmaChanged.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerKarmaChanged.java
new file mode 100644
index 00000000..066f9bbb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerKarmaChanged.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_KARMA_CHANGED;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Karma Changed event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerKarmaChanged(L2PcInstance player, int oldKarma, int newKarma) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_KARMA_CHANGED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLearnSkillRequested.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLearnSkillRequested.java
new file mode 100644
index 00000000..94bfa4c5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLearnSkillRequested.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LEARN_SKILL_REQUESTED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Learn Skill Requested event.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public record PlayerLearnSkillRequested(L2Npc npc, L2PcInstance player, ClassId classId) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_LEARN_SKILL_REQUESTED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLevelChanged.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLevelChanged.java
new file mode 100644
index 00000000..188f5169
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLevelChanged.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LEVEL_CHANGED;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Level Changed event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerLevelChanged(L2PcInstance player, int oldLevel, int newLevel) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_LEVEL_CHANGED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLogin.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLogin.java
new file mode 100644
index 00000000..f073a6da
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLogin.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LOGIN;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Login event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerLogin(L2PcInstance player) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_LOGIN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLogout.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLogout.java
new file mode 100644
index 00000000..a96fa5b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerLogout.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LOGOUT;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Logout event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerLogout(L2PcInstance player) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_LOGOUT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerMenuSelected.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerMenuSelected.java
new file mode 100644
index 00000000..adbfc19e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerMenuSelected.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_MENU_SELECTED;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Menu Selected event.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public record PlayerMenuSelected(L2PcInstance player, L2Character npc, int ask, int reply) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_MENU_SELECTED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerOneSkillSelected.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerOneSkillSelected.java
new file mode 100644
index 00000000..10a26a81
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerOneSkillSelected.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_ONE_SKILL_SELECTED;
+
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player One Skill Selected event.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public record PlayerOneSkillSelected(L2PcInstance player, L2Npc npc, L2SkillLearn skill, boolean needQuest, int unk) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_ONE_SKILL_SELECTED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPKChanged.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPKChanged.java
new file mode 100644
index 00000000..89ecdd78
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPKChanged.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PK_CHANGED;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player PK Changed event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerPKChanged(L2PcInstance player, int oldPoints, int newPoints) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_PK_CHANGED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerProfessionCancel.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerProfessionCancel.java
new file mode 100644
index 00000000..bc3f0ad4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerProfessionCancel.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PROFESSION_CANCEL;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Profession Cancel event.
+ * @author Krunchy
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerProfessionCancel(L2PcInstance player, int classId) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_PROFESSION_CANCEL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerProfessionChange.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerProfessionChange.java
new file mode 100644
index 00000000..24c29cd7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerProfessionChange.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PROFESSION_CHANGE;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Profession Change event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerProfessionChange(L2PcInstance player, L2PcTemplate template, boolean isSubClass) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_PROFESSION_CHANGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPvPChanged.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPvPChanged.java
new file mode 100644
index 00000000..e24770d2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPvPChanged.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PVP_CHANGED;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player PvP Changed event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerPvPChanged(L2PcInstance player, int oldPoints, int newPoints) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_PVP_CHANGED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPvPKill.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPvPKill.java
new file mode 100644
index 00000000..7d0823c8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerPvPKill.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_PVP_KILL;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player PvP Kill event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerPvPKill(L2PcInstance player, L2PcInstance target) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_PVP_KILL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerQuestAccepted.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerQuestAccepted.java
new file mode 100644
index 00000000..e7462096
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerQuestAccepted.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_QUEST_ACCEPTED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Quest Accepted event.
+ * @author Charus
+ * @version 2.6.3.0
+ */
+public record PlayerQuestAccepted(L2PcInstance player, L2Npc npc, int questId) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_QUEST_ACCEPTED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerRestore.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerRestore.java
new file mode 100644
index 00000000..2ed902ea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerRestore.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_RESTORE;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Player Restore event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerRestore(int objectId, String name, L2GameClient client) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_RESTORE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSelect.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSelect.java
new file mode 100644
index 00000000..8899b7c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSelect.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SELECT;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Player Select event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerSelect(L2PcInstance player, int objectId, String name, L2GameClient client) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_SELECT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSit.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSit.java
new file mode 100644
index 00000000..0aa95d30
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSit.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SIT;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Sit event.
+ * @author Zealar
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerSit(L2PcInstance player) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_SIT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSkillLearned.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSkillLearned.java
new file mode 100644
index 00000000..8efe6210
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSkillLearned.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SKILL_LEARNED;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Player Skill Learned event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerSkillLearned(L2Npc npc, L2PcInstance player, Skill skill, AcquireSkillType type) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_SKILL_LEARNED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerStand.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerStand.java
new file mode 100644
index 00000000..d983f08d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerStand.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_STAND;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Stand event.
+ * @author Zealar
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerStand(L2PcInstance player) implements BaseEvent {
+	// TODO(Zoey76): Check if this overlaps with PlayerSit.
+	@Override
+	public EventType getType() {
+		return PLAYER_STAND;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSummonSpawn.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSummonSpawn.java
new file mode 100644
index 00000000..ffc9c465
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSummonSpawn.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SUMMON_SPAWN;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Summon Spawn event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerSummonSpawn(L2Summon summon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_SUMMON_SPAWN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSummonTalk.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSummonTalk.java
new file mode 100644
index 00000000..a97f200b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerSummonTalk.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SUMMON_TALK;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Summon Talk event.
+ * @author St3eT
+ * @author Zoey76
+ */
+public record PlayerSummonTalk(L2Summon summon) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_SUMMON_TALK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTeleportRequest.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTeleportRequest.java
new file mode 100644
index 00000000..9e3c791d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTeleportRequest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TELEPORT_REQUEST;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Teleport Request event.
+ * @author Charus
+ * @version 2.6.3.0
+ */
+public record PlayerTeleportRequest(L2PcInstance player, L2Character npc) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_TELEPORT_REQUEST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTransform.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTransform.java
new file mode 100644
index 00000000..0ea72180
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTransform.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TRANSFORM;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Transform event.
+ * @author UnAfraid
+ */
+public record PlayerTransform(L2PcInstance player, int transformId) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_TRANSFORM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorial.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorial.java
new file mode 100644
index 00000000..e266c606
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorial.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Tutorial event.
+ * @author Zealar
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerTutorial(L2PcInstance player, String command) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_TUTORIAL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialClientEvent.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialClientEvent.java
new file mode 100644
index 00000000..bf420853
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialClientEvent.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL_CLIENT_EVENT;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Tutorial Client Event event.
+ * @author Zealar
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerTutorialClientEvent(L2PcInstance player, int event) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_TUTORIAL_CLIENT_EVENT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialCmd.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialCmd.java
new file mode 100644
index 00000000..0197ad17
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialCmd.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL_CMD;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Tutorial Cmd event.
+ * @author Zealar
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerTutorialCmd(L2PcInstance player, String command) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_TUTORIAL_CMD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialQuestionMark.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialQuestionMark.java
new file mode 100644
index 00000000..cc7b4022
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/PlayerTutorialQuestionMark.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL_QUESTION_MARK;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Tutorial Question Mark event.
+ * @author Zealar
+ * @author Zoey76
+ * @since 2.6.0.0
+ */
+public record PlayerTutorialQuestionMark(L2PcInstance player, int number) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_TUTORIAL_QUESTION_MARK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanCreate.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanCreate.java
new file mode 100644
index 00000000..a4d94f6a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanCreate.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_CREATE;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Clan Create event.
+ * @author UnAfraid
+ */
+public record PlayerClanCreate(L2PcInstance player, L2Clan clan) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_CREATE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanDestroy.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanDestroy.java
new file mode 100644
index 00000000..316571db
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanDestroy.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_DESTROY;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Clan Destroy event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanDestroy(L2ClanMember clanMember, L2Clan clan) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_DESTROY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanJoin.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanJoin.java
new file mode 100644
index 00000000..8ed9444d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanJoin.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_JOIN;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Clan Join event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanJoin(L2ClanMember clanMember, L2Clan clan) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_JOIN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLeaderChange.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLeaderChange.java
new file mode 100644
index 00000000..f542c711
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLeaderChange.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_LEADER_CHANGE;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Clan Leader Change event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanLeaderChange(L2ClanMember oldLeader, L2ClanMember newLeader, L2Clan clan) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_LEADER_CHANGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLeave.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLeave.java
new file mode 100644
index 00000000..f2c2e027
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLeave.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_LEAVE;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Clan Leave event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanLeave(L2ClanMember clanMember, L2Clan clan) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_LEAVE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLevelUp.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLevelUp.java
new file mode 100644
index 00000000..2a42e345
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clan/PlayerClanLevelUp.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_LEVEL_UP;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Player Clan Level Up event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanLevelUp(L2Clan clan) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_LEVEL_UP;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemAdd.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemAdd.java
new file mode 100644
index 00000000..dfeca071
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemAdd.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clanwh;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_WH_ITEM_ADD;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Clan WH Item Add event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanWHItemAdd(String process, L2PcInstance player, L2ItemInstance item, ItemContainer container) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_WH_ITEM_ADD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemDestroy.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemDestroy.java
new file mode 100644
index 00000000..c3103e38
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemDestroy.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clanwh;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_WH_ITEM_DESTROY;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Clan WH Item Destroy event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanWHItemDestroy(String process, L2PcInstance player, L2ItemInstance item, long count, ItemContainer container) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_WH_ITEM_DESTROY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemTransfer.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemTransfer.java
new file mode 100644
index 00000000..34f7113d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/clanwh/PlayerClanWHItemTransfer.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.clanwh;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_CLAN_WH_ITEM_TRANSFER;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Clan WH Item Transfer event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerClanWHItemTransfer(String process, L2PcInstance player, L2ItemInstance item, long count, ItemContainer container) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_CLAN_WH_ITEM_TRANSFER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemAdd.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemAdd.java
new file mode 100644
index 00000000..5795fbc6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemAdd.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.inventory;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_ITEM_ADD;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Item Add event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerItemAdd(L2PcInstance player, L2ItemInstance item) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_ITEM_ADD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemDestroy.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemDestroy.java
new file mode 100644
index 00000000..122e8945
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemDestroy.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.inventory;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_ITEM_DESTROY;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Item Destroy event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerItemDestroy(L2PcInstance player, L2ItemInstance item) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_ITEM_DESTROY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemDrop.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemDrop.java
new file mode 100644
index 00000000..d2ad0be1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemDrop.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.inventory;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_ITEM_DROP;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Item Drop event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerItemDrop(L2PcInstance player, L2ItemInstance item, Location location) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_ITEM_DROP;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemPickup.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemPickup.java
new file mode 100644
index 00000000..667938e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemPickup.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.inventory;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_ITEM_PICKUP;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Item Pickup event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerItemPickup(L2PcInstance player, L2ItemInstance item) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_ITEM_PICKUP;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemTransfer.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemTransfer.java
new file mode 100644
index 00000000..8d93e746
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/player/inventory/PlayerItemTransfer.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.player.inventory;
+
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_ITEM_TRANSFER;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Player Item Transfer event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record PlayerItemTransfer(L2PcInstance player, L2ItemInstance item, ItemContainer container) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return PLAYER_ITEM_TRANSFER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/character/trap/OnTrapAction.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/trap/OnTrapAction.java
new file mode 100644
index 00000000..8fee451e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/character/trap/OnTrapAction.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.character.trap;
+
+import static com.l2jserver.gameserver.model.events.EventType.TRAP_ACTION;
+
+import com.l2jserver.gameserver.enums.TrapAction;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Trap Action event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record OnTrapAction(L2TrapInstance trap, L2Character trigger, TrapAction action) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return TRAP_ACTION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/clan/ClanWarFinish.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/clan/ClanWarFinish.java
new file mode 100644
index 00000000..b2812581
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/clan/ClanWarFinish.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.CLAN_WAR_FINISH;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Clan War Finish event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record ClanWarFinish(L2Clan clan1, L2Clan clan2) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CLAN_WAR_FINISH;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/clan/ClanWarStart.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/clan/ClanWarStart.java
new file mode 100644
index 00000000..2cc31251
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/clan/ClanWarStart.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.clan;
+
+import static com.l2jserver.gameserver.model.events.EventType.CLAN_WAR_START;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Clan War Start event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record ClanWarStart(L2Clan clan1, L2Clan clan2) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CLAN_WAR_START;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventFinish.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventFinish.java
new file mode 100644
index 00000000..de751dca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventFinish.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.events;
+
+import static com.l2jserver.gameserver.model.events.EventType.TVT_EVENT_FINISH;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * TvT Event Finish event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record TvTEventFinish() implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return TVT_EVENT_FINISH;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventKill.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventKill.java
new file mode 100644
index 00000000..97b4c6cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventKill.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.events;
+
+import static com.l2jserver.gameserver.model.events.EventType.TVT_EVENT_KILL;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.TvTEventTeam;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * TvT Event Kill.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record TvTEventKill(L2PcInstance killer, L2PcInstance victim, TvTEventTeam killerTeam) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return TVT_EVENT_KILL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventRegistrationStart.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventRegistrationStart.java
new file mode 100644
index 00000000..d2c29078
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventRegistrationStart.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.events;
+
+import static com.l2jserver.gameserver.model.events.EventType.TVT_EVENT_REGISTRATION_START;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * TvT Event Registration Start event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record TvTEventRegistrationStart() implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return TVT_EVENT_REGISTRATION_START;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventStart.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventStart.java
new file mode 100644
index 00000000..298761e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/events/TvTEventStart.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.events;
+
+import static com.l2jserver.gameserver.model.events.EventType.TVT_EVENT_START;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * TvT Event Start event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record TvTEventStart() implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return TVT_EVENT_START;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemBypass.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemBypass.java
new file mode 100644
index 00000000..f9643fa4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemBypass.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.item;
+
+import static com.l2jserver.gameserver.model.events.EventType.ITEM_BYPASS;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Item Bypass event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record ItemBypass(L2ItemInstance item, L2PcInstance player, String event) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return ITEM_BYPASS;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemCreate.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemCreate.java
new file mode 100644
index 00000000..06d29b72
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemCreate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.item;
+
+import static com.l2jserver.gameserver.model.events.EventType.ITEM_CREATE;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Item Create event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record ItemCreate(String process, L2ItemInstance item, L2PcInstance player, Object reference) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return ITEM_CREATE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemTalk.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemTalk.java
new file mode 100644
index 00000000..8c77a53a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/item/ItemTalk.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.item;
+
+import static com.l2jserver.gameserver.model.events.EventType.ITEM_TALK;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Item Talk event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record ItemTalk(L2ItemInstance item, L2PcInstance player) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return ITEM_TALK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/olympiad/OlympiadMatchResult.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/olympiad/OlympiadMatchResult.java
new file mode 100644
index 00000000..f3aac0d6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/olympiad/OlympiadMatchResult.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.olympiad;
+
+import static com.l2jserver.gameserver.model.events.EventType.OLYMPIAD_MATCH_RESULT;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.olympiad.CompetitionType;
+import com.l2jserver.gameserver.model.olympiad.Participant;
+
+/**
+ * Olympiad Match Result event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record OlympiadMatchResult(Participant winner, Participant loser, CompetitionType competitionType) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return OLYMPIAD_MATCH_RESULT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeFinish.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeFinish.java
new file mode 100644
index 00000000..c488a87a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeFinish.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.sieges.castle;
+
+import static com.l2jserver.gameserver.model.events.EventType.CASTLE_SIEGE_FINISH;
+
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Castle Siege Finish event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CastleSiegeFinish(Siege siege) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CASTLE_SIEGE_FINISH;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeOwnerChange.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeOwnerChange.java
new file mode 100644
index 00000000..0a9eab16
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeOwnerChange.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.sieges.castle;
+
+import static com.l2jserver.gameserver.model.events.EventType.CASTLE_SIEGE_OWNER_CHANGE;
+
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Castle Siege Owner Change event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CastleSiegeOwnerChange(Siege siege) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CASTLE_SIEGE_OWNER_CHANGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeStart.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeStart.java
new file mode 100644
index 00000000..4543ff47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/castle/CastleSiegeStart.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.sieges.castle;
+
+import static com.l2jserver.gameserver.model.events.EventType.CASTLE_SIEGE_START;
+
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Castle Siege Start event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record CastleSiegeStart(Siege siege) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return CASTLE_SIEGE_START;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/fort/FortSiegeFinish.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/fort/FortSiegeFinish.java
new file mode 100644
index 00000000..c03e0c53
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/fort/FortSiegeFinish.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.sieges.fort;
+
+import static com.l2jserver.gameserver.model.events.EventType.FORT_SIEGE_FINISH;
+
+import com.l2jserver.gameserver.model.entity.FortSiege;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Fort Siege Finish event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record FortSiegeFinish(FortSiege siege) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return FORT_SIEGE_FINISH;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/fort/FortSiegeStart.java b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/fort/FortSiegeStart.java
new file mode 100644
index 00000000..92d8736a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/impl/sieges/fort/FortSiegeStart.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.impl.sieges.fort;
+
+import static com.l2jserver.gameserver.model.events.EventType.FORT_SIEGE_START;
+
+import com.l2jserver.gameserver.model.entity.FortSiege;
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+
+/**
+ * Fort Siege Start event.
+ * @author UnAfraid
+ * @author Zoey76
+ */
+public record FortSiegeStart(FortSiege siege) implements BaseEvent {
+	@Override
+	public EventType getType() {
+		return FORT_SIEGE_START;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/listeners/AbstractEventListener.java b/src/main/java/com/l2jserver/gameserver/model/events/listeners/AbstractEventListener.java
new file mode 100644
index 00000000..3cd6c21f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/listeners/AbstractEventListener.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.listeners;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * @author UnAfraid
+ */
+public abstract class AbstractEventListener implements Comparable<AbstractEventListener> {
+	private int _priority = 0;
+	private final ListenersContainer _container;
+	private final EventType _type;
+	private final Object _owner;
+	
+	public AbstractEventListener(ListenersContainer container, EventType type, Object owner) {
+		_container = container;
+		_type = type;
+		_owner = owner;
+	}
+	
+	/**
+	 * @return the container on which this listener is being registered (Used to unregister when unloading scripts)
+	 */
+	public ListenersContainer getContainer() {
+		return _container;
+	}
+	
+	/**
+	 * @return the type of event which listener is listening for.
+	 */
+	public EventType getType() {
+		return _type;
+	}
+	
+	/**
+	 * @return the owner of the listener, the object that registered this listener.
+	 */
+	public Object getOwner() {
+		return _owner;
+	}
+	
+	/**
+	 * @return priority of execution (Higher the sooner)
+	 */
+	public int getPriority() {
+		return _priority;
+	}
+	
+	/**
+	 * Sets priority of execution.
+	 * @param priority
+	 */
+	public void setPriority(int priority) {
+		_priority = priority;
+	}
+	
+	/**
+	 * Method invoked by EventDispatcher that will use the callback.
+	 * @param <R>
+	 * @param event
+	 * @param returnBackClass
+	 * @return
+	 */
+	public abstract <R extends AbstractEventReturn> R executeEvent(BaseEvent event, Class<R> returnBackClass);
+	
+	/**
+	 * Unregisters detaches and unregisters current listener.
+	 */
+	public void unregisterMe() {
+		getContainer().removeListener(this);
+	}
+	
+	@Override
+	public int compareTo(AbstractEventListener o) {
+		return Integer.compare(o.getPriority(), getPriority());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/listeners/AnnotationEventListener.java b/src/main/java/com/l2jserver/gameserver/model/events/listeners/AnnotationEventListener.java
new file mode 100644
index 00000000..efd3f278
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/listeners/AnnotationEventListener.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.listeners;
+
+import java.lang.reflect.Method;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * Annotation event listener provides dynamically attached callback to any method operation with or without any return object.
+ * @author UnAfraid
+ */
+public class AnnotationEventListener extends AbstractEventListener {
+	private static final Logger LOG = LoggerFactory.getLogger(AnnotationEventListener.class);
+	
+	private final Method _callback;
+	
+	public AnnotationEventListener(ListenersContainer container, EventType type, Method callback, Object owner, int priority) {
+		super(container, type, owner);
+		_callback = callback;
+		setPriority(priority);
+	}
+	
+	@Override
+	public <R extends AbstractEventReturn> R executeEvent(BaseEvent event, Class<R> returnBackClass) {
+		try {
+			final Object result = _callback.invoke(getOwner(), event);
+			if (_callback.getReturnType() == returnBackClass) {
+				return returnBackClass.cast(result);
+			}
+		} catch (Exception e) {
+			LOG.warn("Error while invoking {} on {}", _callback.getName(), getOwner(), e);
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/listeners/ConsumerEventListener.java b/src/main/java/com/l2jserver/gameserver/model/events/listeners/ConsumerEventListener.java
new file mode 100644
index 00000000..b433cbcc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/listeners/ConsumerEventListener.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.listeners;
+
+import java.util.function.Consumer;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * Consumer event listener provides callback operation without any return object.
+ * @author UnAfraid
+ */
+public class ConsumerEventListener extends AbstractEventListener {
+	private final Consumer<BaseEvent> _callback;
+	
+	@SuppressWarnings("unchecked")
+	public ConsumerEventListener(ListenersContainer container, EventType type, Consumer<? extends BaseEvent> callback, Object owner) {
+		super(container, type, owner);
+		_callback = (Consumer<BaseEvent>) callback;
+	}
+	
+	@Override
+	public <R extends AbstractEventReturn> R executeEvent(BaseEvent event, Class<R> returnBackClass) {
+		_callback.accept(event);
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/listeners/DummyEventListener.java b/src/main/java/com/l2jserver/gameserver/model/events/listeners/DummyEventListener.java
new file mode 100644
index 00000000..f1fb9f5d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/listeners/DummyEventListener.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.listeners;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * Runnable event listener provides callback operation without any parameters and return object.
+ * @author UnAfraid
+ */
+public class DummyEventListener extends AbstractEventListener {
+	public DummyEventListener(ListenersContainer container, EventType type, Object owner) {
+		super(container, type, owner);
+	}
+	
+	@Override
+	public <R extends AbstractEventReturn> R executeEvent(BaseEvent event, Class<R> returnBackClass) {
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/listeners/FunctionEventListener.java b/src/main/java/com/l2jserver/gameserver/model/events/listeners/FunctionEventListener.java
new file mode 100644
index 00000000..f974ee8e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/listeners/FunctionEventListener.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.listeners;
+
+import java.util.function.Function;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * Function event listener provides callback operation with return object possibility.
+ * @author UnAfraid
+ */
+public class FunctionEventListener extends AbstractEventListener {
+	private static final Logger LOG = LoggerFactory.getLogger(FunctionEventListener.class);
+	
+	private final Function<BaseEvent, ? extends AbstractEventReturn> _callback;
+	
+	@SuppressWarnings("unchecked")
+	public FunctionEventListener(ListenersContainer container, EventType type, Function<? extends BaseEvent, ? extends AbstractEventReturn> callback, Object owner) {
+		super(container, type, owner);
+		_callback = (Function<BaseEvent, ? extends AbstractEventReturn>) callback;
+	}
+	
+	@Override
+	public <R extends AbstractEventReturn> R executeEvent(BaseEvent event, Class<R> returnBackClass) {
+		try {
+			return returnBackClass.cast(_callback.apply(event));
+		} catch (Exception e) {
+			LOG.warn("Error while invoking {} on {}", event, getOwner(), e);
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/listeners/RunnableEventListener.java b/src/main/java/com/l2jserver/gameserver/model/events/listeners/RunnableEventListener.java
new file mode 100644
index 00000000..353ec183
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/listeners/RunnableEventListener.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.listeners;
+
+import com.l2jserver.gameserver.model.events.EventType;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.BaseEvent;
+import com.l2jserver.gameserver.model.events.returns.AbstractEventReturn;
+
+/**
+ * Runnable event listener provides callback operation without any parameters and return object.
+ * @author UnAfraid
+ */
+public class RunnableEventListener extends AbstractEventListener {
+	private final Runnable _callback;
+	
+	public RunnableEventListener(ListenersContainer container, EventType type, Runnable callback, Object owner) {
+		super(container, type, owner);
+		_callback = callback;
+	}
+	
+	@Override
+	public <R extends AbstractEventReturn> R executeEvent(BaseEvent event, Class<R> returnBackClass) {
+		_callback.run();
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/returns/AbstractEventReturn.java b/src/main/java/com/l2jserver/gameserver/model/events/returns/AbstractEventReturn.java
new file mode 100644
index 00000000..afa3884f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/returns/AbstractEventReturn.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.returns;
+
+/**
+ * @author UnAfraid
+ */
+public abstract class AbstractEventReturn {
+	private final boolean _override;
+	private final boolean _abort;
+	
+	public AbstractEventReturn(boolean override, boolean abort) {
+		_override = override;
+		_abort = abort;
+	}
+	
+	/**
+	 * @return {@code true} if return back object must be overridden by this object, {@code false} otherwise.
+	 */
+	public boolean override() {
+		return _override;
+	}
+	
+	/**
+	 * @return {@code true} if notification has to be terminated, {@code false} otherwise.
+	 */
+	public boolean abort() {
+		return _abort;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/returns/ChatFilterReturn.java b/src/main/java/com/l2jserver/gameserver/model/events/returns/ChatFilterReturn.java
new file mode 100644
index 00000000..c1757b82
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/returns/ChatFilterReturn.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.returns;
+
+/**
+ * @author UnAfraid
+ */
+public class ChatFilterReturn extends AbstractEventReturn {
+	private final String _filteredText;
+	
+	public ChatFilterReturn(String filteredText, boolean override, boolean abort) {
+		super(override, abort);
+		_filteredText = filteredText;
+	}
+	
+	public String getFilteredText() {
+		return _filteredText;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/events/returns/TerminateReturn.java b/src/main/java/com/l2jserver/gameserver/model/events/returns/TerminateReturn.java
new file mode 100644
index 00000000..62424039
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/events/returns/TerminateReturn.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events.returns;
+
+/**
+ * @author UnAfraid
+ */
+public class TerminateReturn extends AbstractEventReturn {
+	private final boolean _terminate;
+	
+	public TerminateReturn(boolean terminate, boolean override, boolean abort) {
+		super(override, abort);
+		_terminate = terminate;
+	}
+	
+	/**
+	 * @return {@code true} if execution has to be terminated, {@code false} otherwise.
+	 */
+	public boolean terminate() {
+		return _terminate;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/fishing/L2Fish.java b/src/main/java/com/l2jserver/gameserver/model/fishing/L2Fish.java
new file mode 100644
index 00000000..03e3873a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/fishing/L2Fish.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.fishing;
+
+import com.l2jserver.gameserver.model.StatsSet;
+
+/**
+ * Class for the Fish object.
+ * @author nonom
+ */
+public class L2Fish implements Cloneable {
+	private final int _fishId;
+	private final int _itemId;
+	private final String _itemName;
+	private int _fishGroup;
+	private final int _fishLevel;
+	private final double _fishBiteRate;
+	private final double _fishGuts;
+	private final int _fishHp;
+	private final int _fishMaxLength;
+	private final double _fishLengthRate;
+	private final double _hpRegen;
+	private final int _startCombatTime;
+	private final int _combatDuration;
+	private final int _gutsCheckTime;
+	private final double _gutsCheckProbability;
+	private final double _cheatingProb;
+	private final int _fishGrade;
+	
+	public L2Fish(StatsSet set) {
+		_fishId = set.getInt("fishId");
+		_itemId = set.getInt("itemId");
+		_itemName = set.getString("itemName");
+		_fishGroup = getGroupId(set.getString("fishGroup"));
+		_fishLevel = set.getInt("fishLevel");
+		_fishBiteRate = set.getDouble("fishBiteRate"); // TODO: Support needed.
+		_fishGuts = set.getDouble("fishGuts");
+		_fishHp = set.getInt("fishHp");
+		_fishMaxLength = set.getInt("fishMaxLength"); // TODO: Support needed.
+		_fishLengthRate = set.getDouble("fishLengthRate"); // TODO: Support needed.
+		_hpRegen = set.getDouble("hpRegen");
+		_startCombatTime = set.getInt("startCombatTime");
+		_combatDuration = set.getInt("combatDuration");
+		_gutsCheckTime = set.getInt("gutsCheckTime");
+		_gutsCheckProbability = set.getDouble("gutsCheckProbability"); // TODO: Support needed.
+		_cheatingProb = set.getDouble("cheatingProb"); // TODO: Support needed.
+		_fishGrade = getGradeId(set.getString("fishGrade"));
+	}
+	
+	@Override
+	public L2Fish clone() {
+		try {
+			return (L2Fish) super.clone();
+		} catch (CloneNotSupportedException e) {
+			return null;
+		}
+	}
+	
+	/**
+	 * @return the fish Id.
+	 */
+	public int getFishId() {
+		return _fishId;
+	}
+	
+	/**
+	 * @return the fish Item Id.
+	 */
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	/**
+	 * @return the fish Item name Id.
+	 */
+	public String getItemName() {
+		return _itemName;
+	}
+	
+	/**
+	 * @return the fish Group.
+	 */
+	public int getFishGroup() {
+		return _fishGroup;
+	}
+	
+	/**
+	 * @return the fish Level.
+	 */
+	public int getFishLevel() {
+		return _fishLevel;
+	}
+	
+	/**
+	 * @return the fish Bite Rate.
+	 */
+	public double getFishBiteRate() {
+		return _fishBiteRate;
+	}
+	
+	/**
+	 * @return the fish Guts.
+	 */
+	public double getFishGuts() {
+		return _fishGuts;
+	}
+	
+	/**
+	 * @return the fish Hp.
+	 */
+	public int getFishHp() {
+		return _fishHp;
+	}
+	
+	/**
+	 * @return the fish Max length.
+	 */
+	public int getFishMaxLength() {
+		return _fishMaxLength;
+	}
+	
+	/**
+	 * @return the fish Length rate.
+	 */
+	public double getFishLengthRate() {
+		return _fishLengthRate;
+	}
+	
+	/**
+	 * @return the fish Hp regen.
+	 */
+	public double getHpRegen() {
+		return _hpRegen;
+	}
+	
+	/**
+	 * @return the fish start Combat time.
+	 */
+	public int getStartCombatTime() {
+		return _startCombatTime;
+	}
+	
+	/**
+	 * @return the fish Combat duration.
+	 */
+	public int getCombatDuration() {
+		return _combatDuration;
+	}
+	
+	/**
+	 * @return the fish Guts check time.
+	 */
+	public int getGutsCheckTime() {
+		return _gutsCheckTime;
+	}
+	
+	/**
+	 * @return the fish Guts Check probability.
+	 */
+	public double getGutsCheckProbability() {
+		return _gutsCheckProbability;
+	}
+	
+	/**
+	 * @return the fish Cheating prob.
+	 */
+	public double getCheatingProb() {
+		return _cheatingProb;
+	}
+	
+	/**
+	 * @return the fish Grade.
+	 */
+	public int getFishGrade() {
+		return _fishGrade;
+	}
+	
+	/**
+	 * @param fg the fish Group.
+	 */
+	public void setFishGroup(int fg) {
+		_fishGroup = fg;
+	}
+	
+	/**
+	 * @param name the Group Name.
+	 * @return the fish Group Id.
+	 */
+	private int getGroupId(String name) {
+		return switch (name) {
+			case "swift" -> 1;
+			case "ugly" -> 2;
+			case "fish_box" -> 3;
+			case "easy_wide" -> 4;
+			case "easy_swift" -> 5;
+			case "easy_ugly" -> 6;
+			case "hard_wide" -> 7;
+			case "hard_swift" -> 8;
+			case "hard_ugly" -> 9;
+			// FIXME: Verify the ID
+			case "hs_fish" -> 10;
+			default -> 0;
+		};
+	}
+	
+	/**
+	 * @param name the Grade Name.
+	 * @return the fish Grade Id.
+	 */
+	private int getGradeId(String name) {
+		return switch (name) {
+			case "fish_easy" -> 0;
+			case "fish_hard" -> 2;
+			default -> 1;
+		};
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java b/src/main/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java
new file mode 100644
index 00000000..a82e1dd6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java
@@ -0,0 +1,296 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.fishing;
+
+import java.util.concurrent.Future;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.FishingMonstersData;
+import com.l2jserver.gameserver.enums.audio.Music;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.AbstractScript;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExFishingHpRegen;
+import com.l2jserver.gameserver.network.serverpackets.ExFishingStartCombat;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public class L2Fishing implements Runnable {
+	private L2PcInstance _fisher;
+	private int _time;
+	private int _stop = 0;
+	private int _goodUse = 0;
+	private int _anim = 0;
+	private int _mode;
+	private int _deceptiveMode;
+	private Future<?> _fishAiTask;
+	private boolean _thinking;
+	// Fish data
+	private final int _fishId;
+	private final int _fishMaxHp;
+	private int _fishCurHp;
+	private final double _regenHp;
+	private final boolean _isUpperGrade;
+	
+	@Override
+	public void run() {
+		if (_fisher == null) {
+			return;
+		}
+		
+		if (_fishCurHp >= (_fishMaxHp * 2)) {
+			// The fish got away
+			_fisher.sendPacket(SystemMessageId.BAIT_STOLEN_BY_FISH);
+			doDie(false);
+		} else if (_time <= 0) {
+			// Time is up, so that fish got away
+			_fisher.sendPacket(SystemMessageId.FISH_SPIT_THE_HOOK);
+			doDie(false);
+		} else {
+			aiTask();
+		}
+	}
+	
+	public L2Fishing(L2PcInstance Fisher, L2Fish fish, boolean isNoob, boolean isUpperGrade) {
+		_fisher = Fisher;
+		_fishMaxHp = fish.getFishHp();
+		_fishCurHp = _fishMaxHp;
+		_regenHp = fish.getHpRegen();
+		_fishId = fish.getItemId();
+		_time = fish.getCombatDuration();
+		_isUpperGrade = isUpperGrade;
+		final int lureType;
+		if (isUpperGrade) {
+			_deceptiveMode = ((Rnd.get(100) >= 90) ? 1 : 0);
+			lureType = 2;
+		} else {
+			_deceptiveMode = 0;
+			lureType = (isNoob ? 0 : 1);
+		}
+		_mode = ((Rnd.get(100) >= 80) ? 1 : 0);
+		
+		_fisher.broadcastPacket(new ExFishingStartCombat(_fisher, _time, _fishMaxHp, _mode, lureType, _deceptiveMode));
+		_fisher.sendPacket(Music.SF_S_01.getPacket());
+		// Succeeded in getting a bite
+		_fisher.sendPacket(SystemMessageId.GOT_A_BITE);
+		
+		if (_fishAiTask == null) {
+			_fishAiTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(this, 1000, 1000);
+		}
+	}
+	
+	public void changeHp(int hp, int pen) {
+		_fishCurHp -= hp;
+		if (_fishCurHp < 0) {
+			_fishCurHp = 0;
+		}
+		
+		_fisher.broadcastPacket(new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, _goodUse, _anim, pen, _deceptiveMode));
+		_anim = 0;
+		if (_fishCurHp > (_fishMaxHp * 2)) {
+			_fishCurHp = _fishMaxHp * 2;
+			doDie(false);
+		} else if (_fishCurHp == 0) {
+			doDie(true);
+		}
+	}
+	
+	public synchronized void doDie(boolean win) {
+		if (_fishAiTask != null) {
+			_fishAiTask.cancel(false);
+			_fishAiTask = null;
+		}
+		
+		if (_fisher == null) {
+			return;
+		}
+		
+		if (win) {
+			final L2FishingMonster fishingMonster = FishingMonstersData.getInstance().getFishingMonster(_fisher.getLevel());
+			if (fishingMonster != null) {
+				if (Rnd.get(100) <= fishingMonster.getProbability()) {
+					_fisher.sendPacket(SystemMessageId.YOU_CAUGHT_SOMETHING_SMELLY_THROW_IT_BACK);
+					final L2Npc monster = AbstractScript.addSpawn(fishingMonster.getFishingMonsterId(), _fisher);
+					monster.setTarget(_fisher);
+				} else {
+					_fisher.sendPacket(SystemMessageId.YOU_CAUGHT_SOMETHING);
+					_fisher.addItem("Fishing", _fishId, 1, null, true);
+				}
+			}
+		}
+		_fisher.endFishing(win);
+		_fisher = null;
+	}
+	
+	protected void aiTask() {
+		if (_thinking) {
+			return;
+		}
+		_thinking = true;
+		_time--;
+		
+		try {
+			if (_mode == 1) {
+				if (_deceptiveMode == 0) {
+					_fishCurHp += (int) _regenHp;
+				}
+			} else {
+				if (_deceptiveMode == 1) {
+					_fishCurHp += (int) _regenHp;
+				}
+			}
+			if (_stop == 0) {
+				_stop = 1;
+				int check = Rnd.get(100);
+				if (check >= 70) {
+					_mode = _mode == 0 ? 1 : 0;
+				}
+				if (_isUpperGrade) {
+					check = Rnd.get(100);
+					if (check >= 90) {
+						_deceptiveMode = _deceptiveMode == 0 ? 1 : 0;
+					}
+				}
+			} else {
+				_stop--;
+			}
+		} finally {
+			_thinking = false;
+			ExFishingHpRegen exFishingHpRegen = new ExFishingHpRegen(_fisher, _time, _fishCurHp, _mode, 0, _anim, 0, _deceptiveMode);
+			if (_anim != 0) {
+				_fisher.broadcastPacket(exFishingHpRegen);
+			} else {
+				_fisher.sendPacket(exFishingHpRegen);
+			}
+		}
+	}
+	
+	public void useReeling(int dmg, int pen) {
+		_anim = 2;
+		if (Rnd.get(100) > 90) {
+			_fisher.sendPacket(SystemMessageId.FISH_RESISTED_ATTEMPT_TO_BRING_IT_IN);
+			_goodUse = 0;
+			changeHp(0, pen);
+			return;
+		}
+		if (_fisher == null) {
+			return;
+		}
+		if (_mode == 1) {
+			if (_deceptiveMode == 0) {
+				// Reeling is successful, Damage: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				if (pen > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1);
+					sm.addInt(pen);
+					_fisher.sendPacket(sm);
+				}
+				_goodUse = 1;
+				changeHp(dmg, pen);
+			} else {
+				// Reeling failed, Damage: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				_goodUse = 2;
+				changeHp(-dmg, pen);
+			}
+		} else {
+			if (_deceptiveMode == 0) {
+				// Reeling failed, Damage: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				_goodUse = 2;
+				changeHp(-dmg, pen);
+			} else {
+				// Reeling is successful, Damage: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				if (pen > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1);
+					sm.addInt(pen);
+					_fisher.sendPacket(sm);
+				}
+				_goodUse = 1;
+				changeHp(dmg, pen);
+			}
+		}
+	}
+	
+	public void usePumping(int dmg, int pen) {
+		_anim = 1;
+		if (Rnd.get(100) > 90) {
+			_fisher.sendPacket(SystemMessageId.FISH_RESISTED_ATTEMPT_TO_BRING_IT_IN);
+			_goodUse = 0;
+			changeHp(0, pen);
+			return;
+		}
+		if (_fisher == null) {
+			return;
+		}
+		if (_mode == 0) {
+			if (_deceptiveMode == 0) {
+				// Pumping is successful. Damage: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				if (pen > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1);
+					sm.addInt(pen);
+					_fisher.sendPacket(sm);
+				}
+				_goodUse = 1;
+				changeHp(dmg, pen);
+			} else {
+				// Pumping failed, Regained: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				_goodUse = 2;
+				changeHp(-dmg, pen);
+			}
+		} else {
+			if (_deceptiveMode == 0) {
+				// Pumping failed, Regained: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				_goodUse = 2;
+				changeHp(-dmg, pen);
+			} else {
+				// Pumping is successful. Damage: $s1
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE);
+				sm.addInt(dmg);
+				_fisher.sendPacket(sm);
+				if (pen > 0) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1);
+					sm.addInt(pen);
+					_fisher.sendPacket(sm);
+				}
+				_goodUse = 1;
+				changeHp(dmg, pen);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/fishing/L2FishingMonster.java b/src/main/java/com/l2jserver/gameserver/model/fishing/L2FishingMonster.java
new file mode 100644
index 00000000..01009f16
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/fishing/L2FishingMonster.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.fishing;
+
+import com.l2jserver.gameserver.model.StatsSet;
+
+/**
+ * Class for the Fishing Monsters object.
+ * @author nonom
+ */
+public class L2FishingMonster {
+	private final int _userMinLevel;
+	private final int _userMaxLevel;
+	private final int _fishingMonsterId;
+	private final int _probability;
+	
+	public L2FishingMonster(StatsSet set) {
+		_userMinLevel = set.getInt("userMinLevel");
+		_userMaxLevel = set.getInt("userMaxLevel");
+		_fishingMonsterId = set.getInt("fishingMonsterId");
+		_probability = set.getInt("probability");
+	}
+	
+	public int getUserMinLevel() {
+		return _userMinLevel;
+	}
+	
+	public int getUserMaxLevel() {
+		return _userMaxLevel;
+	}
+	
+	public int getFishingMonsterId() {
+		return _fishingMonsterId;
+	}
+	
+	public int getProbability() {
+		return _probability;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/fishing/L2FishingRod.java b/src/main/java/com/l2jserver/gameserver/model/fishing/L2FishingRod.java
new file mode 100644
index 00000000..4fbb01e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/fishing/L2FishingRod.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.fishing;
+
+import com.l2jserver.gameserver.model.StatsSet;
+
+/**
+ * Class for the Fishing Rod object.
+ * @author nonom
+ */
+public class L2FishingRod {
+	private final int _fishingRodId;
+	private final int _fishingRodItemId;
+	private final int _fishingRodLevel;
+	private final String _fishingRodName;
+	private final double _fishingRodDamage;
+	
+	public L2FishingRod(StatsSet set) {
+		_fishingRodId = set.getInt("fishingRodId");
+		_fishingRodItemId = set.getInt("fishingRodItemId");
+		_fishingRodLevel = set.getInt("fishingRodLevel");
+		_fishingRodName = set.getString("fishingRodName");
+		_fishingRodDamage = set.getDouble("fishingRodDamage");
+	}
+	
+	public int getFishingRodId() {
+		return _fishingRodId;
+	}
+	
+	public int getFishingRodItemId() {
+		return _fishingRodItemId;
+	}
+	
+	public int getFishingRodLevel() {
+		return _fishingRodLevel;
+	}
+	
+	public String getFishingRodItemName() {
+		return _fishingRodName;
+	}
+	
+	public double getFishingRodDamage() {
+		return _fishingRodDamage;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/AdditionalItemHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/AdditionalItemHolder.java
new file mode 100644
index 00000000..6926a02c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/AdditionalItemHolder.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+/**
+ * @author UnAfraid
+ */
+public class AdditionalItemHolder extends ItemHolder {
+	private final boolean _allowed;
+	
+	public AdditionalItemHolder(int id, boolean allowed) {
+		super(id, 0);
+		_allowed = allowed;
+	}
+	
+	public boolean isAllowedToUse() {
+		return _allowed;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/AdditionalSkillHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/AdditionalSkillHolder.java
new file mode 100644
index 00000000..a849914e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/AdditionalSkillHolder.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+/**
+ * @author UnAfraid
+ */
+public class AdditionalSkillHolder extends SkillHolder {
+	private final int _minLevel;
+	
+	public AdditionalSkillHolder(int skillId, int skillLevel, int minLevel) {
+		super(skillId, skillLevel);
+		_minLevel = minLevel;
+	}
+	
+	public int getMinLevel() {
+		return _minLevel;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/DoorRequestHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/DoorRequestHolder.java
new file mode 100644
index 00000000..66f848ba
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/DoorRequestHolder.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+/**
+ * @author UnAfraid
+ */
+public class DoorRequestHolder {
+	private final L2DoorInstance _target;
+	
+	public DoorRequestHolder(L2DoorInstance door) {
+		_target = door;
+	}
+	
+	public L2DoorInstance getDoor() {
+		return _target;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/EffectDurationHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/EffectDurationHolder.java
new file mode 100644
index 00000000..99fc0a6f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/EffectDurationHolder.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Effect duration holder.
+ * @author Zoey76
+ */
+public class EffectDurationHolder {
+	private final int _skillId;
+	private final int _skillLvl;
+	private final int _duration;
+	
+	/**
+	 * Effect duration holder constructor.
+	 * @param skill the skill to get the data
+	 * @param duration the effect duration
+	 */
+	public EffectDurationHolder(Skill skill, int duration) {
+		_skillId = skill.getDisplayId();
+		_skillLvl = skill.getDisplayLevel();
+		_duration = duration;
+	}
+	
+	/**
+	 * Get the effect's skill Id.
+	 * @return the skill Id
+	 */
+	public int getSkillId() {
+		return _skillId;
+	}
+	
+	/**
+	 * Get the effect's skill level.
+	 * @return the skill level
+	 */
+	public int getSkillLvl() {
+		return _skillLvl;
+	}
+	
+	/**
+	 * Get the effect's duration.
+	 * @return the duration in <b>seconds</b>
+	 */
+	public int getDuration() {
+		return _duration;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/InstanceReenterTimeHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/InstanceReenterTimeHolder.java
new file mode 100644
index 00000000..1f5d06ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/InstanceReenterTimeHolder.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import java.time.DayOfWeek;
+
+/**
+ * Simple class for storing Reenter Data for Instances.
+ * @author FallenAngel
+ */
+public final class InstanceReenterTimeHolder {
+	private final DayOfWeek _day;
+	private final int _hour;
+	private final int _minute;
+	private final long _time;
+	
+	public InstanceReenterTimeHolder(long time) {
+		_time = time;
+		_day = null;
+		_hour = -1;
+		_minute = -1;
+	}
+	
+	public InstanceReenterTimeHolder(DayOfWeek day, int hour, int minute) {
+		_time = -1;
+		_day = day;
+		_hour = hour;
+		_minute = minute;
+	}
+	
+	public Long getTime() {
+		return _time;
+	}
+	
+	public DayOfWeek getDay() {
+		return _day;
+	}
+	
+	public int getHour() {
+		return _hour;
+	}
+	
+	public int getMinute() {
+		return _minute;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/InvulSkillHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/InvulSkillHolder.java
new file mode 100644
index 00000000..a141f3e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/InvulSkillHolder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author UnAfraid
+ */
+public class InvulSkillHolder extends SkillHolder {
+	private final AtomicInteger _instances = new AtomicInteger(1);
+	
+	public InvulSkillHolder(int skillId, int skillLevel) {
+		super(skillId, skillLevel);
+	}
+	
+	public InvulSkillHolder(SkillHolder holder) {
+		super(holder.getSkill());
+	}
+	
+	public int getInstances() {
+		return _instances.get();
+	}
+	
+	public int increaseInstances() {
+		return _instances.incrementAndGet();
+	}
+	
+	public int decreaseInstances() {
+		return _instances.decrementAndGet();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/ItemChanceHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/ItemChanceHolder.java
new file mode 100644
index 00000000..52e93b3b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/ItemChanceHolder.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+/**
+ * A DTO for items; contains item ID, count and chance.<br>
+ * Complemented by {@link QuestItemChanceHolder}.
+ * @author xban1x
+ */
+public class ItemChanceHolder extends ItemHolder {
+	private final double _chance;
+	
+	public ItemChanceHolder(int id, double chance) {
+		this(id, chance, 1);
+	}
+	
+	public ItemChanceHolder(int id, double chance, long count) {
+		super(id, count);
+		_chance = chance;
+	}
+	
+	/**
+	 * Gets the chance.
+	 * @return the drop chance of the item contained in this object
+	 */
+	public double getChance() {
+		return _chance;
+	}
+	
+	@Override
+	public String toString() {
+		return "[" + getClass().getSimpleName() + "] ID: " + getId() + ", count: " + getCount() + ", chance: " + _chance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/ItemHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/ItemHolder.java
new file mode 100644
index 00000000..a249d1ba
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/ItemHolder.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
+/**
+ * A simple DTO for items; contains item ID and count.<br>
+ * Extended by {@link ItemChanceHolder}, {@link QuestItemChanceHolder}, {@link UniqueItemHolder}.
+ * @author UnAfraid
+ */
+public class ItemHolder implements IIdentifiable {
+	private final int _id;
+	private final long _count;
+	
+	public ItemHolder(int id, long count) {
+		_id = id;
+		_count = count;
+	}
+	
+	/**
+	 * @return the ID of the item contained in this object
+	 */
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * @return the count of items contained in this object
+	 */
+	public long getCount() {
+		return _count;
+	}
+	
+	@Override
+	public String toString() {
+		return "[" + getClass().getSimpleName() + "] ID: " + _id + ", count: " + _count;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/MinionHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/MinionHolder.java
new file mode 100644
index 00000000..4b92adec
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/MinionHolder.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+
+/**
+ * This class hold info needed for minions spawns<br>
+ * @author Zealar
+ */
+public class MinionHolder implements IIdentifiable {
+	private final int _id;
+	private final int _count;
+	private final long _respawnTime;
+	private final int _weightPoint;
+	
+	/**
+	 * Constructs a minion holder.
+	 * @param id the id
+	 * @param count the count
+	 * @param respawnTime the respawn time
+	 * @param weightPoint the weight point
+	 */
+	public MinionHolder(final int id, final int count, final long respawnTime, final int weightPoint) {
+		_id = id;
+		_count = count;
+		_respawnTime = respawnTime;
+		_weightPoint = weightPoint;
+	}
+	
+	/**
+	 * @return the Identifier of the Minion to spawn.
+	 */
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * @return the count of the Minions to spawn.
+	 */
+	public int getCount() {
+		return _count;
+	}
+	
+	/**
+	 * @return the respawn time of the Minions.
+	 */
+	public long getRespawnTime() {
+		return _respawnTime;
+	}
+	
+	/**
+	 * @return the weight point of the Minion.
+	 */
+	public int getWeightPoint() {
+		return _weightPoint;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java
new file mode 100644
index 00000000..114bd871
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/NpcRoutesHolder.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+
+/**
+ * Holds depending between NPC's spawn point and route
+ * @author GKR
+ */
+public final class NpcRoutesHolder {
+	private final Map<String, String> _correspondences;
+	
+	public NpcRoutesHolder() {
+		_correspondences = new HashMap<>();
+	}
+	
+	/**
+	 * Add correspondence between specific route and specific spawn point
+	 * @param routeName name of route
+	 * @param loc Location of spawn point
+	 */
+	public void addRoute(String routeName, Location loc) {
+		_correspondences.put(getUniqueKey(loc), routeName);
+	}
+	
+	/**
+	 * @param npc
+	 * @return route name for given NPC.
+	 */
+	public String getRouteName(L2Npc npc) {
+		if (npc.getSpawn() != null) {
+			String key = getUniqueKey(npc.getSpawn().getLocation());
+			return _correspondences.getOrDefault(key, "");
+		}
+		return "";
+	}
+	
+	/**
+	 * @param loc
+	 * @return unique text string for given Location.
+	 */
+	private String getUniqueKey(ILocational loc) {
+		return (loc.getX() + "-" + loc.getY() + "-" + loc.getZ());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/PetItemHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/PetItemHolder.java
new file mode 100644
index 00000000..801c8553
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/PetItemHolder.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author UnAfraid
+ */
+public class PetItemHolder {
+	private final L2ItemInstance _item;
+	
+	public PetItemHolder(L2ItemInstance item) {
+		_item = item;
+	}
+	
+	public L2ItemInstance getItem() {
+		return _item;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/PlayerEventHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/PlayerEventHolder.java
new file mode 100644
index 00000000..73d59f13
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/PlayerEventHolder.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Player event holder, meant for restoring player after event has finished.<br>
+ * Allows you to restore following information about player:
+ * <ul>
+ * <li>Name</li>
+ * <li>Title</li>
+ * <li>Clan</li>
+ * <li>Location</li>
+ * <li>PvP Kills</li>
+ * <li>PK Kills</li>
+ * <li>Karma</li>
+ * </ul>
+ * @author Nik
+ * @author xban1x
+ */
+public final class PlayerEventHolder {
+	private final L2PcInstance _player;
+	private final String _name;
+	private final String _title;
+	private final int _clanId;
+	private final Location _loc;
+	private final int _pvpKills;
+	private final int _pkKills;
+	private final int _karma;
+	
+	private final List<L2PcInstance> _kills = new CopyOnWriteArrayList<>();
+	private boolean _sitForced;
+	
+	public PlayerEventHolder(L2PcInstance player) {
+		this(player, false);
+	}
+	
+	public PlayerEventHolder(L2PcInstance player, boolean sitForced) {
+		_player = player;
+		_name = player.getName();
+		_title = player.getTitle();
+		_clanId = player.getClanId();
+		_loc = new Location(player);
+		_pvpKills = player.getPvpKills();
+		_pkKills = player.getPkKills();
+		_karma = player.getKarma();
+		
+		_sitForced = sitForced;
+	}
+	
+	public void restorePlayerStats() {
+		_player.setName(_name);
+		_player.setTitle(_title);
+		_player.setClan(ClanTable.getInstance().getClan(_clanId));
+		_player.teleToLocation(_loc, true);
+		_player.setPvpKills(_pvpKills);
+		_player.setPkKills(_pkKills);
+		_player.setKarma(_karma);
+		
+	}
+	
+	public void setSitForced(boolean sitForced) {
+		_sitForced = sitForced;
+	}
+	
+	public boolean isSitForced() {
+		return _sitForced;
+	}
+	
+	public List<L2PcInstance> getKills() {
+		return _kills;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/PlayerSkillHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/PlayerSkillHolder.java
new file mode 100644
index 00000000..a804f607
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/PlayerSkillHolder.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.ISkillsHolder;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author UnAfraid
+ */
+public class PlayerSkillHolder implements ISkillsHolder {
+	private final Map<Integer, Skill> _skills = new HashMap<>();
+	
+	public PlayerSkillHolder(L2PcInstance player) {
+		for (Skill skill : player.getSkills().values()) {
+			// Adding only skills that can be learned by the player.
+			if (SkillTreesData.getInstance().isSkillAllowed(player, skill)) {
+				addSkill(skill);
+			}
+		}
+	}
+	
+	/**
+	 * @return the map containing this character skills.
+	 */
+	@Override
+	public Map<Integer, Skill> getSkills() {
+		return _skills;
+	}
+	
+	/**
+	 * Add a skill to the skills map.<br>
+	 * @param skill
+	 */
+	@Override
+	public Skill addSkill(Skill skill) {
+		return _skills.put(skill.getId(), skill);
+	}
+	
+	/**
+	 * Return the level of a skill owned by the L2Character.
+	 * @param skillId The identifier of the L2Skill whose level must be returned
+	 * @return The level of the L2Skill identified by skillId
+	 */
+	@Override
+	public int getSkillLevel(int skillId) {
+		final Skill skill = getKnownSkill(skillId);
+		return (skill == null) ? -1 : skill.getLevel();
+	}
+	
+	/**
+	 * @param skillId The identifier of the L2Skill to check the knowledge
+	 * @return the skill from the known skill.
+	 */
+	@Override
+	public Skill getKnownSkill(int skillId) {
+		return _skills.get(skillId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java
new file mode 100644
index 00000000..b4ad1427
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/PunishmentHolder.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.punishment.PunishmentTask;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+
+/**
+ * @author UnAfraid
+ */
+public final class PunishmentHolder {
+	private final Map<String, Map<PunishmentType, PunishmentTask>> _holder = new ConcurrentHashMap<>();
+	
+	/**
+	 * Stores the punishment task in the Map.
+	 * @param task
+	 */
+	public void addPunishment(PunishmentTask task) {
+		if (!task.isExpired()) {
+			final String key = String.valueOf(task.getKey());
+			_holder.computeIfAbsent(key, _ -> new ConcurrentHashMap<>()).put(task.getType(), task);
+		}
+	}
+	
+	/**
+	 * Removes previously stopped task from the Map.
+	 * @param task
+	 */
+	public void stopPunishment(PunishmentTask task) {
+		String key = String.valueOf(task.getKey());
+		if (_holder.containsKey(key)) {
+			task.stopPunishment();
+			final Map<PunishmentType, PunishmentTask> punishments = _holder.get(key);
+			punishments.remove(task.getType());
+			if (punishments.isEmpty()) {
+				_holder.remove(key);
+			}
+		}
+	}
+	
+	/**
+	 * @param key
+	 * @param type
+	 * @return {@code true} if Map contains the current key and type, {@code false} otherwise.
+	 */
+	public boolean hasPunishment(String key, PunishmentType type) {
+		return getPunishment(key, type) != null;
+	}
+	
+	/**
+	 * @param key
+	 * @param type
+	 * @return {@link PunishmentTask} by specified key and type if exists, null otherwise.
+	 */
+	public PunishmentTask getPunishment(String key, PunishmentType type) {
+		if (_holder.containsKey(key)) {
+			return _holder.get(key).get(type);
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/QuestItemChanceHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/QuestItemChanceHolder.java
new file mode 100644
index 00000000..51667d6c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/QuestItemChanceHolder.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+/**
+ * A DTO for quest items; contains limit info.<br>
+ * @author xban1x
+ * @author Noé Caratini aka Kita
+ */
+public class QuestItemChanceHolder extends ItemChanceHolder {
+	private final long limit;
+	
+	public QuestItemChanceHolder(int id) {
+		this(id, 100, 1, 0);
+	}
+	
+	public QuestItemChanceHolder(int id, long limit) {
+		this(id, 100, 1, limit);
+	}
+	
+	public QuestItemChanceHolder(int id, long count, long limit) {
+		this(id, 100, count, limit);
+	}
+	
+	public QuestItemChanceHolder(int id, double chance) {
+		this(id, chance, 1, 0);
+	}
+	
+	public QuestItemChanceHolder(int id, double chance, long limit) {
+		this(id, chance, 1, limit);
+	}
+	
+	public QuestItemChanceHolder(int id, double chance, long count, long limit) {
+		super(id, chance, count);
+		this.limit = limit;
+	}
+	
+	public long getLimit() {
+		return limit;
+	}
+	
+	@Override
+	public String toString() {
+		return "[" + getClass().getSimpleName() + "] ID: " + getId() + ", count: " + getCount() + ", chance: " + getChance() + ", limit: " + getLimit();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/RangeChanceHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/RangeChanceHolder.java
new file mode 100644
index 00000000..54cfac46
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/RangeChanceHolder.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+/**
+ * @author UnAfraid
+ */
+public class RangeChanceHolder {
+	private final int _min;
+	private final int _max;
+	private final double _chance;
+	
+	public RangeChanceHolder(int min, int max, double chance) {
+		_min = min;
+		_max = max;
+		_chance = chance;
+	}
+	
+	public int getMin() {
+		return _min;
+	}
+	
+	public int getMax() {
+		return _max;
+	}
+	
+	public double getChance() {
+		return _chance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/SkillHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/SkillHolder.java
new file mode 100644
index 00000000..ad6a6307
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/SkillHolder.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Simple class for storing skill id/level.
+ * @author BiggBoss
+ */
+public class SkillHolder {
+	private final int _skillId;
+	private final int _skillLvl;
+	
+	public SkillHolder(int skillId) {
+		_skillId = skillId;
+		_skillLvl = 1;
+	}
+	
+	public SkillHolder(int skillId, int skillLvl) {
+		_skillId = skillId;
+		_skillLvl = skillLvl;
+	}
+	
+	public SkillHolder(Skill skill) {
+		_skillId = skill.getId();
+		_skillLvl = skill.getLevel();
+	}
+	
+	public final int getSkillId() {
+		return _skillId;
+	}
+	
+	public final int getSkillLvl() {
+		return _skillLvl;
+	}
+	
+	public final Skill getSkill() {
+		return SkillData.getInstance().getSkill(_skillId, Math.max(_skillLvl, 1));
+	}
+	
+	public final Skill getSkill(int levelOverride) {
+		return SkillData.getInstance().getSkill(_skillId, Math.max(levelOverride, 1));
+	}
+	
+	@Override
+	public String toString() {
+		return "[SkillId: " + _skillId + " Level: " + _skillLvl + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/SkillUseHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/SkillUseHolder.java
new file mode 100644
index 00000000..a3ffd318
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/SkillUseHolder.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author UnAfraid
+ */
+public class SkillUseHolder extends SkillHolder {
+	private final boolean _ctrlPressed;
+	private final boolean _shiftPressed;
+	
+	public SkillUseHolder(Skill skill, boolean ctrlPressed, boolean shiftPressed) {
+		super(skill);
+		_ctrlPressed = ctrlPressed;
+		_shiftPressed = shiftPressed;
+	}
+	
+	public boolean isCtrlPressed() {
+		return _ctrlPressed;
+	}
+	
+	public boolean isShiftPressed() {
+		return _shiftPressed;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/SummonRequestHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/SummonRequestHolder.java
new file mode 100644
index 00000000..4b28febb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/SummonRequestHolder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ */
+public class SummonRequestHolder {
+	private final L2PcInstance _requester;
+	private final int _itemId;
+	private final int _itemCount;
+	
+	public SummonRequestHolder(L2PcInstance requester, int itemId, int itemCount) {
+		_requester = requester;
+		_itemId = itemId;
+		_itemCount = itemCount;
+	}
+	
+	public L2PcInstance getRequester() {
+		return _requester;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	public int getItemCount() {
+		return _itemCount;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/holders/UniqueItemHolder.java b/src/main/java/com/l2jserver/gameserver/model/holders/UniqueItemHolder.java
new file mode 100644
index 00000000..488e452a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/holders/UniqueItemHolder.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.holders;
+
+import com.l2jserver.gameserver.model.interfaces.IUniqueId;
+
+/**
+ * A DTO for items; contains item ID, object ID and count.
+ * @author xban1x
+ */
+public class UniqueItemHolder extends ItemHolder implements IUniqueId {
+	private final int _objectId;
+	
+	public UniqueItemHolder(int id, int objectId) {
+		this(id, objectId, 1);
+	}
+	
+	public UniqueItemHolder(int id, int objectId, long count) {
+		super(id, count);
+		_objectId = objectId;
+	}
+	
+	@Override
+	public int getObjectId() {
+		return _objectId;
+	}
+	
+	@Override
+	public String toString() {
+		return "[" + getClass().getSimpleName() + "] ID: " + getId() + ", object ID: " + _objectId + ", count: " + getCount();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/instancezone/InstanceWorld.java b/src/main/java/com/l2jserver/gameserver/model/instancezone/InstanceWorld.java
new file mode 100644
index 00000000..bd15cd9c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/instancezone/InstanceWorld.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.instancezone;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.entity.Instance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Basic instance zone data transfer object.
+ * @author Zoey76
+ */
+public class InstanceWorld {
+	private int _instanceId;
+	private int _templateId = -1;
+	private final List<Integer> _allowed = new CopyOnWriteArrayList<>();
+	private final AtomicInteger _status = new AtomicInteger();
+	
+	public List<Integer> getAllowed() {
+		return _allowed;
+	}
+	
+	public void removeAllowed(int id) {
+		_allowed.remove(Integer.valueOf(id));
+	}
+	
+	public void addAllowed(int id) {
+		_allowed.add(id);
+	}
+	
+	public boolean isAllowed(int id) {
+		return _allowed.contains(id);
+	}
+	
+	/**
+	 * Gets the dynamically generated instance ID.
+	 * @return the instance ID
+	 */
+	public int getInstanceId() {
+		return _instanceId;
+	}
+	
+	/**
+	 * Sets the instance ID.
+	 * @param instanceId the instance ID
+	 */
+	public void setInstanceId(int instanceId) {
+		_instanceId = instanceId;
+	}
+	
+	/**
+	 * Gets the client's template instance ID.
+	 * @return the template ID
+	 */
+	public int getTemplateId() {
+		return _templateId;
+	}
+	
+	/**
+	 * Sets the template ID.
+	 * @param templateId the template ID
+	 */
+	public void setTemplateId(int templateId) {
+		_templateId = templateId;
+	}
+	
+	public int getStatus() {
+		return _status.get();
+	}
+	
+	public boolean isStatus(int status) {
+		return _status.get() == status;
+	}
+	
+	public void setStatus(int status) {
+		_status.set(status);
+	}
+	
+	public void incStatus() {
+		_status.incrementAndGet();
+	}
+	
+	/**
+	 * @param killer
+	 * @param victim
+	 */
+	public void onDeath(L2Character killer, L2Character victim) {
+		if ((victim != null) && victim.isPlayer()) {
+			final Instance instance = InstanceManager.getInstance().getInstance(getInstanceId());
+			if (instance != null) {
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_EXPELLED_IN_S1);
+				sm.addInt(instance.getEjectTime() / 60 / 1000);
+				victim.getActingPlayer().sendPacket(sm);
+				instance.addEjectDeadTask(victim.getActingPlayer());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IDecayable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IDecayable.java
new file mode 100644
index 00000000..49f2821e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IDecayable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author xban1x
+ */
+public interface IDecayable {
+	boolean decayMe();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IDeletable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IDeletable.java
new file mode 100644
index 00000000..e5139342
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IDeletable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author UnAfraid
+ */
+public interface IDeletable {
+	boolean deleteMe();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IEventListener.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IEventListener.java
new file mode 100644
index 00000000..27d96150
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IEventListener.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ */
+public interface IEventListener {
+	/**
+	 * @return {@code true} if player is on event, {@code false} otherwise.
+	 */
+	boolean isOnEvent();
+	
+	/**
+	 * @return {@code true} if player is blocked from leaving the game, {@code false} otherwise.
+	 */
+	boolean isBlockingExit();
+	
+	/**
+	 * @return {@code true} if player is blocked from receiving death penalty upon death, {@code false} otherwise.
+	 */
+	boolean isBlockingDeathPenalty();
+	
+	/**
+	 * @return {@code true} if player can revive after death, {@code false} otherwise.
+	 */
+	boolean canRevive();
+	
+	L2PcInstance getPlayer();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IIdentifiable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IIdentifiable.java
new file mode 100644
index 00000000..4d7da2c5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IIdentifiable.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * Identifiable objects interface.
+ * @author Zoey76
+ */
+public interface IIdentifiable {
+	int getId();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/ILocational.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/ILocational.java
new file mode 100644
index 00000000..2e00329e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/ILocational.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * Object world location storage interface.
+ * @author xban1x
+ */
+public interface ILocational {
+	/**
+	 * Gets the X coordinate of this object.
+	 * @return the X coordinate
+	 */
+	int getX();
+	
+	/**
+	 * Gets the Y coordinate of this object.
+	 * @return the current Y coordinate
+	 */
+	int getY();
+	
+	/**
+	 * Gets the Z coordinate of this object.
+	 * @return the current Z coordinate
+	 */
+	int getZ();
+	
+	/**
+	 * Gets the heading of this object.
+	 * @return the current heading
+	 */
+	int getHeading();
+	
+	/**
+	 * Gets the instance zone ID of this object.
+	 * @return the ID of the instance zone this object is currently in (0 - not in any instance)
+	 */
+	int getInstanceId();
+	
+	/**
+	 * Gets this object's location.
+	 * @return a {@link ILocational} object containing the current position of this object
+	 */
+	ILocational getLocation();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/INamable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/INamable.java
new file mode 100644
index 00000000..6474e566
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/INamable.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * Interface for objects with name.
+ * @author xban1x
+ */
+public interface INamable {
+	String getName();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IParserAdvUtils.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IParserAdvUtils.java
new file mode 100644
index 00000000..6e357037
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IParserAdvUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * More advanced interface for parsers.<br>
+ * Allows usage of get methods without fall back value.<br>
+ * @author xban1x
+ */
+public interface IParserAdvUtils extends IParserUtils {
+	
+	boolean getBoolean(String key);
+	
+	byte getByte(String key);
+	
+	short getShort(String key);
+	
+	int getInt(String key);
+	
+	long getLong(String key);
+	
+	float getFloat(String key);
+	
+	double getDouble(String key);
+	
+	String getString(String key);
+	
+	<T extends Enum<T>> T getEnum(String key, Class<T> clazz);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IParserUtils.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IParserUtils.java
new file mode 100644
index 00000000..ea5c3030
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IParserUtils.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * Simple interface for parser, enforces of a fall back value.<br>
+ * More suitable for developers not sure about their data.<br>
+ * @author xban1x
+ */
+public interface IParserUtils {
+	boolean getBoolean(String key, boolean defaultValue);
+	
+	byte getByte(String key, byte defaultValue);
+	
+	short getShort(String key, short defaultValue);
+	
+	int getInt(String key, int defaultValue);
+	
+	long getLong(String key, long defaultValue);
+	
+	float getFloat(String key, float defaultValue);
+	
+	double getDouble(String key, double defaultValue);
+	
+	String getString(String key, String defaultValue);
+	
+	<T extends Enum<T>> T getEnum(String key, Class<T> clazz, T defaultValue);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IPositionable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IPositionable.java
new file mode 100644
index 00000000..ca5a5a18
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IPositionable.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * Object world location storage and update interface.
+ * @author Zoey76
+ */
+public interface IPositionable extends ILocational {
+	/**
+	 * Sets the X coordinate of this object.
+	 * @param x the new X coordinate
+	 */
+	void setX(int x);
+	
+	/**
+	 * Sets the Y coordinate of this object.
+	 * @param y the new Y coordinate
+	 */
+	void setY(int y);
+	
+	/**
+	 * Sets the Z coordinate of this object.
+	 * @param z the new Z coordinate
+	 */
+	void setZ(int z);
+	
+	/**
+	 * Sets all three coordinates of this object.
+	 * @param x the new X coordinate
+	 * @param y the new Y coordinate
+	 * @param z the new Z coordinate
+	 */
+	void setXYZ(int x, int y, int z);
+	
+	/**
+	 * Sets all three coordinates of this object.
+	 * @param loc the object whose coordinates to use
+	 */
+	void setXYZ(ILocational loc);
+	
+	/**
+	 * Sets the heading of this object.
+	 * @param heading the new heading
+	 */
+	void setHeading(int heading);
+	
+	/**
+	 * Changes the instance zone ID of this object.
+	 * @param instanceId the ID of the instance zone to put this object in (0 - not in any instance)
+	 */
+	void setInstanceId(int instanceId);
+	
+	/**
+	 * Changes the location of this object.
+	 * @param loc the new location
+	 */
+	void setLocation(Location loc);
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IRestorable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IRestorable.java
new file mode 100644
index 00000000..06456fb6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IRestorable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author UnAfraid
+ */
+public interface IRestorable {
+	boolean restoreMe();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/ISkillsHolder.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/ISkillsHolder.java
new file mode 100644
index 00000000..f7dc4a34
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/ISkillsHolder.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author UnAfraid
+ */
+public interface ISkillsHolder {
+	Map<Integer, Skill> getSkills();
+	
+	Skill addSkill(Skill skill);
+	
+	Skill getKnownSkill(int skillId);
+	
+	int getSkillLevel(int skillId);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/ISpawnable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/ISpawnable.java
new file mode 100644
index 00000000..01f2890d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/ISpawnable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author UnAfraid
+ */
+public interface ISpawnable {
+	boolean spawnMe();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IStorable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IStorable.java
new file mode 100644
index 00000000..920f61b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IStorable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author UnAfraid
+ */
+public interface IStorable {
+	boolean storeMe();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IUniqueId.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IUniqueId.java
new file mode 100644
index 00000000..fdb5dce8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IUniqueId.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author xban1x
+ */
+public interface IUniqueId {
+	int getObjectId();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/interfaces/IUpdatable.java b/src/main/java/com/l2jserver/gameserver/model/interfaces/IUpdatable.java
new file mode 100644
index 00000000..a43a8546
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/interfaces/IUpdatable.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.interfaces;
+
+/**
+ * @author UnAfraid
+ */
+public interface IUpdatable {
+	boolean updateMe();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/AuctionDateGenerator.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/AuctionDateGenerator.java
new file mode 100644
index 00000000..f881ec5d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/AuctionDateGenerator.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+import java.util.Calendar;
+import java.util.concurrent.TimeUnit;
+
+import com.l2jserver.gameserver.model.StatsSet;
+
+/**
+ * @author Forsaiken
+ */
+public final class AuctionDateGenerator {
+	public static final String FIELD_INTERVAL = "interval";
+	public static final String FIELD_DAY_OF_WEEK = "day_of_week";
+	public static final String FIELD_HOUR_OF_DAY = "hour_of_day";
+	public static final String FIELD_MINUTE_OF_HOUR = "minute_of_hour";
+	
+	private static final long MILLIS_IN_WEEK = TimeUnit.MILLISECONDS.convert(7, TimeUnit.DAYS);
+	
+	private final Calendar _calendar;
+	
+	private final int _interval;
+	private int _day_of_week;
+	private int _hour_of_day;
+	private int _minute_of_hour;
+	
+	public AuctionDateGenerator(final StatsSet config) throws IllegalArgumentException {
+		_calendar = Calendar.getInstance();
+		_interval = config.getInt(FIELD_INTERVAL, -1);
+		// NC week start in Monday.
+		final int fixedDayWeek = config.getInt(FIELD_DAY_OF_WEEK, -1) + 1;
+		_day_of_week = (fixedDayWeek > 7) ? 1 : fixedDayWeek;
+		_hour_of_day = config.getInt(FIELD_HOUR_OF_DAY, -1);
+		_minute_of_hour = config.getInt(FIELD_MINUTE_OF_HOUR, -1);
+		
+		checkDayOfWeek(-1);
+		checkHourOfDay(-1);
+		checkMinuteOfHour(0);
+	}
+	
+	public synchronized long nextDate(final long date) {
+		_calendar.setTimeInMillis(date);
+		_calendar.set(Calendar.MILLISECOND, 0);
+		_calendar.set(Calendar.SECOND, 0);
+		
+		_calendar.set(Calendar.MINUTE, _minute_of_hour);
+		_calendar.set(Calendar.HOUR_OF_DAY, _hour_of_day);
+		if (_day_of_week > 0) {
+			_calendar.set(Calendar.DAY_OF_WEEK, _day_of_week);
+			return calcDestTime(_calendar.getTimeInMillis(), date, MILLIS_IN_WEEK);
+		}
+		
+		return calcDestTime(_calendar.getTimeInMillis(), date, TimeUnit.MILLISECONDS.convert(_interval, TimeUnit.DAYS));
+	}
+	
+	private long calcDestTime(long time, final long date, final long add) {
+		if (time < date) {
+			time += ((date - time) / add) * add;
+			if (time < date) {
+				time += add;
+			}
+		}
+		return time;
+	}
+	
+	private void checkDayOfWeek(final int defaultValue) {
+		if ((_day_of_week < 1) || (_day_of_week > 7)) {
+			if ((defaultValue == -1) && (_interval < 1)) {
+				throw new IllegalArgumentException("Illegal params for '" + FIELD_DAY_OF_WEEK + "': " + (_day_of_week == -1 ? "not found" : _day_of_week));
+			}
+			_day_of_week = defaultValue;
+		} else if (_interval > 1) {
+			throw new IllegalArgumentException("Illegal params for '" + FIELD_INTERVAL + "' and '" + FIELD_DAY_OF_WEEK + "': you can use only one, not both");
+		}
+	}
+	
+	private void checkHourOfDay(final int defaultValue) {
+		if ((_hour_of_day < 0) || (_hour_of_day > 23)) {
+			if (defaultValue == -1) {
+				throw new IllegalArgumentException("Illegal params for '" + FIELD_HOUR_OF_DAY + "': " + (_hour_of_day == -1 ? "not found" : _hour_of_day));
+			}
+			_hour_of_day = defaultValue;
+		}
+	}
+	
+	private void checkMinuteOfHour(final int defaultValue) {
+		if ((_minute_of_hour < 0) || (_minute_of_hour > 59)) {
+			if (defaultValue == -1) {
+				throw new IllegalArgumentException("Illegal params for '" + FIELD_MINUTE_OF_HOUR + "': " + (_minute_of_hour == -1 ? "not found" : _minute_of_hour));
+			}
+			_minute_of_hour = defaultValue;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java
new file mode 100644
index 00000000..d1dd872e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.L2Augmentation;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Forsaiken
+ */
+public final class AuctionItem {
+	private final int _auctionItemId;
+	private final int _auctionLength;
+	private final long _auctionInitBid;
+	
+	private final int _itemId;
+	private final long _itemCount;
+	private final StatsSet _itemExtra;
+	
+	public AuctionItem(final int auctionItemId, final int auctionLength, final long auctionInitBid, final int itemId, final long itemCount, final StatsSet itemExtra) {
+		_auctionItemId = auctionItemId;
+		_auctionLength = auctionLength;
+		_auctionInitBid = auctionInitBid;
+		
+		_itemId = itemId;
+		_itemCount = itemCount;
+		_itemExtra = itemExtra;
+	}
+	
+	public boolean checkItemExists() {
+		final L2Item item = ItemTable.getInstance().getTemplate(_itemId);
+		return item != null;
+	}
+	
+	public int getAuctionItemId() {
+		return _auctionItemId;
+	}
+	
+	public int getAuctionLength() {
+		return _auctionLength;
+	}
+	
+	public long getAuctionInitBid() {
+		return _auctionInitBid;
+	}
+	
+	public int getItemId() {
+		return _itemId;
+	}
+	
+	public long getItemCount() {
+		return _itemCount;
+	}
+	
+	public L2ItemInstance createNewItemInstance() {
+		final L2ItemInstance item = ItemTable.getInstance().createItem("ItemAuction", _itemId, _itemCount, null, null);
+		
+		item.setEnchantLevel(item.getDefaultEnchantLevel());
+		
+		final int augmentationId = _itemExtra.getInt("augmentation_id", 0);
+		if (augmentationId > 0) {
+			item.setAugmentation(new L2Augmentation(augmentationId));
+		}
+		
+		return item;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java
new file mode 100644
index 00000000..ac823984
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java
@@ -0,0 +1,459 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Forsaiken
+ */
+public final class ItemAuction {
+	private static final Logger LOG = LoggerFactory.getLogger(ItemAuction.class);
+	
+	private static final long ENDING_TIME_EXTEND_5 = MILLISECONDS.convert(5, MINUTES);
+	private static final long ENDING_TIME_EXTEND_3 = MILLISECONDS.convert(3, MINUTES);
+	
+	private final int _auctionId;
+	private final int _instanceId;
+	private final long _startingTime;
+	private volatile long _endingTime;
+	private final AuctionItem _auctionItem;
+	private final List<ItemAuctionBid> _auctionBids;
+	private final Object _auctionStateLock;
+	
+	private volatile ItemAuctionState _auctionState;
+	private volatile ItemAuctionExtendState _scheduledAuctionEndingExtendState;
+	private volatile ItemAuctionExtendState _auctionEndingExtendState;
+	
+	private final ItemInfo _itemInfo;
+	
+	private ItemAuctionBid _highestBid;
+	private int _lastBidPlayerObjId;
+	
+	// SQL
+	private static final String DELETE_ITEM_AUCTION_BID = "DELETE FROM item_auction_bid WHERE auctionId = ? AND playerObjId = ?";
+	private static final String INSERT_ITEM_AUCTION_BID = "INSERT INTO item_auction_bid (auctionId, playerObjId, playerBid) VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE playerBid = ?";
+	
+	public ItemAuction(final int auctionId, final int instanceId, final long startingTime, final long endingTime, final AuctionItem auctionItem) {
+		this(auctionId, instanceId, startingTime, endingTime, auctionItem, new ArrayList<>(), ItemAuctionState.CREATED);
+	}
+	
+	public ItemAuction(final int auctionId, final int instanceId, final long startingTime, final long endingTime, final AuctionItem auctionItem, final List<ItemAuctionBid> auctionBids, final ItemAuctionState auctionState) {
+		_auctionId = auctionId;
+		_instanceId = instanceId;
+		_startingTime = startingTime;
+		_endingTime = endingTime;
+		_auctionItem = auctionItem;
+		_auctionBids = auctionBids;
+		_auctionState = auctionState;
+		_auctionStateLock = new Object();
+		_scheduledAuctionEndingExtendState = ItemAuctionExtendState.INITIAL;
+		_auctionEndingExtendState = ItemAuctionExtendState.INITIAL;
+		
+		final L2ItemInstance item = _auctionItem.createNewItemInstance();
+		_itemInfo = new ItemInfo(item);
+		L2World.getInstance().removeObject(item);
+		
+		for (final ItemAuctionBid bid : _auctionBids) {
+			if ((_highestBid == null) || (_highestBid.getLastBid() < bid.getLastBid())) {
+				_highestBid = bid;
+			}
+		}
+	}
+	
+	public ItemAuctionState getAuctionState() {
+		final ItemAuctionState auctionState;
+		
+		synchronized (_auctionStateLock) {
+			auctionState = _auctionState;
+		}
+		
+		return auctionState;
+	}
+	
+	public boolean setAuctionState(final ItemAuctionState expected, final ItemAuctionState wanted) {
+		synchronized (_auctionStateLock) {
+			if (_auctionState != expected) {
+				return false;
+			}
+			
+			_auctionState = wanted;
+			storeMe();
+			return true;
+		}
+	}
+	
+	public int getAuctionId() {
+		return _auctionId;
+	}
+	
+	public int getInstanceId() {
+		return _instanceId;
+	}
+	
+	public ItemInfo getItemInfo() {
+		return _itemInfo;
+	}
+	
+	public L2ItemInstance createNewItemInstance() {
+		return _auctionItem.createNewItemInstance();
+	}
+	
+	public long getAuctionInitBid() {
+		return _auctionItem.getAuctionInitBid();
+	}
+	
+	public ItemAuctionBid getHighestBid() {
+		return _highestBid;
+	}
+	
+	public ItemAuctionExtendState getAuctionEndingExtendState() {
+		return _auctionEndingExtendState;
+	}
+	
+	public ItemAuctionExtendState getScheduledAuctionEndingExtendState() {
+		return _scheduledAuctionEndingExtendState;
+	}
+	
+	public void setScheduledAuctionEndingExtendState(ItemAuctionExtendState state) {
+		_scheduledAuctionEndingExtendState = state;
+	}
+	
+	public long getStartingTime() {
+		return _startingTime;
+	}
+	
+	public long getEndingTime() {
+		return _endingTime;
+	}
+	
+	public long getStartingTimeRemaining() {
+		return Math.max(getEndingTime() - System.currentTimeMillis(), 0L);
+	}
+	
+	public long getFinishingTimeRemaining() {
+		return Math.max(getEndingTime() - System.currentTimeMillis(), 0L);
+	}
+	
+	public void storeMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO item_auction (auctionId,instanceId,auctionItemId,startingTime,endingTime,auctionStateId) VALUES (?,?,?,?,?,?) ON DUPLICATE KEY UPDATE auctionStateId=?")) {
+			ps.setInt(1, _auctionId);
+			ps.setInt(2, _instanceId);
+			ps.setInt(3, _auctionItem.getAuctionItemId());
+			ps.setLong(4, _startingTime);
+			ps.setLong(5, _endingTime);
+			ps.setByte(6, _auctionState.getStateId());
+			ps.setByte(7, _auctionState.getStateId());
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	public int getAndSetLastBidPlayerObjectId(final int playerObjId) {
+		final int lastBid = _lastBidPlayerObjId;
+		_lastBidPlayerObjId = playerObjId;
+		return lastBid;
+	}
+	
+	private void updatePlayerBid(final ItemAuctionBid bid, final boolean delete) {
+		updatePlayerBidInternal(bid, delete);
+	}
+	
+	void updatePlayerBidInternal(final ItemAuctionBid bid, final boolean delete) {
+		final String query = delete ? DELETE_ITEM_AUCTION_BID : INSERT_ITEM_AUCTION_BID;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(query)) {
+			ps.setInt(1, _auctionId);
+			ps.setInt(2, bid.getPlayerObjId());
+			if (!delete) {
+				ps.setLong(3, bid.getLastBid());
+				ps.setLong(4, bid.getLastBid());
+			}
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	public void registerBid(final L2PcInstance player, final long newBid) {
+		if (player == null) {
+			throw new NullPointerException();
+		}
+		
+		if (newBid < getAuctionInitBid()) {
+			player.sendPacket(SystemMessageId.BID_PRICE_MUST_BE_HIGHER);
+			return;
+		}
+		
+		if (newBid > 100000000000L) {
+			player.sendPacket(SystemMessageId.BID_CANT_EXCEED_100_BILLION);
+			return;
+		}
+		
+		if (getAuctionState() != ItemAuctionState.STARTED) {
+			return;
+		}
+		
+		final int playerObjId = player.getObjectId();
+		
+		synchronized (_auctionBids) {
+			if ((_highestBid != null) && (newBid < _highestBid.getLastBid())) {
+				player.sendPacket(SystemMessageId.BID_MUST_BE_HIGHER_THAN_CURRENT_BID);
+				return;
+			}
+			
+			ItemAuctionBid bid = getBidFor(playerObjId);
+			if (bid == null) {
+				if (!reduceItemCount(player, newBid)) {
+					player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_FOR_THIS_BID);
+					return;
+				}
+				
+				bid = new ItemAuctionBid(playerObjId, newBid);
+				_auctionBids.add(bid);
+			} else {
+				if (!bid.isCanceled()) {
+					if (newBid < bid.getLastBid()) // just another check
+					{
+						player.sendPacket(SystemMessageId.BID_MUST_BE_HIGHER_THAN_CURRENT_BID);
+						return;
+					}
+					
+					if (!reduceItemCount(player, newBid - bid.getLastBid())) {
+						player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_FOR_THIS_BID);
+						return;
+					}
+				} else if (!reduceItemCount(player, newBid)) {
+					player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_FOR_THIS_BID);
+					return;
+				}
+				
+				bid.setLastBid(newBid);
+			}
+			
+			onPlayerBid(player, bid);
+			updatePlayerBid(bid, false);
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUBMITTED_A_BID_OF_S1);
+			sm.addLong(newBid);
+			player.sendPacket(sm);
+		}
+	}
+	
+	private void onPlayerBid(final L2PcInstance player, final ItemAuctionBid bid) {
+		if (_highestBid == null) {
+			_highestBid = bid;
+		} else if (_highestBid.getLastBid() < bid.getLastBid()) {
+			final L2PcInstance old = _highestBid.getPlayer();
+			if (old != null) {
+				old.sendPacket(SystemMessageId.YOU_HAVE_BEEN_OUTBID);
+			}
+			
+			_highestBid = bid;
+		}
+		
+		if ((getEndingTime() - System.currentTimeMillis()) <= (1000 * 60 * 10)) // 10 minutes
+		{
+			switch (_auctionEndingExtendState) {
+				case INITIAL: {
+					_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_5_MIN;
+					_endingTime += ENDING_TIME_EXTEND_5;
+					broadcastToAllBidders(SystemMessage.getSystemMessage(SystemMessageId.BIDDER_EXISTS_AUCTION_TIME_EXTENDED_BY_5_MINUTES));
+					break;
+				}
+				case EXTEND_BY_5_MIN: {
+					if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) {
+						_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_3_MIN;
+						_endingTime += ENDING_TIME_EXTEND_3;
+						broadcastToAllBidders(SystemMessage.getSystemMessage(SystemMessageId.BIDDER_EXISTS_AUCTION_TIME_EXTENDED_BY_3_MINUTES));
+					}
+					break;
+				}
+				case EXTEND_BY_3_MIN:
+					if (general().getItemAuctionTimeExtendsOnBid() > 0) {
+						if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) {
+							_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A;
+							_endingTime += general().getItemAuctionTimeExtendsOnBid();
+						}
+					}
+					break;
+				case EXTEND_BY_CONFIG_PHASE_A: {
+					if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) {
+						if (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) {
+							_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B;
+							_endingTime += general().getItemAuctionTimeExtendsOnBid();
+						}
+					}
+					break;
+				}
+				case EXTEND_BY_CONFIG_PHASE_B: {
+					if (getAndSetLastBidPlayerObjectId(player.getObjectId()) != player.getObjectId()) {
+						if (_scheduledAuctionEndingExtendState == ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) {
+							_endingTime += general().getItemAuctionTimeExtendsOnBid();
+							_auctionEndingExtendState = ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public void broadcastToAllBidders(final L2GameServerPacket packet) {
+		ThreadPoolManager.getInstance().executeGeneral(() -> broadcastToAllBiddersInternal(packet));
+	}
+	
+	public void broadcastToAllBiddersInternal(final L2GameServerPacket packet) {
+		for (int i = _auctionBids.size(); i-- > 0;) {
+			final ItemAuctionBid bid = _auctionBids.get(i);
+			if (bid != null) {
+				final L2PcInstance player = bid.getPlayer();
+				if (player != null) {
+					player.sendPacket(packet);
+				}
+			}
+		}
+	}
+	
+	public boolean cancelBid(final L2PcInstance player) {
+		if (player == null) {
+			throw new NullPointerException();
+		}
+		
+		switch (getAuctionState()) {
+			case CREATED -> {
+				return false;
+			}
+			case FINISHED -> {
+				if (_startingTime < (System.currentTimeMillis() - MILLISECONDS.convert(general().getItemAuctionExpiredAfter(), DAYS))) {
+					return false;
+				}
+			}
+		}
+		
+		final int playerObjId = player.getObjectId();
+		
+		synchronized (_auctionBids) {
+			if (_highestBid == null) {
+				return false;
+			}
+			
+			final int bidIndex = getBidIndexFor(playerObjId);
+			if (bidIndex == -1) {
+				return false;
+			}
+			
+			final ItemAuctionBid bid = _auctionBids.get(bidIndex);
+			if (bid.getPlayerObjId() == _highestBid.getPlayerObjId()) {
+				// can't return winning bid
+				if (getAuctionState() == ItemAuctionState.FINISHED) {
+					return false;
+				}
+				
+				player.sendPacket(SystemMessageId.HIGHEST_BID_BUT_RESERVE_NOT_MET);
+				return true;
+			}
+			
+			if (bid.isCanceled()) {
+				return false;
+			}
+			
+			increaseItemCount(player, bid.getLastBid());
+			bid.cancelBid();
+			
+			// delete bid from database if auction already finished
+			updatePlayerBid(bid, getAuctionState() == ItemAuctionState.FINISHED);
+			
+			player.sendPacket(SystemMessageId.CANCELED_BID);
+		}
+		return true;
+	}
+	
+	public void clearCanceledBids() {
+		if (getAuctionState() != ItemAuctionState.FINISHED) {
+			throw new IllegalStateException("Attempt to clear canceled bids for non-finished auction");
+		}
+		
+		synchronized (_auctionBids) {
+			for (ItemAuctionBid bid : _auctionBids) {
+				if ((bid == null) || !bid.isCanceled()) {
+					continue;
+				}
+				updatePlayerBid(bid, true);
+			}
+		}
+	}
+	
+	private boolean reduceItemCount(final L2PcInstance player, final long count) {
+		if (!player.reduceAdena("ItemAuction", count, player, true)) {
+			player.sendPacket(SystemMessageId.NOT_ENOUGH_ADENA_FOR_THIS_BID);
+			return false;
+		}
+		return true;
+	}
+	
+	private void increaseItemCount(final L2PcInstance player, final long count) {
+		player.addAdena("ItemAuction", count, player, true);
+	}
+	
+	/**
+	 * Returns the last bid for the given player or -1 if he did not made one yet.
+	 * @param player The player that made the bid
+	 * @return The last bid the player made or -1
+	 */
+	public long getLastBid(final L2PcInstance player) {
+		final ItemAuctionBid bid = getBidFor(player.getObjectId());
+		return bid != null ? bid.getLastBid() : -1L;
+	}
+	
+	public ItemAuctionBid getBidFor(final int playerObjId) {
+		final int index = getBidIndexFor(playerObjId);
+		return index != -1 ? _auctionBids.get(index) : null;
+	}
+	
+	private int getBidIndexFor(final int playerObjId) {
+		for (int i = _auctionBids.size(); i-- > 0;) {
+			final ItemAuctionBid bid = _auctionBids.get(i);
+			if ((bid != null) && (bid.getPlayerObjId() == playerObjId)) {
+				return i;
+			}
+		}
+		return -1;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionBid.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionBid.java
new file mode 100644
index 00000000..321019a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionBid.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Forsaiken
+ */
+public final class ItemAuctionBid {
+	private final int _playerObjId;
+	private long _lastBid;
+	
+	public ItemAuctionBid(final int playerObjId, final long lastBid) {
+		_playerObjId = playerObjId;
+		_lastBid = lastBid;
+	}
+	
+	public int getPlayerObjId() {
+		return _playerObjId;
+	}
+	
+	public long getLastBid() {
+		return _lastBid;
+	}
+	
+	void setLastBid(final long lastBid) {
+		_lastBid = lastBid;
+	}
+	
+	void cancelBid() {
+		_lastBid = -1;
+	}
+	
+	boolean isCanceled() {
+		return _lastBid <= 0;
+	}
+	
+	L2PcInstance getPlayer() {
+		return L2World.getInstance().getPlayer(_playerObjId);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionExtendState.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionExtendState.java
new file mode 100644
index 00000000..b72af78b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionExtendState.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+/**
+ * @author DS
+ */
+public enum ItemAuctionExtendState {
+	INITIAL,
+	EXTEND_BY_5_MIN,
+	EXTEND_BY_3_MIN,
+	EXTEND_BY_CONFIG_PHASE_A,
+	EXTEND_BY_CONFIG_PHASE_B
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java
new file mode 100644
index 00000000..768c7f27
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java
@@ -0,0 +1,505 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.MINUTES;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.instancemanager.ItemAuctionManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class ItemAuctionInstance {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(ItemAuctionInstance.class);
+	
+	private final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("HH:mm:ss dd.MM.yy");
+	
+	private static final long START_TIME_SPACE = MILLISECONDS.convert(1, MINUTES);
+	
+	private static final long FINISH_TIME_SPACE = MILLISECONDS.convert(10, MINUTES);
+	
+	// SQL queries
+	private static final String SELECT_AUCTION_ID_BY_INSTANCE_ID = "SELECT auctionId FROM item_auction WHERE instanceId = ?";
+	
+	private static final String SELECT_AUCTION_INFO = "SELECT auctionItemId, startingTime, endingTime, auctionStateId FROM item_auction WHERE auctionId = ? ";
+	
+	private static final String DELETE_AUCTION_INFO_BY_AUCTION_ID = "DELETE FROM item_auction WHERE auctionId = ?";
+	
+	private static final String DELETE_AUCTION_BID_INFO_BY_AUCTION_ID = "DELETE FROM item_auction_bid WHERE auctionId = ?";
+	
+	private static final String SELECT_PLAYERS_ID_BY_AUCTION_ID = "SELECT playerObjId, playerBid FROM item_auction_bid WHERE auctionId = ?";
+	
+	private final int _instanceId;
+	
+	private final AtomicInteger _auctionIds;
+	
+	private final Map<Integer, ItemAuction> _auctions;
+	
+	private final ArrayList<AuctionItem> _items;
+	
+	private final AuctionDateGenerator _dateGenerator;
+	
+	private ItemAuction _currentAuction;
+	
+	private ItemAuction _nextAuction;
+	
+	private ScheduledFuture<?> _stateTask;
+	
+	public ItemAuctionInstance(final int instanceId, final AtomicInteger auctionIds, final Node node) {
+		_instanceId = instanceId;
+		_auctionIds = auctionIds;
+		_auctions = new HashMap<>();
+		_items = new ArrayList<>();
+		
+		final NamedNodeMap nanode = node.getAttributes();
+		final StatsSet generatorConfig = new StatsSet();
+		for (int i = nanode.getLength(); i-- > 0;) {
+			final Node n = nanode.item(i);
+			if (n != null) {
+				generatorConfig.set(n.getNodeName(), n.getNodeValue());
+			}
+		}
+		
+		_dateGenerator = new AuctionDateGenerator(generatorConfig);
+		
+		for (Node na = node.getFirstChild(); na != null; na = na.getNextSibling()) {
+			try {
+				if ("item".equalsIgnoreCase(na.getNodeName())) {
+					final NamedNodeMap naa = na.getAttributes();
+					final int auctionItemId = Integer.parseInt(naa.getNamedItem("auctionItemId").getNodeValue());
+					final int auctionLength = Integer.parseInt(naa.getNamedItem("auctionLength").getNodeValue());
+					final long auctionInitBid = Integer.parseInt(naa.getNamedItem("auctionInitBid").getNodeValue());
+					
+					final int itemId = Integer.parseInt(naa.getNamedItem("itemId").getNodeValue());
+					final int itemCount = Integer.parseInt(naa.getNamedItem("itemCount").getNodeValue());
+					
+					if (auctionLength < 1) {
+						throw new IllegalArgumentException("auctionLength < 1 for instanceId: " + _instanceId + ", itemId " + itemId);
+					}
+					
+					final StatsSet itemExtra = new StatsSet();
+					final AuctionItem item = new AuctionItem(auctionItemId, auctionLength, auctionInitBid, itemId, itemCount, itemExtra);
+					
+					if (!item.checkItemExists()) {
+						throw new IllegalArgumentException("Item with id " + itemId + " not found");
+					}
+					
+					for (final AuctionItem tmp : _items) {
+						if (tmp.getAuctionItemId() == auctionItemId) {
+							throw new IllegalArgumentException("Duplicated auction item id " + auctionItemId);
+						}
+					}
+					
+					_items.add(item);
+					
+					for (Node nb = na.getFirstChild(); nb != null; nb = nb.getNextSibling()) {
+						if ("extra".equalsIgnoreCase(nb.getNodeName())) {
+							final NamedNodeMap nab = nb.getAttributes();
+							for (int i = nab.getLength(); i-- > 0;) {
+								final Node n = nab.item(i);
+								if (n != null) {
+									itemExtra.set(n.getNodeName(), n.getNodeValue());
+								}
+							}
+						}
+					}
+				}
+			} catch (IllegalArgumentException e) {
+				LOG.warn("Failed loading auction item!", e);
+			}
+		}
+		
+		if (_items.isEmpty()) {
+			throw new IllegalArgumentException("No items defined");
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_AUCTION_ID_BY_INSTANCE_ID)) {
+			ps.setInt(1, _instanceId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					final int auctionId = rs.getInt(1);
+					try {
+						final ItemAuction auction = loadAuction(auctionId);
+						if (auction != null) {
+							_auctions.put(auctionId, auction);
+						} else {
+							ItemAuctionManager.deleteAuction(auctionId);
+						}
+					} catch (Exception e) {
+						LOG.warn("Failed loading auction ID {}!", auctionId, e);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Error loading auctions.", e);
+			return;
+		}
+		
+		LOG.info("Loaded {} item(s) and registered {} auction(s) for NPC ID {}.", _items.size(), _auctions.size(), _instanceId);
+		checkAndSetCurrentAndNextAuction();
+	}
+	
+	public ItemAuction getCurrentAuction() {
+		return _currentAuction;
+	}
+	
+	public ItemAuction getNextAuction() {
+		return _nextAuction;
+	}
+	
+	public void shutdown() {
+		final ScheduledFuture<?> stateTask = _stateTask;
+		if (stateTask != null) {
+			stateTask.cancel(false);
+		}
+	}
+	
+	private AuctionItem getAuctionItem(final int auctionItemId) {
+		for (int i = _items.size(); i-- > 0;) {
+			final AuctionItem item = _items.get(i);
+			if (item.getAuctionItemId() == auctionItemId) {
+				return item;
+			}
+		}
+		return null;
+	}
+	
+	void checkAndSetCurrentAndNextAuction() {
+		final ItemAuction[] auctions = _auctions.values().toArray(new ItemAuction[_auctions.size()]);
+		
+		ItemAuction currentAuction = null;
+		ItemAuction nextAuction = null;
+		
+		// TODO(Zoey76): Eventually in-line n, Eclipse bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=576026
+		final var n = auctions.length;
+		switch (n) {
+			case 0 -> nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE);
+			case 1 -> {
+				switch (auctions[0].getAuctionState()) {
+					case CREATED -> {
+						if (auctions[0].getStartingTime() < (System.currentTimeMillis() + START_TIME_SPACE)) {
+							currentAuction = auctions[0];
+							nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE);
+						} else {
+							nextAuction = auctions[0];
+						}
+					}
+					case STARTED -> {
+						currentAuction = auctions[0];
+						nextAuction = createAuction(Math.max(currentAuction.getEndingTime() + FINISH_TIME_SPACE, System.currentTimeMillis() + START_TIME_SPACE));
+					}
+					case FINISHED -> {
+						currentAuction = auctions[0];
+						nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE);
+					}
+					default -> throw new IllegalArgumentException();
+				}
+			}
+			default -> {
+				Arrays.sort(auctions, Comparator.comparingLong(ItemAuction::getStartingTime).reversed());
+				
+				// just to make sure we won't skip any auction because of little different times
+				final long currentTime = System.currentTimeMillis();
+				
+				for (final ItemAuction auction : auctions) {
+					if (auction.getAuctionState() == ItemAuctionState.STARTED) {
+						currentAuction = auction;
+						break;
+					} else if (auction.getStartingTime() <= currentTime) {
+						currentAuction = auction;
+						break; // only first
+					}
+				}
+				
+				for (final ItemAuction auction : auctions) {
+					if ((auction.getStartingTime() > currentTime) && (currentAuction != auction)) {
+						nextAuction = auction;
+						break;
+					}
+				}
+				
+				if (nextAuction == null) {
+					nextAuction = createAuction(System.currentTimeMillis() + START_TIME_SPACE);
+				}
+			}
+		}
+		
+		_auctions.put(nextAuction.getAuctionId(), nextAuction);
+		
+		_currentAuction = currentAuction;
+		_nextAuction = nextAuction;
+		
+		if ((currentAuction != null) && (currentAuction.getAuctionState() != ItemAuctionState.FINISHED)) {
+			if (currentAuction.getAuctionState() == ItemAuctionState.STARTED) {
+				setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getEndingTime() - System.currentTimeMillis(), 0L)));
+			} else {
+				setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleAuctionTask(currentAuction), Math.max(currentAuction.getStartingTime() - System.currentTimeMillis(), 0L)));
+			}
+			LOG.info("Schedule current auction ID {} for NPC ID {}.", currentAuction.getAuctionId(), _instanceId);
+		} else {
+			setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleAuctionTask(nextAuction), Math.max(nextAuction.getStartingTime() - System.currentTimeMillis(), 0L)));
+			LOG.info("Schedule next auction ID {} on {} for NPC ID {}.", nextAuction.getAuctionId(), DATE_FORMAT.format(new Date(nextAuction.getStartingTime())), _instanceId);
+		}
+	}
+	
+	public ItemAuction getAuction(int auctionId) {
+		return _auctions.get(auctionId);
+	}
+	
+	public ItemAuction[] getAuctionsByBidder(int bidderObjId) {
+		final Collection<ItemAuction> auctions = getAuctions();
+		final ArrayList<ItemAuction> stack = new ArrayList<>(auctions.size());
+		for (final ItemAuction auction : getAuctions()) {
+			if (auction.getAuctionState() != ItemAuctionState.CREATED) {
+				final ItemAuctionBid bid = auction.getBidFor(bidderObjId);
+				if (bid != null) {
+					stack.add(auction);
+				}
+			}
+		}
+		return stack.toArray(new ItemAuction[stack.size()]);
+	}
+	
+	public Collection<ItemAuction> getAuctions() {
+		final Collection<ItemAuction> auctions;
+		
+		synchronized (_auctions) {
+			auctions = _auctions.values();
+		}
+		
+		return auctions;
+	}
+	
+	private class ScheduleAuctionTask implements Runnable {
+		private final Logger LOG = LoggerFactory.getLogger(ScheduleAuctionTask.class);
+		
+		private final ItemAuction _auction;
+		
+		public ScheduleAuctionTask(ItemAuction auction) {
+			_auction = auction;
+		}
+		
+		@Override
+		public final void run() {
+			try {
+				runImpl();
+			} catch (final Exception e) {
+				LOG.error("Failed scheduling auction ID {}!", _auction.getAuctionId(), e);
+			}
+		}
+		
+		private void runImpl() {
+			final ItemAuctionState state = _auction.getAuctionState();
+			switch (state) {
+				case CREATED -> {
+					if (!_auction.setAuctionState(state, ItemAuctionState.STARTED)) {
+						throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.STARTED.toString() + ", expected: " + state.toString());
+					}
+					
+					LOG.info("Auction ID {} has started for NPC ID {}.", _auction.getAuctionId(), _auction.getInstanceId());
+					checkAndSetCurrentAndNextAuction();
+				}
+				case STARTED -> {
+					switch (_auction.getAuctionEndingExtendState()) {
+						case EXTEND_BY_5_MIN -> {
+							if (_auction.getScheduledAuctionEndingExtendState() == ItemAuctionExtendState.INITIAL) {
+								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_5_MIN);
+								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								return;
+							}
+						}
+						case EXTEND_BY_3_MIN -> {
+							if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_3_MIN) {
+								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_3_MIN);
+								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								return;
+							}
+						}
+						case EXTEND_BY_CONFIG_PHASE_A -> {
+							if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B) {
+								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_B);
+								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								return;
+							}
+						}
+						case EXTEND_BY_CONFIG_PHASE_B -> {
+							if (_auction.getScheduledAuctionEndingExtendState() != ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A) {
+								_auction.setScheduledAuctionEndingExtendState(ItemAuctionExtendState.EXTEND_BY_CONFIG_PHASE_A);
+								setStateTask(ThreadPoolManager.getInstance().scheduleGeneral(this, Math.max(_auction.getEndingTime() - System.currentTimeMillis(), 0L)));
+								return;
+							}
+						}
+					}
+					
+					if (!_auction.setAuctionState(state, ItemAuctionState.FINISHED)) {
+						throw new IllegalStateException("Could not set auction state: " + ItemAuctionState.FINISHED.toString() + ", expected: " + state.toString());
+					}
+					
+					onAuctionFinished(_auction);
+					checkAndSetCurrentAndNextAuction();
+				}
+				default -> throw new IllegalStateException("Invalid state: " + state);
+			}
+		}
+	}
+	
+	void onAuctionFinished(final ItemAuction auction) {
+		auction.broadcastToAllBiddersInternal(SystemMessage.getSystemMessage(SystemMessageId.S1_AUCTION_ENDED).addInt(auction.getAuctionId()));
+		
+		final ItemAuctionBid bid = auction.getHighestBid();
+		if (bid != null) {
+			final L2ItemInstance item = auction.createNewItemInstance();
+			final L2PcInstance player = bid.getPlayer();
+			if (player != null) {
+				player.getWarehouse().addItem("ItemAuction", item, null, null);
+				player.sendPacket(SystemMessageId.WON_BID_ITEM_CAN_BE_FOUND_IN_WAREHOUSE);
+				
+				LOG.info("Auction ID {} has finished. Highest bid by {} for instance ID {}.", auction.getAuctionId(), player.getName(), _instanceId);
+			} else {
+				item.setOwnerId(bid.getPlayerObjId());
+				item.setItemLocation(ItemLocation.WAREHOUSE);
+				item.updateDatabase();
+				L2World.getInstance().removeObject(item);
+				
+				final String playerName = CharNameTable.getInstance().getNameById(bid.getPlayerObjId());
+				LOG.info("Auction ID {} has finished. Highest bid by {} for instance ID {}.", auction.getAuctionId(), playerName, _instanceId);
+			}
+			
+			// Clean all canceled bids
+			auction.clearCanceledBids();
+		} else {
+			LOG.info("Auction ID {} has finished. There have not been any bid for instance ID {}.", auction.getAuctionId(), _instanceId);
+		}
+	}
+	
+	void setStateTask(final ScheduledFuture<?> future) {
+		final ScheduledFuture<?> stateTask = _stateTask;
+		if (stateTask != null) {
+			stateTask.cancel(false);
+		}
+		
+		_stateTask = future;
+	}
+	
+	private ItemAuction createAuction(final long after) {
+		final AuctionItem auctionItem = _items.get(Rnd.get(_items.size()));
+		final long startingTime = _dateGenerator.nextDate(after);
+		final long endingTime = startingTime + TimeUnit.MILLISECONDS.convert(auctionItem.getAuctionLength(), TimeUnit.MINUTES);
+		final ItemAuction auction = new ItemAuction(_auctionIds.getAndIncrement(), _instanceId, startingTime, endingTime, auctionItem);
+		auction.storeMe();
+		return auction;
+	}
+	
+	private ItemAuction loadAuction(final int auctionId) throws Exception {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			int auctionItemId;
+			long startingTime;
+			long endingTime;
+			byte auctionStateId;
+			try (var ps = con.prepareStatement(SELECT_AUCTION_INFO)) {
+				ps.setInt(1, auctionId);
+				try (var rs = ps.executeQuery()) {
+					if (!rs.next()) {
+						LOG.warn("Auction data not found for auction ID {}!", auctionId);
+						return null;
+					}
+					auctionItemId = rs.getInt(1);
+					startingTime = rs.getLong(2);
+					endingTime = rs.getLong(3);
+					auctionStateId = rs.getByte(4);
+				}
+			}
+			
+			if (startingTime >= endingTime) {
+				LOG.warn("Invalid starting/ending parameters for auction ID {}!", auctionId);
+				return null;
+			}
+			
+			final AuctionItem auctionItem = getAuctionItem(auctionItemId);
+			if (auctionItem == null) {
+				LOG.warn("Auction item ID {} not found for auction ID {}!", auctionItemId, auctionId);
+				return null;
+			}
+			
+			final ItemAuctionState auctionState = ItemAuctionState.stateForStateId(auctionStateId);
+			if (auctionState == null) {
+				LOG.warn("Invalid auctionStateId {} for auction ID {}!", auctionStateId, auctionId);
+				return null;
+			}
+			
+			if ((auctionState == ItemAuctionState.FINISHED) && (startingTime < (System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(general().getItemAuctionExpiredAfter(), TimeUnit.DAYS)))) {
+				LOG.info("Clearing expired auction ID {}.", auctionId);
+				try (var ps = con.prepareStatement(DELETE_AUCTION_INFO_BY_AUCTION_ID)) {
+					ps.setInt(1, auctionId);
+					ps.execute();
+				}
+				
+				try (var ps = con.prepareStatement(DELETE_AUCTION_BID_INFO_BY_AUCTION_ID)) {
+					ps.setInt(1, auctionId);
+					ps.execute();
+				}
+				return null;
+			}
+			
+			final List<ItemAuctionBid> auctionBids = new ArrayList<>();
+			try (var ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) {
+				ps.setInt(1, auctionId);
+				try (var rs = ps.executeQuery()) {
+					while (rs.next()) {
+						final int playerObjId = rs.getInt(1);
+						final long playerBid = rs.getLong(2);
+						final ItemAuctionBid bid = new ItemAuctionBid(playerObjId, playerBid);
+						auctionBids.add(bid);
+					}
+				}
+			}
+			return new ItemAuction(auctionId, _instanceId, startingTime, endingTime, auctionItem, auctionBids, auctionState);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java
new file mode 100644
index 00000000..7bfc8fa1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionState.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemauction;
+
+/**
+ * @author Forsaiken
+ */
+public enum ItemAuctionState {
+	CREATED((byte) 0),
+	STARTED((byte) 1),
+	FINISHED((byte) 2);
+	
+	private final byte _stateId;
+	
+	ItemAuctionState(final byte stateId) {
+		_stateId = stateId;
+	}
+	
+	public byte getStateId() {
+		return _stateId;
+	}
+	
+	public static ItemAuctionState stateForStateId(final byte stateId) {
+		for (final ItemAuctionState state : ItemAuctionState.values()) {
+			if (state.getStateId() == stateId) {
+				return state;
+			}
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java
new file mode 100644
index 00000000..638c2013
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/ClanWarehouse.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.clanwh.PlayerClanWHItemAdd;
+import com.l2jserver.gameserver.model.events.impl.character.player.clanwh.PlayerClanWHItemDestroy;
+import com.l2jserver.gameserver.model.events.impl.character.player.clanwh.PlayerClanWHItemTransfer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class ClanWarehouse extends Warehouse {
+	private final L2Clan _clan;
+	
+	public ClanWarehouse(L2Clan clan) {
+		_clan = clan;
+	}
+	
+	@Override
+	public String getName() {
+		return "ClanWarehouse";
+	}
+	
+	@Override
+	public int getOwnerId() {
+		return _clan.getId();
+	}
+	
+	@Override
+	public L2PcInstance getOwner() {
+		return _clan.getLeader().getPlayerInstance();
+	}
+	
+	@Override
+	public ItemLocation getBaseLocation() {
+		return ItemLocation.CLANWH;
+	}
+	
+	public String getLocationId() {
+		return "0";
+	}
+	
+	public int getLocationId(boolean dummy) {
+		return 0;
+	}
+	
+	public void setLocationId(L2PcInstance dummy) {
+	}
+	
+	@Override
+	public boolean validateCapacity(long slots) {
+		return ((_items.size() + slots) <= character().getMaximumWarehouseSlotsForClan());
+	}
+	
+	@Override
+	public L2ItemInstance addItem(String process, int itemId, long count, int enchantLevel, L2PcInstance actor, Object reference) {
+		final L2ItemInstance item = super.addItem(process, itemId, count, enchantLevel, actor, reference);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanWHItemAdd(process, actor, item, this), item.getItem());
+		return item;
+	}
+	
+	@Override
+	public L2ItemInstance addItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanWHItemAdd(process, actor, item, this), item.getItem());
+		return super.addItem(process, item, actor, reference);
+	}
+	
+	@Override
+	public L2ItemInstance destroyItem(String process, L2ItemInstance item, long count, L2PcInstance actor, Object reference) {
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanWHItemDestroy(process, actor, item, count, this), item.getItem());
+		return super.destroyItem(process, item, count, actor, reference);
+	}
+	
+	@Override
+	public L2ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, L2PcInstance actor, Object reference) {
+		final L2ItemInstance item = getItemByObjectId(objectId);
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerClanWHItemTransfer(process, actor, item, count, target), item.getItem());
+		return super.transferItem(process, objectId, count, target, actor, reference);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
new file mode 100644
index 00000000..f841f8ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
@@ -0,0 +1,887 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * Inventory.
+ * @author Advi
+ * @since 2005/03/29 23:15:15
+ */
+public abstract class Inventory extends ItemContainer {
+	private static final Logger LOG = LoggerFactory.getLogger(Inventory.class);
+	
+	// Common Items
+	public static final int ADENA_ID = 57;
+	public static final int ANCIENT_ADENA_ID = 5575;
+	
+	public static final int PAPERDOLL_UNDER = 0;
+	public static final int PAPERDOLL_HEAD = 1;
+	public static final int PAPERDOLL_HAIR = 2;
+	public static final int PAPERDOLL_HAIR2 = 3;
+	public static final int PAPERDOLL_NECK = 4;
+	public static final int PAPERDOLL_RHAND = 5;
+	public static final int PAPERDOLL_CHEST = 6;
+	public static final int PAPERDOLL_LHAND = 7;
+	public static final int PAPERDOLL_REAR = 8;
+	public static final int PAPERDOLL_LEAR = 9;
+	public static final int PAPERDOLL_GLOVES = 10;
+	public static final int PAPERDOLL_LEGS = 11;
+	public static final int PAPERDOLL_FEET = 12;
+	public static final int PAPERDOLL_RFINGER = 13;
+	public static final int PAPERDOLL_LFINGER = 14;
+	public static final int PAPERDOLL_LBRACELET = 15;
+	public static final int PAPERDOLL_RBRACELET = 16;
+	public static final int PAPERDOLL_DECO1 = 17;
+	public static final int PAPERDOLL_DECO2 = 18;
+	public static final int PAPERDOLL_DECO3 = 19;
+	public static final int PAPERDOLL_DECO4 = 20;
+	public static final int PAPERDOLL_DECO5 = 21;
+	public static final int PAPERDOLL_DECO6 = 22;
+	public static final int PAPERDOLL_CLOAK = 23;
+	public static final int PAPERDOLL_BELT = 24;
+	public static final int PAPERDOLL_TOTALSLOTS = 25;
+	
+	// Speed percentage mods
+	public static final double MAX_ARMOR_WEIGHT = 12000;
+	
+	private final L2ItemInstance[] _paperdoll;
+	private final List<PaperdollListener> _paperdollListeners;
+	
+	// protected to be accessed from child classes only
+	protected int _totalWeight;
+	
+	// used to quickly check for using of items of special type
+	private int _wearedMask;
+	
+	/**
+	 * Constructor of the inventory
+	 */
+	protected Inventory() {
+		_paperdoll = new L2ItemInstance[PAPERDOLL_TOTALSLOTS];
+		_paperdollListeners = new ArrayList<>();
+		
+		// common
+		addPaperdollListener(StatsListener.getInstance());
+		
+	}
+	
+	protected abstract ItemLocation getEquipLocation();
+	
+	/**
+	 * Returns the instance of new ChangeRecorder
+	 * @return ChangeRecorder
+	 */
+	private ChangeRecorder newRecorder() {
+		return new ChangeRecorder(this);
+	}
+	
+	/**
+	 * Drop item from inventory and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be dropped
+	 * @param actor : L2PcInstance Player requesting the item drop
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	public L2ItemInstance dropItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		if (item == null) {
+			return null;
+		}
+		
+		synchronized (item) {
+			if (!_items.contains(item)) {
+				return null;
+			}
+			
+			removeItem(item);
+			item.setOwnerId(process, 0, actor, reference);
+			item.setItemLocation(ItemLocation.VOID);
+			item.setLastChange(L2ItemInstance.REMOVED);
+			
+			item.updateDatabase();
+			refreshWeight();
+		}
+		return item;
+	}
+	
+	/**
+	 * Drop item from inventory by using its <B>objectID</B> and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be dropped
+	 * @param count : int Quantity of items to be dropped
+	 * @param actor : L2PcInstance Player requesting the item drop
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	public L2ItemInstance dropItem(String process, int objectId, long count, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = getItemByObjectId(objectId);
+		if (item == null) {
+			return null;
+		}
+		
+		synchronized (item) {
+			if (!_items.contains(item)) {
+				return null;
+			}
+			
+			// Adjust item quantity and create new instance to drop
+			// Directly drop entire item
+			if (item.getCount() > count) {
+				item.changeCount(process, -count, actor, reference);
+				item.setLastChange(L2ItemInstance.MODIFIED);
+				item.updateDatabase();
+				
+				item = ItemTable.getInstance().createItem(process, item.getId(), count, actor, reference);
+				item.updateDatabase();
+				refreshWeight();
+				return item;
+			}
+		}
+		return dropItem(process, item, actor, reference);
+	}
+	
+	/**
+	 * Adds item to inventory for further adjustments and Equip it if necessary (itemlocation defined)
+	 * @param item : L2ItemInstance to be added from inventory
+	 */
+	@Override
+	protected void addItem(L2ItemInstance item) {
+		super.addItem(item);
+		if (item.isEquipped()) {
+			equipItem(item);
+		}
+	}
+	
+	/**
+	 * Removes item from inventory for further adjustments.
+	 * @param item : L2ItemInstance to be removed from inventory
+	 */
+	@Override
+	protected boolean removeItem(L2ItemInstance item) {
+		// Unequip item if equiped
+		for (int i = 0; i < _paperdoll.length; i++) {
+			if (_paperdoll[i] == item) {
+				unEquipItemInSlot(i);
+			}
+		}
+		return super.removeItem(item);
+	}
+	
+	/**
+	 * @param slot the slot.
+	 * @return the item in the paperdoll slot
+	 */
+	public L2ItemInstance getPaperdollItem(int slot) {
+		return _paperdoll[slot];
+	}
+	
+	/**
+	 * @param slot the slot.
+	 * @return {@code true} if specified paperdoll slot is empty, {@code false} otherwise
+	 */
+	public boolean isPaperdollSlotEmpty(int slot) {
+		return _paperdoll[slot] == null;
+	}
+	
+	public static int getPaperdollIndex(int slot) {
+		return switch (slot) {
+			case L2Item.SLOT_UNDERWEAR -> PAPERDOLL_UNDER;
+			case L2Item.SLOT_R_EAR -> PAPERDOLL_REAR;
+			case L2Item.SLOT_LR_EAR, L2Item.SLOT_L_EAR -> PAPERDOLL_LEAR;
+			case L2Item.SLOT_NECK -> PAPERDOLL_NECK;
+			case L2Item.SLOT_R_FINGER, L2Item.SLOT_LR_FINGER -> PAPERDOLL_RFINGER;
+			case L2Item.SLOT_L_FINGER -> PAPERDOLL_LFINGER;
+			case L2Item.SLOT_HEAD -> PAPERDOLL_HEAD;
+			case L2Item.SLOT_R_HAND, L2Item.SLOT_LR_HAND -> PAPERDOLL_RHAND;
+			case L2Item.SLOT_L_HAND -> PAPERDOLL_LHAND;
+			case L2Item.SLOT_GLOVES -> PAPERDOLL_GLOVES;
+			case L2Item.SLOT_CHEST, L2Item.SLOT_FULL_ARMOR, L2Item.SLOT_ALLDRESS -> PAPERDOLL_CHEST;
+			case L2Item.SLOT_LEGS -> PAPERDOLL_LEGS;
+			case L2Item.SLOT_FEET -> PAPERDOLL_FEET;
+			case L2Item.SLOT_BACK -> PAPERDOLL_CLOAK;
+			case L2Item.SLOT_HAIR, L2Item.SLOT_HAIRALL -> PAPERDOLL_HAIR;
+			case L2Item.SLOT_HAIR2 -> PAPERDOLL_HAIR2;
+			case L2Item.SLOT_R_BRACELET -> PAPERDOLL_RBRACELET;
+			case L2Item.SLOT_L_BRACELET -> PAPERDOLL_LBRACELET;
+			case L2Item.SLOT_DECO -> PAPERDOLL_DECO1; // return first we deal with it later
+			case L2Item.SLOT_BELT -> PAPERDOLL_BELT;
+			default -> -1;
+		};
+	}
+	
+	/**
+	 * Returns the item in the paperdoll L2Item slot
+	 * @param slot identifier
+	 * @return L2ItemInstance
+	 */
+	public L2ItemInstance getPaperdollItemByL2ItemId(int slot) {
+		int index = getPaperdollIndex(slot);
+		if (index == -1) {
+			return null;
+		}
+		return _paperdoll[index];
+	}
+	
+	/**
+	 * Returns the ID of the item in the paperdoll slot
+	 * @param slot : int designating the slot
+	 * @return int designating the ID of the item
+	 */
+	public int getPaperdollItemId(int slot) {
+		L2ItemInstance item = _paperdoll[slot];
+		if (item != null) {
+			return item.getId();
+		}
+		return 0;
+	}
+	
+	/**
+	 * Returns the ID of the item in the paperdoll slot
+	 * @param slot : int designating the slot
+	 * @return int designating the ID of the item
+	 */
+	public int getPaperdollItemDisplayId(int slot) {
+		final L2ItemInstance item = _paperdoll[slot];
+		return (item != null) ? item.getDisplayId() : 0;
+	}
+	
+	public int getPaperdollAugmentationId(int slot) {
+		final L2ItemInstance item = _paperdoll[slot];
+		return ((item != null) && (item.getAugmentation() != null)) ? item.getAugmentation().getAugmentationId() : 0;
+	}
+	
+	/**
+	 * Returns the objectID associated to the item in the paperdoll slot
+	 * @param slot : int pointing out the slot
+	 * @return int designating the objectID
+	 */
+	public int getPaperdollObjectId(int slot) {
+		final L2ItemInstance item = _paperdoll[slot];
+		return (item != null) ? item.getObjectId() : 0;
+	}
+	
+	/**
+	 * Adds new inventory's paperdoll listener.
+	 * @param listener the new listener
+	 */
+	public synchronized void addPaperdollListener(PaperdollListener listener) {
+		assert !_paperdollListeners.contains(listener);
+		_paperdollListeners.add(listener);
+	}
+	
+	/**
+	 * Removes a paperdoll listener.
+	 * @param listener the listener to be deleted
+	 */
+	public synchronized void removePaperdollListener(PaperdollListener listener) {
+		_paperdollListeners.remove(listener);
+	}
+	
+	/**
+	 * Equips an item in the given slot of the paperdoll.<br>
+	 * <U><I>Remark :</I></U> The item <B>must be</B> in the inventory already.
+	 * @param slot : int pointing out the slot of the paperdoll
+	 * @param item : L2ItemInstance pointing out the item to add in slot
+	 * @return L2ItemInstance designating the item placed in the slot before
+	 */
+	public synchronized L2ItemInstance setPaperdollItem(int slot, L2ItemInstance item) {
+		L2ItemInstance old = _paperdoll[slot];
+		if (old != item) {
+			if (old != null) {
+				_paperdoll[slot] = null;
+				// Put old item from paperdoll slot to base location
+				old.setItemLocation(getBaseLocation());
+				old.setLastChange(L2ItemInstance.MODIFIED);
+				// Get the mask for paperdoll
+				int mask = 0;
+				for (int i = 0; i < PAPERDOLL_TOTALSLOTS; i++) {
+					L2ItemInstance pi = _paperdoll[i];
+					if (pi != null) {
+						mask |= pi.getItem().getItemMask();
+					}
+				}
+				_wearedMask = mask;
+				// Notify all paperdoll listener in order to unequip old item in slot
+				for (PaperdollListener listener : _paperdollListeners) {
+					if (listener == null) {
+						continue;
+					}
+					
+					listener.notifyUnequiped(slot, old, this);
+				}
+				old.updateDatabase();
+			}
+			// Add new item in slot of paperdoll
+			if (item != null) {
+				_paperdoll[slot] = item;
+				item.setItemLocation(getEquipLocation(), slot);
+				item.setLastChange(L2ItemInstance.MODIFIED);
+				_wearedMask |= item.getItem().getItemMask();
+				for (PaperdollListener listener : _paperdollListeners) {
+					if (listener == null) {
+						continue;
+					}
+					
+					listener.notifyEquiped(slot, item, this);
+				}
+				item.updateDatabase();
+			}
+		}
+		return old;
+	}
+	
+	/**
+	 * @return the mask of wore item
+	 */
+	public int getWearedMask() {
+		return _wearedMask;
+	}
+	
+	public int getSlotFromItem(L2ItemInstance item) {
+		int slot = -1;
+		final int location = item.getLocationSlot();
+		switch (location) {
+			case PAPERDOLL_UNDER -> slot = L2Item.SLOT_UNDERWEAR;
+			case PAPERDOLL_LEAR -> slot = L2Item.SLOT_L_EAR;
+			case PAPERDOLL_REAR -> slot = L2Item.SLOT_R_EAR;
+			case PAPERDOLL_NECK -> slot = L2Item.SLOT_NECK;
+			case PAPERDOLL_RFINGER -> slot = L2Item.SLOT_R_FINGER;
+			case PAPERDOLL_LFINGER -> slot = L2Item.SLOT_L_FINGER;
+			case PAPERDOLL_HAIR -> slot = L2Item.SLOT_HAIR;
+			case PAPERDOLL_HAIR2 -> slot = L2Item.SLOT_HAIR2;
+			case PAPERDOLL_HEAD -> slot = L2Item.SLOT_HEAD;
+			case PAPERDOLL_RHAND -> slot = L2Item.SLOT_R_HAND;
+			case PAPERDOLL_LHAND -> slot = L2Item.SLOT_L_HAND;
+			case PAPERDOLL_GLOVES -> slot = L2Item.SLOT_GLOVES;
+			case PAPERDOLL_CHEST -> slot = item.getItem().getBodyPart();
+			case PAPERDOLL_LEGS -> slot = L2Item.SLOT_LEGS;
+			case PAPERDOLL_CLOAK -> slot = L2Item.SLOT_BACK;
+			case PAPERDOLL_FEET -> slot = L2Item.SLOT_FEET;
+			case PAPERDOLL_LBRACELET -> slot = L2Item.SLOT_L_BRACELET;
+			case PAPERDOLL_RBRACELET -> slot = L2Item.SLOT_R_BRACELET;
+			case PAPERDOLL_DECO1, PAPERDOLL_DECO2, PAPERDOLL_DECO3, PAPERDOLL_DECO4, PAPERDOLL_DECO5, PAPERDOLL_DECO6 -> slot = L2Item.SLOT_DECO;
+			case PAPERDOLL_BELT -> slot = L2Item.SLOT_BELT;
+		}
+		return slot;
+	}
+	
+	/**
+	 * Unequips item in body slot and returns alterations.<BR>
+	 * <B>If you dont need return value use {@link Inventory#unEquipItemInBodySlot(int)} instead</B>
+	 * @param slot : int designating the slot of the paperdoll
+	 * @return L2ItemInstance[] : list of changes
+	 */
+	public L2ItemInstance[] unEquipItemInBodySlotAndRecord(int slot) {
+		Inventory.ChangeRecorder recorder = newRecorder();
+		
+		try {
+			unEquipItemInBodySlot(slot);
+		} finally {
+			removePaperdollListener(recorder);
+		}
+		return recorder.getChangedItems();
+	}
+	
+	/**
+	 * Sets item in slot of the paperdoll to null value
+	 * @param pdollSlot : int designating the slot
+	 * @return L2ItemInstance designating the item in slot before change
+	 */
+	public L2ItemInstance unEquipItemInSlot(int pdollSlot) {
+		return setPaperdollItem(pdollSlot, null);
+	}
+	
+	/**
+	 * Unequips item in slot and returns alterations<BR>
+	 * <B>If you dont need return value use {@link Inventory#unEquipItemInSlot(int)} instead</B>
+	 * @param slot : int designating the slot
+	 * @return L2ItemInstance[] : list of items altered
+	 */
+	public L2ItemInstance[] unEquipItemInSlotAndRecord(int slot) {
+		Inventory.ChangeRecorder recorder = newRecorder();
+		
+		try {
+			unEquipItemInSlot(slot);
+			if (getOwner() instanceof L2PcInstance) {
+				((L2PcInstance) getOwner()).refreshExpertisePenalty();
+			}
+		} finally {
+			removePaperdollListener(recorder);
+		}
+		return recorder.getChangedItems();
+	}
+	
+	/**
+	 * Unequips item in slot (i.e. equips with default value)
+	 * @param slot : int designating the slot
+	 * @return {@link L2ItemInstance} designating the item placed in the slot
+	 */
+	public L2ItemInstance unEquipItemInBodySlot(int slot) {
+		if (general().debug()) {
+			LOG.info("Unequip body slot: {}", slot);
+		}
+		
+		int pdollSlot = -1;
+		
+		switch (slot) {
+			case L2Item.SLOT_L_EAR -> pdollSlot = PAPERDOLL_LEAR;
+			case L2Item.SLOT_R_EAR -> pdollSlot = PAPERDOLL_REAR;
+			case L2Item.SLOT_NECK -> pdollSlot = PAPERDOLL_NECK;
+			case L2Item.SLOT_R_FINGER -> pdollSlot = PAPERDOLL_RFINGER;
+			case L2Item.SLOT_L_FINGER -> pdollSlot = PAPERDOLL_LFINGER;
+			case L2Item.SLOT_HAIR -> pdollSlot = PAPERDOLL_HAIR;
+			case L2Item.SLOT_HAIR2 -> pdollSlot = PAPERDOLL_HAIR2;
+			case L2Item.SLOT_HAIRALL -> {
+				setPaperdollItem(PAPERDOLL_HAIR, null);
+				pdollSlot = PAPERDOLL_HAIR;
+			}
+			case L2Item.SLOT_HEAD -> pdollSlot = PAPERDOLL_HEAD;
+			case L2Item.SLOT_R_HAND, L2Item.SLOT_LR_HAND -> pdollSlot = PAPERDOLL_RHAND;
+			case L2Item.SLOT_L_HAND -> pdollSlot = PAPERDOLL_LHAND;
+			case L2Item.SLOT_GLOVES -> pdollSlot = PAPERDOLL_GLOVES;
+			case L2Item.SLOT_CHEST, L2Item.SLOT_ALLDRESS, L2Item.SLOT_FULL_ARMOR -> pdollSlot = PAPERDOLL_CHEST;
+			case L2Item.SLOT_LEGS -> pdollSlot = PAPERDOLL_LEGS;
+			case L2Item.SLOT_BACK -> pdollSlot = PAPERDOLL_CLOAK;
+			case L2Item.SLOT_FEET -> pdollSlot = PAPERDOLL_FEET;
+			case L2Item.SLOT_UNDERWEAR -> pdollSlot = PAPERDOLL_UNDER;
+			case L2Item.SLOT_L_BRACELET -> pdollSlot = PAPERDOLL_LBRACELET;
+			case L2Item.SLOT_R_BRACELET -> pdollSlot = PAPERDOLL_RBRACELET;
+			case L2Item.SLOT_DECO -> pdollSlot = PAPERDOLL_DECO1;
+			case L2Item.SLOT_BELT -> pdollSlot = PAPERDOLL_BELT;
+			default -> {
+				LOG.info("Unhandled slot type: {}", slot);
+				LOG.info(StringUtil.getTraceString(Thread.currentThread().getStackTrace()));
+			}
+		}
+		if (pdollSlot >= 0) {
+			L2ItemInstance old = setPaperdollItem(pdollSlot, null);
+			if (old != null) {
+				if (getOwner() instanceof L2PcInstance) {
+					((L2PcInstance) getOwner()).refreshExpertisePenalty();
+				}
+			}
+			return old;
+		}
+		return null;
+	}
+	
+	/**
+	 * Equips item and returns list of alterations<BR>
+	 * <B>If you don't need return value use {@link Inventory#equipItem(L2ItemInstance)} instead</B>
+	 * @param item : L2ItemInstance corresponding to the item
+	 * @return L2ItemInstance[] : list of alterations
+	 */
+	public L2ItemInstance[] equipItemAndRecord(L2ItemInstance item) {
+		Inventory.ChangeRecorder recorder = newRecorder();
+		
+		try {
+			equipItem(item);
+		} finally {
+			removePaperdollListener(recorder);
+		}
+		return recorder.getChangedItems();
+	}
+	
+	/**
+	 * Equips item in slot of paperdoll.
+	 * @param item : L2ItemInstance designating the item and slot used.
+	 */
+	public void equipItem(L2ItemInstance item) {
+		if ((getOwner() instanceof L2PcInstance player) && (player.getPrivateStoreType() != PrivateStoreType.NONE)) {
+			return;
+		}
+		
+		if (getOwner() instanceof L2PcInstance player) {
+			if (!player.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem()) {
+				return;
+			}
+		}
+		
+		int targetSlot = item.getItem().getBodyPart();
+		
+		// Check if player is using Formal Wear and item isn't Wedding Bouquet.
+		L2ItemInstance formal = getPaperdollItem(PAPERDOLL_CHEST);
+		if ((item.getId() != 21163) && (formal != null) && (formal.getItem().getBodyPart() == L2Item.SLOT_ALLDRESS)) {
+			// only chest target can pass this
+			switch (targetSlot) {
+				case L2Item.SLOT_LR_HAND:
+				case L2Item.SLOT_L_HAND:
+				case L2Item.SLOT_R_HAND:
+				case L2Item.SLOT_LEGS:
+				case L2Item.SLOT_FEET:
+				case L2Item.SLOT_GLOVES:
+				case L2Item.SLOT_HEAD:
+					return;
+			}
+		}
+		
+		switch (targetSlot) {
+			case L2Item.SLOT_LR_HAND -> {
+				setPaperdollItem(PAPERDOLL_LHAND, null);
+				setPaperdollItem(PAPERDOLL_RHAND, item);
+			}
+			case L2Item.SLOT_L_HAND -> {
+				L2ItemInstance rh = getPaperdollItem(PAPERDOLL_RHAND);
+				if ((rh != null) && (rh.getItem().getBodyPart() == L2Item.SLOT_LR_HAND)
+					&& !(((rh.getItemType() == WeaponType.BOW) && (item.getItemType() == EtcItemType.ARROW)) || ((rh.getItemType() == WeaponType.CROSSBOW) && (item.getItemType() == EtcItemType.BOLT)) || ((rh.getItemType() == WeaponType.FISHINGROD) && (item.getItemType() == EtcItemType.LURE)))) {
+					setPaperdollItem(PAPERDOLL_RHAND, null);
+				}
+				
+				setPaperdollItem(PAPERDOLL_LHAND, item);
+			}
+			case L2Item.SLOT_R_HAND -> {
+				// don't care about arrows, listener will unequip them (hopefully)
+				setPaperdollItem(PAPERDOLL_RHAND, item);
+			}
+			case L2Item.SLOT_L_EAR, L2Item.SLOT_R_EAR, L2Item.SLOT_LR_EAR -> {
+				if (_paperdoll[PAPERDOLL_LEAR] == null) {
+					setPaperdollItem(PAPERDOLL_LEAR, item);
+				} else if (_paperdoll[PAPERDOLL_REAR] == null) {
+					setPaperdollItem(PAPERDOLL_REAR, item);
+				} else {
+					setPaperdollItem(PAPERDOLL_LEAR, item);
+				}
+			}
+			case L2Item.SLOT_L_FINGER, L2Item.SLOT_R_FINGER, L2Item.SLOT_LR_FINGER -> {
+				if (_paperdoll[PAPERDOLL_LFINGER] == null) {
+					setPaperdollItem(PAPERDOLL_LFINGER, item);
+				} else if (_paperdoll[PAPERDOLL_RFINGER] == null) {
+					setPaperdollItem(PAPERDOLL_RFINGER, item);
+				} else {
+					setPaperdollItem(PAPERDOLL_LFINGER, item);
+				}
+			}
+			case L2Item.SLOT_NECK -> setPaperdollItem(PAPERDOLL_NECK, item);
+			case L2Item.SLOT_FULL_ARMOR -> {
+				setPaperdollItem(PAPERDOLL_LEGS, null);
+				setPaperdollItem(PAPERDOLL_CHEST, item);
+			}
+			case L2Item.SLOT_CHEST -> setPaperdollItem(PAPERDOLL_CHEST, item);
+			case L2Item.SLOT_LEGS -> {
+				// handle full armor
+				L2ItemInstance chest = getPaperdollItem(PAPERDOLL_CHEST);
+				if ((chest != null) && (chest.getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR)) {
+					setPaperdollItem(PAPERDOLL_CHEST, null);
+				}
+				
+				setPaperdollItem(PAPERDOLL_LEGS, item);
+			}
+			case L2Item.SLOT_FEET -> setPaperdollItem(PAPERDOLL_FEET, item);
+			case L2Item.SLOT_GLOVES -> setPaperdollItem(PAPERDOLL_GLOVES, item);
+			case L2Item.SLOT_HEAD -> setPaperdollItem(PAPERDOLL_HEAD, item);
+			case L2Item.SLOT_HAIR -> {
+				L2ItemInstance hair = getPaperdollItem(PAPERDOLL_HAIR);
+				if ((hair != null) && (hair.getItem().getBodyPart() == L2Item.SLOT_HAIRALL)) {
+					setPaperdollItem(PAPERDOLL_HAIR2, null);
+				} else {
+					setPaperdollItem(PAPERDOLL_HAIR, null);
+				}
+				setPaperdollItem(PAPERDOLL_HAIR, item);
+			}
+			case L2Item.SLOT_HAIR2 -> {
+				L2ItemInstance hair2 = getPaperdollItem(PAPERDOLL_HAIR);
+				if ((hair2 != null) && (hair2.getItem().getBodyPart() == L2Item.SLOT_HAIRALL)) {
+					setPaperdollItem(PAPERDOLL_HAIR, null);
+				} else {
+					setPaperdollItem(PAPERDOLL_HAIR2, null);
+				}
+				setPaperdollItem(PAPERDOLL_HAIR2, item);
+			}
+			case L2Item.SLOT_HAIRALL -> {
+				setPaperdollItem(PAPERDOLL_HAIR2, null);
+				setPaperdollItem(PAPERDOLL_HAIR, item);
+			}
+			case L2Item.SLOT_UNDERWEAR -> setPaperdollItem(PAPERDOLL_UNDER, item);
+			case L2Item.SLOT_BACK -> setPaperdollItem(PAPERDOLL_CLOAK, item);
+			case L2Item.SLOT_L_BRACELET -> setPaperdollItem(PAPERDOLL_LBRACELET, item);
+			case L2Item.SLOT_R_BRACELET -> setPaperdollItem(PAPERDOLL_RBRACELET, item);
+			case L2Item.SLOT_DECO -> equipTalisman(item);
+			case L2Item.SLOT_BELT -> setPaperdollItem(PAPERDOLL_BELT, item);
+			case L2Item.SLOT_ALLDRESS -> {
+				setPaperdollItem(PAPERDOLL_LEGS, null);
+				setPaperdollItem(PAPERDOLL_LHAND, null);
+				setPaperdollItem(PAPERDOLL_RHAND, null);
+				setPaperdollItem(PAPERDOLL_RHAND, null);
+				setPaperdollItem(PAPERDOLL_LHAND, null);
+				setPaperdollItem(PAPERDOLL_HEAD, null);
+				setPaperdollItem(PAPERDOLL_FEET, null);
+				setPaperdollItem(PAPERDOLL_GLOVES, null);
+				setPaperdollItem(PAPERDOLL_CHEST, item);
+			}
+			default -> LOG.warn("Unknown body slot {} for Item ID:{}", targetSlot, item.getId());
+		}
+	}
+	
+	/**
+	 * Refresh the weight of equipment loaded
+	 */
+	@Override
+	protected void refreshWeight() {
+		long weight = 0;
+		
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getItem() != null)) {
+				weight += item.getItem().getWeight() * item.getCount();
+			}
+		}
+		_totalWeight = (int) Math.min(weight, Integer.MAX_VALUE);
+	}
+	
+	/**
+	 * @return the totalWeight.
+	 */
+	public int getTotalWeight() {
+		return _totalWeight;
+	}
+	
+	/**
+	 * Return the L2ItemInstance of the arrows needed for this bow.
+	 * @param bow : L2Item designating the bow
+	 * @return L2ItemInstance pointing out arrows for bow
+	 */
+	public L2ItemInstance findArrowForBow(L2Item bow) {
+		if (bow == null) {
+			return null;
+		}
+		
+		L2ItemInstance arrow = null;
+		
+		for (L2ItemInstance item : getItems()) {
+			if (item.isEtcItem() && (item.getItem().getItemGradeSPlus() == bow.getItemGradeSPlus()) && (item.getEtcItem().getItemType() == EtcItemType.ARROW)) {
+				arrow = item;
+				break;
+			}
+		}
+		
+		// Get the L2ItemInstance corresponding to the item identifier and return it
+		return arrow;
+	}
+	
+	/**
+	 * Return the L2ItemInstance of the bolts needed for this crossbow.
+	 * @param crossbow : L2Item designating the crossbow
+	 * @return L2ItemInstance pointing out bolts for crossbow
+	 */
+	public L2ItemInstance findBoltForCrossBow(L2Item crossbow) {
+		L2ItemInstance bolt = null;
+		
+		for (L2ItemInstance item : getItems()) {
+			if (item.isEtcItem() && (item.getItem().getItemGradeSPlus() == crossbow.getItemGradeSPlus()) && (item.getEtcItem().getItemType() == EtcItemType.BOLT)) {
+				bolt = item;
+				break;
+			}
+		}
+		
+		// Get the L2ItemInstance corresponding to the item identifier and return it
+		return bolt;
+	}
+	
+	/**
+	 * Get back items in inventory from database
+	 */
+	@Override
+	public void restore() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT object_id, item_id, count, enchant_level, loc, loc_data, custom_type1, custom_type2, mana_left, time, agathion_energy FROM items WHERE owner_id=? AND (loc=? OR loc=?) ORDER BY loc_data")) {
+			ps.setInt(1, getOwnerId());
+			ps.setString(2, getBaseLocation().name());
+			ps.setString(3, getEquipLocation().name());
+			try (var inv = ps.executeQuery()) {
+				L2ItemInstance item;
+				while (inv.next()) {
+					item = L2ItemInstance.restoreFromDb(getOwnerId(), inv);
+					if (item == null) {
+						continue;
+					}
+					
+					if (getOwner() instanceof L2PcInstance player) {
+						if (!player.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !player.isHero() && item.isHeroItem()) {
+							item.setItemLocation(ItemLocation.INVENTORY);
+						}
+					}
+					
+					L2World.getInstance().storeObject(item);
+					
+					// If stackable item is found in inventory just add to current quantity
+					if (item.isStackable() && (getItemByItemId(item.getId()) != null)) {
+						addItem("Restore", item, getOwner().getActingPlayer(), null);
+					} else {
+						addItem(item);
+					}
+				}
+			}
+			refreshWeight();
+		} catch (Exception e) {
+			LOG.warn("Could not restore inventory: {}", e.getMessage(), e);
+		}
+	}
+	
+	public int getTalismanSlots() {
+		return getOwner().getActingPlayer().getStat().getTalismanSlots();
+	}
+	
+	private void equipTalisman(L2ItemInstance item) {
+		if (getTalismanSlots() == 0) {
+			return;
+		}
+		
+		// find same (or incompatible) talisman type
+		for (int i = PAPERDOLL_DECO1; i < (PAPERDOLL_DECO1 + getTalismanSlots()); i++) {
+			if (_paperdoll[i] != null) {
+				if (getPaperdollItemId(i) == item.getId()) {
+					// overwrite
+					setPaperdollItem(i, item);
+					return;
+				}
+			}
+		}
+		
+		// no free slot found - put on first free
+		for (int i = PAPERDOLL_DECO1; i < (PAPERDOLL_DECO1 + getTalismanSlots()); i++) {
+			if (_paperdoll[i] == null) {
+				setPaperdollItem(i, item);
+				return;
+			}
+		}
+		
+		// no free slots - put on first
+		setPaperdollItem(PAPERDOLL_DECO1, item);
+	}
+	
+	public boolean canEquipCloak() {
+		return getOwner().getActingPlayer().getStat().canEquipCloak();
+	}
+	
+	/**
+	 * Re-notify to paperdoll listeners every equipped item
+	 */
+	public void reloadEquippedItems() {
+		int slot;
+		
+		for (L2ItemInstance item : _paperdoll) {
+			if (item == null) {
+				continue;
+			}
+			
+			slot = item.getLocationSlot();
+			
+			for (PaperdollListener listener : _paperdollListeners) {
+				if (listener == null) {
+					continue;
+				}
+				
+				listener.notifyUnequiped(slot, item, this);
+				listener.notifyEquiped(slot, item, this);
+			}
+		}
+	}
+	
+	public interface PaperdollListener {
+		void notifyEquiped(int slot, L2ItemInstance inst, Inventory inventory);
+		
+		void notifyUnequiped(int slot, L2ItemInstance inst, Inventory inventory);
+	}
+	
+	// Recorder of alterations in inventory
+	private static final class ChangeRecorder implements PaperdollListener {
+		private final List<L2ItemInstance> _changed;
+		
+		/**
+		 * Constructor of the ChangeRecorder
+		 * @param inventory
+		 */
+		ChangeRecorder(Inventory inventory) {
+			_changed = new ArrayList<>();
+			inventory.addPaperdollListener(this);
+		}
+		
+		/**
+		 * Add alteration in inventory when item equipped
+		 * @param slot
+		 * @param item
+		 * @param inventory
+		 */
+		@Override
+		public void notifyEquiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (!_changed.contains(item)) {
+				_changed.add(item);
+			}
+		}
+		
+		/**
+		 * Add alteration in inventory when item unequipped
+		 * @param slot
+		 * @param item
+		 * @param inventory
+		 */
+		@Override
+		public void notifyUnequiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (!_changed.contains(item)) {
+				_changed.add(item);
+			}
+		}
+		
+		/**
+		 * Returns alterations in inventory
+		 * @return L2ItemInstance[] : array of altered items
+		 */
+		public L2ItemInstance[] getChangedItems() {
+			return _changed.toArray(new L2ItemInstance[0]);
+		}
+	}
+	
+	private static final class StatsListener implements PaperdollListener {
+		private static final StatsListener instance = new StatsListener();
+		
+		public static StatsListener getInstance() {
+			return instance;
+		}
+		
+		@Override
+		public void notifyUnequiped(int slot, L2ItemInstance item, Inventory inventory) {
+			inventory.getOwner().removeStatsOwner(item);
+		}
+		
+		@Override
+		public void notifyEquiped(int slot, L2ItemInstance item, Inventory inventory) {
+			inventory.getOwner().addStatFuncs(item.getStatFuncs(inventory.getOwner()));
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java
new file mode 100644
index 00000000..b30d4668
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java
@@ -0,0 +1,628 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Advi
+ */
+public abstract class ItemContainer {
+	private static final Logger LOG = LoggerFactory.getLogger(ItemContainer.class);
+	
+	protected final List<L2ItemInstance> _items = new CopyOnWriteArrayList<>();
+	
+	protected ItemContainer() {
+	}
+	
+	protected abstract L2Character getOwner();
+	
+	protected abstract ItemLocation getBaseLocation();
+	
+	public String getName() {
+		return "ItemContainer";
+	}
+	
+	/**
+	 * @return int the owner object Id
+	 */
+	public int getOwnerId() {
+		return getOwner() == null ? 0 : getOwner().getObjectId();
+	}
+	
+	/**
+	 * @return the quantity of items in the inventory
+	 */
+	public int getSize() {
+		return _items.size();
+	}
+	
+	/**
+	 * @return the items in inventory
+	 */
+	public L2ItemInstance[] getItems() {
+		return _items.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * @param itemId the item Id
+	 * @return the item from inventory by itemId
+	 */
+	public L2ItemInstance getItemByItemId(int itemId) {
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getId() == itemId)) {
+				return item;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @return true if player got item for self resurrection
+	 */
+	public final boolean haveItemForSelfResurrection() {
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getItem().isAllowSelfResurrection())) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @param itemId the item Id
+	 * @return the items list from inventory by using its itemId
+	 */
+	public List<L2ItemInstance> getItemsByItemId(int itemId) {
+		final List<L2ItemInstance> returnList = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getId() == itemId)) {
+				returnList.add(item);
+			}
+		}
+		return returnList;
+	}
+	
+	/**
+	 * @param itemId the item Id
+	 * @param itemToIgnore used during the loop, to avoid returning the same item
+	 * @return the item from inventory by itemId
+	 */
+	public L2ItemInstance getItemByItemId(int itemId, L2ItemInstance itemToIgnore) {
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getId() == itemId) && !item.equals(itemToIgnore)) {
+				return item;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * @param objectId the item object Id
+	 * @return item from inventory by objectId
+	 */
+	public L2ItemInstance getItemByObjectId(int objectId) {
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getObjectId() == objectId)) {
+				return item;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Gets the inventory item count by item Id and enchant level including equipped items.
+	 * @param itemId the item Id
+	 * @param enchantLevel the item enchant level, use -1 to match any enchant level
+	 * @return the inventory item count
+	 */
+	public long getInventoryItemCount(int itemId, int enchantLevel) {
+		return getInventoryItemCount(itemId, enchantLevel, true);
+	}
+	
+	/**
+	 * Gets the inventory item count by item Id and enchant level, may include equipped items.
+	 * @param itemId the item Id
+	 * @param enchantLevel the item enchant level, use -1 to match any enchant level
+	 * @param includeEquipped if {@code true} includes equipped items in the result
+	 * @return the inventory item count
+	 */
+	public long getInventoryItemCount(int itemId, int enchantLevel, boolean includeEquipped) {
+		long count = 0;
+		
+		for (L2ItemInstance item : _items) {
+			if ((item.getId() == itemId) && ((item.getEnchantLevel() == enchantLevel) || (enchantLevel < 0)) && (includeEquipped || !item.isEquipped())) {
+				if (item.isStackable()) {
+					// FIXME: Zoey76: if there are more than one stacks of the same item Id
+					// it will return the count of the last one, if is not possible to
+					// have more than one stacks of the same item Id,
+					// it will continue iterating over all items
+					// possible fixes:
+					// count += item.getCount();
+					// or
+					// count = item.getCount();
+					// break;
+					count = item.getCount();
+				} else {
+					count++;
+				}
+			}
+		}
+		return count;
+	}
+	
+	/**
+	 * Adds item to inventory
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be added
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	public L2ItemInstance addItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		L2ItemInstance olditem = getItemByItemId(item.getId());
+		
+		// If stackable item is found in inventory just add to current quantity
+		if ((olditem != null) && olditem.isStackable()) {
+			long count = item.getCount();
+			olditem.changeCount(process, count, actor, reference);
+			olditem.setLastChange(L2ItemInstance.MODIFIED);
+			
+			// And destroys the item
+			ItemTable.getInstance().destroyItem(process, item, actor, reference);
+			item.updateDatabase();
+			item = olditem;
+			
+			// Updates database
+			float adenaRate = rates().getDropAmountMultiplierByItemId().getOrDefault(Inventory.ADENA_ID, 1f);
+			if ((item.getId() == Inventory.ADENA_ID) && (count < (10000 * adenaRate))) {
+				// Small adena changes won't be saved to database all the time
+				if ((GameTimeController.getInstance().getGameTicks() % (GameTimeController.TICKS_PER_SECOND / 2)) == 0) {
+					item.updateDatabase();
+				}
+			} else {
+				item.updateDatabase();
+			}
+		}
+		// If item hasn't be found in inventory, create new one
+		else {
+			item.setOwnerId(process, getOwnerId(), actor, reference);
+			item.setItemLocation(getBaseLocation());
+			item.setLastChange((L2ItemInstance.ADDED));
+			
+			// Add item in inventory
+			addItem(item);
+			
+			// Updates database
+			item.updateDatabase();
+		}
+		
+		refreshWeight();
+		return item;
+	}
+	
+	/**
+	 * Eqivalent to {@link #addItem(String, int, long, int, L2PcInstance, Object)} with parameters (process, itemId, 1, -1, actor, reference)
+	 * @param process
+	 * @param itemId
+	 * @param actor
+	 * @param reference
+	 * @return the new or updated item
+	 */
+	public L2ItemInstance addItem(String process, int itemId, L2PcInstance actor, Object reference) {
+		return addItem(process, itemId, 1, -1, actor, reference);
+	}
+	
+	/**
+	 * Eqivalent to {@link #addItem(String, int, long, int, L2PcInstance, Object)} with parameters (process, itemId, count, -1, actor, reference)
+	 * @param process
+	 * @param itemId
+	 * @param count
+	 * @param actor
+	 * @param reference
+	 * @return the new or updated item
+	 */
+	public L2ItemInstance addItem(String process, int itemId, long count, L2PcInstance actor, Object reference) {
+		return addItem(process, itemId, count, -1, actor, reference);
+	}
+	
+	/**
+	 * Adds item to inventory
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item Identifier of the item to be added
+	 * @param count : int Quantity of items to be added
+	 * @param enchantLevel : int Enchant of the item; -1 to not modify on existing items, for new items use the default enchantLevel when -1
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	public L2ItemInstance addItem(String process, int itemId, long count, int enchantLevel, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = getItemByItemId(itemId);
+		
+		// If stackable item is found in inventory just add to current quantity
+		if ((item != null) && item.isStackable()) {
+			item.changeCount(process, count, actor, reference);
+			item.setLastChange(L2ItemInstance.MODIFIED);
+			if (enchantLevel > -1) {
+				item.setEnchantLevel(enchantLevel);
+			}
+			// Updates database
+			// If Adena drop rate is not present it will be x1.
+			float adenaRate = rates().getDropAmountMultiplierByItemId().getOrDefault(Inventory.ADENA_ID, 1f);
+			if ((itemId == Inventory.ADENA_ID) && (count < (10000 * adenaRate))) {
+				// Small adena changes won't be saved to database all the time
+				if ((GameTimeController.getInstance().getGameTicks() % (GameTimeController.TICKS_PER_SECOND / 2)) == 0) {
+					item.updateDatabase();
+				}
+			} else {
+				item.updateDatabase();
+			}
+		}
+		// If item hasn't been found in inventory, create new one
+		else {
+			for (int i = 0; i < count; i++) {
+				L2Item template = ItemTable.getInstance().getTemplate(itemId);
+				if (template == null) {
+					LOG.warn("{}Invalid ItemId requested: {}", (actor != null ? "[" + actor.getName() + "] " : ""), itemId);
+					return null;
+				}
+				
+				item = ItemTable.getInstance().createItem(process, itemId, template.isStackable() ? count : 1, actor, reference);
+				item.setOwnerId(getOwnerId());
+				item.setItemLocation(getBaseLocation());
+				item.setLastChange(L2ItemInstance.ADDED);
+				item.setEnchantLevel(enchantLevel > -1 ? enchantLevel : template.getDefaultEnchantLevel());
+				
+				// Add item in inventory
+				addItem(item);
+				// Updates database
+				item.updateDatabase();
+				
+				// If stackable, end loop as entire count is included in 1 instance of item
+				if (template.isStackable() || !general().multipleItemDrop()) {
+					break;
+				}
+			}
+		}
+		
+		refreshWeight();
+		return item;
+	}
+	
+	/**
+	 * Transfers item to another inventory
+	 * @param process string Identifier of process triggering this action
+	 * @param objectId Item Identifier of the item to be transfered
+	 * @param count Quantity of items to be transfered
+	 * @param target the item container where the item will be moved.
+	 * @param actor Player requesting the item transfer
+	 * @param reference Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	public L2ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, L2PcInstance actor, Object reference) {
+		if (target == null) {
+			return null;
+		}
+		
+		L2ItemInstance sourceitem = getItemByObjectId(objectId);
+		if (sourceitem == null) {
+			return null;
+		}
+		L2ItemInstance targetitem = sourceitem.isStackable() ? target.getItemByItemId(sourceitem.getId()) : null;
+		
+		synchronized (sourceitem) {
+			// check if this item still present in this container
+			if (getItemByObjectId(objectId) != sourceitem) {
+				return null;
+			}
+			
+			// Check if requested quantity is available
+			if (count > sourceitem.getCount()) {
+				count = sourceitem.getCount();
+			}
+			
+			// If possible, move entire item object
+			if ((sourceitem.getCount() == count) && (targetitem == null)) {
+				removeItem(sourceitem);
+				target.addItem(process, sourceitem, actor, reference);
+				targetitem = sourceitem;
+			} else {
+				if (sourceitem.getCount() > count) // If possible, only update counts
+				{
+					sourceitem.changeCount(process, -count, actor, reference);
+				} else
+				// Otherwise destroy old item
+				{
+					removeItem(sourceitem);
+					ItemTable.getInstance().destroyItem(process, sourceitem, actor, reference);
+				}
+				
+				if (targetitem != null) // If possible, only update counts
+				{
+					targetitem.changeCount(process, count, actor, reference);
+				} else
+				// Otherwise add new item
+				{
+					targetitem = target.addItem(process, sourceitem.getId(), count, actor, reference);
+				}
+			}
+			
+			// Updates database
+			sourceitem.updateDatabase(true);
+			if ((targetitem != sourceitem) && (targetitem != null)) {
+				targetitem.updateDatabase();
+			}
+			if (sourceitem.isAugmented()) {
+				sourceitem.getAugmentation().removeBonus(actor);
+			}
+			refreshWeight();
+			target.refreshWeight();
+		}
+		return targetitem;
+	}
+	
+	/**
+	 * Destroy item from inventory and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	public L2ItemInstance destroyItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		return this.destroyItem(process, item, item.getCount(), actor, reference);
+	}
+	
+	/**
+	 * Destroy item from inventory and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be destroyed
+	 * @param count
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	public L2ItemInstance destroyItem(String process, L2ItemInstance item, long count, L2PcInstance actor, Object reference) {
+		synchronized (item) {
+			// Adjust item quantity
+			if (item.getCount() > count) {
+				item.changeCount(process, -count, actor, reference);
+				item.setLastChange(L2ItemInstance.MODIFIED);
+				
+				// don't update often for untraced items
+				if ((process != null) || ((GameTimeController.getInstance().getGameTicks() % GameTimeController.TICKS_PER_SECOND) == 0)) {
+					item.updateDatabase();
+				}
+				
+				refreshWeight();
+			} else {
+				if (item.getCount() < count) {
+					return null;
+				}
+				
+				boolean removed = removeItem(item);
+				if (!removed) {
+					return null;
+				}
+				
+				ItemTable.getInstance().destroyItem(process, item, actor, reference);
+				
+				item.updateDatabase();
+				refreshWeight();
+			}
+			item.deleteMe();
+		}
+		return item;
+	}
+	
+	/**
+	 * Destroy item from inventory by using its <B>objectID</B> and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = getItemByObjectId(objectId);
+		if (item == null) {
+			return null;
+		}
+		return this.destroyItem(process, item, count, actor, reference);
+	}
+	
+	/**
+	 * Destroy item from inventory by using its <B>itemId</B> and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	public L2ItemInstance destroyItemByItemId(String process, int itemId, long count, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = getItemByItemId(itemId);
+		if (item == null) {
+			return null;
+		}
+		return destroyItem(process, item, count, actor, reference);
+	}
+	
+	/**
+	 * Destroy all items from inventory and updates database
+	 * @param process : String Identifier of process triggering this action
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 */
+	public void destroyAllItems(String process, L2PcInstance actor, Object reference) {
+		for (L2ItemInstance item : _items) {
+			if (item != null) {
+				destroyItem(process, item, actor, reference);
+			}
+		}
+	}
+	
+	/**
+	 * @return warehouse Adena.
+	 */
+	public long getAdena() {
+		long count = 0;
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getId() == Inventory.ADENA_ID)) {
+				count = item.getCount();
+				return count;
+			}
+		}
+		return count;
+	}
+	
+	/**
+	 * Adds item to inventory for further adjustments.
+	 * @param item : L2ItemInstance to be added from inventory
+	 */
+	protected void addItem(L2ItemInstance item) {
+		_items.add(item);
+	}
+	
+	/**
+	 * Removes item from inventory for further adjustments.
+	 * @param item : L2ItemInstance to be removed from inventory
+	 * @return
+	 */
+	protected boolean removeItem(L2ItemInstance item) {
+		return _items.remove(item);
+	}
+	
+	/**
+	 * Refresh the weight of equipment loaded
+	 */
+	protected void refreshWeight() {
+	}
+	
+	/**
+	 * Delete item object from world
+	 */
+	public void deleteMe() {
+		if (getOwner() != null) {
+			for (L2ItemInstance item : _items) {
+				if (item != null) {
+					item.updateDatabase(true);
+					item.deleteMe();
+					L2World.getInstance().removeObject(item);
+				}
+			}
+		}
+		_items.clear();
+	}
+	
+	/**
+	 * Update database with items in inventory
+	 */
+	public void updateDatabase() {
+		if (getOwner() != null) {
+			for (L2ItemInstance item : _items) {
+				if (item != null) {
+					item.updateDatabase(true);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Get back items in container from database
+	 */
+	public void restore() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT object_id, item_id, count, enchant_level, loc, loc_data, custom_type1, custom_type2, mana_left, time, agathion_energy FROM items WHERE owner_id=? AND (loc=?)")) {
+			ps.setInt(1, getOwnerId());
+			ps.setString(2, getBaseLocation().name());
+			try (var rs = ps.executeQuery()) {
+				L2ItemInstance item;
+				while (rs.next()) {
+					item = L2ItemInstance.restoreFromDb(getOwnerId(), rs);
+					if (item == null) {
+						continue;
+					}
+					
+					L2World.getInstance().storeObject(item);
+					
+					L2PcInstance owner = getOwner() == null ? null : getOwner().getActingPlayer();
+					
+					// If stackable item is found in inventory just add to current quantity
+					if (item.isStackable() && (getItemByItemId(item.getId()) != null)) {
+						addItem("Restore", item, owner, null);
+					} else {
+						addItem(item);
+					}
+				}
+			}
+			refreshWeight();
+		} catch (Exception e) {
+			LOG.warn("Could not restore container:", e);
+		}
+	}
+	
+	public boolean validateCapacity(long slots) {
+		return true;
+	}
+	
+	public boolean validateWeight(long weight) {
+		return true;
+	}
+	
+	/**
+	 * If the item is stackable validates 1 slot, if the item isn't stackable validates the item count.
+	 * @param itemId the item Id to verify
+	 * @param count amount of item's weight to validate
+	 * @return {@code true} if the item doesn't exists or it validates its slot count
+	 */
+	public boolean validateCapacityByItemId(int itemId, long count) {
+		final L2Item template = ItemTable.getInstance().getTemplate(itemId);
+		return (template == null) || (template.isStackable() ? validateCapacity(1) : validateCapacity(count));
+	}
+	
+	/**
+	 * @param itemId the item Id to verify
+	 * @param count amount of item's weight to validate
+	 * @return {@code true} if the item doesn't exists or it validates its weight
+	 */
+	public boolean validateWeightByItemId(int itemId, long count) {
+		final L2Item template = ItemTable.getInstance().getTemplate(itemId);
+		return (template == null) || validateWeight(template.getWeight() * count);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java
new file mode 100644
index 00000000..4351ba3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Mail.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author DS
+ */
+public class Mail extends ItemContainer {
+	private static final Logger LOG = LoggerFactory.getLogger(Mail.class);
+	
+	private final int _ownerId;
+	
+	private int _messageId;
+	
+	public Mail(int objectId, int messageId) {
+		_ownerId = objectId;
+		_messageId = messageId;
+	}
+	
+	@Override
+	public String getName() {
+		return "Mail";
+	}
+	
+	@Override
+	public L2PcInstance getOwner() {
+		return null;
+	}
+	
+	@Override
+	public ItemLocation getBaseLocation() {
+		return ItemLocation.MAIL;
+	}
+	
+	public int getMessageId() {
+		return _messageId;
+	}
+	
+	public void setNewMessageId(int messageId) {
+		_messageId = messageId;
+		for (L2ItemInstance item : _items) {
+			if (item == null) {
+				continue;
+			}
+			
+			item.setItemLocation(getBaseLocation(), messageId);
+		}
+		
+		updateDatabase();
+	}
+	
+	public void returnToWh(ItemContainer wh) {
+		for (L2ItemInstance item : _items) {
+			if (item == null) {
+				continue;
+			}
+			if (wh == null) {
+				item.setItemLocation(ItemLocation.WAREHOUSE);
+			} else {
+				transferItem("Expire", item.getObjectId(), item.getCount(), wh, null, null);
+			}
+		}
+	}
+	
+	@Override
+	protected void addItem(L2ItemInstance item) {
+		super.addItem(item);
+		item.setItemLocation(getBaseLocation(), _messageId);
+	}
+	
+	@Override
+	public void updateDatabase() {
+		_items.forEach(i -> i.updateDatabase(true));
+	}
+	
+	@Override
+	public void restore() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT object_id, item_id, count, enchant_level, loc, loc_data, custom_type1, custom_type2, mana_left, time, agathion_energy FROM items WHERE owner_id=? AND loc=? AND loc_data=?")) {
+			ps.setInt(1, getOwnerId());
+			ps.setString(2, getBaseLocation().name());
+			ps.setInt(3, getMessageId());
+			try (var rs = ps.executeQuery()) {
+				L2ItemInstance item;
+				while (rs.next()) {
+					item = L2ItemInstance.restoreFromDb(getOwnerId(), rs);
+					if (item == null) {
+						continue;
+					}
+					
+					L2World.getInstance().storeObject(item);
+					
+					// If stackable item is found just add to current quantity
+					if (item.isStackable() && (getItemByItemId(item.getId()) != null)) {
+						addItem("Restore", item, null, null);
+					} else {
+						addItem(item);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not restore container:", e);
+		}
+	}
+	
+	@Override
+	public int getOwnerId() {
+		return _ownerId;
+	}
+	
+	@Override
+	public void deleteMe() {
+		_items.forEach(i -> {
+			i.updateDatabase(true);
+			i.deleteMe();
+			L2World.getInstance().removeObject(i);
+			IdFactory.getInstance().releaseId(i.getObjectId());
+		});
+		_items.clear();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java
new file mode 100644
index 00000000..5d8edcc1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcFreight.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * @author UnAfraid
+ */
+public class PcFreight extends ItemContainer {
+	private final L2PcInstance _owner;
+	private final int _ownerId;
+	
+	public PcFreight(int object_id) {
+		_owner = null;
+		_ownerId = object_id;
+		restore();
+	}
+	
+	public PcFreight(L2PcInstance owner) {
+		_owner = owner;
+		_ownerId = owner.getObjectId();
+	}
+	
+	@Override
+	public int getOwnerId() {
+		return _ownerId;
+	}
+	
+	@Override
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	@Override
+	public ItemLocation getBaseLocation() {
+		return ItemLocation.FREIGHT;
+	}
+	
+	@Override
+	public String getName() {
+		return "Freight";
+	}
+	
+	@Override
+	public boolean validateCapacity(long slots) {
+		int curSlots = _owner == null ? character().getMaximumFreightSlots() : character().getMaximumFreightSlots() + (int) _owner.getStat().calcStat(Stats.FREIGHT_LIM, 0, null, null);
+		return ((getSize() + slots) <= curSlots);
+	}
+	
+	@Override
+	public void refreshWeight() {
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
new file mode 100644
index 00000000..f2e47c8e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
@@ -0,0 +1,1329 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.xml.impl.ArmorSetsData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.L2ArmorSet;
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemAdd;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemDestroy;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemDrop;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemTransfer;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+public class PcInventory extends Inventory {
+	private static final Logger LOG = LoggerFactory.getLogger(PcInventory.class);
+	
+	private final L2PcInstance _owner;
+	
+	private L2ItemInstance _adena;
+	
+	private L2ItemInstance _ancientAdena;
+	
+	private int[] _blockItems = null;
+	
+	private int _questSlots;
+	
+	private final Object _lock;
+	
+	/**
+	 * Block modes:
+	 * <UL>
+	 * <LI>-1 - no block
+	 * <LI>0 - block items from _invItems, allow usage of other items
+	 * <LI>1 - allow usage of items from _invItems, block other items
+	 * </UL>
+	 */
+	private int _blockMode = -1;
+	
+	public PcInventory(L2PcInstance owner) {
+		addPaperdollListener(ArmorSetListener.getInstance());
+		addPaperdollListener(BowCrossRodListener.getInstance());
+		addPaperdollListener(ItemSkillsListener.getInstance());
+		addPaperdollListener(BraceletListener.getInstance());
+		
+		_owner = owner;
+		_lock = new Object();
+	}
+	
+	@Override
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	@Override
+	protected ItemLocation getBaseLocation() {
+		return ItemLocation.INVENTORY;
+	}
+	
+	@Override
+	protected ItemLocation getEquipLocation() {
+		return ItemLocation.PAPERDOLL;
+	}
+	
+	public L2ItemInstance getAdenaInstance() {
+		return _adena;
+	}
+	
+	@Override
+	public long getAdena() {
+		return _adena != null ? _adena.getCount() : 0;
+	}
+	
+	public L2ItemInstance getAncientAdenaInstance() {
+		return _ancientAdena;
+	}
+	
+	public long getAncientAdena() {
+		return (_ancientAdena != null) ? _ancientAdena.getCount() : 0;
+	}
+	
+	/**
+	 * Returns the list of items in inventory available for transaction
+	 * @param allowAdena
+	 * @param allowAncientAdena
+	 * @return L2ItemInstance : items in inventory
+	 */
+	public L2ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena) {
+		return getUniqueItems(allowAdena, allowAncientAdena, true);
+	}
+	
+	public L2ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable) {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if (item == null) {
+				continue;
+			}
+			if ((!allowAdena && (item.getId() == ADENA_ID))) {
+				continue;
+			}
+			if ((!allowAncientAdena && (item.getId() == ANCIENT_ADENA_ID))) {
+				continue;
+			}
+			boolean isDuplicate = false;
+			for (L2ItemInstance litem : list) {
+				if (litem.getId() == item.getId()) {
+					isDuplicate = true;
+					break;
+				}
+			}
+			if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * Returns the list of items in inventory available for transaction Allows an item to appear twice if and only if there is a difference in enchantment level.
+	 * @param allowAdena
+	 * @param allowAncientAdena
+	 * @return L2ItemInstance : items in inventory
+	 */
+	public L2ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena) {
+		return getUniqueItemsByEnchantLevel(allowAdena, allowAncientAdena, true);
+	}
+	
+	public L2ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable) {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if (item == null) {
+				continue;
+			}
+			if ((!allowAdena && (item.getId() == ADENA_ID))) {
+				continue;
+			}
+			if ((!allowAncientAdena && (item.getId() == ANCIENT_ADENA_ID))) {
+				continue;
+			}
+			
+			boolean isDuplicate = false;
+			for (L2ItemInstance litem : list) {
+				if ((litem.getId() == item.getId()) && (litem.getEnchantLevel() == item.getEnchantLevel())) {
+					isDuplicate = true;
+					break;
+				}
+			}
+			
+			if (!isDuplicate && (!onlyAvailable || (item.isSellable() && item.isAvailable(getOwner(), false, false)))) {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[list.size()]);
+	}
+	
+	/**
+	 * @param itemId
+	 * @return
+	 */
+	public L2ItemInstance[] getAllItemsByItemId(int itemId) {
+		return getAllItemsByItemId(itemId, true);
+	}
+	
+	/**
+	 * Returns the list of all items in inventory that have a given item id.
+	 * @param itemId : ID of item
+	 * @param includeEquipped : include equipped items
+	 * @return L2ItemInstance[] : matching items from inventory
+	 */
+	public L2ItemInstance[] getAllItemsByItemId(int itemId, boolean includeEquipped) {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if (item == null) {
+				continue;
+			}
+			
+			if ((item.getId() == itemId) && (includeEquipped || !item.isEquipped())) {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * @param itemId
+	 * @param enchantment
+	 * @return
+	 */
+	public L2ItemInstance[] getAllItemsByItemId(int itemId, int enchantment) {
+		return getAllItemsByItemId(itemId, enchantment, true);
+	}
+	
+	/**
+	 * Returns the list of all items in inventory that have a given item id AND a given enchantment level.
+	 * @param itemId : ID of item
+	 * @param enchantment : enchant level of item
+	 * @param includeEquipped : include equipped items
+	 * @return L2ItemInstance[] : matching items from inventory
+	 */
+	public L2ItemInstance[] getAllItemsByItemId(int itemId, int enchantment, boolean includeEquipped) {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if (item == null) {
+				continue;
+			}
+			
+			if ((item.getId() == itemId) && (item.getEnchantLevel() == enchantment) && (includeEquipped || !item.isEquipped())) {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * @param allowAdena
+	 * @param allowNonTradeable
+	 * @param feightable
+	 * @return the list of items in inventory available for transaction
+	 */
+	public L2ItemInstance[] getAvailableItems(boolean allowAdena, boolean allowNonTradeable, boolean feightable) {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item == null) || !item.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getId())) {
+				continue;
+			} else if (feightable) {
+				if ((item.getItemLocation() == ItemLocation.INVENTORY) && item.isFreightable()) {
+					list.add(item);
+				}
+			} else {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * Get all augmented items
+	 * @return
+	 */
+	public L2ItemInstance[] getAugmentedItems() {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && item.isAugmented()) {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * Get all element items
+	 * @return
+	 */
+	public L2ItemInstance[] getElementItems() {
+		List<L2ItemInstance> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && (item.getElementals() != null)) {
+				list.add(item);
+			}
+		}
+		return list.toArray(new L2ItemInstance[0]);
+	}
+	
+	/**
+	 * Returns the list of items in inventory available for transaction adjusted by tradeList
+	 * @param tradeList
+	 * @return L2ItemInstance : items in inventory
+	 */
+	public TradeItem[] getAvailableItems(TradeList tradeList) {
+		List<TradeItem> list = new LinkedList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item != null) && item.isAvailable(getOwner(), false, false)) {
+				TradeItem adjItem = tradeList.adjustAvailableItem(item);
+				if (adjItem != null) {
+					list.add(adjItem);
+				}
+			}
+		}
+		return list.toArray(new TradeItem[0]);
+	}
+	
+	/**
+	 * Adjust TradeItem according his status in inventory
+	 * @param item : L2ItemInstance to be adjusted
+	 */
+	public void adjustAvailableItem(TradeItem item) {
+		boolean notAllEquipped = false;
+		for (L2ItemInstance adjItem : getItemsByItemId(item.getItem().getId())) {
+			if (adjItem.isEquipable()) {
+				if (!adjItem.isEquipped()) {
+					notAllEquipped |= true;
+				}
+			} else {
+				notAllEquipped |= true;
+				break;
+			}
+		}
+		if (notAllEquipped) {
+			L2ItemInstance adjItem = getItemByItemId(item.getItem().getId());
+			item.setObjectId(adjItem.getObjectId());
+			item.setEnchant(adjItem.getEnchantLevel());
+			
+			if (adjItem.getCount() < item.getCount()) {
+				item.setCount(adjItem.getCount());
+			}
+			
+			return;
+		}
+		
+		item.setCount(0);
+	}
+	
+	/**
+	 * Adds adena to PCInventory
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int Quantity of adena to be added
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 */
+	public void addAdena(String process, long count, L2PcInstance actor, Object reference) {
+		if (count > 0) {
+			addItem(process, ADENA_ID, count, actor, reference);
+		}
+	}
+	
+	/**
+	 * Removes adena to PCInventory
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int Quantity of adena to be removed
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return boolean : true if adena was reduced
+	 */
+	public boolean reduceAdena(String process, long count, L2PcInstance actor, Object reference) {
+		if (count > 0) {
+			return destroyItemByItemId(process, ADENA_ID, count, actor, reference) != null;
+		}
+		return false;
+	}
+	
+	/**
+	 * Adds specified amount of ancient adena to player inventory.
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int Quantity of adena to be added
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 */
+	public void addAncientAdena(String process, long count, L2PcInstance actor, Object reference) {
+		if (count > 0) {
+			addItem(process, ANCIENT_ADENA_ID, count, actor, reference);
+		}
+	}
+	
+	/**
+	 * Removes specified amount of ancient adena from player inventory.
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int Quantity of adena to be removed
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return boolean : true if adena was reduced
+	 */
+	public boolean reduceAncientAdena(String process, long count, L2PcInstance actor, Object reference) {
+		if (count > 0) {
+			return destroyItemByItemId(process, ANCIENT_ADENA_ID, count, actor, reference) != null;
+		}
+		return false;
+	}
+	
+	/**
+	 * Adds item in inventory and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be added
+	 * @param actor : L2PcInstance Player requesting the item add
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance addItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		item = super.addItem(process, item, actor, reference);
+		
+		if ((item != null) && (item.getId() == ADENA_ID) && !item.equals(_adena)) {
+			_adena = item;
+		}
+		
+		if ((item != null) && (item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena)) {
+			_ancientAdena = item;
+		}
+		
+		if (item != null) {
+			// Notify to scripts
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerItemAdd(actor, item), actor, item.getItem());
+		}
+		return item;
+	}
+	
+	/**
+	 * Adds item in inventory and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item Identifier of the item to be added
+	 * @param count : int Quantity of items to be added
+	 * @param enchantLevel : int Enchant of the item; -1 to not modify on existing items, for new items use the default enchantLevel when -1
+	 * @param actor : L2PcInstance Player requesting the item creation
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance addItem(String process, int itemId, long count, int enchantLevel, L2PcInstance actor, Object reference) {
+		final L2ItemInstance item = super.addItem(process, itemId, count, enchantLevel, actor, reference);
+		if (item != null) {
+			if ((item.getId() == ADENA_ID) && !item.equals(_adena)) {
+				_adena = item;
+			}
+			
+			if ((item.getId() == ANCIENT_ADENA_ID) && !item.equals(_ancientAdena)) {
+				_ancientAdena = item;
+			}
+			if (actor != null) {
+				// Send inventory update packet
+				if (!general().forceInventoryUpdate()) {
+					InventoryUpdate playerIU = new InventoryUpdate();
+					playerIU.addItem(item);
+					actor.sendPacket(playerIU);
+				} else {
+					actor.sendPacket(new ItemList(actor, false));
+				}
+				
+				// Update current load as well
+				StatusUpdate su = new StatusUpdate(actor);
+				su.addAttribute(StatusUpdate.CUR_LOAD, actor.getCurrentLoad());
+				actor.sendPacket(su);
+				
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new PlayerItemAdd(actor, item), actor, item.getItem());
+			}
+		}
+		return item;
+	}
+	
+	/**
+	 * Transfers item to another inventory and checks _adena and _ancientAdena
+	 * @param process string Identifier of process triggering this action
+	 * @param objectId Item Identifier of the item to be transfered
+	 * @param count Quantity of items to be transfered
+	 * @param target the item container for the item to be transfered.
+	 * @param actor the player requesting the item transfer
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the new item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance transferItem(String process, int objectId, long count, ItemContainer target, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = super.transferItem(process, objectId, count, target, actor, reference);
+		
+		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) {
+			_adena = null;
+		}
+		
+		if ((_ancientAdena != null) && ((_ancientAdena.getCount() <= 0) || (_ancientAdena.getOwnerId() != getOwnerId()))) {
+			_ancientAdena = null;
+		}
+		
+		// Notify to scripts
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerItemTransfer(actor, item, target), item.getItem());
+		return item;
+	}
+	
+	/**
+	 * Destroy item from inventory and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance destroyItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		return destroyItem(process, item, item.getCount(), actor, reference);
+	}
+	
+	/**
+	 * Destroy item from inventory and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance destroyItem(String process, L2ItemInstance item, long count, L2PcInstance actor, Object reference) {
+		item = super.destroyItem(process, item, count, actor, reference);
+		
+		if ((_adena != null) && (_adena.getCount() <= 0)) {
+			_adena = null;
+		}
+		
+		if ((_ancientAdena != null) && (_ancientAdena.getCount() <= 0)) {
+			_ancientAdena = null;
+		}
+		
+		// Notify to scripts
+		if (item != null) {
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerItemDestroy(actor, item), item.getItem());
+		}
+		return item;
+	}
+	
+	/**
+	 * Destroys item from inventory and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance destroyItem(String process, int objectId, long count, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = getItemByObjectId(objectId);
+		if (item == null) {
+			return null;
+		}
+		return this.destroyItem(process, item, count, actor, reference);
+	}
+	
+	/**
+	 * Destroy item from inventory by using its <B>itemId</B> and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param itemId : int Item identifier of the item to be destroyed
+	 * @param count : int Quantity of items to be destroyed
+	 * @param actor : L2PcInstance Player requesting the item destroy
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance destroyItemByItemId(String process, int itemId, long count, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = getItemByItemId(itemId);
+		if (item == null) {
+			return null;
+		}
+		return this.destroyItem(process, item, count, actor, reference);
+	}
+	
+	/**
+	 * Drop item from inventory and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param item : L2ItemInstance to be dropped
+	 * @param actor : L2PcInstance Player requesting the item drop
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance dropItem(String process, L2ItemInstance item, L2PcInstance actor, Object reference) {
+		item = super.dropItem(process, item, actor, reference);
+		
+		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) {
+			_adena = null;
+		}
+		
+		if ((_ancientAdena != null) && ((_ancientAdena.getCount() <= 0) || (_ancientAdena.getOwnerId() != getOwnerId()))) {
+			_ancientAdena = null;
+		}
+		
+		// Notify to scripts
+		if (item != null) {
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+		}
+		return item;
+	}
+	
+	/**
+	 * Drop item from inventory by using its <B>objectID</B> and checks _adena and _ancientAdena
+	 * @param process : String Identifier of process triggering this action
+	 * @param objectId : int Item Instance identifier of the item to be dropped
+	 * @param count : int Quantity of items to be dropped
+	 * @param actor : L2PcInstance Player requesting the item drop
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 * @return L2ItemInstance corresponding to the destroyed item or the updated item in inventory
+	 */
+	@Override
+	public L2ItemInstance dropItem(String process, int objectId, long count, L2PcInstance actor, Object reference) {
+		L2ItemInstance item = super.dropItem(process, objectId, count, actor, reference);
+		
+		if ((_adena != null) && ((_adena.getCount() <= 0) || (_adena.getOwnerId() != getOwnerId()))) {
+			_adena = null;
+		}
+		
+		if ((_ancientAdena != null) && ((_ancientAdena.getCount() <= 0) || (_ancientAdena.getOwnerId() != getOwnerId()))) {
+			_ancientAdena = null;
+		}
+		
+		// Notify to scripts
+		if (item != null) {
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerItemDrop(actor, item, item.getLocation()), item.getItem());
+		}
+		return item;
+	}
+	
+	/**
+	 * <b>Overloaded</b>, when removes item from inventory, remove also owner shortcuts.
+	 * @param item : L2ItemInstance to be removed from inventory
+	 */
+	@Override
+	protected boolean removeItem(L2ItemInstance item) {
+		// Removes any reference to the item from Shortcut bar
+		getOwner().removeItemFromShortCut(item.getObjectId());
+		
+		// Removes active Enchant Scroll
+		if (item.getObjectId() == getOwner().getActiveEnchantItemId()) {
+			getOwner().setActiveEnchantItemId(L2PcInstance.ID_NONE);
+		}
+		
+		if (item.getId() == ADENA_ID) {
+			_adena = null;
+		} else if (item.getId() == ANCIENT_ADENA_ID) {
+			_ancientAdena = null;
+		}
+		
+		if (item.isQuestItem()) {
+			synchronized (_lock) {
+				_questSlots--;
+				if (_questSlots < 0) {
+					_questSlots = 0;
+					LOG.warn("QuestInventory size < 0!");
+				}
+			}
+		}
+		return super.removeItem(item);
+	}
+	
+	/**
+	 * Refresh the weight of equipment loaded
+	 */
+	@Override
+	public void refreshWeight() {
+		super.refreshWeight();
+		getOwner().refreshOverloaded();
+	}
+	
+	/**
+	 * Get back items in inventory from database
+	 */
+	@Override
+	public void restore() {
+		super.restore();
+		_adena = getItemByItemId(ADENA_ID);
+		_ancientAdena = getItemByItemId(ANCIENT_ADENA_ID);
+	}
+	
+	public static int[][] restoreVisibleInventory(int objectId) {
+		int[][] paperdoll = new int[31][3];
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT object_id, item_id, loc_data, enchant_level FROM items WHERE owner_id=? AND loc='PAPERDOLL'")) {
+			ps.setInt(1, objectId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					int slot = rs.getInt("loc_data");
+					paperdoll[slot][0] = rs.getInt("object_id");
+					paperdoll[slot][1] = rs.getInt("item_id");
+					paperdoll[slot][2] = rs.getInt("enchant_level");
+					
+					// if (slot == Inventory.PAPERDOLL_RHAND) {
+					// paperdoll[Inventory.PAPERDOLL_RHAND][0] = rs.getInt("object_id");
+					// paperdoll[Inventory.PAPERDOLL_RHAND][1] = rs.getInt("item_id");
+					// paperdoll[Inventory.PAPERDOLL_RHAND][2] = rs.getInt("enchant_level");
+					// }
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not restore inventory: {}", e.getMessage(), e);
+		}
+		return paperdoll;
+	}
+	
+	/**
+	 * @param itemList the items that needs to be validated.
+	 * @param sendMessage if {@code true} will send a message of inventory full.
+	 * @param sendSkillMessage if {@code true} will send a message of skill not available.
+	 * @return {@code true} if the inventory isn't full after taking new items and items weight add to current load doesn't exceed max weight load.
+	 */
+	public boolean checkInventorySlotsAndWeight(List<L2Item> itemList, boolean sendMessage, boolean sendSkillMessage) {
+		int lootWeight = 0;
+		int requiredSlots = 0;
+		if (itemList != null) {
+			for (L2Item item : itemList) {
+				// If the item is not stackable or is stackable and not present in inventory, will need a slot.
+				if (!item.isStackable() || (getInventoryItemCount(item.getId(), -1) <= 0)) {
+					requiredSlots++;
+				}
+				lootWeight += item.getWeight();
+			}
+		}
+		
+		boolean inventoryStatusOK = validateCapacity(requiredSlots) && validateWeight(lootWeight);
+		if (!inventoryStatusOK && sendMessage) {
+			_owner.sendPacket(SystemMessageId.SLOTS_FULL);
+			if (sendSkillMessage) {
+				_owner.sendPacket(SystemMessageId.WEIGHT_EXCEEDED_SKILL_UNAVAILABLE);
+			}
+		}
+		return inventoryStatusOK;
+	}
+	
+	/**
+	 * If the item is not stackable or is stackable and not present in inventory, will need a slot.
+	 * @param item the item to validate.
+	 * @return {@code true} if there is enough room to add the item inventory.
+	 */
+	public boolean validateCapacity(L2ItemInstance item) {
+		if (item.getItem().hasExImmediateEffect() || (item.isStackable() && (getInventoryItemCount(item.getId(), -1) > 0))) {
+			return true;
+		}
+		
+		return validateCapacity(1, item.isQuestItem());
+	}
+	
+	/**
+	 * If the item is not stackable or is stackable and not present in inventory, will need a slot.
+	 * @param itemId the item Id for the item to validate.
+	 * @return {@code true} if there is enough room to add the item inventory.
+	 */
+	public boolean validateCapacityByItemId(int itemId) {
+		final L2ItemInstance invItem = getItemByItemId(itemId);
+		if ((invItem == null) || !(invItem.isStackable() && (getInventoryItemCount(itemId, -1) > 0))) {
+			validateCapacity(1, ItemTable.getInstance().getTemplate(itemId).isQuestItem());
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean validateCapacity(long slots) {
+		return validateCapacity(slots, false);
+	}
+	
+	public boolean validateCapacity(long slots, boolean questItem) {
+		if (!questItem) {
+			return (((_items.size() - _questSlots) + slots) <= _owner.getInventoryLimit());
+		}
+		return (_questSlots + slots) <= _owner.getQuestInventoryLimit();
+	}
+	
+	@Override
+	public boolean validateWeight(long weight) {
+		// Disable weight check for GMs.
+		if (_owner.isGM() && _owner.getDietMode() && _owner.getAccessLevel().allowTransaction()) {
+			return true;
+		}
+		return ((_totalWeight + weight) <= _owner.getMaxLoad());
+	}
+	
+	/**
+	 * Set inventory block for specified IDs<br>
+	 * array reference is used for {@link PcInventory#_blockItems}
+	 * @param items array of Ids to block/allow
+	 * @param mode blocking mode {@link PcInventory#_blockMode}
+	 */
+	public void setInventoryBlock(int[] items, int mode) {
+		_blockMode = mode;
+		_blockItems = items;
+		
+		_owner.sendPacket(new ItemList(_owner, false));
+	}
+	
+	/**
+	 * Unblock blocked itemIds
+	 */
+	public void unblock() {
+		_blockMode = -1;
+		_blockItems = null;
+		
+		_owner.sendPacket(new ItemList(_owner, false));
+	}
+	
+	/**
+	 * Check if player inventory is in block mode.
+	 * @return true if some itemIds blocked
+	 */
+	public boolean hasInventoryBlock() {
+		return ((_blockMode > -1) && (_blockItems != null) && (_blockItems.length > 0));
+	}
+	
+	/**
+	 * Block all player items
+	 */
+	public void blockAllItems() {
+		// temp fix, some id must be sended
+		setInventoryBlock(new int[] {
+			(ItemTable.getInstance().getArraySize() + 2)
+		}, 1);
+	}
+	
+	/**
+	 * Return block mode
+	 * @return int {@link PcInventory#_blockMode}
+	 */
+	public int getBlockMode() {
+		return _blockMode;
+	}
+	
+	/**
+	 * Return TIntArrayList with blocked item ids
+	 * @return TIntArrayList
+	 */
+	public int[] getBlockItems() {
+		return _blockItems;
+	}
+	
+	/**
+	 * Check if player can use item by itemid
+	 * @param itemId int
+	 * @return true if can use
+	 */
+	public boolean canManipulateWithItemId(int itemId) {
+		return ((_blockMode != 0) || !Util.contains(_blockItems, itemId)) && ((_blockMode != 1) || Util.contains(_blockItems, itemId));
+	}
+	
+	@Override
+	protected void addItem(L2ItemInstance item) {
+		if (item.isQuestItem()) {
+			synchronized (_lock) {
+				_questSlots++;
+			}
+		}
+		super.addItem(item);
+	}
+	
+	public int getSize(boolean quest) {
+		if (quest) {
+			return _questSlots;
+		}
+		return getSize() - _questSlots;
+	}
+	
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "[" + _owner + "]";
+	}
+	
+	/**
+	 * Apply skills of inventory items
+	 */
+	public void applyItemSkills() {
+		for (L2ItemInstance item : _items) {
+			item.giveSkillsToOwner();
+			item.applyEnchantStats();
+		}
+	}
+	
+	private static final class BowCrossRodListener implements PaperdollListener {
+		private static final BowCrossRodListener instance = new BowCrossRodListener();
+		
+		public static BowCrossRodListener getInstance() {
+			return instance;
+		}
+		
+		@Override
+		public void notifyUnequiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (slot != PAPERDOLL_RHAND) {
+				return;
+			}
+			
+			if (item.getItemType() == WeaponType.BOW) {
+				L2ItemInstance arrow = inventory.getPaperdollItem(PAPERDOLL_LHAND);
+				
+				if (arrow != null) {
+					inventory.setPaperdollItem(PAPERDOLL_LHAND, null);
+				}
+			} else if (item.getItemType() == WeaponType.CROSSBOW) {
+				L2ItemInstance bolts = inventory.getPaperdollItem(PAPERDOLL_LHAND);
+				
+				if (bolts != null) {
+					inventory.setPaperdollItem(PAPERDOLL_LHAND, null);
+				}
+			} else if (item.getItemType() == WeaponType.FISHINGROD) {
+				L2ItemInstance lure = inventory.getPaperdollItem(PAPERDOLL_LHAND);
+				
+				if (lure != null) {
+					inventory.setPaperdollItem(PAPERDOLL_LHAND, null);
+				}
+			}
+		}
+		
+		@Override
+		public void notifyEquiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (slot != PAPERDOLL_RHAND) {
+				return;
+			}
+			
+			if (item.getItemType() == WeaponType.BOW) {
+				L2ItemInstance arrow = inventory.findArrowForBow(item.getItem());
+				
+				if (arrow != null) {
+					inventory.setPaperdollItem(PAPERDOLL_LHAND, arrow);
+				}
+			} else if (item.getItemType() == WeaponType.CROSSBOW) {
+				L2ItemInstance bolts = inventory.findBoltForCrossBow(item.getItem());
+				
+				if (bolts != null) {
+					inventory.setPaperdollItem(PAPERDOLL_LHAND, bolts);
+				}
+			}
+		}
+	}
+	
+	private static final class ItemSkillsListener implements PaperdollListener {
+		private static final ItemSkillsListener instance = new ItemSkillsListener();
+		
+		public static ItemSkillsListener getInstance() {
+			return instance;
+		}
+		
+		@Override
+		public void notifyUnequiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (!(inventory.getOwner() instanceof L2PcInstance)) {
+				return;
+			}
+			final L2PcInstance player = (L2PcInstance) inventory.getOwner();
+			
+			Skill enchant4Skill, itemSkill;
+			L2Item it = item.getItem();
+			boolean update = false;
+			boolean updateTimeStamp = false;
+			
+			// Remove augmentation bonuses on unequip
+			if (item.isAugmented()) {
+				item.getAugmentation().removeBonus(player);
+			}
+			
+			item.unChargeAllShots();
+			item.removeElementAttrBonus(player);
+			
+			// Remove skills bestowed from +4 armor
+			if (item.getEnchantLevel() >= 4) {
+				enchant4Skill = it.getEnchant4Skill();
+				
+				if (enchant4Skill != null) {
+					player.removeSkill(enchant4Skill, false, enchant4Skill.isPassive());
+					update = true;
+				}
+			}
+			
+			item.clearEnchantStats();
+			
+			final SkillHolder[] skills = it.getSkills();
+			
+			if (skills != null) {
+				for (SkillHolder skillInfo : skills) {
+					if (skillInfo == null) {
+						continue;
+					}
+					
+					itemSkill = skillInfo.getSkill();
+					
+					if (itemSkill != null) {
+						player.removeSkill(itemSkill, false, itemSkill.isPassive());
+						update = true;
+					} else {
+						LOG.warn("Inventory.ItemSkillsListener.Weapon: Incorrect skill: {}.", skillInfo);
+					}
+				}
+			}
+			
+			if (item.isArmor()) {
+				for (L2ItemInstance itm : inventory.getItems()) {
+					if (!itm.isEquipped() || (itm.getItem().getSkills() == null) || itm.equals(item)) {
+						continue;
+					}
+					for (SkillHolder sk : itm.getItem().getSkills()) {
+						if (player.getSkillLevel(sk.getSkillId()) != -1) {
+							continue;
+						}
+						
+						itemSkill = sk.getSkill();
+						
+						if (itemSkill != null) {
+							player.addSkill(itemSkill, false);
+							
+							if (itemSkill.isActive()) {
+								if (!player.hasSkillReuse(itemSkill.getReuseHashCode())) {
+									int equipDelay = item.getEquipReuseDelay();
+									if (equipDelay > 0) {
+										player.addTimeStamp(itemSkill, equipDelay);
+										player.disableSkill(itemSkill, equipDelay);
+									}
+								}
+								updateTimeStamp = true;
+							}
+							update = true;
+						}
+					}
+				}
+			}
+			
+			// Apply skill, if weapon have "skills on unequip"
+			Skill unequipSkill = it.getUnequipSkill();
+			if (unequipSkill != null) {
+				unequipSkill.activateSkill(player, player);
+			}
+			
+			if (update) {
+				player.sendSkillList();
+				
+				if (updateTimeStamp) {
+					player.sendPacket(new SkillCoolTime(player));
+				}
+			}
+		}
+		
+		@Override
+		public void notifyEquiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (!(inventory.getOwner() instanceof L2PcInstance)) {
+				return;
+			}
+			
+			final L2PcInstance player = (L2PcInstance) inventory.getOwner();
+			
+			Skill enchant4Skill, itemSkill;
+			L2Item it = item.getItem();
+			boolean update = false;
+			boolean updateTimeStamp = false;
+			
+			// Apply augmentation bonuses on equip
+			if (item.isAugmented()) {
+				item.getAugmentation().applyBonus(player);
+			}
+			item.rechargeShots(true, true);
+			item.updateElementAttrBonus(player);
+			
+			// Add skills bestowed from +4 armor
+			if (item.getEnchantLevel() >= 4) {
+				enchant4Skill = it.getEnchant4Skill();
+				
+				if (enchant4Skill != null) {
+					player.addSkill(enchant4Skill, false);
+					update = true;
+				}
+			}
+			
+			item.applyEnchantStats();
+			
+			final SkillHolder[] skills = it.getSkills();
+			
+			if (skills != null) {
+				for (SkillHolder skillInfo : skills) {
+					if (skillInfo == null) {
+						continue;
+					}
+					
+					itemSkill = skillInfo.getSkill();
+					
+					if (itemSkill != null) {
+						itemSkill.setReferenceItemId(item.getId());
+						player.addSkill(itemSkill, false);
+						
+						if (itemSkill.isActive()) {
+							if (!player.hasSkillReuse(itemSkill.getReuseHashCode())) {
+								int equipDelay = item.getEquipReuseDelay();
+								if (equipDelay > 0) {
+									player.addTimeStamp(itemSkill, equipDelay);
+									player.disableSkill(itemSkill, equipDelay);
+								}
+							}
+							updateTimeStamp = true;
+						}
+						update = true;
+					} else {
+						LOG.warn("Inventory.ItemSkillsListener.Weapon: Incorrect skill: {}.", skillInfo);
+					}
+				}
+			}
+			
+			if (update) {
+				player.sendSkillList();
+				
+				if (updateTimeStamp) {
+					player.sendPacket(new SkillCoolTime(player));
+				}
+			}
+		}
+	}
+	
+	private static final class ArmorSetListener implements PaperdollListener {
+		private static final ArmorSetListener instance = new ArmorSetListener();
+		
+		public static ArmorSetListener getInstance() {
+			return instance;
+		}
+		
+		@Override
+		public void notifyEquiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (!(inventory.getOwner() instanceof L2PcInstance player)) {
+				return;
+			}
+			
+			// Checks if player is wearing a chest item
+			final L2ItemInstance chestItem = inventory.getPaperdollItem(PAPERDOLL_CHEST);
+			
+			if (chestItem == null) {
+				return;
+			}
+			
+			// Checks for armor set for the equipped chest.
+			if (!ArmorSetsData.getInstance().isArmorSet(chestItem.getId())) {
+				return;
+			}
+			final L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getId());
+			boolean update = false;
+			boolean updateTimeStamp = false;
+			// Checks if equipped item is part of set
+			if (armorSet.containItem(slot, item.getId())) {
+				if (armorSet.containAll(player)) {
+					Skill itemSkill;
+					final List<SkillHolder> skills = armorSet.getSkills();
+					
+					if (skills != null) {
+						for (SkillHolder holder : skills) {
+							
+							itemSkill = holder.getSkill();
+							if (itemSkill != null) {
+								player.addSkill(itemSkill, false);
+								
+								if (itemSkill.isActive()) {
+									if (!player.hasSkillReuse(itemSkill.getReuseHashCode())) {
+										int equipDelay = item.getEquipReuseDelay();
+										if (equipDelay > 0) {
+											player.addTimeStamp(itemSkill, equipDelay);
+											player.disableSkill(itemSkill, equipDelay);
+										}
+									}
+									updateTimeStamp = true;
+								}
+								update = true;
+							} else {
+								LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+							}
+						}
+					}
+					
+					if (armorSet.containShield(player)) // has shield from set
+					{
+						for (SkillHolder holder : armorSet.getShieldSkillId()) {
+							if (holder.getSkill() != null) {
+								player.addSkill(holder.getSkill(), false);
+								update = true;
+							} else {
+								LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+							}
+						}
+					}
+					
+					if (armorSet.isEnchanted6(player)) // has all parts of set enchanted to 6 or more
+					{
+						for (SkillHolder holder : armorSet.getEnchant6skillId()) {
+							if (holder.getSkill() != null) {
+								player.addSkill(holder.getSkill(), false);
+								update = true;
+							} else {
+								LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+							}
+						}
+					}
+				}
+			} else if (armorSet.containShield(item.getId())) {
+				for (SkillHolder holder : armorSet.getShieldSkillId()) {
+					if (holder.getSkill() != null) {
+						player.addSkill(holder.getSkill(), false);
+						update = true;
+					} else {
+						LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+					}
+				}
+			}
+			
+			if (update) {
+				player.sendSkillList();
+				
+				if (updateTimeStamp) {
+					player.sendPacket(new SkillCoolTime(player));
+				}
+			}
+		}
+		
+		@Override
+		public void notifyUnequiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (!(inventory.getOwner() instanceof L2PcInstance player)) {
+				return;
+			}
+			
+			boolean remove = false;
+			Skill itemSkill;
+			List<SkillHolder> skills = null;
+			List<SkillHolder> shieldSkill = null; // shield skill
+			List<SkillHolder> skillId6 = null; // enchant +6 skill
+			
+			if (slot == PAPERDOLL_CHEST) {
+				if (!ArmorSetsData.getInstance().isArmorSet(item.getId())) {
+					return;
+				}
+				final L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(item.getId());
+				remove = true;
+				skills = armorSet.getSkills();
+				shieldSkill = armorSet.getShieldSkillId();
+				skillId6 = armorSet.getEnchant6skillId();
+			} else {
+				L2ItemInstance chestItem = inventory.getPaperdollItem(PAPERDOLL_CHEST);
+				if (chestItem == null) {
+					return;
+				}
+				
+				L2ArmorSet armorSet = ArmorSetsData.getInstance().getSet(chestItem.getId());
+				if (armorSet == null) {
+					return;
+				}
+				
+				if (armorSet.containItem(slot, item.getId())) // removed part of set
+				{
+					remove = true;
+					skills = armorSet.getSkills();
+					shieldSkill = armorSet.getShieldSkillId();
+					skillId6 = armorSet.getEnchant6skillId();
+				} else if (armorSet.containShield(item.getId())) // removed shield
+				{
+					remove = true;
+					shieldSkill = armorSet.getShieldSkillId();
+				}
+			}
+			
+			if (remove) {
+				if (skills != null) {
+					for (SkillHolder holder : skills) {
+						itemSkill = holder.getSkill();
+						if (itemSkill != null) {
+							player.removeSkill(itemSkill, false, itemSkill.isPassive());
+						} else {
+							LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+						}
+					}
+				}
+				
+				if (shieldSkill != null) {
+					for (SkillHolder holder : shieldSkill) {
+						itemSkill = holder.getSkill();
+						if (itemSkill != null) {
+							player.removeSkill(itemSkill, false, itemSkill.isPassive());
+						} else {
+							LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+						}
+					}
+				}
+				
+				if (skillId6 != null) {
+					for (SkillHolder holder : skillId6) {
+						itemSkill = holder.getSkill();
+						if (itemSkill != null) {
+							player.removeSkill(itemSkill, false, itemSkill.isPassive());
+						} else {
+							LOG.warn("Inventory.ArmorSetListener: Incorrect skill: {}.", holder);
+						}
+					}
+				}
+				
+				player.checkItemRestriction();
+				player.sendSkillList();
+			}
+		}
+	}
+	
+	private static final class BraceletListener implements PaperdollListener {
+		private static final BraceletListener instance = new BraceletListener();
+		
+		public static BraceletListener getInstance() {
+			return instance;
+		}
+		
+		@Override
+		public void notifyUnequiped(int slot, L2ItemInstance item, Inventory inventory) {
+			if (item.getItem().getBodyPart() == L2Item.SLOT_R_BRACELET) {
+				inventory.unEquipItemInSlot(PAPERDOLL_DECO1);
+				inventory.unEquipItemInSlot(PAPERDOLL_DECO2);
+				inventory.unEquipItemInSlot(PAPERDOLL_DECO3);
+				inventory.unEquipItemInSlot(PAPERDOLL_DECO4);
+				inventory.unEquipItemInSlot(PAPERDOLL_DECO5);
+				inventory.unEquipItemInSlot(PAPERDOLL_DECO6);
+			}
+		}
+		
+		// Note (April 3, 2009): Currently on equip, talismans do not display properly, do we need checks here to fix this?
+		@Override
+		public void notifyEquiped(int slot, L2ItemInstance item, Inventory inventory) {
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java
new file mode 100644
index 00000000..08558dcc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcRefund.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author DS
+ */
+public class PcRefund extends ItemContainer {
+	private static final Logger LOG = LoggerFactory.getLogger(PcRefund.class);
+	
+	private final L2PcInstance _owner;
+	
+	public PcRefund(L2PcInstance owner) {
+		_owner = owner;
+	}
+	
+	@Override
+	public String getName() {
+		return "Refund";
+	}
+	
+	@Override
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	@Override
+	public ItemLocation getBaseLocation() {
+		return ItemLocation.REFUND;
+	}
+	
+	@Override
+	protected void addItem(L2ItemInstance item) {
+		super.addItem(item);
+		try {
+			if (getSize() > 12) {
+				L2ItemInstance removedItem = _items.removeFirst();
+				if (removedItem != null) {
+					ItemTable.getInstance().destroyItem("ClearRefund", removedItem, getOwner(), null);
+					removedItem.updateDatabase(true);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("addItem()", e);
+		}
+	}
+	
+	@Override
+	public void refreshWeight() {
+	}
+	
+	@Override
+	public void deleteMe() {
+		try {
+			for (L2ItemInstance item : _items) {
+				if (item != null) {
+					ItemTable.getInstance().destroyItem("ClearRefund", item, getOwner(), null);
+					item.updateDatabase(true);
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("deleteMe()", e);
+		}
+		_items.clear();
+	}
+	
+	@Override
+	public void restore() {
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java
new file mode 100644
index 00000000..dfd80a18
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PcWarehouse.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PcWarehouse extends Warehouse {
+	
+	private final L2PcInstance _owner;
+	
+	public PcWarehouse(L2PcInstance owner) {
+		_owner = owner;
+	}
+	
+	@Override
+	public String getName() {
+		return "Warehouse";
+	}
+	
+	@Override
+	public L2PcInstance getOwner() {
+		return _owner;
+	}
+	
+	@Override
+	public ItemLocation getBaseLocation() {
+		return ItemLocation.WAREHOUSE;
+	}
+	
+	@Override
+	public boolean validateCapacity(long slots) {
+		return ((_items.size() + slots) <= _owner.getWareHouseLimit());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java
new file mode 100644
index 00000000..f3e21a26
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/PetInventory.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class PetInventory extends Inventory {
+	private final L2PetInstance _owner;
+	
+	public PetInventory(L2PetInstance owner) {
+		_owner = owner;
+	}
+	
+	@Override
+	public L2PetInstance getOwner() {
+		return _owner;
+	}
+	
+	@Override
+	public int getOwnerId() {
+		// gets the L2PcInstance-owner's ID
+		int id;
+		try {
+			id = _owner.getOwner().getObjectId();
+		} catch (NullPointerException e) {
+			return 0;
+		}
+		return id;
+	}
+	
+	/**
+	 * Refresh the weight of equipment loaded
+	 */
+	@Override
+	protected void refreshWeight() {
+		super.refreshWeight();
+		getOwner().updateAndBroadcastStatus(1);
+	}
+	
+	public boolean validateCapacity(L2ItemInstance item) {
+		int slots = 0;
+		
+		if (!(item.isStackable() && (getItemByItemId(item.getId()) != null)) && !item.getItem().hasExImmediateEffect()) {
+			slots++;
+		}
+		
+		return validateCapacity(slots);
+	}
+	
+	@Override
+	public boolean validateCapacity(long slots) {
+		return ((_items.size() + slots) <= _owner.getInventoryLimit());
+	}
+	
+	public boolean validateWeight(L2ItemInstance item, long count) {
+		int weight = 0;
+		L2Item template = ItemTable.getInstance().getTemplate(item.getId());
+		if (template == null) {
+			return false;
+		}
+		weight += count * template.getWeight();
+		return validateWeight(weight);
+	}
+	
+	@Override
+	public boolean validateWeight(long weight) {
+		return ((_totalWeight + weight) <= _owner.getMaxLoad());
+	}
+	
+	@Override
+	protected ItemLocation getBaseLocation() {
+		return ItemLocation.PET;
+	}
+	
+	@Override
+	protected ItemLocation getEquipLocation() {
+		return ItemLocation.PET_EQUIP;
+	}
+	
+	@Override
+	public void restore() {
+		super.restore();
+		// check for equipped items from other pets
+		for (L2ItemInstance item : _items) {
+			if (item.isEquipped()) {
+				if (!item.getItem().checkCondition(getOwner(), getOwner(), false)) {
+					unEquipItemInSlot(item.getLocationSlot());
+				}
+			}
+		}
+	}
+	
+	public void transferItemsToOwner() {
+		for (L2ItemInstance item : _items) {
+			getOwner().transferItem("return", item.getObjectId(), item.getCount(), getOwner().getOwner().getInventory(), getOwner().getOwner(), getOwner());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Warehouse.java b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Warehouse.java
new file mode 100644
index 00000000..123154f0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/itemcontainer/Warehouse.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.itemcontainer;
+
+/**
+ * @since 2005/04/06 16:13:42
+ */
+public abstract class Warehouse extends ItemContainer {
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/L2Armor.java b/src/main/java/com/l2jserver/gameserver/model/items/L2Armor.java
new file mode 100644
index 00000000..c78c70b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/L2Armor.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.type.ArmorType;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * This class is dedicated to the management of armors.
+ */
+public final class L2Armor extends L2Item {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Armor.class);
+	
+	/**
+	 * Skill that activates when armor is enchanted +4.
+	 */
+	private SkillHolder _enchant4Skill = null;
+	
+	private ArmorType _type;
+	
+	/**
+	 * Constructor for Armor.
+	 * @param set the StatsSet designating the set of couples (key,value) characterizing the armor.
+	 */
+	public L2Armor(StatsSet set) {
+		super(set);
+		_type = set.getEnum("armor_type", ArmorType.class, ArmorType.NONE);
+		
+		int _bodyPart = getBodyPart();
+		if ((_bodyPart == L2Item.SLOT_NECK) || ((_bodyPart & L2Item.SLOT_L_EAR) != 0) || ((_bodyPart & L2Item.SLOT_L_FINGER) != 0) || ((_bodyPart & L2Item.SLOT_R_BRACELET) != 0) || ((_bodyPart & L2Item.SLOT_L_BRACELET) != 0)) {
+			_type1 = ItemType1.WEAPON_RING_EARRING_NECKLACE;
+			_type2 = ItemType2.ACCESSORY;
+		} else {
+			if ((_type == ArmorType.NONE) && (getBodyPart() == L2Item.SLOT_L_HAND)) {
+				_type = ArmorType.SHIELD;
+			}
+			_type1 = ItemType1.SHIELD_ARMOR;
+			_type2 = ItemType2.SHIELD_ARMOR;
+		}
+		
+		String skill = set.getString("enchant4_skill", null);
+		if (skill != null) {
+			String[] info = skill.split("-");
+			
+			if (info.length == 2) {
+				int id = 0;
+				int level = 0;
+				try {
+					id = Integer.parseInt(info[0]);
+					level = Integer.parseInt(info[1]);
+				} catch (Exception nfe) {
+					// Incorrect syntax, don't add new skill
+					LOG.warn("Couldn't parse {} in armor enchant skills! item {}!", skill, this);
+				}
+				if ((id > 0) && (level > 0)) {
+					_enchant4Skill = new SkillHolder(id, level);
+				}
+			}
+		}
+	}
+	
+	@Override
+	public ArmorType getItemType() {
+		return _type;
+	}
+	
+	@Override
+	public int getItemMask() {
+		return getItemType().mask();
+	}
+	
+	@Override
+	public Skill getEnchant4Skill() {
+		if (_enchant4Skill == null) {
+			return null;
+		}
+		return _enchant4Skill.getSkill();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/L2EtcItem.java b/src/main/java/com/l2jserver/gameserver/model/items/L2EtcItem.java
new file mode 100644
index 00000000..f73ad9ee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/L2EtcItem.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2ExtractableProduct;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+
+/**
+ * This class is dedicated to the management of EtcItem.
+ */
+public final class L2EtcItem extends L2Item {
+	private static final Logger LOG = LoggerFactory.getLogger(L2EtcItem.class);
+	
+	private String _handler;
+	private EtcItemType _type;
+	private final boolean _isBlessed;
+	private final List<L2ExtractableProduct> _extractableItems;
+	
+	/**
+	 * Constructor for EtcItem.
+	 * @param set StatsSet designating the set of couples (key,value) for description of the Etc
+	 */
+	public L2EtcItem(StatsSet set) {
+		super(set);
+		_type = set.getEnum("etcitem_type", EtcItemType.class, EtcItemType.NONE);
+		
+		// l2j custom - L2EtcItemType.SHOT
+		switch (getDefaultAction()) {
+			case SOULSHOT, SUMMON_SOULSHOT, SUMMON_SPIRITSHOT, SPIRITSHOT -> _type = EtcItemType.SHOT;
+		}
+		
+		_type1 = ItemType1.ITEM_QUESTITEM_ADENA;
+		_type2 = ItemType2.OTHER; // default is other
+		
+		if (isQuestItem()) {
+			_type2 = ItemType2.QUEST;
+		} else if ((getId() == Inventory.ADENA_ID) || (getId() == Inventory.ANCIENT_ADENA_ID)) {
+			_type2 = ItemType2.MONEY;
+		}
+		
+		_handler = set.getString("handler", null); // ! null !
+		_isBlessed = set.getBoolean("blessed", false);
+		
+		// Extractable
+		String capsuled_items = set.getString("capsuled_items", null);
+		if (capsuled_items != null) {
+			String[] split = capsuled_items.split(";");
+			_extractableItems = new ArrayList<>(split.length);
+			for (String part : split) {
+				if (part.trim().isEmpty()) {
+					continue;
+				}
+				String[] data = part.split(",");
+				if (data.length != 4) {
+					LOG.warn("Couldn't parse {} in capsuled_items! item {}!", part, this);
+					continue;
+				}
+				int itemId = Integer.parseInt(data[0]);
+				int min = Integer.parseInt(data[1]);
+				int max = Integer.parseInt(data[2]);
+				double chance = Double.parseDouble(data[3]);
+				if (max < min) {
+					LOG.warn("Max amount < Min amount in {}, item {}!", part, this);
+					continue;
+				}
+				L2ExtractableProduct product = new L2ExtractableProduct(itemId, min, max, chance);
+				_extractableItems.add(product);
+			}
+			((ArrayList<?>) _extractableItems).trimToSize();
+			
+			// check for handler
+			if (_handler == null) {
+				LOG.warn("Item {} define capsuled_items but missing handler!", this);
+				_handler = "ExtractableItems";
+			}
+		} else {
+			_extractableItems = null;
+		}
+	}
+	
+	/**
+	 * @return the type of Etc Item.
+	 */
+	@Override
+	public EtcItemType getItemType() {
+		return _type;
+	}
+	
+	/**
+	 * @return the ID of the Etc item after applying the mask.
+	 */
+	@Override
+	public int getItemMask() {
+		return getItemType().mask();
+	}
+	
+	/**
+	 * @return the handler name, null if no handler for item.
+	 */
+	public String getHandlerName() {
+		return _handler;
+	}
+	
+	/**
+	 * @return {@code true} if the item is blessed, {@code false} otherwise.
+	 */
+	public boolean isBlessed() {
+		return _isBlessed;
+	}
+	
+	/**
+	 * @return the extractable items list.
+	 */
+	public List<L2ExtractableProduct> getExtractableItems() {
+		return _extractableItems;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/L2Henna.java b/src/main/java/com/l2jserver/gameserver/model/items/L2Henna.java
new file mode 100644
index 00000000..08df4e16
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/L2Henna.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.base.ClassId;
+
+/**
+ * Class for the Henna object.
+ * @author Zoey76
+ */
+public class L2Henna {
+	private final int _dyeId;
+	private final String _dyeName;
+	private final int _dyeItemId;
+	private final int _str;
+	private final int _con;
+	private final int _dex;
+	private final int _int;
+	private final int _men;
+	private final int _wit;
+	private final int _wear_fee;
+	private final int _wear_count;
+	private final int _cancel_fee;
+	private final int _cancel_count;
+	private final List<ClassId> _wear_class;
+	
+	public L2Henna(StatsSet set) {
+		_dyeId = set.getInt("dyeId");
+		_dyeName = set.getString("dyeName");
+		_dyeItemId = set.getInt("dyeItemId");
+		_str = set.getInt("str");
+		_con = set.getInt("con");
+		_dex = set.getInt("dex");
+		_int = set.getInt("int");
+		_men = set.getInt("men");
+		_wit = set.getInt("wit");
+		_wear_fee = set.getInt("wear_fee");
+		_wear_count = set.getInt("wear_count");
+		_cancel_fee = set.getInt("cancel_fee");
+		_cancel_count = set.getInt("cancel_count");
+		_wear_class = new ArrayList<>();
+	}
+	
+	/**
+	 * @return the dye Id.
+	 */
+	public int getDyeId() {
+		return _dyeId;
+	}
+	
+	/**
+	 * @return the dye server-side name.
+	 */
+	public String getDyeName() {
+		return _dyeName;
+	}
+	
+	/**
+	 * @return the item Id, required for this dye.
+	 */
+	public int getDyeItemId() {
+		return _dyeItemId;
+	}
+	
+	/**
+	 * @return the STR stat.
+	 */
+	public int getStatSTR() {
+		return _str;
+	}
+	
+	/**
+	 * @return the CON stat.
+	 */
+	public int getStatCON() {
+		return _con;
+	}
+	
+	/**
+	 * @return the DEX stat.
+	 */
+	public int getStatDEX() {
+		return _dex;
+	}
+	
+	/**
+	 * @return the INT stat.
+	 */
+	public int getStatINT() {
+		return _int;
+	}
+	
+	/**
+	 * @return the MEN stat.
+	 */
+	public int getStatMEN() {
+		return _men;
+	}
+	
+	/**
+	 * @return the WIT stat.
+	 */
+	public int getStatWIT() {
+		return _wit;
+	}
+	
+	/**
+	 * @return the wear fee, cost for adding this dye to the player.
+	 */
+	public int getWearFee() {
+		return _wear_fee;
+	}
+	
+	/**
+	 * @return the wear count, the required count to add this dye to the player.
+	 */
+	public int getWearCount() {
+		return _wear_count;
+	}
+	
+	/**
+	 * @return the cancel fee, cost for removing this dye from the player.
+	 */
+	public int getCancelFee() {
+		return _cancel_fee;
+	}
+	
+	/**
+	 * @return the cancel count, the retrieved amount of dye items after removing the dye.
+	 */
+	public int getCancelCount() {
+		return _cancel_count;
+	}
+	
+	/**
+	 * @return the list with the allowed classes to wear this dye.
+	 */
+	public List<ClassId> getAllowedWearClass() {
+		return _wear_class;
+	}
+	
+	/**
+	 * @param c the class trying to wear this dye.
+	 * @return {@code true} if the player is allowed to wear this dye, {@code false} otherwise.
+	 */
+	public boolean isAllowedClass(ClassId c) {
+		return _wear_class.contains(c);
+	}
+	
+	/**
+	 * @param wearClassIds the list of classes that can wear this dye.
+	 */
+	public void setWearClassIds(List<ClassId> wearClassIds) {
+		_wear_class.addAll(wearClassIds);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/L2Item.java b/src/main/java/com/l2jserver/gameserver/model/items/L2Item.java
new file mode 100644
index 00000000..1e61f429
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/L2Item.java
@@ -0,0 +1,805 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.ActionType;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.items.type.MaterialType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This class contains all information concerning the item (weapon, armor, etc).<BR>
+ * Mother class of :
+ * <ul>
+ * <li>L2Armor</li>
+ * <li>L2EtcItem</li>
+ * <li>L2Weapon</li>
+ * </ul>
+ */
+public abstract class L2Item extends ListenersContainer implements IIdentifiable {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Item.class);
+	
+	public static final int SLOT_NONE = 0x0000;
+	public static final int SLOT_UNDERWEAR = 0x0001;
+	public static final int SLOT_R_EAR = 0x0002;
+	public static final int SLOT_L_EAR = 0x0004;
+	public static final int SLOT_LR_EAR = 0x00006;
+	public static final int SLOT_NECK = 0x0008;
+	public static final int SLOT_R_FINGER = 0x0010;
+	public static final int SLOT_L_FINGER = 0x0020;
+	public static final int SLOT_LR_FINGER = 0x0030;
+	public static final int SLOT_HEAD = 0x0040;
+	public static final int SLOT_R_HAND = 0x0080;
+	public static final int SLOT_L_HAND = 0x0100;
+	public static final int SLOT_GLOVES = 0x0200;
+	public static final int SLOT_CHEST = 0x0400;
+	public static final int SLOT_LEGS = 0x0800;
+	public static final int SLOT_FEET = 0x1000;
+	public static final int SLOT_BACK = 0x2000;
+	public static final int SLOT_LR_HAND = 0x4000;
+	public static final int SLOT_FULL_ARMOR = 0x8000;
+	public static final int SLOT_HAIR = 0x010000;
+	public static final int SLOT_ALLDRESS = 0x020000;
+	public static final int SLOT_HAIR2 = 0x040000;
+	public static final int SLOT_HAIRALL = 0x080000;
+	public static final int SLOT_R_BRACELET = 0x100000;
+	public static final int SLOT_L_BRACELET = 0x200000;
+	public static final int SLOT_DECO = 0x400000;
+	public static final int SLOT_BELT = 0x10000000;
+	public static final int SLOT_WOLF = -100;
+	public static final int SLOT_HATCHLING = -101;
+	public static final int SLOT_STRIDER = -102;
+	public static final int SLOT_BABYPET = -103;
+	public static final int SLOT_GREATWOLF = -104;
+	
+	public static final int SLOT_MULTI_ALLWEAPON = SLOT_LR_HAND | SLOT_R_HAND;
+	
+	private final int _itemId;
+	private final int _displayId;
+	private final String _name;
+	private final String _icon;
+	private final int _weight;
+	private final boolean _stackable;
+	private final MaterialType _materialType;
+	private final CrystalType _crystalType;
+	private final int _equipReuseDelay;
+	private final int _duration;
+	private final int _time;
+	private final int _autoDestroyTime;
+	private final int _bodyPart;
+	private final int _referencePrice;
+	private final int _crystalCount;
+	private final boolean _sellable;
+	private final boolean _droppable;
+	private final boolean _destroyable;
+	private final boolean _tradeable;
+	private final boolean _depositable;
+	private final int _enchantable;
+	private final boolean _elementable;
+	private final boolean _questItem;
+	private final boolean _freightable;
+	private final boolean _allow_self_resurrection;
+	private final boolean _is_oly_restricted;
+	private final boolean _for_npc;
+	private final boolean _common;
+	private final boolean _heroItem;
+	private final boolean _pvpItem;
+	private final boolean _immediate_effect;
+	private final boolean _ex_immediate_effect;
+	private final int _defaultEnchantLevel;
+	private final ActionType _defaultAction;
+	
+	protected ItemType1 _type1; // needed for item list (inventory)
+	protected ItemType2 _type2; // different lists for armor, weapon, etc
+	protected Elementals[] _elementals = null;
+	protected List<FuncTemplate> _funcTemplates;
+	protected List<Condition> _preConditions;
+	private SkillHolder[] _skillHolder;
+	private SkillHolder _unequipSkill = null;
+	
+	private final int _useSkillDisTime;
+	private final int _reuseDelay;
+	private final int _sharedReuseGroup;
+	
+	/**
+	 * Constructor of the L2Item that fill class variables.<BR>
+	 * <BR>
+	 * @param set : StatsSet corresponding to a set of couples (key,value) for description of the item
+	 */
+	protected L2Item(StatsSet set) {
+		_itemId = set.getInt("item_id");
+		_displayId = set.getInt("displayId", _itemId);
+		_name = set.getString("name");
+		_icon = set.getString("icon", null);
+		_weight = set.getInt("weight", 0);
+		_materialType = set.getEnum("material", MaterialType.class, MaterialType.STEEL);
+		_equipReuseDelay = set.getInt("equip_reuse_delay", 0) * 1000;
+		_duration = set.getInt("duration", -1);
+		_time = set.getInt("time", -1);
+		_autoDestroyTime = set.getInt("auto_destroy_time", -1) * 1000;
+		_bodyPart = ItemTable.SLOTS.get(set.getString("bodypart", "none"));
+		_referencePrice = set.getInt("price", 0);
+		_crystalType = set.getEnum("crystal_type", CrystalType.class, CrystalType.NONE);
+		_crystalCount = set.getInt("crystal_count", 0);
+		
+		_stackable = set.getBoolean("is_stackable", false);
+		_sellable = set.getBoolean("is_sellable", true);
+		_droppable = set.getBoolean("is_droppable", true);
+		_destroyable = set.getBoolean("is_destroyable", true);
+		_tradeable = set.getBoolean("is_tradable", true);
+		_depositable = set.getBoolean("is_depositable", true);
+		_elementable = set.getBoolean("element_enabled", false);
+		_enchantable = set.getInt("enchant_enabled", 0);
+		_questItem = set.getBoolean("is_questitem", false);
+		_freightable = set.getBoolean("is_freightable", false);
+		_allow_self_resurrection = set.getBoolean("allow_self_resurrection", false);
+		_is_oly_restricted = set.getBoolean("is_oly_restricted", false);
+		_for_npc = set.getBoolean("for_npc", false);
+		
+		_immediate_effect = set.getBoolean("immediate_effect", false);
+		_ex_immediate_effect = set.getBoolean("ex_immediate_effect", false);
+		
+		_defaultAction = set.getEnum("default_action", ActionType.class, ActionType.NONE);
+		_useSkillDisTime = set.getInt("useSkillDisTime", 0);
+		_defaultEnchantLevel = set.getInt("enchanted", 0);
+		_reuseDelay = set.getInt("reuse_delay", 0);
+		_sharedReuseGroup = set.getInt("shared_reuse_group", 0);
+		
+		String skills = set.getString("item_skill", null);
+		if (skills != null) {
+			String[] skillsSplit = skills.split(";");
+			_skillHolder = new SkillHolder[skillsSplit.length];
+			int used = 0;
+			
+			for (String element : skillsSplit) {
+				try {
+					String[] skillSplit = element.split("-");
+					int id = Integer.parseInt(skillSplit[0]);
+					int level = Integer.parseInt(skillSplit[1]);
+					
+					if (id == 0) {
+						LOG.info("Ignoring item_skill({}) for item {}. Skill id is 0!", element, this);
+						continue;
+					}
+					
+					if (level == 0) {
+						LOG.info("Ignoring item_skill({}) for item {}. Skill level is 0!", element, this);
+						continue;
+					}
+					
+					_skillHolder[used] = new SkillHolder(id, level);
+					++used;
+				} catch (Exception ex) {
+					LOG.warn("Failed to parse item_skill({}) for item {}! Format: SkillId0-SkillLevel0[;SkillIdN-SkillLevelN]", element, this);
+				}
+			}
+			
+			// this is only loading? just don't leave a null or use a collection?
+			if (used != _skillHolder.length) {
+				SkillHolder[] skillHolder = new SkillHolder[used];
+				System.arraycopy(_skillHolder, 0, skillHolder, 0, used);
+				_skillHolder = skillHolder;
+			}
+		}
+		
+		skills = set.getString("unequip_skill", null);
+		if (skills != null) {
+			String[] info = skills.split("-");
+			if (info.length == 2) {
+				int id = 0;
+				int level = 0;
+				try {
+					id = Integer.parseInt(info[0]);
+					level = Integer.parseInt(info[1]);
+				} catch (Exception nfe) {
+					// Incorrect syntax, don't add new skill
+					LOG.warn("Couldn't parse {} in weapon unequip skills! item {}!", skills, this);
+				}
+				if ((id > 0) && (level > 0)) {
+					_unequipSkill = new SkillHolder(id, level);
+				}
+			}
+		}
+		
+		_common = ((_itemId >= 11605) && (_itemId <= 12361));
+		_heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842);
+		_pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024))
+			|| ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220));
+	}
+	
+	/**
+	 * Returns the itemType.
+	 * @return Enum
+	 */
+	public abstract ItemType getItemType();
+	
+	/**
+	 * Verifies if the item is a magic weapon.
+	 * @return {@code true} if the weapon is magic, {@code false} otherwise
+	 */
+	public boolean isMagicWeapon() {
+		return false;
+	}
+	
+	/**
+	 * @return the _equipReuseDelay
+	 */
+	public int getEquipReuseDelay() {
+		return _equipReuseDelay;
+	}
+	
+	/**
+	 * Returns the duration of the item
+	 * @return int
+	 */
+	public final int getDuration() {
+		return _duration;
+	}
+	
+	/**
+	 * Returns the time of the item
+	 * @return int
+	 */
+	public final int getTime() {
+		return _time;
+	}
+	
+	/**
+	 * @return the auto destroy time of the item in seconds: 0 or less - default
+	 */
+	public final int getAutoDestroyTime() {
+		return _autoDestroyTime;
+	}
+	
+	/**
+	 * Returns the ID of the item
+	 * @return int
+	 */
+	@Override
+	public final int getId() {
+		return _itemId;
+	}
+	
+	/**
+	 * Returns the ID of the item
+	 * @return int
+	 */
+	public final int getDisplayId() {
+		return _displayId;
+	}
+	
+	/**
+	 * @return the ID of the item after applying the mask
+	 */
+	public abstract int getItemMask();
+	
+	/**
+	 * Return the type of material of the item
+	 * @return MaterialType
+	 */
+	public final MaterialType getMaterialType() {
+		return _materialType;
+	}
+	
+	/**
+	 * Returns the type 2 of the item
+	 * @return ItemType2
+	 */
+	public final ItemType2 getType2() {
+		return _type2;
+	}
+	
+	/**
+	 * Returns the weight of the item
+	 * @return int
+	 */
+	public final int getWeight() {
+		return _weight;
+	}
+	
+	/**
+	 * Returns if the item is crystallizable
+	 * @return boolean
+	 */
+	public final boolean isCrystallizable() {
+		return (_crystalType != CrystalType.NONE) && (_crystalCount > 0);
+	}
+	
+	/**
+	 * Return the type of crystal if item is crystallizable
+	 * @return CrystalType
+	 */
+	public final CrystalType getCrystalType() {
+		return _crystalType;
+	}
+	
+	/**
+	 * Return the ID of crystal if item is crystallizable
+	 * @return int
+	 */
+	public final int getCrystalItemId() {
+		return _crystalType.getCrystalId();
+	}
+	
+	/**
+	 * Returns the grade of the item.<BR>
+	 * <BR>
+	 * <U><I>Concept :</I></U><BR>
+	 * In fact, this function returns the type of crystal of the item.
+	 * @return CrystalType
+	 */
+	public final CrystalType getItemGrade() {
+		return getCrystalType();
+	}
+	
+	/**
+	 * For grades S80 and S84 return S
+	 * @return the grade of the item.
+	 */
+	public final CrystalType getItemGradeSPlus() {
+		return switch (getItemGrade()) {
+			case S80, S84 -> CrystalType.S;
+			default -> getItemGrade();
+		};
+	}
+	
+	/**
+	 * @return the quantity of crystals for crystallization.
+	 */
+	public final int getCrystalCount() {
+		return _crystalCount;
+	}
+	
+	/**
+	 * @param enchantLevel
+	 * @return the quantity of crystals for crystallization on specific enchant level
+	 */
+	public final int getCrystalCount(int enchantLevel) {
+		if (enchantLevel > 3) {
+			return switch (_type2) {
+				case SHIELD_ARMOR, ACCESSORY -> _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * ((3 * enchantLevel) - 6));
+				case WEAPON -> _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * ((2 * enchantLevel) - 3));
+				default -> _crystalCount;
+			};
+		} else if (enchantLevel > 0) {
+			return switch (_type2) {
+				case SHIELD_ARMOR, ACCESSORY -> _crystalCount + (getCrystalType().getCrystalEnchantBonusArmor() * enchantLevel);
+				case WEAPON -> _crystalCount + (getCrystalType().getCrystalEnchantBonusWeapon() * enchantLevel);
+				default -> _crystalCount;
+			};
+		} else {
+			return _crystalCount;
+		}
+	}
+	
+	public final String getName() {
+		return _name;
+	}
+	
+	/**
+	 * @return the base elemental of the item.
+	 */
+	public final Elementals[] getElementals() {
+		return _elementals;
+	}
+	
+	public Elementals getElemental(byte attribute) {
+		for (Elementals elm : _elementals) {
+			if (elm.getElement() == attribute) {
+				return elm;
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Sets the base elemental of the item.
+	 * @param element the element to set.
+	 */
+	public void setElementals(Elementals element) {
+		if (_elementals == null) {
+			_elementals = new Elementals[1];
+			_elementals[0] = element;
+		} else {
+			Elementals elm = getElemental(element.getElement());
+			if (elm != null) {
+				elm.setValue(element.getValue());
+			} else {
+				elm = element;
+				Elementals[] array = new Elementals[_elementals.length + 1];
+				System.arraycopy(_elementals, 0, array, 0, _elementals.length);
+				array[_elementals.length] = elm;
+				_elementals = array;
+			}
+		}
+	}
+	
+	/**
+	 * @return the part of the body used with the item.
+	 */
+	public final int getBodyPart() {
+		return _bodyPart;
+	}
+	
+	/**
+	 * @return the type 1 of the item.
+	 */
+	public final ItemType1 getType1() {
+		return _type1;
+	}
+	
+	/**
+	 * @return {@code true} if the item is stackable, {@code false} otherwise.
+	 */
+	public final boolean isStackable() {
+		return _stackable;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be equipped, {@code false} otherwise.
+	 */
+	public boolean isEquipable() {
+		return (getBodyPart() != 0) && !(getItemType() instanceof EtcItemType);
+	}
+	
+	/**
+	 * @return the price of reference of the item.
+	 */
+	public final int getReferencePrice() {
+		return _referencePrice;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be sold, {@code false} otherwise.
+	 */
+	public final boolean isSellable() {
+		return _sellable;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be dropped, {@code false} otherwise.
+	 */
+	public final boolean isDroppable() {
+		return _droppable;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be destroyed, {@code false} otherwise.
+	 */
+	public final boolean isDestroyable() {
+		return _destroyable;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be traded, {@code false} otherwise.
+	 */
+	public final boolean isTradeable() {
+		return _tradeable;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be put into warehouse, {@code false} otherwise.
+	 */
+	public final boolean isDepositable() {
+		return _depositable;
+	}
+	
+	/**
+	 * This method also check the enchant blacklist.
+	 * @return {@code true} if the item can be enchanted, {@code false} otherwise.
+	 */
+	public final int isEnchantable() {
+		return character().getEnchantBlacklist().contains(getId()) ? 0 : _enchantable;
+	}
+	
+	/**
+	 * @return {@code true} if the item can be elemented, {@code false} otherwise.
+	 */
+	public final boolean isElementable() {
+		return _elementable;
+	}
+	
+	/**
+	 * Returns if item is common
+	 * @return boolean
+	 */
+	public final boolean isCommon() {
+		return _common;
+	}
+	
+	/**
+	 * Returns if item is hero-only
+	 * @return
+	 */
+	public final boolean isHeroItem() {
+		return _heroItem;
+	}
+	
+	/**
+	 * Returns if item is pvp
+	 * @return
+	 */
+	public final boolean isPvpItem() {
+		return _pvpItem;
+	}
+	
+	public boolean isPotion() {
+		return (getItemType() == EtcItemType.POTION);
+	}
+	
+	public boolean isElixir() {
+		return (getItemType() == EtcItemType.ELIXIR);
+	}
+	
+	public boolean isScroll() {
+		return (getItemType() == EtcItemType.SCROLL);
+	}
+	
+	/**
+	 * Get the functions used by this item.
+	 * @param item : L2ItemInstance pointing out the item
+	 * @param player : L2Character pointing out the player
+	 * @return the list of functions
+	 */
+	public final List<AbstractFunction> getStatFuncs(L2ItemInstance item, L2Character player) {
+		if ((_funcTemplates == null) || _funcTemplates.isEmpty()) {
+			return Collections.emptyList();
+		}
+		
+		final List<AbstractFunction> funcs = new ArrayList<>(_funcTemplates.size());
+		for (FuncTemplate t : _funcTemplates) {
+			AbstractFunction f = t.getFunc(player, player, item, item);
+			if (f != null) {
+				funcs.add(f);
+			}
+		}
+		return funcs;
+	}
+	
+	/**
+	 * Add the FuncTemplate f to the list of functions used with the item
+	 * @param f : FuncTemplate to add
+	 */
+	public void attach(FuncTemplate f) {
+		switch (f.getStat()) {
+			case FIRE_RES, FIRE_POWER -> setElementals(new Elementals(Elementals.FIRE, (int) f.getValue()));
+			case WATER_RES, WATER_POWER -> setElementals(new Elementals(Elementals.WATER, (int) f.getValue()));
+			case WIND_RES, WIND_POWER -> setElementals(new Elementals(Elementals.WIND, (int) f.getValue()));
+			case EARTH_RES, EARTH_POWER -> setElementals(new Elementals(Elementals.EARTH, (int) f.getValue()));
+			case HOLY_RES, HOLY_POWER -> setElementals(new Elementals(Elementals.HOLY, (int) f.getValue()));
+			case DARK_RES, DARK_POWER -> setElementals(new Elementals(Elementals.DARK, (int) f.getValue()));
+		}
+		
+		if (_funcTemplates == null) {
+			_funcTemplates = new ArrayList<>(1);
+		}
+		_funcTemplates.add(f);
+	}
+	
+	public final void attach(Condition c) {
+		if (_preConditions == null) {
+			_preConditions = new ArrayList<>(1);
+		}
+		if (!_preConditions.contains(c)) {
+			_preConditions.add(c);
+		}
+	}
+	
+	public boolean hasSkills() {
+		return _skillHolder != null;
+	}
+	
+	/**
+	 * Method to retrieve skills linked to this item armor and weapon: passive skills etcitem: skills used on item use <-- ???
+	 * @return Skills linked to this item as SkillHolder[]
+	 */
+	public final SkillHolder[] getSkills() {
+		return _skillHolder;
+	}
+	
+	/**
+	 * @return skill that activates, when player unequip this weapon or armor
+	 */
+	public final Skill getUnequipSkill() {
+		return _unequipSkill == null ? null : _unequipSkill.getSkill();
+	}
+	
+	public boolean checkCondition(L2Character activeChar, L2Object object, boolean sendMessage) {
+		if (activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !general().gmItemRestriction()) {
+			return true;
+		}
+		
+		// Don't allow hero equipment and restricted items during Olympiad
+		if ((isOlyRestrictedItem() || isHeroItem()) && ((activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode())) {
+			if (isEquipable()) {
+				activeChar.sendPacket(SystemMessageId.THIS_ITEM_CANT_BE_EQUIPPED_FOR_THE_OLYMPIAD_EVENT);
+			} else {
+				activeChar.sendPacket(SystemMessageId.THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT);
+			}
+			return false;
+		}
+		
+		if (!isConditionAttached()) {
+			return true;
+		}
+		
+		final L2Character target = (object instanceof L2Character) ? (L2Character) object : null;
+		for (Condition preCondition : _preConditions) {
+			if (preCondition == null) {
+				continue;
+			}
+			
+			if (!preCondition.test(activeChar, target, null, null)) {
+				if (activeChar instanceof L2Summon) {
+					activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
+					return false;
+				}
+				
+				if (sendMessage) {
+					String msg = preCondition.getMessage();
+					int msgId = preCondition.getMessageId();
+					if (msg != null) {
+						activeChar.sendMessage(msg);
+					} else if (msgId != 0) {
+						SystemMessage sm = SystemMessage.getSystemMessage(msgId);
+						if (preCondition.isAddName()) {
+							sm.addItemName(_itemId);
+						}
+						activeChar.sendPacket(sm);
+					}
+				}
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public boolean isConditionAttached() {
+		return (_preConditions != null) && !_preConditions.isEmpty();
+	}
+	
+	public boolean isQuestItem() {
+		return _questItem;
+	}
+	
+	public boolean isFreightable() {
+		return _freightable;
+	}
+	
+	public boolean isAllowSelfResurrection() {
+		return _allow_self_resurrection;
+	}
+	
+	public boolean isOlyRestrictedItem() {
+		return _is_oly_restricted || olympiad().getRestrictedItems().contains(_itemId);
+	}
+	
+	public boolean isForNpc() {
+		return _for_npc;
+	}
+	
+	/**
+	 * Returns the name of the item followed by the item ID.
+	 * @return the name and the ID of the item
+	 */
+	@Override
+	public String toString() {
+		return _name + "(" + _itemId + ")";
+	}
+	
+	/**
+	 * Verifies if the item has effects immediately.<br>
+	 * <i>Used for herbs mostly.</i>
+	 * @return {@code true} if the item applies effects immediately, {@code false} otherwise
+	 */
+	public boolean hasExImmediateEffect() {
+		return _ex_immediate_effect;
+	}
+	
+	/**
+	 * Verifies if the item has effects immediately.
+	 * @return {@code true} if the item applies effects immediately, {@code false} otherwise
+	 */
+	public boolean hasImmediateEffect() {
+		return _immediate_effect;
+	}
+	
+	/**
+	 * @return the _default_action
+	 */
+	public ActionType getDefaultAction() {
+		return _defaultAction;
+	}
+	
+	public int useSkillDisTime() {
+		return _useSkillDisTime;
+	}
+	
+	/**
+	 * Gets the item reuse delay time in seconds.
+	 * @return the reuse delay time
+	 */
+	public int getReuseDelay() {
+		return _reuseDelay;
+	}
+	
+	/**
+	 * Gets the shared reuse group.<br>
+	 * Items with the same reuse group will render reuse delay upon those items when used.
+	 * @return the shared reuse group
+	 */
+	public int getSharedReuseGroup() {
+		return _sharedReuseGroup;
+	}
+	
+	/**
+	 * Usable in HTML windows.
+	 * @return the icon link in client files
+	 */
+	public String getIcon() {
+		return _icon;
+	}
+	
+	public int getDefaultEnchantLevel() {
+		return _defaultEnchantLevel;
+	}
+	
+	public boolean isPetItem() {
+		return getItemType() == EtcItemType.PET_COLLAR;
+	}
+	
+	/**
+	 * @return skill that player get when has equipped armor +4 or more
+	 */
+	public Skill getEnchant4Skill() {
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/L2WarehouseItem.java b/src/main/java/com/l2jserver/gameserver/model/items/L2WarehouseItem.java
new file mode 100644
index 00000000..959e285a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/L2WarehouseItem.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.items.type.ItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+
+/**
+ * Item instance.
+ * @since 2005/04/06 18:25:18
+ */
+public class L2WarehouseItem {
+	private final L2Item _item;
+	private final int _object;
+	private final long _count;
+	private final int _owner;
+	private final int _locationSlot;
+	private final int _enchant;
+	private final CrystalType _grade;
+	private final boolean _isAugmented;
+	private int _augmentationId;
+	private final int _customType1;
+	private final int _customType2;
+	private final int _mana;
+	
+	private final int _elemAtkType;
+	private final int _elemAtkPower;
+	
+	private final int[] _elemDefAttr = {
+		0,
+		0,
+		0,
+		0,
+		0,
+		0
+	};
+	
+	private final int[] _enchantOptions;
+	
+	private final int _time;
+	
+	public L2WarehouseItem(L2ItemInstance item) {
+		_item = item.getItem();
+		_object = item.getObjectId();
+		_count = item.getCount();
+		_owner = item.getOwnerId();
+		_locationSlot = item.getLocationSlot();
+		_enchant = item.getEnchantLevel();
+		_customType1 = item.getCustomType1();
+		_customType2 = item.getCustomType2();
+		_grade = item.getItem().getItemGrade();
+		if (item.isAugmented()) {
+			_isAugmented = true;
+			_augmentationId = item.getAugmentation().getAugmentationId();
+		} else {
+			_isAugmented = false;
+		}
+		_mana = item.getMana();
+		_time = item.isTimeLimitedItem() ? (int) (item.getRemainingTime() / 1000) : -1;
+		
+		_elemAtkType = item.getAttackElementType();
+		_elemAtkPower = item.getAttackElementPower();
+		for (byte i = 0; i < 6; i++) {
+			_elemDefAttr[i] = item.getElementDefAttr(i);
+		}
+		_enchantOptions = item.getEnchantOptions();
+	}
+	
+	/**
+	 * @return the item.
+	 */
+	public L2Item getItem() {
+		return _item;
+	}
+	
+	/**
+	 * @return the unique objectId.
+	 */
+	public final int getObjectId() {
+		return _object;
+	}
+	
+	/**
+	 * @return the owner.
+	 */
+	public final int getOwnerId() {
+		return _owner;
+	}
+	
+	/**
+	 * @return the location slot.
+	 */
+	public final int getLocationSlot() {
+		return _locationSlot;
+	}
+	
+	/**
+	 * @return the count.
+	 */
+	public final long getCount() {
+		return _count;
+	}
+	
+	/**
+	 * @return the first type.
+	 */
+	public final ItemType1 getType1() {
+		return _item.getType1();
+	}
+	
+	/**
+	 * @return the second type.
+	 */
+	public final ItemType2 getType2() {
+		return _item.getType2();
+	}
+	
+	/**
+	 * @return the second type.
+	 */
+	public final ItemType getItemType() {
+		return _item.getItemType();
+	}
+	
+	/**
+	 * @return the ItemId.
+	 */
+	public final int getItemId() {
+		return _item.getId();
+	}
+	
+	/**
+	 * @return the part of body used with this item.
+	 */
+	public final int getBodyPart() {
+		return _item.getBodyPart();
+	}
+	
+	/**
+	 * @return the enchant level.
+	 */
+	public final int getEnchantLevel() {
+		return _enchant;
+	}
+	
+	/**
+	 * @return the item grade
+	 */
+	public final CrystalType getItemGrade() {
+		return _grade;
+	}
+	
+	/**
+	 * @return {@code true} if the item is a weapon, {@code false} otherwise.
+	 */
+	public final boolean isWeapon() {
+		return (_item instanceof L2Weapon);
+	}
+	
+	/**
+	 * @return {@code true} if the item is an armor, {@code false} otherwise.
+	 */
+	public final boolean isArmor() {
+		return (_item instanceof L2Armor);
+	}
+	
+	/**
+	 * @return {@code true} if the item is an etc item, {@code false} otherwise.
+	 */
+	public final boolean isEtcItem() {
+		return (_item instanceof L2EtcItem);
+	}
+	
+	/**
+	 * @return the name of the item
+	 */
+	public String getItemName() {
+		return _item.getName();
+	}
+	
+	/**
+	 * @return {@code true} if the item is augmented, {@code false} otherwise.
+	 */
+	public boolean isAugmented() {
+		return _isAugmented;
+	}
+	
+	/**
+	 * @return the augmentation If.
+	 */
+	public int getAugmentationId() {
+		return _augmentationId;
+	}
+	
+	/**
+	 * @return the name of the item
+	 */
+	public String getName() {
+		return _item.getName();
+	}
+	
+	public final int getCustomType1() {
+		return _customType1;
+	}
+	
+	public final int getCustomType2() {
+		return _customType2;
+	}
+	
+	public final int getMana() {
+		return _mana;
+	}
+	
+	public int getAttackElementType() {
+		return _elemAtkType;
+	}
+	
+	public int getAttackElementPower() {
+		return _elemAtkPower;
+	}
+	
+	public int getElementDefAttr(byte i) {
+		return _elemDefAttr[i];
+	}
+	
+	public int[] getEnchantOptions() {
+		return _enchantOptions;
+	}
+	
+	public int getTime() {
+		return _time;
+	}
+	
+	/**
+	 * @return the name of the item
+	 */
+	@Override
+	public String toString() {
+		return _item.toString();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/L2Weapon.java b/src/main/java/com/l2jserver/gameserver/model/items/L2Weapon.java
new file mode 100644
index 00000000..fe4ffceb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/L2Weapon.java
@@ -0,0 +1,361 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import java.util.List;
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.conditions.ConditionGameChance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillSee;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Weapon template.
+ */
+public final class L2Weapon extends L2Item {
+	private static final Logger LOG = LoggerFactory.getLogger(L2Weapon.class);
+	
+	private final WeaponType _type;
+	private final boolean _isMagicWeapon;
+	private final int _rndDam;
+	private final int _soulShotCount;
+	private final int _spiritShotCount;
+	private final int _mpConsume;
+	private final int _baseAttackRange;
+	private final int _baseAttackAngle;
+	/**
+	 * Skill that activates when item is enchanted +4 (for duals).
+	 */
+	private SkillHolder _enchant4Skill = null;
+	private final int _changeWeaponId;
+	
+	// Attached skills for Special Abilities
+	private SkillHolder _skillsOnMagic;
+	private Condition _skillsOnMagicCondition = null;
+	private SkillHolder _skillsOnCrit;
+	private Condition _skillsOnCritCondition = null;
+	
+	private final int _reducedSoulshot;
+	private final int _reducedSoulshotChance;
+	
+	private final int _reducedMpConsume;
+	private final int _reducedMpConsumeChance;
+	
+	private final boolean _isForceEquip;
+	private final boolean _isAttackWeapon;
+	private final boolean _useWeaponSkillsOnly;
+	
+	public L2Weapon(StatsSet set) {
+		super(set);
+		_type = WeaponType.valueOf(set.getString("weapon_type", "none").toUpperCase());
+		_type1 = ItemType1.WEAPON_RING_EARRING_NECKLACE;
+		_type2 = ItemType2.WEAPON;
+		_isMagicWeapon = set.getBoolean("is_magic_weapon", false);
+		_soulShotCount = set.getInt("soulshots", 0);
+		_spiritShotCount = set.getInt("spiritshots", 0);
+		_rndDam = set.getInt("random_damage", 0);
+		_mpConsume = set.getInt("mp_consume", 0);
+		_baseAttackRange = set.getInt("attack_range", 40);
+		String[] damgeRange = set.getString("damage_range", "").split(";"); // 0?;0?;fan sector;base attack angle
+		if ((damgeRange.length > 1) && Util.isDigit(damgeRange[3])) {
+			_baseAttackAngle = Integer.parseInt(damgeRange[3]);
+		} else {
+			_baseAttackAngle = 120;
+		}
+		
+		String[] reduced_soulshots = set.getString("reduced_soulshot", "").split(",");
+		_reducedSoulshotChance = (reduced_soulshots.length == 2) ? Integer.parseInt(reduced_soulshots[0]) : 0;
+		_reducedSoulshot = (reduced_soulshots.length == 2) ? Integer.parseInt(reduced_soulshots[1]) : 0;
+		
+		String[] reduced_mpconsume = set.getString("reduced_mp_consume", "").split(",");
+		_reducedMpConsumeChance = (reduced_mpconsume.length == 2) ? Integer.parseInt(reduced_mpconsume[0]) : 0;
+		_reducedMpConsume = (reduced_mpconsume.length == 2) ? Integer.parseInt(reduced_mpconsume[1]) : 0;
+		
+		String skill = set.getString("enchant4_skill", null);
+		if (skill != null) {
+			String[] info = skill.split("-");
+			
+			if (info.length == 2) {
+				int id = 0;
+				int level = 0;
+				try {
+					id = Integer.parseInt(info[0]);
+					level = Integer.parseInt(info[1]);
+				} catch (Exception nfe) {
+					// Incorrect syntax, don't add new skill
+					LOG.warn("Couldn't parse {} in weapon enchant skills! item {}!", skill, this);
+				}
+				if ((id > 0) && (level > 0)) {
+					_enchant4Skill = new SkillHolder(id, level);
+				}
+			}
+		}
+		
+		skill = set.getString("onmagic_skill", null);
+		if (skill != null) {
+			String[] info = skill.split("-");
+			final int chance = set.getInt("onmagic_chance", 100);
+			if (info.length == 2) {
+				int id = 0;
+				int level = 0;
+				try {
+					id = Integer.parseInt(info[0]);
+					level = Integer.parseInt(info[1]);
+				} catch (Exception nfe) {
+					// Incorrect syntax, don't add new skill
+					LOG.warn("Couldn't parse {} in weapon onmagic skills! item {}!", skill, this);
+				}
+				if ((id > 0) && (level > 0) && (chance > 0)) {
+					_skillsOnMagic = new SkillHolder(id, level);
+					_skillsOnMagicCondition = new ConditionGameChance(chance);
+				}
+			}
+		}
+		
+		skill = set.getString("oncrit_skill", null);
+		if (skill != null) {
+			String[] info = skill.split("-");
+			final int chance = set.getInt("oncrit_chance", 100);
+			if (info.length == 2) {
+				int id = 0;
+				int level = 0;
+				try {
+					id = Integer.parseInt(info[0]);
+					level = Integer.parseInt(info[1]);
+				} catch (Exception nfe) {
+					// Incorrect syntax, don't add new skill
+					LOG.warn("Couldn't parse {} in weapon oncrit skills! item {}!", skill, this);
+				}
+				if ((id > 0) && (level > 0) && (chance > 0)) {
+					_skillsOnCrit = new SkillHolder(id, level);
+					_skillsOnCritCondition = new ConditionGameChance(chance);
+				}
+			}
+		}
+		
+		_changeWeaponId = set.getInt("change_weaponId", 0);
+		_isForceEquip = set.getBoolean("isForceEquip", false);
+		_isAttackWeapon = set.getBoolean("isAttackWeapon", true);
+		_useWeaponSkillsOnly = set.getBoolean("useWeaponSkillsOnly", false);
+	}
+	
+	@Override
+	public WeaponType getItemType() {
+		return _type;
+	}
+	
+	/**
+	 * @return the ID of the Etc item after applying the mask.
+	 */
+	@Override
+	public int getItemMask() {
+		return getItemType().mask();
+	}
+	
+	@Override
+	public boolean isMagicWeapon() {
+		return _isMagicWeapon;
+	}
+	
+	public int getSoulShotCount() {
+		return _soulShotCount;
+	}
+	
+	public int getSpiritShotCount() {
+		return _spiritShotCount;
+	}
+	
+	public int getReducedSoulShot() {
+		return _reducedSoulshot;
+	}
+	
+	public int getReducedSoulShotChance() {
+		return _reducedSoulshotChance;
+	}
+	
+	public int getRandomDamage() {
+		return _rndDam;
+	}
+	
+	public int getMpConsume() {
+		return _mpConsume;
+	}
+	
+	public int getBaseAttackRange() {
+		return _baseAttackRange;
+	}
+	
+	public int getBaseAttackAngle() {
+		return _baseAttackAngle;
+	}
+	
+	public int getReducedMpConsume() {
+		return _reducedMpConsume;
+	}
+	
+	public int getReducedMpConsumeChance() {
+		return _reducedMpConsumeChance;
+	}
+	
+	@Override
+	public Skill getEnchant4Skill() {
+		if (_enchant4Skill == null) {
+			return null;
+		}
+		return _enchant4Skill.getSkill();
+	}
+	
+	public int getChangeWeaponId() {
+		return _changeWeaponId;
+	}
+	
+	public boolean isForceEquip() {
+		return _isForceEquip;
+	}
+	
+	public boolean isAttackWeapon() {
+		return _isAttackWeapon;
+	}
+	
+	public boolean useWeaponSkillsOnly() {
+		return _useWeaponSkillsOnly;
+	}
+	
+	/**
+	 * @param caster the L2Character pointing out the caster
+	 * @param target the L2Character pointing out the target
+	 */
+	public void castOnCriticalSkill(L2Character caster, L2Character target) {
+		if ((_skillsOnCrit == null)) {
+			return;
+		}
+		
+		final Skill onCritSkill = _skillsOnCrit.getSkill();
+		if (_skillsOnCritCondition != null) {
+			if (!_skillsOnCritCondition.test(caster, target, onCritSkill)) {
+				// Chance not met
+				return;
+			}
+		}
+		
+		if (!onCritSkill.checkCondition(caster, target, false)) {
+			// Skill condition not met
+			return;
+		}
+		onCritSkill.activateSkill(caster, target);
+	}
+	
+	/**
+	 * @param caster the L2Character pointing out the caster
+	 * @param target the L2Character pointing out the target
+	 * @param trigger the L2Skill pointing out the skill triggering this action
+	 */
+	public void castOnMagicSkill(L2Character caster, L2Character target, Skill trigger) {
+		if (_skillsOnMagic == null) {
+			return;
+		}
+		
+		final Skill onMagicSkill = _skillsOnMagic.getSkill();
+		
+		// Trigger only if both are good or bad magic.
+		if (trigger.isBad() != onMagicSkill.isBad()) {
+			return;
+		}
+		
+		// No Trigger if not Magic Skill
+		if (trigger.isMagic() != onMagicSkill.isMagic()) {
+			return;
+		}
+		
+		if (trigger.isToggle()) {
+			return;
+		}
+		
+		if (caster.getAI().getCastTarget() != target) {
+			return;
+		}
+		
+		if (_skillsOnMagicCondition != null) {
+			if (!_skillsOnMagicCondition.test(caster, target, onMagicSkill)) {
+				// Chance not met
+				return;
+			}
+		}
+		
+		if (!onMagicSkill.checkCondition(caster, target, false)) {
+			// Skill condition not met
+			return;
+		}
+		
+		if (onMagicSkill.isBad() && (Formulas.calcShldUse(caster, target, onMagicSkill) == Formulas.SHIELD_DEFENSE_PERFECT_BLOCK)) {
+			return;
+		}
+		
+		// Launch the magic skill and calculate its effects
+		// Get the skill handler corresponding to the skill type
+		onMagicSkill.activateSkill(caster, target);
+		
+		// notify quests of a skill use
+		if (caster instanceof L2PcInstance) {
+			caster.getKnownList()
+				.getKnownObjects()
+				.values()
+				.stream()
+				.filter(Objects::nonNull)
+				.filter(L2Object::isNpc)
+				.filter(npc -> Util.checkIfInRange(1000, npc, caster, false))
+				.forEach(npc -> EventDispatcher.getInstance().notifyEventAsync(new NpcSkillSee((L2Npc) npc, caster.getActingPlayer(), onMagicSkill, List.of(target), false), npc));
+		}
+		if (caster.isPlayer()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ACTIVATED);
+			sm.addSkillName(onMagicSkill);
+			caster.sendPacket(sm);
+		}
+	}
+	
+	public boolean isRange() {
+		return isBow() || isCrossBow();
+	}
+	
+	public boolean isBow() {
+		return _type == WeaponType.BOW;
+	}
+	
+	public boolean isCrossBow() {
+		return _type == WeaponType.CROSSBOW;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/PcItemTemplate.java b/src/main/java/com/l2jserver/gameserver/model/items/PcItemTemplate.java
new file mode 100644
index 00000000..27bf45d8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/PcItemTemplate.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author Zoey76
+ */
+public final class PcItemTemplate extends ItemHolder {
+	private final boolean _equipped;
+	
+	public PcItemTemplate(StatsSet set) {
+		super(set.getInt("id"), set.getInt("count"));
+		_equipped = set.getBoolean("equipped", false);
+	}
+	
+	public boolean isEquipped() {
+		return _equipped;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/AbstractEnchantItem.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/AbstractEnchantItem.java
new file mode 100644
index 00000000..0c71428d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author UnAfraid
+ */
+public abstract class AbstractEnchantItem {
+	
+	private static final ItemType[] ENCHANT_TYPES = new ItemType[] {
+		EtcItemType.ANCIENT_CRYSTAL_ENCHANT_AM,
+		EtcItemType.ANCIENT_CRYSTAL_ENCHANT_WP,
+		EtcItemType.BLESS_SCRL_ENCHANT_AM,
+		EtcItemType.BLESS_SCRL_ENCHANT_WP,
+		EtcItemType.SCRL_ENCHANT_AM,
+		EtcItemType.SCRL_ENCHANT_WP,
+		EtcItemType.SCRL_INC_ENCHANT_PROP_AM,
+		EtcItemType.SCRL_INC_ENCHANT_PROP_WP,
+	};
+	
+	private final int _id;
+	private final CrystalType _grade;
+	private final int _maxEnchantLevel;
+	private final double _bonusRate;
+	
+	public AbstractEnchantItem(StatsSet set) {
+		_id = set.getInt("id");
+		if (getItem() == null) {
+			throw new NullPointerException();
+		} else if (!Util.contains(ENCHANT_TYPES, getItem().getItemType())) {
+			throw new IllegalAccessError();
+		}
+		_grade = set.getEnum("targetGrade", CrystalType.class, CrystalType.NONE);
+		_maxEnchantLevel = set.getInt("maxEnchant", 65535);
+		_bonusRate = set.getDouble("bonusRate", 0);
+	}
+	
+	/**
+	 * @return id of current item
+	 */
+	public final int getId() {
+		return _id;
+	}
+	
+	/**
+	 * @return bonus chance that would be added
+	 */
+	public final double getBonusRate() {
+		return _bonusRate;
+	}
+	
+	/**
+	 * @return {@link L2Item} current item/scroll
+	 */
+	public final L2Item getItem() {
+		return ItemTable.getInstance().getTemplate(_id);
+	}
+	
+	/**
+	 * @return grade of the item/scroll.
+	 */
+	public final CrystalType getGrade() {
+		return _grade;
+	}
+	
+	/**
+	 * @return {@code true} if scroll is for weapon, {@code false} for armor
+	 */
+	public abstract boolean isWeapon();
+	
+	/**
+	 * @return the maximum enchant level that this scroll/item can be used with
+	 */
+	public int getMaxEnchantLevel() {
+		return _maxEnchantLevel;
+	}
+	
+	/**
+	 * @param itemToEnchant the item to be enchanted
+	 * @param supportItem the support item used when enchanting (can be null)
+	 * @return {@code true} if this support item can be used with the item to be enchanted, {@code false} otherwise
+	 */
+	public boolean isValid(L2ItemInstance itemToEnchant, EnchantSupportItem supportItem) {
+		if (itemToEnchant == null) {
+			return false;
+		} else if (itemToEnchant.isEnchantable() == 0) {
+			return false;
+		} else if (!isValidItemType(itemToEnchant.getItem().getType2())) {
+			return false;
+		} else if ((_maxEnchantLevel != 0) && (itemToEnchant.getEnchantLevel() > _maxEnchantLevel)) {
+			return false;
+		}
+		return _grade == itemToEnchant.getItem().getItemGradeSPlus();
+	}
+	
+	/**
+	 * @param type2 the type2 of the item to be enchanted
+	 * @return {@code true} if current type2 is valid to be enchanted, {@code false} otherwise
+	 */
+	private boolean isValidItemType(ItemType2 type2) {
+		if (type2 == ItemType2.WEAPON) {
+			return isWeapon();
+		} else if ((type2 == ItemType2.SHIELD_ARMOR) || (type2 == ItemType2.ACCESSORY)) {
+			return !isWeapon();
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantItemGroup.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantItemGroup.java
new file mode 100644
index 00000000..5097bcc5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantItemGroup.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.holders.RangeChanceHolder;
+
+/**
+ * @author UnAfraid
+ */
+public final class EnchantItemGroup {
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantItemGroup.class);
+	
+	private final List<RangeChanceHolder> _chances = new ArrayList<>();
+	private final String _name;
+	
+	public EnchantItemGroup(String name) {
+		_name = name;
+	}
+	
+	/**
+	 * @return name of current enchant item group.
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * @param holder
+	 */
+	public void addChance(RangeChanceHolder holder) {
+		_chances.add(holder);
+	}
+	
+	/**
+	 * @param index
+	 * @return chance for success rate for current enchant item group.
+	 */
+	public double getChance(int index) {
+		if (!_chances.isEmpty()) {
+			for (RangeChanceHolder holder : _chances) {
+				if ((holder.getMin() <= index) && (holder.getMax() >= index)) {
+					return holder.getChance();
+				}
+			}
+			LOG.warn("Couldn't match proper chance for item group: {}", _name, new IllegalStateException());
+			return _chances.getLast().getChance();
+		}
+		LOG.warn("Item group: {} doesn't have any chances!", _name);
+		return -1;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantRateItem.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantRateItem.java
new file mode 100644
index 00000000..e095a80f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantRateItem.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import com.l2jserver.gameserver.model.items.L2Item;
+
+/**
+ * @author UnAfraid
+ */
+public final class EnchantRateItem {
+	private final String _name;
+	private int _itemId;
+	private int _slot;
+	private Boolean _isMagicWeapon = null;
+	
+	public EnchantRateItem(String name) {
+		_name = name;
+	}
+	
+	/**
+	 * @return name of enchant group.
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Adds item id verification.
+	 * @param id
+	 */
+	public void setItemId(int id) {
+		_itemId = id;
+	}
+	
+	/**
+	 * Adds body slot verification.
+	 * @param slot
+	 */
+	public void addSlot(int slot) {
+		_slot |= slot;
+	}
+	
+	/**
+	 * Adds magic weapon verification.
+	 * @param magicWeapon
+	 */
+	public void setMagicWeapon(boolean magicWeapon) {
+		_isMagicWeapon = magicWeapon;
+	}
+	
+	/**
+	 * @param item
+	 * @return {@code true} if item can be used with this rate group, {@code false} otherwise.
+	 */
+	public boolean validate(L2Item item) {
+		if ((_itemId != 0) && (_itemId != item.getId())) {
+			return false;
+		} else if ((_slot != 0) && ((item.getBodyPart() & _slot) == 0)) {
+			return false;
+		}
+		return (_isMagicWeapon == null) || (item.isMagicWeapon() == _isMagicWeapon);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantResultType.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantResultType.java
new file mode 100644
index 00000000..19a08f2c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantResultType.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+/**
+ * @author UnAfraid
+ */
+public enum EnchantResultType {
+	ERROR,
+	SUCCESS,
+	FAILURE
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantScroll.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantScroll.java
new file mode 100644
index 00000000..9dc9a69a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantScroll.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemGroupsData;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType;
+import com.l2jserver.gameserver.network.Debug;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author UnAfraid
+ */
+public final class EnchantScroll extends AbstractEnchantItem {
+	private static final Logger LOG = LoggerFactory.getLogger(EnchantScroll.class);
+	
+	private final boolean _isWeapon;
+	private final boolean _isBlessed;
+	private final boolean _isSafe;
+	private final int _scrollGroupId;
+	private Set<Integer> _items;
+	
+	public EnchantScroll(StatsSet set) {
+		super(set);
+		_scrollGroupId = set.getInt("scrollGroupId", 0);
+		
+		final ItemType type = getItem().getItemType();
+		_isWeapon = (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_WP) || (type == EtcItemType.BLESS_SCRL_ENCHANT_WP) || (type == EtcItemType.SCRL_ENCHANT_WP);
+		_isBlessed = (type == EtcItemType.BLESS_SCRL_ENCHANT_AM) || (type == EtcItemType.BLESS_SCRL_ENCHANT_WP);
+		_isSafe = (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_WP);
+	}
+	
+	@Override
+	public boolean isWeapon() {
+		return _isWeapon;
+	}
+	
+	/**
+	 * @return {@code true} for blessed scrolls (enchanted item will remain on failure), {@code false} otherwise
+	 */
+	public boolean isBlessed() {
+		return _isBlessed;
+	}
+	
+	/**
+	 * @return {@code true} for safe-enchant scrolls (enchant level will remain on failure), {@code false} otherwise
+	 */
+	public boolean isSafe() {
+		return _isSafe;
+	}
+	
+	/**
+	 * @return id of scroll group that should be used
+	 */
+	public int getScrollGroupId() {
+		return _scrollGroupId;
+	}
+	
+	/**
+	 * Enforces current scroll to use only those items as possible items to enchant
+	 * @param itemId
+	 */
+	public void addItem(int itemId) {
+		if (_items == null) {
+			_items = new HashSet<>();
+		}
+		_items.add(itemId);
+	}
+	
+	/**
+	 * @param itemToEnchant the item to be enchanted
+	 * @param supportItem the support item used when enchanting (can be null)
+	 * @return {@code true} if this scroll can be used with the specified support item and the item to be enchanted, {@code false} otherwise
+	 */
+	@Override
+	public boolean isValid(L2ItemInstance itemToEnchant, EnchantSupportItem supportItem) {
+		if ((_items != null) && !_items.contains(itemToEnchant.getId())) {
+			return false;
+		} else if ((supportItem != null)) {
+			if (isBlessed()) {
+				return false;
+			} else if (!supportItem.isValid(itemToEnchant, supportItem)) {
+				return false;
+			} else if (supportItem.isWeapon() != isWeapon()) {
+				return false;
+			}
+		}
+		return super.isValid(itemToEnchant, supportItem);
+	}
+	
+	/**
+	 * @param player
+	 * @param enchantItem
+	 * @return the chance of current scroll's group.
+	 */
+	public double getChance(L2PcInstance player, L2ItemInstance enchantItem) {
+		if (EnchantItemGroupsData.getInstance().getScrollGroup(_scrollGroupId) == null) {
+			LOG.warn("Nonexistent enchant scroll group specified for enchant scroll: {}", getId());
+			return -1;
+		}
+		
+		final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId);
+		if (group == null) {
+			LOG.warn("Couldn't find enchant item group for scroll: {} requested by: {}", getId(), player);
+			return -1;
+		}
+		return group.getChance(enchantItem.getEnchantLevel());
+	}
+	
+	/**
+	 * @param player
+	 * @param enchantItem
+	 * @param supportItem
+	 * @return the total chance for success rate of this scroll
+	 */
+	public EnchantResultType calculateSuccess(L2PcInstance player, L2ItemInstance enchantItem, EnchantSupportItem supportItem) {
+		if (!isValid(enchantItem, supportItem)) {
+			return EnchantResultType.ERROR;
+		}
+		
+		final double chance = getChance(player, enchantItem);
+		if (chance == -1) {
+			return EnchantResultType.ERROR;
+		}
+		
+		final double bonusRate = getBonusRate();
+		final double supportBonusRate = (supportItem != null) ? supportItem.getBonusRate() : 0;
+		final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
+		
+		final double random = 100 * Rnd.nextDouble();
+		final boolean success = (random < finalChance);
+		
+		if (player.isDebug()) {
+			final EnchantItemGroup group = EnchantItemGroupsData.getInstance().getItemGroup(enchantItem.getItem(), _scrollGroupId);
+			final StatsSet set = new StatsSet();
+			if (isBlessed()) {
+				set.set("isBlessed", true);
+			}
+			if (isSafe()) {
+				set.set("isSafe", true);
+			}
+			set.set("chance", Util.formatDouble(chance, "#.##"));
+			if (bonusRate > 0) {
+				set.set("bonusRate", Util.formatDouble(bonusRate, "#.##"));
+			}
+			if (supportBonusRate > 0) {
+				set.set("supportBonusRate", Util.formatDouble(supportBonusRate, "#.##"));
+			}
+			set.set("finalChance", Util.formatDouble(finalChance, "#.##"));
+			set.set("random", Util.formatDouble(random, "#.##"));
+			set.set("success", success);
+			set.set("item group", group.getName());
+			set.set("scroll group", _scrollGroupId);
+			Debug.sendItemDebug(player, enchantItem, set);
+		}
+		return success ? EnchantResultType.SUCCESS : EnchantResultType.FAILURE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantScrollGroup.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantScrollGroup.java
new file mode 100644
index 00000000..75ee60ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantScrollGroup.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.items.L2Item;
+
+/**
+ * @author UnAfraid
+ */
+public final class EnchantScrollGroup {
+	private final int _id;
+	private List<EnchantRateItem> _rateGroups;
+	
+	public EnchantScrollGroup(int id) {
+		_id = id;
+	}
+	
+	/**
+	 * @return id of current enchant scroll group.
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Adds new rate group.
+	 * @param group
+	 */
+	public void addRateGroup(EnchantRateItem group) {
+		if (_rateGroups == null) {
+			_rateGroups = new ArrayList<>();
+		}
+		_rateGroups.add(group);
+	}
+	
+	/**
+	 * @return {@code List} of all enchant rate items, Empty list if none.
+	 */
+	public List<EnchantRateItem> getRateGroups() {
+		return _rateGroups != null ? _rateGroups : Collections.emptyList();
+	}
+	
+	/**
+	 * @param item
+	 * @return {@link EnchantRateItem}, {@code NULL} in case non of rate items can be used with.
+	 */
+	public EnchantRateItem getRateGroup(L2Item item) {
+		for (EnchantRateItem group : getRateGroups()) {
+			if (group.validate(item)) {
+				return group;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantSupportItem.java b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantSupportItem.java
new file mode 100644
index 00000000..fd1b6b92
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/enchant/EnchantSupportItem.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+
+/**
+ * @author UnAfraid
+ */
+public final class EnchantSupportItem extends AbstractEnchantItem {
+	private final boolean _isWeapon;
+	
+	public EnchantSupportItem(StatsSet set) {
+		super(set);
+		_isWeapon = getItem().getItemType() == EtcItemType.SCRL_INC_ENCHANT_PROP_WP;
+	}
+	
+	@Override
+	public boolean isWeapon() {
+		return _isWeapon;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java b/src/main/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java
new file mode 100644
index 00000000..c9f7fb7e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java
@@ -0,0 +1,1848 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+import static com.l2jserver.gameserver.model.items.type.EtcItemType.ARROW;
+import static com.l2jserver.gameserver.model.items.type.EtcItemType.SHOT;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.agathion.repository.AgathionRepository;
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemOptionsData;
+import com.l2jserver.gameserver.data.xml.impl.OptionData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.instancemanager.ItemsOnGroundManager;
+import com.l2jserver.gameserver.instancemanager.MercTicketManager;
+import com.l2jserver.gameserver.model.DropProtection;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.L2Augmentation;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.NullKnownList;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerAugment;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemDrop;
+import com.l2jserver.gameserver.model.events.impl.character.player.inventory.PlayerItemPickup;
+import com.l2jserver.gameserver.model.events.impl.item.ItemBypass;
+import com.l2jserver.gameserver.model.events.impl.item.ItemTalk;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.options.EnchantOptions;
+import com.l2jserver.gameserver.model.options.Options;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.DropItem;
+import com.l2jserver.gameserver.network.serverpackets.GetItem;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SpawnItem;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.GMAudit;
+
+public final class L2ItemInstance extends L2Object {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(L2ItemInstance.class);
+	
+	private static final Logger LOG_ITEM = LoggerFactory.getLogger("item");
+	
+	/** ID of the owner */
+	private int _ownerId;
+	
+	/** ID of who dropped the item last, used for knownlist */
+	private int _dropperObjectId = 0;
+	
+	/** Quantity of the item */
+	private long _count;
+	
+	/** Initial Quantity of the item */
+	private long _initCount;
+	
+	/** Remaining time (in milliseconds) */
+	private long _time;
+	
+	/** Quantity of the item can decrease */
+	private boolean _decrease = false;
+	
+	/** ID of the item */
+	private final int _itemId;
+	
+	/** Object L2Item associated to the item */
+	private final L2Item _item;
+	
+	/** Location of the item : Inventory, PaperDoll, WareHouse */
+	private ItemLocation _loc;
+	
+	/** Slot where item is stored : Paperdoll slot, inventory order ... */
+	private int _locData;
+	
+	/** Level of enchantment of the item */
+	private int _enchantLevel;
+	
+	/** Wear Item */
+	private boolean _wear;
+	
+	/** Augmented Item */
+	private L2Augmentation _augmentation = null;
+	
+	/** Shadow item */
+	private int _mana;
+	
+	private boolean _consumingMana = false;
+	
+	private static final int MANA_CONSUMPTION_RATE = 60000;
+	
+	/** Custom item types (used loto, race tickets) */
+	private int _type1;
+	
+	private int _type2;
+	
+	private long _dropTime;
+	
+	private boolean _published = false;
+	
+	private boolean _protected;
+	
+	public static final int UNCHANGED = 0;
+	
+	public static final int ADDED = 1;
+	
+	public static final int REMOVED = 3;
+	
+	public static final int MODIFIED = 2;
+	
+	public static final int[] DEFAULT_ENCHANT_OPTIONS = new int[] {
+		0,
+		0,
+		0
+	};
+	
+	private int _lastChange = 2; // 1 ??, 2 modified, 3 removed
+	
+	private boolean _existsInDb; // if a record exists in DB.
+	
+	private boolean _storedInDb; // if DB data is up-to-date.
+	
+	private final ReentrantLock _dbLock = new ReentrantLock();
+	
+	private Elementals[] _elementals = null;
+	
+	private ScheduledFuture<?> itemLootSchedule = null;
+	
+	private ScheduledFuture<?> _lifeTimeTask;
+	
+	private final DropProtection _dropProtection = new DropProtection();
+	
+	private int _shotsMask = 0;
+	
+	private final List<Options> _enchantOptions = new ArrayList<>();
+	
+	private int agathionEnergy;
+	
+	/**
+	 * Constructor of the L2ItemInstance from the objectId and the itemId.
+	 * @param objectId : int designating the ID of the object in the world
+	 * @param itemId : int designating the ID of the item
+	 */
+	public L2ItemInstance(int objectId, int itemId) {
+		super(objectId);
+		setInstanceType(InstanceType.L2ItemInstance);
+		_itemId = itemId;
+		_item = ItemTable.getInstance().getTemplate(itemId);
+		if ((_itemId == 0) || (_item == null)) {
+			throw new IllegalArgumentException();
+		}
+		super.setName(_item.getName());
+		setCount(1);
+		_loc = ItemLocation.VOID;
+		_type1 = 0;
+		_type2 = 0;
+		_dropTime = 0;
+		_mana = _item.getDuration();
+		_time = _item.getTime() == -1 ? -1 : System.currentTimeMillis() + ((long) _item.getTime() * 60 * 1000);
+		scheduleLifeTimeTask();
+		final var agathionInfo = AgathionRepository.getInstance().getByItemId(itemId);
+		agathionEnergy = agathionInfo == null ? 0 : agathionInfo.maxEnergy();
+	}
+	
+	/**
+	 * Constructor of the L2ItemInstance from the objetId and the description of the item given by the L2Item.
+	 * @param objectId : int designating the ID of the object in the world
+	 * @param item : L2Item containing information of the item
+	 */
+	public L2ItemInstance(int objectId, L2Item item) {
+		super(objectId);
+		setInstanceType(InstanceType.L2ItemInstance);
+		_itemId = item.getId();
+		_item = item;
+		if (_itemId == 0) {
+			throw new IllegalArgumentException();
+		}
+		super.setName(_item.getName());
+		setCount(1);
+		_loc = ItemLocation.VOID;
+		_mana = _item.getDuration();
+		_time = _item.getTime() == -1 ? -1 : System.currentTimeMillis() + ((long) _item.getTime() * 60 * 1000);
+		scheduleLifeTimeTask();
+		final var agathionInfo = AgathionRepository.getInstance().getByItemId(item.getId());
+		agathionEnergy = agathionInfo == null ? 0 : agathionInfo.maxEnergy();
+	}
+	
+	@Override
+	public void initKnownList() {
+		setKnownList(new NullKnownList(this));
+	}
+	
+	/**
+	 * Remove a L2ItemInstance from the world and send server->client GetItem packets.<BR>
+	 * <BR>
+	 * <B><U> Actions</U> :</B><BR>
+	 * <BR>
+	 * <li>Send a Server->Client Packet GetItem to player that pick up and its _knowPlayers member</li>
+	 * <li>Remove the L2Object from the world</li><BR>
+	 * <BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T REMOVE the object from _allObjects of L2World </B></FONT><BR>
+	 * <BR>
+	 * <B><U> Assert </U> :</B><BR>
+	 * <BR>
+	 * <li>this instanceof L2ItemInstance</li>
+	 * <li>_worldRegion != null <I>(L2Object is visible at the beginning)</I></li><BR>
+	 * <BR>
+	 * <B><U> Example of use </U> :</B><BR>
+	 * <BR>
+	 * <li>Do Pickup Item : PCInstance and Pet</li><BR>
+	 * <BR>
+	 * @param player Player that pick up the item
+	 */
+	public void pickupMe(L2Character player) {
+		assert getWorldRegion() != null;
+		
+		L2WorldRegion oldregion = getWorldRegion();
+		
+		// Create a server->client GetItem packet to pick up the L2ItemInstance
+		player.broadcastPacket(new GetItem(this, player.getObjectId()));
+		
+		synchronized (this) {
+			setIsVisible(false);
+			setWorldRegion(null);
+		}
+		
+		// if this item is a mercenary ticket, remove the spawns!
+		int itemId = getId();
+		
+		if (MercTicketManager.getInstance().getTicketCastleId(itemId) > 0) {
+			MercTicketManager.getInstance().removeTicket(this);
+			ItemsOnGroundManager.getInstance().removeObject(this);
+		}
+		
+		// outside of synchronized to avoid deadlocks
+		// Remove the L2ItemInstance from the world
+		L2World.getInstance().removeVisibleObject(this, oldregion);
+		
+		if (player.isPlayer()) {
+			// Notify to scripts
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerItemPickup(player.getActingPlayer(), this), player, getItem());
+		}
+	}
+	
+	/**
+	 * Sets the ownerID of the item
+	 * @param process : String Identifier of process triggering this action
+	 * @param owner_id : int designating the ID of the owner
+	 * @param creator : L2PcInstance Player requesting the item creation
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 */
+	public void setOwnerId(String process, int owner_id, L2PcInstance creator, Object reference) {
+		setOwnerId(owner_id);
+		
+		if (general().logItems()) {
+			if (!general().logItemsSmallLog() || (general().logItemsSmallLog() && (getItem().isEquipable() || (getItem().getId() == ADENA_ID)))) {
+				if ((getItemType() != ARROW) && (getItemType() != SHOT)) {
+					LOG_ITEM.info("SET_OWNER {} by {}, referenced by {}.", this, creator, reference);
+				}
+			}
+		}
+		
+		if (creator != null) {
+			if (creator.isGM()) {
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object) {
+					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+				} else if (reference instanceof String) {
+					referenceName = (String) reference;
+				}
+				String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				if (general().gmAudit()) {
+					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Sets the ownerID of the item
+	 * @param owner_id : int designating the ID of the owner
+	 */
+	public void setOwnerId(int owner_id) {
+		if (owner_id == _ownerId) {
+			return;
+		}
+		
+		// Remove any inventory skills from the old owner.
+		removeSkillsFromOwner();
+		
+		_ownerId = owner_id;
+		_storedInDb = false;
+		
+		// Give any inventory skills to the new owner only if the item is in inventory
+		// else the skills will be given when location is set to inventory.
+		giveSkillsToOwner();
+	}
+	
+	/**
+	 * Returns the ownerID of the item
+	 * @return int : ownerID of the item
+	 */
+	public int getOwnerId() {
+		return _ownerId;
+	}
+	
+	/**
+	 * Sets the location of the item
+	 * @param loc : ItemLocation (enumeration)
+	 */
+	public void setItemLocation(ItemLocation loc) {
+		setItemLocation(loc, 0);
+	}
+	
+	/**
+	 * Sets the location of the item.<BR>
+	 * <BR>
+	 * <U><I>Remark :</I></U> If loc and loc_data different from database, say datas not up-to-date
+	 * @param loc : ItemLocation (enumeration)
+	 * @param loc_data : int designating the slot where the item is stored or the village for freights
+	 */
+	public void setItemLocation(ItemLocation loc, int loc_data) {
+		if ((loc == _loc) && (loc_data == _locData)) {
+			return;
+		}
+		
+		// Remove any inventory skills from the old owner.
+		removeSkillsFromOwner();
+		
+		_loc = loc;
+		_locData = loc_data;
+		_storedInDb = false;
+		
+		// Give any inventory skills to the new owner only if the item is in inventory
+		// else the skills will be given when location is set to inventory.
+		giveSkillsToOwner();
+	}
+	
+	public ItemLocation getItemLocation() {
+		return _loc;
+	}
+	
+	/**
+	 * Sets the quantity of the item.
+	 * @param count the new count to set
+	 */
+	public void setCount(long count) {
+		if (getCount() == count) {
+			return;
+		}
+		
+		_count = count >= -1 ? count : 0;
+		_storedInDb = false;
+	}
+	
+	public long getCount() {
+		return _count;
+	}
+	
+	/**
+	 * Sets the quantity of the item.<BR>
+	 * <BR>
+	 * <U><I>Remark :</I></U> If loc and loc_data different from database, say datas not up-to-date
+	 * @param process : String Identifier of process triggering this action
+	 * @param count : int
+	 * @param creator : L2PcInstance Player requesting the item creation
+	 * @param reference : Object Object referencing current action like NPC selling item or previous item in transformation
+	 */
+	public void changeCount(String process, long count, L2PcInstance creator, Object reference) {
+		if (count == 0) {
+			return;
+		}
+		long old = getCount();
+		long max = getId() == ADENA_ID ? character().getMaxAdena() : Integer.MAX_VALUE;
+		
+		if ((count > 0) && (getCount() > (max - count))) {
+			setCount(max);
+		} else {
+			setCount(getCount() + count);
+		}
+		
+		if (getCount() < 0) {
+			setCount(0);
+		}
+		
+		_storedInDb = false;
+		
+		if (general().logItems() && (process != null)) {
+			if (!general().logItemsSmallLog() || (general().logItemsSmallLog() && (_item.isEquipable() || (_item.getId() == ADENA_ID)))) {
+				if ((getItemType() != ARROW) && (getItemType() != SHOT)) {
+					LOG_ITEM.info("CHANGED {} amount {} by {}, referenced by {}.", this, old, creator, reference);
+				}
+			}
+		}
+		
+		if (creator != null) {
+			if (creator.isGM()) {
+				String referenceName = "no-reference";
+				if (reference instanceof L2Object) {
+					referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
+				} else if (reference instanceof String) {
+					referenceName = (String) reference;
+				}
+				String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
+				if (general().gmAudit()) {
+					GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
+				}
+			}
+		}
+	}
+	
+	// No logging (function designed for shots only)
+	public void changeCountWithoutTrace(int count, L2PcInstance creator, Object reference) {
+		changeCount(null, count, creator, reference);
+	}
+	
+	/**
+	 * Return true if item can be enchanted
+	 * @return boolean
+	 */
+	public int isEnchantable() {
+		if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) {
+			return getItem().isEnchantable();
+		}
+		return 0;
+	}
+	
+	/**
+	 * Returns if item is equipable
+	 * @return boolean
+	 */
+	public boolean isEquipable() {
+		return !((_item.getBodyPart() == 0) || (_item.getItemType() == EtcItemType.ARROW) || (_item.getItemType() == EtcItemType.BOLT) || (_item.getItemType() == EtcItemType.LURE));
+	}
+	
+	/**
+	 * Returns if item is equipped
+	 * @return boolean
+	 */
+	public boolean isEquipped() {
+		return (_loc == ItemLocation.PAPERDOLL) || (_loc == ItemLocation.PET_EQUIP);
+	}
+	
+	/**
+	 * Returns the slot where the item is stored
+	 * @return int
+	 */
+	public int getLocationSlot() {
+		assert (_loc == ItemLocation.PAPERDOLL) || (_loc == ItemLocation.PET_EQUIP) || (_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.MAIL) || (_loc == ItemLocation.FREIGHT);
+		return _locData;
+	}
+	
+	/**
+	 * Returns the characteristics of the item
+	 * @return L2Item
+	 */
+	public L2Item getItem() {
+		return _item;
+	}
+	
+	public int getCustomType1() {
+		return _type1;
+	}
+	
+	public int getCustomType2() {
+		return _type2;
+	}
+	
+	public void setCustomType1(int newtype) {
+		_type1 = newtype;
+	}
+	
+	public void setCustomType2(int newtype) {
+		_type2 = newtype;
+	}
+	
+	public void setDropTime(long time) {
+		_dropTime = time;
+	}
+	
+	public long getDropTime() {
+		return _dropTime;
+	}
+	
+	/**
+	 * @return the type of item.
+	 */
+	public ItemType getItemType() {
+		return _item.getItemType();
+	}
+	
+	/**
+	 * Gets the item ID.
+	 * @return the item ID
+	 */
+	@Override
+	public int getId() {
+		return _itemId;
+	}
+	
+	/**
+	 * @return the display Id of the item.
+	 */
+	public int getDisplayId() {
+		return getItem().getDisplayId();
+	}
+	
+	/**
+	 * @return {@code true} if item is an EtcItem, {@code false} otherwise.
+	 */
+	public boolean isEtcItem() {
+		return (_item instanceof L2EtcItem);
+	}
+	
+	/**
+	 * @return {@code true} if item is a Weapon/Shield, {@code false} otherwise.
+	 */
+	public boolean isWeapon() {
+		return (_item instanceof L2Weapon);
+	}
+	
+	/**
+	 * @return {@code true} if item is an Armor, {@code false} otherwise.
+	 */
+	public boolean isArmor() {
+		return (_item instanceof L2Armor);
+	}
+	
+	/**
+	 * @return the characteristics of the L2EtcItem, {@code false} otherwise.
+	 */
+	public L2EtcItem getEtcItem() {
+		if (_item instanceof L2EtcItem) {
+			return (L2EtcItem) _item;
+		}
+		return null;
+	}
+	
+	/**
+	 * @return the characteristics of the L2Weapon.
+	 */
+	public L2Weapon getWeaponItem() {
+		if (_item instanceof L2Weapon) {
+			return (L2Weapon) _item;
+		}
+		return null;
+	}
+	
+	/**
+	 * @return the characteristics of the L2Armor.
+	 */
+	public L2Armor getArmorItem() {
+		if (_item instanceof L2Armor) {
+			return (L2Armor) _item;
+		}
+		return null;
+	}
+	
+	/**
+	 * @return the quantity of crystals for crystallization.
+	 */
+	public int getCrystalCount() {
+		return _item.getCrystalCount(_enchantLevel);
+	}
+	
+	/**
+	 * @return the reference price of the item.
+	 */
+	public int getReferencePrice() {
+		return _item.getReferencePrice();
+	}
+	
+	/**
+	 * @return the name of the item.
+	 */
+	public String getItemName() {
+		return _item.getName();
+	}
+	
+	/**
+	 * @return the reuse delay of this item.
+	 */
+	public int getReuseDelay() {
+		return _item.getReuseDelay();
+	}
+	
+	/**
+	 * @return the shared reuse item group.
+	 */
+	public int getSharedReuseGroup() {
+		return _item.getSharedReuseGroup();
+	}
+	
+	/**
+	 * @return the last change of the item
+	 */
+	public int getLastChange() {
+		return _lastChange;
+	}
+	
+	/**
+	 * Sets the last change of the item
+	 * @param lastChange : int
+	 */
+	public void setLastChange(int lastChange) {
+		_lastChange = lastChange;
+	}
+	
+	/**
+	 * Returns if item is stackable
+	 * @return boolean
+	 */
+	public boolean isStackable() {
+		return _item.isStackable();
+	}
+	
+	/**
+	 * Returns if item is droppable
+	 * @return boolean
+	 */
+	public boolean isDroppable() {
+		return !isAugmented() && _item.isDroppable();
+	}
+	
+	/**
+	 * Returns if item is destroyable
+	 * @return boolean
+	 */
+	public boolean isDestroyable() {
+		return _item.isDestroyable();
+	}
+	
+	/**
+	 * Returns if item is tradeable
+	 * @return boolean
+	 */
+	public boolean isTradeable() {
+		return !isAugmented() && _item.isTradeable();
+	}
+	
+	/**
+	 * Returns if item is sellable
+	 * @return boolean
+	 */
+	public boolean isSellable() {
+		return !isAugmented() && _item.isSellable();
+	}
+	
+	/**
+	 * @param isPrivateWareHouse
+	 * @return if item can be deposited in warehouse or freight
+	 */
+	public boolean isDepositable(boolean isPrivateWareHouse) {
+		// equipped, hero and quest items
+		if (isEquipped() || !_item.isDepositable()) {
+			return false;
+		}
+		if (!isPrivateWareHouse) {
+			// augmented not tradeable
+			return isTradeable() && !isShadowItem();
+		}
+		return true;
+	}
+	
+	public boolean isPotion() {
+		return _item.isPotion();
+	}
+	
+	public boolean isElixir() {
+		return _item.isElixir();
+	}
+	
+	public boolean isScroll() {
+		return _item.isScroll();
+	}
+	
+	public boolean isHeroItem() {
+		return _item.isHeroItem();
+	}
+	
+	public boolean isCommonItem() {
+		return _item.isCommon();
+	}
+	
+	/**
+	 * Returns whether this item is pvp or not
+	 * @return boolean
+	 */
+	public boolean isPvp() {
+		return _item.isPvpItem();
+	}
+	
+	public boolean isOlyRestrictedItem() {
+		return getItem().isOlyRestrictedItem();
+	}
+	
+	/**
+	 * @param player
+	 * @param allowAdena
+	 * @param allowNonTradeable
+	 * @return if item is available for manipulation
+	 */
+	public boolean isAvailable(L2PcInstance player, boolean allowAdena, boolean allowNonTradeable) {
+		return ((!isEquipped()) // Not equipped
+			&& (getItem().getType2() != ItemType2.QUEST) // Not Quest Item
+			&& ((getItem().getType2() != ItemType2.MONEY) || (getItem().getType1() != ItemType1.SHIELD_ARMOR)) // not money, not shield
+			&& (!player.hasSummon() || (getObjectId() != player.getSummon().getControlObjectId())) // Not Control item of currently summoned pet
+			&& (player.getActiveEnchantItemId() != getObjectId()) // Not momentarily used enchant scroll
+			&& (player.getActiveEnchantSupportItemId() != getObjectId()) // Not momentarily used enchant support item
+			&& (player.getActiveEnchantAttrItemId() != getObjectId()) // Not momentarily used enchant attribute item
+			&& (allowAdena || (getId() != Inventory.ADENA_ID)) // Not Adena
+			&& ((player.getCurrentSkill() == null) || (player.getCurrentSkill().getSkill().getItemConsumeId() != getId())) && (!player.isCastingSimultaneouslyNow() || (player.getLastSimultaneousSkillCast() == null) || (player.getLastSimultaneousSkillCast().getItemConsumeId() != getId()))
+			&& (allowNonTradeable || (isTradeable() && (!((getItem().getItemType() == EtcItemType.PET_COLLAR) && player.havePetInvItems())))));
+	}
+	
+	/**
+	 * Returns the level of enchantment of the item
+	 * @return int
+	 */
+	public int getEnchantLevel() {
+		return _enchantLevel;
+	}
+	
+	/**
+	 * @param enchantLevel the enchant value to set
+	 */
+	public void setEnchantLevel(int enchantLevel) {
+		if (_enchantLevel == enchantLevel) {
+			return;
+		}
+		clearEnchantStats();
+		_enchantLevel = enchantLevel;
+		applyEnchantStats();
+		_storedInDb = false;
+	}
+	
+	/**
+	 * Returns whether this item is augmented or not
+	 * @return true if augmented
+	 */
+	public boolean isAugmented() {
+		return _augmentation != null;
+	}
+	
+	/**
+	 * Returns the augmentation object for this item
+	 * @return augmentation
+	 */
+	public L2Augmentation getAugmentation() {
+		return _augmentation;
+	}
+	
+	/**
+	 * Sets a new augmentation
+	 * @param augmentation
+	 * @return return true if successful
+	 */
+	public boolean setAugmentation(L2Augmentation augmentation) {
+		// there shall be no previous augmentation..
+		if (_augmentation != null) {
+			LOG.warn("Augment set for {} by owner {}!", this, getActingPlayer());
+			return false;
+		}
+		
+		_augmentation = augmentation;
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			updateItemAttributes(con);
+		} catch (Exception ex) {
+			LOG.warn("Could not update atributes for item {} from database!", this, ex);
+		}
+		
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerAugment(getActingPlayer(), this, augmentation, true), getItem());
+		return true;
+	}
+	
+	public void removeAugmentation() {
+		if (_augmentation == null) {
+			return;
+		}
+		
+		// Copy augmentation before removing it.
+		final L2Augmentation augment = _augmentation;
+		_augmentation = null;
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM item_attributes WHERE itemId = ?")) {
+			ps.setInt(1, getObjectId());
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not remove augmentation for item {} from database!", this, ex);
+		}
+		
+		// Notify to scripts.
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerAugment(getActingPlayer(), this, augment, false), getItem());
+	}
+	
+	public void restoreAttributes() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement("SELECT augAttributes FROM item_attributes WHERE itemId=?");
+			var ps2 = con.prepareStatement("SELECT elemType,elemValue FROM item_elementals WHERE itemId=?")) {
+			ps1.setInt(1, getObjectId());
+			try (var rs = ps1.executeQuery()) {
+				if (rs.next()) {
+					int aug_attributes = rs.getInt(1);
+					if (aug_attributes != -1) {
+						_augmentation = new L2Augmentation(rs.getInt("augAttributes"));
+					}
+				}
+			}
+			
+			ps2.setInt(1, getObjectId());
+			try (var rs = ps2.executeQuery()) {
+				while (rs.next()) {
+					byte elem_type = rs.getByte(1);
+					int elem_value = rs.getInt(2);
+					if ((elem_type != -1) && (elem_value != -1)) {
+						applyAttribute(elem_type, elem_value);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not restore augmentation and elemental data for item {} from database!", this, ex);
+		}
+	}
+	
+	private void updateItemAttributes(Connection con) {
+		try (var ps = con.prepareStatement("REPLACE INTO item_attributes VALUES(?,?)")) {
+			ps.setInt(1, getObjectId());
+			ps.setInt(2, _augmentation != null ? _augmentation.getAttributes() : -1);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not update atributes for item {} from database!", this, ex);
+		}
+	}
+	
+	private void updateItemElements(Connection con) {
+		try (var ps = con.prepareStatement("DELETE FROM item_elementals WHERE itemId = ?")) {
+			ps.setInt(1, getObjectId());
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not update elementals for item {} from database!", this, ex);
+		}
+		
+		if (_elementals == null) {
+			return;
+		}
+		
+		try (var ps = con.prepareStatement("INSERT INTO item_elementals VALUES(?,?,?)")) {
+			for (Elementals elm : _elementals) {
+				ps.setInt(1, getObjectId());
+				ps.setByte(2, elm.getElement());
+				ps.setInt(3, elm.getValue());
+				ps.executeUpdate();
+				ps.clearParameters();
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not update elementals for item {} from database!", this, ex);
+		}
+	}
+	
+	public Elementals[] getElementals() {
+		return _elementals;
+	}
+	
+	public Elementals getElemental(byte attribute) {
+		if (_elementals == null) {
+			return null;
+		}
+		for (Elementals elm : _elementals) {
+			if (elm.getElement() == attribute) {
+				return elm;
+			}
+		}
+		return null;
+	}
+	
+	public byte getAttackElementType() {
+		if (!isWeapon()) {
+			return -2;
+		} else if (getItem().getElementals() != null) {
+			return getItem().getElementals()[0].getElement();
+		} else if (_elementals != null) {
+			return _elementals[0].getElement();
+		}
+		return -2;
+	}
+	
+	public int getAttackElementPower() {
+		if (!isWeapon()) {
+			return 0;
+		} else if (getItem().getElementals() != null) {
+			return getItem().getElementals()[0].getValue();
+		} else if (_elementals != null) {
+			return _elementals[0].getValue();
+		}
+		return 0;
+	}
+	
+	public int getElementDefAttr(byte element) {
+		if (!isArmor()) {
+			return 0;
+		} else if (getItem().getElementals() != null) {
+			Elementals elm = getItem().getElemental(element);
+			if (elm != null) {
+				return elm.getValue();
+			}
+		} else if (_elementals != null) {
+			Elementals elm = getElemental(element);
+			if (elm != null) {
+				return elm.getValue();
+			}
+		}
+		return 0;
+	}
+	
+	private void applyAttribute(byte element, int value) {
+		if (_elementals == null) {
+			_elementals = new Elementals[1];
+			_elementals[0] = new Elementals(element, value);
+		} else {
+			Elementals elm = getElemental(element);
+			if (elm != null) {
+				elm.setValue(value);
+			} else {
+				elm = new Elementals(element, value);
+				Elementals[] array = new Elementals[_elementals.length + 1];
+				System.arraycopy(_elementals, 0, array, 0, _elementals.length);
+				array[_elementals.length] = elm;
+				_elementals = array;
+			}
+		}
+	}
+	
+	/**
+	 * Add elemental attribute to item and save to db
+	 * @param element
+	 * @param value
+	 */
+	public void setElementAttr(byte element, int value) {
+		applyAttribute(element, value);
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			updateItemElements(con);
+		} catch (Exception ex) {
+			LOG.warn("Could not update elementals for item {} from database!", this, ex);
+		}
+	}
+	
+	/**
+	 * Remove elemental from item
+	 * @param element byte element to remove, -1 for all elementals remove
+	 */
+	public void clearElementAttr(byte element) {
+		if ((getElemental(element) == null) && (element != -1)) {
+			return;
+		}
+		
+		Elementals[] array = null;
+		if ((element != -1) && (_elementals != null) && (_elementals.length > 1)) {
+			array = new Elementals[_elementals.length - 1];
+			int i = 0;
+			for (Elementals elm : _elementals) {
+				if (elm.getElement() != element) {
+					array[i++] = elm;
+				}
+			}
+		}
+		_elementals = array;
+		
+		String query = (element != -1) ? "DELETE FROM item_elementals WHERE itemId = ? AND elemType = ?" : "DELETE FROM item_elementals WHERE itemId = ?";
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(query)) {
+			if (element != -1) {
+				// Item can have still others
+				ps.setInt(2, element);
+			}
+			
+			ps.setInt(1, getObjectId());
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not remove elemental enchant for item {} from database!", this, ex);
+		}
+	}
+	
+	/**
+	 * Used to decrease mana (mana means life time for shadow items)
+	 */
+	public static class ScheduleConsumeManaTask implements Runnable {
+		
+		private static final Logger LOG = LoggerFactory.getLogger(ScheduleConsumeManaTask.class);
+		
+		private final L2ItemInstance _shadowItem;
+		
+		public ScheduleConsumeManaTask(L2ItemInstance item) {
+			_shadowItem = item;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				// decrease mana
+				if (_shadowItem != null) {
+					_shadowItem.decreaseMana(true);
+				}
+			} catch (Exception ex) {
+				LOG.warn("There has been an error decreasing Mana!", ex);
+			}
+		}
+	}
+	
+	/**
+	 * Returns true if this item is a shadow item Shadow items have a limited life-time
+	 * @return
+	 */
+	public boolean isShadowItem() {
+		return (_mana >= 0);
+	}
+	
+	/**
+	 * Returns the remaining mana of this shadow item
+	 * @return lifeTime
+	 */
+	public int getMana() {
+		return _mana;
+	}
+	
+	/**
+	 * Decreases the mana of this shadow item, sends a inventory update schedules a new consumption task if non is running optionally one could force a new task
+	 * @param resetConsumingMana if true forces a new consumption task if item is equipped
+	 */
+	public void decreaseMana(boolean resetConsumingMana) {
+		decreaseMana(resetConsumingMana, 1);
+	}
+	
+	/**
+	 * Decreases the mana of this shadow item, sends a inventory update schedules a new consumption task if non is running optionally one could force a new task
+	 * @param resetConsumingMana if forces a new consumption task if item is equipped
+	 * @param count how much mana decrease
+	 */
+	public void decreaseMana(boolean resetConsumingMana, int count) {
+		if (!isShadowItem()) {
+			return;
+		}
+		
+		if ((_mana - count) >= 0) {
+			_mana -= count;
+		} else {
+			_mana = 0;
+		}
+		
+		if (_storedInDb) {
+			_storedInDb = false;
+		}
+		if (resetConsumingMana) {
+			_consumingMana = false;
+		}
+		
+		final L2PcInstance player = getActingPlayer();
+		if (player != null) {
+			SystemMessage sm;
+			switch (_mana) {
+				case 10 -> {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_10);
+					sm.addItemName(_item);
+					player.sendPacket(sm);
+				}
+				case 5 -> {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_5);
+					sm.addItemName(_item);
+					player.sendPacket(sm);
+				}
+				case 1 -> {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_1);
+					sm.addItemName(_item);
+					player.sendPacket(sm);
+				}
+			}
+			
+			if (_mana == 0) // The life time has expired
+			{
+				sm = SystemMessage.getSystemMessage(SystemMessageId.S1S_REMAINING_MANA_IS_NOW_0);
+				sm.addItemName(_item);
+				player.sendPacket(sm);
+				
+				// unequip
+				if (isEquipped()) {
+					L2ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot());
+					InventoryUpdate iu = new InventoryUpdate();
+					for (L2ItemInstance item : unequiped) {
+						item.unChargeAllShots();
+						iu.addModifiedItem(item);
+					}
+					player.sendPacket(iu);
+					player.broadcastUserInfo();
+				}
+				
+				if (getItemLocation() != ItemLocation.WAREHOUSE) {
+					// destroy
+					player.getInventory().destroyItem("L2ItemInstance", this, player, null);
+					
+					// send update
+					InventoryUpdate iu = new InventoryUpdate();
+					iu.addRemovedItem(this);
+					player.sendPacket(iu);
+					
+					StatusUpdate su = new StatusUpdate(player);
+					su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+					player.sendPacket(su);
+					
+				} else {
+					player.getWarehouse().destroyItem("L2ItemInstance", this, player, null);
+				}
+				
+				// delete from world
+				L2World.getInstance().removeObject(this);
+			} else {
+				// Reschedule if still equipped
+				if (!_consumingMana && isEquipped()) {
+					scheduleConsumeManaTask();
+				}
+				if (getItemLocation() != ItemLocation.WAREHOUSE) {
+					InventoryUpdate iu = new InventoryUpdate();
+					iu.addModifiedItem(this);
+					player.sendPacket(iu);
+				}
+			}
+		}
+	}
+	
+	public void scheduleConsumeManaTask() {
+		if (_consumingMana) {
+			return;
+		}
+		_consumingMana = true;
+		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleConsumeManaTask(this), MANA_CONSUMPTION_RATE);
+	}
+	
+	/**
+	 * Returns false cause item can't be attacked
+	 * @return boolean false
+	 */
+	@Override
+	public boolean isAutoAttackable(L2Character attacker) {
+		return false;
+	}
+	
+	/**
+	 * This function basically returns a set of functions from L2Item/L2Armor/L2Weapon, but may add additional functions, if this particular item instance is enhanced for a particular player.
+	 * @param player the player
+	 * @return the functions list
+	 */
+	public List<AbstractFunction> getStatFuncs(L2Character player) {
+		return getItem().getStatFuncs(this, player);
+	}
+	
+	/**
+	 * Updates the database.<BR>
+	 */
+	public void updateDatabase() {
+		this.updateDatabase(false);
+	}
+	
+	/**
+	 * Updates the database.<BR>
+	 * @param force if the update should necessarily be done.
+	 */
+	public void updateDatabase(boolean force) {
+		_dbLock.lock();
+		
+		try {
+			if (_existsInDb) {
+				if ((_ownerId == 0) || (_loc == ItemLocation.VOID) || (_loc == ItemLocation.REFUND) || ((getCount() == 0) && (_loc != ItemLocation.LEASE))) {
+					removeFromDb();
+				} else if (!general().lazyItemsUpdate() || force) {
+					updateInDb();
+				}
+			} else {
+				if ((_ownerId == 0) || (_loc == ItemLocation.VOID) || (_loc == ItemLocation.REFUND) || ((getCount() == 0) && (_loc != ItemLocation.LEASE))) {
+					return;
+				}
+				insertIntoDb();
+			}
+		} finally {
+			_dbLock.unlock();
+		}
+	}
+	
+	/**
+	 * Restores an item from the database.
+	 * @param ownerId the owner Id
+	 * @param rs the result set
+	 * @return the item instance
+	 */
+	public static L2ItemInstance restoreFromDb(int ownerId, ResultSet rs) {
+		try {
+			final var objectId = rs.getInt(1);
+			final var itemId = rs.getInt("item_id");
+			final var template = ItemTable.getInstance().getTemplate(itemId);
+			if (template == null) {
+				LOG.error("Item Id {} not known, object Id {} by owner Id {}!", itemId, objectId, ownerId);
+				return null;
+			}
+			
+			final var item = new L2ItemInstance(objectId, template);
+			item._ownerId = ownerId;
+			item.setCount(rs.getLong("count"));
+			item._enchantLevel = rs.getInt("enchant_level");
+			item._type1 = rs.getInt("custom_type1");
+			item._type2 = rs.getInt("custom_type2");
+			item._loc = ItemLocation.valueOf(rs.getString("loc"));
+			item._locData = rs.getInt("loc_data");
+			item._existsInDb = true;
+			item._storedInDb = true;
+			// Support shadow weapons
+			item._mana = rs.getInt("mana_left");
+			item._time = rs.getLong("time");
+			// Support Agathion energy
+			item.agathionEnergy = rs.getInt("agathion_energy");
+			
+			// load augmentation and elemental enchant
+			if (item.isEquipable()) {
+				item.restoreAttributes();
+			}
+			return item;
+		} catch (Exception ex) {
+			LOG.warn("Could not restore an item owned by {} from database!", ownerId, ex);
+			return null;
+		}
+	}
+	
+	/**
+	 * Init a dropped L2ItemInstance and add it in the world as a visible object.<BR>
+	 * <BR>
+	 * <B><U> Actions</U> :</B><BR>
+	 * <BR>
+	 * <li>Set the x,y,z position of the L2ItemInstance dropped and update its _worldregion</li>
+	 * <li>Add the L2ItemInstance dropped to _visibleObjects of its L2WorldRegion</li>
+	 * <li>Add the L2ItemInstance dropped in the world as a <B>visible</B> object</li><BR>
+	 * <BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T ADD the object to _allObjects of L2World </B></FONT><BR>
+	 * <BR>
+	 * <B><U> Assert </U> :</B><BR>
+	 * <BR>
+	 * <li>_worldRegion == null <I>(L2Object is invisible at the beginning)</I></li><BR>
+	 * <BR>
+	 * <B><U> Example of use </U> :</B><BR>
+	 * <BR>
+	 * <li>Drop item</li>
+	 * <li>Call Pet</li><BR>
+	 */
+	public class ItemDropTask implements Runnable {
+		private int _x, _y, _z;
+		private final L2Character _dropper;
+		private final L2ItemInstance _itm;
+		
+		public ItemDropTask(L2ItemInstance item, L2Character dropper, int x, int y, int z) {
+			_x = x;
+			_y = y;
+			_z = z;
+			_dropper = dropper;
+			_itm = item;
+		}
+		
+		@Override
+		public final void run() {
+			assert _itm.getWorldRegion() == null;
+			
+			if (_dropper != null) {
+				Location dropDest = GeoData.getInstance().moveCheck(_dropper.getX(), _dropper.getY(), _dropper.getZ(), _x, _y, _z, _dropper.getInstanceId());
+				_x = dropDest.getX();
+				_y = dropDest.getY();
+				_z = dropDest.getZ();
+			}
+			
+			if (_dropper != null) {
+				setInstanceId(_dropper.getInstanceId()); // Inherit instance zone when dropped in visible world
+			} else {
+				setInstanceId(0); // No dropper? Make it a global item...
+			}
+			
+			synchronized (_itm) {
+				// Set the x,y,z position of the L2ItemInstance dropped and update its _worldregion
+				_itm.setIsVisible(true);
+				_itm.setXYZ(_x, _y, _z);
+				_itm.setWorldRegion(L2World.getInstance().getRegion(getLocation()));
+				
+				// Add the L2ItemInstance dropped to _visibleObjects of its L2WorldRegion
+			}
+			
+			_itm.getWorldRegion().addVisibleObject(_itm);
+			_itm.setDropTime(System.currentTimeMillis());
+			_itm.setDropperObjectId(_dropper != null ? _dropper.getObjectId() : 0); // Set the dropper Id for the known list packets in sendInfo
+			
+			// this can synchronize on others instances, so it's out of
+			// synchronized, to avoid deadlocks
+			// Add the L2ItemInstance dropped in the world as a visible object
+			L2World.getInstance().addVisibleObject(_itm, _itm.getWorldRegion());
+			if (general().saveDroppedItem()) {
+				ItemsOnGroundManager.getInstance().save(_itm);
+			}
+			_itm.setDropperObjectId(0); // Set the dropper Id back to 0 so it no longer shows the drop packet
+		}
+	}
+	
+	public void dropMe(L2Character dropper, int x, int y, int z) {
+		ThreadPoolManager.getInstance().executeGeneral(new ItemDropTask(this, dropper, x, y, z));
+		if ((dropper != null) && dropper.isPlayer()) {
+			// Notify to scripts
+			EventDispatcher.getInstance().notifyEventAsync(new PlayerItemDrop(dropper.getActingPlayer(), this, new Location(x, y, z)), getItem());
+		}
+	}
+	
+	/**
+	 * Update the database with values of the item
+	 */
+	private void updateInDb() {
+		assert _existsInDb;
+		
+		if (_wear) {
+			return;
+		}
+		
+		if (_storedInDb) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE items SET owner_id=?, count=?, loc=?, loc_data=?, enchant_level=?, custom_type1=?, custom_type2=?, mana_left=?, time=?, agathion_energy=? WHERE object_id=?")) {
+			ps.setInt(1, _ownerId);
+			ps.setLong(2, getCount());
+			ps.setString(3, _loc.name());
+			ps.setInt(4, _locData);
+			ps.setInt(5, getEnchantLevel());
+			ps.setInt(6, getCustomType1());
+			ps.setInt(7, getCustomType2());
+			ps.setInt(8, getMana());
+			ps.setLong(9, getTime());
+			ps.setInt(10, getAgathionRemainingEnergy());
+			ps.setInt(11, getObjectId());
+			ps.executeUpdate();
+			_existsInDb = true;
+			_storedInDb = true;
+		} catch (Exception ex) {
+			LOG.warn("Could not update item {} in database!", this, ex);
+		}
+	}
+	
+	private void insertIntoDb() {
+		assert !_existsInDb && (getObjectId() != 0);
+		
+		if (_wear) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO items (owner_id, item_id, count, loc, loc_data, enchant_level, object_id, custom_type1, custom_type2, mana_left, time, agathion_energy) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)")) {
+			ps.setInt(1, _ownerId);
+			ps.setInt(2, _itemId);
+			ps.setLong(3, getCount());
+			ps.setString(4, _loc.name());
+			ps.setInt(5, _locData);
+			ps.setInt(6, getEnchantLevel());
+			ps.setInt(7, getObjectId());
+			ps.setInt(8, _type1);
+			ps.setInt(9, _type2);
+			ps.setInt(10, getMana());
+			ps.setLong(11, getTime());
+			ps.setInt(12, getAgathionRemainingEnergy());
+			
+			ps.executeUpdate();
+			_existsInDb = true;
+			_storedInDb = true;
+			
+			if (_augmentation != null) {
+				updateItemAttributes(con);
+			}
+			if (_elementals != null) {
+				updateItemElements(con);
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not insert item {} into database!", this, ex);
+		}
+	}
+	
+	private void removeFromDb() {
+		assert _existsInDb;
+		
+		if (_wear) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			try (var ps = con.prepareStatement("DELETE FROM items WHERE object_id = ?")) {
+				ps.setInt(1, getObjectId());
+				ps.executeUpdate();
+				_existsInDb = false;
+				_storedInDb = false;
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM item_attributes WHERE itemId = ?")) {
+				ps.setInt(1, getObjectId());
+				ps.executeUpdate();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM item_elementals WHERE itemId = ?")) {
+				ps.setInt(1, getObjectId());
+				ps.executeUpdate();
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not delete item {} in database!", this, ex);
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return _item + "[" + getObjectId() + "]" + (getEnchantLevel() > 0 ? " +" + getEnchantLevel() : "");
+	}
+	
+	public void resetOwnerTimer() {
+		if (itemLootSchedule != null) {
+			itemLootSchedule.cancel(true);
+		}
+		itemLootSchedule = null;
+	}
+	
+	public void setItemLootSchedule(ScheduledFuture<?> sf) {
+		itemLootSchedule = sf;
+	}
+	
+	public ScheduledFuture<?> getItemLootSchedule() {
+		return itemLootSchedule;
+	}
+	
+	public void setProtected(boolean isProtected) {
+		_protected = isProtected;
+	}
+	
+	public boolean isProtected() {
+		return _protected;
+	}
+	
+	public boolean isNightLure() {
+		return (((_itemId >= 8505) && (_itemId <= 8513)) || (_itemId == 8485));
+	}
+	
+	public void setCountDecrease(boolean decrease) {
+		_decrease = decrease;
+	}
+	
+	public boolean getCountDecrease() {
+		return _decrease;
+	}
+	
+	public void setInitCount(int InitCount) {
+		_initCount = InitCount;
+	}
+	
+	public long getInitCount() {
+		return _initCount;
+	}
+	
+	public void restoreInitCount() {
+		if (_decrease) {
+			setCount(_initCount);
+		}
+	}
+	
+	public boolean isTimeLimitedItem() {
+		return (_time > 0);
+	}
+	
+	/**
+	 * Returns (current system time + time) of this time limited item
+	 * @return Time
+	 */
+	public long getTime() {
+		return _time;
+	}
+	
+	public long getRemainingTime() {
+		return _time - System.currentTimeMillis();
+	}
+	
+	public void endOfLife() {
+		L2PcInstance player = getActingPlayer();
+		if (player != null) {
+			if (isEquipped()) {
+				L2ItemInstance[] unequiped = player.getInventory().unEquipItemInSlotAndRecord(getLocationSlot());
+				InventoryUpdate iu = new InventoryUpdate();
+				for (L2ItemInstance item : unequiped) {
+					item.unChargeAllShots();
+					iu.addModifiedItem(item);
+				}
+				player.sendPacket(iu);
+				player.broadcastUserInfo();
+			}
+			
+			if (getItemLocation() != ItemLocation.WAREHOUSE) {
+				// destroy
+				player.getInventory().destroyItem("L2ItemInstance", this, player, null);
+				
+				// send update
+				InventoryUpdate iu = new InventoryUpdate();
+				iu.addRemovedItem(this);
+				player.sendPacket(iu);
+				
+				StatusUpdate su = new StatusUpdate(player);
+				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+				player.sendPacket(su);
+				
+			} else {
+				player.getWarehouse().destroyItem("L2ItemInstance", this, player, null);
+			}
+			player.sendPacket(SystemMessageId.TIME_LIMITED_ITEM_DELETED);
+			// delete from world
+			L2World.getInstance().removeObject(this);
+		}
+	}
+	
+	public void scheduleLifeTimeTask() {
+		if (!isTimeLimitedItem()) {
+			return;
+		}
+		if (getRemainingTime() <= 0) {
+			endOfLife();
+		} else {
+			if (_lifeTimeTask != null) {
+				_lifeTimeTask.cancel(false);
+			}
+			_lifeTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleLifeTimeTask(this), getRemainingTime());
+		}
+	}
+	
+	public static class ScheduleLifeTimeTask implements Runnable {
+		
+		private static final Logger LOG = LoggerFactory.getLogger(ScheduleLifeTimeTask.class);
+		
+		private final L2ItemInstance _limitedItem;
+		
+		public ScheduleLifeTimeTask(L2ItemInstance item) {
+			_limitedItem = item;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				if (_limitedItem != null) {
+					_limitedItem.endOfLife();
+				}
+			} catch (Exception ex) {
+				LOG.warn("There has been an error ending item {} life!", _limitedItem, ex);
+			}
+		}
+	}
+	
+	public void updateElementAttrBonus(L2PcInstance player) {
+		if (_elementals == null) {
+			return;
+		}
+		for (Elementals elm : _elementals) {
+			elm.updateBonus(player, isArmor());
+		}
+	}
+	
+	public void removeElementAttrBonus(L2PcInstance player) {
+		if (_elementals == null) {
+			return;
+		}
+		for (Elementals elm : _elementals) {
+			elm.removeBonus(player);
+		}
+	}
+	
+	public void setDropperObjectId(int id) {
+		_dropperObjectId = id;
+	}
+	
+	@Override
+	public void sendInfo(L2PcInstance activeChar) {
+		if (_dropperObjectId != 0) {
+			activeChar.sendPacket(new DropItem(this, _dropperObjectId));
+		} else {
+			activeChar.sendPacket(new SpawnItem(this));
+		}
+	}
+	
+	public DropProtection getDropProtection() {
+		return _dropProtection;
+	}
+	
+	public boolean isPublished() {
+		return _published;
+	}
+	
+	public void publish() {
+		_published = true;
+	}
+	
+	@Override
+	public boolean decayMe() {
+		if (general().saveDroppedItem()) {
+			ItemsOnGroundManager.getInstance().removeObject(this);
+		}
+		return super.decayMe();
+	}
+	
+	public boolean isQuestItem() {
+		return getItem().isQuestItem();
+	}
+	
+	public boolean isElementable() {
+		if ((getItemLocation() == ItemLocation.INVENTORY) || (getItemLocation() == ItemLocation.PAPERDOLL)) {
+			return getItem().isElementable();
+		}
+		return false;
+	}
+	
+	public boolean isFreightable() {
+		return getItem().isFreightable();
+	}
+	
+	public int useSkillDisTime() {
+		return getItem().useSkillDisTime();
+	}
+	
+	public int getOlyEnchantLevel() {
+		L2PcInstance player = getActingPlayer();
+		int enchant = getEnchantLevel();
+		
+		if (player == null) {
+			return enchant;
+		}
+		
+		if (player.isInOlympiadMode() && (olympiad().getEnchantLimit() >= 0) && (enchant > olympiad().getEnchantLimit())) {
+			enchant = olympiad().getEnchantLimit();
+		}
+		
+		return enchant;
+	}
+	
+	public int getDefaultEnchantLevel() {
+		return _item.getDefaultEnchantLevel();
+	}
+	
+	public boolean hasPassiveSkills() {
+		return (getItemType() == EtcItemType.RUNE) && (getItemLocation() == ItemLocation.INVENTORY) && (getOwnerId() > 0) && getItem().hasSkills();
+	}
+	
+	public void giveSkillsToOwner() {
+		if (!hasPassiveSkills()) {
+			return;
+		}
+		
+		final L2PcInstance player = getActingPlayer();
+		
+		if (player != null) {
+			for (SkillHolder sh : getItem().getSkills()) {
+				if (sh.getSkill().isPassive()) {
+					player.addSkill(sh.getSkill(), false);
+				}
+			}
+		}
+	}
+	
+	public void removeSkillsFromOwner() {
+		if (!hasPassiveSkills()) {
+			return;
+		}
+		
+		final L2PcInstance player = getActingPlayer();
+		
+		if (player != null) {
+			for (SkillHolder sh : getItem().getSkills()) {
+				if (sh.getSkill().isPassive()) {
+					player.removeSkill(sh.getSkill(), false, true);
+				}
+			}
+		}
+	}
+	
+	@Override
+	public boolean isItem() {
+		return true;
+	}
+	
+	@Override
+	public L2PcInstance getActingPlayer() {
+		return L2World.getInstance().getPlayer(getOwnerId());
+	}
+	
+	public int getEquipReuseDelay() {
+		return _item.getEquipReuseDelay();
+	}
+	
+	/**
+	 * @param activeChar
+	 * @param command
+	 */
+	public void onBypassFeedback(L2PcInstance activeChar, String command) {
+		if (command.startsWith("Quest")) {
+			String questName = command.substring(6);
+			String event = null;
+			int idx = questName.indexOf(' ');
+			if (idx > 0) {
+				event = questName.substring(idx).trim();
+			}
+			
+			if (event != null) {
+				EventDispatcher.getInstance().notifyEventAsync(new ItemBypass(this, activeChar, event), getItem());
+			} else {
+				EventDispatcher.getInstance().notifyEventAsync(new ItemTalk(this, activeChar), getItem());
+			}
+		}
+	}
+	
+	@Override
+	public boolean isChargedShot(ShotType type) {
+		return (_shotsMask & type.getMask()) == type.getMask();
+	}
+	
+	@Override
+	public void setChargedShot(ShotType type, boolean charged) {
+		if (charged) {
+			_shotsMask |= type.getMask();
+		} else {
+			_shotsMask &= ~type.getMask();
+		}
+	}
+	
+	public void unChargeAllShots() {
+		_shotsMask = 0;
+	}
+	
+	/**
+	 * Returns enchant effect object for this item
+	 * @return enchanteffect
+	 */
+	public int[] getEnchantOptions() {
+		EnchantOptions op = EnchantItemOptionsData.getInstance().getOptions(this);
+		if (op != null) {
+			return op.getOptions();
+		}
+		return DEFAULT_ENCHANT_OPTIONS;
+	}
+	
+	/**
+	 * Clears all the enchant bonuses if item is enchanted and containing bonuses for enchant value.
+	 */
+	public void clearEnchantStats() {
+		final L2PcInstance player = getActingPlayer();
+		if (player == null) {
+			_enchantOptions.clear();
+			return;
+		}
+		
+		for (Options op : _enchantOptions) {
+			op.remove(player);
+		}
+		_enchantOptions.clear();
+	}
+	
+	/**
+	 * Clears and applies all the enchant bonuses if item is enchanted and containing bonuses for enchant value.
+	 */
+	public void applyEnchantStats() {
+		final L2PcInstance player = getActingPlayer();
+		if (!isEquipped() || (player == null) || (getEnchantOptions() == DEFAULT_ENCHANT_OPTIONS)) {
+			return;
+		}
+		
+		for (int id : getEnchantOptions()) {
+			final Options options = OptionData.getInstance().getOptions(id);
+			if (options != null) {
+				options.apply(player);
+				_enchantOptions.add(options);
+			} else if (id != 0) {
+				LOG.warn("Couldn't find option Id {} for item {}!", id, this);
+			}
+		}
+	}
+	
+	@Override
+	public void setHeading(int heading) {
+	}
+	
+	public void deleteMe() {
+		if ((_lifeTimeTask != null) && !_lifeTimeTask.isDone()) {
+			_lifeTimeTask.cancel(false);
+			_lifeTimeTask = null;
+		}
+	}
+	
+	public int getAgathionRemainingEnergy() {
+		return agathionEnergy;
+	}
+	
+	public void setAgathionRemainingEnergy(int agathionEnergy) {
+		this.agathionEnergy = agathionEnergy;
+		_storedInDb = false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/ActionType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/ActionType.java
new file mode 100644
index 00000000..46de0394
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/ActionType.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Action Type enumerated.
+ * @author nBd
+ */
+public enum ActionType {
+	CALC,
+	CALL_SKILL,
+	CAPSULE,
+	CREATE_MPCC,
+	DICE,
+	EQUIP,
+	FISHINGSHOT,
+	HARVEST,
+	HIDE_NAME,
+	KEEP_EXP,
+	NICK_COLOR,
+	NONE,
+	PEEL,
+	RECIPE,
+	SEED,
+	SHOW_ADVENTURER_GUIDE_BOOK,
+	SHOW_HTML,
+	SHOW_SSQ_STATUS,
+	SKILL_MAINTAIN,
+	SKILL_REDUCE,
+	SOULSHOT,
+	SPIRITSHOT,
+	START_QUEST,
+	SUMMON_SOULSHOT,
+	SUMMON_SPIRITSHOT,
+	XMAS_OPEN,
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/ArmorType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/ArmorType.java
new file mode 100644
index 00000000..f1737b15
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/ArmorType.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Armor Type enumerated.
+ */
+public enum ArmorType implements ItemType {
+	NONE,
+	LIGHT,
+	HEAVY,
+	MAGIC,
+	SIGIL,
+	// L2J CUSTOM
+	SHIELD;
+	
+	final int _mask;
+	
+	ArmorType() {
+		_mask = 1 << (ordinal() + WeaponType.values().length);
+	}
+	
+	/**
+	 * @return the ID of the ArmorType after applying a mask.
+	 */
+	@Override
+	public int mask() {
+		return _mask;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/CrystalType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/CrystalType.java
new file mode 100644
index 00000000..01f16cb5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/CrystalType.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Crystal Type enumerated.
+ * @author Adry_85
+ */
+public enum CrystalType {
+	NONE(0, 0, 0, 0),
+	D(1, 1458, 11, 90),
+	C(2, 1459, 6, 45),
+	B(3, 1460, 11, 67),
+	A(4, 1461, 20, 145),
+	S(5, 1462, 25, 250),
+	S80(6, 1462, 25, 250),
+	S84(7, 1462, 25, 250);
+	
+	private final int _id;
+	private final int _crystalId;
+	private final int _crystalEnchantBonusArmor;
+	private final int _crystalEnchantBonusWeapon;
+	
+	CrystalType(int id, int crystalId, int crystalEnchantBonusArmor, int crystalEnchantBonusWeapon) {
+		_id = id;
+		_crystalId = crystalId;
+		_crystalEnchantBonusArmor = crystalEnchantBonusArmor;
+		_crystalEnchantBonusWeapon = crystalEnchantBonusWeapon;
+	}
+	
+	/**
+	 * Gets the crystal type ID.
+	 * @return the crystal type ID
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Gets the item ID of the crystal.
+	 * @return the item ID of the crystal
+	 */
+	public int getCrystalId() {
+		return _crystalId;
+	}
+	
+	public int getCrystalEnchantBonusArmor() {
+		return _crystalEnchantBonusArmor;
+	}
+	
+	public int getCrystalEnchantBonusWeapon() {
+		return _crystalEnchantBonusWeapon;
+	}
+	
+	public boolean isGreater(CrystalType crystalType) {
+		return getId() > crystalType.getId();
+	}
+	
+	public boolean isLesser(CrystalType crystalType) {
+		return getId() < crystalType.getId();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/EtcItemType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/EtcItemType.java
new file mode 100644
index 00000000..c69c85b5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/EtcItemType.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * EtcItem Type enumerated.
+ */
+public enum EtcItemType implements ItemType {
+	NONE,
+	ARROW,
+	POTION,
+	SCRL_ENCHANT_WP,
+	SCRL_ENCHANT_AM,
+	SCROLL,
+	RECIPE,
+	MATERIAL,
+	PET_COLLAR,
+	CASTLE_GUARD,
+	LOTTO,
+	RACE_TICKET,
+	DYE,
+	SEED,
+	CROP,
+	MATURECROP,
+	HARVEST,
+	SEED2,
+	TICKET_OF_LORD,
+	LURE,
+	BLESS_SCRL_ENCHANT_WP,
+	BLESS_SCRL_ENCHANT_AM,
+	COUPON,
+	ELIXIR,
+	SCRL_ENCHANT_ATTR,
+	BOLT,
+	SCRL_INC_ENCHANT_PROP_WP,
+	SCRL_INC_ENCHANT_PROP_AM,
+	ANCIENT_CRYSTAL_ENCHANT_WP,
+	ANCIENT_CRYSTAL_ENCHANT_AM,
+	RUNE_SELECT,
+	RUNE,
+	
+	// L2J CUSTOM, BACKWARD COMPATIBILITY
+	SHOT;
+	
+	/**
+	 * @return the ID of the item after applying the mask.
+	 */
+	@Override
+	public int mask() {
+		return 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType.java
new file mode 100644
index 00000000..58086e0d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Created for allow comparing different item types
+ * @author DS
+ */
+public interface ItemType {
+	int mask();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType1.java b/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType1.java
new file mode 100644
index 00000000..e3b119be
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType1.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Item Type 1 enumerated.
+ * @author Adry_85
+ * @since 2.6.0.0
+ */
+public enum ItemType1 {
+	WEAPON_RING_EARRING_NECKLACE(0),
+	SHIELD_ARMOR(1),
+	ITEM_QUESTITEM_ADENA(4);
+	
+	private final int _id;
+	
+	ItemType1(int id) {
+		_id = id;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType2.java b/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType2.java
new file mode 100644
index 00000000..6c7d36b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/ItemType2.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Item Type 2 enumerated.
+ * @author Adry_85
+ * @since 2.6.0.0
+ */
+public enum ItemType2 {
+	WEAPON(0),
+	SHIELD_ARMOR(1),
+	ACCESSORY(2),
+	QUEST(3),
+	MONEY(4),
+	OTHER(5);
+	
+	private final int _id;
+	
+	ItemType2(int id) {
+		_id = id;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/MaterialType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/MaterialType.java
new file mode 100644
index 00000000..cd2948a4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/MaterialType.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+/**
+ * Material Type enumerated.
+ * @author Adry_85
+ */
+public enum MaterialType {
+	STEEL,
+	FINE_STEEL,
+	COTTON,
+	BLOOD_STEEL,
+	BRONZE,
+	SILVER,
+	GOLD,
+	MITHRIL,
+	ORIHARUKON,
+	PAPER,
+	WOOD,
+	CLOTH,
+	LEATHER,
+	BONE,
+	HORN,
+	DAMASCUS,
+	ADAMANTAITE,
+	CHRYSOLITE,
+	CRYSTAL,
+	LIQUID,
+	SCALE_OF_DRAGON,
+	DYESTUFF,
+	COBWEB,
+	SEED,
+	FISH,
+	RUNE_XP,
+	RUNE_SP,
+	RUNE_REMOVE_PENALTY
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/items/type/WeaponType.java b/src/main/java/com/l2jserver/gameserver/model/items/type/WeaponType.java
new file mode 100644
index 00000000..0bffcd47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/items/type/WeaponType.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.type;
+
+import com.l2jserver.gameserver.model.stats.TraitType;
+
+/**
+ * Weapon Type enumerated.
+ * @author mkizub
+ */
+public enum WeaponType implements ItemType {
+	SWORD(TraitType.SWORD),
+	BLUNT(TraitType.BLUNT),
+	DAGGER(TraitType.DAGGER),
+	BOW(TraitType.BOW),
+	POLE(TraitType.POLE),
+	NONE(TraitType.NONE),
+	DUAL(TraitType.DUAL),
+	ETC(TraitType.ETC),
+	FIST(TraitType.FIST),
+	DUALFIST(TraitType.DUALFIST),
+	FISHINGROD(TraitType.NONE),
+	RAPIER(TraitType.RAPIER),
+	ANCIENTSWORD(TraitType.ANCIENTSWORD),
+	CROSSBOW(TraitType.CROSSBOW),
+	FLAG(TraitType.NONE),
+	OWNTHING(TraitType.NONE),
+	DUALDAGGER(TraitType.DUALDAGGER);
+	
+	private final int _mask;
+	private final TraitType _traitType;
+	
+	WeaponType(TraitType traitType) {
+		_mask = 1 << ordinal();
+		_traitType = traitType;
+	}
+	
+	/**
+	 * @return the ID of the item after applying the mask.
+	 */
+	@Override
+	public int mask() {
+		return _mask;
+	}
+	
+	public TraitType getTraitType() {
+		return _traitType;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/multisell/Entry.java b/src/main/java/com/l2jserver/gameserver/model/multisell/Entry.java
new file mode 100644
index 00000000..1ff7e09a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/multisell/Entry.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.multisell;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author DS
+ */
+public class Entry {
+	protected int _entryId;
+	protected boolean _stackable = true;
+	
+	protected List<Ingredient> _products;
+	protected List<Ingredient> _ingredients;
+	
+	public Entry(int entryId) {
+		_entryId = entryId;
+		_products = new ArrayList<>();
+		_ingredients = new ArrayList<>();
+	}
+	
+	/**
+	 * This constructor used in PreparedEntry only, ArrayLists not created.
+	 */
+	protected Entry() {
+	}
+	
+	public final void setEntryId(int id) {
+		_entryId = id;
+	}
+	
+	public final int getEntryId() {
+		return _entryId;
+	}
+	
+	public final void addProduct(Ingredient product) {
+		_products.add(product);
+		
+		if (!product.isStackable()) {
+			_stackable = false;
+		}
+	}
+	
+	public final List<Ingredient> getProducts() {
+		return _products;
+	}
+	
+	public final void addIngredient(Ingredient ingredient) {
+		_ingredients.add(ingredient);
+	}
+	
+	public final List<Ingredient> getIngredients() {
+		return _ingredients;
+	}
+	
+	public final boolean isStackable() {
+		return _stackable;
+	}
+	
+	public long getTaxAmount() {
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/multisell/Ingredient.java b/src/main/java/com/l2jserver/gameserver/model/multisell/Ingredient.java
new file mode 100644
index 00000000..82830b4a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/multisell/Ingredient.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.multisell;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author DS
+ */
+public class Ingredient {
+	private int _itemId;
+	private long _itemCount;
+	private boolean _isTaxIngredient;
+	private boolean _maintainIngredient;
+	private L2Item _template = null;
+	private ItemInfo _itemInfo = null;
+	
+	public Ingredient(StatsSet set) {
+		this(set.getInt("id"), set.getLong("count"), set.getBoolean("isTaxIngredient", false), set.getBoolean("maintainIngredient", false));
+	}
+	
+	public Ingredient(int itemId, long itemCount, boolean isTaxIngredient, boolean maintainIngredient) {
+		_itemId = itemId;
+		_itemCount = itemCount;
+		_isTaxIngredient = isTaxIngredient;
+		_maintainIngredient = maintainIngredient;
+		if (_itemId > 0) {
+			_template = ItemTable.getInstance().getTemplate(_itemId);
+		}
+	}
+	
+	/**
+	 * @return a new Ingredient instance with the same values as this.
+	 */
+	public Ingredient getCopy() {
+		return new Ingredient(_itemId, _itemCount, _isTaxIngredient, _maintainIngredient);
+	}
+	
+	public final L2Item getTemplate() {
+		return _template;
+	}
+	
+	public final void setItemInfo(L2ItemInstance item) {
+		_itemInfo = new ItemInfo(item);
+	}
+	
+	public final void setItemInfo(ItemInfo info) {
+		_itemInfo = info;
+	}
+	
+	public final ItemInfo getItemInfo() {
+		return _itemInfo;
+	}
+	
+	public final int getEnchantLevel() {
+		return _itemInfo != null ? _itemInfo.getEnchantLevel() : 0;
+	}
+	
+	public final void setItemId(int itemId) {
+		_itemId = itemId;
+	}
+	
+	public final int getItemId() {
+		return _itemId;
+	}
+	
+	public final void setItemCount(long itemCount) {
+		_itemCount = itemCount;
+	}
+	
+	public final long getItemCount() {
+		return _itemCount;
+	}
+	
+	public final void setIsTaxIngredient(boolean isTaxIngredient) {
+		_isTaxIngredient = isTaxIngredient;
+	}
+	
+	public final boolean isTaxIngredient() {
+		return _isTaxIngredient;
+	}
+	
+	public final void setMaintainIngredient(boolean maintainIngredient) {
+		_maintainIngredient = maintainIngredient;
+	}
+	
+	public final boolean getMaintainIngredient() {
+		return _maintainIngredient;
+	}
+	
+	public final boolean isStackable() {
+		return (_template == null) || _template.isStackable();
+	}
+	
+	public final boolean isArmorOrWeapon() {
+		return (_template != null) && ((_template instanceof L2Armor) || (_template instanceof L2Weapon));
+	}
+	
+	public final int getWeight() {
+		return _template == null ? 0 : _template.getWeight();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/multisell/ItemInfo.java b/src/main/java/com/l2jserver/gameserver/model/multisell/ItemInfo.java
new file mode 100644
index 00000000..e8991c1a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/multisell/ItemInfo.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.multisell;
+
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author DS
+ */
+public class ItemInfo {
+	private final int _enchantLevel, _augmentId;
+	private final byte _elementId;
+	private final int _elementPower;
+	private final int[] _elementals = new int[6];
+	
+	public ItemInfo(L2ItemInstance item) {
+		_enchantLevel = item.getEnchantLevel();
+		_augmentId = item.getAugmentation() != null ? item.getAugmentation().getAugmentationId() : 0;
+		_elementId = item.getAttackElementType();
+		_elementPower = item.getAttackElementPower();
+		_elementals[0] = item.getElementDefAttr(Elementals.FIRE);
+		_elementals[1] = item.getElementDefAttr(Elementals.WATER);
+		_elementals[2] = item.getElementDefAttr(Elementals.WIND);
+		_elementals[3] = item.getElementDefAttr(Elementals.EARTH);
+		_elementals[4] = item.getElementDefAttr(Elementals.HOLY);
+		_elementals[5] = item.getElementDefAttr(Elementals.DARK);
+	}
+	
+	public ItemInfo(int enchantLevel) {
+		_enchantLevel = enchantLevel;
+		_augmentId = 0;
+		_elementId = Elementals.NONE;
+		_elementPower = 0;
+		_elementals[0] = 0;
+		_elementals[1] = 0;
+		_elementals[2] = 0;
+		_elementals[3] = 0;
+		_elementals[4] = 0;
+		_elementals[5] = 0;
+	}
+	
+	public final int getEnchantLevel() {
+		return _enchantLevel;
+	}
+	
+	public final int getAugmentId() {
+		return _augmentId;
+	}
+	
+	public final byte getElementId() {
+		return _elementId;
+	}
+	
+	public final int getElementPower() {
+		return _elementPower;
+	}
+	
+	public final int[] getElementals() {
+		return _elementals;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/multisell/ListContainer.java b/src/main/java/com/l2jserver/gameserver/model/multisell/ListContainer.java
new file mode 100644
index 00000000..e316581a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/multisell/ListContainer.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.multisell;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * @author DS
+ */
+public class ListContainer {
+	private final int _listId;
+	private boolean _applyTaxes = false;
+	private boolean _maintainEnchantment = false;
+	private double _useRate = 1.0;
+	
+	protected List<Entry> _entries = new ArrayList<>();
+	protected Set<Integer> _npcsAllowed = null;
+	
+	public ListContainer(int listId) {
+		_listId = listId;
+	}
+	
+	public final List<Entry> getEntries() {
+		return _entries;
+	}
+	
+	public final int getListId() {
+		return _listId;
+	}
+	
+	public final void setApplyTaxes(boolean applyTaxes) {
+		_applyTaxes = applyTaxes;
+	}
+	
+	public final boolean getApplyTaxes() {
+		return _applyTaxes;
+	}
+	
+	public final void setMaintainEnchantment(boolean maintainEnchantment) {
+		_maintainEnchantment = maintainEnchantment;
+	}
+	
+	public double getUseRate() {
+		return _useRate;
+	}
+	
+	/**
+	 * Set this to create multisell with increased products, all product counts will be multiplied by the rate specified.<br>
+	 * <b>NOTE:</b> It affects only parser, it won't change values of already parsed multisell since MultiSells' parseEntry method handles this feature.
+	 * @param rate
+	 */
+	public void setUseRate(double rate) {
+		_useRate = rate;
+	}
+	
+	public final boolean getMaintainEnchantment() {
+		return _maintainEnchantment;
+	}
+	
+	public void allowNpc(int npcId) {
+		if (_npcsAllowed == null) {
+			_npcsAllowed = new HashSet<>();
+		}
+		_npcsAllowed.add(npcId);
+	}
+	
+	public boolean isNpcAllowed(int npcId) {
+		return (_npcsAllowed == null) || _npcsAllowed.contains(npcId);
+	}
+	
+	public boolean isNpcOnly() {
+		return _npcsAllowed != null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java b/src/main/java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java
new file mode 100644
index 00000000..155d80e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/multisell/PreparedEntry.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.multisell;
+
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+
+import java.util.ArrayList;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author DS
+ */
+public class PreparedEntry extends Entry {
+	private long _taxAmount = 0;
+	
+	public PreparedEntry(Entry template, L2ItemInstance item, boolean applyTaxes, boolean maintainEnchantment, double taxRate) {
+		_entryId = template.getEntryId() * 100000;
+		if (maintainEnchantment && (item != null)) {
+			_entryId += item.getEnchantLevel();
+		}
+		
+		ItemInfo info = null;
+		long adenaAmount = 0;
+		
+		_ingredients = new ArrayList<>(template.getIngredients().size());
+		for (Ingredient ing : template.getIngredients()) {
+			if (ing.getItemId() == ADENA_ID) {
+				// Tax ingredients added only if taxes enabled
+				if (ing.isTaxIngredient()) {
+					// if taxes are to be applied, modify/add the adena count based on the template adena/ancient adena count
+					if (applyTaxes) {
+						_taxAmount += Math.round(ing.getItemCount() * taxRate);
+					}
+				} else {
+					adenaAmount += ing.getItemCount();
+				}
+				// do not yet add this adena amount to the list as non-taxIngredient adena might be entered later (order not guaranteed)
+				continue;
+			} else if (maintainEnchantment && (item != null) && ing.isArmorOrWeapon()) {
+				info = new ItemInfo(item);
+				final Ingredient newIngredient = ing.getCopy();
+				newIngredient.setItemInfo(info);
+				_ingredients.add(newIngredient);
+			} else {
+				final Ingredient newIngredient = ing.getCopy();
+				_ingredients.add(newIngredient);
+			}
+		}
+		
+		// now add the adena, if any.
+		adenaAmount += _taxAmount; // do not forget tax
+		if (adenaAmount > 0) {
+			_ingredients.add(new Ingredient(ADENA_ID, adenaAmount, false, false));
+		}
+		
+		// now copy products
+		_products = new ArrayList<>(template.getProducts().size());
+		for (Ingredient ing : template.getProducts()) {
+			if (!ing.isStackable()) {
+				_stackable = false;
+			}
+			
+			final Ingredient newProduct = ing.getCopy();
+			if (maintainEnchantment && ing.isArmorOrWeapon()) {
+				newProduct.setItemInfo(info);
+			} else if (ing.isArmorOrWeapon() && (ing.getTemplate().getDefaultEnchantLevel() > 0)) {
+				info = new ItemInfo(ing.getTemplate().getDefaultEnchantLevel());
+				newProduct.setItemInfo(info);
+			}
+			_products.add(newProduct);
+		}
+	}
+	
+	@Override
+	public final long getTaxAmount() {
+		return _taxAmount;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java b/src/main/java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java
new file mode 100644
index 00000000..5531c2e0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/multisell/PreparedListContainer.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.multisell;
+
+import java.util.ArrayList;
+import java.util.LinkedList;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class PreparedListContainer extends ListContainer {
+	private int _npcObjectId = 0;
+	
+	public PreparedListContainer(ListContainer template, boolean inventoryOnly, L2PcInstance player, L2Npc npc) {
+		super(template.getListId());
+		setMaintainEnchantment(template.getMaintainEnchantment());
+		setApplyTaxes(false);
+		double taxRate = 0;
+		if (npc != null) {
+			_npcObjectId = npc.getObjectId();
+			if (template.getApplyTaxes() && npc.getIsInTown() && (npc.getCastle().getOwnerId() > 0)) {
+				setApplyTaxes(true);
+				taxRate = npc.getCastle().getTaxRate();
+			}
+		}
+		
+		if (inventoryOnly) {
+			if (player == null) {
+				return;
+			}
+			
+			final L2ItemInstance[] items;
+			if (getMaintainEnchantment()) {
+				items = player.getInventory().getUniqueItemsByEnchantLevel(false, false, false);
+			} else {
+				items = player.getInventory().getUniqueItems(false, false, false);
+			}
+			
+			_entries = new LinkedList<>();
+			for (L2ItemInstance item : items) {
+				// only do the match up on equippable items that are not currently equipped
+				// so for each appropriate item, produce a set of entries for the multisell list.
+				if (!item.isEquipped() && ((item.getItem() instanceof L2Armor) || (item.getItem() instanceof L2Weapon))) {
+					// loop through the entries to see which ones we wish to include
+					for (Entry ent : template.getEntries()) {
+						// check ingredients of this entry to see if it's an entry we'd like to include.
+						for (Ingredient ing : ent.getIngredients()) {
+							if (item.getId() == ing.getItemId()) {
+								_entries.add(new PreparedEntry(ent, item, getApplyTaxes(), getMaintainEnchantment(), taxRate));
+								break; // next entry
+							}
+						}
+					}
+				}
+			}
+		} else {
+			_entries = new ArrayList<>(template.getEntries().size());
+			for (Entry ent : template.getEntries()) {
+				_entries.add(new PreparedEntry(ent, null, getApplyTaxes(), false, taxRate));
+			}
+		}
+	}
+	
+	public final boolean checkNpcObjectId(int npcObjectId) {
+		return (_npcObjectId == 0) || (_npcObjectId == npcObjectId);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java
new file mode 100644
index 00000000..a8ad5cd5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java
@@ -0,0 +1,439 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2Party.messageType;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMode;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author godson
+ * @author GodKratos
+ * @author Pere
+ * @author DS
+ */
+public abstract class AbstractOlympiadGame {
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractOlympiadGame.class);
+	protected static final Logger LOG_RESULTS = LoggerFactory.getLogger("olympiad");
+	
+	protected static final String POINTS = "olympiad_points";
+	protected static final String COMP_DONE = "competitions_done";
+	protected static final String COMP_WON = "competitions_won";
+	protected static final String COMP_LOST = "competitions_lost";
+	protected static final String COMP_DRAWN = "competitions_drawn";
+	protected static final String COMP_DONE_WEEK = "competitions_done_week";
+	protected static final String COMP_DONE_WEEK_CLASSED = "competitions_done_week_classed";
+	protected static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed";
+	protected static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team";
+	
+	protected long _startTime = 0;
+	protected boolean _aborted = false;
+	protected final int _stadiumID;
+	
+	protected AbstractOlympiadGame(int id) {
+		_stadiumID = id;
+	}
+	
+	public final boolean isAborted() {
+		return _aborted;
+	}
+	
+	public final int getStadiumId() {
+		return _stadiumID;
+	}
+	
+	protected boolean makeCompetitionStart() {
+		_startTime = System.currentTimeMillis();
+		return !_aborted;
+	}
+	
+	protected final void addPointsToParticipant(Participant par, int points) {
+		par.updateStat(POINTS, points);
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_GAINED_S2_OLYMPIAD_POINTS);
+		sm.addString(par.getName());
+		sm.addInt(points);
+		broadcastPacket(sm);
+	}
+	
+	protected final void removePointsFromParticipant(Participant par, int points) {
+		par.updateStat(POINTS, -points);
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LOST_S2_OLYMPIAD_POINTS);
+		sm.addString(par.getName());
+		sm.addInt(points);
+		broadcastPacket(sm);
+	}
+	
+	/**
+	 * Function return null if player passed all checks or SystemMessage with reason for broadcast to opponent(s).
+	 * @param player
+	 * @return
+	 */
+	protected static SystemMessage checkDefaulted(L2PcInstance player) {
+		if ((player == null) || !player.isOnline()) {
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_ENDS_THE_GAME);
+		}
+		
+		if ((player.getClient() == null) || player.getClient().isDetached()) {
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_ENDS_THE_GAME);
+		}
+		
+		// safety precautions
+		if (player.inObserverMode() || TvTEvent.isPlayerParticipant(player.getObjectId())) {
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
+		}
+		
+		SystemMessage sm;
+		if (player.isDead()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_OLYMPIAD_WHILE_DEAD);
+			sm.addPcName(player);
+			player.sendPacket(sm);
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
+		}
+		if (player.isSubClassActive()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_WHILE_CHANGED_TO_SUB_CLASS);
+			sm.addPcName(player);
+			player.sendPacket(sm);
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
+		}
+		if (player.isCursedWeaponEquipped()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_JOIN_OLYMPIAD_POSSESSING_S2);
+			sm.addPcName(player);
+			sm.addItemName(player.getCursedWeaponEquippedId());
+			player.sendPacket(sm);
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
+		}
+		if (!player.isInventoryUnder90(true)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT);
+			sm.addPcName(player);
+			player.sendPacket(sm);
+			return SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME);
+		}
+		
+		return null;
+	}
+	
+	protected static boolean portPlayerToArena(Participant par, Location loc, int id) {
+		final L2PcInstance player = par.getPlayer();
+		if ((player == null) || !player.isOnline()) {
+			return false;
+		}
+		
+		try {
+			player.setLastLocation();
+			if (player.isSitting()) {
+				player.standUp();
+			}
+			player.setTarget(null);
+			
+			player.setOlympiadGameId(id);
+			player.setIsInOlympiadMode(true);
+			player.setIsOlympiadStart(false);
+			player.setOlympiadSide(par.getSide());
+			player.setOlympiadBuffCount(olympiad().getMaxBuffs());
+			loc.setInstanceId(OlympiadGameManager.getInstance().getOlympiadTask(id).getZone().getInstanceId());
+			player.teleToLocation(loc, false);
+			player.sendPacket(new ExOlympiadMode(2));
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+			return false;
+		}
+		return true;
+	}
+	
+	protected static void removals(L2PcInstance player, boolean removeParty) {
+		try {
+			if (player == null) {
+				return;
+			}
+			
+			// Remove Buffs
+			player.stopAllEffectsExceptThoseThatLastThroughDeath();
+			
+			// Remove Clan Skills
+			if (player.getClan() != null) {
+				player.getClan().removeSkillEffects(player);
+				if (player.getClan().getCastleId() > 0) {
+					CastleManager.getInstance().getCastleByOwner(player.getClan()).removeResidentialSkills(player);
+				}
+				if (player.getClan().getFortId() > 0) {
+					FortManager.getInstance().getFortByOwner(player.getClan()).removeResidentialSkills(player);
+				}
+			}
+			// Abort casting if player casting
+			player.abortAttack();
+			player.abortCast();
+			
+			// Force the character to be visible
+			player.setInvisible(false);
+			
+			// Heal Player fully
+			player.setCurrentCp(player.getMaxCp());
+			player.setCurrentHp(player.getMaxHp());
+			player.setCurrentMp(player.getMaxMp());
+			
+			// Remove Summon's Buffs
+			if (player.hasSummon()) {
+				final L2Summon summon = player.getSummon();
+				summon.stopAllEffectsExceptThoseThatLastThroughDeath();
+				summon.abortAttack();
+				summon.abortCast();
+				
+				if (summon.isPet()) {
+					summon.unSummon(player);
+				}
+			}
+			
+			// stop any cubic that has been given by other player.
+			player.stopCubicsByOthers();
+			
+			// Remove player from his party
+			if (removeParty) {
+				final L2Party party = player.getParty();
+				if (party != null) {
+					party.removePartyMember(player, messageType.Expelled);
+				}
+			}
+			// Remove Agathion
+			if (player.getAgathionId() > 0) {
+				player.setAgathionId(0);
+				player.broadcastUserInfo();
+			}
+			
+			player.checkItemRestriction();
+			
+			// Remove shot automation
+			player.disableAutoShotsAll();
+			
+			// Discharge any active shots
+			L2ItemInstance item = player.getActiveWeaponInstance();
+			if (item != null) {
+				item.unChargeAllShots();
+			}
+			
+			// enable skills with cool time <= 15 minutes
+			for (Skill skill : player.getAllSkills()) {
+				if (skill.getReuseDelay() <= 900000) {
+					player.enableSkill(skill);
+				}
+			}
+			
+			player.sendSkillList();
+			player.sendPacket(new SkillCoolTime(player));
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	protected static void cleanEffects(L2PcInstance player) {
+		try {
+			// prevent players kill each other
+			player.setIsOlympiadStart(false);
+			player.setTarget(null);
+			player.abortAttack();
+			player.abortCast();
+			player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+			
+			if (player.isDead()) {
+				player.setIsDead(false);
+			}
+			
+			player.stopAllEffectsExceptThoseThatLastThroughDeath();
+			player.clearSouls();
+			player.clearCharges();
+			if (player.getAgathionId() > 0) {
+				player.setAgathionId(0);
+			}
+			final L2Summon summon = player.getSummon();
+			if ((summon != null) && !summon.isDead()) {
+				summon.setTarget(null);
+				summon.abortAttack();
+				summon.abortCast();
+				summon.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+				summon.stopAllEffectsExceptThoseThatLastThroughDeath();
+			}
+			
+			player.setCurrentCp(player.getMaxCp());
+			player.setCurrentHp(player.getMaxHp());
+			player.setCurrentMp(player.getMaxMp());
+			player.getStatus().startHpMpRegeneration();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	protected static void playerStatusBack(L2PcInstance player) {
+		try {
+			if (player.isTransformed()) {
+				player.untransform();
+			}
+			
+			if (player.isInOlympiadMode()) {
+				player.sendPacket(new ExOlympiadMode(0));
+			}
+			
+			player.setIsInOlympiadMode(false);
+			player.setIsOlympiadStart(false);
+			player.setOlympiadSide(-1);
+			player.setOlympiadGameId(-1);
+			
+			// Add Clan Skills
+			if (player.getClan() != null) {
+				player.getClan().addSkillEffects(player);
+				if (player.getClan().getCastleId() > 0) {
+					CastleManager.getInstance().getCastleByOwner(player.getClan()).giveResidentialSkills(player);
+				}
+				if (player.getClan().getFortId() > 0) {
+					FortManager.getInstance().getFortByOwner(player.getClan()).giveResidentialSkills(player);
+				}
+				player.sendSkillList();
+			}
+			
+			// heal again after adding clan skills
+			player.setCurrentCp(player.getMaxCp());
+			player.setCurrentHp(player.getMaxHp());
+			player.setCurrentMp(player.getMaxMp());
+			player.getStatus().startHpMpRegeneration();
+			
+			if (customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) {
+				AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, player);
+			}
+		} catch (Exception e) {
+			LOG.warn("portPlayersToArena()", e);
+		}
+	}
+	
+	protected static void portPlayerBack(L2PcInstance player) {
+		if (player == null) {
+			return;
+		}
+		final Location loc = player.getLastLocation();
+		if ((loc.getX() == 0) && (loc.getY() == 0)) {
+			return;
+		}
+		player.setTeam(Team.NONE);
+		player.setIsPendingRevive(false);
+		player.setInstanceId(0);
+		player.teleToLocation(loc);
+		player.unsetLastLocation();
+	}
+	
+	public static void rewardParticipant(L2PcInstance player, List<ItemHolder> rewards) {
+		if ((player == null) || !player.isOnline() || (rewards == null) || rewards.isEmpty()) {
+			return;
+		}
+		
+		try {
+			SystemMessage sm;
+			L2ItemInstance item;
+			final InventoryUpdate iu = new InventoryUpdate();
+			for (ItemHolder reward : rewards) {
+				if (reward == null) {
+					continue;
+				}
+				
+				item = player.getInventory().addItem("Olympiad", reward.getId(), reward.getCount(), player, null);
+				if (item == null) {
+					continue;
+				}
+				
+				iu.addModifiedItem(item);
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+				sm.addItemName(reward.getId());
+				sm.addLong(reward.getCount());
+				player.sendPacket(sm);
+			}
+			player.sendPacket(iu);
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	public abstract CompetitionType getType();
+	
+	public abstract String[] getPlayerNames();
+	
+	public abstract boolean containsParticipant(int playerId);
+	
+	public abstract void sendOlympiadInfo(L2Character player);
+	
+	public abstract void broadcastOlympiadInfo(L2OlympiadStadiumZone stadium);
+	
+	protected abstract void broadcastPacket(L2GameServerPacket packet);
+	
+	protected abstract boolean needBuffers();
+	
+	protected abstract boolean checkDefaulted();
+	
+	protected abstract void removals();
+	
+	protected abstract boolean portPlayersToArena(List<Location> spawns);
+	
+	protected abstract void cleanEffects();
+	
+	protected abstract void portPlayersBack();
+	
+	protected abstract void playersStatusBack();
+	
+	protected abstract void clearPlayers();
+	
+	protected abstract void handleDisconnect(L2PcInstance player);
+	
+	protected abstract void resetDamage();
+	
+	protected abstract void addDamage(L2PcInstance player, int damage);
+	
+	protected abstract boolean checkBattleStatus();
+	
+	protected abstract boolean haveWinner();
+	
+	protected abstract void validateWinner(L2OlympiadStadiumZone stadium);
+	
+	protected abstract int getDivider();
+	
+	protected abstract List<ItemHolder> getReward();
+	
+	protected abstract String getWeeklyMatchType();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/CompetitionType.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/CompetitionType.java
new file mode 100644
index 00000000..1d728857
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/CompetitionType.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+/**
+ * @author DS
+ */
+public enum CompetitionType {
+	CLASSED("classed"),
+	NON_CLASSED("non-classed"),
+	TEAMS("teams"),
+	OTHER("other");
+	
+	private final String _name;
+	
+	CompetitionType(String name) {
+		_name = name;
+	}
+	
+	@Override
+	public final String toString() {
+		return _name;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java
new file mode 100644
index 00000000..3e90205a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java
@@ -0,0 +1,1017 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * Olympiad.
+ * @author godson
+ */
+public class Olympiad extends ListenersContainer {
+	private static final Logger LOG = LoggerFactory.getLogger(Olympiad.class);
+	private static final Logger LOG_OLYMPIAD = LoggerFactory.getLogger("olympiad");
+	
+	private static final Map<Integer, StatsSet> NOBLES = new ConcurrentHashMap<>();
+	
+	private static final List<StatsSet> HEROES_TO_BE = new ArrayList<>();
+	
+	private static final Map<Integer, Integer> NOBLES_RANK = new HashMap<>();
+	
+	public static final String OLYMPIAD_HTML_PATH = "data/html/olympiad/";
+	private static final String OLYMPIAD_LOAD_DATA = "SELECT current_cycle, period, olympiad_end, validation_end, next_weekly_change FROM olympiad_data WHERE id = 0";
+	private static final String OLYMPIAD_SAVE_DATA = "INSERT INTO olympiad_data (id, current_cycle, period, olympiad_end, validation_end, next_weekly_change) VALUES (0,?,?,?,?,?) ON DUPLICATE KEY UPDATE current_cycle=?, period=?, olympiad_end=?, validation_end=?, next_weekly_change=?";
+	private static final String OLYMPIAD_LOAD_NOBLES = "SELECT olympiad_nobles.charId, olympiad_nobles.class_id, characters.char_name, olympiad_nobles.olympiad_points, olympiad_nobles.competitions_done, olympiad_nobles.competitions_won, olympiad_nobles.competitions_lost, olympiad_nobles.competitions_drawn, olympiad_nobles.competitions_done_week, olympiad_nobles.competitions_done_week_classed, olympiad_nobles.competitions_done_week_non_classed, olympiad_nobles.competitions_done_week_team FROM olympiad_nobles, characters WHERE characters.charId = olympiad_nobles.charId";
+	private static final String OLYMPIAD_SAVE_NOBLES = "INSERT INTO olympiad_nobles (`charId`, `class_id`, `olympiad_points`, `competitions_done`, `competitions_won`, `competitions_lost`, `competitions_drawn`, `competitions_done_week`, `competitions_done_week_classed`, `competitions_done_week_non_classed`, `competitions_done_week_team`) VALUES (?,?,?,?,?,?,?,?,?,?,?)";
+	private static final String OLYMPIAD_UPDATE_NOBLES = "UPDATE olympiad_nobles SET olympiad_points = ?, competitions_done = ?, competitions_won = ?, competitions_lost = ?, competitions_drawn = ?, competitions_done_week = ?, competitions_done_week_classed = ?, competitions_done_week_non_classed = ?, competitions_done_week_team = ? WHERE charId = ?";
+	private static final String OLYMPIAD_GET_HEROES = "SELECT olympiad_nobles.charId, characters.char_name FROM olympiad_nobles, characters WHERE characters.charId = olympiad_nobles.charId AND olympiad_nobles.class_id = ? AND olympiad_nobles.competitions_done >= "
+		+ olympiad().getMinMatchesForPoints() + " AND olympiad_nobles.competitions_won > 0 ORDER BY olympiad_nobles.olympiad_points DESC, olympiad_nobles.competitions_done DESC, olympiad_nobles.competitions_won DESC";
+	private static final String GET_ALL_CLASSIFIED_NOBLESS = "SELECT charId from olympiad_nobles_eom WHERE competitions_done >= " + olympiad().getMinMatchesForPoints() + " ORDER BY olympiad_points DESC, competitions_done DESC, competitions_won DESC";
+	private static final String GET_EACH_CLASS_LEADER = "SELECT characters.char_name from olympiad_nobles_eom, characters WHERE characters.charId = olympiad_nobles_eom.charId AND olympiad_nobles_eom.class_id = ? AND olympiad_nobles_eom.competitions_done >= " + olympiad().getMinMatchesForPoints()
+		+ " ORDER BY olympiad_nobles_eom.olympiad_points DESC, olympiad_nobles_eom.competitions_done DESC, olympiad_nobles_eom.competitions_won DESC LIMIT 10";
+	private static final String GET_EACH_CLASS_LEADER_CURRENT = "SELECT characters.char_name from olympiad_nobles, characters WHERE characters.charId = olympiad_nobles.charId AND olympiad_nobles.class_id = ? AND olympiad_nobles.competitions_done >= " + olympiad().getMinMatchesForPoints()
+		+ " ORDER BY olympiad_nobles.olympiad_points DESC, olympiad_nobles.competitions_done DESC, olympiad_nobles.competitions_won DESC LIMIT 10";
+	private static final String GET_EACH_CLASS_LEADER_SOULHOUND = "SELECT characters.char_name from olympiad_nobles_eom, characters WHERE characters.charId = olympiad_nobles_eom.charId AND (olympiad_nobles_eom.class_id = ? OR olympiad_nobles_eom.class_id = 133) AND olympiad_nobles_eom.competitions_done >= "
+		+ olympiad().getMinMatchesForPoints() + " ORDER BY olympiad_nobles_eom.olympiad_points DESC, olympiad_nobles_eom.competitions_done DESC, olympiad_nobles_eom.competitions_won DESC LIMIT 10";
+	private static final String GET_EACH_CLASS_LEADER_CURRENT_SOULHOUND = "SELECT characters.char_name from olympiad_nobles, characters WHERE characters.charId = olympiad_nobles.charId AND (olympiad_nobles.class_id = ? OR olympiad_nobles.class_id = 133) AND olympiad_nobles.competitions_done >= "
+		+ olympiad().getMinMatchesForPoints() + " ORDER BY olympiad_nobles.olympiad_points DESC, olympiad_nobles.competitions_done DESC, olympiad_nobles.competitions_won DESC LIMIT 10";
+	
+	private static final String OLYMPIAD_DELETE_ALL = "TRUNCATE olympiad_nobles";
+	private static final String OLYMPIAD_MONTH_CLEAR = "TRUNCATE olympiad_nobles_eom";
+	private static final String OLYMPIAD_MONTH_CREATE = "INSERT INTO olympiad_nobles_eom SELECT charId, class_id, olympiad_points, competitions_done, competitions_won, competitions_lost, competitions_drawn FROM olympiad_nobles";
+	private static final int[] HERO_IDS = {
+		88,
+		89,
+		90,
+		91,
+		92,
+		93,
+		94,
+		95,
+		96,
+		97,
+		98,
+		99,
+		100,
+		101,
+		102,
+		103,
+		104,
+		105,
+		106,
+		107,
+		108,
+		109,
+		110,
+		111,
+		112,
+		113,
+		114,
+		115,
+		116,
+		117,
+		118,
+		131,
+		132,
+		133,
+		134
+	};
+	
+	public static final String CHAR_ID = "charId";
+	public static final String CLASS_ID = "class_id";
+	public static final String CHAR_NAME = "char_name";
+	public static final String POINTS = "olympiad_points";
+	public static final String COMP_DONE = "competitions_done";
+	public static final String COMP_WON = "competitions_won";
+	public static final String COMP_LOST = "competitions_lost";
+	public static final String COMP_DRAWN = "competitions_drawn";
+	public static final String COMP_DONE_WEEK = "competitions_done_week";
+	public static final String COMP_DONE_WEEK_CLASSED = "competitions_done_week_classed";
+	public static final String COMP_DONE_WEEK_NON_CLASSED = "competitions_done_week_non_classed";
+	public static final String COMP_DONE_WEEK_TEAM = "competitions_done_week_team";
+	
+	private long _olympiadEnd;
+	private long _validationEnd;
+	
+	/**
+	 * The current period of the olympiad.<br>
+	 * <b>0 -</b> Competition period<br>
+	 * <b>1 -</b> Validation Period
+	 */
+	private int _period;
+	private long _nextWeeklyChange;
+	private int _currentCycle;
+	private long _compEnd;
+	private Calendar _compStart;
+	private static boolean _inCompPeriod;
+	private ScheduledFuture<?> _scheduledOlympiadEnd;
+	private ScheduledFuture<?> _scheduledWeeklyTask;
+	private ScheduledFuture<?> _gameManager = null;
+	private ScheduledFuture<?> _gameAnnouncer = null;
+	
+	protected Olympiad() {
+		load();
+		AntiFeedManager.getInstance().registerEvent(AntiFeedManager.OLYMPIAD_ID);
+		
+		if (_period == 0) {
+			init();
+		}
+	}
+	
+	private void load() {
+		NOBLES.clear();
+		boolean loaded = false;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(OLYMPIAD_LOAD_DATA)) {
+			while (rs.next()) {
+				_currentCycle = rs.getInt("current_cycle");
+				_period = rs.getInt("period");
+				_olympiadEnd = rs.getLong("olympiad_end");
+				_validationEnd = rs.getLong("validation_end");
+				_nextWeeklyChange = rs.getLong("next_weekly_change");
+				loaded = true;
+			}
+		} catch (Exception e) {
+			LOG.warn("Error loading olympiad data from database: ", e);
+		}
+		
+		if (!loaded) {
+			LOG.info("Failed to load data from database, trying to load from file.");
+			
+			if (olympiad().getCurrentCycle() != null) {
+				_currentCycle = olympiad().getCurrentCycle();
+				_period = olympiad().getPeriod();
+				_olympiadEnd = olympiad().getOlympiadEnd();
+				_validationEnd = olympiad().getValidationEnd();
+				_nextWeeklyChange = olympiad().getNextWeeklyChange();
+			}
+		}
+		
+		switch (_period) {
+			case 0:
+				if ((_olympiadEnd == 0) || (_olympiadEnd < Calendar.getInstance().getTimeInMillis())) {
+					setNewOlympiadEnd();
+				} else {
+					scheduleWeeklyChange();
+				}
+				break;
+			case 1:
+				if (_validationEnd > Calendar.getInstance().getTimeInMillis()) {
+					loadNoblesRank();
+					ThreadPoolManager.getInstance().scheduleGeneral(new ValidationEndTask(), getMillisToValidationEnd());
+				} else {
+					_currentCycle++;
+					_period = 0;
+					deleteNobles();
+					setNewOlympiadEnd();
+				}
+				break;
+			default:
+				LOG.warn("Omg something went wrong in loading!! Period = {}", _period);
+				return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(OLYMPIAD_LOAD_NOBLES)) {
+			StatsSet statData;
+			while (rs.next()) {
+				statData = new StatsSet();
+				statData.set(CLASS_ID, rs.getInt(CLASS_ID));
+				statData.set(CHAR_NAME, rs.getString(CHAR_NAME));
+				statData.set(POINTS, rs.getInt(POINTS));
+				statData.set(COMP_DONE, rs.getInt(COMP_DONE));
+				statData.set(COMP_WON, rs.getInt(COMP_WON));
+				statData.set(COMP_LOST, rs.getInt(COMP_LOST));
+				statData.set(COMP_DRAWN, rs.getInt(COMP_DRAWN));
+				statData.set(COMP_DONE_WEEK, rs.getInt(COMP_DONE_WEEK));
+				statData.set(COMP_DONE_WEEK_CLASSED, rs.getInt(COMP_DONE_WEEK_CLASSED));
+				statData.set(COMP_DONE_WEEK_NON_CLASSED, rs.getInt(COMP_DONE_WEEK_NON_CLASSED));
+				statData.set(COMP_DONE_WEEK_TEAM, rs.getInt(COMP_DONE_WEEK_TEAM));
+				statData.set("to_save", false);
+				
+				addNobleStats(rs.getInt(CHAR_ID), statData);
+			}
+		} catch (Exception e) {
+			LOG.warn("Error loading noblesse data from database: ", e);
+		}
+		
+		synchronized (this) {
+			LOG.info("Loading Olympiad System....");
+			if (_period == 0) {
+				LOG.info("Currently in Olympiad Period");
+			} else {
+				LOG.info("Currently in Validation Period");
+			}
+			
+			long milliToEnd;
+			if (_period == 0) {
+				milliToEnd = getMillisToOlympiadEnd();
+			} else {
+				milliToEnd = getMillisToValidationEnd();
+			}
+			
+			LOG.info("{} minutes until period ends", milliToEnd / 60000);
+			
+			if (_period == 0) {
+				milliToEnd = getMillisToWeekChange();
+				
+				LOG.info("Next weekly change is in {} minutes", milliToEnd / 60000);
+			}
+		}
+		
+		LOG.info("Loaded {} Nobles", NOBLES.size());
+		
+	}
+	
+	private void loadNoblesRank() {
+		NOBLES_RANK.clear();
+		Map<Integer, Integer> tmpPlace = new HashMap<>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement();
+			var rs = s.executeQuery(GET_ALL_CLASSIFIED_NOBLESS)) {
+			int place = 1;
+			while (rs.next()) {
+				tmpPlace.put(rs.getInt(CHAR_ID), place++);
+			}
+		} catch (Exception e) {
+			LOG.warn("Error loading noblesse data from database for Ranking: ", e);
+		}
+		
+		int rank1 = (int) Math.round(tmpPlace.size() * 0.01);
+		int rank2 = (int) Math.round(tmpPlace.size() * 0.10);
+		int rank3 = (int) Math.round(tmpPlace.size() * 0.25);
+		int rank4 = (int) Math.round(tmpPlace.size() * 0.50);
+		if (rank1 == 0) {
+			rank1 = 1;
+			rank2++;
+			rank3++;
+			rank4++;
+		}
+		for (Entry<Integer, Integer> chr : tmpPlace.entrySet()) {
+			if (chr.getValue() <= rank1) {
+				NOBLES_RANK.put(chr.getKey(), 1);
+			} else if (tmpPlace.get(chr.getKey()) <= rank2) {
+				NOBLES_RANK.put(chr.getKey(), 2);
+			} else if (tmpPlace.get(chr.getKey()) <= rank3) {
+				NOBLES_RANK.put(chr.getKey(), 3);
+			} else if (tmpPlace.get(chr.getKey()) <= rank4) {
+				NOBLES_RANK.put(chr.getKey(), 4);
+			} else {
+				NOBLES_RANK.put(chr.getKey(), 5);
+			}
+		}
+	}
+	
+	protected void init() {
+		if (_period == 1) {
+			return;
+		}
+		
+		_compStart = Calendar.getInstance();
+		_compStart.set(Calendar.HOUR_OF_DAY, olympiad().getStartHour());
+		_compStart.set(Calendar.MINUTE, olympiad().getStartMinute());
+		_compEnd = _compStart.getTimeInMillis() + olympiad().getCompetitionPeriod();
+		
+		if (_scheduledOlympiadEnd != null) {
+			_scheduledOlympiadEnd.cancel(true);
+		}
+		
+		_scheduledOlympiadEnd = ThreadPoolManager.getInstance().scheduleGeneral(new OlympiadEndTask(HEROES_TO_BE), getMillisToOlympiadEnd());
+		
+		updateCompStatus();
+	}
+	
+	protected class OlympiadEndTask implements Runnable {
+		private final List<StatsSet> _heroesToBe;
+		
+		public OlympiadEndTask(List<StatsSet> heroesToBe) {
+			_heroesToBe = heroesToBe;
+		}
+		
+		@Override
+		public void run() {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.OLYMPIAD_PERIOD_S1_HAS_ENDED);
+			sm.addInt(_currentCycle);
+			
+			Broadcast.toAllOnlinePlayers(sm);
+			Broadcast.toAllOnlinePlayers("Olympiad Validation Period has began");
+			
+			if (_scheduledWeeklyTask != null) {
+				_scheduledWeeklyTask.cancel(true);
+			}
+			
+			saveNobleData();
+			
+			_period = 1;
+			sortHeroesToBe();
+			Hero.getInstance().resetData();
+			Hero.getInstance().computeNewHeroes(_heroesToBe);
+			
+			saveOlympiadStatus();
+			updateMonthlyData();
+			
+			Calendar validationEnd = Calendar.getInstance();
+			_validationEnd = validationEnd.getTimeInMillis() + olympiad().getValidationPeriod();
+			
+			loadNoblesRank();
+			ThreadPoolManager.getInstance().scheduleGeneral(new ValidationEndTask(), getMillisToValidationEnd());
+		}
+	}
+	
+	protected class ValidationEndTask implements Runnable {
+		@Override
+		public void run() {
+			Broadcast.toAllOnlinePlayers("Olympiad Validation Period has ended");
+			_period = 0;
+			_currentCycle++;
+			deleteNobles();
+			setNewOlympiadEnd();
+			init();
+		}
+	}
+	
+	protected static int getNobleCount() {
+		return NOBLES.size();
+	}
+	
+	protected static StatsSet getNobleStats(int playerId) {
+		return NOBLES.get(playerId);
+	}
+	
+	private void updateCompStatus() {
+		// _compStarted = false;
+		
+		synchronized (this) {
+			long milliToStart = getMillisToCompBegin();
+			
+			double numSecs = (milliToStart / 1000.0) % 60;
+			double countDown = ((milliToStart / 1000.) - numSecs) / 60;
+			int numMins = (int) Math.floor(countDown % 60);
+			countDown = (countDown - numMins) / 60;
+			int numHours = (int) Math.floor(countDown % 24);
+			int numDays = (int) Math.floor((countDown - numHours) / 24);
+			
+			LOG.info("Competition Period Starts in {} days, {} hours and {} mins.", numDays, numHours, numMins);
+			
+			LOG.info("Event starts/started : {}", _compStart.getTime());
+		}
+		
+		ThreadPoolManager.getInstance().scheduleGeneral(() -> {
+			if (isOlympiadEnd()) {
+				return;
+			}
+			
+			_inCompPeriod = true;
+			
+			Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_OLYMPIAD_GAME_HAS_STARTED));
+			LOG.info("Olympiad Game Started");
+			
+			if (olympiad().logFights()) {
+				LOG_OLYMPIAD.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed");
+			}
+			
+			_gameManager = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(OlympiadGameManager.getInstance(), 30000, 30000);
+			if (olympiad().announceGames()) {
+				_gameAnnouncer = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new OlympiadAnnouncer(), 30000, 500);
+			}
+			
+			long regEnd = getMillisToCompEnd() - 600000;
+			if (regEnd > 0) {
+				ThreadPoolManager.getInstance().scheduleGeneral(() -> Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.OLYMPIAD_REGISTRATION_PERIOD_ENDED)), regEnd);
+			}
+			
+			ThreadPoolManager.getInstance().scheduleGeneral(() -> {
+				if (isOlympiadEnd()) {
+					return;
+				}
+				_inCompPeriod = false;
+				Broadcast.toAllOnlinePlayers(SystemMessage.getSystemMessage(SystemMessageId.THE_OLYMPIAD_GAME_HAS_ENDED));
+				LOG.info("Olympiad Game Ended");
+				
+				while (OlympiadGameManager.getInstance().isBattleStarted()) // cleared in game manager
+				{
+					try {
+						// wait 1 minutes for end of pending games
+						Thread.sleep(60000);
+					} catch (InterruptedException e) {
+					}
+				}
+				
+				if (_gameManager != null) {
+					_gameManager.cancel(false);
+					_gameManager = null;
+				}
+				
+				if (_gameAnnouncer != null) {
+					_gameAnnouncer.cancel(false);
+					_gameAnnouncer = null;
+				}
+				
+				saveOlympiadStatus();
+				
+				init();
+			}, getMillisToCompEnd());
+		}, getMillisToCompBegin());
+	}
+	
+	private long getMillisToOlympiadEnd() {
+		// if (_olympiadEnd > Calendar.getInstance().getTimeInMillis())
+		return (_olympiadEnd - Calendar.getInstance().getTimeInMillis());
+		// return 10L;
+	}
+	
+	public void manualSelectHeroes() {
+		if (_scheduledOlympiadEnd != null) {
+			_scheduledOlympiadEnd.cancel(true);
+		}
+		
+		_scheduledOlympiadEnd = ThreadPoolManager.getInstance().scheduleGeneral(new OlympiadEndTask(HEROES_TO_BE), 0);
+	}
+	
+	private long getMillisToValidationEnd() {
+		if (_validationEnd > Calendar.getInstance().getTimeInMillis()) {
+			return (_validationEnd - Calendar.getInstance().getTimeInMillis());
+		}
+		return 10L;
+	}
+	
+	public boolean isOlympiadEnd() {
+		return (_period != 0);
+	}
+	
+	private void setNewOlympiadEnd() {
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.OLYMPIAD_PERIOD_S1_HAS_STARTED);
+		sm.addInt(_currentCycle);
+		
+		Broadcast.toAllOnlinePlayers(sm);
+		
+		Calendar currentTime = Calendar.getInstance();
+		currentTime.add(Calendar.MONTH, 1);
+		currentTime.set(Calendar.DAY_OF_MONTH, 1);
+		currentTime.set(Calendar.AM_PM, Calendar.AM);
+		currentTime.set(Calendar.HOUR, 12);
+		currentTime.set(Calendar.MINUTE, 0);
+		currentTime.set(Calendar.SECOND, 0);
+		_olympiadEnd = currentTime.getTimeInMillis();
+		
+		Calendar nextChange = Calendar.getInstance();
+		_nextWeeklyChange = nextChange.getTimeInMillis() + olympiad().getWeeklyPeriod();
+		scheduleWeeklyChange();
+	}
+	
+	public boolean inCompPeriod() {
+		return _inCompPeriod;
+	}
+	
+	private long getMillisToCompBegin() {
+		if ((_compStart.getTimeInMillis() < Calendar.getInstance().getTimeInMillis()) && (_compEnd > Calendar.getInstance().getTimeInMillis())) {
+			return 10L;
+		}
+		
+		if (_compStart.getTimeInMillis() > Calendar.getInstance().getTimeInMillis()) {
+			return (_compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
+		}
+		
+		return setNewCompBegin();
+	}
+	
+	private long setNewCompBegin() {
+		_compStart = Calendar.getInstance();
+		_compStart.set(Calendar.HOUR_OF_DAY, olympiad().getStartHour());
+		_compStart.set(Calendar.MINUTE, olympiad().getStartMinute());
+		_compStart.add(Calendar.HOUR_OF_DAY, 24);
+		_compEnd = _compStart.getTimeInMillis() + olympiad().getCompetitionPeriod();
+		
+		LOG.info("New Schedule @ " + _compStart.getTime());
+		
+		return (_compStart.getTimeInMillis() - Calendar.getInstance().getTimeInMillis());
+	}
+	
+	protected long getMillisToCompEnd() {
+		// if (_compEnd > Calendar.getInstance().getTimeInMillis())
+		return (_compEnd - Calendar.getInstance().getTimeInMillis());
+		// return 10L;
+	}
+	
+	private long getMillisToWeekChange() {
+		if (_nextWeeklyChange > Calendar.getInstance().getTimeInMillis()) {
+			return (_nextWeeklyChange - Calendar.getInstance().getTimeInMillis());
+		}
+		return 10L;
+	}
+	
+	private void scheduleWeeklyChange() {
+		_scheduledWeeklyTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(() -> {
+			addWeeklyPoints();
+			LOG.info("Added weekly points to nobles");
+			resetWeeklyMatches();
+			LOG.info("Reset weekly matches to nobles");
+			
+			Calendar nextChange = Calendar.getInstance();
+			_nextWeeklyChange = nextChange.getTimeInMillis() + olympiad().getWeeklyPeriod();
+		}, getMillisToWeekChange(), olympiad().getWeeklyPeriod());
+	}
+	
+	private synchronized void addWeeklyPoints() {
+		if (_period == 1) {
+			return;
+		}
+		
+		int currentPoints;
+		for (StatsSet nobleInfo : NOBLES.values()) {
+			currentPoints = nobleInfo.getInt(POINTS);
+			currentPoints += olympiad().getWeeklyPoints();
+			nobleInfo.set(POINTS, currentPoints);
+		}
+	}
+	
+	/**
+	 * Resets number of matches, classed matches, non classed matches, team matches done by noble characters in the week.
+	 */
+	private synchronized void resetWeeklyMatches() {
+		if (_period == 1) {
+			return;
+		}
+		
+		for (StatsSet nobleInfo : NOBLES.values()) {
+			nobleInfo.set(COMP_DONE_WEEK, 0);
+			nobleInfo.set(COMP_DONE_WEEK_CLASSED, 0);
+			nobleInfo.set(COMP_DONE_WEEK_NON_CLASSED, 0);
+			nobleInfo.set(COMP_DONE_WEEK_TEAM, 0);
+		}
+	}
+	
+	public int getCurrentCycle() {
+		return _currentCycle;
+	}
+	
+	public int getPeriod() {
+		return _period;
+	}
+	
+	public boolean playerInStadia(L2PcInstance player) {
+		return (ZoneManager.getInstance().getOlympiadStadium(player) != null);
+	}
+	
+	/**
+	 * Save noblesse data to database
+	 */
+	private synchronized void saveNobleData() {
+		if (NOBLES.isEmpty()) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			for (Entry<Integer, StatsSet> entry : NOBLES.entrySet()) {
+				StatsSet nobleInfo = entry.getValue();
+				
+				if (nobleInfo == null) {
+					continue;
+				}
+				
+				int charId = entry.getKey();
+				int classId = nobleInfo.getInt(CLASS_ID);
+				int points = nobleInfo.getInt(POINTS);
+				int compDone = nobleInfo.getInt(COMP_DONE);
+				int compWon = nobleInfo.getInt(COMP_WON);
+				int compLost = nobleInfo.getInt(COMP_LOST);
+				int compDrawn = nobleInfo.getInt(COMP_DRAWN);
+				int compDoneWeek = nobleInfo.getInt(COMP_DONE_WEEK);
+				int compDoneWeekClassed = nobleInfo.getInt(COMP_DONE_WEEK_CLASSED);
+				int compDoneWeekNonClassed = nobleInfo.getInt(COMP_DONE_WEEK_NON_CLASSED);
+				int compDoneWeekTeam = nobleInfo.getInt(COMP_DONE_WEEK_TEAM);
+				boolean toSave = nobleInfo.getBoolean("to_save");
+				
+				try (var ps = con.prepareStatement(toSave ? OLYMPIAD_SAVE_NOBLES : OLYMPIAD_UPDATE_NOBLES)) {
+					if (toSave) {
+						ps.setInt(1, charId);
+						ps.setInt(2, classId);
+						ps.setInt(3, points);
+						ps.setInt(4, compDone);
+						ps.setInt(5, compWon);
+						ps.setInt(6, compLost);
+						ps.setInt(7, compDrawn);
+						ps.setInt(8, compDoneWeek);
+						ps.setInt(9, compDoneWeekClassed);
+						ps.setInt(10, compDoneWeekNonClassed);
+						ps.setInt(11, compDoneWeekTeam);
+						
+						nobleInfo.set("to_save", false);
+					} else {
+						ps.setInt(1, points);
+						ps.setInt(2, compDone);
+						ps.setInt(3, compWon);
+						ps.setInt(4, compLost);
+						ps.setInt(5, compDrawn);
+						ps.setInt(6, compDoneWeek);
+						ps.setInt(7, compDoneWeekClassed);
+						ps.setInt(8, compDoneWeekNonClassed);
+						ps.setInt(9, compDoneWeekTeam);
+						ps.setInt(10, charId);
+					}
+					ps.execute();
+				}
+			}
+		} catch (Exception e) {
+			LOG.error("Failed to save noblesse data to database: ", e);
+		}
+	}
+	
+	/**
+	 * Save olympiad.properties file with current olympiad status and update noblesse table in database
+	 */
+	public void saveOlympiadStatus() {
+		saveNobleData();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(OLYMPIAD_SAVE_DATA)) {
+			ps.setInt(1, _currentCycle);
+			ps.setInt(2, _period);
+			ps.setLong(3, _olympiadEnd);
+			ps.setLong(4, _validationEnd);
+			ps.setLong(5, _nextWeeklyChange);
+			ps.setInt(6, _currentCycle);
+			ps.setInt(7, _period);
+			ps.setLong(8, _olympiadEnd);
+			ps.setLong(9, _validationEnd);
+			ps.setLong(10, _nextWeeklyChange);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("Failed to save olympiad data to database: ", e);
+		}
+		
+		//@formatter:off
+		/*
+		Properties OlympiadProperties = new Properties();
+		try (FileOutputStream fos = new FileOutputStream(new File("./" + OLYMPIAD_DATA_FILE)))
+		{
+			OlympiadProperties.setProperty("CurrentCycle", String.valueOf(_currentCycle));
+			OlympiadProperties.setProperty("Period", String.valueOf(_period));
+			OlympiadProperties.setProperty("OlympiadEnd", String.valueOf(_olympiadEnd));
+			OlympiadProperties.setProperty("ValidationEnd", String.valueOf(_validationEnd));
+			OlympiadProperties.setProperty("NextWeeklyChange", String.valueOf(_nextWeeklyChange));
+			OlympiadProperties.store(fos, "Olympiad Properties");
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING, "Unable to save olympiad properties to file: ", e);
+		}
+		*/
+		//@formatter:on
+	}
+	
+	private void updateMonthlyData() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s1 = con.createStatement();
+			var s2 = con.createStatement()) {
+			s1.executeUpdate(OLYMPIAD_MONTH_CLEAR);
+			s2.executeUpdate(OLYMPIAD_MONTH_CREATE);
+		} catch (Exception e) {
+			LOG.error("Failed to update monthly noblesse data: ", e);
+		}
+	}
+	
+	private void sortHeroesToBe() {
+		if (_period != 1) {
+			return;
+		}
+		
+		LOG_OLYMPIAD.info("Noble,charid,classid,compDone,points");
+		for (Entry<Integer, StatsSet> entry : NOBLES.entrySet()) {
+			StatsSet nobleInfo = entry.getValue();
+			if (nobleInfo == null) {
+				continue;
+			}
+			LOG_OLYMPIAD.info("{}, {}, {}, {}, {}", nobleInfo.getString(CHAR_NAME), entry.getKey(), nobleInfo.getInt(CLASS_ID), nobleInfo.getInt(COMP_DONE), nobleInfo.getInt(POINTS));
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(OLYMPIAD_GET_HEROES)) {
+			StatsSet hero;
+			List<StatsSet> soulHounds = new ArrayList<>();
+			for (int element : HERO_IDS) {
+				ps.setInt(1, element);
+				
+				try (var rs = ps.executeQuery()) {
+					if (rs.next()) {
+						hero = new StatsSet();
+						hero.set(CLASS_ID, element);
+						hero.set(CHAR_ID, rs.getInt(CHAR_ID));
+						hero.set(CHAR_NAME, rs.getString(CHAR_NAME));
+						
+						if ((element == 132) || (element == 133)) // Male & Female Soulhounds rank as one hero class
+						{
+							hero = NOBLES.get(hero.getInt(CHAR_ID));
+							hero.set(CHAR_ID, rs.getInt(CHAR_ID));
+							soulHounds.add(hero);
+						} else {
+							LOG_OLYMPIAD.info("Hero {} {} {}", hero.getString(CHAR_NAME), hero.getInt(CHAR_ID), hero.getInt(CLASS_ID));
+							
+							HEROES_TO_BE.add(hero);
+						}
+					}
+				}
+			}
+			
+			switch (soulHounds.size()) {
+				case 1 -> {
+					hero = new StatsSet();
+					StatsSet winner = soulHounds.getFirst();
+					hero.set(CLASS_ID, winner.getInt(CLASS_ID));
+					hero.set(CHAR_ID, winner.getInt(CHAR_ID));
+					hero.set(CHAR_NAME, winner.getString(CHAR_NAME));
+					
+					LOG_OLYMPIAD.info("Hero {} {} {}", hero.getString(CHAR_NAME), hero.getInt(CHAR_ID), hero.getInt(CLASS_ID));
+					
+					HEROES_TO_BE.add(hero);
+				}
+				case 2 -> {
+					hero = new StatsSet();
+					StatsSet winner;
+					StatsSet hero1 = soulHounds.get(0);
+					StatsSet hero2 = soulHounds.get(1);
+					int hero1Points = hero1.getInt(POINTS);
+					int hero2Points = hero2.getInt(POINTS);
+					int hero1Comps = hero1.getInt(COMP_DONE);
+					int hero2Comps = hero2.getInt(COMP_DONE);
+					int hero1Wins = hero1.getInt(COMP_WON);
+					int hero2Wins = hero2.getInt(COMP_WON);
+					
+					if (hero1Points > hero2Points) {
+						winner = hero1;
+					} else if (hero2Points > hero1Points) {
+						winner = hero2;
+					} else {
+						if (hero1Comps > hero2Comps) {
+							winner = hero1;
+						} else if (hero2Comps > hero1Comps) {
+							winner = hero2;
+						} else {
+							if (hero1Wins > hero2Wins) {
+								winner = hero1;
+							} else {
+								winner = hero2;
+							}
+						}
+					}
+					
+					hero.set(CLASS_ID, winner.getInt(CLASS_ID));
+					hero.set(CHAR_ID, winner.getInt(CHAR_ID));
+					hero.set(CHAR_NAME, winner.getString(CHAR_NAME));
+					
+					LOG_OLYMPIAD.info("Hero {} {} {}", hero.getString(CHAR_NAME), hero.getInt(CHAR_ID), hero.getInt(CLASS_ID));
+					
+					HEROES_TO_BE.add(hero);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't load heroes from DB");
+		}
+	}
+	
+	public List<String> getClassLeaderBoard(int classId) {
+		final List<String> names = new ArrayList<>();
+		String query = olympiad().showMonthlyWinners() ? ((classId == 132) ? GET_EACH_CLASS_LEADER_SOULHOUND : GET_EACH_CLASS_LEADER) : ((classId == 132) ? GET_EACH_CLASS_LEADER_CURRENT_SOULHOUND : GET_EACH_CLASS_LEADER_CURRENT);
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(query)) {
+			ps.setInt(1, classId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					names.add(rs.getString(CHAR_NAME));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't load olympiad leaders from DB!");
+		}
+		return names;
+	}
+	
+	public int getNoblessePasses(L2PcInstance player, boolean clear) {
+		if ((player == null) || (_period != 1) || NOBLES_RANK.isEmpty()) {
+			return 0;
+		}
+		
+		final int objId = player.getObjectId();
+		if (!NOBLES_RANK.containsKey(objId)) {
+			return 0;
+		}
+		
+		final StatsSet noble = NOBLES.get(objId);
+		if ((noble == null) || (noble.getInt(POINTS) == 0)) {
+			return 0;
+		}
+		
+		final int rank = NOBLES_RANK.get(objId);
+		int points = (player.isHero() || Hero.getInstance().isUnclaimedHero(player.getObjectId()) ? olympiad().getHeroPoints() : 0);
+		switch (rank) {
+			case 1 -> points += olympiad().getRank1Points();
+			case 2 -> points += olympiad().getRank2Points();
+			case 3 -> points += olympiad().getRank3Points();
+			case 4 -> points += olympiad().getRank4Points();
+			default -> points += olympiad().getRank5Points();
+		}
+		
+		if (clear) {
+			noble.set(POINTS, 0);
+		}
+		points *= olympiad().getGPPerPoint();
+		return points;
+	}
+	
+	public int getNoblePoints(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(POINTS);
+	}
+	
+	public int getLastNobleOlympiadPoints(int objId) {
+		int result = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT olympiad_points FROM olympiad_nobles_eom WHERE charId = ?")) {
+			ps.setInt(1, objId);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					result = rs.getInt(1);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not load last olympiad points:", e);
+		}
+		return result;
+	}
+	
+	public int getCompetitionDone(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_DONE);
+	}
+	
+	public int getCompetitionWon(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_WON);
+	}
+	
+	public int getCompetitionLost(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_LOST);
+	}
+	
+	/**
+	 * Gets how many matches a noble character did in the week
+	 * @param objId id of a noble character
+	 * @return number of weekly competitions done
+	 */
+	public int getCompetitionDoneWeek(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_DONE_WEEK);
+	}
+	
+	/**
+	 * Gets how many classed matches a noble character did in the week
+	 * @param objId id of a noble character
+	 * @return number of weekly <i>classed</i> competitions done
+	 */
+	public int getCompetitionDoneWeekClassed(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_DONE_WEEK_CLASSED);
+	}
+	
+	/**
+	 * Gets how many non classed matches a noble character did in the week
+	 * @param objId id of a noble character
+	 * @return number of weekly <i>non classed</i> competitions done
+	 */
+	public int getCompetitionDoneWeekNonClassed(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_DONE_WEEK_NON_CLASSED);
+	}
+	
+	/**
+	 * Gets how many team matches a noble character did in the week
+	 * @param objId id of a noble character
+	 * @return number of weekly <i>team</i> competitions done
+	 */
+	public int getCompetitionDoneWeekTeam(int objId) {
+		if (!NOBLES.containsKey(objId)) {
+			return 0;
+		}
+		return NOBLES.get(objId).getInt(COMP_DONE_WEEK_TEAM);
+	}
+	
+	/**
+	 * Number of remaining matches a noble character can join in the week
+	 * @param objId id of a noble character
+	 * @return difference between maximum allowed weekly matches and currently done weekly matches.
+	 */
+	public int getRemainingWeeklyMatches(int objId) {
+		return Math.max(olympiad().getMaxWeeklyMatches() - getCompetitionDoneWeek(objId), 0);
+	}
+	
+	/**
+	 * Number of remaining <i>classed</i> matches a noble character can join in the week
+	 * @param objId id of a noble character
+	 * @return difference between maximum allowed weekly classed matches and currently done weekly classed matches.
+	 */
+	public int getRemainingWeeklyMatchesClassed(int objId) {
+		return Math.max(olympiad().getMaxWeeklyMatchesClassed() - getCompetitionDoneWeekClassed(objId), 0);
+	}
+	
+	/**
+	 * Number of remaining <i>non classed</i> matches a noble character can join in the week
+	 * @param objId id of a noble character
+	 * @return difference between maximum allowed weekly non classed matches and currently done weekly non classed matches.
+	 */
+	public int getRemainingWeeklyMatchesNonClassed(int objId) {
+		return Math.max(olympiad().getMaxWeeklyMatchesNonClassed() - getCompetitionDoneWeekNonClassed(objId), 0);
+	}
+	
+	/**
+	 * Number of remaining <i>team</i> matches a noble character can join in the week
+	 * @param objId id of a noble character
+	 * @return difference between maximum allowed weekly team matches and currently done weekly team matches.
+	 */
+	public int getRemainingWeeklyMatchesTeam(int objId) {
+		return Math.max(olympiad().getMaxWeeklyMatchesTeam() - getCompetitionDoneWeekTeam(objId), 0);
+	}
+	
+	private void deleteNobles() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var s = con.createStatement()) {
+			s.executeUpdate(OLYMPIAD_DELETE_ALL);
+		} catch (Exception e) {
+			LOG.warn("Couldn't delete nobles from DB!");
+		}
+		NOBLES.clear();
+	}
+	
+	/**
+	 * @param charId the noble object Id.
+	 * @param data the stats set data to add.
+	 * @return the old stats set if the noble is already present, null otherwise.
+	 */
+	protected static StatsSet addNobleStats(int charId, StatsSet data) {
+		return NOBLES.put(charId, data);
+	}
+	
+	public static Olympiad getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final Olympiad INSTANCE = new Olympiad();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadAnnouncer.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadAnnouncer.java
new file mode 100644
index 00000000..6e06cbe3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadAnnouncer.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import java.util.Set;
+
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+
+/**
+ * @author DS
+ */
+public final class OlympiadAnnouncer implements Runnable {
+	private static final int OLY_MANAGER = 31688;
+	private final Set<L2Spawn> _managers;
+	private int _currentStadium = 0;
+	
+	public OlympiadAnnouncer() {
+		_managers = SpawnTable.getInstance().getSpawns(OLY_MANAGER);
+	}
+	
+	@Override
+	public void run() {
+		OlympiadGameTask task;
+		for (int i = OlympiadGameManager.getInstance().getNumberOfStadiums(); --i >= 0; _currentStadium++) {
+			if (_currentStadium >= OlympiadGameManager.getInstance().getNumberOfStadiums()) {
+				_currentStadium = 0;
+			}
+			
+			task = OlympiadGameManager.getInstance().getOlympiadTask(_currentStadium);
+			if ((task != null) && (task.getGame() != null) && task.needAnnounce()) {
+				NpcStringId npcString;
+				final String arenaId = String.valueOf(task.getGame().getStadiumId() + 1);
+				switch (task.getGame().getType()) {
+					case NON_CLASSED:
+						npcString = NpcStringId.OLYMPIAD_CLASS_FREE_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
+						break;
+					case CLASSED:
+						npcString = NpcStringId.OLYMPIAD_CLASS_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
+						break;
+					case TEAMS:
+						npcString = NpcStringId.OLYMPIAD_CLASS_FREE_TEAM_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
+						break;
+					default:
+						continue;
+				}
+				
+				L2Npc manager;
+				NpcSay packet;
+				for (L2Spawn spawn : _managers) {
+					manager = spawn.getLastSpawn();
+					if (manager != null) {
+						packet = new NpcSay(manager.getObjectId(), Say2.NPC_SHOUT, manager.getId(), npcString);
+						packet.addStringParameter(arenaId);
+						manager.broadcastPacket(packet);
+					}
+				}
+				break;
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameClassed.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameClassed.java
new file mode 100644
index 00000000..e18f67f7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameClassed.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.List;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author DS
+ */
+public class OlympiadGameClassed extends OlympiadGameNormal {
+	private OlympiadGameClassed(int id, Participant[] opponents) {
+		super(id, opponents);
+	}
+	
+	@Override
+	public final CompetitionType getType() {
+		return CompetitionType.CLASSED;
+	}
+	
+	@Override
+	protected final int getDivider() {
+		return olympiad().getDividerClassed();
+	}
+	
+	@Override
+	protected final List<ItemHolder> getReward() {
+		return olympiad().getClassedReward();
+	}
+	
+	@Override
+	protected final String getWeeklyMatchType() {
+		return COMP_DONE_WEEK_CLASSED;
+	}
+	
+	protected static OlympiadGameClassed createGame(int id, List<List<Integer>> classList) {
+		if ((classList == null) || classList.isEmpty()) {
+			return null;
+		}
+		
+		List<Integer> list;
+		Participant[] opponents;
+		while (!classList.isEmpty()) {
+			list = classList.get(Rnd.nextInt(classList.size()));
+			if ((list == null) || (list.size() < 2)) {
+				classList.remove(list);
+				continue;
+			}
+			
+			opponents = OlympiadGameNormal.createListOfParticipants(list);
+			if (opponents == null) {
+				classList.remove(list);
+				continue;
+			}
+			
+			return new OlympiadGameClassed(id, opponents);
+		}
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameManager.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameManager.java
new file mode 100644
index 00000000..76d1ca15
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameManager.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
+
+/**
+ * Olympiad Game Manager.
+ * @author GodKratos
+ * @author DS
+ */
+public class OlympiadGameManager implements Runnable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(OlympiadGameManager.class);
+	
+	private volatile boolean _battleStarted = false;
+	
+	private final OlympiadGameTask[] _tasks;
+	
+	protected OlympiadGameManager() {
+		final Collection<L2OlympiadStadiumZone> zones = ZoneManager.getInstance().getAllZones(L2OlympiadStadiumZone.class);
+		if (zones.isEmpty()) {
+			throw new Error("No olympiad stadium zones defined !");
+		}
+		
+		_tasks = new OlympiadGameTask[zones.size()];
+		int i = 0;
+		for (L2OlympiadStadiumZone zone : zones) {
+			_tasks[i++] = new OlympiadGameTask(zone);
+		}
+		
+		LOG.info("Loaded {} stadiums.", _tasks.length);
+	}
+	
+	protected final boolean isBattleStarted() {
+		return _battleStarted;
+	}
+	
+	protected final void startBattle() {
+		_battleStarted = true;
+	}
+	
+	@Override
+	public final void run() {
+		if (Olympiad.getInstance().isOlympiadEnd()) {
+			return;
+		}
+		
+		if (Olympiad.getInstance().inCompPeriod()) {
+			OlympiadGameTask task;
+			AbstractOlympiadGame newGame;
+			
+			List<List<Integer>> readyClassed = OlympiadManager.getInstance().hasEnoughRegisteredClassed();
+			boolean readyNonClassed = OlympiadManager.getInstance().hasEnoughRegisteredNonClassed();
+			boolean readyTeams = OlympiadManager.getInstance().hasEnoughRegisteredTeams();
+			
+			if ((readyClassed != null) || readyNonClassed || readyTeams) {
+				// set up the games queue
+				for (int i = 0; i < _tasks.length; i++) {
+					task = _tasks[i];
+					synchronized (task) {
+						if (!task.isRunning()) {
+							// Fair arena distribution
+							// 0,2,4,6,8.. arenas checked for classed or teams first
+							if (((readyClassed != null) || readyTeams) && ((i % 2) == 0)) {
+								// 0,4,8.. arenas checked for teams first
+								if (readyTeams && ((i % 4) == 0)) {
+									newGame = OlympiadGameTeams.createGame(i, OlympiadManager.getInstance().getRegisteredTeamsBased());
+									if (newGame != null) {
+										task.attachGame(newGame);
+										continue;
+									}
+									readyTeams = false;
+								}
+								// if no ready teams found check for classed
+								if (readyClassed != null) {
+									newGame = OlympiadGameClassed.createGame(i, readyClassed);
+									if (newGame != null) {
+										task.attachGame(newGame);
+										continue;
+									}
+									readyClassed = null;
+								}
+							}
+							// 1,3,5,7,9.. arenas used for non-classed
+							// also other arenas will be used for non-classed if no classed or teams available
+							if (readyNonClassed) {
+								newGame = OlympiadGameNonClassed.createGame(i, OlympiadManager.getInstance().getRegisteredNonClassBased());
+								if (newGame != null) {
+									task.attachGame(newGame);
+									continue;
+								}
+								readyNonClassed = false;
+							}
+						}
+					}
+					
+					// stop generating games if no more participants
+					if ((readyClassed == null) && !readyNonClassed && !readyTeams) {
+						break;
+					}
+				}
+			}
+		} else {
+			// not in competition period
+			if (isAllTasksFinished()) {
+				OlympiadManager.getInstance().clearRegistered();
+				_battleStarted = false;
+				LOG.info("All current games finished.");
+			}
+		}
+	}
+	
+	public final boolean isAllTasksFinished() {
+		for (OlympiadGameTask task : _tasks) {
+			if (task.isRunning()) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	public final OlympiadGameTask getOlympiadTask(int id) {
+		if ((id < 0) || (id >= _tasks.length)) {
+			return null;
+		}
+		
+		return _tasks[id];
+	}
+	
+	public final int getNumberOfStadiums() {
+		return _tasks.length;
+	}
+	
+	public final void notifyCompetitorDamage(L2PcInstance player, int damage) {
+		if (player == null) {
+			return;
+		}
+		
+		final int id = player.getOlympiadGameId();
+		if ((id < 0) || (id >= _tasks.length)) {
+			return;
+		}
+		
+		final AbstractOlympiadGame game = _tasks[id].getGame();
+		if (game != null) {
+			game.addDamage(player, damage);
+		}
+	}
+	
+	public static OlympiadGameManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final OlympiadGameManager INSTANCE = new OlympiadGameManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNonClassed.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNonClassed.java
new file mode 100644
index 00000000..38c070e5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNonClassed.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+
+/**
+ * @author DS
+ */
+public class OlympiadGameNonClassed extends OlympiadGameNormal {
+	private OlympiadGameNonClassed(int id, Participant[] opponents) {
+		super(id, opponents);
+	}
+	
+	@Override
+	public final CompetitionType getType() {
+		return CompetitionType.NON_CLASSED;
+	}
+	
+	@Override
+	protected final int getDivider() {
+		return olympiad().getDividerNonClassed();
+	}
+	
+	@Override
+	protected final List<ItemHolder> getReward() {
+		return olympiad().getNonClassedReward();
+	}
+	
+	@Override
+	protected final String getWeeklyMatchType() {
+		return COMP_DONE_WEEK_NON_CLASSED;
+	}
+	
+	protected static OlympiadGameNonClassed createGame(int id, List<Integer> list) {
+		final Participant[] opponents = OlympiadGameNormal.createListOfParticipants(list);
+		if (opponents == null) {
+			return null;
+		}
+		return new OlympiadGameNonClassed(id, opponents);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java
new file mode 100644
index 00000000..1416a1a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameNormal.java
@@ -0,0 +1,607 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.olympiad.OlympiadMatchResult;
+import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMatchResult;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author GodKratos
+ * @author Pere
+ * @author DS
+ */
+public abstract class OlympiadGameNormal extends AbstractOlympiadGame {
+	private static final Logger LOG = LoggerFactory.getLogger(OlympiadGameNormal.class);
+	
+	private int _damageP1 = 0;
+	private int _damageP2 = 0;
+	
+	private Participant _playerOne;
+	private Participant _playerTwo;
+	
+	protected OlympiadGameNormal(int id, Participant[] opponents) {
+		super(id);
+		
+		_playerOne = opponents[0];
+		_playerTwo = opponents[1];
+		
+		_playerOne.getPlayer().setOlympiadGameId(id);
+		_playerTwo.getPlayer().setOlympiadGameId(id);
+	}
+	
+	protected static Participant[] createListOfParticipants(List<Integer> list) {
+		if ((list == null) || list.isEmpty() || (list.size() < 2)) {
+			return null;
+		}
+		
+		int playerOneObjectId;
+		L2PcInstance playerOne;
+		L2PcInstance playerTwo;
+		
+		while (list.size() > 1) {
+			playerOneObjectId = list.remove(Rnd.nextInt(list.size()));
+			playerOne = L2World.getInstance().getPlayer(playerOneObjectId);
+			if ((playerOne == null) || !playerOne.isOnline()) {
+				continue;
+			}
+			
+			playerTwo = L2World.getInstance().getPlayer(list.remove(Rnd.nextInt(list.size())));
+			if ((playerTwo == null) || !playerTwo.isOnline()) {
+				list.add(playerOneObjectId);
+				continue;
+			}
+			
+			Participant[] result = new Participant[2];
+			result[0] = new Participant(playerOne, 1);
+			result[1] = new Participant(playerTwo, 2);
+			
+			return result;
+		}
+		return null;
+	}
+	
+	@Override
+	public final boolean containsParticipant(int playerId) {
+		return ((_playerOne != null) && (_playerOne.getObjectId() == playerId)) || ((_playerTwo != null) && (_playerTwo.getObjectId() == playerId));
+	}
+	
+	@Override
+	public final void sendOlympiadInfo(L2Character player) {
+		player.sendPacket(new ExOlympiadUserInfo(_playerOne));
+		player.sendPacket(new ExOlympiadUserInfo(_playerTwo));
+	}
+	
+	@Override
+	public final void broadcastOlympiadInfo(L2OlympiadStadiumZone stadium) {
+		stadium.broadcastPacket(new ExOlympiadUserInfo(_playerOne));
+		stadium.broadcastPacket(new ExOlympiadUserInfo(_playerTwo));
+	}
+	
+	@Override
+	protected final void broadcastPacket(L2GameServerPacket packet) {
+		if (_playerOne.updatePlayer()) {
+			_playerOne.getPlayer().sendPacket(packet);
+		}
+		
+		if (_playerTwo.updatePlayer()) {
+			_playerTwo.getPlayer().sendPacket(packet);
+		}
+	}
+	
+	@Override
+	protected final boolean portPlayersToArena(List<Location> spawns) {
+		boolean result;
+		try {
+			result = portPlayerToArena(_playerOne, spawns.getFirst(), _stadiumID);
+			result &= portPlayerToArena(_playerTwo, spawns.get(spawns.size() / 2), _stadiumID);
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+			return false;
+		}
+		return result;
+	}
+	
+	@Override
+	protected boolean needBuffers() {
+		return true;
+	}
+	
+	@Override
+	protected final void removals() {
+		if (_aborted) {
+			return;
+		}
+		
+		removals(_playerOne.getPlayer(), true);
+		removals(_playerTwo.getPlayer(), true);
+	}
+	
+	@Override
+	protected final boolean makeCompetitionStart() {
+		if (!super.makeCompetitionStart()) {
+			return false;
+		}
+		
+		if ((_playerOne.getPlayer() == null) || (_playerTwo.getPlayer() == null)) {
+			return false;
+		}
+		
+		_playerOne.getPlayer().setIsOlympiadStart(true);
+		_playerOne.getPlayer().updateEffectIcons();
+		_playerTwo.getPlayer().setIsOlympiadStart(true);
+		_playerTwo.getPlayer().updateEffectIcons();
+		return true;
+	}
+	
+	@Override
+	protected final void cleanEffects() {
+		if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumID)) {
+			cleanEffects(_playerOne.getPlayer());
+		}
+		
+		if ((_playerTwo.getPlayer() != null) && !_playerTwo.isDefaulted() && !_playerTwo.isDisconnected() && (_playerTwo.getPlayer().getOlympiadGameId() == _stadiumID)) {
+			cleanEffects(_playerTwo.getPlayer());
+		}
+	}
+	
+	@Override
+	protected final void portPlayersBack() {
+		if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected()) {
+			portPlayerBack(_playerOne.getPlayer());
+		}
+		if ((_playerTwo.getPlayer() != null) && !_playerTwo.isDefaulted() && !_playerTwo.isDisconnected()) {
+			portPlayerBack(_playerTwo.getPlayer());
+		}
+	}
+	
+	@Override
+	protected final void playersStatusBack() {
+		if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumID)) {
+			playerStatusBack(_playerOne.getPlayer());
+		}
+		
+		if ((_playerTwo.getPlayer() != null) && !_playerTwo.isDefaulted() && !_playerTwo.isDisconnected() && (_playerTwo.getPlayer().getOlympiadGameId() == _stadiumID)) {
+			playerStatusBack(_playerTwo.getPlayer());
+		}
+	}
+	
+	@Override
+	protected final void clearPlayers() {
+		_playerOne.setPlayer(null);
+		_playerOne = null;
+		_playerTwo.setPlayer(null);
+		_playerTwo = null;
+	}
+	
+	@Override
+	protected final void handleDisconnect(L2PcInstance player) {
+		if (player.getObjectId() == _playerOne.getObjectId()) {
+			_playerOne.setDisconnected(true);
+		} else if (player.getObjectId() == _playerTwo.getObjectId()) {
+			_playerTwo.setDisconnected(true);
+		}
+	}
+	
+	@Override
+	protected final boolean checkBattleStatus() {
+		if (_aborted) {
+			return false;
+		}
+		
+		if ((_playerOne.getPlayer() == null) || _playerOne.isDisconnected()) {
+			return false;
+		}
+		
+		return (_playerTwo.getPlayer() != null) && !_playerTwo.isDisconnected();
+	}
+	
+	@Override
+	protected final boolean haveWinner() {
+		if (!checkBattleStatus()) {
+			return true;
+		}
+		
+		boolean playerOneLost = true;
+		if (_playerOne.getPlayer().getOlympiadGameId() == _stadiumID) {
+			playerOneLost = _playerOne.getPlayer().isDead();
+		}
+		
+		boolean playerTwoLost = true;
+		if (_playerTwo.getPlayer().getOlympiadGameId() == _stadiumID) {
+			playerTwoLost = _playerTwo.getPlayer().isDead();
+		}
+		
+		return playerOneLost || playerTwoLost;
+	}
+	
+	@Override
+	protected void validateWinner(L2OlympiadStadiumZone stadium) {
+		if (_aborted) {
+			return;
+		}
+		
+		ExOlympiadMatchResult result;
+		
+		boolean tie = false;
+		int winside = 0;
+		
+		List<OlympiadInfo> list1 = new ArrayList<>(1);
+		List<OlympiadInfo> list2 = new ArrayList<>(1);
+		
+		final boolean _pOneCrash = ((_playerOne.getPlayer() == null) || _playerOne.isDisconnected());
+		final boolean _pTwoCrash = ((_playerTwo.getPlayer() == null) || _playerTwo.isDisconnected());
+		
+		final int playerOnePoints = _playerOne.getStats().getInt(POINTS);
+		final int playerTwoPoints = _playerTwo.getStats().getInt(POINTS);
+		int pointDiff = Math.min(playerOnePoints, playerTwoPoints) / getDivider();
+		if (pointDiff <= 0) {
+			pointDiff = 1;
+		} else if (pointDiff > olympiad().getMaxPoints()) {
+			pointDiff = olympiad().getMaxPoints();
+		}
+		
+		int points;
+		SystemMessage sm;
+		
+		// Check for if a player defaulted before battle started
+		if (_playerOne.isDefaulted() || _playerTwo.isDefaulted()) {
+			try {
+				if (_playerOne.isDefaulted()) {
+					try {
+						points = Math.min(playerOnePoints / 3, olympiad().getMaxPoints());
+						removePointsFromParticipant(_playerOne, points);
+						list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints - points, -points));
+						
+						winside = 2;
+						
+						if (olympiad().logFights()) {
+							LOG_RESULTS.info("{} default, {}, {}, {}, {}, {}, {}, {}, {}", _playerOne.getName(), _playerOne.getName(), _playerTwo.getName(), 0, 0, 0, 0, points, getType().toString());
+						}
+					} catch (Exception e) {
+						LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+					}
+				}
+				if (_playerTwo.isDefaulted()) {
+					try {
+						points = Math.min(playerTwoPoints / 3, olympiad().getMaxPoints());
+						removePointsFromParticipant(_playerTwo, points);
+						list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints - points, -points));
+						
+						if (winside == 2) {
+							tie = true;
+						} else {
+							winside = 1;
+						}
+						
+						if (olympiad().logFights()) {
+							LOG_RESULTS.info("{} default, {}, {}, {}, {}, {}, {}, {}, {}", _playerTwo.getName(), _playerOne.getName(), _playerTwo.getName(), 0, 0, 0, 0, points, getType().toString());
+						}
+					} catch (Exception e) {
+						LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+					}
+				}
+				if (winside == 1) {
+					result = new ExOlympiadMatchResult(tie, winside, list1, list2);
+				} else {
+					result = new ExOlympiadMatchResult(tie, winside, list2, list1);
+				}
+				stadium.broadcastPacket(result);
+				return;
+			} catch (Exception e) {
+				LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+				return;
+			}
+		}
+		
+		// Create results for players if a player crashed
+		if (_pOneCrash || _pTwoCrash) {
+			try {
+				if (_pTwoCrash && !_pOneCrash) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+					sm.addString(_playerOne.getName());
+					stadium.broadcastPacket(sm);
+					
+					_playerOne.updateStat(COMP_WON, 1);
+					addPointsToParticipant(_playerOne, pointDiff);
+					list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints + pointDiff, pointDiff));
+					
+					_playerTwo.updateStat(COMP_LOST, 1);
+					removePointsFromParticipant(_playerTwo, pointDiff);
+					list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints - pointDiff, -pointDiff));
+					
+					winside = 1;
+					
+					rewardParticipant(_playerOne.getPlayer(), getReward());
+					
+					if (olympiad().logFights()) {
+						LOG_RESULTS.info("{} crash, {}, {}, {}, {}, {}, {}, {}, {}", _playerTwo.getName(), _playerOne.getName(), _playerTwo.getName(), 0, 0, 0, 0, pointDiff, getType().toString());
+					}
+					
+					// Notify to scripts
+					EventDispatcher.getInstance().notifyEventAsync(new OlympiadMatchResult(_playerOne, _playerTwo, getType()), Olympiad.getInstance());
+				} else if (!_pTwoCrash) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+					sm.addString(_playerTwo.getName());
+					stadium.broadcastPacket(sm);
+					
+					_playerTwo.updateStat(COMP_WON, 1);
+					addPointsToParticipant(_playerTwo, pointDiff);
+					list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints + pointDiff, pointDiff));
+					
+					_playerOne.updateStat(COMP_LOST, 1);
+					removePointsFromParticipant(_playerOne, pointDiff);
+					list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints - pointDiff, -pointDiff));
+					
+					winside = 2;
+					
+					rewardParticipant(_playerTwo.getPlayer(), getReward());
+					
+					if (olympiad().logFights()) {
+						LOG_RESULTS.info("{} crash, {}, {}, {}, {}, {}, {}, {}, {}", _playerOne.getName(), _playerOne.getName(), _playerTwo.getName(), 0, 0, 0, 0, pointDiff, getType().toString());
+					}
+					// Notify to scripts
+					EventDispatcher.getInstance().notifyEventAsync(new OlympiadMatchResult(_playerTwo, _playerOne, getType()), Olympiad.getInstance());
+				} else {
+					stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_ENDED_IN_A_TIE));
+					
+					_playerOne.updateStat(COMP_LOST, 1);
+					removePointsFromParticipant(_playerOne, pointDiff);
+					list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints - pointDiff, -pointDiff));
+					
+					_playerTwo.updateStat(COMP_LOST, 1);
+					removePointsFromParticipant(_playerTwo, pointDiff);
+					list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints - pointDiff, -pointDiff));
+					
+					tie = true;
+					
+					if (olympiad().logFights()) {
+						LOG_RESULTS.info("both crash, {}, {}, {}, {}, {}, {}, {}, {}", _playerOne.getName(), _playerTwo.getName(), 0, 0, 0, 0, pointDiff, getType().toString());
+					}
+				}
+				
+				_playerOne.updateStat(COMP_DONE, 1);
+				_playerTwo.updateStat(COMP_DONE, 1);
+				_playerOne.updateStat(COMP_DONE_WEEK, 1);
+				_playerTwo.updateStat(COMP_DONE_WEEK, 1);
+				_playerOne.updateStat(getWeeklyMatchType(), 1);
+				_playerTwo.updateStat(getWeeklyMatchType(), 1);
+				
+				if (winside == 1) {
+					result = new ExOlympiadMatchResult(tie, winside, list1, list2);
+				} else {
+					result = new ExOlympiadMatchResult(tie, winside, list2, list1);
+				}
+				stadium.broadcastPacket(result);
+				
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new OlympiadMatchResult(null, _playerOne, getType()), Olympiad.getInstance());
+				EventDispatcher.getInstance().notifyEventAsync(new OlympiadMatchResult(null, _playerTwo, getType()), Olympiad.getInstance());
+				return;
+			} catch (Exception e) {
+				LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+				return;
+			}
+		}
+		
+		try {
+			String winner = "draw";
+			
+			// Calculate Fight time
+			long _fightTime = (System.currentTimeMillis() - _startTime);
+			
+			double playerOneHp = 0;
+			if ((_playerOne.getPlayer() != null) && !_playerOne.getPlayer().isDead()) {
+				playerOneHp = _playerOne.getPlayer().getCurrentHp() + _playerOne.getPlayer().getCurrentCp();
+				if (playerOneHp < 0.5) {
+					playerOneHp = 0;
+				}
+			}
+			
+			double playerTwoHp = 0;
+			if ((_playerTwo.getPlayer() != null) && !_playerTwo.getPlayer().isDead()) {
+				playerTwoHp = _playerTwo.getPlayer().getCurrentHp() + _playerTwo.getPlayer().getCurrentCp();
+				if (playerTwoHp < 0.5) {
+					playerTwoHp = 0;
+				}
+			}
+			
+			// if players crashed, search if they've re-logged
+			_playerOne.updatePlayer();
+			_playerTwo.updatePlayer();
+			
+			if (((_playerOne.getPlayer() == null) || !_playerOne.getPlayer().isOnline()) && ((_playerTwo.getPlayer() == null) || !_playerTwo.getPlayer().isOnline())) {
+				_playerOne.updateStat(COMP_DRAWN, 1);
+				_playerTwo.updateStat(COMP_DRAWN, 1);
+				sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_ENDED_IN_A_TIE);
+				stadium.broadcastPacket(sm);
+			} else if ((_playerTwo.getPlayer() == null) || !_playerTwo.getPlayer().isOnline() || ((playerTwoHp == 0) && (playerOneHp != 0)) || ((_damageP1 > _damageP2) && (playerTwoHp != 0) && (playerOneHp != 0))) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+				sm.addString(_playerOne.getName());
+				stadium.broadcastPacket(sm);
+				
+				_playerOne.updateStat(COMP_WON, 1);
+				_playerTwo.updateStat(COMP_LOST, 1);
+				
+				addPointsToParticipant(_playerOne, pointDiff);
+				list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints + pointDiff, pointDiff));
+				
+				removePointsFromParticipant(_playerTwo, pointDiff);
+				list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints - pointDiff, -pointDiff));
+				winner = _playerOne.getName() + " won";
+				
+				winside = 1;
+				
+				// Save Fight Result
+				saveResults(_playerOne, _playerTwo, 1, _startTime, _fightTime, getType());
+				rewardParticipant(_playerOne.getPlayer(), getReward());
+				
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new OlympiadMatchResult(_playerOne, _playerTwo, getType()), Olympiad.getInstance());
+			} else if ((_playerOne.getPlayer() == null) || !_playerOne.getPlayer().isOnline() || ((playerOneHp == 0) && (playerTwoHp != 0)) || ((_damageP2 > _damageP1) && (playerOneHp != 0) && (playerTwoHp != 0))) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+				sm.addString(_playerTwo.getName());
+				stadium.broadcastPacket(sm);
+				
+				_playerTwo.updateStat(COMP_WON, 1);
+				_playerOne.updateStat(COMP_LOST, 1);
+				
+				addPointsToParticipant(_playerTwo, pointDiff);
+				list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints + pointDiff, pointDiff));
+				
+				removePointsFromParticipant(_playerOne, pointDiff);
+				list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints - pointDiff, -pointDiff));
+				
+				winner = _playerTwo.getName() + " won";
+				winside = 2;
+				
+				// Save Fight Result
+				saveResults(_playerOne, _playerTwo, 2, _startTime, _fightTime, getType());
+				rewardParticipant(_playerTwo.getPlayer(), getReward());
+				
+				// Notify to scripts
+				EventDispatcher.getInstance().notifyEventAsync(new OlympiadMatchResult(_playerTwo, _playerOne, getType()), Olympiad.getInstance());
+			} else {
+				// Save Fight Result
+				saveResults(_playerOne, _playerTwo, 0, _startTime, _fightTime, getType());
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_ENDED_IN_A_TIE);
+				stadium.broadcastPacket(sm);
+				
+				int value = Math.min(playerOnePoints / getDivider(), olympiad().getMaxPoints());
+				
+				removePointsFromParticipant(_playerOne, value);
+				list1.add(new OlympiadInfo(_playerOne.getName(), _playerOne.getClanName(), _playerOne.getClanId(), _playerOne.getBaseClass(), _damageP1, playerOnePoints - value, -value));
+				
+				value = Math.min(playerTwoPoints / getDivider(), olympiad().getMaxPoints());
+				removePointsFromParticipant(_playerTwo, value);
+				list2.add(new OlympiadInfo(_playerTwo.getName(), _playerTwo.getClanName(), _playerTwo.getClanId(), _playerTwo.getBaseClass(), _damageP2, playerTwoPoints - value, -value));
+				
+				tie = true;
+			}
+			
+			_playerOne.updateStat(COMP_DONE, 1);
+			_playerTwo.updateStat(COMP_DONE, 1);
+			_playerOne.updateStat(COMP_DONE_WEEK, 1);
+			_playerTwo.updateStat(COMP_DONE_WEEK, 1);
+			_playerOne.updateStat(getWeeklyMatchType(), 1);
+			_playerTwo.updateStat(getWeeklyMatchType(), 1);
+			
+			if (winside == 1) {
+				result = new ExOlympiadMatchResult(tie, winside, list1, list2);
+			} else {
+				result = new ExOlympiadMatchResult(tie, winside, list2, list1);
+			}
+			stadium.broadcastPacket(result);
+			
+			if (olympiad().logFights()) {
+				LOG_RESULTS.info("{}, {}, {}, {}, {}, {}, {}, {}, {}", winner, _playerOne.getName(), _playerTwo.getName(), playerOneHp, playerTwoHp, _damageP1, _damageP2, pointDiff, getType().toString());
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	protected final void addDamage(L2PcInstance player, int damage) {
+		if ((_playerOne.getPlayer() == null) || (_playerTwo.getPlayer() == null)) {
+			return;
+		}
+		if (player == _playerOne.getPlayer()) {
+			_damageP1 += damage;
+		} else if (player == _playerTwo.getPlayer()) {
+			_damageP2 += damage;
+		}
+	}
+	
+	@Override
+	public final String[] getPlayerNames() {
+		return new String[] {
+			_playerOne.getName(),
+			_playerTwo.getName()
+		};
+	}
+	
+	@Override
+	public boolean checkDefaulted() {
+		SystemMessage reason;
+		_playerOne.updatePlayer();
+		_playerTwo.updatePlayer();
+		
+		reason = checkDefaulted(_playerOne.getPlayer());
+		if (reason != null) {
+			_playerOne.setDefaulted(true);
+			if (_playerTwo.getPlayer() != null) {
+				_playerTwo.getPlayer().sendPacket(reason);
+			}
+		}
+		
+		reason = checkDefaulted(_playerTwo.getPlayer());
+		if (reason != null) {
+			_playerTwo.setDefaulted(true);
+			if (_playerOne.getPlayer() != null) {
+				_playerOne.getPlayer().sendPacket(reason);
+			}
+		}
+		
+		return _playerOne.isDefaulted() || _playerTwo.isDefaulted();
+	}
+	
+	@Override
+	public final void resetDamage() {
+		_damageP1 = 0;
+		_damageP2 = 0;
+	}
+	
+	private static void saveResults(Participant one, Participant two, int winner, long startTime, long fightTime, CompetitionType type) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO olympiad_fights (charOneId, charTwoId, charOneClass, charTwoClass, winner, start, time, classed) values(?,?,?,?,?,?,?,?)")) {
+			ps.setInt(1, one.getObjectId());
+			ps.setInt(2, two.getObjectId());
+			ps.setInt(3, one.getBaseClass());
+			ps.setInt(4, two.getBaseClass());
+			ps.setInt(5, winner);
+			ps.setLong(6, startTime);
+			ps.setLong(7, fightTime);
+			ps.setInt(8, (type == CompetitionType.CLASSED ? 1 : 0));
+			ps.execute();
+		} catch (Exception e) {
+			LOG.error("SQL exception while saving olympiad fight.", e);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java
new file mode 100644
index 00000000..7ce289e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author DS
+ */
+public final class OlympiadGameTask implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(OlympiadGameTask.class);
+	
+	private static final int[] TELEPORT_TO_ARENA_TIMES = {
+		120,
+		60,
+		30,
+		15,
+		10,
+		5,
+		4,
+		3,
+		2,
+		1,
+		0
+	};
+	
+	private static final int[] BATTLE_START_TIME_FIRST = {
+		60,
+		50,
+		40,
+		30,
+		20,
+		10,
+		0
+	};
+	
+	private static final int[] BATTLE_START_TIME_SECOND = {
+		10,
+		5,
+		4,
+		3,
+		2,
+		1,
+		0
+	};
+	
+	private static final int[] TELEPORT_TO_TOWN_TIMES = {
+		40,
+		30,
+		20,
+		10,
+		5,
+		4,
+		3,
+		2,
+		1,
+		0
+	};
+	
+	private final L2OlympiadStadiumZone _zone;
+	private AbstractOlympiadGame _game;
+	private GameState _state = GameState.IDLE;
+	private boolean _needAnnounce = false;
+	private int _countDown = 0;
+	
+	private enum GameState {
+		BEGIN,
+		TELEPORT_TO_ARENA,
+		GAME_STARTED,
+		BATTLE_COUNTDOWN_FIRST,
+		BATTLE_COUNTDOWN_SECOND,
+		BATTLE_STARTED,
+		BATTLE_IN_PROGRESS,
+		GAME_CANCELLED,
+		GAME_STOPPED,
+		TELEPORT_TO_TOWN,
+		CLEANUP,
+		IDLE
+	}
+	
+	public OlympiadGameTask(L2OlympiadStadiumZone zone) {
+		_zone = zone;
+		zone.registerTask(this);
+	}
+	
+	public boolean isRunning() {
+		return _state != GameState.IDLE;
+	}
+	
+	public boolean isGameStarted() {
+		return (_state.ordinal() >= GameState.GAME_STARTED.ordinal()) && (_state.ordinal() <= GameState.CLEANUP.ordinal());
+	}
+	
+	public boolean isBattleStarted() {
+		return _state == GameState.BATTLE_IN_PROGRESS;
+	}
+	
+	public boolean isBattleFinished() {
+		return _state == GameState.TELEPORT_TO_TOWN;
+	}
+	
+	public boolean needAnnounce() {
+		if (_needAnnounce) {
+			_needAnnounce = false;
+			return true;
+		}
+		return false;
+	}
+	
+	public L2OlympiadStadiumZone getZone() {
+		return _zone;
+	}
+	
+	public AbstractOlympiadGame getGame() {
+		return _game;
+	}
+	
+	public void attachGame(AbstractOlympiadGame game) {
+		if ((game != null) && (_state != GameState.IDLE)) {
+			LOG.warn("Attempt to overwrite non-finished game in state {}", _state);
+			return;
+		}
+		
+		_game = game;
+		_state = GameState.BEGIN;
+		_needAnnounce = false;
+		ThreadPoolManager.getInstance().executeGeneral(this);
+	}
+	
+	@Override
+	public void run() {
+		try {
+			int delay = 1; // schedule next call after 1s
+			switch (_state) {
+				// Game created
+				case BEGIN: {
+					_state = GameState.TELEPORT_TO_ARENA;
+					_countDown = olympiad().getWaitTime();
+					break;
+				}
+				// Teleport to arena countdown
+				case TELEPORT_TO_ARENA: {
+					if (_countDown > 0) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_ENTER_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S);
+						sm.addInt(_countDown);
+						_game.broadcastPacket(sm);
+					}
+					
+					delay = getDelay(TELEPORT_TO_ARENA_TIMES);
+					if (_countDown <= 0) {
+						_state = GameState.GAME_STARTED;
+					}
+					break;
+				}
+				// Game start, port players to arena
+				case GAME_STARTED: {
+					if (!startGame()) {
+						_state = GameState.GAME_CANCELLED;
+						break;
+					}
+					
+					_state = GameState.BATTLE_COUNTDOWN_FIRST;
+					_countDown = BATTLE_START_TIME_FIRST[0];
+					delay = 5;
+					break;
+				}
+				// Battle start countdown, first part (60-10)
+				case BATTLE_COUNTDOWN_FIRST: {
+					if (_countDown > 0) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_WILL_START_IN_S1_SECOND_S);
+						sm.addInt(_countDown);
+						_zone.broadcastPacket(sm);
+					}
+					
+					delay = getDelay(BATTLE_START_TIME_FIRST);
+					if (_countDown <= 0) {
+						openDoors();
+						
+						_state = GameState.BATTLE_COUNTDOWN_SECOND;
+						_countDown = BATTLE_START_TIME_SECOND[0];
+						delay = getDelay(BATTLE_START_TIME_SECOND);
+					}
+					
+					break;
+				}
+				// Battle start countdown, second part (10-0)
+				case BATTLE_COUNTDOWN_SECOND: {
+					if (_countDown > 0) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_WILL_START_IN_S1_SECOND_S);
+						sm.addInt(_countDown);
+						_zone.broadcastPacket(sm);
+					}
+					
+					delay = getDelay(BATTLE_START_TIME_SECOND);
+					if (_countDown <= 0) {
+						_state = GameState.BATTLE_STARTED;
+					}
+					
+					break;
+				}
+				// Beginning of the battle
+				case BATTLE_STARTED: {
+					_countDown = 0;
+					_state = GameState.BATTLE_IN_PROGRESS; // set state first, used in zone update
+					if (!startBattle()) {
+						_state = GameState.GAME_STOPPED;
+					}
+					
+					break;
+				}
+				// Checks during battle
+				case BATTLE_IN_PROGRESS: {
+					_countDown += 1000;
+					if (checkBattle() || (_countDown > olympiad().getBattlePeriod())) {
+						_state = GameState.GAME_STOPPED;
+					}
+					
+					break;
+				}
+				// Battle cancelled before teleport participants to the stadium
+				case GAME_CANCELLED: {
+					stopGame();
+					_state = GameState.CLEANUP;
+					break;
+				}
+				// End of the battle
+				case GAME_STOPPED: {
+					_state = GameState.TELEPORT_TO_TOWN;
+					_countDown = TELEPORT_TO_TOWN_TIMES[0];
+					stopGame();
+					delay = getDelay(TELEPORT_TO_TOWN_TIMES);
+					break;
+				}
+				// Teleport to town countdown
+				case TELEPORT_TO_TOWN: {
+					if (_countDown > 0) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_TOWN_IN_S1_SECONDS);
+						sm.addInt(_countDown);
+						_game.broadcastPacket(sm);
+					}
+					
+					delay = getDelay(TELEPORT_TO_TOWN_TIMES);
+					if (_countDown <= 0) {
+						_state = GameState.CLEANUP;
+					}
+					
+					break;
+				}
+				// Removals
+				case CLEANUP: {
+					cleanupGame();
+					_state = GameState.IDLE;
+					_game = null;
+					return;
+				}
+			}
+			ThreadPoolManager.getInstance().scheduleGeneral(this, delay * 1000L);
+		} catch (Exception e) {
+			switch (_state) {
+				case GAME_STOPPED, TELEPORT_TO_TOWN, CLEANUP, IDLE -> {
+					LOG.warn("Unable to return players back in town, exception: {}", e.getMessage());
+					_state = GameState.IDLE;
+					_game = null;
+					return;
+				}
+			}
+			
+			LOG.warn("Exception in {}, trying to port players back: {}", _state, e.getMessage(), e);
+			_state = GameState.GAME_STOPPED;
+			ThreadPoolManager.getInstance().scheduleGeneral(this, 1000);
+		}
+	}
+	
+	private int getDelay(int[] times) {
+		int time;
+		for (int i = 0; i < (times.length - 1); i++) {
+			time = times[i];
+			if (time >= _countDown) {
+				continue;
+			}
+			
+			final int delay = _countDown - time;
+			_countDown = time;
+			return delay;
+		}
+		// should not happen
+		_countDown = -1;
+		return 1;
+	}
+	
+	/**
+	 * Second stage: check for defaulted, port players to arena, announce game.
+	 * @return true if no participants defaulted.
+	 */
+	private boolean startGame() {
+		try {
+			// Checking for opponents and teleporting to arena
+			if (_game.checkDefaulted()) {
+				return false;
+			}
+			
+			_zone.closeDoors();
+			if (_game.needBuffers()) {
+				_zone.spawnBuffers();
+			}
+			
+			if (!_game.portPlayersToArena(_zone.getSpawns())) {
+				return false;
+			}
+			
+			_game.removals();
+			_needAnnounce = true;
+			OlympiadGameManager.getInstance().startBattle(); // inform manager
+			return true;
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		return false;
+	}
+	
+	/**
+	 * Third stage: open doors.
+	 */
+	private void openDoors() {
+		try {
+			_game.resetDamage();
+			_zone.openDoors();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Fourth stage: last checks, remove buffers, start competition itself.
+	 * @return true if all participants online and ready on the stadium.
+	 */
+	private boolean startBattle() {
+		try {
+			if (_game.needBuffers()) {
+				_zone.deleteBuffers();
+			}
+			
+			if (_game.checkBattleStatus() && _game.makeCompetitionStart()) {
+				// game successfully started
+				_game.broadcastOlympiadInfo(_zone);
+				_zone.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.STARTS_THE_GAME));
+				_zone.updateZoneStatusForCharactersInside();
+				return true;
+			}
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		return false;
+	}
+	
+	/**
+	 * Fifth stage: battle is running, returns true if winner found.
+	 */
+	private boolean checkBattle() {
+		try {
+			return _game.haveWinner();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Sixth stage: winner's validations
+	 */
+	private void stopGame() {
+		try {
+			_game.validateWinner(_zone);
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		
+		try {
+			_zone.updateZoneStatusForCharactersInside();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		
+		try {
+			_game.cleanEffects();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Seventh stage: game cleanup (port players back, closing doors, etc)
+	 */
+	private void cleanupGame() {
+		try {
+			_game.playersStatusBack();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		
+		try {
+			_game.portPlayersBack();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		
+		try {
+			_game.clearPlayers();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		
+		try {
+			_zone.closeDoors();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java
new file mode 100644
index 00000000..0980dc57
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTeams.java
@@ -0,0 +1,929 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.enums.Team;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMatchResult;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Pere
+ * @author DS
+ */
+public class OlympiadGameTeams extends AbstractOlympiadGame {
+	private static final Logger LOG = LoggerFactory.getLogger(OlympiadGameTeams.class);
+	
+	private static final int MAX_TEAM_SIZE = 3;
+	
+	private boolean _teamOneDefaulted;
+	private boolean _teamTwoDefaulted;
+	
+	private int _damageT1 = 0;
+	private int _damageT2 = 0;
+	
+	private final int _teamOneSize;
+	private final int _teamTwoSize;
+	private final Participant[] _teamOne;
+	private final Participant[] _teamTwo;
+	
+	private OlympiadGameTeams(int id, Participant[] teamOne, Participant[] teamTwo) {
+		super(id);
+		
+		_teamOneSize = Math.min(teamOne.length, MAX_TEAM_SIZE);
+		_teamTwoSize = Math.min(teamTwo.length, MAX_TEAM_SIZE);
+		_teamOne = new Participant[MAX_TEAM_SIZE];
+		_teamTwo = new Participant[MAX_TEAM_SIZE];
+		
+		Participant par;
+		for (int i = 0; i < MAX_TEAM_SIZE; i++) {
+			if (i < _teamOneSize) {
+				par = teamOne[i];
+				_teamOne[i] = par;
+				if (par.getPlayer() != null) {
+					par.getPlayer().setOlympiadGameId(id);
+				}
+			} else {
+				final var objectId = IdFactory.getInstance().getNextId();
+				_teamOne[i] = new Participant(objectId, 1);
+			}
+			
+			if (i < _teamTwoSize) {
+				par = teamTwo[i];
+				_teamTwo[i] = par;
+				if (par.getPlayer() != null) {
+					par.getPlayer().setOlympiadGameId(id);
+				}
+			} else {
+				final var objectId = IdFactory.getInstance().getNextId();
+				_teamTwo[i] = new Participant(objectId, 2);
+			}
+		}
+	}
+	
+	private static Participant[][] createListOfParticipants(List<List<Integer>> list) {
+		if ((list == null) || list.isEmpty() || (list.size() < 2)) {
+			return null;
+		}
+		
+		List<Integer> teamOne;
+		List<Integer> teamTwo;
+		L2PcInstance player;
+		List<L2PcInstance> teamOnePlayers = new ArrayList<>(MAX_TEAM_SIZE);
+		List<L2PcInstance> teamTwoPlayers = new ArrayList<>(MAX_TEAM_SIZE);
+		
+		while (list.size() > 1) {
+			teamOne = list.remove(Rnd.nextInt(list.size()));
+			
+			if (((teamOne == null) || teamOne.isEmpty())) {
+				continue;
+			}
+			
+			for (int objectId : teamOne) {
+				player = L2World.getInstance().getPlayer(objectId);
+				if ((player == null) || !player.isOnline()) {
+					teamOnePlayers.clear();
+					break;
+				}
+				teamOnePlayers.add(player);
+			}
+			if (teamOnePlayers.isEmpty()) {
+				continue;
+			}
+			
+			teamTwo = list.remove(Rnd.nextInt(list.size()));
+			if ((teamTwo == null) || teamTwo.isEmpty()) {
+				list.add(teamOne);
+				teamOnePlayers.clear();
+				continue;
+			}
+			
+			for (int objectId : teamTwo) {
+				player = L2World.getInstance().getPlayer(objectId);
+				if ((player == null) || !player.isOnline()) {
+					teamTwoPlayers.clear();
+					break;
+				}
+				teamTwoPlayers.add(player);
+			}
+			if (teamTwoPlayers.isEmpty()) {
+				list.add(teamOne);
+				teamOnePlayers.clear();
+				continue;
+			}
+			
+			Participant[] t1 = new Participant[teamOnePlayers.size()];
+			Participant[] t2 = new Participant[teamTwoPlayers.size()];
+			Participant[][] result = new Participant[2][];
+			
+			for (int i = 0; i < t1.length; i++) {
+				t1[i] = new Participant(teamOnePlayers.get(i), 1);
+			}
+			
+			for (int i = 0; i < t2.length; i++) {
+				t2[i] = new Participant(teamTwoPlayers.get(i), 2);
+			}
+			
+			result[0] = t1;
+			result[1] = t2;
+			return result;
+		}
+		
+		return null;
+	}
+	
+	protected static OlympiadGameTeams createGame(int id, List<List<Integer>> list) {
+		final Participant[][] teams = createListOfParticipants(list);
+		if (teams == null) {
+			return null;
+		}
+		
+		return new OlympiadGameTeams(id, teams[0], teams[1]);
+	}
+	
+	@Override
+	public CompetitionType getType() {
+		return CompetitionType.TEAMS;
+	}
+	
+	@Override
+	protected int getDivider() {
+		return 5;
+	}
+	
+	@Override
+	protected List<ItemHolder> getReward() {
+		return olympiad().getTeamReward();
+	}
+	
+	@Override
+	protected final String getWeeklyMatchType() {
+		return COMP_DONE_WEEK_TEAM;
+	}
+	
+	@Override
+	public final boolean containsParticipant(int playerId) {
+		for (int i = _teamOneSize; --i >= 0;) {
+			if (_teamOne[i].getObjectId() == playerId) {
+				return true;
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			if (_teamTwo[i].getObjectId() == playerId) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	@Override
+	public final void sendOlympiadInfo(L2Character player) {
+		for (int i = 0; i < MAX_TEAM_SIZE; i++) {
+			player.sendPacket(new ExOlympiadUserInfo(_teamOne[i]));
+		}
+		
+		for (int i = 0; i < MAX_TEAM_SIZE; i++) {
+			player.sendPacket(new ExOlympiadUserInfo(_teamTwo[i]));
+		}
+	}
+	
+	@Override
+	public final void broadcastOlympiadInfo(L2OlympiadStadiumZone stadium) {
+		for (int i = 0; i < MAX_TEAM_SIZE; i++) {
+			stadium.broadcastPacket(new ExOlympiadUserInfo(_teamOne[i]));
+		}
+		
+		for (int i = 0; i < MAX_TEAM_SIZE; i++) {
+			stadium.broadcastPacket(new ExOlympiadUserInfo(_teamTwo[i]));
+		}
+	}
+	
+	@Override
+	protected final void broadcastPacket(L2GameServerPacket packet) {
+		Participant par;
+		for (int i = 0; i < _teamOneSize; i++) {
+			par = _teamOne[i];
+			if (par.updatePlayer()) {
+				par.getPlayer().sendPacket(packet);
+			}
+		}
+		
+		for (int i = 0; i < _teamTwoSize; i++) {
+			par = _teamTwo[i];
+			par.updatePlayer();
+			if (par.getPlayer() != null) {
+				par.getPlayer().sendPacket(packet);
+			}
+		}
+	}
+	
+	/**
+	 * UnAfraid: FIXME: Sometimes buffers appear on arena 3v3 match where it shouldn't or they don't get unspawned when match start.
+	 */
+	@Override
+	protected boolean needBuffers() {
+		return false;
+	}
+	
+	@Override
+	protected final boolean portPlayersToArena(List<Location> spawns) {
+		boolean result = true;
+		try {
+			for (int i = 0; i < _teamOneSize; i++) {
+				result &= portPlayerToArena(_teamOne[i], spawns.get(i), _stadiumID);
+			}
+			
+			final int offset = spawns.size() / 2;
+			for (int i = 0; i < _teamTwoSize; i++) {
+				result &= portPlayerToArena(_teamTwo[i], spawns.get(i + offset), _stadiumID);
+			}
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+			return false;
+		}
+		return result;
+	}
+	
+	@Override
+	protected final void removals() {
+		for (int i = _teamOneSize; --i >= 0;) {
+			removals(_teamOne[i].getPlayer(), false);
+			_teamOne[i].getPlayer().setTeam(Team.BLUE);
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			removals(_teamTwo[i].getPlayer(), false);
+			_teamTwo[i].getPlayer().setTeam(Team.RED);
+		}
+	}
+	
+	@Override
+	protected final boolean makeCompetitionStart() {
+		if (!super.makeCompetitionStart()) {
+			return false;
+		}
+		
+		Participant par;
+		for (int i = 0; i < _teamOneSize; i++) {
+			par = _teamOne[i];
+			if (par.getPlayer() == null) {
+				return false;
+			}
+			
+			par.getPlayer().setIsOlympiadStart(true);
+			par.getPlayer().updateEffectIcons();
+		}
+		
+		for (int i = 0; i < _teamTwoSize; i++) {
+			par = _teamTwo[i];
+			if (par.getPlayer() == null) {
+				return false;
+			}
+			
+			par.getPlayer().setIsOlympiadStart(true);
+			par.getPlayer().updateEffectIcons();
+		}
+		return true;
+	}
+	
+	@Override
+	protected final void cleanEffects() {
+		Participant par;
+		for (int i = _teamOneSize; --i >= 0;) {
+			par = _teamOne[i];
+			if ((par.getPlayer() != null) && !par.isDefaulted() && !par.isDisconnected() && (par.getPlayer().getOlympiadGameId() == _stadiumID)) {
+				cleanEffects(par.getPlayer());
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			par = _teamTwo[i];
+			if ((par.getPlayer() != null) && !par.isDefaulted() && !par.isDisconnected() && (par.getPlayer().getOlympiadGameId() == _stadiumID)) {
+				cleanEffects(par.getPlayer());
+			}
+		}
+	}
+	
+	@Override
+	protected final void portPlayersBack() {
+		Participant par;
+		for (int i = _teamOneSize; --i >= 0;) {
+			par = _teamOne[i];
+			if ((par.getPlayer() != null) && !par.isDefaulted() && !par.isDisconnected()) {
+				portPlayerBack(par.getPlayer());
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			par = _teamTwo[i];
+			if ((par.getPlayer() != null) && !par.isDefaulted() && !par.isDisconnected()) {
+				portPlayerBack(par.getPlayer());
+			}
+		}
+	}
+	
+	@Override
+	protected final void playersStatusBack() {
+		Participant par;
+		for (int i = _teamOneSize; --i >= 0;) {
+			par = _teamOne[i];
+			if ((par.getPlayer() != null) && !par.isDefaulted() && !par.isDisconnected() && (par.getPlayer().getOlympiadGameId() == _stadiumID)) {
+				playerStatusBack(par.getPlayer());
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			par = _teamTwo[i];
+			if ((par.getPlayer() != null) && !par.isDefaulted() && !par.isDisconnected() && (par.getPlayer().getOlympiadGameId() == _stadiumID)) {
+				playerStatusBack(par.getPlayer());
+			}
+		}
+	}
+	
+	@Override
+	protected final void clearPlayers() {
+		for (int i = 0; i < MAX_TEAM_SIZE; i++) {
+			if (i < _teamOneSize) {
+				_teamOne[i].setPlayer(null);
+			} else {
+				IdFactory.getInstance().releaseId(_teamOne[i].getObjectId());
+			}
+			
+			if (i < _teamTwoSize) {
+				_teamTwo[i].setPlayer(null);
+			} else {
+				IdFactory.getInstance().releaseId(_teamTwo[i].getObjectId());
+			}
+			
+			_teamOne[i] = null;
+			_teamTwo[i] = null;
+		}
+	}
+	
+	@Override
+	protected final void handleDisconnect(L2PcInstance player) {
+		Participant par;
+		for (int i = _teamOneSize; --i >= 0;) {
+			par = _teamOne[i];
+			if (par.getObjectId() == player.getObjectId()) {
+				par.setDisconnected(true);
+				return;
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			par = _teamTwo[i];
+			if (par.getObjectId() == player.getObjectId()) {
+				par.setDisconnected(true);
+				return;
+			}
+		}
+	}
+	
+	@Override
+	protected final boolean haveWinner() {
+		if (!checkBattleStatus()) {
+			return true;
+		}
+		
+		boolean teamOneLost = true;
+		boolean teamTwoLost = true;
+		Participant par;
+		for (int i = _teamOneSize; --i >= 0;) {
+			par = _teamOne[i];
+			if (!par.isDisconnected()) {
+				if ((par.getPlayer() != null) && (par.getPlayer().getOlympiadGameId() == _stadiumID)) {
+					teamOneLost &= par.getPlayer().isDead();
+				}
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			par = _teamTwo[i];
+			if (!par.isDisconnected()) {
+				if ((par.getPlayer() != null) && (par.getPlayer().getOlympiadGameId() == _stadiumID)) {
+					teamTwoLost &= par.getPlayer().isDead();
+				}
+			}
+		}
+		
+		return teamOneLost || teamTwoLost;
+	}
+	
+	@Override
+	protected final boolean checkBattleStatus() {
+		if (_aborted) {
+			return false;
+		}
+		
+		if (teamOneAllDisconnected()) {
+			return false;
+		}
+		
+		if (teamTwoAllDisconnected()) {
+			return false;
+		}
+		
+		return true;
+	}
+	
+	@Override
+	protected void validateWinner(L2OlympiadStadiumZone stadium) {
+		if (_aborted) {
+			return;
+		}
+		
+		ExOlympiadMatchResult result = null;
+		
+		boolean tie = false;
+		int winside = 0;
+		
+		List<OlympiadInfo> list1 = new ArrayList<>(3);
+		List<OlympiadInfo> list2 = new ArrayList<>(3);
+		
+		final boolean tOneCrash = teamOneAllDisconnected();
+		final boolean tTwoCrash = teamTwoAllDisconnected();
+		
+		Participant par;
+		SystemMessage sm;
+		int points;
+		
+		// Check for if a team defaulted before battle started
+		if (_teamOneDefaulted || _teamTwoDefaulted) {
+			try {
+				if (_teamOneDefaulted) {
+					for (int i = _teamOneSize; --i >= 0;) {
+						par = _teamOne[i];
+						points = par.getStats().getInt(POINTS) / getDivider();
+						int val = Math.min(par.getStats().getInt(POINTS) / 3, olympiad().getMaxPoints());
+						removePointsFromParticipant(par, val);
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, points - val, -val));
+					}
+					winside = 2;
+				}
+				if (_teamTwoDefaulted) {
+					for (int i = _teamTwoSize; --i >= 0;) {
+						par = _teamTwo[i];
+						points = par.getStats().getInt(POINTS) / getDivider();
+						int val = Math.min(par.getStats().getInt(POINTS) / 3, olympiad().getMaxPoints());
+						removePointsFromParticipant(par, val);
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, points - val, -val));
+					}
+					if (winside == 2) {
+						tie = true;
+					} else {
+						winside = 1;
+					}
+				}
+				if (winside == 1) {
+					result = new ExOlympiadMatchResult(tie, winside, list1, list2);
+				} else {
+					result = new ExOlympiadMatchResult(tie, winside, list2, list1);
+				}
+				stadium.broadcastPacket(result);
+			} catch (Exception e) {
+				LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+			}
+			return;
+		}
+		
+		// points to be dedicted in case of losing
+		final int[] pointsTeamOne = new int[_teamOneSize];
+		final int[] pointsTeamTwo = new int[_teamTwoSize];
+		final int[] maxPointsTeamOne = new int[_teamOneSize];
+		final int[] maxPointsTeamTwo = new int[_teamTwoSize];
+		int totalPointsTeamOne = 0;
+		int totalPointsTeamTwo = 0;
+		for (int i = 0; i < _teamOneSize; i++) {
+			points = _teamOne[i].getStats().getInt(POINTS) / getDivider();
+			if (points <= 0) {
+				points = 1;
+			} else if (points > olympiad().getMaxPoints()) {
+				points = olympiad().getMaxPoints();
+			}
+			
+			totalPointsTeamOne += points;
+			pointsTeamOne[i] = points;
+			maxPointsTeamOne[i] = points;
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			points = _teamTwo[i].getStats().getInt(POINTS) / getDivider();
+			if (points <= 0) {
+				points = 1;
+			} else if (points > olympiad().getMaxPoints()) {
+				points = olympiad().getMaxPoints();
+			}
+			
+			totalPointsTeamTwo += points;
+			pointsTeamTwo[i] = points;
+			maxPointsTeamTwo[i] = points;
+		}
+		
+		// Choose minimum sum
+		int min = Math.min(totalPointsTeamOne, totalPointsTeamTwo);
+		
+		// make sure all team members got same number of the points: round down to 3x
+		min = (min / MAX_TEAM_SIZE) * MAX_TEAM_SIZE;
+		
+		// calculating coefficients and trying to correct total number of points for each team
+		// due to rounding errors total points after correction will always be lower or equal
+		// than needed minimal sum
+		final double dividerOne = (double) totalPointsTeamOne / min;
+		final double dividerTwo = (double) totalPointsTeamTwo / min;
+		totalPointsTeamOne = min;
+		totalPointsTeamTwo = min;
+		for (int i = 0; i < _teamOneSize; i++) {
+			points = Math.max((int) (pointsTeamOne[i] / dividerOne), 1);
+			pointsTeamOne[i] = points;
+			totalPointsTeamOne -= points;
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			points = Math.max((int) (pointsTeamTwo[i] / dividerTwo), 1);
+			pointsTeamTwo[i] = points;
+			totalPointsTeamTwo -= points;
+		}
+		
+		// compensating remaining points, first team from begin to end, second from end to begin
+		for (int i = 0; (totalPointsTeamOne > 0) && (i < _teamOneSize); i++) {
+			if (pointsTeamOne[i] < maxPointsTeamOne[i]) {
+				pointsTeamOne[i]++;
+				totalPointsTeamOne--;
+			}
+		}
+		
+		for (int i = _teamTwoSize; (totalPointsTeamTwo > 0) && (--i >= 0);) {
+			if (pointsTeamTwo[i] < maxPointsTeamTwo[i]) {
+				pointsTeamTwo[i]++;
+				totalPointsTeamTwo--;
+			}
+		}
+		
+		// Create results for players if a team crashed
+		if (tOneCrash || tTwoCrash) {
+			try {
+				if (tTwoCrash && !tOneCrash) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+					sm.addString(_teamOne[0].getName());
+					stadium.broadcastPacket(sm);
+					
+					for (int i = 0; i < _teamTwoSize; i++) {
+						par = _teamTwo[i];
+						par.updateStat(COMP_LOST, 1);
+						points = pointsTeamTwo[i];
+						removePointsFromParticipant(par, points);
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - points, -points));
+					}
+					
+					points = min / MAX_TEAM_SIZE;
+					for (int i = 0; i < _teamOneSize; i++) {
+						par = _teamOne[i];
+						par.updateStat(COMP_WON, 1);
+						addPointsToParticipant(par, points);
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) + points, points));
+					}
+					
+					for (int i = 0; i < _teamOneSize; i++) {
+						rewardParticipant(_teamOne[i].getPlayer(), getReward());
+					}
+					
+					winside = 1;
+				} else if (tOneCrash && !tTwoCrash) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+					sm.addString(_teamTwo[0].getName());
+					stadium.broadcastPacket(sm);
+					
+					for (int i = 0; i < _teamOneSize; i++) {
+						par = _teamOne[i];
+						par.updateStat(COMP_LOST, 1);
+						points = pointsTeamOne[i];
+						removePointsFromParticipant(par, points);
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - points, -points));
+					}
+					
+					points = min / MAX_TEAM_SIZE;
+					for (int i = 0; i < _teamTwoSize; i++) {
+						par = _teamTwo[i];
+						par.updateStat(COMP_WON, 1);
+						addPointsToParticipant(par, points);
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) + points, points));
+					}
+					
+					winside = 2;
+					
+					for (int i = 0; i < _teamTwoSize; i++) {
+						rewardParticipant(_teamTwo[i].getPlayer(), getReward());
+					}
+				} else if (tOneCrash && tTwoCrash) {
+					stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_ENDED_IN_A_TIE));
+					
+					for (int i = _teamOneSize; --i >= 0;) {
+						par = _teamOne[i];
+						par.updateStat(COMP_LOST, 1);
+						removePointsFromParticipant(par, pointsTeamOne[i]);
+						list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - pointsTeamOne[i], -pointsTeamOne[i]));
+					}
+					
+					for (int i = _teamTwoSize; --i >= 0;) {
+						par = _teamTwo[i];
+						par.updateStat(COMP_LOST, 1);
+						removePointsFromParticipant(par, pointsTeamTwo[i]);
+						list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - pointsTeamOne[i], -pointsTeamOne[i]));
+					}
+					
+					tie = true;
+				}
+				
+				for (int i = _teamOneSize; --i >= 0;) {
+					par = _teamOne[i];
+					par.updateStat(COMP_DONE, 1);
+					par.updateStat(COMP_DONE_WEEK, 1);
+					par.updateStat(getWeeklyMatchType(), 1);
+				}
+				
+				for (int i = _teamTwoSize; --i >= 0;) {
+					par = _teamTwo[i];
+					par.updateStat(COMP_DONE, 1);
+					par.updateStat(COMP_DONE_WEEK, 1);
+					par.updateStat(getWeeklyMatchType(), 1);
+				}
+			} catch (Exception e) {
+				LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+			}
+			
+			if (winside == 1) {
+				result = new ExOlympiadMatchResult(tie, winside, list1, list2);
+			} else {
+				result = new ExOlympiadMatchResult(tie, winside, list2, list1);
+			}
+			stadium.broadcastPacket(result);
+			return;
+		}
+		
+		try {
+			double hp;
+			double teamOneHp = 0;
+			double teamTwoHp = 0;
+			
+			for (int i = _teamOneSize; --i >= 0;) {
+				par = _teamOne[i];
+				if (!par.isDisconnected() && (par.getPlayer() != null) && !par.getPlayer().isDead()) {
+					hp = par.getPlayer().getCurrentHp() + par.getPlayer().getCurrentCp();
+					if (hp >= 0.5) {
+						teamOneHp += hp;
+					}
+				}
+				par.updatePlayer();
+			}
+			
+			for (int i = _teamTwoSize; --i >= 0;) {
+				par = _teamTwo[i];
+				if (!par.isDisconnected() && (par.getPlayer() != null) && !par.getPlayer().isDead()) {
+					hp = par.getPlayer().getCurrentHp() + par.getPlayer().getCurrentCp();
+					if (hp >= 0.5) {
+						teamTwoHp += hp;
+					}
+				}
+				par.updatePlayer();
+			}
+			
+			if (((teamTwoHp == 0) && (teamOneHp != 0)) || ((_damageT1 > _damageT2) && (teamTwoHp != 0) && (teamOneHp != 0))) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+				sm.addString(_teamOne[0].getName());
+				stadium.broadcastPacket(sm);
+				
+				for (int i = 0; i < _teamTwoSize; i++) {
+					par = _teamTwo[i];
+					par.updateStat(COMP_LOST, 1);
+					points = pointsTeamTwo[i];
+					removePointsFromParticipant(par, points);
+					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - points, -points));
+				}
+				
+				points = min / MAX_TEAM_SIZE;
+				for (int i = 0; i < _teamOneSize; i++) {
+					par = _teamOne[i];
+					par.updateStat(COMP_WON, 1);
+					addPointsToParticipant(par, points);
+					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) + points, points));
+				}
+				
+				winside = 1;
+				
+				for (int i = 0; i < _teamOneSize; i++) {
+					rewardParticipant(_teamOne[i].getPlayer(), getReward());
+				}
+			} else if (((teamOneHp == 0) && (teamTwoHp != 0)) || ((_damageT2 > _damageT1) && (teamOneHp != 0) && (teamTwoHp != 0))) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_WON_THE_GAME);
+				sm.addString(_teamTwo[0].getName());
+				stadium.broadcastPacket(sm);
+				
+				for (int i = 0; i < _teamOneSize; i++) {
+					par = _teamOne[i];
+					par.updateStat(COMP_LOST, 1);
+					points = pointsTeamOne[i];
+					removePointsFromParticipant(par, points);
+					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - points, -points));
+				}
+				
+				points = min / MAX_TEAM_SIZE;
+				for (int i = 0; i < _teamTwoSize; i++) {
+					par = _teamTwo[i];
+					par.updateStat(COMP_WON, 1);
+					addPointsToParticipant(par, points);
+					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) + points, points));
+				}
+				
+				winside = 2;
+				
+				for (int i = 0; i < _teamTwoSize; i++) {
+					rewardParticipant(_teamTwo[i].getPlayer(), getReward());
+				}
+			} else {
+				stadium.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_ENDED_IN_A_TIE));
+				
+				for (int i = 0; i < _teamOneSize; i++) {
+					par = _teamOne[i];
+					par.updateStat(COMP_DRAWN, 1);
+					points = Math.min(par.getStats().getInt(POINTS) / getDivider(), olympiad().getMaxPoints());
+					removePointsFromParticipant(par, points);
+					list1.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT1, par.getStats().getInt(POINTS) - points, -points));
+				}
+				
+				for (int i = 0; i < _teamTwoSize; i++) {
+					par = _teamTwo[i];
+					par.updateStat(COMP_DRAWN, 1);
+					points = Math.min(par.getStats().getInt(POINTS) / getDivider(), olympiad().getMaxPoints());
+					removePointsFromParticipant(par, points);
+					list2.add(new OlympiadInfo(par.getName(), par.getClanName(), par.getClanId(), par.getBaseClass(), _damageT2, par.getStats().getInt(POINTS) - points, -points));
+				}
+				tie = true;
+			}
+			
+			for (int i = _teamOneSize; --i >= 0;) {
+				par = _teamOne[i];
+				par.updateStat(COMP_DONE, 1);
+				par.updateStat(COMP_DONE_WEEK, 1);
+				par.updateStat(getWeeklyMatchType(), 1);
+			}
+			
+			for (int i = _teamTwoSize; --i >= 0;) {
+				par = _teamTwo[i];
+				par.updateStat(COMP_DONE, 1);
+				par.updateStat(COMP_DONE_WEEK, 1);
+				par.updateStat(getWeeklyMatchType(), 1);
+			}
+			if (winside == 1) {
+				result = new ExOlympiadMatchResult(tie, winside, list1, list2);
+			} else {
+				result = new ExOlympiadMatchResult(tie, winside, list2, list1);
+			}
+			stadium.broadcastPacket(result);
+		} catch (Exception e) {
+			LOG.warn("Exception on validateWinner(): {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * UnAfraid: TODO: We should calculate the damage in array separately for each player so we can display it on ExOlympiadMatchResult correctly.
+	 */
+	@Override
+	protected final void addDamage(L2PcInstance player, int damage) {
+		Participant par;
+		for (int i = _teamOneSize; --i >= 0;) {
+			par = _teamOne[i];
+			if (par.getObjectId() == player.getObjectId()) {
+				if (!par.isDisconnected()) {
+					_damageT1 += damage;
+				}
+				return;
+			}
+		}
+		
+		for (int i = _teamTwoSize; --i >= 0;) {
+			par = _teamTwo[i];
+			if (par.getObjectId() == player.getObjectId()) {
+				if (!par.isDisconnected()) {
+					_damageT2 += damage;
+				}
+				return;
+			}
+		}
+	}
+	
+	@Override
+	public final String[] getPlayerNames() {
+		return new String[] {
+			_teamOne[0].getName(),
+			_teamTwo[0].getName()
+		};
+	}
+	
+	@Override
+	public final boolean checkDefaulted() {
+		try {
+			SystemMessage reason = null;
+			Participant par;
+			for (int i = _teamOneSize; --i >= 0;) {
+				par = _teamOne[i];
+				par.updatePlayer();
+				reason = checkDefaulted(par.getPlayer());
+				if (reason != null) {
+					par.setDefaulted(true);
+					if (!_teamOneDefaulted) {
+						_teamOneDefaulted = true;
+						for (Participant t : _teamTwo) {
+							if (t.getPlayer() != null) {
+								t.getPlayer().sendPacket(reason);
+							}
+						}
+					}
+				}
+			}
+			
+			for (int i = _teamTwoSize; --i >= 0;) {
+				par = _teamTwo[i];
+				par.updatePlayer();
+				reason = checkDefaulted(par.getPlayer());
+				if (reason != null) {
+					par.setDefaulted(true);
+					if (!_teamTwoDefaulted) {
+						_teamTwoDefaulted = true;
+						for (Participant t : _teamOne) {
+							if (t.getPlayer() != null) {
+								t.getPlayer().sendPacket(reason);
+							}
+						}
+					}
+				}
+			}
+			
+			return _teamOneDefaulted || _teamTwoDefaulted;
+		} catch (Exception e) {
+			LOG.warn("Exception on checkDefaulted(): {}", e.getMessage(), e);
+			return true;
+		}
+	}
+	
+	@Override
+	public final void resetDamage() {
+		_damageT1 = 0;
+		_damageT2 = 0;
+	}
+	
+	private boolean teamOneAllDisconnected() {
+		for (int i = _teamOneSize; --i >= 0;) {
+			if (!_teamOne[i].isDisconnected()) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	private boolean teamTwoAllDisconnected() {
+		for (int i = _teamTwoSize; --i >= 0;) {
+			if (!_teamTwo[i].isDisconnected()) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadInfo.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadInfo.java
new file mode 100644
index 00000000..d4ad0320
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadInfo.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+/**
+ * @author JIV
+ */
+public class OlympiadInfo {
+	private final String _name;
+	private final String _clan;
+	private final int _clanId;
+	private final int _classId;
+	private final int _dmg;
+	private final int _curPoints;
+	private final int _diffPoints;
+	
+	public OlympiadInfo(String name, String clan, int clanId, int classId, int dmg, int curPoints, int diffPoints) {
+		_name = name;
+		_clan = clan;
+		_clanId = clanId;
+		_classId = classId;
+		_dmg = dmg;
+		_curPoints = curPoints;
+		_diffPoints = diffPoints;
+	}
+	
+	/**
+	 * @return the name the player's name.
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * @return the name the player's clan name.
+	 */
+	public String getClanName() {
+		return _clan;
+	}
+	
+	/**
+	 * @return the name the player's clan id.
+	 */
+	public int getClanId() {
+		return _clanId;
+	}
+	
+	/**
+	 * @return the name the player's class id.
+	 */
+	public int getClassId() {
+		return _classId;
+	}
+	
+	/**
+	 * @return the name the player's damage.
+	 */
+	public int getDamage() {
+		return _dmg;
+	}
+	
+	/**
+	 * @return the name the player's current points.
+	 */
+	public int getCurrentPoints() {
+		return _curPoints;
+	}
+	
+	/**
+	 * @return the name the player's points difference since this match.
+	 */
+	public int getDiffPoints() {
+		return _diffPoints;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java
new file mode 100644
index 00000000..1a5cdc1d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/OlympiadManager.java
@@ -0,0 +1,486 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author DS
+ */
+public class OlympiadManager {
+	private final List<Integer> _nonClassBasedRegisters;
+	private final Map<Integer, List<Integer>> _classBasedRegisters;
+	private final List<List<Integer>> _teamsBasedRegisters;
+	
+	protected OlympiadManager() {
+		_nonClassBasedRegisters = new CopyOnWriteArrayList<>();
+		_classBasedRegisters = new ConcurrentHashMap<>();
+		_teamsBasedRegisters = new CopyOnWriteArrayList<>();
+	}
+	
+	public static OlympiadManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	public final List<Integer> getRegisteredNonClassBased() {
+		return _nonClassBasedRegisters;
+	}
+	
+	public final Map<Integer, List<Integer>> getRegisteredClassBased() {
+		return _classBasedRegisters;
+	}
+	
+	public final List<List<Integer>> getRegisteredTeamsBased() {
+		return _teamsBasedRegisters;
+	}
+	
+	protected final List<List<Integer>> hasEnoughRegisteredClassed() {
+		List<List<Integer>> result = null;
+		for (Map.Entry<Integer, List<Integer>> classList : _classBasedRegisters.entrySet()) {
+			if ((classList.getValue() != null) && (classList.getValue().size() >= olympiad().getClassedParticipants())) {
+				if (result == null) {
+					result = new CopyOnWriteArrayList<>();
+				}
+				
+				result.add(classList.getValue());
+			}
+		}
+		return result;
+	}
+	
+	protected final boolean hasEnoughRegisteredNonClassed() {
+		return _nonClassBasedRegisters.size() >= olympiad().getNonClassedParticipants();
+	}
+	
+	protected final boolean hasEnoughRegisteredTeams() {
+		return _teamsBasedRegisters.size() >= olympiad().getTeamsParticipants();
+	}
+	
+	protected final void clearRegistered() {
+		_nonClassBasedRegisters.clear();
+		_classBasedRegisters.clear();
+		_teamsBasedRegisters.clear();
+		AntiFeedManager.getInstance().clear(AntiFeedManager.OLYMPIAD_ID);
+	}
+	
+	public final boolean isRegistered(L2PcInstance noble) {
+		return isRegistered(noble, noble, false);
+	}
+	
+	private boolean isRegistered(L2PcInstance noble, L2PcInstance player, boolean showMessage) {
+		final Integer objId = noble.getObjectId();
+		// party may be already dispersed
+		for (List<Integer> team : _teamsBasedRegisters) {
+			if ((team != null) && team.contains(objId)) {
+				if (showMessage) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_NON_CLASS_LIMITED_EVENT_TEAMS);
+					sm.addPcName(noble);
+					player.sendPacket(sm);
+				}
+				return true;
+			}
+		}
+		
+		if (_nonClassBasedRegisters.contains(objId)) {
+			if (showMessage) {
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_NON_CLASS_LIMITED_MATCH_WAITING_LIST);
+				sm.addPcName(noble);
+				player.sendPacket(sm);
+			}
+			return true;
+		}
+		
+		final List<Integer> classed = _classBasedRegisters.get(noble.getBaseClass());
+		if ((classed != null) && classed.contains(objId)) {
+			if (showMessage) {
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST);
+				sm.addPcName(noble);
+				player.sendPacket(sm);
+			}
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public final boolean isRegisteredInComp(L2PcInstance noble) {
+		return isRegistered(noble, noble, false) || isInCompetition(noble, noble, false);
+	}
+	
+	private boolean isInCompetition(L2PcInstance noble, L2PcInstance player, boolean showMessage) {
+		if (!Olympiad.getInstance().inCompPeriod()) {
+			return false;
+		}
+		
+		AbstractOlympiadGame game;
+		for (int i = OlympiadGameManager.getInstance().getNumberOfStadiums(); --i >= 0;) {
+			game = OlympiadGameManager.getInstance().getOlympiadTask(i).getGame();
+			if (game == null) {
+				continue;
+			}
+			
+			if (game.containsParticipant(noble.getObjectId())) {
+				if (!showMessage) {
+					return true;
+				}
+				
+				switch (game.getType()) {
+					case CLASSED -> {
+						final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST);
+						sm.addPcName(noble);
+						player.sendPacket(sm);
+					}
+					case NON_CLASSED -> {
+						final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_ON_THE_NON_CLASS_LIMITED_MATCH_WAITING_LIST);
+						sm.addPcName(noble);
+						player.sendPacket(sm);
+					}
+					case TEAMS -> {
+						final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_REGISTERED_NON_CLASS_LIMITED_EVENT_TEAMS);
+						sm.addPcName(noble);
+						player.sendPacket(sm);
+					}
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public final boolean registerNoble(L2PcInstance player, CompetitionType type) {
+		if (!Olympiad.getInstance().inCompPeriod()) {
+			player.sendPacket(SystemMessageId.THE_OLYMPIAD_GAME_IS_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
+		if (Olympiad.getInstance().getMillisToCompEnd() < 600000) {
+			player.sendPacket(SystemMessageId.GAME_REQUEST_CANNOT_BE_MADE);
+			return false;
+		}
+		
+		final int charId = player.getObjectId();
+		if (Olympiad.getInstance().getRemainingWeeklyMatches(charId) < 1) {
+			player.sendPacket(SystemMessageId.MAX_OLY_WEEKLY_MATCHES_REACHED);
+			return false;
+		}
+		
+		switch (type) {
+			case CLASSED -> {
+				if (!checkNoble(player, player)) {
+					return false;
+				}
+				
+				if (Olympiad.getInstance().getRemainingWeeklyMatchesClassed(charId) < 1) {
+					player.sendPacket(SystemMessageId.MAX_OLY_WEEKLY_MATCHES_REACHED_60_NON_CLASSED_30_CLASSED_10_TEAM);
+					return false;
+				}
+				
+				List<Integer> classed = _classBasedRegisters.get(player.getBaseClass());
+				if (classed != null) {
+					classed.add(charId);
+				} else {
+					classed = new CopyOnWriteArrayList<>();
+					classed.add(charId);
+					_classBasedRegisters.put(player.getBaseClass(), classed);
+				}
+				
+				player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REGISTERED_IN_A_WAITING_LIST_OF_CLASSIFIED_GAMES);
+			}
+			case NON_CLASSED -> {
+				if (!checkNoble(player, player)) {
+					return false;
+				}
+				
+				if (Olympiad.getInstance().getRemainingWeeklyMatchesNonClassed(charId) < 1) {
+					player.sendPacket(SystemMessageId.MAX_OLY_WEEKLY_MATCHES_REACHED_60_NON_CLASSED_30_CLASSED_10_TEAM);
+					return false;
+				}
+				
+				_nonClassBasedRegisters.add(charId);
+				player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REGISTERED_IN_A_WAITING_LIST_OF_NO_CLASS_GAMES);
+			}
+			case TEAMS -> {
+				final L2Party party = player.getParty();
+				if ((party == null) || (party.getMemberCount() != 3)) {
+					player.sendPacket(SystemMessageId.PARTY_REQUIREMENTS_NOT_MET);
+					return false;
+				}
+				if (!party.isLeader(player)) {
+					player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_REQUEST_TEAM_MATCH);
+					return false;
+				}
+				
+				int teamPoints = 0;
+				List<Integer> team = new ArrayList<>(party.getMemberCount());
+				for (L2PcInstance noble : party.getMembers()) {
+					if (!checkNoble(noble, player)) {
+						// remove previously registered party members
+						if (customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) {
+							for (L2PcInstance unreg : party.getMembers()) {
+								if (unreg == noble) {
+									break;
+								}
+								
+								AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, unreg);
+							}
+						}
+						return false;
+					}
+					
+					if (Olympiad.getInstance().getRemainingWeeklyMatchesTeam(noble.getObjectId()) < 1) {
+						player.sendPacket(SystemMessageId.MAX_OLY_WEEKLY_MATCHES_REACHED_60_NON_CLASSED_30_CLASSED_10_TEAM);
+						return false;
+					}
+					team.add(noble.getObjectId());
+					teamPoints += Olympiad.getInstance().getNoblePoints(noble.getObjectId());
+				}
+				if (teamPoints < 10) {
+					// TODO: replace with retail message
+					player.sendMessage("Your team must have at least 10 points in total.");
+					// remove previously registered party members
+					if (customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) {
+						for (L2PcInstance unreg : party.getMembers()) {
+							AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, unreg);
+						}
+					}
+					return false;
+				}
+				
+				party.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_REGISTERED_IN_A_WAITING_LIST_OF_TEAM_GAMES));
+				_teamsBasedRegisters.add(team);
+			}
+		}
+		return true;
+	}
+	
+	public final boolean unRegisterNoble(L2PcInstance noble) {
+		if (!Olympiad.getInstance().inCompPeriod()) {
+			noble.sendPacket(SystemMessageId.THE_OLYMPIAD_GAME_IS_NOT_CURRENTLY_IN_PROGRESS);
+			return false;
+		}
+		
+		if (!noble.isNoble()) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_REQUIREMENTS_ONLY_NOBLESS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
+			sm.addString(noble.getName());
+			noble.sendPacket(sm);
+			return false;
+		}
+		
+		if (!isRegistered(noble, noble, false)) {
+			noble.sendPacket(SystemMessageId.YOU_HAVE_NOT_BEEN_REGISTERED_IN_A_WAITING_LIST_OF_A_GAME);
+			return false;
+		}
+		
+		if (isInCompetition(noble, noble, false)) {
+			return false;
+		}
+		
+		Integer objId = noble.getObjectId();
+		if (_nonClassBasedRegisters.remove(objId)) {
+			if (customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) {
+				AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, noble);
+			}
+			
+			noble.sendPacket(SystemMessageId.YOU_HAVE_BEEN_DELETED_FROM_THE_WAITING_LIST_OF_A_GAME);
+			return true;
+		}
+		
+		final List<Integer> classed = _classBasedRegisters.get(noble.getBaseClass());
+		if ((classed != null) && classed.remove(objId)) {
+			_classBasedRegisters.put(noble.getBaseClass(), classed);
+			
+			if (customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) {
+				AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, noble);
+			}
+			
+			noble.sendPacket(SystemMessageId.YOU_HAVE_BEEN_DELETED_FROM_THE_WAITING_LIST_OF_A_GAME);
+			return true;
+		}
+		
+		for (List<Integer> team : _teamsBasedRegisters) {
+			if ((team != null) && team.contains(objId)) {
+				_teamsBasedRegisters.remove(team);
+				ThreadPoolManager.getInstance().executeGeneral(new AnnounceUnregToTeam(team));
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public final void removeDisconnectedCompetitor(L2PcInstance player) {
+		final OlympiadGameTask task = OlympiadGameManager.getInstance().getOlympiadTask(player.getOlympiadGameId());
+		if ((task != null) && task.isGameStarted()) {
+			task.getGame().handleDisconnect(player);
+		}
+		
+		final Integer objId = player.getObjectId();
+		if (_nonClassBasedRegisters.remove(objId)) {
+			return;
+		}
+		
+		final List<Integer> classed = _classBasedRegisters.get(player.getBaseClass());
+		if ((classed != null) && classed.remove(objId)) {
+			return;
+		}
+		
+		for (List<Integer> team : _teamsBasedRegisters) {
+			if ((team != null) && team.contains(objId)) {
+				_teamsBasedRegisters.remove(team);
+				ThreadPoolManager.getInstance().executeGeneral(new AnnounceUnregToTeam(team));
+				return;
+			}
+		}
+	}
+	
+	/**
+	 * @param noble - checked noble
+	 * @param player - messages will be sent to this L2PcInstance
+	 * @return true if all requirements are met
+	 */
+	// TODO: move to the bypass handler after reworking points system
+	private boolean checkNoble(L2PcInstance noble, L2PcInstance player) {
+		SystemMessage sm;
+		if (!noble.isNoble()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_REQUIREMENTS_ONLY_NOBLESS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
+			sm.addPcName(noble);
+			player.sendPacket(sm);
+			return false;
+		}
+		
+		if (noble.isSubClassActive()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANT_JOIN_THE_OLYMPIAD_WITH_A_SUB_CLASS_CHARACTER);
+			sm.addPcName(noble);
+			player.sendPacket(sm);
+			return false;
+		}
+		
+		if (noble.isCursedWeaponEquipped()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_JOIN_OLYMPIAD_POSSESSING_S2);
+			sm.addPcName(noble);
+			sm.addItemName(noble.getCursedWeaponEquippedId());
+			player.sendPacket(sm);
+			return false;
+		}
+		
+		if (!noble.isInventoryUnder90(true)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT);
+			sm.addPcName(noble);
+			player.sendPacket(sm);
+			return false;
+		}
+		
+		final int charId = noble.getObjectId();
+		if (noble.isOnEvent()) {
+			player.sendMessage("You can't join olympiad while participating on TvT Event.");
+			return false;
+		}
+		
+		if (isRegistered(noble, player, true)) {
+			return false;
+		}
+		
+		if (isInCompetition(noble, player, true)) {
+			return false;
+		}
+		
+		StatsSet statDat = Olympiad.getNobleStats(charId);
+		if (statDat == null) {
+			statDat = new StatsSet();
+			statDat.set(Olympiad.CLASS_ID, noble.getBaseClass());
+			statDat.set(Olympiad.CHAR_NAME, noble.getName());
+			statDat.set(Olympiad.POINTS, olympiad().getStartPoints());
+			statDat.set(Olympiad.COMP_DONE, 0);
+			statDat.set(Olympiad.COMP_WON, 0);
+			statDat.set(Olympiad.COMP_LOST, 0);
+			statDat.set(Olympiad.COMP_DRAWN, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK_CLASSED, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK_NON_CLASSED, 0);
+			statDat.set(Olympiad.COMP_DONE_WEEK_TEAM, 0);
+			statDat.set("to_save", true);
+			Olympiad.addNobleStats(charId, statDat);
+		}
+		
+		final int points = Olympiad.getInstance().getNoblePoints(charId);
+		if (points <= 0) {
+			final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
+			message.setFile(player.getHtmlPrefix(), "data/html/olympiad/noble_nopoints1.htm");
+			message.replace("%objectId%", String.valueOf(noble.getLastHtmlActionOriginId()));
+			player.sendPacket(message);
+			return false;
+		}
+		
+		if ((customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) && !AntiFeedManager.getInstance().tryAddPlayer(AntiFeedManager.OLYMPIAD_ID, noble, customs().getDualboxCheckMaxOlympiadParticipantsPerIP())) {
+			final NpcHtmlMessage message = new NpcHtmlMessage(player.getLastHtmlActionOriginId());
+			message.setFile(player.getHtmlPrefix(), "data/html/mods/OlympiadIPRestriction.htm");
+			message.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(player, customs().getDualboxCheckMaxOlympiadParticipantsPerIP())));
+			player.sendPacket(message);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	private static final class AnnounceUnregToTeam implements Runnable {
+		private final List<Integer> _team;
+		
+		public AnnounceUnregToTeam(List<Integer> t) {
+			_team = t;
+		}
+		
+		@Override
+		public void run() {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BEEN_DELETED_FROM_THE_WAITING_LIST_OF_A_GAME);
+			for (int objectId : _team) {
+				L2PcInstance teamMember = L2World.getInstance().getPlayer(objectId);
+				if (teamMember != null) {
+					teamMember.sendPacket(sm);
+					if (customs().getDualboxCheckMaxOlympiadParticipantsPerIP() > 0) {
+						AntiFeedManager.getInstance().removePlayer(AntiFeedManager.OLYMPIAD_ID, teamMember);
+					}
+				}
+			}
+		}
+	}
+	
+	public int getCountOpponents() {
+		return _nonClassBasedRegisters.size() + _classBasedRegisters.size() + _teamsBasedRegisters.size();
+	}
+	
+	private static class SingletonHolder {
+		protected static final OlympiadManager _instance = new OlympiadManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/olympiad/Participant.java b/src/main/java/com/l2jserver/gameserver/model/olympiad/Participant.java
new file mode 100644
index 00000000..ecd5cc11
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/olympiad/Participant.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.olympiad;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author DS
+ * @author Zoey76
+ */
+public final class Participant {
+	private final int objectId;
+	private L2PcInstance player;
+	private final String name;
+	private final int side;
+	private final int baseClass;
+	private boolean disconnected = false;
+	private boolean defaulted = false;
+	private final StatsSet stats;
+	public String clanName;
+	public int clanId;
+	
+	public Participant(L2PcInstance plr, int olympiadSide) {
+		objectId = plr.getObjectId();
+		player = plr;
+		name = plr.getName();
+		side = olympiadSide;
+		baseClass = plr.getBaseClass();
+		stats = Olympiad.getNobleStats(getObjectId());
+		clanName = plr.getClan() != null ? plr.getClan().getName() : "";
+		clanId = plr.getClanId();
+	}
+	
+	public Participant(int objId, int olympiadSide) {
+		objectId = objId;
+		player = null;
+		name = "-";
+		side = olympiadSide;
+		baseClass = 0;
+		stats = null;
+		clanName = "";
+		clanId = 0;
+	}
+	
+	/**
+	 * Updates the reference to {@link #player}, if it's null or appears off-line.
+	 * @return {@code true} if after the update the player isn't null, {@code false} otherwise.
+	 */
+	public boolean updatePlayer() {
+		if ((player == null) || !player.isOnline()) {
+			player = L2World.getInstance().getPlayer(getObjectId());
+		}
+		return (player != null);
+	}
+	
+	/**
+	 * @param statName
+	 * @param increment
+	 */
+	public void updateStat(String statName, int increment) {
+		stats.set(statName, Math.max(stats.getInt(statName) + increment, 0));
+	}
+	
+	/**
+	 * @return the name the player's name.
+	 */
+	public String getName() {
+		return name;
+	}
+	
+	/**
+	 * @return the name the player's clan name.
+	 */
+	public String getClanName() {
+		return clanName;
+	}
+	
+	/**
+	 * @return the name the player's id.
+	 */
+	public int getClanId() {
+		return clanId;
+	}
+	
+	/**
+	 * @return the player
+	 */
+	public L2PcInstance getPlayer() {
+		return player;
+	}
+	
+	/**
+	 * @return the objectId
+	 */
+	public int getObjectId() {
+		return objectId;
+	}
+	
+	/**
+	 * @return the stats
+	 */
+	public StatsSet getStats() {
+		return stats;
+	}
+	
+	/**
+	 * @param noble the player to set
+	 */
+	public void setPlayer(L2PcInstance noble) {
+		player = noble;
+	}
+	
+	/**
+	 * @return the side
+	 */
+	public int getSide() {
+		return side;
+	}
+	
+	/**
+	 * @return the baseClass
+	 */
+	public int getBaseClass() {
+		return baseClass;
+	}
+	
+	/**
+	 * @return the disconnected
+	 */
+	public boolean isDisconnected() {
+		return disconnected;
+	}
+	
+	/**
+	 * @param val the disconnected to set
+	 */
+	public void setDisconnected(boolean val) {
+		disconnected = val;
+	}
+	
+	/**
+	 * @return the defaulted
+	 */
+	public boolean isDefaulted() {
+		return defaulted;
+	}
+	
+	/**
+	 * @param val the value to set.
+	 */
+	public void setDefaulted(boolean val) {
+		defaulted = val;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/options/EnchantOptions.java b/src/main/java/com/l2jserver/gameserver/model/options/EnchantOptions.java
new file mode 100644
index 00000000..d085cd4c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/options/EnchantOptions.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.options;
+
+/**
+ * @author UnAfraid
+ */
+public class EnchantOptions {
+	private final int _level;
+	private final int[] _options;
+	
+	public EnchantOptions(int level) {
+		_level = level;
+		_options = new int[3];
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public int[] getOptions() {
+		return _options;
+	}
+	
+	public void setOption(byte index, int option) {
+		if (_options.length > index) {
+			_options[index] = option;
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/options/Options.java b/src/main/java/com/l2jserver/gameserver/model/options/Options.java
new file mode 100644
index 00000000..53221f9d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/options/Options.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.options;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
+
+/**
+ * @author UnAfraid
+ */
+public class Options {
+	private final int _id;
+	private final List<FuncTemplate> _funcs = new ArrayList<>();
+	
+	private SkillHolder _activeSkill = null;
+	private SkillHolder _passiveSkill = null;
+	
+	private final List<OptionsSkillHolder> _activationSkills = new ArrayList<>();
+	
+	/**
+	 * @param id
+	 */
+	public Options(int id) {
+		_id = id;
+	}
+	
+	public final int getId() {
+		return _id;
+	}
+	
+	public boolean hasFuncs() {
+		return !_funcs.isEmpty();
+	}
+	
+	public List<AbstractFunction> getStatFuncs(L2ItemInstance item, L2Character player) {
+		if (_funcs.isEmpty()) {
+			return Collections.emptyList();
+		}
+		
+		final List<AbstractFunction> funcs = new ArrayList<>(_funcs.size());
+		for (FuncTemplate fuctionTemplate : _funcs) {
+			AbstractFunction fuction = fuctionTemplate.getFunc(player, player, item, this);
+			if (fuction != null) {
+				funcs.add(fuction);
+			}
+			player.sendDebugMessage("Adding stats: " + fuctionTemplate.getStat() + " val: " + fuctionTemplate.getValue());
+		}
+		return funcs;
+	}
+	
+	public void addFunc(FuncTemplate template) {
+		_funcs.add(template);
+	}
+	
+	public boolean hasActiveSkill() {
+		return _activeSkill != null;
+	}
+	
+	public SkillHolder getActiveSkill() {
+		return _activeSkill;
+	}
+	
+	public void setActiveSkill(SkillHolder holder) {
+		_activeSkill = holder;
+	}
+	
+	public boolean hasPassiveSkill() {
+		return _passiveSkill != null;
+	}
+	
+	public SkillHolder getPassiveSkill() {
+		return _passiveSkill;
+	}
+	
+	public void setPassiveSkill(SkillHolder holder) {
+		_passiveSkill = holder;
+	}
+	
+	public boolean hasActivationSkills() {
+		return !_activationSkills.isEmpty();
+	}
+	
+	public boolean hasActivationSkills(OptionsSkillType type) {
+		for (OptionsSkillHolder holder : _activationSkills) {
+			if (holder.getSkillType() == type) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public List<OptionsSkillHolder> getActivationsSkills() {
+		return _activationSkills;
+	}
+	
+	public List<OptionsSkillHolder> getActivationsSkills(OptionsSkillType type) {
+		List<OptionsSkillHolder> temp = new ArrayList<>();
+		for (OptionsSkillHolder holder : _activationSkills) {
+			if (holder.getSkillType() == type) {
+				temp.add(holder);
+			}
+		}
+		return temp;
+	}
+	
+	public void addActivationSkill(OptionsSkillHolder holder) {
+		_activationSkills.add(holder);
+	}
+	
+	public void apply(L2PcInstance player) {
+		player.sendDebugMessage("Activating option id: " + _id);
+		if (hasFuncs()) {
+			player.addStatFuncs(getStatFuncs(null, player));
+		}
+		if (hasActiveSkill()) {
+			addSkill(player, getActiveSkill().getSkill());
+			player.sendDebugMessage("Adding active skill: " + getActiveSkill());
+		}
+		if (hasPassiveSkill()) {
+			addSkill(player, getPassiveSkill().getSkill());
+			player.sendDebugMessage("Adding passive skill: " + getPassiveSkill());
+		}
+		if (hasActivationSkills()) {
+			for (OptionsSkillHolder holder : _activationSkills) {
+				player.addTriggerSkill(holder);
+				player.sendDebugMessage("Adding trigger skill: " + holder);
+			}
+		}
+		
+		player.sendSkillList();
+	}
+	
+	public void remove(L2PcInstance player) {
+		player.sendDebugMessage("Deactivating option id: " + _id);
+		if (hasFuncs()) {
+			player.removeStatsOwner(this);
+		}
+		if (hasActiveSkill()) {
+			player.removeSkill(getActiveSkill().getSkill(), false, false);
+			player.sendDebugMessage("Removing active skill: " + getActiveSkill());
+		}
+		if (hasPassiveSkill()) {
+			player.removeSkill(getPassiveSkill().getSkill(), false, true);
+			player.sendDebugMessage("Removing passive skill: " + getPassiveSkill());
+		}
+		if (hasActivationSkills()) {
+			for (OptionsSkillHolder holder : _activationSkills) {
+				player.removeTriggerSkill(holder);
+				player.sendDebugMessage("Removing trigger skill: " + holder);
+			}
+		}
+		player.sendSkillList();
+	}
+	
+	private void addSkill(L2PcInstance player, Skill skill) {
+		boolean updateTimeStamp = false;
+		
+		player.addSkill(skill, false);
+		
+		if (skill.isActive()) {
+			final long remainingTime = player.getSkillRemainingReuseTime(skill.getReuseHashCode());
+			if (remainingTime > 0) {
+				player.addTimeStamp(skill, remainingTime);
+				player.disableSkill(skill, remainingTime);
+			}
+			updateTimeStamp = true;
+		}
+		if (updateTimeStamp) {
+			player.sendPacket(new SkillCoolTime(player));
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/options/OptionsSkillHolder.java b/src/main/java/com/l2jserver/gameserver/model/options/OptionsSkillHolder.java
new file mode 100644
index 00000000..458cd6c4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/options/OptionsSkillHolder.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.options;
+
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+/**
+ * @author UnAfraid
+ */
+public class OptionsSkillHolder extends SkillHolder {
+	private final OptionsSkillType _type;
+	private final double _chance;
+	
+	public OptionsSkillHolder(int skillId, int skillLvl, double chance, OptionsSkillType type) {
+		super(skillId, skillLvl);
+		_chance = chance;
+		_type = type;
+	}
+	
+	public OptionsSkillType getSkillType() {
+		return _type;
+	}
+	
+	public double getChance() {
+		return _chance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/options/OptionsSkillType.java b/src/main/java/com/l2jserver/gameserver/model/options/OptionsSkillType.java
new file mode 100644
index 00000000..940b6d35
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/options/OptionsSkillType.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.options;
+
+/**
+ * @author UnAfraid
+ */
+public enum OptionsSkillType {
+	ATTACK,
+	MAGIC,
+	CRITICAL
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentAffect.java b/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentAffect.java
new file mode 100644
index 00000000..43a53da4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentAffect.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.punishment;
+
+/**
+ * @author UnAfraid
+ */
+public enum PunishmentAffect {
+	ACCOUNT,
+	CHARACTER,
+	IP;
+	// HWID; Not implemented yet.
+	
+	public static PunishmentAffect getByName(String name) {
+		for (PunishmentAffect type : values()) {
+			if (type.name().equalsIgnoreCase(name)) {
+				return type;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentTask.java b/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentTask.java
new file mode 100644
index 00000000..9cd0f967
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentTask.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.punishment;
+
+import static java.sql.Statement.RETURN_GENERATED_KEYS;
+
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.handler.IPunishmentHandler;
+import com.l2jserver.gameserver.handler.PunishmentHandler;
+import com.l2jserver.gameserver.instancemanager.PunishmentManager;
+
+/**
+ * @author UnAfraid
+ */
+public class PunishmentTask implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(PunishmentTask.class);
+	
+	private static final String INSERT_QUERY = "INSERT INTO punishments (`key`, `affect`, `type`, `expiration`, `reason`, `punishedBy`) VALUES (?, ?, ?, ?, ?, ?)";
+	private static final String UPDATE_QUERY = "UPDATE punishments SET expiration = ? WHERE id = ?";
+	
+	private int _id;
+	private final String _key;
+	private final PunishmentAffect _affect;
+	private final PunishmentType _type;
+	private final long _expirationTime;
+	private final String _reason;
+	private final String _punishedBy;
+	private boolean _isStored;
+	private ScheduledFuture<?> _task = null;
+	
+	public PunishmentTask(Object key, PunishmentAffect affect, PunishmentType type, long expirationTime, String reason, String punishedBy) {
+		this(0, key, affect, type, expirationTime, reason, punishedBy, false);
+	}
+	
+	public PunishmentTask(int id, Object key, PunishmentAffect affect, PunishmentType type, long expirationTime, String reason, String punishedBy, boolean isStored) {
+		_id = id;
+		_key = String.valueOf(key);
+		_affect = affect;
+		_type = type;
+		_expirationTime = expirationTime;
+		_reason = reason;
+		_punishedBy = punishedBy;
+		_isStored = isStored;
+		
+		startPunishment();
+	}
+	
+	/**
+	 * @return affection value charId, account, ip, etc..
+	 */
+	public Object getKey() {
+		return _key;
+	}
+	
+	/**
+	 * @return {@link PunishmentAffect} affection type, account, character, ip, etc..
+	 */
+	public PunishmentAffect getAffect() {
+		return _affect;
+	}
+	
+	/**
+	 * @return {@link PunishmentType} type of current punishment.
+	 */
+	public PunishmentType getType() {
+		return _type;
+	}
+	
+	/**
+	 * @return milliseconds to the end of the current punishment, -1 for infinity.
+	 */
+	public final long getExpirationTime() {
+		return _expirationTime;
+	}
+	
+	/**
+	 * @return the reason for this punishment.
+	 */
+	public String getReason() {
+		return _reason;
+	}
+	
+	/**
+	 * @return name of the punishment issuer.
+	 */
+	public String getPunishedBy() {
+		return _punishedBy;
+	}
+	
+	/**
+	 * @return {@code true} if current punishment task is stored in database, {@code false} otherwise.
+	 */
+	public boolean isStored() {
+		return _isStored;
+	}
+	
+	/**
+	 * @return {@code true} if current punishment task has expired, {@code false} otherwise.
+	 */
+	public final boolean isExpired() {
+		return (_expirationTime > 0) && (System.currentTimeMillis() > _expirationTime);
+	}
+	
+	/**
+	 * Activates the punishment task.
+	 */
+	private void startPunishment() {
+		if (isExpired()) {
+			return;
+		}
+		
+		onStart();
+		if (_expirationTime > 0) // Has expiration?
+		{
+			_task = ThreadPoolManager.getInstance().scheduleGeneral(this, (_expirationTime - System.currentTimeMillis()));
+		}
+	}
+	
+	/**
+	 * Stops the punishment task.
+	 */
+	public final void stopPunishment() {
+		abortTask();
+		onEnd();
+	}
+	
+	/**
+	 * Aborts the scheduled task.
+	 */
+	private void abortTask() {
+		if (_task != null) {
+			if (!_task.isCancelled() && !_task.isDone()) {
+				_task.cancel(false);
+			}
+			_task = null;
+		}
+	}
+	
+	/**
+	 * Store and activate punishment upon start.
+	 */
+	private void onStart() {
+		if (!_isStored) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(INSERT_QUERY, RETURN_GENERATED_KEYS)) {
+				ps.setString(1, _key);
+				ps.setString(2, _affect.name());
+				ps.setString(3, _type.name());
+				ps.setLong(4, _expirationTime);
+				ps.setString(5, _reason);
+				ps.setString(6, _punishedBy);
+				ps.execute();
+				try (var rs = ps.getGeneratedKeys()) {
+					if (rs.next()) {
+						_id = rs.getInt(1);
+					}
+				}
+				_isStored = true;
+			} catch (Exception e) {
+				LOG.warn("Couldn't store punishment task for: {} {}", _affect, _key, e);
+			}
+		}
+		
+		final IPunishmentHandler handler = PunishmentHandler.getInstance().getHandler(_type);
+		if (handler != null) {
+			handler.onStart(this);
+		}
+	}
+	
+	/**
+	 * Remove and deactivate punishment when it ends.
+	 */
+	private void onEnd() {
+		if (_isStored) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var ps = con.prepareStatement(UPDATE_QUERY)) {
+				ps.setLong(1, System.currentTimeMillis());
+				ps.setLong(2, _id);
+				ps.execute();
+			} catch (Exception e) {
+				LOG.warn("Couldn't update punishment task for: {} {} id: {}", _affect, _key, _id, e);
+			}
+		}
+		
+		final IPunishmentHandler handler = PunishmentHandler.getInstance().getHandler(_type);
+		if (handler != null) {
+			handler.onEnd(this);
+		}
+	}
+	
+	/**
+	 * Runs when punishment task ends in order to stop and remove it.
+	 */
+	@Override
+	public final void run() {
+		PunishmentManager.getInstance().stopPunishment(_key, _affect, _type);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentType.java b/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentType.java
new file mode 100644
index 00000000..2906b956
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/punishment/PunishmentType.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.punishment;
+
+/**
+ * @author UnAfraid
+ */
+public enum PunishmentType {
+	BAN,
+	CHAT_BAN,
+	PARTY_BAN,
+	JAIL;
+	
+	public static PunishmentType getByName(String name) {
+		for (PunishmentType type : values()) {
+			if (type.name().equalsIgnoreCase(name)) {
+				return type;
+			}
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/quest/Event.java b/src/main/java/com/l2jserver/gameserver/model/quest/Event.java
new file mode 100644
index 00000000..4d1cb155
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/quest/Event.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Abstract event class.
+ * @author JIV
+ */
+public abstract class Event extends Quest {
+	public abstract boolean eventStart(L2PcInstance eventMaker);
+	
+	public abstract boolean eventStop();
+	
+	public abstract boolean eventBypass(L2PcInstance activeChar, String bypass);
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/quest/Quest.java b/src/main/java/com/l2jserver/gameserver/model/quest/Quest.java
new file mode 100644
index 00000000..e74874df
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/quest/Quest.java
@@ -0,0 +1,2364 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.events.EventType.ATTACKABLE_AGGRO_RANGE_ENTER;
+import static com.l2jserver.gameserver.model.events.EventType.ATTACKABLE_ATTACK;
+import static com.l2jserver.gameserver.model.events.EventType.ATTACKABLE_KILL;
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ZONE_ENTER;
+import static com.l2jserver.gameserver.model.events.EventType.CREATURE_ZONE_EXIT;
+import static com.l2jserver.gameserver.model.events.EventType.FACTION_CALL;
+import static com.l2jserver.gameserver.model.events.EventType.ITEM_BYPASS;
+import static com.l2jserver.gameserver.model.events.EventType.ITEM_TALK;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_CREATURE_SEE;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MANOR_BYPASS;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MOVE_FINISHED;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MOVE_NODE_ARRIVED;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_MOVE_ROUTE_FINISHED;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_SKILL_FINISHED;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_SKILL_SEE;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_SPAWN;
+import static com.l2jserver.gameserver.model.events.EventType.NPC_TELEPORT;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LEARN_SKILL_REQUESTED;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_LOGIN;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_MENU_SELECTED;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_QUEST_ACCEPTED;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_SKILL_LEARNED;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TELEPORT_REQUEST;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL_CLIENT_EVENT;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL_CMD;
+import static com.l2jserver.gameserver.model.events.EventType.PLAYER_TUTORIAL_QUESTION_MARK;
+import static com.l2jserver.gameserver.model.events.EventType.TRAP_ACTION;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.GLOBAL;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.ITEM;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.NPC;
+import static com.l2jserver.gameserver.model.events.ListenerRegisterType.ZONE;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+import java.util.function.Predicate;
+import java.util.stream.IntStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.commons.util.Util;
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.IAudio;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.events.AbstractScript;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureZoneEnter;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureZoneExit;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcCreatureSee;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcEventReceived;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcManorBypass;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveNodeArrived;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcMoveRouteFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillFinished;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSkillSee;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcSpawn;
+import com.l2jserver.gameserver.model.events.impl.character.npc.NpcTeleport;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAggroRangeEnter;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableAttack;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.AttackableKill;
+import com.l2jserver.gameserver.model.events.impl.character.npc.attackable.FactionCall;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLearnSkillRequested;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerLogin;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerMenuSelected;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerOneSkillSelected;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerQuestAccepted;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSkillLearned;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTeleportRequest;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorial;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialClientEvent;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialCmd;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialQuestionMark;
+import com.l2jserver.gameserver.model.events.impl.character.trap.OnTrapAction;
+import com.l2jserver.gameserver.model.events.impl.item.ItemBypass;
+import com.l2jserver.gameserver.model.events.impl.item.ItemTalk;
+import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.olympiad.CompetitionType;
+import com.l2jserver.gameserver.model.olympiad.Participant;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.NpcQuestHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.TutorialShowHtml;
+import com.l2jserver.gameserver.scripting.ScriptManager;
+
+/**
+ * Quest main class.
+ * @author Luis Arias
+ * @author Zoey76
+ */
+public class Quest extends AbstractScript implements IIdentifiable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Quest.class);
+	
+	/** Map containing lists of timers from the name of the timer. */
+	private volatile Map<String, List<QuestTimer>> _questTimers = null;
+	
+	private final ReentrantReadWriteLock _rwLock = new ReentrantReadWriteLock();
+	
+	private final WriteLock _writeLock = _rwLock.writeLock();
+	
+	private final ReadLock _readLock = _rwLock.readLock();
+	
+	/** Map containing all the start conditions. */
+	private volatile Map<Predicate<L2PcInstance>, String> _startCondition = null;
+	
+	private final int _questId;
+	private final String _name;
+	private final byte _initialState = State.CREATED;
+	protected boolean _onEnterWorld = false;
+	private final String customName;
+	
+	private int[] _questItemIds = null;
+	
+	private static final String DEFAULT_NO_QUEST_MSG = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>";
+	private static final String DEFAULT_ALREADY_COMPLETED_MSG = "<html><body>This quest has already been completed.</body></html>";
+	
+	private static final String QUEST_DELETE_FROM_CHAR_QUERY = "DELETE FROM character_quests WHERE charId=? AND name=?";
+	private static final String QUEST_DELETE_FROM_CHAR_QUERY_NON_REPEATABLE_QUERY = "DELETE FROM character_quests WHERE charId=? AND name=? AND var!=?";
+	
+	private static final int RESET_HOUR = 6;
+	private static final int RESET_MINUTES = 30;
+	
+	/**
+	 * Script constructor.
+	 */
+	public Quest() {
+		this(-1);
+	}
+	
+	/**
+	 * Quest constructor.
+	 * @param id the ID of the quest
+	 */
+	public Quest(int id) {
+		this(id, null);
+	}
+	
+	/**
+	 * Custom quest constructor.
+	 * @param id the ID of the quest
+	 */
+	public Quest(int id, String customName) {
+		_questId = id;
+		_name = getClass().getSimpleName();
+		this.customName = customName;
+		if (id > 0) {
+			QuestManager.getInstance().addQuest(this);
+		} else {
+			QuestManager.getInstance().addScript(this);
+		}
+		
+		loadGlobalData();
+	}
+	
+	/**
+	 * Gets the reset hour for a daily quest.
+	 * @return the reset hour
+	 */
+	public int getResetHour() {
+		return RESET_HOUR;
+	}
+	
+	/**
+	 * Gets the reset minutes for a daily quest.
+	 * @return the reset minutes
+	 */
+	public int getResetMinutes() {
+		return RESET_MINUTES;
+	}
+	
+	/**
+	 * This method is, by default, called by the constructor of all scripts.<br>
+	 * Children of this class can implement this function in order to define what variables to load and what structures to save them in.<br>
+	 * By default, nothing is loaded.
+	 */
+	protected void loadGlobalData() {
+		
+	}
+	
+	/**
+	 * The function saveGlobalData is, by default, called at shutdown, for all quests, by the QuestManager.<br>
+	 * Children of this class can implement this function in order to convert their structures<br>
+	 * into <var, value> tuples and make calls to save them to the database, if needed.<br>
+	 * By default, nothing is saved.
+	 */
+	public void saveGlobalData() {
+		
+	}
+	
+	/**
+	 * Gets the quest ID.
+	 * @return the quest ID
+	 */
+	@Override
+	public int getId() {
+		return _questId;
+	}
+	
+	/**
+	 * Add a new quest state of this quest to the database.
+	 * @param player the owner of the newly created quest state
+	 * @return the newly created {@link QuestState} object
+	 */
+	public QuestState newQuestState(L2PcInstance player) {
+		return new QuestState(this, player, _initialState);
+	}
+	
+	/**
+	 * Get the specified player's {@link QuestState} object for this quest.<br>
+	 * If the player does not have it and initIfNode is {@code true},<br>
+	 * create a new QuestState object and return it, otherwise return {@code null}.
+	 * @param player the player whose QuestState to get
+	 * @param initIfNone if true and the player does not have a QuestState for this quest,<br>
+	 *            create a new QuestState
+	 * @return the QuestState object for this quest or null if it doesn't exist
+	 */
+	public QuestState getQuestState(L2PcInstance player, boolean initIfNone) {
+		final QuestState qs = player.getQuestState(_name);
+		if ((qs != null) || !initIfNone) {
+			return qs;
+		}
+		return newQuestState(player);
+	}
+	
+	/**
+	 * @return the initial state of the quest
+	 */
+	public byte getInitialState() {
+		return _initialState;
+	}
+	
+	@Override
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Add a timer to the quest (if it doesn't exist already) and start it.
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, L2Npc, L2PcInstance)})
+	 * @param time time in ms for when to fire the timer
+	 * @param npc the npc associated with this timer (can be null)
+	 * @param player the player associated with this timer (can be null)
+	 * @see #startQuestTimer(String, long, L2Npc, L2PcInstance, boolean)
+	 */
+	public void startQuestTimer(String name, long time, L2Npc npc, L2PcInstance player) {
+		startQuestTimer(name, time, npc, player, false);
+	}
+	
+	/**
+	 * Gets the quest timers.
+	 * @return the quest timers
+	 */
+	public final Map<String, List<QuestTimer>> getQuestTimers() {
+		var questTimers = _questTimers;
+		if (questTimers == null) {
+			synchronized (this) {
+				questTimers = _questTimers;
+				if (questTimers == null) {
+					_questTimers = questTimers = new ConcurrentHashMap<>(1);
+				}
+			}
+		}
+		return questTimers;
+	}
+	
+	/**
+	 * Add a timer to the quest (if it doesn't exist already) and start it.
+	 * @param name the name of the timer (also passed back as "event" in {@link #onEvent(String, L2Npc, L2PcInstance)})
+	 * @param time time in ms for when to fire the timer
+	 * @param npc the npc associated with this timer (can be null)
+	 * @param player the player associated with this timer (can be null)
+	 * @param repeating indicates whether the timer is repeatable or one-time.<br>
+	 *            If {@code true}, the task is repeated every {@code time} milliseconds until explicitly stopped.
+	 */
+	public void startQuestTimer(String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) {
+		final List<QuestTimer> timers = getQuestTimers().computeIfAbsent(name, _ -> new ArrayList<>(1));
+		// if there exists a timer with this name, allow the timer only if the [npc, player] set is unique
+		// nulls act as wildcards
+		if (getQuestTimer(name, npc, player) == null) {
+			_writeLock.lock();
+			try {
+				timers.add(new QuestTimer(this, name, time, npc, player, repeating));
+			} finally {
+				_writeLock.unlock();
+			}
+		}
+	}
+	
+	/**
+	 * Get a quest timer that matches the provided name and parameters.
+	 * @param name the name of the quest timer to get
+	 * @param npc the NPC associated with the quest timer to get
+	 * @param player the player associated with the quest timer to get
+	 * @return the quest timer that matches the specified parameters or {@code null} if nothing was found
+	 */
+	public QuestTimer getQuestTimer(String name, L2Npc npc, L2PcInstance player) {
+		if (_questTimers == null) {
+			return null;
+		}
+		
+		final List<QuestTimer> timers = getQuestTimers().get(name);
+		if (timers != null) {
+			_readLock.lock();
+			try {
+				for (QuestTimer timer : timers) {
+					if (timer != null) {
+						if (timer.isMatch(this, name, npc, player)) {
+							return timer;
+						}
+					}
+				}
+			} finally {
+				_readLock.unlock();
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Cancel all quest timers with the specified name.
+	 * @param name the name of the quest timers to cancel
+	 */
+	public void cancelQuestTimers(String name) {
+		if (_questTimers == null) {
+			return;
+		}
+		
+		final List<QuestTimer> timers = getQuestTimers().get(name);
+		if (timers != null) {
+			_writeLock.lock();
+			try {
+				for (QuestTimer timer : timers) {
+					if (timer != null) {
+						timer.cancel();
+					}
+				}
+				timers.clear();
+			} finally {
+				_writeLock.unlock();
+			}
+		}
+	}
+	
+	/**
+	 * Cancel the quest timer that matches the specified name and parameters.
+	 * @param name the name of the quest timer to cancel
+	 * @param npc the NPC associated with the quest timer to cancel
+	 * @param player the player associated with the quest timer to cancel
+	 */
+	public void cancelQuestTimer(String name, L2Npc npc, L2PcInstance player) {
+		final QuestTimer timer = getQuestTimer(name, npc, player);
+		if (timer != null) {
+			timer.cancelAndRemove();
+		}
+	}
+	
+	/**
+	 * Remove a quest timer from the list of all timers.<br>
+	 * Note: does not stop the timer itself!
+	 * @param timer the {@link QuestState} object to remove
+	 */
+	public void removeQuestTimer(QuestTimer timer) {
+		if ((timer != null) && (_questTimers != null)) {
+			final List<QuestTimer> timers = getQuestTimers().get(timer.getName());
+			if (timers != null) {
+				_writeLock.lock();
+				try {
+					timers.remove(timer);
+				} finally {
+					_writeLock.unlock();
+				}
+			}
+		}
+	}
+	
+	// These are methods to call within the core to call the quest events.
+	
+	/**
+	 * Notify Event.
+	 * @param event the event
+	 * @param npc the NPC
+	 * @param player the player
+	 */
+	public final void notifyEvent(String event, L2Npc npc, L2PcInstance player) {
+		try {
+			final var result = onEvent(event, npc, player);
+			showResult(player, result, npc);
+		} catch (Exception ex) {
+			showError(player, ex);
+		}
+	}
+	
+	/**
+	 * Notify Talk event.
+	 * @param npc the npc
+	 * @param player the player
+	 */
+	public final void notifyTalk(L2Npc npc, L2PcInstance player) {
+		try {
+			String result;
+			final var startConditionHtml = getStartConditionHtml(player);
+			if (!player.hasQuestState(_name) && (startConditionHtml != null)) {
+				result = startConditionHtml;
+			} else {
+				result = onTalk(npc, player);
+			}
+			player.setLastQuestNpcObject(npc.getObjectId());
+			showResult(player, result, npc);
+		} catch (Exception ex) {
+			showError(player, ex);
+		}
+	}
+	
+	/**
+	 * Notify First Talk event.<br>
+	 * Overrides the default NPC dialogs when a quest defines this for the given NPC.<br>
+	 * Note: If the default html for this npc needs to be shown, onFirstTalk should call npc.showChatWindow(player) and then return null.
+	 * @param npc the NPC whose dialogs to override
+	 * @param player the player talking to the NPC
+	 */
+	public final void notifyFirstTalk(L2Npc npc, L2PcInstance player) {
+		try {
+			final var result = onFirstTalk(npc, player);
+			showResult(player, result, npc);
+		} catch (Exception ex) {
+			showError(player, ex);
+		}
+	}
+	
+	// These are methods that java calls to invoke scripts.
+	
+	/**
+	 * On Attack event triggered when a player attacks an NPC.
+	 * @param npc the NPC
+	 * @param attacker the attacker player
+	 * @param damage the inflicted to the NPC
+	 * @param isSummon {@code true} if the attacker is a summon
+	 */
+	public void onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon) {
+		
+	}
+	
+	/**
+	 * On Attack event triggered when a player attacks an NPC.
+	 * @param npc the NPC
+	 * @param attacker the attacker player
+	 * @param damage the inflicted to the NPC
+	 * @param isSummon {@code true} if the attacker is a summon
+	 * @param skill the skill used to attack, if any
+	 */
+	public void onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon, Skill skill) {
+		onAttack(npc, attacker, damage, isSummon);
+	}
+	
+	/**
+	 * This function is called whenever an <b>exact instance</b> of a character who was previously registered for this event dies.<br>
+	 * The registration for {@link #onDeath(L2Character, L2Character, QuestState)} events <b>is not</b> done via the quest itself, but it is instead handled by the QuestState of a particular player.
+	 * @param killer this parameter contains a reference to the exact instance of the NPC that <b>killed</b> the character.
+	 * @param victim this parameter contains a reference to the exact instance of the character that got killed.
+	 * @param qs this parameter contains a reference to the QuestState of whomever was interested (waiting) for this kill.
+	 */
+	public void onDeath(L2Character killer, L2Character victim, QuestState qs) {
+		onEvent("", ((killer instanceof L2Npc) ? ((L2Npc) killer) : null), qs.getPlayer());
+	}
+	
+	/**
+	 * This function is called whenever a player clicks on a link in a quest dialog and whenever a timer fires.
+	 * @param event this parameter contains a string identifier for the event.<br>
+	 *            Generally, this string is passed directly via the link.<br>
+	 *            For example:<br>
+	 *            <code>
+	 *            &lt;a action="bypass -h Quest 626_ADarkTwilight 31517-01.htm"&gt;hello&lt;/a&gt;
+	 *            </code><br>
+	 *            The above link sets the event variable to "31517-01.htm" for the quest 626_ADarkTwilight.<br>
+	 *            In the case of timers, this will be the name of the timer.<br>
+	 *            This parameter serves as a sort of identifier.
+	 * @param npc this parameter contains a reference to the instance of NPC associated with this event.<br>
+	 *            This may be the NPC registered in a timer, or the NPC with whom a player is speaking, etc.<br>
+	 *            This parameter may be {@code null} in certain circumstances.
+	 * @param player this parameter contains a reference to the player participating in this function.<br>
+	 *            It may be the player speaking to the NPC, or the player who caused a timer to start (and owns that timer).<br>
+	 *            This parameter may be {@code null} in certain circumstances.
+	 * @return the text returned by the event (maybe {@code null}, a filename or just text)
+	 */
+	public String onEvent(String event, L2Npc npc, L2PcInstance player) {
+		return null;
+	}
+	
+	/**
+	 * On Kill event triggered when a player kills a NPC.
+	 * @param npc the NPC
+	 * @param player the player
+	 * @param isSummon if {@code true} the killer is the summon
+	 */
+	public void onKill(L2Npc npc, L2PcInstance player, boolean isSummon) {
+		
+	}
+	
+	/**
+	 * This function is called whenever a player clicks to the "Quest" link of an NPC that is registered for the quest.
+	 * @param npc this parameter contains a reference to the exact instance of the NPC that the player is talking with.
+	 * @param talker this parameter contains a reference to the exact instance of the player who is talking to the NPC.
+	 * @return the text returned by the event (maybe {@code null}, a filename or just text)
+	 */
+	public String onTalk(L2Npc npc, L2PcInstance talker) {
+		return null;
+	}
+	
+	/**
+	 * This function is called whenever a player talks to an NPC that is registered for the quest.<br>
+	 * That is, it is triggered from the very first click on the NPC, not via another dialog.<br>
+	 * <b>Note 1:</b><br>
+	 * Each NPC can be registered to at most one quest for triggering this function.<br>
+	 * In other words, the same one NPC cannot respond to an "onFirstTalk" request from two different quests.<br>
+	 * Attempting to register an NPC in two different quests for this function will result in one of the two registration being ignored.<br>
+	 * <b>Note 2:</b><br>
+	 * Since a Quest link isn't clicked in order to reach this, a quest state can be invalid within this function.<br>
+	 * The coder of the script may need to create a new quest state (if necessary).<br>
+	 * <b>Note 3:</b><br>
+	 * The returned value of onFirstTalk replaces the default HTML that would have otherwise been loaded from a sub-folder of DatapackRoot/game/data/html/.<br>
+	 * If you wish to show the default HTML, within onFirstTalk do npc.showChatWindow(player) and then return ""<br>
+	 * @param npc this parameter contains a reference to the exact instance of the NPC that the player is talking with.
+	 * @param player this parameter contains a reference to the exact instance of the player who is talking to the NPC.
+	 * @return the text returned by the event (maybe {@code null}, a filename or just text)
+	 */
+	public String onFirstTalk(L2Npc npc, L2PcInstance player) {
+		return null;
+	}
+	
+	/**
+	 * On Item Talk event triggered when an item bypass is called.
+	 * @param event the event
+	 */
+	public void onItemTalk(ItemTalk event) {
+		
+	}
+	
+	/**
+	 * On Item event.
+	 * @param event the event
+	 */
+	public void onItemEvent(ItemBypass event) {
+		
+	}
+	
+	/**
+	 * On Menu Selected event.
+	 * @param event the event
+	 */
+	public void onMenuSelected(PlayerMenuSelected event) {
+		
+	}
+	
+	/**
+	 * On Manor Menu Selected event.
+	 * @param event the event
+	 */
+	public void onManorMenuSelected(NpcManorBypass event) {
+		
+	}
+	
+	/**
+	 * On Quest Accepted event.
+	 * @param event the event
+	 */
+	public void onQuestAccepted(PlayerQuestAccepted event) {
+		
+	}
+	
+	/**
+	 * On Learn Skill Requested event.
+	 * @param event the event
+	 */
+	public void onLearnSkillRequested(PlayerLearnSkillRequested event) {
+		
+	}
+	
+	/**
+	 * On One Skill Selected event.
+	 * @param event the event
+	 */
+	public void onOneSkillSelected(PlayerOneSkillSelected event) {
+		
+	}
+	
+	/**
+	 * On Skill Learned event.
+	 * @param event the event
+	 */
+	public void onSkillLearned(PlayerSkillLearned event) {
+		
+	}
+	
+	/**
+	 * On Teleport Request event
+	 */
+	public void onTeleportRequest(PlayerTeleportRequest event) {
+		
+	}
+	
+	/**
+	 * This function is called whenever a player uses a quest item that has a quest events list.<br>
+	 * TODO: complete this documentation and unhardcode it to work with all item uses not with those listed.
+	 * @param item the quest item that the player used
+	 * @param player the player who used the item
+	 */
+	public void onItemUse(L2Item item, L2PcInstance player) {
+		
+	}
+	
+	/**
+	 * This function is called whenever a player casts a skill near a registered NPC (1000 distance).<br>
+	 * <b>Note:</b><br>
+	 * If a skill does damage, both onSkillSee(..) and onAttack(..) will be triggered for the damaged NPC!<br>
+	 * However, only onSkillSee(..) will be triggered if the skill does no damage,<br>
+	 * or if it damages an NPC who has no onAttack(..) registration while near another NPC who has an onSkillSee registration.<br>
+	 * TODO: confirm if the distance is 1000 and unhardcode.
+	 * @param npc the NPC that saw the skill
+	 * @param caster the player who cast the skill
+	 * @param skill the actual skill that was used
+	 * @param targets an array of all objects (can be any type of object, including mobs and players) that were affected by the skill
+	 * @param isSummon if {@code true}, the skill was actually cast by the player's summon, not the player himself
+	 */
+	public void onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, List<L2Object> targets, boolean isSummon) {
+		
+	}
+	
+	/**
+	 * On Spell Finished event triggered when an NPC finishes casting a skill.
+	 * @param event the event
+	 */
+	public void onSpellFinished(NpcSkillFinished event) {
+		
+	}
+	
+	/**
+	 * On Trap Action event triggered when a trap action is triggered.
+	 * @param event the event
+	 */
+	public void onTrapAction(OnTrapAction event) {
+		
+	}
+	
+	/**
+	 * This function is called whenever an NPC spawns or re-spawns and passes a reference to the newly (re)spawned NPC.<br>
+	 * It is useful for initializations, starting quest timers, displaying chat (NpcSay), and more.
+	 * @param npc the npc
+	 */
+	public void onSpawn(L2Npc npc) {
+		
+	}
+	
+	/**
+	 * This function is called whenever an NPC is teleport.
+	 * @param npc the npc
+	 */
+	protected void onTeleport(L2Npc npc) {
+		
+	}
+	
+	/**
+	 * On Faction Call event triggered when an NPC ask for help.
+	 * @param event the event
+	 */
+	public void onFactionCall(FactionCall event) {
+		
+	}
+	
+	/**
+	 * On Aggro Range Enter event triggered when a player enters an NPC aggression range.
+	 * @param event the event
+	 */
+	public void onAggroRangeEnter(AttackableAggroRangeEnter event) {
+		
+	}
+	
+	/**
+	 * On See Creature event is triggered when an NPC sees a creature.
+	 * @param npc the NPC who sees the creature
+	 * @param creature the creature seen by the NPC
+	 */
+	public void onSeeCreature(L2Npc npc, L2Character creature) {
+		
+	}
+	
+	/**
+	 * On Enter World event is triggered when a player enters the game.
+	 * @param player the player who is entering the world
+	 */
+	public void onEnterWorld(L2PcInstance player) {
+		
+	}
+	
+	/**
+	 * On Tutorial Event is triggered by a tutorial event and the associated command.
+	 * @param player the player who triggered the tutorial event
+	 * @param command the command associated with the tutorial event
+	 */
+	public void onTutorialEvent(L2PcInstance player, String command) {
+		
+	}
+	
+	/**
+	 * On Tutorial Client Event is triggered by a tutorial event and the associated client event.
+	 * @param player the player who triggered the tutorial client event
+	 * @param event the client event associated with the tutorial
+	 */
+	public void onTutorialClientEvent(L2PcInstance player, int event) {
+		
+	}
+	
+	/**
+	 * On Tutorial Question Mark event is triggered when a tutorial question mark appears for the player.
+	 * @param player the player who sees the tutorial question mark
+	 * @param number the identifier of the tutorial question mark
+	 */
+	public void onTutorialQuestionMark(L2PcInstance player, int number) {
+		
+	}
+	
+	/**
+	 * On Tutorial Command event is triggered when a tutorial command is entered by the player.
+	 * @param player the player who entered the tutorial command
+	 * @param command the command entered by the player
+	 */
+	public void onTutorialCmd(L2PcInstance player, String command) {
+		
+	}
+	
+	/**
+	 * On Enter Zone event is triggered when a character enters a registered zone.
+	 * @param creature the character entering the zone
+	 * @param zoneType the zone that the character is entering
+	 */
+	public void onEnterZone(L2Character creature, L2ZoneType zoneType) {
+		
+	}
+	
+	/**
+	 * On Exit Zone event is triggered when a character exits a registered zone.
+	 * @param creature the character exiting the zone
+	 * @param zoneType the zone that the character is exiting
+	 */
+	public void onExitZone(L2Character creature, L2ZoneType zoneType) {
+		
+	}
+	
+	/**
+	 * On Event Received event is triggered when an event is received by the NPC.
+	 * @param event the event received
+	 */
+	public void onEventReceived(NpcEventReceived event) {
+		
+	}
+	
+	/**
+	 * On Olympiad Match Finish event is triggered when a player wins an Olympiad Game.
+	 * @param winner the player who won the match
+	 * @param loser the player who lost the match
+	 * @param type the competition type
+	 */
+	public void onOlympiadMatchFinish(Participant winner, Participant loser, CompetitionType type) {
+		
+	}
+	
+	/**
+	 * On Olympiad Lose event is triggered when a player loses an Olympiad Game.
+	 * @param loser the player who lost the match
+	 * @param type the competition type
+	 */
+	public void onOlympiadLose(L2PcInstance loser, CompetitionType type) {
+		
+	}
+	
+	/**
+	 * On Move Finished event is triggered when an NPC finishes moving.
+	 * @param npc the NPC who finished moving
+	 */
+	public void onMoveFinished(L2Npc npc) {
+		
+	}
+	
+	/**
+	 * On Node Arrived event is triggered when a walker NPC arrives at a walking node.
+	 * @param npc the NPC who arrived at the node
+	 */
+	public void onNodeArrived(L2Npc npc) {
+		
+	}
+	
+	/**
+	 * On Route Finished event is triggered when a walker NPC finishes its route.
+	 * @param npc the NPC who finished its route
+	 */
+	public void onRouteFinished(L2Npc npc) {
+		
+	}
+	
+	/**
+	 * On NPC Hate event is triggered when an NPC determines if it can hate a playable.
+	 * @param mob the NPC who may hate the playable
+	 * @param player the player being considered for hate
+	 * @param isSummon whether the hate is on the summon
+	 * @return {@code true} if the NPC can hate the playable, {@code false} otherwise
+	 */
+	public boolean onNpcHate(L2Attackable mob, L2PcInstance player, boolean isSummon) {
+		return true;
+	}
+	
+	/**
+	 * On Summon Spawn event is triggered when a summon spawns.
+	 * @param summon the summon that spawned
+	 */
+	public void onSummonSpawn(L2Summon summon) {
+		
+	}
+	
+	/**
+	 * On Summon Talk event is triggered when a summon is being talked.
+	 * @param summon the summon that is talking
+	 */
+	public void onSummonTalk(L2Summon summon) {
+		
+	}
+	
+	/**
+	 * On Can See Me event is triggered when an NPC checks if it can see a player.
+	 * @param npc the NPC performing the check
+	 * @param player the player being checked
+	 * @return {@code true} if the NPC can see the player, {@code false} otherwise
+	 */
+	public boolean onCanSeeMe(L2Npc npc, L2PcInstance player) {
+		return false;
+	}
+	
+	/**
+	 * Show an error message to the specified player.
+	 * @param player the player to whom to send the error (must be a GM)
+	 * @param t the {@link Throwable} to get the message/stacktrace from
+	 * @return {@code false}
+	 */
+	public boolean showError(L2PcInstance player, Throwable t) {
+		LOG.warn("There has been an error on the script!", t);
+		if (t.getMessage() == null) {
+			LOG.warn(t.getMessage()); // TODO(Zoey76): Test and eventually remove it if duplicated.
+		}
+		if ((player != null) && player.getAccessLevel().isGm()) {
+			final var result = "<html><body><title>Script error</title>" + Util.getStackTrace(t) + "</body></html>";
+			return showResult(player, result, null);
+		}
+		return false;
+	}
+	
+	/**
+	 * Show a message to the specified player.<br>
+	 * <u><i>Concept:</i></u><br>
+	 * Three cases are managed according to the value of the {@code res} parameter:<br>
+	 * <ul>
+	 * <li><u>{@code res} ends with ".htm" or ".html":</u> the contents of the specified HTML file are shown in a dialog window</li>
+	 * <li><u>{@code res} starts with "&lt;html&gt;":</u> the contents of the parameter are shown in a dialog window</li>
+	 * <li><u>all other cases :</u> the text contained in the parameter is shown in chat</li>
+	 * </ul>
+	 * @param player the player to whom to show the result
+	 * @param npc npc to show the result for
+	 * @param res the message to show to the player
+	 * @return {@code false} if the message was sent, {@code true} otherwise
+	 */
+	protected boolean showResult(L2PcInstance player, String res, L2Npc npc) {
+		if ((res == null) || res.isEmpty() || (player == null)) {
+			return true;
+		}
+		
+		if (res.endsWith(".htm") || res.endsWith(".html")) {
+			showHtmlFile(player, res, npc);
+		} else if (res.startsWith("<html")) {
+			final NpcHtmlMessage npcReply = new NpcHtmlMessage(npc != null ? npc.getObjectId() : 0, res);
+			npcReply.replace("%playername%", player.getName());
+			player.sendPacket(npcReply);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+		} else {
+			player.sendMessage(res);
+		}
+		return false;
+	}
+	
+	/**
+	 * Loads all quest states and variables for the specified player.
+	 * @param player the player who is entering the world
+	 */
+	public static void playerEnter(L2PcInstance player) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var invalidQuestData = con.prepareStatement("DELETE FROM character_quests WHERE charId = ? AND name = ?");
+			var invalidQuestDataVar = con.prepareStatement("DELETE FROM character_quests WHERE charId = ? AND name = ? AND var = ?");
+			var ps1 = con.prepareStatement("SELECT name, value FROM character_quests WHERE charId = ? AND var = ?")) {
+			// Get list of quests owned by the player from database
+			
+			ps1.setInt(1, player.getObjectId());
+			ps1.setString(2, "<state>");
+			try (var rs = ps1.executeQuery()) {
+				while (rs.next()) {
+					// Get the ID of the quest and its state
+					final var questId = rs.getString("name");
+					final var statename = rs.getString("value");
+					
+					// Search quest associated with the ID
+					final var q = QuestManager.getInstance().getQuest(questId);
+					if (q == null) {
+						LOG.warn("Unknown quest {} for player {}!", questId, player);
+						if (general().autoDeleteInvalidQuestData()) {
+							invalidQuestData.setInt(1, player.getObjectId());
+							invalidQuestData.setString(2, questId);
+							invalidQuestData.executeUpdate();
+						}
+						continue;
+					}
+					
+					// Create a new QuestState for the player that will be added to the player's list of quests
+					new QuestState(q, player, State.getStateId(statename));
+				}
+			}
+			
+			// Get list of quests owned by the player from the DB in order to add variables used in the quest.
+			try (var ps2 = con.prepareStatement("SELECT name, var, value FROM character_quests WHERE charId = ? AND var <> ?")) {
+				ps2.setInt(1, player.getObjectId());
+				ps2.setString(2, "<state>");
+				try (var rs = ps2.executeQuery()) {
+					while (rs.next()) {
+						final var questId = rs.getString("name");
+						final var var = rs.getString("var");
+						final var value = rs.getString("value");
+						// Get the QuestState saved in the loop before
+						final var q = QuestManager.getInstance().getQuest(questId);
+						if (q == null) {
+							continue;
+						}
+						
+						final var qs = q.getQuestState(player, true);
+						if (qs == null) {
+							LOG.warn("Lost variable {} in quest {} for player {}!", var, questId, player.getName());
+							if (general().autoDeleteInvalidQuestData()) {
+								invalidQuestDataVar.setInt(1, player.getObjectId());
+								invalidQuestDataVar.setString(2, questId);
+								invalidQuestDataVar.setString(3, var);
+								invalidQuestDataVar.executeUpdate();
+							}
+							continue;
+						}
+						// Add parameter to the quest
+						qs.setInternal(var, value);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not insert char quest!", ex);
+		}
+		
+		// events
+		for (String name : QuestManager.getInstance().getScripts().keySet()) {
+			player.processQuestEvent(name, "enter");
+		}
+	}
+	
+	/**
+	 * Insert (or update) in the database variables that need to stay persistent for this quest after a reboot.<br>
+	 * This function is for storage of values that do not relate to a specific player but are global for all characters.<br>
+	 * For example, if we need to disable a quest-gatekeeper until a certain time (as is done with some grand-boss gatekeepers), we can save that time in the DB.
+	 * @param var the name of the variable to save
+	 * @param value the value of the variable
+	 */
+	public final void saveGlobalQuestVar(String var, String value) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("REPLACE INTO quest_global_data (quest_name,var,value) VALUES (?,?,?)")) {
+			ps.setString(1, getName());
+			ps.setString(2, var);
+			ps.setString(3, value);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not insert global quest variable!", ex);
+		}
+	}
+	
+	/**
+	 * Read from the database a previously saved variable for this quest.<br>
+	 * Due to performance considerations, this function should best be used only when the quest is first loaded.<br>
+	 * Subclasses of this class can define structures into which these loaded values can be saved.<br>
+	 * However, on-demand usage of this function throughout the script is not prohibited, only not recommended.<br>
+	 * Values read from this function were entered by calls to "saveGlobalQuestVar".
+	 * @param var the name of the variable to load
+	 * @return the current value of the specified variable, or an empty string if the variable does not exist
+	 */
+	public final String loadGlobalQuestVar(String var) {
+		String result = "";
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT value FROM quest_global_data WHERE quest_name = ? AND var = ?")) {
+			ps.setString(1, getName());
+			ps.setString(2, var);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					result = rs.getString(1);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not load global quest variable!", ex);
+		}
+		return result;
+	}
+	
+	/**
+	 * Permanently delete from the database a global quest variable that was previously saved for this quest.
+	 * @param var the name of the variable to delete
+	 */
+	public final void deleteGlobalQuestVar(String var) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ? AND var = ?")) {
+			ps.setString(1, getName());
+			ps.setString(2, var);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not delete global quest variable!", ex);
+		}
+	}
+	
+	/**
+	 * Permanently delete from the database all global quest variables that were previously saved for this quest.
+	 */
+	public final void deleteAllGlobalQuestVars() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ?")) {
+			ps.setString(1, getName());
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not delete global quest variables!", ex);
+		}
+	}
+	
+	/**
+	 * Insert in the database the quest for the player.
+	 * @param qs the {@link QuestState} object whose variable to insert
+	 * @param var the name of the variable
+	 * @param value the value of the variable
+	 */
+	public static void createQuestVarInDb(QuestState qs, String var, String value) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("INSERT INTO character_quests (charId,name,var,value) VALUES (?,?,?,?) ON DUPLICATE KEY UPDATE value=?")) {
+			ps.setInt(1, qs.getPlayer().getObjectId());
+			ps.setString(2, qs.getQuestName());
+			ps.setString(3, var);
+			ps.setString(4, value);
+			ps.setString(5, value);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not insert char quest!", ex);
+		}
+	}
+	
+	/**
+	 * Update the value of the variable "var" for the specified quest in database
+	 * @param qs the {@link QuestState} object whose variable to update
+	 * @param var the name of the variable
+	 * @param value the value of the variable
+	 */
+	public static void updateQuestVarInDb(QuestState qs, String var, String value) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE character_quests SET value=? WHERE charId=? AND name=? AND var = ?")) {
+			ps.setString(1, value);
+			ps.setInt(2, qs.getPlayer().getObjectId());
+			ps.setString(3, qs.getQuestName());
+			ps.setString(4, var);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not update char quest!", ex);
+		}
+	}
+	
+	/**
+	 * Delete a variable of player's quest from the database.
+	 * @param qs the {@link QuestState} object whose variable to delete
+	 * @param var the name of the variable to delete
+	 */
+	public static void deleteQuestVarInDb(QuestState qs, String var) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_quests WHERE charId=? AND name=? AND var=?")) {
+			ps.setInt(1, qs.getPlayer().getObjectId());
+			ps.setString(2, qs.getQuestName());
+			ps.setString(3, var);
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Could not delete char quest!", ex);
+		}
+	}
+	
+	/**
+	 * Delete from the database all variables and states of the specified quest state.
+	 * @param qs the {@link QuestState} object whose variables to delete
+	 * @param repeatable if {@code false}, the state variable will be preserved, otherwise it will be deleted as well
+	 */
+	public static void deleteQuestInDb(QuestState qs, boolean repeatable) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(repeatable ? QUEST_DELETE_FROM_CHAR_QUERY : QUEST_DELETE_FROM_CHAR_QUERY_NON_REPEATABLE_QUERY)) {
+			ps.setInt(1, qs.getPlayer().getObjectId());
+			ps.setString(2, qs.getQuestName());
+			if (!repeatable) {
+				ps.setString(3, "<state>");
+			}
+			ps.executeUpdate();
+		} catch (Exception ex) {
+			LOG.warn("Unable to delete char quest!", ex);
+		}
+	}
+	
+	/**
+	 * Create a database record for the specified quest state.
+	 * @param qs the {@link QuestState} object whose data to write in the database
+	 */
+	public static void createQuestInDb(QuestState qs) {
+		createQuestVarInDb(qs, "<state>", State.getStateName(qs.getState()));
+	}
+	
+	/**
+	 * Update a quest state record of the specified quest state in database.
+	 * @param qs the {@link QuestState} object whose data to update in the database
+	 */
+	public static void updateQuestInDb(QuestState qs) {
+		updateQuestVarInDb(qs, "<state>", State.getStateName(qs.getState()));
+	}
+	
+	/**
+	 * @param player the player whose language settings to use in finding the html of the right language
+	 * @return the default html for when no quest is available: "You are either not on a quest that involves this NPC.."
+	 */
+	public static String getNoQuestMsg(L2PcInstance player) {
+		final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/noquest.htm");
+		if ((result != null) && (result.length() > 0)) {
+			return result;
+		}
+		return DEFAULT_NO_QUEST_MSG;
+	}
+	
+	/**
+	 * @param player the player whose language settings to use in finding the html of the right language
+	 * @return the default html for when no quest is already completed: "This quest has already been completed."
+	 */
+	public static String getAlreadyCompletedMsg(L2PcInstance player) {
+		final String result = HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "data/html/alreadycompleted.htm");
+		if ((result != null) && !result.isEmpty()) {
+			return result;
+		}
+		return DEFAULT_ALREADY_COMPLETED_MSG;
+	}
+	
+	/**
+	 * Binds the NPCs to the start NPC event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindStartNpc(int... npcIds) {
+		setNpcQuestStartId(npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the start NPC event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindStartNpc(Collection<Integer> npcIds) {
+		setNpcQuestStartId(npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the first talk event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindFirstTalk(int... npcIds) {
+		setNpcFirstTalkId(event -> notifyFirstTalk(event.npc(), event.player()), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the first talk event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindFirstTalk(Collection<Integer> npcIds) {
+		setNpcFirstTalkId(event -> notifyFirstTalk(event.npc(), event.player()), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Menu Selected event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindMenuSelected(int... npcIds) {
+		registerConsumer((PlayerMenuSelected event) -> onMenuSelected(event), PLAYER_MENU_SELECTED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Manor Menu Selected event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindManorMenuSelected(int... npcIds) {
+		registerConsumer((NpcManorBypass event) -> onManorMenuSelected(event), NPC_MANOR_BYPASS, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Quest Accepted event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindQuestAccepted(int... npcIds) {
+		registerConsumer((PlayerQuestAccepted event) -> onQuestAccepted(event), PLAYER_QUEST_ACCEPTED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Learn Skill Requested event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindLearnSkillRequested(int... npcIds) {
+		registerConsumer((PlayerLearnSkillRequested event) -> onLearnSkillRequested(event), PLAYER_LEARN_SKILL_REQUESTED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Skill Learned event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSkillLearned(int... npcIds) {
+		registerConsumer((PlayerSkillLearned event) -> onSkillLearned(event), PLAYER_SKILL_LEARNED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Teleport Request event.
+	 */
+	public void bindTeleportRequest(int... npcIds) {
+		registerConsumer((PlayerTeleportRequest event) -> onTeleportRequest(event), PLAYER_TELEPORT_REQUEST, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the Item to the notify when player speaks with it.
+	 * @param itemIds the IDs of the Item
+	 */
+	public void bindItemBypass(int... itemIds) {
+		registerConsumer((ItemBypass event) -> onItemEvent(event), ITEM_BYPASS, ITEM, itemIds);
+	}
+	
+	/**
+	 * Binds the Item to the item bypass event.
+	 * @param itemIds the IDs of the Item
+	 */
+	public void bindItemBypass(Collection<Integer> itemIds) {
+		registerConsumer((ItemBypass event) -> onItemEvent(event), ITEM_BYPASS, ITEM, itemIds);
+	}
+	
+	/**
+	 * Binds the Item to the item talk event.
+	 * @param itemIds the IDs of the Item
+	 */
+	public void bindItemTalk(int... itemIds) {
+		registerConsumer((ItemTalk event) -> onItemTalk(event), ITEM_TALK, ITEM, itemIds);
+	}
+	
+	/**
+	 * Binds the Item to the item talk event.
+	 * @param itemIds the IDs of the Item
+	 */
+	public void addItemTalk(Collection<Integer> itemIds) {
+		registerConsumer((ItemTalk event) -> onItemTalk(event), ITEM_TALK, ITEM, itemIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Attack event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindAttack(int... npcIds) {
+		registerConsumer((AttackableAttack event) -> onAttack(event.target(), event.attacker(), event.damage(), event.isSummon(), event.skill()), ATTACKABLE_ATTACK, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Attack event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindAttack(Collection<Integer> npcIds) {
+		registerConsumer((AttackableAttack event) -> onAttack(event.target(), event.attacker(), event.damage(), event.isSummon(), event.skill()), ATTACKABLE_ATTACK, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Kill event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindKill(int... npcIds) {
+		registerConsumer((AttackableKill event) -> onKill(event.target(), event.attacker(), event.isSummon()), ATTACKABLE_KILL, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Kill event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindKill(Collection<Integer> npcIds) {
+		registerConsumer((AttackableKill event) -> onKill(event.target(), event.attacker(), event.isSummon()), ATTACKABLE_KILL, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Talk event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindTalk(int... npcIds) {
+		setNpcTalkId(npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Talk event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindTalk(Collection<Integer> npcIds) {
+		setNpcTalkId(npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Teleport event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindTeleport(int... npcIds) {
+		registerConsumer((NpcTeleport event) -> onTeleport(event.npc()), NPC_TELEPORT, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Teleport event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindTeleport(Collection<Integer> npcIds) {
+		registerConsumer((NpcTeleport event) -> onTeleport(event.npc()), NPC_TELEPORT, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Spawn event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSpawn(int... npcIds) {
+		registerConsumer((NpcSpawn event) -> onSpawn(event.npc()), NPC_SPAWN, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Spawn event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSpawn(Collection<Integer> npcIds) {
+		registerConsumer((NpcSpawn event) -> onSpawn(event.npc()), NPC_SPAWN, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Skill See event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSkillSee(int... npcIds) {
+		registerConsumer((NpcSkillSee event) -> onSkillSee(event.npc(), event.caster(), event.skill(), event.targets(), event.isSummon()), NPC_SKILL_SEE, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Skill See event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSkillSee(Collection<Integer> npcIds) {
+		registerConsumer((NpcSkillSee event) -> onSkillSee(event.npc(), event.caster(), event.skill(), event.targets(), event.isSummon()), NPC_SKILL_SEE, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Spell Finished event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSpellFinished(int... npcIds) {
+		registerConsumer((NpcSkillFinished event) -> onSpellFinished(event), NPC_SKILL_FINISHED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Spell Finished event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSpellFinished(Collection<Integer> npcIds) {
+		registerConsumer((NpcSkillFinished event) -> onSpellFinished(event), NPC_SKILL_FINISHED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Trap Action event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindTrapAction(int... npcIds) {
+		registerConsumer((OnTrapAction event) -> onTrapAction(event), TRAP_ACTION, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Trap Action event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindTrapAction(Collection<Integer> npcIds) {
+		registerConsumer((OnTrapAction event) -> onTrapAction(event), TRAP_ACTION, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Faction Call event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindFactionCall(int... npcIds) {
+		registerConsumer((FactionCall event) -> onFactionCall(event), FACTION_CALL, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Faction Call event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindFactionCall(Collection<Integer> npcIds) {
+		registerConsumer((FactionCall event) -> onFactionCall(event), FACTION_CALL, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Aggro Range Enter event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindAggroRangeEnter(int... npcIds) {
+		registerConsumer((AttackableAggroRangeEnter event) -> onAggroRangeEnter(event), ATTACKABLE_AGGRO_RANGE_ENTER, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Aggro Range Enter event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindAggroRangeEnter(Collection<Integer> npcIds) {
+		registerConsumer((AttackableAggroRangeEnter event) -> onAggroRangeEnter(event), ATTACKABLE_AGGRO_RANGE_ENTER, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the See Creature event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSeeCreature(int... npcIds) {
+		registerConsumer((NpcCreatureSee event) -> onSeeCreature(event.npc(), event.creature()), NPC_CREATURE_SEE, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the See Creature event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSeeCreature(Collection<Integer> npcIds) {
+		registerConsumer((NpcCreatureSee event) -> onSeeCreature(event.npc(), event.creature()), NPC_CREATURE_SEE, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the Zones to the Enter Zone event.
+	 * @param zoneIds the IDs of the zones
+	 */
+	public void bindEnterZone(int... zoneIds) {
+		registerConsumer((CreatureZoneEnter event) -> onEnterZone(event.creature(), event.zone()), CREATURE_ZONE_ENTER, ZONE, zoneIds);
+	}
+	
+	/**
+	 * Binds the Zones to the Enter Zone event.
+	 * @param zoneIds the IDs of the zones
+	 */
+	public void bindEnterZone(Collection<Integer> zoneIds) {
+		registerConsumer((CreatureZoneEnter event) -> onEnterZone(event.creature(), event.zone()), CREATURE_ZONE_ENTER, ZONE, zoneIds);
+	}
+	
+	/**
+	 * Binds the Zones to the Exit Zone event.
+	 * @param zoneIds the IDs of the zones
+	 */
+	public void bindExitZone(int... zoneIds) {
+		registerConsumer((CreatureZoneExit event) -> onExitZone(event.creature(), event.zone()), CREATURE_ZONE_EXIT, ZONE, zoneIds);
+	}
+	
+	/**
+	 * Binds the Zones to the Exit Zone event.
+	 * @param zoneIds the IDs of the zones
+	 */
+	public void bindExitZone(Collection<Integer> zoneIds) {
+		registerConsumer((CreatureZoneExit event) -> onExitZone(event.creature(), event.zone()), CREATURE_ZONE_EXIT, ZONE, zoneIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Event Received event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindEventReceived(int... npcIds) {
+		setNpcEventReceivedId(event -> onEventReceived(event), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Event Received event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindEventReceived(Collection<Integer> npcIds) {
+		setNpcEventReceivedId(event -> onEventReceived(event), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Move Finished event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindMoveFinished(int... npcIds) {
+		registerConsumer((NpcMoveFinished event) -> onMoveFinished(event.npc()), NPC_MOVE_FINISHED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Move Finished event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindMoveFinished(Collection<Integer> npcIds) {
+		registerConsumer((NpcMoveFinished event) -> onMoveFinished(event.npc()), NPC_MOVE_FINISHED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Node Arrived event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindNodeArrived(int... npcIds) {
+		registerConsumer((NpcMoveNodeArrived event) -> onNodeArrived(event.npc()), NPC_MOVE_NODE_ARRIVED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Node Arrived event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindNodeArrived(Collection<Integer> npcIds) {
+		registerConsumer((NpcMoveNodeArrived event) -> onNodeArrived(event.npc()), NPC_MOVE_NODE_ARRIVED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Route Finished event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindRouteFinished(int... npcIds) {
+		registerConsumer((NpcMoveRouteFinished event) -> onRouteFinished(event.npc()), NPC_MOVE_ROUTE_FINISHED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Route Finished event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindRouteFinished(Collection<Integer> npcIds) {
+		registerConsumer((NpcMoveRouteFinished event) -> onRouteFinished(event.npc()), NPC_MOVE_ROUTE_FINISHED, NPC, npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the NPC Hate event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindNpcHate(int... npcIds) {
+		addNpcHateId(event -> new TerminateReturn(!onNpcHate(event.npc(), event.player(), event.isSummon()), false, false), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the NPC Hate event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindNpcHate(Collection<Integer> npcIds) {
+		addNpcHateId(event -> new TerminateReturn(!onNpcHate(event.npc(), event.player(), event.isSummon()), false, false), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Summon Spawn event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSummonSpawn(int... npcIds) {
+		setPlayerSummonSpawnId(event -> onSummonSpawn(event.summon()), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Summon Spawn event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSummonSpawn(Collection<Integer> npcIds) {
+		setPlayerSummonSpawnId(event -> onSummonSpawn(event.summon()), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Summon Talk event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSummonTalk(int... npcIds) {
+		setPlayerSummonTalkId(event -> onSummonTalk(event.summon()), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Summon Talk event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindSummonTalk(Collection<Integer> npcIds) {
+		setPlayerSummonTalkId(event -> onSummonTalk(event.summon()), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Can See Me event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindCanSeeMe(int... npcIds) {
+		addNpcHateId(event -> new TerminateReturn(!onCanSeeMe(event.npc(), event.player()), false, false), npcIds);
+	}
+	
+	/**
+	 * Binds the NPCs to the Can See Me event.
+	 * @param npcIds the IDs of the NPCs
+	 */
+	public void bindCanSeeMe(Collection<Integer> npcIds) {
+		addNpcHateId(event -> new TerminateReturn(!onCanSeeMe(event.npc(), event.player()), false, false), npcIds);
+	}
+	
+	/**
+	 * Binds the Quest to the Olympiad Match Finish event.
+	 */
+	public void bindOlympiadMatchFinish() {
+		setOlympiadMatchResult(event -> onOlympiadMatchFinish(event.winner(), event.loser(), event.competitionType()));
+	}
+	
+	public void setOnEnterWorld(boolean state) {
+		if (state) {
+			registerConsumer((PlayerLogin event) -> onEnterWorld(event.player()), PLAYER_LOGIN, GLOBAL);
+		} else {
+			getListeners().stream().filter(listener -> listener.getType() == PLAYER_LOGIN).forEach(AbstractEventListener::unregisterMe);
+		}
+	}
+	
+	/**
+	 * Binds the Quest to the Tutorial event.
+	 */
+	public void bindTutorial() {
+		registerConsumer((PlayerTutorial event) -> onTutorialEvent(event.player(), event.command()), PLAYER_TUTORIAL, GLOBAL);
+	}
+	
+	/**
+	 * Binds the Quest to the Tutorial Client event.
+	 */
+	public void bindTutorialClient() {
+		registerConsumer((PlayerTutorialClientEvent event) -> onTutorialClientEvent(event.player(), event.event()), PLAYER_TUTORIAL_CLIENT_EVENT, GLOBAL);
+	}
+	
+	/**
+	 * Binds the Quest to the Tutorial Question Mark event.
+	 */
+	public void bindTutorialQuestionMark() {
+		registerConsumer((PlayerTutorialQuestionMark event) -> onTutorialQuestionMark(event.player(), event.number()), PLAYER_TUTORIAL_QUESTION_MARK, GLOBAL);
+	}
+	
+	/**
+	 * Binds the Quest to the Tutorial Cmd event.
+	 */
+	public void bindTutorialCmd() {
+		registerConsumer((PlayerTutorialCmd event) -> onTutorialCmd(event.player(), event.command()), PLAYER_TUTORIAL_CMD, GLOBAL);
+	}
+	
+	/**
+	 * Use this method to get a random party member from a player's party.<br>
+	 * Useful when distributing rewards after killing an NPC.
+	 * @param player this parameter represents the player whom the party will taken.
+	 * @return {@code null} if {@code player} is {@code null}, {@code player} itself if the player does not have a party, and a random party member in all other cases
+	 */
+	public L2PcInstance getRandomPartyMember(L2PcInstance player) {
+		if (player == null) {
+			return null;
+		}
+		final L2Party party = player.getParty();
+		if ((party == null) || (party.getMembers().isEmpty())) {
+			return player;
+		}
+		return party.getMembers().get(Rnd.get(party.getMembers().size()));
+	}
+	
+	/**
+	 * Get a random party member with required cond value.
+	 * @param player the instance of a player whose party is to be searched
+	 * @param cond the value of the "cond" variable that must be matched
+	 * @return a random party member that matches the specified condition, or {@code null} if no match was found
+	 */
+	public L2PcInstance getRandomPartyMember(L2PcInstance player, int cond) {
+		return getRandomPartyMember(player, "cond", String.valueOf(cond));
+	}
+	
+	/**
+	 * Auxiliary function for party quests.<br>
+	 * Note: This function is only here because of how commonly it may be used by quest developers.<br>
+	 * For any variations on this function, the quest script can always handle things on its own.
+	 * @param player the instance of a player whose party is to be searched
+	 * @param var the quest variable to look for in party members. If {@code null}, it simply unconditionally returns a random party member
+	 * @param value the value of the specified quest variable the random party member must have
+	 * @return a random party member that matches the specified conditions or {@code null} if no match was found.<br>
+	 *         If the {@code var} parameter is {@code null}, a random party member is selected without any conditions.<br>
+	 *         The party member must be within a range of 1500 ingame units of the target of the reference player, or, if no target exists, within the same range of the player itself
+	 */
+	public L2PcInstance getRandomPartyMember(L2PcInstance player, String var, String value) {
+		// if no valid player instance is passed, there is nothing to check...
+		if (player == null) {
+			return null;
+		}
+		
+		// for null var condition, return any random party member.
+		if (var == null) {
+			return getRandomPartyMember(player);
+		}
+		
+		// normal cases...if the player is not in a party, check the player's state
+		QuestState temp;
+		L2Party party = player.getParty();
+		// if this player is not in a party, just check if this player instance matches the conditions itself
+		if ((party == null) || (party.getMembers().isEmpty())) {
+			temp = player.getQuestState(getName());
+			if ((temp != null) && temp.isSet(var) && temp.get(var).equalsIgnoreCase(value)) {
+				return player; // match
+			}
+			return null; // no match
+		}
+		
+		// if the player is in a party, gather a list of all matching party members (possibly including this player)
+		List<L2PcInstance> candidates = new ArrayList<>();
+		// get the target for enforcing distance limitations.
+		L2Object target = player.getTarget();
+		if (target == null) {
+			target = player;
+		}
+		
+		for (L2PcInstance partyMember : party.getMembers()) {
+			if (partyMember == null) {
+				continue;
+			}
+			temp = partyMember.getQuestState(getName());
+			if ((temp != null) && (temp.get(var) != null) && (temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, 1500, true, false)) {
+				candidates.add(partyMember);
+			}
+		}
+		// if there was no match, return null...
+		if (candidates.isEmpty()) {
+			return null;
+		}
+		// if a match was found from the party, return one of them at random.
+		return candidates.get(Rnd.get(candidates.size()));
+	}
+	
+	/**
+	 * Auxiliary function for party quests.<br>
+	 * Note: This function is only here because of how commonly it may be used by quest developers.<br>
+	 * For any variations on this function, the quest script can always handle things on its own.
+	 * @param player the player whose random party member is to be selected
+	 * @param state the quest state required of the random party member
+	 * @return {@code null} if nothing was selected or a random party member that has the specified quest state
+	 */
+	public L2PcInstance getRandomPartyMemberState(L2PcInstance player, int state) {
+		// if no valid player instance is passed, there is nothing to check...
+		if (player == null) {
+			return null;
+		}
+		
+		// normal cases...if the player is not in a party check the player's state
+		QuestState temp;
+		L2Party party = player.getParty();
+		// if this player is not in a party, just check if this player instance matches the conditions itself
+		if ((party == null) || (party.getMembers().isEmpty())) {
+			temp = player.getQuestState(getName());
+			if ((temp != null) && (temp.getState() == state)) {
+				return player; // match
+			}
+			
+			return null; // no match
+		}
+		
+		// if the player is in a party, gather a list of all matching party members (possibly
+		// including this player)
+		List<L2PcInstance> candidates = new ArrayList<>();
+		
+		// get the target for enforcing distance limitations.
+		L2Object target = player.getTarget();
+		if (target == null) {
+			target = player;
+		}
+		
+		for (L2PcInstance partyMember : party.getMembers()) {
+			if (partyMember == null) {
+				continue;
+			}
+			temp = partyMember.getQuestState(getName());
+			if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius(target, 1500, true, false)) {
+				candidates.add(partyMember);
+			}
+		}
+		// if there was no match, return null...
+		if (candidates.isEmpty()) {
+			return null;
+		}
+		
+		// if a match was found from the party, return one of them at random.
+		return candidates.get(Rnd.get(candidates.size()));
+	}
+	
+	/**
+	 * Get a random party member from the specified player's party.<br>
+	 * If the player is not in a party, only the player himself is checked.<br>
+	 * The lucky member is chosen by standard loot roll rules -<br>
+	 * each member rolls a random number, the one with the highest roll wins.
+	 * @param player the player whose party to check
+	 * @param npc the NPC used for distance and other checks (if {@link #checkPartyMember(L2PcInstance, L2Npc)} is overridden)
+	 * @return the random party member or {@code null}
+	 */
+	public L2PcInstance getRandomPartyMember(L2PcInstance player, L2Npc npc) {
+		if ((player == null) || !checkDistanceToTarget(player, npc)) {
+			return null;
+		}
+		final L2Party party = player.getParty();
+		L2PcInstance luckyPlayer = null;
+		if (party == null) {
+			if (checkPartyMember(player, npc)) {
+				luckyPlayer = player;
+			}
+		} else {
+			int highestRoll = 0;
+			
+			for (L2PcInstance member : party.getMembers()) {
+				final int rnd = getRandom(1000);
+				
+				if ((rnd > highestRoll) && checkPartyMember(member, npc)) {
+					highestRoll = rnd;
+					luckyPlayer = member;
+				}
+			}
+		}
+		if ((luckyPlayer != null) && checkDistanceToTarget(luckyPlayer, npc)) {
+			return luckyPlayer;
+		}
+		return null;
+	}
+	
+	/**
+	 * This method is called for every party member in {@link #getRandomPartyMember(L2PcInstance, L2Npc)}.<br>
+	 * It is intended to be overridden by the specific quest implementations.
+	 * @param player the player to check
+	 * @param npc the NPC that was passed to {@link #getRandomPartyMember(L2PcInstance, L2Npc)}
+	 * @return {@code true} if this party member passes the check, {@code false} otherwise
+	 */
+	public boolean checkPartyMember(L2PcInstance player, L2Npc npc) {
+		return true;
+	}
+	
+	/**
+	 * Get a random party member from the player's party who has this quest at the specified quest progress.<br>
+	 * If the player is not in a party, only the player himself is checked.
+	 * @param player the player whose random party member state to get
+	 * @param condition the quest progress step the random member should be at (-1 = check only if quest is started)
+	 * @param playerChance how many times more chance does the player get compared to other party members (3 - 3x more chance).<br>
+	 *            On retail servers, the killer usually gets 2-3x more chance than other party members
+	 * @param target the NPC to use for the distance check (can be null)
+	 * @return the {@link QuestState} object of the random party member or {@code null} if none matched the condition
+	 */
+	public QuestState getRandomPartyMemberState(L2PcInstance player, int condition, int playerChance, L2Npc target) {
+		if ((player == null) || (playerChance < 1)) {
+			return null;
+		}
+		
+		QuestState qs = player.getQuestState(getName());
+		if (!player.isInParty()) {
+			if (!checkPartyMemberConditions(qs, condition, target)) {
+				return null;
+			}
+			if (!checkDistanceToTarget(player, target)) {
+				return null;
+			}
+			return qs;
+		}
+		
+		final List<QuestState> candidates = new ArrayList<>();
+		if (checkPartyMemberConditions(qs, condition, target)) {
+			for (int i = 0; i < playerChance; i++) {
+				candidates.add(qs);
+			}
+		}
+		
+		for (L2PcInstance member : player.getParty().getMembers()) {
+			if (member == player) {
+				continue;
+			}
+			
+			qs = member.getQuestState(getName());
+			if (checkPartyMemberConditions(qs, condition, target)) {
+				candidates.add(qs);
+			}
+		}
+		
+		if (candidates.isEmpty()) {
+			return null;
+		}
+		
+		qs = candidates.get(getRandom(candidates.size()));
+		if (!checkDistanceToTarget(qs.getPlayer(), target)) {
+			return null;
+		}
+		return qs;
+	}
+	
+	private boolean checkPartyMemberConditions(QuestState qs, int condition, L2Npc npc) {
+		return ((qs != null) && ((condition == -1) ? qs.isStarted() : qs.isCond(condition)) && checkPartyMember(qs, npc));
+	}
+	
+	private static boolean checkDistanceToTarget(L2PcInstance player, L2Npc target) {
+		return ((target == null) || com.l2jserver.gameserver.util.Util.checkIfInRange(1500, player, target, true));
+	}
+	
+	/**
+	 * This method is called for every party member in {@link #getRandomPartyMemberState(L2PcInstance, int, int, L2Npc)} if/after all the standard checks are passed.<br>
+	 * It is intended to be overridden by the specific quest implementations.<br>
+	 * It can be used in cases when there are more checks performed than simply a quest condition check,<br>
+	 * for example, if an item is required in the player's inventory.
+	 * @param qs the {@link QuestState} object of the party member
+	 * @param npc the NPC that was passed as the last parameter to {@link #getRandomPartyMemberState(L2PcInstance, int, int, L2Npc)}
+	 * @return {@code true} if this party member passes the check, {@code false} otherwise
+	 */
+	public boolean checkPartyMember(QuestState qs, L2Npc npc) {
+		return true;
+	}
+	
+	/**
+	 * Displays an HTML page to the specified player.<br>
+	 * This method fetches the HTML content associated with the given file name and sends it as an {@link NpcHtmlMessage} to the player.
+	 * @param player the player to whom the HTML content will be displayed
+	 * @param fileName the name of the HTML file to be shown
+	 */
+	public void showPage(L2PcInstance player, String fileName) {
+		showFHTML(player, fileName, Map.of());
+	}
+	
+	public void showFHTML(L2PcInstance player, String fileName, Map<String, Object> mappings) {
+		var content = getHtm(player.getHtmlPrefix(), fileName);
+		if (content == null) {
+			LOG.warn("Player {} requested non-existent file {}!", player, fileName);
+			return;
+		}
+		
+		for (var mapping : mappings.entrySet()) {
+			content = content.replace(mapping.getKey(), mapping.getValue().toString());
+		}
+		
+		final var npc = player.getLastFolkNPC();
+		player.sendPacket(new NpcHtmlMessage(npc != null ? npc.getObjectId() : 0, content));
+	}
+	
+	/**
+	 * Displays a quest-specific HTML file to the specified player.<br>
+	 * The method fetches the HTML content, ensures it exists, and sends it as an {@link NpcQuestHtmlMessage} to the player.
+	 * @param player the player to whom the HTML content will be displayed
+	 * @param fileName the name of the HTML file to be shown
+	 * @param questId the ID of the quest associated with the HTML content
+	 */
+	public void showQuestPage(L2PcInstance player, String fileName, int questId) {
+		showQuestFHTML(player, fileName, questId, Map.of());
+	}
+	
+	/**
+	 * Displays a quest-specific HTML file to the specified player with dynamic mappings applied.<br>
+	 * This method fetches the HTML content, replaces placeholders with the provided mappings, and sends the processed content as an {@link NpcQuestHtmlMessage} to the player.
+	 * @param player the player to whom the HTML content will be displayed
+	 * @param fileName the name of the HTML file to be shown
+	 * @param questId the ID of the quest associated with the HTML content
+	 * @param mappings a map of placeholders and their corresponding values to replace in the HTML content
+	 */
+	public void showQuestFHTML(L2PcInstance player, String fileName, int questId, Map<String, Object> mappings) {
+		var content = getHtm(player.getHtmlPrefix(), fileName);
+		if (content == null) {
+			LOG.warn("Player {} requested non-existent file {}!", player, fileName);
+			return;
+		}
+		
+		for (var mapping : mappings.entrySet()) {
+			content = content.replace(mapping.getKey(), mapping.getValue().toString());
+		}
+		
+		final var npc = player.getLastFolkNPC();
+		player.sendPacket(new NpcQuestHtmlMessage(npc != null ? npc.getObjectId() : 0, questId, content));
+	}
+	
+	/**
+	 * Displays a tutorial-specific HTML file to the specified player.<br>
+	 * This method retrieves the HTML content based on the provided file name and the player's language preference.<br>
+	 * If the file exists, the content is sent to the player as a {@link TutorialShowHtml} packet.
+	 * @param player the player to whom the tutorial HTML content will be displayed
+	 * @param fileName the name of the tutorial HTML file to be shown
+	 */
+	public void showTutorialHTML(L2PcInstance player, String fileName) {
+		final var content = getHtm(player.getHtmlPrefix(), fileName);
+		if (content != null) {
+			player.sendPacket(new TutorialShowHtml(content));
+		}
+	}
+	
+	/**
+	 * Sends an HTML file to the specified player, optionally associating it with an NPC.<br>
+	 * If an NPC is provided, its object ID is included in the content.<br>
+	 * If the file is related to a quest, it will be displayed as a quest window.
+	 * @param player the player to send the HTML file to
+	 * @param filename the name of the HTML file to show
+	 * @param npc the NPC that is showing the HTML file, or {@code null} if none
+	 * @return the contents of the HTML file that was sent to the player
+	 */
+	@Deprecated
+	private String showHtmlFile(L2PcInstance player, String filename, L2Npc npc) {
+		boolean questWindow = !filename.endsWith(".html");
+		int questId = getId();
+		
+		// Retrieve the HTML content linked to the quest or NPC
+		String content = getHtm(player.getHtmlPrefix(), filename);
+		
+		// Send content to the player if it's not empty
+		if (content != null) {
+			var npcObjId = 0;
+			if (npc != null) {
+				content = content.replace("%objectId%", String.valueOf(npc.getObjectId()));
+				npcObjId = npc.getObjectId();
+			}
+			
+			content = content.replace("%playername%", player.getName());
+			
+			if (questWindow && (questId > 0) && (questId < 20000) && (questId != 999)) {
+				player.sendPacket(new NpcQuestHtmlMessage(npcObjId, questId, content));
+			} else {
+				player.sendPacket(new NpcHtmlMessage(npcObjId, content));
+			}
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+		}
+		
+		return content;
+	}
+	
+	/**
+	 * @param prefix player's language prefix
+	 * @param fileName the html file to get
+	 * @return the HTML file contents
+	 */
+	public String getHtm(String prefix, String fileName) {
+		final var path = fileName.startsWith("data/") ? fileName : getClass().getPackageName().replace('.', '/') + "/" + fileName;
+		return HtmCache.getInstance().getHtm(prefix, path);
+	}
+	
+	public int[] getRegisteredItemIds() {
+		return _questItemIds;
+	}
+	
+	/**
+	 * Registers all items that have to be destroyed in case player abort the quest or finish it.
+	 */
+	public void registerQuestItems(int... items) {
+		if (_questItemIds != null) {
+			_questItemIds = IntStream.concat(Arrays.stream(_questItemIds), IntStream.of(items)).toArray();
+		} else {
+			_questItemIds = items;
+		}
+	}
+	
+	public void registerQuestItems(Set<Integer> itemIds) {
+		registerQuestItems(itemIds.stream().mapToInt(i -> i).toArray());
+	}
+	
+	/**
+	 * Remove all quest items associated with this quest from the specified player's inventory.
+	 * @param player the player whose quest items to remove
+	 */
+	public void removeRegisteredQuestItems(L2PcInstance player) {
+		takeItems(player, -1, _questItemIds);
+	}
+	
+	@Override
+	public void setActive(boolean status) {
+		// TODO: Implement.
+	}
+	
+	@Override
+	public boolean reload() {
+		unload();
+		
+		// TODO(Zoey76): Implement.
+		return false;
+	}
+	
+	@Override
+	public boolean unload() {
+		return unload(true);
+	}
+	
+	public boolean unload(boolean removeFromList) {
+		saveGlobalData();
+		// cancel all pending timers before reloading.
+		// if timers ought to be restarted, the quest can take care of it
+		// with its code (example: save global data indicating what timer must be restarted).
+		if (_questTimers != null) {
+			for (var timers : getQuestTimers().values()) {
+				_readLock.lock();
+				try {
+					for (var timer : timers) {
+						timer.cancel();
+					}
+				} finally {
+					_readLock.unlock();
+				}
+				timers.clear();
+			}
+			getQuestTimers().clear();
+		}
+		
+		if (removeFromList) {
+			return QuestManager.getInstance().removeScript(this) && super.unload();
+		}
+		return super.unload();
+	}
+	
+	@Override
+	public ScriptManager<?> getManager() {
+		return QuestManager.getInstance();
+	}
+	
+	/**
+	 * Checks if this is a custom quest.
+	 * @return {@code true} if the quest is a custom quest, {@code false} otherwise
+	 */
+	public boolean isCustom() {
+		return customName != null;
+	}
+	
+	/**
+	 * Gets the quest's custom name.
+	 * @return the custom name
+	 */
+	public String getCustomName() {
+		return customName;
+	}
+	
+	/**
+	 * Gets the start conditions.
+	 * @return the start conditions
+	 */
+	private Map<Predicate<L2PcInstance>, String> getStartConditions() {
+		var startCondition = _startCondition;
+		if (startCondition == null) {
+			synchronized (this) {
+				startCondition = _startCondition;
+				if (startCondition == null) {
+					_startCondition = startCondition = new LinkedHashMap<>(1);
+				}
+			}
+		}
+		return startCondition;
+	}
+	
+	/**
+	 * Verifies if the player meets all the start conditions.
+	 * @param player the player
+	 * @return {@code true} if all conditions are met
+	 */
+	public boolean canStartQuest(L2PcInstance player) {
+		if (_startCondition == null) {
+			return true;
+		}
+		
+		for (var cond : _startCondition.keySet()) {
+			if (!cond.test(player)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Gets the HTML for the first starting condition not met.
+	 * @param player the player
+	 * @return the HTML
+	 */
+	public String getStartConditionHtml(L2PcInstance player) {
+		if (_startCondition == null) {
+			return null;
+		}
+		
+		for (var startRequirement : _startCondition.entrySet()) {
+			if (!startRequirement.getKey().test(player)) {
+				return startRequirement.getValue();
+			}
+		}
+		return null;
+	}
+	
+	/**
+	 * Adds a predicate to the start conditions.
+	 * @param questStartRequirement the predicate condition
+	 * @param html the HTML to display if that condition is not met
+	 */
+	public void addCondStart(Predicate<L2PcInstance> questStartRequirement, String html) {
+		getStartConditions().put(questStartRequirement, html);
+	}
+	
+	/**
+	 * Adds a minimum/maximum level start condition to the quest.
+	 * @param minLevel the minimum player's level to start the quest
+	 * @param maxLevel the maximum player's level to start the quest
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondLevel(int minLevel, int maxLevel, String html) {
+		getStartConditions().put(p -> (p.getLevel() >= minLevel) && (p.getLevel() <= maxLevel), html);
+	}
+	
+	/**
+	 * Adds a minimum level start condition to the quest.
+	 * @param minLevel the minimum player's level to start the quest
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondMinLevel(int minLevel, String html) {
+		getStartConditions().put(p -> p.getLevel() >= minLevel, html);
+	}
+	
+	/**
+	 * Adds a minimum/maximum level start condition to the quest.
+	 * @param maxLevel the maximum player's level to start the quest
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondMaxLevel(int maxLevel, String html) {
+		getStartConditions().put(p -> p.getLevel() <= maxLevel, html);
+	}
+	
+	/**
+	 * Adds a race start condition to the quest.
+	 * @param race the race
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondRace(Race race, String html) {
+		getStartConditions().put(p -> p.getRace() == race, html);
+	}
+	
+	/**
+	 * Adds a not-race start condition to the quest.
+	 * @param race the race
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondNotRace(Race race, String html) {
+		getStartConditions().put(p -> p.getRace() != race, html);
+	}
+	
+	/**
+	 * Adds a quest completed start condition to the quest.
+	 * @param name the quest name
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondCompletedQuest(String name, String html) {
+		getStartConditions().put(p -> p.hasQuestState(name) && p.getQuestState(name).isCompleted(), html);
+	}
+	
+	/**
+	 * Adds a class ID start condition to the quest.
+	 * @param classId the class ID
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondClassId(ClassId classId, String html) {
+		getStartConditions().put(p -> p.getClassId() == classId, html);
+	}
+	
+	/**
+	 * Adds a not-class ID start condition to the quest.
+	 * @param classId the class ID
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondNotClassId(ClassId classId, String html) {
+		getStartConditions().put(p -> p.getClassId() != classId, html);
+	}
+	
+	/**
+	 * Adds a subclass active start condition to the quest.
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondIsSubClassActive(String html) {
+		getStartConditions().put(L2PcInstance::isSubClassActive, html);
+	}
+	
+	/**
+	 * Adds a not-subclass active start condition to the quest.
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondIsNotSubClassActive(String html) {
+		getStartConditions().put(p -> !p.isSubClassActive(), html);
+	}
+	
+	/**
+	 * Adds a category start condition to the quest.
+	 * @param categoryType the category type
+	 * @param html the HTML to display if the condition is not met
+	 */
+	public void addCondInCategory(CategoryType categoryType, String html) {
+		getStartConditions().put(p -> p.isInCategory(categoryType), html);
+	}
+	
+	public boolean haveMemo(L2PcInstance talker, int questId) {
+		Quest quest = QuestManager.getInstance().getQuest(questId);
+		return (quest != null) && talker.hasQuestState(quest.getName());
+	}
+	
+	/**
+	 * @param talker Player
+	 * @param questId Quest Id
+	 * @param flag 0 = false / 1 = true
+	 */
+	public void setOneTimeQuestFlag(L2PcInstance talker, int questId, int flag) {
+		Quest quest = QuestManager.getInstance().getQuest(questId);
+		if (quest != null) {
+			quest.getQuestState(talker, true).setState(flag == 1 ? State.COMPLETED : State.STARTED);
+		}
+	}
+	
+	public int getOneTimeQuestFlag(L2PcInstance talker, int questId) {
+		Quest quest = QuestManager.getInstance().getQuest(questId);
+		if ((quest != null) && quest.getQuestState(talker, true).isCompleted()) {
+			return 1;
+		}
+		return 0;
+	}
+	
+	public static void playSound(L2PcInstance player, IAudio sound) {
+		player.sendPacket(sound.getPacket());
+	}
+	
+	public boolean isVisibleInQuestWindow() {
+		return true;
+	}
+	
+	@Override
+	public String toString() {
+		return _name + " (" + _questId + ")";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/quest/QuestDroplist.java b/src/main/java/com/l2jserver/gameserver/model/quest/QuestDroplist.java
new file mode 100644
index 00000000..fe67c587
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/quest/QuestDroplist.java
@@ -0,0 +1,354 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.drops.DropListScope;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.QuestItemChanceHolder;
+import com.l2jserver.gameserver.model.quest.QuestDroplist.QuestDropListBuilder.GroupedDropBuilder;
+
+/**
+ * Quest Droplist.
+ * @author Noé Caratini aka Kita
+ */
+public class QuestDroplist {
+	private final Map<Integer, List<QuestDropInfo>> dropsByNpcId = new HashMap<>();
+	
+	private QuestDroplist(QuestDropListBuilder builder) {
+		dropsByNpcId.putAll(builder.dropList);
+	}
+	
+	public QuestDropInfo get(int npcId) {
+		if (!dropsByNpcId.containsKey(npcId)) {
+			return null;
+		}
+		
+		return dropsByNpcId.get(npcId).get(0);
+	}
+	
+	public QuestDropInfo get(L2Npc npc) {
+		return get(npc.getId());
+	}
+	
+	public QuestDropInfo get(int npcId, int itemId) {
+		if (!dropsByNpcId.containsKey(npcId)) {
+			return null;
+		}
+		
+		for (QuestDropInfo dropInfo : dropsByNpcId.get(npcId)) {
+			if (dropInfo.item().getId() == itemId) {
+				return dropInfo;
+			}
+		}
+		
+		return null;
+	}
+	
+	public QuestDropInfo get(int npcId, ItemHolder item) {
+		return get(npcId, item.getId());
+	}
+	
+	public QuestDropInfo get(L2Npc npc, ItemHolder item) {
+		return get(npc.getId(), item.getId());
+	}
+	
+	public Set<Integer> getNpcIds() {
+		return dropsByNpcId.keySet();
+	}
+	
+	public Set<Integer> getItemIds() {
+		return dropsByNpcId.values().stream().flatMap(List::stream).map(QuestDropInfo::drop).flatMap(dropItem -> {
+			if (dropItem instanceof GeneralDropItem gen) {
+				return Stream.of(gen.getItemId());
+			} else if (dropItem instanceof GroupedGeneralDropItem grp) {
+				return grp.getItems().stream().map(GeneralDropItem::getItemId);
+			} else {
+				return Stream.empty();
+			}
+		}).collect(Collectors.toSet());
+	}
+	
+	public static IDropItem singleDropItem(ItemChanceHolder itemHolder) {
+		return singleDropItem(itemHolder.getId(), itemHolder.getCount(), itemHolder.getCount(), itemHolder.getChance());
+	}
+	
+	public static IDropItem singleDropItem(ItemChanceHolder itemHolder, double chance) {
+		return singleDropItem(itemHolder.getId(), itemHolder.getCount(), itemHolder.getCount(), chance);
+	}
+	
+	public static IDropItem singleDropItem(ItemChanceHolder itemHolder, long amount) {
+		return singleDropItem(itemHolder.getId(), amount, amount, itemHolder.getChance());
+	}
+	
+	public static IDropItem singleDropItem(int itemId, long amount) {
+		return singleDropItem(itemId, amount, amount, 100.0);
+	}
+	
+	public static IDropItem singleDropItem(int itemId, double chance) {
+		return singleDropItem(itemId, 1, 1, chance);
+	}
+	
+	public static IDropItem singleDropItem(int itemId, long minAmount, long maxAmount, double chance) {
+		return DropListScope.QUEST.newDropItem(itemId, minAmount, maxAmount, chance);
+	}
+	
+	public static IDropItem groupedDropItem(double chance, ItemChanceHolder... itemHolders) {
+		return groupedDropItem(chance, List.of(itemHolders));
+	}
+	
+	private static IDropItem groupedDropItem(double chance, List<? extends ItemChanceHolder> itemHolders) {
+		GroupedGeneralDropItem group = DropListScope.QUEST.newGroupedDropItem(chance);
+		List<GeneralDropItem> dropItems = itemHolders.stream().map(QuestDroplist::singleDropItem).filter(GeneralDropItem.class::isInstance).map(GeneralDropItem.class::cast).toList();
+		group.setItems(dropItems);
+		return group;
+	}
+	
+	public static QuestDropListBuilder builder() {
+		return new QuestDropListBuilder();
+	}
+	
+	public static class QuestDropListBuilder {
+		private final Map<Integer, List<QuestDropInfo>> dropList = new HashMap<>();
+		private Map.Entry<Integer, QuestDropInfo> lastAdded = null;
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, QuestItemChanceHolder questItem, long minAmount, long maxAmount, double chance, int[] requiredItemIds) {
+			List<QuestDropInfo> dropsForMob = dropList.computeIfAbsent(npcId, ArrayList::new);
+			QuestDropInfo dropInfo = new QuestDropInfo(questItem, singleDropItem(questItem.getId(), minAmount, maxAmount, chance), requiredItemIds);
+			dropsForMob.add(dropInfo);
+			updateLastAdded(npcId, dropInfo);
+			return this;
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, QuestItemChanceHolder questItem, long minAmount, long maxAmount, double chance) {
+			return addSingleDrop(npcId, questItem, minAmount, maxAmount, chance, null);
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, QuestItemChanceHolder questItem) {
+			return addSingleDrop(npcId, questItem, questItem.getCount(), questItem.getCount(), questItem.getChance());
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, QuestItemChanceHolder questItem, long amount, double chance) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(questItem.getId(), chance, amount, questItem.getLimit()));
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, QuestItemChanceHolder questItem, long amount) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(questItem.getId(), questItem.getChance(), amount, questItem.getLimit()));
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, QuestItemChanceHolder questItem, double chance) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(questItem.getId(), chance, questItem.getCount(), questItem.getLimit()));
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, int itemId) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(itemId, 100.0, 1, 0));
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, int itemId, long amount) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(itemId, 100.0, amount, 0));
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, int itemId, double chance) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(itemId, chance, 1, 0));
+		}
+		
+		public QuestDropListBuilder addSingleDrop(int npcId, int itemId, long amount, double chance) {
+			return addSingleDrop(npcId, new QuestItemChanceHolder(itemId, chance, amount, 0));
+		}
+		
+		public QuestDropListBuilder withRequiredItems(int... itemIds) {
+			if (lastAdded == null) {
+				throw new IllegalStateException("Cannot add required items without adding a drop first.");
+			}
+			
+			int[] uniqueItemIds = Optional.ofNullable(itemIds).map(ids -> Arrays.stream(ids).distinct().toArray()).orElse(null);
+			
+			QuestDropInfo oldDropInfo = lastAdded.getValue();
+			QuestDropInfo newDropInfo = new QuestDropInfo(oldDropInfo.item(), oldDropInfo.drop(), uniqueItemIds);
+			
+			List<QuestDropInfo> dropsForNpc = dropList.get(lastAdded.getKey());
+			dropsForNpc.remove(oldDropInfo);
+			dropsForNpc.add(newDropInfo);
+			updateLastAdded(lastAdded.getKey(), newDropInfo);
+			return this;
+		}
+		
+		public SingleDropBuilder bulkAddSingleDrop(QuestItemChanceHolder questItem) {
+			return new SingleDropBuilder(this, questItem);
+		}
+		
+		public SingleDropBuilder bulkAddSingleDrop(QuestItemChanceHolder questItem, double chance) {
+			return bulkAddSingleDrop(new QuestItemChanceHolder(questItem.getId(), chance, questItem.getCount(), questItem.getLimit()));
+		}
+		
+		public SingleDropBuilder bulkAddSingleDrop(int itemId, double chance) {
+			return bulkAddSingleDrop(new QuestItemChanceHolder(itemId, chance, 1, 0));
+		}
+		
+		private QuestDropListBuilder addGroupedDrop(int npcId, QuestDropInfo dropInfo) {
+			List<QuestDropInfo> dropsForMob = dropList.computeIfAbsent(npcId, ArrayList::new);
+			dropsForMob.add(dropInfo);
+			updateLastAdded(npcId, dropInfo);
+			return this;
+		}
+		
+		public GroupedDropBuilder addGroupedDrop(int npcId, double chanceForGroup) {
+			return new GroupedDropBuilder(this, npcId, chanceForGroup);
+		}
+		
+		public GroupedDropForSingleItemBuilder addGroupedDropForSingleItem(int npcId, QuestItemChanceHolder questItem, double chanceForGroup) {
+			return new GroupedDropForSingleItemBuilder(this, npcId, questItem, chanceForGroup);
+		}
+		
+		private void updateLastAdded(int npcId, QuestDropInfo dropInfo) {
+			lastAdded = Map.entry(npcId, dropInfo);
+		}
+		
+		public QuestDroplist build() {
+			return new QuestDroplist(this);
+		}
+		
+		public static class SingleDropBuilder {
+			private final QuestDropListBuilder parentBuilder;
+			private final QuestItemChanceHolder item;
+			
+			private final Set<Integer> npcIds = new HashSet<>();
+			private int[] requiredItems = null;
+			
+			public SingleDropBuilder(QuestDropListBuilder parentBuilder, QuestItemChanceHolder item) {
+				this.parentBuilder = parentBuilder;
+				this.item = item;
+			}
+			
+			public SingleDropBuilder withNpcs(Set<Integer> npcIds) {
+				this.npcIds.addAll(npcIds);
+				return this;
+			}
+			
+			public SingleDropBuilder withNpcs(int... npcIds) {
+				return withNpcs(Arrays.stream(npcIds).boxed().collect(Collectors.toSet()));
+			}
+			
+			public SingleDropBuilder withRequiredItems(int... itemIds) {
+				requiredItems = itemIds;
+				return this;
+			}
+			
+			public QuestDropListBuilder build() {
+				npcIds.forEach(npcId -> parentBuilder.addSingleDrop(npcId, item).withRequiredItems(requiredItems));
+				return parentBuilder;
+			}
+		}
+		
+		public static class GroupedDropBuilder {
+			private final QuestDropListBuilder parentBuilder;
+			private final int npcId;
+			
+			private final double chance;
+			protected final List<QuestItemChanceHolder> items = new ArrayList<>();
+			
+			private GroupedDropBuilder(QuestDropListBuilder parentBuilder, int npcId, double chanceForGroup) {
+				this.parentBuilder = parentBuilder;
+				this.npcId = npcId;
+				chance = chanceForGroup;
+			}
+			
+			public GroupedDropBuilder withDropItem(QuestItemChanceHolder questItem) {
+				items.add(questItem);
+				return this;
+			}
+			
+			public GroupedDropBuilder withDropItem(QuestItemChanceHolder questItem, long amount) {
+				return withDropItem(new QuestItemChanceHolder(questItem.getId(), questItem.getChance(), amount, questItem.getLimit()));
+			}
+			
+			public GroupedDropBuilder withDropItem(QuestItemChanceHolder questItem, double chanceWithinGroup) {
+				return withDropItem(new QuestItemChanceHolder(questItem.getId(), chanceWithinGroup, questItem.getCount(), questItem.getLimit()));
+			}
+			
+			public GroupedDropBuilder withDropItem(QuestItemChanceHolder questItem, long amount, double chanceWithinGroup) {
+				return withDropItem(new QuestItemChanceHolder(questItem.getId(), chanceWithinGroup, amount, questItem.getLimit()));
+			}
+			
+			public GroupedDropBuilder withDropItem(int itemId, double chanceWithinGroup) {
+				return withDropItem(new QuestItemChanceHolder(itemId, chanceWithinGroup, 1, 0));
+			}
+			
+			public GroupedDropBuilder withDropItem(int itemId, long amount, double chanceWithinGroup) {
+				return withDropItem(new QuestItemChanceHolder(itemId, chanceWithinGroup, amount, 0));
+			}
+			
+			public QuestDropListBuilder build() {
+				return parentBuilder.addGroupedDrop(npcId, new QuestDropInfo(items.get(0), groupedDropItem(chance, items)));
+			}
+		}
+	}
+	
+	public static class GroupedDropForSingleItemBuilder extends GroupedDropBuilder {
+		private final QuestItemChanceHolder questItem;
+		
+		private GroupedDropForSingleItemBuilder(QuestDropListBuilder parentBuilder, int npcId, QuestItemChanceHolder questItem, double chanceForGroup) {
+			super(parentBuilder, npcId, chanceForGroup);
+			this.questItem = questItem;
+		}
+		
+		public GroupedDropForSingleItemBuilder withAmount(long amount, double chanceWithinGroup) {
+			this.withDropItem(questItem, amount, chanceWithinGroup);
+			return this;
+		}
+		
+		public QuestDropListBuilder orElse(long amount) {
+			double sumOfChances = items.stream().mapToDouble(ItemChanceHolder::getChance).sum();
+			
+			this.withDropItem(questItem, amount, 100.0 - sumOfChances);
+			return super.build();
+		}
+		
+		@Override
+		public QuestDropListBuilder build() {
+			return super.build();
+		}
+	}
+	
+	public record QuestDropInfo(QuestItemChanceHolder item, IDropItem drop, int[] requiredItems) {
+		
+		public QuestDropInfo(QuestItemChanceHolder item, IDropItem drop) {
+			this(item, drop, null);
+		}
+		
+		public long getLimit() {
+			return item.getLimit();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/quest/QuestState.java b/src/main/java/com/l2jserver/gameserver/model/quest/QuestState.java
new file mode 100644
index 00000000..eac03b94
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/quest/QuestState.java
@@ -0,0 +1,1122 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.enums.QuestType;
+import com.l2jserver.gameserver.enums.audio.IAudio;
+import com.l2jserver.gameserver.enums.audio.Sound;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.AbstractScript;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.network.serverpackets.ExShowQuestMark;
+import com.l2jserver.gameserver.network.serverpackets.QuestList;
+import com.l2jserver.gameserver.network.serverpackets.TutorialCloseHtml;
+import com.l2jserver.gameserver.network.serverpackets.TutorialEnableClientEvent;
+import com.l2jserver.gameserver.network.serverpackets.TutorialShowQuestionMark;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Quest state class.
+ * @author Luis Arias
+ */
+public final class QuestState {
+	private static final Logger LOG = LoggerFactory.getLogger(QuestState.class);
+	
+	/** The name of the quest of this QuestState */
+	private final String _questName;
+	
+	/** The "owner" of this QuestState object */
+	private final L2PcInstance _player;
+	
+	/** The current state of the quest */
+	private int _state;
+	
+	/** A map of key->value pairs containing the quest state variables and their values */
+	private Map<String, String> _vars;
+	
+	/**
+	 * boolean flag letting QuestStateManager know to exit quest when cleaning up
+	 */
+	private boolean _isExitQuestOnCleanUp = false;
+	
+	/**
+	 * Constructor of the QuestState. Creates the QuestState object and sets the player's progress of the quest to this QuestState.
+	 * @param quest the {@link Quest} object associated with the QuestState
+	 * @param player the owner of this {@link QuestState} object
+	 * @param state the initial state of the quest
+	 */
+	public QuestState(Quest quest, L2PcInstance player, int state) {
+		_questName = quest.getName();
+		_player = player;
+		_state = state;
+		
+		player.setQuestState(this);
+	}
+	
+	/**
+	 * @return the name of the quest of this QuestState
+	 */
+	public String getQuestName() {
+		return _questName;
+	}
+	
+	/**
+	 * @return the {@link Quest} object of this QuestState
+	 */
+	public Quest getQuest() {
+		return QuestManager.getInstance().getQuest(_questName);
+	}
+	
+	/**
+	 * @return the {@link L2PcInstance} object of the owner of this QuestState
+	 */
+	public L2PcInstance getPlayer() {
+		return _player;
+	}
+	
+	/**
+	 * @return the current State of this QuestState
+	 * @see com.l2jserver.gameserver.model.quest.State
+	 */
+	public int getState() {
+		return _state;
+	}
+	
+	/**
+	 * @return {@code true} if the State of this QuestState is CREATED, {@code false} otherwise
+	 * @see com.l2jserver.gameserver.model.quest.State
+	 */
+	public boolean isCreated() {
+		return (_state == State.CREATED);
+	}
+	
+	/**
+	 * @return {@code true} if the State of this QuestState is STARTED, {@code false} otherwise
+	 * @see com.l2jserver.gameserver.model.quest.State
+	 */
+	public boolean isStarted() {
+		return (_state == State.STARTED);
+	}
+	
+	/**
+	 * @return {@code true} if the State of this QuestState is COMPLETED, {@code false} otherwise
+	 * @see com.l2jserver.gameserver.model.quest.State
+	 */
+	public boolean isCompleted() {
+		return (_state == State.COMPLETED);
+	}
+	
+	/**
+	 * @param state the new state of the quest to set
+	 * @return {@code true} if state was changed, {@code false} otherwise
+	 * @see #setState(int state, boolean saveInDb)
+	 * @see com.l2jserver.gameserver.model.quest.State
+	 */
+	public boolean setState(int state) {
+		return setState(state, true);
+	}
+	
+	/**
+	 * Change the state of this quest to the specified value.
+	 * @param state the new state of the quest to set
+	 * @param saveInDb if {@code true}, will save the state change in the database
+	 * @return {@code true} if state was changed, {@code false} otherwise
+	 * @see com.l2jserver.gameserver.model.quest.State
+	 */
+	public boolean setState(int state, boolean saveInDb) {
+		if (_state == state) {
+			return false;
+		}
+		final boolean newQuest = isCreated();
+		_state = state;
+		if (saveInDb) {
+			if (newQuest) {
+				Quest.createQuestInDb(this);
+			} else {
+				Quest.updateQuestInDb(this);
+			}
+		}
+		
+		_player.sendPacket(new QuestList());
+		return true;
+	}
+	
+	/**
+	 * Add parameter used in quests.
+	 * @param var String pointing out the name of the variable for quest
+	 * @param val String pointing out the value of the variable for quest
+	 * @return String (equal to parameter "val")
+	 */
+	public String setInternal(String var, String val) {
+		if (_vars == null) {
+			_vars = new HashMap<>();
+		}
+		
+		if (val == null) {
+			val = "";
+		}
+		
+		_vars.put(var, val);
+		return val;
+	}
+	
+	public String set(String var, int val) {
+		return set(var, Integer.toString(val));
+	}
+	
+	/**
+	 * Return value of parameter "val" after adding the couple (var,val) in class variable "vars".<br>
+	 * Actions:<br>
+	 * <ul>
+	 * <li>Initialize class variable "vars" if is null.</li>
+	 * <li>Initialize parameter "val" if is null</li>
+	 * <li>Add/Update couple (var,val) in class variable Map "vars"</li>
+	 * <li>If the key represented by "var" exists in Map "vars", the couple (var,val) is updated in the database.<br>
+	 * The key is known as existing if the preceding value of the key (given as result of function put()) is not null.<br>
+	 * If the key doesn't exist, the couple is added/created in the database</li>
+	 * <ul>
+	 * @param var String indicating the name of the variable for quest
+	 * @param val String indicating the value of the variable for quest
+	 * @return String (equal to parameter "val")
+	 */
+	public String set(String var, String val) {
+		if (_vars == null) {
+			_vars = new HashMap<>();
+		}
+		
+		if (val == null) {
+			val = "";
+		}
+		
+		String old = _vars.put(var, val);
+		if (old != null) {
+			Quest.updateQuestVarInDb(this, var, val);
+		} else {
+			Quest.createQuestVarInDb(this, var, val);
+		}
+		
+		if ("cond".equals(var)) {
+			try {
+				int previousVal;
+				try {
+					previousVal = Integer.parseInt(old);
+				} catch (Exception ex) {
+					previousVal = 0;
+				}
+				setCond(Integer.parseInt(val), previousVal);
+			} catch (Exception e) {
+				LOG.warn("{}, {} cond [{}] is not an integer. Value stored, but no packet was sent: {}", _player.getName(), getQuestName(), val, e.getMessage(), e);
+			}
+		}
+		
+		return val;
+	}
+	
+	/**
+	 * Internally handles the progression of the quest so that it is ready for sending appropriate packets to the client.<br>
+	 * <u><i>Actions :</i></u><br>
+	 * <ul>
+	 * <li>Check if the new progress number resets the quest to a previous (smaller) step.</li>
+	 * <li>If not, check if quest progress steps have been skipped.</li>
+	 * <li>If skipped, prepare the variable completedStateFlags appropriately to be ready for sending to clients.</li>
+	 * <li>If no steps were skipped, flags do not need to be prepared...</li>
+	 * <li>If the passed step resets the quest to a previous step, reset such that steps after the parameter are not considered, while skipped steps before the parameter, if any, maintain their info.</li>
+	 * </ul>
+	 * @param cond the current quest progress condition (0 - 31 including)
+	 * @param old the previous quest progress condition to check against
+	 */
+	private void setCond(int cond, int old) {
+		if (cond == old) {
+			return;
+		}
+		
+		int completedStateFlags = 0;
+		// cond 0 and 1 do not need completedStateFlags. Also, if cond > 1, the 1st step must
+		// always exist (i.e. it can never be skipped). So if cond is 2, we can still safely
+		// assume no steps have been skipped.
+		// Finally, more than 31 steps CANNOT be supported in any way with skipping.
+		if ((cond < 3) || (cond > 31)) {
+			unset("__compltdStateFlags");
+		} else {
+			completedStateFlags = getInt("__compltdStateFlags");
+		}
+		
+		// case 1: No steps have been skipped so far...
+		if (completedStateFlags == 0) {
+			// check if this step also doesn't skip anything. If so, no further work is needed
+			// also, in this case, no work is needed if the state is being reset to a smaller value
+			// in those cases, skip forward to informing the client about the change...
+			
+			// ELSE, if we just now skipped for the first time...prepare the flags!!!
+			if (cond > (old + 1)) {
+				// set the most significant bit to 1 (indicates that there exist skipped states)
+				// also, ensure that the least significant bit is an 1 (the first step is never skipped, no matter
+				// what the cond says)
+				completedStateFlags = 0x80000001;
+				
+				// since no flag had been skipped until now, the least significant bits must all
+				// be set to 1, up until "old" number of bits.
+				completedStateFlags |= ((1 << old) - 1);
+				
+				// now, just set the bit corresponding to the passed cond to 1 (current step)
+				completedStateFlags |= (1 << (cond - 1));
+				set("__compltdStateFlags", String.valueOf(completedStateFlags));
+			}
+		}
+		// case 2: There were exist previously skipped steps
+		// if this is a push back to a previous step, clear all completion flags ahead
+		else if (cond < old) {
+			// note, this also unsets the flag indicating that there exist skips
+			completedStateFlags &= ((1 << cond) - 1);
+			
+			// now, check if this resulted in no steps being skipped any more
+			if (completedStateFlags == ((1 << cond) - 1)) {
+				unset("__compltdStateFlags");
+			} else {
+				// set the most significant bit back to 1 again, to correctly indicate that this skips states.
+				// also, ensure that the least significant bit is an 1 (the first step is never skipped, no matter
+				// what the cond says)
+				completedStateFlags |= 0x80000001;
+				set("__compltdStateFlags", String.valueOf(completedStateFlags));
+			}
+		}
+		// If this moves forward, it changes nothing on previously skipped steps.
+		// Just mark this state and we are done.
+		else {
+			completedStateFlags |= (1 << (cond - 1));
+			set("__compltdStateFlags", String.valueOf(completedStateFlags));
+		}
+		
+		// send a packet to the client to inform it of the quest progress (step change)
+		_player.sendPacket(new QuestList());
+		
+		final Quest q = getQuest();
+		if (!q.isCustom() && (cond > 0)) {
+			_player.sendPacket(new ExShowQuestMark(q.getId()));
+		}
+	}
+	
+	/**
+	 * Removes a quest variable from the list of existing quest variables.
+	 * @param var the name of the variable to remove
+	 * @return the previous value of the variable or {@code null} if none were found
+	 */
+	public String unset(String var) {
+		if (_vars == null) {
+			return null;
+		}
+		
+		String old = _vars.remove(var);
+		if (old != null) {
+			Quest.deleteQuestVarInDb(this, var);
+		}
+		return old;
+	}
+	
+	/**
+	 * Insert (or update) in the database variables that need to stay persistent for this player after a reboot. This function is for storage of values that are not related to a specific quest but are global instead, i.e. can be used by any script.
+	 * @param var the name of the variable to save
+	 * @param value the value of the variable
+	 */
+	// TODO: these methods should not be here, they could be used by other classes to save some variables, but they can't because they require to create a QuestState first.
+	public void saveGlobalQuestVar(String var, String value) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("REPLACE INTO character_quest_global_data (charId, var, value) VALUES (?, ?, ?)")) {
+			ps.setInt(1, _player.getObjectId());
+			ps.setString(2, var);
+			ps.setString(3, value);
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Could not insert player's global quest variable: {}", e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * Read from the database a previously saved variable for this quest.<br>
+	 * Due to performance considerations, this function should best be used only when the quest is first loaded.<br>
+	 * Subclasses of this class can define structures into which these loaded values can be saved.<br>
+	 * However, on-demand usage of this function throughout the script is not prohibited, only not recommended.<br>
+	 * Values read from this function were entered by calls to "saveGlobalQuestVar".
+	 * @param var the name of the variable whose value to get
+	 * @return the value of the variable or an empty string if the variable does not exist in the database
+	 */
+	// TODO: these methods should not be here, they could be used by other classes to save some variables, but they can't because they require to create a QuestState first.
+	public String getGlobalQuestVar(String var) {
+		String result = "";
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT value FROM character_quest_global_data WHERE charId = ? AND var = ?")) {
+			ps.setInt(1, _player.getObjectId());
+			ps.setString(2, var);
+			try (var rs = ps.executeQuery()) {
+				if (rs.next()) {
+					result = rs.getString(1);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not load player's global quest variable: {}", e.getMessage(), e);
+		}
+		return result;
+	}
+	
+	/**
+	 * Permanently delete a global quest variable from the database.
+	 * @param var the name of the variable to delete
+	 */
+	public void deleteGlobalQuestVar(String var) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_quest_global_data WHERE charId = ? AND var = ?")) {
+			ps.setInt(1, _player.getObjectId());
+			ps.setString(2, var);
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("Could not delete player's global quest variable; charId = {}, variable name = {}. Exception: {}", _player.getObjectId(), var, e.getMessage(), e);
+		}
+	}
+	
+	/**
+	 * @param var the name of the variable to get
+	 * @return the value of the variable from the list of quest variables
+	 */
+	public String get(String var) {
+		if (_vars == null) {
+			return null;
+		}
+		return _vars.get(var);
+	}
+	
+	/**
+	 * @param var the name of the variable to get
+	 * @return the integer value of the variable or 0 if the variable does not exist or its value is not an integer
+	 */
+	public int getInt(String var) {
+		if (_vars == null) {
+			return -1;
+		}
+		
+		final String variable = _vars.get(var);
+		if ((variable == null) || variable.isEmpty()) {
+			return -1;
+		}
+		
+		int varint = -1;
+		try {
+			varint = Integer.parseInt(variable);
+		} catch (NumberFormatException nfe) {
+			LOG.warn("Quest {}, method getInt({}), tried to parse a non-integer value ({}). Char Id: {}", getQuestName(), var, variable, _player.getObjectId(), nfe);
+		}
+		
+		return varint;
+	}
+	
+	/**
+	 * Checks if the quest state progress ({@code cond}) is at the specified step.
+	 * @param condition the condition to check against
+	 * @return {@code true} if the quest condition is equal to {@code condition}, {@code false} otherwise
+	 * @see #getInt(String var)
+	 */
+	public boolean isCond(int condition) {
+		return (getInt("cond") == condition);
+	}
+	
+	/**
+	 * Sets the quest state progress ({@code cond}) to the specified step.
+	 * @param value the new value of the quest state progress
+	 * @return this {@link QuestState} object
+	 * @see #set(String var, String val)
+	 * @see #setCond(int, boolean)
+	 */
+	public QuestState setCond(int value) {
+		if (isStarted()) {
+			set("cond", Integer.toString(value));
+		}
+		return this;
+	}
+	
+	/**
+	 * @return the current quest progress ({@code cond})
+	 */
+	public int getCond() {
+		if (isStarted()) {
+			return getInt("cond");
+		}
+		return 0;
+	}
+	
+	/**
+	 * Check if a given variable is set for this quest.
+	 * @param variable the variable to check
+	 * @return {@code true} if the variable is set, {@code false} otherwise
+	 * @see #get(String)
+	 * @see #getInt(String)
+	 * @see #getCond()
+	 */
+	public boolean isSet(String variable) {
+		return (get(variable) != null);
+	}
+	
+	/**
+	 * Sets the quest state progress ({@code cond}) to the specified step.
+	 * @param value the new value of the quest state progress
+	 * @param playQuestMiddle if {@code true}, plays "ItemSound.quest_middle"
+	 * @return this {@link QuestState} object
+	 * @see #setCond(int value)
+	 * @see #set(String var, String val)
+	 */
+	public QuestState setCond(int value, boolean playQuestMiddle) {
+		if (!isStarted()) {
+			return this;
+		}
+		set("cond", String.valueOf(value));
+		
+		if (playQuestMiddle) {
+			AbstractScript.playSound(_player, Sound.ITEMSOUND_QUEST_MIDDLE);
+		}
+		return this;
+	}
+	
+	public QuestState setMemoState(int value) {
+		set("memoState", String.valueOf(value));
+		return this;
+	}
+	
+	/**
+	 * @return the current Memo State
+	 */
+	public int getMemoState() {
+		if (isStarted()) {
+			return getInt("memoState");
+		}
+		return -1;
+	}
+	
+	public boolean hasMemoState() {
+		return getMemoState() > 0;
+	}
+	
+	public boolean isMemoState(int memoState) {
+		return (getInt("memoState") == memoState);
+	}
+	
+	public String removeMemo() {
+		return unset("memoState");
+	}
+	
+	/**
+	 * Gets the memo state ex.
+	 * @param slot the slot where the value was saved
+	 * @return the memo state ex
+	 */
+	public int getMemoStateEx(int slot) {
+		if (isStarted()) {
+			return getInt("memoStateEx" + slot);
+		}
+		return 0;
+	}
+	
+	/**
+	 * Sets the memo state ex.
+	 * @param slot the slot where the value will be saved
+	 * @param value the value
+	 * @return this QuestState
+	 */
+	public QuestState setMemoStateEx(int slot, long value) {
+		set("memoStateEx" + slot, String.valueOf(value));
+		return this;
+	}
+	
+	/**
+	 * Verifies if the given value is equal to the current memos state ex.
+	 * @param slot the slot where the value was saved
+	 * @param memoStateEx the value to verify
+	 * @return {@code true} if the values are equal, {@code false} otherwise
+	 */
+	public boolean isMemoStateEx(int slot, int memoStateEx) {
+		return (getMemoStateEx(slot) == memoStateEx);
+	}
+	
+	/**
+	 * Add player to get notification of characters death
+	 * @param character the {@link L2Character} object of the character to get notification of death
+	 */
+	public void addNotifyOfDeath(L2Character character) {
+		if (!(character instanceof L2PcInstance)) {
+			return;
+		}
+		
+		((L2PcInstance) character).addNotifyQuestOfDeath(this);
+	}
+	
+	// TODO: This all remains because of backward compatibility, should be cleared when all scripts are rewritten in java
+	
+	/**
+	 * Return the quantity of one sort of item hold by the player
+	 * @param itemId the Id of the item wanted to be count
+	 * @return long
+	 */
+	public long getQuestItemsCount(int itemId) {
+		return AbstractScript.getQuestItemsCount(_player, itemId);
+	}
+	
+	/**
+	 * @param itemId the Id of the item required
+	 * @return true if item exists in player's inventory, false - if not
+	 */
+	public boolean hasQuestItems(int itemId) {
+		return AbstractScript.hasQuestItems(_player, itemId);
+	}
+	
+	/**
+	 * @param itemIds list of items that are required
+	 * @return true if all items exists in player's inventory, false - if not
+	 */
+	public boolean hasQuestItems(int... itemIds) {
+		return AbstractScript.hasQuestItems(_player, itemIds);
+	}
+	
+	/**
+	 * Return the level of enchantment on the weapon of the player(Done specifically for weapon SA's)
+	 * @param itemId Id of the item to check enchantment
+	 * @return int
+	 */
+	public int getEnchantLevel(int itemId) {
+		return AbstractScript.getEnchantLevel(_player, itemId);
+	}
+	
+	/**
+	 * Give adena to the player
+	 * @param count
+	 * @param applyRates
+	 */
+	public void giveAdena(long count, boolean applyRates) {
+		giveItems(Inventory.ADENA_ID, count, applyRates ? 0 : 1);
+	}
+	
+	/**
+	 * Give reward to player using multiplier's
+	 * @param item
+	 */
+	public void rewardItems(ItemHolder item) {
+		AbstractScript.rewardItems(_player, item);
+	}
+	
+	/**
+	 * Give reward to player using multiplier's
+	 * @param itemId
+	 * @param count
+	 */
+	public void rewardItems(int itemId, long count) {
+		AbstractScript.rewardItems(_player, itemId, count);
+	}
+	
+	/**
+	 * Give item/reward to the player
+	 * @param itemId
+	 * @param count
+	 */
+	public void giveItems(int itemId, long count) {
+		AbstractScript.giveItems(_player, itemId, count, 0);
+	}
+	
+	public void giveItems(ItemHolder holder) {
+		AbstractScript.giveItems(_player, holder.getId(), holder.getCount(), 0);
+	}
+	
+	public void giveItems(int itemId, long count, int enchantlevel) {
+		AbstractScript.giveItems(_player, itemId, count, enchantlevel);
+	}
+	
+	public void giveItems(int itemId, long count, byte attributeId, int attributeLevel) {
+		AbstractScript.giveItems(_player, itemId, count, attributeId, attributeLevel);
+	}
+	
+	@Deprecated
+	public boolean giveItemRandomly(int itemId, long amount, long limit, double dropChance, boolean playSound) {
+		return AbstractScript.giveItemRandomly(_player, null, itemId, amount, limit, dropChance, playSound);
+	}
+	
+	@Deprecated
+	public boolean giveItemRandomly(L2Npc npc, int itemId, long amount, long limit, double dropChance, boolean playSound) {
+		return AbstractScript.giveItemRandomly(_player, npc, itemId, amount, limit, dropChance, playSound);
+	}
+	
+	@Deprecated
+	public boolean giveItemRandomly(L2Npc npc, int itemId, long minAmount, long maxAmount, long limit, double dropChance, boolean playSound) {
+		return AbstractScript.giveItemRandomly(_player, npc, itemId, minAmount, maxAmount, limit, dropChance, playSound);
+	}
+	
+	/**
+	 * Remove items from player's inventory when talking to NPC in order to have rewards.<br>
+	 * Actions:<br>
+	 * <ul>
+	 * <li>Destroy quantity of items wanted</li>
+	 * <li>Send new inventory list to player</li>
+	 * </ul>
+	 * @param itemId Identifier of the item
+	 * @param count Quantity of items to destroy
+	 */
+	public void takeItems(int itemId, long count) {
+		AbstractScript.takeItems(_player, itemId, count);
+	}
+	
+	/**
+	 * Send a packet in order to play a sound to the player.
+	 * @param audio the {@link IAudio} object of the sound to play
+	 */
+	public void playSound(IAudio audio) {
+		AbstractScript.playSound(_player, audio);
+	}
+	
+	/**
+	 * Add XP and SP as quest reward
+	 * @param exp
+	 * @param sp
+	 */
+	public void addExpAndSp(int exp, int sp) {
+		AbstractScript.addExpAndSp(_player, exp, sp);
+	}
+	
+	/**
+	 * @param loc
+	 * @return number of ticks from GameTimeController
+	 */
+	public int getItemEquipped(int loc) {
+		return AbstractScript.getItemEquipped(_player, loc);
+	}
+	
+	/**
+	 * @return {@code true} if quest is to be exited on clean up by QuestStateManager, {@code false} otherwise
+	 */
+	public boolean isExitQuestOnCleanUp() {
+		return _isExitQuestOnCleanUp;
+	}
+	
+	/**
+	 * @param isExitQuestOnCleanUp {@code true} if quest is to be exited on clean up by QuestStateManager, {@code false} otherwise
+	 */
+	public void setIsExitQuestOnCleanUp(boolean isExitQuestOnCleanUp) {
+		_isExitQuestOnCleanUp = isExitQuestOnCleanUp;
+	}
+	
+	/**
+	 * Start a timed event for a quest.<br>
+	 * Will call an event in onEvent.
+	 * @param name the name of the timer/event
+	 * @param time time in milliseconds till the event is executed
+	 */
+	public void startQuestTimer(String name, long time) {
+		getQuest().startQuestTimer(name, time, null, _player, false);
+	}
+	
+	/**
+	 * Start a timed event for a quest.<br>
+	 * Will call an event in onEvent.
+	 * @param name the name of the timer/event
+	 * @param time time in milliseconds till the event is executed
+	 * @param npc the L2Npc associated with this event
+	 */
+	public void startQuestTimer(String name, long time, L2Npc npc) {
+		getQuest().startQuestTimer(name, time, npc, _player, false);
+	}
+	
+	/**
+	 * Start a repeating timed event for a quest.<br>
+	 * Will call an event in onEvent.
+	 * @param name the name of the timer/event
+	 * @param time time in milliseconds till the event is executed/repeated
+	 */
+	public void startRepeatingQuestTimer(String name, long time) {
+		getQuest().startQuestTimer(name, time, null, _player, true);
+	}
+	
+	/**
+	 * Start a repeating timed event for a quest.<br>
+	 * Will call an event in onEvent.
+	 * @param name the name of the timer/event
+	 * @param time time in milliseconds till the event is executed/repeated
+	 * @param npc the L2Npc associated with this event
+	 */
+	public void startRepeatingQuestTimer(String name, long time, L2Npc npc) {
+		getQuest().startQuestTimer(name, time, npc, _player, true);
+	}
+	
+	/**
+	 * @param name the name of the QuestTimer required
+	 * @return the {@link QuestTimer} object with the specified name or {@code null} if it doesn't exist
+	 */
+	public QuestTimer getQuestTimer(String name) {
+		return getQuest().getQuestTimer(name, null, _player);
+	}
+	
+	// --- Spawn methods ---
+	/**
+	 * Add a temporary spawn of the specified npc.<br>
+	 * Player's coordinates will be used for the spawn.
+	 * @param npcId the Id of the npc to spawn
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId) {
+		return addSpawn(npcId, _player.getX(), _player.getY(), _player.getZ(), 0, false, 0, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.<br>
+	 * Player's coordinates will be used for the spawn.
+	 * @param npcId the Id of the npc to spawn
+	 * @param despawnDelay time in milliseconds till the npc is despawned (default: 0)
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId, int despawnDelay) {
+		return addSpawn(npcId, _player.getX(), _player.getY(), _player.getZ(), 0, false, despawnDelay, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param x the X coordinate of the npc spawn location
+	 * @param y the Y coordinate of the npc spawn location
+	 * @param z the Z coordinate (height) of the npc spawn location
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId, int x, int y, int z) {
+		return addSpawn(npcId, x, y, z, 0, false, 0, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param x the X coordinate of the npc spawn location
+	 * @param y the Y coordinate of the npc spawn location
+	 * @param z the Z coordinate (height) of the npc spawn location
+	 * @param despawnDelay time in milliseconds till the npc is despawned (default: 0)
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId, int x, int y, int z, int despawnDelay) {
+		return addSpawn(npcId, x, y, z, 0, false, despawnDelay, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param cha the character whose coordinates will be used for the npc spawn
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId, L2Character cha) {
+		return addSpawn(npcId, cha.getX(), cha.getY(), cha.getZ(), cha.getHeading(), true, 0, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param cha the character whose coordinates will be used for the npc spawn
+	 * @param despawnDelay time in milliseconds till the npc is despawned (default: 0)
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId, L2Character cha, int despawnDelay) {
+		return addSpawn(npcId, cha.getX(), cha.getY(), cha.getZ(), cha.getHeading(), true, despawnDelay, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param cha the character whose coordinates will be used for the npc spawn
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the npc is despawned (default: 0)
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn)
+	 */
+	public L2Npc addSpawn(int npcId, L2Character cha, boolean randomOffset, int despawnDelay) {
+		return addSpawn(npcId, cha.getX(), cha.getY(), cha.getZ(), cha.getHeading(), randomOffset, despawnDelay, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param x the X coordinate of the npc spawn location
+	 * @param y the Y coordinate of the npc spawn location
+	 * @param z the Z coordinate (height) of the npc spawn location
+	 * @param heading the heading of the npc
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the npc is despawned (default: 0)
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int, int, int, int, int, boolean, int, boolean)
+	 */
+	public L2Npc addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay) {
+		return addSpawn(npcId, x, y, z, heading, randomOffset, despawnDelay, false);
+	}
+	
+	/**
+	 * Add a temporary spawn of the specified npc.
+	 * @param npcId the Id of the npc to spawn
+	 * @param x the X coordinate of the npc spawn location
+	 * @param y the Y coordinate of the npc spawn location
+	 * @param z the Z coordinate (height) of the npc spawn location
+	 * @param heading the heading of the npc
+	 * @param randomOffset if {@code true}, adds +/- 50~100 to X/Y coordinates of the spawn location
+	 * @param despawnDelay time in milliseconds till the npc is despawned (default: 0)
+	 * @param isSummonSpawn if {@code true}, displays a summon animation on npc spawn (default: {@code false})
+	 * @return the {@link L2Npc} object of the newly spawned npc or {@code null} if the npc doesn't exist
+	 * @see #addSpawn(int)
+	 * @see #addSpawn(int, int)
+	 * @see #addSpawn(int, L2Character)
+	 * @see #addSpawn(int, L2Character, int)
+	 * @see #addSpawn(int, int, int, int)
+	 * @see #addSpawn(int, L2Character, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, int)
+	 * @see #addSpawn(int, int, int, int, int, boolean, int, boolean)
+	 */
+	public L2Npc addSpawn(int npcId, int x, int y, int z, int heading, boolean randomOffset, int despawnDelay, boolean isSummonSpawn) {
+		return AbstractScript.addSpawn(npcId, x, y, z, heading, randomOffset, despawnDelay, isSummonSpawn);
+	}
+	
+	/**
+	 * Set condition to 1, state to STARTED and play the "ItemSound.quest_accept".<br>
+	 * Works only if state is CREATED and the quest is not a custom quest.
+	 * @return the newly created {@code QuestState} object
+	 */
+	public QuestState startQuest() {
+		return startQuest(true);
+	}
+	
+	/**
+	 * Starts the quest.
+	 * @param playSound if {@code true} plays the accept sound
+	 * @return the quest state
+	 */
+	public QuestState startQuest(boolean playSound) {
+		return startQuest(playSound, 1);
+	}
+	
+	/**
+	 * Starts the quest.
+	 * @param playSound if {@code true} plays the accept sound
+	 * @param cond the cond
+	 * @return the quest state
+	 */
+	public QuestState startQuest(boolean playSound, int cond) {
+		if (isCreated() && !getQuest().isCustom()) {
+			set("cond", cond);
+			setState(State.STARTED);
+			if (playSound) {
+				playSound(Sound.ITEMSOUND_QUEST_ACCEPT);
+			}
+		}
+		return this;
+	}
+	
+	/**
+	 * Finishes the quest and removes all quest items associated with this quest from the player's inventory.<br>
+	 * If {@code type} is {@code QuestType.ONE_TIME}, also removes all other quest data associated with this quest.
+	 * @param type the {@link QuestType} of the quest
+	 * @return this {@link QuestState} object
+	 * @see #exitQuest(QuestType type, boolean playExitQuest)
+	 * @see #exitQuest(boolean repeatable)
+	 * @see #exitQuest(boolean repeatable, boolean playExitQuest)
+	 */
+	public QuestState exitQuest(QuestType type) {
+		if (type == QuestType.DAILY) {
+			exitQuest(false);
+			setRestartTime();
+		} else {
+			exitQuest(type == QuestType.REPEATABLE);
+		}
+		return this;
+	}
+	
+	/**
+	 * Finishes the quest and removes all quest items associated with this quest from the player's inventory.<br>
+	 * If {@code type} is {@code QuestType.ONE_TIME}, also removes all other quest data associated with this quest.
+	 * @param type the {@link QuestType} of the quest
+	 * @param playExitQuest if {@code true}, plays "ItemSound.quest_finish"
+	 * @return this {@link QuestState} object
+	 * @see #exitQuest(QuestType type)
+	 * @see #exitQuest(boolean repeatable)
+	 * @see #exitQuest(boolean repeatable, boolean playExitQuest)
+	 */
+	public QuestState exitQuest(QuestType type, boolean playExitQuest) {
+		exitQuest(type);
+		if (playExitQuest) {
+			playSound(Sound.ITEMSOUND_QUEST_FINISH);
+		}
+		return this;
+	}
+	
+	/**
+	 * Finishes the quest and removes all quest items associated with this quest from the player's inventory.<br>
+	 * If {@code repeatable} is set to {@code false}, also removes all other quest data associated with this quest.
+	 * @param repeatable if {@code true}, deletes all data and variables of this quest, otherwise keeps them
+	 * @return this {@link QuestState} object
+	 * @see #exitQuest(QuestType type)
+	 * @see #exitQuest(QuestType type, boolean playExitQuest)
+	 * @see #exitQuest(boolean repeatable, boolean playExitQuest)
+	 */
+	public QuestState exitQuest(boolean repeatable) {
+		_player.removeNotifyQuestOfDeath(this);
+		
+		if (!isStarted()) {
+			return this;
+		}
+		
+		// Clean registered quest items
+		getQuest().removeRegisteredQuestItems(_player);
+		
+		Quest.deleteQuestInDb(this, repeatable);
+		if (repeatable) {
+			_player.delQuestState(getQuestName());
+			_player.sendPacket(new QuestList());
+		} else {
+			setState(State.COMPLETED);
+		}
+		_vars = null;
+		return this;
+	}
+	
+	/**
+	 * Finishes the quest and removes all quest items associated with this quest from the player's inventory.<br>
+	 * If {@code repeatable} is set to {@code false}, also removes all other quest data associated with this quest.
+	 * @param repeatable if {@code true}, deletes all data and variables of this quest, otherwise keeps them
+	 * @param playExitQuest if {@code true}, plays "ItemSound.quest_finish"
+	 * @return this {@link QuestState} object
+	 * @see #exitQuest(QuestType type)
+	 * @see #exitQuest(QuestType type, boolean playExitQuest)
+	 * @see #exitQuest(boolean repeatable)
+	 */
+	public QuestState exitQuest(boolean repeatable, boolean playExitQuest) {
+		exitQuest(repeatable);
+		if (playExitQuest) {
+			playSound(Sound.ITEMSOUND_QUEST_FINISH);
+		}
+		return this;
+	}
+	
+	/**
+	 * Set the restart time for the daily quests.<br>
+	 * The time is hardcoded at {@link Quest#getResetHour()} hours, {@link Quest#getResetMinutes()} minutes of the following day.<br>
+	 * It can be overridden in scripts (quests).
+	 */
+	public void setRestartTime() {
+		final Calendar reDo = Calendar.getInstance();
+		if (reDo.get(Calendar.HOUR_OF_DAY) >= getQuest().getResetHour()) {
+			reDo.add(Calendar.DATE, 1);
+		}
+		reDo.set(Calendar.HOUR_OF_DAY, getQuest().getResetHour());
+		reDo.set(Calendar.MINUTE, getQuest().getResetMinutes());
+		set("restartTime", String.valueOf(reDo.getTimeInMillis()));
+	}
+	
+	/**
+	 * Check if a daily quest is available to be started over.
+	 * @return {@code true} if the quest is available, {@code false} otherwise.
+	 */
+	public boolean isNowAvailable() {
+		final String val = get("restartTime");
+		return !Util.isDigit(val) || (Long.parseLong(val) <= System.currentTimeMillis());
+	}
+	
+	public void setNRMemo(L2PcInstance talker, int value) {
+		set("NRmemo", String.valueOf(value));
+	}
+	
+	// TODO Check if remover only for basic NRmemo or from all!
+	// TODO Maybe value determine what to be removed?
+	public void removeNRMemo(L2PcInstance talker, int value) {
+		unset("NRmemo");
+	}
+	
+	public void setNRMemoState(L2PcInstance talker, int slot, int value) {
+		set("NRmemoState" + slot, String.valueOf(value));
+	}
+	
+	public int getNRMemoState(L2PcInstance talker, int slot) {
+		return getInt("NRmemoState" + slot);
+	}
+	
+	// TODO Find what unknown do (always 1)
+	public void setNRMemoStateEx(L2PcInstance talker, int slot, int unknown, int value) {
+		set("NRmemoStateEx" + slot, String.valueOf(value));
+	}
+	
+	// TODO Find what unknown do (always 1)
+	public int getNRMemoStateEx(L2PcInstance talker, int slot, int unknown) {
+		return getInt("NRmemoStateEx" + slot);
+	}
+	
+	public boolean haveNRMemo(L2PcInstance talker, int slot) {
+		return getInt("NRmemo") == slot;
+	}
+	
+	public void setNRFlagJournal(L2PcInstance talker, int questId, int flagId) {
+		set("NRFlagJournal", String.valueOf(flagId));
+	}
+	
+	public void setFlagJournal(int flagId) {
+		set("FlagJournal", String.valueOf(flagId));
+	}
+	
+	public void resetFlagJournal(int flagId) {
+		unset("FlagJournal");
+	}
+	
+	/**
+	 * @param castleId
+	 * @return true if castle under TW
+	 */
+	public int getDominionWarState(int castleId) {
+		return TerritoryWarManager.getInstance().isTWInProgress() ? 5 : 0;
+	}
+	
+	public void enableTutorialEvent(L2PcInstance talker, int state) {
+		talker.sendPacket(new TutorialEnableClientEvent(state));
+	}
+	
+	public int getDominionSiegeID(L2PcInstance talker) {
+		return TerritoryWarManager.getInstance().getRegisteredTerritoryId(talker);
+	}
+	
+	public void showQuestionMark(L2PcInstance talker, int number) {
+		talker.sendPacket(new TutorialShowQuestionMark(number));
+	}
+	
+	public void showQuestionMark(int number) {
+		_player.sendPacket(new TutorialShowQuestionMark(number));
+	}
+	
+	public void closeTutorialHtml(L2PcInstance player) {
+		player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/quest/QuestTimer.java b/src/main/java/com/l2jserver/gameserver/model/quest/QuestTimer.java
new file mode 100644
index 00000000..711ef064
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/quest/QuestTimer.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class QuestTimer {
+	protected static final Logger LOG = LoggerFactory.getLogger(QuestTimer.class);
+	
+	public class ScheduleTimerTask implements Runnable {
+		@Override
+		public void run() {
+			if (!getIsActive()) {
+				return;
+			}
+			
+			try {
+				if (!getIsRepeating()) {
+					cancelAndRemove();
+				}
+				getQuest().notifyEvent(getName(), getNpc(), getPlayer());
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	private boolean _isActive = true;
+	private final String _name;
+	private final Quest _quest;
+	private final L2Npc _npc;
+	private final L2PcInstance _player;
+	private final boolean _isRepeating;
+	private final ScheduledFuture<?> _scheduler;
+	
+	public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player, boolean repeating) {
+		_name = name;
+		_quest = quest;
+		_player = player;
+		_npc = npc;
+		_isRepeating = repeating;
+		if (repeating) {
+			_scheduler = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ScheduleTimerTask(), time, time); // Prepare auto end task
+		} else {
+			_scheduler = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleTimerTask(), time); // Prepare auto end task
+		}
+	}
+	
+	public QuestTimer(Quest quest, String name, long time, L2Npc npc, L2PcInstance player) {
+		this(quest, name, time, npc, player, false);
+	}
+	
+	public QuestTimer(QuestState qs, String name, long time) {
+		this(qs.getQuest(), name, time, null, qs.getPlayer(), false);
+	}
+	
+	/**
+	 * Cancel this quest timer.
+	 */
+	public void cancel() {
+		_isActive = false;
+		if (_scheduler != null) {
+			_scheduler.cancel(false);
+		}
+	}
+	
+	/**
+	 * Cancel this quest timer and remove it from the associated quest.
+	 */
+	public void cancelAndRemove() {
+		cancel();
+		_quest.removeQuestTimer(this);
+	}
+	
+	/**
+	 * Compares if this timer matches with the key attributes passed.
+	 * @param quest the quest to which the timer is attached
+	 * @param name the name of the timer
+	 * @param npc the NPC attached to the desired timer (null if no NPC attached)
+	 * @param player the player attached to the desired timer (null if no player attached)
+	 * @return
+	 */
+	public boolean isMatch(Quest quest, String name, L2Npc npc, L2PcInstance player) {
+		if ((quest == null) || (name == null)) {
+			return false;
+		}
+		if ((quest != _quest) || !name.equalsIgnoreCase(getName())) {
+			return false;
+		}
+		return ((npc == _npc) && (player == _player));
+	}
+	
+	public final boolean getIsActive() {
+		return _isActive;
+	}
+	
+	public final boolean getIsRepeating() {
+		return _isRepeating;
+	}
+	
+	public final Quest getQuest() {
+		return _quest;
+	}
+	
+	public final String getName() {
+		return _name;
+	}
+	
+	public final L2Npc getNpc() {
+		return _npc;
+	}
+	
+	public final L2PcInstance getPlayer() {
+		return _player;
+	}
+	
+	@Override
+	public final String toString() {
+		return _name;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/quest/State.java b/src/main/java/com/l2jserver/gameserver/model/quest/State.java
new file mode 100644
index 00000000..119388d2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/quest/State.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+/**
+ * This class merely enumerates the three necessary states for all quests:<br>
+ * <ul>
+ * <li>CREATED: a quest state is created but the quest is not yet accepted.</li>
+ * <li>STARTED: the player has accepted the quest. Quest is currently in progress</li>
+ * <li>COMPLETED: the quest has been completed.</li>
+ * </ul>
+ * In addition, this class defines two functions for lookup and inverse lookup of the state given a name.<br>
+ * This is useful only for saving the state values into the database with a more readable form and then being able to read the string back and remap them to their correct states.<br>
+ * All quests have these and only these states.
+ * @author Luis Arias
+ * @author Fulminus
+ */
+public class State {
+	public static final int CREATED = 0;
+	public static final int STARTED = 1;
+	public static final int COMPLETED = 2;
+	
+	/**
+	 * Get the quest state's string representation from its byte value.
+	 * @param state the byte value of the state
+	 * @return the String representation of the quest state (default: Start)
+	 */
+	public static String getStateName(int state) {
+		return switch (state) {
+			case STARTED -> "Started";
+			case COMPLETED -> "Completed";
+			default -> "Start";
+		};
+	}
+	
+	/**
+	 * Get the quest state's byte value from its string representation.
+	 * @param statename the String representation of the state
+	 * @return the byte value of the quest state (default: 0)
+	 */
+	public static int getStateId(String statename) {
+		return switch (statename) {
+			case "Started" -> 1;
+			case "Completed" -> 2;
+			default -> 0;
+		};
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/AbnormalType.java b/src/main/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
new file mode 100644
index 00000000..b065a5bd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/AbnormalType.java
@@ -0,0 +1,417 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+/**
+ * Abnormal type enumerate.
+ * @author Zoey76
+ */
+public enum AbnormalType {
+	ABILITY_CHANGE,
+	ABNORMAL_INVINCIBILITY,
+	ABNORMAL_ITEM,
+	AB_HAWK_EYE,
+	AGATHION_BUFF,
+	ALL_ATTACK_DOWN,
+	ALL_ATTACK_UP,
+	ALL_REGEN_DOWN,
+	ALL_REGEN_UP,
+	ALL_SPEED_DOWN,
+	ALL_SPEED_UP,
+	ANESTHESIA,
+	ANTARAS_DEBUFF,
+	APELLA,
+	ARCHER_SPECIAL,
+	ARCHER_SPECIAL_I,
+	ARMOR_EARTH,
+	ARMOR_ELEMENT_ALL,
+	ARMOR_FIRE,
+	ARMOR_HOLY,
+	ARMOR_UNHOLY,
+	ARMOR_WATER,
+	ARMOR_WIND,
+	ATTACK_SPEED_UP_BOW,
+	ATTACK_TIME_DOWN,
+	ATTACK_TIME_DOWN_SPECIAL,
+	ATTACK_TIME_UP,
+	ATTRIBUTE_POTION,
+	AVOID_DOWN,
+	AVOID_SKILL,
+	AVOID_UP,
+	AVOID_UP_SPECIAL,
+	BERSERKER,
+	BETRAYAL_MARK,
+	BIG_BODY,
+	BIG_HEAD,
+	BLEEDING,
+	BLESS_THE_BLOOD,
+	BLOCK_RESURRECTION,
+	BLOCK_SHIELD_UP,
+	BLOCK_SPEED_UP,
+	BLOCK_TRANSFORM,
+	BLOOD_CONSTRACT,
+	BOT_PENALTY,
+	BOW_RANGE_UP,
+	BR_EVENT_BUF1,
+	BR_EVENT_BUF10,
+	BR_EVENT_BUF2,
+	BR_EVENT_BUF3,
+	BR_EVENT_BUF4,
+	BR_EVENT_BUF5,
+	BR_EVENT_BUF6,
+	BR_EVENT_BUF7,
+	BR_EVENT_BUF8,
+	BR_EVENT_BUF9,
+	BUFF_QUEEN_OF_CAT,
+	BUFF_UNICORN_SERAPHIM,
+	CANCEL_PROB_DOWN,
+	CASTING_TIME_DOWN,
+	CASTING_TIME_UP,
+	CHAGNE_ATTR_A,
+	CHANGE_ATTR_W,
+	CHEAP_MAGIC,
+	COMBINATION,
+	COUNTER_CRITICAL,
+	COUNTER_CRITICAL_TRIGGER,
+	COUNTER_SKILL,
+	CP_DOWN,
+	CP_REGEN_DOWN,
+	CP_REGEN_UP,
+	CP_UP,
+	CRITICAL_DMG_DOWN,
+	CRITICAL_DMG_UP,
+	CRITICAL_POISON,
+	CRITICAL_PROB_DOWN,
+	CRITICAL_PROB_UP,
+	CURSE_LIFE_FLOW,
+	DAMAGE_AMPLIFY,
+	DANCE_OF_ALIGNMENT,
+	DANCE_OF_AQUA_GUARD,
+	DANCE_OF_BERSERKER,
+	DANCE_OF_BLADESTORM,
+	DANCE_OF_CONCENTRATION,
+	DANCE_OF_EARTH_GUARD,
+	DANCE_OF_FIRE,
+	DANCE_OF_FURY,
+	DANCE_OF_INSPIRATION,
+	DANCE_OF_LIGHT,
+	DANCE_OF_MYSTIC,
+	DANCE_OF_PROTECTION,
+	DANCE_OF_SHADOW,
+	DANCE_OF_SIREN,
+	DANCE_OF_VAMPIRE,
+	DANCE_OF_WARRIOR,
+	DARK_SEED,
+	DD_RESIST,
+	DEATHWORM,
+	DEATH_CLACK,
+	DEATH_MARK,
+	DEATH_PENALTY,
+	DEBUFF_NIGHTSHADE,
+	DEBUFF_SHIELD,
+	DECREASE_WEIGHT_PENALTY,
+	DERANGEMENT,
+	DETECT_WEAKNESS,
+	DISARM,
+	DMG_SHIELD,
+	DOT_ATTR,
+	DOT_MP,
+	DRAGON_BREATH,
+	DUELIST_SPIRIT,
+	DWARF_ATTACK_BUFF,
+	DWARF_DEFENCE_BUFF,
+	EARTH_DOT,
+	ELEMENTAL_ARMOR,
+	ENERGY_OF_TOTEM_1,
+	ENERGY_OF_TOTEM_2,
+	ENERGY_OF_TOTEM_3,
+	ENERGY_OF_TOTEM_4,
+	ENERVATION,
+	ENTRY_FOR_GAME,
+	EVASION_BUFF,
+	EVENT_BAWI,
+	EVENT_BO,
+	EVENT_BUF1,
+	EVENT_BUF10,
+	EVENT_BUF2,
+	EVENT_BUF3,
+	EVENT_BUF4,
+	EVENT_BUF5,
+	EVENT_BUF6,
+	EVENT_BUF7,
+	EVENT_BUF8,
+	EVENT_BUF9,
+	EVENT_GAWI,
+	EVENT_SANTA_REWARD,
+	EVENT_TERRITORY,
+	EVENT_WIN,
+	EVIL_BLOOD,
+	EXPOSE_WEAK_POINT,
+	FATAL_POISON,
+	FINAL_SECRET,
+	FIRE_DOT,
+	FISHING_MASTERY_DOWN,
+	FLY_AWAY,
+	FOCUS_DAGGER,
+	FORCE_MEDITATION,
+	FORCE_OF_DESTRUCTION,
+	FREEZING,
+	HEAL_EFFECT_DOWN,
+	HEAL_EFFECT_UP,
+	HEAL_POWER_UP,
+	HERO_BUFF,
+	HERO_DEBUFF,
+	HIDE,
+	HIT_DOWN,
+	HIT_UP,
+	HOLY_ATTACK,
+	HOT_GROUND,
+	HP_RECOVER,
+	HP_REGEN_DOWN,
+	HP_REGEN_UP,
+	IMPROVE_CRT_RATE_DMG_UP,
+	IMPROVE_HIT_DEFENCE_CRT_RATE_UP,
+	IMPROVE_HP_MP_UP,
+	IMPROVE_MAGIC_SPEED_CRT_RATE_UP,
+	IMPROVE_MA_MD_UP,
+	IMPROVE_PA_PD_UP,
+	IMPROVE_SHIELD_RATE_DEFENCE_UP,
+	IMPROVE_SPEED_AVOID_UP,
+	IMPROVE_VAMPIRIC_HASTE,
+	INSTINCT,
+	INVINCIBILITY,
+	IRON_SHIELD,
+	IRON_SHIELD_I,
+	KAMAEL_SPECIAL,
+	KNIGHT_AURA,
+	KNIGHT_SHIELD,
+	LIFE_FORCE_KAMAEL,
+	LIFE_FORCE_ORC,
+	LIFE_FORCE_OTHERS,
+	LIMIT,
+	MAGICAL_STANCE,
+	MAGIC_CRITICAL_UP,
+	MAJESTY,
+	MAX,
+	MAXIMUM_ABILITY,
+	MAX_BREATH_UP,
+	MAX_HP_DOWN,
+	MAX_HP_UP,
+	MAX_HP_UP_K,
+	MAX_MP_UP,
+	MA_DOWN,
+	MA_MD_UP,
+	MA_UP,
+	MA_UP_HERB,
+	MA_UP_SPECIAL,
+	MD_DOWN,
+	MD_UP,
+	MD_UP_ATTR,
+	MENTAL_IMPOVERISH,
+	MIGHT_MORTAL,
+	MIRAGE,
+	MIRAGE_TRAP,
+	MORALE_UP,
+	MOTION_OF_DEFENCE,
+	MP_COST_DOWN,
+	MP_COST_UP,
+	MP_RECOVER,
+	MP_REGEN_UP,
+	MP_SHIELD,
+	MULTI_BUFF,
+	MULTI_BUFF_A,
+	MULTI_DEBUFF,
+	MULTI_DEBUFF_A,
+	MULTI_DEBUFF_B,
+	MULTI_DEBUFF_C,
+	MULTI_DEBUFF_D,
+	MULTI_DEBUFF_E,
+	MULTI_DEBUFF_EARTH,
+	MULTI_DEBUFF_F,
+	MULTI_DEBUFF_FIRE,
+	MULTI_DEBUFF_G,
+	MULTI_DEBUFF_HOLY,
+	MULTI_DEBUFF_SOUL,
+	MULTI_DEBUFF_UNHOLY,
+	MULTI_DEBUFF_WATER,
+	MULTI_DEBUFF_WIND,
+	NONE,
+	NORMAL_ATTACK_BLOCK,
+	OBLIVION,
+	PARALYZE,
+	PATIENCE,
+	PA_DOWN,
+	PA_PD_UP,
+	PA_UP,
+	PA_UP_HERB,
+	PA_UP_SPECIAL,
+	PD_DOWN,
+	PD_UP,
+	PD_UP_BOW,
+	PD_UP_SPECIAL,
+	PHYSICAL_STANCE,
+	PINCH,
+	PK_PROTECT,
+	POISON,
+	POLEARM_ATTACK,
+	POSSESSION,
+	POSSESSION_SPECIAL,
+	POTION_OF_GENESIS,
+	PRESERVE_ABNORMAL,
+	PROTECTION,
+	PUBLIC_SLOT,
+	PVP_DMG_DOWN,
+	PVP_DMG_UP,
+	PVP_WEAPON_BUFF,
+	PVP_WEAPON_DEBUFF,
+	RAGE_MIGHT,
+	REAL_TARGET,
+	RECHARGE_UP,
+	REDUCE_DROP_PENALTY,
+	REFLECT_ABNORMAL,
+	REFLECT_MAGIC_DD,
+	RESIST_BLEEDING,
+	RESIST_DEBUFF_DISPEL,
+	RESIST_DERANGEMENT,
+	RESIST_HOLY_UNHOLY,
+	RESIST_POISON,
+	RESIST_SHOCK,
+	RESIST_SPIRITLESS,
+	RESURRECTION_SPECIAL,
+	REUSE_DELAY_DOWN,
+	REUSE_DELAY_UP,
+	ROOT_MAGICALLY,
+	ROOT_PHYSICALLY,
+	SEED_BUFF_A,
+	SEED_DEBUFF_A,
+	SEED_DEBUFF_B,
+	SEED_DEBUFF_C,
+	SEED_DEBUFF_D,
+	SEED_DEBUFF_E,
+	SEED_DEBUFF_F,
+	SEED_DEBUFF_G,
+	SEED_DEBUFF_H,
+	SEED_DEBUFF_I,
+	SEED_OF_CRITICAL,
+	SEED_OF_KNIGHT,
+	SEIZURE_A,
+	SEIZURE_B,
+	SEIZURE_C,
+	SEIZURE_PENALTY,
+	SHIELD_DEFENCE_UP,
+	SHIELD_PROB_UP,
+	SIGNAL_A,
+	SIGNAL_B,
+	SIGNAL_C,
+	SIGNAL_D,
+	SIGNAL_E,
+	SIGNAL_G,
+	SILENCE,
+	SILENCE_ALL,
+	SILENCE_PHYSICAL,
+	SKILL_IGNORE,
+	SLEEP,
+	SNIPE,
+	SOA_BUFF1,
+	SOA_BUFF2,
+	SOA_BUFF3,
+	SONG_OF_CHAMPION,
+	SONG_OF_EARTH,
+	SONG_OF_ELEMENTAL,
+	SONG_OF_FLAME_GUARD,
+	SONG_OF_HUNTER,
+	SONG_OF_INVOCATION,
+	SONG_OF_LIFE,
+	SONG_OF_MEDITATION,
+	SONG_OF_PURIFICATION,
+	SONG_OF_RENEWAL,
+	SONG_OF_STORM_GUARD,
+	SONG_OF_VENGEANCE,
+	SONG_OF_VITALITY,
+	SONG_OF_WARDING,
+	SONG_OF_WATER,
+	SONG_OF_WIND,
+	SONG_OF_WINDSTORM,
+	SPA_DISEASE_A,
+	SPA_DISEASE_B,
+	SPA_DISEASE_C,
+	SPA_DISEASE_D,
+	SPEED_DOWN,
+	SPEED_UP,
+	SPEED_UP_SPECIAL,
+	SPITE,
+	SPOIL_BOMB,
+	SSQ_TOWN_BLESSING,
+	SSQ_TOWN_CURSE,
+	STEALTH,
+	STIGMA_A,
+	STIGMA_OF_SILEN,
+	STUN,
+	SUB_TRIGGER_CRT_RATE_UP,
+	SUB_TRIGGER_DEFENCE,
+	SUB_TRIGGER_HASTE,
+	SUB_TRIGGER_SPIRIT,
+	SUMMON_CONDITION,
+	TALISMAN,
+	TARGET_LOCK,
+	THIN_SKIN,
+	THRILL_FIGHT,
+	TIME_BOMB,
+	TIME_CHECK,
+	TOUCH_OF_DEATH,
+	TOUCH_OF_LIFE,
+	TRANSFER_DAMAGE,
+	TRANSFORM,
+	TRANSFORM_HANGOVER,
+	TRANSFORM_SCRIFICE,
+	TRANSFORM_SCRIFICE_P,
+	TURN_FLEE,
+	TURN_PASSIVE,
+	TURN_STONE,
+	T_CRT_DMG_DOWN,
+	T_CRT_DMG_UP,
+	T_CRT_RATE_DOWN,
+	T_CRT_RATE_UP,
+	ULTIMATE_BUFF,
+	ULTIMATE_DEBUFF,
+	VALAKAS_ITEM,
+	VAMPIRIC_ATTACK,
+	VAMPIRIC_ATTACK_SPECIAL,
+	VIBRATION,
+	VOTE,
+	VP_CHANGE,
+	VP_KEEP,
+	VP_UP,
+	WATCHER_GAZE,
+	WATER_DOT,
+	WEAK_CONSTITUTION,
+	WEAPON_MASTERY,
+	WILL,
+	WIND_DOT,
+	WISPERING_OF_BATTLE,
+	WP_CHANGE_EVENT;
+	
+	/**
+	 * Verify if this enumerate is default.
+	 * @return {@code true} if this enumerate is none, {@code false} otherwise
+	 */
+	public boolean isNone() {
+		return this == NONE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/AbnormalVisualEffect.java b/src/main/java/com/l2jserver/gameserver/model/skills/AbnormalVisualEffect.java
new file mode 100644
index 00000000..d5400912
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/AbnormalVisualEffect.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+/**
+ * Abnormal Visual Effect enumerated.
+ * @author DrHouse
+ * @author Zoey76
+ */
+public enum AbnormalVisualEffect {
+	NONE(0x0000000, 0),
+	DOT_BLEEDING(0x00000001, 0),
+	DOT_POISON(0x00000002, 0),
+	DOT_FIRE(0x00000004, 0),
+	DOT_WATER(0x00000008, 0),
+	DOT_WIND(0x00000010, 0),
+	DOT_SOIL(0x00000020, 0),
+	STUN(0x00000040, 0),
+	SLEEP(0x00000080, 0),
+	SILENCE(0x00000100, 0),
+	ROOT(0x00000200, 0),
+	PARALYZE(0x00000400, 0),
+	FLESH_STONE(0x00000800, 0),
+	DOT_MP(0x00001000, 0),
+	BIG_HEAD(0x00002000, 0),
+	DOT_FIRE_AREA(0x00004000, 0),
+	CHANGE_TEXTURE(0x00008000, 0),
+	BIG_BODY(0x00010000, 0),
+	FLOATING_ROOT(0x00020000, 0),
+	DANCE_ROOT(0x00040000, 0),
+	GHOST_STUN(0x00080000, 0),
+	STEALTH(0x00100000, 0),
+	SEIZURE1(0x00200000, 0),
+	SEIZURE2(0x00400000, 0),
+	MAGIC_SQUARE(0x00800000, 0),
+	FREEZING(0x01000000, 0),
+	SHAKE(0x02000000, 0),
+	BLIND(0x04000000, 0),
+	ULTIMATE_DEFENCE(0x08000000, 0),
+	VP_UP(0x10000000, 0),
+	REAL_TARGET(0x20000000, 0),
+	DEATH_MARK(0x40000000, 0),
+	TURN_FLEE(0x80000000, 0),
+	VP_KEEP(0x10000000, 0), // TODO: Find.
+	// Special
+	INVINCIBILITY(0x000001, 1),
+	AIR_BATTLE_SLOW(0x000002, 1),
+	AIR_BATTLE_ROOT(0x000004, 1),
+	CHANGE_WP(0x000008, 1),
+	CHANGE_HAIR_G(0x000010, 1),
+	CHANGE_HAIR_P(0x000020, 1),
+	CHANGE_HAIR_B(0x000040, 1),
+	STIGMA_OF_SILEN(0x000100, 1),
+	SPEED_DOWN(0x000200, 1),
+	FROZEN_PILLAR(0x000400, 1),
+	CHANGE_VES_S(0x000800, 1),
+	CHANGE_VES_C(0x001000, 1),
+	CHANGE_VES_D(0x002000, 1),
+	TIME_BOMB(0x004000, 1), // High Five
+	MP_SHIELD(0x008000, 1), // High Five
+	NEVIT_ADVENT(0x080000, 1), // High Five
+	// Event
+	// TODO: Fix, currently not working.
+	BR_NONE(0x000000, 2),
+	BR_AFRO_NORMAL(0x000001, 2),
+	BR_AFRO_PINK(0x000002, 2),
+	BR_AFRO_GOLD(0x000004, 2),
+	BR_POWER_OF_EVA(0x000008, 2), // High Five
+	BR_HEADPHONE(0x000010, 2), // High Five
+	BR_VESPER1(0x000020, 2),
+	BR_VESPER2(0x000040, 2),
+	BR_VESPER3(0x000080, 2),
+	BR_SOUL_AVATAR(0x000100, 2), // High Five
+	// New High Five
+	CHANGE_7ANNIVERSARY(0, 2); // TODO(Zoey76): Find.
+	
+	/** Int mask. */
+	private final int _mask;
+	/** Type: 0 Normal, 1 Special, 2 Event. */
+	private final int _type;
+	
+	AbnormalVisualEffect(int mask, int type) {
+		_mask = mask;
+		_type = type;
+	}
+	
+	/**
+	 * Gets the int bitmask for the abnormal visual effect.
+	 * @return the int bitmask
+	 */
+	public final int getMask() {
+		return _mask;
+	}
+	
+	/**
+	 * Verify if it's a special abnormal visual effect.
+	 * @return {@code true} it's a special abnormal visual effect, {@code false} otherwise
+	 */
+	public final boolean isSpecial() {
+		return _type == 1;
+	}
+	
+	/**
+	 * Verify if it's an event abnormal visual effect.
+	 * @return {@code true} it's an event abnormal visual effect, {@code false} otherwise
+	 */
+	public final boolean isEvent() {
+		return _type == 2;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/AttributeType.java b/src/main/java/com/l2jserver/gameserver/model/skills/AttributeType.java
new file mode 100644
index 00000000..98aea0e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/AttributeType.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+/**
+ * Attribute type enumerate.
+ * @author Adry_85
+ * @since 2.6.0.0
+ */
+public enum AttributeType {
+	NONE(-2),
+	FIRE(0),
+	WATER(1),
+	WIND(2),
+	EARTH(3),
+	HOLY(4),
+	UNHOLY(5);
+	
+	private final byte _id;
+	
+	AttributeType(int id) {
+		_id = (byte) id;
+	}
+	
+	public byte getId() {
+		return _id;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/BuffInfo.java b/src/main/java/com/l2jserver/gameserver/model/skills/BuffInfo.java
new file mode 100644
index 00000000..3e1026a0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/BuffInfo.java
@@ -0,0 +1,458 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_FEEL_S1_EFFECT;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.CharEffectList;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.effects.EffectTaskInfo;
+import com.l2jserver.gameserver.model.effects.EffectTickTask;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Buff Info.<br>
+ * Complex DTO that holds all the information for a given buff (or debuff or dance/song) set of effects issued by an skill.
+ * @author Zoey76
+ */
+public final class BuffInfo {
+	// Data
+	/** Data. */
+	private final L2Character _effector;
+	private final L2Character _effected;
+	private final Skill _skill;
+	private final int index;
+	/** The effects. */
+	private final List<AbstractEffect> _effects = new ArrayList<>(1);
+	// Tasks
+	/** Effect tasks for ticks. */
+	private volatile Map<AbstractEffect, EffectTaskInfo> _tasks;
+	/** Scheduled future. */
+	private ScheduledFuture<?> _scheduledFutureTimeTask;
+	// Time and ticks
+	/** Abnormal time. */
+	private int _abnormalTime;
+	/** The game ticks at the start of this effect. */
+	private final int _periodStartTicks;
+	// Misc
+	/** If {@code true} then this effect has been cancelled. */
+	private boolean _isRemoved = false;
+	/** If {@code true} then this effect is in use (or has been stop because an Herb took place). */
+	private boolean _isInUse = true;
+	
+	private int _charges = 0;
+	
+	/**
+	 * Buff Info constructor.
+	 * @param effector
+	 * @param effected
+	 * @param index
+	 * @param skill
+	 */
+	public BuffInfo(L2Character effector, L2Character effected, int index, Skill skill) {
+		_effector = effector;
+		_effected = effected;
+		this.index = index;
+		_skill = skill;
+		_abnormalTime = Formulas.calcEffectAbnormalTime(effector, effected, skill);
+		_periodStartTicks = GameTimeController.getInstance().getGameTicks();
+	}
+	
+	public BuffInfo(L2Character effector, L2Character effected, Skill skill) {
+		this(effector, effected, -1, skill);
+	}
+	
+	/**
+	 * Gets the effects on this buff info.
+	 * @return the effects
+	 */
+	public List<AbstractEffect> getEffects() {
+		return _effects;
+	}
+	
+	/**
+	 * Adds an effect to this buff info.
+	 * @param effect the effect to add
+	 */
+	public void addEffect(AbstractEffect effect) {
+		_effects.add(effect);
+	}
+	
+	/**
+	 * Adds an effect task to this buff info.<br>
+	 * Uses double-checked locking to initialize the map if it's necessary.
+	 * @param effect the effect that owns the task
+	 * @param effectTaskInfo the task info
+	 */
+	private void addTask(AbstractEffect effect, EffectTaskInfo effectTaskInfo) {
+		if (_tasks == null) {
+			synchronized (this) {
+				if (_tasks == null) {
+					_tasks = new ConcurrentHashMap<>();
+				}
+			}
+		}
+		_tasks.put(effect, effectTaskInfo);
+	}
+	
+	/**
+	 * Gets the task for the given effect.
+	 * @param effect the effect
+	 * @return the task
+	 */
+	private EffectTaskInfo getEffectTask(AbstractEffect effect) {
+		return (_tasks == null) ? null : _tasks.get(effect);
+	}
+	
+	/**
+	 * Gets the skill that created this buff info.
+	 * @return the skill
+	 */
+	public Skill getSkill() {
+		return _skill;
+	}
+	
+	/**
+	 * Gets the calculated abnormal time.
+	 * @return the abnormal time
+	 */
+	public int getAbnormalTime() {
+		return _abnormalTime;
+	}
+	
+	/**
+	 * Sets the abnormal time.
+	 * @param abnormalTime the abnormal time to set
+	 */
+	public void setAbnormalTime(int abnormalTime) {
+		_abnormalTime = abnormalTime;
+	}
+	
+	/**
+	 * Gets the period start ticks.
+	 * @return the period start
+	 */
+	public int getPeriodStartTicks() {
+		return _periodStartTicks;
+	}
+	
+	/**
+	 * Get the remaining time in seconds for this buff info.
+	 * @return the elapsed time
+	 */
+	public int getTime() {
+		return _abnormalTime - ((GameTimeController.getInstance().getGameTicks() - _periodStartTicks) / GameTimeController.TICKS_PER_SECOND);
+	}
+	
+	/**
+	 * Verify if this buff info has been cancelled.
+	 * @return {@code true} if this buff info has been cancelled, {@code false} otherwise
+	 */
+	public boolean isRemoved() {
+		return _isRemoved;
+	}
+	
+	/**
+	 * Set the buff info to removed.
+	 * @param val the value to set
+	 */
+	public void setRemoved(boolean val) {
+		_isRemoved = val;
+	}
+	
+	/**
+	 * Verify if this buff info is in use.
+	 * @return {@code true} if this buff info is in use, {@code false} otherwise
+	 */
+	public boolean isInUse() {
+		return _isInUse;
+	}
+	
+	/**
+	 * Set the buff info to in use.
+	 * @param val the value to set
+	 */
+	public void setInUse(boolean val) {
+		_isInUse = val;
+	}
+	
+	/**
+	 * Gets the character that launched the buff.
+	 * @return the effector
+	 */
+	public L2Character getEffector() {
+		return _effector;
+	}
+	
+	/**
+	 * Gets the target of the skill.
+	 * @return the effected
+	 */
+	public L2Character getEffected() {
+		return _effected;
+	}
+	
+	/**
+	 * Gets the target's index.
+	 * @return the index
+	 */
+	public int getIndex() {
+		return index;
+	}
+	
+	/**
+	 * Stops all the effects for this buff info.<br>
+	 * Removes effects stats.<br>
+	 * <b>It will not remove the buff info from the effect list</b>.<br>
+	 * Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)}
+	 * @param removed if {@code true} the skill will be handled as removed
+	 */
+	public void stopAllEffects(boolean removed) {
+		setRemoved(removed);
+		// Cancels the task that will end this buff info
+		if ((_scheduledFutureTimeTask != null) && !_scheduledFutureTimeTask.isCancelled()) {
+			_scheduledFutureTimeTask.cancel(true);
+		}
+		finishEffects();
+	}
+	
+	public void initializeEffects() {
+		if ((_effected == null) || (_skill == null)) {
+			return;
+		}
+		
+		// When effects are initialized, the successfully landed.
+		if (_effected.isPlayer() && !_skill.isPassive()) {
+			final var sm = SystemMessage.getSystemMessage(YOU_FEEL_S1_EFFECT);
+			sm.addSkillName(_skill);
+			_effected.sendPacket(sm);
+		}
+		
+		for (var effect : _effects) {
+			if (effect.isInstant() || (_effected.isDead() && !_skill.isPassive())) {
+				continue;
+			}
+			
+			// Call on start.
+			effect.onStart(this);
+			
+			// If it's a continuous effect, if has ticks schedule a task with period, otherwise schedule a simple task to end it.
+			if (effect.getTicks() > 0) {
+				// The task for the effect ticks.
+				final var effectTask = new EffectTickTask(this, effect);
+				final var scheduledFuture = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(effectTask, effect.getTicks() * character().getEffectTickRatio(), effect.getTicks() * character().getEffectTickRatio());
+				// Adds the task for ticking.
+				addTask(effect, new EffectTaskInfo(effectTask, scheduledFuture));
+			}
+			
+			// Add stats.
+			_effected.addStatFuncs(effect.getStatFuncs(_effector, _effected, _skill));
+		}
+		
+		addAbnormalVisualEffects();
+		
+		// Creates a task that will stop all the effects
+		if (_abnormalTime > 0) {
+			_scheduledFutureTimeTask = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(new BuffTimeTask(this), 0, 1000L);
+		}
+	}
+	
+	/**
+	 * Called on each tick.<br>
+	 * Verify if the effect should end and the effect task should be cancelled.
+	 * @param effect the effect that is ticking
+	 * @param tickCount the tick count
+	 */
+	public void onTick(AbstractEffect effect, int tickCount) {
+		boolean continueForever = false;
+		// If the effect is in use, allow it to affect the effected.
+		if (_isInUse) {
+			// Callback for on action time event.
+			continueForever = effect.onActionTime(this);
+		}
+		
+		if (!continueForever && _skill.isToggle()) {
+			final var task = getEffectTask(effect);
+			if (task != null) {
+				task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
+				_effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list.
+			}
+		}
+	}
+	
+	public void finishEffects() {
+		// Cancels the ticking task.
+		if (_tasks != null) {
+			for (EffectTaskInfo effectTask : _tasks.values()) {
+				effectTask.getScheduledFuture().cancel(true); // Don't allow to finish current run.
+			}
+		}
+		// Remove stats
+		removeStats();
+		// Notify on exit.
+		for (AbstractEffect effect : _effects) {
+			// Instant effects shouldn't call onExit(..).
+			if ((effect != null) && !effect.isInstant()) {
+				effect.onExit(this);
+			}
+		}
+		// Remove abnormal visual effects.
+		removeAbnormalVisualEffects();
+		// Set the proper system message.
+		if (!(_effected.isSummon() && !((L2Summon) _effected).getOwner().hasSummon())) {
+			SystemMessageId smId = null;
+			if (_skill.isToggle()) {
+				smId = SystemMessageId.S1_HAS_BEEN_ABORTED;
+			} else if (isRemoved()) {
+				smId = SystemMessageId.EFFECT_S1_HAS_BEEN_REMOVED;
+			} else if (!_skill.isPassive()) {
+				smId = SystemMessageId.S1_HAS_WORN_OFF;
+			}
+			
+			if (smId != null) {
+				final var sm = SystemMessage.getSystemMessage(smId);
+				sm.addSkillName(_skill);
+				_effected.sendPacket(sm);
+			}
+		}
+		// Remove short buff.
+		if (this == _effected.getEffectList().getShortBuff()) {
+			_effected.getEffectList().shortBuffStatusUpdate(null);
+		}
+	}
+	
+	/**
+	 * Applies all the abnormal visual effects to the effected.<br>
+	 * Prevents multiple updates.
+	 */
+	private void addAbnormalVisualEffects() {
+		var updated = false;
+		if (_skill.hasAbnormalVisualEffects()) {
+			_effected.startAbnormalVisualEffect(false, _skill.getAbnormalVisualEffects());
+			updated = true;
+		}
+		
+		if (_effected.isPlayer() && _skill.hasAbnormalVisualEffectsEvent()) {
+			_effected.startAbnormalVisualEffect(false, _skill.getAbnormalVisualEffectsEvent());
+			updated = true;
+		}
+		
+		if (_skill.hasAbnormalVisualEffectsSpecial()) {
+			_effected.startAbnormalVisualEffect(false, _skill.getAbnormalVisualEffectsSpecial());
+			updated = true;
+		}
+		
+		if (updated) {
+			_effected.updateAbnormalEffect();
+		}
+	}
+	
+	/**
+	 * Removes all the abnormal visual effects from the effected.<br>
+	 * Prevents multiple updates.
+	 */
+	private void removeAbnormalVisualEffects() {
+		if ((_effected == null) || (_skill == null)) {
+			return;
+		}
+		
+		var updated = false;
+		if (_skill.hasAbnormalVisualEffects()) {
+			_effected.stopAbnormalVisualEffect(false, _skill.getAbnormalVisualEffects());
+			updated = true;
+		}
+		
+		if (_effected.isPlayer() && _skill.hasAbnormalVisualEffectsEvent()) {
+			_effected.stopAbnormalVisualEffect(false, _skill.getAbnormalVisualEffectsEvent());
+			updated = true;
+		}
+		
+		if (_skill.hasAbnormalVisualEffectsSpecial()) {
+			_effected.stopAbnormalVisualEffect(false, _skill.getAbnormalVisualEffectsSpecial());
+			updated = true;
+		}
+		
+		if (updated) {
+			_effected.updateAbnormalEffect();
+		}
+	}
+	
+	/**
+	 * Adds the buff stats.
+	 */
+	public void addStats() {
+		_effects.forEach(effect -> _effected.addStatFuncs(effect.getStatFuncs(_effector, _effected, _skill)));
+	}
+	
+	/**
+	 * Removes the buff stats.
+	 */
+	public void removeStats() {
+		_effects.forEach(_effected::removeStatsOwner);
+		_effected.removeStatsOwner(_skill);
+	}
+	
+	/**
+	 * Gets the effect tick count.
+	 * @param effect the effect
+	 * @return the current tick count
+	 */
+	public int getTickCount(AbstractEffect effect) {
+		if (_tasks != null) {
+			final EffectTaskInfo effectTaskInfo = _tasks.get(effect);
+			if (effectTaskInfo != null) {
+				return effectTaskInfo.getEffectTask().getTickCount();
+			}
+		}
+		return 0;
+	}
+	
+	/**
+	 * @return the loaded charges
+	 */
+	public int getCharges() {
+		return _charges;
+	}
+	
+	/**
+	 * @param charges set loaded charges
+	 */
+	public void setCharges(int charges) {
+		_charges = charges;
+	}
+	
+	@Override
+	public String toString() {
+		return "BuffInfo [effector=" + _effector + ", effected=" + _effected + ", skill=" + _skill + ", effects=" + _effects + ", tasks=" + _tasks + ", scheduledFutureTimeTask=" + _scheduledFutureTimeTask + ", abnormalTime=" + _abnormalTime + ", periodStartTicks=" + _periodStartTicks
+			+ ", isRemoved=" + _isRemoved + ", isInUse=" + _isInUse + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/BuffTimeTask.java b/src/main/java/com/l2jserver/gameserver/model/skills/BuffTimeTask.java
new file mode 100644
index 00000000..d99b745d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/BuffTimeTask.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Effect time task finish the effect when the abnormal time is reached.
+ * @author Zoey76
+ */
+public class BuffTimeTask implements Runnable {
+	private final AtomicInteger _time = new AtomicInteger();
+	private final BuffInfo _info;
+	
+	/**
+	 * EffectTimeTask constructor.
+	 * @param info the buff info
+	 */
+	public BuffTimeTask(BuffInfo info) {
+		_info = info;
+	}
+	
+	/**
+	 * Gets the elapsed time.
+	 * @return the tick count
+	 */
+	public int getElapsedTime() {
+		return _time.get();
+	}
+	
+	@Override
+	public void run() {
+		if (_time.incrementAndGet() > _info.getAbnormalTime()) {
+			_info.getEffected().getEffectList().stopSkillEffects(false, _info.getSkill().getId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/CommonSkill.java b/src/main/java/com/l2jserver/gameserver/model/skills/CommonSkill.java
new file mode 100644
index 00000000..8085deee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/CommonSkill.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+
+/**
+ * An Enum to hold some important references to commonly used skills
+ * @author DrHouse
+ */
+public enum CommonSkill {
+	RAID_CURSE(4215, 1),
+	RAID_CURSE2(4515, 1),
+	SEAL_OF_RULER(246, 1),
+	BUILD_HEADQUARTERS(247, 1),
+	WYVERN_BREATH(4289, 1),
+	STRIDER_SIEGE_ASSAULT(325, 1),
+	FIREWORK(5965, 1),
+	LARGE_FIREWORK(2025, 1),
+	BLESSING_OF_PROTECTION(5182, 1),
+	VOID_BURST(3630, 1),
+	VOID_FLOW(3631, 1),
+	THE_VICTOR_OF_WAR(5074, 1),
+	THE_VANQUISHED_OF_WAR(5075, 1),
+	SPECIAL_TREE_RECOVERY_BONUS(2139, 1),
+	WEAPON_GRADE_PENALTY(6209, 1),
+	ARMOR_GRADE_PENALTY(6213, 1),
+	CREATE_DWARVEN(172, 1),
+	LUCKY(194, 1),
+	EXPERTISE(239, 1),
+	CRYSTALLIZE(248, 1),
+	ONYX_BEAST_TRANSFORMATION(617, 1),
+	CREATE_COMMON(1320, 1),
+	DIVINE_INSPIRATION(1405, 1),
+	SERVITOR_SHARE(1557, 1),
+	CARAVANS_SECRET_MEDICINE(2341, 1);
+	
+	private final SkillHolder _holder;
+	
+	CommonSkill(int id, int level) {
+		_holder = new SkillHolder(id, level);
+	}
+	
+	public int getId() {
+		return _holder.getSkillId();
+	}
+	
+	public int getLevel() {
+		return _holder.getSkillLvl();
+	}
+	
+	public Skill getSkill() {
+		return _holder.getSkill();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/EffectScope.java b/src/main/java/com/l2jserver/gameserver/model/skills/EffectScope.java
new file mode 100644
index 00000000..6b9c2f8c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/EffectScope.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+/**
+ * @author NosBit
+ */
+public enum EffectScope {
+	GENERAL,
+	START,
+	SELF,
+	PASSIVE,
+	CHANNELING,
+	PVP,
+	PVE,
+	END
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/RideState.java b/src/main/java/com/l2jserver/gameserver/model/skills/RideState.java
new file mode 100644
index 00000000..6afc8d8c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/RideState.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+/**
+ * Ride state enumerated.
+ * @author Zoey76
+ */
+public enum RideState {
+	/** Riding nothing. */
+	NONE,
+	/** Riding a strider. */
+	STRIDER,
+	/** Riding a wolf. */
+	WOLF,
+	/** Riding a wyvern. */
+	WYVERN
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/Skill.java b/src/main/java/com/l2jserver/gameserver/model/skills/Skill.java
new file mode 100644
index 00000000..c3377b1f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/Skill.java
@@ -0,0 +1,1394 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+import com.l2jserver.gameserver.model.ArenaParticipantsHolder;
+import com.l2jserver.gameserver.model.L2ExtractableProductItem;
+import com.l2jserver.gameserver.model.L2ExtractableSkill;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2BlockInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
+import com.l2jserver.gameserver.model.skills.targets.AffectObject;
+import com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl;
+import com.l2jserver.gameserver.model.skills.targets.AffectScope;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Formulas;
+import com.l2jserver.gameserver.model.stats.TraitType;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+import com.l2jserver.gameserver.model.stats.functions.FuncTemplate;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class Skill implements IIdentifiable {
+	private static final Logger LOG = LoggerFactory.getLogger(Skill.class);
+	
+	/** Skill ID. */
+	private final int _id;
+	/** Skill level. */
+	private final int _level;
+	/** Custom skill ID displayed by the client. */
+	private final int _displayId;
+	/** Custom skill level displayed by the client. */
+	private final int _displayLevel;
+	/** Skill client's name. */
+	private final String _name;
+	/** Operative type: passive, active, toggle. */
+	private final SkillOperateType _operateType;
+	private final int _magic;
+	private final TraitType _traitType;
+	private final boolean _reuseDelayLock;
+	/** Initial MP consumption. */
+	private final int _mpConsume1;
+	/** MP consumption. */
+	private final int _mpConsume2;
+	/** MP consumption per channeling. */
+	private final int _mpPerChanneling;
+	/** HP consumption. */
+	private final int _hpConsume;
+	/** Amount of items consumed by this skill from caster. */
+	private final int _itemConsumeCount;
+	/** Id of item consumed by this skill from caster. */
+	private final int _itemConsumeId;
+	/** Cast range: how far can be the target. */
+	private final int _castRange;
+	/** Effect range: how far the skill affect the target. */
+	private final int _effectRange;
+	/** Abnormal instant, used for herbs mostly. */
+	private final boolean _isAbnormalInstant;
+	/** Abnormal level, global effect level. */
+	private final int _abnormalLvl;
+	/** Abnormal type: global effect "group". */
+	private final AbnormalType _abnormalType;
+	/** Abnormal time: global effect duration time. */
+	private final int _abnormalTime;
+	/** Abnormal visual effect: the visual effect displayed in game. */
+	private AbnormalVisualEffect[] _abnormalVisualEffects = null;
+	/** Abnormal visual effect special: the visual effect displayed in game. */
+	private AbnormalVisualEffect[] _abnormalVisualEffectsSpecial = null;
+	/** Abnormal visual effect event: the visual effect displayed in game. */
+	private AbnormalVisualEffect[] _abnormalVisualEffectsEvent = null;
+	/** If {@code true} this skill's effect should stay after death. */
+	private final boolean _stayAfterDeath;
+	/** If {@code true} this skill's effect should stay after class-subclass change. */
+	private final boolean _stayOnSubclassChange;
+	/** If {@code true} this skill's effect recovery HP/MP or CP from herb. */
+	private final boolean _isRecoveryHerb;
+	
+	private int _refId;
+	// all times in milliseconds
+	private final int hitTime;
+	private final int hitCancelTime;
+	private final int _coolTime;
+	private final int _reuseHashCode;
+	private final int _reuseDelay;
+	
+	// base success chance
+	private final int _magicLevel;
+	private final int _lvlBonusRate;
+	private final int _activateRate;
+	private final int _minChance;
+	private final int _maxChance;
+	
+	private final int[] affectLimit;
+	private AffectObject affectObject;
+	private final int affectRange;
+	private AffectScope affectScope;
+	private TargetType targetType;
+	private final int[] fanRange;
+	
+	private final boolean _nextActionIsAttack;
+	
+	private final boolean _blockedInOlympiad;
+	
+	private final AttributeType _attributeType;
+	private final int _attributePower;
+	
+	private final BaseStats _basicProperty;
+	
+	private final boolean _overhit;
+	
+	private final int _minPledgeClass;
+	private final int _chargeConsume;
+	private final int _soulMaxConsume;
+	
+	private final int _effectPoint;
+	// Condition lists
+	private List<Condition> _preCondition;
+	private List<Condition> _itemPreCondition;
+	private Set<MountType> _rideState;
+	// Function lists
+	private List<FuncTemplate> _funcTemplates;
+	
+	private final Map<EffectScope, List<AbstractEffect>> _effectLists = new EnumMap<>(EffectScope.class);
+	
+	private final boolean _isDebuff;
+	
+	private final boolean _isSuicideAttack;
+	private final boolean _irreplaceableBuff;
+	
+	private final boolean _excludedFromCheck;
+	private final boolean _simultaneousCast;
+	
+	private L2ExtractableSkill _extractableItems = null;
+	
+	private final String _icon;
+	
+	private volatile Byte[] _effectTypes;
+	
+	// Channeling data
+	private final int _channelingSkillId;
+	private final int _channelingTickInitialDelay;
+	private final int _channelingTickInterval;
+	
+	public Skill(StatsSet set) {
+		_id = set.getInt("skill_id");
+		_level = set.getInt("level");
+		_displayId = set.getInt("displayId", _id);
+		_displayLevel = set.getInt("displayLevel", _level);
+		_name = set.getString("name", "");
+		_operateType = set.getEnum("operateType", SkillOperateType.class);
+		_magic = set.getInt("isMagic", 0);
+		_traitType = set.getEnum("trait", TraitType.class, TraitType.NONE);
+		_reuseDelayLock = set.getBoolean("reuseDelayLock", false);
+		_mpConsume1 = set.getInt("mpConsume1", 0);
+		_mpConsume2 = set.getInt("mpConsume2", 0);
+		_mpPerChanneling = set.getInt("mpPerChanneling", _mpConsume2);
+		_hpConsume = set.getInt("hpConsume", 0);
+		_itemConsumeCount = set.getInt("itemConsumeCount", 0);
+		_itemConsumeId = set.getInt("itemConsumeId", 0);
+		
+		_castRange = set.getInt("castRange", -1);
+		_effectRange = set.getInt("effectRange", -1);
+		_abnormalLvl = set.getInt("abnormalLvl", 0);
+		_abnormalType = set.getEnum("abnormalType", AbnormalType.class, AbnormalType.NONE);
+		
+		int abnormalTime = set.getInt("abnormalTime", 0);
+		final var skillDuration = character().getSkillDuration().get(_id);
+		if (character().modifySkillDuration() && (skillDuration != null)) {
+			if ((getLevel() < 100) || (getLevel() > 140)) {
+				abnormalTime = skillDuration;
+			} else if (getLevel() < 140) {
+				abnormalTime += skillDuration;
+			}
+		}
+		
+		_abnormalTime = abnormalTime;
+		_isAbnormalInstant = set.getBoolean("abnormalInstant", false);
+		parseAbnormalVisualEffect(set.getString("abnormalVisualEffect", null));
+		
+		_stayAfterDeath = set.getBoolean("stayAfterDeath", false);
+		_stayOnSubclassChange = set.getBoolean("stayOnSubclassChange", true);
+		
+		hitTime = set.getInt("hitTime", 0);
+		hitCancelTime = set.getInt("hitCancelTime", 0);
+		_coolTime = set.getInt("coolTime", 0);
+		_isDebuff = set.getBoolean("isDebuff", false);
+		_isRecoveryHerb = set.getBoolean("isRecoveryHerb", false);
+		_reuseHashCode = SkillData.getSkillHashCode(_id, _level);
+		
+		final var skillReuse = character().getSkillReuse().get(_id);
+		if (character().modifySkillReuse() && (skillReuse != null)) {
+			if (general().debug()) {
+				LOG.info("*** Skill {} ({}) changed reuse from {} to {} seconds.", _name, _level, set.getInt("reuseDelay", 0), skillReuse);
+			}
+			_reuseDelay = skillReuse;
+		} else {
+			_reuseDelay = set.getInt("reuseDelay", 0);
+		}
+		
+		final String rideState = set.getString("rideState", null);
+		if (rideState != null) {
+			String[] state = rideState.split(";");
+			if (state.length > 0) {
+				_rideState = new HashSet<>(state.length);
+				for (String s : state) {
+					try {
+						_rideState.add(MountType.valueOf(s));
+					} catch (Exception e) {
+						LOG.warn("Bad data in rideState for skill {}!", this, e);
+					}
+				}
+			}
+		}
+		
+		affectLimit = set.getIntArray("affectLimit", "0-0", "-");
+		affectObject = set.getEnum("affectObject", AffectObjectStaticImpl.class, AffectObjectStaticImpl.ALL);
+		affectScope = isToggle() ? AffectScope.SINGLE : set.getEnum("affectScope", AffectScope.class, AffectScope.NONE);
+		affectRange = set.getInt("affectRange", 0);
+		targetType = set.getEnum("targetType", TargetType.class, TargetType.SELF);
+		fanRange = set.getIntArray("fanRange", "0,0,0,0", ",");
+		
+		_magicLevel = set.getInt("magicLvl", 0);
+		_lvlBonusRate = set.getInt("lvlBonusRate", 0);
+		_activateRate = set.getInt("activateRate", -1);
+		_minChance = set.getInt("minChance", character().getMinAbnormalStateSuccessRate());
+		_maxChance = set.getInt("maxChance", character().getMaxAbnormalStateSuccessRate());
+		
+		_nextActionIsAttack = set.getBoolean("nextActionAttack", false);
+		
+		_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
+		
+		_attributeType = set.getEnum("attributeType", AttributeType.class, AttributeType.NONE);
+		_attributePower = set.getInt("attributePower", 0);
+		
+		_basicProperty = set.getEnum("basicProperty", BaseStats.class, BaseStats.NONE);
+		
+		_overhit = set.getBoolean("overHit", false);
+		_isSuicideAttack = set.getBoolean("isSuicideAttack", false);
+		
+		_minPledgeClass = set.getInt("minPledgeClass", 0);
+		_chargeConsume = set.getInt("chargeConsume", 0);
+		
+		_soulMaxConsume = set.getInt("soulMaxConsumeCount", 0);
+		
+		_effectPoint = set.getInt("effectPoint", 0);
+		
+		_irreplaceableBuff = set.getBoolean("irreplaceableBuff", false);
+		
+		_excludedFromCheck = set.getBoolean("excludedFromCheck", false);
+		_simultaneousCast = set.getBoolean("simultaneousCast", false);
+		
+		String capsuled_items = set.getString("capsuled_items_skill", null);
+		if (capsuled_items != null) {
+			if (capsuled_items.isEmpty()) {
+				LOG.warn("Empty Extractable Item Skill data in Skill Id: {}", _id);
+			}
+			
+			_extractableItems = parseExtractableSkill(_id, _level, capsuled_items);
+		}
+		
+		_icon = set.getString("icon", "icon.skill0000");
+		
+		_channelingSkillId = set.getInt("channelingSkillId", 0);
+		_channelingTickInterval = set.getInt("channelingTickInterval", 2) * 1000;
+		_channelingTickInitialDelay = set.getInt("channelingTickInitialDelay", _channelingTickInterval / 1000) * 1000;
+	}
+	
+	// TODO(Zoey76): Remove this after all skills are migrated.
+	public void updateTargetSystem(TargetType targetType, AffectScope affectScope, AffectObject affectObject) {
+		this.targetType = targetType;
+		this.affectScope = affectScope;
+		this.affectObject = affectObject;
+	}
+	
+	public TraitType getTraitType() {
+		return _traitType;
+	}
+	
+	public AttributeType getAttributeType() {
+		return _attributeType;
+	}
+	
+	public int getAttributePower() {
+		return _attributePower;
+	}
+	
+	public TargetType getTargetType() {
+		return targetType;
+	}
+	
+	public boolean isAOE() {
+		return (affectScope == AffectScope.FAN) ||
+			(affectScope == AffectScope.POINT_BLANK) ||
+			(affectScope == AffectScope.RANGE) ||
+			(affectScope == AffectScope.RANGE_SORT_BY_HP) ||
+			(affectScope == AffectScope.RING_RANGE) ||
+			(affectScope == AffectScope.SQUARE) ||
+			(affectScope == AffectScope.SQUARE_PB);
+	}
+	
+	public boolean isDamage() {
+		return hasEffectType(L2EffectType.MAGICAL_ATTACK, L2EffectType.HP_DRAIN, L2EffectType.PHYSICAL_ATTACK);
+	}
+	
+	public boolean isOverhit() {
+		return _overhit;
+	}
+	
+	public boolean isSuicideAttack() {
+		return _isSuicideAttack;
+	}
+	
+	/**
+	 * Verify if this skill is abnormal instant.<br>
+	 * Herb buff skills yield {@code true} for this check.
+	 * @return {@code true} if the skill is abnormal instant, {@code false} otherwise
+	 */
+	public boolean isAbnormalInstant() {
+		return _isAbnormalInstant;
+	}
+	
+	/**
+	 * Gets the skill abnormal type.
+	 * @return the abnormal type
+	 */
+	public AbnormalType getAbnormalType() {
+		return _abnormalType;
+	}
+	
+	/**
+	 * Gets the skill abnormal level.
+	 * @return the skill abnormal level
+	 */
+	public int getAbnormalLvl() {
+		return _abnormalLvl;
+	}
+	
+	/**
+	 * Gets the skill abnormal time.<br>
+	 * Is the base to calculate the duration of the continuous effects of this skill.
+	 * @return the abnormal time
+	 */
+	public int getAbnormalTime() {
+		return _abnormalTime;
+	}
+	
+	/**
+	 * Gets the skill abnormal visual effect.
+	 * @return the abnormal visual effect
+	 */
+	public AbnormalVisualEffect[] getAbnormalVisualEffects() {
+		return _abnormalVisualEffects;
+	}
+	
+	/**
+	 * Verify if the skill has abnormal visual effects.
+	 * @return {@code true} if the skill has abnormal visual effects, {@code false} otherwise
+	 */
+	public boolean hasAbnormalVisualEffects() {
+		return (_abnormalVisualEffects != null) && (_abnormalVisualEffects.length > 0);
+	}
+	
+	/**
+	 * Gets the skill special abnormal visual effect.
+	 * @return the abnormal visual effect
+	 */
+	public AbnormalVisualEffect[] getAbnormalVisualEffectsSpecial() {
+		return _abnormalVisualEffectsSpecial;
+	}
+	
+	/**
+	 * Verify if the skill has special abnormal visual effects.
+	 * @return {@code true} if the skill has special abnormal visual effects, {@code false} otherwise
+	 */
+	public boolean hasAbnormalVisualEffectsSpecial() {
+		return (_abnormalVisualEffectsSpecial != null) && (_abnormalVisualEffectsSpecial.length > 0);
+	}
+	
+	/**
+	 * Gets the skill event abnormal visual effect.
+	 * @return the abnormal visual effect
+	 */
+	public AbnormalVisualEffect[] getAbnormalVisualEffectsEvent() {
+		return _abnormalVisualEffectsEvent;
+	}
+	
+	/**
+	 * Verify if the skill has event abnormal visual effects.
+	 * @return {@code true} if the skill has event abnormal visual effects, {@code false} otherwise
+	 */
+	public boolean hasAbnormalVisualEffectsEvent() {
+		return (_abnormalVisualEffectsEvent != null) && (_abnormalVisualEffectsEvent.length > 0);
+	}
+	
+	/**
+	 * Gets the skill magic level.
+	 * @return the skill magic level
+	 */
+	public int getMagicLevel() {
+		return _magicLevel;
+	}
+	
+	public int getLvlBonusRate() {
+		return _lvlBonusRate;
+	}
+	
+	public int getActivateRate() {
+		return _activateRate;
+	}
+	
+	/**
+	 * Return custom minimum skill/effect chance.
+	 */
+	public int getMinChance() {
+		return _minChance;
+	}
+	
+	/**
+	 * Return custom maximum skill/effect chance.
+	 */
+	public int getMaxChance() {
+		return _maxChance;
+	}
+	
+	/**
+	 * Return true if skill effects should be removed on any action except movement
+	 */
+	public boolean isRemovedOnAnyActionExceptMove() {
+		return (_abnormalType == AbnormalType.INVINCIBILITY) || (_abnormalType == AbnormalType.HIDE);
+	}
+	
+	/**
+	 * @return {@code true} if skill effects should be removed on damage
+	 */
+	public boolean isRemovedOnDamage() {
+		return (_abnormalType == AbnormalType.SLEEP) || (_abnormalType == AbnormalType.FORCE_MEDITATION) || (_abnormalType == AbnormalType.HIDE);
+	}
+	
+	/**
+	 * @return {@code true} if skill can not be used in olympiad.
+	 */
+	public boolean isBlockedInOlympiad() {
+		return _blockedInOlympiad;
+	}
+	
+	/**
+	 * Return the additional effect Id.
+	 */
+	public int getChannelingSkillId() {
+		return _channelingSkillId;
+	}
+	
+	/**
+	 * Return true if character should attack target after skill
+	 */
+	public boolean nextActionIsAttack() {
+		return _nextActionIsAttack;
+	}
+	
+	public int getCastRange() {
+		return _castRange;
+	}
+	
+	public int getEffectRange() {
+		return _effectRange;
+	}
+	
+	public int getHpConsume() {
+		return _hpConsume;
+	}
+	
+	@Override
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Verify if this skill is a debuff.
+	 * @return {@code true} if this skill is a debuff, {@code false} otherwise
+	 */
+	public boolean isDebuff() {
+		return _isDebuff;
+	}
+	
+	/**
+	 * Verify if this skill is coming from Recovery Herb.
+	 * @return {@code true} if this skill is a recover herb, {@code false} otherwise
+	 */
+	public boolean isRecoveryHerb() {
+		return _isRecoveryHerb;
+	}
+	
+	public int getDisplayId() {
+		return _displayId;
+	}
+	
+	public int getDisplayLevel() {
+		return _displayLevel;
+	}
+	
+	/**
+	 * Return skill basicProperty base stat (STR, INT ...).
+	 */
+	public BaseStats getBasicProperty() {
+		return _basicProperty;
+	}
+	
+	/**
+	 * @return Returns the how much items will be consumed.
+	 */
+	public int getItemConsumeCount() {
+		return _itemConsumeCount;
+	}
+	
+	/**
+	 * @return Returns the ID of item for consume.
+	 */
+	public int getItemConsumeId() {
+		return _itemConsumeId;
+	}
+	
+	public int getLevel() {
+		return _level;
+	}
+	
+	public boolean isPhysical() {
+		return _magic == 0;
+	}
+	
+	public boolean isMagic() {
+		return _magic == 1;
+	}
+	
+	public boolean isStatic() {
+		return _magic == 2;
+	}
+	
+	public boolean isDance() {
+		return _magic == 3;
+	}
+	
+	public boolean isTrigger() {
+		return _magic == 4;
+	}
+	
+	public boolean isReuseDelayLocked() {
+		return _reuseDelayLock;
+	}
+	
+	public int getMpConsume1() {
+		return _mpConsume1;
+	}
+	
+	public int getMpConsume2() {
+		return _mpConsume2;
+	}
+	
+	public int getMpPerChanneling() {
+		return _mpPerChanneling;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int getReuseDelay() {
+		return _reuseDelay;
+	}
+	
+	public int getReuseHashCode() {
+		return _reuseHashCode;
+	}
+	
+	public int getHitTime() {
+		return hitTime;
+	}
+	
+	public int getHitCancelTime() {
+		return hitCancelTime;
+	}
+	
+	public int getCoolTime() {
+		return _coolTime;
+	}
+	
+	public int getAffectLimit() {
+		if (affectLimit[1] == 0) {
+			return 0;
+		}
+		return affectLimit[0] + Rnd.get(affectLimit[1]);
+	}
+	
+	public AffectObject getAffectObject() {
+		return affectObject;
+	}
+	
+	public int getAffectRange() {
+		return affectRange;
+	}
+	
+	public AffectScope getAffectScope() {
+		return affectScope;
+	}
+	
+	public int[] getFanRange() {
+		return fanRange;
+	}
+	
+	public boolean isActive() {
+		return (_operateType != null) && _operateType.isActive();
+	}
+	
+	public boolean isPassive() {
+		return (_operateType != null) && _operateType.isPassive();
+	}
+	
+	public boolean isToggle() {
+		return (_operateType != null) && _operateType.isToggle();
+	}
+	
+	public boolean isContinuous() {
+		return ((_operateType != null) && _operateType.isContinuous()) || isSelfContinuous();
+	}
+	
+	public boolean isSelfContinuous() {
+		return (_operateType != null) && _operateType.isSelfContinuous();
+	}
+	
+	public boolean isChanneling() {
+		return (_operateType != null) && _operateType.isChanneling();
+	}
+	
+	public boolean isFlyType() {
+		return (_operateType != null) && _operateType.isFlyType();
+	}
+	
+	/**
+	 * Verify if the skill is a transformation skill.
+	 * @return {@code true} if the skill is a transformation, {@code false} otherwise
+	 */
+	public boolean isTransformation() {
+		return _abnormalType == AbnormalType.TRANSFORM;
+	}
+	
+	public int getEffectPoint() {
+		return _effectPoint;
+	}
+	
+	public boolean useSoulShot() {
+		return hasEffectType(L2EffectType.PHYSICAL_ATTACK);
+	}
+	
+	public boolean useSpiritShot() {
+		return _magic == 1;
+	}
+	
+	public boolean useFishShot() {
+		return hasEffectType(L2EffectType.FISHING);
+	}
+	
+	public int getMinPledgeClass() {
+		return _minPledgeClass;
+	}
+	
+	public boolean isHeroSkill() {
+		return SkillTreesData.getInstance().isHeroSkill(_id, _level);
+	}
+	
+	public boolean isGMSkill() {
+		return SkillTreesData.getInstance().isGMSkill(_id, _level);
+	}
+	
+	public boolean is7Signs() {
+		return (_id > 4360) && (_id < 4367);
+	}
+	
+	/**
+	 * Verify if this is a healing potion skill.
+	 * @return {@code true} if this is a healing potion skill, {@code false} otherwise
+	 */
+	public boolean isHealingPotionSkill() {
+		return getAbnormalType() == AbnormalType.HP_RECOVER;
+	}
+	
+	public int getChargeConsume() {
+		return _chargeConsume;
+	}
+	
+	public int getMaxSoulConsumeCount() {
+		return _soulMaxConsume;
+	}
+	
+	public boolean isStayAfterDeath() {
+		return _stayAfterDeath;
+	}
+	
+	public boolean isStayOnSubclassChange() {
+		return _stayOnSubclassChange;
+	}
+	
+	public boolean isBad() {
+		return (_effectPoint < 0) && (targetType != TargetType.SELF) && (targetType != TargetType.SUMMON);
+	}
+	
+	public boolean checkCondition(L2Character activeChar, L2Object object, boolean itemOrWeapon) {
+		if (activeChar.canOverrideCond(PcCondOverride.SKILL_CONDITIONS) && !general().gmSkillRestriction()) {
+			return true;
+		}
+		
+		if (activeChar.isPlayer() && !canBeUseWhileRiding((L2PcInstance) activeChar)) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addSkillName(_id);
+			activeChar.sendPacket(sm);
+			return false;
+		}
+		
+		final List<Condition> preCondition = itemOrWeapon ? _itemPreCondition : _preCondition;
+		if ((preCondition == null) || preCondition.isEmpty()) {
+			return true;
+		}
+		
+		final L2Character target = (object instanceof L2Character) ? (L2Character) object : null;
+		for (Condition cond : preCondition) {
+			if (!cond.test(activeChar, target, this)) {
+				final String msg = cond.getMessage();
+				final int msgId = cond.getMessageId();
+				if (msgId != 0) {
+					final SystemMessage sm = SystemMessage.getSystemMessage(msgId);
+					if (cond.isAddName()) {
+						sm.addSkillName(_id);
+					}
+					activeChar.sendPacket(sm);
+				} else if (msg != null) {
+					activeChar.sendMessage(msg);
+				}
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Checks if a player can use this skill while riding.
+	 * @param player the player
+	 * @return {@code true} if the player can use this skill, {@code false} otherwise
+	 */
+	public boolean canBeUseWhileRiding(final L2PcInstance player) {
+		return (_rideState == null) || _rideState.contains(player.getMountType());
+	}
+	
+	public List<L2Object> getTargets(L2Character creature) {
+		return getTargets(creature, creature.getTarget());
+	}
+	
+	public List<L2Object> getTargets(L2Character creature, L2Object target) {
+		return targetType.getTargets(this, creature, target);
+	}
+	
+	/**
+	 * Check if should be target added to the target list false if target is dead, target same as caster,<br>
+	 * target inside peace zone, target in the same party with caster, caster can see target Additional checks if not in PvP zones (arena, siege):<br>
+	 * target in not the same clan and alliance with caster, and usual skill PvP check. If TvT event is active - performing additional checks. Caution: distance is not checked.
+	 * @param caster
+	 * @param target
+	 * @param skill
+	 * @param sourceInArena
+	 * @return
+	 */
+	@Deprecated
+	public static boolean checkForAreaOffensiveSkills(L2Character caster, L2Character target, Skill skill, boolean sourceInArena) {
+		if ((target == null) || target.isDead() || (target == caster)) {
+			return false;
+		}
+		
+		final L2PcInstance player = caster.getActingPlayer();
+		final L2PcInstance targetPlayer = target.getActingPlayer();
+		if (player != null) {
+			if (targetPlayer != null) {
+				if ((targetPlayer == caster) || (targetPlayer == player)) {
+					return false;
+				}
+				
+				if (targetPlayer.inObserverMode()) {
+					return false;
+				}
+				
+				if (skill.isBad() && (player.getSiegeState() > 0) && player.isInsideZone(ZoneId.SIEGE) && (player.getSiegeState() == targetPlayer.getSiegeState()) && (player.getSiegeSide() == targetPlayer.getSiegeSide())) {
+					return false;
+				}
+				
+				if (skill.isBad() && target.isInsideZone(ZoneId.PEACE)) {
+					return false;
+				}
+				
+				if (player.isInParty() && targetPlayer.isInParty()) {
+					// Same party
+					if (player.getParty().getLeaderObjectId() == targetPlayer.getParty().getLeaderObjectId()) {
+						return false;
+					}
+					
+					// Same command channel
+					if (player.getParty().isInCommandChannel() && (player.getParty().getCommandChannel() == targetPlayer.getParty().getCommandChannel())) {
+						return false;
+					}
+				}
+				
+				if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill)) {
+					return false;
+				}
+				
+				if (!sourceInArena && !(targetPlayer.isInsideZone(ZoneId.PVP) && !targetPlayer.isInsideZone(ZoneId.SIEGE))) {
+					if ((player.getAllyId() != 0) && (player.getAllyId() == targetPlayer.getAllyId())) {
+						return false;
+					}
+					
+					if ((player.getClanId() != 0) && (player.getClanId() == targetPlayer.getClanId())) {
+						return false;
+					}
+					
+					if (!player.checkPvpSkill(targetPlayer, skill)) {
+						return false;
+					}
+				}
+			}
+		} else {
+			// target is mob
+			if ((targetPlayer == null) && (target instanceof L2Attackable) && (caster instanceof L2Attackable)) {
+				return false;
+			}
+		}
+		return GeoData.getInstance().canSeeTarget(caster, target);
+	}
+	
+	public List<AbstractFunction> getStatFuncs(AbstractEffect effect, L2Character player) {
+		if (_funcTemplates == null) {
+			return Collections.emptyList();
+		}
+		
+		if (!(player instanceof L2Playable) && !(player instanceof L2Attackable)) {
+			return Collections.emptyList();
+		}
+		
+		final List<AbstractFunction> funcs = new ArrayList<>(_funcTemplates.size());
+		for (FuncTemplate t : _funcTemplates) {
+			AbstractFunction f = t.getFunc(player, null, this, this); // skill is owner
+			if (f != null) {
+				funcs.add(f);
+			}
+		}
+		return funcs;
+	}
+	
+	/**
+	 * Gets the skill effects.
+	 * @param effectScope the effect scope
+	 * @return the list of effects for the give scope
+	 */
+	public List<AbstractEffect> getEffects(EffectScope effectScope) {
+		return _effectLists.get(effectScope);
+	}
+	
+	/**
+	 * Verify if this skill has effects for the given scope.
+	 * @param effectScope the effect scope
+	 * @return {@code true} if this skill has effects for the given scope, {@code false} otherwise
+	 */
+	public boolean hasEffects(EffectScope effectScope) {
+		List<AbstractEffect> effects = _effectLists.get(effectScope);
+		return (effects != null) && !effects.isEmpty();
+	}
+	
+	/**
+	 * Applies the effects from this skill to the target for the given effect scope.
+	 * @param effectScope the effect scope
+	 * @param info the buff info
+	 * @param applyInstantEffects if {@code true} instant effects will be applied to the effected
+	 * @param addContinuousEffects if {@code true} continuous effects will be applied to the effected
+	 */
+	public void applyEffectScope(EffectScope effectScope, BuffInfo info, boolean applyInstantEffects, boolean addContinuousEffects) {
+		if ((effectScope != null) && hasEffects(effectScope)) {
+			for (AbstractEffect effect : getEffects(effectScope)) {
+				if (effect != null) {
+					if (effect.isInstant()) {
+						if (applyInstantEffects && effect.calcSuccess(info)) {
+							effect.onStart(info);
+						}
+					} else if (addContinuousEffects) {
+						if (effect.canStart(info)) {
+							info.addEffect(effect);
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Method overload for {@link Skill#applyEffects(L2Character, L2Character, int, boolean, boolean, boolean, int)}.<br>
+	 * Simplify the calls.
+	 * @param effector the caster of the skill
+	 * @param effected the target of the effect
+	 */
+	public void applyEffects(L2Character effector, L2Character effected) {
+		applyEffects(effector, effected, -1, false, false, true, 0);
+	}
+	
+	/**
+	 * Method overload for {@link Skill#applyEffects(L2Character, L2Character, int, boolean, boolean, boolean, int)}.<br>
+	 * Simplify the calls, allowing abnormal time time customization.
+	 * @param effector the caster of the skill
+	 * @param effected the target of the effect
+	 * @param instant if {@code true} instant effects will be applied to the effected
+	 * @param abnormalTime custom abnormal time, if equal or lesser than zero will be ignored
+	 */
+	public void applyEffects(L2Character effector, L2Character effected, boolean instant, int abnormalTime) {
+		applyEffects(effector, effected, -1, false, false, instant, abnormalTime);
+	}
+	
+	/**
+	 * Applies the effects from this skill to the target.
+	 * @param effector the caster of the skill
+	 * @param effected the target of the effect
+	 * @param index the index on a list of targets, single skill casts receive -1
+	 * @param self if {@code true} self-effects will be casted on the caster
+	 * @param passive if {@code true} passive effects will be applied to the effector
+	 * @param instant if {@code true} instant effects will be applied to the effected
+	 * @param abnormalTime custom abnormal time, if equal or lesser than zero will be ignored
+	 */
+	public void applyEffects(L2Character effector, L2Character effected, int index, boolean self, boolean passive, boolean instant, int abnormalTime) {
+		// null targets cannot receive any effects.
+		if (effected == null) {
+			return;
+		}
+		// Check bad skills against target.
+		if ((effector != effected) && isBad() && (effected.isInvul() || (effector.isGM() && !effector.getAccessLevel().canGiveDamage()))) {
+			return;
+		}
+		
+		if (isDebuff()) {
+			if (effected.isDebuffBlocked()) {
+				return;
+			}
+		} else {
+			if (effected.isBuffBlocked() && !isBad()) {
+				return;
+			}
+		}
+		
+		if (effected.isInvulAgainst(getId(), getLevel())) {
+			effected.sendDebugMessage("Skill " + this + " has been ignored (invul against)");
+			return;
+		}
+		
+		boolean addContinuousEffects = !passive && (_operateType.isToggle() || (_operateType.isContinuous() && Formulas.calcEffectSuccess(effector, effected, this)));
+		if (!self && !passive) {
+			final var info = new BuffInfo(effector, effected, index, this);
+			
+			if (effector.isPlayer() && (getMaxSoulConsumeCount() > 0)) {
+				info.setCharges(effector.getActingPlayer().decreaseSouls(getMaxSoulConsumeCount()));
+			}
+			
+			if (addContinuousEffects && (abnormalTime > 0)) {
+				info.setAbnormalTime(abnormalTime);
+			}
+			
+			applyEffectScope(EffectScope.GENERAL, info, instant, addContinuousEffects);
+			
+			EffectScope pvpOrPveEffectScope = effector.isPlayable() && effected.isAttackable() ? EffectScope.PVE : effector.isPlayable() && effected.isPlayable() ? EffectScope.PVP : null;
+			applyEffectScope(pvpOrPveEffectScope, info, instant, addContinuousEffects);
+			
+			applyEffectScope(EffectScope.CHANNELING, info, instant, addContinuousEffects);
+			
+			if (addContinuousEffects) {
+				effected.getEffectList().add(info);
+			}
+			
+			// Support for buff sharing feature including healing herbs.
+			if (effected.isPlayer() && effected.hasServitor() && !isTransformation() && (getAbnormalType() != AbnormalType.SUMMON_CONDITION)) {
+				if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()) {
+					applyEffects(effector, effected.getSummon(), isRecoveryHerb(), 0);
+				}
+			}
+		}
+		
+		if (self) {
+			addContinuousEffects = !passive && (_operateType.isToggle() || ((_operateType.isContinuous() || _operateType.isSelfContinuous()) && Formulas.calcEffectSuccess(effector, effector, this)));
+			
+			final BuffInfo info = new BuffInfo(effector, effector, this);
+			if (addContinuousEffects && (abnormalTime > 0)) {
+				info.setAbnormalTime(abnormalTime);
+			}
+			
+			applyEffectScope(EffectScope.SELF, info, instant, addContinuousEffects);
+			
+			// TODO : Need to be done better after skill rework
+			if (addContinuousEffects && hasEffectType(L2EffectType.BUFF)) {
+				info.getEffector().getEffectList().add(info);
+			}
+			
+			// Support for buff sharing feature.
+			// Avoiding Servitor Share since it's implementation already "shares" the effect.
+			if (addContinuousEffects && info.getEffected().isPlayer() && info.getEffected().hasServitor() && isContinuous() && !isDebuff() && (getId() != CommonSkill.SERVITOR_SHARE.getId())) {
+				applyEffects(effector, info.getEffected().getSummon(), false, 0);
+			}
+		}
+		
+		if (passive) {
+			final BuffInfo info = new BuffInfo(effector, effector, this);
+			applyEffectScope(EffectScope.PASSIVE, info, false, true);
+			effector.getEffectList().add(info);
+		}
+	}
+	
+	public void activateSkill(L2Character caster, L2Object target) {
+		activateSkill(caster, null, List.of(target));
+	}
+	
+	/**
+	 * Activates a skill for the given creature and targets.
+	 * @param caster the caster
+	 * @param targets the targets
+	 */
+	public void activateSkill(L2Character caster, List<L2Object> targets) {
+		activateSkill(caster, null, targets);
+	}
+	
+	/**
+	 * Activates a skill for the given cubic and targets.
+	 * @param cubic the cubic
+	 * @param targets the targets
+	 */
+	public void activateSkill(L2CubicInstance cubic, List<L2Object> targets) {
+		activateSkill(cubic.getOwner(), cubic, targets);
+	}
+	
+	/**
+	 * Activates the skill to the targets.
+	 * @param caster the caster
+	 * @param cubic the cubic, can be {@code null}
+	 * @param targets the targets
+	 */
+	private void activateSkill(L2Character caster, L2CubicInstance cubic, List<L2Object> targets) {
+		switch (getId()) {
+			// TODO: replace with AI
+			case 5852:
+			case 5853: {
+				final L2BlockInstance block = targets.get(0) instanceof L2BlockInstance ? (L2BlockInstance) targets.get(0) : null;
+				final L2PcInstance player = caster.isPlayer() ? (L2PcInstance) caster : null;
+				if ((block == null) || (player == null)) {
+					return;
+				}
+				
+				final int arena = player.getBlockCheckerArena();
+				if (arena != -1) {
+					final ArenaParticipantsHolder holder = HandysBlockCheckerManager.getInstance().getHolder(arena);
+					if (holder == null) {
+						return;
+					}
+					
+					final int team = holder.getPlayerTeam(player);
+					final int color = block.getColorEffect();
+					if ((team == 0) && (color == 0x00)) {
+						block.changeColor(player, holder, team);
+					} else if ((team == 1) && (color == 0x53)) {
+						block.changeColor(player, holder, team);
+					}
+				}
+				break;
+			}
+			default: {
+				for (L2Object obj : targets) {
+					final L2Character target = (L2Character) obj;
+					if (Formulas.calcBuffDebuffReflection(target, this)) {
+						// if skill is reflected instant effects should be casted on target
+						// and continuous effects on caster
+						applyEffects(target, caster, false, 0);
+						
+						final BuffInfo info = new BuffInfo(caster, target, this);
+						applyEffectScope(EffectScope.GENERAL, info, true, false);
+						
+						EffectScope pvpOrPveEffectScope = caster.isPlayable() && target.isAttackable() ? EffectScope.PVE : caster.isPlayable() && target.isPlayable() ? EffectScope.PVP : null;
+						applyEffectScope(pvpOrPveEffectScope, info, true, false);
+						
+						applyEffectScope(EffectScope.CHANNELING, info, true, false);
+					} else {
+						applyEffects(caster, target);
+					}
+				}
+				break;
+			}
+		}
+		
+		// Self Effect
+		if (hasEffects(EffectScope.SELF)) {
+			if (caster.isAffectedBySkill(getId())) {
+				caster.stopSkillEffects(true, getId());
+			}
+			applyEffects(caster, caster, -1, true, false, true, 0);
+		}
+		
+		if (cubic == null) {
+			if (useSpiritShot()) {
+				caster.setChargedShot(caster.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
+			} else if (useSoulShot()) {
+				caster.setChargedShot(ShotType.SOULSHOTS, false);
+			}
+		}
+		
+		if (isSuicideAttack()) {
+			caster.doDie(caster);
+		}
+	}
+	
+	public void attach(FuncTemplate f) {
+		if (_funcTemplates == null) {
+			_funcTemplates = new ArrayList<>(1);
+		}
+		_funcTemplates.add(f);
+	}
+	
+	/**
+	 * Adds an effect to the effect list for the give effect scope.
+	 * @param effectScope the effect scope
+	 * @param effect the effect to add
+	 */
+	public void addEffect(EffectScope effectScope, AbstractEffect effect) {
+		final var effects = _effectLists.computeIfAbsent(effectScope, _ -> new ArrayList<>(1));
+		effects.add(effect);
+	}
+	
+	public void attach(Condition c, boolean itemOrWeapon) {
+		if (itemOrWeapon) {
+			if (_itemPreCondition == null) {
+				_itemPreCondition = new ArrayList<>();
+			}
+			_itemPreCondition.add(c);
+		} else {
+			if (_preCondition == null) {
+				_preCondition = new ArrayList<>();
+			}
+			_preCondition.add(c);
+		}
+	}
+	
+	@Override
+	public String toString() {
+		return "Skill " + _name + "(" + _id + "," + _level + ")";
+	}
+	
+	/**
+	 * used for tracking item id in case that item consume cannot be used
+	 * @return reference item id
+	 */
+	public int getReferenceItemId() {
+		return _refId;
+	}
+	
+	public void setReferenceItemId(int val) {
+		_refId = val;
+	}
+	
+	/**
+	 * Verify if the skill can be replaced.
+	 * @return {@code true} if skill can be replaced, {@code false} otherwise
+	 */
+	public boolean isIrreplaceableBuff() {
+		return _irreplaceableBuff;
+	}
+	
+	/**
+	 * Verify if the skill can be stolen.
+	 * @return {@code true} if skill can be stolen, {@code false} otherwise
+	 */
+	public boolean canBeStolen() {
+		return !isPassive() && !isToggle() && !isDebuff() && !isHeroSkill() && !isGMSkill() && !isIrreplaceableBuff() && !(isStatic() && (getId() != CommonSkill.CARAVANS_SECRET_MEDICINE.getId()) && (getMagicLevel() >= 0));
+	}
+	
+	public boolean isClanSkill() {
+		return SkillTreesData.getInstance().isClanSkill(_id, _level);
+	}
+	
+	public boolean isExcludedFromCheck() {
+		return _excludedFromCheck;
+	}
+	
+	public boolean isSimultaneousCast() {
+		return _simultaneousCast;
+	}
+	
+	/**
+	 * Parse an extractable skill.
+	 * @param skillId the skill Id
+	 * @param skillLvl the skill level
+	 * @param values the values to parse
+	 * @return the parsed extractable skill
+	 * @author Zoey76
+	 */
+	private L2ExtractableSkill parseExtractableSkill(int skillId, int skillLvl, String values) {
+		final String[] prodLists = values.split(";");
+		final List<L2ExtractableProductItem> products = new ArrayList<>();
+		String[] prodData;
+		for (String prodList : prodLists) {
+			prodData = prodList.split(",");
+			if (prodData.length < 3) {
+				LOG.warn("Extractable skills data: Error in Skill Id: {} Level: {} -> wrong separator!", skillId, skillLvl);
+			}
+			List<ItemHolder> items = null;
+			double chance = 0;
+			final int length = prodData.length - 1;
+			try {
+				items = new ArrayList<>(length / 2);
+				for (int j = 0; j < length; j += 2) {
+					final int prodId = Integer.parseInt(prodData[j]);
+					final int quantity = Integer.parseInt(prodData[j + 1]);
+					if ((prodId <= 0) || (quantity <= 0)) {
+						LOG.warn("Extractable skills data: Error in Skill Id: {} Level: {} wrong production Id: {} or wrong quantity: {}!", skillId, skillLvl, prodId, quantity);
+					}
+					items.add(new ItemHolder(prodId, quantity));
+				}
+				chance = Double.parseDouble(prodData[length]);
+			} catch (Exception e) {
+				LOG.warn("Extractable skills data: Error in Skill Id: {} Level: {} -> incomplete/invalid production data or wrong separator!", skillId, skillLvl);
+			}
+			products.add(new L2ExtractableProductItem(items, chance));
+		}
+		
+		if (products.isEmpty()) {
+			LOG.warn("Extractable skills data: Error in Skill Id: {} Level: {} -> There are no production items!", skillId, skillLvl);
+		}
+		return new L2ExtractableSkill(SkillData.getSkillHashCode(skillId, skillLvl), products);
+	}
+	
+	/**
+	 * Parses all the abnormal visual effects.
+	 * @param abnormalVisualEffects the abnormal visual effects list
+	 */
+	private void parseAbnormalVisualEffect(String abnormalVisualEffects) {
+		if (abnormalVisualEffects != null) {
+			final String[] data = abnormalVisualEffects.split(";");
+			List<AbnormalVisualEffect> avesEvent = null;
+			List<AbnormalVisualEffect> avesSpecial = null;
+			List<AbnormalVisualEffect> aves = null;
+			for (String ave2 : data) {
+				final AbnormalVisualEffect ave = AbnormalVisualEffect.valueOf(ave2);
+				if (ave.isEvent()) {
+					if (avesEvent == null) {
+						avesEvent = new ArrayList<>(1);
+					}
+					avesEvent.add(ave);
+					continue;
+				}
+				
+				if (ave.isSpecial()) {
+					if (avesSpecial == null) {
+						avesSpecial = new ArrayList<>(1);
+					}
+					avesSpecial.add(ave);
+					continue;
+				}
+				
+				if (aves == null) {
+					aves = new ArrayList<>(1);
+				}
+				aves.add(ave);
+			}
+			
+			if (avesEvent != null) {
+				_abnormalVisualEffectsEvent = avesEvent.toArray(new AbnormalVisualEffect[0]);
+			}
+			
+			if (avesSpecial != null) {
+				_abnormalVisualEffectsSpecial = avesSpecial.toArray(new AbnormalVisualEffect[0]);
+			}
+			
+			if (aves != null) {
+				_abnormalVisualEffects = aves.toArray(new AbnormalVisualEffect[0]);
+			}
+		}
+	}
+	
+	public L2ExtractableSkill getExtractableSkill() {
+		return _extractableItems;
+	}
+	
+	/**
+	 * @param effectType Effect type to check if its present on this skill effects.
+	 * @param effectTypes Effect types to check if are present on this skill effects.
+	 * @return {@code true} if at least one of specified {@link L2EffectType} types is present on this skill effects, {@code false} otherwise.
+	 */
+	public boolean hasEffectType(L2EffectType effectType, L2EffectType... effectTypes) {
+		if (_effectTypes == null) {
+			synchronized (this) {
+				if (_effectTypes == null) {
+					Set<Byte> effectTypesSet = new HashSet<>();
+					for (List<AbstractEffect> effectList : _effectLists.values()) {
+						if (effectList != null) {
+							for (AbstractEffect effect : effectList) {
+								if (effect == null) {
+									continue;
+								}
+								effectTypesSet.add((byte) effect.getEffectType().ordinal());
+							}
+						}
+					}
+					
+					Byte[] effectTypesArray = effectTypesSet.toArray(new Byte[0]);
+					Arrays.sort(effectTypesArray);
+					_effectTypes = effectTypesArray;
+				}
+			}
+		}
+		
+		if (Arrays.binarySearch(_effectTypes, (byte) effectType.ordinal()) >= 0) {
+			return true;
+		}
+		
+		for (L2EffectType type : effectTypes) {
+			if (Arrays.binarySearch(_effectTypes, (byte) type.ordinal()) >= 0) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @return icon of the current skill.
+	 */
+	public String getIcon() {
+		return _icon;
+	}
+	
+	public int getChannelingTickInterval() {
+		return _channelingTickInterval;
+	}
+	
+	public int getChannelingTickInitialDelay() {
+		return _channelingTickInitialDelay;
+	}
+	
+	public Set<MountType> getRideState() {
+		return _rideState;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/SkillChannelized.java b/src/main/java/com/l2jserver/gameserver/model/skills/SkillChannelized.java
new file mode 100644
index 00000000..60e40ced
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/SkillChannelized.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author UnAfraid
+ */
+public final class SkillChannelized {
+	private final Map<Integer, Map<Integer, L2Character>> _channelizers = new ConcurrentHashMap<>();
+	
+	public void addChannelizer(int skillId, L2Character channelizer) {
+		_channelizers.computeIfAbsent(skillId, _ -> new ConcurrentHashMap<>()).put(channelizer.getObjectId(), channelizer);
+	}
+	
+	public void removeChannelizer(int skillId, L2Character channelizer) {
+		getChannelizers(skillId).remove(channelizer.getObjectId());
+	}
+	
+	public int getChannerlizersSize(int skillId) {
+		return getChannelizers(skillId).size();
+	}
+	
+	public Map<Integer, L2Character> getChannelizers(int skillId) {
+		return _channelizers.getOrDefault(skillId, Collections.emptyMap());
+	}
+	
+	public void abortChannelization() {
+		for (Map<Integer, L2Character> map : _channelizers.values()) {
+			for (L2Character channelizer : map.values()) {
+				channelizer.abortCast();
+			}
+		}
+		_channelizers.clear();
+	}
+	
+	public boolean isChannelized() {
+		for (Map<Integer, L2Character> map : _channelizers.values()) {
+			if (!map.isEmpty()) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/SkillChannelizer.java b/src/main/java/com/l2jserver/gameserver/model/skills/SkillChannelizer.java
new file mode 100644
index 00000000..332069ef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/SkillChannelizer.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.targets.AffectScope;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Skill Channelizer implementation.
+ * @author UnAfraid
+ */
+public class SkillChannelizer implements Runnable {
+	private static final Logger LOG = LoggerFactory.getLogger(SkillChannelizer.class);
+	
+	private final L2Character _channelizer;
+	private List<L2Character> _channelized;
+	private L2Character _initialChannelized;
+	
+	private Skill _skill;
+	private volatile ScheduledFuture<?> _task = null;
+	
+	public SkillChannelizer(L2Character channelizer) {
+		_channelizer = channelizer;
+	}
+	
+	public L2Character getChannelizer() {
+		return _channelizer;
+	}
+	
+	public List<L2Character> getChannelized() {
+		return _channelized;
+	}
+	
+	public boolean hasChannelized() {
+		return _channelized != null;
+	}
+	
+	public void startChanneling(Skill skill) {
+		// Verify for same status.
+		if (isChanneling()) {
+			LOG.warn("Character: {} is attempting to channel skill but he already does!", _channelizer);
+			return;
+		}
+		
+		// If affect scope is SINGLE, save target to avoid target changing during channeling.
+		if (skill.getAffectScope() == AffectScope.SINGLE) {
+			final var creatures = skill.getTargets(_channelizer);
+			if (!creatures.isEmpty()) {
+				final var creature = creatures.getFirst(); // Get the first target to lock it on
+				_initialChannelized = ((L2Character) creature);
+				_initialChannelized.getSkillChannelized().addChannelizer(skill.getChannelingSkillId(), getChannelizer());
+			}
+		}
+		
+		// Start channeling.
+		_skill = skill;
+		_task = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(this, skill.getChannelingTickInitialDelay(), skill.getChannelingTickInterval());
+	}
+	
+	public void stopChanneling() {
+		// Verify for same status.
+		if (!isChanneling()) {
+			LOG.warn("Character: {} is attempting to stop channel skill but he does not!", _channelizer);
+			return;
+		}
+		
+		// Cancel the task and unset it.
+		_task.cancel(true);
+		_task = null;
+		
+		// Recalculate channeling state, cancel target channelization and unset it.
+		if (_channelized != null) {
+			for (L2Character chars : _channelized) {
+				cleanupChannelization(_skill, chars);
+			}
+		}
+		
+		// unset channelized
+		_channelized = null;
+		_initialChannelized = null;
+		
+		// unset skill.
+		_skill = null;
+	}
+	
+	public Skill getSkill() {
+		return _skill;
+	}
+	
+	public boolean isChanneling() {
+		return _task != null;
+	}
+	
+	@Override
+	public void run() {
+		if (!isChanneling()) {
+			return;
+		}
+		if (_skill == null) {
+			return;
+		}
+		try {
+			if (_skill.getMpPerChanneling() > 0) {
+				// Validate mana per tick.
+				if (_channelizer.getCurrentMp() < _skill.getMpPerChanneling()) {
+					if (_channelizer.isPlayer()) {
+						_channelizer.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
+					}
+					_channelizer.abortCast();
+					return;
+				}
+				
+				// Reduce mana per tick
+				_channelizer.reduceCurrentMp(_skill.getMpPerChanneling());
+			}
+			
+			// Apply channeling skills on the targets.
+			if (_skill.getChannelingSkillId() > 0) {
+				final Skill baseSkill = SkillData.getInstance().getSkill(_skill.getChannelingSkillId(), 1);
+				if (baseSkill == null) {
+					LOG.warn("Skill {} couldn't find effect id skill: {} !", _skill, _skill.getChannelingSkillId());
+					_channelizer.abortCast();
+					return;
+				}
+				
+				final var targets = new LinkedList<L2Character>();
+				
+				// If _singleChannelized exists, keep effects only on that target, else affect the new target.
+				if (_initialChannelized != null) {
+					targets.add(_initialChannelized);
+					_initialChannelized.getSkillChannelized().addChannelizer(_skill.getChannelingSkillId(), getChannelizer());
+				} else {
+					for (var object : _skill.getTargets(_channelizer)) {
+						if (object.isCharacter()) {
+							final var creature = (L2Character) object;
+							targets.add(creature);
+							creature.getSkillChannelized().addChannelizer(_skill.getChannelingSkillId(), getChannelizer());
+						}
+					}
+				}
+				
+				if (targets.isEmpty()) {
+					return;
+				}
+				_channelized = targets;
+				
+				for (L2Character character : _channelized) {
+					if (!Util.checkIfInRange(_skill.getEffectRange(), _channelizer, character, true)) {
+						if (_initialChannelized != null) {
+							_channelizer.abortCast();
+							_channelizer.sendPacket(SystemMessageId.TARGET_TOO_FAR);
+						}
+						continue;
+					} else if (!GeoData.getInstance().canSeeTarget(_channelizer, character)) {
+						if (_initialChannelized != null) {
+							_channelizer.abortCast();
+							_channelizer.sendPacket(SystemMessageId.CANT_SEE_TARGET);
+						}
+						continue;
+					} else {
+						final int maxSkillLevel = SkillData.getInstance().getMaxLevel(_skill.getChannelingSkillId());
+						final int skillLevel = Math.min(character.getSkillChannelized().getChannerlizersSize(_skill.getChannelingSkillId()), maxSkillLevel);
+						final BuffInfo info = character.getEffectList().getBuffInfoBySkillId(_skill.getChannelingSkillId());
+						
+						if ((info == null) || (info.getSkill().getLevel() < skillLevel)) {
+							final Skill skill = SkillData.getInstance().getSkill(_skill.getChannelingSkillId(), skillLevel);
+							if (skill == null) {
+								LOG.warn("Non existent channeling skill requested: {}", _skill);
+								_channelizer.abortCast();
+								return;
+							}
+							
+							// Update PvP status
+							if (character.isPlayable() && getChannelizer().isPlayer() && skill.isBad()) {
+								((L2PcInstance) getChannelizer()).updatePvPStatus(character);
+							}
+							
+							skill.applyEffects(getChannelizer(), character);
+							
+							// Reduce shots.
+							if (_skill.useSpiritShot()) {
+								_channelizer.setChargedShot(_channelizer.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
+							} else {
+								_channelizer.setChargedShot(ShotType.SOULSHOTS, false);
+							}
+							
+							// Shots are re-charged every cast.
+							_channelizer.rechargeShots(_skill.useSoulShot(), _skill.useSpiritShot());
+						}
+						_channelizer.broadcastPacket(new MagicSkillLaunched(_channelizer, _skill.getId(), _skill.getLevel(), character));
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Error while channelizing skill: {} channelizer: {} channelized: {}; {}", _skill, _channelizer, _channelized, e.getMessage(), e);
+		}
+	}
+	
+	private void cleanupChannelization(Skill skill, L2Character character) {
+		final BuffInfo info = character.getEffectList().getBuffInfoBySkillId(skill.getChannelingSkillId());
+		if (info != null) {
+			final int channerlizersSize = character.getSkillChannelized().getChannerlizersSize(skill.getChannelingSkillId());
+			// If this is the last channelizer for the target, remove attached effects, else decrease affecting skill level by 1.
+			if (channerlizersSize == 1) {
+				character.getEffectList().remove(false, info);
+			} else if (channerlizersSize > 1) {
+				final int maxSkillLevel = SkillData.getInstance().getMaxLevel(skill.getChannelingSkillId());
+				final int skillLevel = Math.min(character.getSkillChannelized().getChannerlizersSize(skill.getChannelingSkillId()), maxSkillLevel);
+				final Skill currentSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel);
+				character.getEffectList().stopSkillEffects(true, currentSkill);
+				final Skill nextSkill = SkillData.getInstance().getSkill(skill.getChannelingSkillId(), skillLevel - 1);
+				nextSkill.applyEffects(getChannelizer(), character);
+			}
+		}
+		character.getSkillChannelized().removeChannelizer(skill.getChannelingSkillId(), getChannelizer());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/SkillOperateType.java b/src/main/java/com/l2jserver/gameserver/model/skills/SkillOperateType.java
new file mode 100644
index 00000000..90e9885b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/SkillOperateType.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+/**
+ * This enum class holds the skill operative types:
+ * <ul>
+ * <li>A1</li>
+ * <li>A2</li>
+ * <li>A3</li>
+ * <li>A4</li>
+ * <li>CA1</li>
+ * <li>CA5</li>
+ * <li>DA1</li>
+ * <li>DA2</li>
+ * <li>P</li>
+ * <li>T</li>
+ * </ul>
+ * @author Zoey76
+ */
+public enum SkillOperateType {
+	/**
+	 * Active Skill with "Instant Effect" (for example damage skills heal/pdam/mdam/cpdam skills).
+	 */
+	A1,
+	
+	/**
+	 * Active Skill with "Continuous effect + Instant effect" (for example buff/debuff or damage/heal over time skills).
+	 */
+	A2,
+	
+	/**
+	 * Active Skill with "Instant effect + Continuous effect"
+	 */
+	A3,
+	
+	/**
+	 * Active Skill with "Instant effect + ?" used for special event herb.
+	 */
+	A4,
+	
+	/**
+	 * Continuous Active Skill with "instant effect" (instant effect casted by ticks).
+	 */
+	CA1,
+	
+	/**
+	 * Continuous Active Skill with "continuous effect" (continuous effect casted by ticks).
+	 */
+	CA5,
+	
+	/**
+	 * Directional Active Skill with "Charge/Rush instant effect".
+	 */
+	DA1,
+	
+	/**
+	 * Directional Active Skill with "Charge/Rush Continuous effect".
+	 */
+	DA2,
+	
+	/**
+	 * Passive Skill.
+	 */
+	P,
+	
+	/**
+	 * Toggle Skill.
+	 */
+	T;
+	
+	/**
+	 * Verifies if the operative type correspond to an active skill.
+	 * @return {@code true} if the operative skill type is active, {@code false} otherwise
+	 */
+	public boolean isActive() {
+		return switch (this) {
+			case A1, A2, A3, A4, CA1, CA5, DA1, DA2 -> true;
+			default -> false;
+		};
+	}
+	
+	/**
+	 * Verifies if the operative type correspond to a continuous skill.
+	 * @return {@code true} if the operative skill type is continuous, {@code false} otherwise
+	 */
+	public boolean isContinuous() {
+		return switch (this) {
+			case A2, A4, DA2 -> true;
+			default -> false;
+		};
+	}
+	
+	/**
+	 * Verifies if the operative type correspond to a continuous skill.
+	 * @return {@code true} if the operative skill type is continuous, {@code false} otherwise
+	 */
+	public boolean isSelfContinuous() {
+		return (this == A3);
+	}
+	
+	/**
+	 * Verifies if the operative type correspond to a passive skill.
+	 * @return {@code true} if the operative skill type is passive, {@code false} otherwise
+	 */
+	public boolean isPassive() {
+		return (this == P);
+	}
+	
+	/**
+	 * Verifies if the operative type correspond to a toggle skill.
+	 * @return {@code true} if the operative skill type is toggle, {@code false} otherwise
+	 */
+	public boolean isToggle() {
+		return (this == T);
+	}
+	
+	/**
+	 * Verifies if the operative type correspond to a channeling skill.
+	 * @return {@code true} if the operative skill type is channeling, {@code false} otherwise
+	 */
+	public boolean isChanneling() {
+		return switch (this) {
+			case CA1, CA5 -> true;
+			default -> false;
+		};
+	}
+	
+	/**
+	 * Verifies if the operative type correspond to a fly skill.
+	 * @return {@code true} if the operative skill type is fly, {@code false} otherwise
+	 */
+	public boolean isFlyType() {
+		return switch (this) {
+			case DA1, DA2 -> true;
+			default -> false;
+		};
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectObject.java b/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectObject.java
new file mode 100644
index 00000000..790231cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectObject.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Affect Object.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public interface AffectObject {
+	
+	boolean affectObject(L2Character caster, L2Object object);
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectObjectStaticImpl.java b/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectObjectStaticImpl.java
new file mode 100644
index 00000000..30f8c7e5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectObjectStaticImpl.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+
+/**
+ * Affect Object static implementation.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public enum AffectObjectStaticImpl implements AffectObject {
+	ALL {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			return true;
+		}
+	},
+	CLAN {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			if (caster.isPlayable()) {
+				final var clanId = caster.getClanId();
+				if (clanId == 0) {
+					return false;
+				}
+				
+				if (!object.isPlayable()) {
+					return false;
+				}
+				
+				final var creature = (L2Character) object;
+				return clanId == creature.getClanId();
+			} else if (caster.isNpc()) {
+				// TODO(Zoey76): Implement.
+			}
+			return false;
+		}
+	},
+	FRIEND {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			return !object.isAutoAttackable(caster);
+		}
+	},
+	HIDDEN_PLACE {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			// TODO(Zoey76): Implement.
+			return false;
+		}
+	},
+	INVISIBLE {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			return !object.isVisibleFor(caster) || object.isInvisible();
+		}
+	},
+	NONE {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			return false;
+		}
+	},
+	NOT_FRIEND {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			if (object instanceof L2Character target) {
+				if (target.isDead()) {
+					return false;
+				}
+				
+				if (caster instanceof L2Npc) {
+					return target instanceof L2Playable;
+				}
+			}
+			
+			return object.isAutoAttackable(caster);
+		}
+	},
+	OBJECT_DEAD_NPC_BODY {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			if (!object.isNpc()) {
+				return false;
+			}
+			
+			final var npc = (L2Npc) object;
+			return npc.isDead();
+		}
+	},
+	UNDEAD_REAL_ENEMY {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			if (!object.isNpc()) {
+				return false;
+			}
+			
+			final var npc = (L2Npc) object;
+			return npc.isUndead();
+		}
+	},
+	WYVERN_OBJECT {
+		@Override
+		public boolean affectObject(L2Character caster, L2Object object) {
+			if (!object.isNpc()) {
+				return false;
+			}
+			return WYVERN_ID == object.getId();
+		}
+	};
+	
+	private static final int WYVERN_ID = 12621;
+	
+	@Override
+	public abstract boolean affectObject(L2Character caster, L2Object object);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectScope.java b/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectScope.java
new file mode 100644
index 00000000..daf4b945
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/targets/AffectScope.java
@@ -0,0 +1,474 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import static com.l2jserver.gameserver.model.zone.ZoneId.SIEGE;
+import static java.util.Comparator.comparingDouble;
+import static java.util.stream.Collectors.toList;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Affect Scope.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public enum AffectScope {
+	/** Affects Valakas. */
+	BALAKAS_SCOPE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Implement.
+			return List.of();
+		}
+	},
+	/** Affects dead clan mates of the target. */
+	DEAD_PLEDGE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Should work for NPC clans?
+			if (!target.isPlayable()) {
+				return List.of();
+			}
+			
+			final var player = target.getActingPlayer();
+			final var clanId = player.getClanId();
+			if (clanId == 0) {
+				// TODO(Zoey76): Should work without clan and over pet?
+				return List.of();
+			}
+			
+			final var affectLimit = skill.getAffectLimit();
+			final var affectObject = skill.getAffectObject();
+			final var targets = new LinkedList<L2Object>();
+			final var inDuel = player.isInDuel();
+			for (var object : L2World.getInstance().getVisibleObjects(target, skill.getAffectRange())) {
+				if ((affectLimit > 0) && (targets.size() >= affectLimit)) {
+					break;
+				}
+				
+				if (!object.isPlayable()) {
+					continue;
+				}
+				
+				final var targetPlayer = object.getActingPlayer();
+				if (targetPlayer == null) {
+					continue;
+				}
+				
+				if (clanId != targetPlayer.getClanId()) {
+					continue;
+				}
+				
+				if (inDuel) {
+					if (player.getDuelId() != targetPlayer.getDuelId()) {
+						continue;
+					}
+					if (player.isInParty() && targetPlayer.isInParty() && (player.getParty().getLeaderObjectId() != targetPlayer.getParty().getLeaderObjectId())) {
+						continue;
+					}
+				}
+				
+				if (!player.checkPvpSkill(targetPlayer, skill)) {
+					continue;
+				}
+				
+				if (!TvTEvent.checkForTvTSkill(player, targetPlayer, skill)) {
+					continue;
+				}
+				
+				if (player.isInOlympiadMode()) {
+					if (player.getOlympiadGameId() != targetPlayer.getOlympiadGameId()) {
+						continue;
+					}
+					
+					if (player.getOlympiadSide() != targetPlayer.getOlympiadGameId()) {
+						continue;
+					}
+				}
+				
+				if (targetPlayer.isInsideZone(SIEGE) && !targetPlayer.isInSiege()) {
+					continue;
+				}
+				
+				if (!affectObject.affectObject(player, targetPlayer)) {
+					continue;
+				}
+				
+				targets.add(targetPlayer);
+			}
+			return targets;
+		}
+	},
+	/** Affects dead command channel mates of the target. */
+	DEAD_UNION {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			if (!target.isPlayable()) {
+				return List.of();
+			}
+			
+			final var player = target.getActingPlayer();
+			final var affectLimit = skill.getAffectLimit();
+			final var affectObject = skill.getAffectObject();
+			final var targets = new LinkedList<L2Object>();
+			for (var object : L2World.getInstance().getVisibleObjects(target, skill.getAffectRange())) {
+				if ((affectLimit > 0) && (targets.size() >= affectLimit)) {
+					break;
+				}
+				
+				if (!object.isCharacter()) {
+					continue;
+				}
+				
+				final var creature = (L2Character) object;
+				if (!player.isInCommandChannelWith(creature)) {
+					continue;
+				}
+				
+				if (!creature.isDead()) {
+					continue;
+				}
+				
+				if (!affectObject.affectObject(player, creature)) {
+					continue;
+				}
+				
+				targets.add(creature);
+			}
+			return targets;
+		}
+	},
+	/** Affects fan area. */
+	FAN {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			final var headingAngle = Util.calculateAngleFrom(caster, target);
+			final var affectLimit = skill.getAffectLimit();
+			final var fanRange = skill.getFanRange();
+			final var fanStartingAngle = fanRange[1];
+			final var fanRadius = fanRange[2];
+			final var fanAngle = fanRange[3];
+			final var affectObject = skill.getAffectObject();
+			final var targets = new LinkedList<L2Object>();
+			for (var object : L2World.getInstance().getVisibleObjects(caster, fanRadius)) {
+				if ((affectLimit > 0) && (targets.size() >= affectLimit)) {
+					break;
+				}
+				
+				if (!object.isCharacter()) {
+					continue;
+				}
+				
+				final var creature = (L2Character) object;
+				if (creature.isDead()) {
+					continue;
+				}
+				
+				if (Math.abs(Util.calculateAngleFrom(caster, creature) - (headingAngle + fanStartingAngle)) > (fanAngle / 2)) {
+					continue;
+				}
+				
+				if (!affectObject.affectObject(caster, creature)) {
+					continue;
+				}
+				
+				if (!GeoData.getInstance().canSeeTarget(caster, creature)) {
+					continue;
+				}
+				
+				targets.add(creature);
+			}
+			return targets;
+		}
+	},
+	/** Affects nothing. */
+	NONE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			return List.of();
+		}
+	},
+	/** Affects party members of the target. */
+	PARTY {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			if (!target.isCharacter()) {
+				return List.of();
+			}
+			
+			final var affectLimit = skill.getAffectLimit();
+			final var affectRange = skill.getAffectRange();
+			final var targets = new LinkedList<L2Object>();
+			final var creature = (L2Character) target;
+			if (creature.isInParty()) {
+				for (var partyMember : creature.getParty().getMembers()) {
+					if ((affectLimit > 0) && (targets.size() >= affectLimit)) {
+						break;
+					}
+					
+					if (!Util.checkIfInRange(affectRange, creature, partyMember, true)) {
+						continue;
+					}
+					
+					// TODO(Zoey76): Check affect object?
+					
+					targets.add(partyMember);
+					
+					if (partyMember.hasSummon()) {
+						final var summon = partyMember.getSummon();
+						if (Util.checkIfInRange(affectRange, creature, summon, true)) {
+							targets.add(summon);
+						}
+					}
+				}
+			} else {
+				final var player = target.getActingPlayer();
+				targets.add(player);
+				if (player.hasSummon()) {
+					final var summon = player.getSummon();
+					if (Util.checkIfInRange(affectRange, creature, summon, true)) {
+						targets.add(summon);
+					}
+				}
+			}
+			return targets;
+		}
+	},
+	/** Affects party and clan mates of the target. */
+	PARTY_PLEDGE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			final var targets = new HashSet<L2Object>();
+			targets.addAll(PARTY.affectTargets(caster, target, skill));
+			targets.addAll(PLEDGE.affectTargets(caster, target, skill));
+			return new LinkedList<>(targets);
+		}
+	},
+	/** Affects clan mates of the target. */
+	PLEDGE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			final var affectRange = skill.getAffectRange();
+			final var affectLimit = skill.getAffectLimit();
+			final var targets = new LinkedList<L2Object>();
+			if (target.isPlayer()) {
+				final var targetPlayer = target.getActingPlayer();
+				final var clan = targetPlayer.getClan();
+				if (clan != null) {
+					for (var clanMember : clan.getMembers()) {
+						if ((affectLimit > 0) && (targets.size() >= affectLimit)) {
+							break;
+						}
+						
+						final var clanMemberPlayer = clanMember.getPlayerInstance();
+						if (clanMemberPlayer == null) {
+							continue;
+						}
+						
+						if (targetPlayer.isInDuel()) {
+							if (targetPlayer.getDuelId() != clanMemberPlayer.getDuelId()) {
+								continue;
+							}
+							if (targetPlayer.isInParty() && clanMemberPlayer.isInParty() && //
+								(targetPlayer.getParty().getLeaderObjectId() != clanMemberPlayer.getParty().getLeaderObjectId())) {
+								continue;
+							}
+						}
+						
+						if (!targetPlayer.checkPvpSkill(clanMemberPlayer, skill)) {
+							continue;
+						}
+						
+						if (!TvTEvent.checkForTvTSkill(targetPlayer, clanMemberPlayer, skill)) {
+							continue;
+						}
+						
+						if (targetPlayer.isInOlympiadMode()) {
+							if (targetPlayer.getOlympiadGameId() != clanMemberPlayer.getOlympiadGameId()) {
+								continue;
+							}
+							
+							if (targetPlayer.getOlympiadSide() != clanMemberPlayer.getOlympiadSide()) {
+								continue;
+							}
+						}
+						
+						if (Util.checkIfInRange(affectRange, targetPlayer, clanMemberPlayer, true)) {
+							targets.add(clanMemberPlayer);
+						}
+						
+						if (clanMemberPlayer.hasSummon()) {
+							final var summon = clanMemberPlayer.getSummon();
+							if (Util.checkIfInRange(affectRange, targetPlayer, summon, true)) {
+								targets.add(summon);
+							}
+						}
+					}
+				} else {
+					if (Util.checkIfInRange(affectRange, targetPlayer, targetPlayer, true)) {
+						targets.add(targetPlayer);
+					}
+					
+					if (targetPlayer.hasSummon()) {
+						final var summon = targetPlayer.getSummon();
+						if (Util.checkIfInRange(affectRange, targetPlayer, summon, true)) {
+							targets.add(summon);
+						}
+					}
+				}
+			} else if (target.isNpc()) {
+				final var npc = (L2Npc) target;
+				targets.add(target);
+				
+				final var clans = npc.getTemplate().getClans();
+				if ((clans == null) || clans.isEmpty()) {
+					return targets;
+				}
+				
+				for (var creature : npc.getKnownList().getKnownCharactersInRadius(affectRange)) {
+					if ((affectLimit > 0) && (targets.size() >= affectLimit)) {
+						break;
+					}
+					
+					if (!creature.isNpc()) {
+						continue;
+					}
+					
+					if (!npc.isInMyClan((L2Npc) creature)) {
+						continue;
+					}
+					
+					targets.add(creature);
+				}
+			}
+			return targets;
+		}
+	},
+	/** Affects point blank targets, using caster as point of origin. */
+	POINT_BLANK {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			if (!target.isCharacter()) {
+				return List.of();
+			}
+			final var affectLimit = skill.getAffectLimit();
+			return L2World.getInstance()
+				.getVisibleObjectsStream(target, skill.getAffectRange(), true)
+				.filter(c -> skill.getAffectObject().affectObject(caster, c))
+				.limit(affectLimit > 0 ? affectLimit : Integer.MAX_VALUE)
+				.toList();
+		}
+	},
+	/** Affects ranged targets, using selected target as point of origin. */
+	RANGE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			final var affectLimit = skill.getAffectLimit();
+			return L2World.getInstance()
+				.getVisibleObjectsStream(target, skill.getAffectRange(), false)
+				.filter(L2Object::isCharacter)
+				.map(o -> (L2Character) o)
+				.filter(c -> !c.isDead())
+				.filter(c -> skill.getAffectObject().affectObject(caster, c))
+				.limit(affectLimit > 0 ? affectLimit : Integer.MAX_VALUE)
+				.collect(toList());
+		}
+	},
+	/** Affects ranged targets sorted by HP, using selected target as point of origin. */
+	RANGE_SORT_BY_HP {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			final var affectLimit = skill.getAffectLimit();
+			return L2World.getInstance()
+				.getVisibleObjectsStream(target, skill.getAffectRange(), false)
+				.filter(L2Object::isCharacter)
+				.map(o -> (L2Character) o)
+				.filter(creature -> !creature.isDead())
+				.filter(creature -> skill.getAffectObject().affectObject(caster, creature))
+				.sorted(comparingDouble(creature -> creature.getCurrentHp() / creature.getMaxHp()))
+				.limit(affectLimit > 0 ? affectLimit : Integer.MAX_VALUE)
+				.collect(toList());
+		}
+	},
+	/** Affects ranged targets, using selected target as point of origin. */
+	RING_RANGE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Implement.
+			return List.of();
+		}
+	},
+	/** Affects a single target. */
+	SINGLE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			if (!skill.getAffectObject().affectObject(caster, target)) {
+				// TODO(Zoey76): Add message?
+				return List.of();
+			}
+			return List.of(target);
+		}
+	},
+	/** Affects targets inside an square area, using selected target as point of origin. */
+	SQUARE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Implement.
+			return List.of();
+		}
+	},
+	/** Affects targets inside an square area, using caster as point of origin. */
+	SQUARE_PB {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Implement.
+			return List.of();
+		}
+	},
+	/** Affects static object targets. */
+	STATIC_OBJECT_SCOPE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Implement.
+			return List.of();
+		}
+	},
+	/** Affects wyvern. */
+	WYVERN_SCOPE {
+		@Override
+		public List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill) {
+			// TODO(Zoey76): Implement.
+			return List.of();
+		}
+	};
+	
+	public abstract List<L2Object> affectTargets(L2Character caster, L2Object target, Skill skill);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/skills/targets/TargetType.java b/src/main/java/com/l2jserver/gameserver/model/skills/targets/TargetType.java
new file mode 100644
index 00000000..b181fbbc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/skills/targets/TargetType.java
@@ -0,0 +1,419 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance.FLAGPOLE;
+import static com.l2jserver.gameserver.model.zone.ZoneId.PEACE;
+import static com.l2jserver.gameserver.model.zone.ZoneId.PVP;
+import static com.l2jserver.gameserver.network.SystemMessageId.A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_PEACE_ZONE;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_USE_ON_YOURSELF;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANT_SEE_TARGET;
+import static com.l2jserver.gameserver.network.SystemMessageId.INCORRECT_TARGET;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.holders.SkillUseHolder;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target type enumerated.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public enum TargetType {
+	/** Advance Head Quarters (Outposts). */
+	ADVANCE_BASE {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || !target.isNpc() || (target.getId() != OUTPOST) || ((L2Npc) target).isDead()) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Enemies in high terrain or protected by castle walls and doors. */
+	ARTILLERY {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || !target.isDoor() || ((L2DoorInstance) target).isDead() || !target.isAutoAttackable(caster)) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Doors or treasure chests. */
+	DOOR_TREASURE {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || (!target.isDoor() && !(target instanceof L2ChestInstance))) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Any enemies (included allies). */
+	ENEMY {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || ((L2Character) target).isDead() || (caster.getObjectId() == target.getObjectId()) || !target.isCharacter()) {
+				return null;
+			}
+			
+			if (target.isNpc()) {
+				if (target.isAttackable()) {
+					return target;
+				}
+				if ((target instanceof L2TrapInstance trap) && trap.isAutoAttackable(caster)) {
+					return target;
+				}
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			final var player = caster.getActingPlayer();
+			if (player != null) {
+				if (player.doesSkillNeedCtrl((L2Character) target, skill) && !getCurrentPlayableSkill(caster).isCtrlPressed()) {
+					caster.sendPacket(INCORRECT_TARGET);
+					return null;
+				}
+			}
+			return target;
+		}
+	},
+	/** Friendly. */
+	ENEMY_NOT {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || !target.isCharacter() || ((L2Character) target).isDead() || target.isAutoAttackable(caster)) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Only enemies (not included allies). */
+	ENEMY_ONLY {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || !target.isCharacter() || (caster.getObjectId() == target.getObjectId()) || ((L2Character) target).isDead() || !target.isAutoAttackable(caster)) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			if (target.isNpc()) {
+				if (target.isAttackable()) {
+					return target;
+				}
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			if (!caster.isPlayable()) {
+				return target;
+			}
+			
+			final var player = caster.getActingPlayer();
+			if (player == null) {
+				return null;
+			}
+			
+			// In Olympiad, different sides.
+			if (player.isInOlympiadMode()) {
+				final var targetPlayer = target.getActingPlayer();
+				if ((targetPlayer != null) && (player.getOlympiadSide() != targetPlayer.getOlympiadSide())) {
+					return target;
+				}
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			final var targetCreature = (L2Character) target;
+			// In Duel, different sides.
+			if (player.isInDuelWith(targetCreature)) {
+				final var targetPlayer = target.getActingPlayer();
+				final var duel = DuelManager.getInstance().getDuel(player.getDuelId());
+				final var teamA = duel.getTeamA();
+				final var teamB = duel.getTeamB();
+				if ((teamA.contains(player) && teamB.contains(targetPlayer)) || //
+					(teamB.contains(player) && teamA.contains(targetPlayer))) {
+					return target;
+				}
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// Not in same party.
+			if (player.isInPartyWith(targetCreature)) {
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// In PVP Zone.
+			if (player.isInsideZone(PVP)) {
+				return target;
+			}
+			
+			// Not in same clan.
+			if (player.isInClanWith(targetCreature)) {
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// TODO(Zoey76): Validate.
+			// Not in same alliance.
+			if (player.isInAllyWith(targetCreature)) {
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// TODO(Zoey76): Validate.
+			// Not in same command channel.
+			if (player.isInCommandChannelWith(targetCreature)) {
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// Not on same Siege Side.
+			if (player.isOnSameSiegeSideWith(targetCreature)) {
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// At Clan War.
+			if (player.isAtWarWith(targetCreature)) {
+				return target;
+			}
+			
+			// Cannot PvP.
+			if (!player.checkIfPvP(targetCreature) && (target.isPlayable() && (target.getActingPlayer().getKarma() == 0))) {
+				player.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			return target;
+		}
+	},
+	/** Fortress's Flagpole. */
+	FORTRESS_FLAGPOLE {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if (!(target instanceof L2StaticObjectInstance) || (((L2StaticObjectInstance) target).getType() != FLAGPOLE)) {
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Ground. */
+	GROUND {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			final var player = caster.getActingPlayer();
+			if (player == null) {
+				return null;
+			}
+			
+			final var worldPosition = player.getCurrentSkillWorldPosition();
+			if ((worldPosition == null) || !GeoData.getInstance().canSeeTarget(player, worldPosition)) {
+				caster.sendPacket(CANT_SEE_TARGET);
+				return null;
+			}
+			
+			if (skill.isBad() && caster.isInsideZone(PEACE)) {
+				caster.sendPacket(A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_PEACE_ZONE);
+				return null;
+			}
+			return caster;
+		}
+	},
+	/** Holy Artifacts from sieges. */
+	HOLYTHING {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if (!(target instanceof L2ArtefactInstance)) {
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Items. */
+	ITEM {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if (!(target instanceof L2ItemInstance)) {
+				return null;
+			}
+			return caster;
+		}
+	},
+	/** Nothing. */
+	NONE {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			return caster;
+		}
+	},
+	/** NPC corpses. */
+	NPC_BODY {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || !target.isNpc() || !((L2Character) target).isDead()) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			
+			// TODO(Zoey76): Review this validation.
+			if (skill.hasEffectType(L2EffectType.SUMMON) && target.isServitor() && (target.getActingPlayer() != null) && (target.getActingPlayer().getObjectId() == caster.getObjectId())) {
+				return null;
+			}
+			
+			// TODO(Zoey76): This is validated with condition.
+			if (skill.hasEffectType(L2EffectType.HP_DRAIN) && ((L2Attackable) target).isOldCorpse(caster.getActingPlayer(), npc().getCorpseConsumeSkillAllowedTimeBeforeDecay(), true)) {
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Others, except caster. */
+	OTHERS {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || (target == caster)) {
+				caster.sendPacket(CANNOT_USE_ON_YOURSELF);
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Player Controlled corpses. */
+	PC_BODY {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if ((target == null) || !(target.isPlayer() || target.isPet()) || !((L2Character) target).isDead()) {
+				caster.sendPacket(INCORRECT_TARGET);
+				return null;
+			}
+			return target;
+		}
+	},
+	/** Self. */
+	SELF {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			return caster;
+		}
+	},
+	/** Servitor, not pet. */
+	SUMMON {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if (!caster.hasServitor()) {
+				return null;
+			}
+			
+			return caster.getSummon();
+		}
+	},
+	/** Anything targetable. */
+	TARGET {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			if (target == null) {
+				return null;
+			}
+			
+			final var player = caster.getActingPlayer();
+			if (player != null) {
+				if (target.isAutoAttackable(caster)) {
+					final var currentSkill = getCurrentPlayableSkill(caster);
+					if ((currentSkill != null) && !currentSkill.isCtrlPressed()) {
+						caster.sendPacket(INCORRECT_TARGET);
+						return null;
+					}
+				}
+			}
+			return target;
+		}
+	},
+	/** Wyverns. */
+	WYVERN_TARGET {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			// TODO(Zoey76): Implement.
+			if (caster.isPlayable()) {
+				LOG.warn("Target type {} not implmented for skill {}!", skill.getTargetType(), skill);
+			}
+			return target;
+		}
+	},
+	@Deprecated
+	ONE {
+		@Override
+		public L2Object getTarget(Skill skill, L2Character caster, L2Object target) {
+			// TODO(Zoey76): Remove custom target type.
+			if (caster.isPlayable()) {
+				LOG.warn("Outdated {} with target type {} used on {} by {}!", skill, skill.getTargetType(), target, caster);
+			}
+			skill.updateTargetSystem(TARGET, AffectScope.SINGLE, AffectObjectStaticImpl.ALL);
+			return TARGET.getTarget(skill, caster, target);
+		}
+	};
+	
+	public static final L2Object[] EMPTY_TARGET_LIST = new L2Object[0];
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TargetType.class);
+	
+	private static final int OUTPOST = 36590;
+	
+	public abstract L2Object getTarget(Skill skill, L2Character caster, L2Object target);
+	
+	public final List<L2Object> getTargets(Skill skill, L2Character caster, L2Object target) {
+		final var actualTarget = getTarget(skill, caster, target);
+		if (actualTarget == null) {
+			return List.of();
+		}
+		return skill.getAffectScope().affectTargets(caster, actualTarget, skill);
+	}
+	
+	private static final SkillUseHolder getCurrentPlayableSkill(L2Character caster) {
+		if (caster.isSummon()) {
+			return caster.getActingPlayer().getCurrentPetSkill();
+		}
+		return caster.getActingPlayer().getCurrentSkill();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/BaseStats.java b/src/main/java/com/l2jserver/gameserver/model/stats/BaseStats.java
new file mode 100644
index 00000000..cced6bd2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/BaseStats.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author DS
+ */
+public enum BaseStats {
+	STR(new STR()),
+	INT(new INT()),
+	DEX(new DEX()),
+	WIT(new WIT()),
+	CON(new CON()),
+	MEN(new MEN()),
+	NONE(new NONE());
+	
+	private static final Logger LOG = LoggerFactory.getLogger(BaseStats.class);
+	
+	private static final int MAX_STAT_VALUE = 100;
+	
+	private static final double[] STRbonus = new double[MAX_STAT_VALUE];
+	private static final double[] INTbonus = new double[MAX_STAT_VALUE];
+	private static final double[] DEXbonus = new double[MAX_STAT_VALUE];
+	private static final double[] WITbonus = new double[MAX_STAT_VALUE];
+	private static final double[] CONbonus = new double[MAX_STAT_VALUE];
+	private static final double[] MENbonus = new double[MAX_STAT_VALUE];
+	
+	private final BaseStat _stat;
+	
+	public final String getValue() {
+		return _stat.getClass().getSimpleName();
+	}
+	
+	BaseStats(BaseStat s) {
+		_stat = s;
+	}
+	
+	public final double calcBonus(L2Character actor) {
+		if (actor != null) {
+			return _stat.calcBonus(actor);
+		}
+		
+		return 1;
+	}
+	
+	private interface BaseStat {
+		double calcBonus(L2Character actor);
+	}
+	
+	protected static final class STR implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return STRbonus[actor.getSTR()];
+		}
+	}
+	
+	protected static final class INT implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return INTbonus[actor.getINT()];
+		}
+	}
+	
+	protected static final class DEX implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return DEXbonus[actor.getDEX()];
+		}
+	}
+	
+	protected static final class WIT implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return WITbonus[actor.getWIT()];
+		}
+	}
+	
+	protected static final class CON implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return CONbonus[actor.getCON()];
+		}
+	}
+	
+	protected static final class MEN implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return MENbonus[actor.getMEN()];
+		}
+	}
+	
+	protected static final class NONE implements BaseStat {
+		@Override
+		public double calcBonus(L2Character actor) {
+			return 1f;
+		}
+	}
+	
+	static {
+		final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		factory.setValidating(false);
+		factory.setIgnoringComments(true);
+		final File file = new File(server().getDatapackRoot(), "data/stats/statBonus.xml");
+		Document doc = null;
+		
+		if (file.exists()) {
+			try {
+				doc = factory.newDocumentBuilder().parse(file);
+			} catch (Exception e) {
+				LOG.warn("Could not parse file: {}", e.getMessage(), e);
+			}
+			
+			if (doc != null) {
+				String statName;
+				int val;
+				double bonus;
+				NamedNodeMap attrs;
+				for (Node list = doc.getFirstChild(); list != null; list = list.getNextSibling()) {
+					if ("list".equalsIgnoreCase(list.getNodeName())) {
+						for (Node stat = list.getFirstChild(); stat != null; stat = stat.getNextSibling()) {
+							statName = stat.getNodeName();
+							for (Node value = stat.getFirstChild(); value != null; value = value.getNextSibling()) {
+								if ("stat".equalsIgnoreCase(value.getNodeName())) {
+									attrs = value.getAttributes();
+									try {
+										val = Integer.parseInt(attrs.getNamedItem("value").getNodeValue());
+										bonus = Double.parseDouble(attrs.getNamedItem("bonus").getNodeValue());
+									} catch (Exception e) {
+										LOG.error("Invalid stats value: {}, skipping", value.getNodeValue(), e);
+										continue;
+									}
+									
+									if ("STR".equalsIgnoreCase(statName)) {
+										STRbonus[val] = bonus;
+									} else if ("INT".equalsIgnoreCase(statName)) {
+										INTbonus[val] = bonus;
+									} else if ("DEX".equalsIgnoreCase(statName)) {
+										DEXbonus[val] = bonus;
+									} else if ("WIT".equalsIgnoreCase(statName)) {
+										WITbonus[val] = bonus;
+									} else if ("CON".equalsIgnoreCase(statName)) {
+										CONbonus[val] = bonus;
+									} else if ("MEN".equalsIgnoreCase(statName)) {
+										MENbonus[val] = bonus;
+									} else {
+										LOG.error("Invalid stats name: {}, skipping", statName);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		} else {
+			throw new Error("[BaseStats] File not found: " + file.getAbsolutePath());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/Calculator.java b/src/main/java/com/l2jserver/gameserver/model/stats/Calculator.java
new file mode 100644
index 00000000..f76756db
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/Calculator.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * A calculator is created to manage and dynamically calculate the effect of a character property (ex : MAX_HP, REGENERATE_HP_RATE...).<br>
+ * In fact, each calculator is a table of Func object in which each Func represents a mathematical function:<br>
+ * FuncAtkAccuracy -> Math.sqrt(_player.getDEX())*6+_player.getLevel()<br>
+ * When the calc method of a calculator is launched, each mathematical function is called according to its priority <B>_order</B>.<br>
+ * Indeed, Func with lowest priority order is executed first and Funcs with the same order are executed in unspecified order.<br>
+ * The result of the calculation is stored in the value property of an Env class instance.<br>
+ * Method addFunc and removeFunc permit to add and remove a Func object from a Calculator.
+ */
+public final class Calculator {
+	/** Empty Func table definition */
+	private static final AbstractFunction[] EMPTY_FUNCS = new AbstractFunction[0];
+	
+	/** Table of Func object */
+	private AbstractFunction[] _functions;
+	
+	/**
+	 * Constructor of Calculator (Init value : emptyFuncs).
+	 */
+	public Calculator() {
+		_functions = EMPTY_FUNCS;
+	}
+	
+	/**
+	 * Constructor of Calculator (Init value : Calculator c).
+	 * @param c
+	 */
+	public Calculator(Calculator c) {
+		_functions = c._functions;
+	}
+	
+	/**
+	 * Check if 2 calculators are equals.
+	 * @param c1
+	 * @param c2
+	 * @return
+	 */
+	public static boolean equalsCals(Calculator c1, Calculator c2) {
+		if (c1 == c2) {
+			return true;
+		}
+		
+		if ((c1 == null) || (c2 == null)) {
+			return false;
+		}
+		
+		AbstractFunction[] funcs1 = c1._functions;
+		AbstractFunction[] funcs2 = c2._functions;
+		
+		if (funcs1 == funcs2) {
+			return true;
+		}
+		
+		if (funcs1.length != funcs2.length) {
+			return false;
+		}
+		
+		if (funcs1.length == 0) {
+			return true;
+		}
+		
+		for (int i = 0; i < funcs1.length; i++) {
+			if (funcs1[i] != funcs2[i]) {
+				return false;
+			}
+		}
+		return true;
+		
+	}
+	
+	/**
+	 * Return the number of Funcs in the Calculator.
+	 * @return
+	 */
+	public int size() {
+		return _functions.length;
+	}
+	
+	/**
+	 * Adds a function to the Calculator.
+	 * @param function the function
+	 */
+	public synchronized void addFunc(AbstractFunction function) {
+		AbstractFunction[] funcs = _functions;
+		AbstractFunction[] tmp = new AbstractFunction[funcs.length + 1];
+		
+		final int order = function.getOrder();
+		int i;
+		
+		for (i = 0; (i < funcs.length) && (order >= funcs[i].getOrder()); i++) {
+			tmp[i] = funcs[i];
+		}
+		
+		tmp[i] = function;
+		
+		for (; i < funcs.length; i++) {
+			tmp[i + 1] = funcs[i];
+		}
+		
+		_functions = tmp;
+	}
+	
+	/**
+	 * Removes a function from the Calculator.
+	 * @param function the function
+	 */
+	public synchronized void removeFunc(AbstractFunction function) {
+		AbstractFunction[] funcs = _functions;
+		AbstractFunction[] tmp = new AbstractFunction[funcs.length - 1];
+		
+		int i;
+		
+		for (i = 0; (i < (funcs.length - 1)) && (function != funcs[i]); i++) {
+			tmp[i] = funcs[i];
+		}
+		
+		if (i == funcs.length) {
+			return;
+		}
+		
+		for (i++; i < funcs.length; i++) {
+			tmp[i - 1] = funcs[i];
+		}
+		
+		if (tmp.length == 0) {
+			_functions = EMPTY_FUNCS;
+		} else {
+			_functions = tmp;
+		}
+	}
+	
+	/**
+	 * Remove each Func with the specified owner of the Calculator.
+	 * @param owner the owner
+	 * @return a list of modified stats
+	 */
+	public synchronized List<Stats> removeOwner(Object owner) {
+		List<Stats> modifiedStats = new ArrayList<>();
+		for (AbstractFunction func : _functions) {
+			if (func.getFuncOwner() == owner) {
+				modifiedStats.add(func.getStat());
+				removeFunc(func);
+			}
+		}
+		return modifiedStats;
+	}
+	
+	/**
+	 * Run each function of the Calculator.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param skill the skill
+	 * @param initVal the initial value
+	 * @return the calculated value
+	 */
+	public double calc(L2Character caster, L2Character target, Skill skill, double initVal) {
+		double value = initVal;
+		for (AbstractFunction func : _functions) {
+			value = func.calc(caster, target, skill, value);
+		}
+		return value;
+	}
+	
+	/**
+	 * Get array of all function, dont use for add/remove
+	 * @return
+	 */
+	public AbstractFunction[] getFunctions() {
+		return _functions;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/Formulas.java b/src/main/java/com/l2jserver/gameserver/model/stats/Formulas.java
new file mode 100644
index 00000000..899393ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/Formulas.java
@@ -0,0 +1,1903 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+import static com.l2jserver.gameserver.model.stats.Stats.STAT_CON;
+import static com.l2jserver.gameserver.model.stats.Stats.STAT_DEX;
+import static com.l2jserver.gameserver.model.stats.Stats.STAT_INT;
+import static com.l2jserver.gameserver.model.stats.Stats.STAT_MEN;
+import static com.l2jserver.gameserver.model.stats.Stats.STAT_STR;
+import static com.l2jserver.gameserver.model.stats.Stats.STAT_WIT;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.data.xml.impl.HitConditionBonusData;
+import com.l2jserver.gameserver.data.xml.impl.KarmaData;
+import com.l2jserver.gameserver.enums.DispelCategory;
+import com.l2jserver.gameserver.enums.ShotType;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.type.ArmorType;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.AttributeType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncArmorSet;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncAtkAccuracy;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncAtkCritical;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncAtkEvasion;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncGatesMDefMod;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncGatesPDefMod;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncHenna;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMAtkCritical;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMAtkMod;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMAtkSpeed;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMDefMod;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMaxCpMul;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMaxHpMul;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMaxMpMul;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncMoveSpeed;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncPAtkMod;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncPAtkSpeed;
+import com.l2jserver.gameserver.model.stats.functions.formulas.FuncPDefMod;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.model.zone.type.L2CastleZone;
+import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
+import com.l2jserver.gameserver.model.zone.type.L2FortZone;
+import com.l2jserver.gameserver.model.zone.type.L2MotherTreeZone;
+import com.l2jserver.gameserver.network.Debug;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Global calculations.
+ */
+public final class Formulas {
+	private static final Logger LOG = LoggerFactory.getLogger(Formulas.class);
+	
+	/** Regeneration Task period. */
+	private static final int HP_REGENERATE_PERIOD = 3000; // 3 secs
+	
+	public static final byte SHIELD_DEFENSE_FAILED = 0; // no shield defense
+	public static final byte SHIELD_DEFENSE_SUCCEED = 1; // normal shield defense
+	public static final byte SHIELD_DEFENSE_PERFECT_BLOCK = 2; // perfect block
+	
+	private static final byte MELEE_ATTACK_RANGE = 40;
+	
+	/**
+	 * Return the period between 2 regeneration task (3s for L2Character, 5 min for L2DoorInstance).
+	 * @param cha
+	 * @return
+	 */
+	public static int getRegeneratePeriod(L2Character cha) {
+		return cha.isDoor() ? HP_REGENERATE_PERIOD * 100 : HP_REGENERATE_PERIOD;
+	}
+	
+	/**
+	 * Return the standard NPC Calculator set containing ACCURACY_COMBAT and EVASION_RATE.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * A calculator is created to manage and dynamically calculate the effect of a character property (ex : MAX_HP, REGENERATE_HP_RATE...). In fact, each calculator is a table of Func object in which each Func represents a mathematic function : <br>
+	 * FuncAtkAccuracy -> Math.sqrt(_player.getDEX())*6+_player.getLevel()<br>
+	 * To reduce cache memory use, L2NPCInstances who don't have skills share the same Calculator set called <B>NPC_STD_CALCULATOR</B>.<br>
+	 * @return
+	 */
+	public static Calculator[] getStdNPCCalculators() {
+		Calculator[] std = new Calculator[Stats.NUM_STATS];
+		
+		std[Stats.MAX_HP.ordinal()] = new Calculator();
+		std[Stats.MAX_HP.ordinal()].addFunc(FuncMaxHpMul.getInstance());
+		
+		std[Stats.MAX_MP.ordinal()] = new Calculator();
+		std[Stats.MAX_MP.ordinal()].addFunc(FuncMaxMpMul.getInstance());
+		
+		std[Stats.POWER_ATTACK.ordinal()] = new Calculator();
+		std[Stats.POWER_ATTACK.ordinal()].addFunc(FuncPAtkMod.getInstance());
+		
+		std[Stats.MAGIC_ATTACK.ordinal()] = new Calculator();
+		std[Stats.MAGIC_ATTACK.ordinal()].addFunc(FuncMAtkMod.getInstance());
+		
+		std[Stats.POWER_DEFENCE.ordinal()] = new Calculator();
+		std[Stats.POWER_DEFENCE.ordinal()].addFunc(FuncPDefMod.getInstance());
+		
+		std[Stats.MAGIC_DEFENCE.ordinal()] = new Calculator();
+		std[Stats.MAGIC_DEFENCE.ordinal()].addFunc(FuncMDefMod.getInstance());
+		
+		std[Stats.CRITICAL_RATE.ordinal()] = new Calculator();
+		std[Stats.CRITICAL_RATE.ordinal()].addFunc(FuncAtkCritical.getInstance());
+		
+		std[Stats.MCRITICAL_RATE.ordinal()] = new Calculator();
+		std[Stats.MCRITICAL_RATE.ordinal()].addFunc(FuncMAtkCritical.getInstance());
+		
+		std[Stats.ACCURACY_COMBAT.ordinal()] = new Calculator();
+		std[Stats.ACCURACY_COMBAT.ordinal()].addFunc(FuncAtkAccuracy.getInstance());
+		
+		std[Stats.EVASION_RATE.ordinal()] = new Calculator();
+		std[Stats.EVASION_RATE.ordinal()].addFunc(FuncAtkEvasion.getInstance());
+		
+		std[Stats.POWER_ATTACK_SPEED.ordinal()] = new Calculator();
+		std[Stats.POWER_ATTACK_SPEED.ordinal()].addFunc(FuncPAtkSpeed.getInstance());
+		
+		std[Stats.MAGIC_ATTACK_SPEED.ordinal()] = new Calculator();
+		std[Stats.MAGIC_ATTACK_SPEED.ordinal()].addFunc(FuncMAtkSpeed.getInstance());
+		
+		std[Stats.MOVE_SPEED.ordinal()] = new Calculator();
+		std[Stats.MOVE_SPEED.ordinal()].addFunc(FuncMoveSpeed.getInstance());
+		
+		return std;
+	}
+	
+	public static Calculator[] getStdDoorCalculators() {
+		Calculator[] std = new Calculator[Stats.NUM_STATS];
+		
+		// Add the FuncAtkAccuracy to the Standard Calculator of ACCURACY_COMBAT
+		std[Stats.ACCURACY_COMBAT.ordinal()] = new Calculator();
+		std[Stats.ACCURACY_COMBAT.ordinal()].addFunc(FuncAtkAccuracy.getInstance());
+		
+		// Add the FuncAtkEvasion to the Standard Calculator of EVASION_RATE
+		std[Stats.EVASION_RATE.ordinal()] = new Calculator();
+		std[Stats.EVASION_RATE.ordinal()].addFunc(FuncAtkEvasion.getInstance());
+		
+		// SevenSigns PDEF Modifier
+		std[Stats.POWER_DEFENCE.ordinal()] = new Calculator();
+		std[Stats.POWER_DEFENCE.ordinal()].addFunc(FuncGatesPDefMod.getInstance());
+		
+		// SevenSigns MDEF Modifier
+		std[Stats.MAGIC_DEFENCE.ordinal()] = new Calculator();
+		std[Stats.MAGIC_DEFENCE.ordinal()].addFunc(FuncGatesMDefMod.getInstance());
+		
+		return std;
+	}
+	
+	/**
+	 * Add basics stats functions to a player.<br>
+	 * <B><U>Concept</U>:</B><br>
+	 * A calculator is created to manage and dynamically calculate the effect of a character property (ex : MAX_HP, REGENERATE_HP_RATE...).<br>
+	 * In fact, each calculator is a table of Func object in which each Func represents a mathematics function: <br>
+	 * FuncAtkAccuracy -> Math.sqrt(_player.getDEX())*6+_player.getLevel()<br>
+	 * @param player the player
+	 */
+	public static void addFuncsToNewPlayer(L2PcInstance player) {
+		player.addStatFuncs(List.of( //
+			FuncMaxHpMul.getInstance(), //
+			FuncMaxCpMul.getInstance(), //
+			FuncMaxMpMul.getInstance(), //
+			FuncPAtkMod.getInstance(), //
+			FuncMAtkMod.getInstance(), //
+			FuncPDefMod.getInstance(), //
+			FuncMDefMod.getInstance(), //
+			FuncAtkCritical.getInstance(), //
+			FuncMAtkCritical.getInstance(), //
+			FuncAtkAccuracy.getInstance(), //
+			FuncAtkEvasion.getInstance(), //
+			FuncPAtkSpeed.getInstance(), //
+			FuncMAtkSpeed.getInstance(), //
+			FuncMoveSpeed.getInstance(), //
+			
+			FuncHenna.getInstance(STAT_STR), //
+			FuncHenna.getInstance(STAT_DEX), //
+			FuncHenna.getInstance(STAT_INT), //
+			FuncHenna.getInstance(STAT_MEN), //
+			FuncHenna.getInstance(STAT_CON), //
+			FuncHenna.getInstance(STAT_WIT), //
+			
+			FuncArmorSet.getInstance(STAT_STR), //
+			FuncArmorSet.getInstance(STAT_DEX), //
+			FuncArmorSet.getInstance(STAT_INT), //
+			FuncArmorSet.getInstance(STAT_MEN), //
+			FuncArmorSet.getInstance(STAT_CON), //
+			FuncArmorSet.getInstance(STAT_WIT)));
+	}
+	
+	public static void addFuncsToNewSummon(L2Summon summon) {
+		summon.addStatFuncs(List.of( //
+			FuncMaxHpMul.getInstance(), //
+			FuncMaxMpMul.getInstance(), //
+			FuncPAtkMod.getInstance(), //
+			FuncMAtkMod.getInstance(), //
+			FuncPDefMod.getInstance(), //
+			FuncMDefMod.getInstance(), //
+			FuncAtkCritical.getInstance(), //
+			FuncMAtkCritical.getInstance(), //
+			FuncAtkAccuracy.getInstance(), //
+			FuncAtkEvasion.getInstance(), //
+			FuncMoveSpeed.getInstance(), //
+			FuncPAtkSpeed.getInstance(), //
+			FuncMAtkSpeed.getInstance()));
+	}
+	
+	/**
+	 * Calculate the HP regen rate (base + modifiers).
+	 * @param cha
+	 * @return
+	 */
+	public static double calcHpRegen(L2Character cha) {
+		double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseHpRegen(cha.getLevel()) : cha.getTemplate().getBaseHpReg();
+		double hpRegenMultiplier = cha.isRaid() ? npc().getRaidHpRegenMultiplier() : character().getHpRegenMultiplier();
+		double hpRegenBonus = 0;
+		
+		if (customs().championEnable() && cha.isChampion()) {
+			hpRegenMultiplier *= customs().getChampionHpRegen();
+		}
+		
+		if (cha.isPlayer()) {
+			L2PcInstance player = cha.getActingPlayer();
+			
+			// SevenSigns Festival modifier
+			if (SevenSignsFestival.getInstance().isFestivalInProgress() && player.isFestivalParticipant()) {
+				hpRegenMultiplier *= calcFestivalRegenModifier(player);
+			} else {
+				double siegeModifier = calcSiegeRegenModifier(player);
+				if (siegeModifier > 0) {
+					hpRegenMultiplier *= siegeModifier;
+				}
+			}
+			
+			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0)) {
+				L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class);
+				int posChIndex = zone == null ? -1 : zone.getResidenceId();
+				int clanHallIndex = player.getClan().getHideoutId();
+				if ((clanHallIndex > 0) && (clanHallIndex == posChIndex)) {
+					ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);
+					if (clansHall != null) {
+						if (clansHall.getFunction(ClanHall.FUNC_RESTORE_HP) != null) {
+							hpRegenMultiplier *= 1 + ((double) clansHall.getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() / 100);
+						}
+					}
+				}
+			}
+			
+			if (player.isInsideZone(ZoneId.CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0)) {
+				L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class);
+				int posCastleIndex = zone == null ? -1 : zone.getResidenceId();
+				int castleIndex = player.getClan().getCastleId();
+				if ((castleIndex > 0) && (castleIndex == posCastleIndex)) {
+					Castle castle = CastleManager.getInstance().getCastleById(castleIndex);
+					if (castle != null) {
+						if (castle.getFunction(Castle.FUNC_RESTORE_HP) != null) {
+							hpRegenMultiplier *= 1 + ((double) castle.getFunction(Castle.FUNC_RESTORE_HP).getLvl() / 100);
+						}
+					}
+				}
+			}
+			
+			if (player.isInsideZone(ZoneId.FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0)) {
+				L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class);
+				int posFortIndex = zone == null ? -1 : zone.getResidenceId();
+				int fortIndex = player.getClan().getFortId();
+				if ((fortIndex > 0) && (fortIndex == posFortIndex)) {
+					Fort fort = FortManager.getInstance().getFortById(fortIndex);
+					if (fort != null) {
+						if (fort.getFunction(Fort.FUNC_RESTORE_HP) != null) {
+							hpRegenMultiplier *= 1 + ((double) fort.getFunction(Fort.FUNC_RESTORE_HP).getLvl() / 100);
+						}
+					}
+				}
+			}
+			
+			// Mother Tree effect is calculated at last
+			if (player.isInsideZone(ZoneId.MOTHER_TREE)) {
+				L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class);
+				int hpBonus = zone == null ? 0 : zone.getHpRegenBonus();
+				hpRegenBonus += hpBonus;
+			}
+			
+			// Calculate Movement bonus
+			if (player.isSitting()) {
+				hpRegenMultiplier *= 1.5; // Sitting
+			} else if (!player.isMoving()) {
+				hpRegenMultiplier *= 1.1; // Staying
+			} else if (player.isRunning()) {
+				hpRegenMultiplier *= 0.7; // Running
+			}
+			
+			// Add CON bonus
+			init *= cha.getLevelMod() * BaseStats.CON.calcBonus(cha);
+		} else if (cha.isPet()) {
+			init = ((L2PetInstance) cha).getPetLevelData().getPetRegenHP() * npc().getPetHpRegenMultiplier();
+		}
+		
+		return (cha.calcStat(Stats.REGENERATE_HP_RATE, Math.max(1, init), null, null) * hpRegenMultiplier) + hpRegenBonus;
+	}
+	
+	/**
+	 * Calculate the MP regen rate (base + modifiers).
+	 * @param cha
+	 * @return
+	 */
+	public static double calcMpRegen(L2Character cha) {
+		double init = cha.isPlayer() ? cha.getActingPlayer().getTemplate().getBaseMpRegen(cha.getLevel()) : cha.getTemplate().getBaseMpReg();
+		double mpRegenMultiplier = cha.isRaid() ? npc().getRaidMpRegenMultiplier() : character().getMpRegenMultiplier();
+		double mpRegenBonus = 0;
+		
+		if (cha.isPlayer()) {
+			L2PcInstance player = cha.getActingPlayer();
+			
+			// SevenSigns Festival modifier
+			if (SevenSignsFestival.getInstance().isFestivalInProgress() && player.isFestivalParticipant()) {
+				mpRegenMultiplier *= calcFestivalRegenModifier(player);
+			}
+			
+			// Mother Tree effect is calculated at last'
+			if (player.isInsideZone(ZoneId.MOTHER_TREE)) {
+				L2MotherTreeZone zone = ZoneManager.getInstance().getZone(player, L2MotherTreeZone.class);
+				int mpBonus = zone == null ? 0 : zone.getMpRegenBonus();
+				mpRegenBonus += mpBonus;
+			}
+			
+			if (player.isInsideZone(ZoneId.CLAN_HALL) && (player.getClan() != null) && (player.getClan().getHideoutId() > 0)) {
+				L2ClanHallZone zone = ZoneManager.getInstance().getZone(player, L2ClanHallZone.class);
+				int posChIndex = zone == null ? -1 : zone.getResidenceId();
+				int clanHallIndex = player.getClan().getHideoutId();
+				if ((clanHallIndex > 0) && (clanHallIndex == posChIndex)) {
+					ClanHall clansHall = ClanHallManager.getInstance().getClanHallById(clanHallIndex);
+					if (clansHall != null) {
+						if (clansHall.getFunction(ClanHall.FUNC_RESTORE_MP) != null) {
+							mpRegenMultiplier *= 1 + ((double) clansHall.getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() / 100);
+						}
+					}
+				}
+			}
+			
+			if (player.isInsideZone(ZoneId.CASTLE) && (player.getClan() != null) && (player.getClan().getCastleId() > 0)) {
+				L2CastleZone zone = ZoneManager.getInstance().getZone(player, L2CastleZone.class);
+				int posCastleIndex = zone == null ? -1 : zone.getResidenceId();
+				int castleIndex = player.getClan().getCastleId();
+				if ((castleIndex > 0) && (castleIndex == posCastleIndex)) {
+					Castle castle = CastleManager.getInstance().getCastleById(castleIndex);
+					if (castle != null) {
+						if (castle.getFunction(Castle.FUNC_RESTORE_MP) != null) {
+							mpRegenMultiplier *= 1 + ((double) castle.getFunction(Castle.FUNC_RESTORE_MP).getLvl() / 100);
+						}
+					}
+				}
+			}
+			
+			if (player.isInsideZone(ZoneId.FORT) && (player.getClan() != null) && (player.getClan().getFortId() > 0)) {
+				L2FortZone zone = ZoneManager.getInstance().getZone(player, L2FortZone.class);
+				int posFortIndex = zone == null ? -1 : zone.getResidenceId();
+				int fortIndex = player.getClan().getFortId();
+				if ((fortIndex > 0) && (fortIndex == posFortIndex)) {
+					Fort fort = FortManager.getInstance().getFortById(fortIndex);
+					if (fort != null) {
+						if (fort.getFunction(Fort.FUNC_RESTORE_MP) != null) {
+							mpRegenMultiplier *= 1 + ((double) fort.getFunction(Fort.FUNC_RESTORE_MP).getLvl() / 100);
+						}
+					}
+				}
+			}
+			
+			// Calculate Movement bonus
+			if (player.isSitting()) {
+				mpRegenMultiplier *= 1.5; // Sitting
+			} else if (!player.isMoving()) {
+				mpRegenMultiplier *= 1.1; // Staying
+			} else if (player.isRunning()) {
+				mpRegenMultiplier *= 0.7; // Running
+			}
+			
+			// Add MEN bonus
+			init *= cha.getLevelMod() * BaseStats.MEN.calcBonus(cha);
+		} else if (cha.isPet()) {
+			init = ((L2PetInstance) cha).getPetLevelData().getPetRegenMP() * npc().getPetMpRegenMultiplier();
+		}
+		
+		return (cha.calcStat(Stats.REGENERATE_MP_RATE, Math.max(1, init), null, null) * mpRegenMultiplier) + mpRegenBonus;
+	}
+	
+	/**
+	 * Calculates the CP regeneration rate (base + modifiers).
+	 * @param player the player
+	 * @return the CP regeneration rate
+	 */
+	public static double calcCpRegen(L2PcInstance player) {
+		// With CON bonus
+		final double init = player.getActingPlayer().getTemplate().getBaseCpRegen(player.getLevel()) * player.getLevelMod() * BaseStats.CON.calcBonus(player);
+		double cpRegenMultiplier = character().getCpRegenMultiplier();
+		if (player.isSitting()) {
+			cpRegenMultiplier *= 1.5; // Sitting
+		} else if (!player.isMoving()) {
+			cpRegenMultiplier *= 1.1; // Staying
+		} else if (player.isRunning()) {
+			cpRegenMultiplier *= 0.7; // Running
+		}
+		return player.calcStat(Stats.REGENERATE_CP_RATE, Math.max(1, init), null, null) * cpRegenMultiplier;
+	}
+	
+	public static double calcFestivalRegenModifier(L2PcInstance activeChar) {
+		final int[] festivalInfo = SevenSignsFestival.getInstance().getFestivalForPlayer(activeChar);
+		final int oracle = festivalInfo[0];
+		final int festivalId = festivalInfo[1];
+		int[] festivalCenter;
+		
+		// If the player isn't found in the festival, leave the regen rate as it is.
+		if (festivalId < 0) {
+			return 0;
+		}
+		
+		// Retrieve the X and Y coords for the center of the festival arena the player is in.
+		if (oracle == SevenSigns.CABAL_DAWN) {
+			festivalCenter = SevenSignsFestival.FESTIVAL_DAWN_PLAYER_SPAWNS[festivalId];
+		} else {
+			festivalCenter = SevenSignsFestival.FESTIVAL_DUSK_PLAYER_SPAWNS[festivalId];
+		}
+		
+		// Check the distance between the player and the player spawn point, in the center of the arena.
+		double distToCenter = activeChar.calculateDistance(festivalCenter[0], festivalCenter[1], 0, false, false);
+		
+		if (general().debug()) {
+			LOG.info("Distance: {}, RegenMulti: {}", distToCenter, (distToCenter * 2.5) / 50);
+		}
+		
+		return 1.0 - (distToCenter * 0.0005); // Maximum Decreased Regen of ~ -65%;
+	}
+	
+	public static double calcSiegeRegenModifier(L2PcInstance activeChar) {
+		if ((activeChar == null) || (activeChar.getClan() == null)) {
+			return 0;
+		}
+		
+		Siege siege = SiegeManager.getInstance().getSiege(activeChar.getX(), activeChar.getY(), activeChar.getZ());
+		if ((siege == null) || !siege.isInProgress()) {
+			return 0;
+		}
+		
+		L2SiegeClan siegeClan = siege.getAttackerClan(activeChar.getClan().getId());
+		if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, activeChar, siegeClan.getFlag().get(0), true)) {
+			return 0;
+		}
+		
+		return 1.5; // If all is true, then modifier will be 50% more
+	}
+	
+	public static double calcBlowDamage(L2Character attacker, L2Character target, Skill skill, byte shld, boolean ss, double power) {
+		double defence = target.getPDef(attacker);
+		
+		switch (shld) {
+			case Formulas.SHIELD_DEFENSE_SUCCEED -> {
+				defence += target.getShldDef();
+			}
+			case Formulas.SHIELD_DEFENSE_PERFECT_BLOCK -> {
+				return 1;
+			}
+		}
+		
+		final boolean isPvP = attacker.isPlayable() && target.isPlayable();
+		double damage;
+		double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed);
+		double ssboost = ss ? 1.458 : 1;
+		double pvpBonus = 1;
+		
+		if (isPvP) {
+			// Damage bonuses in PvP fight
+			pvpBonus = attacker.calcStat(Stats.PVP_PHYS_SKILL_DMG, 1, null, null);
+			// Defense bonuses in PvP fight
+			defence *= target.calcStat(Stats.PVP_PHYS_SKILL_DEF, 1, null, null);
+		}
+		
+		// Initial damage
+		double baseMod = ((77 * (power + (attacker.getPAtk(target) * ssboost))) / defence);
+		// Critical
+		double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill));
+		double criticalModPos = (((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2) + 1);
+		double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill));
+		double criticalAddMod = ((attacker.getStat().calcStat(Stats.CRITICAL_DAMAGE_ADD, 0) * 6.1 * 77) / defence);
+		double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill);
+		// Trait, elements
+		double weaponTraitMod = calcWeaponTraitBonus(attacker, target);
+		double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false);
+		double attributeMod = calcAttributeBonus(attacker, target, skill);
+		double weaponMod = attacker.getRandomDamageMultiplier();
+		
+		double penaltyMod = 1;
+		if ((target instanceof L2Attackable) && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) {
+			int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
+			if (lvlDiff >= npc().getSkillDmgPenaltyForLvLDifferences().size()) {
+				penaltyMod *= npc().getSkillDmgPenaltyForLvLDifferences().get(npc().getSkillDmgPenaltyForLvLDifferences().size() - 1);
+			} else {
+				penaltyMod *= npc().getSkillDmgPenaltyForLvLDifferences().get(lvlDiff);
+			}
+		}
+		damage = (baseMod * criticalMod * criticalModPos * criticalVulnMod * proximityBonus * pvpBonus) + criticalAddMod + criticalAddVuln;
+		damage *= weaponTraitMod;
+		damage *= generalTraitMod;
+		damage *= attributeMod;
+		damage *= weaponMod;
+		damage *= penaltyMod;
+		
+		if (attacker.isDebug()) {
+			final StatsSet set = new StatsSet();
+			set.set("skillPower", power);
+			set.set("ssboost", ssboost);
+			set.set("proximityBonus", proximityBonus);
+			set.set("pvpBonus", pvpBonus);
+			set.set("baseMod", baseMod);
+			set.set("criticalMod", criticalMod);
+			set.set("criticalModPos", criticalModPos);
+			set.set("criticalVulnMod", criticalVulnMod);
+			set.set("criticalAddMod", criticalAddMod);
+			set.set("criticalAddVuln", criticalAddVuln);
+			set.set("weaponTraitMod", weaponTraitMod);
+			set.set("generalTraitMod", generalTraitMod);
+			set.set("attributeMod", attributeMod);
+			set.set("weaponMod", weaponMod);
+			set.set("penaltyMod", penaltyMod);
+			set.set("damage", (int) damage);
+			Debug.sendSkillDebug(attacker, target, skill, set);
+		}
+		
+		return Math.max(damage, 1);
+	}
+	
+	public static double calcBackstabDamage(L2Character attacker, L2Character target, Skill skill, byte shld, boolean ss, double power) {
+		double defence = target.getPDef(attacker);
+		
+		switch (shld) {
+			case Formulas.SHIELD_DEFENSE_SUCCEED -> {
+				defence += target.getShldDef();
+			}
+			case Formulas.SHIELD_DEFENSE_PERFECT_BLOCK -> {
+				return 1;
+			}
+		}
+		
+		boolean isPvP = attacker.isPlayable() && target.isPlayer();
+		double damage;
+		double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10%
+		double ssboost = ss ? 1.458 : 1;
+		double pvpBonus = 1;
+		
+		if (isPvP) {
+			// Damage bonuses in PvP fight
+			pvpBonus = attacker.calcStat(Stats.PVP_PHYS_SKILL_DMG, 1, null, null);
+			// Defense bonuses in PvP fight
+			defence *= target.calcStat(Stats.PVP_PHYS_SKILL_DEF, 1, null, null);
+		}
+		
+		// Initial damage
+		double baseMod = ((77 * (power + attacker.getPAtk(target))) / defence) * ssboost;
+		// Critical
+		double criticalMod = (attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, skill));
+		double criticalModPos = (((attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, skill) - 1) / 2) + 1);
+		double criticalVulnMod = (target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, skill));
+		double criticalAddMod = ((attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, skill) * 6.1 * 77) / defence);
+		double criticalAddVuln = target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, skill);
+		// Trait, elements
+		double generalTraitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false);
+		double attributeMod = calcAttributeBonus(attacker, target, skill);
+		double weaponMod = attacker.getRandomDamageMultiplier();
+		
+		double penaltyMod = 1;
+		if (target.isAttackable() && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) {
+			int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
+			if (lvlDiff >= npc().getSkillDmgPenaltyForLvLDifferences().size()) {
+				penaltyMod *= npc().getSkillDmgPenaltyForLvLDifferences().get(npc().getSkillDmgPenaltyForLvLDifferences().size() - 1);
+			} else {
+				penaltyMod *= npc().getSkillDmgPenaltyForLvLDifferences().get(lvlDiff);
+			}
+			
+		}
+		
+		damage = (baseMod * criticalMod * criticalModPos * criticalVulnMod * proximityBonus * pvpBonus) + criticalAddMod + criticalAddVuln;
+		damage *= generalTraitMod;
+		damage *= attributeMod;
+		damage *= weaponMod;
+		damage *= penaltyMod;
+		
+		if (attacker.isDebug()) {
+			final StatsSet set = new StatsSet();
+			set.set("skillPower", power);
+			set.set("ssboost", ssboost);
+			set.set("proximityBonus", proximityBonus);
+			set.set("pvpBonus", pvpBonus);
+			set.set("baseMod", baseMod);
+			set.set("criticalMod", criticalMod);
+			set.set("criticalVulnMod", criticalVulnMod);
+			set.set("criticalAddMod", criticalAddMod);
+			set.set("criticalAddVuln", criticalAddVuln);
+			set.set("generalTraitMod", generalTraitMod);
+			set.set("attributeMod", attributeMod);
+			set.set("weaponMod", weaponMod);
+			set.set("penaltyMod", penaltyMod);
+			set.set("damage", (int) damage);
+			Debug.sendSkillDebug(attacker, target, skill, set);
+		}
+		
+		return Math.max(damage, 1);
+	}
+	
+	/**
+	 * Calculated damage caused by ATTACK of attacker on target.
+	 * @param attacker player or NPC that makes ATTACK
+	 * @param target player or NPC, target of ATTACK
+	 * @param shld
+	 * @param crit if the ATTACK have critical success
+	 * @param ss if weapon item was charged by soulshot
+	 * @return
+	 */
+	public static double calcPhysDam(L2Character attacker, L2Character target, byte shld, boolean crit, boolean ss) {
+		double defence = target.getPDef(attacker);
+		
+		switch (shld) {
+			case SHIELD_DEFENSE_SUCCEED -> {
+				if (!character().shieldBlocks()) {
+					defence += target.getShldDef();
+				}
+			}
+			case SHIELD_DEFENSE_PERFECT_BLOCK -> {
+				return 1;
+			}
+		}
+		
+		final boolean isPvP = attacker.isPlayable() && target.isPlayable();
+		double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed)
+		double damage = attacker.getPAtk(target);
+		double ssboost = ss ? 2 : 1;
+		
+		if (isPvP) {
+			// Defense bonuses in PvP fight
+			defence *= target.calcStat(Stats.PVP_PHYSICAL_DEF, 1, null, null);
+		}
+		
+		damage *= ssboost;
+		
+		if (crit) {
+			// H5 Damage Formula
+			damage = 2 * attacker.calcStat(Stats.CRITICAL_DAMAGE, 1, target, null) * attacker.calcStat(Stats.CRITICAL_DAMAGE_POS, 1, target, null) * target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE, 1, target, null) * ((76 * damage * proximityBonus) / defence);
+			damage += ((attacker.calcStat(Stats.CRITICAL_DAMAGE_ADD, 0, target, null) * 77) / defence);
+			damage += target.calcStat(Stats.DEFENCE_CRITICAL_DAMAGE_ADD, 0, target, null);
+		} else {
+			damage = (76 * damage * proximityBonus) / defence;
+		}
+		
+		damage *= calcAttackTraitBonus(attacker, target);
+		
+		// Weapon random damage
+		damage *= attacker.getRandomDamageMultiplier();
+		
+		// Dmg bonuses in PvP fight
+		if (isPvP) {
+			damage *= attacker.calcStat(Stats.PVP_PHYSICAL_DMG, 1, null, null);
+		}
+		
+		damage *= calcAttributeBonus(attacker, target, null);
+		if (target.isAttackable()) {
+			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) {
+				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
+				
+				if (crit) {
+					if (lvlDiff >= npc().getCritDmgPenaltyForLvLDifferences().size()) {
+						damage *= npc().getCritDmgPenaltyForLvLDifferences().get(npc().getCritDmgPenaltyForLvLDifferences().size() - 1);
+					} else {
+						damage *= npc().getCritDmgPenaltyForLvLDifferences().get(lvlDiff);
+					}
+				} else {
+					if (lvlDiff >= npc().getDmgPenaltyForLvLDifferences().size()) {
+						damage *= npc().getDmgPenaltyForLvLDifferences().get(npc().getDmgPenaltyForLvLDifferences().size() - 1);
+					} else {
+						damage *= npc().getDmgPenaltyForLvLDifferences().get(lvlDiff);
+					}
+				}
+			}
+		}
+		
+		return Math.max(damage, 1);
+	}
+	
+	/**
+	 * Calculated damage caused by skill ATTACK of attacker on target.
+	 * @param attacker player or NPC that makes ATTACK
+	 * @param target player or NPC, target of ATTACK
+	 * @param skill
+	 * @param shld
+	 * @param crit if the ATTACK have critical success
+	 * @param ss if weapon item was charged by soulshot
+	 * @return
+	 */
+	public static double calcSkillPhysDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean crit, boolean ss, double power) {
+		double defence = target.getPDef(attacker);
+		
+		switch (shld) {
+			case SHIELD_DEFENSE_SUCCEED -> {
+				if (!character().shieldBlocks()) {
+					defence += target.getShldDef();
+				}
+			}
+			case SHIELD_DEFENSE_PERFECT_BLOCK -> {
+				return 1.;
+			}
+		}
+		
+		final boolean isPvP = attacker.isPlayable() && target.isPlayable();
+		double proximityBonus = attacker.isBehindTarget() ? 1.2 : attacker.isInFrontOfTarget() ? 1 : 1.1; // Behind: +20% - Side: +10% (TODO: values are unconfirmed, possibly custom, remove or update when confirmed)
+		double damage;
+		double ssBoost = ss ? 2 : 1;
+		double pvpBonus = 1;
+		
+		if (isPvP) {
+			// Damage bonuses in PvP fight
+			pvpBonus = attacker.getStat().calcStat(Stats.PVP_PHYS_SKILL_DMG, 1.0);
+			// Defense bonuses in PvP fight
+			defence *= target.getStat().calcStat(Stats.PVP_PHYS_SKILL_DEF, 1.0);
+		}
+		
+		// Initial damage
+		double baseMod = ((77 * (power + (attacker.getPAtk(target) * ssBoost))) / defence);
+		
+		double penaltyMod = 1;
+		if ((target instanceof L2Attackable) && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) {
+			int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
+			
+			if (lvlDiff >= npc().getSkillDmgPenaltyForLvLDifferences().size()) {
+				penaltyMod *= npc().getSkillDmgPenaltyForLvLDifferences().get(npc().getSkillDmgPenaltyForLvLDifferences().size() - 1);
+			} else {
+				penaltyMod *= npc().getSkillDmgPenaltyForLvLDifferences().get(lvlDiff);
+			}
+			
+			if (crit) {
+				if (lvlDiff >= npc().getCritDmgPenaltyForLvLDifferences().size()) {
+					penaltyMod *= npc().getCritDmgPenaltyForLvLDifferences().get(npc().getCritDmgPenaltyForLvLDifferences().size() - 1);
+				} else {
+					penaltyMod *= npc().getCritDmgPenaltyForLvLDifferences().get(lvlDiff);
+				}
+			} else {
+				if (lvlDiff >= npc().getDmgPenaltyForLvLDifferences().size()) {
+					penaltyMod *= npc().getDmgPenaltyForLvLDifferences().get(npc().getDmgPenaltyForLvLDifferences().size() - 1);
+				} else {
+					penaltyMod *= npc().getDmgPenaltyForLvLDifferences().get(lvlDiff);
+				}
+			}
+		}
+		
+		damage = baseMod * proximityBonus * pvpBonus;
+		damage *= calcAttackTraitBonus(attacker, target);
+		damage *= calcAttributeBonus(attacker, target, skill);
+		damage *= attacker.getRandomDamageMultiplier();
+		damage *= penaltyMod;
+		damage = attacker.getStat().calcStat(Stats.PHYSICAL_SKILL_POWER, damage);
+		
+		return Math.max(damage, 1);
+	}
+	
+	public static double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit, double power) {
+		return calcMagicDam(attacker, target, skill, shld, 0, sps, bss, mcrit, power);
+	}
+	
+	public static double calcMagicDam(L2Character attacker, L2Character target, Skill skill, byte shld, double shieldDefensePercentage, boolean sps, boolean bss, boolean mcrit, double power) {
+		double mDef = target.getMDef(attacker, skill);
+		switch (shld) {
+			case SHIELD_DEFENSE_SUCCEED -> {
+				if (shieldDefensePercentage <= 0) {
+					mDef += target.getShldDef();
+				} else {
+					mDef += (target.getShldDef() * shieldDefensePercentage) / 100.0;
+				}
+			}
+			case SHIELD_DEFENSE_PERFECT_BLOCK -> {
+				return 1;
+			}
+		}
+		
+		double mAtk = attacker.getMAtk(target, skill);
+		final boolean isPvP = attacker.isPlayable() && target.isPlayable();
+		
+		// PvP bonuses for defense
+		if (isPvP) {
+			if (skill.isMagic()) {
+				mDef *= target.calcStat(Stats.PVP_MAGICAL_DEF, 1, null, null);
+			} else {
+				mDef *= target.calcStat(Stats.PVP_PHYS_SKILL_DEF, 1, null, null);
+			}
+		}
+		
+		// Bonus Spirit shot
+		mAtk *= bss ? 4 : sps ? 2 : 1;
+		// MDAM Formula.
+		double damage = ((91 * Math.sqrt(mAtk)) / mDef) * power;
+		
+		// Failure calculation
+		if (character().magicFailures() && !calcMagicSuccess(attacker, target, skill)) {
+			if (attacker.isPlayer()) {
+				if (calcMagicSuccess(attacker, target, skill) && ((target.getLevel() - attacker.getLevel()) <= 9)) {
+					if (skill.hasEffectType(L2EffectType.HP_DRAIN)) {
+						attacker.sendPacket(SystemMessageId.DRAIN_HALF_SUCCESFUL);
+					} else {
+						attacker.sendPacket(SystemMessageId.ATTACK_FAILED);
+					}
+					damage /= 2;
+				} else {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
+					sm.addCharName(target);
+					sm.addSkillName(skill);
+					attacker.sendPacket(sm);
+					damage = 1;
+				}
+			}
+			
+			if (target.isPlayer()) {
+				final SystemMessage sm = (skill.hasEffectType(L2EffectType.HP_DRAIN)) ? SystemMessage.getSystemMessage(SystemMessageId.RESISTED_C1_DRAIN) : SystemMessage.getSystemMessage(SystemMessageId.RESISTED_C1_MAGIC);
+				sm.addCharName(attacker);
+				target.sendPacket(sm);
+			}
+		} else if (mcrit) {
+			damage *= attacker.isPlayer() && target.isPlayer() ? 2.5 : 3;
+			damage *= attacker.calcStat(Stats.MAGIC_CRIT_DMG, 1, null, null);
+		}
+		
+		// Weapon random damage
+		damage *= attacker.getRandomDamageMultiplier();
+		
+		// PvP bonuses for damage
+		if (isPvP) {
+			Stats stat = skill.isMagic() ? Stats.PVP_MAGICAL_DMG : Stats.PVP_PHYS_SKILL_DMG;
+			damage *= attacker.calcStat(stat, 1, null, null);
+		}
+		
+		damage *= calcAttributeBonus(attacker, target, skill);
+		
+		if (target.isAttackable()) {
+			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) {
+				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
+				if (lvlDiff >= npc().getSkillDmgPenaltyForLvLDifferences().size()) {
+					damage *= npc().getSkillDmgPenaltyForLvLDifferences().get(npc().getSkillDmgPenaltyForLvLDifferences().size() - 1);
+				} else {
+					damage *= npc().getSkillDmgPenaltyForLvLDifferences().get(lvlDiff);
+				}
+			}
+		}
+		return damage;
+	}
+	
+	public static double calcMagicDam(L2CubicInstance attacker, L2Character target, Skill skill, boolean mcrit, byte shld) {
+		double mDef = target.getMDef(attacker.getOwner(), skill);
+		switch (shld) {
+			case SHIELD_DEFENSE_SUCCEED:
+				mDef += target.getShldDef(); // kamael
+				break;
+			case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block
+				return 1;
+		}
+		
+		// Cubics MDAM Formula (similar to PDAM formula, but using 91 instead of 70, also resisted by mDef).
+		double damage = (91 * attacker.getCubicPower()) / mDef;
+		
+		// Failure calculation
+		L2PcInstance owner = attacker.getOwner();
+		if (character().magicFailures() && !calcMagicSuccess(owner, target, skill)) {
+			if (calcMagicSuccess(owner, target, skill) && ((target.getLevel() - skill.getMagicLevel()) <= 9)) {
+				if (skill.hasEffectType(L2EffectType.HP_DRAIN)) {
+					owner.sendPacket(SystemMessageId.DRAIN_HALF_SUCCESFUL);
+				} else {
+					owner.sendPacket(SystemMessageId.ATTACK_FAILED);
+				}
+				damage /= 2;
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
+				sm.addCharName(target);
+				sm.addSkillName(skill);
+				owner.sendPacket(sm);
+				damage = 1;
+			}
+			
+			if (target.isPlayer()) {
+				if (skill.hasEffectType(L2EffectType.HP_DRAIN)) {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.RESISTED_C1_DRAIN);
+					sm.addCharName(owner);
+					target.sendPacket(sm);
+				} else {
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.RESISTED_C1_MAGIC);
+					sm.addCharName(owner);
+					target.sendPacket(sm);
+				}
+			}
+		} else if (mcrit) {
+			damage *= 3;
+		}
+		
+		damage *= calcAttributeBonus(owner, target, skill);
+		
+		if (target.isAttackable()) {
+			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getOwner() != null) && ((target.getLevel() - attacker.getOwner().getLevel()) >= 2)) {
+				int lvlDiff = target.getLevel() - attacker.getOwner().getLevel() - 1;
+				if (lvlDiff >= npc().getSkillDmgPenaltyForLvLDifferences().size()) {
+					damage *= npc().getSkillDmgPenaltyForLvLDifferences().get(npc().getSkillDmgPenaltyForLvLDifferences().size() - 1);
+				} else {
+					damage *= npc().getSkillDmgPenaltyForLvLDifferences().get(lvlDiff);
+				}
+			}
+		}
+		return damage;
+	}
+	
+	/**
+	 * Returns true in case of critical hit
+	 * @param attacker
+	 * @param target
+	 * @return
+	 */
+	public static boolean calcCrit(L2Character attacker, L2Character target) {
+		double rate = attacker.getStat().calcStat(Stats.CRITICAL_RATE_POS, attacker.getStat().getCriticalHit(target, null));
+		return (target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE, rate, null, null) + target.getStat().calcStat(Stats.DEFENCE_CRITICAL_RATE_ADD, 0, null, null)) > Rnd.get(1000);
+	}
+	
+	/**
+	 * Returns true in case of physical skill critical hit
+	 * @param attacker
+	 * @param target
+	 * @param criticalChance
+	 * @return
+	 */
+	public static boolean calcSkillCrit(L2Character attacker, L2Character target, int criticalChance) {
+		return (BaseStats.STR.calcBonus(attacker) * criticalChance) > (Rnd.nextDouble() * 100);
+	}
+	
+	public static boolean calcMCrit(double mRate) {
+		return mRate > Rnd.get(1000);
+	}
+	
+	/**
+	 * @param target
+	 * @param dmg
+	 * @return true in case when ATTACK is canceled due to hit
+	 */
+	public static boolean calcAtkBreak(L2Character target, double dmg) {
+		if (target.isChanneling()) {
+			return false;
+		}
+		
+		double init = 0;
+		if (character().cancelCast() && target.isCastingNow()) {
+			init = 15;
+		}
+		if (character().cancelBow() && target.isAttackingNow()) {
+			L2Weapon wpn = target.getActiveWeaponItem();
+			if ((wpn != null) && (wpn.getItemType() == WeaponType.BOW)) {
+				init = 15;
+			}
+		}
+		
+		if (target.isRaid() || target.isInvul() || (init <= 0)) {
+			return false; // No attack break
+		}
+		
+		// Chance of break is higher with higher dmg
+		init += Math.sqrt(13 * dmg);
+		
+		// Chance is affected by target MEN
+		init -= ((BaseStats.MEN.calcBonus(target) * 100) - 100);
+		
+		// Calculate all modifiers for ATTACK_CANCEL
+		double rate = target.calcStat(Stats.ATTACK_CANCEL, init, null, null);
+		
+		// Adjust the rate to be between 1 and 99
+		rate = Math.max(Math.min(rate, 99), 1);
+		
+		return Rnd.get(100) < rate;
+	}
+	
+	public static double calcCastTime(L2Character character, Skill skill) {
+		double skillAnimTime = skill.getHitTime();
+		if (!skill.isChanneling() || (skill.getChannelingSkillId() == 0)) {
+			// Calculate the Casting Time of the "Non-Static" Skills (with caster PAtk/MAtkSpd).
+			if (!skill.isStatic()) {
+				final double speed = skill.isMagic() ? character.getMAtkSpd() : character.getPAtkSpd();
+				skillAnimTime = (skillAnimTime / speed) * 333;
+			}
+			
+			// Calculate the Casting Time of Magic Skills (reduced in 40% if using SPS/BSPS)
+			if (skill.isMagic() && (character.isChargedShot(ShotType.SPIRITSHOTS) || character.isChargedShot(ShotType.BLESSED_SPIRITSHOTS))) {
+				skillAnimTime = skillAnimTime * 0.6;
+			}
+			
+			if ((skillAnimTime < 500) && (skill.getHitTime() > 500)) {
+				skillAnimTime = 500.0;
+			}
+		}
+		return skillAnimTime;
+	}
+	
+	/**
+	 * Formula based on http://l2p.l2wh.com/nonskillattacks.html
+	 * @param attacker
+	 * @param target
+	 * @return {@code true} if hit missed (target evaded), {@code false} otherwise.
+	 */
+	public static boolean calcHitMiss(L2Character attacker, L2Character target) {
+		int chance = (80 + (2 * (attacker.getAccuracy() - target.getEvasionRate(attacker)))) * 10;
+		
+		// Get additional bonus from the conditions when you are attacking
+		chance *= HitConditionBonusData.getInstance().getConditionBonus(attacker, target);
+		
+		chance = Math.max(chance, 200);
+		chance = Math.min(chance, 980);
+		
+		return chance < Rnd.get(1000);
+	}
+	
+	/**
+	 * Returns:<br>
+	 * 0 = shield defense doesn't succeed<br>
+	 * 1 = shield defense succeed<br>
+	 * 2 = perfect block<br>
+	 * @param attacker
+	 * @param target
+	 * @param skill
+	 * @param sendSysMsg
+	 * @return
+	 */
+	public static byte calcShldUse(L2Character attacker, L2Character target, Skill skill, boolean sendSysMsg) {
+		L2Item item = target.getSecondaryWeaponItem();
+		if (!(item instanceof L2Armor) || (((L2Armor) item).getItemType() == ArmorType.SIGIL)) {
+			return 0;
+		}
+		
+		double shldRate = target.calcStat(Stats.SHIELD_RATE, 0, attacker, null) * BaseStats.DEX.calcBonus(target);
+		if (shldRate <= 1e-6) {
+			return 0;
+		}
+		
+		int degreeside = (int) target.calcStat(Stats.SHIELD_DEFENCE_ANGLE, 0, null, null) + 120;
+		if ((degreeside < 360) && (!target.isFacing(attacker, degreeside))) {
+			return 0;
+		}
+		
+		byte shldSuccess = SHIELD_DEFENSE_FAILED;
+		// if attacker
+		// if attacker use bow and target wear shield, shield block rate is multiplied by 1.3 (30%)
+		L2Weapon at_weapon = attacker.getActiveWeaponItem();
+		if ((at_weapon != null) && (at_weapon.getItemType() == WeaponType.BOW)) {
+			shldRate *= 1.3;
+		}
+		
+		if ((shldRate > 0) && ((100 - character().getPerfectShieldBlockRate()) < Rnd.get(100))) {
+			shldSuccess = SHIELD_DEFENSE_PERFECT_BLOCK;
+		} else if (shldRate > Rnd.get(100)) {
+			shldSuccess = SHIELD_DEFENSE_SUCCEED;
+		}
+		
+		if (sendSysMsg && target.isPlayer()) {
+			L2PcInstance enemy = target.getActingPlayer();
+			
+			switch (shldSuccess) {
+				case SHIELD_DEFENSE_SUCCEED -> enemy.sendPacket(SystemMessageId.SHIELD_DEFENCE_SUCCESSFULL);
+				case SHIELD_DEFENSE_PERFECT_BLOCK -> enemy.sendPacket(SystemMessageId.YOUR_EXCELLENT_SHIELD_DEFENSE_WAS_A_SUCCESS);
+			}
+		}
+		return shldSuccess;
+	}
+	
+	public static byte calcShldUse(L2Character attacker, L2Character target, Skill skill) {
+		return calcShldUse(attacker, target, skill, true);
+	}
+	
+	public static byte calcShldUse(L2Character attacker, L2Character target) {
+		return calcShldUse(attacker, target, null, true);
+	}
+	
+	public static boolean calcMagicAffected(L2Character actor, L2Character target, Skill skill) {
+		// TODO: CHECK/FIX THIS FORMULA UP!!
+		double defence = 0;
+		if (skill.isActive() && skill.isBad()) {
+			defence = target.getMDef(actor, skill);
+		}
+		
+		double attack = 2 * actor.getMAtk(target, skill) * calcGeneralTraitBonus(actor, target, skill.getTraitType(), false);
+		double d = (attack - defence) / (attack + defence);
+		
+		if (skill.isDebuff() && target.isDebuffBlocked()) {
+			return false;
+		}
+		
+		d += 0.5 * Rnd.nextGaussian();
+		return d > 0;
+	}
+	
+	public static double calcLvlBonusMod(L2Character attacker, L2Character target, Skill skill) {
+		int attackerLvl = skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel();
+		double skillLvlBonusRateMod = 1 + (skill.getLvlBonusRate() / 100.);
+		double lvlMod = 1 + ((attackerLvl - target.getLevel()) / 100.);
+		return skillLvlBonusRateMod * lvlMod;
+	}
+	
+	/**
+	 * Calculates the effect landing success.<br>
+	 * @param attacker the attacker
+	 * @param target the target
+	 * @param skill the skill
+	 * @return {@code true} if the effect lands
+	 */
+	public static boolean calcEffectSuccess(L2Character attacker, L2Character target, Skill skill) {
+		// StaticObjects can not receive continuous effects.
+		if (target.isDoor() || (target instanceof L2SiegeFlagInstance) || (target instanceof L2StaticObjectInstance)) {
+			return false;
+		}
+		
+		if (skill.isDebuff() && target.isDebuffBlocked()) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
+			sm.addCharName(target);
+			sm.addSkillName(skill);
+			attacker.sendPacket(sm);
+			return false;
+		}
+		
+		final int activateRate = skill.getActivateRate();
+		if ((activateRate == -1) || (skill.getBasicProperty() == BaseStats.NONE)) {
+			return true;
+		}
+		
+		int magicLevel = skill.getMagicLevel();
+		if (magicLevel <= -1) {
+			magicLevel = target.getLevel() + 3;
+		}
+		
+		int targetBaseStat = switch (skill.getBasicProperty()) {
+			case STR -> target.getSTR();
+			case DEX -> target.getDEX();
+			case CON -> target.getCON();
+			case INT -> target.getINT();
+			case MEN -> target.getMEN();
+			case WIT -> target.getWIT();
+			default -> 0;
+		};
+		
+		final double baseMod = ((((((magicLevel - target.getLevel()) + 3) * skill.getLvlBonusRate()) + activateRate) + 30.0) - targetBaseStat);
+		final double elementMod = calcAttributeBonus(attacker, target, skill);
+		final double traitMod = calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false);
+		final double buffDebuffMod = 1 + (target.calcStat(skill.isDebuff() ? Stats.DEBUFF_VULN : Stats.BUFF_VULN, 1, null, null) / 100);
+		double mAtkMod = 1;
+		
+		if (skill.isMagic()) {
+			double mAtk = attacker.getMAtk(null, null);
+			double val = 0;
+			if (attacker.isChargedShot(ShotType.BLESSED_SPIRITSHOTS)) {
+				val = mAtk * 3.0;// 3.0 is the blessed spiritshot multiplier
+			}
+			val += mAtk;
+			val = (Math.sqrt(val) / target.getMDef(null, null)) * 11.0;
+			mAtkMod = val;
+		}
+		
+		final double rate = baseMod * elementMod * traitMod * mAtkMod * buffDebuffMod;
+		final double finalRate = traitMod > 0 ? Util.constrain(rate, skill.getMinChance(), skill.getMaxChance()) : 0;
+		
+		if (attacker.isDebug()) {
+			final StatsSet set = new StatsSet();
+			set.set("baseMod", baseMod);
+			set.set("elementMod", elementMod);
+			set.set("traitMod", traitMod);
+			set.set("mAtkMod", mAtkMod);
+			set.set("buffDebuffMod", buffDebuffMod);
+			set.set("rate", rate);
+			set.set("finalRate", finalRate);
+			Debug.sendSkillDebug(attacker, target, skill, set);
+		}
+		
+		if (finalRate <= Rnd.get(100)) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
+			sm.addCharName(target);
+			sm.addSkillName(skill);
+			attacker.sendPacket(sm);
+			return false;
+		}
+		return true;
+	}
+	
+	public static boolean calcCubicSkillSuccess(L2CubicInstance attacker, L2Character target, Skill skill, byte shld) {
+		if (skill.isDebuff() && target.isDebuffBlocked()) {
+			return false;
+		}
+		
+		// Perfect Shield Block.
+		if (shld == SHIELD_DEFENSE_PERFECT_BLOCK) {
+			return false;
+		}
+		
+		// if target reflect this skill then the effect will fail
+		if (calcBuffDebuffReflection(target, skill)) {
+			return false;
+		}
+		
+		// Calculate BaseRate.
+		double baseRate = skill.getActivateRate();
+		double statMod = skill.getBasicProperty().calcBonus(target);
+		double rate = (baseRate / statMod);
+		
+		// Resist Modifier.
+		double resMod = calcGeneralTraitBonus(attacker.getOwner(), target, skill.getTraitType(), false);
+		rate *= resMod;
+		
+		// Lvl Bonus Modifier.
+		double lvlBonusMod = calcLvlBonusMod(attacker.getOwner(), target, skill);
+		rate *= lvlBonusMod;
+		
+		// Element Modifier.
+		double elementMod = calcAttributeBonus(attacker.getOwner(), target, skill);
+		rate *= elementMod;
+		
+		// Add Matk/Mdef Bonus (TODO: Pending)
+		
+		// Check the Rate Limits.
+		final double finalRate = Util.constrain(rate, skill.getMinChance(), skill.getMaxChance());
+		
+		if (attacker.getOwner().isDebug()) {
+			final StatsSet set = new StatsSet();
+			set.set("baseMod", baseRate);
+			set.set("resMod", resMod);
+			set.set("statMod", statMod);
+			set.set("elementMod", elementMod);
+			set.set("lvlBonusMod", lvlBonusMod);
+			set.set("rate", rate);
+			set.set("finalRate", finalRate);
+			Debug.sendSkillDebug(attacker.getOwner(), target, skill, set);
+		}
+		
+		return (Rnd.get(100) < finalRate);
+	}
+	
+	public static boolean calcMagicSuccess(L2Character attacker, L2Character target, Skill skill) {
+		// FIXME: Fix this LevelMod Formula.
+		int lvlDifference = (target.getLevel() - (skill.getMagicLevel() > 0 ? skill.getMagicLevel() : attacker.getLevel()));
+		double lvlModifier = Math.pow(1.3, lvlDifference);
+		double targetModifier = 1.00;
+		if (target.isAttackable() && !target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 3)) {
+			int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 2;
+			if (lvlDiff >= npc().getSkillChancePenaltyForLvLDifferences().size()) {
+				targetModifier = npc().getSkillChancePenaltyForLvLDifferences().get(npc().getSkillChancePenaltyForLvLDifferences().size() - 1);
+			} else {
+				targetModifier = npc().getSkillChancePenaltyForLvLDifferences().get(lvlDiff);
+			}
+		}
+		// general magic resist
+		final double resModifier = target.calcStat(Stats.MAGIC_SUCCESS_RES, 1, null, skill);
+		int rate = 100 - Math.round((float) (lvlModifier * targetModifier * resModifier));
+		
+		if (attacker.isDebug()) {
+			final StatsSet set = new StatsSet();
+			set.set("lvlDifference", lvlDifference);
+			set.set("lvlModifier", lvlModifier);
+			set.set("resModifier", resModifier);
+			set.set("targetModifier", targetModifier);
+			set.set("rate", rate);
+			Debug.sendSkillDebug(attacker, target, skill, set);
+		}
+		
+		return (Rnd.get(100) < rate);
+	}
+	
+	public static double calcManaDam(L2Character attacker, L2Character target, Skill skill, byte shld, boolean sps, boolean bss, boolean mcrit, double power) {
+		// Formula: (SQR(M.Atk)*Power*(Target Max MP/97))/M.Def
+		double mAtk = attacker.getMAtk(target, skill);
+		double mDef = target.getMDef(attacker, skill);
+		double mp = target.getMaxMp();
+		
+		switch (shld) {
+			case SHIELD_DEFENSE_SUCCEED:
+				mDef += target.getShldDef();
+				break;
+			case SHIELD_DEFENSE_PERFECT_BLOCK: // perfect block
+				return 1;
+		}
+		
+		// Bonus Spiritshot
+		mAtk *= bss ? 4 : sps ? 2 : 1;
+		
+		double damage = (Math.sqrt(mAtk) * power * (mp / 97)) / mDef;
+		damage *= calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false);
+		
+		if (target.isAttackable()) {
+			if (!target.isRaid() && !target.isRaidMinion() && (target.getLevel() >= npc().getMinNPCLevelForDmgPenalty()) && (attacker.getActingPlayer() != null) && ((target.getLevel() - attacker.getActingPlayer().getLevel()) >= 2)) {
+				int lvlDiff = target.getLevel() - attacker.getActingPlayer().getLevel() - 1;
+				if (lvlDiff >= npc().getSkillDmgPenaltyForLvLDifferences().size()) {
+					damage *= npc().getSkillDmgPenaltyForLvLDifferences().get(npc().getSkillDmgPenaltyForLvLDifferences().size() - 1);
+				} else {
+					damage *= npc().getSkillDmgPenaltyForLvLDifferences().get(lvlDiff);
+				}
+			}
+		}
+		
+		// Failure calculation
+		if (character().magicFailures() && !calcMagicSuccess(attacker, target, skill)) {
+			if (attacker.isPlayer()) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DAMAGE_DECREASED_BECAUSE_C1_RESISTED_C2_MAGIC);
+				sm.addCharName(target);
+				sm.addCharName(attacker);
+				attacker.sendPacket(sm);
+				damage /= 2;
+			}
+			
+			if (target.isPlayer()) {
+				SystemMessage sm2 = SystemMessage.getSystemMessage(SystemMessageId.C1_WEAKLY_RESISTED_C2_MAGIC);
+				sm2.addCharName(target);
+				sm2.addCharName(attacker);
+				target.sendPacket(sm2);
+			}
+		}
+		
+		if (mcrit) {
+			damage *= 3;
+			attacker.sendPacket(SystemMessageId.CRITICAL_HIT_MAGIC);
+		}
+		return damage;
+	}
+	
+	public static double calculateSkillResurrectRestorePercent(double baseRestorePercent, L2Character caster) {
+		if ((baseRestorePercent == 0) || (baseRestorePercent == 100)) {
+			return baseRestorePercent;
+		}
+		
+		double restorePercent = baseRestorePercent * BaseStats.WIT.calcBonus(caster);
+		if ((restorePercent - baseRestorePercent) > 20.0) {
+			restorePercent += 20.0;
+		}
+		
+		restorePercent = Math.max(restorePercent, baseRestorePercent);
+		restorePercent = Math.min(restorePercent, 90.0);
+		
+		return restorePercent;
+	}
+	
+	public static boolean calcPhysicalSkillEvasion(L2Character activeChar, L2Character target, Skill skill) {
+		if (skill.isMagic() || skill.isDebuff()) {
+			return false;
+		}
+		if (Rnd.get(100) < target.calcStat(Stats.P_SKILL_EVASION, 0, null, skill)) {
+			if (activeChar.isPlayer()) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DODGES_ATTACK);
+				sm.addString(target.getName());
+				activeChar.getActingPlayer().sendPacket(sm);
+			}
+			if (target.isPlayer()) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVOIDED_C1_ATTACK2);
+				sm.addString(activeChar.getName());
+				target.getActingPlayer().sendPacket(sm);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	public static boolean calcSkillMastery(L2Character actor, Skill sk) {
+		// Static Skills are not affected by Skill Mastery.
+		if (sk.isStatic()) {
+			return false;
+		}
+		
+		final int val = (int) actor.getStat().calcStat(Stats.SKILL_CRITICAL, 0, null, null);
+		
+		if (val == 0) {
+			return false;
+		}
+		
+		if (actor.isPlayer()) {
+			double initVal = switch (val) {
+				case 1 -> (BaseStats.STR).calcBonus(actor);
+				case 4 -> (BaseStats.INT).calcBonus(actor);
+				default -> 0;
+			};
+			initVal *= actor.getStat().calcStat(Stats.SKILL_CRITICAL_PROBABILITY, 1, null, null);
+			return (Rnd.get(100) < initVal);
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Calculates the Attribute Bonus
+	 * @param attacker
+	 * @param target
+	 * @param skill Can be {@code null} if there is no skill used for the attack.
+	 * @return The attribute bonus
+	 */
+	public static double calcAttributeBonus(L2Character attacker, L2Character target, Skill skill) {
+		int attack_attribute;
+		if (skill != null) {
+			if ((skill.getAttributeType() == AttributeType.NONE) || (attacker.getAttackElement() != skill.getAttributeType().getId())) {
+				return 1;
+			}
+			attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement()) + skill.getAttributePower();
+		} else {
+			attack_attribute = attacker.getAttackElementValue(attacker.getAttackElement());
+			if (attack_attribute == 0) {
+				return 1;
+			}
+		}
+		
+		int defence_attribute = target.getDefenseElementValue(attacker.getAttackElement());
+		
+		if (attack_attribute <= defence_attribute) {
+			return 1;
+		}
+		
+		double attack_attribute_mod;
+		double defence_attribute_mod;
+		
+		if (attack_attribute >= 450) {
+			if (defence_attribute >= 450) {
+				attack_attribute_mod = 0.06909;
+				defence_attribute_mod = 0.078;
+			}
+			// On retail else if (attack_attribute >= 350), can be considered a typo
+			else if (defence_attribute >= 350) {
+				attack_attribute_mod = 0.0887;
+				defence_attribute_mod = 0.1007;
+			} else {
+				attack_attribute_mod = 0.129;
+				defence_attribute_mod = 0.1473;
+			}
+		} else if (attack_attribute >= 300) {
+			if (defence_attribute >= 300) {
+				attack_attribute_mod = 0.0887;
+				defence_attribute_mod = 0.1007;
+			} else if (defence_attribute >= 150) {
+				attack_attribute_mod = 0.129;
+				defence_attribute_mod = 0.1473;
+			} else {
+				attack_attribute_mod = 0.25;
+				defence_attribute_mod = 0.2894;
+			}
+		} else if (attack_attribute >= 150) {
+			if (defence_attribute >= 150) {
+				attack_attribute_mod = 0.129;
+				defence_attribute_mod = 0.1473;
+			} else if (defence_attribute >= 0) {
+				attack_attribute_mod = 0.25;
+				defence_attribute_mod = 0.2894;
+			} else {
+				attack_attribute_mod = 0.4;
+				defence_attribute_mod = 0.55;
+			}
+		} else if (attack_attribute >= -99) {
+			if (defence_attribute >= 0) {
+				attack_attribute_mod = 0.25;
+				defence_attribute_mod = 0.2894;
+			} else {
+				attack_attribute_mod = 0.4;
+				defence_attribute_mod = 0.55;
+			}
+		} else {
+			if (defence_attribute >= 450) {
+				attack_attribute_mod = 0.06909;
+				defence_attribute_mod = 0.078;
+			} else if (defence_attribute >= 350) {
+				attack_attribute_mod = 0.0887;
+				defence_attribute_mod = 0.1007;
+			} else {
+				attack_attribute_mod = 0.129;
+				defence_attribute_mod = 0.1473;
+			}
+		}
+		
+		int attribute_diff = attack_attribute - defence_attribute;
+		double min;
+		double max;
+		if (attribute_diff >= 300) {
+			max = 100.0;
+			min = -50;
+		} else if (attribute_diff >= 150) {
+			max = 70.0;
+			min = -50;
+		} else if (attribute_diff >= -150) {
+			max = 40.0;
+			min = -50;
+		} else if (attribute_diff >= -300) {
+			max = 40.0;
+			min = -60;
+		} else {
+			max = 40.0;
+			min = -80;
+		}
+		
+		attack_attribute += 100;
+		attack_attribute *= attack_attribute;
+		
+		attack_attribute_mod = (attack_attribute / 144.0) * attack_attribute_mod;
+		
+		defence_attribute += 100;
+		defence_attribute *= defence_attribute;
+		
+		defence_attribute_mod = (defence_attribute / 169.0) * defence_attribute_mod;
+		
+		double attribute_mod_diff = attack_attribute_mod - defence_attribute_mod;
+		
+		attribute_mod_diff = Util.constrain(attribute_mod_diff, min, max);
+		
+		double result = (attribute_mod_diff / 100.0) + 1;
+		
+		if (attacker.isPlayer() && target.isPlayer() && (result < 1.0)) {
+			result = 1.0;
+		}
+		
+		return result;
+	}
+	
+	public static void calcDamageReflected(L2Character attacker, L2Character target, Skill skill, boolean crit) {
+		// Only melee skills can be reflected
+		if (skill.isMagic() || (skill.getCastRange() > MELEE_ATTACK_RANGE)) {
+			return;
+		}
+		
+		final double chance = target.calcStat(Stats.VENGEANCE_SKILL_PHYSICAL_DAMAGE, 0, target, skill);
+		if (Rnd.get(100) < chance) {
+			if (target.isPlayer()) {
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.COUNTERED_C1_ATTACK);
+				sm.addCharName(attacker);
+				target.sendPacket(sm);
+			}
+			if (attacker.isPlayer()) {
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_PERFORMING_COUNTERATTACK);
+				sm.addCharName(target);
+				attacker.sendPacket(sm);
+			}
+			
+			double counterdmg = (((target.getPAtk(attacker) * 10.0) * 70.0) / attacker.getPDef(target));
+			counterdmg *= calcWeaponTraitBonus(attacker, target);
+			counterdmg *= calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false);
+			counterdmg *= calcAttributeBonus(attacker, target, skill);
+			
+			attacker.reduceCurrentHp(counterdmg, target, skill);
+			if (crit) // TODO: It counters multiple times depending on how much effects skill has not on critical, but gotta be verified first!
+			{
+				attacker.reduceCurrentHp(counterdmg, target, skill);
+			}
+			target.notifyDamageReceived(counterdmg, attacker, skill, crit, false, true);
+		}
+	}
+	
+	/**
+	 * Calculate buff/debuff reflection.
+	 * @param target
+	 * @param skill
+	 * @return {@code true} if reflect, {@code false} otherwise.
+	 */
+	public static boolean calcBuffDebuffReflection(L2Character target, Skill skill) {
+		if (!skill.isDebuff() || (skill.getActivateRate() == -1)) {
+			return false;
+		}
+		return target.calcStat(skill.isMagic() ? Stats.REFLECT_SKILL_MAGIC : Stats.REFLECT_SKILL_PHYSIC, 0, null, skill) > Rnd.get(100);
+	}
+	
+	/**
+	 * Calculate damage caused by falling
+	 * @param cha
+	 * @param fallHeight
+	 * @return damage
+	 */
+	public static double calcFallDam(L2Character cha, int fallHeight) {
+		if (!general().enableFallingDamage() || (fallHeight < 0)) {
+			return 0;
+		}
+		return cha.calcStat(Stats.FALL, (fallHeight * cha.getMaxHp()) / 1000.0, null, null);
+	}
+	
+	public static boolean calcBlowSuccess(L2Character activeChar, L2Character target, Skill skill, int blowChance) {
+		// Apply DEX Mod.
+		double dexMod = BaseStats.DEX.calcBonus(activeChar);
+		// Apply Position Bonus (TODO: values are unconfirmed, possibly custom, remove or update when confirmed).
+		double sideMod = (activeChar.isInFrontOfTarget()) ? 1 : (activeChar.isBehindTarget()) ? 2 : 1.5;
+		// Apply all mods.
+		double baseRate = blowChance * dexMod * sideMod;
+		// Apply blow rates
+		double rate = activeChar.calcStat(Stats.BLOW_RATE, baseRate, target, null);
+		// Debug
+		if (activeChar.isDebug()) {
+			final StatsSet set = new StatsSet();
+			set.set("dexMod", dexMod);
+			set.set("blowChance", blowChance);
+			set.set("sideMod", sideMod);
+			set.set("baseRate", baseRate);
+			set.set("rate", rate);
+			Debug.sendSkillDebug(activeChar, target, skill, set);
+		}
+		return Rnd.get(100) < rate;
+	}
+	
+	public static List<BuffInfo> calcCancelEffects(L2Character activeChar, L2Character target, Skill skill, DispelCategory slot, int rate, int max) {
+		final List<BuffInfo> canceled = new ArrayList<>(max);
+		switch (slot) {
+			case BUFF -> {
+				// Resist Modifier.
+				int cancelMagicLvl = skill.getMagicLevel();
+				final double vuln = target.calcStat(Stats.CANCEL_VULN, 0, target, null);
+				final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null);
+				
+				double resMod = 1 + (((vuln + prof) * -1) / 100);
+				double finalRate = rate / resMod;
+				
+				if (activeChar.isDebug()) {
+					final StatsSet set = new StatsSet();
+					set.set("baseMod", rate);
+					set.set("magicLevel", cancelMagicLvl);
+					set.set("resMod", resMod);
+					set.set("rate", finalRate);
+					Debug.sendSkillDebug(activeChar, target, skill, set);
+				}
+				
+				// Prevent initialization.
+				final List<BuffInfo> buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1);
+				if (target.getEffectList().hasDances()) {
+					buffs.addAll(target.getEffectList().getDances());
+				}
+				if (target.getEffectList().hasTriggered()) {
+					buffs.addAll(target.getEffectList().getTriggered());
+				}
+				for (int i = buffs.size() - 1; i >= 0; i--) // reverse order
+				{
+					BuffInfo info = buffs.get(i);
+					if (!info.getSkill().canBeStolen() || (!calcCancelSuccess(info, cancelMagicLvl, (int) finalRate, skill))) {
+						continue;
+					}
+					canceled.add(info);
+					if (canceled.size() >= max) {
+						break;
+					}
+				}
+				break;
+			}
+			case DEBUFF -> {
+				final List<BuffInfo> debuffs = new ArrayList<>(target.getEffectList().getDebuffs());
+				for (int i = debuffs.size() - 1; i >= 0; i--) {
+					BuffInfo info = debuffs.get(i);
+					if (info.getSkill().isDebuff() && !info.getSkill().isIrreplaceableBuff() && (Rnd.get(100) <= rate)) {
+						canceled.add(info);
+						if (canceled.size() >= max) {
+							break;
+						}
+					}
+				}
+			}
+		}
+		return canceled;
+	}
+	
+	public static List<BuffInfo> calcStealEffects(L2Character activeChar, L2Character target, Skill skill, DispelCategory slot, int rate, int max) {
+		final List<BuffInfo> canceled = new ArrayList<>(max);
+		final int cancelMagicLvl = skill.getMagicLevel();
+		switch (slot) {
+			case BUFF -> {
+				// Prevent initialization.
+				final List<BuffInfo> buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(max);
+				if (target.getEffectList().hasDances()) {
+					buffs.addAll(target.getEffectList().getDances());
+				}
+				if (target.getEffectList().hasTriggered()) {
+					buffs.addAll(target.getEffectList().getTriggered());
+				}
+				
+				int pos = max;
+				for (int i = buffs.size() - 1; i >= 0; i--) {
+					BuffInfo info = buffs.get(i);
+					if (!info.getSkill().canBeStolen()) {
+						continue;
+					}
+					pos--;
+					if (calcCancelSuccess(info, cancelMagicLvl, rate, skill)) {
+						canceled.add(info);
+					}
+					
+					if (pos < 1) {
+						break;
+					}
+				}
+			}
+			case DEBUFF -> {
+				final List<BuffInfo> debuffs = new ArrayList<>(target.getEffectList().getDebuffs());
+				for (int i = debuffs.size() - 1; i >= 0; i--) {
+					BuffInfo info = debuffs.get(i);
+					if (info.getSkill().isDebuff() && !info.getSkill().isIrreplaceableBuff() && (Rnd.get(100) <= rate)) {
+						canceled.add(info);
+						if (canceled.size() >= max) {
+							break;
+						}
+					}
+				}
+			}
+		}
+		return canceled;
+	}
+	
+	public static boolean calcCancelSuccess(BuffInfo info, int cancelMagicLvl, int rate, Skill skill) {
+		// Lvl Bonus Modifier.
+		rate *= info.getSkill().getMagicLevel() > 0 ? 1 + ((cancelMagicLvl - info.getSkill().getMagicLevel()) / 100.) : 1;
+		return Rnd.get(100) < Util.constrain(rate, skill.getMinChance(), skill.getMaxChance());
+	}
+	
+	/**
+	 * Calculates the abnormal time for an effect.<br>
+	 * The abnormal time is taken from the skill definition, and it's global for all effects present in the skills.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param skill the skill
+	 * @return the time that the effect will last
+	 */
+	public static int calcEffectAbnormalTime(L2Character caster, L2Character target, Skill skill) {
+		int time = skill.isPassive() || skill.isToggle() ? -1 : skill.getAbnormalTime();
+		
+		// An herb buff will affect both master and servitor, but the buff duration will be half of the normal duration.
+		// If a servitor is not summoned, the master will receive the full buff duration.
+		if ((target != null) && target.isServitor() && skill.isAbnormalInstant()) {
+			time /= 2;
+		}
+		
+		// If the skill is a mastery skill, the effect will last twice the default time.
+		if (Formulas.calcSkillMastery(caster, skill)) {
+			time *= 2;
+		}
+		
+		// Debuffs Duration Affected by Resistances.
+		if ((caster != null) && (target != null) && skill.isDebuff()) {
+			double statMod = skill.getBasicProperty().calcBonus(target);
+			double resMod = calcGeneralTraitBonus(caster, target, skill.getTraitType(), false);
+			double lvlBonusMod = calcLvlBonusMod(caster, target, skill);
+			double elementMod = calcAttributeBonus(caster, target, skill);
+			time = (int) Math.ceil(Util.constrain(((time * resMod * lvlBonusMod * elementMod) / statMod), (time * 0.5), time));
+		}
+		return time;
+	}
+	
+	/**
+	 * Calculate Probability in following effects:<br>
+	 * TargetCancel,<br>
+	 * TargetMeProbability,<br>
+	 * SkillTurning,<br>
+	 * Betray,<br>
+	 * Bluff,<br>
+	 * DeleteHate,<br>
+	 * RandomizeHate,<br>
+	 * DeleteHateOfMe,<br>
+	 * TransferHate,<br>
+	 * Confuse<br>
+	 * @param baseChance chance from effect parameter
+	 * @param attacker
+	 * @param target
+	 * @param skill
+	 * @return chance for effect to succeed
+	 */
+	public static boolean calcProbability(double baseChance, L2Character attacker, L2Character target, Skill skill) {
+		return Rnd.get(100) < ((((((skill.getMagicLevel() + baseChance) - target.getLevel()) + 30) - target.getINT()) * calcAttributeBonus(attacker, target, skill)) * calcGeneralTraitBonus(attacker, target, skill.getTraitType(), false));
+	}
+	
+	/**
+	 * Calculates karma lost upon death.
+	 * @param player
+	 * @param exp
+	 * @return the amount of karma player has loosed.
+	 */
+	public static int calculateKarmaLost(L2PcInstance player, long exp) {
+		double karmaLooseMul = KarmaData.getInstance().getMultiplier(player.getLevel());
+		if (exp > 0) // Received exp
+		{
+			exp /= rates().getRateKarmaLost();
+		}
+		return (int) ((Math.abs(exp) / karmaLooseMul) / 30);
+	}
+	
+	/**
+	 * Calculates karma gain upon playable kill.</br>
+	 * Updated to High Five on 10.09.2014 by Zealar tested in retail.
+	 * @param pkCount
+	 * @param isSummon
+	 * @return karma points that will be added to the player.
+	 */
+	public static int calculateKarmaGain(int pkCount, boolean isSummon) {
+		int result = 43200;
+		
+		if (isSummon) {
+			result = (int) ((((pkCount * 0.375) + 1) * 60) * 4) - 150;
+			
+			if (result > 10800) {
+				return 10800;
+			}
+		}
+		
+		if (pkCount < 99) {
+			result = (int) ((((pkCount * 0.5) + 1) * 60) * 12);
+		} else if (pkCount < 180) {
+			result = (int) ((((pkCount * 0.125) + 37.75) * 60) * 12);
+		}
+		
+		return result;
+	}
+	
+	public static double calcGeneralTraitBonus(L2Character attacker, L2Character target, TraitType traitType, boolean ignoreResistance) {
+		if (traitType == TraitType.NONE) {
+			return 1.0;
+		}
+		
+		if (target.getStat().isTraitInvul(traitType)) {
+			return 0;
+		}
+		
+		switch (traitType.getType()) {
+			case 2 -> {
+				if (!attacker.getStat().hasAttackTrait(traitType) || !target.getStat().hasDefenceTrait(traitType)) {
+					return 1.0;
+				}
+			}
+			case 3 -> {
+				if (ignoreResistance) {
+					return 1.0;
+				}
+			}
+			default -> {
+				return 1.0;
+			}
+		}
+		
+		final double result = (attacker.getStat().getAttackTrait(traitType) - target.getStat().getDefenceTrait(traitType)) + 1.0;
+		return Util.constrain(result, 0.05, 2.0);
+	}
+	
+	public static double calcWeaponTraitBonus(L2Character attacker, L2Character target) {
+		final TraitType type = attacker.getAttackType().getTraitType();
+		double result = target.getStat().getDefenceTraits()[type.getId()] - 1.0;
+		return 1.0 - result;
+	}
+	
+	public static double calcAttackTraitBonus(L2Character attacker, L2Character target) {
+		final double weaponTraitBonus = calcWeaponTraitBonus(attacker, target);
+		if (weaponTraitBonus == 0) {
+			return 0;
+		}
+		
+		double weaknessBonus = 1.0;
+		for (TraitType traitType : TraitType.values()) {
+			if (traitType.getType() == 2) {
+				weaknessBonus *= calcGeneralTraitBonus(attacker, target, traitType, true);
+				if (weaknessBonus == 0) {
+					return 0;
+				}
+			}
+		}
+		
+		return Util.constrain((weaponTraitBonus * weaknessBonus), 0.05, 2.0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/MoveType.java b/src/main/java/com/l2jserver/gameserver/model/stats/MoveType.java
new file mode 100644
index 00000000..8a0ee241
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/MoveType.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+/**
+ * Enum of move types.
+ * @author GKR
+ */
+public enum MoveType {
+	WALK,
+	RUN,
+	FAST_SWIM,
+	SLOW_SWIM,
+	FAST_FLY,
+	SLOW_FLY
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/Stats.java b/src/main/java/com/l2jserver/gameserver/model/stats/Stats.java
new file mode 100644
index 00000000..4bf3232b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/Stats.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Enum of basic stats.
+ * @author mkizub
+ */
+public enum Stats {
+	// Base stats, for each in Calculator a slot is allocated
+	
+	// HP, MP & CP
+	MAX_HP("maxHp"),
+	MAX_MP("maxMp"),
+	MAX_CP("maxCp"),
+	MAX_RECOVERABLE_HP("maxRecoverableHp"), // The maximum HP that is able to be recovered trough heals
+	MAX_RECOVERABLE_MP("maxRecoverableMp"),
+	MAX_RECOVERABLE_CP("maxRecoverableCp"),
+	REGENERATE_HP_RATE("regHp"),
+	REGENERATE_CP_RATE("regCp"),
+	REGENERATE_MP_RATE("regMp"),
+	MANA_CHARGE("manaCharge"),
+	HEAL_EFFECT("healEffect"),
+	
+	// ATTACK & DEFENCE
+	POWER_DEFENCE("pDef"),
+	MAGIC_DEFENCE("mDef"),
+	POWER_ATTACK("pAtk"),
+	MAGIC_ATTACK("mAtk"),
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
+	POWER_ATTACK_SPEED("pAtkSpd"),
+	MAGIC_ATTACK_SPEED("mAtkSpd"), // Magic Skill Casting Time Rate
+	ATK_REUSE("atkReuse"), // Bows Hits Reuse Rate
+	P_REUSE("pReuse"), // Physical Skill Reuse Rate
+	MAGIC_REUSE_RATE("mReuse"), // Magic Skill Reuse Rate
+	DANCE_REUSE("dReuse"), // Dance Skill Reuse Rate
+	SHIELD_DEFENCE("sDef"),
+	
+	CRITICAL_DAMAGE("critDmg"),
+	CRITICAL_DAMAGE_POS("critDmgPos"),
+	CRITICAL_DAMAGE_ADD("critDmgAdd"), // this is another type for special critical damage mods - vicious stance, critical power and critical damage SA
+	MAGIC_CRIT_DMG("mCritPower"),
+	
+	// PVP BONUS
+	PVP_PHYSICAL_DMG("pvpPhysDmg"),
+	PVP_MAGICAL_DMG("pvpMagicalDmg"),
+	PVP_PHYS_SKILL_DMG("pvpPhysSkillsDmg"),
+	PVP_PHYSICAL_DEF("pvpPhysDef"),
+	PVP_MAGICAL_DEF("pvpMagicalDef"),
+	PVP_PHYS_SKILL_DEF("pvpPhysSkillsDef"),
+	
+	// ATTACK & DEFENCE RATES
+	EVASION_RATE("rEvas"),
+	P_SKILL_EVASION("pSkillEvas"),
+	DEFENCE_CRITICAL_RATE("defCritRate"),
+	DEFENCE_CRITICAL_RATE_ADD("defCritRateAdd"),
+	DEFENCE_CRITICAL_DAMAGE("defCritDamage"),
+	DEFENCE_CRITICAL_DAMAGE_ADD("defCritDamageAdd"), // Resistance to critical damage in value (Example: +100 will be 100 more critical damage, NOT 100% more).
+	SHIELD_RATE("rShld"),
+	CRITICAL_RATE("critRate"),
+	CRITICAL_RATE_POS("critRatePos"),
+	BLOW_RATE("blowRate"),
+	MCRITICAL_RATE("mCritRate"),
+	BONUS_EXP("bonusExp"),
+	BONUS_SP("bonusSp"),
+	ATTACK_CANCEL("cancel"),
+	
+	// ACCURACY & RANGE
+	ACCURACY_COMBAT("accCombat"),
+	POWER_ATTACK_RANGE("pAtkRange"),
+	MAGIC_ATTACK_RANGE("mAtkRange"),
+	ATTACK_COUNT_MAX("atkCountMax"),
+	// Run speed, walk & escape speed are calculated proportionally, magic speed is a buff
+	MOVE_SPEED("runSpd"),
+	
+	// BASIC STATS
+	STAT_STR("STR"),
+	STAT_CON("CON"),
+	STAT_DEX("DEX"),
+	STAT_INT("INT"),
+	STAT_WIT("WIT"),
+	STAT_MEN("MEN"),
+	
+	// Special stats, share one slot in Calculator
+	
+	// VARIOUS
+	BREATH("breath"),
+	FALL("fall"),
+	
+	// VULNERABILITIES
+	DAMAGE_ZONE_VULN("damageZoneVuln"),
+	MOVEMENT_VULN("movementVuln"),
+	CANCEL_VULN("cancelVuln"), // Resistance for cancel type skills
+	DEBUFF_VULN("debuffVuln"),
+	BUFF_VULN("buffVuln"),
+	
+	// RESISTANCES
+	FIRE_RES("fireRes"),
+	WIND_RES("windRes"),
+	WATER_RES("waterRes"),
+	EARTH_RES("earthRes"),
+	HOLY_RES("holyRes"),
+	DARK_RES("darkRes"),
+	MAGIC_SUCCESS_RES("magicSuccRes"),
+	
+	// ELEMENT POWER
+	FIRE_POWER("firePower"),
+	WATER_POWER("waterPower"),
+	WIND_POWER("windPower"),
+	EARTH_POWER("earthPower"),
+	HOLY_POWER("holyPower"),
+	DARK_POWER("darkPower"),
+	
+	// PROFICIENCY
+	CANCEL_PROF("cancelProf"),
+	
+	REFLECT_DAMAGE_PERCENT("reflectDam"),
+	REFLECT_SKILL_MAGIC("reflectSkillMagic"),
+	REFLECT_SKILL_PHYSIC("reflectSkillPhysic"),
+	VENGEANCE_SKILL_MAGIC_DAMAGE("vengeanceMdam"),
+	VENGEANCE_SKILL_PHYSICAL_DAMAGE("vengeancePdam"),
+	ABSORB_DAMAGE_PERCENT("absorbDam"),
+	TRANSFER_DAMAGE_PERCENT("transDam"),
+	MANA_SHIELD_PERCENT("manaShield"),
+	TRANSFER_DAMAGE_TO_PLAYER("transDamToPlayer"),
+	ABSORB_MANA_DAMAGE_PERCENT("absorbDamMana"),
+	
+	WEIGHT_LIMIT("weightLimit"),
+	WEIGHT_PENALTY("weightPenalty"),
+	ENLARGE_ABNORMAL_SLOT("enlargeAbnormalSlot"),
+	
+	// ExSkill
+	INV_LIM("inventoryLimit"),
+	WH_LIM("whLimit"),
+	FREIGHT_LIM("freightLimit"),
+	P_SELL_LIM("privateSellLimit"),
+	P_BUY_LIM("privateBuyLimit"),
+	REC_D_LIM("dwarfRecipeLimit"),
+	REC_C_LIM("commonRecipeLimit"),
+	
+	// C4 Stats
+	PHYSICAL_MP_CONSUME_RATE("physicalMpConsumeRate"),
+	MAGICAL_MP_CONSUME_RATE("magicalMpConsumeRate"),
+	DANCE_MP_CONSUME_RATE("danceMpConsumeRate"),
+	BOW_MP_CONSUME_RATE("bowMpConsumeRate"),
+	MP_CONSUME("mpConsume"),
+	
+	// Shield Stats
+	SHIELD_DEFENCE_ANGLE("shieldDefAngle"),
+	
+	// Skill mastery
+	SKILL_CRITICAL("skillCritical"),
+	SKILL_CRITICAL_PROBABILITY("skillCriticalProbability"),
+	
+	// Vitality
+	VITALITY_CONSUME_RATE("vitalityConsumeRate"),
+	
+	// Souls
+	MAX_SOULS("maxSouls"),
+	
+	REDUCE_EXP_LOST_BY_PVP("reduceExpLostByPvp"),
+	REDUCE_EXP_LOST_BY_MOB("reduceExpLostByMob"),
+	REDUCE_EXP_LOST_BY_RAID("reduceExpLostByRaid"),
+	
+	REDUCE_DEATH_PENALTY_BY_PVP("reduceDeathPenaltyByPvp"),
+	REDUCE_DEATH_PENALTY_BY_MOB("reduceDeathPenaltyByMob"),
+	REDUCE_DEATH_PENALTY_BY_RAID("reduceDeathPenaltyByRaid"),
+	
+	// Fishing
+	FISHING_EXPERTISE("fishingExpertise");
+	
+	public static final int NUM_STATS = values().length;
+	
+	private static final Map<String, Stats> STATS = new HashMap<>();
+	
+	private final String name;
+	
+	static {
+		for (Stats stat : values()) {
+			STATS.put(stat.name, stat);
+		}
+	}
+	
+	Stats(String name) {
+		this.name = name;
+	}
+	
+	public static Stats valueOfXml(String name) {
+		return STATS.get(name);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/TraitType.java b/src/main/java/com/l2jserver/gameserver/model/stats/TraitType.java
new file mode 100644
index 00000000..6c85a904
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/TraitType.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+/**
+ * @author UnAfraid
+ * @author NosBit
+ */
+public enum TraitType {
+	NONE(0, 0),
+	SWORD(1, 1),
+	BLUNT(2, 1),
+	DAGGER(3, 1),
+	POLE(4, 1),
+	FIST(5, 1),
+	BOW(6, 1),
+	ETC(7, 1),
+	UNK_8(8, 0),
+	POISON(9, 3),
+	HOLD(10, 3),
+	BLEED(11, 3),
+	SLEEP(12, 3),
+	SHOCK(13, 3),
+	DERANGEMENT(14, 3),
+	BUG_WEAKNESS(15, 2),
+	ANIMAL_WEAKNESS(16, 2),
+	PLANT_WEAKNESS(17, 2),
+	BEAST_WEAKNESS(18, 2),
+	DRAGON_WEAKNESS(19, 2),
+	PARALYZE(20, 3),
+	DUAL(21, 1),
+	DUALFIST(22, 1),
+	BOSS(23, 3),
+	GIANT_WEAKNESS(24, 2),
+	CONSTRUCT_WEAKNESS(25, 2),
+	DEATH(26, 3),
+	VALAKAS(27, 2),
+	ANESTHESIA(28, 2),
+	CRITICAL_POISON(29, 3),
+	ROOT_PHYSICALLY(30, 3),
+	ROOT_MAGICALLY(31, 3),
+	RAPIER(32, 1),
+	CROSSBOW(33, 1),
+	ANCIENTSWORD(34, 1),
+	TURN_STONE(35, 3),
+	GUST(36, 3),
+	PHYSICAL_BLOCKADE(37, 3),
+	TARGET(38, 3),
+	PHYSICAL_WEAKNESS(39, 3),
+	MAGICAL_WEAKNESS(40, 3),
+	DUALDAGGER(41, 1),
+	DEMONIC_WEAKNESS(42, 2), // CT26_P4
+	DIVINE_WEAKNESS(43, 2),
+	ELEMENTAL_WEAKNESS(44, 2),
+	FAIRY_WEAKNESS(45, 2),
+	HUMAN_WEAKNESS(46, 2),
+	HUMANOID_WEAKNESS(47, 2),
+	UNDEAD_WEAKNESS(48, 2);
+	
+	private final int _id;
+	private final int _type; // 1 = weapon, 2 = weakness, 3 = resistance
+	
+	TraitType(int id, int type) {
+		_id = id;
+		_type = type;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	public int getType() {
+		return _type;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/AbstractFunction.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/AbstractFunction.java
new file mode 100644
index 00000000..84b9fd0b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/AbstractFunction.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * A Function object is a component of a Calculator created to manage and dynamically calculate the effect of a character property (ex : MAX_HP, REGENERATE_HP_RATE...).<br>
+ * In fact, each calculator is a table of functions object in which each function represents a mathematics function:<br>
+ * FuncAtkAccuracy -> Math.sqrt(_player.getDEX())*6+_player.getLevel()<br>
+ * When the calc method of a calculator is launched, each mathematics function is called according to its priority <B>_order</B>.<br>
+ * Indeed, functions with lowest priority order is executed first and functions with the same order are executed in unspecified order.<br>
+ * @author Zoey76
+ */
+public abstract class AbstractFunction {
+	
+	/** Statistics, that is affected by this function (See L2Character.CALCULATOR_XXX constants) */
+	private final Stats _stat;
+	/**
+	 * Order of functions calculation.<br>
+	 * Functions with lower order are executed first.<br>
+	 * Functions with the same order are executed in unspecified order.<br>
+	 * Usually add/subtract functions has lowest order,<br>
+	 * then bonus/penalty functions (multiply/divide) are applied, then functions that do more complex<br>
+	 * calculations (non-linear functions).
+	 */
+	private final int _order;
+	/**
+	 * Owner can be an armor, weapon, skill, system event, quest, etc.<br>
+	 * Used to remove all functions added by this owner.
+	 */
+	private final Object _funcOwner;
+	/** Function may be disabled by attached condition. */
+	private final Condition _applyCond;
+	/** The value. */
+	private final double _value;
+	
+	/**
+	 * Constructor of Func.
+	 * @param stat the stat
+	 * @param order the order
+	 * @param owner the owner
+	 * @param value the value
+	 * @param applyCond the apply condition
+	 */
+	public AbstractFunction(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		_stat = stat;
+		_order = order;
+		_funcOwner = owner;
+		_value = value;
+		_applyCond = applyCond;
+	}
+	
+	/**
+	 * Gets the apply condition
+	 * @return the apply condition
+	 */
+	public Condition getApplyCond() {
+		return _applyCond;
+	}
+	
+	/**
+	 * Gets the function owner.
+	 * @return the function owner
+	 */
+	public final Object getFuncOwner() {
+		return _funcOwner;
+	}
+	
+	/**
+	 * Gets the function order.
+	 * @return the order
+	 */
+	public final int getOrder() {
+		return _order;
+	}
+	
+	/**
+	 * Gets the stat.
+	 * @return the stat
+	 */
+	public final Stats getStat() {
+		return _stat;
+	}
+	
+	/**
+	 * Gets the value.
+	 * @return the value
+	 */
+	public final double getValue() {
+		return _value;
+	}
+	
+	/**
+	 * Run the mathematics function of the Func.
+	 * @param effector the effector
+	 * @param effected the effected
+	 * @param skill the skill
+	 * @param initVal the initial value
+	 * @return the calculated value
+	 */
+	public abstract double calc(L2Character effector, L2Character effected, Skill skill, double initVal);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncAdd.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncAdd.java
new file mode 100644
index 00000000..f2563c71
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncAdd.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * Returns the initial value plus the function value, if the condition are met.
+ * @author Zoey76
+ */
+public class FuncAdd extends AbstractFunction {
+	public FuncAdd(Stats stat, int order, Object owner, double value, Condition applayCond) {
+		super(stat, order, owner, value, applayCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if ((getApplyCond() == null) || getApplyCond().test(effector, effected, skill)) {
+			return initVal + getValue();
+		}
+		return initVal;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncDiv.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncDiv.java
new file mode 100644
index 00000000..25c22523
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncDiv.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * Returns the initial value divided the function value, if the condition are met.
+ * @author Zoey76
+ */
+public class FuncDiv extends AbstractFunction {
+	private static final Logger LOG = LoggerFactory.getLogger(FuncDiv.class);
+	
+	public FuncDiv(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		super(stat, order, owner, value, applyCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if ((getApplyCond() == null) || getApplyCond().test(effector, effected, skill)) {
+			try {
+				return initVal / getValue();
+			} catch (Exception e) {
+				LOG.warn("Division by zero: {}!", getValue());
+			}
+		}
+		return initVal;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java
new file mode 100644
index 00000000..cffbe67e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchant.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import static com.l2jserver.gameserver.config.Configuration.olympiad;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+public class FuncEnchant extends AbstractFunction {
+	public FuncEnchant(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		super(stat, order, owner, value, applyCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		double value = initVal;
+		if ((getApplyCond() != null) && !getApplyCond().test(effector, effected, skill)) {
+			return value;
+		}
+		
+		L2ItemInstance item = (L2ItemInstance) getFuncOwner();
+		int enchant = item.getEnchantLevel();
+		if (enchant <= 0) {
+			return value;
+		}
+		
+		int overEnchant = 0;
+		if (enchant > 3) {
+			overEnchant = enchant - 3;
+			enchant = 3;
+		}
+		
+		if (effector.isPlayer()) {
+			if (effector.getActingPlayer().isInOlympiadMode() && (olympiad().getEnchantLimit() >= 0) && ((enchant + overEnchant) > olympiad().getEnchantLimit())) {
+				if (olympiad().getEnchantLimit() > 3) {
+					overEnchant = olympiad().getEnchantLimit() - 3;
+				} else {
+					overEnchant = 0;
+					enchant = olympiad().getEnchantLimit();
+				}
+			}
+		}
+		
+		if ((getStat() == Stats.MAGIC_DEFENCE) || (getStat() == Stats.POWER_DEFENCE)) {
+			return value + enchant + (3 * overEnchant);
+		}
+		
+		if (getStat() == Stats.MAGIC_ATTACK) {
+			// M. Atk. increases by 4 for all weapons.
+			// Starting at +4, M. Atk. bonus double.
+			// M. Atk. increases by 3 for all weapons.
+			// Starting at +4, M. Atk. bonus double.
+			// M. Atk. increases by 2 for all weapons. Starting at +4, M. Atk. bonus double.
+			// Starting at +4, M. Atk. bonus double.
+			switch (item.getItem().getItemGradeSPlus()) {
+				case S -> value += (4 * enchant) + (8 * overEnchant);
+				case A, B, C -> value += (3 * enchant) + (6 * overEnchant);
+				case D, NONE -> value += (2 * enchant) + (4 * overEnchant);
+			}
+			return value;
+		}
+		
+		if (item.isWeapon()) {
+			final WeaponType type = (WeaponType) item.getItemType();
+			switch (item.getItem().getItemGradeSPlus()) {
+				case S:
+					if (item.getWeaponItem().getBodyPart() == L2Item.SLOT_LR_HAND) {
+						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW)) {
+							// P. Atk. increases by 10 for bows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (10 * enchant) + (20 * overEnchant);
+						} else {
+							// P. Atk. increases by 6 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
+							// Starting at +4, P. Atk. bonus double.
+							value += (6 * enchant) + (12 * overEnchant);
+						}
+					} else {
+						// P. Atk. increases by 5 for one-handed swords, one-handed blunts, daggers, spears, and other weapons.
+						// Starting at +4, P. Atk. bonus double.
+						value += (5 * enchant) + (10 * overEnchant);
+					}
+					break;
+				case A:
+					if (item.getWeaponItem().getBodyPart() == L2Item.SLOT_LR_HAND) {
+						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW)) {
+							// P. Atk. increases by 8 for bows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (8 * enchant) + (16 * overEnchant);
+						} else {
+							// P. Atk. increases by 5 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
+							// Starting at +4, P. Atk. bonus double.
+							value += (5 * enchant) + (10 * overEnchant);
+						}
+					} else {
+						// P. Atk. increases by 4 for one-handed swords, one-handed blunts, daggers, spears, and other weapons.
+						// Starting at +4, P. Atk. bonus double.
+						value += (4 * enchant) + (8 * overEnchant);
+					}
+					break;
+				case B:
+				case C:
+					if (item.getWeaponItem().getBodyPart() == L2Item.SLOT_LR_HAND) {
+						if ((type == WeaponType.BOW) || (type == WeaponType.CROSSBOW)) {
+							// P. Atk. increases by 6 for bows.
+							// Starting at +4, P. Atk. bonus double.
+							value += (6 * enchant) + (12 * overEnchant);
+						} else {
+							// P. Atk. increases by 4 for two-handed swords, two-handed blunts, dualswords, and two-handed combat weapons.
+							// Starting at +4, P. Atk. bonus double.
+							value += (4 * enchant) + (8 * overEnchant);
+						}
+					} else {
+						// P. Atk. increases by 3 for one-handed swords, one-handed blunts, daggers, spears, and other weapons.
+						// Starting at +4, P. Atk. bonus double.
+						value += (3 * enchant) + (6 * overEnchant);
+					}
+					break;
+				case D:
+				case NONE:
+					// P. Atk. increases by 2 for all weapons with the exception of bows.
+					// Starting at +4, P. Atk. bonus double.
+					switch (type) {
+						case BOW, CROSSBOW -> {
+							// Bows increase by 4.
+							// Starting at +4, P. Atk. bonus double.
+							value += (4 * enchant) + (8 * overEnchant);
+						}
+						default -> value += (2 * enchant) + (4 * overEnchant);
+					}
+					break;
+			}
+		}
+		return value;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchantHp.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchantHp.java
new file mode 100644
index 00000000..043772ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncEnchantHp.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemHPBonusData;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * @author Yamaneko
+ */
+public class FuncEnchantHp extends AbstractFunction {
+	public FuncEnchantHp(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		super(stat, order, owner, value, applyCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if ((getApplyCond() != null) && !getApplyCond().test(effector, effected, skill)) {
+			return initVal;
+		}
+		
+		final L2ItemInstance item = (L2ItemInstance) getFuncOwner();
+		if (item.getEnchantLevel() > 0) {
+			return initVal + EnchantItemHPBonusData.getInstance().getHPBonus(item);
+		}
+		return initVal;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncMul.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncMul.java
new file mode 100644
index 00000000..bb1d8640
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncMul.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * Returns the initial value plus the function value, if the condition are met.
+ * @author Zoey76
+ */
+public class FuncMul extends AbstractFunction {
+	public FuncMul(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		super(stat, order, owner, value, applyCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if ((getApplyCond() == null) || getApplyCond().test(effector, effected, skill)) {
+			return initVal * getValue();
+		}
+		return initVal;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncSet.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncSet.java
new file mode 100644
index 00000000..4d8a49ce
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncSet.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * Returns the function value, if the condition are met.
+ * @author Zoey76
+ */
+public class FuncSet extends AbstractFunction {
+	public FuncSet(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		super(stat, order, owner, value, applyCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if ((getApplyCond() == null) || getApplyCond().test(effector, effected, skill)) {
+			return getValue();
+		}
+		return initVal;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncSub.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncSub.java
new file mode 100644
index 00000000..6d1a7c51
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncSub.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * Returns the initial value minus the function value, if the condition are met.
+ * @author Zoey76
+ */
+public class FuncSub extends AbstractFunction {
+	public FuncSub(Stats stat, int order, Object owner, double value, Condition applyCond) {
+		super(stat, order, owner, value, applyCond);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if ((getApplyCond() == null) || getApplyCond().test(effector, effected, skill)) {
+			return initVal - getValue();
+		}
+		return initVal;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncTemplate.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncTemplate.java
new file mode 100644
index 00000000..4c4d06e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/FuncTemplate.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions;
+
+import java.lang.reflect.Constructor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.StatFunction;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * Function template.
+ * @author mkizub
+ * @author Zoey76
+ */
+public final class FuncTemplate {
+	private static final Logger LOG = LoggerFactory.getLogger(FuncTemplate.class);
+	
+	private final Condition _attachCond;
+	private final Condition _applyCond;
+	private final Constructor<?> _constructor;
+	private final Stats _stat;
+	private final int _order;
+	private final double _value;
+	
+	public FuncTemplate(Condition attachCond, Condition applyCond, String functionName, int order, Stats stat, double value) {
+		final StatFunction function = StatFunction.valueOf(functionName.toUpperCase());
+		if (order >= 0) {
+			_order = order;
+		} else {
+			_order = function.getOrder();
+		}
+		
+		_attachCond = attachCond;
+		_applyCond = applyCond;
+		_stat = stat;
+		_value = value;
+		
+		try {
+			final Class<?> functionClass = Class.forName("com.l2jserver.gameserver.model.stats.functions.Func" + function.getName());
+			_constructor = functionClass.getConstructor(Stats.class, // Stats to update
+				Integer.TYPE, // Order of execution
+				Object.class, // Owner
+				Double.TYPE, // Value for function
+				Condition.class // Condition
+			);
+		} catch (ClassNotFoundException | NoSuchMethodException e) {
+			throw new RuntimeException(e);
+		}
+	}
+	
+	/**
+	 * Gets the function stat.
+	 * @return the stat.
+	 */
+	public Stats getStat() {
+		return _stat;
+	}
+	
+	/**
+	 * Gets the function priority order.
+	 * @return the order
+	 */
+	public int getOrder() {
+		return _order;
+	}
+	
+	/**
+	 * Gets the function value.
+	 * @return the value
+	 */
+	public double getValue() {
+		return _value;
+	}
+	
+	/**
+	 * Gets the functions for skills.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param skill the skill
+	 * @param owner the owner
+	 * @return the function if conditions are met, {@code null} otherwise
+	 */
+	public AbstractFunction getFunc(L2Character caster, L2Character target, Skill skill, Object owner) {
+		return getFunc(caster, target, skill, null, owner);
+	}
+	
+	/**
+	 * Gets the functions for items.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param item the item
+	 * @param owner the owner
+	 * @return the function if conditions are met, {@code null} otherwise
+	 */
+	public AbstractFunction getFunc(L2Character caster, L2Character target, L2ItemInstance item, Object owner) {
+		return getFunc(caster, target, null, item, owner);
+	}
+	
+	/**
+	 * Gets the functions for skills and items.
+	 * @param caster the caster
+	 * @param target the target
+	 * @param skill the skill
+	 * @param item the item
+	 * @param owner the owner
+	 * @return the function if conditions are met, {@code null} otherwise
+	 */
+	private AbstractFunction getFunc(L2Character caster, L2Character target, Skill skill, L2ItemInstance item, Object owner) {
+		if ((_attachCond != null) && !_attachCond.test(caster, target, skill)) {
+			return null;
+		}
+		try {
+			return (AbstractFunction) _constructor.newInstance(_stat, _order, owner, _value, _applyCond);
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncArmorSet.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncArmorSet.java
new file mode 100644
index 00000000..09752eb1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncArmorSet.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.data.xml.impl.ArmorSetsData;
+import com.l2jserver.gameserver.model.L2ArmorSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncArmorSet extends AbstractFunction {
+	private static final Map<Stats, FuncArmorSet> _fh_instance = new HashMap<>();
+	
+	public static AbstractFunction getInstance(Stats st) {
+		if (!_fh_instance.containsKey(st)) {
+			_fh_instance.put(st, new FuncArmorSet(st));
+		}
+		return _fh_instance.get(st);
+	}
+	
+	private FuncArmorSet(Stats stat) {
+		super(stat, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		double value = initVal;
+		L2PcInstance player = effector.getActingPlayer();
+		if (player != null) {
+			L2ItemInstance chest = player.getChestArmorInstance();
+			if (chest != null) {
+				L2ArmorSet set = ArmorSetsData.getInstance().getSet(chest.getId());
+				if ((set != null) && set.containAll(player)) {
+					switch (getStat()) {
+						case STAT_STR -> value += set.getSTR();
+						case STAT_DEX -> value += set.getDEX();
+						case STAT_INT -> value += set.getINT();
+						case STAT_MEN -> value += set.getMEN();
+						case STAT_CON -> value += set.getCON();
+						case STAT_WIT -> value += set.getWIT();
+					}
+				}
+			}
+		}
+		return value;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkAccuracy.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkAccuracy.java
new file mode 100644
index 00000000..a67b0439
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkAccuracy.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncAtkAccuracy extends AbstractFunction {
+	private static final FuncAtkAccuracy _faa_instance = new FuncAtkAccuracy();
+	
+	public static AbstractFunction getInstance() {
+		return _faa_instance;
+	}
+	
+	private FuncAtkAccuracy() {
+		super(Stats.ACCURACY_COMBAT, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		final int level = effector.getLevel();
+		// [Square(DEX)] * 6 + lvl + weapon hitbonus;
+		double value = initVal + (Math.sqrt(effector.getDEX()) * 6) + level;
+		if (level > 77) {
+			value += level - 76;
+		}
+		if (level > 69) {
+			value += level - 69;
+		}
+		return value;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkCritical.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkCritical.java
new file mode 100644
index 00000000..87a6b050
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkCritical.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncAtkCritical extends AbstractFunction {
+	private static final FuncAtkCritical _fac_instance = new FuncAtkCritical();
+	
+	public static AbstractFunction getInstance() {
+		return _fac_instance;
+	}
+	
+	private FuncAtkCritical() {
+		super(Stats.CRITICAL_RATE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.DEX.calcBonus(effector) * 10;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkEvasion.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkEvasion.java
new file mode 100644
index 00000000..973b0f97
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncAtkEvasion.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncAtkEvasion extends AbstractFunction {
+	private static final FuncAtkEvasion _fae_instance = new FuncAtkEvasion();
+	
+	public static AbstractFunction getInstance() {
+		return _fae_instance;
+	}
+	
+	private FuncAtkEvasion() {
+		super(Stats.EVASION_RATE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		final int level = effector.getLevel();
+		double value = initVal;
+		if (effector.isPlayer()) {
+			// [Square(DEX)] * 6 + lvl;
+			value += (Math.sqrt(effector.getDEX()) * 6) + level;
+			double diff = level - 69;
+			if (level >= 78) {
+				diff *= 1.2;
+			}
+			if (level >= 70) {
+				value += diff;
+			}
+		} else {
+			// [Square(DEX)] * 6 + lvl;
+			value += (Math.sqrt(effector.getDEX()) * 6) + level;
+			if (level > 69) {
+				value += (level - 69) + 2;
+			}
+		}
+		return (int) value;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncGatesMDefMod.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncGatesMDefMod.java
new file mode 100644
index 00000000..9ca9d373
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncGatesMDefMod.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import static com.l2jserver.gameserver.config.Configuration.sevenSigns;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncGatesMDefMod extends AbstractFunction {
+	private static final FuncGatesMDefMod _fmm_instance = new FuncGatesMDefMod();
+	
+	public static AbstractFunction getInstance() {
+		return _fmm_instance;
+	}
+	
+	private FuncGatesMDefMod() {
+		super(Stats.MAGIC_DEFENCE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DAWN) {
+			return initVal * sevenSigns().getDawnGatesMdefMult();
+		} else if (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK) {
+			return initVal * sevenSigns().getDuskGatesMdefMult();
+		}
+		return initVal;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncGatesPDefMod.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncGatesPDefMod.java
new file mode 100644
index 00000000..eac5d22b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncGatesPDefMod.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import static com.l2jserver.gameserver.config.Configuration.sevenSigns;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncGatesPDefMod extends AbstractFunction {
+	private static final FuncGatesPDefMod _fmm_instance = new FuncGatesPDefMod();
+	
+	public static AbstractFunction getInstance() {
+		return _fmm_instance;
+	}
+	
+	private FuncGatesPDefMod() {
+		super(Stats.POWER_DEFENCE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		if (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DAWN) {
+			return initVal * sevenSigns().getDawnGatesPdefMult();
+		} else if (SevenSigns.getInstance().getSealOwner(SevenSigns.SEAL_STRIFE) == SevenSigns.CABAL_DUSK) {
+			return initVal * sevenSigns().getDuskGatesPdefMult();
+		}
+		return initVal;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java
new file mode 100644
index 00000000..0de6fce4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncHenna.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncHenna extends AbstractFunction {
+	private static final Map<Stats, FuncHenna> _fh_instance = new HashMap<>();
+	
+	public static AbstractFunction getInstance(Stats st) {
+		if (!_fh_instance.containsKey(st)) {
+			_fh_instance.put(st, new FuncHenna(st));
+		}
+		return _fh_instance.get(st);
+	}
+	
+	private FuncHenna(Stats stat) {
+		super(stat, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		L2PcInstance pc = effector.getActingPlayer();
+		double value = initVal;
+		if (pc != null) {
+			switch (getStat()) {
+				case STAT_STR -> value += pc.getHennaStatSTR();
+				case STAT_CON -> value += pc.getHennaStatCON();
+				case STAT_DEX -> value += pc.getHennaStatDEX();
+				case STAT_INT -> value += pc.getHennaStatINT();
+				case STAT_WIT -> value += pc.getHennaStatWIT();
+				case STAT_MEN -> value += pc.getHennaStatMEN();
+			}
+		}
+		return value;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkCritical.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkCritical.java
new file mode 100644
index 00000000..d103239e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkCritical.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMAtkCritical extends AbstractFunction {
+	private static final FuncMAtkCritical _fac_instance = new FuncMAtkCritical();
+	
+	public static AbstractFunction getInstance() {
+		return _fac_instance;
+	}
+	
+	private FuncMAtkCritical() {
+		super(Stats.MCRITICAL_RATE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		// CT2: The magic critical rate has been increased to 10 times.
+		if (!effector.isPlayer() || (effector.getActiveWeaponInstance() != null)) {
+			return initVal * BaseStats.WIT.calcBonus(effector) * 10;
+		}
+		return initVal;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java
new file mode 100644
index 00000000..47e98227
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkMod.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMAtkMod extends AbstractFunction {
+	private static final FuncMAtkMod _fma_instance = new FuncMAtkMod();
+	
+	public static AbstractFunction getInstance() {
+		return _fma_instance;
+	}
+	
+	private FuncMAtkMod() {
+		super(Stats.MAGIC_ATTACK, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		// Level Modifier^2 * INT Modifier^2
+		double lvlMod = effector.isPlayer() ? BaseStats.INT.calcBonus(effector.getActingPlayer()) : BaseStats.INT.calcBonus(effector);
+		double intMod = effector.isPlayer() ? effector.getActingPlayer().getLevelMod() : effector.getLevelMod();
+		return initVal * Math.pow(lvlMod, 2) * Math.pow(intMod, 2);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkSpeed.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkSpeed.java
new file mode 100644
index 00000000..e6f5f99e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMAtkSpeed.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMAtkSpeed extends AbstractFunction {
+	private static final FuncMAtkSpeed _fas_instance = new FuncMAtkSpeed();
+	
+	public static AbstractFunction getInstance() {
+		return _fas_instance;
+	}
+	
+	private FuncMAtkSpeed() {
+		super(Stats.MAGIC_ATTACK_SPEED, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.WIT.calcBonus(effector);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java
new file mode 100644
index 00000000..8084925b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMDefMod.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMDefMod extends AbstractFunction {
+	private static final FuncMDefMod _fmm_instance = new FuncMDefMod();
+	
+	public static AbstractFunction getInstance() {
+		return _fmm_instance;
+	}
+	
+	private FuncMDefMod() {
+		super(Stats.MAGIC_DEFENCE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		double value = initVal;
+		if (effector.isPlayer()) {
+			L2PcInstance p = effector.getActingPlayer();
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_LFINGER)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_LFINGER) : Inventory.PAPERDOLL_LFINGER);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_RFINGER)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_RFINGER) : Inventory.PAPERDOLL_RFINGER);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_LEAR)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_LEAR) : Inventory.PAPERDOLL_LEAR);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_REAR)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_REAR) : Inventory.PAPERDOLL_REAR);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_NECK)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_NECK) : Inventory.PAPERDOLL_NECK);
+			}
+		} else if (effector.isPet() && (effector.getInventory().getPaperdollObjectId(Inventory.PAPERDOLL_NECK) != 0)) {
+			value -= 13;
+		}
+		return value * BaseStats.MEN.calcBonus(effector) * effector.getLevelMod();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxCpMul.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxCpMul.java
new file mode 100644
index 00000000..0eef80b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxCpMul.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMaxCpMul extends AbstractFunction {
+	private static final FuncMaxCpMul _fmcm_instance = new FuncMaxCpMul();
+	
+	public static AbstractFunction getInstance() {
+		return _fmcm_instance;
+	}
+	
+	private FuncMaxCpMul() {
+		super(Stats.MAX_CP, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.CON.calcBonus(effector);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxHpMul.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxHpMul.java
new file mode 100644
index 00000000..df582c83
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxHpMul.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMaxHpMul extends AbstractFunction {
+	private static final FuncMaxHpMul _fmhm_instance = new FuncMaxHpMul();
+	
+	public static AbstractFunction getInstance() {
+		return _fmhm_instance;
+	}
+	
+	private FuncMaxHpMul() {
+		super(Stats.MAX_HP, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.CON.calcBonus(effector);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxMpMul.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxMpMul.java
new file mode 100644
index 00000000..643864fc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMaxMpMul.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMaxMpMul extends AbstractFunction {
+	private static final FuncMaxMpMul _fmmm_instance = new FuncMaxMpMul();
+	
+	public static AbstractFunction getInstance() {
+		return _fmmm_instance;
+	}
+	
+	private FuncMaxMpMul() {
+		super(Stats.MAX_MP, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.MEN.calcBonus(effector);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMoveSpeed.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMoveSpeed.java
new file mode 100644
index 00000000..09461c69
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncMoveSpeed.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncMoveSpeed extends AbstractFunction {
+	private static final FuncMoveSpeed _fms_instance = new FuncMoveSpeed();
+	
+	public static AbstractFunction getInstance() {
+		return _fms_instance;
+	}
+	
+	private FuncMoveSpeed() {
+		super(Stats.MOVE_SPEED, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.DEX.calcBonus(effector);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPAtkMod.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPAtkMod.java
new file mode 100644
index 00000000..a5d51543
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPAtkMod.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncPAtkMod extends AbstractFunction {
+	private static final FuncPAtkMod _fpa_instance = new FuncPAtkMod();
+	
+	public static AbstractFunction getInstance() {
+		return _fpa_instance;
+	}
+	
+	private FuncPAtkMod() {
+		super(Stats.POWER_ATTACK, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.STR.calcBonus(effector) * effector.getLevelMod();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPAtkSpeed.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPAtkSpeed.java
new file mode 100644
index 00000000..9ed1ad6b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPAtkSpeed.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.BaseStats;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncPAtkSpeed extends AbstractFunction {
+	private static final FuncPAtkSpeed _fas_instance = new FuncPAtkSpeed();
+	
+	public static AbstractFunction getInstance() {
+		return _fas_instance;
+	}
+	
+	private FuncPAtkSpeed() {
+		super(Stats.POWER_ATTACK_SPEED, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		return initVal * BaseStats.DEX.calcBonus(effector);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPDefMod.java b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPDefMod.java
new file mode 100644
index 00000000..f8b18569
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/stats/functions/formulas/FuncPDefMod.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats.functions.formulas;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.stats.functions.AbstractFunction;
+
+/**
+ * @author UnAfraid
+ */
+public class FuncPDefMod extends AbstractFunction {
+	private static final FuncPDefMod _fmm_instance = new FuncPDefMod();
+	
+	public static AbstractFunction getInstance() {
+		return _fmm_instance;
+	}
+	
+	private FuncPDefMod() {
+		super(Stats.POWER_DEFENCE, 1, null, 0, null);
+	}
+	
+	@Override
+	public double calc(L2Character effector, L2Character effected, Skill skill, double initVal) {
+		double value = initVal;
+		if (effector.isPlayer()) {
+			final L2PcInstance p = effector.getActingPlayer();
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST)) {
+				value -= p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_CHEST) : p.getTemplate().getBaseDefBySlot(Inventory.PAPERDOLL_CHEST);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_LEGS) || (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_CHEST) && (p.getInventory().getPaperdollItem(Inventory.PAPERDOLL_CHEST).getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR))) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_LEGS) : Inventory.PAPERDOLL_LEGS);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_HEAD)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_HEAD) : Inventory.PAPERDOLL_HEAD);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_FEET)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_FEET) : Inventory.PAPERDOLL_FEET);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_GLOVES)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_GLOVES) : Inventory.PAPERDOLL_GLOVES);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_UNDER)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_UNDER) : Inventory.PAPERDOLL_UNDER);
+			}
+			if (!p.getInventory().isPaperdollSlotEmpty(Inventory.PAPERDOLL_CLOAK)) {
+				value -= p.getTemplate().getBaseDefBySlot(p.isTransformed() ? p.getTransformation().getBaseDefBySlot(p, Inventory.PAPERDOLL_CLOAK) : Inventory.PAPERDOLL_CLOAK);
+			}
+		}
+		return value * effector.getLevelMod();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/variables/AbstractVariables.java b/src/main/java/com/l2jserver/gameserver/model/variables/AbstractVariables.java
new file mode 100644
index 00000000..59344876
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/variables/AbstractVariables.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.variables;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.interfaces.IRestorable;
+import com.l2jserver.gameserver.model.interfaces.IStorable;
+
+/**
+ * @author UnAfraid
+ */
+public abstract class AbstractVariables extends StatsSet implements IRestorable, IStorable {
+	private final AtomicBoolean _hasChanges = new AtomicBoolean(false);
+	
+	/**
+	 * Overriding following methods to prevent from doing useless database operations if there is no changes since player's login.
+	 */
+	
+	@Override
+	public final void set(String name, boolean value) {
+		_hasChanges.compareAndSet(false, true);
+		super.set(name, value);
+	}
+	
+	@Override
+	public final void set(String name, double value) {
+		_hasChanges.compareAndSet(false, true);
+		super.set(name, value);
+	}
+	
+	@Override
+	public final void set(String name, Enum<?> value) {
+		_hasChanges.compareAndSet(false, true);
+		super.set(name, value);
+	}
+	
+	@Override
+	public final void set(String name, int value) {
+		_hasChanges.compareAndSet(false, true);
+		super.set(name, value);
+	}
+	
+	@Override
+	public final void set(String name, long value) {
+		_hasChanges.compareAndSet(false, true);
+		super.set(name, value);
+	}
+	
+	@Override
+	public final void set(String name, String value) {
+		_hasChanges.compareAndSet(false, true);
+		super.set(name, value);
+	}
+	
+	/**
+	 * Return true if there exists a record for the variable name.
+	 * @param name
+	 * @return
+	 */
+	public boolean hasVariable(String name) {
+		return getSet().containsKey(name);
+	}
+	
+	/**
+	 * @return {@code true} if changes are made since last load/save.
+	 */
+	public final boolean hasChanges() {
+		return _hasChanges.get();
+	}
+	
+	/**
+	 * Atomically sets the value to the given updated value if the current value {@code ==} the expected value.
+	 * @param expect
+	 * @param update
+	 * @return {@code true} if successful. {@code false} return indicates that the actual value was not equal to the expected value.
+	 */
+	public final boolean compareAndSetChanges(boolean expect, boolean update) {
+		return _hasChanges.compareAndSet(expect, update);
+	}
+	
+	/**
+	 * Removes variable
+	 * @param name
+	 */
+	public final void remove(String name) {
+		_hasChanges.compareAndSet(false, true);
+		getSet().remove(name);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/variables/AccountVariables.java b/src/main/java/com/l2jserver/gameserver/model/variables/AccountVariables.java
new file mode 100644
index 00000000..6d8b6fe1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/variables/AccountVariables.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.variables;
+
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+
+/**
+ * @author UnAfraid
+ */
+public class AccountVariables extends AbstractVariables {
+	private static final Logger LOG = LoggerFactory.getLogger(AccountVariables.class);
+	
+	// SQL Queries.
+	private static final String SELECT_QUERY = "SELECT * FROM account_gsdata WHERE account_name = ?";
+	private static final String DELETE_QUERY = "DELETE FROM account_gsdata WHERE account_name = ?";
+	private static final String INSERT_QUERY = "INSERT INTO account_gsdata (account_name, var, value) VALUES (?, ?, ?)";
+	
+	private final String _accountName;
+	
+	public AccountVariables(String accountName) {
+		_accountName = accountName;
+		restoreMe();
+	}
+	
+	@Override
+	public boolean restoreMe() {
+		// Restore previous variables.
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var st = con.prepareStatement(SELECT_QUERY)) {
+			st.setString(1, _accountName);
+			try (var rs = st.executeQuery()) {
+				while (rs.next()) {
+					set(rs.getString("var"), rs.getString("value"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't restore variables for: {}", _accountName, e);
+			return false;
+		} finally {
+			compareAndSetChanges(true, false);
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		// No changes, nothing to store.
+		if (!hasChanges()) {
+			return false;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			// Clear previous entries.
+			try (var st = con.prepareStatement(DELETE_QUERY)) {
+				st.setString(1, _accountName);
+				st.execute();
+			}
+			
+			// Insert all variables.
+			try (var st = con.prepareStatement(INSERT_QUERY)) {
+				st.setString(1, _accountName);
+				for (Entry<String, Object> entry : getSet().entrySet()) {
+					st.setString(2, entry.getKey());
+					st.setString(3, String.valueOf(entry.getValue()));
+					st.addBatch();
+				}
+				st.executeBatch();
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't update variables for: {}", _accountName, e);
+			return false;
+		} finally {
+			compareAndSetChanges(true, false);
+		}
+		return true;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/variables/NpcVariables.java b/src/main/java/com/l2jserver/gameserver/model/variables/NpcVariables.java
new file mode 100644
index 00000000..57a88bd0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/variables/NpcVariables.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.variables;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * NPC Variables implementation.
+ * @author GKR
+ */
+public class NpcVariables extends AbstractVariables {
+	@Override
+	public int getInt(String key) {
+		return super.getInt(key, 0);
+	}
+	
+	@Override
+	public boolean restoreMe() {
+		return true;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		return true;
+	}
+	
+	/**
+	 * Gets the stored player.
+	 * @param name the name of the variable
+	 * @return the stored player or {@code null}
+	 */
+	public L2PcInstance getPlayer(String name) {
+		return getObject(name, L2PcInstance.class);
+	}
+	
+	/**
+	 * Gets the stored summon.
+	 * @param name the name of the variable
+	 * @return the stored summon or {@code null}
+	 */
+	public L2Summon getSummon(String name) {
+		return getObject(name, L2Summon.class);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/variables/PlayerVariables.java b/src/main/java/com/l2jserver/gameserver/model/variables/PlayerVariables.java
new file mode 100644
index 00000000..29762c78
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/variables/PlayerVariables.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.variables;
+
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ */
+public class PlayerVariables extends AbstractVariables {
+	private static final Logger LOG = LoggerFactory.getLogger(PlayerVariables.class);
+	
+	// SQL Queries.
+	private static final String SELECT_QUERY = "SELECT * FROM character_variables WHERE charId = ?";
+	private static final String DELETE_QUERY = "DELETE FROM character_variables WHERE charId = ?";
+	private static final String INSERT_QUERY = "INSERT INTO character_variables (charId, var, val) VALUES (?, ?, ?)";
+	
+	private final int _objectId;
+	
+	public PlayerVariables(int objectId) {
+		_objectId = objectId;
+		restoreMe();
+	}
+	
+	@Override
+	public boolean restoreMe() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_QUERY)) {
+			ps.setInt(1, _objectId);
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					set(rs.getString("var"), rs.getString("val"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't restore variables for: {}", getPlayer(), e);
+			return false;
+		} finally {
+			compareAndSetChanges(true, false);
+		}
+		return true;
+	}
+	
+	@Override
+	public boolean storeMe() {
+		// No changes, nothing to store.
+		if (!hasChanges()) {
+			return false;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			// Clear previous entries.
+			try (var st = con.prepareStatement(DELETE_QUERY)) {
+				st.setInt(1, _objectId);
+				st.execute();
+			}
+			
+			// Insert all variables.
+			try (var st = con.prepareStatement(INSERT_QUERY)) {
+				st.setInt(1, _objectId);
+				for (Entry<String, Object> entry : getSet().entrySet()) {
+					st.setString(2, entry.getKey());
+					st.setString(3, String.valueOf(entry.getValue()));
+					st.addBatch();
+				}
+				st.executeBatch();
+			}
+		} catch (Exception e) {
+			LOG.warn("Couldn't update variables for: {}", getPlayer(), e);
+			return false;
+		} finally {
+			compareAndSetChanges(true, false);
+		}
+		return true;
+	}
+	
+	public L2PcInstance getPlayer() {
+		return L2World.getInstance().getPlayer(_objectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/AbstractZoneSettings.java b/src/main/java/com/l2jserver/gameserver/model/zone/AbstractZoneSettings.java
new file mode 100644
index 00000000..ecc58f2c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/AbstractZoneSettings.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+/**
+ * Abstract class for Zone settings.
+ * @author UnAfraid
+ */
+public abstract class AbstractZoneSettings {
+	/**
+	 * Clear the Zone settings.
+	 */
+	public abstract void clear();
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java b/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java
new file mode 100644
index 00000000..a07c00c1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneForm.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+import java.awt.Rectangle;
+
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Abstract base class for any zone form
+ * @author durgus
+ */
+public abstract class L2ZoneForm {
+	protected static final int STEP = 10;
+	
+	public abstract Rectangle getBoundingBox();
+	
+	public abstract boolean isInsideZone(int x, int y, int z);
+	
+	public abstract boolean intersectsRectangle(int x1, int x2, int y1, int y2);
+	
+	public abstract double getDistanceToZone(int x, int y);
+	
+	public abstract int getLowZ(); // Support for the ability to extract the z coordinates of zones.
+	
+	public abstract int getHighZ(); // New fishing patch makes use of that to get the Z for the hook
+	
+	// landing coordinates.
+	
+	protected boolean lineSegmentsIntersect(int ax1, int ay1, int ax2, int ay2, int bx1, int by1, int bx2, int by2) {
+		return java.awt.geom.Line2D.linesIntersect(ax1, ay1, ax2, ay2, bx1, by1, bx2, by2);
+	}
+	
+	public abstract void visualizeZone(int z);
+	
+	protected final void dropDebugItem(int itemId, int num, int x, int y, int z) {
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var item = new L2ItemInstance(objectId, itemId);
+		item.setCount(num);
+		item.spawnMe(x, y, z + 5);
+		ZoneManager.getInstance().getDebugItems().add(item);
+	}
+	
+	public abstract int[] getRandomPoint();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneRespawn.java b/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneRespawn.java
new file mode 100644
index 00000000..9af6884e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneRespawn.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * Abstract respawn zone.
+ * @author DS
+ * @author Nyaran
+ * @since 2011/07/10
+ */
+public abstract class L2ZoneRespawn extends L2ZoneType {
+	private static final Logger LOG = LoggerFactory.getLogger(L2ZoneRespawn.class);
+	
+	private List<Location> _spawnLocs = null;
+	private List<Location> _otherSpawnLocs = null;
+	private List<Location> _chaoticSpawnLocs = null;
+	private List<Location> _banishSpawnLocs = null;
+	
+	protected L2ZoneRespawn(int id) {
+		super(id);
+	}
+	
+	public void parseLoc(int x, int y, int z, String type) {
+		if ((type == null) || type.isEmpty()) {
+			addSpawn(x, y, z);
+		} else {
+			switch (type) {
+				case "other" -> addOtherSpawn(x, y, z);
+				case "chaotic" -> addChaoticSpawn(x, y, z);
+				case "banish" -> addBanishSpawn(x, y, z);
+				default -> LOG.warn("Unknown location type: {}", type);
+			}
+		}
+	}
+	
+	public final void addSpawn(int x, int y, int z) {
+		if (_spawnLocs == null) {
+			_spawnLocs = new ArrayList<>();
+		}
+		
+		_spawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final void addOtherSpawn(int x, int y, int z) {
+		if (_otherSpawnLocs == null) {
+			_otherSpawnLocs = new ArrayList<>();
+		}
+		
+		_otherSpawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final void addChaoticSpawn(int x, int y, int z) {
+		if (_chaoticSpawnLocs == null) {
+			_chaoticSpawnLocs = new ArrayList<>();
+		}
+		
+		_chaoticSpawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final void addBanishSpawn(int x, int y, int z) {
+		if (_banishSpawnLocs == null) {
+			_banishSpawnLocs = new ArrayList<>();
+		}
+		
+		_banishSpawnLocs.add(new Location(x, y, z));
+	}
+	
+	public final List<Location> getSpawns() {
+		return _spawnLocs;
+	}
+	
+	public final Location getSpawnLoc() {
+		if (character().randomRespawnInTown()) {
+			return _spawnLocs.get(Rnd.get(_spawnLocs.size()));
+		}
+		return _spawnLocs.getFirst();
+	}
+	
+	public final Location getOtherSpawnLoc() {
+		if (_otherSpawnLocs != null) {
+			if (character().randomRespawnInTown()) {
+				return _otherSpawnLocs.get(Rnd.get(_otherSpawnLocs.size()));
+			}
+			return _otherSpawnLocs.getFirst();
+		}
+		return getSpawnLoc();
+	}
+	
+	public final Location getChaoticSpawnLoc() {
+		if (_chaoticSpawnLocs != null) {
+			if (character().randomRespawnInTown()) {
+				return _chaoticSpawnLocs.get(Rnd.get(_chaoticSpawnLocs.size()));
+			}
+			return _chaoticSpawnLocs.getFirst();
+		}
+		return getSpawnLoc();
+	}
+	
+	public final Location getBanishSpawnLoc() {
+		if (_banishSpawnLocs != null) {
+			if (character().randomRespawnInTown()) {
+				return _banishSpawnLocs.get(Rnd.get(_banishSpawnLocs.size()));
+			}
+			return _banishSpawnLocs.getFirst();
+		}
+		return getSpawnLoc();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java b/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java
new file mode 100644
index 00000000..053cd9ba
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java
@@ -0,0 +1,478 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.ListenersContainer;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureZoneEnter;
+import com.l2jserver.gameserver.model.events.impl.character.CreatureZoneExit;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+
+/**
+ * Abstract base class for any zone type handles basic operations.
+ * @author durgus
+ */
+public abstract class L2ZoneType extends ListenersContainer {
+	private static final Logger LOG = LoggerFactory.getLogger(L2ZoneType.class);
+	
+	private final int _id;
+	protected L2ZoneForm _zone;
+	protected Map<Integer, L2Character> _characterList;
+	
+	/** Parameters to affect specific characters */
+	private boolean _checkAffected = false;
+	private String _name = null;
+	private int _instanceId = -1;
+	private String _instanceTemplate = "";
+	private int _minLvl;
+	private int _maxLvl;
+	private int[] _race;
+	private int[] _class;
+	private char _classType;
+	private InstanceType _target = InstanceType.L2Character; // default all chars
+	private boolean _allowStore;
+	private boolean _enabled;
+	private AbstractZoneSettings _settings;
+	
+	protected L2ZoneType(int id) {
+		_id = id;
+		_characterList = new ConcurrentHashMap<>();
+		
+		_minLvl = 0;
+		_maxLvl = 0xFF;
+		
+		_classType = 0;
+		
+		_race = null;
+		_class = null;
+		_allowStore = true;
+		_enabled = true;
+	}
+	
+	/**
+	 * @return Returns the id.
+	 */
+	public int getId() {
+		return _id;
+	}
+	
+	/**
+	 * Setup new parameters for this zone
+	 */
+	public void setParameter(String name, String value) {
+		_checkAffected = true;
+		
+		// Zone name
+		switch (name) {
+			case "name":
+				_name = value;
+				break;
+			case "instanceId":
+				_instanceId = Integer.parseInt(value);
+				break;
+			case "instanceTemplate":
+				_instanceTemplate = value;
+				_instanceId = InstanceManager.getInstance().createDynamicInstance(value);
+				break;
+			// Minimum level
+			case "affectedLvlMin":
+				_minLvl = Integer.parseInt(value);
+				break;
+			// Maximum level
+			case "affectedLvlMax":
+				_maxLvl = Integer.parseInt(value);
+				break;
+			// Affected Races
+			case "affectedRace":
+				// Create a new array holding the affected race
+				if (_race == null) {
+					_race = new int[1];
+					_race[0] = Integer.parseInt(value);
+				} else {
+					int[] temp = new int[_race.length + 1];
+					
+					int i = 0;
+					for (; i < _race.length; i++) {
+						temp[i] = _race[i];
+					}
+					
+					temp[i] = Integer.parseInt(value);
+					
+					_race = temp;
+				}
+				break;
+			// Affected classes
+			case "affectedClassId":
+				// Create a new array holding the affected classIds
+				if (_class == null) {
+					_class = new int[1];
+					_class[0] = Integer.parseInt(value);
+				} else {
+					int[] temp = new int[_class.length + 1];
+					
+					int i = 0;
+					for (; i < _class.length; i++) {
+						temp[i] = _class[i];
+					}
+					
+					temp[i] = Integer.parseInt(value);
+					
+					_class = temp;
+				}
+				break;
+			// Affected class type
+			case "affectedClassType":
+				if (value.equals("Fighter")) {
+					_classType = 1;
+				} else {
+					_classType = 2;
+				}
+				break;
+			case "targetClass":
+				_target = Enum.valueOf(InstanceType.class, value);
+				break;
+			case "allowStore":
+				_allowStore = Boolean.parseBoolean(value);
+				break;
+			case "default_enabled":
+				_enabled = Boolean.parseBoolean(value);
+				break;
+			default:
+				LOG.info("Unknown parameter - {} in zone: {}", name, getId());
+				break;
+		}
+	}
+	
+	/**
+	 * @param character the player to verify.
+	 * @return {@code true} if the given character is affected by this zone, {@code false} otherwise.
+	 */
+	private boolean isAffected(L2Character character) {
+		// Check lvl
+		if ((character.getLevel() < _minLvl) || (character.getLevel() > _maxLvl)) {
+			return false;
+		}
+		
+		// check obj class
+		if (!character.isInstanceTypes(_target)) {
+			return false;
+		}
+		
+		if (character instanceof L2PcInstance) {
+			// Check class type
+			if (_classType != 0) {
+				if (((L2PcInstance) character).isMageClass()) {
+					if (_classType == 1) {
+						return false;
+					}
+				} else if (_classType == 2) {
+					return false;
+				}
+			}
+			
+			// Check race
+			if (_race != null) {
+				boolean ok = false;
+				
+				for (int element : _race) {
+					if (character.getRace().ordinal() == element) {
+						ok = true;
+						break;
+					}
+				}
+				
+				if (!ok) {
+					return false;
+				}
+			}
+			
+			// Check class
+			if (_class != null) {
+				boolean ok = false;
+				
+				for (int classId : _class) {
+					if (((L2PcInstance) character).getClassId().ordinal() == classId) {
+						ok = true;
+						break;
+					}
+				}
+				return ok;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Set the zone for this L2ZoneType Instance
+	 */
+	public void setZone(L2ZoneForm zone) {
+		if (_zone != null) {
+			throw new IllegalStateException("Zone already set");
+		}
+		_zone = zone;
+	}
+	
+	/**
+	 * Returns this zones zone form.
+	 * @return {@link #_zone}
+	 */
+	public L2ZoneForm getZone() {
+		return _zone;
+	}
+	
+	/**
+	 * Set the zone name.
+	 */
+	public void setName(String name) {
+		_name = name;
+	}
+	
+	/**
+	 * Returns zone name
+	 */
+	public String getName() {
+		return _name;
+	}
+	
+	/**
+	 * Set the zone instanceId.
+	 */
+	public void setInstanceId(int instanceId) {
+		_instanceId = instanceId;
+	}
+	
+	/**
+	 * Returns zone instanceId
+	 */
+	public int getInstanceId() {
+		return _instanceId;
+	}
+	
+	/**
+	 * Returns zone instanceTemplate
+	 */
+	public String getInstanceTemplate() {
+		return _instanceTemplate;
+	}
+	
+	/**
+	 * Checks if the given coordinates are within zone's plane
+	 */
+	public boolean isInsideZone(int x, int y) {
+		return _zone.isInsideZone(x, y, _zone.getHighZ());
+	}
+	
+	/**
+	 * Checks if the given coordinates are within the zone, ignores instanceId check
+	 */
+	public boolean isInsideZone(ILocational loc) {
+		return _zone.isInsideZone(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	/**
+	 * Checks if the given coordinates are within the zone, ignores instanceId check
+	 */
+	public boolean isInsideZone(int x, int y, int z) {
+		return _zone.isInsideZone(x, y, z);
+	}
+	
+	/**
+	 * Checks if the given coordinates are within the zone and the instanceId used matched the zone's instanceId
+	 */
+	public boolean isInsideZone(int x, int y, int z, int instanceId) {
+		// It will check if coords are within the zone if the given instanceId or
+		// the zone's _instanceId are in the multiverse or they match
+		if ((_instanceId == -1) || (instanceId == -1) || (_instanceId == instanceId)) {
+			return _zone.isInsideZone(x, y, z);
+		}
+		
+		return false;
+	}
+	
+	/**
+	 * Checks if the given object is inside the zone.
+	 */
+	public boolean isInsideZone(L2Object object) {
+		return isInsideZone(object.getX(), object.getY(), object.getZ(), object.getInstanceId());
+	}
+	
+	public double getDistanceToZone(int x, int y) {
+		return getZone().getDistanceToZone(x, y);
+	}
+	
+	public double getDistanceToZone(L2Object object) {
+		return getZone().getDistanceToZone(object.getX(), object.getY());
+	}
+	
+	public void revalidateInZone(L2Character character) {
+		// If the character can't be affected by this zone return
+		if (_checkAffected) {
+			if (!isAffected(character)) {
+				return;
+			}
+		}
+		
+		// If the object is inside the zone...
+		if (isInsideZone(character)) {
+			// Was the character not yet inside this zone?
+			if (!_characterList.containsKey(character.getObjectId())) {
+				// Notify to scripts.
+				EventDispatcher.getInstance().notifyEventAsync(new CreatureZoneEnter(character, this), this);
+				
+				// Register player.
+				_characterList.put(character.getObjectId(), character);
+				
+				// Notify Zone implementation.
+				onEnter(character);
+			}
+		} else {
+			removeCharacter(character);
+		}
+	}
+	
+	/**
+	 * Force fully removes a character from the zone Should use during teleport / logoff
+	 */
+	public void removeCharacter(L2Character character) {
+		// Was the character inside this zone?
+		if (_characterList.containsKey(character.getObjectId())) {
+			// Notify to scripts.
+			EventDispatcher.getInstance().notifyEventAsync(new CreatureZoneExit(character, this), this);
+			
+			// Unregister player.
+			_characterList.remove(character.getObjectId());
+			
+			// Notify Zone implementation.
+			onExit(character);
+		}
+	}
+	
+	/**
+	 * Will scan the zones char list for the character
+	 */
+	public boolean isCharacterInZone(L2Character character) {
+		return _characterList.containsKey(character.getObjectId());
+	}
+	
+	public AbstractZoneSettings getSettings() {
+		return _settings;
+	}
+	
+	public void setSettings(AbstractZoneSettings settings) {
+		if (_settings != null) {
+			_settings.clear();
+		}
+		_settings = settings;
+	}
+	
+	protected abstract void onEnter(L2Character character);
+	
+	protected abstract void onExit(L2Character character);
+	
+	public void onDieInside(L2Character character) {
+	}
+	
+	public void onReviveInside(L2Character character) {
+	}
+	
+	public void onPlayerLoginInside(L2PcInstance player) {
+	}
+	
+	public void onPlayerLogoutInside(L2PcInstance player) {
+	}
+	
+	public Map<Integer, L2Character> getCharacters() {
+		return _characterList;
+	}
+	
+	public Collection<L2Character> getCharactersInside() {
+		return _characterList.values();
+	}
+	
+	public List<L2PcInstance> getPlayersInside() {
+		List<L2PcInstance> players = new ArrayList<>();
+		for (L2Character ch : _characterList.values()) {
+			if ((ch != null) && ch.isPlayer()) {
+				players.add(ch.getActingPlayer());
+			}
+		}
+		
+		return players;
+	}
+	
+	/**
+	 * Broadcasts packet to all players inside the zone
+	 */
+	public void broadcastPacket(L2GameServerPacket packet) {
+		if (_characterList.isEmpty()) {
+			return;
+		}
+		
+		for (L2Character character : _characterList.values()) {
+			if ((character != null) && character.isPlayer()) {
+				character.sendPacket(packet);
+			}
+		}
+	}
+	
+	public InstanceType getTargetType() {
+		return _target;
+	}
+	
+	public void setTargetType(InstanceType type) {
+		_target = type;
+		_checkAffected = true;
+	}
+	
+	public boolean getAllowStore() {
+		return _allowStore;
+	}
+	
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + "[" + _id + "]";
+	}
+	
+	public void visualizeZone(int z) {
+		getZone().visualizeZone(z);
+	}
+	
+	public void setEnabled(boolean state) {
+		_enabled = state;
+	}
+	
+	public boolean isEnabled() {
+		return _enabled;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/TaskZoneSettings.java b/src/main/java/com/l2jserver/gameserver/model/zone/TaskZoneSettings.java
new file mode 100644
index 00000000..45efb2ef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/TaskZoneSettings.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+import java.util.concurrent.Future;
+
+/**
+ * Basic task zone settings implementation.
+ * @author UnAfraid
+ */
+public class TaskZoneSettings extends AbstractZoneSettings {
+	private Future<?> _task;
+	
+	/**
+	 * Gets the task.
+	 * @return the task
+	 */
+	public Future<?> getTask() {
+		return _task;
+	}
+	
+	/**
+	 * Sets the task.
+	 * @param task the new task
+	 */
+	public void setTask(Future<?> task) {
+		_task = task;
+	}
+	
+	@Override
+	public void clear() {
+		if (_task != null) {
+			_task.cancel(true);
+			_task = null;
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/ZoneId.java b/src/main/java/com/l2jserver/gameserver/model/zone/ZoneId.java
new file mode 100644
index 00000000..0b25c89d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/ZoneId.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone;
+
+/**
+ * Zone Ids.
+ * @author Zoey76
+ */
+public enum ZoneId {
+	PVP,
+	PEACE,
+	SIEGE,
+	MOTHER_TREE,
+	CLAN_HALL,
+	LANDING,
+	NO_LANDING,
+	WATER,
+	JAIL,
+	MONSTER_TRACK,
+	CASTLE,
+	SWAMP,
+	NO_SUMMON_FRIEND,
+	FORT,
+	NO_STORE,
+	TOWN,
+	SCRIPT,
+	HQ,
+	DANGER_AREA,
+	ALTERED,
+	NO_BOOKMARK,
+	NO_ITEM_DROP,
+	NO_RESTART;
+	
+	public static int getZoneCount() {
+		return values().length;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java b/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java
new file mode 100644
index 00000000..d584d465
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboid.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.form;
+
+import java.awt.Rectangle;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.zone.L2ZoneForm;
+
+/**
+ * A primitive rectangular zone
+ * @author durgus
+ */
+public class ZoneCuboid extends L2ZoneForm {
+	private final int _z1, _z2;
+	private final Rectangle _r;
+	
+	public ZoneCuboid(int x1, int x2, int y1, int y2, int z1, int z2) {
+		int _x1 = Math.min(x1, x2);
+		int _x2 = Math.max(x1, x2);
+		int _y1 = Math.min(y1, y2);
+		int _y2 = Math.max(y1, y2);
+		
+		_r = new Rectangle(_x1, _y1, _x2 - _x1, _y2 - _y1);
+		
+		_z1 = Math.min(z1, z2);
+		_z2 = Math.max(z1, z2);
+	}
+	
+	@Override
+	public Rectangle getBoundingBox() {
+		return _r;
+	}
+	
+	@Override
+	public boolean isInsideZone(int x, int y, int z) {
+		return (_r.contains(x, y) && (z >= _z1) && (z <= _z2));
+	}
+	
+	@Override
+	public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2) {
+		return (_r.intersects(Math.min(ax1, ax2), Math.min(ay1, ay2), Math.abs(ax2 - ax1), Math.abs(ay2 - ay1)));
+	}
+	
+	@Override
+	public double getDistanceToZone(int x, int y) {
+		int _x1 = _r.x;
+		int _x2 = _r.x + _r.width;
+		int _y1 = _r.y;
+		int _y2 = _r.y + _r.height;
+		double test, shortestDist = Math.pow(_x1 - x, 2) + Math.pow(_y1 - y, 2);
+		
+		test = Math.pow(_x1 - x, 2) + Math.pow(_y2 - y, 2);
+		if (test < shortestDist) {
+			shortestDist = test;
+		}
+		
+		test = Math.pow(_x2 - x, 2) + Math.pow(_y1 - y, 2);
+		if (test < shortestDist) {
+			shortestDist = test;
+		}
+		
+		test = Math.pow(_x2 - x, 2) + Math.pow(_y2 - y, 2);
+		if (test < shortestDist) {
+			shortestDist = test;
+		}
+		
+		return Math.sqrt(shortestDist);
+	}
+	
+	/*
+	 * getLowZ() / getHighZ() - These two functions were added to cope with the demand of the new fishing algorithms, which are now able to correctly place the hook in the water, thanks to getHighZ(). getLowZ() was added, considering potential future modifications.
+	 */
+	@Override
+	public int getLowZ() {
+		return _z1;
+	}
+	
+	@Override
+	public int getHighZ() {
+		return _z2;
+	}
+	
+	@Override
+	public void visualizeZone(int z) {
+		int _x1 = _r.x;
+		int _x2 = _r.x + _r.width;
+		int _y1 = _r.y;
+		int _y2 = _r.y + _r.height;
+		
+		// x1->x2
+		for (int x = _x1; x < _x2; x = x + STEP) {
+			dropDebugItem(Inventory.ADENA_ID, 1, x, _y1, z);
+			dropDebugItem(Inventory.ADENA_ID, 1, x, _y2, z);
+		}
+		// y1->y2
+		for (int y = _y1; y < _y2; y = y + STEP) {
+			dropDebugItem(Inventory.ADENA_ID, 1, _x1, y, z);
+			dropDebugItem(Inventory.ADENA_ID, 1, _x2, y, z);
+		}
+	}
+	
+	@Override
+	public int[] getRandomPoint() {
+		int x = Rnd.get(_r.x, _r.x + _r.width);
+		int y = Rnd.get(_r.y, _r.y + _r.height);
+		
+		return new int[] {
+			x,
+			y,
+			GeoData.getInstance().getHeight(x, y, _z1)
+		};
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java b/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java
new file mode 100644
index 00000000..7da54bfb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinder.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.form;
+
+import java.awt.Rectangle;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.zone.L2ZoneForm;
+
+/**
+ * A primitive circular zone
+ * @author durgus
+ */
+public class ZoneCylinder extends L2ZoneForm {
+	private final int _x, _y, _z1, _z2, _rad, _radS;
+	
+	public ZoneCylinder(int x, int y, int z1, int z2, int rad) {
+		_x = x;
+		_y = y;
+		_z1 = z1;
+		_z2 = z2;
+		_rad = rad;
+		_radS = rad * rad;
+	}
+	
+	@Override
+	public Rectangle getBoundingBox() {
+		final var diameter = _rad * 2;
+		return new Rectangle(_x - _rad, _y - _rad, diameter, diameter);
+	}
+	
+	@Override
+	public boolean isInsideZone(int x, int y, int z) {
+		return (!((Math.pow(_x - x, 2) + Math.pow(_y - y, 2)) > _radS)) && (z >= _z1) && (z <= _z2);
+	}
+	
+	@Override
+	public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2) {
+		// Circles point inside the rectangle?
+		if ((_x > ax1) && (_x < ax2) && (_y > ay1) && (_y < ay2)) {
+			return true;
+		}
+		
+		// Any point of the rectangle intersecting the Circle?
+		if ((Math.pow(ax1 - _x, 2) + Math.pow(ay1 - _y, 2)) < _radS) {
+			return true;
+		}
+		if ((Math.pow(ax1 - _x, 2) + Math.pow(ay2 - _y, 2)) < _radS) {
+			return true;
+		}
+		if ((Math.pow(ax2 - _x, 2) + Math.pow(ay1 - _y, 2)) < _radS) {
+			return true;
+		}
+		if ((Math.pow(ax2 - _x, 2) + Math.pow(ay2 - _y, 2)) < _radS) {
+			return true;
+		}
+		
+		// Collision on any side of the rectangle?
+		if ((_x > ax1) && (_x < ax2)) {
+			if (Math.abs(_y - ay2) < _rad) {
+				return true;
+			}
+			if (Math.abs(_y - ay1) < _rad) {
+				return true;
+			}
+		}
+		if ((_y > ay1) && (_y < ay2)) {
+			if (Math.abs(_x - ax2) < _rad) {
+				return true;
+			}
+			return Math.abs(_x - ax1) < _rad;
+		}
+		return false;
+	}
+	
+	@Override
+	public double getDistanceToZone(int x, int y) {
+		return Math.hypot(_x - x, _y - y) - _rad;
+	}
+	
+	// getLowZ() / getHighZ() - These two functions were added to cope with the demand of the new fishing algorithms, which are now able to correctly place the hook in the water, thanks to getHighZ(). getLowZ() was added, considering potential future modifications.
+	@Override
+	public int getLowZ() {
+		return _z1;
+	}
+	
+	@Override
+	public int getHighZ() {
+		return _z2;
+	}
+	
+	@Override
+	public void visualizeZone(int z) {
+		int count = (int) ((2 * Math.PI * _rad) / STEP);
+		double angle = (2 * Math.PI) / count;
+		for (int i = 0; i < count; i++) {
+			int x = (int) (Math.cos(angle * i) * _rad);
+			int y = (int) (Math.sin(angle * i) * _rad);
+			dropDebugItem(Inventory.ADENA_ID, 1, _x + x, _y + y, z);
+		}
+	}
+	
+	@Override
+	public int[] getRandomPoint() {
+		double x, y, q, r;
+		
+		q = Rnd.get() * 2 * Math.PI;
+		r = Math.sqrt(Rnd.get());
+		x = (_rad * r * Math.cos(q)) + _x;
+		y = (_rad * r * Math.sin(q)) + _y;
+		
+		return new int[] {
+			(int) x,
+			(int) y,
+			GeoData.getInstance().getHeight((int) x, (int) y, _z1)
+		};
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java b/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java
new file mode 100644
index 00000000..4b5b13a8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/form/ZoneNPoly.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.form;
+
+import java.awt.Polygon;
+import java.awt.Rectangle;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.zone.L2ZoneForm;
+
+/**
+ * A not so primitive npoly zone
+ * @author durgus
+ */
+public class ZoneNPoly extends L2ZoneForm {
+	private final Polygon _p;
+	private final int _z1;
+	private final int _z2;
+	
+	public ZoneNPoly(int[] x, int[] y, int z1, int z2) {
+		_p = new Polygon(x, y, x.length);
+		
+		_z1 = Math.min(z1, z2);
+		_z2 = Math.max(z1, z2);
+	}
+	
+	@Override
+	public Rectangle getBoundingBox() {
+		return _p.getBounds();
+	}
+	
+	@Override
+	public boolean isInsideZone(int x, int y, int z) {
+		return (_p.contains(x, y) && (z >= _z1) && (z <= _z2));
+	}
+	
+	@Override
+	public boolean intersectsRectangle(int ax1, int ax2, int ay1, int ay2) {
+		return (_p.intersects(Math.min(ax1, ax2), Math.min(ay1, ay2), Math.abs(ax2 - ax1), Math.abs(ay2 - ay1)));
+	}
+	
+	@Override
+	public double getDistanceToZone(int x, int y) {
+		int[] _x = _p.xpoints;
+		int[] _y = _p.ypoints;
+		double test, shortestDist = Math.pow(_x[0] - x, 2) + Math.pow(_y[0] - y, 2);
+		
+		for (int i = 1; i < _p.npoints; i++) {
+			test = Math.pow(_x[i] - x, 2) + Math.pow(_y[i] - y, 2);
+			if (test < shortestDist) {
+				shortestDist = test;
+			}
+		}
+		
+		return Math.sqrt(shortestDist);
+	}
+	
+	// getLowZ() / getHighZ() - These two functions were added to cope with the demand of the new fishing algorithms, which are now able to correctly place the hook in the water, thanks to getHighZ(). getLowZ() was added, considering potential future modifications.
+	@Override
+	public int getLowZ() {
+		return _z1;
+	}
+	
+	@Override
+	public int getHighZ() {
+		return _z2;
+	}
+	
+	@Override
+	public void visualizeZone(int z) {
+		int[] _x = _p.xpoints;
+		int[] _y = _p.ypoints;
+		
+		for (int i = 0; i < _p.npoints; i++) {
+			int nextIndex = i + 1;
+			// ending point to first one
+			if (nextIndex == _x.length) {
+				nextIndex = 0;
+			}
+			int vx = _x[nextIndex] - _x[i];
+			int vy = _y[nextIndex] - _y[i];
+			float length = (float) Math.sqrt((vx * vx) + (vy * vy));
+			length /= STEP;
+			for (int o = 1; o <= length; o++) {
+				float k = o / length;
+				dropDebugItem(Inventory.ADENA_ID, 1, (int) (_x[i] + (k * vx)), (int) (_y[i] + (k * vy)), z);
+			}
+		}
+	}
+	
+	@Override
+	public int[] getRandomPoint() {
+		int x, y;
+		
+		int _minX = _p.getBounds().x;
+		int _maxX = _p.getBounds().x + _p.getBounds().width;
+		int _minY = _p.getBounds().y;
+		int _maxY = _p.getBounds().y + _p.getBounds().height;
+		
+		x = Rnd.get(_minX, _maxX);
+		y = Rnd.get(_minY, _maxY);
+		
+		int antiBlocker = 0;
+		while (!_p.contains(x, y) && (antiBlocker++ < 1000)) {
+			x = Rnd.get(_minX, _maxX);
+			y = Rnd.get(_minY, _maxY);
+		}
+		
+		return new int[] {
+			x,
+			y,
+			GeoData.getInstance().getHeight(x, y, _z1)
+		};
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ArenaZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ArenaZone.java
new file mode 100644
index 00000000..88831450
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ArenaZone.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * A PVP Zone
+ * @author durgus
+ */
+public class L2ArenaZone extends L2ZoneType {
+	public L2ArenaZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character instanceof L2PcInstance) {
+			if (!character.isInsideZone(ZoneId.PVP)) {
+				character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
+			}
+		}
+		
+		character.setInsideZone(ZoneId.PVP, true);
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character instanceof L2PcInstance) {
+			if (!character.isInsideZone(ZoneId.PVP)) {
+				character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
+			}
+		}
+		
+		character.setInsideZone(ZoneId.PVP, false);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java
new file mode 100644
index 00000000..6d1fe1ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java
@@ -0,0 +1,352 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import com.l2jserver.gameserver.GameServer;
+import com.l2jserver.gameserver.instancemanager.GrandBossManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * @author DaRkRaGe
+ */
+public class L2BossZone extends L2ZoneType {
+	private int _timeInvade;
+	
+	private final int[] _oustLoc;
+	
+	public static final class Settings extends AbstractZoneSettings {
+		// track the times that players got disconnected. Players are allowed
+		// to log back into the zone as long as their log-out was within _timeInvade time...
+		// <player objectId, expiration time in milliseconds>
+		private final Map<Integer, Long> _playerAllowedReEntryTimes = new ConcurrentHashMap<>();
+		
+		// track the players admitted to the zone who should be allowed back in
+		// after reboot/server downtime (outside of their control), within 30 of server restart
+		private final List<Integer> _playersAllowed = new CopyOnWriteArrayList<>();
+		
+		private final List<L2Character> _raidList = new CopyOnWriteArrayList<>();
+		
+		protected Settings() {
+		}
+		
+		public Map<Integer, Long> getPlayerAllowedReEntryTimes() {
+			return _playerAllowedReEntryTimes;
+		}
+		
+		public List<Integer> getPlayersAllowed() {
+			return _playersAllowed;
+		}
+		
+		public List<L2Character> getRaidList() {
+			return _raidList;
+		}
+		
+		@Override
+		public void clear() {
+			_playerAllowedReEntryTimes.clear();
+			_playersAllowed.clear();
+			_raidList.clear();
+		}
+	}
+	
+	public L2BossZone(int id) {
+		super(id);
+		_oustLoc = new int[3];
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null) {
+			settings = new Settings();
+		}
+		setSettings(settings);
+		GrandBossManager.getInstance().addZone(this);
+	}
+	
+	@Override
+	public Settings getSettings() {
+		return (Settings) super.getSettings();
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		switch (name) {
+			case "InvadeTime" -> _timeInvade = Integer.parseInt(value);
+			case "oustX" -> _oustLoc[0] = Integer.parseInt(value);
+			case "oustY" -> _oustLoc[1] = Integer.parseInt(value);
+			case "oustZ" -> _oustLoc[2] = Integer.parseInt(value);
+			default -> super.setParameter(name, value);
+		}
+	}
+	
+	/**
+	 * Boss zones have special behaviors for player characters.<br>
+	 * Players are automatically teleported out when the attempt to enter these zones, except if the time at which they enter the zone is prior to the entry expiration time set for that player.<br>
+	 * Entry expiration times are set by any one of the following:<br>
+	 * 1) A player logs out while in a zone (Expiration gets set to logoutTime + _timeInvade)<br>
+	 * 2) An external source (such as a quest or AI of NPC) set up the player for entry.<br>
+	 * There exists one more case in which the player will be allowed to enter.<br>
+	 * That is if the server recently rebooted (boot-up time more recent than currentTime - _timeInvade) AND the player was in the zone prior to reboot.
+	 */
+	@Override
+	protected void onEnter(L2Character character) {
+		if (isEnabled()) {
+			if (character.isPlayer()) {
+				final L2PcInstance player = character.getActingPlayer();
+				if (player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) {
+					return;
+				}
+				// if player has been (previously) cleared by npc/ai for entry and the zone is
+				// set to receive players (aka not waiting for boss to respawn)
+				if (getSettings().getPlayersAllowed().contains(player.getObjectId())) {
+					// Get the information about this player's last logout-exit from
+					// this zone.
+					final Long expirationTime = getSettings().getPlayerAllowedReEntryTimes().get(player.getObjectId());
+					
+					// with legal entries, do nothing.
+					if (expirationTime == null) // legal null expirationTime entries
+					{
+						long serverStartTime = GameServer.dateTimeServerStarted.getTimeInMillis();
+						if ((serverStartTime > (System.currentTimeMillis() - _timeInvade))) {
+							return;
+						}
+					} else {
+						// legal non-null logoutTime entries
+						getSettings().getPlayerAllowedReEntryTimes().remove(player.getObjectId());
+						if (expirationTime > System.currentTimeMillis()) {
+							return;
+						}
+					}
+					getSettings().getPlayersAllowed().remove((Integer) player.getObjectId());
+				}
+				// teleport out all players who attempt "illegal" (re-)entry
+				if ((_oustLoc[0] != 0) && (_oustLoc[1] != 0) && (_oustLoc[2] != 0)) {
+					player.teleToLocation(_oustLoc[0], _oustLoc[1], _oustLoc[2]);
+				} else {
+					player.teleToLocation(TeleportWhereType.TOWN);
+				}
+			} else if (character.isSummon()) {
+				final L2PcInstance player = character.getActingPlayer();
+				if (player != null) {
+					if (getSettings().getPlayersAllowed().contains(player.getObjectId()) || player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) {
+						return;
+					}
+					
+					// remove summon and teleport out owner
+					// who attempt "illegal" (re-)entry
+					if ((_oustLoc[0] != 0) && (_oustLoc[1] != 0) && (_oustLoc[2] != 0)) {
+						player.teleToLocation(_oustLoc[0], _oustLoc[1], _oustLoc[2]);
+					} else {
+						player.teleToLocation(TeleportWhereType.TOWN);
+					}
+				}
+				((L2Summon) character).unSummon(player);
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (isEnabled()) {
+			if (character.isPlayer()) {
+				final L2PcInstance player = character.getActingPlayer();
+				if (player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) {
+					return;
+				}
+				
+				// if the player just got disconnected/logged out, store the dc
+				// time so that
+				// decisions can be made later about allowing or not the player
+				// to log into the zone
+				if (!player.isOnline() && getSettings().getPlayersAllowed().contains(player.getObjectId())) {
+					// mark the time that the player left the zone
+					getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), System.currentTimeMillis() + _timeInvade);
+				} else {
+					if (getSettings().getPlayersAllowed().contains(player.getObjectId())) {
+						getSettings().getPlayersAllowed().remove((Integer) player.getObjectId());
+					}
+					getSettings().getPlayerAllowedReEntryTimes().remove(player.getObjectId());
+				}
+			}
+			if (character.isPlayable()) {
+				if ((getCharactersInside() != null) && !getCharactersInside().isEmpty()) {
+					getSettings().getRaidList().clear();
+					int count = 0;
+					for (L2Character creature : getCharactersInside()) {
+						if (creature == null) {
+							continue;
+						}
+						if (creature.isPlayable()) {
+							count++;
+						} else if (creature.isAttackable() && creature.isRaid()) {
+							getSettings().getRaidList().add(creature);
+						}
+					}
+					// if inside zone isn't any player, force all boss instance return to its spawn points
+					if ((count == 0) && !getSettings().getRaidList().isEmpty()) {
+						for (L2Character creature : getSettings().getRaidList()) {
+							L2Attackable raid = (L2Attackable) creature;
+							if ((raid == null) || (raid.getSpawn() == null) || raid.isDead()) {
+								continue;
+							}
+							if (!raid.isInsideRadius(raid.getSpawn(), 150, false, false)) {
+								raid.returnHome();
+							}
+						}
+					}
+				}
+			}
+		}
+		if (character.isAttackable() && character.isRaid() && !character.isDead()) {
+			((L2Attackable) character).returnHome();
+		}
+	}
+	
+	@Override
+	public void setEnabled(boolean flag) {
+		if (isEnabled() != flag) {
+			oustAllPlayers();
+		}
+		super.setEnabled(flag);
+	}
+	
+	public int getTimeInvade() {
+		return _timeInvade;
+	}
+	
+	public void setAllowedPlayers(List<Integer> players) {
+		if (players != null) {
+			getSettings().getPlayersAllowed().clear();
+			getSettings().getPlayersAllowed().addAll(players);
+		}
+	}
+	
+	public List<Integer> getAllowedPlayers() {
+		return getSettings().getPlayersAllowed();
+	}
+	
+	public boolean isPlayerAllowed(L2PcInstance player) {
+		if (player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) {
+			return true;
+		} else if (getSettings().getPlayersAllowed().contains(player.getObjectId())) {
+			return true;
+		} else {
+			if ((_oustLoc[0] != 0) && (_oustLoc[1] != 0) && (_oustLoc[2] != 0)) {
+				player.teleToLocation(_oustLoc[0], _oustLoc[1], _oustLoc[2]);
+			} else {
+				player.teleToLocation(TeleportWhereType.TOWN);
+			}
+			return false;
+		}
+	}
+	
+	/**
+	 * Some GrandBosses send all players in zone to a specific part of the zone, rather than just removing them all.<br>
+	 * If this is the case, this command should be used. If this is no the case, then use oustAllPlayers().
+	 * @param loc
+	 */
+	public void movePlayersTo(Location loc) {
+		if (_characterList.isEmpty()) {
+			return;
+		}
+		
+		for (L2Character character : getCharactersInside()) {
+			if ((character != null) && character.isPlayer()) {
+				L2PcInstance player = character.getActingPlayer();
+				if (player.isOnline()) {
+					player.teleToLocation(loc);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Occasionally, all players need to be sent out of the zone (for example, if the players are just running around without fighting for too long, or if all players die, etc).<br>
+	 * This call sends all online players to town and marks offline players to be teleported (by clearing their relog expiration times) when they log back in (no real need for off-line teleport).
+	 */
+	public void oustAllPlayers() {
+		if (_characterList.isEmpty()) {
+			return;
+		}
+		
+		for (L2Character character : getCharactersInside()) {
+			if ((character != null) && character.isPlayer()) {
+				L2PcInstance player = character.getActingPlayer();
+				if (player.isOnline()) {
+					if ((_oustLoc[0] != 0) && (_oustLoc[1] != 0) && (_oustLoc[2] != 0)) {
+						player.teleToLocation(_oustLoc[0], _oustLoc[1], _oustLoc[2]);
+					} else {
+						player.teleToLocation(TeleportWhereType.TOWN);
+					}
+				}
+			}
+		}
+		getSettings().getPlayerAllowedReEntryTimes().clear();
+		getSettings().getPlayersAllowed().clear();
+	}
+	
+	/**
+	 * This function is to be used by external sources, such as quests and AI in order to allow a player for entry into the zone for some time. Naturally if the player does not enter within the allowed time, he/she will be teleported out again...
+	 * @param player reference to the player we wish to allow
+	 * @param durationInSec amount of time in seconds during which entry is valid.
+	 */
+	public void allowPlayerEntry(L2PcInstance player, int durationInSec) {
+		if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) {
+			if (!getSettings().getPlayersAllowed().contains(player.getObjectId())) {
+				getSettings().getPlayersAllowed().add(player.getObjectId());
+			}
+			getSettings().getPlayerAllowedReEntryTimes().put(player.getObjectId(), System.currentTimeMillis() + (durationInSec * 1000));
+		}
+	}
+	
+	public void removePlayer(L2PcInstance player) {
+		if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) {
+			getSettings().getPlayersAllowed().remove(Integer.valueOf(player.getObjectId()));
+			getSettings().getPlayerAllowedReEntryTimes().remove(player.getObjectId());
+		}
+	}
+	
+	public void updateKnownList(L2Npc npc) {
+		if ((_characterList == null) || _characterList.isEmpty()) {
+			return;
+		}
+		
+		Map<Integer, L2PcInstance> npcKnownPlayers = npc.getKnownList().getKnownPlayers();
+		for (L2Character character : getCharactersInside()) {
+			if ((character != null) && character.isPlayer()) {
+				L2PcInstance player = character.getActingPlayer();
+				if (player.isOnline()) {
+					npcKnownPlayers.put(player.getObjectId(), player);
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2CastleZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2CastleZone.java
new file mode 100644
index 00000000..1f33ca81
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2CastleZone.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A castle zone
+ * @author durgus
+ */
+public final class L2CastleZone extends L2ResidenceZone {
+	
+	public L2CastleZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("castleId")) {
+			setResidenceId(Integer.parseInt(value));
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.CASTLE, true);
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.CASTLE, false);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java
new file mode 100644
index 00000000..68c15d63
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ClanHallZone.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.AgitDecoInfo;
+
+/**
+ * A clan hall zone
+ * @author durgus
+ */
+public class L2ClanHallZone extends L2ResidenceZone {
+	private static final Logger LOG = LoggerFactory.getLogger(L2ClanHallZone.class);
+	
+	public L2ClanHallZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("clanHallId")) {
+			setResidenceId(Integer.parseInt(value));
+			// Register self to the correct clan hall
+			ClanHall hall = ClanHallManager.getInstance().getClanHallById(getResidenceId());
+			if (hall == null) {
+				LOG.warn("Clan hall with id {} does not exist!", getResidenceId());
+			} else {
+				hall.setZone(this);
+			}
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			// Set as in clan hall
+			character.setInsideZone(ZoneId.CLAN_HALL, true);
+			
+			AuctionableHall clanHall = ClanHallManager.getInstance().getAuctionableHallById(getResidenceId());
+			if (clanHall == null) {
+				return;
+			}
+			
+			// Send decoration packet
+			AgitDecoInfo deco = new AgitDecoInfo(clanHall);
+			character.sendPacket(deco);
+			
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.CLAN_HALL, false);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ConditionZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ConditionZone.java
new file mode 100644
index 00000000..4fa57fd6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ConditionZone.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * @author UnAfraid
+ */
+public class L2ConditionZone extends L2ZoneType {
+	private boolean NO_ITEM_DROP = false;
+	private boolean NO_BOOKMARK = false;
+	
+	public L2ConditionZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equalsIgnoreCase("NoBookmark")) {
+			NO_BOOKMARK = Boolean.parseBoolean(value);
+		} else if (name.equalsIgnoreCase("NoItemDrop")) {
+			NO_ITEM_DROP = Boolean.parseBoolean(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			if (NO_BOOKMARK) {
+				character.setInsideZone(ZoneId.NO_BOOKMARK, true);
+			}
+			if (NO_ITEM_DROP) {
+				character.setInsideZone(ZoneId.NO_ITEM_DROP, true);
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			if (NO_BOOKMARK) {
+				character.setInsideZone(ZoneId.NO_BOOKMARK, false);
+			}
+			if (NO_ITEM_DROP) {
+				character.setInsideZone(ZoneId.NO_ITEM_DROP, false);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java
new file mode 100644
index 00000000..41010b89
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DamageZone.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.TaskZoneSettings;
+
+/**
+ * A damage zone
+ * @author durgus
+ */
+public class L2DamageZone extends L2ZoneType {
+	private int _damageHPPerSec;
+	private int _damageMPPerSec;
+	
+	private int _castleId;
+	private Castle _castle;
+	
+	private int _startTask;
+	private int _reuseTask;
+	
+	public L2DamageZone(int id) {
+		super(id);
+		
+		// Setup default damage
+		_damageHPPerSec = 200;
+		_damageMPPerSec = 0;
+		
+		// Setup default start / reuse time
+		_startTask = 10;
+		_reuseTask = 5000;
+		
+		// no castle by default
+		_castleId = 0;
+		_castle = null;
+		
+		setTargetType(InstanceType.L2Playable); // default only playable
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null) {
+			settings = new TaskZoneSettings();
+		}
+		setSettings(settings);
+	}
+	
+	@Override
+	public TaskZoneSettings getSettings() {
+		return (TaskZoneSettings) super.getSettings();
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("dmgHPSec")) {
+			_damageHPPerSec = Integer.parseInt(value);
+		} else if (name.equals("dmgMPSec")) {
+			_damageMPPerSec = Integer.parseInt(value);
+		} else if (name.equals("castleId")) {
+			_castleId = Integer.parseInt(value);
+		} else if (name.equalsIgnoreCase("initialDelay")) {
+			_startTask = Integer.parseInt(value);
+		} else if (name.equalsIgnoreCase("reuse")) {
+			_reuseTask = Integer.parseInt(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if ((getSettings().getTask() == null) && ((_damageHPPerSec != 0) || (_damageMPPerSec != 0))) {
+			L2PcInstance player = character.getActingPlayer();
+			if (getCastle() != null) // Castle zone
+			{
+				if (!(getCastle().getSiege().isInProgress() && (player != null) && (player.getSiegeState() != 2))) // Siege and no defender
+				{
+					return;
+				}
+			}
+			
+			synchronized (this) {
+				if (getSettings().getTask() == null) {
+					getSettings().setTask(ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ApplyDamage(this), _startTask, _reuseTask));
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (_characterList.isEmpty() && (getSettings().getTask() != null)) {
+			getSettings().clear();
+		}
+	}
+	
+	protected int getHPDamagePerSecond() {
+		return _damageHPPerSec;
+	}
+	
+	protected int getMPDamagePerSecond() {
+		return _damageMPPerSec;
+	}
+	
+	protected Castle getCastle() {
+		if ((_castleId > 0) && (_castle == null)) {
+			_castle = CastleManager.getInstance().getCastleById(_castleId);
+		}
+		
+		return _castle;
+	}
+	
+	private final class ApplyDamage implements Runnable {
+		private final L2DamageZone _dmgZone;
+		private final Castle _castle;
+		
+		protected ApplyDamage(L2DamageZone zone) {
+			_dmgZone = zone;
+			_castle = zone.getCastle();
+		}
+		
+		@Override
+		public void run() {
+			if (!isEnabled()) {
+				return;
+			}
+			
+			boolean siege = false;
+			
+			if (_castle != null) {
+				siege = _castle.getSiege().isInProgress();
+				// castle zones active only during siege
+				if (!siege) {
+					_dmgZone.getSettings().clear();
+					return;
+				}
+			}
+			
+			for (L2Character temp : _dmgZone.getCharactersInside()) {
+				if ((temp != null) && !temp.isDead()) {
+					if (siege) {
+						// during siege defenders not affected
+						final L2PcInstance player = temp.getActingPlayer();
+						if ((player != null) && player.isInSiege() && (player.getSiegeState() == 2)) {
+							continue;
+						}
+					}
+					
+					double multiplier = 1 + (temp.calcStat(Stats.DAMAGE_ZONE_VULN, 0, null, null) / 100);
+					
+					if (getHPDamagePerSecond() != 0) {
+						temp.reduceCurrentHp(_dmgZone.getHPDamagePerSecond() * multiplier, null, null);
+					}
+					if (getMPDamagePerSecond() != 0) {
+						temp.reduceCurrentMp(_dmgZone.getMPDamagePerSecond() * multiplier);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DerbyTrackZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DerbyTrackZone.java
new file mode 100644
index 00000000..8cc98331
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DerbyTrackZone.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * The Monster Derby Track Zone
+ * @author durgus
+ */
+public class L2DerbyTrackZone extends L2ZoneType {
+	public L2DerbyTrackZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayable()) {
+			character.setInsideZone(ZoneId.MONSTER_TRACK, true);
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayable()) {
+			character.setInsideZone(ZoneId.MONSTER_TRACK, false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DynamicZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DynamicZone.java
new file mode 100644
index 00000000..a9719500
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2DynamicZone.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.TaskZoneSettings;
+
+/**
+ * A dynamic zone? Maybe use this for interlude skills like protection field :>
+ * @author durgus
+ */
+public class L2DynamicZone extends L2ZoneType {
+	private final L2WorldRegion _region;
+	private final L2Character _owner;
+	private final Skill _skill;
+	
+	public L2DynamicZone(L2WorldRegion region, L2Character owner, Skill skill) {
+		super(-1);
+		_region = region;
+		_owner = owner;
+		_skill = skill;
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null) {
+			settings = new TaskZoneSettings();
+		}
+		setSettings(settings);
+		
+		getSettings().setTask(ThreadPoolManager.getInstance().scheduleGeneral(this::remove, skill.getAbnormalTime() * 1000));
+	}
+	
+	@Override
+	public TaskZoneSettings getSettings() {
+		return (TaskZoneSettings) super.getSettings();
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			character.sendMessage("You have entered a temporary zone!");
+		}
+		if (_owner != null) {
+			_skill.applyEffects(_owner, character);
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			character.sendMessage("You have left a temporary zone!"); // TODO: Custom message?
+		}
+		
+		if (character == _owner) {
+			remove();
+			return;
+		}
+		
+		character.stopSkillEffects(true, _skill.getId());
+	}
+	
+	protected void remove() {
+		if ((getSettings().getTask() == null) || (_skill == null)) {
+			return;
+		}
+		
+		getSettings().getTask().cancel(false);
+		
+		_region.removeZone(this);
+		for (L2Character member : getCharactersInside()) {
+			member.stopSkillEffects(true, _skill.getId());
+		}
+		_owner.stopSkillEffects(true, _skill.getId());
+		
+	}
+	
+	@Override
+	public void onDieInside(L2Character character) {
+		if (character == _owner) {
+			remove();
+		} else {
+			character.stopSkillEffects(true, _skill.getId());
+		}
+	}
+	
+	@Override
+	public void onReviveInside(L2Character character) {
+		_skill.applyEffects(_owner, character);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java
new file mode 100644
index 00000000..6532682c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.TaskZoneSettings;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
+
+/**
+ * another type of damage zone with skills
+ * @author kerberos
+ */
+public class L2EffectZone extends L2ZoneType {
+	private static final Logger LOG = LoggerFactory.getLogger(L2EffectZone.class);
+	
+	private int _chance;
+	private int _initialDelay;
+	private int _reuse;
+	private boolean _bypassConditions;
+	private boolean _isShowDangerIcon;
+	protected volatile Map<Integer, Integer> _skills;
+	
+	public L2EffectZone(int id) {
+		super(id);
+		_chance = 100;
+		_initialDelay = 0;
+		_reuse = 30000;
+		setTargetType(InstanceType.L2Playable); // default only playable
+		_bypassConditions = false;
+		_isShowDangerIcon = true;
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null) {
+			settings = new TaskZoneSettings();
+		}
+		setSettings(settings);
+	}
+	
+	@Override
+	public TaskZoneSettings getSettings() {
+		return (TaskZoneSettings) super.getSettings();
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		switch (name) {
+			case "chance" -> _chance = Integer.parseInt(value);
+			case "initialDelay" -> _initialDelay = Integer.parseInt(value);
+			case "reuse" -> _reuse = Integer.parseInt(value);
+			case "bypassSkillConditions" -> _bypassConditions = Boolean.parseBoolean(value);
+			case "maxDynamicSkillCount" -> _skills = new ConcurrentHashMap<>(Integer.parseInt(value));
+			case "skillIdLvl" -> {
+				String[] propertySplit = value.split(";");
+				_skills = new ConcurrentHashMap<>(propertySplit.length);
+				for (String skill : propertySplit) {
+					String[] skillSplit = skill.split("-");
+					if (skillSplit.length != 2) {
+						LOG.warn("Invalid config property -> skillsIdLvl \"{}\"", skill);
+					} else {
+						try {
+							_skills.put(Integer.parseInt(skillSplit[0]), Integer.parseInt(skillSplit[1]));
+						} catch (NumberFormatException nfe) {
+							if (!skill.isEmpty()) {
+								LOG.warn("Invalid config property -> skillsIdLvl \"{}\"{}", skillSplit[0], skillSplit[1]);
+							}
+						}
+					}
+				}
+			}
+			case "showDangerIcon" -> _isShowDangerIcon = Boolean.parseBoolean(value);
+			default -> super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (_skills != null) {
+			if (getSettings().getTask() == null) {
+				synchronized (this) {
+					if (getSettings().getTask() == null) {
+						getSettings().setTask(ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new ApplySkill(), _initialDelay, _reuse));
+					}
+				}
+			}
+		}
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.ALTERED, true);
+			if (_isShowDangerIcon) {
+				character.setInsideZone(ZoneId.DANGER_AREA, true);
+				character.sendPacket(new EtcStatusUpdate(character.getActingPlayer()));
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.ALTERED, false);
+			if (_isShowDangerIcon) {
+				character.setInsideZone(ZoneId.DANGER_AREA, false);
+				if (!character.isInsideZone(ZoneId.DANGER_AREA)) {
+					character.sendPacket(new EtcStatusUpdate(character.getActingPlayer()));
+				}
+			}
+		}
+		if (_characterList.isEmpty() && (getSettings().getTask() != null)) {
+			getSettings().clear();
+		}
+	}
+	
+	protected Skill getSkill(int skillId, int skillLvl) {
+		return SkillData.getInstance().getSkill(skillId, skillLvl);
+	}
+	
+	public int getChance() {
+		return _chance;
+	}
+	
+	public void addSkill(int skillId, int skillLvL) {
+		if (skillLvL < 1) // remove skill
+		{
+			removeSkill(skillId);
+			return;
+		}
+		
+		if (_skills == null) {
+			synchronized (this) {
+				if (_skills == null) {
+					_skills = new ConcurrentHashMap<>(3);
+				}
+			}
+		}
+		_skills.put(skillId, skillLvL);
+	}
+	
+	public void removeSkill(int skillId) {
+		if (_skills != null) {
+			_skills.remove(skillId);
+		}
+	}
+	
+	public void clearSkills() {
+		if (_skills != null) {
+			_skills.clear();
+		}
+	}
+	
+	public int getSkillLevel(int skillId) {
+		final Map<Integer, Integer> skills = _skills;
+		return skills != null ? skills.getOrDefault(skillId, 0) : 0;
+	}
+	
+	private final class ApplySkill implements Runnable {
+		private ApplySkill() {
+			if (_skills == null) {
+				throw new IllegalStateException("No skills defined.");
+			}
+		}
+		
+		@Override
+		public void run() {
+			if (isEnabled()) {
+				for (L2Character temp : getCharactersInside()) {
+					if ((temp != null) && !temp.isDead()) {
+						if (Rnd.get(100) < getChance()) {
+							for (Entry<Integer, Integer> e : _skills.entrySet()) {
+								Skill skill = getSkill(e.getKey(), e.getValue());
+								if ((skill != null) && (_bypassConditions || skill.checkCondition(temp, temp, false))) {
+									if (!temp.isAffectedBySkill(e.getKey())) {
+										skill.applyEffects(temp, temp);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
new file mode 100644
index 00000000..1c7d90b0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2FishingZone.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * A fishing zone
+ * @author durgus
+ */
+public class L2FishingZone extends L2ZoneType {
+	public L2FishingZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+	}
+	
+	/*
+	 * getWaterZ() this added function returns the Z value for the water surface. In effect this simply returns the upper Z value of the zone. This required some modification of L2ZoneForm, and zone form extentions.
+	 */
+	public int getWaterZ() {
+		return getZone().getHighZ();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2FortZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2FortZone.java
new file mode 100644
index 00000000..f2dc5ff2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2FortZone.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A castle zone
+ * @author durgus
+ */
+public final class L2FortZone extends L2ResidenceZone {
+	public L2FortZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("fortId")) {
+			setResidenceId(Integer.parseInt(value));
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.FORT, true);
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.FORT, false);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2HqZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2HqZone.java
new file mode 100644
index 00000000..3d50a5a6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2HqZone.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * Zone where 'Build Headquarters' is allowed.
+ * @author Gnacik
+ */
+public class L2HqZone extends L2ZoneType {
+	public L2HqZone(final int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if ("castleId".equals(name)) {
+			// TODO
+		} else if ("fortId".equals(name)) {
+			// TODO
+		} else if ("clanHallId".equals(name)) {
+			// TODO
+		} else if ("territoryId".equals(name)) {
+			// TODO
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(final L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.HQ, true);
+		}
+	}
+	
+	@Override
+	protected void onExit(final L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.HQ, false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2JailZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2JailZone.java
new file mode 100644
index 00000000..fa222c11
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2JailZone.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.tasks.player.TeleportTask;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * A jail zone
+ * @author durgus
+ */
+public class L2JailZone extends L2ZoneType {
+	private static final Location JAIL_IN_LOC = new Location(-114356, -249645, -2984);
+	private static final Location JAIL_OUT_LOC = new Location(17836, 170178, -3507);
+	
+	public L2JailZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.JAIL, true);
+			character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true);
+			if (general().jailIsPvp()) {
+				character.setInsideZone(ZoneId.PVP, true);
+				character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
+			}
+			if (general().jailDisableTransaction()) {
+				character.setInsideZone(ZoneId.NO_STORE, true);
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			final L2PcInstance player = character.getActingPlayer();
+			player.setInsideZone(ZoneId.JAIL, false);
+			player.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
+			
+			if (general().jailIsPvp()) {
+				character.setInsideZone(ZoneId.PVP, false);
+				character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
+			}
+			
+			if (player.isJailed()) {
+				// when a player wants to exit jail even if he is still jailed, teleport him back to jail
+				ThreadPoolManager.getInstance().scheduleGeneral(new TeleportTask(player, JAIL_IN_LOC), 2000);
+				character.sendMessage("You cannot cheat your way out of here. You must wait until your jail time is over.");
+			}
+			if (general().jailDisableTransaction()) {
+				character.setInsideZone(ZoneId.NO_STORE, false);
+			}
+		}
+	}
+	
+	public static Location getLocationIn() {
+		return JAIL_IN_LOC;
+	}
+	
+	public static Location getLocationOut() {
+		return JAIL_OUT_LOC;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2LandingZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2LandingZone.java
new file mode 100644
index 00000000..63a5cd77
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2LandingZone.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A landing zone
+ * @author Kerberos
+ */
+public class L2LandingZone extends L2ZoneType {
+	public L2LandingZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.LANDING, true);
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.LANDING, false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java
new file mode 100644
index 00000000..a1dd82b4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2MotherTreeZone.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * A mother-trees zone Basic type zone for Hp, MP regen
+ * @author durgus
+ */
+public class L2MotherTreeZone extends L2ZoneType {
+	private int _enterMsg;
+	private int _leaveMsg;
+	private int _mpRegen;
+	private int _hpRegen;
+	
+	public L2MotherTreeZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		switch (name) {
+			case "enterMsgId" -> _enterMsg = Integer.parseInt(value);
+			case "leaveMsgId" -> _leaveMsg = Integer.parseInt(value);
+			case "MpRegenBonus" -> _mpRegen = Integer.parseInt(value);
+			case "HpRegenBonus" -> _hpRegen = Integer.parseInt(value);
+			default -> super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			L2PcInstance player = character.getActingPlayer();
+			character.setInsideZone(ZoneId.MOTHER_TREE, true);
+			if (_enterMsg != 0) {
+				player.sendPacket(SystemMessage.getSystemMessage(_enterMsg));
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			L2PcInstance player = character.getActingPlayer();
+			player.setInsideZone(ZoneId.MOTHER_TREE, false);
+			if (_leaveMsg != 0) {
+				player.sendPacket(SystemMessage.getSystemMessage(_leaveMsg));
+			}
+		}
+	}
+	
+	/**
+	 * @return the _mpRegen
+	 */
+	public int getMpRegenBonus() {
+		return _mpRegen;
+	}
+	
+	/**
+	 * @return the _hpRegen
+	 */
+	public int getHpRegenBonus() {
+		return _hpRegen;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoLandingZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoLandingZone.java
new file mode 100644
index 00000000..08c8b04d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoLandingZone.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * A no landing zone
+ * @author durgus
+ */
+public class L2NoLandingZone extends L2ZoneType {
+	private int dismountDelay = 5;
+	
+	public L2NoLandingZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("dismountDelay")) {
+			dismountDelay = Integer.parseInt(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.NO_LANDING, true);
+			if (character.getActingPlayer().getMountType() == MountType.WYVERN) {
+				character.sendPacket(SystemMessageId.AREA_CANNOT_BE_ENTERED_WHILE_MOUNTED_WYVERN);
+				character.getActingPlayer().enteredNoLanding(dismountDelay);
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.NO_LANDING, false);
+			if (character.getActingPlayer().getMountType() == MountType.WYVERN) {
+				character.getActingPlayer().exitedNoLanding();
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoRestartZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoRestartZone.java
new file mode 100644
index 00000000..d0c36470
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoRestartZone.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.GameServer;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A simple no restart zone
+ * @author GKR
+ */
+public class L2NoRestartZone extends L2ZoneType {
+	private int _restartAllowedTime = 0;
+	private int _restartTime = 0;
+	private boolean _enabled = true;
+	
+	public L2NoRestartZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equalsIgnoreCase("default_enabled")) {
+			_enabled = Boolean.parseBoolean(value);
+		} else if (name.equalsIgnoreCase("restartAllowedTime")) {
+			_restartAllowedTime = Integer.parseInt(value) * 1000;
+		} else if (name.equalsIgnoreCase("restartTime")) {
+			_restartTime = Integer.parseInt(value) * 1000;
+		} else if (name.equalsIgnoreCase("instanceId")) {
+			// Do nothing.
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (!_enabled) {
+			return;
+		}
+		
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.NO_RESTART, true);
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (!_enabled) {
+			return;
+		}
+		
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.NO_RESTART, false);
+		}
+	}
+	
+	@Override
+	public void onPlayerLoginInside(L2PcInstance player) {
+		if (!_enabled) {
+			return;
+		}
+		
+		if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime())) {
+			player.teleToLocation(TeleportWhereType.TOWN);
+		}
+	}
+	
+	public int getRestartAllowedTime() {
+		return _restartAllowedTime;
+	}
+	
+	public void setRestartAllowedTime(int time) {
+		_restartAllowedTime = time;
+	}
+	
+	public int getRestartTime() {
+		return _restartTime;
+	}
+	
+	public void setRestartTime(int time) {
+		_restartTime = time;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoStoreZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoStoreZone.java
new file mode 100644
index 00000000..76e99771
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoStoreZone.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * Zone where store is not allowed.
+ * @author fordfrog
+ */
+public class L2NoStoreZone extends L2ZoneType {
+	public L2NoStoreZone(final int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(final L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.NO_STORE, true);
+		}
+	}
+	
+	@Override
+	protected void onExit(final L2Character character) {
+		if (character.isPlayer()) {
+			character.setInsideZone(ZoneId.NO_STORE, false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoSummonFriendZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoSummonFriendZone.java
new file mode 100644
index 00000000..edfd5283
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2NoSummonFriendZone.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A simple no summon zone
+ * @author JIV
+ */
+public class L2NoSummonFriendZone extends L2ZoneType {
+	
+	public L2NoSummonFriendZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true);
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2OlympiadStadiumZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2OlympiadStadiumZone.java
new file mode 100644
index 00000000..d6932d49
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2OlympiadStadiumZone.java
@@ -0,0 +1,250 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2OlympiadManagerInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMatchEnd;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Olympiad stadium zone.
+ * @author durgus
+ * @author DS
+ */
+public class L2OlympiadStadiumZone extends L2ZoneRespawn {
+	private List<Location> _spectatorLocations;
+	
+	public L2OlympiadStadiumZone(int id) {
+		super(id);
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null) {
+			settings = new Settings();
+		}
+		setSettings(settings);
+	}
+	
+	public static final class Settings extends AbstractZoneSettings {
+		private OlympiadGameTask _task = null;
+		
+		protected Settings() {
+		}
+		
+		public OlympiadGameTask getOlympiadTask() {
+			return _task;
+		}
+		
+		protected void setTask(OlympiadGameTask task) {
+			_task = task;
+		}
+		
+		@Override
+		public void clear() {
+			_task = null;
+		}
+	}
+	
+	@Override
+	public Settings getSettings() {
+		return (Settings) super.getSettings();
+	}
+	
+	public final void registerTask(OlympiadGameTask task) {
+		getSettings().setTask(task);
+	}
+	
+	public final void openDoors() {
+		for (L2DoorInstance door : InstanceManager.getInstance().getInstance(getInstanceId()).getDoors()) {
+			if ((door != null) && !door.getOpen()) {
+				door.openMe();
+			}
+		}
+	}
+	
+	public final void closeDoors() {
+		for (L2DoorInstance door : InstanceManager.getInstance().getInstance(getInstanceId()).getDoors()) {
+			if ((door != null) && door.getOpen()) {
+				door.closeMe();
+			}
+		}
+	}
+	
+	public final void spawnBuffers() {
+		for (L2Npc buffer : InstanceManager.getInstance().getInstance(getInstanceId()).getNpcs()) {
+			if ((buffer instanceof L2OlympiadManagerInstance) && !buffer.isVisible()) {
+				buffer.spawnMe();
+			}
+		}
+	}
+	
+	public final void deleteBuffers() {
+		for (L2Npc buffer : InstanceManager.getInstance().getInstance(getInstanceId()).getNpcs()) {
+			if ((buffer instanceof L2OlympiadManagerInstance) && buffer.isVisible()) {
+				buffer.decayMe();
+			}
+		}
+	}
+	
+	public final void broadcastStatusUpdate(L2PcInstance player) {
+		final ExOlympiadUserInfo packet = new ExOlympiadUserInfo(player);
+		for (L2PcInstance target : getPlayersInside()) {
+			if ((target != null) && (target.inObserverMode() || (target.getOlympiadSide() != player.getOlympiadSide()))) {
+				target.sendPacket(packet);
+			}
+		}
+	}
+	
+	public final void broadcastPacketToObservers(L2GameServerPacket packet) {
+		for (L2Character character : getCharactersInside()) {
+			if ((character != null) && character.isPlayer() && character.getActingPlayer().inObserverMode()) {
+				character.sendPacket(packet);
+			}
+		}
+	}
+	
+	@Override
+	protected final void onEnter(L2Character character) {
+		if (getSettings().getOlympiadTask() != null) {
+			if (getSettings().getOlympiadTask().isBattleStarted()) {
+				character.setInsideZone(ZoneId.PVP, true);
+				if (character.isPlayer()) {
+					character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
+					getSettings().getOlympiadTask().getGame().sendOlympiadInfo(character);
+				}
+			}
+		}
+		
+		if (character.isPlayable()) {
+			final L2PcInstance player = character.getActingPlayer();
+			if (player != null) {
+				// only participants, observers and GMs allowed
+				if (!player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS) && !player.isInOlympiadMode() && !player.inObserverMode()) {
+					ThreadPoolManager.getInstance().executeGeneral(new KickPlayer(player));
+				} else {
+					// check for pet
+					if (player.hasPet()) {
+						player.getSummon().unSummon(player);
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected final void onExit(L2Character character) {
+		if (getSettings().getOlympiadTask() != null) {
+			if (getSettings().getOlympiadTask().isBattleStarted()) {
+				character.setInsideZone(ZoneId.PVP, false);
+				if (character.isPlayer()) {
+					character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
+					character.sendPacket(ExOlympiadMatchEnd.STATIC_PACKET);
+				}
+			}
+		}
+	}
+	
+	public final void updateZoneStatusForCharactersInside() {
+		if (getSettings().getOlympiadTask() == null) {
+			return;
+		}
+		
+		final boolean battleStarted = getSettings().getOlympiadTask().isBattleStarted();
+		final SystemMessage sm;
+		if (battleStarted) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ENTERED_COMBAT_ZONE);
+		} else {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.LEFT_COMBAT_ZONE);
+		}
+		
+		for (L2Character character : getCharactersInside()) {
+			if (character == null) {
+				continue;
+			}
+			
+			if (battleStarted) {
+				character.setInsideZone(ZoneId.PVP, true);
+				if (character.isPlayer()) {
+					character.sendPacket(sm);
+				}
+			} else {
+				character.setInsideZone(ZoneId.PVP, false);
+				if (character.isPlayer()) {
+					character.sendPacket(sm);
+					character.sendPacket(ExOlympiadMatchEnd.STATIC_PACKET);
+				}
+			}
+		}
+	}
+	
+	private static final class KickPlayer implements Runnable {
+		private L2PcInstance _player;
+		
+		public KickPlayer(L2PcInstance player) {
+			_player = player;
+		}
+		
+		@Override
+		public void run() {
+			if (_player != null) {
+				if (_player.hasSummon()) {
+					_player.getSummon().unSummon(_player);
+				}
+				
+				_player.teleToLocation(TeleportWhereType.TOWN);
+				_player.setInstanceId(0);
+				_player = null;
+			}
+		}
+	}
+	
+	@Override
+	public void parseLoc(int x, int y, int z, String type) {
+		if ((type != null) && type.equals("spectatorSpawn")) {
+			if (_spectatorLocations == null) {
+				_spectatorLocations = new ArrayList<>();
+			}
+			_spectatorLocations.add(new Location(x, y, z));
+		} else {
+			super.parseLoc(x, y, z, type);
+		}
+	}
+	
+	public List<Location> getSpectatorSpawns() {
+		return _spectatorLocations;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java
new file mode 100644
index 00000000..4b9b47f9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2PeaceZone.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A Peace Zone
+ * @author durgus
+ */
+public class L2PeaceZone extends L2ZoneType {
+	public L2PeaceZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (character.isPlayer()) {
+			L2PcInstance player = character.getActingPlayer();
+			if (player.isCombatFlagEquipped() && TerritoryWarManager.getInstance().isTWInProgress()) {
+				TerritoryWarManager.getInstance().dropCombatFlag(player, false, true);
+			}
+			
+			// PVP possible during siege, now for siege participants only
+			// Could also check if this town is in siege, or if any siege is going on
+			if ((player.getSiegeState() != 0) && (general().getPeaceZoneMode() == 1)) {
+				return;
+			}
+			
+			// Pause Hunting System times
+			player.getHuntingSystem().stopHuntingBonusTask(true);
+			player.getRecSystem().stopBonusTask(true);
+		}
+		
+		if (general().getPeaceZoneMode() != 2) {
+			character.setInsideZone(ZoneId.PEACE, true);
+		}
+		
+		if (!getAllowStore()) {
+			character.setInsideZone(ZoneId.NO_STORE, true);
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		if (general().getPeaceZoneMode() != 2) {
+			character.setInsideZone(ZoneId.PEACE, false);
+		}
+		
+		if (!getAllowStore()) {
+			character.setInsideZone(ZoneId.NO_STORE, false);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java
new file mode 100644
index 00000000..edd80356
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceHallTeleportZone.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Teleport residence zone for clan hall sieges
+ * @author BiggBoss
+ */
+public class L2ResidenceHallTeleportZone extends L2ResidenceTeleportZone {
+	private int _id;
+	private ScheduledFuture<?> _teleTask;
+	
+	public L2ResidenceHallTeleportZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("residenceZoneId")) {
+			_id = Integer.parseInt(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	public int getResidenceZoneId() {
+		return _id;
+	}
+	
+	public synchronized void checkTeleportTask() {
+		if ((_teleTask == null) || _teleTask.isDone()) {
+			_teleTask = ThreadPoolManager.getInstance().scheduleGeneral(new TeleportTask(), 30000);
+		}
+	}
+	
+	protected class TeleportTask implements Runnable {
+		@Override
+		public void run() {
+			int index = 0;
+			if (getSpawns().size() > 1) {
+				index = Rnd.get(getSpawns().size());
+			}
+			
+			final Location loc = getSpawns().get(index);
+			if (loc == null) {
+				throw new NullPointerException();
+			}
+			
+			for (L2PcInstance pc : getPlayersInside()) {
+				if (pc != null) {
+					pc.teleToLocation(loc, false);
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceTeleportZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceTeleportZone.java
new file mode 100644
index 00000000..8615814e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceTeleportZone.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * based on Kerberos work for custom L2CastleTeleportZone
+ * @author Nyaran
+ */
+public class L2ResidenceTeleportZone extends L2ZoneRespawn {
+	private int _residenceId;
+	
+	public L2ResidenceTeleportZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("residenceId")) {
+			_residenceId = Integer.parseInt(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true); // FIXME: Custom ?
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); // FIXME: Custom ?
+	}
+	
+	public void oustAllPlayers() {
+		for (L2PcInstance player : getPlayersInside()) {
+			if ((player != null) && player.isOnline()) {
+				player.teleToLocation(getSpawnLoc(), 200);
+			}
+		}
+	}
+	
+	public int getResidenceId() {
+		return _residenceId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceZone.java
new file mode 100644
index 00000000..2fbb85ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ResidenceZone.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
+
+/**
+ * @author xban1x
+ */
+public abstract class L2ResidenceZone extends L2ZoneRespawn {
+	private int _residenceId;
+	
+	protected L2ResidenceZone(int id) {
+		super(id);
+	}
+	
+	public void banishForeigners(int owningClanId) {
+		for (L2PcInstance temp : getPlayersInside()) {
+			if ((owningClanId != 0) && (temp.getClanId() == owningClanId)) {
+				continue;
+			}
+			temp.teleToLocation(getBanishSpawnLoc(), true);
+		}
+	}
+	
+	protected void setResidenceId(int residenceId) {
+		_residenceId = residenceId;
+	}
+	
+	public int getResidenceId() {
+		return _residenceId;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java
new file mode 100644
index 00000000..d4a119d3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+
+/**
+ * Respawn zone implementation.
+ * @author Nyaran
+ */
+public class L2RespawnZone extends L2ZoneType {
+	private final Map<Race, String> _raceRespawnPoint = new HashMap<>();
+	
+	public L2RespawnZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+	}
+	
+	public void addRaceRespawnPoint(String race, String point) {
+		_raceRespawnPoint.put(Race.valueOf(race), point);
+	}
+	
+	public Map<Race, String> getAllRespawnPoints() {
+		return _raceRespawnPoint;
+	}
+	
+	public String getRespawnPoint(L2PcInstance activeChar) {
+		return _raceRespawnPoint.get(activeChar.getRace());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ScriptZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ScriptZone.java
new file mode 100644
index 00000000..c30e9189
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2ScriptZone.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A scripted zone... Creation of such a zone should require some kind of script reference which can handle onEnter() / onExit()
+ * @author durgus
+ */
+public class L2ScriptZone extends L2ZoneType {
+	public L2ScriptZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.SCRIPT, true);
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.SCRIPT, false);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegableHallZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegableHallZone.java
new file mode 100644
index 00000000..4370b521
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegableHallZone.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author BiggBoss
+ */
+public final class L2SiegableHallZone extends L2ClanHallZone {
+	private List<Location> _challengerLocations;
+	
+	public L2SiegableHallZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	public void parseLoc(int x, int y, int z, String type) {
+		if ((type != null) && type.equals("challenger")) {
+			if (_challengerLocations == null) {
+				_challengerLocations = new ArrayList<>();
+			}
+			_challengerLocations.add(new Location(x, y, z));
+		} else {
+			super.parseLoc(x, y, z, type);
+		}
+	}
+	
+	public List<Location> getChallengerSpawns() {
+		return _challengerLocations;
+	}
+	
+	public void banishNonSiegeParticipants() {
+		for (L2PcInstance player : getPlayersInside()) {
+			if ((player != null) && player.isInHideoutSiege()) {
+				player.teleToLocation(getBanishSpawnLoc(), true);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java
new file mode 100644
index 00000000..41b2deea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SiegeZone.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import static com.l2jserver.gameserver.config.Configuration.castle;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.FortSiege;
+import com.l2jserver.gameserver.model.entity.Siegable;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.AbstractZoneSettings;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * A siege zone
+ * @author durgus
+ */
+public class L2SiegeZone extends L2ZoneType {
+	private static final Logger LOG = LoggerFactory.getLogger(L2SiegeZone.class);
+	
+	private static final int DISMOUNT_DELAY = 5;
+	
+	public L2SiegeZone(int id) {
+		super(id);
+		AbstractZoneSettings settings = ZoneManager.getSettings(getName());
+		if (settings == null) {
+			settings = new Settings();
+		}
+		setSettings(settings);
+	}
+	
+	public static final class Settings extends AbstractZoneSettings {
+		private int _siegableId = -1;
+		private Siegable _siege = null;
+		private boolean _isActiveSiege = false;
+		
+		private Settings() {
+		}
+		
+		public int getSiegeableId() {
+			return _siegableId;
+		}
+		
+		protected void setSiegeableId(int id) {
+			_siegableId = id;
+		}
+		
+		public Siegable getSiege() {
+			return _siege;
+		}
+		
+		public void setSiege(Siegable s) {
+			_siege = s;
+		}
+		
+		public boolean isActiveSiege() {
+			return _isActiveSiege;
+		}
+		
+		public void setActiveSiege(boolean val) {
+			_isActiveSiege = val;
+		}
+		
+		@Override
+		public void clear() {
+			_siegableId = -1;
+			_siege = null;
+			_isActiveSiege = false;
+		}
+	}
+	
+	@Override
+	public Settings getSettings() {
+		return (Settings) super.getSettings();
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		switch (name) {
+			case "castleId", "fortId" -> {
+				if (getSettings().getSiegeableId() != -1) {
+					throw new IllegalArgumentException("Siege object already defined!");
+				}
+				getSettings().setSiegeableId(Integer.parseInt(value));
+			}
+			case "clanHallId" -> {
+				if (getSettings().getSiegeableId() != -1) {
+					throw new IllegalArgumentException("Siege object already defined!");
+				}
+				getSettings().setSiegeableId(Integer.parseInt(value));
+				SiegableHall hall = ClanHallSiegeManager.getInstance().getConquerableHalls().get(getSettings().getSiegeableId());
+				if (hall == null) {
+					LOG.warn("Siegable clan hall with id {} does not exist!", value);
+				} else {
+					hall.setSiegeZone(this);
+				}
+			}
+			default -> super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (getSettings().isActiveSiege()) {
+			character.setInsideZone(ZoneId.PVP, true);
+			character.setInsideZone(ZoneId.SIEGE, true);
+			character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, true); // FIXME: Custom ?
+			
+			if (character.isPlayer()) {
+				L2PcInstance player = character.getActingPlayer();
+				if (player.isRegisteredOnThisSiegeField(getSettings().getSiegeableId())) {
+					player.setIsInSiege(true); // in siege
+					if (getSettings().getSiege().giveFame() && (getSettings().getSiege().getFameFrequency() > 0)) {
+						player.startFameTask(getSettings().getSiege().getFameFrequency(), getSettings().getSiege().getFameAmount());
+					}
+				}
+				
+				character.sendPacket(SystemMessageId.ENTERED_COMBAT_ZONE);
+				if (!castle().allowRideWyvernDuringSiege() && (player.getMountType() == MountType.WYVERN)) {
+					player.sendPacket(SystemMessageId.AREA_CANNOT_BE_ENTERED_WHILE_MOUNTED_WYVERN);
+					player.enteredNoLanding(DISMOUNT_DELAY);
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.PVP, false);
+		character.setInsideZone(ZoneId.SIEGE, false);
+		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); // FIXME: Custom ?
+		if (getSettings().isActiveSiege()) {
+			if (character.isPlayer()) {
+				L2PcInstance player = character.getActingPlayer();
+				character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
+				if (player.getMountType() == MountType.WYVERN) {
+					player.exitedNoLanding();
+				}
+				// Set pvp flag
+				if (player.getPvpFlag() == 0) {
+					player.startPvPFlag();
+				}
+			}
+		}
+		if (character.isPlayer()) {
+			L2PcInstance activeChar = character.getActingPlayer();
+			activeChar.stopFameTask();
+			activeChar.setIsInSiege(false);
+			
+			if ((getSettings().getSiege() instanceof FortSiege) && (activeChar.getInventory().getItemByItemId(9819) != null)) {
+				// drop combat flag
+				Fort fort = FortManager.getInstance().getFortById(getSettings().getSiegeableId());
+				if (fort != null) {
+					FortSiegeManager.getInstance().dropCombatFlag(activeChar, fort.getResidenceId());
+				} else {
+					int slot = activeChar.getInventory().getSlotFromItem(activeChar.getInventory().getItemByItemId(9819));
+					activeChar.getInventory().unEquipItemInBodySlot(slot);
+					activeChar.destroyItem("CombatFlag", activeChar.getInventory().getItemByItemId(9819), null, true);
+				}
+			}
+		}
+	}
+	
+	@Override
+	public void onDieInside(L2Character character) {
+		if (getSettings().isActiveSiege()) {
+			// debuff participants only if they die inside siege zone
+			if (character.isPlayer() && character.getActingPlayer().isRegisteredOnThisSiegeField(getSettings().getSiegeableId())) {
+				int lvl = 1;
+				final BuffInfo info = character.getEffectList().getBuffInfoBySkillId(5660);
+				if (info != null) {
+					lvl = Math.min(lvl + info.getSkill().getLevel(), 5);
+				}
+				
+				final Skill skill = SkillData.getInstance().getSkill(5660, lvl);
+				if (skill != null) {
+					skill.applyEffects(character, character);
+				}
+			}
+		}
+	}
+	
+	public void updateZoneStatusForCharactersInside() {
+		if (getSettings().isActiveSiege()) {
+			for (L2Character character : getCharactersInside()) {
+				if (character != null) {
+					onEnter(character);
+				}
+			}
+		} else {
+			L2PcInstance player;
+			for (L2Character character : getCharactersInside()) {
+				if (character == null) {
+					continue;
+				}
+				
+				character.setInsideZone(ZoneId.PVP, false);
+				character.setInsideZone(ZoneId.SIEGE, false);
+				character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
+				
+				if (character.isPlayer()) {
+					player = character.getActingPlayer();
+					character.sendPacket(SystemMessageId.LEFT_COMBAT_ZONE);
+					player.stopFameTask();
+					if (player.getMountType() == MountType.WYVERN) {
+						player.exitedNoLanding();
+					}
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Sends a message to all players in this zone
+	 */
+	public void announceToPlayers(String message) {
+		for (L2PcInstance player : getPlayersInside()) {
+			if (player != null) {
+				player.sendMessage(message);
+			}
+		}
+	}
+	
+	public int getSiegeObjectId() {
+		return getSettings().getSiegeableId();
+	}
+	
+	public boolean isActive() {
+		return getSettings().isActiveSiege();
+	}
+	
+	public void setIsActive(boolean val) {
+		getSettings().setActiveSiege(val);
+	}
+	
+	public void setSiegeInstance(Siegable siege) {
+		getSettings().setSiege(siege);
+	}
+	
+	/**
+	 * Removes all foreigners from the zone
+	 */
+	public void banishForeigners(int owningClanId) {
+		TeleportWhereType type = TeleportWhereType.TOWN;
+		for (L2PcInstance temp : getPlayersInside()) {
+			if (temp.getClanId() == owningClanId) {
+				continue;
+			}
+			
+			temp.teleToLocation(type);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SwampZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SwampZone.java
new file mode 100644
index 00000000..3d725ad7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2SwampZone.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * another type of zone where your speed is changed
+ * @author kerberos
+ */
+public class L2SwampZone extends L2ZoneType {
+	private double _move_bonus;
+	
+	private int _castleId;
+	private Castle _castle;
+	
+	public L2SwampZone(int id) {
+		super(id);
+		
+		// Setup default speed reduce (in %)
+		_move_bonus = 0.5;
+		
+		// no castle by default
+		_castleId = 0;
+		_castle = null;
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("move_bonus")) {
+			_move_bonus = Double.parseDouble(value);
+		} else if (name.equals("castleId")) {
+			_castleId = Integer.parseInt(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	private Castle getCastle() {
+		if ((_castleId > 0) && (_castle == null)) {
+			_castle = CastleManager.getInstance().getCastleById(_castleId);
+		}
+		
+		return _castle;
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		if (getCastle() != null) {
+			// castle zones active only during siege
+			if (!getCastle().getSiege().isInProgress() || !isEnabled()) {
+				return;
+			}
+			
+			// defenders not affected
+			final L2PcInstance player = character.getActingPlayer();
+			if ((player != null) && player.isInSiege() && (player.getSiegeState() == 2)) {
+				return;
+			}
+		}
+		
+		character.setInsideZone(ZoneId.SWAMP, true);
+		if (character.isPlayer()) {
+			character.getActingPlayer().broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		// don't broadcast info if not needed
+		if (character.isInsideZone(ZoneId.SWAMP)) {
+			character.setInsideZone(ZoneId.SWAMP, false);
+			if (character.isPlayer()) {
+				character.getActingPlayer().broadcastUserInfo();
+			}
+		}
+	}
+	
+	public double getMoveBonus() {
+		return _move_bonus;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2TownZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2TownZone.java
new file mode 100644
index 00000000..8f38541c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2TownZone.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * A Town zone
+ * @author durgus
+ */
+public class L2TownZone extends L2ZoneType {
+	private int _townId;
+	private int _taxById;
+	
+	public L2TownZone(int id) {
+		super(id);
+		
+		_taxById = 0;
+	}
+	
+	@Override
+	public void setParameter(String name, String value) {
+		if (name.equals("townId")) {
+			_townId = Integer.parseInt(value);
+		} else if (name.equals("taxById")) {
+			_taxById = Integer.parseInt(value);
+		} else {
+			super.setParameter(name, value);
+		}
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.TOWN, true);
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.TOWN, false);
+	}
+	
+	/**
+	 * Returns this zones town id (if any)
+	 * @return
+	 */
+	public int getTownId() {
+		return _townId;
+	}
+	
+	/**
+	 * Returns this town zones castle id
+	 * @return
+	 */
+	public final int getTaxById() {
+		return _taxById;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java
new file mode 100644
index 00000000..26a56ae4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/L2WaterZone.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
+import com.l2jserver.gameserver.network.serverpackets.ServerObjectInfo;
+
+public class L2WaterZone extends L2ZoneType {
+	public L2WaterZone(int id) {
+		super(id);
+	}
+	
+	@Override
+	protected void onEnter(L2Character character) {
+		character.setInsideZone(ZoneId.WATER, true);
+		
+		// TODO: update to only send speed status when that packet is known
+		if (character.isPlayer()) {
+			L2PcInstance player = character.getActingPlayer();
+			if (player.isTransformed() && !player.getTransformation().canSwim()) {
+				character.stopTransformation(true);
+			} else {
+				player.broadcastUserInfo();
+			}
+		} else if (character.isNpc()) {
+			for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) {
+				if (character.getRunSpeed() == 0) {
+					player.sendPacket(new ServerObjectInfo((L2Npc) character, player));
+				} else {
+					player.sendPacket(new AbstractNpcInfo.NpcInfo((L2Npc) character, player));
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void onExit(L2Character character) {
+		character.setInsideZone(ZoneId.WATER, false);
+		
+		// TODO: update to only send speed status when that packet is known
+		if (character.isPlayer()) {
+			character.getActingPlayer().broadcastUserInfo();
+		} else if (character.isNpc()) {
+			for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) {
+				if (character.getRunSpeed() == 0) {
+					player.sendPacket(new ServerObjectInfo((L2Npc) character, player));
+				} else {
+					player.sendPacket(new AbstractNpcInfo.NpcInfo((L2Npc) character, player));
+				}
+			}
+		}
+	}
+	
+	public int getWaterZ() {
+		return getZone().getHighZ();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/model/zone/type/NpcSpawnTerritory.java b/src/main/java/com/l2jserver/gameserver/model/zone/type/NpcSpawnTerritory.java
new file mode 100644
index 00000000..2b9b3ff7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/model/zone/type/NpcSpawnTerritory.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.type;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.zone.L2ZoneForm;
+
+/**
+ * Just dummy zone, needs only for geometry calculations
+ * @author GKR
+ */
+public class NpcSpawnTerritory {
+	private final String _name;
+	private final L2ZoneForm _territory;
+	@SuppressWarnings("unused")
+	private List<L2ZoneForm> _bannedTerritories; // TODO: Implement it
+	
+	public NpcSpawnTerritory(String name, L2ZoneForm territory) {
+		_name = name;
+		_territory = territory;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int[] getRandomPoint() {
+		return _territory.getRandomPoint();
+	}
+	
+	public boolean isInsideZone(int x, int y, int z) {
+		return _territory.isInsideZone(x, y, z);
+	}
+	
+	public void visualizeZone(int z) {
+		_territory.visualizeZone(z);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/BlowFishKeygen.java b/src/main/java/com/l2jserver/gameserver/network/BlowFishKeygen.java
new file mode 100644
index 00000000..a0ab1340
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/BlowFishKeygen.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import com.l2jserver.commons.util.Rnd;
+
+/**
+ * Blowfish keygen for GameServer client connections.
+ * @author KenM
+ */
+public class BlowFishKeygen {
+	private static final int CRYPT_KEYS_SIZE = 20;
+	private static final byte[][] CRYPT_KEYS = new byte[CRYPT_KEYS_SIZE][16];
+	
+	static {
+		// init the GS encryption keys on class load
+		
+		for (int i = 0; i < CRYPT_KEYS_SIZE; i++) {
+			// randomize the 8 first bytes
+			for (int j = 0; j < CRYPT_KEYS[i].length; j++) {
+				CRYPT_KEYS[i][j] = (byte) Rnd.get(255);
+			}
+			
+			// the last 8 bytes are static
+			CRYPT_KEYS[i][8] = (byte) 0xc8;
+			CRYPT_KEYS[i][9] = (byte) 0x27;
+			CRYPT_KEYS[i][10] = (byte) 0x93;
+			CRYPT_KEYS[i][11] = (byte) 0x01;
+			CRYPT_KEYS[i][12] = (byte) 0xa1;
+			CRYPT_KEYS[i][13] = (byte) 0x6c;
+			CRYPT_KEYS[i][14] = (byte) 0x31;
+			CRYPT_KEYS[i][15] = (byte) 0x97;
+		}
+	}
+	
+	// block instantiation
+	private BlowFishKeygen() {
+		
+	}
+	
+	/**
+	 * Returns a key from this keygen pool, the logical ownership is retained by this keygen.<BR>
+	 * Thus when getting a key with interests other then read-only a copy must be performed.<BR>
+	 * @return A key from this keygen pool.
+	 */
+	public static byte[] getRandomKey() {
+		return CRYPT_KEYS[Rnd.get(CRYPT_KEYS_SIZE)];
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/ClientStats.java b/src/main/java/com/l2jserver/gameserver/network/ClientStats.java
new file mode 100644
index 00000000..d514ddb9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/ClientStats.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.mmo;
+
+public class ClientStats {
+	public int processedPackets = 0;
+	public int droppedPackets = 0;
+	public int unknownPackets = 0;
+	public int totalQueueSize = 0;
+	public int maxQueueSize = 0;
+	public int totalBursts = 0;
+	public int maxBurstSize = 0;
+	public int shortFloods = 0;
+	public int longFloods = 0;
+	public int totalQueueOverflows = 0;
+	public int totalUnderflowExceptions = 0;
+	
+	private final int[] _packetsInSecond;
+	private long _packetCountStartTick = 0;
+	private int _head;
+	private int _totalCount = 0;
+	
+	private int _floodsInMin = 0;
+	private long _floodStartTick = 0;
+	private int _unknownPacketsInMin = 0;
+	private long _unknownPacketStartTick = 0;
+	private int _overflowsInMin = 0;
+	private long _overflowStartTick = 0;
+	private int _underflowReadsInMin = 0;
+	private long _underflowReadStartTick = 0;
+	
+	private volatile boolean _floodDetected = false;
+	private volatile boolean _queueOverflowDetected = false;
+	
+	private final int BUFFER_SIZE;
+	
+	public ClientStats() {
+		BUFFER_SIZE = general().getClientPacketQueueMeasureInterval();
+		_packetsInSecond = new int[BUFFER_SIZE];
+		_head = BUFFER_SIZE - 1;
+	}
+	
+	/**
+	 * @return true if incoming packet need to be dropped
+	 */
+	protected final boolean dropPacket() {
+		final boolean result = _floodDetected || _queueOverflowDetected;
+		if (result) {
+			droppedPackets++;
+		}
+		return result;
+	}
+	
+	/**
+	 * Later during flood returns true (and send ActionFailed) once per second.
+	 * @param queueSize
+	 * @return true if flood detected first and ActionFailed packet need to be sent.
+	 */
+	protected final boolean countPacket(int queueSize) {
+		processedPackets++;
+		totalQueueSize += queueSize;
+		if (maxQueueSize < queueSize) {
+			maxQueueSize = queueSize;
+		}
+		if (_queueOverflowDetected && (queueSize < 2)) {
+			_queueOverflowDetected = false;
+		}
+		
+		return countPacket();
+	}
+	
+	/**
+	 * @return Counts unknown packets and return true if threshold is reached.
+	 */
+	protected final boolean countUnknownPacket() {
+		unknownPackets++;
+		
+		final long tick = System.currentTimeMillis();
+		if ((tick - _unknownPacketStartTick) > 60000) {
+			_unknownPacketStartTick = tick;
+			_unknownPacketsInMin = 1;
+			return false;
+		}
+		
+		_unknownPacketsInMin++;
+		return _unknownPacketsInMin > general().getClientPacketQueueMaxUnknownPerMin();
+	}
+	
+	/**
+	 * @param count - current number of processed packets in burst
+	 * @return burst length and return true if execution of the queue need to be aborted.
+	 */
+	protected final boolean countBurst(int count) {
+		if (count > maxBurstSize) {
+			maxBurstSize = count;
+		}
+		
+		final var maxBurstSize = Math.max(general().getClientPacketQueueMaxBurstSize(), mmo().getMaxReadPerPass() + 1);
+		if (count < maxBurstSize) {
+			return false;
+		}
+		
+		totalBursts++;
+		return true;
+	}
+	
+	/**
+	 * @return Counts queue overflows and return true if threshold is reached.
+	 */
+	protected final boolean countQueueOverflow() {
+		_queueOverflowDetected = true;
+		totalQueueOverflows++;
+		
+		final long tick = System.currentTimeMillis();
+		if ((tick - _overflowStartTick) > 60000) {
+			_overflowStartTick = tick;
+			_overflowsInMin = 1;
+			return false;
+		}
+		
+		_overflowsInMin++;
+		return _overflowsInMin > general().getClientPacketQueueMaxOverflowsPerMin();
+	}
+	
+	/**
+	 * @return Counts underflow exceptions and return true if threshold is reached.
+	 */
+	protected final boolean countUnderflowException() {
+		totalUnderflowExceptions++;
+		
+		final long tick = System.currentTimeMillis();
+		if ((tick - _underflowReadStartTick) > 60000) {
+			_underflowReadStartTick = tick;
+			_underflowReadsInMin = 1;
+			return false;
+		}
+		
+		_underflowReadsInMin++;
+		return _underflowReadsInMin > general().getClientPacketQueueMaxUnderflowsPerMin();
+	}
+	
+	/**
+	 * @return true if maximum number of floods per minute is reached.
+	 */
+	protected final boolean countFloods() {
+		return _floodsInMin > general().getClientPacketQueueMaxFloodsPerMin();
+	}
+	
+	private boolean longFloodDetected() {
+		return (_totalCount / BUFFER_SIZE) > general().getClientPacketQueueMaxAveragePacketsPerSecond();
+	}
+	
+	/**
+	 * Later during flood returns true (and send ActionFailed) once per second.
+	 * @return true if flood detected first and ActionFailed packet need to be sent.
+	 */
+	private synchronized boolean countPacket() {
+		_totalCount++;
+		final long tick = System.currentTimeMillis();
+		if ((tick - _packetCountStartTick) > 1000) {
+			_packetCountStartTick = tick;
+			
+			// clear flag if no more flooding during last seconds
+			if (_floodDetected && !longFloodDetected() && (_packetsInSecond[_head] < (general().getClientPacketQueueMaxPacketsPerSecond() / 2))) {
+				_floodDetected = false;
+			}
+			
+			// wrap head of the buffer around the tail
+			if (_head <= 0) {
+				_head = BUFFER_SIZE;
+			}
+			_head--;
+			
+			_totalCount -= _packetsInSecond[_head];
+			_packetsInSecond[_head] = 1;
+			return _floodDetected;
+		}
+		
+		final int count = ++_packetsInSecond[_head];
+		if (!_floodDetected) {
+			if (count > general().getClientPacketQueueMaxPacketsPerSecond()) {
+				shortFloods++;
+			} else if (longFloodDetected()) {
+				longFloods++;
+			} else {
+				return false;
+			}
+			
+			_floodDetected = true;
+			if ((tick - _floodStartTick) > 60000) {
+				_floodStartTick = tick;
+				_floodsInMin = 1;
+			} else {
+				_floodsInMin++;
+			}
+			
+			return true; // Return true only in the beginning of the flood
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/Debug.java b/src/main/java/com/l2jserver/gameserver/network/Debug.java
new file mode 100644
index 00000000..cc28f40c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/Debug.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import java.util.Map.Entry;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.TutorialShowHtml;
+
+/**
+ * @author UnAfraid
+ */
+public class Debug {
+	public static void sendSkillDebug(L2Character attacker, L2Character target, Skill skill, StatsSet set) {
+		if (!attacker.isPlayer()) {
+			return;
+		}
+		
+		final StringBuilder sb = new StringBuilder();
+		for (Entry<String, Object> entry : set.getSet().entrySet()) {
+			sb.append("<tr><td>").append(entry.getKey()).append("</td><td><font color=\"LEVEL\">").append(entry.getValue()).append("</font></td></tr>");
+		}
+		
+		final NpcHtmlMessage msg = new NpcHtmlMessage();
+		msg.setFile(attacker.getActingPlayer().getHtmlPrefix(), "data/html/admin/skilldebug.htm");
+		msg.replace("%patk%", target.getPAtk(target));
+		msg.replace("%matk%", target.getMAtk(target, skill));
+		msg.replace("%pdef%", target.getPDef(target));
+		msg.replace("%mdef%", target.getMDef(target, skill));
+		msg.replace("%acc%", target.getAccuracy());
+		msg.replace("%evas%", target.getEvasionRate(target));
+		msg.replace("%crit%", target.getCriticalHit(target, skill));
+		msg.replace("%speed%", target.getRunSpeed());
+		msg.replace("%pAtkSpd%", target.getPAtkSpd());
+		msg.replace("%mAtkSpd%", target.getMAtkSpd());
+		msg.replace("%str%", target.getSTR());
+		msg.replace("%dex%", target.getDEX());
+		msg.replace("%con%", target.getCON());
+		msg.replace("%int%", target.getINT());
+		msg.replace("%wit%", target.getWIT());
+		msg.replace("%men%", target.getMEN());
+		msg.replace("%atkElemType%", Elementals.getElementName(target.getAttackElement()));
+		msg.replace("%atkElemVal%", target.getAttackElementValue(target.getAttackElement()));
+		msg.replace("%fireDef%", target.getDefenseElementValue((byte) 0));
+		msg.replace("%waterDef%", target.getDefenseElementValue((byte) 1));
+		msg.replace("%windDef%", target.getDefenseElementValue((byte) 2));
+		msg.replace("%earthDef%", target.getDefenseElementValue((byte) 3));
+		msg.replace("%holyDef%", target.getDefenseElementValue((byte) 4));
+		msg.replace("%darkDef%", target.getDefenseElementValue((byte) 5));
+		msg.replace("%skill%", skill.toString());
+		msg.replace("%details%", sb.toString());
+		attacker.sendPacket(new TutorialShowHtml(msg.getHtml()));
+	}
+	
+	public static void sendItemDebug(L2PcInstance player, L2ItemInstance item, StatsSet set) {
+		final StringBuilder sb = new StringBuilder();
+		for (Entry<String, Object> entry : set.getSet().entrySet()) {
+			sb.append("<tr><td>").append(entry.getKey()).append("</td><td><font color=\"LEVEL\">").append(entry.getValue()).append("</font></td></tr>");
+		}
+		
+		final NpcHtmlMessage msg = new NpcHtmlMessage();
+		msg.setFile(player.getHtmlPrefix(), "data/html/admin/itemdebug.htm");
+		msg.replace("%itemName%", item.getName());
+		msg.replace("%itemSlot%", getBodyPart(item.getItem().getBodyPart()));
+		msg.replace("%itemType%", item.isArmor() ? "Armor" : item.isWeapon() ? "Weapon" : "Etc");
+		msg.replace("%enchantLevel%", item.getEnchantLevel());
+		msg.replace("%isMagicWeapon%", item.getItem().isMagicWeapon());
+		msg.replace("%item%", item.toString());
+		msg.replace("%details%", sb.toString());
+		player.sendPacket(new TutorialShowHtml(msg.getHtml()));
+	}
+	
+	private static String getBodyPart(int bodyPart) {
+		for (Entry<String, Integer> entry : ItemTable.SLOTS.entrySet()) {
+			if ((entry.getValue() & bodyPart) == bodyPart) {
+				return entry.getKey();
+			}
+		}
+		return "Unknown";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/GameCrypt.java b/src/main/java/com/l2jserver/gameserver/network/GameCrypt.java
new file mode 100644
index 00000000..03e923c9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/GameCrypt.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+/**
+ * @author KenM
+ */
+public class GameCrypt {
+	private final byte[] _inKey = new byte[16];
+	private final byte[] _outKey = new byte[16];
+	private boolean _isEnabled;
+	
+	public void setKey(byte[] key) {
+		System.arraycopy(key, 0, _inKey, 0, 16);
+		System.arraycopy(key, 0, _outKey, 0, 16);
+	}
+	
+	public void decrypt(byte[] raw, final int offset, final int size) {
+		if (!_isEnabled) {
+			return;
+		}
+		
+		int temp = 0;
+		for (int i = 0; i < size; i++) {
+			int temp2 = raw[offset + i] & 0xFF;
+			raw[offset + i] = (byte) (temp2 ^ _inKey[i & 15] ^ temp);
+			temp = temp2;
+		}
+		
+		int old = _inKey[8] & 0xff;
+		old |= (_inKey[9] << 8) & 0xff00;
+		old |= (_inKey[10] << 0x10) & 0xff0000;
+		old |= (_inKey[11] << 0x18) & 0xff000000;
+		
+		old += size;
+		
+		_inKey[8] = (byte) (old & 0xff);
+		_inKey[9] = (byte) ((old >> 0x08) & 0xff);
+		_inKey[10] = (byte) ((old >> 0x10) & 0xff);
+		_inKey[11] = (byte) ((old >> 0x18) & 0xff);
+	}
+	
+	public void encrypt(byte[] raw, final int offset, final int size) {
+		if (!_isEnabled) {
+			_isEnabled = true;
+			return;
+		}
+		
+		int temp = 0;
+		for (int i = 0; i < size; i++) {
+			int temp2 = raw[offset + i] & 0xFF;
+			temp = temp2 ^ _outKey[i & 15] ^ temp;
+			raw[offset + i] = (byte) temp;
+		}
+		
+		int old = _outKey[8] & 0xff;
+		old |= (_outKey[9] << 8) & 0xff00;
+		old |= (_outKey[10] << 0x10) & 0xff0000;
+		old |= (_outKey[11] << 0x18) & 0xff000000;
+		
+		old += size;
+		
+		_outKey[8] = (byte) (old & 0xff);
+		_outKey[9] = (byte) ((old >> 0x08) & 0xff);
+		_outKey[10] = (byte) ((old >> 0x10) & 0xff);
+		_outKey[11] = (byte) ((old >> 0x18) & 0xff);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/L2GameClient.java b/src/main/java/com/l2jserver/gameserver/network/L2GameClient.java
new file mode 100644
index 00000000..e9a3b664
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/L2GameClient.java
@@ -0,0 +1,940 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.mmo;
+import static com.l2jserver.gameserver.model.PcCondOverride.SEE_ALL_PLAYERS;
+import static java.util.concurrent.TimeUnit.DAYS;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.util.List;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.LoginServerThread.SessionKey;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.model.CharSelectInfoPackage;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.L2Event;
+import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.ServerClose;
+import com.l2jserver.gameserver.security.SecondaryPasswordAuth;
+import com.l2jserver.gameserver.util.FloodProtectors;
+import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.mmocore.MMOClient;
+import com.l2jserver.mmocore.MMOConnection;
+import com.l2jserver.mmocore.ReceivablePacket;
+
+/**
+ * Represents a client connected on Game Server.
+ * @author KenM
+ */
+public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> implements Runnable {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(L2GameClient.class);
+	
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	private static final Logger LOG_AUDIT = LoggerFactory.getLogger("audit");
+	
+	/**
+	 * @author KenM
+	 */
+	public enum GameClientState {
+		/** Client has just connected . */
+		CONNECTED,
+		/** Client has authed but doesn't has character attached to it yet. */
+		AUTHED,
+		/** Client has selected a character, but it hasn't joined the server yet. */
+		JOINING,
+		/** Client has selected a char and is in game. */
+		IN_GAME
+	}
+	
+	private GameClientState _state;
+	
+	// Info
+	private final InetAddress _addr;
+	private String _accountName;
+	private SessionKey _sessionId;
+	private L2PcInstance _activeChar;
+	private final ReentrantLock _activeCharLock = new ReentrantLock();
+	private SecondaryPasswordAuth _secondaryAuth;
+	
+	private boolean _isAuthedGG;
+	private final long _connectionStartTime;
+	private List<CharSelectInfoPackage> _charSlotMapping = null;
+	private int _charSlot = -1;
+	
+	// flood protectors
+	private final FloodProtectors _floodProtectors = new FloodProtectors(this);
+	
+	// Task
+	protected final ScheduledFuture<?> _autoSaveInDB;
+	protected ScheduledFuture<?> _cleanupTask = null;
+	
+	private L2GameServerPacket _additionalClosePacket;
+	
+	// Crypt
+	private final GameCrypt _crypt;
+	
+	private final ClientStats _stats;
+	
+	private boolean _isDetached = false;
+	
+	private boolean _protocol;
+	
+	private final ArrayBlockingQueue<ReceivablePacket<L2GameClient>> _packetQueue;
+	
+	private final ReentrantLock _queueLock = new ReentrantLock();
+	
+	private int[][] trace;
+	
+	public L2GameClient(MMOConnection<L2GameClient> con) {
+		super(con);
+		_state = GameClientState.CONNECTED;
+		_connectionStartTime = System.currentTimeMillis();
+		_crypt = new GameCrypt();
+		_stats = new ClientStats();
+		
+		final var capacity = Math.max(general().getClientPacketQueueSize(), mmo().getMaxReadPerPass() + 2);
+		_packetQueue = new ArrayBlockingQueue<>(capacity);
+		
+		if (general().getCharacterDataStoreInterval() > 0) {
+			_autoSaveInDB = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new AutoSaveTask(), 300000L, general().getCharacterDataStoreInterval());
+		} else {
+			_autoSaveInDB = null;
+		}
+		
+		try {
+			_addr = con != null ? con.getInetAddress() : InetAddress.getLocalHost();
+		} catch (UnknownHostException e) {
+			throw new Error("Unable to determine localhost address.");
+		}
+	}
+	
+	public byte[] enableCrypt() {
+		byte[] key = BlowFishKeygen.getRandomKey();
+		_crypt.setKey(key);
+		return key;
+	}
+	
+	public GameClientState getState() {
+		return _state;
+	}
+	
+	public void setState(GameClientState pState) {
+		if (_state != pState) {
+			_state = pState;
+			_packetQueue.clear();
+		}
+	}
+	
+	public ClientStats getStats() {
+		return _stats;
+	}
+	
+	/**
+	 * For loaded offline traders returns localhost address.
+	 * @return cached connection IP address, for checking detached clients.
+	 */
+	public InetAddress getConnectionAddress() {
+		return _addr;
+	}
+	
+	public long getConnectionStartTime() {
+		return _connectionStartTime;
+	}
+	
+	@Override
+	public boolean decrypt(ByteBuffer buf, int size) {
+		_crypt.decrypt(buf.array(), buf.position(), size);
+		return true;
+	}
+	
+	@Override
+	public boolean encrypt(final ByteBuffer buf, final int size) {
+		_crypt.encrypt(buf.array(), buf.position(), size);
+		buf.position(buf.position() + size);
+		return true;
+	}
+	
+	public L2PcInstance getActiveChar() {
+		return _activeChar;
+	}
+	
+	public void setActiveChar(L2PcInstance pActiveChar) {
+		_activeChar = pActiveChar;
+	}
+	
+	public ReentrantLock getActiveCharLock() {
+		return _activeCharLock;
+	}
+	
+	public FloodProtectors getFloodProtectors() {
+		return _floodProtectors;
+	}
+	
+	public void setGameGuardOk(boolean val) {
+		_isAuthedGG = val;
+	}
+	
+	public boolean isAuthedGG() {
+		return _isAuthedGG;
+	}
+	
+	public void setAccountName(String pAccountName) {
+		_accountName = pAccountName;
+		
+		if (SecondaryAuthData.getInstance().isEnabled()) {
+			_secondaryAuth = new SecondaryPasswordAuth(this);
+		}
+	}
+	
+	public String getAccountName() {
+		return _accountName;
+	}
+	
+	public void setSessionId(SessionKey sk) {
+		_sessionId = sk;
+	}
+	
+	public SessionKey getSessionId() {
+		return _sessionId;
+	}
+	
+	public void sendPacket(L2GameServerPacket gsp) {
+		if (_isDetached || (gsp == null)) {
+			return;
+		}
+		
+		// Packets from invisible chars sends only to GMs
+		if (gsp.isInvisible() && (getActiveChar() != null) && !getActiveChar().canOverrideCond(SEE_ALL_PLAYERS)) {
+			return;
+		}
+		
+		getConnection().sendPacket(gsp);
+		gsp.runImpl();
+	}
+	
+	public boolean isDetached() {
+		return _isDetached;
+	}
+	
+	public void setDetached(boolean b) {
+		_isDetached = b;
+	}
+	
+	/**
+	 * Method to handle character deletion
+	 * @param charslot
+	 * @return a byte:
+	 *         <li>-1: Error: No char was found for such charslot, caught exception, etc...
+	 *         <li>0: character is not member of any clan, proceed with deletion
+	 *         <li>1: character is member of a clan, but not clan leader
+	 *         <li>2: character is clan leader
+	 */
+	public byte markToDeleteChar(int charslot) {
+		int objid = getObjectIdForSlot(charslot);
+		
+		if (objid < 0) {
+			return -1;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("SELECT clanId FROM characters WHERE charId=?")) {
+			ps.setInt(1, objid);
+			byte answer = 0;
+			try (var rs = ps.executeQuery()) {
+				int clanId = rs.next() ? rs.getInt(1) : 0;
+				if (clanId != 0) {
+					L2Clan clan = ClanTable.getInstance().getClan(clanId);
+					
+					if (clan == null) {
+						answer = 0; // jeezes!
+					} else if (clan.getLeaderId() == objid) {
+						answer = 2;
+					} else {
+						answer = 1;
+					}
+				}
+				
+				// Setting delete time
+				if (answer == 0) {
+					if (character().getDeleteCharAfterDays() == 0) {
+						deleteCharByObjId(objid);
+					} else {
+						try (var ps2 = con.prepareStatement("UPDATE characters SET deletetime=? WHERE charId=?")) {
+							ps2.setLong(1, System.currentTimeMillis() + DAYS.toMillis(character().getDeleteCharAfterDays()));
+							ps2.setInt(2, objid);
+							ps2.execute();
+						}
+					}
+					LOG_ACCOUNTING.info("Deleted character Id {} and client {}.", objid, this);
+				}
+			}
+			return answer;
+		} catch (Exception ex) {
+			LOG.error("There has been an error updating delete time of character!", ex);
+			return -1;
+		}
+	}
+	
+	/**
+	 * Save the L2PcInstance to the database.
+	 */
+	public void saveCharToDisk() {
+		try {
+			if (getActiveChar() != null) {
+				getActiveChar().storeMe();
+				getActiveChar().getRecSystem().store();
+				if (general().updateItemsOnCharStore()) {
+					getActiveChar().getInventory().updateDatabase();
+					getActiveChar().getWarehouse().updateDatabase();
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("There has been an error saving character!", ex);
+		}
+	}
+	
+	public void markRestoredChar(int charslot) {
+		final int objid = getObjectIdForSlot(charslot);
+		if (objid < 0) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE characters SET deletetime=0 WHERE charId=?")) {
+			ps.setInt(1, objid);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("There has been an error restoring character!", ex);
+		}
+		
+		LOG_ACCOUNTING.info("Restoring Character Id {}, client {}.", objid, this);
+	}
+	
+	public static void deleteCharByObjId(int objid) {
+		if (objid < 0) {
+			return;
+		}
+		
+		CharNameTable.getInstance().removeName(objid);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			try (var ps = con.prepareStatement("DELETE FROM character_contacts WHERE charId=? OR contactId=?")) {
+				ps.setInt(1, objid);
+				ps.setInt(2, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_friends WHERE charId=? OR friendId=?")) {
+				ps.setInt(1, objid);
+				ps.setInt(2, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_hennas WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_macroses WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_quests WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_quest_global_data WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.executeUpdate();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_recipebook WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_shortcuts WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_skills WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_skills_save WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_subclasses WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM heroes WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM olympiad_nobles WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM seven_signs WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM pets WHERE item_obj_id IN (SELECT object_id FROM items WHERE items.owner_id=?)")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM item_attributes WHERE itemId IN (SELECT object_id FROM items WHERE items.owner_id=?)")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM items WHERE owner_id=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM merchant_lease WHERE player_id=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_raid_points WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_reco_bonus WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_instance_time WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM character_variables WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			try (var ps = con.prepareStatement("DELETE FROM characters WHERE charId=?")) {
+				ps.setInt(1, objid);
+				ps.execute();
+			}
+			
+			if (customs().allowWedding()) {
+				try (var ps = con.prepareStatement("DELETE FROM mods_wedding WHERE player1Id = ? OR player2Id = ?")) {
+					ps.setInt(1, objid);
+					ps.setInt(2, objid);
+					ps.execute();
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error deleting character Id {}!", objid, ex);
+		}
+	}
+	
+	public L2PcInstance loadCharFromDisk(int charslot) {
+		final int objId = getObjectIdForSlot(charslot);
+		if (objId < 0) {
+			return null;
+		}
+		
+		L2PcInstance character = L2World.getInstance().getPlayer(objId);
+		if (character != null) {
+			// exploit prevention, should not happens in normal way
+			LOG.error("Attempt of double login {}, account {}!", character, getAccountName());
+			if (character.getClient() != null) {
+				character.getClient().closeNow();
+			} else {
+				character.deleteMe();
+			}
+			return null;
+		}
+		
+		character = L2PcInstance.load(objId);
+		if (character != null) {
+			character.setRunning();
+			character.standUp();
+			character.refreshOverloaded();
+			character.refreshExpertisePenalty();
+			character.setOnlineStatus(true, false);
+		} else {
+			LOG.error("Could not restore in slot {}!", charslot);
+		}
+		return character;
+	}
+	
+	public void setCharSelection(List<CharSelectInfoPackage> list) {
+		_charSlotMapping = list;
+	}
+	
+	public void setCharSelectionSlot(int charSlot) {
+		_charSlot = charSlot;
+	}
+	
+	public CharSelectInfoPackage getCharSelection() {
+		return getCharSelection(_charSlot);
+	}
+	
+	public CharSelectInfoPackage getCharSelection(int charslot) {
+		if ((_charSlotMapping == null) || (charslot < 0) || (charslot >= _charSlotMapping.size())) {
+			return null;
+		}
+		return _charSlotMapping.get(charslot);
+	}
+	
+	public SecondaryPasswordAuth getSecondaryAuth() {
+		return _secondaryAuth;
+	}
+	
+	public void close(L2GameServerPacket gsp) {
+		if (getConnection() == null) {
+			return; // offline shop
+		}
+		if (_additionalClosePacket != null) {
+			getConnection().close(new L2GameServerPacket[] {
+				_additionalClosePacket,
+				gsp
+			});
+		} else {
+			getConnection().close(gsp);
+		}
+	}
+	
+	public void close(L2GameServerPacket[] gspArray) {
+		if (getConnection() == null) {
+			return; // offline shop
+		}
+		getConnection().close(gspArray);
+	}
+	
+	private int getObjectIdForSlot(int charSlot) {
+		final CharSelectInfoPackage info = getCharSelection(charSlot);
+		if (info == null) {
+			LOG.warn("{} tried to delete character in slot {} but no characters exits at that slot!", this, charSlot);
+			return -1;
+		}
+		return info.getObjectId();
+	}
+	
+	@Override
+	protected void onForcedDisconnection() {
+		LOG_ACCOUNTING.warn("Client {} disconnected abnormally!", this);
+	}
+	
+	@Override
+	protected void onDisconnection() {
+		// no long running tasks here, do it async
+		try {
+			ThreadPoolManager.getInstance().executeGeneral(new DisconnectTask(this));
+		} catch (RejectedExecutionException e) {
+			// server is closing
+		}
+	}
+	
+	/**
+	 * Close client connection with {@link ServerClose} packet
+	 */
+	public void closeNow() {
+		_isDetached = true; // prevents more packets execution
+		close(ServerClose.STATIC_PACKET);
+		synchronized (this) {
+			if (_cleanupTask != null) {
+				cancelCleanup();
+			}
+			_cleanupTask = ThreadPoolManager.getInstance().scheduleGeneral(new CleanupTask(), 0); // instant
+		}
+	}
+	
+	/**
+	 * Produces the best possible string representation of this client.
+	 */
+	@Override
+	public String toString() {
+		try {
+			final InetAddress address = getConnection().getInetAddress();
+			return switch (getState()) {
+				case CONNECTED -> "[IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]";
+				case AUTHED -> "[Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]";
+				case JOINING, IN_GAME -> "[Character: " + (getActiveChar() == null ? "disconnected" : getActiveChar().getName() + "[" + getActiveChar().getObjectId() + "]") + " - Account: " + getAccountName() + " - IP: " + (address == null ? "disconnected" : address.getHostAddress()) + "]";
+			};
+		} catch (NullPointerException e) {
+			return "[Character read failed due to disconnect]";
+		}
+	}
+	
+	protected class DisconnectTask implements Runnable {
+		
+		private final L2GameClient client;
+		
+		public DisconnectTask(L2GameClient client) {
+			this.client = client;
+		}
+		
+		@Override
+		public void run() {
+			boolean fast = true;
+			try {
+				final L2PcInstance player = client.getActiveChar();
+				if ((player != null) && !isDetached()) {
+					setDetached(true);
+					if (offlineMode(player)) {
+						player.leaveParty();
+						OlympiadManager.getInstance().unRegisterNoble(player);
+						
+						// If the L2PcInstance has Pet, unsummon it
+						if (player.hasSummon()) {
+							player.getSummon().setRestoreSummon(true);
+							
+							player.getSummon().unSummon(player);
+							// Dead pet wasn't unsummoned, broadcast npcinfo changes (pet will be without owner name - means owner offline)
+							if (player.getSummon() != null) {
+								player.getSummon().broadcastNpcInfo(0);
+							}
+						}
+						
+						if (customs().offlineSetNameColor()) {
+							player.getAppearance().setNameColor(customs().getOfflineNameColor());
+							player.broadcastUserInfo();
+						}
+						
+						if (player.getOfflineStartTime() == 0) {
+							player.setOfflineStartTime(System.currentTimeMillis());
+						}
+						LOG_ACCOUNTING.info("Client {} entering offline mode.", client);
+						return;
+					}
+					fast = !player.isInCombat() && !player.isLocked();
+				}
+				cleanMe(fast);
+			} catch (Exception ex) {
+				LOG.warn("There has been an error while disconnecting client {}!", client, ex);
+			}
+		}
+	}
+	
+	/**
+	 * @param player the player to be check.
+	 * @return {@code true} if the player is allowed to remain as off-line shop.
+	 */
+	protected boolean offlineMode(L2PcInstance player) {
+		if (player.isInOlympiadMode() || player.isFestivalParticipant() || player.isBlockedFromExit() || player.isJailed() || (player.getVehicle() != null)) {
+			return false;
+		}
+		
+		boolean canSetShop = switch (player.getPrivateStoreType()) {
+			case SELL, PACKAGE_SELL, BUY -> customs().offlineTradeEnable();
+			case MANUFACTURE -> customs().offlineTradeEnable();
+			default -> customs().offlineCraftEnable() && player.isInCraftMode();
+		};
+		
+		if (customs().offlineModeInPeaceZone() && !player.isInsideZone(ZoneId.PEACE)) {
+			canSetShop = false;
+		}
+		return canSetShop;
+	}
+	
+	public void cleanMe(boolean fast) {
+		try {
+			synchronized (this) {
+				if (_cleanupTask == null) {
+					_cleanupTask = ThreadPoolManager.getInstance().scheduleGeneral(new CleanupTask(), fast ? 5 : 15000L);
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error during cleanup!", ex);
+		}
+	}
+	
+	protected class CleanupTask implements Runnable {
+		@Override
+		public void run() {
+			try {
+				// we are going to manually save the char bellow thus we can force the cancel
+				if (_autoSaveInDB != null) {
+					_autoSaveInDB.cancel(true);
+					// ThreadPoolManager.getInstance().removeGeneral((Runnable) _autoSaveInDB);
+				}
+				
+				// this should only happen on connection loss
+				if (getActiveChar() != null) {
+					if (getActiveChar().isLocked()) {
+						LOG.warn("Player {} still performing subclass actions during disconnect!", getActiveChar());
+					}
+					
+					// we store all data from players who are disconnected while in an event in order to restore it in the next login
+					if (L2Event.isParticipant(getActiveChar())) {
+						L2Event.savePlayerEventStatus(getActiveChar());
+					}
+					
+					// prevent closing again
+					getActiveChar().setClient(null);
+					
+					if (getActiveChar().isOnline()) {
+						getActiveChar().deleteMe();
+						AntiFeedManager.getInstance().onDisconnect(L2GameClient.this);
+					}
+				}
+				setActiveChar(null);
+			} catch (Exception ex) {
+				LOG.warn("There has been  an error while cleanup client!", ex);
+			} finally {
+				LoginServerThread.getInstance().sendLogout(getAccountName());
+			}
+		}
+	}
+	
+	protected class AutoSaveTask implements Runnable {
+		@Override
+		public void run() {
+			try {
+				final var player = getActiveChar();
+				// Safety precaution.
+				if ((player != null) && player.isOnline()) {
+					saveCharToDisk();
+					if (player.hasSummon()) {
+						player.getSummon().storeMe();
+					}
+				}
+			} catch (Exception ex) {
+				LOG.error("There has been an error on AutoSaveTask!", ex);
+			}
+		}
+	}
+	
+	public boolean isProtocolOk() {
+		return _protocol;
+	}
+	
+	public void setProtocolOk(boolean b) {
+		_protocol = b;
+	}
+	
+	public boolean handleCheat(String punishment) {
+		if (_activeChar != null) {
+			Util.handleIllegalPlayerAction(_activeChar, toString() + ": " + punishment);
+			return true;
+		}
+		
+		LOG_AUDIT.warn("Client {} kicked for {}!", this, punishment);
+		closeNow();
+		return false;
+	}
+	
+	/**
+	 * True if detached, or flood detected, or queue overflow detected and queue still not empty.
+	 * @return false if client can receive packets.
+	 */
+	public boolean dropPacket() {
+		if (_isDetached) {
+			return true;
+		}
+		
+		// Flood protection.
+		if (getStats().countPacket(_packetQueue.size())) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return true;
+		}
+		
+		return getStats().dropPacket();
+	}
+	
+	/**
+	 * Counts buffer underflow exceptions.
+	 */
+	public void onBufferUnderflow() {
+		if (getStats().countUnderflowException()) {
+			LOG.error("Client {} disconnected, too many buffer underflow exceptions!", this);
+			closeNow();
+			return;
+		}
+		
+		// In CONNECTED state kick client immediately.
+		if (_state == GameClientState.CONNECTED) {
+			if (general().packetHandlerDebug()) {
+				LOG.error("Client {} disconnected, too many buffer underflow in non-authed state!", this);
+			}
+			closeNow();
+		}
+	}
+	
+	/**
+	 * Counts unknown packets
+	 */
+	public void onUnknownPacket() {
+		if (getStats().countUnknownPacket()) {
+			LOG.error("Client {} disconnected, too many unknown packets!", this);
+			closeNow();
+			return;
+		}
+		
+		// In CONNECTED state kick client immediately.
+		if (_state == GameClientState.CONNECTED) {
+			if (general().packetHandlerDebug()) {
+				LOG.error("Client {} disconnected, too many unknown packets in non-authed state!", this);
+			}
+			closeNow();
+		}
+	}
+	
+	/**
+	 * Add packet to the queue and start worker thread if needed
+	 * @param packet
+	 */
+	public void execute(ReceivablePacket<L2GameClient> packet) {
+		if (getStats().countFloods()) {
+			LOG.error("Client {} disconnected, too many floods {} long and {} short!", this, getStats().longFloods, getStats().shortFloods);
+			closeNow();
+			return;
+		}
+		
+		if (!_packetQueue.offer(packet)) {
+			if (getStats().countQueueOverflow()) {
+				LOG.error("Client {} disconnected, too many queue overflows!", this);
+				closeNow();
+			} else {
+				sendPacket(ActionFailed.STATIC_PACKET);
+			}
+			return;
+		}
+		
+		if (_queueLock.isLocked()) {
+			return;
+		}
+		
+		try {
+			if (_state == GameClientState.CONNECTED) {
+				if (getStats().processedPackets > 3) {
+					if (general().packetHandlerDebug()) {
+						LOG.error("Client {} disconnected, too many packets in non-authed state!", this);
+					}
+					closeNow();
+					return;
+				}
+				ThreadPoolManager.getInstance().executeIOPacket(this);
+			} else {
+				ThreadPoolManager.getInstance().executePacket(this);
+			}
+		} catch (RejectedExecutionException ex) {
+			// If the server is shutdown we ignore.
+			if (!ThreadPoolManager.getInstance().isShutdown()) {
+				LOG.error("Failed executing {}, for client {}!", packet.getClass().getSimpleName(), toString(), ex);
+			}
+		}
+	}
+	
+	@Override
+	public void run() {
+		if (!_queueLock.tryLock()) {
+			return;
+		}
+		
+		try {
+			int count = 0;
+			ReceivablePacket<L2GameClient> packet;
+			while (true) {
+				packet = _packetQueue.poll();
+				if (packet == null) {
+					return;
+				}
+				
+				// Clear queue immediately after detach.
+				if (_isDetached) {
+					_packetQueue.clear();
+					return;
+				}
+				
+				try {
+					packet.run();
+				} catch (Exception ex) {
+					LOG.error("Exception during execution {}, client {}!", packet.getClass().getSimpleName(), this, ex);
+				}
+				
+				count++;
+				if (getStats().countBurst(count)) {
+					return;
+				}
+			}
+		} finally {
+			_queueLock.unlock();
+		}
+	}
+	
+	public void setClientTracert(int[][] tracert) {
+		trace = tracert;
+	}
+	
+	public int[][] getTrace() {
+		return trace;
+	}
+	
+	private boolean cancelCleanup() {
+		final Future<?> task = _cleanupTask;
+		if (task != null) {
+			_cleanupTask = null;
+			return task.cancel(true);
+		}
+		return false;
+	}
+	
+	public void setAdditionalClosePacket(L2GameServerPacket additionalClosePacket) {
+		_additionalClosePacket = additionalClosePacket;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java b/src/main/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
new file mode 100644
index 00000000..f53327b5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java
@@ -0,0 +1,1433 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.nio.ByteBuffer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Util;
+import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
+import com.l2jserver.gameserver.network.clientpackets.Action;
+import com.l2jserver.gameserver.network.clientpackets.AddTradeItem;
+import com.l2jserver.gameserver.network.clientpackets.AllyDismiss;
+import com.l2jserver.gameserver.network.clientpackets.AllyLeave;
+import com.l2jserver.gameserver.network.clientpackets.AnswerCoupleAction;
+import com.l2jserver.gameserver.network.clientpackets.AnswerJoinPartyRoom;
+import com.l2jserver.gameserver.network.clientpackets.AnswerPartyLootModification;
+import com.l2jserver.gameserver.network.clientpackets.AnswerTradeRequest;
+import com.l2jserver.gameserver.network.clientpackets.Appearing;
+import com.l2jserver.gameserver.network.clientpackets.Attack;
+import com.l2jserver.gameserver.network.clientpackets.AttackRequest;
+import com.l2jserver.gameserver.network.clientpackets.AuthLogin;
+import com.l2jserver.gameserver.network.clientpackets.BrEventRankerList;
+import com.l2jserver.gameserver.network.clientpackets.BypassUserCmd;
+import com.l2jserver.gameserver.network.clientpackets.CannotMoveAnymore;
+import com.l2jserver.gameserver.network.clientpackets.CannotMoveAnymoreInVehicle;
+import com.l2jserver.gameserver.network.clientpackets.CharacterCreate;
+import com.l2jserver.gameserver.network.clientpackets.CharacterDelete;
+import com.l2jserver.gameserver.network.clientpackets.CharacterRestore;
+import com.l2jserver.gameserver.network.clientpackets.CharacterSelect;
+import com.l2jserver.gameserver.network.clientpackets.DlgAnswer;
+import com.l2jserver.gameserver.network.clientpackets.EndScenePlayer;
+import com.l2jserver.gameserver.network.clientpackets.EnterWorld;
+import com.l2jserver.gameserver.network.clientpackets.ExGetOnAirShip;
+import com.l2jserver.gameserver.network.clientpackets.FinishRotating;
+import com.l2jserver.gameserver.network.clientpackets.GameGuardReply;
+import com.l2jserver.gameserver.network.clientpackets.Logout;
+import com.l2jserver.gameserver.network.clientpackets.MoveBackwardToLocation;
+import com.l2jserver.gameserver.network.clientpackets.MoveToLocationAirShip;
+import com.l2jserver.gameserver.network.clientpackets.MoveToLocationInAirShip;
+import com.l2jserver.gameserver.network.clientpackets.MoveWithDelta;
+import com.l2jserver.gameserver.network.clientpackets.MultiSellChoose;
+import com.l2jserver.gameserver.network.clientpackets.NewCharacter;
+import com.l2jserver.gameserver.network.clientpackets.ObserverReturn;
+import com.l2jserver.gameserver.network.clientpackets.ProtocolVersion;
+import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkill;
+import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkillInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestActionUse;
+import com.l2jserver.gameserver.network.clientpackets.RequestAllAgitInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestAllCastleInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestAllFortressInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestAllyCrest;
+import com.l2jserver.gameserver.network.clientpackets.RequestAllyInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestAnswerFriendInvite;
+import com.l2jserver.gameserver.network.clientpackets.RequestAnswerJoinAlly;
+import com.l2jserver.gameserver.network.clientpackets.RequestAnswerJoinParty;
+import com.l2jserver.gameserver.network.clientpackets.RequestAnswerJoinPledge;
+import com.l2jserver.gameserver.network.clientpackets.RequestAskJoinPartyRoom;
+import com.l2jserver.gameserver.network.clientpackets.RequestAutoSoulShot;
+import com.l2jserver.gameserver.network.clientpackets.RequestBBSwrite;
+import com.l2jserver.gameserver.network.clientpackets.RequestBidItemAuction;
+import com.l2jserver.gameserver.network.clientpackets.RequestBlock;
+import com.l2jserver.gameserver.network.clientpackets.RequestBookMarkSlotInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestBuyItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestBuySeed;
+import com.l2jserver.gameserver.network.clientpackets.RequestBuySellUIClose;
+import com.l2jserver.gameserver.network.clientpackets.RequestBypassToServer;
+import com.l2jserver.gameserver.network.clientpackets.RequestCancelPostAttachment;
+import com.l2jserver.gameserver.network.clientpackets.RequestChangeNicknameColor;
+import com.l2jserver.gameserver.network.clientpackets.RequestChangePartyLeader;
+import com.l2jserver.gameserver.network.clientpackets.RequestChangePetName;
+import com.l2jserver.gameserver.network.clientpackets.RequestConfirmCancelItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestConfirmGemStone;
+import com.l2jserver.gameserver.network.clientpackets.RequestConfirmRefinerItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestConfirmSiegeWaitingList;
+import com.l2jserver.gameserver.network.clientpackets.RequestConfirmTargetItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestCrystallizeItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestCursedWeaponList;
+import com.l2jserver.gameserver.network.clientpackets.RequestCursedWeaponLocation;
+import com.l2jserver.gameserver.network.clientpackets.RequestDeleteBookMarkSlot;
+import com.l2jserver.gameserver.network.clientpackets.RequestDeleteMacro;
+import com.l2jserver.gameserver.network.clientpackets.RequestDeleteReceivedPost;
+import com.l2jserver.gameserver.network.clientpackets.RequestDeleteSentPost;
+import com.l2jserver.gameserver.network.clientpackets.RequestDestroyItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestDismissAlly;
+import com.l2jserver.gameserver.network.clientpackets.RequestDismissPartyRoom;
+import com.l2jserver.gameserver.network.clientpackets.RequestDispel;
+import com.l2jserver.gameserver.network.clientpackets.RequestDominionInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestDropItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestDuelAnswerStart;
+import com.l2jserver.gameserver.network.clientpackets.RequestDuelStart;
+import com.l2jserver.gameserver.network.clientpackets.RequestDuelSurrender;
+import com.l2jserver.gameserver.network.clientpackets.RequestEnchantItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestEx2ndPasswordCheck;
+import com.l2jserver.gameserver.network.clientpackets.RequestEx2ndPasswordReq;
+import com.l2jserver.gameserver.network.clientpackets.RequestEx2ndPasswordVerify;
+import com.l2jserver.gameserver.network.clientpackets.RequestExAcceptJoinMPCC;
+import com.l2jserver.gameserver.network.clientpackets.RequestExAddContactToContactList;
+import com.l2jserver.gameserver.network.clientpackets.RequestExAskJoinMPCC;
+import com.l2jserver.gameserver.network.clientpackets.RequestExCancelEnchantItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestExChangeName;
+import com.l2jserver.gameserver.network.clientpackets.RequestExCleftEnter;
+import com.l2jserver.gameserver.network.clientpackets.RequestExCubeGameChangeTeam;
+import com.l2jserver.gameserver.network.clientpackets.RequestExCubeGameReadyAnswer;
+import com.l2jserver.gameserver.network.clientpackets.RequestExDeleteContactFromContactList;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantItemAttribute;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantSkill;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantSkillInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantSkillInfoDetail;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantSkillRouteChange;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantSkillSafe;
+import com.l2jserver.gameserver.network.clientpackets.RequestExEnchantSkillUntrain;
+import com.l2jserver.gameserver.network.clientpackets.RequestExFishRanking;
+import com.l2jserver.gameserver.network.clientpackets.RequestExFriendListExtended;
+import com.l2jserver.gameserver.network.clientpackets.RequestExMPCCShowPartyMembersInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestExMagicSkillUseGround;
+import com.l2jserver.gameserver.network.clientpackets.RequestExOlympiadMatchListRefresh;
+import com.l2jserver.gameserver.network.clientpackets.RequestExOustFromMPCC;
+import com.l2jserver.gameserver.network.clientpackets.RequestExPledgeCrestLarge;
+import com.l2jserver.gameserver.network.clientpackets.RequestExRemoveItemAttribute;
+import com.l2jserver.gameserver.network.clientpackets.RequestExRqItemLink;
+import com.l2jserver.gameserver.network.clientpackets.RequestExSetPledgeCrestLarge;
+import com.l2jserver.gameserver.network.clientpackets.RequestExShowContactList;
+import com.l2jserver.gameserver.network.clientpackets.RequestExTryToPutEnchantSupportItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestExTryToPutEnchantTargetItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestExitPartyMatchingWaitingRoom;
+import com.l2jserver.gameserver.network.clientpackets.RequestFortressMapInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestFortressSiegeInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestFriendDel;
+import com.l2jserver.gameserver.network.clientpackets.RequestFriendInvite;
+import com.l2jserver.gameserver.network.clientpackets.RequestFriendList;
+import com.l2jserver.gameserver.network.clientpackets.RequestGMCommand;
+import com.l2jserver.gameserver.network.clientpackets.RequestGetBossRecord;
+import com.l2jserver.gameserver.network.clientpackets.RequestGetItemFromPet;
+import com.l2jserver.gameserver.network.clientpackets.RequestGetOffVehicle;
+import com.l2jserver.gameserver.network.clientpackets.RequestGetOnVehicle;
+import com.l2jserver.gameserver.network.clientpackets.RequestGiveItemToPet;
+import com.l2jserver.gameserver.network.clientpackets.RequestGiveNickName;
+import com.l2jserver.gameserver.network.clientpackets.RequestGmList;
+import com.l2jserver.gameserver.network.clientpackets.RequestGotoLobby;
+import com.l2jserver.gameserver.network.clientpackets.RequestHennaEquip;
+import com.l2jserver.gameserver.network.clientpackets.RequestHennaItemInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestHennaItemList;
+import com.l2jserver.gameserver.network.clientpackets.RequestHennaItemRemoveInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestHennaRemove;
+import com.l2jserver.gameserver.network.clientpackets.RequestHennaRemoveList;
+import com.l2jserver.gameserver.network.clientpackets.RequestInfoItemAuction;
+import com.l2jserver.gameserver.network.clientpackets.RequestItemList;
+import com.l2jserver.gameserver.network.clientpackets.RequestJoinAlly;
+import com.l2jserver.gameserver.network.clientpackets.RequestJoinDominionWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestJoinParty;
+import com.l2jserver.gameserver.network.clientpackets.RequestJoinPledge;
+import com.l2jserver.gameserver.network.clientpackets.RequestJoinSiege;
+import com.l2jserver.gameserver.network.clientpackets.RequestKeyMapping;
+import com.l2jserver.gameserver.network.clientpackets.RequestLinkHtml;
+import com.l2jserver.gameserver.network.clientpackets.RequestListPartyMatchingWaitingRoom;
+import com.l2jserver.gameserver.network.clientpackets.RequestMagicSkillUse;
+import com.l2jserver.gameserver.network.clientpackets.RequestMakeMacro;
+import com.l2jserver.gameserver.network.clientpackets.RequestManorList;
+import com.l2jserver.gameserver.network.clientpackets.RequestModifyBookMarkSlot;
+import com.l2jserver.gameserver.network.clientpackets.RequestMoveToLocationInVehicle;
+import com.l2jserver.gameserver.network.clientpackets.RequestOlympiadMatchList;
+import com.l2jserver.gameserver.network.clientpackets.RequestOlympiadObserverEnd;
+import com.l2jserver.gameserver.network.clientpackets.RequestOustFromPartyRoom;
+import com.l2jserver.gameserver.network.clientpackets.RequestOustPartyMember;
+import com.l2jserver.gameserver.network.clientpackets.RequestOustPledgeMember;
+import com.l2jserver.gameserver.network.clientpackets.RequestPCCafeCouponUse;
+import com.l2jserver.gameserver.network.clientpackets.RequestPackageSend;
+import com.l2jserver.gameserver.network.clientpackets.RequestPackageSendableItemList;
+import com.l2jserver.gameserver.network.clientpackets.RequestPartyLootModification;
+import com.l2jserver.gameserver.network.clientpackets.RequestPartyMatchConfig;
+import com.l2jserver.gameserver.network.clientpackets.RequestPartyMatchDetail;
+import com.l2jserver.gameserver.network.clientpackets.RequestPartyMatchList;
+import com.l2jserver.gameserver.network.clientpackets.RequestPetGetItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestPetUseItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestPetition;
+import com.l2jserver.gameserver.network.clientpackets.RequestPetitionCancel;
+import com.l2jserver.gameserver.network.clientpackets.RequestPetitionFeedback;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeCrest;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeExtendedInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeMemberInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeMemberList;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeMemberPowerInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgePower;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgePowerGradeList;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeReorganizeMember;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeSetAcademyMaster;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeSetMemberPowerGrade;
+import com.l2jserver.gameserver.network.clientpackets.RequestPledgeWarList;
+import com.l2jserver.gameserver.network.clientpackets.RequestPostAttachment;
+import com.l2jserver.gameserver.network.clientpackets.RequestPostItemList;
+import com.l2jserver.gameserver.network.clientpackets.RequestPreviewItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestPrivateStoreBuy;
+import com.l2jserver.gameserver.network.clientpackets.RequestPrivateStoreManageBuy;
+import com.l2jserver.gameserver.network.clientpackets.RequestPrivateStoreManageSell;
+import com.l2jserver.gameserver.network.clientpackets.RequestPrivateStoreQuitBuy;
+import com.l2jserver.gameserver.network.clientpackets.RequestPrivateStoreQuitSell;
+import com.l2jserver.gameserver.network.clientpackets.RequestPrivateStoreSell;
+import com.l2jserver.gameserver.network.clientpackets.RequestProcureCropList;
+import com.l2jserver.gameserver.network.clientpackets.RequestQuestAbort;
+import com.l2jserver.gameserver.network.clientpackets.RequestQuestList;
+import com.l2jserver.gameserver.network.clientpackets.RequestReceivedPost;
+import com.l2jserver.gameserver.network.clientpackets.RequestReceivedPostList;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeBookDestroy;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeBookOpen;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeItemMakeInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeItemMakeSelf;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeShopListSet;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeShopMakeInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeShopMakeItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeShopManagePrev;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeShopManageQuit;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecipeShopMessageSet;
+import com.l2jserver.gameserver.network.clientpackets.RequestRecordInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestRefine;
+import com.l2jserver.gameserver.network.clientpackets.RequestRefineCancel;
+import com.l2jserver.gameserver.network.clientpackets.RequestRefundItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestRejectPostAttachment;
+import com.l2jserver.gameserver.network.clientpackets.RequestReplyStartPledgeWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestReplyStopPledgeWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestReplySurrenderPledgeWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestResetNickname;
+import com.l2jserver.gameserver.network.clientpackets.RequestRestart;
+import com.l2jserver.gameserver.network.clientpackets.RequestRestartPoint;
+import com.l2jserver.gameserver.network.clientpackets.RequestSSQStatus;
+import com.l2jserver.gameserver.network.clientpackets.RequestSaveBookMarkSlot;
+import com.l2jserver.gameserver.network.clientpackets.RequestSaveInventoryOrder;
+import com.l2jserver.gameserver.network.clientpackets.RequestSaveKeyMapping;
+import com.l2jserver.gameserver.network.clientpackets.RequestSeedPhase;
+import com.l2jserver.gameserver.network.clientpackets.RequestSellItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestSendFriendMsg;
+import com.l2jserver.gameserver.network.clientpackets.RequestSendPost;
+import com.l2jserver.gameserver.network.clientpackets.RequestSentPost;
+import com.l2jserver.gameserver.network.clientpackets.RequestSentPostList;
+import com.l2jserver.gameserver.network.clientpackets.RequestSetAllyCrest;
+import com.l2jserver.gameserver.network.clientpackets.RequestSetCastleSiegeTime;
+import com.l2jserver.gameserver.network.clientpackets.RequestSetCrop;
+import com.l2jserver.gameserver.network.clientpackets.RequestSetPledgeCrest;
+import com.l2jserver.gameserver.network.clientpackets.RequestSetSeed;
+import com.l2jserver.gameserver.network.clientpackets.RequestShortCutDel;
+import com.l2jserver.gameserver.network.clientpackets.RequestShortCutReg;
+import com.l2jserver.gameserver.network.clientpackets.RequestShowBoard;
+import com.l2jserver.gameserver.network.clientpackets.RequestShowMiniMap;
+import com.l2jserver.gameserver.network.clientpackets.RequestSiegeAttackerList;
+import com.l2jserver.gameserver.network.clientpackets.RequestSiegeDefenderList;
+import com.l2jserver.gameserver.network.clientpackets.RequestSiegeInfo;
+import com.l2jserver.gameserver.network.clientpackets.RequestSkillList;
+import com.l2jserver.gameserver.network.clientpackets.RequestStartPledgeWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestStopPledgeWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestSurrenderPledgeWar;
+import com.l2jserver.gameserver.network.clientpackets.RequestTargetCanceld;
+import com.l2jserver.gameserver.network.clientpackets.RequestTeleportBookMark;
+import com.l2jserver.gameserver.network.clientpackets.RequestTutorialClientEvent;
+import com.l2jserver.gameserver.network.clientpackets.RequestTutorialLinkHtml;
+import com.l2jserver.gameserver.network.clientpackets.RequestTutorialPassCmdToServer;
+import com.l2jserver.gameserver.network.clientpackets.RequestTutorialQuestionMark;
+import com.l2jserver.gameserver.network.clientpackets.RequestUnEquipItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestVoteNew;
+import com.l2jserver.gameserver.network.clientpackets.RequestWithDrawPremiumItem;
+import com.l2jserver.gameserver.network.clientpackets.RequestWithDrawalParty;
+import com.l2jserver.gameserver.network.clientpackets.RequestWithdrawPartyRoom;
+import com.l2jserver.gameserver.network.clientpackets.RequestWithdrawalPledge;
+import com.l2jserver.gameserver.network.clientpackets.RequestWriteHeroWords;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.clientpackets.SendBypassBuildCmd;
+import com.l2jserver.gameserver.network.clientpackets.SendWareHouseDepositList;
+import com.l2jserver.gameserver.network.clientpackets.SendWareHouseWithDrawList;
+import com.l2jserver.gameserver.network.clientpackets.SetPrivateStoreListBuy;
+import com.l2jserver.gameserver.network.clientpackets.SetPrivateStoreListSell;
+import com.l2jserver.gameserver.network.clientpackets.SetPrivateStoreMsgBuy;
+import com.l2jserver.gameserver.network.clientpackets.SetPrivateStoreMsgSell;
+import com.l2jserver.gameserver.network.clientpackets.SetPrivateStoreWholeMsg;
+import com.l2jserver.gameserver.network.clientpackets.SnoopQuit;
+import com.l2jserver.gameserver.network.clientpackets.StartRotating;
+import com.l2jserver.gameserver.network.clientpackets.TradeDone;
+import com.l2jserver.gameserver.network.clientpackets.TradeRequest;
+import com.l2jserver.gameserver.network.clientpackets.UseItem;
+import com.l2jserver.gameserver.network.clientpackets.ValidatePosition;
+import com.l2jserver.mmocore.ClientFactory;
+import com.l2jserver.mmocore.MMOConnection;
+import com.l2jserver.mmocore.MMOExecutor;
+import com.l2jserver.mmocore.PacketHandler;
+import com.l2jserver.mmocore.ReceivablePacket;
+
+/**
+ * Stateful Packet Handler<BR>
+ * The Stateful approach prevents the server from handling inconsistent packets, examples:<br>
+ * <ul>
+ * <li>Clients sends a MoveToLocation packet without having a character attached. (Potential errors handling the packet).</li>
+ * <li>Clients sends a RequestAuthLogin being already authed. (Potential exploit).</li>
+ * </ul>
+ * Note: If for a given exception a packet needs to be handled on more then one state, then it should be added to all these states.
+ * @author KenM
+ */
+public final class L2GamePacketHandler implements PacketHandler<L2GameClient>, ClientFactory<L2GameClient>, MMOExecutor<L2GameClient> {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(L2GamePacketHandler.class);
+	
+	@Override
+	public ReceivablePacket<L2GameClient> handlePacket(ByteBuffer buf, L2GameClient client) {
+		if (client.dropPacket()) {
+			return null;
+		}
+		
+		int opcode = buf.get() & 0xFF;
+		int id3;
+		
+		ReceivablePacket<L2GameClient> msg = null;
+		GameClientState state = client.getState();
+		
+		switch (state) {
+			case CONNECTED:
+				switch (opcode) {
+					case 0x0e -> msg = new ProtocolVersion();
+					case 0x2b -> msg = new AuthLogin();
+					default -> printDebug(opcode, buf, state, client);
+				}
+				break;
+			case AUTHED:
+				switch (opcode) {
+					case 0x00 -> msg = new Logout();
+					case 0x0c -> msg = new CharacterCreate();
+					case 0x0d -> msg = new CharacterDelete();
+					case 0x12 -> msg = new CharacterSelect();
+					case 0x13 -> msg = new NewCharacter();
+					case 0x7b -> msg = new CharacterRestore();
+					case 0xd0 -> {
+						int id2;
+						if (buf.remaining() >= 2) {
+							id2 = buf.getShort() & 0xffff;
+						} else {
+							if (general().packetHandlerDebug()) {
+								LOG.warn("Client: {} sent a 0xd0 without the second opcode.", client);
+							}
+							break;
+						}
+						switch (id2) {
+							case 0x36 -> msg = new RequestGotoLobby();
+							case 0x93 -> msg = new RequestEx2ndPasswordCheck();
+							case 0x94 -> msg = new RequestEx2ndPasswordVerify();
+							case 0x95 -> msg = new RequestEx2ndPasswordReq();
+							default -> printDebugDoubleOpcode(opcode, id2, buf, state, client);
+						}
+					}
+					default -> printDebug(opcode, buf, state, client);
+				}
+				break;
+			case JOINING: {
+				switch (opcode) {
+					case 0x11 -> msg = new EnterWorld();
+					case 0xd0 -> {
+						int id2;
+						if (buf.remaining() >= 2) {
+							id2 = buf.getShort() & 0xffff;
+						} else {
+							if (general().packetHandlerDebug()) {
+								LOG.warn("Client: {} sent a 0xd0 without the second opcode.", client);
+							}
+							break;
+						}
+						
+						if (id2 == 0x01) {
+							msg = new RequestManorList();
+						} else {
+							printDebugDoubleOpcode(opcode, id2, buf, state, client);
+						}
+					}
+					default -> printDebug(opcode, buf, state, client);
+				}
+				break;
+			}
+			case IN_GAME:
+				switch (opcode) {
+					case 0x00:
+						msg = new Logout();
+						break;
+					case 0x01:
+						msg = new Attack();
+						break;
+					case 0x03:
+						msg = new RequestStartPledgeWar();
+						break;
+					case 0x04:
+						msg = new RequestReplyStartPledgeWar();
+						break;
+					case 0x05:
+						msg = new RequestStopPledgeWar();
+						break;
+					case 0x06: // RequestSCCheck
+						msg = new RequestReplyStopPledgeWar();
+						break;
+					case 0x07:
+						msg = new RequestSurrenderPledgeWar();
+						break;
+					case 0x08:
+						msg = new RequestReplySurrenderPledgeWar();
+						break;
+					case 0x09:
+						msg = new RequestSetPledgeCrest();
+						break;
+					case 0x0b:
+						msg = new RequestGiveNickName();
+						break;
+					case 0x0f:
+						msg = new MoveBackwardToLocation();
+						break;
+					case 0x10:
+						// Say
+						break;
+					case 0x12:
+						// CharacterSelect, in case of player spam clicks on login screen
+						break;
+					case 0x14:
+						msg = new RequestItemList();
+						break;
+					case 0x15:
+						// RequestEquipItem
+						client.handleCheat("Used obsolete RequestEquipItem packet!");
+						break;
+					case 0x16:
+						msg = new RequestUnEquipItem();
+						break;
+					case 0x17:
+						msg = new RequestDropItem();
+						break;
+					case 0x19:
+						msg = new UseItem();
+						break;
+					case 0x1a:
+						msg = new TradeRequest();
+						break;
+					case 0x1b:
+						msg = new AddTradeItem();
+						break;
+					case 0x1c:
+						msg = new TradeDone();
+						break;
+					case 0x1f:
+						msg = new Action();
+						break;
+					case 0x22:
+						msg = new RequestLinkHtml();
+						break;
+					case 0x23:
+						msg = new RequestBypassToServer();
+						break;
+					case 0x24:
+						msg = new RequestBBSwrite();
+						break;
+					case 0x25:
+						// RequestCreatePledge
+						break;
+					case 0x26:
+						msg = new RequestJoinPledge();
+						break;
+					case 0x27:
+						msg = new RequestAnswerJoinPledge();
+						break;
+					case 0x28:
+						msg = new RequestWithdrawalPledge();
+						break;
+					case 0x29:
+						msg = new RequestOustPledgeMember();
+						break;
+					case 0x2c:
+						msg = new RequestGetItemFromPet();
+						break;
+					case 0x2e:
+						msg = new RequestAllyInfo();
+						break;
+					case 0x2f:
+						msg = new RequestCrystallizeItem();
+						break;
+					case 0x30:
+						msg = new RequestPrivateStoreManageSell();
+						break;
+					case 0x31:
+						msg = new SetPrivateStoreListSell();
+						break;
+					case 0x32:
+						msg = new AttackRequest();
+						break;
+					case 0x33:
+						// RequestTeleportPacket
+						break;
+					case 0x34:
+						// msg = new RequestSocialAction();
+						client.handleCheat("Used obsolete RequestSocialAction packet");
+						break;
+					case 0x35:
+						// msg = new ChangeMoveType2();
+						client.handleCheat("Used obsolete ChangeMoveType packet");
+						break;
+					case 0x36:
+						// msg = new ChangeWaitType2();
+						client.handleCheat("Used obsolete ChangeWaitType packet");
+						break;
+					case 0x37:
+						msg = new RequestSellItem();
+						break;
+					case 0x38:
+						// RequestMagicSkillList
+						break;
+					case 0x39:
+						msg = new RequestMagicSkillUse();
+						break;
+					case 0x3a: // SendAppearingPacket
+						msg = new Appearing();
+						break;
+					case 0x3b:
+						if (general().allowWarehouse()) {
+							msg = new SendWareHouseDepositList();
+						}
+						break;
+					case 0x3c:
+						msg = new SendWareHouseWithDrawList();
+						break;
+					case 0x3d:
+						msg = new RequestShortCutReg();
+						break;
+					case 0x3f:
+						msg = new RequestShortCutDel();
+						break;
+					case 0x40:
+						msg = new RequestBuyItem();
+						break;
+					case 0x41:
+						// RequestDismissPledge
+						break;
+					case 0x42:
+						msg = new RequestJoinParty();
+						break;
+					case 0x43:
+						msg = new RequestAnswerJoinParty();
+						break;
+					case 0x44:
+						msg = new RequestWithDrawalParty();
+						break;
+					case 0x45:
+						msg = new RequestOustPartyMember();
+						break;
+					case 0x46:
+						// RequestDismissParty
+						break;
+					case 0x47:
+						msg = new CannotMoveAnymore();
+						break;
+					case 0x48:
+						msg = new RequestTargetCanceld();
+						break;
+					case 0x49:
+						msg = new Say2();
+						break;
+					case 0x4a:
+						int id_2;
+						if (buf.remaining() >= 2) {
+							id_2 = buf.getShort() & 0xffff;
+						} else {
+							if (general().packetHandlerDebug()) {
+								LOG.warn("Client: {} sent a 0x4a without the second opcode.", client);
+							}
+							break;
+						}
+						switch (id_2) {
+							case 0x00:
+								// SuperCmdCharacterInfo
+								break;
+							case 0x01:
+								// SuperCmdSummonCmd
+								break;
+							case 0x02:
+								// SuperCmdServerStatus
+								break;
+							case 0x03:
+								// SendL2ParamSetting
+								break;
+							default:
+								printDebugDoubleOpcode(opcode, id_2, buf, state, client);
+								break;
+						}
+						break;
+					case 0x4d:
+						msg = new RequestPledgeMemberList();
+						break;
+					case 0x4f:
+						// RequestMagicList
+						break;
+					case 0x50:
+						msg = new RequestSkillList();
+						break;
+					case 0x52:
+						msg = new MoveWithDelta();
+						break;
+					case 0x53:
+						msg = new RequestGetOnVehicle();
+						break;
+					case 0x54:
+						msg = new RequestGetOffVehicle();
+						break;
+					case 0x55:
+						msg = new AnswerTradeRequest();
+						break;
+					case 0x56:
+						msg = new RequestActionUse();
+						break;
+					case 0x57:
+						msg = new RequestRestart();
+						break;
+					case 0x58:
+						msg = new RequestSiegeInfo();
+						break;
+					case 0x59:
+						msg = new ValidatePosition();
+						break;
+					case 0x5a:
+						// RequestSEKCustom
+						break;
+					case 0x5b:
+						msg = new StartRotating();
+						break;
+					case 0x5c:
+						msg = new FinishRotating();
+						break;
+					case 0x5e:
+						msg = new RequestShowBoard();
+						break;
+					case 0x5f:
+						msg = new RequestEnchantItem();
+						break;
+					case 0x60:
+						msg = new RequestDestroyItem();
+						break;
+					case 0x62:
+						msg = new RequestQuestList();
+						break;
+					case 0x63: // RequestDestroyQuest
+						msg = new RequestQuestAbort();
+						break;
+					case 0x65:
+						msg = new RequestPledgeInfo();
+						break;
+					case 0x66:
+						msg = new RequestPledgeExtendedInfo();
+						break;
+					case 0x67:
+						msg = new RequestPledgeCrest();
+						break;
+					case 0x6b: // RequestSendL2FriendSay
+						msg = new RequestSendFriendMsg();
+						break;
+					case 0x6c:
+						msg = new RequestShowMiniMap();
+						break;
+					case 0x6d:
+						// RequestSendMsnChatLog
+						break;
+					case 0x6e: // RequestReload
+						msg = new RequestRecordInfo();
+						break;
+					case 0x6f:
+						msg = new RequestHennaEquip();
+						break;
+					case 0x70:
+						msg = new RequestHennaRemoveList();
+						break;
+					case 0x71:
+						msg = new RequestHennaItemRemoveInfo();
+						break;
+					case 0x72:
+						msg = new RequestHennaRemove();
+						break;
+					case 0x73:
+						msg = new RequestAcquireSkillInfo();
+						break;
+					case 0x74:
+						msg = new SendBypassBuildCmd();
+						break;
+					case 0x75:
+						msg = new RequestMoveToLocationInVehicle();
+						break;
+					case 0x76:
+						msg = new CannotMoveAnymoreInVehicle();
+						break;
+					case 0x77:
+						msg = new RequestFriendInvite();
+						break;
+					case 0x78: // RequestFriendAddReply
+						msg = new RequestAnswerFriendInvite();
+						break;
+					case 0x79:
+						msg = new RequestFriendList();
+						break;
+					case 0x7a:
+						msg = new RequestFriendDel();
+						break;
+					case 0x7c:
+						msg = new RequestAcquireSkill();
+						break;
+					case 0x7d:
+						msg = new RequestRestartPoint();
+						break;
+					case 0x7e:
+						msg = new RequestGMCommand();
+						break;
+					case 0x7f:
+						msg = new RequestPartyMatchConfig();
+						break;
+					case 0x80:
+						msg = new RequestPartyMatchList();
+						break;
+					case 0x81:
+						msg = new RequestPartyMatchDetail();
+						break;
+					case 0x83: // SendPrivateStoreBuyList
+						msg = new RequestPrivateStoreBuy();
+						break;
+					case 0x85:
+						msg = new RequestTutorialLinkHtml();
+						break;
+					case 0x86:
+						msg = new RequestTutorialPassCmdToServer();
+						break;
+					case 0x87:
+						msg = new RequestTutorialQuestionMark();
+						break;
+					case 0x88:
+						msg = new RequestTutorialClientEvent();
+						break;
+					case 0x89:
+						msg = new RequestPetition();
+						break;
+					case 0x8a:
+						msg = new RequestPetitionCancel();
+						break;
+					case 0x8b:
+						msg = new RequestGmList();
+						break;
+					case 0x8c:
+						msg = new RequestJoinAlly();
+						break;
+					case 0x8d:
+						msg = new RequestAnswerJoinAlly();
+						break;
+					case 0x8e: // RequestWithdrawAlly
+						msg = new AllyLeave();
+						break;
+					case 0x8f: // RequestOustAlly
+						msg = new AllyDismiss();
+						break;
+					case 0x90:
+						msg = new RequestDismissAlly();
+						break;
+					case 0x91:
+						msg = new RequestSetAllyCrest();
+						break;
+					case 0x92:
+						msg = new RequestAllyCrest();
+						break;
+					case 0x93:
+						msg = new RequestChangePetName();
+						break;
+					case 0x94:
+						msg = new RequestPetUseItem();
+						break;
+					case 0x95:
+						msg = new RequestGiveItemToPet();
+						break;
+					case 0x96:
+						msg = new RequestPrivateStoreQuitSell();
+						break;
+					case 0x97:
+						msg = new SetPrivateStoreMsgSell();
+						break;
+					case 0x98:
+						msg = new RequestPetGetItem();
+						break;
+					case 0x99:
+						msg = new RequestPrivateStoreManageBuy();
+						break;
+					case 0x9a: // SetPrivateStoreList
+						msg = new SetPrivateStoreListBuy();
+						break;
+					case 0x9c:
+						msg = new RequestPrivateStoreQuitBuy();
+						break;
+					case 0x9d:
+						msg = new SetPrivateStoreMsgBuy();
+						break;
+					case 0x9f: // SendPrivateStoreBuyList
+						msg = new RequestPrivateStoreSell();
+						break;
+					case 0xa0:
+						// SendTimeCheckPacket
+						break;
+					case 0xa6:
+						// RequestSkillCoolTime
+						break;
+					case 0xa7:
+						msg = new RequestPackageSendableItemList();
+						break;
+					case 0xa8:
+						msg = new RequestPackageSend();
+						break;
+					case 0xa9:
+						msg = new RequestBlock();
+						break;
+					case 0xaa:
+						msg = new RequestSiegeInfo();
+						break;
+					case 0xab: // RequestCastleSiegeAttackerList
+						msg = new RequestSiegeAttackerList();
+						break;
+					case 0xac:
+						msg = new RequestSiegeDefenderList();
+						break;
+					case 0xad: // RequestJoinCastleSiege
+						msg = new RequestJoinSiege();
+						break;
+					case 0xae: // RequestConfirmCastleSiegeWaitingList
+						msg = new RequestConfirmSiegeWaitingList();
+						break;
+					case 0xAF:
+						msg = new RequestSetCastleSiegeTime();
+						break;
+					case 0xb0:
+						msg = new MultiSellChoose();
+						break;
+					case 0xb1:
+						// NetPing
+						break;
+					case 0xb2:
+						// RequestRemainTime
+						break;
+					case 0xb3:
+						msg = new BypassUserCmd();
+						break;
+					case 0xb4:
+						msg = new SnoopQuit();
+						break;
+					case 0xb5:
+						msg = new RequestRecipeBookOpen();
+						break;
+					case 0xb6: // RequestRecipeItemDelete
+						msg = new RequestRecipeBookDestroy();
+						break;
+					case 0xb7:
+						msg = new RequestRecipeItemMakeInfo();
+						break;
+					case 0xb8:
+						msg = new RequestRecipeItemMakeSelf();
+						break;
+					case 0xb9:
+						// RequestRecipeShopManageList
+						break;
+					case 0xba:
+						msg = new RequestRecipeShopMessageSet();
+						break;
+					case 0xbb:
+						msg = new RequestRecipeShopListSet();
+						break;
+					case 0xbc:
+						msg = new RequestRecipeShopManageQuit();
+						break;
+					case 0xbd:
+						// RequestRecipeShopManageCancel
+						break;
+					case 0xbe:
+						msg = new RequestRecipeShopMakeInfo();
+						break;
+					case 0xbf: // RequestRecipeShopMakeDo
+						msg = new RequestRecipeShopMakeItem();
+						break;
+					case 0xc0: // RequestRecipeShopSellList
+						msg = new RequestRecipeShopManagePrev();
+						break;
+					case 0xc1: // RequestObserverEndPacket
+						msg = new ObserverReturn();
+						break;
+					case 0xc2:
+						// Unused (RequestEvaluate/VoteSociality)
+						break;
+					case 0xc3:
+						msg = new RequestHennaItemList();
+						break;
+					case 0xc4:
+						msg = new RequestHennaItemInfo();
+						break;
+					case 0xc5:
+						msg = new RequestBuySeed();
+						break;
+					case 0xc6: // ConfirmDlg
+						msg = new DlgAnswer();
+						break;
+					case 0xc7: // RequestPreviewItem
+						msg = new RequestPreviewItem();
+						break;
+					case 0xc8:
+						msg = new RequestSSQStatus();
+						break;
+					case 0xc9:
+						msg = new RequestPetitionFeedback();
+						break;
+					case 0xcb:
+						msg = new GameGuardReply();
+						break;
+					case 0xcc:
+						msg = new RequestPledgePower();
+						break;
+					case 0xcd:
+						msg = new RequestMakeMacro();
+						break;
+					case 0xce:
+						msg = new RequestDeleteMacro();
+						break;
+					case 0xcf: // RequestProcureCrop
+						// msg = new RequestBuyProcure();
+						break;
+					case 0xd0:
+						int id2;
+						if (buf.remaining() >= 2) {
+							id2 = buf.getShort() & 0xffff;
+						} else {
+							if (general().packetHandlerDebug()) {
+								LOG.warn("Client: {} sent a 0xd0 without the second opcode.", client);
+							}
+							break;
+						}
+						
+						switch (id2) {
+							case 0x01:
+								msg = new RequestManorList();
+								break;
+							case 0x02:
+								msg = new RequestProcureCropList();
+								break;
+							case 0x03:
+								msg = new RequestSetSeed();
+								break;
+							case 0x04:
+								msg = new RequestSetCrop();
+								break;
+							case 0x05:
+								msg = new RequestWriteHeroWords();
+								break;
+							case 0x5F:
+								// Server Packets:
+								// ExMpccRoomInfo FE:9B
+								// ExListMpccWaiting FE:9C
+								// ExDismissMpccRoom FE:9D
+								// ExManageMpccRoomMember FE:9E
+								// ExMpccRoomMember FE:9F
+								// TODO: RequestJoinMpccRoom chdd
+								break;
+							case 0x5D:
+								// TODO: RequestListMpccWaiting chddd
+								break;
+							case 0x5E:
+								// TODO: RequestManageMpccRoom chdddddS
+								break;
+							case 0x06:
+								msg = new RequestExAskJoinMPCC();
+								break;
+							case 0x07:
+								msg = new RequestExAcceptJoinMPCC();
+								break;
+							case 0x08:
+								msg = new RequestExOustFromMPCC();
+								break;
+							case 0x09:
+								msg = new RequestOustFromPartyRoom();
+								break;
+							case 0x0a:
+								msg = new RequestDismissPartyRoom();
+								break;
+							case 0x0b:
+								msg = new RequestWithdrawPartyRoom();
+								break;
+							case 0x0c:
+								msg = new RequestChangePartyLeader();
+								break;
+							case 0x0d:
+								msg = new RequestAutoSoulShot();
+								break;
+							case 0x0e:
+								msg = new RequestExEnchantSkillInfo();
+								break;
+							case 0x0f:
+								msg = new RequestExEnchantSkill();
+								break;
+							case 0x10:
+								msg = new RequestExPledgeCrestLarge();
+								break;
+							case 0x11:
+								msg = new RequestExSetPledgeCrestLarge();
+								break;
+							case 0x12:
+								msg = new RequestPledgeSetAcademyMaster();
+								break;
+							case 0x13:
+								msg = new RequestPledgePowerGradeList();
+								break;
+							case 0x14:
+								msg = new RequestPledgeMemberPowerInfo();
+								break;
+							case 0x15:
+								msg = new RequestPledgeSetMemberPowerGrade();
+								break;
+							case 0x16:
+								msg = new RequestPledgeMemberInfo();
+								break;
+							case 0x17:
+								msg = new RequestPledgeWarList();
+								break;
+							case 0x18:
+								msg = new RequestExFishRanking();
+								break;
+							case 0x19:
+								msg = new RequestPCCafeCouponUse();
+								break;
+							case 0x1b:
+								msg = new RequestDuelStart();
+								break;
+							case 0x1c:
+								msg = new RequestDuelAnswerStart();
+								break;
+							case 0x1d:
+								// RequestExSetTutorial
+								break;
+							case 0x1e:
+								msg = new RequestExRqItemLink();
+								break;
+							case 0x1f:
+								// CanNotMoveAnymoreAirShip
+								break;
+							case 0x20:
+								msg = new MoveToLocationInAirShip();
+								break;
+							case 0x21:
+								msg = new RequestKeyMapping();
+								break;
+							case 0x22:
+								msg = new RequestSaveKeyMapping();
+								break;
+							case 0x23:
+								msg = new RequestExRemoveItemAttribute();
+								break;
+							case 0x24:
+								msg = new RequestSaveInventoryOrder();
+								break;
+							case 0x25:
+								msg = new RequestExitPartyMatchingWaitingRoom();
+								break;
+							case 0x26:
+								msg = new RequestConfirmTargetItem();
+								break;
+							case 0x27:
+								msg = new RequestConfirmRefinerItem();
+								break;
+							case 0x28:
+								msg = new RequestConfirmGemStone();
+								break;
+							case 0x29:
+								msg = new RequestOlympiadObserverEnd();
+								break;
+							case 0x2a:
+								msg = new RequestCursedWeaponList();
+								break;
+							case 0x2b:
+								msg = new RequestCursedWeaponLocation();
+								break;
+							case 0x2c:
+								msg = new RequestPledgeReorganizeMember();
+								break;
+							case 0x2d:
+								msg = new RequestExMPCCShowPartyMembersInfo();
+								break;
+							case 0x2e:
+								msg = new RequestOlympiadMatchList();
+								break;
+							case 0x2f:
+								msg = new RequestAskJoinPartyRoom();
+								break;
+							case 0x30:
+								msg = new AnswerJoinPartyRoom();
+								break;
+							case 0x31:
+								msg = new RequestListPartyMatchingWaitingRoom();
+								break;
+							case 0x32:
+								msg = new RequestExEnchantSkillSafe();
+								break;
+							case 0x33:
+								msg = new RequestExEnchantSkillUntrain();
+								break;
+							case 0x34:
+								msg = new RequestExEnchantSkillRouteChange();
+								break;
+							case 0x35:
+								msg = new RequestExEnchantItemAttribute();
+								break;
+							case 0x36:
+								msg = new ExGetOnAirShip();
+								break;
+							case 0x38:
+								msg = new MoveToLocationAirShip();
+								break;
+							case 0x39:
+								msg = new RequestBidItemAuction();
+								break;
+							case 0x3a:
+								msg = new RequestInfoItemAuction();
+								break;
+							case 0x3b:
+								msg = new RequestExChangeName();
+								break;
+							case 0x3c:
+								msg = new RequestAllCastleInfo();
+								break;
+							case 0x3d:
+								msg = new RequestAllFortressInfo();
+								break;
+							case 0x3e:
+								msg = new RequestAllAgitInfo();
+								break;
+							case 0x3f:
+								msg = new RequestFortressSiegeInfo();
+								break;
+							case 0x40:
+								msg = new RequestGetBossRecord();
+								break;
+							case 0x41:
+								msg = new RequestRefine();
+								break;
+							case 0x42:
+								msg = new RequestConfirmCancelItem();
+								break;
+							case 0x43:
+								msg = new RequestRefineCancel();
+								break;
+							case 0x44:
+								msg = new RequestExMagicSkillUseGround();
+								break;
+							case 0x45:
+								msg = new RequestDuelSurrender();
+								break;
+							case 0x46:
+								msg = new RequestExEnchantSkillInfoDetail();
+								break;
+							case 0x48:
+								msg = new RequestFortressMapInfo();
+								break;
+							case 0x49:
+								// RequestPVPMatchRecord
+								break;
+							case 0x4a:
+								msg = new SetPrivateStoreWholeMsg();
+								break;
+							case 0x4b:
+								msg = new RequestDispel();
+								break;
+							case 0x4c:
+								msg = new RequestExTryToPutEnchantTargetItem();
+								break;
+							case 0x4d:
+								msg = new RequestExTryToPutEnchantSupportItem();
+								break;
+							case 0x4e:
+								msg = new RequestExCancelEnchantItem();
+								break;
+							case 0x4f:
+								msg = new RequestChangeNicknameColor();
+								break;
+							case 0x50:
+								msg = new RequestResetNickname();
+								break;
+							case 0x51:
+								if (buf.remaining() >= 4) {
+									id3 = buf.getInt();
+								} else {
+									LOG.warn("Client: {} sent a 0xd0:0x51 without the third opcode.", client);
+									break;
+								}
+								switch (id3) {
+									case 0x00:
+										msg = new RequestBookMarkSlotInfo();
+										break;
+									case 0x01:
+										msg = new RequestSaveBookMarkSlot();
+										break;
+									case 0x02:
+										msg = new RequestModifyBookMarkSlot();
+										break;
+									case 0x03:
+										msg = new RequestDeleteBookMarkSlot();
+										break;
+									case 0x04:
+										msg = new RequestTeleportBookMark();
+										break;
+									case 0x05:
+										// RequestChangeBookMarkSlot
+										break;
+									default:
+										printDebugDoubleOpcode(opcode, id3, buf, state, client);
+										break;
+								}
+								break;
+							case 0x52:
+								msg = new RequestWithDrawPremiumItem();
+								break;
+							case 0x53:
+								// RequestJump
+								break;
+							case 0x54:
+								// RequestStartShowCrataeCubeRank
+								break;
+							case 0x55:
+								// RequestStopShowCrataeCubeRank
+								break;
+							case 0x56:
+								// NotifyStartMiniGame
+								break;
+							case 0x57:
+								msg = new RequestJoinDominionWar();
+								break;
+							case 0x58:
+								msg = new RequestDominionInfo();
+								break;
+							case 0x59:
+								msg = new RequestExCleftEnter();
+								break;
+							case 0x5a:
+								msg = new RequestExCubeGameChangeTeam();
+								break;
+							case 0x5b:
+								msg = new EndScenePlayer();
+								break;
+							case 0x5c:
+								msg = new RequestExCubeGameReadyAnswer();
+								break;
+							case 0x63:
+								msg = new RequestSeedPhase();
+								break;
+							case 0x65:
+								msg = new RequestPostItemList();
+								break;
+							case 0x66:
+								msg = new RequestSendPost();
+								break;
+							case 0x67:
+								msg = new RequestReceivedPostList();
+								break;
+							case 0x68:
+								msg = new RequestDeleteReceivedPost();
+								break;
+							case 0x69:
+								msg = new RequestReceivedPost();
+								break;
+							case 0x6a:
+								msg = new RequestPostAttachment();
+								break;
+							case 0x6b:
+								msg = new RequestRejectPostAttachment();
+								break;
+							case 0x6c:
+								msg = new RequestSentPostList();
+								break;
+							case 0x6d:
+								msg = new RequestDeleteSentPost();
+								break;
+							case 0x6e:
+								msg = new RequestSentPost();
+								break;
+							case 0x6f:
+								msg = new RequestCancelPostAttachment();
+								break;
+							case 0x70:
+								// RequestShowNewUserPetition
+								break;
+							case 0x71:
+								// RequestShowStepThree
+								break;
+							case 0x72:
+								// RequestShowStepTwo
+								break;
+							case 0x73:
+								// ExRaidReserveResult
+								break;
+							case 0x75:
+								msg = new RequestRefundItem();
+								break;
+							case 0x76:
+								msg = new RequestBuySellUIClose();
+								break;
+							case 0x77:
+								// RequestEventMatchObserverEnd
+								break;
+							case 0x78:
+								msg = new RequestPartyLootModification();
+								break;
+							case 0x79:
+								msg = new AnswerPartyLootModification();
+								break;
+							case 0x7a:
+								msg = new AnswerCoupleAction();
+								break;
+							case 0x7b:
+								msg = new BrEventRankerList();
+								break;
+							case 0x7c:
+								// AskMembership
+								break;
+							case 0x7d:
+								// RequestAddExpandQuestAlarm
+								break;
+							case 0x7e:
+								msg = new RequestVoteNew();
+								break;
+							case 0x84:
+								msg = new RequestExAddContactToContactList();
+								break;
+							case 0x85:
+								msg = new RequestExDeleteContactFromContactList();
+								break;
+							case 0x86:
+								msg = new RequestExShowContactList();
+								break;
+							case 0x87:
+								msg = new RequestExFriendListExtended();
+								break;
+							case 0x88:
+								msg = new RequestExOlympiadMatchListRefresh();
+								break;
+							case 0x89:
+								// RequestBRGamePoint
+								break;
+							case 0x8A:
+								// RequestBRProductList
+								break;
+							case 0x8B:
+								// RequestBRProductInfo
+								break;
+							case 0x8C:
+								// RequestBRBuyProduct
+								break;
+							case 0x8D:
+								// RequestBRRecentProductList
+								break;
+							case 0x8E:
+								// BrMinigameLoadScores
+								break;
+							case 0x8F:
+								// BrMinigameInsertScore
+								break;
+							case 0x90:
+								// BrLectureMark
+								break;
+							case 0x91:
+								// RequestGoodsInventoryInfo
+								break;
+							case 0x92:
+								// RequestUseGoodsInventoryItem
+								break;
+							default:
+								printDebugDoubleOpcode(opcode, id2, buf, state, client);
+								break;
+						}
+						break;
+					default:
+						printDebug(opcode, buf, state, client);
+						break;
+				}
+				break;
+		}
+		return msg;
+	}
+	
+	private void printDebug(int opcode, ByteBuffer buf, GameClientState state, L2GameClient client) {
+		client.onUnknownPacket();
+		if (!general().packetHandlerDebug()) {
+			return;
+		}
+		
+		int size = buf.remaining();
+		LOG.warn("Unknown Packet: 0x{} on State: {} Client: {}", Integer.toHexString(opcode), state.name(), client.toString());
+		byte[] array = new byte[size];
+		buf.get(array);
+		LOG.warn(Util.printData(array, size));
+	}
+	
+	private void printDebugDoubleOpcode(int opcode, int id2, ByteBuffer buf, GameClientState state, L2GameClient client) {
+		client.onUnknownPacket();
+		if (!general().packetHandlerDebug()) {
+			return;
+		}
+		
+		int size = buf.remaining();
+		LOG.warn("Unknown Packet: 0x{}:0x{} on State: {} Client: {}", Integer.toHexString(opcode), Integer.toHexString(id2), state.name(), client.toString());
+		byte[] array = new byte[size];
+		buf.get(array);
+		LOG.warn(Util.printData(array, size));
+	}
+	
+	// impl
+	@Override
+	public L2GameClient create(MMOConnection<L2GameClient> con) {
+		return new L2GameClient(con);
+	}
+	
+	@Override
+	public void execute(ReceivablePacket<L2GameClient> rp) {
+		rp.getClient().execute(rp);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/NpcStringId.java b/src/main/java/com/l2jserver/gameserver/network/NpcStringId.java
new file mode 100644
index 00000000..9f31d314
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/NpcStringId.java
@@ -0,0 +1,25404 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.clientstrings.Localization;
+import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
+
+/**
+ * NpcStringId implementation.
+ * @author mrTJO
+ * @author Zoey76
+ */
+public final class NpcStringId {
+	private static final Logger LOG = LoggerFactory.getLogger(NpcStringId.class);
+	
+	/**
+	 * ID: 1<br>
+	 * Message: Hello! I am $s1. You are $s2, right? Hehehe
+	 */
+	public static final NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE;
+	
+	/**
+	 * ID: 2<br>
+	 * Message: $s1--$s2--$s3--$s4//$s5 Hehehe
+	 */
+	public static final NpcStringId S1_S2_S3_S4_S5_HEHEHE;
+	
+	/**
+	 * ID: 5<br>
+	 * Message: Withdraw the fee for the next time at $s1/$s2 $s3
+	 */
+	public static final NpcStringId WITHDRAW_THE_FEE_FOR_THE_NEXT_TIME_AT_S1_S2_S4;
+	
+	/**
+	 * ID: 8<br>
+	 * Message: Stage
+	 */
+	public static final NpcStringId STAGE;
+	
+	/**
+	 * ID: 9<br>
+	 * Message: Stage $s1
+	 */
+	public static final NpcStringId STAGE_S1;
+	
+	/**
+	 * ID: 10<br>
+	 * Message: $s1%%
+	 */
+	public static final NpcStringId S1;
+	
+	/**
+	 * ID: 2004<br>
+	 * Message: What did you just do to me?
+	 */
+	public static final NpcStringId WHAT_DID_YOU_JUST_DO_TO_ME;
+	
+	/**
+	 * ID: 2005<br>
+	 * Message: Are you trying to tame me? Don't do that!
+	 */
+	public static final NpcStringId ARE_YOU_TRYING_TO_TAME_ME_DONT_DO_THAT;
+	
+	/**
+	 * ID: 2006<br>
+	 * Message: Don't give such a thing. You can endanger yourself!
+	 */
+	public static final NpcStringId DONT_GIVE_SUCH_A_THING_YOU_CAN_ENDANGER_YOURSELF;
+	
+	/**
+	 * ID: 2007<br>
+	 * Message: Yuck! What is this? It tastes terrible!
+	 */
+	public static final NpcStringId YUCK_WHAT_IS_THIS_IT_TASTES_TERRIBLE;
+	
+	/**
+	 * ID: 2008<br>
+	 * Message: I'm hungry. Give me a little more, please.
+	 */
+	public static final NpcStringId IM_HUNGRY_GIVE_ME_A_LITTLE_MORE_PLEASE;
+	
+	/**
+	 * ID: 2009<br>
+	 * Message: What is this? Is this edible?
+	 */
+	public static final NpcStringId WHAT_IS_THIS_IS_THIS_EDIBLE;
+	
+	/**
+	 * ID: 2010<br>
+	 * Message: Don't worry about me.
+	 */
+	public static final NpcStringId DONT_WORRY_ABOUT_ME;
+	
+	/**
+	 * ID: 2011<br>
+	 * Message: Thank you. That was delicious!
+	 */
+	public static final NpcStringId THANK_YOU_THAT_WAS_DELICIOUS;
+	
+	/**
+	 * ID: 2012<br>
+	 * Message: I think I am starting to like you!
+	 */
+	public static final NpcStringId I_THINK_I_AM_STARTING_TO_LIKE_YOU;
+	
+	/**
+	 * ID: 2013<br>
+	 * Message: Eeeeek! Eeeeek!
+	 */
+	public static final NpcStringId EEEEEK_EEEEEK;
+	
+	/**
+	 * ID: 2014<br>
+	 * Message: Don't keep trying to tame me. I don't want to be tamed.
+	 */
+	public static final NpcStringId DONT_KEEP_TRYING_TO_TAME_ME_I_DONT_WANT_TO_BE_TAMED;
+	
+	/**
+	 * ID: 2015<br>
+	 * Message: It is just food to me. Although it may also be your hand.
+	 */
+	public static final NpcStringId IT_IS_JUST_FOOD_TO_ME_ALTHOUGH_IT_MAY_ALSO_BE_YOUR_HAND;
+	
+	/**
+	 * ID: 2016<br>
+	 * Message: If I keep eating like this, won't I become fat? *chomp chomp*
+	 */
+	public static final NpcStringId IF_I_KEEP_EATING_LIKE_THIS_WONT_I_BECOME_FAT_CHOMP_CHOMP;
+	
+	/**
+	 * ID: 2017<br>
+	 * Message: Why do you keep feeding me?
+	 */
+	public static final NpcStringId WHY_DO_YOU_KEEP_FEEDING_ME;
+	
+	/**
+	 * ID: 2018<br>
+	 * Message: Don't trust me. I'm afraid I may betray you later.
+	 */
+	public static final NpcStringId DONT_TRUST_ME_IM_AFRAID_I_MAY_BETRAY_YOU_LATER;
+	
+	/**
+	 * ID: 2019<br>
+	 * Message: Grrrrr....
+	 */
+	public static final NpcStringId GRRRRR;
+	
+	/**
+	 * ID: 2020<br>
+	 * Message: You brought this upon yourself...!
+	 */
+	public static final NpcStringId YOU_BROUGHT_THIS_UPON_YOURSELF;
+	
+	/**
+	 * ID: 2021<br>
+	 * Message: I feel strange...! I keep having these evil thoughts...!
+	 */
+	public static final NpcStringId I_FEEL_STRANGE_I_KEEP_HAVING_THESE_EVIL_THOUGHTS;
+	
+	/**
+	 * ID: 2022<br>
+	 * Message: Alas... so this is how it all ends...
+	 */
+	public static final NpcStringId ALAS_SO_THIS_IS_HOW_IT_ALL_ENDS;
+	
+	/**
+	 * ID: 2023<br>
+	 * Message: I don't feel so good... Oh, my mind is very troubled...!
+	 */
+	public static final NpcStringId I_DONT_FEEL_SO_GOOD_OH_MY_MIND_IS_VERY_TROUBLED;
+	
+	/**
+	 * ID: 2024<br>
+	 * Message: $s1, so what do you think it is like to be tamed?
+	 */
+	public static final NpcStringId S1_SO_WHAT_DO_YOU_THINK_IT_IS_LIKE_TO_BE_TAMED;
+	
+	/**
+	 * ID: 2025<br>
+	 * Message: $s1, whenever I see spice, I think I will miss your hand that used to feed it to me.
+	 */
+	public static final NpcStringId S1_WHENEVER_I_SEE_SPICE_I_THINK_I_WILL_MISS_YOUR_HAND_THAT_USED_TO_FEED_IT_TO_ME;
+	
+	/**
+	 * ID: 2026<br>
+	 * Message: $s1, don't go to the village. I don't have the strength to follow you.
+	 */
+	public static final NpcStringId S1_DONT_GO_TO_THE_VILLAGE_I_DONT_HAVE_THE_STRENGTH_TO_FOLLOW_YOU;
+	
+	/**
+	 * ID: 2027<br>
+	 * Message: Thank you for trusting me, $s1. I hope I will be helpful to you.
+	 */
+	public static final NpcStringId THANK_YOU_FOR_TRUSTING_ME_S1_I_HOPE_I_WILL_BE_HELPFUL_TO_YOU;
+	
+	/**
+	 * ID: 2028<br>
+	 * Message: $s1, will I be able to help you?
+	 */
+	public static final NpcStringId S1_WILL_I_BE_ABLE_TO_HELP_YOU;
+	
+	/**
+	 * ID: 2029<br>
+	 * Message: I guess it's just my animal magnetism.
+	 */
+	public static final NpcStringId I_GUESS_ITS_JUST_MY_ANIMAL_MAGNETISM;
+	
+	/**
+	 * ID: 2030<br>
+	 * Message: Too much spicy food makes me sweat like a beast.
+	 */
+	public static final NpcStringId TOO_MUCH_SPICY_FOOD_MAKES_ME_SWEAT_LIKE_A_BEAST;
+	
+	/**
+	 * ID: 2031<br>
+	 * Message: Animals need love too.
+	 */
+	public static final NpcStringId ANIMALS_NEED_LOVE_TOO;
+	
+	/**
+	 * ID: 2032<br>
+	 * Message: What'd I miss? What'd I miss?
+	 */
+	public static final NpcStringId WHATD_I_MISS_WHATD_I_MISS;
+	
+	/**
+	 * ID: 2033<br>
+	 * Message: I just know before this is over, I'm gonna need a lot of serious therapy.
+	 */
+	public static final NpcStringId I_JUST_KNOW_BEFORE_THIS_IS_OVER_IM_GONNA_NEED_A_LOT_OF_SERIOUS_THERAPY;
+	
+	/**
+	 * ID: 2034<br>
+	 * Message: I sense great wisdom in you... I'm an animal, and I got instincts.
+	 */
+	public static final NpcStringId I_SENSE_GREAT_WISDOM_IN_YOU_IM_AN_ANIMAL_AND_I_GOT_INSTINCTS;
+	
+	/**
+	 * ID: 2035<br>
+	 * Message: Remember, I'm here to help.
+	 */
+	public static final NpcStringId REMEMBER_IM_HERE_TO_HELP;
+	
+	/**
+	 * ID: 2036<br>
+	 * Message: Are we there yet?
+	 */
+	public static final NpcStringId ARE_WE_THERE_YET;
+	
+	/**
+	 * ID: 2037<br>
+	 * Message: That really made me feel good to see that.
+	 */
+	public static final NpcStringId THAT_REALLY_MADE_ME_FEEL_GOOD_TO_SEE_THAT;
+	
+	/**
+	 * ID: 2038<br>
+	 * Message: Oh, no, no, no, Nooooo!
+	 */
+	public static final NpcStringId OH_NO_NO_NO_NOOOOO;
+	
+	/**
+	 * ID: 2150<br>
+	 * Message: Who awoke me?
+	 */
+	public static final NpcStringId WHO_AWOKE_ME;
+	
+	/**
+	 * ID: 2151<br>
+	 * Message: My master has instructed me to be your guide, $s1.
+	 */
+	public static final NpcStringId MY_MASTER_HAS_INSTRUCTED_ME_TO_BE_YOUR_GUIDE_S1;
+	
+	/**
+	 * ID: 2152<br>
+	 * Message: Please check this bookcase, $s1.
+	 */
+	public static final NpcStringId PLEASE_CHECK_THIS_BOOKCASE_S1;
+	
+	/**
+	 * ID: 2250<br>
+	 * Message: Did you call me, $s1?
+	 */
+	public static final NpcStringId DID_YOU_CALL_ME_S1;
+	
+	/**
+	 * ID: 2251<br>
+	 * Message: I'm confused! Maybe it's time to go back.
+	 */
+	public static final NpcStringId IM_CONFUSED_MAYBE_ITS_TIME_TO_GO_BACK;
+	
+	/**
+	 * ID: 2450<br>
+	 * Message: That sign!
+	 */
+	public static final NpcStringId THAT_SIGN;
+	
+	/**
+	 * ID: 2550<br>
+	 * Message: That box was sealed by my master, $s1! Don't touch it!
+	 */
+	public static final NpcStringId THAT_BOX_WAS_SEALED_BY_MY_MASTER_S1_DONT_TOUCH_IT;
+	
+	/**
+	 * ID: 2551<br>
+	 * Message: You've ended my immortal life! You're protected by the feudal lord, aren't you?
+	 */
+	public static final NpcStringId YOUVE_ENDED_MY_IMMORTAL_LIFE_YOURE_PROTECTED_BY_THE_FEUDAL_LORD_ARENT_YOU;
+	
+	/**
+	 * ID: 4151<br>
+	 * Message: Delivery duty complete. \\n Go find the Newbie Guide.
+	 */
+	public static final NpcStringId DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE;
+	
+	/**
+	 * ID: 4152<br>
+	 * Message: Acquisition of Soulshot for beginners complete. \\n Go find the Newbie Guide.
+	 */
+	public static final NpcStringId ACQUISITION_OF_SOULSHOT_FOR_BEGINNERS_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE;
+	
+	/**
+	 * ID: 4153<br>
+	 * Message: Acquisition of Weapon Exchange coupon for beginners complete. \\n Go speak with the Newbie Guide.
+	 */
+	public static final NpcStringId ACQUISITION_OF_WEAPON_EXCHANGE_COUPON_FOR_BEGINNERS_COMPLETE_N_GO_SPEAK_WITH_THE_NEWBIE_GUIDE;
+	
+	/**
+	 * ID: 4154<br>
+	 * Message: Acquisition of race-specific weapon complete. \\n Go find the Newbie Guide.
+	 */
+	public static final NpcStringId ACQUISITION_OF_RACE_SPECIFIC_WEAPON_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE;
+	
+	/**
+	 * ID: 4155<br>
+	 * Message: Last duty complete. \\n Go find the Newbie Guide.
+	 */
+	public static final NpcStringId LAST_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE;
+	
+	/**
+	 * ID: 6051<br>
+	 * Message: $s1! I must kill you. Blame your own curiosity.
+	 */
+	public static final NpcStringId S1_I_MUST_KILL_YOU_BLAME_YOUR_OWN_CURIOSITY;
+	
+	/**
+	 * ID: 6052<br>
+	 * Message: You have good luck. I shall return.
+	 */
+	public static final NpcStringId YOU_HAVE_GOOD_LUCK_I_SHALL_RETURN;
+	
+	/**
+	 * ID: 6053<br>
+	 * Message: You are strong. This was a mistake.
+	 */
+	public static final NpcStringId YOU_ARE_STRONG_THIS_WAS_A_MISTAKE;
+	
+	/**
+	 * ID: 6054<br>
+	 * Message: Who are you to join in the battle? How upsetting.
+	 */
+	public static final NpcStringId WHO_ARE_YOU_TO_JOIN_IN_THE_BATTLE_HOW_UPSETTING;
+	
+	/**
+	 * ID: 6451<br>
+	 * Message: $s1, did you come to help me?
+	 */
+	public static final NpcStringId S1_DID_YOU_COME_TO_HELP_ME;
+	
+	/**
+	 * ID: 6551<br>
+	 * Message: Drats! How could I be so wrong??
+	 */
+	public static final NpcStringId DRATS_HOW_COULD_I_BE_SO_WRONG;
+	
+	/**
+	 * ID: 6552<br>
+	 * Message: $s1! Step back from the confounded box! I will take it myself!
+	 */
+	public static final NpcStringId S1_STEP_BACK_FROM_THE_CONFOUNDED_BOX_I_WILL_TAKE_IT_MYSELF;
+	
+	/**
+	 * ID: 6553<br>
+	 * Message: $s1! I will be back soon. Stay there and don't you dare wander off!
+	 */
+	public static final NpcStringId S1_I_WILL_BE_BACK_SOON_STAY_THERE_AND_DONT_YOU_DARE_WANDER_OFF;
+	
+	/**
+	 * ID: 6554<br>
+	 * Message: Grr. I've been hit...
+	 */
+	public static final NpcStringId GRR_IVE_BEEN_HIT;
+	
+	/**
+	 * ID: 6555<br>
+	 * Message: Grr! Who are you and why have you stopped me?
+	 */
+	public static final NpcStringId GRR_WHO_ARE_YOU_AND_WHY_HAVE_YOU_STOPPED_ME;
+	
+	/**
+	 * ID: 6556<br>
+	 * Message: I am late!
+	 */
+	public static final NpcStringId I_AM_LATE;
+	
+	/**
+	 * ID: 6557<br>
+	 * Message: Good luck!
+	 */
+	public static final NpcStringId GOOD_LUCK;
+	
+	/**
+	 * ID: 6750<br>
+	 * Message: $s1! You seek the forbidden knowledge and I cannot let you have it!
+	 */
+	public static final NpcStringId S1_YOU_SEEK_THE_FORBIDDEN_KNOWLEDGE_AND_I_CANNOT_LET_YOU_HAVE_IT;
+	
+	/**
+	 * ID: 6751<br>
+	 * Message: Is this all I am allowed to have?...
+	 */
+	public static final NpcStringId IS_THIS_ALL_I_AM_ALLOWED_TO_HAVE;
+	
+	/**
+	 * ID: 6752<br>
+	 * Message: You defeated me, but our doom approaches...
+	 */
+	public static final NpcStringId YOU_DEFEATED_ME_BUT_OUR_DOOM_APPROACHES;
+	
+	/**
+	 * ID: 6753<br>
+	 * Message: $s1! Who are you? Why are you bothering my minions?
+	 */
+	public static final NpcStringId S1_WHO_ARE_YOU_WHY_ARE_YOU_BOTHERING_MY_MINIONS;
+	
+	/**
+	 * ID: 6754<br>
+	 * Message: Beefcake!!
+	 */
+	public static final NpcStringId BEEFCAKE;
+	
+	/**
+	 * ID: 6755<br>
+	 * Message: Grr! Why are you sticking your nose in our business?
+	 */
+	public static final NpcStringId GRR_WHY_ARE_YOU_STICKING_YOUR_NOSE_IN_OUR_BUSINESS;
+	
+	/**
+	 * ID: 6756<br>
+	 * Message: Farewell and watch your back!
+	 */
+	public static final NpcStringId FAREWELL_AND_WATCH_YOUR_BACK;
+	
+	/**
+	 * ID: 6757<br>
+	 * Message: Kamael! Good to see you. I have something to ask you...
+	 */
+	public static final NpcStringId KAMAEL_GOOD_TO_SEE_YOU_I_HAVE_SOMETHING_TO_ASK_YOU;
+	
+	/**
+	 * ID: 6758<br>
+	 * Message: $s1! Go get him!!
+	 */
+	public static final NpcStringId S1_GO_GET_HIM;
+	
+	/**
+	 * ID: 6759<br>
+	 * Message: $s1! What are you doing? Attack him!
+	 */
+	public static final NpcStringId S1_WHAT_ARE_YOU_DOING_ATTACK_HIM;
+	
+	/**
+	 * ID: 6760<br>
+	 * Message: $s1! Is ? your full potential?
+	 */
+	public static final NpcStringId S1_IS_YOUR_FULL_POTENTIAL;
+	
+	/**
+	 * ID: 6761<br>
+	 * Message: Thanks! I must go and hunt down those that oppose me.
+	 */
+	public static final NpcStringId THANKS_I_MUST_GO_AND_HUNT_DOWN_THOSE_THAT_OPPOSE_ME;
+	
+	/**
+	 * ID: 6762<br>
+	 * Message: You are so stubborn... I must follow him now...
+	 */
+	public static final NpcStringId YOU_ARE_SO_STUBBORN_I_MUST_FOLLOW_HIM_NOW;
+	
+	/**
+	 * ID: 6763<br>
+	 * Message: Seek enlightenment from the Tablet.
+	 */
+	public static final NpcStringId SEEK_ENLIGHTENMENT_FROM_THE_TABLET;
+	
+	/**
+	 * ID: 6764<br>
+	 * Message: Arrogant beings! You are all doomed!
+	 */
+	public static final NpcStringId ARROGANT_BEINGS_YOU_ARE_ALL_DOOMED;
+	
+	/**
+	 * ID: 6765<br>
+	 * Message: My time in your world has come to an end. Consider yourselves lucky...
+	 */
+	public static final NpcStringId MY_TIME_IN_YOUR_WORLD_HAS_COME_TO_AN_END_CONSIDER_YOURSELVES_LUCKY;
+	
+	/**
+	 * ID: 6766<br>
+	 * Message: $s1! How dare you!!!
+	 */
+	public static final NpcStringId S1_HOW_DARE_YOU;
+	
+	/**
+	 * ID: 6767<br>
+	 * Message: $s1! Ahhaa! Your god forsakes you!
+	 */
+	public static final NpcStringId S1_AHHAA_YOUR_GOD_FORSAKES_YOU;
+	
+	/**
+	 * ID: 6851<br>
+	 * Message: $s1! Your time is up. Prepare to die a horrible death.
+	 */
+	public static final NpcStringId S1_YOUR_TIME_IS_UP_PREPARE_TO_DIE_A_HORRIBLE_DEATH;
+	
+	/**
+	 * ID: 6852<br>
+	 * Message: Consider yourself lucky. The next time we meet, you will die - PERMANENTLY!
+	 */
+	public static final NpcStringId CONSIDER_YOURSELF_LUCKY_THE_NEXT_TIME_WE_MEET_YOU_WILL_DIE_PERMANENTLY;
+	
+	/**
+	 * ID: 6853<br>
+	 * Message: Fare thee well! We shall meet again.
+	 */
+	public static final NpcStringId FARE_THEE_WELL_WE_SHALL_MEET_AGAIN;
+	
+	/**
+	 * ID: 6854<br>
+	 * Message: $s1! Who are you? And better yet, why are you bothering my minions?
+	 */
+	public static final NpcStringId S1_WHO_ARE_YOU_AND_BETTER_YET_WHY_ARE_YOU_BOTHERING_MY_MINIONS;
+	
+	/**
+	 * ID: 6855<br>
+	 * Message: Strength beyond strength!!
+	 */
+	public static final NpcStringId STRENGTH_BEYOND_STRENGTH;
+	
+	/**
+	 * ID: 6856<br>
+	 * Message: Grr! Why are you sticking your nose where it doesn't belong?
+	 */
+	public static final NpcStringId GRR_WHY_ARE_YOU_STICKING_YOUR_NOSE_WHERE_IT_DOESNT_BELONG;
+	
+	/**
+	 * ID: 6857<br>
+	 * Message: You've won for now, but we will meet again!
+	 */
+	public static final NpcStringId YOUVE_WON_FOR_NOW_BUT_WE_WILL_MEET_AGAIN;
+	
+	/**
+	 * ID: 6858<br>
+	 * Message: Are they tired of following me?
+	 */
+	public static final NpcStringId ARE_THEY_TIRED_OF_FOLLOWING_ME;
+	
+	/**
+	 * ID: 6859<br>
+	 * Message: $s1! Can you help me?
+	 */
+	public static final NpcStringId S1_CAN_YOU_HELP_ME;
+	
+	/**
+	 * ID: 6860<br>
+	 * Message: Is that all you got, little $s1?
+	 */
+	public static final NpcStringId IS_THAT_ALL_YOU_GOT_LITTLE_S1;
+	
+	/**
+	 * ID: 6861<br>
+	 * Message: $s1! Wake up fool! Don't let him get away!
+	 */
+	public static final NpcStringId S1_WAKE_UP_FOOL_DONT_LET_HIM_GET_AWAY;
+	
+	/**
+	 * ID: 6862<br>
+	 * Message: The path is clear, but be careful!
+	 */
+	public static final NpcStringId THE_PATH_IS_CLEAR_BUT_BE_CAREFUL;
+	
+	/**
+	 * ID: 6863<br>
+	 * Message: I must follow someone now. See you around!
+	 */
+	public static final NpcStringId I_MUST_FOLLOW_SOMEONE_NOW_SEE_YOU_AROUND;
+	
+	/**
+	 * ID: 6864<br>
+	 * Message: May we meet again.
+	 */
+	public static final NpcStringId MAY_WE_MEET_AGAIN;
+	
+	/**
+	 * ID: 6865<br>
+	 * Message: Curses on those who blaspheme the Gods!
+	 */
+	public static final NpcStringId CURSES_ON_THOSE_WHO_BLASPHEME_THE_GODS;
+	
+	/**
+	 * ID: 6866<br>
+	 * Message: Einhasad is calling me! You are lucky and I shall continue my punishment later!
+	 */
+	public static final NpcStringId EINHASAD_IS_CALLING_ME_YOU_ARE_LUCKY_AND_I_SHALL_CONTINUE_MY_PUNISHMENT_LATER;
+	
+	/**
+	 * ID: 6867<br>
+	 * Message: By the power vested in me by the gods, you $s1, shall die!
+	 */
+	public static final NpcStringId BY_THE_POWER_VESTED_IN_ME_BY_THE_GODS_YOU_S1_SHALL_DIE;
+	
+	/**
+	 * ID: 6868<br>
+	 * Message: $s1! I will not forget you!
+	 */
+	public static final NpcStringId S1_I_WILL_NOT_FORGET_YOU;
+	
+	/**
+	 * ID: 6950<br>
+	 * Message: $s1! How dare you interfere! You shall pay for this!
+	 */
+	public static final NpcStringId S1_HOW_DARE_YOU_INTERFERE_YOU_SHALL_PAY_FOR_THIS;
+	
+	/**
+	 * ID: 6951<br>
+	 * Message: Beleth is calling me. You are lucky but still a fool...
+	 */
+	public static final NpcStringId BELETH_IS_CALLING_ME_YOU_ARE_LUCKY_BUT_STILL_A_FOOL;
+	
+	/**
+	 * ID: 6952<br>
+	 * Message: I shall take my leave, but will never surrender!
+	 */
+	public static final NpcStringId I_SHALL_TAKE_MY_LEAVE_BUT_WILL_NEVER_SURRENDER;
+	
+	/**
+	 * ID: 6954<br>
+	 * Message: Cower before my awesome and mighty power!!
+	 */
+	public static final NpcStringId COWER_BEFORE_MY_AWESOME_AND_MIGHTY_POWER;
+	
+	/**
+	 * ID: 6955<br>
+	 * Message: Grr! Can't you find something better to do with your time?
+	 */
+	public static final NpcStringId GRR_CANT_YOU_FIND_SOMETHING_BETTER_TO_DO_WITH_YOUR_TIME;
+	
+	/**
+	 * ID: 6956<br>
+	 * Message: I shall take my leave, but your head will be mine some day.. Oh yes..yes it will!
+	 */
+	public static final NpcStringId I_SHALL_TAKE_MY_LEAVE_BUT_YOUR_HEAD_WILL_BE_MINE_SOME_DAY_OH_YESYES_IT_WILL;
+	
+	/**
+	 * ID: 6957<br>
+	 * Message: My children are stronger!
+	 */
+	public static final NpcStringId MY_CHILDREN_ARE_STRONGER;
+	
+	/**
+	 * ID: 6958<br>
+	 * Message: $s1! Let's kill them all.
+	 */
+	public static final NpcStringId S1_LETS_KILL_THEM_ALL;
+	
+	/**
+	 * ID: 6959<br>
+	 * Message: $s1! Come my children...
+	 */
+	public static final NpcStringId S1_COME_MY_CHILDREN;
+	
+	/**
+	 * ID: 6960<br>
+	 * Message: $s1! Muster your strength... Pick them off like chickens.
+	 */
+	public static final NpcStringId S1_MUSTER_YOUR_STRENGTH_PICK_THEM_OFF_LIKE_CHICKENS;
+	
+	/**
+	 * ID: 6961<br>
+	 * Message: Thank you my children... Someday, we will meet again.
+	 */
+	public static final NpcStringId THANK_YOU_MY_CHILDREN_SOMEDAY_WE_WILL_MEET_AGAIN;
+	
+	/**
+	 * ID: 6962<br>
+	 * Message: My children... Seek my enemies.
+	 */
+	public static final NpcStringId MY_CHILDREN_SEEK_MY_ENEMIES;
+	
+	/**
+	 * ID: 6963<br>
+	 * Message: My children... I grant you my blessings...
+	 */
+	public static final NpcStringId MY_CHILDREN_I_GRANT_YOU_MY_BLESSINGS;
+	
+	/**
+	 * ID: 6964<br>
+	 * Message: You worthless beings!
+	 */
+	public static final NpcStringId YOU_WORTHLESS_BEINGS;
+	
+	/**
+	 * ID: 6965<br>
+	 * Message: My time on the material plane has ended. You are lucky...
+	 */
+	public static final NpcStringId MY_TIME_ON_THE_MATERIAL_PLANE_HAS_ENDED_YOU_ARE_LUCKY;
+	
+	/**
+	 * ID: 6966<br>
+	 * Message: $s1! Worthless beings! Begone!
+	 */
+	public static final NpcStringId S1_WORTHLESS_BEINGS_BEGONE;
+	
+	/**
+	 * ID: 6967<br>
+	 * Message: $s1! You are the meaning of the word 'danger'...
+	 */
+	public static final NpcStringId S1_YOU_ARE_THE_MEANING_OF_THE_WORD_DANGER;
+	
+	/**
+	 * ID: 7050<br>
+	 * Message: You made it here, $s1. I'll show my strength. Die!
+	 */
+	public static final NpcStringId YOU_MADE_IT_HERE_S1_ILL_SHOW_MY_STRENGTH_DIE;
+	
+	/**
+	 * ID: 7051<br>
+	 * Message: Ha! You failed! Are you ready to quit?
+	 */
+	public static final NpcStringId HA_YOU_FAILED_ARE_YOU_READY_TO_QUIT;
+	
+	/**
+	 * ID: 7052<br>
+	 * Message: I'm the strongest! I lost everything to win!
+	 */
+	public static final NpcStringId IM_THE_STRONGEST_I_LOST_EVERYTHING_TO_WIN;
+	
+	/**
+	 * ID: 7053<br>
+	 * Message: $s1! Are you doing this because they're Halisha's minions?
+	 */
+	public static final NpcStringId S1_ARE_YOU_DOING_THIS_BECAUSE_THEYRE_HALISHAS_MINIONS;
+	
+	/**
+	 * ID: 7054<br>
+	 * Message: My spirit is released from this shell. I'm getting close to Halisha...
+	 */
+	public static final NpcStringId MY_SPIRIT_IS_RELEASED_FROM_THIS_SHELL_IM_GETTING_CLOSE_TO_HALISHA;
+	
+	/**
+	 * ID: 7055<br>
+	 * Message: Mind your own business!
+	 */
+	public static final NpcStringId MIND_YOUR_OWN_BUSINESS;
+	
+	/**
+	 * ID: 7056<br>
+	 * Message: This fight is a waste of time. Goodbye!
+	 */
+	public static final NpcStringId THIS_FIGHT_IS_A_WASTE_OF_TIME_GOODBYE;
+	
+	/**
+	 * ID: 7057<br>
+	 * Message: Every cloud has a silver lining, don't you think?
+	 */
+	public static final NpcStringId EVERY_CLOUD_HAS_A_SILVER_LINING_DONT_YOU_THINK;
+	
+	/**
+	 * ID: 7058<br>
+	 * Message: $s1! Don't listen to this demon.
+	 */
+	public static final NpcStringId S1_DONT_LISTEN_TO_THIS_DEMON;
+	
+	/**
+	 * ID: 7059<br>
+	 * Message: $s1! Hesitation betrays your heart. Fight!
+	 */
+	public static final NpcStringId S1_HESITATION_BETRAYS_YOUR_HEART_FIGHT;
+	
+	/**
+	 * ID: 7060<br>
+	 * Message: $s1! Isn't protecting somebody worthy? Isn't that justice?
+	 */
+	public static final NpcStringId S1_ISNT_PROTECTING_SOMEBODY_WORTHY_ISNT_THAT_JUSTICE;
+	
+	/**
+	 * ID: 7061<br>
+	 * Message: I have urgent business! I gotta go.
+	 */
+	public static final NpcStringId I_HAVE_URGENT_BUSINESS_I_GOTTA_GO;
+	
+	/**
+	 * ID: 7062<br>
+	 * Message: Are my efforts in vain? Is this the end?
+	 */
+	public static final NpcStringId ARE_MY_EFFORTS_IN_VAIN_IS_THIS_THE_END;
+	
+	/**
+	 * ID: 7063<br>
+	 * Message: Goodbye, friend. I hope to see you again.
+	 */
+	public static final NpcStringId GOODBYE_FRIEND_I_HOPE_TO_SEE_YOU_AGAIN;
+	
+	/**
+	 * ID: 7064<br>
+	 * Message: Knights are always foolish!
+	 */
+	public static final NpcStringId KNIGHTS_ARE_ALWAYS_FOOLISH;
+	
+	/**
+	 * ID: 7065<br>
+	 * Message: I'll show mercy on you for now.
+	 */
+	public static final NpcStringId ILL_SHOW_MERCY_ON_YOU_FOR_NOW;
+	
+	/**
+	 * ID: 7066<br>
+	 * Message: $s1! Your justice is just hypocrisy if you give up on what you've promised to protect.
+	 */
+	public static final NpcStringId S1_YOUR_JUSTICE_IS_JUST_HYPOCRISY_IF_YOU_GIVE_UP_ON_WHAT_YOUVE_PROMISED_TO_PROTECT;
+	
+	/**
+	 * ID: 7067<br>
+	 * Message: $s1...Don't think you've won! Your dark shadow will always follow you...hypocrite!
+	 */
+	public static final NpcStringId S1DONT_THINK_YOUVE_WON_YOUR_DARK_SHADOW_WILL_ALWAYS_FOLLOW_YOUHYPOCRITE;
+	
+	/**
+	 * ID: 7150<br>
+	 * Message: A temple knight guards the Mother Tree! $s1! Has Human contact made you forget that?
+	 */
+	public static final NpcStringId A_TEMPLE_KNIGHT_GUARDS_THE_MOTHER_TREE_S1_HAS_HUMAN_CONTACT_MADE_YOU_FORGET_THAT;
+	
+	/**
+	 * ID: 7151<br>
+	 * Message: I must stop. Remember, the ones you're protecting will someday defeat the Elves.
+	 */
+	public static final NpcStringId I_MUST_STOP_REMEMBER_THE_ONES_YOURE_PROTECTING_WILL_SOMEDAY_DEFEAT_THE_ELVES;
+	
+	/**
+	 * ID: 7152<br>
+	 * Message: What! That will just strengthen the enemy!
+	 */
+	public static final NpcStringId WHAT_THAT_WILL_JUST_STRENGTHEN_THE_ENEMY;
+	
+	/**
+	 * ID: 7153<br>
+	 * Message: You dare to disturb the order of the shrine! Die, $s1!
+	 */
+	public static final NpcStringId YOU_DARE_TO_DISTURB_THE_ORDER_OF_THE_SHRINE_DIE_S1;
+	
+	/**
+	 * ID: 7154<br>
+	 * Message: My spirit is releasing from this shell. I'm getting close to Halisha...
+	 */
+	public static final NpcStringId MY_SPIRIT_IS_RELEASING_FROM_THIS_SHELL_IM_GETTING_CLOSE_TO_HALISHA;
+	
+	/**
+	 * ID: 7156<br>
+	 * Message: This is a waste of time. Goodbye!
+	 */
+	public static final NpcStringId THIS_IS_A_WASTE_OF_TIME_GOODBYE;
+	
+	/**
+	 * ID: 7157<br>
+	 * Message: I'm not like my brother Panacea. Ghost of the past, begone!
+	 */
+	public static final NpcStringId IM_NOT_LIKE_MY_BROTHER_PANACEA_GHOST_OF_THE_PAST_BEGONE;
+	
+	/**
+	 * ID: 7158<br>
+	 * Message: The Elves no longer rule! Help me, $s1!
+	 */
+	public static final NpcStringId THE_ELVES_NO_LONGER_RULE_HELP_ME_S1;
+	
+	/**
+	 * ID: 7159<br>
+	 * Message: Don't give up, $s1! He' a demon from the past!
+	 */
+	public static final NpcStringId DONT_GIVE_UP_S1_HE_A_DEMON_FROM_THE_PAST;
+	
+	/**
+	 * ID: 7160<br>
+	 * Message: Be proud, $s1. We protect this world together.
+	 */
+	public static final NpcStringId BE_PROUD_S1_WE_PROTECT_THIS_WORLD_TOGETHER;
+	
+	/**
+	 * ID: 7161<br>
+	 * Message: I have to go. I've got some business to take care of.
+	 */
+	public static final NpcStringId I_HAVE_TO_GO_IVE_GOT_SOME_BUSINESS_TO_TAKE_CARE_OF;
+	
+	/**
+	 * ID: 7162<br>
+	 * Message: Ugh! Don't let him get away!
+	 */
+	public static final NpcStringId UGH_DONT_LET_HIM_GET_AWAY;
+	
+	/**
+	 * ID: 7163<br>
+	 * Message: Don't forget your pride. You're protecting the world!
+	 */
+	public static final NpcStringId DONT_FORGET_YOUR_PRIDE_YOURE_PROTECTING_THE_WORLD;
+	
+	/**
+	 * ID: 7164<br>
+	 * Message: Ha, ha, ha!...
+	 */
+	public static final NpcStringId HA_HA_HA;
+	
+	/**
+	 * ID: 7165<br>
+	 * Message: Kuh, huh...
+	 */
+	public static final NpcStringId KUH_HUH;
+	
+	/**
+	 * ID: 7166<br>
+	 * Message: Aah! Kuh...$s1!...Kuh, huh...
+	 */
+	public static final NpcStringId AAH_KUHS1KUH_HUH;
+	
+	/**
+	 * ID: 7167<br>
+	 * Message: $s1!...Re... mem... Ugh...Uh...
+	 */
+	public static final NpcStringId S1RE_MEM_UGHUH;
+	
+	/**
+	 * ID: 7250<br>
+	 * Message: $s1, You'd better listen.
+	 */
+	public static final NpcStringId S1_YOUD_BETTER_LISTEN;
+	
+	/**
+	 * ID: 7251<br>
+	 * Message: Huh? It's curtain time! I won't get any money.
+	 */
+	public static final NpcStringId HUH_ITS_CURTAIN_TIME_I_WONT_GET_ANY_MONEY;
+	
+	/**
+	 * ID: 7252<br>
+	 * Message: Ugh...It can't be...!
+	 */
+	public static final NpcStringId UGHIT_CANT_BE;
+	
+	/**
+	 * ID: 7257<br>
+	 * Message: You won't get away this time, Narcissus!
+	 */
+	public static final NpcStringId YOU_WONT_GET_AWAY_THIS_TIME_NARCISSUS;
+	
+	/**
+	 * ID: 7258<br>
+	 * Message: $s1! Help me!
+	 */
+	public static final NpcStringId S1_HELP_ME;
+	
+	/**
+	 * ID: 7259<br>
+	 * Message: You must be aware of your audience when singing, %s! => Join us $s1! A song that nobody listens to is empty.
+	 */
+	public static final NpcStringId YOU_MUST_BE_AWARE_OF_YOUR_AUDIENCE_WHEN_SINGING_S_JOIN_US_S1_A_SONG_THAT_NOBODY_LISTENS_TO_IS_EMPTY;
+	
+	/**
+	 * ID: 7260<br>
+	 * Message: You must work harder to be victorious, $s1.
+	 */
+	public static final NpcStringId YOU_MUST_WORK_HARDER_TO_BE_VICTORIOUS_S1;
+	
+	/**
+	 * ID: 7261<br>
+	 * Message: My song is over, I must go. Goodbye!
+	 */
+	public static final NpcStringId MY_SONG_IS_OVER_I_MUST_GO_GOODBYE;
+	
+	/**
+	 * ID: 7262<br>
+	 * Message: How could I miss!
+	 */
+	public static final NpcStringId HOW_COULD_I_MISS;
+	
+	/**
+	 * ID: 7263<br>
+	 * Message: Don't forget. Song comes with harmony.
+	 */
+	public static final NpcStringId DONT_FORGET_SONG_COMES_WITH_HARMONY;
+	
+	/**
+	 * ID: 7264<br>
+	 * Message: Sing. Everyone will listen.
+	 */
+	public static final NpcStringId SING_EVERYONE_WILL_LISTEN;
+	
+	/**
+	 * ID: 7265<br>
+	 * Message: You don't deserve my blessing.
+	 */
+	public static final NpcStringId YOU_DONT_DESERVE_MY_BLESSING;
+	
+	/**
+	 * ID: 7266<br>
+	 * Message: Do you reject my blessing, $s1?
+	 */
+	public static final NpcStringId DO_YOU_REJECT_MY_BLESSING_S1;
+	
+	/**
+	 * ID: 7267<br>
+	 * Message: But why, $s1. Everyone would praise you!
+	 */
+	public static final NpcStringId BUT_WHY_S1_EVERYONE_WOULD_PRAISE_YOU;
+	
+	/**
+	 * ID: 7350<br>
+	 * Message: $s1! Attack me? I'm immortal! I'm unrivaled!
+	 */
+	public static final NpcStringId S1_ATTACK_ME_IM_IMMORTAL_IM_UNRIVALED;
+	
+	/**
+	 * ID: 7351<br>
+	 * Message: Ha! I'm immortal. This scar will soon heal. You'll die next time.
+	 */
+	public static final NpcStringId HA_IM_IMMORTAL_THIS_SCAR_WILL_SOON_HEAL_YOULL_DIE_NEXT_TIME;
+	
+	/**
+	 * ID: 7352<br>
+	 * Message: Metellus! You promised me an immortal life! How could I, Swordmaster Iron, lose?
+	 */
+	public static final NpcStringId METELLUS_YOU_PROMISED_ME_AN_IMMORTAL_LIFE_HOW_COULD_I_SWORDMASTER_IRON_LOSE;
+	
+	/**
+	 * ID: 7357<br>
+	 * Message: Fallen Angel? It's worth trying.
+	 */
+	public static final NpcStringId FALLEN_ANGEL_ITS_WORTH_TRYING;
+	
+	/**
+	 * ID: 7358<br>
+	 * Message: Hey $s1! Why don't you join? It's your best shot!
+	 */
+	public static final NpcStringId HEY_S1_WHY_DONT_YOU_JOIN_ITS_YOUR_BEST_SHOT;
+	
+	/**
+	 * ID: 7359<br>
+	 * Message: Are you interested in immortal life, $s1? It's too boring for me.
+	 */
+	public static final NpcStringId ARE_YOU_INTERESTED_IN_IMMORTAL_LIFE_S1_ITS_TOO_BORING_FOR_ME;
+	
+	/**
+	 * ID: 7360<br>
+	 * Message: Excellent, $s1! Show me what you learned when your life was on the line!
+	 */
+	public static final NpcStringId EXCELLENT_S1_SHOW_ME_WHAT_YOU_LEARNED_WHEN_YOUR_LIFE_WAS_ON_THE_LINE;
+	
+	/**
+	 * ID: 7361<br>
+	 * Message: I have to go take a break.
+	 */
+	public static final NpcStringId I_HAVE_TO_GO_TAKE_A_BREAK;
+	
+	/**
+	 * ID: 7362<br>
+	 * Message: You missed?! What a fool you are!
+	 */
+	public static final NpcStringId YOU_MISSED_WHAT_A_FOOL_YOU_ARE;
+	
+	/**
+	 * ID: 7363<br>
+	 * Message: Fighting without risk, training without danger and growing without hardship will only lead to an inflated ego. Don't forget.
+	 */
+	public static final NpcStringId FIGHTING_WITHOUT_RISK_TRAINING_WITHOUT_DANGER_AND_GROWING_WITHOUT_HARDSHIP_WILL_ONLY_LEAD_TO_AN_INFLATED_EGO_DONT_FORGET;
+	
+	/**
+	 * ID: 7364<br>
+	 * Message: Do you want an immortal life?
+	 */
+	public static final NpcStringId DO_YOU_WANT_AN_IMMORTAL_LIFE;
+	
+	/**
+	 * ID: 7365<br>
+	 * Message: Think it over. An immortal life and assured victory...
+	 */
+	public static final NpcStringId THINK_IT_OVER_AN_IMMORTAL_LIFE_AND_ASSURED_VICTORY;
+	
+	/**
+	 * ID: 7366<br>
+	 * Message: That's good, $s1! Do you want my blessing to improve your skills?
+	 */
+	public static final NpcStringId THATS_GOOD_S1_DO_YOU_WANT_MY_BLESSING_TO_IMPROVE_YOUR_SKILLS;
+	
+	/**
+	 * ID: 7367<br>
+	 * Message: $s1! Why do you reject guaranteed victory?
+	 */
+	public static final NpcStringId S1_WHY_DO_YOU_REJECT_GUARANTEED_VICTORY;
+	
+	/**
+	 * ID: 7450<br>
+	 * Message: In the name of gods, I punish you, $s1! You can't rival us all, no matter how strong you think you are!
+	 */
+	public static final NpcStringId IN_THE_NAME_OF_GODS_I_PUNISH_YOU_S1_YOU_CANT_RIVAL_US_ALL_NO_MATTER_HOW_STRONG_YOU_THINK_YOU_ARE;
+	
+	/**
+	 * ID: 7451<br>
+	 * Message: I have to stop for now, but I'll defeat the power of the dragon yet!
+	 */
+	public static final NpcStringId I_HAVE_TO_STOP_FOR_NOW_BUT_ILL_DEFEAT_THE_POWER_OF_THE_DRAGON_YET;
+	
+	/**
+	 * ID: 7452<br>
+	 * Message: It is...The power that shouldn't live!
+	 */
+	public static final NpcStringId IT_ISTHE_POWER_THAT_SHOULDNT_LIVE;
+	
+	/**
+	 * ID: 7457<br>
+	 * Message: Isn't it unwise for an angel to interfere in Human affairs?
+	 */
+	public static final NpcStringId ISNT_IT_UNWISE_FOR_AN_ANGEL_TO_INTERFERE_IN_HUMAN_AFFAIRS;
+	
+	/**
+	 * ID: 7458<br>
+	 * Message: This is tough! $s1, would you help me?
+	 */
+	public static final NpcStringId THIS_IS_TOUGH_S1_WOULD_YOU_HELP_ME;
+	
+	/**
+	 * ID: 7459<br>
+	 * Message: $s1! He's keeping an eye on all those in succession to the blood of dragons, including you!
+	 */
+	public static final NpcStringId S1_HES_KEEPING_AN_EYE_ON_ALL_THOSE_IN_SUCCESSION_TO_THE_BLOOD_OF_DRAGONS_INCLUDING_YOU;
+	
+	/**
+	 * ID: 7460<br>
+	 * Message: Attack the rear, $s1! If I'm killed, you're next!
+	 */
+	public static final NpcStringId ATTACK_THE_REAR_S1_IF_IM_KILLED_YOURE_NEXT;
+	
+	/**
+	 * ID: 7461<br>
+	 * Message: I can't stay any longer. There are too many eyes on us. Farewell!
+	 */
+	public static final NpcStringId I_CANT_STAY_ANY_LONGER_THERE_ARE_TOO_MANY_EYES_ON_US_FAREWELL;
+	
+	/**
+	 * ID: 7462<br>
+	 * Message: Get away? You're still alive. But...
+	 */
+	public static final NpcStringId GET_AWAY_YOURE_STILL_ALIVE_BUT;
+	
+	/**
+	 * ID: 7463<br>
+	 * Message: If we can't avoid this fight, we'll need great strength. It's the only way to peace.
+	 */
+	public static final NpcStringId IF_WE_CANT_AVOID_THIS_FIGHT_WELL_NEED_GREAT_STRENGTH_ITS_THE_ONLY_WAY_TO_PEACE;
+	
+	/**
+	 * ID: 7464<br>
+	 * Message: Warlord, you'll never learn the techniques of the dragon!
+	 */
+	public static final NpcStringId WARLORD_YOULL_NEVER_LEARN_THE_TECHNIQUES_OF_THE_DRAGON;
+	
+	/**
+	 * ID: 7465<br>
+	 * Message: Hey, why bother with this. Isn't it your mother's business?
+	 */
+	public static final NpcStringId HEY_WHY_BOTHER_WITH_THIS_ISNT_IT_YOUR_MOTHERS_BUSINESS;
+	
+	/**
+	 * ID: 7466<br>
+	 * Message: $s1! Are you against your mother's wishes? You're not worthy of the secrets of Shilen's children!
+	 */
+	public static final NpcStringId S1_ARE_YOU_AGAINST_YOUR_MOTHERS_WISHES_YOURE_NOT_WORTHY_OF_THE_SECRETS_OF_SHILENS_CHILDREN;
+	
+	/**
+	 * ID: 7467<br>
+	 * Message: Excellent technique, $s1. Unfortunately, you're the one destined for tragedy!
+	 */
+	public static final NpcStringId EXCELLENT_TECHNIQUE_S1_UNFORTUNATELY_YOURE_THE_ONE_DESTINED_FOR_TRAGEDY;
+	
+	/**
+	 * ID: 7550<br>
+	 * Message: $s1! You may follow me, but an Orc is no match for my giant's strength!
+	 */
+	public static final NpcStringId S1_YOU_MAY_FOLLOW_ME_BUT_AN_ORC_IS_NO_MATCH_FOR_MY_GIANTS_STRENGTH;
+	
+	/**
+	 * ID: 7551<br>
+	 * Message: Kuh...My body fails..This is the end!
+	 */
+	public static final NpcStringId KUHMY_BODY_FAILSTHIS_IS_THE_END;
+	
+	/**
+	 * ID: 7552<br>
+	 * Message: How could I lose with the powers of a giant? Aargh!!!
+	 */
+	public static final NpcStringId HOW_COULD_I_LOSE_WITH_THE_POWERS_OF_A_GIANT_AARGH;
+	
+	/**
+	 * ID: 7557<br>
+	 * Message: That's the enemy.
+	 */
+	public static final NpcStringId THATS_THE_ENEMY;
+	
+	/**
+	 * ID: 7558<br>
+	 * Message: Hmm.. $s1! Will you just stand there doing nothing?
+	 */
+	public static final NpcStringId HMM_S1_WILL_YOU_JUST_STAND_THERE_DOING_NOTHING;
+	
+	/**
+	 * ID: 7559<br>
+	 * Message: $s1. Nothing risked, nothing gained. Only those who fight enjoy the spoils of victory.
+	 */
+	public static final NpcStringId S1_NOTHING_RISKED_NOTHING_GAINED_ONLY_THOSE_WHO_FIGHT_ENJOY_THE_SPOILS_OF_VICTORY;
+	
+	/**
+	 * ID: 7560<br>
+	 * Message: A sword isn't jewelry, $s1. Don't you agree?
+	 */
+	public static final NpcStringId A_SWORD_ISNT_JEWELRY_S1_DONT_YOU_AGREE;
+	
+	/**
+	 * ID: 7561<br>
+	 * Message: With no fight, I have no reason to stay.
+	 */
+	public static final NpcStringId WITH_NO_FIGHT_I_HAVE_NO_REASON_TO_STAY;
+	
+	/**
+	 * ID: 7562<br>
+	 * Message: Miss...
+	 */
+	public static final NpcStringId MISS;
+	
+	/**
+	 * ID: 7563<br>
+	 * Message: Pick your battles wisely, or you'll regret it.
+	 */
+	public static final NpcStringId PICK_YOUR_BATTLES_WISELY_OR_YOULL_REGRET_IT;
+	
+	/**
+	 * ID: 7564<br>
+	 * Message: What a fool to challenge the giant of the Oroka tribe!
+	 */
+	public static final NpcStringId WHAT_A_FOOL_TO_CHALLENGE_THE_GIANT_OF_THE_OROKA_TRIBE;
+	
+	/**
+	 * ID: 7565<br>
+	 * Message: Running low on steam. I must withdraw.
+	 */
+	public static final NpcStringId RUNNING_LOW_ON_STEAM_I_MUST_WITHDRAW;
+	
+	/**
+	 * ID: 7566<br>
+	 * Message: $s1. You're the one who defeated Guardian Muhark!
+	 */
+	public static final NpcStringId S1_YOURE_THE_ONE_WHO_DEFEATED_GUARDIAN_MUHARK;
+	
+	/**
+	 * ID: 7567<br>
+	 * Message: $s1....! I must succeed...
+	 */
+	public static final NpcStringId S1_I_MUST_SUCCEED;
+	
+	/**
+	 * ID: 7650<br>
+	 * Message: $s1... Would you fight Uruz, who has reached the power of Azira?
+	 */
+	public static final NpcStringId S1_WOULD_YOU_FIGHT_URUZ_WHO_HAS_REACHED_THE_POWER_OF_AZIRA;
+	
+	/**
+	 * ID: 7651<br>
+	 * Message: I can't handle the power of Azira yet. First...
+	 */
+	public static final NpcStringId I_CANT_HANDLE_THE_POWER_OF_AZIRA_YET_FIRST;
+	
+	/**
+	 * ID: 7652<br>
+	 * Message: This can't be happening! I have the power of Azira! How could I fall so easily?
+	 */
+	public static final NpcStringId THIS_CANT_BE_HAPPENING_I_HAVE_THE_POWER_OF_AZIRA_HOW_COULD_I_FALL_SO_EASILY;
+	
+	/**
+	 * ID: 7657<br>
+	 * Message: Azira, born from the Evil Flame, I'll kill you with my bare hands!
+	 */
+	public static final NpcStringId AZIRA_BORN_FROM_THE_EVIL_FLAME_ILL_KILL_YOU_WITH_MY_BARE_HANDS;
+	
+	/**
+	 * ID: 7658<br>
+	 * Message: $s1! In the name of Khavatari Hubai, strike this evil with your fists!
+	 */
+	public static final NpcStringId S1_IN_THE_NAME_OF_KHAVATARI_HUBAI_STRIKE_THIS_EVIL_WITH_YOUR_FISTS;
+	
+	/**
+	 * ID: 7659<br>
+	 * Message: $s1! Attack from both sides! Hit hard!
+	 */
+	public static final NpcStringId S1_ATTACK_FROM_BOTH_SIDES_HIT_HARD;
+	
+	/**
+	 * ID: 7660<br>
+	 * Message: $s1! Strike with all your heart. It must work.
+	 */
+	public static final NpcStringId S1_STRIKE_WITH_ALL_YOUR_HEART_IT_MUST_WORK;
+	
+	/**
+	 * ID: 7661<br>
+	 * Message: Damn! It's time to go. Until next time.
+	 */
+	public static final NpcStringId DAMN_ITS_TIME_TO_GO_UNTIL_NEXT_TIME;
+	
+	/**
+	 * ID: 7662<br>
+	 * Message: Evil spirit of flame! I won't give up!
+	 */
+	public static final NpcStringId EVIL_SPIRIT_OF_FLAME_I_WONT_GIVE_UP;
+	
+	/**
+	 * ID: 7663<br>
+	 * Message: My fist works even on the evil spirit. Don't forget!
+	 */
+	public static final NpcStringId MY_FIST_WORKS_EVEN_ON_THE_EVIL_SPIRIT_DONT_FORGET;
+	
+	/**
+	 * ID: 7664<br>
+	 * Message: Foolish Khavatari...Do you think your power will work on me? I'm the source of your martial art!
+	 */
+	public static final NpcStringId FOOLISH_KHAVATARIDO_YOU_THINK_YOUR_POWER_WILL_WORK_ON_ME_IM_THE_SOURCE_OF_YOUR_MARTIAL_ART;
+	
+	/**
+	 * ID: 7665<br>
+	 * Message: No more games...
+	 */
+	public static final NpcStringId NO_MORE_GAMES;
+	
+	/**
+	 * ID: 7666<br>
+	 * Message: $s1...Are you next after Khavatari? Do you know who I am?
+	 */
+	public static final NpcStringId S1ARE_YOU_NEXT_AFTER_KHAVATARI_DO_YOU_KNOW_WHO_I_AM;
+	
+	/**
+	 * ID: 7667<br>
+	 * Message: $s1...Kashu. Not a bad attack. I can't hold on much longer.
+	 */
+	public static final NpcStringId S1KASHU_NOT_A_BAD_ATTACK_I_CANT_HOLD_ON_MUCH_LONGER;
+	
+	/**
+	 * ID: 7750<br>
+	 * Message: $s1, Akkan, you can't be my rival! I'll kill everything! I'll be the king!
+	 */
+	public static final NpcStringId S1_AKKAN_YOU_CANT_BE_MY_RIVAL_ILL_KILL_EVERYTHING_ILL_BE_THE_KING;
+	
+	/**
+	 * ID: 7751<br>
+	 * Message: Ha! I'll show mercy on you this time. I know well of your technique!
+	 */
+	public static final NpcStringId HA_ILL_SHOW_MERCY_ON_YOU_THIS_TIME_I_KNOW_WELL_OF_YOUR_TECHNIQUE;
+	
+	/**
+	 * ID: 7752<br>
+	 * Message: I have in me the blood of a king! How could I lose?!
+	 */
+	public static final NpcStringId I_HAVE_IN_ME_THE_BLOOD_OF_A_KING_HOW_COULD_I_LOSE;
+	
+	/**
+	 * ID: 7757<br>
+	 * Message: Are you....tyrant!
+	 */
+	public static final NpcStringId ARE_YOUTYRANT;
+	
+	/**
+	 * ID: 7758<br>
+	 * Message: You're not a king! You're just a tyrant! $s1, we must fight together!
+	 */
+	public static final NpcStringId YOURE_NOT_A_KING_YOURE_JUST_A_TYRANT_S1_WE_MUST_FIGHT_TOGETHER;
+	
+	/**
+	 * ID: 7759<br>
+	 * Message: Such rule is ruining the country! $s1, I can't bear this tyranny any longer!
+	 */
+	public static final NpcStringId SUCH_RULE_IS_RUINING_THE_COUNTRY_S1_I_CANT_BEAR_THIS_TYRANNY_ANY_LONGER;
+	
+	/**
+	 * ID: 7760<br>
+	 * Message: $s1, leaders must always resist tyranny!
+	 */
+	public static final NpcStringId S1_LEADERS_MUST_ALWAYS_RESIST_TYRANNY;
+	
+	/**
+	 * ID: 7761<br>
+	 * Message: I stayed too long. I'll be punished for being away so long.
+	 */
+	public static final NpcStringId I_STAYED_TOO_LONG_ILL_BE_PUNISHED_FOR_BEING_AWAY_SO_LONG;
+	
+	/**
+	 * ID: 7762<br>
+	 * Message: He got away, Dammit! We must catch this dark soul!
+	 */
+	public static final NpcStringId HE_GOT_AWAY_DAMMIT_WE_MUST_CATCH_THIS_DARK_SOUL;
+	
+	/**
+	 * ID: 7763<br>
+	 * Message: What is a king? What must one do to be a good king? Think it over.
+	 */
+	public static final NpcStringId WHAT_IS_A_KING_WHAT_MUST_ONE_DO_TO_BE_A_GOOD_KING_THINK_IT_OVER;
+	
+	/**
+	 * ID: 7764<br>
+	 * Message: Kneel down before me! Foolish people!
+	 */
+	public static final NpcStringId KNEEL_DOWN_BEFORE_ME_FOOLISH_PEOPLE;
+	
+	/**
+	 * ID: 7765<br>
+	 * Message: It's time for the king to leave! Bow your head and say goodbye!
+	 */
+	public static final NpcStringId ITS_TIME_FOR_THE_KING_TO_LEAVE_BOW_YOUR_HEAD_AND_SAY_GOODBYE;
+	
+	/**
+	 * ID: 7766<br>
+	 * Message: $s1! You dare to fight me? A king's power must be great to rule!
+	 */
+	public static final NpcStringId S1_YOU_DARE_TO_FIGHT_ME_A_KINGS_POWER_MUST_BE_GREAT_TO_RULE;
+	
+	/**
+	 * ID: 7767<br>
+	 * Message: You would fight the king, $s1? Traitor!
+	 */
+	public static final NpcStringId YOU_WOULD_FIGHT_THE_KING_S1_TRAITOR;
+	
+	/**
+	 * ID: 7850<br>
+	 * Message: Tejakar Sharuhi! $s1, I'll show you the power of Sharuhi Mouth Mudaha!
+	 */
+	public static final NpcStringId TEJAKAR_SHARUHI_S1_ILL_SHOW_YOU_THE_POWER_OF_SHARUHI_MOUTH_MUDAHA;
+	
+	/**
+	 * ID: 7851<br>
+	 * Message: Aaargh! My soul won't keep quiet. Now I must take my leave.
+	 */
+	public static final NpcStringId AAARGH_MY_SOUL_WONT_KEEP_QUIET_NOW_I_MUST_TAKE_MY_LEAVE;
+	
+	/**
+	 * ID: 7852<br>
+	 * Message: No, Sharuhi. You're soul is mine!
+	 */
+	public static final NpcStringId NO_SHARUHI_YOURE_SOUL_IS_MINE;
+	
+	/**
+	 * ID: 7857<br>
+	 * Message: Tejakar Oroca! Tejakar Duda-Mara!
+	 */
+	public static final NpcStringId TEJAKAR_OROCA_TEJAKAR_DUDA_MARA;
+	
+	/**
+	 * ID: 7858<br>
+	 * Message: $s1, we must fight this soul together to prevent an everlasting winter!
+	 */
+	public static final NpcStringId S1_WE_MUST_FIGHT_THIS_SOUL_TOGETHER_TO_PREVENT_AN_EVERLASTING_WINTER;
+	
+	/**
+	 * ID: 7859<br>
+	 * Message: $s1! The soul responds to you. May your attack quiet him!
+	 */
+	public static final NpcStringId S1_THE_SOUL_RESPONDS_TO_YOU_MAY_YOUR_ATTACK_QUIET_HIM;
+	
+	/**
+	 * ID: 7860<br>
+	 * Message: $s1! Calm Sharuhi! He doesn't listen to me anymore.
+	 */
+	public static final NpcStringId S1_CALM_SHARUHI_HE_DOESNT_LISTEN_TO_ME_ANYMORE;
+	
+	/**
+	 * ID: 7861<br>
+	 * Message: It's time to go! May the eternal flame bless you!
+	 */
+	public static final NpcStringId ITS_TIME_TO_GO_MAY_THE_ETERNAL_FLAME_BLESS_YOU;
+	
+	/**
+	 * ID: 7862<br>
+	 * Message: He left...That's too bad..Too bad...
+	 */
+	public static final NpcStringId HE_LEFTTHATS_TOO_BADTOO_BAD;
+	
+	/**
+	 * ID: 7863<br>
+	 * Message: Don't forget your strong will now!
+	 */
+	public static final NpcStringId DONT_FORGET_YOUR_STRONG_WILL_NOW;
+	
+	/**
+	 * ID: 7864<br>
+	 * Message: Ha! Nobody will rule over me anymore!
+	 */
+	public static final NpcStringId HA_NOBODY_WILL_RULE_OVER_ME_ANYMORE;
+	
+	/**
+	 * ID: 7865<br>
+	 * Message: Freedom... freedom... freedom!
+	 */
+	public static final NpcStringId FREEDOM_FREEDOM_FREEDOM;
+	
+	/**
+	 * ID: 7866<br>
+	 * Message: $s1, You released me, but you also want to catch me. Ha!
+	 */
+	public static final NpcStringId S1_YOU_RELEASED_ME_BUT_YOU_ALSO_WANT_TO_CATCH_ME_HA;
+	
+	/**
+	 * ID: 7867<br>
+	 * Message: ...$s1...Me?....All right...I'll help you.
+	 */
+	public static final NpcStringId S1MEALL_RIGHTILL_HELP_YOU;
+	
+	/**
+	 * ID: 7950<br>
+	 * Message: Get out of here! This place is forbidden by god.
+	 */
+	public static final NpcStringId GET_OUT_OF_HERE_THIS_PLACE_IS_FORBIDDEN_BY_GOD;
+	
+	/**
+	 * ID: 7951<br>
+	 * Message: Einhasad is calling me.
+	 */
+	public static final NpcStringId EINHASAD_IS_CALLING_ME;
+	
+	/**
+	 * ID: 7952<br>
+	 * Message: You killed me! Aren't you afraid of god's curse?
+	 */
+	public static final NpcStringId YOU_KILLED_ME_ARENT_YOU_AFRAID_OF_GODS_CURSE;
+	
+	/**
+	 * ID: 7953<br>
+	 * Message: You bother my minions, $s1. Do you want to die?
+	 */
+	public static final NpcStringId YOU_BOTHER_MY_MINIONS_S1_DO_YOU_WANT_TO_DIE;
+	
+	/**
+	 * ID: 7954<br>
+	 * Message: What the hell... I lost.
+	 */
+	public static final NpcStringId WHAT_THE_HELL_I_LOST;
+	
+	/**
+	 * ID: 7955<br>
+	 * Message: Who are you? Why are you interfering in our business?
+	 */
+	public static final NpcStringId WHO_ARE_YOU_WHY_ARE_YOU_INTERFERING_IN_OUR_BUSINESS;
+	
+	/**
+	 * ID: 7956<br>
+	 * Message: You're strong. I'll get you next time!
+	 */
+	public static final NpcStringId YOURE_STRONG_ILL_GET_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 7957<br>
+	 * Message: We meet again. I'll have you this time!
+	 */
+	public static final NpcStringId WE_MEET_AGAIN_ILL_HAVE_YOU_THIS_TIME;
+	
+	/**
+	 * ID: 7958<br>
+	 * Message: A worthy opponent. $s1. Help me!
+	 */
+	public static final NpcStringId A_WORTHY_OPPONENT_S1_HELP_ME;
+	
+	/**
+	 * ID: 7959<br>
+	 * Message: $s1! Hurry before he gets away!
+	 */
+	public static final NpcStringId S1_HURRY_BEFORE_HE_GETS_AWAY;
+	
+	/**
+	 * ID: 7960<br>
+	 * Message: I'll kill you!
+	 */
+	public static final NpcStringId ILL_KILL_YOU;
+	
+	/**
+	 * ID: 7961<br>
+	 * Message: Why don't you fight me someday?
+	 */
+	public static final NpcStringId WHY_DONT_YOU_FIGHT_ME_SOMEDAY;
+	
+	/**
+	 * ID: 7962<br>
+	 * Message: I missed again. Dammit!
+	 */
+	public static final NpcStringId I_MISSED_AGAIN_DAMMIT;
+	
+	/**
+	 * ID: 7963<br>
+	 * Message: I'm sure we'll meet again someday.
+	 */
+	public static final NpcStringId IM_SURE_WELL_MEET_AGAIN_SOMEDAY;
+	
+	/**
+	 * ID: 7964<br>
+	 * Message: Curse those who defy the gods!
+	 */
+	public static final NpcStringId CURSE_THOSE_WHO_DEFY_THE_GODS;
+	
+	/**
+	 * ID: 7966<br>
+	 * Message: You would fight me, a messenger of the gods?
+	 */
+	public static final NpcStringId YOU_WOULD_FIGHT_ME_A_MESSENGER_OF_THE_GODS;
+	
+	/**
+	 * ID: 7967<br>
+	 * Message: $s1! I won't forget you.
+	 */
+	public static final NpcStringId S1_I_WONT_FORGET_YOU;
+	
+	/**
+	 * ID: 8050<br>
+	 * Message: $s1! How could you desecrate a holy place?
+	 */
+	public static final NpcStringId S1_HOW_COULD_YOU_DESECRATE_A_HOLY_PLACE;
+	
+	/**
+	 * ID: 8051<br>
+	 * Message: Leave before you are severely punished!
+	 */
+	public static final NpcStringId LEAVE_BEFORE_YOU_ARE_SEVERELY_PUNISHED;
+	
+	/**
+	 * ID: 8052<br>
+	 * Message: Einhasad, don't give up on me!
+	 */
+	public static final NpcStringId EINHASAD_DONT_GIVE_UP_ON_ME;
+	
+	/**
+	 * ID: 8053<br>
+	 * Message: $s1, so you're the one who's looking for me?
+	 */
+	public static final NpcStringId S1_SO_YOURE_THE_ONE_WHOS_LOOKING_FOR_ME;
+	
+	/**
+	 * ID: 8054<br>
+	 * Message: A mere mortal has defeated me!
+	 */
+	public static final NpcStringId A_MERE_MORTAL_HAS_DEFEATED_ME;
+	
+	/**
+	 * ID: 8055<br>
+	 * Message: How cowardly to intrude in other people's business.
+	 */
+	public static final NpcStringId HOW_COWARDLY_TO_INTRUDE_IN_OTHER_PEOPLES_BUSINESS;
+	
+	/**
+	 * ID: 8056<br>
+	 * Message: Time is up.
+	 */
+	public static final NpcStringId TIME_IS_UP;
+	
+	/**
+	 * ID: 8057<br>
+	 * Message: I'll kill you with my sword!
+	 */
+	public static final NpcStringId ILL_KILL_YOU_WITH_MY_SWORD;
+	
+	/**
+	 * ID: 8058<br>
+	 * Message: Help me!
+	 */
+	public static final NpcStringId HELP_ME;
+	
+	/**
+	 * ID: 8059<br>
+	 * Message: Don't miss!
+	 */
+	public static final NpcStringId DONT_MISS;
+	
+	/**
+	 * ID: 8060<br>
+	 * Message: Keep pushing!
+	 */
+	public static final NpcStringId KEEP_PUSHING;
+	
+	/**
+	 * ID: 8061<br>
+	 * Message: I'll get him. You'll have your revenge.
+	 */
+	public static final NpcStringId ILL_GET_HIM_YOULL_HAVE_YOUR_REVENGE;
+	
+	/**
+	 * ID: 8062<br>
+	 * Message: I missed him again. I'll kill you.
+	 */
+	public static final NpcStringId I_MISSED_HIM_AGAIN_ILL_KILL_YOU;
+	
+	/**
+	 * ID: 8063<br>
+	 * Message: I must follow him.
+	 */
+	public static final NpcStringId I_MUST_FOLLOW_HIM;
+	
+	/**
+	 * ID: 8150<br>
+	 * Message: $s1, you should leave if you fear god's wrath!
+	 */
+	public static final NpcStringId S1_YOU_SHOULD_LEAVE_IF_YOU_FEAR_GODS_WRATH;
+	
+	/**
+	 * ID: 8151<br>
+	 * Message: What's going on?
+	 */
+	public static final NpcStringId WHATS_GOING_ON;
+	
+	/**
+	 * ID: 8152<br>
+	 * Message: I'll see you again!
+	 */
+	public static final NpcStringId ILL_SEE_YOU_AGAIN;
+	
+	/**
+	 * ID: 8153<br>
+	 * Message: Who are you? Why are you bothering my minions?
+	 */
+	public static final NpcStringId WHO_ARE_YOU_WHY_ARE_YOU_BOTHERING_MY_MINIONS;
+	
+	/**
+	 * ID: 8154<br>
+	 * Message: No way!!!
+	 */
+	public static final NpcStringId NO_WAY;
+	
+	/**
+	 * ID: 8155<br>
+	 * Message: Why are you sticking your nose in our business?
+	 */
+	public static final NpcStringId WHY_ARE_YOU_STICKING_YOUR_NOSE_IN_OUR_BUSINESS;
+	
+	/**
+	 * ID: 8156<br>
+	 * Message: Who are you? How can a creature from the netherworld be so powerful?
+	 */
+	public static final NpcStringId WHO_ARE_YOU_HOW_CAN_A_CREATURE_FROM_THE_NETHERWORLD_BE_SO_POWERFUL;
+	
+	/**
+	 * ID: 8157<br>
+	 * Message: Is this the end?
+	 */
+	public static final NpcStringId IS_THIS_THE_END;
+	
+	/**
+	 * ID: 8158<br>
+	 * Message: Show me what you're made of. Kill him!
+	 */
+	public static final NpcStringId SHOW_ME_WHAT_YOURE_MADE_OF_KILL_HIM;
+	
+	/**
+	 * ID: 8159<br>
+	 * Message: You think you can get him with that?
+	 */
+	public static final NpcStringId YOU_THINK_YOU_CAN_GET_HIM_WITH_THAT;
+	
+	/**
+	 * ID: 8160<br>
+	 * Message: Pull yourself together! He's trying to get away.
+	 */
+	public static final NpcStringId PULL_YOURSELF_TOGETHER_HES_TRYING_TO_GET_AWAY;
+	
+	/**
+	 * ID: 8161<br>
+	 * Message: Tell the Black Cat that I got his paid back.
+	 */
+	public static final NpcStringId TELL_THE_BLACK_CAT_THAT_I_GOT_HIS_PAID_BACK;
+	
+	/**
+	 * ID: 8162<br>
+	 * Message: Black Cat, he'll blame me.
+	 */
+	public static final NpcStringId BLACK_CAT_HELL_BLAME_ME;
+	
+	/**
+	 * ID: 8163<br>
+	 * Message: I gotta' go now.
+	 */
+	public static final NpcStringId I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 8166<br>
+	 * Message: I'll kill you in the name of god.
+	 */
+	public static final NpcStringId ILL_KILL_YOU_IN_THE_NAME_OF_GOD;
+	
+	/**
+	 * ID: 8167<br>
+	 * Message: $s1! See you later.
+	 */
+	public static final NpcStringId S1_SEE_YOU_LATER;
+	
+	/**
+	 * ID: 8251<br>
+	 * Message: Get out before you're punished!
+	 */
+	public static final NpcStringId GET_OUT_BEFORE_YOURE_PUNISHED;
+	
+	/**
+	 * ID: 8252<br>
+	 * Message: Einhasad, please don't give up on me!
+	 */
+	public static final NpcStringId EINHASAD_PLEASE_DONT_GIVE_UP_ON_ME;
+	
+	/**
+	 * ID: 8253<br>
+	 * Message: $s1, are you looking for me?
+	 */
+	public static final NpcStringId S1_ARE_YOU_LOOKING_FOR_ME;
+	
+	/**
+	 * ID: 8254<br>
+	 * Message: A mere mortal is killing me!
+	 */
+	public static final NpcStringId A_MERE_MORTAL_IS_KILLING_ME;
+	
+	/**
+	 * ID: 8256<br>
+	 * Message: Mortal, don't you recognize my greatness?
+	 */
+	public static final NpcStringId MORTAL_DONT_YOU_RECOGNIZE_MY_GREATNESS;
+	
+	/**
+	 * ID: 8257<br>
+	 * Message: I'll get you this time.
+	 */
+	public static final NpcStringId ILL_GET_YOU_THIS_TIME;
+	
+	/**
+	 * ID: 8258<br>
+	 * Message: I'll never forget the taste of his steel, $s1! Let's fight him together!
+	 */
+	public static final NpcStringId ILL_NEVER_FORGET_THE_TASTE_OF_HIS_STEEL_S1_LETS_FIGHT_HIM_TOGETHER;
+	
+	/**
+	 * ID: 8259<br>
+	 * Message: $s1! Pull yourself together. We'll miss him!
+	 */
+	public static final NpcStringId S1_PULL_YOURSELF_TOGETHER_WELL_MISS_HIM;
+	
+	/**
+	 * ID: 8260<br>
+	 * Message: $s1! He's trying to get away.
+	 */
+	public static final NpcStringId S1_HES_TRYING_TO_GET_AWAY;
+	
+	/**
+	 * ID: 8261<br>
+	 * Message: I missed again! Next time...
+	 */
+	public static final NpcStringId I_MISSED_AGAIN_NEXT_TIME;
+	
+	/**
+	 * ID: 8262<br>
+	 * Message: Dammit! Failed again!
+	 */
+	public static final NpcStringId DAMMIT_FAILED_AGAIN;
+	
+	/**
+	 * ID: 8353<br>
+	 * Message: You are the one who's looking for me, $s1?
+	 */
+	public static final NpcStringId YOU_ARE_THE_ONE_WHOS_LOOKING_FOR_ME_S1;
+	
+	/**
+	 * ID: 8354<br>
+	 * Message: A mere mortal has killed me!
+	 */
+	public static final NpcStringId A_MERE_MORTAL_HAS_KILLED_ME;
+	
+	/**
+	 * ID: 8355<br>
+	 * Message: Who are you? This is none of your business!
+	 */
+	public static final NpcStringId WHO_ARE_YOU_THIS_IS_NONE_OF_YOUR_BUSINESS;
+	
+	/**
+	 * ID: 8359<br>
+	 * Message: $s1! Pull yourself together.
+	 */
+	public static final NpcStringId S1_PULL_YOURSELF_TOGETHER;
+	
+	/**
+	 * ID: 8360<br>
+	 * Message: $s1! He'll get away!
+	 */
+	public static final NpcStringId S1_HELL_GET_AWAY;
+	
+	/**
+	 * ID: 8452<br>
+	 * Message: Einhasad, please don't forsake me!
+	 */
+	public static final NpcStringId EINHASAD_PLEASE_DONT_FORSAKE_ME;
+	
+	/**
+	 * ID: 8453<br>
+	 * Message: Looking for me, $s1?
+	 */
+	public static final NpcStringId LOOKING_FOR_ME_S1;
+	
+	/**
+	 * ID: 8550<br>
+	 * Message: $s1! Bishop, how foolish to go against the will of god!
+	 */
+	public static final NpcStringId S1_BISHOP_HOW_FOOLISH_TO_GO_AGAINST_THE_WILL_OF_GOD;
+	
+	/**
+	 * ID: 8551<br>
+	 * Message: Your faith is stronger than I thought. I'll pay you back next time.
+	 */
+	public static final NpcStringId YOUR_FAITH_IS_STRONGER_THAN_I_THOUGHT_ILL_PAY_YOU_BACK_NEXT_TIME;
+	
+	/**
+	 * ID: 8552<br>
+	 * Message: Tanakia! Forgive me. I couldn't fulfill your dream!
+	 */
+	public static final NpcStringId TANAKIA_FORGIVE_ME_I_COULDNT_FULFILL_YOUR_DREAM;
+	
+	/**
+	 * ID: 8553<br>
+	 * Message: $s1, you are the won who's been bothering my minions?
+	 */
+	public static final NpcStringId S1_YOU_ARE_THE_WON_WHOS_BEEN_BOTHERING_MY_MINIONS;
+	
+	/**
+	 * ID: 8554<br>
+	 * Message: Damn! You've beaten me.
+	 */
+	public static final NpcStringId DAMN_YOUVE_BEATEN_ME;
+	
+	/**
+	 * ID: 8555<br>
+	 * Message: Who are you? This isn't your business, coward.
+	 */
+	public static final NpcStringId WHO_ARE_YOU_THIS_ISNT_YOUR_BUSINESS_COWARD;
+	
+	/**
+	 * ID: 8556<br>
+	 * Message: How weak. I'll forgive you this time because you made me laugh.
+	 */
+	public static final NpcStringId HOW_WEAK_ILL_FORGIVE_YOU_THIS_TIME_BECAUSE_YOU_MADE_ME_LAUGH;
+	
+	/**
+	 * ID: 8557<br>
+	 * Message: You are stronger than I thought, but I'm no weakling!
+	 */
+	public static final NpcStringId YOU_ARE_STRONGER_THAN_I_THOUGHT_BUT_IM_NO_WEAKLING;
+	
+	/**
+	 * ID: 8558<br>
+	 * Message: He's got a tough shell. $s1! Let's fight together and crack his skull!
+	 */
+	public static final NpcStringId HES_GOT_A_TOUGH_SHELL_S1_LETS_FIGHT_TOGETHER_AND_CRACK_HIS_SKULL;
+	
+	/**
+	 * ID: 8560<br>
+	 * Message: $s1! We won't beat him unless we give it our all. Come on!
+	 */
+	public static final NpcStringId S1_WE_WONT_BEAT_HIM_UNLESS_WE_GIVE_IT_OUR_ALL_COME_ON;
+	
+	/**
+	 * ID: 8561<br>
+	 * Message: I'll follow him.
+	 */
+	public static final NpcStringId ILL_FOLLOW_HIM;
+	
+	/**
+	 * ID: 8562<br>
+	 * Message: I missed again! He's hard to follow.
+	 */
+	public static final NpcStringId I_MISSED_AGAIN_HES_HARD_TO_FOLLOW;
+	
+	/**
+	 * ID: 8563<br>
+	 * Message: We'll see what the future brings.
+	 */
+	public static final NpcStringId WELL_SEE_WHAT_THE_FUTURE_BRINGS;
+	
+	/**
+	 * ID: 8564<br>
+	 * Message: For Shilen!
+	 */
+	public static final NpcStringId FOR_SHILEN;
+	
+	/**
+	 * ID: 8565<br>
+	 * Message: I'll be back. I'll deal with you then.
+	 */
+	public static final NpcStringId ILL_BE_BACK_ILL_DEAL_WITH_YOU_THEN;
+	
+	/**
+	 * ID: 8566<br>
+	 * Message: $s1! Are you going to fight me?
+	 */
+	public static final NpcStringId S1_ARE_YOU_GOING_TO_FIGHT_ME;
+	
+	/**
+	 * ID: 8567<br>
+	 * Message: $s1! I'll pay you back. I won't forget you.
+	 */
+	public static final NpcStringId S1_ILL_PAY_YOU_BACK_I_WONT_FORGET_YOU;
+	
+	/**
+	 * ID: 8650<br>
+	 * Message: $s1! Prophet, how foolish to go against the will of god!
+	 */
+	public static final NpcStringId S1_PROPHET_HOW_FOOLISH_TO_GO_AGAINST_THE_WILL_OF_GOD;
+	
+	/**
+	 * ID: 8651<br>
+	 * Message: Your faith is stronger than I thought. I'll deal with you next time.
+	 */
+	public static final NpcStringId YOUR_FAITH_IS_STRONGER_THAN_I_THOUGHT_ILL_DEAL_WITH_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 8653<br>
+	 * Message: Are you the one who's been bothering my minions, $s1?
+	 */
+	public static final NpcStringId ARE_YOU_THE_ONE_WHOS_BEEN_BOTHERING_MY_MINIONS_S1;
+	
+	/**
+	 * ID: 8654<br>
+	 * Message: Damn! I can't believe I've been beaten by you!
+	 */
+	public static final NpcStringId DAMN_I_CANT_BELIEVE_IVE_BEEN_BEATEN_BY_YOU;
+	
+	/**
+	 * ID: 8655<br>
+	 * Message: Who are you? This is none of your business, coward.
+	 */
+	public static final NpcStringId WHO_ARE_YOU_THIS_IS_NONE_OF_YOUR_BUSINESS_COWARD;
+	
+	/**
+	 * ID: 8657<br>
+	 * Message: I'll destroy the darkness surrounding the world with the power of light!
+	 */
+	public static final NpcStringId ILL_DESTROY_THE_DARKNESS_SURROUNDING_THE_WORLD_WITH_THE_POWER_OF_LIGHT;
+	
+	/**
+	 * ID: 8658<br>
+	 * Message: $s1! Fight the Fallen Angel with me. Show the true power of light!
+	 */
+	public static final NpcStringId S1_FIGHT_THE_FALLEN_ANGEL_WITH_ME_SHOW_THE_TRUE_POWER_OF_LIGHT;
+	
+	/**
+	 * ID: 8659<br>
+	 * Message: $s1! Go! We must stop fighting here.
+	 */
+	public static final NpcStringId S1_GO_WE_MUST_STOP_FIGHTING_HERE;
+	
+	/**
+	 * ID: 8660<br>
+	 * Message: We mustn't lose, $s1! Pull yourself together!
+	 */
+	public static final NpcStringId WE_MUSTNT_LOSE_S1_PULL_YOURSELF_TOGETHER;
+	
+	/**
+	 * ID: 8661<br>
+	 * Message: We'll meet again if fate wills it.
+	 */
+	public static final NpcStringId WELL_MEET_AGAIN_IF_FATE_WILLS_IT;
+	
+	/**
+	 * ID: 8662<br>
+	 * Message: I'll follow the cowardly devil.
+	 */
+	public static final NpcStringId ILL_FOLLOW_THE_COWARDLY_DEVIL;
+	
+	/**
+	 * ID: 8750<br>
+	 * Message: $s1! Elder, it's foolish of you to go against the will of the gods.
+	 */
+	public static final NpcStringId S1_ELDER_ITS_FOOLISH_OF_YOU_TO_GO_AGAINST_THE_WILL_OF_THE_GODS;
+	
+	/**
+	 * ID: 8757<br>
+	 * Message: You're stronger than I thought, but I'm no weakling either!
+	 */
+	public static final NpcStringId YOURE_STRONGER_THAN_I_THOUGHT_BUT_IM_NO_WEAKLING_EITHER;
+	
+	/**
+	 * ID: 8760<br>
+	 * Message: $s1! We'll never win unless we give it our all. Come on!
+	 */
+	public static final NpcStringId S1_WELL_NEVER_WIN_UNLESS_WE_GIVE_IT_OUR_ALL_COME_ON;
+	
+	/**
+	 * ID: 8850<br>
+	 * Message: Are you $s1? Oh! I have the Resonance Amulet!
+	 */
+	public static final NpcStringId ARE_YOU_S1_OH_I_HAVE_THE_RESONANCE_AMULET;
+	
+	/**
+	 * ID: 8851<br>
+	 * Message: You're feistier than I thought! I'll quit here for today.
+	 */
+	public static final NpcStringId YOURE_FEISTIER_THAN_I_THOUGHT_ILL_QUIT_HERE_FOR_TODAY;
+	
+	/**
+	 * ID: 8852<br>
+	 * Message: Aaargh! I can't believe I lost...
+	 */
+	public static final NpcStringId AAARGH_I_CANT_BELIEVE_I_LOST;
+	
+	/**
+	 * ID: 8854<br>
+	 * Message: Yikes! You're tough!
+	 */
+	public static final NpcStringId YIKES_YOURE_TOUGH;
+	
+	/**
+	 * ID: 8855<br>
+	 * Message: Why do you interfere in other people's business...
+	 */
+	public static final NpcStringId WHY_DO_YOU_INTERFERE_IN_OTHER_PEOPLES_BUSINESS;
+	
+	/**
+	 * ID: 8856<br>
+	 * Message: I'll stop here for today.
+	 */
+	public static final NpcStringId ILL_STOP_HERE_FOR_TODAY;
+	
+	/**
+	 * ID: 8857<br>
+	 * Message: I won't miss you this time!
+	 */
+	public static final NpcStringId I_WONT_MISS_YOU_THIS_TIME;
+	
+	/**
+	 * ID: 8858<br>
+	 * Message: Dammit! This is too hard by myself... $s1! Give me a hand!
+	 */
+	public static final NpcStringId DAMMIT_THIS_IS_TOO_HARD_BY_MYSELF_S1_GIVE_ME_A_HAND;
+	
+	/**
+	 * ID: 8859<br>
+	 * Message: $s1! Hurry up, we'll miss him.
+	 */
+	public static final NpcStringId S1_HURRY_UP_WELL_MISS_HIM;
+	
+	/**
+	 * ID: 8860<br>
+	 * Message: $s1! Come on. Hurry up!
+	 */
+	public static final NpcStringId S1_COME_ON_HURRY_UP;
+	
+	/**
+	 * ID: 8861<br>
+	 * Message: I gotta' go follow him.
+	 */
+	public static final NpcStringId I_GOTTA_GO_FOLLOW_HIM;
+	
+	/**
+	 * ID: 8862<br>
+	 * Message: Hey, quit running! Stop!
+	 */
+	public static final NpcStringId HEY_QUIT_RUNNING_STOP;
+	
+	/**
+	 * ID: 8863<br>
+	 * Message: See you next time~
+	 */
+	public static final NpcStringId SEE_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 8864<br>
+	 * Message: What? Think you can get in my way?
+	 */
+	public static final NpcStringId WHAT_THINK_YOU_CAN_GET_IN_MY_WAY;
+	
+	/**
+	 * ID: 8865<br>
+	 * Message: You are so weak. I gotta' go now!
+	 */
+	public static final NpcStringId YOU_ARE_SO_WEAK_I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 8866<br>
+	 * Message: $s1! Good. I'll help you.
+	 */
+	public static final NpcStringId S1_GOOD_ILL_HELP_YOU;
+	
+	/**
+	 * ID: 8867<br>
+	 * Message: $s1, you're stronger than I thought. See you next time.
+	 */
+	public static final NpcStringId S1_YOURE_STRONGER_THAN_I_THOUGHT_SEE_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 8951<br>
+	 * Message: You're feistier than I thought! I'll stop here today.
+	 */
+	public static final NpcStringId YOURE_FEISTIER_THAN_I_THOUGHT_ILL_STOP_HERE_TODAY;
+	
+	/**
+	 * ID: 8952<br>
+	 * Message: Aargh! I can't believe I lost...
+	 */
+	public static final NpcStringId AARGH_I_CANT_BELIEVE_I_LOST;
+	
+	/**
+	 * ID: 8956<br>
+	 * Message: I'll stop here today.
+	 */
+	public static final NpcStringId ILL_STOP_HERE_TODAY;
+	
+	/**
+	 * ID: 8958<br>
+	 * Message: Damn! It's too much by myself...$s1! Give me a hand!
+	 */
+	public static final NpcStringId DAMN_ITS_TOO_MUCH_BY_MYSELFS1_GIVE_ME_A_HAND;
+	
+	/**
+	 * ID: 8959<br>
+	 * Message: $s1! Hurry, we'll miss him.
+	 */
+	public static final NpcStringId S1_HURRY_WELL_MISS_HIM;
+	
+	/**
+	 * ID: 8960<br>
+	 * Message: $s1! Hurry, please!
+	 */
+	public static final NpcStringId S1_HURRY_PLEASE;
+	
+	/**
+	 * ID: 8961<br>
+	 * Message: I gotta' go follow him now.
+	 */
+	public static final NpcStringId I_GOTTA_GO_FOLLOW_HIM_NOW;
+	
+	/**
+	 * ID: 8962<br>
+	 * Message: Are you running away? Stop!
+	 */
+	public static final NpcStringId ARE_YOU_RUNNING_AWAY_STOP;
+	
+	/**
+	 * ID: 8964<br>
+	 * Message: Do you think you can stop me?
+	 */
+	public static final NpcStringId DO_YOU_THINK_YOU_CAN_STOP_ME;
+	
+	/**
+	 * ID: 8965<br>
+	 * Message: You're so weak. I gotta' go now...
+	 */
+	public static final NpcStringId YOURE_SO_WEAK_I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 8966<br>
+	 * Message: You're $s1! Good. I'll help you.
+	 */
+	public static final NpcStringId YOURE_S1_GOOD_ILL_HELP_YOU;
+	
+	/**
+	 * ID: 9050<br>
+	 * Message: Are you $s1? Oh! I have a Resonance Amulet!
+	 */
+	public static final NpcStringId ARE_YOU_S1_OH_I_HAVE_A_RESONANCE_AMULET;
+	
+	/**
+	 * ID: 9051<br>
+	 * Message: Hey, you're more tenacious than I thought! I'll stop here today.
+	 */
+	public static final NpcStringId HEY_YOURE_MORE_TENACIOUS_THAN_I_THOUGHT_ILL_STOP_HERE_TODAY;
+	
+	/**
+	 * ID: 9058<br>
+	 * Message: Dammit! I can't do this alone, $s1! Give me a hand!
+	 */
+	public static final NpcStringId DAMMIT_I_CANT_DO_THIS_ALONE_S1_GIVE_ME_A_HAND;
+	
+	/**
+	 * ID: 9059<br>
+	 * Message: $s1! Hurry or we'll miss him.
+	 */
+	public static final NpcStringId S1_HURRY_OR_WELL_MISS_HIM;
+	
+	/**
+	 * ID: 9060<br>
+	 * Message: $s1! Hurry up!
+	 */
+	public static final NpcStringId S1_HURRY_UP;
+	
+	/**
+	 * ID: 9061<br>
+	 * Message: I gotta' follow him now.
+	 */
+	public static final NpcStringId I_GOTTA_FOLLOW_HIM_NOW;
+	
+	/**
+	 * ID: 9062<br>
+	 * Message: Hey, are you running? Stop!
+	 */
+	public static final NpcStringId HEY_ARE_YOU_RUNNING_STOP;
+	
+	/**
+	 * ID: 9066<br>
+	 * Message: Oh! You're $s1! Good. I'll help you.
+	 */
+	public static final NpcStringId OH_YOURE_S1_GOOD_ILL_HELP_YOU;
+	
+	/**
+	 * ID: 9150<br>
+	 * Message: You carouse with evil spirits, $s1! You're not worthy of the holy wisdom!
+	 */
+	public static final NpcStringId YOU_CAROUSE_WITH_EVIL_SPIRITS_S1_YOURE_NOT_WORTHY_OF_THE_HOLY_WISDOM;
+	
+	/**
+	 * ID: 9151<br>
+	 * Message: You're so stubborn! I can't boss you around any more, can I?
+	 */
+	public static final NpcStringId YOURE_SO_STUBBORN_I_CANT_BOSS_YOU_AROUND_ANY_MORE_CAN_I;
+	
+	/**
+	 * ID: 9152<br>
+	 * Message: How could it happen? Defeated by a Human!
+	 */
+	public static final NpcStringId HOW_COULD_IT_HAPPEN_DEFEATED_BY_A_HUMAN;
+	
+	/**
+	 * ID: 9157<br>
+	 * Message: My master sent me here! I'll give you a hand.
+	 */
+	public static final NpcStringId MY_MASTER_SENT_ME_HERE_ILL_GIVE_YOU_A_HAND;
+	
+	/**
+	 * ID: 9158<br>
+	 * Message: Meow~! Master $s1, help me!
+	 */
+	public static final NpcStringId MEOW_MASTER_S1_HELP_ME;
+	
+	/**
+	 * ID: 9159<br>
+	 * Message: Master $s1. Punish him so he can't bother Belinda!
+	 */
+	public static final NpcStringId MASTER_S1_PUNISH_HIM_SO_HE_CANT_BOTHER_BELINDA;
+	
+	/**
+	 * ID: 9160<br>
+	 * Message: Master $s1, We'll miss him!
+	 */
+	public static final NpcStringId MASTER_S1_WELL_MISS_HIM;
+	
+	/**
+	 * ID: 9161<br>
+	 * Message: Meow~! My master is calling. Meow! I gotta' go now~!
+	 */
+	public static final NpcStringId MEOW_MY_MASTER_IS_CALLING_MEOW_I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 9162<br>
+	 * Message: Meow~! I missed him. Meow!
+	 */
+	public static final NpcStringId MEOW_I_MISSED_HIM_MEOW;
+	
+	/**
+	 * ID: 9163<br>
+	 * Message: Good luck! Meow~! I gotta' go now.
+	 */
+	public static final NpcStringId GOOD_LUCK_MEOW_I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 9164<br>
+	 * Message: Curiosity killed the cat? I'll show you!
+	 */
+	public static final NpcStringId CURIOSITY_KILLED_THE_CAT_ILL_SHOW_YOU;
+	
+	/**
+	 * ID: 9165<br>
+	 * Message: That's all for today...!
+	 */
+	public static final NpcStringId THATS_ALL_FOR_TODAY;
+	
+	/**
+	 * ID: 9166<br>
+	 * Message: Are you trying to take Belinda from me, $s1? I'll show you!
+	 */
+	public static final NpcStringId ARE_YOU_TRYING_TO_TAKE_BELINDA_FROM_ME_S1_ILL_SHOW_YOU;
+	
+	/**
+	 * ID: 9167<br>
+	 * Message: Belinda! I love you! Yikes!!!
+	 */
+	public static final NpcStringId BELINDA_I_LOVE_YOU_YIKES;
+	
+	/**
+	 * ID: 9251<br>
+	 * Message: You're stubborn as a mule! Guess I can't boss you around any more!
+	 */
+	public static final NpcStringId YOURE_STUBBORN_AS_A_MULE_GUESS_I_CANT_BOSS_YOU_AROUND_ANY_MORE;
+	
+	/**
+	 * ID: 9252<br>
+	 * Message: How could it be?...Defeated by an Elf!
+	 */
+	public static final NpcStringId HOW_COULD_IT_BEDEFEATED_BY_AN_ELF;
+	
+	/**
+	 * ID: 9257<br>
+	 * Message: I came to help you. It's the will of Radyss.
+	 */
+	public static final NpcStringId I_CAME_TO_HELP_YOU_ITS_THE_WILL_OF_RADYSS;
+	
+	/**
+	 * ID: 9258<br>
+	 * Message: $s1! Fight with me!
+	 */
+	public static final NpcStringId S1_FIGHT_WITH_ME;
+	
+	/**
+	 * ID: 9259<br>
+	 * Message: $s1! We must defeat him!
+	 */
+	public static final NpcStringId S1_WE_MUST_DEFEAT_HIM;
+	
+	/**
+	 * ID: 9260<br>
+	 * Message: $s1. There's no time. We must defeat him!
+	 */
+	public static final NpcStringId S1_THERES_NO_TIME_WE_MUST_DEFEAT_HIM;
+	
+	/**
+	 * ID: 9261<br>
+	 * Message: Radyss is calling me. I gotta' go now.
+	 */
+	public static final NpcStringId RADYSS_IS_CALLING_ME_I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 9262<br>
+	 * Message: I was unable to avenge my brother.
+	 */
+	public static final NpcStringId I_WAS_UNABLE_TO_AVENGE_MY_BROTHER;
+	
+	/**
+	 * ID: 9263<br>
+	 * Message: May you be blessed.
+	 */
+	public static final NpcStringId MAY_YOU_BE_BLESSED;
+	
+	/**
+	 * ID: 9264<br>
+	 * Message: The proud, repent! The foolish, awaken! Sinners, die!
+	 */
+	public static final NpcStringId THE_PROUD_REPENT_THE_FOOLISH_AWAKEN_SINNERS_DIE;
+	
+	/**
+	 * ID: 9265<br>
+	 * Message: Hell's master is calling. Atonement will have to wait!
+	 */
+	public static final NpcStringId HELLS_MASTER_IS_CALLING_ATONEMENT_WILL_HAVE_TO_WAIT;
+	
+	/**
+	 * ID: 9266<br>
+	 * Message: $s1, I'll remember your name, heathen.
+	 */
+	public static final NpcStringId S1_ILL_REMEMBER_YOUR_NAME_HEATHEN;
+	
+	/**
+	 * ID: 9267<br>
+	 * Message: I won't forget the name of one who doesn't obey holy judgment, $s1!
+	 */
+	public static final NpcStringId I_WONT_FORGET_THE_NAME_OF_ONE_WHO_DOESNT_OBEY_HOLY_JUDGMENT_S1;
+	
+	/**
+	 * ID: 9351<br>
+	 * Message: You're stubborn as a mule! I guess I can't boss you around any more!
+	 */
+	public static final NpcStringId YOURE_STUBBORN_AS_A_MULE_I_GUESS_I_CANT_BOSS_YOU_AROUND_ANY_MORE;
+	
+	/**
+	 * ID: 9352<br>
+	 * Message: Could it be...? Defeated by a Dark Elf!
+	 */
+	public static final NpcStringId COULD_IT_BE_DEFEATED_BY_A_DARK_ELF;
+	
+	/**
+	 * ID: 9357<br>
+	 * Message: Shadow Summoner, I came here to help you.
+	 */
+	public static final NpcStringId SHADOW_SUMMONER_I_CAME_HERE_TO_HELP_YOU;
+	
+	/**
+	 * ID: 9358<br>
+	 * Message: Shadow Summoner, $s1! Fight with me!
+	 */
+	public static final NpcStringId SHADOW_SUMMONER_S1_FIGHT_WITH_ME;
+	
+	/**
+	 * ID: 9359<br>
+	 * Message: $s1, You'll die if you don't kill him!
+	 */
+	public static final NpcStringId S1_YOULL_DIE_IF_YOU_DONT_KILL_HIM;
+	
+	/**
+	 * ID: 9360<br>
+	 * Message: Hurry, $s1! Don't miss him!
+	 */
+	public static final NpcStringId HURRY_S1_DONT_MISS_HIM;
+	
+	/**
+	 * ID: 9361<br>
+	 * Message: I can't hold on any longer...
+	 */
+	public static final NpcStringId I_CANT_HOLD_ON_ANY_LONGER;
+	
+	/**
+	 * ID: 9362<br>
+	 * Message: After all that...I missed him...
+	 */
+	public static final NpcStringId AFTER_ALL_THATI_MISSED_HIM;
+	
+	/**
+	 * ID: 9363<br>
+	 * Message: Shadow summoner! May you be blessed!
+	 */
+	public static final NpcStringId SHADOW_SUMMONER_MAY_YOU_BE_BLESSED;
+	
+	/**
+	 * ID: 9364<br>
+	 * Message: My master sent me here to kill you!
+	 */
+	public static final NpcStringId MY_MASTER_SENT_ME_HERE_TO_KILL_YOU;
+	
+	/**
+	 * ID: 9365<br>
+	 * Message: The shadow is calling me...
+	 */
+	public static final NpcStringId THE_SHADOW_IS_CALLING_ME;
+	
+	/**
+	 * ID: 9366<br>
+	 * Message: $s1, you want to die early? I'll send you to the darkness!
+	 */
+	public static final NpcStringId S1_YOU_WANT_TO_DIE_EARLY_ILL_SEND_YOU_TO_THE_DARKNESS;
+	
+	/**
+	 * ID: 9367<br>
+	 * Message: You deal in darkness, $s1! I'll pay you back.
+	 */
+	public static final NpcStringId YOU_DEAL_IN_DARKNESS_S1_ILL_PAY_YOU_BACK;
+	
+	/**
+	 * ID: 9450<br>
+	 * Message: You're $s1? I won't be like Hindemith!
+	 */
+	public static final NpcStringId YOURE_S1_I_WONT_BE_LIKE_HINDEMITH;
+	
+	/**
+	 * ID: 9451<br>
+	 * Message: You're feistier than I thought! I'll stop here for today.
+	 */
+	public static final NpcStringId YOURE_FEISTIER_THAN_I_THOUGHT_ILL_STOP_HERE_FOR_TODAY;
+	
+	/**
+	 * ID: 9453<br>
+	 * Message: Are you the one who is bothering my minions, $s1?
+	 */
+	public static final NpcStringId ARE_YOU_THE_ONE_WHO_IS_BOTHERING_MY_MINIONS_S1;
+	
+	/**
+	 * ID: 9457<br>
+	 * Message: I can't let you commune with Tablet of Vision! Give me the Resonance Amulet!
+	 */
+	public static final NpcStringId I_CANT_LET_YOU_COMMUNE_WITH_TABLET_OF_VISION_GIVE_ME_THE_RESONANCE_AMULET;
+	
+	/**
+	 * ID: 9460<br>
+	 * Message: $s1! Please hurry!
+	 */
+	public static final NpcStringId S1_PLEASE_HURRY;
+	
+	/**
+	 * ID: 9461<br>
+	 * Message: I must follow him now.
+	 */
+	public static final NpcStringId I_MUST_FOLLOW_HIM_NOW;
+	
+	/**
+	 * ID: 9462<br>
+	 * Message: Are you running? Stop!
+	 */
+	public static final NpcStringId ARE_YOU_RUNNING_STOP;
+	
+	/**
+	 * ID: 9464<br>
+	 * Message: Are you betraying me? I thought something was wrong...I'll stop here.
+	 */
+	public static final NpcStringId ARE_YOU_BETRAYING_ME_I_THOUGHT_SOMETHING_WAS_WRONGILL_STOP_HERE;
+	
+	/**
+	 * ID: 9466<br>
+	 * Message: You're $s1? Even two of you can't stop me!
+	 */
+	public static final NpcStringId YOURE_S1_EVEN_TWO_OF_YOU_CANT_STOP_ME;
+	
+	/**
+	 * ID: 9467<br>
+	 * Message: Dammit! My Resonance Amulet...$s1, I'll never forget to pay you back.
+	 */
+	public static final NpcStringId DAMMIT_MY_RESONANCE_AMULETS1_ILL_NEVER_FORGET_TO_PAY_YOU_BACK;
+	
+	/**
+	 * ID: 9550<br>
+	 * Message: Are you... $s1? I won't be like Waldstein!
+	 */
+	public static final NpcStringId ARE_YOU_S1_I_WONT_BE_LIKE_WALDSTEIN;
+	
+	/**
+	 * ID: 9552<br>
+	 * Message: Yikes! I can't believe I lost...
+	 */
+	public static final NpcStringId YIKES_I_CANT_BELIEVE_I_LOST;
+	
+	/**
+	 * ID: 9553<br>
+	 * Message: Are you the one bothering my minions, $s1?
+	 */
+	public static final NpcStringId ARE_YOU_THE_ONE_BOTHERING_MY_MINIONS_S1;
+	
+	/**
+	 * ID: 9557<br>
+	 * Message: You can't commune with the Tablet of Vision! Give me the Resonance Amulet!
+	 */
+	public static final NpcStringId YOU_CANT_COMMUNE_WITH_THE_TABLET_OF_VISION_GIVE_ME_THE_RESONANCE_AMULET;
+	
+	/**
+	 * ID: 9567<br>
+	 * Message: Dammit! My Resonance Amulet...$s1, I'll never forget this.
+	 */
+	public static final NpcStringId DAMMIT_MY_RESONANCE_AMULETS1_ILL_NEVER_FORGET_THIS;
+	
+	/**
+	 * ID: 9650<br>
+	 * Message: You're $s1? I'll kill you for Hallate!
+	 */
+	public static final NpcStringId YOURE_S1_ILL_KILL_YOU_FOR_HALLATE;
+	
+	/**
+	 * ID: 9651<br>
+	 * Message: You're tougher than I thought, but you still can't rival me!
+	 */
+	public static final NpcStringId YOURE_TOUGHER_THAN_I_THOUGHT_BUT_YOU_STILL_CANT_RIVAL_ME;
+	
+	/**
+	 * ID: 9652<br>
+	 * Message: Hallate! Forgive me! I can't help you.
+	 */
+	public static final NpcStringId HALLATE_FORGIVE_ME_I_CANT_HELP_YOU;
+	
+	/**
+	 * ID: 9654<br>
+	 * Message: Dammit! I can't believe you beat me!
+	 */
+	public static final NpcStringId DAMMIT_I_CANT_BELIEVE_YOU_BEAT_ME;
+	
+	/**
+	 * ID: 9655<br>
+	 * Message: Who are you? Mind your own business, coward.
+	 */
+	public static final NpcStringId WHO_ARE_YOU_MIND_YOUR_OWN_BUSINESS_COWARD;
+	
+	/**
+	 * ID: 9657<br>
+	 * Message: Purgatory Lord, I won't fail this time.
+	 */
+	public static final NpcStringId PURGATORY_LORD_I_WONT_FAIL_THIS_TIME;
+	
+	/**
+	 * ID: 9658<br>
+	 * Message: $s1! Now's the time to put your training to the test!
+	 */
+	public static final NpcStringId S1_NOWS_THE_TIME_TO_PUT_YOUR_TRAINING_TO_THE_TEST;
+	
+	/**
+	 * ID: 9659<br>
+	 * Message: $s1! Your sword skills can't be that bad.
+	 */
+	public static final NpcStringId S1_YOUR_SWORD_SKILLS_CANT_BE_THAT_BAD;
+	
+	/**
+	 * ID: 9660<br>
+	 * Message: $s1! Show your strength!
+	 */
+	public static final NpcStringId S1_SHOW_YOUR_STRENGTH;
+	
+	/**
+	 * ID: 9661<br>
+	 * Message: I have some pressing business. I have to go.
+	 */
+	public static final NpcStringId I_HAVE_SOME_PRESSING_BUSINESS_I_HAVE_TO_GO;
+	
+	/**
+	 * ID: 9662<br>
+	 * Message: I missed him! Dammit.
+	 */
+	public static final NpcStringId I_MISSED_HIM_DAMMIT;
+	
+	/**
+	 * ID: 9663<br>
+	 * Message: Try again sometime.
+	 */
+	public static final NpcStringId TRY_AGAIN_SOMETIME;
+	
+	/**
+	 * ID: 9664<br>
+	 * Message: I'll kill anyone who gets in my way!
+	 */
+	public static final NpcStringId ILL_KILL_ANYONE_WHO_GETS_IN_MY_WAY;
+	
+	/**
+	 * ID: 9665<br>
+	 * Message: This is pathetic! You make me laugh.
+	 */
+	public static final NpcStringId THIS_IS_PATHETIC_YOU_MAKE_ME_LAUGH;
+	
+	/**
+	 * ID: 9666<br>
+	 * Message: $s1! Are you trying to get in my way?
+	 */
+	public static final NpcStringId S1_ARE_YOU_TRYING_TO_GET_IN_MY_WAY;
+	
+	/**
+	 * ID: 9667<br>
+	 * Message: $s1! When I come back, I'll kill you.
+	 */
+	public static final NpcStringId S1_WHEN_I_COME_BACK_ILL_KILL_YOU;
+	
+	/**
+	 * ID: 9750<br>
+	 * Message: $s1? Wake up! Time to die!
+	 */
+	public static final NpcStringId S1_WAKE_UP_TIME_TO_DIE;
+	
+	/**
+	 * ID: 9751<br>
+	 * Message: You're tougher than I thought! I'll be back!
+	 */
+	public static final NpcStringId YOURE_TOUGHER_THAN_I_THOUGHT_ILL_BE_BACK;
+	
+	/**
+	 * ID: 9752<br>
+	 * Message: I lost? It can't be!
+	 */
+	public static final NpcStringId I_LOST_IT_CANT_BE;
+	
+	/**
+	 * ID: 9757<br>
+	 * Message: You're a cunning fiend. I won't fail again.
+	 */
+	public static final NpcStringId YOURE_A_CUNNING_FIEND_I_WONT_FAIL_AGAIN;
+	
+	/**
+	 * ID: 9758<br>
+	 * Message: $s1! It's after you! Fight!
+	 */
+	public static final NpcStringId S1_ITS_AFTER_YOU_FIGHT;
+	
+	/**
+	 * ID: 9759<br>
+	 * Message: $s1! You have to fight better than that if you expect to survive!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_TO_FIGHT_BETTER_THAN_THAT_IF_YOU_EXPECT_TO_SURVIVE;
+	
+	/**
+	 * ID: 9760<br>
+	 * Message: $s1! Pull yourself together. Fight!
+	 */
+	public static final NpcStringId S1_PULL_YOURSELF_TOGETHER_FIGHT;
+	
+	/**
+	 * ID: 9761<br>
+	 * Message: I'll catch the cunning fiend.
+	 */
+	public static final NpcStringId ILL_CATCH_THE_CUNNING_FIEND;
+	
+	/**
+	 * ID: 9762<br>
+	 * Message: I missed him again! He's clever!
+	 */
+	public static final NpcStringId I_MISSED_HIM_AGAIN_HES_CLEVER;
+	
+	/**
+	 * ID: 9763<br>
+	 * Message: Don't cower like a puppy next time!
+	 */
+	public static final NpcStringId DONT_COWER_LIKE_A_PUPPY_NEXT_TIME;
+	
+	/**
+	 * ID: 9764<br>
+	 * Message: I have only one goal. Get out of my way.
+	 */
+	public static final NpcStringId I_HAVE_ONLY_ONE_GOAL_GET_OUT_OF_MY_WAY;
+	
+	/**
+	 * ID: 9765<br>
+	 * Message: Just wait. You'll get yours!
+	 */
+	public static final NpcStringId JUST_WAIT_YOULL_GET_YOURS;
+	
+	/**
+	 * ID: 9766<br>
+	 * Message: $s1! You're a coward, aren't you!
+	 */
+	public static final NpcStringId S1_YOURE_A_COWARD_ARENT_YOU;
+	
+	/**
+	 * ID: 9767<br>
+	 * Message: $s1! I'll kill you next time.
+	 */
+	public static final NpcStringId S1_ILL_KILL_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 9850<br>
+	 * Message: $s1! How foolish to act against the will of god.
+	 */
+	public static final NpcStringId S1_HOW_FOOLISH_TO_ACT_AGAINST_THE_WILL_OF_GOD;
+	
+	/**
+	 * ID: 9851<br>
+	 * Message: Your faith is stronger than I thought. I'll get you next time.
+	 */
+	public static final NpcStringId YOUR_FAITH_IS_STRONGER_THAN_I_THOUGHT_ILL_GET_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 9855<br>
+	 * Message: Who are you? Mind your own business, you coward!
+	 */
+	public static final NpcStringId WHO_ARE_YOU_MIND_YOUR_OWN_BUSINESS_YOU_COWARD;
+	
+	/**
+	 * ID: 9857<br>
+	 * Message: Tanakia, your lie has already been exposed!
+	 */
+	public static final NpcStringId TANAKIA_YOUR_LIE_HAS_ALREADY_BEEN_EXPOSED;
+	
+	/**
+	 * ID: 9858<br>
+	 * Message: $s1! Help me overcome this.
+	 */
+	public static final NpcStringId S1_HELP_ME_OVERCOME_THIS;
+	
+	/**
+	 * ID: 9859<br>
+	 * Message: $s1! We can't defeat Tanakia this way.
+	 */
+	public static final NpcStringId S1_WE_CANT_DEFEAT_TANAKIA_THIS_WAY;
+	
+	/**
+	 * ID: 9860<br>
+	 * Message: $s1! Here's our chance. Don't squander the opportunity!
+	 */
+	public static final NpcStringId S1_HERES_OUR_CHANCE_DONT_SQUANDER_THE_OPPORTUNITY;
+	
+	/**
+	 * ID: 9861<br>
+	 * Message: Goodbye. We'll meet again if fate allows.
+	 */
+	public static final NpcStringId GOODBYE_WELL_MEET_AGAIN_IF_FATE_ALLOWS;
+	
+	/**
+	 * ID: 9862<br>
+	 * Message: I'll follow Tanakia to correct this falsehood.
+	 */
+	public static final NpcStringId ILL_FOLLOW_TANAKIA_TO_CORRECT_THIS_FALSEHOOD;
+	
+	/**
+	 * ID: 9863<br>
+	 * Message: I'll be back if fate allows.
+	 */
+	public static final NpcStringId ILL_BE_BACK_IF_FATE_ALLOWS;
+	
+	/**
+	 * ID: 9865<br>
+	 * Message: I'll be back. You'll pay.
+	 */
+	public static final NpcStringId ILL_BE_BACK_YOULL_PAY;
+	
+	/**
+	 * ID: 9866<br>
+	 * Message: $s1! Are you trying to spoil my plan?
+	 */
+	public static final NpcStringId S1_ARE_YOU_TRYING_TO_SPOIL_MY_PLAN;
+	
+	/**
+	 * ID: 9867<br>
+	 * Message: $s1! I won't forget you. You'll pay.
+	 */
+	public static final NpcStringId S1_I_WONT_FORGET_YOU_YOULL_PAY;
+	
+	/**
+	 * ID: 9950<br>
+	 * Message: $s1, You have an affinity for dangerous ideas. Are you ready to die?
+	 */
+	public static final NpcStringId S1_YOU_HAVE_AN_AFFINITY_FOR_DANGEROUS_IDEAS_ARE_YOU_READY_TO_DIE;
+	
+	/**
+	 * ID: 9951<br>
+	 * Message: My time is up...
+	 */
+	public static final NpcStringId MY_TIME_IS_UP;
+	
+	/**
+	 * ID: 9952<br>
+	 * Message: I can't believe I must kneel to a Human!
+	 */
+	public static final NpcStringId I_CANT_BELIEVE_I_MUST_KNEEL_TO_A_HUMAN;
+	
+	/**
+	 * ID: 9957<br>
+	 * Message: Minervia! What's the matter?
+	 */
+	public static final NpcStringId MINERVIA_WHATS_THE_MATTER;
+	
+	/**
+	 * ID: 9958<br>
+	 * Message: The princess is in danger. Why are you staring?
+	 */
+	public static final NpcStringId THE_PRINCESS_IS_IN_DANGER_WHY_ARE_YOU_STARING;
+	
+	/**
+	 * ID: 9959<br>
+	 * Message: Master $s1! Come on, Hurry up!
+	 */
+	public static final NpcStringId MASTER_S1_COME_ON_HURRY_UP;
+	
+	/**
+	 * ID: 9960<br>
+	 * Message: We can't fail! Master $s1, Pull yourself together!
+	 */
+	public static final NpcStringId WE_CANT_FAIL_MASTER_S1_PULL_YOURSELF_TOGETHER;
+	
+	/**
+	 * ID: 9961<br>
+	 * Message: What am I doing... I gotta' go! Goodbye.
+	 */
+	public static final NpcStringId WHAT_AM_I_DOING_I_GOTTA_GO_GOODBYE;
+	
+	/**
+	 * ID: 9962<br>
+	 * Message: Dammit! I missed...!
+	 */
+	public static final NpcStringId DAMMIT_I_MISSED;
+	
+	/**
+	 * ID: 9963<br>
+	 * Message: Sorry, but I must say goodbye again... Good luck to you!
+	 */
+	public static final NpcStringId SORRY_BUT_I_MUST_SAY_GOODBYE_AGAIN_GOOD_LUCK_TO_YOU;
+	
+	/**
+	 * ID: 9964<br>
+	 * Message: I can't yield the secret of the tablet!
+	 */
+	public static final NpcStringId I_CANT_YIELD_THE_SECRET_OF_THE_TABLET;
+	
+	/**
+	 * ID: 9965<br>
+	 * Message: I'll stop here for now...
+	 */
+	public static final NpcStringId ILL_STOP_HERE_FOR_NOW;
+	
+	/**
+	 * ID: 9966<br>
+	 * Message: $s1, you dared to leave scar on my face! I'll kill you!!!
+	 */
+	public static final NpcStringId S1_YOU_DARED_TO_LEAVE_SCAR_ON_MY_FACE_ILL_KILL_YOU;
+	
+	/**
+	 * ID: 9967<br>
+	 * Message: $s1, I won't forget your name...Ha!
+	 */
+	public static final NpcStringId S1_I_WONT_FORGET_YOUR_NAMEHA;
+	
+	/**
+	 * ID: 10050<br>
+	 * Message: $s1? You have an affinity for bad ideas. Are you ready to die?
+	 */
+	public static final NpcStringId S1_YOU_HAVE_AN_AFFINITY_FOR_BAD_IDEAS_ARE_YOU_READY_TO_DIE;
+	
+	/**
+	 * ID: 10052<br>
+	 * Message: I can't believe I must kneel before a Human!
+	 */
+	public static final NpcStringId I_CANT_BELIEVE_I_MUST_KNEEL_BEFORE_A_HUMAN;
+	
+	/**
+	 * ID: 10057<br>
+	 * Message: You thief! Give me the Resonance Amulet!
+	 */
+	public static final NpcStringId YOU_THIEF_GIVE_ME_THE_RESONANCE_AMULET;
+	
+	/**
+	 * ID: 10058<br>
+	 * Message: Ugh! $s1, Help me!
+	 */
+	public static final NpcStringId UGH_S1_HELP_ME;
+	
+	/**
+	 * ID: 10059<br>
+	 * Message: $s1. Please, help me! Together we can beat him.
+	 */
+	public static final NpcStringId S1_PLEASE_HELP_ME_TOGETHER_WE_CAN_BEAT_HIM;
+	
+	/**
+	 * ID: 10060<br>
+	 * Message: $s1! Are you going to let a guild member die?
+	 */
+	public static final NpcStringId S1_ARE_YOU_GOING_TO_LET_A_GUILD_MEMBER_DIE;
+	
+	/**
+	 * ID: 10061<br>
+	 * Message: I'm sorry, but I gotta' go first!
+	 */
+	public static final NpcStringId IM_SORRY_BUT_I_GOTTA_GO_FIRST;
+	
+	/**
+	 * ID: 10062<br>
+	 * Message: Aaaah! I couldn't get the Resonance Amulet.
+	 */
+	public static final NpcStringId AAAAH_I_COULDNT_GET_THE_RESONANCE_AMULET;
+	
+	/**
+	 * ID: 10063<br>
+	 * Message: Take care! I gotta' go now~!
+	 */
+	public static final NpcStringId TAKE_CARE_I_GOTTA_GO_NOW;
+	
+	/**
+	 * ID: 10064<br>
+	 * Message: I'm sorry, but it's my job to kill you now!
+	 */
+	public static final NpcStringId IM_SORRY_BUT_ITS_MY_JOB_TO_KILL_YOU_NOW;
+	
+	/**
+	 * ID: 10065<br>
+	 * Message: What a waste of time!
+	 */
+	public static final NpcStringId WHAT_A_WASTE_OF_TIME;
+	
+	/**
+	 * ID: 10066<br>
+	 * Message: $s1! How could you do this? I'll kill you!
+	 */
+	public static final NpcStringId S1_HOW_COULD_YOU_DO_THIS_ILL_KILL_YOU;
+	
+	/**
+	 * ID: 10067<br>
+	 * Message: $s1! I'll pay you back!
+	 */
+	public static final NpcStringId S1_ILL_PAY_YOU_BACK;
+	
+	/**
+	 * ID: 10068<br>
+	 * Message: Why don't you just die?!
+	 */
+	public static final NpcStringId WHY_DONT_YOU_JUST_DIE;
+	
+	/**
+	 * ID: 10069<br>
+	 * Message: Taste the sting of Level 5 Spoil!
+	 */
+	public static final NpcStringId TASTE_THE_STING_OF_LEVEL_5_SPOIL;
+	
+	/**
+	 * ID: 10070<br>
+	 * Message: The item is already inside you...
+	 */
+	public static final NpcStringId THE_ITEM_IS_ALREADY_INSIDE_YOU;
+	
+	/**
+	 * ID: 10071<br>
+	 * Message: This potion you're making me drink is worth its weight in gold!
+	 */
+	public static final NpcStringId THIS_POTION_YOURE_MAKING_ME_DRINK_IS_WORTH_ITS_WEIGHT_IN_GOLD;
+	
+	/**
+	 * ID: 10072<br>
+	 * Message: This potion is prepared from the ground gall of a bear. Be careful - it packs quite a punch!
+	 */
+	public static final NpcStringId THIS_POTION_IS_PREPARED_FROM_THE_GROUND_GALL_OF_A_BEAR_BE_CAREFUL_IT_PACKS_QUITE_A_PUNCH;
+	
+	/**
+	 * ID: 10073<br>
+	 * Message: How can you use a potion on a newbie...
+	 */
+	public static final NpcStringId HOW_CAN_YOU_USE_A_POTION_ON_A_NEWBIE;
+	
+	/**
+	 * ID: 10074<br>
+	 * Message: Listen to me, $s1! Unless you have prior authorization, you can't carry a weapon here!
+	 */
+	public static final NpcStringId LISTEN_TO_ME_S1_UNLESS_YOU_HAVE_PRIOR_AUTHORIZATION_YOU_CANT_CARRY_A_WEAPON_HERE;
+	
+	/**
+	 * ID: 10075<br>
+	 * Message: Dear $s1, may the blessings of Einhasad be with you always.
+	 */
+	public static final NpcStringId DEAR_S1_MAY_THE_BLESSINGS_OF_EINHASAD_BE_WITH_YOU_ALWAYS;
+	
+	/**
+	 * ID: 10076<br>
+	 * Message: Dear brother $s1, follow the path of light with me...
+	 */
+	public static final NpcStringId DEAR_BROTHER_S1_FOLLOW_THE_PATH_OF_LIGHT_WITH_ME;
+	
+	/**
+	 * ID: 10077<br>
+	 * Message: $s1, why would you choose the path of darkness?!
+	 */
+	public static final NpcStringId S1_WHY_WOULD_YOU_CHOOSE_THE_PATH_OF_DARKNESS;
+	
+	/**
+	 * ID: 10078<br>
+	 * Message: $s1! How dare you defy the will of Einhasad!
+	 */
+	public static final NpcStringId S1_HOW_DARE_YOU_DEFY_THE_WILL_OF_EINHASAD;
+	
+	/**
+	 * ID: 10079<br>
+	 * Message: The door to the 3rd floor of the altar is now open.
+	 */
+	public static final NpcStringId THE_DOOR_TO_THE_3RD_FLOOR_OF_THE_ALTAR_IS_NOW_OPEN;
+	
+	/**
+	 * ID: 11101<br>
+	 * Message: Elrokian Hunters
+	 */
+	public static final NpcStringId ELROKIAN_HUNTERS;
+	
+	/**
+	 * ID: 11450<br>
+	 * Message: You, $s1, you attacked Wendy. Prepare to die!
+	 */
+	public static final NpcStringId YOU_S1_YOU_ATTACKED_WENDY_PREPARE_TO_DIE;
+	
+	/**
+	 * ID: 11451<br>
+	 * Message: $s1, your enemy was driven out. I will now withdraw and await your next command.
+	 */
+	public static final NpcStringId S1_YOUR_ENEMY_WAS_DRIVEN_OUT_I_WILL_NOW_WITHDRAW_AND_AWAIT_YOUR_NEXT_COMMAND;
+	
+	/**
+	 * ID: 11452<br>
+	 * Message: This enemy is far too powerful for me to fight. I must withdraw.
+	 */
+	public static final NpcStringId THIS_ENEMY_IS_FAR_TOO_POWERFUL_FOR_ME_TO_FIGHT_I_MUST_WITHDRAW;
+	
+	/**
+	 * ID: 11453<br>
+	 * Message: The radio signal detector is responding. # A suspicious pile of stones catches your eye.
+	 */
+	public static final NpcStringId THE_RADIO_SIGNAL_DETECTOR_IS_RESPONDING_A_SUSPICIOUS_PILE_OF_STONES_CATCHES_YOUR_EYE;
+	
+	/**
+	 * ID: 11550<br>
+	 * Message: This looks like the right place...
+	 */
+	public static final NpcStringId THIS_LOOKS_LIKE_THE_RIGHT_PLACE;
+	
+	/**
+	 * ID: 11551<br>
+	 * Message: I see someone. Is this fate?
+	 */
+	public static final NpcStringId I_SEE_SOMEONE_IS_THIS_FATE;
+	
+	/**
+	 * ID: 11552<br>
+	 * Message: We meet again.
+	 */
+	public static final NpcStringId WE_MEET_AGAIN;
+	
+	/**
+	 * ID: 11553<br>
+	 * Message: Don't bother trying to find out more about me. Follow your own destiny.
+	 */
+	public static final NpcStringId DONT_BOTHER_TRYING_TO_FIND_OUT_MORE_ABOUT_ME_FOLLOW_YOUR_OWN_DESTINY;
+	
+	/**
+	 * ID: 14204<br>
+	 * Message: Fallen Angel - Select
+	 */
+	public static final NpcStringId FALLEN_ANGEL_SELECT;
+	
+	/**
+	 * ID: 15804<br>
+	 * Message: ... How dare you challenge me!
+	 */
+	public static final NpcStringId _HOW_DARE_YOU_CHALLENGE_ME;
+	
+	/**
+	 * ID: 15805<br>
+	 * Message: The power of Lord Beleth rules the whole world...!
+	 */
+	public static final NpcStringId THE_POWER_OF_LORD_BELETH_RULES_THE_WHOLE_WORLD;
+	
+	/**
+	 * ID: 16404<br>
+	 * Message: I will taste your blood!
+	 */
+	public static final NpcStringId I_WILL_TASTE_YOUR_BLOOD;
+	
+	/**
+	 * ID: 16405<br>
+	 * Message: I have fulfilled my contract with Trader Creamees.
+	 */
+	public static final NpcStringId I_HAVE_FULFILLED_MY_CONTRACT_WITH_TRADER_CREAMEES;
+	
+	/**
+	 * ID: 17004<br>
+	 * Message: I'll cast you into an eternal nightmare!
+	 */
+	public static final NpcStringId ILL_CAST_YOU_INTO_AN_ETERNAL_NIGHTMARE;
+	
+	/**
+	 * ID: 17005<br>
+	 * Message: Send my soul to Lich King Icarus...
+	 */
+	public static final NpcStringId SEND_MY_SOUL_TO_LICH_KING_ICARUS;
+	
+	/**
+	 * ID: 17151<br>
+	 * Message: You should consider going back...
+	 */
+	public static final NpcStringId YOU_SHOULD_CONSIDER_GOING_BACK;
+	
+	/**
+	 * ID: 17951<br>
+	 * Message: The Veiled Creator...
+	 */
+	public static final NpcStringId THE_VEILED_CREATOR;
+	
+	/**
+	 * ID: 17952<br>
+	 * Message: The Conspiracy of the Ancient Race
+	 */
+	public static final NpcStringId THE_CONSPIRACY_OF_THE_ANCIENT_RACE;
+	
+	/**
+	 * ID: 17953<br>
+	 * Message: Chaos and Time...
+	 */
+	public static final NpcStringId CHAOS_AND_TIME;
+	
+	/**
+	 * ID: 18451<br>
+	 * Message: Intruder Alert! The alarm will self-destruct in 2 minutes.
+	 */
+	public static final NpcStringId INTRUDER_ALERT_THE_ALARM_WILL_SELF_DESTRUCT_IN_2_MINUTES;
+	
+	/**
+	 * ID: 18452<br>
+	 * Message: The alarm will self-destruct in 60 seconds. Enter passcode to override.
+	 */
+	public static final NpcStringId THE_ALARM_WILL_SELF_DESTRUCT_IN_60_SECONDS_ENTER_PASSCODE_TO_OVERRIDE;
+	
+	/**
+	 * ID: 18453<br>
+	 * Message: The alarm will self-destruct in 30 seconds. Enter passcode to override.
+	 */
+	public static final NpcStringId THE_ALARM_WILL_SELF_DESTRUCT_IN_30_SECONDS_ENTER_PASSCODE_TO_OVERRIDE;
+	
+	/**
+	 * ID: 18454<br>
+	 * Message: The alarm will self-destruct in 10 seconds. Enter passcode to override.
+	 */
+	public static final NpcStringId THE_ALARM_WILL_SELF_DESTRUCT_IN_10_SECONDS_ENTER_PASSCODE_TO_OVERRIDE;
+	
+	/**
+	 * ID: 18455<br>
+	 * Message: Recorder crushed.
+	 */
+	public static final NpcStringId RECORDER_CRUSHED;
+	
+	/**
+	 * ID: 18552<br>
+	 * Message: The alarm will self-destruct in 60 seconds. Please evacuate immediately!
+	 */
+	public static final NpcStringId THE_ALARM_WILL_SELF_DESTRUCT_IN_60_SECONDS_PLEASE_EVACUATE_IMMEDIATELY;
+	
+	/**
+	 * ID: 18553<br>
+	 * Message: The alarm will self-destruct in 30 seconds. Please evacuate immediately!
+	 */
+	public static final NpcStringId THE_ALARM_WILL_SELF_DESTRUCT_IN_30_SECONDS_PLEASE_EVACUATE_IMMEDIATELY;
+	
+	/**
+	 * ID: 18554<br>
+	 * Message: The alarm will self-destruct in 10 seconds. Please evacuate immediately!
+	 */
+	public static final NpcStringId THE_ALARM_WILL_SELF_DESTRUCT_IN_10_SECONDS_PLEASE_EVACUATE_IMMEDIATELY;
+	
+	/**
+	 * ID: 19304<br>
+	 * Message: $s1! You are not the owner of that item.
+	 */
+	public static final NpcStringId S1_YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM;
+	
+	/**
+	 * ID: 19305<br>
+	 * Message: Next time, you will not escape!
+	 */
+	public static final NpcStringId NEXT_TIME_YOU_WILL_NOT_ESCAPE;
+	
+	/**
+	 * ID: 19306<br>
+	 * Message: $s1! You may have won this time... But next time, I will surely capture you!
+	 */
+	public static final NpcStringId S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU;
+	
+	/**
+	 * ID: 19504<br>
+	 * Message: Intruder! Protect the Priests of Dawn!
+	 */
+	public static final NpcStringId INTRUDER_PROTECT_THE_PRIESTS_OF_DAWN;
+	
+	/**
+	 * ID: 19505<br>
+	 * Message: Who are you?! A new face like you can't approach this place!
+	 */
+	public static final NpcStringId WHO_ARE_YOU_A_NEW_FACE_LIKE_YOU_CAN_T_APPROACH_THIS_PLACE;
+	
+	/**
+	 * ID: 19506<br>
+	 * Message: How dare you intrude with that transformation! Get lost!
+	 */
+	public static final NpcStringId HOW_DARE_YOU_INTRUDE_WITH_THAT_TRANSFORMATION_GET_LOST;
+	
+	/**
+	 * ID: 19604<br>
+	 * Message: Who dares summon the Merchant of Mammon?!
+	 */
+	public static final NpcStringId WHO_DARES_SUMMON_THE_MERCHANT_OF_MAMMON;
+	
+	/**
+	 * ID: 19605<br>
+	 * Message: The ancient promise to the Emperor has been fulfilled.
+	 */
+	public static final NpcStringId THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED;
+	
+	/**
+	 * ID: 19606<br>
+	 * Message: For the eternity of Einhasad!!!
+	 */
+	public static final NpcStringId FOR_THE_ETERNITY_OF_EINHASAD;
+	
+	/**
+	 * ID: 19607<br>
+	 * Message: Dear Shillien's offsprings! You are not capable of confronting us!
+	 */
+	public static final NpcStringId DEAR_SHILLIENS_OFFSPRINGS_YOU_ARE_NOT_CAPABLE_OF_CONFRONTING_US;
+	
+	/**
+	 * ID: 19608<br>
+	 * Message: I'll show you the real power of Einhasad!
+	 */
+	public static final NpcStringId ILL_SHOW_YOU_THE_REAL_POWER_OF_EINHASAD;
+	
+	/**
+	 * ID: 19609<br>
+	 * Message: Dear Military Force of Light! Go destroy the offsprings of Shillien!!!
+	 */
+	public static final NpcStringId DEAR_MILITARY_FORCE_OF_LIGHT_GO_DESTROY_THE_OFFSPRINGS_OF_SHILLIEN;
+	
+	/**
+	 * ID: 19610<br>
+	 * Message: Everything is owing to $s1. Thank you.
+	 */
+	public static final NpcStringId EVERYTHING_IS_OWING_TO_S1_THANK_YOU;
+	
+	/**
+	 * ID: 19611<br>
+	 * Message: My power's weakening.. Hurry and turn on the sealing device!!!
+	 */
+	public static final NpcStringId MY_POWERS_WEAKENING_HURRY_AND_TURN_ON_THE_SEALING_DEVICE;
+	
+	/**
+	 * ID: 19612<br>
+	 * Message: All 4 sealing devices must be turned on!!!
+	 */
+	public static final NpcStringId ALL_4_SEALING_DEVICES_MUST_BE_TURNED_ON;
+	
+	/**
+	 * ID: 19613<br>
+	 * Message: Lilith's attack is getting stronger! Go ahead and turn it on!
+	 */
+	public static final NpcStringId LILITHS_ATTACK_IS_GETTING_STRONGER_GO_AHEAD_AND_TURN_IT_ON;
+	
+	/**
+	 * ID: 19614<br>
+	 * Message: Dear $s1, give me more strength.
+	 */
+	public static final NpcStringId DEAR_S1_GIVE_ME_MORE_STRENGTH;
+	
+	/**
+	 * ID: 19615<br>
+	 * Message: You, such a fool! The victory over this war belongs to Shilien!!!
+	 */
+	public static final NpcStringId YOU_SUCH_A_FOOL_THE_VICTORY_OVER_THIS_WAR_BELONGS_TO_SHILIEN;
+	
+	/**
+	 * ID: 19616<br>
+	 * Message: How dare you try to contend against me in strength? Ridiculous.
+	 */
+	public static final NpcStringId HOW_DARE_YOU_TRY_TO_CONTEND_AGAINST_ME_IN_STRENGTH_RIDICULOUS;
+	
+	/**
+	 * ID: 19617<br>
+	 * Message: Anakim! In the name of Great Shilien, I will cut your throat!
+	 */
+	public static final NpcStringId ANAKIM_IN_THE_NAME_OF_GREAT_SHILIEN_I_WILL_CUT_YOUR_THROAT;
+	
+	/**
+	 * ID: 19618<br>
+	 * Message: You cannot be the match of Lilith. I'll teach you a lesson!
+	 */
+	public static final NpcStringId YOU_CANNOT_BE_THE_MATCH_OF_LILITH_I_LL_TEACH_YOU_A_LESSON;
+	
+	/**
+	 * ID: 19619<br>
+	 * Message: I must go back to Shilien just like this. Outrageous.
+	 */
+	public static final NpcStringId I_MUST_GO_BACK_TO_SHILIEN_JUST_LIKE_THIS_OUTRAGEOUS;
+	
+	/**
+	 * ID: 19804<br>
+	 * Message: Death to the enemies of the Lords of Dawn!!!
+	 */
+	public static final NpcStringId DEATH_TO_THE_ENEMIES_OF_THE_LORDS_OF_DAWN;
+	
+	/**
+	 * ID: 19805<br>
+	 * Message: We will be with you always...
+	 */
+	public static final NpcStringId WE_WILL_BE_WITH_YOU_ALWAYS;
+	
+	/**
+	 * ID: 19806<br>
+	 * Message: You are not the owner of that item.
+	 */
+	public static final NpcStringId YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM;
+	
+	/**
+	 * ID: 19807<br>
+	 * Message: Embryo...
+	 */
+	public static final NpcStringId EMBRYO;
+	
+	/**
+	 * ID: 20901<br>
+	 * Message: Kamael Tutorial
+	 */
+	public static final NpcStringId KAMAEL_TUTORIAL;
+	
+	/**
+	 * ID: 22051<br>
+	 * Message: Is it a lackey of Kakai?!
+	 */
+	public static final NpcStringId IS_IT_A_LACKEY_OF_KAKAI;
+	
+	/**
+	 * ID: 22052<br>
+	 * Message: Too late!
+	 */
+	public static final NpcStringId TOO_LATE;
+	
+	/**
+	 * ID: 22055<br>
+	 * Message: How regretful! Unjust dishonor!
+	 */
+	public static final NpcStringId HOW_REGRETFUL_UNJUST_DISHONOR;
+	
+	/**
+	 * ID: 22056<br>
+	 * Message: I'll get revenge someday!!
+	 */
+	public static final NpcStringId ILL_GET_REVENGE_SOMEDAY;
+	
+	/**
+	 * ID: 22057<br>
+	 * Message: Indignant and unfair death!
+	 */
+	public static final NpcStringId INDIGNANT_AND_UNFAIR_DEATH;
+	
+	/**
+	 * ID: 22719<br>
+	 * Message: The concealed truth will always be revealed...!
+	 */
+	public static final NpcStringId THE_CONCEALED_TRUTH_WILL_ALWAYS_BE_REVEALED;
+	
+	/**
+	 * ID: 22720<br>
+	 * Message: Cowardly guy!
+	 */
+	public static final NpcStringId COWARDLY_GUY;
+	
+	/**
+	 * ID: 22819<br>
+	 * Message: I am a tree of nothing... a tree... that knows where to return...
+	 */
+	public static final NpcStringId I_AM_A_TREE_OF_NOTHING_A_TREE_THAT_KNOWS_WHERE_TO_RETURN;
+	
+	/**
+	 * ID: 22820<br>
+	 * Message: I am a creature that shows the truth of the place deep in my heart...
+	 */
+	public static final NpcStringId I_AM_A_CREATURE_THAT_SHOWS_THE_TRUTH_OF_THE_PLACE_DEEP_IN_MY_HEART;
+	
+	/**
+	 * ID: 22821<br>
+	 * Message: I am a mirror of darkness... a virtual image of darkness...
+	 */
+	public static final NpcStringId I_AM_A_MIRROR_OF_DARKNESS_A_VIRTUAL_IMAGE_OF_DARKNESS;
+	
+	/**
+	 * ID: 22933<br>
+	 * Message: I absolutely cannot give it to you! It is my precious jewel!
+	 */
+	public static final NpcStringId I_ABSOLUTELY_CANNOT_GIVE_IT_TO_YOU_IT_IS_MY_PRECIOUS_JEWEL;
+	
+	/**
+	 * ID: 22934<br>
+	 * Message: I'll take your lives later!
+	 */
+	public static final NpcStringId ILL_TAKE_YOUR_LIVES_LATER;
+	
+	/**
+	 * ID: 22935<br>
+	 * Message: That sword is really...!
+	 */
+	public static final NpcStringId THAT_SWORD_IS_REALLY;
+	
+	/**
+	 * ID: 22936<br>
+	 * Message: No! I haven't completely finished the command for destruction and slaughter yet!!!
+	 */
+	public static final NpcStringId NO_I_HAVENT_COMPLETELY_FINISHED_THE_COMMAND_FOR_DESTRUCTION_AND_SLAUGHTER_YET;
+	
+	/**
+	 * ID: 22937<br>
+	 * Message: How dare you wake me! Now you shall die!
+	 */
+	public static final NpcStringId HOW_DARE_YOU_WAKE_ME_NOW_YOU_SHALL_DIE;
+	
+	/**
+	 * ID: 23060<br>
+	 * Message: START DUEL
+	 */
+	public static final NpcStringId START_DUEL;
+	
+	/**
+	 * ID: 23061<br>
+	 * Message: RULE VIOLATION
+	 */
+	public static final NpcStringId RULE_VIOLATION;
+	
+	/**
+	 * ID: 23062<br>
+	 * Message: I LOSE
+	 */
+	public static final NpcStringId I_LOSE;
+	
+	/**
+	 * ID: 23063<br>
+	 * Message: Whhiisshh!
+	 */
+	public static final NpcStringId WHHIISSHH;
+	
+	/**
+	 * ID: 23065<br>
+	 * Message: I'm sorry, Lord!
+	 */
+	public static final NpcStringId IM_SORRY_LORD;
+	
+	/**
+	 * ID: 23066<br>
+	 * Message: Whish! Fight!
+	 */
+	public static final NpcStringId WHISH_FIGHT;
+	
+	/**
+	 * ID: 23068<br>
+	 * Message: Lost! Sorry, Lord!
+	 */
+	public static final NpcStringId LOST_SORRY_LORD;
+	
+	/**
+	 * ID: 23072<br>
+	 * Message: So shall we start?!
+	 */
+	public static final NpcStringId SO_SHALL_WE_START;
+	
+	/**
+	 * ID: 23074<br>
+	 * Message: Ugh! I lost...!
+	 */
+	public static final NpcStringId UGH_I_LOST;
+	
+	/**
+	 * ID: 23075<br>
+	 * Message: I'll walk all over you!
+	 */
+	public static final NpcStringId ILL_WALK_ALL_OVER_YOU;
+	
+	/**
+	 * ID: 23077<br>
+	 * Message: Ugh! Can this be happening?!
+	 */
+	public static final NpcStringId UGH_CAN_THIS_BE_HAPPENING;
+	
+	/**
+	 * ID: 23078<br>
+	 * Message: It's the natural result!
+	 */
+	public static final NpcStringId ITS_THE_NATURAL_RESULT;
+	
+	/**
+	 * ID: 23079<br>
+	 * Message: Ho, ho! I win!
+	 */
+	public static final NpcStringId HO_HO_I_WIN;
+	
+	/**
+	 * ID: 23080<br>
+	 * Message: I WIN
+	 */
+	public static final NpcStringId I_WIN;
+	
+	/**
+	 * ID: 23081<br>
+	 * Message: Whish! I won!
+	 */
+	public static final NpcStringId WHISH_I_WON;
+	
+	/**
+	 * ID: 23434<br>
+	 * Message: Who dares to try and steal my noble blood?
+	 */
+	public static final NpcStringId WHO_DARES_TO_TRY_AND_STEAL_MY_NOBLE_BLOOD;
+	
+	/**
+	 * ID: 23651<br>
+	 * Message: $s1! Finally, we meet!
+	 */
+	public static final NpcStringId S1_FINALLY_WE_MEET;
+	
+	/**
+	 * ID: 23652<br>
+	 * Message: Hmm, where did my friend go?
+	 */
+	public static final NpcStringId HMM_WHERE_DID_MY_FRIEND_GO;
+	
+	/**
+	 * ID: 23653<br>
+	 * Message: Best of luck with your future endeavours.
+	 */
+	public static final NpcStringId BEST_OF_LUCK_WITH_YOUR_FUTURE_ENDEAVOURS;
+	
+	/**
+	 * ID: 23661<br>
+	 * Message: $s1! Did you wait for long?
+	 */
+	public static final NpcStringId S1_DID_YOU_WAIT_FOR_LONG;
+	
+	/**
+	 * ID: 23671<br>
+	 * Message: Did you bring what I asked, $s1?
+	 */
+	public static final NpcStringId DID_YOU_BRING_WHAT_I_ASKED_S1;
+	
+	/**
+	 * ID: 23681<br>
+	 * Message: Hmm? Is someone approaching?
+	 */
+	public static final NpcStringId HMM_IS_SOMEONE_APPROACHING;
+	
+	/**
+	 * ID: 23682<br>
+	 * Message: Graaah, we're being attacked!
+	 */
+	public static final NpcStringId GRAAAH_WERE_BEING_ATTACKED;
+	
+	/**
+	 * ID: 23683<br>
+	 * Message: In that case, I wish you good luck.
+	 */
+	public static final NpcStringId IN_THAT_CASE_I_WISH_YOU_GOOD_LUCK;
+	
+	/**
+	 * ID: 23685<br>
+	 * Message: $s1, has everything been found?
+	 */
+	public static final NpcStringId S1_HAS_EVERYTHING_BEEN_FOUND;
+	
+	/**
+	 * ID: 23687<br>
+	 * Message: Safe travels!
+	 */
+	public static final NpcStringId SAFE_TRAVELS;
+	
+	/**
+	 * ID: 25901<br>
+	 * Message: Request from the Farm Owner
+	 */
+	public static final NpcStringId REQUEST_FROM_THE_FARM_OWNER;
+	
+	/**
+	 * ID: 31603<br>
+	 * Message: Why do you oppress us so?
+	 */
+	public static final NpcStringId WHY_DO_YOU_OPPRESS_US_SO;
+	
+	/**
+	 * ID: 33409<br>
+	 * Message: Don't interrupt my rest again
+	 */
+	public static final NpcStringId DONT_INTERRUPT_MY_REST_AGAIN;
+	
+	/**
+	 * ID: 33410<br>
+	 * Message: You're a great devil now...
+	 */
+	public static final NpcStringId YOURE_A_GREAT_DEVIL_NOW;
+	
+	/**
+	 * ID: 33411<br>
+	 * Message: Oh, it's not an opponent of mine. Ha, ha, ha!
+	 */
+	public static final NpcStringId OH_ITS_NOT_AN_OPPONENT_OF_MINE_HA_HA_HA;
+	
+	/**
+	 * ID: 33412<br>
+	 * Message: Oh... Great Demon King...
+	 */
+	public static final NpcStringId OH_GREAT_DEMON_KING;
+	
+	/**
+	 * ID: 33413<br>
+	 * Message: Revenge is Overlord Ramsebalius of the evil world!
+	 */
+	public static final NpcStringId REVENGE_IS_OVERLORD_RAMSEBALIUS_OF_THE_EVIL_WORLD;
+	
+	/**
+	 * ID: 33414<br>
+	 * Message: Bonaparterius, Abyss King, will punish you
+	 */
+	public static final NpcStringId BONAPARTERIUS_ABYSS_KING_WILL_PUNISH_YOU;
+	
+	/**
+	 * ID: 33415<br>
+	 * Message: OK, everybody pray fervently!
+	 */
+	public static final NpcStringId OK_EVERYBODY_PRAY_FERVENTLY;
+	
+	/**
+	 * ID: 33416<br>
+	 * Message: Both hands to heaven! Everybody yell together!
+	 */
+	public static final NpcStringId BOTH_HANDS_TO_HEAVEN_EVERYBODY_YELL_TOGETHER;
+	
+	/**
+	 * ID: 33417<br>
+	 * Message: One! Two! May your dreams come true!
+	 */
+	public static final NpcStringId ONE_TWO_MAY_YOUR_DREAMS_COME_TRUE;
+	
+	/**
+	 * ID: 33418<br>
+	 * Message: Who killed my underling devil?
+	 */
+	public static final NpcStringId WHO_KILLED_MY_UNDERLING_DEVIL;
+	
+	/**
+	 * ID: 33420<br>
+	 * Message: I will make your love come true~ love, love, love~
+	 */
+	public static final NpcStringId I_WILL_MAKE_YOUR_LOVE_COME_TRUE_LOVE_LOVE_LOVE;
+	
+	/**
+	 * ID: 33421<br>
+	 * Message: I have wisdom in me. I am the box of wisdom!
+	 */
+	public static final NpcStringId I_HAVE_WISDOM_IN_ME_I_AM_THE_BOX_OF_WISDOM;
+	
+	/**
+	 * ID: 33422<br>
+	 * Message: Oh, oh, oh!
+	 */
+	public static final NpcStringId OH_OH_OH;
+	
+	/**
+	 * ID: 33423<br>
+	 * Message: Do you want us to love you? Oh.
+	 */
+	public static final NpcStringId DO_YOU_WANT_US_TO_LOVE_YOU_OH;
+	
+	/**
+	 * ID: 33424<br>
+	 * Message: Who is calling the Lord of Darkness!
+	 */
+	public static final NpcStringId WHO_IS_CALLING_THE_LORD_OF_DARKNESS;
+	
+	/**
+	 * ID: 33425<br>
+	 * Message: I am a great empire, Bonaparterius!
+	 */
+	public static final NpcStringId I_AM_A_GREAT_EMPIRE_BONAPARTERIUS;
+	
+	/**
+	 * ID: 33426<br>
+	 * Message: Let your head down before the Lord!
+	 */
+	public static final NpcStringId LET_YOUR_HEAD_DOWN_BEFORE_THE_LORD;
+	
+	/**
+	 * ID: 33501<br>
+	 * Message: The Song of the Hunter
+	 */
+	public static final NpcStringId THE_SONG_OF_THE_HUNTER;
+	
+	/**
+	 * ID: 33511<br>
+	 * Message: We'll take the property of the ancient empire!
+	 */
+	public static final NpcStringId WELL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE;
+	
+	/**
+	 * ID: 33512<br>
+	 * Message: Show me the pretty sparkling things! They're all mine!
+	 */
+	public static final NpcStringId SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEYRE_ALL_MINE;
+	
+	/**
+	 * ID: 33513<br>
+	 * Message: Pretty good!
+	 */
+	public static final NpcStringId PRETTY_GOOD;
+	
+	/**
+	 * ID: 34830<br>
+	 * Message: Ha, that was fun! If you wish to find the key, search the corpse.
+	 */
+	public static final NpcStringId HA_THAT_WAS_FUN_IF_YOU_WISH_TO_FIND_THE_KEY_SEARCH_THE_CORPSE;
+	
+	/**
+	 * ID: 34831<br>
+	 * Message: I have the key. Why don't you come and take it?
+	 */
+	public static final NpcStringId I_HAVE_THE_KEY_WHY_DONT_YOU_COME_AND_TAKE_IT;
+	
+	/**
+	 * ID: 34832<br>
+	 * Message: You fools will get what's coming to you!
+	 */
+	public static final NpcStringId YOU_FOOLS_WILL_GET_WHATS_COMING_TO_YOU;
+	
+	/**
+	 * ID: 34833<br>
+	 * Message: Sorry about this, but I must kill you now.
+	 */
+	public static final NpcStringId SORRY_ABOUT_THIS_BUT_I_MUST_KILL_YOU_NOW;
+	
+	/**
+	 * ID: 34835<br>
+	 * Message: You guys wouldn't know... the seven seals are... Arrrgh!
+	 */
+	public static final NpcStringId YOU_GUYS_WOULDNT_KNOW_THE_SEVEN_SEALS_ARE_ARRRGH;
+	
+	/**
+	 * ID: 34836<br>
+	 * Message: I shall drench this mountain with your blood!
+	 */
+	public static final NpcStringId I_SHALL_DRENCH_THIS_MOUNTAIN_WITH_YOUR_BLOOD;
+	
+	/**
+	 * ID: 34837<br>
+	 * Message: That doesn't belong to you. Don't touch it!
+	 */
+	public static final NpcStringId THAT_DOESNT_BELONG_TO_YOU_DONT_TOUCH_IT;
+	
+	/**
+	 * ID: 34838<br>
+	 * Message: Get out of my sight, you infidels!
+	 */
+	public static final NpcStringId GET_OUT_OF_MY_SIGHT_YOU_INFIDELS;
+	
+	/**
+	 * ID: 34839<br>
+	 * Message: We don't have any further business to discuss... Have you searched the corpse for the key?
+	 */
+	public static final NpcStringId WE_DONT_HAVE_ANY_FURTHER_BUSINESS_TO_DISCUSS_HAVE_YOU_SEARCHED_THE_CORPSE_FOR_THE_KEY;
+	
+	/**
+	 * ID: 35051<br>
+	 * Message: $s1 has earned a stage $s2 Blue Soul Crystal.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_A_STAGE_S2_BLUE_SOUL_CRYSTAL;
+	
+	/**
+	 * ID: 35052<br>
+	 * Message: $s1 has earned a stage $s2 Red Soul Crystal.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_A_STAGE_S2_RED_SOUL_CRYSTAL;
+	
+	/**
+	 * ID: 35053<br>
+	 * Message: $s1 has earned a stage $s2 Green Soul Crystal.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_A_STAGE_S2_GREEN_SOUL_CRYSTAL;
+	
+	/**
+	 * ID: 35054<br>
+	 * Message: $s1 has earned a Stage $s2 Blue Cursed Soul Crystal.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_A_STAGE_S2_BLUE_CURSED_SOUL_CRYSTAL;
+	
+	/**
+	 * ID: 35055<br>
+	 * Message: $s1 has earned a Stage $s2 Red Cursed Soul Crystal.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_A_STAGE_S2_RED_CURSED_SOUL_CRYSTAL;
+	
+	/**
+	 * ID: 35056<br>
+	 * Message: $s1 has earned a Stage $s2 Green Cursed Soul Crystal.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_A_STAGE_S2_GREEN_CURSED_SOUL_CRYSTAL;
+	
+	/**
+	 * ID: 37101<br>
+	 * Message: Shrieks of Ghosts
+	 */
+	public static final NpcStringId SHRIEKS_OF_GHOSTS;
+	
+	/**
+	 * ID: 38451<br>
+	 * Message: Slot $s1: $s2
+	 */
+	public static final NpcStringId SLOT_S1_S3;
+	
+	/**
+	 * ID: 40306<br>
+	 * Message: You childish fool, do you think you can catch me?
+	 */
+	public static final NpcStringId YOU_CHILDISH_FOOL_DO_YOU_THINK_YOU_CAN_CATCH_ME;
+	
+	/**
+	 * ID: 40307<br>
+	 * Message: I must do something about this shameful incident...
+	 */
+	public static final NpcStringId I_MUST_DO_SOMETHING_ABOUT_THIS_SHAMEFUL_INCIDENT;
+	
+	/**
+	 * ID: 40308<br>
+	 * Message: What, do you dare to challenge me!
+	 */
+	public static final NpcStringId WHAT_DO_YOU_DARE_TO_CHALLENGE_ME;
+	
+	/**
+	 * ID: 40309<br>
+	 * Message: The red-eyed thieves will revenge!
+	 */
+	public static final NpcStringId THE_RED_EYED_THIEVES_WILL_REVENGE;
+	
+	/**
+	 * ID: 40310<br>
+	 * Message: Go ahead, you child!
+	 */
+	public static final NpcStringId GO_AHEAD_YOU_CHILD;
+	
+	/**
+	 * ID: 40311<br>
+	 * Message: My friends are sure to revenge!
+	 */
+	public static final NpcStringId MY_FRIENDS_ARE_SURE_TO_REVENGE;
+	
+	/**
+	 * ID: 40312<br>
+	 * Message: You ruthless fool, I will show you what real fighting is all about!
+	 */
+	public static final NpcStringId YOU_RUTHLESS_FOOL_I_WILL_SHOW_YOU_WHAT_REAL_FIGHTING_IS_ALL_ABOUT;
+	
+	/**
+	 * ID: 40313<br>
+	 * Message: Ahh, how can it end like this... it is not fair!
+	 */
+	public static final NpcStringId AHH_HOW_CAN_IT_END_LIKE_THIS_IT_IS_NOT_FAIR;
+	
+	/**
+	 * ID: 40909<br>
+	 * Message: The sacred flame is ours!
+	 */
+	public static final NpcStringId THE_SACRED_FLAME_IS_OURS;
+	
+	/**
+	 * ID: 40910<br>
+	 * Message: Arrghh...we shall never.. surrender...
+	 */
+	public static final NpcStringId ARRGHHWE_SHALL_NEVER_SURRENDER;
+	
+	/**
+	 * ID: 40913<br>
+	 * Message: As you wish, master!
+	 */
+	public static final NpcStringId AS_YOU_WISH_MASTER;
+	
+	/**
+	 * ID: 41651<br>
+	 * Message: My dear friend of $s1, who has gone on ahead of me!
+	 */
+	public static final NpcStringId MY_DEAR_FRIEND_OF_S1_WHO_HAS_GONE_ON_AHEAD_OF_ME;
+	
+	/**
+	 * ID: 41652<br>
+	 * Message: Listen to Tejakar Gandi, young Oroka! The spirit of the slain leopard is calling you, $s1!
+	 */
+	public static final NpcStringId LISTEN_TO_TEJAKAR_GANDI_YOUNG_OROKA_THE_SPIRIT_OF_THE_SLAIN_LEOPARD_IS_CALLING_YOU_S1;
+	
+	/**
+	 * ID: 42046<br>
+	 * Message: Hey! Everybody watch the eggs!
+	 */
+	public static final NpcStringId HEY_EVERYBODY_WATCH_THE_EGGS;
+	
+	/**
+	 * ID: 42047<br>
+	 * Message: I thought I'd caught one share... Whew!
+	 */
+	public static final NpcStringId I_THOUGHT_ID_CAUGHT_ONE_SHARE_WHEW;
+	
+	/**
+	 * ID: 42048<br>
+	 * Message: The stone... the Elven stone... broke...
+	 */
+	public static final NpcStringId THE_STONE_THE_ELVEN_STONE_BROKE;
+	
+	/**
+	 * ID: 42049<br>
+	 * Message: If the eggs get taken, we're dead!
+	 */
+	public static final NpcStringId IF_THE_EGGS_GET_TAKEN_WERE_DEAD;
+	
+	/**
+	 * ID: 42111<br>
+	 * Message: Give me a Fairy Leaf...!
+	 */
+	public static final NpcStringId GIVE_ME_A_FAIRY_LEAF;
+	
+	/**
+	 * ID: 42112<br>
+	 * Message: Why do you bother me again?
+	 */
+	public static final NpcStringId WHY_DO_YOU_BOTHER_ME_AGAIN;
+	
+	/**
+	 * ID: 42113<br>
+	 * Message: Hey, you've already drunk the essence of wind!
+	 */
+	public static final NpcStringId HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_WIND;
+	
+	/**
+	 * ID: 42114<br>
+	 * Message: Leave now, before you incur the wrath of the guardian ghost...
+	 */
+	public static final NpcStringId LEAVE_NOW_BEFORE_YOU_INCUR_THE_WRATH_OF_THE_GUARDIAN_GHOST;
+	
+	/**
+	 * ID: 42115<br>
+	 * Message: Hey, you've already drunk the essence of a star!
+	 */
+	public static final NpcStringId HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_A_STAR;
+	
+	/**
+	 * ID: 42116<br>
+	 * Message: Hey, you've already drunk the essence of dusk!
+	 */
+	public static final NpcStringId HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_DUSK;
+	
+	/**
+	 * ID: 42117<br>
+	 * Message: Hey, you've already drunk the essence of the abyss!
+	 */
+	public static final NpcStringId HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_THE_ABYSS;
+	
+	/**
+	 * ID: 42118<br>
+	 * Message: We must protect the fairy tree!
+	 */
+	public static final NpcStringId WE_MUST_PROTECT_THE_FAIRY_TREE;
+	
+	/**
+	 * ID: 42119<br>
+	 * Message: Get out of the sacred tree, you scoundrels!
+	 */
+	public static final NpcStringId GET_OUT_OF_THE_SACRED_TREE_YOU_SCOUNDRELS;
+	
+	/**
+	 * ID: 42120<br>
+	 * Message: Death to the thieves of the pure water of the world!
+	 */
+	public static final NpcStringId DEATH_TO_THE_THIEVES_OF_THE_PURE_WATER_OF_THE_WORLD;
+	
+	/**
+	 * ID: 42231<br>
+	 * Message: Hey, it seems like you need my help, doesn't it?
+	 */
+	public static final NpcStringId HEY_IT_SEEMS_LIKE_YOU_NEED_MY_HELP_DOESNT_IT;
+	
+	/**
+	 * ID: 42232<br>
+	 * Message: Almost got it... Ouch! Stop! Damn these bloody manacles!
+	 */
+	public static final NpcStringId ALMOST_GOT_IT_OUCH_STOP_DAMN_THESE_BLOODY_MANACLES;
+	
+	/**
+	 * ID: 42233<br>
+	 * Message: Oh, that smarts!
+	 */
+	public static final NpcStringId OH_THAT_SMARTS;
+	
+	/**
+	 * ID: 42234<br>
+	 * Message: Hey, master! Pay attention! I'm dying over here!
+	 */
+	public static final NpcStringId HEY_MASTER_PAY_ATTENTION_IM_DYING_OVER_HERE;
+	
+	/**
+	 * ID: 42235<br>
+	 * Message: What have I done to deserve this?
+	 */
+	public static final NpcStringId WHAT_HAVE_I_DONE_TO_DESERVE_THIS;
+	
+	/**
+	 * ID: 42236<br>
+	 * Message: Oh, this is just great! What are you going to do now?
+	 */
+	public static final NpcStringId OH_THIS_IS_JUST_GREAT_WHAT_ARE_YOU_GOING_TO_DO_NOW;
+	
+	/**
+	 * ID: 42237<br>
+	 * Message: You inconsiderate moron! Can't you even take care of little old me?!
+	 */
+	public static final NpcStringId YOU_INCONSIDERATE_MORON_CANT_YOU_EVEN_TAKE_CARE_OF_LITTLE_OLD_ME;
+	
+	/**
+	 * ID: 42238<br>
+	 * Message: Oh no! The man who eats one's sins has died! Penitence is further away~!
+	 */
+	public static final NpcStringId OH_NO_THE_MAN_WHO_EATS_ONES_SINS_HAS_DIED_PENITENCE_IS_FURTHER_AWAY;
+	
+	/**
+	 * ID: 42239<br>
+	 * Message: Using a special skill here could trigger a bloodbath!
+	 */
+	public static final NpcStringId USING_A_SPECIAL_SKILL_HERE_COULD_TRIGGER_A_BLOODBATH;
+	
+	/**
+	 * ID: 42240<br>
+	 * Message: Hey, what do you expect of me?
+	 */
+	public static final NpcStringId HEY_WHAT_DO_YOU_EXPECT_OF_ME;
+	
+	/**
+	 * ID: 42241<br>
+	 * Message: Ugggggh! Push! It's not coming out!
+	 */
+	public static final NpcStringId UGGGGGH_PUSH_ITS_NOT_COMING_OUT;
+	
+	/**
+	 * ID: 42242<br>
+	 * Message: Ah, I missed the mark!
+	 */
+	public static final NpcStringId AH_I_MISSED_THE_MARK;
+	
+	/**
+	 * ID: 42243<br>
+	 * Message: Yawwwwn! It's so boring here. We should go and find some action!
+	 */
+	public static final NpcStringId YAWWWWN_ITS_SO_BORING_HERE_WE_SHOULD_GO_AND_FIND_SOME_ACTION;
+	
+	/**
+	 * ID: 42244<br>
+	 * Message: Hey, if you continue to waste time you will never finish your penance!
+	 */
+	public static final NpcStringId HEY_IF_YOU_CONTINUE_TO_WASTE_TIME_YOU_WILL_NEVER_FINISH_YOUR_PENANCE;
+	
+	/**
+	 * ID: 42245<br>
+	 * Message: I know you don't like me. The feeling is mutual!
+	 */
+	public static final NpcStringId I_KNOW_YOU_DONT_LIKE_ME_THE_FEELING_IS_MUTUAL;
+	
+	/**
+	 * ID: 42246<br>
+	 * Message: I need a drink.
+	 */
+	public static final NpcStringId I_NEED_A_DRINK;
+	
+	/**
+	 * ID: 42247<br>
+	 * Message: Oh, this is dragging on too long... At this rate I won't make it home before the seven seals are broken.
+	 */
+	public static final NpcStringId OH_THIS_IS_DRAGGING_ON_TOO_LONG_AT_THIS_RATE_I_WONT_MAKE_IT_HOME_BEFORE_THE_SEVEN_SEALS_ARE_BROKEN;
+	
+	/**
+	 * ID: 45650<br>
+	 * Message: $s1 received a $s2 item as a reward from the separated soul.
+	 */
+	public static final NpcStringId S1_RECEIVED_A_S2_ITEM_AS_A_REWARD_FROM_THE_SEPARATED_SOUL;
+	
+	/**
+	 * ID: 45651<br>
+	 * Message: Sealed Vorpal Helmet
+	 */
+	public static final NpcStringId SEALED_VORPAL_HELMET;
+	
+	/**
+	 * ID: 45652<br>
+	 * Message: Sealed Vorpal Leather Helmet
+	 */
+	public static final NpcStringId SEALED_VORPAL_LEATHER_HELMET;
+	
+	/**
+	 * ID: 45653<br>
+	 * Message: Sealed Vorpal Circlet
+	 */
+	public static final NpcStringId SEALED_VORPAL_CIRCLET;
+	
+	/**
+	 * ID: 45654<br>
+	 * Message: Sealed Vorpal Breastplate
+	 */
+	public static final NpcStringId SEALED_VORPAL_BREASTPLATE;
+	
+	/**
+	 * ID: 45655<br>
+	 * Message: Sealed Vorpal Leather Breastplate
+	 */
+	public static final NpcStringId SEALED_VORPAL_LEATHER_BREASTPLATE;
+	
+	/**
+	 * ID: 45656<br>
+	 * Message: Sealed Vorpal Tunic
+	 */
+	public static final NpcStringId SEALED_VORPAL_TUNIC;
+	
+	/**
+	 * ID: 45657<br>
+	 * Message: Sealed Vorpal Gaiters
+	 */
+	public static final NpcStringId SEALED_VORPAL_GAITERS;
+	
+	/**
+	 * ID: 45658<br>
+	 * Message: Sealed Vorpal Leather Legging
+	 */
+	public static final NpcStringId SEALED_VORPAL_LEATHER_LEGGING;
+	
+	/**
+	 * ID: 45659<br>
+	 * Message: Sealed Vorpal Stocking
+	 */
+	public static final NpcStringId SEALED_VORPAL_STOCKING;
+	
+	/**
+	 * ID: 45660<br>
+	 * Message: Sealed Vorpal Gauntlet
+	 */
+	public static final NpcStringId SEALED_VORPAL_GAUNTLET;
+	
+	/**
+	 * ID: 45661<br>
+	 * Message: Sealed Vorpal Leather Gloves
+	 */
+	public static final NpcStringId SEALED_VORPAL_LEATHER_GLOVES;
+	
+	/**
+	 * ID: 45662<br>
+	 * Message: Sealed Vorpal Gloves
+	 */
+	public static final NpcStringId SEALED_VORPAL_GLOVES;
+	
+	/**
+	 * ID: 45663<br>
+	 * Message: Sealed Vorpal Boots
+	 */
+	public static final NpcStringId SEALED_VORPAL_BOOTS;
+	
+	/**
+	 * ID: 45664<br>
+	 * Message: Sealed Vorpal Leather Boots
+	 */
+	public static final NpcStringId SEALED_VORPAL_LEATHER_BOOTS;
+	
+	/**
+	 * ID: 45665<br>
+	 * Message: Sealed Vorpal Shoes
+	 */
+	public static final NpcStringId SEALED_VORPAL_SHOES;
+	
+	/**
+	 * ID: 45666<br>
+	 * Message: Sealed Vorpal Shield
+	 */
+	public static final NpcStringId SEALED_VORPAL_SHIELD;
+	
+	/**
+	 * ID: 45667<br>
+	 * Message: Sealed Vorpal Sigil
+	 */
+	public static final NpcStringId SEALED_VORPAL_SIGIL;
+	
+	/**
+	 * ID: 45668<br>
+	 * Message: Sealed Vorpal Ring
+	 */
+	public static final NpcStringId SEALED_VORPAL_RING;
+	
+	/**
+	 * ID: 45669<br>
+	 * Message: Sealed Vorpal Earring
+	 */
+	public static final NpcStringId SEALED_VORPAL_EARRING;
+	
+	/**
+	 * ID: 45670<br>
+	 * Message: Sealed Vorpal Necklace
+	 */
+	public static final NpcStringId SEALED_VORPAL_NECKLACE;
+	
+	/**
+	 * ID: 45671<br>
+	 * Message: Periel Sword
+	 */
+	public static final NpcStringId PERIEL_SWORD;
+	
+	/**
+	 * ID: 45672<br>
+	 * Message: Skull Edge
+	 */
+	public static final NpcStringId SKULL_EDGE;
+	
+	/**
+	 * ID: 45673<br>
+	 * Message: Vigwik Axe
+	 */
+	public static final NpcStringId VIGWIK_AXE;
+	
+	/**
+	 * ID: 45674<br>
+	 * Message: Devilish Maul
+	 */
+	public static final NpcStringId DEVILISH_MAUL;
+	
+	/**
+	 * ID: 45675<br>
+	 * Message: Feather Eye Blade
+	 */
+	public static final NpcStringId FEATHER_EYE_BLADE;
+	
+	/**
+	 * ID: 45676<br>
+	 * Message: Octo Claw
+	 */
+	public static final NpcStringId OCTO_CLAW;
+	
+	/**
+	 * ID: 45677<br>
+	 * Message: Doubletop Spear
+	 */
+	public static final NpcStringId DOUBLETOP_SPEAR;
+	
+	/**
+	 * ID: 45678<br>
+	 * Message: Rising Star
+	 */
+	public static final NpcStringId RISING_STAR;
+	
+	/**
+	 * ID: 45679<br>
+	 * Message: Black Visage
+	 */
+	public static final NpcStringId BLACK_VISAGE;
+	
+	/**
+	 * ID: 45680<br>
+	 * Message: Veniplant Sword
+	 */
+	public static final NpcStringId VENIPLANT_SWORD;
+	
+	/**
+	 * ID: 45681<br>
+	 * Message: Skull Carnium Bow
+	 */
+	public static final NpcStringId SKULL_CARNIUM_BOW;
+	
+	/**
+	 * ID: 45682<br>
+	 * Message: Gemtail Rapier
+	 */
+	public static final NpcStringId GEMTAIL_RAPIER;
+	
+	/**
+	 * ID: 45683<br>
+	 * Message: Finale Blade
+	 */
+	public static final NpcStringId FINALE_BLADE;
+	
+	/**
+	 * ID: 45684<br>
+	 * Message: Dominion Crossbow
+	 */
+	public static final NpcStringId DOMINION_CROSSBOW;
+	
+	/**
+	 * ID: 45685<br>
+	 * Message: Blessed Weapon Enchant Scroll - S Grade
+	 */
+	public static final NpcStringId BLESSED_WEAPON_ENCHANT_SCROLL_S_GRADE;
+	
+	/**
+	 * ID: 45686<br>
+	 * Message: Blessed Armor Enchant Scroll - S Grade
+	 */
+	public static final NpcStringId BLESSED_ARMOR_ENCHANT_SCROLL_S_GRADE;
+	
+	/**
+	 * ID: 45687<br>
+	 * Message: Fire Crystal
+	 */
+	public static final NpcStringId FIRE_CRYSTAL;
+	
+	/**
+	 * ID: 45688<br>
+	 * Message: Water Crystal
+	 */
+	public static final NpcStringId WATER_CRYSTAL;
+	
+	/**
+	 * ID: 45689<br>
+	 * Message: Earth Crystal
+	 */
+	public static final NpcStringId EARTH_CRYSTAL;
+	
+	/**
+	 * ID: 45690<br>
+	 * Message: Wind Crystal
+	 */
+	public static final NpcStringId WIND_CRYSTAL;
+	
+	/**
+	 * ID: 45691<br>
+	 * Message: Holy Crystal
+	 */
+	public static final NpcStringId HOLY_CRYSTAL;
+	
+	/**
+	 * ID: 45692<br>
+	 * Message: Dark Crystal
+	 */
+	public static final NpcStringId DARK_CRYSTAL;
+	
+	/**
+	 * ID: 45693<br>
+	 * Message: Weapon Enchant Scroll - S Grade
+	 */
+	public static final NpcStringId WEAPON_ENCHANT_SCROLL_S_GRADE;
+	
+	/**
+	 * ID: 46350<br>
+	 * Message: Att... attack... $s1.. Ro... rogue... $s2..
+	 */
+	public static final NpcStringId ATT_ATTACK_S1_RO_ROGUE_S2;
+	
+	/**
+	 * ID: 50110<br>
+	 * Message: ##########Bingo!##########
+	 */
+	public static final NpcStringId BINGO;
+	
+	/**
+	 * ID: 50338<br>
+	 * Message: Blood and honor!
+	 */
+	public static final NpcStringId BLOOD_AND_HONOR;
+	
+	/**
+	 * ID: 50339<br>
+	 * Message: Curse of the gods on the one that defiles the property of the empire!
+	 */
+	public static final NpcStringId CURSE_OF_THE_GODS_ON_THE_ONE_THAT_DEFILES_THE_PROPERTY_OF_THE_EMPIRE;
+	
+	/**
+	 * ID: 50340<br>
+	 * Message: War and death!
+	 */
+	public static final NpcStringId WAR_AND_DEATH;
+	
+	/**
+	 * ID: 50341<br>
+	 * Message: Ambition and power!
+	 */
+	public static final NpcStringId AMBITION_AND_POWER;
+	
+	/**
+	 * ID: 50503<br>
+	 * Message: $s1 has won the main event for players under level $s2, and earned $s3 points!
+	 */
+	public static final NpcStringId S1_HAS_WON_THE_MAIN_EVENT_FOR_PLAYERS_UNDER_LEVEL_S2_AND_EARNED_S3_POINTS;
+	
+	/**
+	 * ID: 50504<br>
+	 * Message: $s1 has earned $s2 points in the main event for unlimited levels.
+	 */
+	public static final NpcStringId S1_HAS_EARNED_S2_POINTS_IN_THE_MAIN_EVENT_FOR_UNLIMITED_LEVELS;
+	
+	/**
+	 * ID: 50701<br>
+	 * Message: Into the Chaos
+	 */
+	public static final NpcStringId INTO_THE_CHAOS;
+	
+	/**
+	 * ID: 50851<br>
+	 * Message: You have successfully completed a clan quest. $s1 points have been added to your clan's reputation score.
+	 */
+	public static final NpcStringId YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLANS_REPUTATION_SCORE;
+	
+	/**
+	 * ID: 60000<br>
+	 * Message: The furnace will go out. Watch and see.
+	 */
+	public static final NpcStringId THE_FURNACE_WILL_GO_OUT_WATCH_AND_SEE;
+	
+	/**
+	 * ID: 60001<br>
+	 * Message: There's about 1 minute left!
+	 */
+	public static final NpcStringId THERES_ABOUT_1_MINUTE_LEFT;
+	
+	/**
+	 * ID: 60002<br>
+	 * Message: There's just 10 seconds left!
+	 */
+	public static final NpcStringId THERES_JUST_10_SECONDS_LEFT;
+	
+	/**
+	 * ID: 60003<br>
+	 * Message: Now, light the furnace's fire.
+	 */
+	public static final NpcStringId NOW_LIGHT_THE_FURNACES_FIRE;
+	
+	/**
+	 * ID: 60004<br>
+	 * Message: Time is up and you have failed. Any more will be difficult.
+	 */
+	public static final NpcStringId TIME_IS_UP_AND_YOU_HAVE_FAILED_ANY_MORE_WILL_BE_DIFFICULT;
+	
+	/**
+	 * ID: 60005<br>
+	 * Message: Oh, you've succeeded.
+	 */
+	public static final NpcStringId OH_YOUVE_SUCCEEDED;
+	
+	/**
+	 * ID: 60006<br>
+	 * Message: Ah, is this failure? But it looks like I can keep going.
+	 */
+	public static final NpcStringId AH_IS_THIS_FAILURE_BUT_IT_LOOKS_LIKE_I_CAN_KEEP_GOING;
+	
+	/**
+	 * ID: 60007<br>
+	 * Message: Ah, I've failed. Going further will be difficult.
+	 */
+	public static final NpcStringId AH_IVE_FAILED_GOING_FURTHER_WILL_BE_DIFFICULT;
+	
+	/**
+	 * ID: 60008<br>
+	 * Message: Furnace of Balance
+	 */
+	public static final NpcStringId FURNACE_OF_BALANCE;
+	
+	/**
+	 * ID: 60009<br>
+	 * Message: Furnace of Protection
+	 */
+	public static final NpcStringId FURNACE_OF_PROTECTION;
+	
+	/**
+	 * ID: 60010<br>
+	 * Message: Furnace of Will
+	 */
+	public static final NpcStringId FURNACE_OF_WILL;
+	
+	/**
+	 * ID: 60011<br>
+	 * Message: Furnace of Magic
+	 */
+	public static final NpcStringId FURNACE_OF_MAGIC;
+	
+	/**
+	 * ID: 60012<br>
+	 * Message: Divine energy is beginning to encircle.
+	 */
+	public static final NpcStringId DIVINE_ENERGY_IS_BEGINNING_TO_ENCIRCLE;
+	
+	/**
+	 * ID: 60013<br>
+	 * Message: For the glory of Solina!
+	 */
+	public static final NpcStringId FOR_THE_GLORY_OF_SOLINA;
+	
+	/**
+	 * ID: 60014<br>
+	 * Message: Punish all those who tread footsteps in this place.
+	 */
+	public static final NpcStringId PUNISH_ALL_THOSE_WHO_TREAD_FOOTSTEPS_IN_THIS_PLACE;
+	
+	/**
+	 * ID: 60015<br>
+	 * Message: We are the sword of truth, the sword of Solina.
+	 */
+	public static final NpcStringId WE_ARE_THE_SWORD_OF_TRUTH_THE_SWORD_OF_SOLINA;
+	
+	/**
+	 * ID: 60016<br>
+	 * Message: We raise our blades for the glory of Solina.
+	 */
+	public static final NpcStringId WE_RAISE_OUR_BLADES_FOR_THE_GLORY_OF_SOLINA;
+	
+	/**
+	 * ID: 60018<br>
+	 * Message: Hey, don't go so fast.
+	 */
+	public static final NpcStringId HEY_DONT_GO_SO_FAST;
+	
+	/**
+	 * ID: 60019<br>
+	 * Message: It's hard to follow.
+	 */
+	public static final NpcStringId ITS_HARD_TO_FOLLOW;
+	
+	/**
+	 * ID: 60020<br>
+	 * Message: Huff huff. You're too fast. I can't follow anymore.
+	 */
+	public static final NpcStringId HUFF_HUFF_YOURE_TOO_FAST_I_CANT_FOLLOW_ANYMORE;
+	
+	/**
+	 * ID: 60021<br>
+	 * Message: Ah... I think I remember this place.
+	 */
+	public static final NpcStringId AH_I_THINK_I_REMEMBER_THIS_PLACE;
+	
+	/**
+	 * ID: 60022<br>
+	 * Message: Ah! Fresh air!
+	 */
+	public static final NpcStringId AH_FRESH_AIR;
+	
+	/**
+	 * ID: 60023<br>
+	 * Message: What were you doing here?
+	 */
+	public static final NpcStringId WHAT_WERE_YOU_DOING_HERE;
+	
+	/**
+	 * ID: 60024<br>
+	 * Message: I guess you're the silent type. Then are you looking for treasure like me?
+	 */
+	public static final NpcStringId I_GUESS_YOURE_THE_SILENT_TYPE_THEN_ARE_YOU_LOOKING_FOR_TREASURE_LIKE_ME;
+	
+	/**
+	 * ID: 60403<br>
+	 * Message: Who is calling me?
+	 */
+	public static final NpcStringId WHO_IS_CALLING_ME;
+	
+	/**
+	 * ID: 60404<br>
+	 * Message: Can light exist without darkness?
+	 */
+	public static final NpcStringId CAN_LIGHT_EXIST_WITHOUT_DARKNESS;
+	
+	/**
+	 * ID: 60903<br>
+	 * Message: You can't avoid the eyes of Udan!
+	 */
+	public static final NpcStringId YOU_CANT_AVOID_THE_EYES_OF_UDAN;
+	
+	/**
+	 * ID: 60904<br>
+	 * Message: Udan has already seen your face!
+	 */
+	public static final NpcStringId UDAN_HAS_ALREADY_SEEN_YOUR_FACE;
+	
+	/**
+	 * ID: 61050<br>
+	 * Message: The magical power of water comes from the power of storm and hail! If you dare to confront it, only death will await you!
+	 */
+	public static final NpcStringId THE_MAGICAL_POWER_OF_WATER_COMES_FROM_THE_POWER_OF_STORM_AND_HAIL_IF_YOU_DARE_TO_CONFRONT_IT_ONLY_DEATH_WILL_AWAIT_YOU;
+	
+	/**
+	 * ID: 61051<br>
+	 * Message: The power of constraint is getting weaker. Your ritual has failed!
+	 */
+	public static final NpcStringId THE_POWER_OF_CONSTRAINT_IS_GETTING_WEAKER_YOUR_RITUAL_HAS_FAILED;
+	
+	/**
+	 * ID: 61503<br>
+	 * Message: You can't avoid the eyes of Asefa!
+	 */
+	public static final NpcStringId YOU_CANT_AVOID_THE_EYES_OF_ASEFA;
+	
+	/**
+	 * ID: 61504<br>
+	 * Message: Asefa has already seen your face!
+	 */
+	public static final NpcStringId ASEFA_HAS_ALREADY_SEEN_YOUR_FACE;
+	
+	/**
+	 * ID: 61650<br>
+	 * Message: The magical power of fire is also the power of flames and lava! If you dare to confront it, only death will await you!
+	 */
+	public static final NpcStringId THE_MAGICAL_POWER_OF_FIRE_IS_ALSO_THE_POWER_OF_FLAMES_AND_LAVA_IF_YOU_DARE_TO_CONFRONT_IT_ONLY_DEATH_WILL_AWAIT_YOU;
+	
+	/**
+	 * ID: 62503<br>
+	 * Message: I smell something delicious...
+	 */
+	public static final NpcStringId I_SMELL_SOMETHING_DELICIOUS;
+	
+	/**
+	 * ID: 62504<br>
+	 * Message: Oooh!
+	 */
+	public static final NpcStringId OOOH;
+	
+	/**
+	 * ID: 66001<br>
+	 * Message: Aiding the Floran Village.
+	 */
+	public static final NpcStringId AIDING_THE_FLORAN_VILLAGE;
+	
+	/**
+	 * ID: 66300<br>
+	 * Message: No such card
+	 */
+	public static final NpcStringId NO_SUCH_CARD;
+	
+	/**
+	 * ID: 68801<br>
+	 * Message: Defeat the Elrokian Raiders!
+	 */
+	public static final NpcStringId DEFEAT_THE_ELROKIAN_RAIDERS;
+	
+	/**
+	 * ID: 70851<br>
+	 * Message: Have you completed your preparations to become a lord?
+	 */
+	public static final NpcStringId HAVE_YOU_COMPLETED_YOUR_PREPARATIONS_TO_BECOME_A_LORD;
+	
+	/**
+	 * ID: 70852<br>
+	 * Message: $s1. Now, depart!
+	 */
+	public static final NpcStringId S1_NOW_DEPART;
+	
+	/**
+	 * ID: 70853<br>
+	 * Message: Go find Saius!
+	 */
+	public static final NpcStringId GO_FIND_SAIUS;
+	
+	/**
+	 * ID: 70854<br>
+	 * Message: Listen, you villagers. Our liege, who will soon become a lord, has defeated the Headless Knight. You can now rest easy!
+	 */
+	public static final NpcStringId LISTEN_YOU_VILLAGERS_OUR_LIEGE_WHO_WILL_SOON_BECOME_A_LORD_HAS_DEFEATED_THE_HEADLESS_KNIGHT_YOU_CAN_NOW_REST_EASY;
+	
+	/**
+	 * ID: 70855<br>
+	 * Message: $s1! Do you dare defy my subordinates?
+	 */
+	public static final NpcStringId S1_DO_YOU_DARE_DEFY_MY_SUBORDINATES;
+	
+	/**
+	 * ID: 70856<br>
+	 * Message: Does my mission to block the supplies end here?
+	 */
+	public static final NpcStringId DOES_MY_MISSION_TO_BLOCK_THE_SUPPLIES_END_HERE;
+	
+	/**
+	 * ID: 70859<br>
+	 * Message: $s1 has become lord of the Town of Gludio. Long may he reign!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_LORD_OF_THE_TOWN_OF_GLUDIO_LONG_MAY_HE_REIGN;
+	
+	/**
+	 * ID: 70957<br>
+	 * Message: You'll see! I won't forgive you next time!
+	 */
+	public static final NpcStringId YOULL_SEE_I_WONT_FORGIVE_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 70959<br>
+	 * Message: $s1 has become lord of the Town of Dion. Long may he reign!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_LORD_OF_THE_TOWN_OF_DION_LONG_MAY_HE_REIGN;
+	
+	/**
+	 * ID: 71052<br>
+	 * Message: It's the enemy! No mercy!
+	 */
+	public static final NpcStringId ITS_THE_ENEMY_NO_MERCY;
+	
+	/**
+	 * ID: 71053<br>
+	 * Message: What are you doing? We are still superior!
+	 */
+	public static final NpcStringId WHAT_ARE_YOU_DOING_WE_ARE_STILL_SUPERIOR;
+	
+	/**
+	 * ID: 71054<br>
+	 * Message: How infuriating! This enemy...
+	 */
+	public static final NpcStringId HOW_INFURIATING_THIS_ENEMY;
+	
+	/**
+	 * ID: 71059<br>
+	 * Message: $s1 has become the lord of the Town of Giran. May there be glory in the territory of Giran!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_GIRAN_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_GIRAN;
+	
+	/**
+	 * ID: 71151<br>
+	 * Message: My liege! Where are you?
+	 */
+	public static final NpcStringId MY_LIEGE_WHERE_ARE_YOU;
+	
+	/**
+	 * ID: 71159<br>
+	 * Message: $s1 has become the lord of the Town of Innadril. May there be glory in the territory of Innadril!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_INNADRIL_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_INNADRIL;
+	
+	/**
+	 * ID: 71252<br>
+	 * Message: You have found all the Nebulite Orbs!
+	 */
+	public static final NpcStringId YOU_HAVE_FOUND_ALL_THE_NEBULITE_ORBS;
+	
+	/**
+	 * ID: 71259<br>
+	 * Message: $s1 has become the lord of the Town of Oren. May there be glory in the territory of Oren!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_OREN_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_OREN;
+	
+	/**
+	 * ID: 71351<br>
+	 * Message: $s1 has become the lord of the Town of Aden. May there be glory in the territory of Aden!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_ADEN_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_ADEN;
+	
+	/**
+	 * ID: 71459<br>
+	 * Message: $s1 has become the lord of the Town of Schuttgart. May there be glory in the territory of Schuttgart!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_SCHUTTGART_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 71551<br>
+	 * Message: $s1, I will remember you.
+	 */
+	public static final NpcStringId S1_I_WILL_REMEMBER_YOU;
+	
+	/**
+	 * ID: 71559<br>
+	 * Message: $s1 has become the lord of the Town of Goddard. May there be glory in the territory of Goddard!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_GODDARD_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_GODDARD;
+	
+	/**
+	 * ID: 71653<br>
+	 * Message: Frederick is looking for you, my liege.
+	 */
+	public static final NpcStringId FREDERICK_IS_LOOKING_FOR_YOU_MY_LIEGE;
+	
+	/**
+	 * ID: 71654<br>
+	 * Message: Ho ho! Did you think you could really stop trading with us?
+	 */
+	public static final NpcStringId HO_HO_DID_YOU_THINK_YOU_COULD_REALLY_STOP_TRADING_WITH_US;
+	
+	/**
+	 * ID: 71655<br>
+	 * Message: You have charged into the temple.
+	 */
+	public static final NpcStringId YOU_HAVE_CHARGED_INTO_THE_TEMPLE;
+	
+	/**
+	 * ID: 71656<br>
+	 * Message: You are in the midst of dealing with the heretic of Heretic Temple.
+	 */
+	public static final NpcStringId YOU_ARE_IN_THE_MIDST_OF_DEALING_WITH_THE_HERETIC_OF_HERETIC_TEMPLE;
+	
+	/**
+	 * ID: 71657<br>
+	 * Message: The Heretic Temple is descending into chaos.
+	 */
+	public static final NpcStringId THE_HERETIC_TEMPLE_IS_DESCENDING_INTO_CHAOS;
+	
+	/**
+	 * ID: 71659<br>
+	 * Message: $s1 has become the lord of the Town of Rune. May there be glory in the territory of Rune!
+	 */
+	public static final NpcStringId S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_RUNE_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_RUNE;
+	
+	/**
+	 * ID: 71751<br>
+	 * Message: $s1! Raise your weapons for the sake of the territory!
+	 */
+	public static final NpcStringId S1_RAISE_YOUR_WEAPONS_FOR_THE_SAKE_OF_THE_TERRITORY;
+	
+	/**
+	 * ID: 71752<br>
+	 * Message: $s1! The war is over. Lower your sword for the sake of the future.
+	 */
+	public static final NpcStringId S1_THE_WAR_IS_OVER_LOWER_YOUR_SWORD_FOR_THE_SAKE_OF_THE_FUTURE;
+	
+	/**
+	 * ID: 71755<br>
+	 * Message: 90 Territory Badges, 450 scores in Individual Fame and $s2 Adenas
+	 */
+	public static final NpcStringId N91_TERRITORY_BADGES_450_SCORES_IN_INDIVIDUAL_FAME_AND_S2_ADENAS;
+	
+	/**
+	 * ID: 72903<br>
+	 * Message: The mercenary quest number is $s1; memostate1 is $s2; and memostate2 is $s3.
+	 */
+	public static final NpcStringId THE_MERCENARY_QUEST_NUMBER_IS_S1_MEMOSTATE1_IS_S2_AND_MEMOSTATE2_IS_S3;
+	
+	/**
+	 * ID: 72904<br>
+	 * Message: user_connected event occurrence success. Siege Id is $s1, Number 728 memo2 is $s2. 729/memo2 is $s3, and 255/memo1 is $s4.
+	 */
+	public static final NpcStringId USER_CONNECTED_EVENT_OCCURRENCE_SUCCESS_SIEGE_ID_IS_S1_NUMBER_728_MEMO2_IS_S2_729_MEMO2_IS_S3_AND_255_MEMO1_IS_S4;
+	
+	/**
+	 * ID: 72905<br>
+	 * Message: Territory Catapult dying event catapult's territory ID $s1, party status $s2.
+	 */
+	public static final NpcStringId TERRITORY_CATAPULT_DYING_EVENT_CATAPULTS_TERRITORY_ID_S1_PARTY_STATUS_S2;
+	
+	/**
+	 * ID: 72951<br>
+	 * Message: Protect the catapult of Gludio!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_GLUDIO;
+	
+	/**
+	 * ID: 72952<br>
+	 * Message: Protect the catapult of Dion!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_DION;
+	
+	/**
+	 * ID: 72953<br>
+	 * Message: Protect the catapult of Giran!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_GIRAN;
+	
+	/**
+	 * ID: 72954<br>
+	 * Message: Protect the catapult of Oren!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_OREN;
+	
+	/**
+	 * ID: 72955<br>
+	 * Message: Protect the catapult of Aden!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_ADEN;
+	
+	/**
+	 * ID: 72956<br>
+	 * Message: Protect the catapult of Innadril!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_INNADRIL;
+	
+	/**
+	 * ID: 72957<br>
+	 * Message: Protect the catapult of Goddard!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_GODDARD;
+	
+	/**
+	 * ID: 72958<br>
+	 * Message: Protect the catapult of Rune!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_RUNE;
+	
+	/**
+	 * ID: 72959<br>
+	 * Message: Protect the catapult of Schuttgart!
+	 */
+	public static final NpcStringId PROTECT_THE_CATAPULT_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 72961<br>
+	 * Message: The catapult of Gludio has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_GLUDIO_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72962<br>
+	 * Message: The catapult of Dion has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_DION_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72963<br>
+	 * Message: The catapult of Giran has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_GIRAN_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72964<br>
+	 * Message: The catapult of Oren has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_OREN_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72965<br>
+	 * Message: The catapult of Aden has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_ADEN_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72966<br>
+	 * Message: The catapult of Innadril has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_INNADRIL_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72967<br>
+	 * Message: The catapult of Goddard has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_GODDARD_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72968<br>
+	 * Message: The catapult of Rune has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_RUNE_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72969<br>
+	 * Message: The catapult of Schuttgart has been destroyed!
+	 */
+	public static final NpcStringId THE_CATAPULT_OF_SCHUTTGART_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 72981<br>
+	 * Message: Gludio
+	 */
+	public static final NpcStringId GLUDIO;
+	
+	/**
+	 * ID: 72982<br>
+	 * Message: Dion
+	 */
+	public static final NpcStringId DION;
+	
+	/**
+	 * ID: 72983<br>
+	 * Message: Giran
+	 */
+	public static final NpcStringId GIRAN;
+	
+	/**
+	 * ID: 72984<br>
+	 * Message: Oren
+	 */
+	public static final NpcStringId OREN;
+	
+	/**
+	 * ID: 72985<br>
+	 * Message: Aden
+	 */
+	public static final NpcStringId ADEN;
+	
+	/**
+	 * ID: 72986<br>
+	 * Message: Innadril
+	 */
+	public static final NpcStringId INNADRIL;
+	
+	/**
+	 * ID: 72987<br>
+	 * Message: Goddard
+	 */
+	public static final NpcStringId GODDARD;
+	
+	/**
+	 * ID: 72988<br>
+	 * Message: Rune
+	 */
+	public static final NpcStringId RUNE;
+	
+	/**
+	 * ID: 72989<br>
+	 * Message: Schuttgart
+	 */
+	public static final NpcStringId SCHUTTGART;
+	
+	/**
+	 * ID: 73051<br>
+	 * Message: Protect the supplies safe of Gludio!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_GLUDIO;
+	
+	/**
+	 * ID: 73052<br>
+	 * Message: Protect the supplies safe of Dion!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_DION;
+	
+	/**
+	 * ID: 73053<br>
+	 * Message: Protect the supplies safe of Giran!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_GIRAN;
+	
+	/**
+	 * ID: 73054<br>
+	 * Message: Protect the supplies safe of Oren!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_OREN;
+	
+	/**
+	 * ID: 73055<br>
+	 * Message: Protect the supplies safe of Aden!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_ADEN;
+	
+	/**
+	 * ID: 73056<br>
+	 * Message: Protect the supplies safe of Innadril!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_INNADRIL;
+	
+	/**
+	 * ID: 73057<br>
+	 * Message: Protect the supplies safe of Goddard!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_GODDARD;
+	
+	/**
+	 * ID: 73058<br>
+	 * Message: Protect the supplies safe of Rune!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_RUNE;
+	
+	/**
+	 * ID: 73059<br>
+	 * Message: Protect the supplies safe of Schuttgart!
+	 */
+	public static final NpcStringId PROTECT_THE_SUPPLIES_SAFE_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 73061<br>
+	 * Message: The supplies safe of Gludio has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_GLUDIO_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73062<br>
+	 * Message: The supplies safe of Dion has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_DION_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73063<br>
+	 * Message: The supplies safe of Giran has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_GIRAN_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73064<br>
+	 * Message: The supplies safe of Oren has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_OREN_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73065<br>
+	 * Message: The supplies safe of Aden has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_ADEN_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73066<br>
+	 * Message: The supplies safe of Innadril has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_INNADRIL_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73067<br>
+	 * Message: The supplies safe of Goddard has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_GODDARD_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73068<br>
+	 * Message: The supplies safe of Rune has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_RUNE_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73069<br>
+	 * Message: The supplies safe of Schuttgart has been destroyed!
+	 */
+	public static final NpcStringId THE_SUPPLIES_SAFE_OF_SCHUTTGART_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 73151<br>
+	 * Message: Protect the Military Association Leader of Gludio!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_GLUDIO;
+	
+	/**
+	 * ID: 73152<br>
+	 * Message: Protect the Military Association Leader of Dion!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_DION;
+	
+	/**
+	 * ID: 73153<br>
+	 * Message: Protect the Military Association Leader of Giran!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_GIRAN;
+	
+	/**
+	 * ID: 73154<br>
+	 * Message: Protect the Military Association Leader of Oren!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_OREN;
+	
+	/**
+	 * ID: 73155<br>
+	 * Message: Protect the Military Association Leader of Aden!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_ADEN;
+	
+	/**
+	 * ID: 73156<br>
+	 * Message: Protect the Military Association Leader of Innadril!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_INNADRIL;
+	
+	/**
+	 * ID: 73157<br>
+	 * Message: Protect the Military Association Leader of Goddard!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_GODDARD;
+	
+	/**
+	 * ID: 73158<br>
+	 * Message: Protect the Military Association Leader of Rune!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_RUNE;
+	
+	/**
+	 * ID: 73159<br>
+	 * Message: Protect the Military Association Leader of Schuttgart!
+	 */
+	public static final NpcStringId PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 73161<br>
+	 * Message: The Military Association Leader of Gludio is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_GLUDIO_IS_DEAD;
+	
+	/**
+	 * ID: 73162<br>
+	 * Message: The Military Association Leader of Dion is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_DION_IS_DEAD;
+	
+	/**
+	 * ID: 73163<br>
+	 * Message: The Military Association Leader of Giran is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_GIRAN_IS_DEAD;
+	
+	/**
+	 * ID: 73164<br>
+	 * Message: The Military Association Leader of Oren is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_OREN_IS_DEAD;
+	
+	/**
+	 * ID: 73165<br>
+	 * Message: The Military Association Leader of Aden is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_ADEN_IS_DEAD;
+	
+	/**
+	 * ID: 73166<br>
+	 * Message: The Military Association Leader of Innadril is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_INNADRIL_IS_DEAD;
+	
+	/**
+	 * ID: 73167<br>
+	 * Message: The Military Association Leader of Goddard is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_GODDARD_IS_DEAD;
+	
+	/**
+	 * ID: 73168<br>
+	 * Message: The Military Association Leader of Rune is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_RUNE_IS_DEAD;
+	
+	/**
+	 * ID: 73169<br>
+	 * Message: The Military Association Leader of Schuttgart is dead!
+	 */
+	public static final NpcStringId THE_MILITARY_ASSOCIATION_LEADER_OF_SCHUTTGART_IS_DEAD;
+	
+	/**
+	 * ID: 73251<br>
+	 * Message: Protect the Religious Association Leader of Gludio!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GLUDIO;
+	
+	/**
+	 * ID: 73252<br>
+	 * Message: Protect the Religious Association Leader of Dion!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_DION;
+	
+	/**
+	 * ID: 73253<br>
+	 * Message: Protect the Religious Association Leader of Giran!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GIRAN;
+	
+	/**
+	 * ID: 73254<br>
+	 * Message: Protect the Religious Association Leader of Oren!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_OREN;
+	
+	/**
+	 * ID: 73255<br>
+	 * Message: Protect the Religious Association Leader of Aden!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_ADEN;
+	
+	/**
+	 * ID: 73256<br>
+	 * Message: Protect the Religious Association Leader of Innadril!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_INNADRIL;
+	
+	/**
+	 * ID: 73257<br>
+	 * Message: Protect the Religious Association Leader of Goddard!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GODDARD;
+	
+	/**
+	 * ID: 73258<br>
+	 * Message: Protect the Religious Association Leader of Rune!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_RUNE;
+	
+	/**
+	 * ID: 73259<br>
+	 * Message: Protect the Religious Association Leader of Schuttgart!
+	 */
+	public static final NpcStringId PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 73261<br>
+	 * Message: The Religious Association Leader of Gludio is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GLUDIO_IS_DEAD;
+	
+	/**
+	 * ID: 73262<br>
+	 * Message: The Religious Association Leader of Dion is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_DION_IS_DEAD;
+	
+	/**
+	 * ID: 73263<br>
+	 * Message: The Religious Association Leader of Giran is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GIRAN_IS_DEAD;
+	
+	/**
+	 * ID: 73264<br>
+	 * Message: The Religious Association Leader of Oren is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_OREN_IS_DEAD;
+	
+	/**
+	 * ID: 73265<br>
+	 * Message: The Religious Association Leader of Aden is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_ADEN_IS_DEAD;
+	
+	/**
+	 * ID: 73266<br>
+	 * Message: The Religious Association Leader of Innadril is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_INNADRIL_IS_DEAD;
+	
+	/**
+	 * ID: 73267<br>
+	 * Message: The Religious Association Leader of Goddard is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GODDARD_IS_DEAD;
+	
+	/**
+	 * ID: 73268<br>
+	 * Message: The Religious Association Leader of Rune is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_RUNE_IS_DEAD;
+	
+	/**
+	 * ID: 73269<br>
+	 * Message: The Religious Association Leader of Schuttgart is dead!
+	 */
+	public static final NpcStringId THE_RELIGIOUS_ASSOCIATION_LEADER_OF_SCHUTTGART_IS_DEAD;
+	
+	/**
+	 * ID: 73351<br>
+	 * Message: Protect the Economic Association Leader of Gludio!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_GLUDIO;
+	
+	/**
+	 * ID: 73352<br>
+	 * Message: Protect the Economic Association Leader of Dion!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_DION;
+	
+	/**
+	 * ID: 73353<br>
+	 * Message: Protect the Economic Association Leader of Giran!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_GIRAN;
+	
+	/**
+	 * ID: 73354<br>
+	 * Message: Protect the Economic Association Leader of Oren!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_OREN;
+	
+	/**
+	 * ID: 73355<br>
+	 * Message: Protect the Economic Association Leader of Aden!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_ADEN;
+	
+	/**
+	 * ID: 73356<br>
+	 * Message: Protect the Economic Association Leader of Innadril!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_INNADRIL;
+	
+	/**
+	 * ID: 73357<br>
+	 * Message: Protect the Economic Association Leader of Goddard!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_GODDARD;
+	
+	/**
+	 * ID: 73358<br>
+	 * Message: Protect the Economic Association Leader of Rune!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_RUNE;
+	
+	/**
+	 * ID: 73359<br>
+	 * Message: Protect the Economic Association Leader of Schuttgart!
+	 */
+	public static final NpcStringId PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 73361<br>
+	 * Message: The Economic Association Leader of Gludio is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_GLUDIO_IS_DEAD;
+	
+	/**
+	 * ID: 73362<br>
+	 * Message: The Economic Association Leader of Dion is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_DION_IS_DEAD;
+	
+	/**
+	 * ID: 73363<br>
+	 * Message: The Economic Association Leader of Giran is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_GIRAN_IS_DEAD;
+	
+	/**
+	 * ID: 73364<br>
+	 * Message: The Economic Association Leader of Oren is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_OREN_IS_DEAD;
+	
+	/**
+	 * ID: 73365<br>
+	 * Message: The Economic Association Leader of Aden is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_ADEN_IS_DEAD;
+	
+	/**
+	 * ID: 73366<br>
+	 * Message: The Economic Association Leader of Innadril is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_INNADRIL_IS_DEAD;
+	
+	/**
+	 * ID: 73367<br>
+	 * Message: The Economic Association Leader of Goddard is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_GODDARD_IS_DEAD;
+	
+	/**
+	 * ID: 73368<br>
+	 * Message: The Economic Association Leader of Rune is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_RUNE_IS_DEAD;
+	
+	/**
+	 * ID: 73369<br>
+	 * Message: The Economic Association Leader of Schuttgart is dead!
+	 */
+	public static final NpcStringId THE_ECONOMIC_ASSOCIATION_LEADER_OF_SCHUTTGART_IS_DEAD;
+	
+	/**
+	 * ID: 73451<br>
+	 * Message: Defeat $s1 enemy knights!
+	 */
+	public static final NpcStringId DEFEAT_S1_ENEMY_KNIGHTS;
+	
+	/**
+	 * ID: 73461<br>
+	 * Message: You have defeated $s2 of $s1 knights.
+	 */
+	public static final NpcStringId YOU_HAVE_DEFEATED_S2_OF_S1_KNIGHTS;
+	
+	/**
+	 * ID: 73462<br>
+	 * Message: You weakened the enemy's defense!
+	 */
+	public static final NpcStringId YOU_WEAKENED_THE_ENEMYS_DEFENSE;
+	
+	/**
+	 * ID: 73551<br>
+	 * Message: Defeat $s1 warriors and rogues!
+	 */
+	public static final NpcStringId DEFEAT_S1_WARRIORS_AND_ROGUES;
+	
+	/**
+	 * ID: 73561<br>
+	 * Message: You have defeated $s2 of $s1 warriors and rogues.
+	 */
+	public static final NpcStringId YOU_HAVE_DEFEATED_S2_OF_S1_WARRIORS_AND_ROGUES;
+	
+	/**
+	 * ID: 73562<br>
+	 * Message: You weakened the enemy's attack!
+	 */
+	public static final NpcStringId YOU_WEAKENED_THE_ENEMYS_ATTACK;
+	
+	/**
+	 * ID: 73651<br>
+	 * Message: Defeat $s1 wizards and summoners!
+	 */
+	public static final NpcStringId DEFEAT_S1_WIZARDS_AND_SUMMONERS;
+	
+	/**
+	 * ID: 73661<br>
+	 * Message: You have defeated $s2 of $s1 enemies.
+	 */
+	public static final NpcStringId YOU_HAVE_DEFEATED_S2_OF_S1_ENEMIES;
+	
+	/**
+	 * ID: 73662<br>
+	 * Message: You weakened the enemy's magic!
+	 */
+	public static final NpcStringId YOU_WEAKENED_THE_ENEMYS_MAGIC;
+	
+	/**
+	 * ID: 73751<br>
+	 * Message: Defeat $s1 healers and buffers.
+	 */
+	public static final NpcStringId DEFEAT_S1_HEALERS_AND_BUFFERS;
+	
+	/**
+	 * ID: 73761<br>
+	 * Message: You have defeated $s2 of $s1 healers and buffers.
+	 */
+	public static final NpcStringId YOU_HAVE_DEFEATED_S2_OF_S1_HEALERS_AND_BUFFERS;
+	
+	/**
+	 * ID: 73762<br>
+	 * Message: You have weakened the enemy's support!
+	 */
+	public static final NpcStringId YOU_HAVE_WEAKENED_THE_ENEMYS_SUPPORT;
+	
+	/**
+	 * ID: 73851<br>
+	 * Message: Defeat $s1 warsmiths and overlords.
+	 */
+	public static final NpcStringId DEFEAT_S1_WARSMITHS_AND_OVERLORDS;
+	
+	/**
+	 * ID: 73861<br>
+	 * Message: You have defeated $s2 of $s1 warsmiths and overlords.
+	 */
+	public static final NpcStringId YOU_HAVE_DEFEATED_S2_OF_S1_WARSMITHS_AND_OVERLORDS;
+	
+	/**
+	 * ID: 73862<br>
+	 * Message: You destroyed the enemy's professionals!
+	 */
+	public static final NpcStringId YOU_DESTROYED_THE_ENEMYS_PROFESSIONALS;
+	
+	/**
+	 * ID: 99601<br>
+	 * Message: Tra la la... Today, I'm going to make another fun-filled trip. I wonder what I should look for this time...
+	 */
+	public static final NpcStringId TRA_LA_LA_TODAY_IM_GOING_TO_MAKE_ANOTHER_FUN_FILLED_TRIP_I_WONDER_WHAT_I_SHOULD_LOOK_FOR_THIS_TIME;
+	
+	/**
+	 * ID: 99700<br>
+	 * Message: What's this? Why am I being disturbed?
+	 */
+	public static final NpcStringId WHATS_THIS_WHY_AM_I_BEING_DISTURBED;
+	
+	/**
+	 * ID: 99701<br>
+	 * Message: Ta-da! Here I am!
+	 */
+	public static final NpcStringId TA_DA_HERE_I_AM;
+	
+	/**
+	 * ID: 99702<br>
+	 * Message: What are you looking at?
+	 */
+	public static final NpcStringId WHAT_ARE_YOU_LOOKING_AT;
+	
+	/**
+	 * ID: 99703<br>
+	 * Message: If you give me nectar, this little squash will grow up quickly!
+	 */
+	public static final NpcStringId IF_YOU_GIVE_ME_NECTAR_THIS_LITTLE_SQUASH_WILL_GROW_UP_QUICKLY;
+	
+	/**
+	 * ID: 99704<br>
+	 * Message: Are you my mommy?
+	 */
+	public static final NpcStringId ARE_YOU_MY_MOMMY;
+	
+	/**
+	 * ID: 99705<br>
+	 * Message: Fancy meeting you here!
+	 */
+	public static final NpcStringId FANCY_MEETING_YOU_HERE;
+	
+	/**
+	 * ID: 99706<br>
+	 * Message: Are you afraid of the big-bad squash?
+	 */
+	public static final NpcStringId ARE_YOU_AFRAID_OF_THE_BIG_BAD_SQUASH;
+	
+	/**
+	 * ID: 99707<br>
+	 * Message: Impressive, aren't I?
+	 */
+	public static final NpcStringId IMPRESSIVE_ARENT_I;
+	
+	/**
+	 * ID: 99708<br>
+	 * Message: Obey me!!
+	 */
+	public static final NpcStringId OBEY_ME;
+	
+	/**
+	 * ID: 99709<br>
+	 * Message: Raise me well and you'll be rewarded. Neglect me and suffer the consequences!
+	 */
+	public static final NpcStringId RAISE_ME_WELL_AND_YOULL_BE_REWARDED_NEGLECT_ME_AND_SUFFER_THE_CONSEQUENCES;
+	
+	/**
+	 * ID: 99710<br>
+	 * Message: Transform!
+	 */
+	public static final NpcStringId TRANSFORM;
+	
+	/**
+	 * ID: 99711<br>
+	 * Message: I feel different?
+	 */
+	public static final NpcStringId I_FEEL_DIFFERENT;
+	
+	/**
+	 * ID: 99712<br>
+	 * Message: I'm bigger now! Bring it on!
+	 */
+	public static final NpcStringId IM_BIGGER_NOW_BRING_IT_ON;
+	
+	/**
+	 * ID: 99713<br>
+	 * Message: I'm not a kid anymore!
+	 */
+	public static final NpcStringId IM_NOT_A_KID_ANYMORE;
+	
+	/**
+	 * ID: 99714<br>
+	 * Message: Big time!
+	 */
+	public static final NpcStringId BIG_TIME;
+	
+	/**
+	 * ID: 99716<br>
+	 * Message: I'm all grown up now!
+	 */
+	public static final NpcStringId IM_ALL_GROWN_UP_NOW;
+	
+	/**
+	 * ID: 99717<br>
+	 * Message: If you let me go, I'll be your best friend.
+	 */
+	public static final NpcStringId IF_YOU_LET_ME_GO_ILL_BE_YOUR_BEST_FRIEND;
+	
+	/**
+	 * ID: 99718<br>
+	 * Message: I'm chuck full of goodness!
+	 */
+	public static final NpcStringId IM_CHUCK_FULL_OF_GOODNESS;
+	
+	/**
+	 * ID: 99719<br>
+	 * Message: Good job! Now what are you going to do?
+	 */
+	public static final NpcStringId GOOD_JOB_NOW_WHAT_ARE_YOU_GOING_TO_DO;
+	
+	/**
+	 * ID: 99720<br>
+	 * Message: Keep it coming!
+	 */
+	public static final NpcStringId KEEP_IT_COMING;
+	
+	/**
+	 * ID: 99721<br>
+	 * Message: That's what I'm talking about!
+	 */
+	public static final NpcStringId THATS_WHAT_IM_TALKING_ABOUT;
+	
+	/**
+	 * ID: 99722<br>
+	 * Message: May I have some more?
+	 */
+	public static final NpcStringId MAY_I_HAVE_SOME_MORE;
+	
+	/**
+	 * ID: 99723<br>
+	 * Message: That hit the spot!
+	 */
+	public static final NpcStringId THAT_HIT_THE_SPOT;
+	
+	/**
+	 * ID: 99724<br>
+	 * Message: I feel special!
+	 */
+	public static final NpcStringId I_FEEL_SPECIAL;
+	
+	/**
+	 * ID: 99725<br>
+	 * Message: I think it's working!
+	 */
+	public static final NpcStringId I_THINK_ITS_WORKING;
+	
+	/**
+	 * ID: 99726<br>
+	 * Message: You DO understand!
+	 */
+	public static final NpcStringId YOU_DO_UNDERSTAND;
+	
+	/**
+	 * ID: 99727<br>
+	 * Message: Yuck! What is this? Ha Ha just kidding!
+	 */
+	public static final NpcStringId YUCK_WHAT_IS_THIS_HA_HA_JUST_KIDDING;
+	
+	/**
+	 * ID: 99728<br>
+	 * Message: A total of five and I'll be twice as alive!
+	 */
+	public static final NpcStringId A_TOTAL_OF_FIVE_AND_ILL_BE_TWICE_AS_ALIVE;
+	
+	/**
+	 * ID: 99729<br>
+	 * Message: Nectar is sublime!
+	 */
+	public static final NpcStringId NECTAR_IS_SUBLIME;
+	
+	/**
+	 * ID: 99730<br>
+	 * Message: You call that a hit?
+	 */
+	public static final NpcStringId YOU_CALL_THAT_A_HIT;
+	
+	/**
+	 * ID: 99731<br>
+	 * Message: Why are you hitting me? Ouch, stop it! Give me nectar!
+	 */
+	public static final NpcStringId WHY_ARE_YOU_HITTING_ME_OUCH_STOP_IT_GIVE_ME_NECTAR;
+	
+	/**
+	 * ID: 99732<br>
+	 * Message: Stop or I'll wilt!
+	 */
+	public static final NpcStringId STOP_OR_ILL_WILT;
+	
+	/**
+	 * ID: 99733<br>
+	 * Message: I'm not fully grown yet! Oh well, do what you will. I'll fade away without nectar anyway!
+	 */
+	public static final NpcStringId IM_NOT_FULLY_GROWN_YET_OH_WELL_DO_WHAT_YOU_WILL_ILL_FADE_AWAY_WITHOUT_NECTAR_ANYWAY;
+	
+	/**
+	 * ID: 99734<br>
+	 * Message: Go ahead and hit me again. It won't do you any good!
+	 */
+	public static final NpcStringId GO_AHEAD_AND_HIT_ME_AGAIN_IT_WONT_DO_YOU_ANY_GOOD;
+	
+	/**
+	 * ID: 99735<br>
+	 * Message: Woe is me! I'm wilting!
+	 */
+	public static final NpcStringId WOE_IS_ME_IM_WILTING;
+	
+	/**
+	 * ID: 99736<br>
+	 * Message: I'm not fully grown yet! How about some nectar to ease my pain?
+	 */
+	public static final NpcStringId IM_NOT_FULLY_GROWN_YET_HOW_ABOUT_SOME_NECTAR_TO_EASE_MY_PAIN;
+	
+	/**
+	 * ID: 99737<br>
+	 * Message: The end is near!
+	 */
+	public static final NpcStringId THE_END_IS_NEAR;
+	
+	/**
+	 * ID: 99738<br>
+	 * Message: Pretty please... with sugar on top, give me some nectar!
+	 */
+	public static final NpcStringId PRETTY_PLEASE_WITH_SUGAR_ON_TOP_GIVE_ME_SOME_NECTAR;
+	
+	/**
+	 * ID: 99739<br>
+	 * Message: If I die without nectar, you'll get nothing.
+	 */
+	public static final NpcStringId IF_I_DIE_WITHOUT_NECTAR_YOULL_GET_NOTHING;
+	
+	/**
+	 * ID: 99740<br>
+	 * Message: I'm feeling better! Another thirty seconds and I'll be out of here!
+	 */
+	public static final NpcStringId IM_FEELING_BETTER_ANOTHER_THIRTY_SECONDS_AND_ILL_BE_OUT_OF_HERE;
+	
+	/**
+	 * ID: 99741<br>
+	 * Message: Twenty seconds and it's ciao, baby!
+	 */
+	public static final NpcStringId TWENTY_SECONDS_AND_ITS_CIAO_BABY;
+	
+	/**
+	 * ID: 99742<br>
+	 * Message: Woohoo, just ten seconds left! nine... eight... seven!
+	 */
+	public static final NpcStringId WOOHOO_JUST_TEN_SECONDS_LEFT_NINE_EIGHT_SEVEN;
+	
+	/**
+	 * ID: 99743<br>
+	 * Message: Give me nectar or I'll be gone in two minutes!
+	 */
+	public static final NpcStringId GIVE_ME_NECTAR_OR_ILL_BE_GONE_IN_TWO_MINUTES;
+	
+	/**
+	 * ID: 99744<br>
+	 * Message: Give me nectar or I'll be gone in one minute!
+	 */
+	public static final NpcStringId GIVE_ME_NECTAR_OR_ILL_BE_GONE_IN_ONE_MINUTE;
+	
+	/**
+	 * ID: 99745<br>
+	 * Message: So long suckers!
+	 */
+	public static final NpcStringId SO_LONG_SUCKERS;
+	
+	/**
+	 * ID: 99746<br>
+	 * Message: I'm out of here!
+	 */
+	public static final NpcStringId IM_OUT_OF_HERE;
+	
+	/**
+	 * ID: 99747<br>
+	 * Message: I must be going! Have fun everybody!
+	 */
+	public static final NpcStringId I_MUST_BE_GOING_HAVE_FUN_EVERYBODY;
+	
+	/**
+	 * ID: 99748<br>
+	 * Message: Time is up! Put your weapons down!
+	 */
+	public static final NpcStringId TIME_IS_UP_PUT_YOUR_WEAPONS_DOWN;
+	
+	/**
+	 * ID: 99749<br>
+	 * Message: Good for me, bad for you!
+	 */
+	public static final NpcStringId GOOD_FOR_ME_BAD_FOR_YOU;
+	
+	/**
+	 * ID: 99750<br>
+	 * Message: Soundtastic!
+	 */
+	public static final NpcStringId SOUNDTASTIC;
+	
+	/**
+	 * ID: 99751<br>
+	 * Message: I can sing along if you like?
+	 */
+	public static final NpcStringId I_CAN_SING_ALONG_IF_YOU_LIKE;
+	
+	/**
+	 * ID: 99752<br>
+	 * Message: I think you need some backup!
+	 */
+	public static final NpcStringId I_THINK_YOU_NEED_SOME_BACKUP;
+	
+	/**
+	 * ID: 99753<br>
+	 * Message: Keep up that rhythm and you'll be a star!
+	 */
+	public static final NpcStringId KEEP_UP_THAT_RHYTHM_AND_YOULL_BE_A_STAR;
+	
+	/**
+	 * ID: 99754<br>
+	 * Message: My heart yearns for more music.
+	 */
+	public static final NpcStringId MY_HEART_YEARNS_FOR_MORE_MUSIC;
+	
+	/**
+	 * ID: 99755<br>
+	 * Message: You're out of tune again!
+	 */
+	public static final NpcStringId YOURE_OUT_OF_TUNE_AGAIN;
+	
+	/**
+	 * ID: 99756<br>
+	 * Message: This is awful!
+	 */
+	public static final NpcStringId THIS_IS_AWFUL;
+	
+	/**
+	 * ID: 99757<br>
+	 * Message: I think I broke something!
+	 */
+	public static final NpcStringId I_THINK_I_BROKE_SOMETHING;
+	
+	/**
+	 * ID: 99758<br>
+	 * Message: What a lovely melody! Play it again!
+	 */
+	public static final NpcStringId WHAT_A_LOVELY_MELODY_PLAY_IT_AGAIN;
+	
+	/**
+	 * ID: 99759<br>
+	 * Message: Music to my, uh... ears!
+	 */
+	public static final NpcStringId MUSIC_TO_MY_UH_EARS;
+	
+	/**
+	 * ID: 99760<br>
+	 * Message: You need music lessons!
+	 */
+	public static final NpcStringId YOU_NEED_MUSIC_LESSONS;
+	
+	/**
+	 * ID: 99761<br>
+	 * Message: I can't hear you!
+	 */
+	public static final NpcStringId I_CANT_HEAR_YOU;
+	
+	/**
+	 * ID: 99762<br>
+	 * Message: You can't hurt me like that!
+	 */
+	public static final NpcStringId YOU_CANT_HURT_ME_LIKE_THAT;
+	
+	/**
+	 * ID: 99763<br>
+	 * Message: I'm stronger than you are!
+	 */
+	public static final NpcStringId IM_STRONGER_THAN_YOU_ARE;
+	
+	/**
+	 * ID: 99764<br>
+	 * Message: No music? I'm out of here!
+	 */
+	public static final NpcStringId NO_MUSIC_IM_OUT_OF_HERE;
+	
+	/**
+	 * ID: 99765<br>
+	 * Message: That racket is getting on my nerves! Tone it down a bit!
+	 */
+	public static final NpcStringId THAT_RACKET_IS_GETTING_ON_MY_NERVES_TONE_IT_DOWN_A_BIT;
+	
+	/**
+	 * ID: 99766<br>
+	 * Message: You can only hurt me through music!
+	 */
+	public static final NpcStringId YOU_CAN_ONLY_HURT_ME_THROUGH_MUSIC;
+	
+	/**
+	 * ID: 99767<br>
+	 * Message: Only musical instruments can hurt me! Nothing else!
+	 */
+	public static final NpcStringId ONLY_MUSICAL_INSTRUMENTS_CAN_HURT_ME_NOTHING_ELSE;
+	
+	/**
+	 * ID: 99768<br>
+	 * Message: Your skills are impressive, but sadly, useless...
+	 */
+	public static final NpcStringId YOUR_SKILLS_ARE_IMPRESSIVE_BUT_SADLY_USELESS;
+	
+	/**
+	 * ID: 99769<br>
+	 * Message: Catch a Chrono for me please.
+	 */
+	public static final NpcStringId CATCH_A_CHRONO_FOR_ME_PLEASE;
+	
+	/**
+	 * ID: 99770<br>
+	 * Message: You got me!
+	 */
+	public static final NpcStringId YOU_GOT_ME;
+	
+	/**
+	 * ID: 99771<br>
+	 * Message: Now look at what you've done!
+	 */
+	public static final NpcStringId NOW_LOOK_AT_WHAT_YOUVE_DONE;
+	
+	/**
+	 * ID: 99772<br>
+	 * Message: You win!
+	 */
+	public static final NpcStringId YOU_WIN;
+	
+	/**
+	 * ID: 99773<br>
+	 * Message: Squashed......
+	 */
+	public static final NpcStringId SQUASHED;
+	
+	/**
+	 * ID: 99774<br>
+	 * Message: Don't tell anyone!
+	 */
+	public static final NpcStringId DONT_TELL_ANYONE;
+	
+	/**
+	 * ID: 99775<br>
+	 * Message: Gross! My guts are coming out!
+	 */
+	public static final NpcStringId GROSS_MY_GUTS_ARE_COMING_OUT;
+	
+	/**
+	 * ID: 99776<br>
+	 * Message: Take it and go.
+	 */
+	public static final NpcStringId TAKE_IT_AND_GO;
+	
+	/**
+	 * ID: 99777<br>
+	 * Message: I should've left when I could!
+	 */
+	public static final NpcStringId I_SHOULDVE_LEFT_WHEN_I_COULD;
+	
+	/**
+	 * ID: 99778<br>
+	 * Message: Now look what you have done!
+	 */
+	public static final NpcStringId NOW_LOOK_WHAT_YOU_HAVE_DONE;
+	
+	/**
+	 * ID: 99779<br>
+	 * Message: I feel dirty!
+	 */
+	public static final NpcStringId I_FEEL_DIRTY;
+	
+	/**
+	 * ID: 99780<br>
+	 * Message: Better luck next time!
+	 */
+	public static final NpcStringId BETTER_LUCK_NEXT_TIME;
+	
+	/**
+	 * ID: 99781<br>
+	 * Message: Nice shot!
+	 */
+	public static final NpcStringId NICE_SHOT;
+	
+	/**
+	 * ID: 99782<br>
+	 * Message: I'm not afraid of you!
+	 */
+	public static final NpcStringId IM_NOT_AFRAID_OF_YOU;
+	
+	/**
+	 * ID: 99783<br>
+	 * Message: If I knew this was going to happen, I would have stayed home!
+	 */
+	public static final NpcStringId IF_I_KNEW_THIS_WAS_GOING_TO_HAPPEN_I_WOULD_HAVE_STAYED_HOME;
+	
+	/**
+	 * ID: 99784<br>
+	 * Message: Try harder or I'm out of here!
+	 */
+	public static final NpcStringId TRY_HARDER_OR_IM_OUT_OF_HERE;
+	
+	/**
+	 * ID: 99785<br>
+	 * Message: I'm tougher than I look!
+	 */
+	public static final NpcStringId IM_TOUGHER_THAN_I_LOOK;
+	
+	/**
+	 * ID: 99786<br>
+	 * Message: Good strike!
+	 */
+	public static final NpcStringId GOOD_STRIKE;
+	
+	/**
+	 * ID: 99787<br>
+	 * Message: Oh my gourd!
+	 */
+	public static final NpcStringId OH_MY_GOURD;
+	
+	/**
+	 * ID: 99788<br>
+	 * Message: That's all you've got?
+	 */
+	public static final NpcStringId THATS_ALL_YOUVE_GOT;
+	
+	/**
+	 * ID: 99789<br>
+	 * Message: Why me?
+	 */
+	public static final NpcStringId WHY_ME;
+	
+	/**
+	 * ID: 99790<br>
+	 * Message: Bring me nectar!
+	 */
+	public static final NpcStringId BRING_ME_NECTAR;
+	
+	/**
+	 * ID: 99791<br>
+	 * Message: I must have nectar to grow!
+	 */
+	public static final NpcStringId I_MUST_HAVE_NECTAR_TO_GROW;
+	
+	/**
+	 * ID: 99792<br>
+	 * Message: Give me some nectar quickly or you'll get nothing!
+	 */
+	public static final NpcStringId GIVE_ME_SOME_NECTAR_QUICKLY_OR_YOULL_GET_NOTHING;
+	
+	/**
+	 * ID: 99793<br>
+	 * Message: Please give me some nectar! I'm hungry!
+	 */
+	public static final NpcStringId PLEASE_GIVE_ME_SOME_NECTAR_IM_HUNGRY;
+	
+	/**
+	 * ID: 99794<br>
+	 * Message: Nectar please!
+	 */
+	public static final NpcStringId NECTAR_PLEASE;
+	
+	/**
+	 * ID: 99795<br>
+	 * Message: Nectar will make me grow quickly!
+	 */
+	public static final NpcStringId NECTAR_WILL_MAKE_ME_GROW_QUICKLY;
+	
+	/**
+	 * ID: 99796<br>
+	 * Message: Don't you want a bigger squash? Give me some nectar and I'll grow much larger!
+	 */
+	public static final NpcStringId DONT_YOU_WANT_A_BIGGER_SQUASH_GIVE_ME_SOME_NECTAR_AND_ILL_GROW_MUCH_LARGER;
+	
+	/**
+	 * ID: 99797<br>
+	 * Message: If you raise me well, you'll get prizes! Or not...
+	 */
+	public static final NpcStringId IF_YOU_RAISE_ME_WELL_YOULL_GET_PRIZES_OR_NOT;
+	
+	/**
+	 * ID: 99798<br>
+	 * Message: You are here for the stuff, eh? Well it's mine, all mine!
+	 */
+	public static final NpcStringId YOU_ARE_HERE_FOR_THE_STUFF_EH_WELL_ITS_MINE_ALL_MINE;
+	
+	/**
+	 * ID: 99799<br>
+	 * Message: Trust me... give me nectar and I'll become a giant squash!
+	 */
+	public static final NpcStringId TRUST_ME_GIVE_ME_NECTAR_AND_ILL_BECOME_A_GIANT_SQUASH;
+	
+	/**
+	 * ID: 528551<br>
+	 * Message: There's nothing you can't say. I can't listen to you anymore!
+	 */
+	public static final NpcStringId THERES_NOTHING_YOU_CANT_SAY_I_CANT_LISTEN_TO_YOU_ANYMORE;
+	
+	/**
+	 * ID: 528651<br>
+	 * Message: You advanced bravely but got such a tiny result. Hohoho.
+	 */
+	public static final NpcStringId YOU_ADVANCED_BRAVELY_BUT_GOT_SUCH_A_TINY_RESULT_HOHOHO;
+	
+	/**
+	 * ID: 1000001<br>
+	 * Message: A non-permitted target has been discovered.
+	 */
+	public static final NpcStringId A_NON_PERMITTED_TARGET_HAS_BEEN_DISCOVERED;
+	
+	/**
+	 * ID: 1000002<br>
+	 * Message: Intruder removal system initiated.
+	 */
+	public static final NpcStringId INTRUDER_REMOVAL_SYSTEM_INITIATED;
+	
+	/**
+	 * ID: 1000003<br>
+	 * Message: Removing intruders.
+	 */
+	public static final NpcStringId REMOVING_INTRUDERS;
+	
+	/**
+	 * ID: 1000004<br>
+	 * Message: A fatal error has occurred.
+	 */
+	public static final NpcStringId A_FATAL_ERROR_HAS_OCCURRED;
+	
+	/**
+	 * ID: 1000005<br>
+	 * Message: System is being shut down...
+	 */
+	public static final NpcStringId SYSTEM_IS_BEING_SHUT_DOWN;
+	
+	/**
+	 * ID: 1000006<br>
+	 * Message: ......
+	 */
+	public static final NpcStringId DOT_DOT_DOT_DOT_DOT_DOT;
+	
+	/**
+	 * ID: 1000007<br>
+	 * Message: We shall see about that!
+	 */
+	public static final NpcStringId WE_SHALL_SEE_ABOUT_THAT;
+	
+	/**
+	 * ID: 1000008<br>
+	 * Message: I will definitely repay this humiliation!
+	 */
+	public static final NpcStringId I_WILL_DEFINITELY_REPAY_THIS_HUMILIATION;
+	
+	/**
+	 * ID: 1000009<br>
+	 * Message: Retreat!
+	 */
+	public static final NpcStringId RETREAT;
+	
+	/**
+	 * ID: 1000010<br>
+	 * Message: Tactical retreat!
+	 */
+	public static final NpcStringId TACTICAL_RETREAT;
+	
+	/**
+	 * ID: 1000011<br>
+	 * Message: Mass fleeing!
+	 */
+	public static final NpcStringId MASS_FLEEING;
+	
+	/**
+	 * ID: 1000012<br>
+	 * Message: It's stronger than expected!
+	 */
+	public static final NpcStringId ITS_STRONGER_THAN_EXPECTED;
+	
+	/**
+	 * ID: 1000013<br>
+	 * Message: I'll kill you next time!
+	 */
+	public static final NpcStringId ILL_KILL_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 1000014<br>
+	 * Message: I'll definitely kill you next time!
+	 */
+	public static final NpcStringId ILL_DEFINITELY_KILL_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 1000015<br>
+	 * Message: Oh! How strong!
+	 */
+	public static final NpcStringId OH_HOW_STRONG;
+	
+	/**
+	 * ID: 1000016<br>
+	 * Message: Invader!
+	 */
+	public static final NpcStringId INVADER;
+	
+	/**
+	 * ID: 1000017<br>
+	 * Message: There is no reason for you to kill me! I have nothing you need!
+	 */
+	public static final NpcStringId THERE_IS_NO_REASON_FOR_YOU_TO_KILL_ME_I_HAVE_NOTHING_YOU_NEED;
+	
+	/**
+	 * ID: 1000018<br>
+	 * Message: Someday you will pay!
+	 */
+	public static final NpcStringId SOMEDAY_YOU_WILL_PAY;
+	
+	/**
+	 * ID: 1000019<br>
+	 * Message: I won't just stand still while you hit me.
+	 */
+	public static final NpcStringId I_WONT_JUST_STAND_STILL_WHILE_YOU_HIT_ME;
+	
+	/**
+	 * ID: 1000020<br>
+	 * Message: Stop hitting!
+	 */
+	public static final NpcStringId STOP_HITTING;
+	
+	/**
+	 * ID: 1000021<br>
+	 * Message: It hurts to the bone!
+	 */
+	public static final NpcStringId IT_HURTS_TO_THE_BONE;
+	
+	/**
+	 * ID: 1000022<br>
+	 * Message: Am I the neighborhood drum for beating!
+	 */
+	public static final NpcStringId AM_I_THE_NEIGHBORHOOD_DRUM_FOR_BEATING;
+	
+	/**
+	 * ID: 1000023<br>
+	 * Message: Follow me if you want!
+	 */
+	public static final NpcStringId FOLLOW_ME_IF_YOU_WANT;
+	
+	/**
+	 * ID: 1000024<br>
+	 * Message: Surrender!
+	 */
+	public static final NpcStringId SURRENDER;
+	
+	/**
+	 * ID: 1000025<br>
+	 * Message: Oh, I'm dead!
+	 */
+	public static final NpcStringId OH_IM_DEAD;
+	
+	/**
+	 * ID: 1000026<br>
+	 * Message: I'll be back!
+	 */
+	public static final NpcStringId ILL_BE_BACK;
+	
+	/**
+	 * ID: 1000027<br>
+	 * Message: I'll give you ten million arena if you let me live!
+	 */
+	public static final NpcStringId ILL_GIVE_YOU_TEN_MILLION_ARENA_IF_YOU_LET_ME_LIVE;
+	
+	/**
+	 * ID: 1000028<br>
+	 * Message: $s1. Stop kidding yourself about your own powerlessness!
+	 */
+	public static final NpcStringId S1_STOP_KIDDING_YOURSELF_ABOUT_YOUR_OWN_POWERLESSNESS;
+	
+	/**
+	 * ID: 1000029<br>
+	 * Message: $s1. I'll make you feel what true fear is!
+	 */
+	public static final NpcStringId S1_ILL_MAKE_YOU_FEEL_WHAT_TRUE_FEAR_IS;
+	
+	/**
+	 * ID: 1000030<br>
+	 * Message: You're really stupid to have challenged me. $s1! Get ready!
+	 */
+	public static final NpcStringId YOURE_REALLY_STUPID_TO_HAVE_CHALLENGED_ME_S1_GET_READY;
+	
+	/**
+	 * ID: 1000031<br>
+	 * Message: $s1. Do you think that's going to work?!
+	 */
+	public static final NpcStringId S1_DO_YOU_THINK_THATS_GOING_TO_WORK;
+	
+	/**
+	 * ID: 1000032<br>
+	 * Message: I will definitely reclaim my honor which has been tarnished!
+	 */
+	public static final NpcStringId I_WILL_DEFINITELY_RECLAIM_MY_HONOR_WHICH_HAS_BEEN_TARNISHED;
+	
+	/**
+	 * ID: 1000033<br>
+	 * Message: Show me the wrath of the knight whose honor has been downtrodden!
+	 */
+	public static final NpcStringId SHOW_ME_THE_WRATH_OF_THE_KNIGHT_WHOSE_HONOR_HAS_BEEN_DOWNTRODDEN;
+	
+	/**
+	 * ID: 1000034<br>
+	 * Message: Death to the hypocrite!
+	 */
+	public static final NpcStringId DEATH_TO_THE_HYPOCRITE;
+	
+	/**
+	 * ID: 1000035<br>
+	 * Message: I'll never sleep until I've shed my dishonor!
+	 */
+	public static final NpcStringId ILL_NEVER_SLEEP_UNTIL_IVE_SHED_MY_DISHONOR;
+	
+	/**
+	 * ID: 1000036<br>
+	 * Message: I'm here for the ones that are cursing the world!
+	 */
+	public static final NpcStringId IM_HERE_FOR_THE_ONES_THAT_ARE_CURSING_THE_WORLD;
+	
+	/**
+	 * ID: 1000037<br>
+	 * Message: I'll turn you into a malignant spirit!
+	 */
+	public static final NpcStringId ILL_TURN_YOU_INTO_A_MALIGNANT_SPIRIT;
+	
+	/**
+	 * ID: 1000038<br>
+	 * Message: I'll curse you with the power of revenge and hate!
+	 */
+	public static final NpcStringId ILL_CURSE_YOU_WITH_THE_POWER_OF_REVENGE_AND_HATE;
+	
+	/**
+	 * ID: 1000039<br>
+	 * Message: For the glory of Gracia!
+	 */
+	public static final NpcStringId FOR_THE_GLORY_OF_GRACIA;
+	
+	/**
+	 * ID: 1000040<br>
+	 * Message: Do you dare pit your power against me?
+	 */
+	public static final NpcStringId DO_YOU_DARE_PIT_YOUR_POWER_AGAINST_ME;
+	
+	/**
+	 * ID: 1000041<br>
+	 * Message: I... I am defeated!!!
+	 */
+	public static final NpcStringId I_I_AM_DEFEATED;
+	
+	/**
+	 * ID: 1000042<br>
+	 * Message: I am conveying the will of Nurka! Everybody get out of my way!
+	 */
+	public static final NpcStringId I_AM_CONVEYING_THE_WILL_OF_NURKA_EVERYBODY_GET_OUT_OF_MY_WAY;
+	
+	/**
+	 * ID: 1000043<br>
+	 * Message: Those who stand against me shall die horribly!
+	 */
+	public static final NpcStringId THOSE_WHO_STAND_AGAINST_ME_SHALL_DIE_HORRIBLY;
+	
+	/**
+	 * ID: 1000044<br>
+	 * Message: Do you dare to block my way?!
+	 */
+	public static final NpcStringId DO_YOU_DARE_TO_BLOCK_MY_WAY;
+	
+	/**
+	 * ID: 1000045<br>
+	 * Message: My comrades will get revenge!
+	 */
+	public static final NpcStringId MY_COMRADES_WILL_GET_REVENGE;
+	
+	/**
+	 * ID: 1000046<br>
+	 * Message: You heathen blasphemers of this holy place will be punished!
+	 */
+	public static final NpcStringId YOU_HEATHEN_BLASPHEMERS_OF_THIS_HOLY_PLACE_WILL_BE_PUNISHED;
+	
+	/**
+	 * ID: 1000047<br>
+	 * Message: Step forward, you worthless creatures who challenge my authority!
+	 */
+	public static final NpcStringId STEP_FORWARD_YOU_WORTHLESS_CREATURES_WHO_CHALLENGE_MY_AUTHORITY;
+	
+	/**
+	 * ID: 1000048<br>
+	 * Message: My creator... The unchanging faithfulness to my master...
+	 */
+	public static final NpcStringId MY_CREATOR_THE_UNCHANGING_FAITHFULNESS_TO_MY_MASTER;
+	
+	/**
+	 * ID: 1000049<br>
+	 * Message: Master of the tower... My master... master... Where is he?
+	 */
+	public static final NpcStringId MASTER_OF_THE_TOWER_MY_MASTER_MASTER_WHERE_IS_HE;
+	
+	/**
+	 * ID: 1000050<br>
+	 * Message: I AM THE ONE CARRYING OUT THE WILL OF CORE.
+	 */
+	public static final NpcStringId I_AM_THE_ONE_CARRYING_OUT_THE_WILL_OF_CORE;
+	
+	/**
+	 * ID: 1000051<br>
+	 * Message: DESTROY THE INVADER.
+	 */
+	public static final NpcStringId DESTROY_THE_INVADER;
+	
+	/**
+	 * ID: 1000052<br>
+	 * Message: STRANGE CONDITION - DOESN'T WORK
+	 */
+	public static final NpcStringId STRANGE_CONDITION_DOESNT_WORK;
+	
+	/**
+	 * ID: 1000053<br>
+	 * Message: According to the command of Beleth... I'm going to observe you guys!
+	 */
+	public static final NpcStringId ACCORDING_TO_THE_COMMAND_OF_BELETH_IM_GOING_TO_OBSERVE_YOU_GUYS;
+	
+	/**
+	 * ID: 1000054<br>
+	 * Message: You people make me sick! No sense of loyalty whatsoever!
+	 */
+	public static final NpcStringId YOU_PEOPLE_MAKE_ME_SICK_NO_SENSE_OF_LOYALTY_WHATSOEVER;
+	
+	/**
+	 * ID: 1000055<br>
+	 * Message: A challenge against me is the same as a challenge against Beleth...
+	 */
+	public static final NpcStringId A_CHALLENGE_AGAINST_ME_IS_THE_SAME_AS_A_CHALLENGE_AGAINST_BELETH;
+	
+	/**
+	 * ID: 1000056<br>
+	 * Message: Beleth is always watching over you guys!
+	 */
+	public static final NpcStringId BELETH_IS_ALWAYS_WATCHING_OVER_YOU_GUYS;
+	
+	/**
+	 * ID: 1000057<br>
+	 * Message: That was really close! Antharas opened its eyes!
+	 */
+	public static final NpcStringId THAT_WAS_REALLY_CLOSE_ANTHARAS_OPENED_ITS_EYES;
+	
+	/**
+	 * ID: 1000058<br>
+	 * Message: You who disobey the will of Antharas! Die!
+	 */
+	public static final NpcStringId YOU_WHO_DISOBEY_THE_WILL_OF_ANTHARAS_DIE;
+	
+	/**
+	 * ID: 1000059<br>
+	 * Message: Antharas has taken my life!
+	 */
+	public static final NpcStringId ANTHARAS_HAS_TAKEN_MY_LIFE;
+	
+	/**
+	 * ID: 1000060<br>
+	 * Message: I crossed back over the marshlands of death to reclaim the treasure!
+	 */
+	public static final NpcStringId I_CROSSED_BACK_OVER_THE_MARSHLANDS_OF_DEATH_TO_RECLAIM_THE_TREASURE;
+	
+	/**
+	 * ID: 1000061<br>
+	 * Message: Bring over and surrender your precious gold treasure to me!
+	 */
+	public static final NpcStringId BRING_OVER_AND_SURRENDER_YOUR_PRECIOUS_GOLD_TREASURE_TO_ME;
+	
+	/**
+	 * ID: 1000062<br>
+	 * Message: I'll kill you in an instant!
+	 */
+	public static final NpcStringId ILL_KILL_YOU_IN_AN_INSTANT;
+	
+	/**
+	 * ID: 1000063<br>
+	 * Message: No! The treasure is still..!
+	 */
+	public static final NpcStringId NO_THE_TREASURE_IS_STILL;
+	
+	/**
+	 * ID: 1000064<br>
+	 * Message: Invaders of Dragon Valley will never live to return!
+	 */
+	public static final NpcStringId INVADERS_OF_DRAGON_VALLEY_WILL_NEVER_LIVE_TO_RETURN;
+	
+	/**
+	 * ID: 1000065<br>
+	 * Message: I am the guardian that honors the command of Antharas to watch over this place!
+	 */
+	public static final NpcStringId I_AM_THE_GUARDIAN_THAT_HONORS_THE_COMMAND_OF_ANTHARAS_TO_WATCH_OVER_THIS_PLACE;
+	
+	/**
+	 * ID: 1000066<br>
+	 * Message: You've set foot in Dragon Valley without permission! The penalty is death!
+	 */
+	public static final NpcStringId YOUVE_SET_FOOT_IN_DRAGON_VALLEY_WITHOUT_PERMISSION_THE_PENALTY_IS_DEATH;
+	
+	/**
+	 * ID: 1000068<br>
+	 * Message: The joy of killing! The ecstasy of looting! Hey guys, let's have a go at it again!
+	 */
+	public static final NpcStringId THE_JOY_OF_KILLING_THE_ECSTASY_OF_LOOTING_HEY_GUYS_LETS_HAVE_A_GO_AT_IT_AGAIN;
+	
+	/**
+	 * ID: 1000069<br>
+	 * Message: There really are still lots of folks in the world without fear! I'll teach you a lesson!
+	 */
+	public static final NpcStringId THERE_REALLY_ARE_STILL_LOTS_OF_FOLKS_IN_THE_WORLD_WITHOUT_FEAR_ILL_TEACH_YOU_A_LESSON;
+	
+	/**
+	 * ID: 1000070<br>
+	 * Message: If you hand over everything you've got, I'll at least spare your life!
+	 */
+	public static final NpcStringId IF_YOU_HAND_OVER_EVERYTHING_YOUVE_GOT_ILL_AT_LEAST_SPARE_YOUR_LIFE;
+	
+	/**
+	 * ID: 1000071<br>
+	 * Message: Kneel down before one such as this!
+	 */
+	public static final NpcStringId KNEEL_DOWN_BEFORE_ONE_SUCH_AS_THIS;
+	
+	/**
+	 * ID: 1000072<br>
+	 * Message: Honor the master's wishes and punish all the invaders!
+	 */
+	public static final NpcStringId HONOR_THE_MASTERS_WISHES_AND_PUNISH_ALL_THE_INVADERS;
+	
+	/**
+	 * ID: 1000073<br>
+	 * Message: Follow the master's wishes and punish the invaders!
+	 */
+	public static final NpcStringId FOLLOW_THE_MASTERS_WISHES_AND_PUNISH_THE_INVADERS;
+	
+	/**
+	 * ID: 1000074<br>
+	 * Message: Death is nothing more than a momentary rest...
+	 */
+	public static final NpcStringId DEATH_IS_NOTHING_MORE_THAN_A_MOMENTARY_REST;
+	
+	/**
+	 * ID: 1000075<br>
+	 * Message: Listen! This is the end of the human era! Antharas has awoken!
+	 */
+	public static final NpcStringId LISTEN_THIS_IS_THE_END_OF_THE_HUMAN_ERA_ANTHARAS_HAS_AWOKEN;
+	
+	/**
+	 * ID: 1000076<br>
+	 * Message: Present the lives of four people to Antharas!
+	 */
+	public static final NpcStringId PRESENT_THE_LIVES_OF_FOUR_PEOPLE_TO_ANTHARAS;
+	
+	/**
+	 * ID: 1000077<br>
+	 * Message: This is unbelievable! How could I have lost to one so inferior to myself?
+	 */
+	public static final NpcStringId THIS_IS_UNBELIEVABLE_HOW_COULD_I_HAVE_LOST_TO_ONE_SO_INFERIOR_TO_MYSELF;
+	
+	/**
+	 * ID: 1000078<br>
+	 * Message: I carry the power of darkness and have returned from the abyss.
+	 */
+	public static final NpcStringId I_CARRY_THE_POWER_OF_DARKNESS_AND_HAVE_RETURNED_FROM_THE_ABYSS;
+	
+	/**
+	 * ID: 1000079<br>
+	 * Message: It's detestable.
+	 */
+	public static final NpcStringId ITS_DETESTABLE;
+	
+	/**
+	 * ID: 1000080<br>
+	 * Message: I finally find rest...
+	 */
+	public static final NpcStringId I_FINALLY_FIND_REST;
+	
+	/**
+	 * ID: 1000081<br>
+	 * Message: Glory to Orfen!
+	 */
+	public static final NpcStringId GLORY_TO_ORFEN;
+	
+	/**
+	 * ID: 1000082<br>
+	 * Message: In the name of Orfen, I can never forgive you who are invading this place!
+	 */
+	public static final NpcStringId IN_THE_NAME_OF_ORFEN_I_CAN_NEVER_FORGIVE_YOU_WHO_ARE_INVADING_THIS_PLACE;
+	
+	/**
+	 * ID: 1000083<br>
+	 * Message: I'll make you pay the price for fearlessly entering Orfen's land!
+	 */
+	public static final NpcStringId ILL_MAKE_YOU_PAY_THE_PRICE_FOR_FEARLESSLY_ENTERING_ORFENS_LAND;
+	
+	/**
+	 * ID: 1000084<br>
+	 * Message: Even if you disappear into nothingness, you will still face the life-long suffering of the curse that I have given you.
+	 */
+	public static final NpcStringId EVEN_IF_YOU_DISAPPEAR_INTO_NOTHINGNESS_YOU_WILL_STILL_FACE_THE_LIFE_LONG_SUFFERING_OF_THE_CURSE_THAT_I_HAVE_GIVEN_YOU;
+	
+	/**
+	 * ID: 1000085<br>
+	 * Message: I'll stand against anyone that makes light of the sacred place of the Elves!
+	 */
+	public static final NpcStringId ILL_STAND_AGAINST_ANYONE_THAT_MAKES_LIGHT_OF_THE_SACRED_PLACE_OF_THE_ELVES;
+	
+	/**
+	 * ID: 1000086<br>
+	 * Message: I will kill with my own hands anyone that defiles our home!
+	 */
+	public static final NpcStringId I_WILL_KILL_WITH_MY_OWN_HANDS_ANYONE_THAT_DEFILES_OUR_HOME;
+	
+	/**
+	 * ID: 1000087<br>
+	 * Message: My brothers will never rest until we push you and your gang out of this valley!
+	 */
+	public static final NpcStringId MY_BROTHERS_WILL_NEVER_REST_UNTIL_WE_PUSH_YOU_AND_YOUR_GANG_OUT_OF_THIS_VALLEY;
+	
+	/**
+	 * ID: 1000088<br>
+	 * Message: Until the day of destruction of Hestui!
+	 */
+	public static final NpcStringId UNTIL_THE_DAY_OF_DESTRUCTION_OF_HESTUI;
+	
+	/**
+	 * ID: 1000089<br>
+	 * Message: If any intrepid Orcs remain, attack them!
+	 */
+	public static final NpcStringId IF_ANY_INTREPID_ORCS_REMAIN_ATTACK_THEM;
+	
+	/**
+	 * ID: 1000090<br>
+	 * Message: I'll break your windpipe!
+	 */
+	public static final NpcStringId ILL_BREAK_YOUR_WINDPIPE;
+	
+	/**
+	 * ID: 1000091<br>
+	 * Message: Is revenge a failure?!
+	 */
+	public static final NpcStringId IS_REVENGE_A_FAILURE;
+	
+	/**
+	 * ID: 1000092<br>
+	 * Message: The sparkling mithril of the dwarves and their pretty treasures! I'll get them all!
+	 */
+	public static final NpcStringId THE_SPARKLING_MITHRIL_OF_THE_DWARVES_AND_THEIR_PRETTY_TREASURES_ILL_GET_THEM_ALL;
+	
+	/**
+	 * ID: 1000093<br>
+	 * Message: Where are all the dreadful dwarves and their sparkling things?
+	 */
+	public static final NpcStringId WHERE_ARE_ALL_THE_DREADFUL_DWARVES_AND_THEIR_SPARKLING_THINGS;
+	
+	/**
+	 * ID: 1000094<br>
+	 * Message: Hand over your pretty treasures!
+	 */
+	public static final NpcStringId HAND_OVER_YOUR_PRETTY_TREASURES;
+	
+	/**
+	 * ID: 1000095<br>
+	 * Message: Hey! You should have run away!
+	 */
+	public static final NpcStringId HEY_YOU_SHOULD_HAVE_RUN_AWAY;
+	
+	/**
+	 * ID: 1000096<br>
+	 * Message: DESTRUCTION - EXTINCTION - SLAUGHTER - COLLAPSE! DESTRUCTION - EXTINCTION - SLAUGHTER - COLLAPSE!
+	 */
+	public static final NpcStringId DESTRUCTION_EXTINCTION_SLAUGHTER_COLLAPSE_DESTRUCTION_EXTINCTION_SLAUGHTER_COLLAPSE;
+	
+	/**
+	 * ID: 1000097<br>
+	 * Message: Destruction! Destruction! Destruction! Destruction!
+	 */
+	public static final NpcStringId DESTRUCTION_DESTRUCTION_DESTRUCTION_DESTRUCTION;
+	
+	/**
+	 * ID: 1000098<br>
+	 * Message: Destruction! Destruction! Destruction. . .
+	 */
+	public static final NpcStringId DESTRUCTION_DESTRUCTION_DESTRUCTION;
+	
+	/**
+	 * ID: 1000099<br>
+	 * Message: Ta-da! Uthanka has returned!
+	 */
+	public static final NpcStringId TA_DA_UTHANKA_HAS_RETURNED;
+	
+	/**
+	 * ID: 1000100<br>
+	 * Message: Wah, ha, ha, ha! Uthanka has taken over this island today!
+	 */
+	public static final NpcStringId WAH_HA_HA_HA_UTHANKA_HAS_TAKEN_OVER_THIS_ISLAND_TODAY;
+	
+	/**
+	 * ID: 1000101<br>
+	 * Message: Whew! He's quite a guy!
+	 */
+	public static final NpcStringId WHEW_HES_QUITE_A_GUY;
+	
+	/**
+	 * ID: 1000102<br>
+	 * Message: How exasperating and unfair to have things happen in such a meaningless way like this...
+	 */
+	public static final NpcStringId HOW_EXASPERATING_AND_UNFAIR_TO_HAVE_THINGS_HAPPEN_IN_SUCH_A_MEANINGLESS_WAY_LIKE_THIS;
+	
+	/**
+	 * ID: 1000103<br>
+	 * Message: This world should be filled with fear and sadness...
+	 */
+	public static final NpcStringId THIS_WORLD_SHOULD_BE_FILLED_WITH_FEAR_AND_SADNESS;
+	
+	/**
+	 * ID: 1000104<br>
+	 * Message: I won't forgive the world that cursed me!
+	 */
+	public static final NpcStringId I_WONT_FORGIVE_THE_WORLD_THAT_CURSED_ME;
+	
+	/**
+	 * ID: 1000105<br>
+	 * Message: I'll make everyone feel the same suffering as me!
+	 */
+	public static final NpcStringId ILL_MAKE_EVERYONE_FEEL_THE_SAME_SUFFERING_AS_ME;
+	
+	/**
+	 * ID: 1000106<br>
+	 * Message: I'll give you a curse that you'll never be able to remove forever!
+	 */
+	public static final NpcStringId ILL_GIVE_YOU_A_CURSE_THAT_YOULL_NEVER_BE_ABLE_TO_REMOVE_FOREVER;
+	
+	/**
+	 * ID: 1000107<br>
+	 * Message: I'll get revenge on you who slaughtered my compatriots!
+	 */
+	public static final NpcStringId ILL_GET_REVENGE_ON_YOU_WHO_SLAUGHTERED_MY_COMPATRIOTS;
+	
+	/**
+	 * ID: 1000108<br>
+	 * Message: Those who are afraid should get away and those who are brave should fight!
+	 */
+	public static final NpcStringId THOSE_WHO_ARE_AFRAID_SHOULD_GET_AWAY_AND_THOSE_WHO_ARE_BRAVE_SHOULD_FIGHT;
+	
+	/**
+	 * ID: 1000109<br>
+	 * Message: I've got power from Beleth so do you think I'll be easily defeated?!
+	 */
+	public static final NpcStringId IVE_GOT_POWER_FROM_BELETH_SO_DO_YOU_THINK_ILL_BE_EASILY_DEFEATED;
+	
+	/**
+	 * ID: 1000110<br>
+	 * Message: I am leaving now, but soon someone will come who will teach you all a lesson!
+	 */
+	public static final NpcStringId I_AM_LEAVING_NOW_BUT_SOON_SOMEONE_WILL_COME_WHO_WILL_TEACH_YOU_ALL_A_LESSON;
+	
+	/**
+	 * ID: 1000111<br>
+	 * Message: Hey guys, let's make a round of our territory!
+	 */
+	public static final NpcStringId HEY_GUYS_LETS_MAKE_A_ROUND_OF_OUR_TERRITORY;
+	
+	/**
+	 * ID: 1000112<br>
+	 * Message: The rumor is that there are wild, uncivilized ruffians who have recently arrived in my territory.
+	 */
+	public static final NpcStringId THE_RUMOR_IS_THAT_THERE_ARE_WILD_UNCIVILIZED_RUFFIANS_WHO_HAVE_RECENTLY_ARRIVED_IN_MY_TERRITORY;
+	
+	/**
+	 * ID: 1000113<br>
+	 * Message: Do you know who I am?! I am Sirocco! Everyone, attack!
+	 */
+	public static final NpcStringId DO_YOU_KNOW_WHO_I_AM_I_AM_SIROCCO_EVERYONE_ATTACK;
+	
+	/**
+	 * ID: 1000114<br>
+	 * Message: What's just happened?! The invincible Sirocco was defeated by someone like you?!
+	 */
+	public static final NpcStringId WHATS_JUST_HAPPENED_THE_INVINCIBLE_SIROCCO_WAS_DEFEATED_BY_SOMEONE_LIKE_YOU;
+	
+	/**
+	 * ID: 1000115<br>
+	 * Message: Oh, I'm really hungry...
+	 */
+	public static final NpcStringId OH_IM_REALLY_HUNGRY;
+	
+	/**
+	 * ID: 1000116<br>
+	 * Message: I smell food. Ooh...
+	 */
+	public static final NpcStringId I_SMELL_FOOD_OOH;
+	
+	/**
+	 * ID: 1000117<br>
+	 * Message: Ooh...
+	 */
+	public static final NpcStringId OOH;
+	
+	/**
+	 * ID: 1000118<br>
+	 * Message: What does honey of this place taste like?!
+	 */
+	public static final NpcStringId WHAT_DOES_HONEY_OF_THIS_PLACE_TASTE_LIKE;
+	
+	/**
+	 * ID: 1000119<br>
+	 * Message: Give me some sweet, delicious golden honey!
+	 */
+	public static final NpcStringId GIVE_ME_SOME_SWEET_DELICIOUS_GOLDEN_HONEY;
+	
+	/**
+	 * ID: 1000120<br>
+	 * Message: If you give me some honey, I'll at least spare your life...
+	 */
+	public static final NpcStringId IF_YOU_GIVE_ME_SOME_HONEY_ILL_AT_LEAST_SPARE_YOUR_LIFE;
+	
+	/**
+	 * ID: 1000121<br>
+	 * Message: Only for lack of honey did I lose to the likes of you.
+	 */
+	public static final NpcStringId ONLY_FOR_LACK_OF_HONEY_DID_I_LOSE_TO_THE_LIKES_OF_YOU;
+	
+	/**
+	 * ID: 1000122<br>
+	 * Message: Where is the traitor Kuroboros!?
+	 */
+	public static final NpcStringId WHERE_IS_THE_TRAITOR_KUROBOROS;
+	
+	/**
+	 * ID: 1000123<br>
+	 * Message: Look in every nook and cranny around here!
+	 */
+	public static final NpcStringId LOOK_IN_EVERY_NOOK_AND_CRANNY_AROUND_HERE;
+	
+	/**
+	 * ID: 1000124<br>
+	 * Message: Are you Lackey of Kuroboros?! I'll knock you out in one shot!
+	 */
+	public static final NpcStringId ARE_YOU_LACKEY_OF_KUROBOROS_ILL_KNOCK_YOU_OUT_IN_ONE_SHOT;
+	
+	/**
+	 * ID: 1000125<br>
+	 * Message: He just closed his eyes without disposing of the traitor... How unfair!
+	 */
+	public static final NpcStringId HE_JUST_CLOSED_HIS_EYES_WITHOUT_DISPOSING_OF_THE_TRAITOR_HOW_UNFAIR;
+	
+	/**
+	 * ID: 1000126<br>
+	 * Message: Hell for unbelievers in Kuroboros!
+	 */
+	public static final NpcStringId HELL_FOR_UNBELIEVERS_IN_KUROBOROS;
+	
+	/**
+	 * ID: 1000127<br>
+	 * Message: The person that does not believe in kuroboros, his life will soon become hell!
+	 */
+	public static final NpcStringId THE_PERSON_THAT_DOES_NOT_BELIEVE_IN_KUROBOROS_HIS_LIFE_WILL_SOON_BECOME_HELL;
+	
+	/**
+	 * ID: 1000128<br>
+	 * Message: The lackey of that demented devil, the servant of a false god! I'll send that fool straight to hell!
+	 */
+	public static final NpcStringId THE_LACKEY_OF_THAT_DEMENTED_DEVIL_THE_SERVANT_OF_A_FALSE_GOD_ILL_SEND_THAT_FOOL_STRAIGHT_TO_HELL;
+	
+	/**
+	 * ID: 1000129<br>
+	 * Message: Uh... I'm not dying; I'm just disappearing for a moment... I'll resurrect again!
+	 */
+	public static final NpcStringId UH_IM_NOT_DYING_IM_JUST_DISAPPEARING_FOR_A_MOMENT_ILL_RESURRECT_AGAIN;
+	
+	/**
+	 * ID: 1000130<br>
+	 * Message: Hail to Kuroboros, the founder of our religion!
+	 */
+	public static final NpcStringId HAIL_TO_KUROBOROS_THE_FOUNDER_OF_OUR_RELIGION;
+	
+	/**
+	 * ID: 1000131<br>
+	 * Message: Only those who believe in Patriarch Kuroboros shall receive salvation!
+	 */
+	public static final NpcStringId ONLY_THOSE_WHO_BELIEVE_IN_PATRIARCH_KUROBOROS_SHALL_RECEIVE_SALVATION;
+	
+	/**
+	 * ID: 1000132<br>
+	 * Message: Are you the ones that Sharuk has incited?! You also should trust in Kuroboros and be saved!
+	 */
+	public static final NpcStringId ARE_YOU_THE_ONES_THAT_SHARUK_HAS_INCITED_YOU_ALSO_SHOULD_TRUST_IN_KUROBOROS_AND_BE_SAVED;
+	
+	/**
+	 * ID: 1000133<br>
+	 * Message: Kuroboros will punish you.
+	 */
+	public static final NpcStringId KUROBOROS_WILL_PUNISH_YOU;
+	
+	/**
+	 * ID: 1000134<br>
+	 * Message: You who have beautiful spirits that shine brightly! I have returned!
+	 */
+	public static final NpcStringId YOU_WHO_HAVE_BEAUTIFUL_SPIRITS_THAT_SHINE_BRIGHTLY_I_HAVE_RETURNED;
+	
+	/**
+	 * ID: 1000135<br>
+	 * Message: You that are weary and exhausted... Entrust your souls to me.
+	 */
+	public static final NpcStringId YOU_THAT_ARE_WEARY_AND_EXHAUSTED_ENTRUST_YOUR_SOULS_TO_ME;
+	
+	/**
+	 * ID: 1000136<br>
+	 * Message: The color of your soul is very attractive.
+	 */
+	public static final NpcStringId THE_COLOR_OF_YOUR_SOUL_IS_VERY_ATTRACTIVE;
+	
+	/**
+	 * ID: 1000137<br>
+	 * Message: Those of you who live! Do you know how beautiful your souls are?!
+	 */
+	public static final NpcStringId THOSE_OF_YOU_WHO_LIVE_DO_YOU_KNOW_HOW_BEAUTIFUL_YOUR_SOULS_ARE;
+	
+	/**
+	 * ID: 1000138<br>
+	 * Message: It... will... kill... everyone...
+	 */
+	public static final NpcStringId IT_WILL_KILL_EVERYONE;
+	
+	/**
+	 * ID: 1000139<br>
+	 * Message: I'm... so... lonely...
+	 */
+	public static final NpcStringId IM_SO_LONELY;
+	
+	/**
+	 * ID: 1000140<br>
+	 * Message: My... enemy...!
+	 */
+	public static final NpcStringId MY_ENEMY;
+	
+	/**
+	 * ID: 1000141<br>
+	 * Message: ... Now... I'm not so lonely!
+	 */
+	public static final NpcStringId _NOW_IM_NOT_SO_LONELY;
+	
+	/**
+	 * ID: 1000142<br>
+	 * Message: I will never forgive the Pixy Murika... that is trying to... kill us!
+	 */
+	public static final NpcStringId I_WILL_NEVER_FORGIVE_THE_PIXY_MURIKA_THAT_IS_TRYING_TO_KILL_US;
+	
+	/**
+	 * ID: 1000143<br>
+	 * Message: Attack all the dull and stupid followers of Murika!
+	 */
+	public static final NpcStringId ATTACK_ALL_THE_DULL_AND_STUPID_FOLLOWERS_OF_MURIKA;
+	
+	/**
+	 * ID: 1000144<br>
+	 * Message: I didn't have any idea about such ambitions!
+	 */
+	public static final NpcStringId I_DIDNT_HAVE_ANY_IDEA_ABOUT_SUCH_AMBITIONS;
+	
+	/**
+	 * ID: 1000145<br>
+	 * Message: This is not the end... It's just the beginning.
+	 */
+	public static final NpcStringId THIS_IS_NOT_THE_END_ITS_JUST_THE_BEGINNING;
+	
+	/**
+	 * ID: 1000146<br>
+	 * Message: Hey... Shall we have some fun for the first time in a long while?...
+	 */
+	public static final NpcStringId HEY_SHALL_WE_HAVE_SOME_FUN_FOR_THE_FIRST_TIME_IN_A_LONG_WHILE;
+	
+	/**
+	 * ID: 1000147<br>
+	 * Message: There've been some things going around like crazy here recently...
+	 */
+	public static final NpcStringId THEREVE_BEEN_SOME_THINGS_GOING_AROUND_LIKE_CRAZY_HERE_RECENTLY;
+	
+	/**
+	 * ID: 1000148<br>
+	 * Message: Hey! Do you know who I am? I am Malex, Herald of Dagoniel! Attack!
+	 */
+	public static final NpcStringId HEY_DO_YOU_KNOW_WHO_I_AM_I_AM_MALEX_HERALD_OF_DAGONIEL_ATTACK;
+	
+	/**
+	 * ID: 1000149<br>
+	 * Message: What's just happened?! The invincible Malex just lost to the likes of you?!
+	 */
+	public static final NpcStringId WHATS_JUST_HAPPENED_THE_INVINCIBLE_MALEX_JUST_LOST_TO_THE_LIKES_OF_YOU;
+	
+	/**
+	 * ID: 1000150<br>
+	 * Message: It's something repeated in a vain life...
+	 */
+	public static final NpcStringId ITS_SOMETHING_REPEATED_IN_A_VAIN_LIFE;
+	
+	/**
+	 * ID: 1000151<br>
+	 * Message: Shake in fear, all you who value your lives!
+	 */
+	public static final NpcStringId SHAKE_IN_FEAR_ALL_YOU_WHO_VALUE_YOUR_LIVES;
+	
+	/**
+	 * ID: 1000152<br>
+	 * Message: I'll make you feel suffering like a flame that is never extinguished!
+	 */
+	public static final NpcStringId ILL_MAKE_YOU_FEEL_SUFFERING_LIKE_A_FLAME_THAT_IS_NEVER_EXTINGUISHED;
+	
+	/**
+	 * ID: 1000153<br>
+	 * Message: Back to the dirt...
+	 */
+	public static final NpcStringId BACK_TO_THE_DIRT;
+	
+	/**
+	 * ID: 1000154<br>
+	 * Message: Hail Varika!!
+	 */
+	public static final NpcStringId HAIL_VARIKA;
+	
+	/**
+	 * ID: 1000155<br>
+	 * Message: Nobody can stop us!
+	 */
+	public static final NpcStringId NOBODY_CAN_STOP_US;
+	
+	/**
+	 * ID: 1000156<br>
+	 * Message: You move slowly!
+	 */
+	public static final NpcStringId YOU_MOVE_SLOWLY;
+	
+	/**
+	 * ID: 1000157<br>
+	 * Message: Varika! Go first!
+	 */
+	public static final NpcStringId VARIKA_GO_FIRST;
+	
+	/**
+	 * ID: 1000158<br>
+	 * Message: Where am I? Who am I?
+	 */
+	public static final NpcStringId WHERE_AM_I_WHO_AM_I;
+	
+	/**
+	 * ID: 1000159<br>
+	 * Message: Uh... My head hurts like it's going to burst! Who am I?
+	 */
+	public static final NpcStringId UH_MY_HEAD_HURTS_LIKE_ITS_GOING_TO_BURST_WHO_AM_I;
+	
+	/**
+	 * ID: 1000160<br>
+	 * Message: You jerk. You're a devil! You're a devil to have made me like this!
+	 */
+	public static final NpcStringId YOU_JERK_YOURE_A_DEVIL_YOURE_A_DEVIL_TO_HAVE_MADE_ME_LIKE_THIS;
+	
+	/**
+	 * ID: 1000161<br>
+	 * Message: Where am I? What happened? Thank you!
+	 */
+	public static final NpcStringId WHERE_AM_I_WHAT_HAPPENED_THANK_YOU;
+	
+	/**
+	 * ID: 1000162<br>
+	 * Message: Ukru Master!
+	 */
+	public static final NpcStringId UKRU_MASTER;
+	
+	/**
+	 * ID: 1000163<br>
+	 * Message: Are you Matu?
+	 */
+	public static final NpcStringId ARE_YOU_MATU;
+	
+	/**
+	 * ID: 1000164<br>
+	 * Message: Marak! Tubarin! Sabaracha!
+	 */
+	public static final NpcStringId MARAK_TUBARIN_SABARACHA;
+	
+	/**
+	 * ID: 1000165<br>
+	 * Message: Pa'agrio Tama!
+	 */
+	public static final NpcStringId PAAGRIO_TAMA;
+	
+	/**
+	 * ID: 1000166<br>
+	 * Message: Accept the will of Icarus!
+	 */
+	public static final NpcStringId ACCEPT_THE_WILL_OF_ICARUS;
+	
+	/**
+	 * ID: 1000167<br>
+	 * Message: The people who are blocking my way will not be forgiven...
+	 */
+	public static final NpcStringId THE_PEOPLE_WHO_ARE_BLOCKING_MY_WAY_WILL_NOT_BE_FORGIVEN;
+	
+	/**
+	 * ID: 1000168<br>
+	 * Message: You are scum.
+	 */
+	public static final NpcStringId YOU_ARE_SCUM;
+	
+	/**
+	 * ID: 1000169<br>
+	 * Message: You lack power.
+	 */
+	public static final NpcStringId YOU_LACK_POWER;
+	
+	/**
+	 * ID: 1000170<br>
+	 * Message: Return
+	 */
+	public static final NpcStringId RETURN;
+	
+	/**
+	 * ID: 1000171<br>
+	 * Message: Adena has been transferred.
+	 */
+	public static final NpcStringId ADENA_HAS_BEEN_TRANSFERRED;
+	
+	/**
+	 * ID: 1000172<br>
+	 * Message: Event Number
+	 */
+	public static final NpcStringId EVENT_NUMBER;
+	
+	/**
+	 * ID: 1000173<br>
+	 * Message: First Prize
+	 */
+	public static final NpcStringId FIRST_PRIZE;
+	
+	/**
+	 * ID: 1000174<br>
+	 * Message: Second Prize
+	 */
+	public static final NpcStringId SECOND_PRIZE;
+	
+	/**
+	 * ID: 1000175<br>
+	 * Message: Third Prize
+	 */
+	public static final NpcStringId THIRD_PRIZE;
+	
+	/**
+	 * ID: 1000176<br>
+	 * Message: Fourth Prize
+	 */
+	public static final NpcStringId FOURTH_PRIZE;
+	
+	/**
+	 * ID: 1000177<br>
+	 * Message: There has been no winning lottery ticket.
+	 */
+	public static final NpcStringId THERE_HAS_BEEN_NO_WINNING_LOTTERY_TICKET;
+	
+	/**
+	 * ID: 1000178<br>
+	 * Message: The most recent winning lottery numbers
+	 */
+	public static final NpcStringId THE_MOST_RECENT_WINNING_LOTTERY_NUMBERS;
+	
+	/**
+	 * ID: 1000179<br>
+	 * Message: Your lucky numbers have been selected above.
+	 */
+	public static final NpcStringId YOUR_LUCKY_NUMBERS_HAVE_BEEN_SELECTED_ABOVE;
+	
+	/**
+	 * ID: 1000180<br>
+	 * Message: I wonder who it is that is lurking about..
+	 */
+	public static final NpcStringId I_WONDER_WHO_IT_IS_THAT_IS_LURKING_ABOUT;
+	
+	/**
+	 * ID: 1000181<br>
+	 * Message: Sacred magical research is conducted here.
+	 */
+	public static final NpcStringId SACRED_MAGICAL_RESEARCH_IS_CONDUCTED_HERE;
+	
+	/**
+	 * ID: 1000182<br>
+	 * Message: Behold the awesome power of magic!
+	 */
+	public static final NpcStringId BEHOLD_THE_AWESOME_POWER_OF_MAGIC;
+	
+	/**
+	 * ID: 1000183<br>
+	 * Message: Your powers are impressive but you must not annoy our high level sorcerer.
+	 */
+	public static final NpcStringId YOUR_POWERS_ARE_IMPRESSIVE_BUT_YOU_MUST_NOT_ANNOY_OUR_HIGH_LEVEL_SORCERER;
+	
+	/**
+	 * ID: 1000184<br>
+	 * Message: I am Barda, master of the Bandit Stronghold!
+	 */
+	public static final NpcStringId I_AM_BARDA_MASTER_OF_THE_BANDIT_STRONGHOLD;
+	
+	/**
+	 * ID: 1000185<br>
+	 * Message: I, Master Barda, once owned that stronghold,
+	 */
+	public static final NpcStringId I_MASTER_BARDA_ONCE_OWNED_THAT_STRONGHOLD;
+	
+	/**
+	 * ID: 1000186<br>
+	 * Message: Ah, very interesting!
+	 */
+	public static final NpcStringId AH_VERY_INTERESTING;
+	
+	/**
+	 * ID: 1000187<br>
+	 * Message: You are more powerful than you appear. We'll meet again!
+	 */
+	public static final NpcStringId YOU_ARE_MORE_POWERFUL_THAN_YOU_APPEAR_WELL_MEET_AGAIN;
+	
+	/**
+	 * ID: 1000188<br>
+	 * Message: You filthy sorcerers disgust me!
+	 */
+	public static final NpcStringId YOU_FILTHY_SORCERERS_DISGUST_ME;
+	
+	/**
+	 * ID: 1000189<br>
+	 * Message: Why would you build a tower in our territory?
+	 */
+	public static final NpcStringId WHY_WOULD_YOU_BUILD_A_TOWER_IN_OUR_TERRITORY;
+	
+	/**
+	 * ID: 1000190<br>
+	 * Message: Are you part of that evil gang of sorcerers?
+	 */
+	public static final NpcStringId ARE_YOU_PART_OF_THAT_EVIL_GANG_OF_SORCERERS;
+	
+	/**
+	 * ID: 1000191<br>
+	 * Message: That is why I don't bother with anyone below the level of sorcerer.
+	 */
+	public static final NpcStringId THAT_IS_WHY_I_DONT_BOTHER_WITH_ANYONE_BELOW_THE_LEVEL_OF_SORCERER;
+	
+	/**
+	 * ID: 1000192<br>
+	 * Message: Ah, another beautiful day!
+	 */
+	public static final NpcStringId AH_ANOTHER_BEAUTIFUL_DAY;
+	
+	/**
+	 * ID: 1000193<br>
+	 * Message: Our specialties are arson and looting.
+	 */
+	public static final NpcStringId OUR_SPECIALTIES_ARE_ARSON_AND_LOOTING;
+	
+	/**
+	 * ID: 1000194<br>
+	 * Message: You will leave empty-handed!
+	 */
+	public static final NpcStringId YOU_WILL_LEAVE_EMPTY_HANDED;
+	
+	/**
+	 * ID: 1000195<br>
+	 * Message: Ah, so you admire my treasure, do you? Try finding it! Ha!
+	 */
+	public static final NpcStringId AH_SO_YOU_ADMIRE_MY_TREASURE_DO_YOU_TRY_FINDING_IT_HA;
+	
+	/**
+	 * ID: 1000196<br>
+	 * Message: Is everybody listening? Sirion has come back. Everyone chant and bow...
+	 */
+	public static final NpcStringId IS_EVERYBODY_LISTENING_SIRION_HAS_COME_BACK_EVERYONE_CHANT_AND_BOW;
+	
+	/**
+	 * ID: 1000197<br>
+	 * Message: Bow down, you worthless humans!
+	 */
+	public static final NpcStringId BOW_DOWN_YOU_WORTHLESS_HUMANS;
+	
+	/**
+	 * ID: 1000198<br>
+	 * Message: Very tacky!
+	 */
+	public static final NpcStringId VERY_TACKY;
+	
+	/**
+	 * ID: 1000199<br>
+	 * Message: Don't think that you are invincible just because you defeated me!
+	 */
+	public static final NpcStringId DONT_THINK_THAT_YOU_ARE_INVINCIBLE_JUST_BECAUSE_YOU_DEFEATED_ME;
+	
+	/**
+	 * ID: 1000200<br>
+	 * Message: The material desires of mortals are ultimately meaningless.
+	 */
+	public static final NpcStringId THE_MATERIAL_DESIRES_OF_MORTALS_ARE_ULTIMATELY_MEANINGLESS;
+	
+	/**
+	 * ID: 1000201<br>
+	 * Message: Do not forget the reason the Tower of Insolence collapsed.
+	 */
+	public static final NpcStringId DO_NOT_FORGET_THE_REASON_THE_TOWER_OF_INSOLENCE_COLLAPSED;
+	
+	/**
+	 * ID: 1000202<br>
+	 * Message: You humans are all alike, full of greed and avarice!
+	 */
+	public static final NpcStringId YOU_HUMANS_ARE_ALL_ALIKE_FULL_OF_GREED_AND_AVARICE;
+	
+	/**
+	 * ID: 1000203<br>
+	 * Message: All for nothing,
+	 */
+	public static final NpcStringId ALL_FOR_NOTHING;
+	
+	/**
+	 * ID: 1000204<br>
+	 * Message: What are all these people doing here?
+	 */
+	public static final NpcStringId WHAT_ARE_ALL_THESE_PEOPLE_DOING_HERE;
+	
+	/**
+	 * ID: 1000205<br>
+	 * Message: I must find the secret of eternal life, here among these rotten angels!
+	 */
+	public static final NpcStringId I_MUST_FIND_THE_SECRET_OF_ETERNAL_LIFE_HERE_AMONG_THESE_ROTTEN_ANGELS;
+	
+	/**
+	 * ID: 1000206<br>
+	 * Message: Do you also seek the secret of immortality?
+	 */
+	public static final NpcStringId DO_YOU_ALSO_SEEK_THE_SECRET_OF_IMMORTALITY;
+	
+	/**
+	 * ID: 1000207<br>
+	 * Message: I shall never reveal my secrets!
+	 */
+	public static final NpcStringId I_SHALL_NEVER_REVEAL_MY_SECRETS;
+	
+	/**
+	 * ID: 1000208<br>
+	 * Message: Who dares enter this place?
+	 */
+	public static final NpcStringId WHO_DARES_ENTER_THIS_PLACE;
+	
+	/**
+	 * ID: 1000209<br>
+	 * Message: This is no place for humans! You must leave immediately.
+	 */
+	public static final NpcStringId THIS_IS_NO_PLACE_FOR_HUMANS_YOU_MUST_LEAVE_IMMEDIATELY;
+	
+	/**
+	 * ID: 1000210<br>
+	 * Message: You poor creatures! Too stupid to realize your own ignorance!
+	 */
+	public static final NpcStringId YOU_POOR_CREATURES_TOO_STUPID_TO_REALIZE_YOUR_OWN_IGNORANCE;
+	
+	/**
+	 * ID: 1000211<br>
+	 * Message: You mustn't go there!
+	 */
+	public static final NpcStringId YOU_MUSTNT_GO_THERE;
+	
+	/**
+	 * ID: 1000212<br>
+	 * Message: Who dares disturb this marsh?
+	 */
+	public static final NpcStringId WHO_DARES_DISTURB_THIS_MARSH;
+	
+	/**
+	 * ID: 1000213<br>
+	 * Message: The humans must not be allowed to destroy the marshland for their greedy purposes.
+	 */
+	public static final NpcStringId THE_HUMANS_MUST_NOT_BE_ALLOWED_TO_DESTROY_THE_MARSHLAND_FOR_THEIR_GREEDY_PURPOSES;
+	
+	/**
+	 * ID: 1000214<br>
+	 * Message: You are a brave man...
+	 */
+	public static final NpcStringId YOU_ARE_A_BRAVE_MAN;
+	
+	/**
+	 * ID: 1000215<br>
+	 * Message: You idiots! Some day you shall also be gone!
+	 */
+	public static final NpcStringId YOU_IDIOTS_SOME_DAY_YOU_SHALL_ALSO_BE_GONE;
+	
+	/**
+	 * ID: 1000216<br>
+	 * Message: Someone has entered the forest...
+	 */
+	public static final NpcStringId SOMEONE_HAS_ENTERED_THE_FOREST;
+	
+	/**
+	 * ID: 1000217<br>
+	 * Message: The forest is very quiet and peaceful.
+	 */
+	public static final NpcStringId THE_FOREST_IS_VERY_QUIET_AND_PEACEFUL;
+	
+	/**
+	 * ID: 1000218<br>
+	 * Message: Stay here in this wonderful forest!
+	 */
+	public static final NpcStringId STAY_HERE_IN_THIS_WONDERFUL_FOREST;
+	
+	/**
+	 * ID: 1000219<br>
+	 * Message: My... my souls...
+	 */
+	public static final NpcStringId MY_MY_SOULS;
+	
+	/**
+	 * ID: 1000220<br>
+	 * Message: This forest is a dangerous place.
+	 */
+	public static final NpcStringId THIS_FOREST_IS_A_DANGEROUS_PLACE;
+	
+	/**
+	 * ID: 1000221<br>
+	 * Message: Unless you leave this forest immediately you are bound to run into serious trouble.
+	 */
+	public static final NpcStringId UNLESS_YOU_LEAVE_THIS_FOREST_IMMEDIATELY_YOU_ARE_BOUND_TO_RUN_INTO_SERIOUS_TROUBLE;
+	
+	/**
+	 * ID: 1000222<br>
+	 * Message: Leave now!
+	 */
+	public static final NpcStringId LEAVE_NOW;
+	
+	/**
+	 * ID: 1000223<br>
+	 * Message: Why do you ignore my warning?
+	 */
+	public static final NpcStringId WHY_DO_YOU_IGNORE_MY_WARNING;
+	
+	/**
+	 * ID: 1000224<br>
+	 * Message: Harits of the world... I bring you peace!
+	 */
+	public static final NpcStringId HARITS_OF_THE_WORLD_I_BRING_YOU_PEACE;
+	
+	/**
+	 * ID: 1000225<br>
+	 * Message: Harits! Be courageous!
+	 */
+	public static final NpcStringId HARITS_BE_COURAGEOUS;
+	
+	/**
+	 * ID: 1000226<br>
+	 * Message: I shall eat your still-beating heart!.
+	 */
+	public static final NpcStringId I_SHALL_EAT_YOUR_STILL_BEATING_HEART;
+	
+	/**
+	 * ID: 1000227<br>
+	 * Message: Harits! Keep faith until the day I return... Never lose hope!
+	 */
+	public static final NpcStringId HARITS_KEEP_FAITH_UNTIL_THE_DAY_I_RETURN_NEVER_LOSE_HOPE;
+	
+	/**
+	 * ID: 1000228<br>
+	 * Message: Even the giants are gone! There's nothing left to be afraid of now!
+	 */
+	public static final NpcStringId EVEN_THE_GIANTS_ARE_GONE_THERES_NOTHING_LEFT_TO_BE_AFRAID_OF_NOW;
+	
+	/**
+	 * ID: 1000229<br>
+	 * Message: Have you heard of the giants? Their downfall was inevitable!
+	 */
+	public static final NpcStringId HAVE_YOU_HEARD_OF_THE_GIANTS_THEIR_DOWNFALL_WAS_INEVITABLE;
+	
+	/**
+	 * ID: 1000230<br>
+	 * Message: What nerve! Do you dare to challenge me?
+	 */
+	public static final NpcStringId WHAT_NERVE_DO_YOU_DARE_TO_CHALLENGE_ME;
+	
+	/**
+	 * ID: 1000231<br>
+	 * Message: You are as evil as the giants...
+	 */
+	public static final NpcStringId YOU_ARE_AS_EVIL_AS_THE_GIANTS;
+	
+	/**
+	 * ID: 1000232<br>
+	 * Message: This dungeon is still in good condition!
+	 */
+	public static final NpcStringId THIS_DUNGEON_IS_STILL_IN_GOOD_CONDITION;
+	
+	/**
+	 * ID: 1000233<br>
+	 * Message: This place is spectacular, wouldn't you say?
+	 */
+	public static final NpcStringId THIS_PLACE_IS_SPECTACULAR_WOULDNT_YOU_SAY;
+	
+	/**
+	 * ID: 1000234<br>
+	 * Message: You are very brave warriors!
+	 */
+	public static final NpcStringId YOU_ARE_VERY_BRAVE_WARRIORS;
+	
+	/**
+	 * ID: 1000235<br>
+	 * Message: Are the giants truly gone for good?
+	 */
+	public static final NpcStringId ARE_THE_GIANTS_TRULY_GONE_FOR_GOOD;
+	
+	/**
+	 * ID: 1000236<br>
+	 * Message: These graves are good.
+	 */
+	public static final NpcStringId THESE_GRAVES_ARE_GOOD;
+	
+	/**
+	 * ID: 1000237<br>
+	 * Message: Gold and silver are meaningless to a dead man!
+	 */
+	public static final NpcStringId GOLD_AND_SILVER_ARE_MEANINGLESS_TO_A_DEAD_MAN;
+	
+	/**
+	 * ID: 1000238<br>
+	 * Message: Why would those corrupt aristocrats bury such useful things?
+	 */
+	public static final NpcStringId WHY_WOULD_THOSE_CORRUPT_ARISTOCRATS_BURY_SUCH_USEFUL_THINGS;
+	
+	/**
+	 * ID: 1000239<br>
+	 * Message: You filthy pig! Eat and be merry now that you have shirked your responsibilities!
+	 */
+	public static final NpcStringId YOU_FILTHY_PIG_EAT_AND_BE_MERRY_NOW_THAT_YOU_HAVE_SHIRKED_YOUR_RESPONSIBILITIES;
+	
+	/**
+	 * ID: 1000240<br>
+	 * Message: Those thugs! It would be too merciful to rip them apart and chew them up one at a time!
+	 */
+	public static final NpcStringId THOSE_THUGS_IT_WOULD_BE_TOO_MERCIFUL_TO_RIP_THEM_APART_AND_CHEW_THEM_UP_ONE_AT_A_TIME;
+	
+	/**
+	 * ID: 1000241<br>
+	 * Message: You accursed scoundrels!
+	 */
+	public static final NpcStringId YOU_ACCURSED_SCOUNDRELS;
+	
+	/**
+	 * ID: 1000242<br>
+	 * Message: Hmm, could this be the assassin sent by those idiots from Aden?
+	 */
+	public static final NpcStringId HMM_COULD_THIS_BE_THE_ASSASSIN_SENT_BY_THOSE_IDIOTS_FROM_ADEN;
+	
+	/**
+	 * ID: 1000243<br>
+	 * Message: I shall curse your name with my last breath!
+	 */
+	public static final NpcStringId I_SHALL_CURSE_YOUR_NAME_WITH_MY_LAST_BREATH;
+	
+	/**
+	 * ID: 1000244<br>
+	 * Message: My beloved Lord Shilen.
+	 */
+	public static final NpcStringId MY_BELOVED_LORD_SHILEN;
+	
+	/**
+	 * ID: 1000245<br>
+	 * Message: I must break the seal and release Lord Shilen as soon as possible...
+	 */
+	public static final NpcStringId I_MUST_BREAK_THE_SEAL_AND_RELEASE_LORD_SHILEN_AS_SOON_AS_POSSIBLE;
+	
+	/**
+	 * ID: 1000246<br>
+	 * Message: You shall taste the vengeance of Lord Shilen!
+	 */
+	public static final NpcStringId YOU_SHALL_TASTE_THE_VENGEANCE_OF_LORD_SHILEN;
+	
+	/**
+	 * ID: 1000247<br>
+	 * Message: Lord Shilen... some day... you will accomplish... this mission...
+	 */
+	public static final NpcStringId LORD_SHILEN_SOME_DAY_YOU_WILL_ACCOMPLISH_THIS_MISSION;
+	
+	/**
+	 * ID: 1000248<br>
+	 * Message: Towards immortality...
+	 */
+	public static final NpcStringId TOWARDS_IMMORTALITY;
+	
+	/**
+	 * ID: 1000249<br>
+	 * Message: He who desires immortality... Come unto me.
+	 */
+	public static final NpcStringId HE_WHO_DESIRES_IMMORTALITY_COME_UNTO_ME;
+	
+	/**
+	 * ID: 1000250<br>
+	 * Message: You shall be sacrificed to gain my immortality!
+	 */
+	public static final NpcStringId YOU_SHALL_BE_SACRIFICED_TO_GAIN_MY_IMMORTALITY;
+	
+	/**
+	 * ID: 1000251<br>
+	 * Message: Eternal life in front of my eyes... I have collapsed in such a worthless way like this...
+	 */
+	public static final NpcStringId ETERNAL_LIFE_IN_FRONT_OF_MY_EYES_I_HAVE_COLLAPSED_IN_SUCH_A_WORTHLESS_WAY_LIKE_THIS;
+	
+	/**
+	 * ID: 1000252<br>
+	 * Message: Zaken, you are a cowardly cur!
+	 */
+	public static final NpcStringId ZAKEN_YOU_ARE_A_COWARDLY_CUR;
+	
+	/**
+	 * ID: 1000253<br>
+	 * Message: You are immortal, aren't you, Zaken?
+	 */
+	public static final NpcStringId YOU_ARE_IMMORTAL_ARENT_YOU_ZAKEN;
+	
+	/**
+	 * ID: 1000254<br>
+	 * Message: Please return my body to me.
+	 */
+	public static final NpcStringId PLEASE_RETURN_MY_BODY_TO_ME;
+	
+	/**
+	 * ID: 1000255<br>
+	 * Message: Finally... will I be able to rest?
+	 */
+	public static final NpcStringId FINALLY_WILL_I_BE_ABLE_TO_REST;
+	
+	/**
+	 * ID: 1000256<br>
+	 * Message: What is all that racket?
+	 */
+	public static final NpcStringId WHAT_IS_ALL_THAT_RACKET;
+	
+	/**
+	 * ID: 1000257<br>
+	 * Message: Master Gildor does not like to be disturbed.
+	 */
+	public static final NpcStringId MASTER_GILDOR_DOES_NOT_LIKE_TO_BE_DISTURBED;
+	
+	/**
+	 * ID: 1000258<br>
+	 * Message: Please, just hold it down...
+	 */
+	public static final NpcStringId PLEASE_JUST_HOLD_IT_DOWN;
+	
+	/**
+	 * ID: 1000259<br>
+	 * Message: If you disturb Master Gildor I won't be able to help you.
+	 */
+	public static final NpcStringId IF_YOU_DISTURB_MASTER_GILDOR_I_WONT_BE_ABLE_TO_HELP_YOU;
+	
+	/**
+	 * ID: 1000260<br>
+	 * Message: Who dares approach?
+	 */
+	public static final NpcStringId WHO_DARES_APPROACH;
+	
+	/**
+	 * ID: 1000261<br>
+	 * Message: These reeds are my territory...
+	 */
+	public static final NpcStringId THESE_REEDS_ARE_MY_TERRITORY;
+	
+	/**
+	 * ID: 1000262<br>
+	 * Message: You fools! Today you shall learn a lesson!
+	 */
+	public static final NpcStringId YOU_FOOLS_TODAY_YOU_SHALL_LEARN_A_LESSON;
+	
+	/**
+	 * ID: 1000263<br>
+	 * Message: The past goes by... Is a new era beginning?...
+	 */
+	public static final NpcStringId THE_PAST_GOES_BY_IS_A_NEW_ERA_BEGINNING;
+	
+	/**
+	 * ID: 1000264<br>
+	 * Message: This is the garden of Eva.
+	 */
+	public static final NpcStringId THIS_IS_THE_GARDEN_OF_EVA;
+	
+	/**
+	 * ID: 1000265<br>
+	 * Message: The garden of Eva is a sacred place.
+	 */
+	public static final NpcStringId THE_GARDEN_OF_EVA_IS_A_SACRED_PLACE;
+	
+	/**
+	 * ID: 1000266<br>
+	 * Message: Do you mean to insult Eva?
+	 */
+	public static final NpcStringId DO_YOU_MEAN_TO_INSULT_EVA;
+	
+	/**
+	 * ID: 1000267<br>
+	 * Message: How rude! Eva's love is available to all, even to an ill-mannered lout like yourself!
+	 */
+	public static final NpcStringId HOW_RUDE_EVAS_LOVE_IS_AVAILABLE_TO_ALL_EVEN_TO_AN_ILL_MANNERED_LOUT_LIKE_YOURSELF;
+	
+	/**
+	 * ID: 1000268<br>
+	 * Message: This place once belonged to Lord Shilen.
+	 */
+	public static final NpcStringId THIS_PLACE_ONCE_BELONGED_TO_LORD_SHILEN;
+	
+	/**
+	 * ID: 1000269<br>
+	 * Message: Leave this palace to us, spirits of Eva.
+	 */
+	public static final NpcStringId LEAVE_THIS_PALACE_TO_US_SPIRITS_OF_EVA;
+	
+	/**
+	 * ID: 1000270<br>
+	 * Message: Why are you getting in our way?
+	 */
+	public static final NpcStringId WHY_ARE_YOU_GETTING_IN_OUR_WAY;
+	
+	/**
+	 * ID: 1000271<br>
+	 * Message: Shilen... our Shilen!
+	 */
+	public static final NpcStringId SHILEN_OUR_SHILEN;
+	
+	/**
+	 * ID: 1000272<br>
+	 * Message: All who fear of Fafurion... Leave this place at once!
+	 */
+	public static final NpcStringId ALL_WHO_FEAR_OF_FAFURION_LEAVE_THIS_PLACE_AT_ONCE;
+	
+	/**
+	 * ID: 1000273<br>
+	 * Message: You are being punished in the name of Fafurion!
+	 */
+	public static final NpcStringId YOU_ARE_BEING_PUNISHED_IN_THE_NAME_OF_FAFURION;
+	
+	/**
+	 * ID: 1000274<br>
+	 * Message: Oh, master... please forgive your humble servant...
+	 */
+	public static final NpcStringId OH_MASTER_PLEASE_FORGIVE_YOUR_HUMBLE_SERVANT;
+	
+	/**
+	 * ID: 1000275<br>
+	 * Message: Prepare to die, foreign invaders! I am Gustav, the eternal ruler of this fortress and I have taken up my sword to repel thee!
+	 */
+	public static final NpcStringId PREPARE_TO_DIE_FOREIGN_INVADERS_I_AM_GUSTAV_THE_ETERNAL_RULER_OF_THIS_FORTRESS_AND_I_HAVE_TAKEN_UP_MY_SWORD_TO_REPEL_THEE;
+	
+	/**
+	 * ID: 1000276<br>
+	 * Message: Glory to Aden, the Kingdom of the Lion! Glory to Sir Gustav, our immortal lord!
+	 */
+	public static final NpcStringId GLORY_TO_ADEN_THE_KINGDOM_OF_THE_LION_GLORY_TO_SIR_GUSTAV_OUR_IMMORTAL_LORD;
+	
+	/**
+	 * ID: 1000277<br>
+	 * Message: Soldiers of Gustav, go forth and destroy the invaders!
+	 */
+	public static final NpcStringId SOLDIERS_OF_GUSTAV_GO_FORTH_AND_DESTROY_THE_INVADERS;
+	
+	/**
+	 * ID: 1000278<br>
+	 * Message: This is unbelievable! Have I really been defeated? I shall return and take your head!
+	 */
+	public static final NpcStringId THIS_IS_UNBELIEVABLE_HAVE_I_REALLY_BEEN_DEFEATED_I_SHALL_RETURN_AND_TAKE_YOUR_HEAD;
+	
+	/**
+	 * ID: 1000279<br>
+	 * Message: Could it be that I have reached my end? I cannot die without honor, without the permission of Sir Gustav!
+	 */
+	public static final NpcStringId COULD_IT_BE_THAT_I_HAVE_REACHED_MY_END_I_CANNOT_DIE_WITHOUT_HONOR_WITHOUT_THE_PERMISSION_OF_SIR_GUSTAV;
+	
+	/**
+	 * ID: 1000280<br>
+	 * Message: Ah, the bitter taste of defeat... I fear my torments are not over...
+	 */
+	public static final NpcStringId AH_THE_BITTER_TASTE_OF_DEFEAT_I_FEAR_MY_TORMENTS_ARE_NOT_OVER;
+	
+	/**
+	 * ID: 1000281<br>
+	 * Message: I follow the will of Fafurion.
+	 */
+	public static final NpcStringId I_FOLLOW_THE_WILL_OF_FAFURION;
+	
+	/**
+	 * ID: 1000282<br>
+	 * Message: Tickets for the Lucky Lottery are now on sale!
+	 */
+	public static final NpcStringId TICKETS_FOR_THE_LUCKY_LOTTERY_ARE_NOW_ON_SALE;
+	
+	/**
+	 * ID: 1000283<br>
+	 * Message: The Lucky Lottery drawing is about to begin!
+	 */
+	public static final NpcStringId THE_LUCKY_LOTTERY_DRAWING_IS_ABOUT_TO_BEGIN;
+	
+	/**
+	 * ID: 1000284<br>
+	 * Message: The winning numbers for Lucky Lottery $s1 are $s2. Congratulations to the winners!
+	 */
+	public static final NpcStringId THE_WINNING_NUMBERS_FOR_LUCKY_LOTTERY_S1_ARE_S2_CONGRATULATIONS_TO_THE_WINNERS;
+	
+	/**
+	 * ID: 1000285<br>
+	 * Message: You're too young to play Lucky Lottery!
+	 */
+	public static final NpcStringId YOURE_TOO_YOUNG_TO_PLAY_LUCKY_LOTTERY;
+	
+	/**
+	 * ID: 1000286<br>
+	 * Message: $s1! Watch your back!!!
+	 */
+	public static final NpcStringId S1_WATCH_YOUR_BACK;
+	
+	/**
+	 * ID: 1000287<br>
+	 * Message: $s1! Come on, I'll take you on!
+	 */
+	public static final NpcStringId S1_COME_ON_ILL_TAKE_YOU_ON;
+	
+	/**
+	 * ID: 1000288<br>
+	 * Message: $s1! How dare you interrupt our fight! Hey guys, help!
+	 */
+	public static final NpcStringId S1_HOW_DARE_YOU_INTERRUPT_OUR_FIGHT_HEY_GUYS_HELP;
+	
+	/**
+	 * ID: 1000289<br>
+	 * Message: I'll help you! I'm no coward!
+	 */
+	public static final NpcStringId ILL_HELP_YOU_IM_NO_COWARD;
+	
+	/**
+	 * ID: 1000290<br>
+	 * Message: Dear ultimate power!!!
+	 */
+	public static final NpcStringId DEAR_ULTIMATE_POWER;
+	
+	/**
+	 * ID: 1000291<br>
+	 * Message: Everybody! Attack $s1!
+	 */
+	public static final NpcStringId EVERYBODY_ATTACK_S1;
+	
+	/**
+	 * ID: 1000292<br>
+	 * Message: I will follow your order.
+	 */
+	public static final NpcStringId I_WILL_FOLLOW_YOUR_ORDER;
+	
+	/**
+	 * ID: 1000293<br>
+	 * Message: Bet you didn't expect this!
+	 */
+	public static final NpcStringId BET_YOU_DIDNT_EXPECT_THIS;
+	
+	/**
+	 * ID: 1000294<br>
+	 * Message: Come out, you children of darkness!
+	 */
+	public static final NpcStringId COME_OUT_YOU_CHILDREN_OF_DARKNESS;
+	
+	/**
+	 * ID: 1000295<br>
+	 * Message: Summon party members!
+	 */
+	public static final NpcStringId SUMMON_PARTY_MEMBERS;
+	
+	/**
+	 * ID: 1000296<br>
+	 * Message: Master! Did you call me?
+	 */
+	public static final NpcStringId MASTER_DID_YOU_CALL_ME;
+	
+	/**
+	 * ID: 1000297<br>
+	 * Message: You idiot!
+	 */
+	public static final NpcStringId YOU_IDIOT;
+	
+	/**
+	 * ID: 1000298<br>
+	 * Message: What about this?
+	 */
+	public static final NpcStringId WHAT_ABOUT_THIS;
+	
+	/**
+	 * ID: 1000299<br>
+	 * Message: Very impressive $s1! This is the last!
+	 */
+	public static final NpcStringId VERY_IMPRESSIVE_S1_THIS_IS_THE_LAST;
+	
+	/**
+	 * ID: 1000300<br>
+	 * Message: Dawn
+	 */
+	public static final NpcStringId DAWN;
+	
+	/**
+	 * ID: 1000301<br>
+	 * Message: Dusk
+	 */
+	public static final NpcStringId DUSK;
+	
+	/**
+	 * ID: 1000302<br>
+	 * Message: Nothingness
+	 */
+	public static final NpcStringId NOTHINGNESS;
+	
+	/**
+	 * ID: 1000303<br>
+	 * Message: This world will soon be annihilated!
+	 */
+	public static final NpcStringId THIS_WORLD_WILL_SOON_BE_ANNIHILATED;
+	
+	/**
+	 * ID: 1000304<br>
+	 * Message: A curse upon you!
+	 */
+	public static final NpcStringId A_CURSE_UPON_YOU;
+	
+	/**
+	 * ID: 1000305<br>
+	 * Message: The day of judgment is near!
+	 */
+	public static final NpcStringId THE_DAY_OF_JUDGMENT_IS_NEAR;
+	
+	/**
+	 * ID: 1000306<br>
+	 * Message: I bestow upon you a blessing!
+	 */
+	public static final NpcStringId I_BESTOW_UPON_YOU_A_BLESSING;
+	
+	/**
+	 * ID: 1000307<br>
+	 * Message: The first rule of fighting is to start by killing the weak ones!
+	 */
+	public static final NpcStringId THE_FIRST_RULE_OF_FIGHTING_IS_TO_START_BY_KILLING_THE_WEAK_ONES;
+	
+	/**
+	 * ID: 1000308<br>
+	 * Message: Adena
+	 */
+	public static final NpcStringId ADENA;
+	
+	/**
+	 * ID: 1000309<br>
+	 * Message: Ancient Adena
+	 */
+	public static final NpcStringId ANCIENT_ADENA;
+	
+	/**
+	 * ID: 1000312<br>
+	 * Message: Level 31 or lower
+	 */
+	public static final NpcStringId LEVEL_31_OR_LOWER;
+	
+	/**
+	 * ID: 1000313<br>
+	 * Message: Level 42 or lower
+	 */
+	public static final NpcStringId LEVEL_42_OR_LOWER;
+	
+	/**
+	 * ID: 1000314<br>
+	 * Message: Level 53 or lower
+	 */
+	public static final NpcStringId LEVEL_53_OR_LOWER;
+	
+	/**
+	 * ID: 1000315<br>
+	 * Message: Level 64 or lower
+	 */
+	public static final NpcStringId LEVEL_64_OR_LOWER;
+	
+	/**
+	 * ID: 1000316<br>
+	 * Message: No Level Limit
+	 */
+	public static final NpcStringId NO_LEVEL_LIMIT;
+	
+	/**
+	 * ID: 1000317<br>
+	 * Message: The main event will start in 2 minutes. Please register now.
+	 */
+	public static final NpcStringId THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW;
+	
+	/**
+	 * ID: 1000318<br>
+	 * Message: The main event is now starting.
+	 */
+	public static final NpcStringId THE_MAIN_EVENT_IS_NOW_STARTING;
+	
+	/**
+	 * ID: 1000319<br>
+	 * Message: The main event will close in 5 minutes.
+	 */
+	public static final NpcStringId THE_MAIN_EVENT_WILL_CLOSE_IN_5_MINUTES;
+	
+	/**
+	 * ID: 1000320<br>
+	 * Message: The main event will finish in 2 minutes. Please prepare for the next game.
+	 */
+	public static final NpcStringId THE_MAIN_EVENT_WILL_FINISH_IN_2_MINUTES_PLEASE_PREPARE_FOR_THE_NEXT_GAME;
+	
+	/**
+	 * ID: 1000321<br>
+	 * Message: The amount of SSQ contribution has increased by $s1.
+	 */
+	public static final NpcStringId THE_AMOUNT_OF_SSQ_CONTRIBUTION_HAS_INCREASED_BY_S1;
+	
+	/**
+	 * ID: 1000322<br>
+	 * Message: No record exists
+	 */
+	public static final NpcStringId NO_RECORD_EXISTS;
+	
+	/**
+	 * ID: 1000380<br>
+	 * Message: That will do! I'll move you to the outside soon.
+	 */
+	public static final NpcStringId THAT_WILL_DO_ILL_MOVE_YOU_TO_THE_OUTSIDE_SOON;
+	
+	/**
+	 * ID: 1000382<br>
+	 * Message: Your rear is practically unguarded!
+	 */
+	public static final NpcStringId YOUR_REAR_IS_PRACTICALLY_UNGUARDED;
+	
+	/**
+	 * ID: 1000383<br>
+	 * Message: How dare you turn your back on me!
+	 */
+	public static final NpcStringId HOW_DARE_YOU_TURN_YOUR_BACK_ON_ME;
+	
+	/**
+	 * ID: 1000384<br>
+	 * Message: $s1! I'll deal with you myself!
+	 */
+	public static final NpcStringId S1_ILL_DEAL_WITH_YOU_MYSELF;
+	
+	/**
+	 * ID: 1000385<br>
+	 * Message: $s1! This is personal!
+	 */
+	public static final NpcStringId S1_THIS_IS_PERSONAL;
+	
+	/**
+	 * ID: 1000386<br>
+	 * Message: $s1! Leave us alone! This is between us!
+	 */
+	public static final NpcStringId S1_LEAVE_US_ALONE_THIS_IS_BETWEEN_US;
+	
+	/**
+	 * ID: 1000387<br>
+	 * Message: $s1! Killing you will be a pleasure!
+	 */
+	public static final NpcStringId S1_KILLING_YOU_WILL_BE_A_PLEASURE;
+	
+	/**
+	 * ID: 1000388<br>
+	 * Message: $s1! Hey! We're having a duel here!
+	 */
+	public static final NpcStringId S1_HEY_WERE_HAVING_A_DUEL_HERE;
+	
+	/**
+	 * ID: 1000389<br>
+	 * Message: The duel is over! Attack!
+	 */
+	public static final NpcStringId THE_DUEL_IS_OVER_ATTACK;
+	
+	/**
+	 * ID: 1000390<br>
+	 * Message: Foul! Kill the coward!
+	 */
+	public static final NpcStringId FOUL_KILL_THE_COWARD;
+	
+	/**
+	 * ID: 1000391<br>
+	 * Message: How dare you interrupt a sacred duel! You must be taught a lesson!
+	 */
+	public static final NpcStringId HOW_DARE_YOU_INTERRUPT_A_SACRED_DUEL_YOU_MUST_BE_TAUGHT_A_LESSON;
+	
+	/**
+	 * ID: 1000392<br>
+	 * Message: Die, you coward!
+	 */
+	public static final NpcStringId DIE_YOU_COWARD;
+	
+	/**
+	 * ID: 1000394<br>
+	 * Message: Kill the coward!
+	 */
+	public static final NpcStringId KILL_THE_COWARD;
+	
+	/**
+	 * ID: 1000395<br>
+	 * Message: I never thought I'd use this against a novice!
+	 */
+	public static final NpcStringId I_NEVER_THOUGHT_ID_USE_THIS_AGAINST_A_NOVICE;
+	
+	/**
+	 * ID: 1000396<br>
+	 * Message: You won't take me down easily.
+	 */
+	public static final NpcStringId YOU_WONT_TAKE_ME_DOWN_EASILY;
+	
+	/**
+	 * ID: 1000397<br>
+	 * Message: The battle has just begun!
+	 */
+	public static final NpcStringId THE_BATTLE_HAS_JUST_BEGUN;
+	
+	/**
+	 * ID: 1000398<br>
+	 * Message: Kill $s1 first!
+	 */
+	public static final NpcStringId KILL_S1_FIRST;
+	
+	/**
+	 * ID: 1000399<br>
+	 * Message: Attack $s1!
+	 */
+	public static final NpcStringId ATTACK_S1;
+	
+	/**
+	 * ID: 1000400<br>
+	 * Message: Attack! Attack!
+	 */
+	public static final NpcStringId ATTACK_ATTACK;
+	
+	/**
+	 * ID: 1000401<br>
+	 * Message: Over here!
+	 */
+	public static final NpcStringId OVER_HERE;
+	
+	/**
+	 * ID: 1000402<br>
+	 * Message: Roger!
+	 */
+	public static final NpcStringId ROGER;
+	
+	/**
+	 * ID: 1000403<br>
+	 * Message: Show yourselves!
+	 */
+	public static final NpcStringId SHOW_YOURSELVES;
+	
+	/**
+	 * ID: 1000404<br>
+	 * Message: Forces of darkness! Follow me!
+	 */
+	public static final NpcStringId FORCES_OF_DARKNESS_FOLLOW_ME;
+	
+	/**
+	 * ID: 1000405<br>
+	 * Message: Destroy the enemy, my brothers!
+	 */
+	public static final NpcStringId DESTROY_THE_ENEMY_MY_BROTHERS;
+	
+	/**
+	 * ID: 1000406<br>
+	 * Message: Now the fun starts!
+	 */
+	public static final NpcStringId NOW_THE_FUN_STARTS;
+	
+	/**
+	 * ID: 1000407<br>
+	 * Message: Enough fooling around. Get ready to die!
+	 */
+	public static final NpcStringId ENOUGH_FOOLING_AROUND_GET_READY_TO_DIE;
+	
+	/**
+	 * ID: 1000408<br>
+	 * Message: You idiot! I've just been toying with you!
+	 */
+	public static final NpcStringId YOU_IDIOT_IVE_JUST_BEEN_TOYING_WITH_YOU;
+	
+	/**
+	 * ID: 1000409<br>
+	 * Message: Witness my true power!
+	 */
+	public static final NpcStringId WITNESS_MY_TRUE_POWER;
+	
+	/**
+	 * ID: 1000410<br>
+	 * Message: Now the battle begins!
+	 */
+	public static final NpcStringId NOW_THE_BATTLE_BEGINS;
+	
+	/**
+	 * ID: 1000411<br>
+	 * Message: I must admit, no one makes my blood boil quite like you do!
+	 */
+	public static final NpcStringId I_MUST_ADMIT_NO_ONE_MAKES_MY_BLOOD_BOIL_QUITE_LIKE_YOU_DO;
+	
+	/**
+	 * ID: 1000412<br>
+	 * Message: You have more skill than I thought!
+	 */
+	public static final NpcStringId YOU_HAVE_MORE_SKILL_THAN_I_THOUGHT;
+	
+	/**
+	 * ID: 1000413<br>
+	 * Message: I'll double my strength!
+	 */
+	public static final NpcStringId ILL_DOUBLE_MY_STRENGTH;
+	
+	/**
+	 * ID: 1000414<br>
+	 * Message: Prepare to die!
+	 */
+	public static final NpcStringId PREPARE_TO_DIE;
+	
+	/**
+	 * ID: 1000415<br>
+	 * Message: All is lost! Prepare to meet the goddess of death!
+	 */
+	public static final NpcStringId ALL_IS_LOST_PREPARE_TO_MEET_THE_GODDESS_OF_DEATH;
+	
+	/**
+	 * ID: 1000416<br>
+	 * Message: All is lost! The prophecy of destruction has been fulfilled!
+	 */
+	public static final NpcStringId ALL_IS_LOST_THE_PROPHECY_OF_DESTRUCTION_HAS_BEEN_FULFILLED;
+	
+	/**
+	 * ID: 1000417<br>
+	 * Message: The end of time has come! The prophecy of destruction has been fulfilled!
+	 */
+	public static final NpcStringId THE_END_OF_TIME_HAS_COME_THE_PROPHECY_OF_DESTRUCTION_HAS_BEEN_FULFILLED;
+	
+	/**
+	 * ID: 1000418<br>
+	 * Message: $s1! You bring an ill wind!
+	 */
+	public static final NpcStringId S1_YOU_BRING_AN_ILL_WIND;
+	
+	/**
+	 * ID: 1000419<br>
+	 * Message: $s1! You might as well give up!
+	 */
+	public static final NpcStringId S1_YOU_MIGHT_AS_WELL_GIVE_UP;
+	
+	/**
+	 * ID: 1000420<br>
+	 * Message: You don't have any hope! Your end has come!
+	 */
+	public static final NpcStringId YOU_DONT_HAVE_ANY_HOPE_YOUR_END_HAS_COME;
+	
+	/**
+	 * ID: 1000421<br>
+	 * Message: The prophecy of darkness has been fulfilled!
+	 */
+	public static final NpcStringId THE_PROPHECY_OF_DARKNESS_HAS_BEEN_FULFILLED;
+	
+	/**
+	 * ID: 1000422<br>
+	 * Message: As foretold in the prophecy of darkness, the era of chaos has begun!
+	 */
+	public static final NpcStringId AS_FORETOLD_IN_THE_PROPHECY_OF_DARKNESS_THE_ERA_OF_CHAOS_HAS_BEGUN;
+	
+	/**
+	 * ID: 1000423<br>
+	 * Message: The prophecy of darkness has come to pass!
+	 */
+	public static final NpcStringId THE_PROPHECY_OF_DARKNESS_HAS_COME_TO_PASS;
+	
+	/**
+	 * ID: 1000424<br>
+	 * Message: $s1! I give you the blessing of prophecy!
+	 */
+	public static final NpcStringId S1_I_GIVE_YOU_THE_BLESSING_OF_PROPHECY;
+	
+	/**
+	 * ID: 1000425<br>
+	 * Message: $s1! I bestow upon you the authority of the abyss!
+	 */
+	public static final NpcStringId S1_I_BESTOW_UPON_YOU_THE_AUTHORITY_OF_THE_ABYSS;
+	
+	/**
+	 * ID: 1000426<br>
+	 * Message: Herald of the new era, open your eyes!
+	 */
+	public static final NpcStringId HERALD_OF_THE_NEW_ERA_OPEN_YOUR_EYES;
+	
+	/**
+	 * ID: 1000427<br>
+	 * Message: Remember, kill the weaklings first!
+	 */
+	public static final NpcStringId REMEMBER_KILL_THE_WEAKLINGS_FIRST;
+	
+	/**
+	 * ID: 1000428<br>
+	 * Message: Prepare to die, maggot!
+	 */
+	public static final NpcStringId PREPARE_TO_DIE_MAGGOT;
+	
+	/**
+	 * ID: 1000429<br>
+	 * Message: That will do. Prepare to be released!
+	 */
+	public static final NpcStringId THAT_WILL_DO_PREPARE_TO_BE_RELEASED;
+	
+	/**
+	 * ID: 1000430<br>
+	 * Message: Draw
+	 */
+	public static final NpcStringId DRAW;
+	
+	/**
+	 * ID: 1000431<br>
+	 * Message: Rulers of the seal! I bring you wondrous gifts!
+	 */
+	public static final NpcStringId RULERS_OF_THE_SEAL_I_BRING_YOU_WONDROUS_GIFTS;
+	
+	/**
+	 * ID: 1000432<br>
+	 * Message: Rulers of the seal! I have some excellent weapons to show you!
+	 */
+	public static final NpcStringId RULERS_OF_THE_SEAL_I_HAVE_SOME_EXCELLENT_WEAPONS_TO_SHOW_YOU;
+	
+	/**
+	 * ID: 1000433<br>
+	 * Message: I've been so busy lately, in addition to planning my trip!
+	 */
+	public static final NpcStringId IVE_BEEN_SO_BUSY_LATELY_IN_ADDITION_TO_PLANNING_MY_TRIP;
+	
+	/**
+	 * ID: 1000434<br>
+	 * Message: Your treatment of weaklings is unforgivable!
+	 */
+	public static final NpcStringId YOUR_TREATMENT_OF_WEAKLINGS_IS_UNFORGIVABLE;
+	
+	/**
+	 * ID: 1000435<br>
+	 * Message: I'm here to help you! Hi yah!
+	 */
+	public static final NpcStringId IM_HERE_TO_HELP_YOU_HI_YAH;
+	
+	/**
+	 * ID: 1000436<br>
+	 * Message: Justice will be served!
+	 */
+	public static final NpcStringId JUSTICE_WILL_BE_SERVED;
+	
+	/**
+	 * ID: 1000437<br>
+	 * Message: On to immortal glory!
+	 */
+	public static final NpcStringId ON_TO_IMMORTAL_GLORY;
+	
+	/**
+	 * ID: 1000438<br>
+	 * Message: Justice always avenges the powerless!
+	 */
+	public static final NpcStringId JUSTICE_ALWAYS_AVENGES_THE_POWERLESS;
+	
+	/**
+	 * ID: 1000439<br>
+	 * Message: Are you hurt? Hang in there, we've almost got them!
+	 */
+	public static final NpcStringId ARE_YOU_HURT_HANG_IN_THERE_WEVE_ALMOST_GOT_THEM;
+	
+	/**
+	 * ID: 1000440<br>
+	 * Message: Why should I tell you my name, you creep!?
+	 */
+	public static final NpcStringId WHY_SHOULD_I_TELL_YOU_MY_NAME_YOU_CREEP;
+	
+	/**
+	 * ID: 1000441<br>
+	 * Message: 0 minute
+	 */
+	public static final NpcStringId N1_MINUTE;
+	
+	/**
+	 * ID: 1000443<br>
+	 * Message: The defenders of $s1 castle will be teleported to the inner castle.
+	 */
+	public static final NpcStringId THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_TO_THE_INNER_CASTLE;
+	
+	/**
+	 * ID: 1000444<br>
+	 * Message: Sunday
+	 */
+	public static final NpcStringId SUNDAY;
+	
+	/**
+	 * ID: 1000445<br>
+	 * Message: Monday
+	 */
+	public static final NpcStringId MONDAY;
+	
+	/**
+	 * ID: 1000446<br>
+	 * Message: Tuesday
+	 */
+	public static final NpcStringId TUESDAY;
+	
+	/**
+	 * ID: 1000447<br>
+	 * Message: Wednesday
+	 */
+	public static final NpcStringId WEDNESDAY;
+	
+	/**
+	 * ID: 1000448<br>
+	 * Message: Thursday
+	 */
+	public static final NpcStringId THURSDAY;
+	
+	/**
+	 * ID: 1000449<br>
+	 * Message: Friday
+	 */
+	public static final NpcStringId FRIDAY;
+	
+	/**
+	 * ID: 1000450<br>
+	 * Message: Saturday
+	 */
+	public static final NpcStringId SATURDAY;
+	
+	/**
+	 * ID: 1000451<br>
+	 * Message: Hour
+	 */
+	public static final NpcStringId HOUR;
+	
+	/**
+	 * ID: 1000452<br>
+	 * Message: It's a good day to die! Welcome to hell, maggot!
+	 */
+	public static final NpcStringId ITS_A_GOOD_DAY_TO_DIE_WELCOME_TO_HELL_MAGGOT;
+	
+	/**
+	 * ID: 1000453<br>
+	 * Message: The Festival of Darkness will end in two minutes.
+	 */
+	public static final NpcStringId THE_FESTIVAL_OF_DARKNESS_WILL_END_IN_TWO_MINUTES;
+	
+	/**
+	 * ID: 1000454<br>
+	 * Message: Noblesse Gate Pass
+	 */
+	public static final NpcStringId NOBLESSE_GATE_PASS;
+	
+	/**
+	 * ID: 1000456<br>
+	 * Message: minute(s) have passed.
+	 */
+	public static final NpcStringId MINUTES_HAVE_PASSED;
+	
+	/**
+	 * ID: 1000457<br>
+	 * Message: Game over. The teleport will appear momentarily.
+	 */
+	public static final NpcStringId GAME_OVER_THE_TELEPORT_WILL_APPEAR_MOMENTARILY;
+	
+	/**
+	 * ID: 1000458<br>
+	 * Message: You, who are like the slugs crawling on the ground. The generosity and greatness of me, Daimon the White-Eyed is endless! Ha Ha Ha!
+	 */
+	public static final NpcStringId YOU_WHO_ARE_LIKE_THE_SLUGS_CRAWLING_ON_THE_GROUND_THE_GENEROSITY_AND_GREATNESS_OF_ME_DAIMON_THE_WHITE_EYED_IS_ENDLESS_HA_HA_HA;
+	
+	/**
+	 * ID: 1000459<br>
+	 * Message: If you want to be the opponent of me, Daimon the White-Eyed, you should at least have the basic skills~!
+	 */
+	public static final NpcStringId IF_YOU_WANT_TO_BE_THE_OPPONENT_OF_ME_DAIMON_THE_WHITE_EYED_YOU_SHOULD_AT_LEAST_HAVE_THE_BASIC_SKILLS;
+	
+	/**
+	 * ID: 1000460<br>
+	 * Message: You stupid creatures that are bound to the earth. You are suffering too much while dragging your fat, heavy bodies. I, Daimon, will lighten your burden.
+	 */
+	public static final NpcStringId YOU_STUPID_CREATURES_THAT_ARE_BOUND_TO_THE_EARTH_YOU_ARE_SUFFERING_TOO_MUCH_WHILE_DRAGGING_YOUR_FAT_HEAVY_BODIES_I_DAIMON_WILL_LIGHTEN_YOUR_BURDEN;
+	
+	/**
+	 * ID: 1000461<br>
+	 * Message: A weak and stupid tribe like yours doesn't deserve to be my enemy! Bwa ha ha ha!
+	 */
+	public static final NpcStringId A_WEAK_AND_STUPID_TRIBE_LIKE_YOURS_DOESNT_DESERVE_TO_BE_MY_ENEMY_BWA_HA_HA_HA;
+	
+	/**
+	 * ID: 1000462<br>
+	 * Message: You dare to invade the territory of Daimon, the White-Eyed! Now, you will pay the price for your action!
+	 */
+	public static final NpcStringId YOU_DARE_TO_INVADE_THE_TERRITORY_OF_DAIMON_THE_WHITE_EYED_NOW_YOU_WILL_PAY_THE_PRICE_FOR_YOUR_ACTION;
+	
+	/**
+	 * ID: 1000463<br>
+	 * Message: This is the grace of Daimon the White-Eyed, the great Monster Eye Lord! Ha Ha Ha!
+	 */
+	public static final NpcStringId THIS_IS_THE_GRACE_OF_DAIMON_THE_WHITE_EYED_THE_GREAT_MONSTER_EYE_LORD_HA_HA_HA;
+	
+	/**
+	 * ID: 1000464<br>
+	 * Message: $s1! You have become a Hero of Duelists. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_DUELISTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000465<br>
+	 * Message: $s1! You have become a Hero of Dreadnoughts. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_DREADNOUGHTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000466<br>
+	 * Message: $s1! You have become a Hero of Phoenix Knights. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_PHOENIX_KNIGHTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000467<br>
+	 * Message: $s1! You have become a Hero of Hell Knights. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_HELL_KNIGHTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000468<br>
+	 * Message: $s1 You have become a Sagittarius Hero. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_SAGITTARIUS_HERO_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000469<br>
+	 * Message: $s1! You have become a Hero of Adventurers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_ADVENTURERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000470<br>
+	 * Message: $s1! You have become a Hero of Archmages. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_ARCHMAGES_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000471<br>
+	 * Message: $s1! You have become a Hero of Soultakers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_SOULTAKERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000472<br>
+	 * Message: $s1! You have become a Hero of Arcana Lords. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_ARCANA_LORDS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000473<br>
+	 * Message: $s1! You have become a Hero of Cardinals. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_CARDINALS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000474<br>
+	 * Message: $s1! You have become a Hero of Hierophants. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_HIEROPHANTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000475<br>
+	 * Message: $s1! You have become a Hero of Eva's Templars. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_EVAS_TEMPLARS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000476<br>
+	 * Message: $s1! You have become a Hero of Sword Muses. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_SWORD_MUSES_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000477<br>
+	 * Message: $s1! You have become a Hero of Wind Riders. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_WIND_RIDERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000478<br>
+	 * Message: $s1! You have become a Hero of Moonlight Sentinels. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_MOONLIGHT_SENTINELS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000479<br>
+	 * Message: $s1! You have become a Hero of Mystic Muses. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_MYSTIC_MUSES_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000480<br>
+	 * Message: $s1! You have become a Hero of Elemental Masters. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_ELEMENTAL_MASTERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000481<br>
+	 * Message: $s1! You have become a Hero of Eva's Saints. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_EVAS_SAINTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000482<br>
+	 * Message: $s1! You have become a Hero of the Shillien Templars. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_THE_SHILLIEN_TEMPLARS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000483<br>
+	 * Message: $s1! You have become a Hero of Spectral Dancers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_SPECTRAL_DANCERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000484<br>
+	 * Message: $s1! You have become a Hero of Ghost Hunters. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_GHOST_HUNTERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000485<br>
+	 * Message: $s1! You have become a Hero of Ghost Sentinels. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_GHOST_SENTINELS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000486<br>
+	 * Message: $s1! You have become a Hero of Storm Screamers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_STORM_SCREAMERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000487<br>
+	 * Message: $s1! You have become a Hero of Spectral Masters. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_SPECTRAL_MASTERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000488<br>
+	 * Message: $s1! You have become a Hero of the Shillien Saints. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_THE_SHILLIEN_SAINTS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000489<br>
+	 * Message: $s1! You have become a Hero of Titans. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_TITANS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000490<br>
+	 * Message: $s1! You have become a Hero of Grand Khavataris. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_GRAND_KHAVATARIS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000491<br>
+	 * Message: $s1! You have become a Hero of Dominators. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_DOMINATORS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000492<br>
+	 * Message: $s1! You have become a Hero of Doomcryers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_DOOMCRYERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000493<br>
+	 * Message: $s1! You have become a Hero of Fortune Seekers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_FORTUNE_SEEKERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000494<br>
+	 * Message: $s1! You have become a Hero of Maestros. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_MAESTROS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000495<br>
+	 * Message: **unregistered**
+	 */
+	public static final NpcStringId UNREGISTERED;
+	
+	/**
+	 * ID: 1000496<br>
+	 * Message: $s1! You have become a Hero of Doombringers. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_DOOMBRINGERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000497<br>
+	 * Message: $s1! You have become a Hero of Soul Hounds. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_SOUL_HOUNDS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000499<br>
+	 * Message: $s1! You have become a Hero of Tricksters. Congratulations!
+	 */
+	public static final NpcStringId S1_YOU_HAVE_BECOME_A_HERO_OF_TRICKSTERS_CONGRATULATIONS;
+	
+	/**
+	 * ID: 1000500<br>
+	 * Message: You may now enter the Sepulcher.
+	 */
+	public static final NpcStringId YOU_MAY_NOW_ENTER_THE_SEPULCHER;
+	
+	/**
+	 * ID: 1000501<br>
+	 * Message: If you place your hand on the stone statue in front of each sepulcher, you will be able to enter.
+	 */
+	public static final NpcStringId IF_YOU_PLACE_YOUR_HAND_ON_THE_STONE_STATUE_IN_FRONT_OF_EACH_SEPULCHER_YOU_WILL_BE_ABLE_TO_ENTER;
+	
+	/**
+	 * ID: 1000502<br>
+	 * Message: The monsters have spawned!
+	 */
+	public static final NpcStringId THE_MONSTERS_HAVE_SPAWNED;
+	
+	/**
+	 * ID: 1000503<br>
+	 * Message: Thank you for saving me.
+	 */
+	public static final NpcStringId THANK_YOU_FOR_SAVING_ME;
+	
+	/**
+	 * ID: 1000504<br>
+	 * Message: Fewer than $s1
+	 */
+	public static final NpcStringId FEWER_THAN_S2;
+	
+	/**
+	 * ID: 1000505<br>
+	 * Message: More than $s1
+	 */
+	public static final NpcStringId MORE_THAN_S2;
+	
+	/**
+	 * ID: 1000506<br>
+	 * Message: Point
+	 */
+	public static final NpcStringId POINT;
+	
+	/**
+	 * ID: 1000507<br>
+	 * Message: Competition
+	 */
+	public static final NpcStringId COMPETITION;
+	
+	/**
+	 * ID: 1000508<br>
+	 * Message: Seal Validation
+	 */
+	public static final NpcStringId SEAL_VALIDATION;
+	
+	/**
+	 * ID: 1000509<br>
+	 * Message: Preparation
+	 */
+	public static final NpcStringId PREPARATION;
+	
+	/**
+	 * ID: 1000512<br>
+	 * Message: No Owner
+	 */
+	public static final NpcStringId NO_OWNER;
+	
+	/**
+	 * ID: 1000513<br>
+	 * Message: This place is dangerous, $s1. Please turn back.
+	 */
+	public static final NpcStringId THIS_PLACE_IS_DANGEROUS_S1_PLEASE_TURN_BACK;
+	
+	/**
+	 * ID: 1000514<br>
+	 * Message: Who disturbs my sacred sleep?
+	 */
+	public static final NpcStringId WHO_DISTURBS_MY_SACRED_SLEEP;
+	
+	/**
+	 * ID: 1000515<br>
+	 * Message: Begone, thief! Let our bones rest in peace.
+	 */
+	public static final NpcStringId BEGONE_THIEF_LET_OUR_BONES_REST_IN_PEACE;
+	
+	/**
+	 * ID: 1000516<br>
+	 * Message: Leave us be, Hestui scum!
+	 */
+	public static final NpcStringId _LEAVE_US_BE_HESTUI_SCUM;
+	
+	/**
+	 * ID: 1000517<br>
+	 * Message: Thieving Kakai, may bloodbugs gnaw you in your sleep!
+	 */
+	public static final NpcStringId THIEVING_KAKAI_MAY_BLOODBUGS_GNAW_YOU_IN_YOUR_SLEEP;
+	
+	/**
+	 * ID: 1000518<br>
+	 * Message: Newbie Travel Token
+	 */
+	public static final NpcStringId NEWBIE_TRAVEL_TOKEN;
+	
+	/**
+	 * ID: 1000519<br>
+	 * Message: Arrogant fool! You dare to challenge me, the Ruler of Flames? Here is your reward!
+	 */
+	public static final NpcStringId ARROGANT_FOOL_YOU_DARE_TO_CHALLENGE_ME_THE_RULER_OF_FLAMES_HERE_IS_YOUR_REWARD;
+	
+	/**
+	 * ID: 1000520<br>
+	 * Message: $s1!!!! You cannot hope to defeat me with your meager strength.
+	 */
+	public static final NpcStringId S1_YOU_CANNOT_HOPE_TO_DEFEAT_ME_WITH_YOUR_MEAGER_STRENGTH;
+	
+	/**
+	 * ID: 1000521<br>
+	 * Message: Not even the gods themselves could touch me. But you, $s1, you dare challenge me?! Ignorant mortal!
+	 */
+	public static final NpcStringId NOT_EVEN_THE_GODS_THEMSELVES_COULD_TOUCH_ME_BUT_YOU_S1_YOU_DARE_CHALLENGE_ME_IGNORANT_MORTAL;
+	
+	/**
+	 * ID: 1000522<br>
+	 * Message: Requiem of Hatred
+	 */
+	public static final NpcStringId REQUIEM_OF_HATRED;
+	
+	/**
+	 * ID: 1000523<br>
+	 * Message: Fugue of Jubilation
+	 */
+	public static final NpcStringId FUGUE_OF_JUBILATION;
+	
+	/**
+	 * ID: 1000524<br>
+	 * Message: Frenetic Toccata
+	 */
+	public static final NpcStringId FRENETIC_TOCCATA;
+	
+	/**
+	 * ID: 1000525<br>
+	 * Message: Hypnotic Mazurka
+	 */
+	public static final NpcStringId HYPNOTIC_MAZURKA;
+	
+	/**
+	 * ID: 1000526<br>
+	 * Message: Mournful Chorale Prelude
+	 */
+	public static final NpcStringId MOURNFUL_CHORALE_PRELUDE;
+	
+	/**
+	 * ID: 1000527<br>
+	 * Message: Rondo of Solitude
+	 */
+	public static final NpcStringId RONDO_OF_SOLITUDE;
+	
+	/**
+	 * ID: 1000528<br>
+	 * Message: Olympiad Token
+	 */
+	public static final NpcStringId OLYMPIAD_TOKEN;
+	
+	/**
+	 * ID: 1001000<br>
+	 * Message: The Kingdom of Aden
+	 */
+	public static final NpcStringId THE_KINGDOM_OF_ADEN;
+	
+	/**
+	 * ID: 1001100<br>
+	 * Message: The Kingdom of Elmore
+	 */
+	public static final NpcStringId THE_KINGDOM_OF_ELMORE;
+	
+	/**
+	 * ID: 1010001<br>
+	 * Message: Talking Island Village
+	 */
+	public static final NpcStringId TALKING_ISLAND_VILLAGE;
+	
+	/**
+	 * ID: 1010002<br>
+	 * Message: The Elven Village
+	 */
+	public static final NpcStringId THE_ELVEN_VILLAGE;
+	
+	/**
+	 * ID: 1010003<br>
+	 * Message: The Dark Elf Village
+	 */
+	public static final NpcStringId THE_DARK_ELF_VILLAGE;
+	
+	/**
+	 * ID: 1010004<br>
+	 * Message: The Village of Gludin
+	 */
+	public static final NpcStringId THE_VILLAGE_OF_GLUDIN;
+	
+	/**
+	 * ID: 1010005<br>
+	 * Message: The Town of Gludio
+	 */
+	public static final NpcStringId THE_TOWN_OF_GLUDIO;
+	
+	/**
+	 * ID: 1010006<br>
+	 * Message: The Town of Dion
+	 */
+	public static final NpcStringId THE_TOWN_OF_DION;
+	
+	/**
+	 * ID: 1010007<br>
+	 * Message: The Town of Giran
+	 */
+	public static final NpcStringId THE_TOWN_OF_GIRAN;
+	
+	/**
+	 * ID: 1010008<br>
+	 * Message: Orc Village
+	 */
+	public static final NpcStringId ORC_VILLAGE;
+	
+	/**
+	 * ID: 1010009<br>
+	 * Message: Dwarven Village
+	 */
+	public static final NpcStringId DWARVEN_VILLAGE;
+	
+	/**
+	 * ID: 1010010<br>
+	 * Message: The Southern Part of the Dark Forest
+	 */
+	public static final NpcStringId THE_SOUTHERN_PART_OF_THE_DARK_FOREST;
+	
+	/**
+	 * ID: 1010011<br>
+	 * Message: The Northeast Coast
+	 */
+	public static final NpcStringId THE_NORTHEAST_COAST;
+	
+	/**
+	 * ID: 1010012<br>
+	 * Message: The Southern Entrance to the Wastelandss
+	 */
+	public static final NpcStringId THE_SOUTHERN_ENTRANCE_TO_THE_WASTELANDSS;
+	
+	/**
+	 * ID: 1010013<br>
+	 * Message: Town of Oren
+	 */
+	public static final NpcStringId TOWN_OF_OREN;
+	
+	/**
+	 * ID: 1010014<br>
+	 * Message: Ivory Tower
+	 */
+	public static final NpcStringId IVORY_TOWER;
+	
+	/**
+	 * ID: 1010015<br>
+	 * Message: 1st Floor Lobby
+	 */
+	public static final NpcStringId N1ST_FLOOR_LOBBY;
+	
+	/**
+	 * ID: 1010016<br>
+	 * Message: Underground Shopping Area
+	 */
+	public static final NpcStringId UNDERGROUND_SHOPPING_AREA;
+	
+	/**
+	 * ID: 1010017<br>
+	 * Message: 2nd Floor Human Wizard Guild
+	 */
+	public static final NpcStringId N2ND_FLOOR_HUMAN_WIZARD_GUILD;
+	
+	/**
+	 * ID: 1010018<br>
+	 * Message: 3rd Floor Elven Wizard Guild
+	 */
+	public static final NpcStringId N3RD_FLOOR_ELVEN_WIZARD_GUILD;
+	
+	/**
+	 * ID: 1010019<br>
+	 * Message: 4th Floor Dark Wizard Guild
+	 */
+	public static final NpcStringId N4TH_FLOOR_DARK_WIZARD_GUILD;
+	
+	/**
+	 * ID: 1010020<br>
+	 * Message: Hunters Village
+	 */
+	public static final NpcStringId HUNTERS_VILLAGE;
+	
+	/**
+	 * ID: 1010021<br>
+	 * Message: Giran Harbor
+	 */
+	public static final NpcStringId GIRAN_HARBOR;
+	
+	/**
+	 * ID: 1010022<br>
+	 * Message: Hardin's Private Academy
+	 */
+	public static final NpcStringId HARDINS_PRIVATE_ACADEMY;
+	
+	/**
+	 * ID: 1010023<br>
+	 * Message: Town of Aden
+	 */
+	public static final NpcStringId TOWN_OF_ADEN;
+	
+	/**
+	 * ID: 1010024<br>
+	 * Message: Village Square
+	 */
+	public static final NpcStringId VILLAGE_SQUARE;
+	
+	/**
+	 * ID: 1010025<br>
+	 * Message: North Gate Entrance
+	 */
+	public static final NpcStringId NORTH_GATE_ENTRANCE;
+	
+	/**
+	 * ID: 1010026<br>
+	 * Message: East Gate Entrance
+	 */
+	public static final NpcStringId EAST_GATE_ENTRANCE;
+	
+	/**
+	 * ID: 1010027<br>
+	 * Message: West Gate Entrance
+	 */
+	public static final NpcStringId WEST_GATE_ENTRANCE;
+	
+	/**
+	 * ID: 1010028<br>
+	 * Message: South Gate Entrance
+	 */
+	public static final NpcStringId SOUTH_GATE_ENTRANCE;
+	
+	/**
+	 * ID: 1010029<br>
+	 * Message: Entrance to Turek Orc Camp
+	 */
+	public static final NpcStringId ENTRANCE_TO_TUREK_ORC_CAMP;
+	
+	/**
+	 * ID: 1010030<br>
+	 * Message: Entrance to Forgotten Temple
+	 */
+	public static final NpcStringId ENTRANCE_TO_FORGOTTEN_TEMPLE;
+	
+	/**
+	 * ID: 1010031<br>
+	 * Message: Entrance to the Wastelands
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_WASTELANDS;
+	
+	/**
+	 * ID: 1010032<br>
+	 * Message: Entrance to Abandoned Camp
+	 */
+	public static final NpcStringId ENTRANCE_TO_ABANDONED_CAMP;
+	
+	/**
+	 * ID: 1010033<br>
+	 * Message: Entrance to Cruma Marshlands
+	 */
+	public static final NpcStringId ENTRANCE_TO_CRUMA_MARSHLANDS;
+	
+	/**
+	 * ID: 1010034<br>
+	 * Message: Entrance to Execution Grounds
+	 */
+	public static final NpcStringId ENTRANCE_TO_EXECUTION_GROUNDS;
+	
+	/**
+	 * ID: 1010035<br>
+	 * Message: Entrance to the Fortress of Resistance
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_FORTRESS_OF_RESISTANCE;
+	
+	/**
+	 * ID: 1010036<br>
+	 * Message: Entrance to Floran Village
+	 */
+	public static final NpcStringId ENTRANCE_TO_FLORAN_VILLAGE;
+	
+	/**
+	 * ID: 1010037<br>
+	 * Message: Neutral Zone
+	 */
+	public static final NpcStringId NEUTRAL_ZONE;
+	
+	/**
+	 * ID: 1010038<br>
+	 * Message: Western Road of Giran
+	 */
+	public static final NpcStringId WESTERN_ROAD_OF_GIRAN;
+	
+	/**
+	 * ID: 1010039<br>
+	 * Message: Eastern Road of Gludin Village
+	 */
+	public static final NpcStringId EASTERN_ROAD_OF_GLUDIN_VILLAGE;
+	
+	/**
+	 * ID: 1010041<br>
+	 * Message: Entrance to Cruma Tower
+	 */
+	public static final NpcStringId ENTRANCE_TO_CRUMA_TOWER;
+	
+	/**
+	 * ID: 1010042<br>
+	 * Message: Death Pass
+	 */
+	public static final NpcStringId DEATH_PASS;
+	
+	/**
+	 * ID: 1010043<br>
+	 * Message: Northern part of the Marshlands
+	 */
+	public static final NpcStringId NORTHERN_PART_OF_THE_MARSHLANDS;
+	
+	/**
+	 * ID: 1010044<br>
+	 * Message: Northeast of the Neutral Zone
+	 */
+	public static final NpcStringId NORTHEAST_OF_THE_NEUTRAL_ZONE;
+	
+	/**
+	 * ID: 1010045<br>
+	 * Message: Immortal Plateau, Central Region
+	 */
+	public static final NpcStringId IMMORTAL_PLATEAU_CENTRAL_REGION;
+	
+	/**
+	 * ID: 1010046<br>
+	 * Message: Immortal Plateau, Southern Region
+	 */
+	public static final NpcStringId IMMORTAL_PLATEAU_SOUTHERN_REGION;
+	
+	/**
+	 * ID: 1010047<br>
+	 * Message: Immortal Plateau, Southeast Region
+	 */
+	public static final NpcStringId IMMORTAL_PLATEAU_SOUTHEAST_REGION;
+	
+	/**
+	 * ID: 1010048<br>
+	 * Message: Frozen Waterfall
+	 */
+	public static final NpcStringId FROZEN_WATERFALL;
+	
+	/**
+	 * ID: 1010049<br>
+	 * Message: Heine
+	 */
+	public static final NpcStringId HEINE;
+	
+	/**
+	 * ID: 1010050<br>
+	 * Message: Tower of Insolence - 1st Floor
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE_1ST_FLOOR;
+	
+	/**
+	 * ID: 1010051<br>
+	 * Message: Tower of Insolence - 5th Floor
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE_5TH_FLOOR;
+	
+	/**
+	 * ID: 1010052<br>
+	 * Message: Tower of Insolence - 10th Floor
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE_10TH_FLOOR;
+	
+	/**
+	 * ID: 1010053<br>
+	 * Message: Coliseum
+	 */
+	public static final NpcStringId COLISEUM;
+	
+	/**
+	 * ID: 1010054<br>
+	 * Message: Monster Derby
+	 */
+	public static final NpcStringId MONSTER_DERBY;
+	
+	/**
+	 * ID: 1010055<br>
+	 * Message: Near the frontier post
+	 */
+	public static final NpcStringId NEAR_THE_FRONTIER_POST;
+	
+	/**
+	 * ID: 1010056<br>
+	 * Message: Entrance to the Sea of Spores
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_SEA_OF_SPORES;
+	
+	/**
+	 * ID: 1010057<br>
+	 * Message: An old battlefield
+	 */
+	public static final NpcStringId AN_OLD_BATTLEFIELD;
+	
+	/**
+	 * ID: 1010058<br>
+	 * Message: Entrance to Enchanted Valley
+	 */
+	public static final NpcStringId ENTRANCE_TO_ENCHANTED_VALLEY;
+	
+	/**
+	 * ID: 1010059<br>
+	 * Message: Entrance to the Tower of Insolence
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_TOWER_OF_INSOLENCE;
+	
+	/**
+	 * ID: 1010060<br>
+	 * Message: Blazing Swamp
+	 */
+	public static final NpcStringId BLAZING_SWAMP;
+	
+	/**
+	 * ID: 1010061<br>
+	 * Message: Entrance to the Cemetery
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_CEMETERY;
+	
+	/**
+	 * ID: 1010062<br>
+	 * Message: Entrance to The Giant's Cave
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_GIANTS_CAVE;
+	
+	/**
+	 * ID: 1010063<br>
+	 * Message: Entrance to the Forest of Mirrors
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_FOREST_OF_MIRRORS;
+	
+	/**
+	 * ID: 1010064<br>
+	 * Message: The Forbidden Gateway
+	 */
+	public static final NpcStringId THE_FORBIDDEN_GATEWAY;
+	
+	/**
+	 * ID: 1010066<br>
+	 * Message: Entrance to the Tanor Silenos Barracks
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_TANOR_SILENOS_BARRACKS;
+	
+	/**
+	 * ID: 1010067<br>
+	 * Message: Dragon Valley
+	 */
+	public static final NpcStringId DRAGON_VALLEY;
+	
+	/**
+	 * ID: 1010068<br>
+	 * Message: Oracle of Dawn
+	 */
+	public static final NpcStringId ORACLE_OF_DAWN;
+	
+	/**
+	 * ID: 1010069<br>
+	 * Message: Oracle of Dusk
+	 */
+	public static final NpcStringId ORACLE_OF_DUSK;
+	
+	/**
+	 * ID: 1010070<br>
+	 * Message: Necropolis of Sacrifice
+	 */
+	public static final NpcStringId NECROPOLIS_OF_SACRIFICE;
+	
+	/**
+	 * ID: 1010071<br>
+	 * Message: The Pilgrim's Necropolis
+	 */
+	public static final NpcStringId THE_PILGRIMS_NECROPOLIS;
+	
+	/**
+	 * ID: 1010072<br>
+	 * Message: Necropolis of Worship
+	 */
+	public static final NpcStringId NECROPOLIS_OF_WORSHIP;
+	
+	/**
+	 * ID: 1010073<br>
+	 * Message: The Patriot's Necropolis
+	 */
+	public static final NpcStringId THE_PATRIOTS_NECROPOLIS;
+	
+	/**
+	 * ID: 1010074<br>
+	 * Message: Necropolis of Devotion
+	 */
+	public static final NpcStringId NECROPOLIS_OF_DEVOTION;
+	
+	/**
+	 * ID: 1010075<br>
+	 * Message: Necropolis of Martyrdom
+	 */
+	public static final NpcStringId NECROPOLIS_OF_MARTYRDOM;
+	
+	/**
+	 * ID: 1010076<br>
+	 * Message: The Disciple's Necropolis
+	 */
+	public static final NpcStringId THE_DISCIPLES_NECROPOLIS;
+	
+	/**
+	 * ID: 1010077<br>
+	 * Message: The Saint's Necropolis
+	 */
+	public static final NpcStringId THE_SAINTS_NECROPOLIS;
+	
+	/**
+	 * ID: 1010078<br>
+	 * Message: The Catacomb of the Heretic
+	 */
+	public static final NpcStringId THE_CATACOMB_OF_THE_HERETIC;
+	
+	/**
+	 * ID: 1010079<br>
+	 * Message: Catacomb of the Branded
+	 */
+	public static final NpcStringId CATACOMB_OF_THE_BRANDED;
+	
+	/**
+	 * ID: 1010080<br>
+	 * Message: Catacomb of the Apostate
+	 */
+	public static final NpcStringId CATACOMB_OF_THE_APOSTATE;
+	
+	/**
+	 * ID: 1010081<br>
+	 * Message: Catacomb of the Witch
+	 */
+	public static final NpcStringId CATACOMB_OF_THE_WITCH;
+	
+	/**
+	 * ID: 1010082<br>
+	 * Message: Catacomb of Dark Omens
+	 */
+	public static final NpcStringId CATACOMB_OF_DARK_OMENS;
+	
+	/**
+	 * ID: 1010083<br>
+	 * Message: Catacomb of the Forbidden Path
+	 */
+	public static final NpcStringId CATACOMB_OF_THE_FORBIDDEN_PATH;
+	
+	/**
+	 * ID: 1010084<br>
+	 * Message: Entrance to the Ruins of Agony
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_RUINS_OF_AGONY;
+	
+	/**
+	 * ID: 1010085<br>
+	 * Message: Entrance to the Ruins of Despair
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_RUINS_OF_DESPAIR;
+	
+	/**
+	 * ID: 1010086<br>
+	 * Message: Entrance to the Ant Nest
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_ANT_NEST;
+	
+	/**
+	 * ID: 1010087<br>
+	 * Message: Southern Dion
+	 */
+	public static final NpcStringId SOUTHERN_DION;
+	
+	/**
+	 * ID: 1010088<br>
+	 * Message: Entrance to Dragon Valley
+	 */
+	public static final NpcStringId ENTRANCE_TO_DRAGON_VALLEY;
+	
+	/**
+	 * ID: 1010089<br>
+	 * Message: Field of Silence
+	 */
+	public static final NpcStringId FIELD_OF_SILENCE;
+	
+	/**
+	 * ID: 1010090<br>
+	 * Message: Field of Whispers
+	 */
+	public static final NpcStringId FIELD_OF_WHISPERS;
+	
+	/**
+	 * ID: 1010091<br>
+	 * Message: Entrance to Alligator Island
+	 */
+	public static final NpcStringId ENTRANCE_TO_ALLIGATOR_ISLAND;
+	
+	/**
+	 * ID: 1010092<br>
+	 * Message: Southern Plain of Oren
+	 */
+	public static final NpcStringId SOUTHERN_PLAIN_OF_OREN;
+	
+	/**
+	 * ID: 1010093<br>
+	 * Message: Entrance to the Bandit Stronghold
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_BANDIT_STRONGHOLD;
+	
+	/**
+	 * ID: 1010094<br>
+	 * Message: Windy Hill
+	 */
+	public static final NpcStringId WINDY_HILL;
+	
+	/**
+	 * ID: 1010095<br>
+	 * Message: Orc Barracks
+	 */
+	public static final NpcStringId ORC_BARRACKS;
+	
+	/**
+	 * ID: 1010096<br>
+	 * Message: Fellmere Harvesting Grounds
+	 */
+	public static final NpcStringId FELLMERE_HARVESTING_GROUNDS;
+	
+	/**
+	 * ID: 1010097<br>
+	 * Message: Ruins of Agony
+	 */
+	public static final NpcStringId RUINS_OF_AGONY;
+	
+	/**
+	 * ID: 1010098<br>
+	 * Message: Abandoned Camp
+	 */
+	public static final NpcStringId ABANDONED_CAMP;
+	
+	/**
+	 * ID: 1010099<br>
+	 * Message: Red Rock Ridge
+	 */
+	public static final NpcStringId RED_ROCK_RIDGE;
+	
+	/**
+	 * ID: 1010100<br>
+	 * Message: Langk Lizardman Dwellings
+	 */
+	public static final NpcStringId LANGK_LIZARDMAN_DWELLINGS;
+	
+	/**
+	 * ID: 1010101<br>
+	 * Message: Ruins of Despair
+	 */
+	public static final NpcStringId RUINS_OF_DESPAIR;
+	
+	/**
+	 * ID: 1010102<br>
+	 * Message: Windawood Manor
+	 */
+	public static final NpcStringId WINDAWOOD_MANOR;
+	
+	/**
+	 * ID: 1010103<br>
+	 * Message: Northern Pathway to the Wastelands
+	 */
+	public static final NpcStringId NORTHERN_PATHWAY_TO_THE_WASTELANDS;
+	
+	/**
+	 * ID: 1010104<br>
+	 * Message: Western Pathway to the Wastelands
+	 */
+	public static final NpcStringId WESTERN_PATHWAY_TO_THE_WASTELANDS;
+	
+	/**
+	 * ID: 1010105<br>
+	 * Message: Southern Pathway to the Wastelands
+	 */
+	public static final NpcStringId SOUTHERN_PATHWAY_TO_THE_WASTELANDS;
+	
+	/**
+	 * ID: 1010106<br>
+	 * Message: Forgotten Temple
+	 */
+	public static final NpcStringId FORGOTTEN_TEMPLE;
+	
+	/**
+	 * ID: 1010107<br>
+	 * Message: South Entrance of Ant Nest
+	 */
+	public static final NpcStringId SOUTH_ENTRANCE_OF_ANT_NEST;
+	
+	/**
+	 * ID: 1010108<br>
+	 * Message: East Entrance of Ant Nest
+	 */
+	public static final NpcStringId EAST_ENTRANCE_OF_ANT_NEST;
+	
+	/**
+	 * ID: 1010109<br>
+	 * Message: West Entrance of Ant Nest
+	 */
+	public static final NpcStringId WEST_ENTRANCE_OF_ANT_NEST;
+	
+	/**
+	 * ID: 1010110<br>
+	 * Message: Cruma Marshland
+	 */
+	public static final NpcStringId CRUMA_MARSHLAND;
+	
+	/**
+	 * ID: 1010111<br>
+	 * Message: Plains of Dion
+	 */
+	public static final NpcStringId PLAINS_OF_DION;
+	
+	/**
+	 * ID: 1010112<br>
+	 * Message: Bee Hive
+	 */
+	public static final NpcStringId BEE_HIVE;
+	
+	/**
+	 * ID: 1010113<br>
+	 * Message: Fortress of Resistance
+	 */
+	public static final NpcStringId FORTRESS_OF_RESISTANCE;
+	
+	/**
+	 * ID: 1010114<br>
+	 * Message: Execution Grounds
+	 */
+	public static final NpcStringId EXECUTION_GROUNDS;
+	
+	/**
+	 * ID: 1010115<br>
+	 * Message: Tanor Canyon
+	 */
+	public static final NpcStringId TANOR_CANYON;
+	
+	/**
+	 * ID: 1010116<br>
+	 * Message: Cruma Tower
+	 */
+	public static final NpcStringId CRUMA_TOWER;
+	
+	/**
+	 * ID: 1010117<br>
+	 * Message: Three-way crossroads at Dragon Valley
+	 */
+	public static final NpcStringId THREE_WAY_CROSSROADS_AT_DRAGON_VALLEY;
+	
+	/**
+	 * ID: 1010118<br>
+	 * Message: Breka's Stronghold
+	 */
+	public static final NpcStringId BREKAS_STRONGHOLD;
+	
+	/**
+	 * ID: 1010119<br>
+	 * Message: Gorgon Flower Garden
+	 */
+	public static final NpcStringId GORGON_FLOWER_GARDEN;
+	
+	/**
+	 * ID: 1010120<br>
+	 * Message: Antharas's Lair
+	 */
+	public static final NpcStringId ANTHARASS_LAIR;
+	
+	/**
+	 * ID: 1010121<br>
+	 * Message: Sea of Spores
+	 */
+	public static final NpcStringId SEA_OF_SPORES;
+	
+	/**
+	 * ID: 1010122<br>
+	 * Message: Outlaw Forest
+	 */
+	public static final NpcStringId OUTLAW_FOREST;
+	
+	/**
+	 * ID: 1010123<br>
+	 * Message: Forest of Evil and the Ivory Tower
+	 */
+	public static final NpcStringId FOREST_OF_EVIL_AND_THE_IVORY_TOWER;
+	
+	/**
+	 * ID: 1010124<br>
+	 * Message: Timak Outpost
+	 */
+	public static final NpcStringId TIMAK_OUTPOST;
+	
+	/**
+	 * ID: 1010125<br>
+	 * Message: Great Plains of Oren
+	 */
+	public static final NpcStringId GREAT_PLAINS_OF_OREN;
+	
+	/**
+	 * ID: 1010126<br>
+	 * Message: Alchemist's Hut
+	 */
+	public static final NpcStringId ALCHEMISTS_HUT;
+	
+	/**
+	 * ID: 1010127<br>
+	 * Message: Ancient Battleground
+	 */
+	public static final NpcStringId ANCIENT_BATTLEGROUND;
+	
+	/**
+	 * ID: 1010128<br>
+	 * Message: Northern Pathway of the Enchanted Valley
+	 */
+	public static final NpcStringId NORTHERN_PATHWAY_OF_THE_ENCHANTED_VALLEY;
+	
+	/**
+	 * ID: 1010129<br>
+	 * Message: Southern Pathway of the Enchanted Valley
+	 */
+	public static final NpcStringId SOUTHERN_PATHWAY_OF_THE_ENCHANTED_VALLEY;
+	
+	/**
+	 * ID: 1010130<br>
+	 * Message: Hunters Valley
+	 */
+	public static final NpcStringId HUNTERS_VALLEY;
+	
+	/**
+	 * ID: 1010131<br>
+	 * Message: Western Entrance of Blazing Swamp
+	 */
+	public static final NpcStringId WESTERN_ENTRANCE_OF_BLAZING_SWAMP;
+	
+	/**
+	 * ID: 1010132<br>
+	 * Message: Eastern Entrance of Blazing Swamp
+	 */
+	public static final NpcStringId EASTERN_ENTRANCE_OF_BLAZING_SWAMP;
+	
+	/**
+	 * ID: 1010133<br>
+	 * Message: Plains of Glory
+	 */
+	public static final NpcStringId PLAINS_OF_GLORY;
+	
+	/**
+	 * ID: 1010134<br>
+	 * Message: War-Torn Plains
+	 */
+	public static final NpcStringId WAR_TORN_PLAINS;
+	
+	/**
+	 * ID: 1010135<br>
+	 * Message: Northwestern Passage to the Forest of Mirrors
+	 */
+	public static final NpcStringId NORTHWESTERN_PASSAGE_TO_THE_FOREST_OF_MIRRORS;
+	
+	/**
+	 * ID: 1010136<br>
+	 * Message: The Front of Anghel Waterfall
+	 */
+	public static final NpcStringId THE_FRONT_OF_ANGHEL_WATERFALL;
+	
+	/**
+	 * ID: 1010137<br>
+	 * Message: South Entrance of Devastated Castle
+	 */
+	public static final NpcStringId SOUTH_ENTRANCE_OF_DEVASTATED_CASTLE;
+	
+	/**
+	 * ID: 1010138<br>
+	 * Message: North Entrance of Devastated Castle
+	 */
+	public static final NpcStringId NORTH_ENTRANCE_OF_DEVASTATED_CASTLE;
+	
+	/**
+	 * ID: 1010139<br>
+	 * Message: North Entrance of the Cemetery
+	 */
+	public static final NpcStringId NORTH_ENTRANCE_OF_THE_CEMETERY;
+	
+	/**
+	 * ID: 1010140<br>
+	 * Message: South Entrance of the Cemetery
+	 */
+	public static final NpcStringId SOUTH_ENTRANCE_OF_THE_CEMETERY;
+	
+	/**
+	 * ID: 1010141<br>
+	 * Message: West Entrance of the Cemetery
+	 */
+	public static final NpcStringId WEST_ENTRANCE_OF_THE_CEMETERY;
+	
+	/**
+	 * ID: 1010142<br>
+	 * Message: Entrance of the Forbidden Gateway
+	 */
+	public static final NpcStringId ENTRANCE_OF_THE_FORBIDDEN_GATEWAY;
+	
+	/**
+	 * ID: 1010143<br>
+	 * Message: Forsaken Plains
+	 */
+	public static final NpcStringId FORSAKEN_PLAINS;
+	
+	/**
+	 * ID: 1010144<br>
+	 * Message: Tower of Insolence
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE;
+	
+	/**
+	 * ID: 1010145<br>
+	 * Message: The Giant's Cave
+	 */
+	public static final NpcStringId THE_GIANTS_CAVE;
+	
+	/**
+	 * ID: 1010146<br>
+	 * Message: Northern Part of the Field of Silence
+	 */
+	public static final NpcStringId NORTHERN_PART_OF_THE_FIELD_OF_SILENCE;
+	
+	/**
+	 * ID: 1010147<br>
+	 * Message: Western Part of the Field of Silence
+	 */
+	public static final NpcStringId WESTERN_PART_OF_THE_FIELD_OF_SILENCE;
+	
+	/**
+	 * ID: 1010148<br>
+	 * Message: Eastern Part of the Field of Silence
+	 */
+	public static final NpcStringId EASTERN_PART_OF_THE_FIELD_OF_SILENCE;
+	
+	/**
+	 * ID: 1010149<br>
+	 * Message: Western Part of the Field of Whispers
+	 */
+	public static final NpcStringId WESTERN_PART_OF_THE_FIELD_OF_WHISPERS;
+	
+	/**
+	 * ID: 1010150<br>
+	 * Message: Alligator Island
+	 */
+	public static final NpcStringId ALLIGATOR_ISLAND;
+	
+	/**
+	 * ID: 1010151<br>
+	 * Message: Alligator Beach
+	 */
+	public static final NpcStringId ALLIGATOR_BEACH;
+	
+	/**
+	 * ID: 1010152<br>
+	 * Message: Devil's Isle
+	 */
+	public static final NpcStringId DEVILS_ISLE;
+	
+	/**
+	 * ID: 1010153<br>
+	 * Message: Garden of Eva
+	 */
+	public static final NpcStringId GARDEN_OF_EVA;
+	
+	/**
+	 * ID: 1010154<br>
+	 * Message: Talking Island
+	 */
+	public static final NpcStringId TALKING_ISLAND;
+	
+	/**
+	 * ID: 1010155<br>
+	 * Message: Elven Village
+	 */
+	public static final NpcStringId ELVEN_VILLAGE;
+	
+	/**
+	 * ID: 1010156<br>
+	 * Message: Dark Elf Village
+	 */
+	public static final NpcStringId DARK_ELF_VILLAGE;
+	
+	/**
+	 * ID: 1010159<br>
+	 * Message: Scenic Deck of Iris Lake
+	 */
+	public static final NpcStringId SCENIC_DECK_OF_IRIS_LAKE;
+	
+	/**
+	 * ID: 1010160<br>
+	 * Message: Altar of Rites
+	 */
+	public static final NpcStringId ALTAR_OF_RITES;
+	
+	/**
+	 * ID: 1010161<br>
+	 * Message: Dark Forest, Waterfall
+	 */
+	public static final NpcStringId DARK_FOREST_WATERFALL;
+	
+	/**
+	 * ID: 1010162<br>
+	 * Message: Three-way Crossroads of the Neutral Zone
+	 */
+	public static final NpcStringId THREE_WAY_CROSSROADS_OF_THE_NEUTRAL_ZONE;
+	
+	/**
+	 * ID: 1010163<br>
+	 * Message: Dark Forest
+	 */
+	public static final NpcStringId DARK_FOREST;
+	
+	/**
+	 * ID: 1010164<br>
+	 * Message: Swampland
+	 */
+	public static final NpcStringId SWAMPLAND;
+	
+	/**
+	 * ID: 1010165<br>
+	 * Message: Black Rock Hill
+	 */
+	public static final NpcStringId BLACK_ROCK_HILL;
+	
+	/**
+	 * ID: 1010166<br>
+	 * Message: Spider Nest
+	 */
+	public static final NpcStringId SPIDER_NEST;
+	
+	/**
+	 * ID: 1010167<br>
+	 * Message: Elven Forest
+	 */
+	public static final NpcStringId ELVEN_FOREST;
+	
+	/**
+	 * ID: 1010168<br>
+	 * Message: Obelisk of Victory
+	 */
+	public static final NpcStringId OBELISK_OF_VICTORY;
+	
+	/**
+	 * ID: 1010169<br>
+	 * Message: Northern Territory of Talking Island
+	 */
+	public static final NpcStringId NORTHERN_TERRITORY_OF_TALKING_ISLAND;
+	
+	/**
+	 * ID: 1010170<br>
+	 * Message: Southern Territory of Talking Island
+	 */
+	public static final NpcStringId SOUTHERN_TERRITORY_OF_TALKING_ISLAND;
+	
+	/**
+	 * ID: 1010171<br>
+	 * Message: Evil Hunting Grounds
+	 */
+	public static final NpcStringId EVIL_HUNTING_GROUNDS;
+	
+	/**
+	 * ID: 1010172<br>
+	 * Message: Maille Lizardmen Barracks
+	 */
+	public static final NpcStringId MAILLE_LIZARDMEN_BARRACKS;
+	
+	/**
+	 * ID: 1010173<br>
+	 * Message: Ruins of Agony Bend
+	 */
+	public static final NpcStringId RUINS_OF_AGONY_BEND;
+	
+	/**
+	 * ID: 1010174<br>
+	 * Message: The Entrance to the Ruins of Despair
+	 */
+	public static final NpcStringId THE_ENTRANCE_TO_THE_RUINS_OF_DESPAIR;
+	
+	/**
+	 * ID: 1010175<br>
+	 * Message: Windmill Hill
+	 */
+	public static final NpcStringId WINDMILL_HILL;
+	
+	/**
+	 * ID: 1010177<br>
+	 * Message: Floran Agricultural Area
+	 */
+	public static final NpcStringId FLORAN_AGRICULTURAL_AREA;
+	
+	/**
+	 * ID: 1010178<br>
+	 * Message: Western Tanor Canyon
+	 */
+	public static final NpcStringId WESTERN_TANOR_CANYON;
+	
+	/**
+	 * ID: 1010179<br>
+	 * Message: Plains of the Lizardmen
+	 */
+	public static final NpcStringId PLAINS_OF_THE_LIZARDMEN;
+	
+	/**
+	 * ID: 1010180<br>
+	 * Message: Forest of Evil
+	 */
+	public static final NpcStringId FOREST_OF_EVIL;
+	
+	/**
+	 * ID: 1010181<br>
+	 * Message: Fields of Massacre
+	 */
+	public static final NpcStringId FIELDS_OF_MASSACRE;
+	
+	/**
+	 * ID: 1010182<br>
+	 * Message: Silent Valley
+	 */
+	public static final NpcStringId SILENT_VALLEY;
+	
+	/**
+	 * ID: 1010183<br>
+	 * Message: Northern Area of the Immortal Plateau, Northern Region
+	 */
+	public static final NpcStringId NORTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_NORTHERN_REGION;
+	
+	/**
+	 * ID: 1010184<br>
+	 * Message: Southern Area of the Immortal Plateau, Northern Region
+	 */
+	public static final NpcStringId SOUTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_NORTHERN_REGION;
+	
+	/**
+	 * ID: 1010185<br>
+	 * Message: Northern Area of the Immortal Plateau, Southern Region
+	 */
+	public static final NpcStringId NORTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_SOUTHERN_REGION;
+	
+	/**
+	 * ID: 1010186<br>
+	 * Message: Southern Area of the Immortal Plateau, Southern Region
+	 */
+	public static final NpcStringId SOUTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_SOUTHERN_REGION;
+	
+	/**
+	 * ID: 1010187<br>
+	 * Message: Western Mining Zone
+	 */
+	public static final NpcStringId WESTERN_MINING_ZONE;
+	
+	/**
+	 * ID: 1010190<br>
+	 * Message: Entrance to the Abandoned Coal Mines
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_ABANDONED_COAL_MINES;
+	
+	/**
+	 * ID: 1010191<br>
+	 * Message: Entrance to the Mithril Mines
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_MITHRIL_MINES;
+	
+	/**
+	 * ID: 1010192<br>
+	 * Message: West Area of the Devastated Castle
+	 */
+	public static final NpcStringId WEST_AREA_OF_THE_DEVASTATED_CASTLE;
+	
+	/**
+	 * ID: 1010193<br>
+	 * Message: Tower of Insolence, 3rd Floor
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE_3RD_FLOOR;
+	
+	/**
+	 * ID: 1010195<br>
+	 * Message: Tower of Insolence, 7th Floor
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE_7TH_FLOOR;
+	
+	/**
+	 * ID: 1010197<br>
+	 * Message: Tower of Insolence, 13th Floor
+	 */
+	public static final NpcStringId TOWER_OF_INSOLENCE_13TH_FLOOR;
+	
+	/**
+	 * ID: 1010199<br>
+	 * Message: Town of Goddard
+	 */
+	public static final NpcStringId TOWN_OF_GODDARD;
+	
+	/**
+	 * ID: 1010200<br>
+	 * Message: Rune Township
+	 */
+	public static final NpcStringId RUNE_TOWNSHIP;
+	
+	/**
+	 * ID: 1010201<br>
+	 * Message: A delivery for Mr. Lector? Very good!
+	 */
+	public static final NpcStringId A_DELIVERY_FOR_MR_LECTOR_VERY_GOOD;
+	
+	/**
+	 * ID: 1010202<br>
+	 * Message: I need a break!
+	 */
+	public static final NpcStringId I_NEED_A_BREAK;
+	
+	/**
+	 * ID: 1010203<br>
+	 * Message: Hello, Mr. Lector! Long time no see, Mr. Jackson!
+	 */
+	public static final NpcStringId HELLO_MR_LECTOR_LONG_TIME_NO_SEE_MR_JACKSON;
+	
+	/**
+	 * ID: 1010204<br>
+	 * Message: Lulu!
+	 */
+	public static final NpcStringId LULU;
+	
+	/**
+	 * ID: 1010205<br>
+	 * Message: Where has he gone?
+	 */
+	public static final NpcStringId WHERE_HAS_HE_GONE;
+	
+	/**
+	 * ID: 1010206<br>
+	 * Message: Have you seen Windawood?
+	 */
+	public static final NpcStringId HAVE_YOU_SEEN_WINDAWOOD;
+	
+	/**
+	 * ID: 1010207<br>
+	 * Message: Where did he go?
+	 */
+	public static final NpcStringId WHERE_DID_HE_GO;
+	
+	/**
+	 * ID: 1010208<br>
+	 * Message: The Mother Tree is slowly dying.
+	 */
+	public static final NpcStringId THE_MOTHER_TREE_IS_SLOWLY_DYING;
+	
+	/**
+	 * ID: 1010209<br>
+	 * Message: How can we save the Mother Tree?
+	 */
+	public static final NpcStringId HOW_CAN_WE_SAVE_THE_MOTHER_TREE;
+	
+	/**
+	 * ID: 1010210<br>
+	 * Message: The Mother Tree is always so gorgeous!
+	 */
+	public static final NpcStringId THE_MOTHER_TREE_IS_ALWAYS_SO_GORGEOUS;
+	
+	/**
+	 * ID: 1010211<br>
+	 * Message: Lady Mirabel, may the peace of the lake be with you!
+	 */
+	public static final NpcStringId LADY_MIRABEL_MAY_THE_PEACE_OF_THE_LAKE_BE_WITH_YOU;
+	
+	/**
+	 * ID: 1010212<br>
+	 * Message: You're a hard worker, Rayla!
+	 */
+	public static final NpcStringId YOURE_A_HARD_WORKER_RAYLA;
+	
+	/**
+	 * ID: 1010213<br>
+	 * Message: You're a hard worker!
+	 */
+	public static final NpcStringId YOURE_A_HARD_WORKER;
+	
+	/**
+	 * ID: 1010214<br>
+	 * Message: The mass of darkness will start in a couple of days. Pay more attention to the guard!
+	 */
+	public static final NpcStringId THE_MASS_OF_DARKNESS_WILL_START_IN_A_COUPLE_OF_DAYS_PAY_MORE_ATTENTION_TO_THE_GUARD;
+	
+	/**
+	 * ID: 1010215<br>
+	 * Message: Have you seen Torocco today?
+	 */
+	public static final NpcStringId HAVE_YOU_SEEN_TOROCCO_TODAY;
+	
+	/**
+	 * ID: 1010216<br>
+	 * Message: Have you seen Torocco?
+	 */
+	public static final NpcStringId HAVE_YOU_SEEN_TOROCCO;
+	
+	/**
+	 * ID: 1010217<br>
+	 * Message: Where is that fool hiding?
+	 */
+	public static final NpcStringId WHERE_IS_THAT_FOOL_HIDING;
+	
+	/**
+	 * ID: 1010218<br>
+	 * Message: Care to go a round?
+	 */
+	public static final NpcStringId CARE_TO_GO_A_ROUND;
+	
+	/**
+	 * ID: 1010219<br>
+	 * Message: Have a nice day, Mr. Garita and Mion!
+	 */
+	public static final NpcStringId HAVE_A_NICE_DAY_MR_GARITA_AND_MION;
+	
+	/**
+	 * ID: 1010220<br>
+	 * Message: Mr. Lid, Murdoc, and Airy! How are you doing?
+	 */
+	public static final NpcStringId MR_LID_MURDOC_AND_AIRY_HOW_ARE_YOU_DOING;
+	
+	/**
+	 * ID: 1010221<br>
+	 * Message: A black moon... Now do you understand that he has opened his eyes?
+	 */
+	public static final NpcStringId A_BLACK_MOON_NOW_DO_YOU_UNDERSTAND_THAT_HE_HAS_OPENED_HIS_EYES;
+	
+	/**
+	 * ID: 1010222<br>
+	 * Message: Clouds of blood are gathering. Soon, it will start to rain. The rain of crimson blood...
+	 */
+	public static final NpcStringId CLOUDS_OF_BLOOD_ARE_GATHERING_SOON_IT_WILL_START_TO_RAIN_THE_RAIN_OF_CRIMSON_BLOOD;
+	
+	/**
+	 * ID: 1010223<br>
+	 * Message: While the foolish light was asleep, the darkness will awaken first. Uh huh huh...
+	 */
+	public static final NpcStringId WHILE_THE_FOOLISH_LIGHT_WAS_ASLEEP_THE_DARKNESS_WILL_AWAKEN_FIRST_UH_HUH_HUH;
+	
+	/**
+	 * ID: 1010224<br>
+	 * Message: It is the deepest darkness. With its arrival, the world will soon die.
+	 */
+	public static final NpcStringId IT_IS_THE_DEEPEST_DARKNESS_WITH_ITS_ARRIVAL_THE_WORLD_WILL_SOON_DIE;
+	
+	/**
+	 * ID: 1010225<br>
+	 * Message: Death is just a new beginning. Huhu... Fear not.
+	 */
+	public static final NpcStringId DEATH_IS_JUST_A_NEW_BEGINNING_HUHU_FEAR_NOT;
+	
+	/**
+	 * ID: 1010226<br>
+	 * Message: Ahh! Beautiful goddess of death! Cover over the filth of this world with your darkness!
+	 */
+	public static final NpcStringId AHH_BEAUTIFUL_GODDESS_OF_DEATH_COVER_OVER_THE_FILTH_OF_THIS_WORLD_WITH_YOUR_DARKNESS;
+	
+	/**
+	 * ID: 1010227<br>
+	 * Message: The goddess's resurrection has already begun. Huhu... Insignificant creatures like you can do nothing!
+	 */
+	public static final NpcStringId THE_GODDESSS_RESURRECTION_HAS_ALREADY_BEGUN_HUHU_INSIGNIFICANT_CREATURES_LIKE_YOU_CAN_DO_NOTHING;
+	
+	/**
+	 * ID: 1010400<br>
+	 * Message: Croak, Croak! Food like $s1 in this place?!
+	 */
+	public static final NpcStringId CROAK_CROAK_FOOD_LIKE_S1_IN_THIS_PLACE;
+	
+	/**
+	 * ID: 1010401<br>
+	 * Message: $s1, How lucky I am!
+	 */
+	public static final NpcStringId S1_HOW_LUCKY_I_AM;
+	
+	/**
+	 * ID: 1010402<br>
+	 * Message: Pray that you caught a wrong fish $s1!
+	 */
+	public static final NpcStringId PRAY_THAT_YOU_CAUGHT_A_WRONG_FISH_S1;
+	
+	/**
+	 * ID: 1010403<br>
+	 * Message: Do you know what a frog tastes like?
+	 */
+	public static final NpcStringId DO_YOU_KNOW_WHAT_A_FROG_TASTES_LIKE;
+	
+	/**
+	 * ID: 1010404<br>
+	 * Message: I will show you the power of a frog!
+	 */
+	public static final NpcStringId I_WILL_SHOW_YOU_THE_POWER_OF_A_FROG;
+	
+	/**
+	 * ID: 1010405<br>
+	 * Message: I will swallow at a mouthful!
+	 */
+	public static final NpcStringId I_WILL_SWALLOW_AT_A_MOUTHFUL;
+	
+	/**
+	 * ID: 1010406<br>
+	 * Message: Ugh, no chance. How could this elder pass away like this!
+	 */
+	public static final NpcStringId UGH_NO_CHANCE_HOW_COULD_THIS_ELDER_PASS_AWAY_LIKE_THIS;
+	
+	/**
+	 * ID: 1010407<br>
+	 * Message: Croak! Croak! A frog is dying!
+	 */
+	public static final NpcStringId CROAK_CROAK_A_FROG_IS_DYING;
+	
+	/**
+	 * ID: 1010408<br>
+	 * Message: A frog tastes bad! Yuck!
+	 */
+	public static final NpcStringId A_FROG_TASTES_BAD_YUCK;
+	
+	/**
+	 * ID: 1010409<br>
+	 * Message: Kaak! $s1, What are you doing now?
+	 */
+	public static final NpcStringId KAAK_S1_WHAT_ARE_YOU_DOING_NOW;
+	
+	/**
+	 * ID: 1010410<br>
+	 * Message: Huh, $s1 You pierced into the body of the Spirit with a needle. Are you ready?
+	 */
+	public static final NpcStringId HUH_S1_YOU_PIERCED_INTO_THE_BODY_OF_THE_SPIRIT_WITH_A_NEEDLE_ARE_YOU_READY;
+	
+	/**
+	 * ID: 1010411<br>
+	 * Message: Ooh $s1 That's you. But, no lady is pleased with this savage invitation!
+	 */
+	public static final NpcStringId OOH_S1_THATS_YOU_BUT_NO_LADY_IS_PLEASED_WITH_THIS_SAVAGE_INVITATION;
+	
+	/**
+	 * ID: 1010412<br>
+	 * Message: You made me angry!
+	 */
+	public static final NpcStringId YOU_MADE_ME_ANGRY;
+	
+	/**
+	 * ID: 1010413<br>
+	 * Message: It is but a scratch! Is that all you can do?!
+	 */
+	public static final NpcStringId IT_IS_BUT_A_SCRATCH_IS_THAT_ALL_YOU_CAN_DO;
+	
+	/**
+	 * ID: 1010414<br>
+	 * Message: Feel my pain!
+	 */
+	public static final NpcStringId FEEL_MY_PAIN;
+	
+	/**
+	 * ID: 1010415<br>
+	 * Message: I'll get you for this!
+	 */
+	public static final NpcStringId ILL_GET_YOU_FOR_THIS;
+	
+	/**
+	 * ID: 1010416<br>
+	 * Message: I will tell fish not to take your bait!
+	 */
+	public static final NpcStringId I_WILL_TELL_FISH_NOT_TO_TAKE_YOUR_BAIT;
+	
+	/**
+	 * ID: 1010417<br>
+	 * Message: You bothered such a weak spirit...Huh, Huh
+	 */
+	public static final NpcStringId YOU_BOTHERED_SUCH_A_WEAK_SPIRITHUH_HUH;
+	
+	/**
+	 * ID: 1010418<br>
+	 * Message: Ke, ke, ke..$s1...I'm eating..Ke..
+	 */
+	public static final NpcStringId KE_KE_KES1IM_EATINGKE;
+	
+	/**
+	 * ID: 1010419<br>
+	 * Message: Kuh..Ooh..$s1..Enmity...Fish....
+	 */
+	public static final NpcStringId KUHOOHS1ENMITYFISH;
+	
+	/**
+	 * ID: 1010420<br>
+	 * Message: $s1...? Huh... Huh..huh...
+	 */
+	public static final NpcStringId S1_HUH_HUHHUH;
+	
+	/**
+	 * ID: 1010421<br>
+	 * Message: Ke, ke, ke, Rakul! Spin! Eh, eh, eh!
+	 */
+	public static final NpcStringId KE_KE_KE_RAKUL_SPIN_EH_EH_EH;
+	
+	/**
+	 * ID: 1010422<br>
+	 * Message: Ah! Fafurion! Ah! Ah!
+	 */
+	public static final NpcStringId AH_FAFURION_AH_AH;
+	
+	/**
+	 * ID: 1010423<br>
+	 * Message: Rakul! Rakul! Ra-kul!
+	 */
+	public static final NpcStringId RAKUL_RAKUL_RA_KUL;
+	
+	/**
+	 * ID: 1010424<br>
+	 * Message: Eh..Enmity...Fish...
+	 */
+	public static final NpcStringId EHENMITYFISH;
+	
+	/**
+	 * ID: 1010425<br>
+	 * Message: I won't be eaten up...Kah, ah, ah
+	 */
+	public static final NpcStringId I_WONT_BE_EATEN_UPKAH_AH_AH;
+	
+	/**
+	 * ID: 1010426<br>
+	 * Message: Cough! Rakul! Cough, Cough! Keh...
+	 */
+	public static final NpcStringId COUGH_RAKUL_COUGH_COUGH_KEH;
+	
+	/**
+	 * ID: 1010427<br>
+	 * Message: Glory to Fafurion! Death to $s1!
+	 */
+	public static final NpcStringId GLORY_TO_FAFURION_DEATH_TO_S1;
+	
+	/**
+	 * ID: 1010428<br>
+	 * Message: $s1! You are the one who bothered my poor fish!
+	 */
+	public static final NpcStringId S1_YOU_ARE_THE_ONE_WHO_BOTHERED_MY_POOR_FISH;
+	
+	/**
+	 * ID: 1010429<br>
+	 * Message: Fafurion! A curse upon $s1!
+	 */
+	public static final NpcStringId FAFURION_A_CURSE_UPON_S1;
+	
+	/**
+	 * ID: 1010430<br>
+	 * Message: Giant Special Attack!
+	 */
+	public static final NpcStringId GIANT_SPECIAL_ATTACK;
+	
+	/**
+	 * ID: 1010431<br>
+	 * Message: Know the enmity of fish!
+	 */
+	public static final NpcStringId KNOW_THE_ENMITY_OF_FISH;
+	
+	/**
+	 * ID: 1010432<br>
+	 * Message: I will show you the power of a spear!
+	 */
+	public static final NpcStringId I_WILL_SHOW_YOU_THE_POWER_OF_A_SPEAR;
+	
+	/**
+	 * ID: 1010433<br>
+	 * Message: Glory to Fafurion!
+	 */
+	public static final NpcStringId GLORY_TO_FAFURION;
+	
+	/**
+	 * ID: 1010434<br>
+	 * Message: Yipes!
+	 */
+	public static final NpcStringId YIPES;
+	
+	/**
+	 * ID: 1010435<br>
+	 * Message: An old soldier does not die..! but just disappear...!
+	 */
+	public static final NpcStringId AN_OLD_SOLDIER_DOES_NOT_DIE_BUT_JUST_DISAPPEAR;
+	
+	/**
+	 * ID: 1010436<br>
+	 * Message: $s1, Take my challenge, the knight of water!
+	 */
+	public static final NpcStringId S1_TAKE_MY_CHALLENGE_THE_KNIGHT_OF_WATER;
+	
+	/**
+	 * ID: 1010437<br>
+	 * Message: Discover $s1 in the treasure chest of fish!
+	 */
+	public static final NpcStringId DISCOVER_S1_IN_THE_TREASURE_CHEST_OF_FISH;
+	
+	/**
+	 * ID: 1010438<br>
+	 * Message: $s1, I took your bait!
+	 */
+	public static final NpcStringId S1_I_TOOK_YOUR_BAIT;
+	
+	/**
+	 * ID: 1010439<br>
+	 * Message: I will show you spearmanship used in Dragon King's Palace!
+	 */
+	public static final NpcStringId I_WILL_SHOW_YOU_SPEARMANSHIP_USED_IN_DRAGON_KINGS_PALACE;
+	
+	/**
+	 * ID: 1010440<br>
+	 * Message: This is the last gift I give you!
+	 */
+	public static final NpcStringId THIS_IS_THE_LAST_GIFT_I_GIVE_YOU;
+	
+	/**
+	 * ID: 1010441<br>
+	 * Message: Your bait was too delicious! Now, I will kill you!
+	 */
+	public static final NpcStringId YOUR_BAIT_WAS_TOO_DELICIOUS_NOW_I_WILL_KILL_YOU;
+	
+	/**
+	 * ID: 1010442<br>
+	 * Message: What a regret! The enmity of my brethren!
+	 */
+	public static final NpcStringId WHAT_A_REGRET_THE_ENMITY_OF_MY_BRETHREN;
+	
+	/**
+	 * ID: 1010443<br>
+	 * Message: I'll pay you back! Somebody will have my revenge!
+	 */
+	public static final NpcStringId ILL_PAY_YOU_BACK_SOMEBODY_WILL_HAVE_MY_REVENGE;
+	
+	/**
+	 * ID: 1010444<br>
+	 * Message: Cough... But, I won't be eaten up by you...!
+	 */
+	public static final NpcStringId COUGH_BUT_I_WONT_BE_EATEN_UP_BY_YOU;
+	
+	/**
+	 * ID: 1010445<br>
+	 * Message: ....? $s1... I will kill you...
+	 */
+	public static final NpcStringId _S1_I_WILL_KILL_YOU;
+	
+	/**
+	 * ID: 1010446<br>
+	 * Message: $s1... How could you catch me from the deep sea...
+	 */
+	public static final NpcStringId S1_HOW_COULD_YOU_CATCH_ME_FROM_THE_DEEP_SEA;
+	
+	/**
+	 * ID: 1010447<br>
+	 * Message: $s1... Do you think I am a fish?
+	 */
+	public static final NpcStringId S1_DO_YOU_THINK_I_AM_A_FISH;
+	
+	/**
+	 * ID: 1010448<br>
+	 * Message: Ebibibi~
+	 */
+	public static final NpcStringId EBIBIBI;
+	
+	/**
+	 * ID: 1010449<br>
+	 * Message: He, he, he. Do you want me to roast you well?
+	 */
+	public static final NpcStringId HE_HE_HE_DO_YOU_WANT_ME_TO_ROAST_YOU_WELL;
+	
+	/**
+	 * ID: 1010450<br>
+	 * Message: You didn't keep your eyes on me because I come from the sea?
+	 */
+	public static final NpcStringId YOU_DIDNT_KEEP_YOUR_EYES_ON_ME_BECAUSE_I_COME_FROM_THE_SEA;
+	
+	/**
+	 * ID: 1010451<br>
+	 * Message: Eeek... I feel sick...yow...!
+	 */
+	public static final NpcStringId EEEK_I_FEEL_SICKYOW;
+	
+	/**
+	 * ID: 1010452<br>
+	 * Message: I have failed...
+	 */
+	public static final NpcStringId I_HAVE_FAILED;
+	
+	/**
+	 * ID: 1010453<br>
+	 * Message: Activity of life... Is stopped... Chizifc...
+	 */
+	public static final NpcStringId ACTIVITY_OF_LIFE_IS_STOPPED_CHIZIFC;
+	
+	/**
+	 * ID: 1010454<br>
+	 * Message: Growling! $s1~ Growling!
+	 */
+	public static final NpcStringId GROWLING_S1_GROWLING;
+	
+	/**
+	 * ID: 1010455<br>
+	 * Message: I can smell $s1..!
+	 */
+	public static final NpcStringId I_CAN_SMELL_S1;
+	
+	/**
+	 * ID: 1010456<br>
+	 * Message: Looks delicious, $s1!
+	 */
+	public static final NpcStringId LOOKS_DELICIOUS_S1;
+	
+	/**
+	 * ID: 1010457<br>
+	 * Message: I will catch you!
+	 */
+	public static final NpcStringId I_WILL_CATCH_YOU;
+	
+	/**
+	 * ID: 1010458<br>
+	 * Message: Uah, ah, ah, I couldn't eat anything for a long time!
+	 */
+	public static final NpcStringId UAH_AH_AH_I_COULDNT_EAT_ANYTHING_FOR_A_LONG_TIME;
+	
+	/**
+	 * ID: 1010459<br>
+	 * Message: I can swallow you at a mouthful!
+	 */
+	public static final NpcStringId I_CAN_SWALLOW_YOU_AT_A_MOUTHFUL;
+	
+	/**
+	 * ID: 1010460<br>
+	 * Message: What?! I am defeated by the prey!
+	 */
+	public static final NpcStringId WHAT_I_AM_DEFEATED_BY_THE_PREY;
+	
+	/**
+	 * ID: 1010461<br>
+	 * Message: You are my food! I have to kill you!
+	 */
+	public static final NpcStringId YOU_ARE_MY_FOOD_I_HAVE_TO_KILL_YOU;
+	
+	/**
+	 * ID: 1010462<br>
+	 * Message: I can't believe I am eaten up by my prey... Gah!
+	 */
+	public static final NpcStringId I_CANT_BELIEVE_I_AM_EATEN_UP_BY_MY_PREY_GAH;
+	
+	/**
+	 * ID: 1010463<br>
+	 * Message: ....You caught me, $s1...?
+	 */
+	public static final NpcStringId YOU_CAUGHT_ME_S1;
+	
+	/**
+	 * ID: 1010464<br>
+	 * Message: You're lucky to have even seen me, $s1.
+	 */
+	public static final NpcStringId YOURE_LUCKY_TO_HAVE_EVEN_SEEN_ME_S1;
+	
+	/**
+	 * ID: 1010465<br>
+	 * Message: $s1, you can't leave here alive. Give up.
+	 */
+	public static final NpcStringId S1_YOU_CANT_LEAVE_HERE_ALIVE_GIVE_UP;
+	
+	/**
+	 * ID: 1010466<br>
+	 * Message: I will show you the power of the deep sea!
+	 */
+	public static final NpcStringId I_WILL_SHOW_YOU_THE_POWER_OF_THE_DEEP_SEA;
+	
+	/**
+	 * ID: 1010467<br>
+	 * Message: I will break the fishing pole!
+	 */
+	public static final NpcStringId I_WILL_BREAK_THE_FISHING_POLE;
+	
+	/**
+	 * ID: 1010468<br>
+	 * Message: Your corpse will be good food for me!
+	 */
+	public static final NpcStringId YOUR_CORPSE_WILL_BE_GOOD_FOOD_FOR_ME;
+	
+	/**
+	 * ID: 1010469<br>
+	 * Message: You are a good fisherman.
+	 */
+	public static final NpcStringId YOU_ARE_A_GOOD_FISHERMAN;
+	
+	/**
+	 * ID: 1010470<br>
+	 * Message: Aren't you afraid of Fafurion?!
+	 */
+	public static final NpcStringId ARENT_YOU_AFRAID_OF_FAFURION;
+	
+	/**
+	 * ID: 1010471<br>
+	 * Message: You are excellent....
+	 */
+	public static final NpcStringId YOU_ARE_EXCELLENT;
+	
+	/**
+	 * ID: 1010472<br>
+	 * Message: The Poison device has been activated.
+	 */
+	public static final NpcStringId THE_POISON_DEVICE_HAS_BEEN_ACTIVATED;
+	
+	/**
+	 * ID: 1010473<br>
+	 * Message: The P. Atk. reduction device will be activated in 1 minute.
+	 */
+	public static final NpcStringId THE_P_ATK_REDUCTION_DEVICE_WILL_BE_ACTIVATED_IN_1_MINUTE;
+	
+	/**
+	 * ID: 1010474<br>
+	 * Message: The Defense reduction device will be activated in 2 minutes.
+	 */
+	public static final NpcStringId THE_DEFENSE_REDUCTION_DEVICE_WILL_BE_ACTIVATED_IN_2_MINUTES;
+	
+	/**
+	 * ID: 1010475<br>
+	 * Message: The HP regeneration reduction device will be activated in 3 minutes.
+	 */
+	public static final NpcStringId THE_HP_REGENERATION_REDUCTION_DEVICE_WILL_BE_ACTIVATED_IN_3_MINUTES;
+	
+	/**
+	 * ID: 1010476<br>
+	 * Message: The P. Atk. reduction device has been activated.
+	 */
+	public static final NpcStringId THE_P_ATK_REDUCTION_DEVICE_HAS_BEEN_ACTIVATED;
+	
+	/**
+	 * ID: 1010477<br>
+	 * Message: The Defense reduction device has been activated.
+	 */
+	public static final NpcStringId THE_DEFENSE_REDUCTION_DEVICE_HAS_BEEN_ACTIVATED;
+	
+	/**
+	 * ID: 1010478<br>
+	 * Message: The HP regeneration reduction device has been activated.
+	 */
+	public static final NpcStringId THE_HP_REGENERATION_REDUCTION_DEVICE_HAS_BEEN_ACTIVATED;
+	
+	/**
+	 * ID: 1010479<br>
+	 * Message: The poison device has now been destroyed.
+	 */
+	public static final NpcStringId THE_POISON_DEVICE_HAS_NOW_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1010480<br>
+	 * Message: The P. Atk. reduction device has now been destroyed.
+	 */
+	public static final NpcStringId THE_P_ATK_REDUCTION_DEVICE_HAS_NOW_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1010481<br>
+	 * Message: The Defense reduction device has been destroyed.
+	 */
+	public static final NpcStringId THE_DEFENSE_REDUCTION_DEVICE_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1010485<br>
+	 * Message: Entrance to the Cave of Trials
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_CAVE_OF_TRIALS;
+	
+	/**
+	 * ID: 1010486<br>
+	 * Message: Inside the Elven Ruins
+	 */
+	public static final NpcStringId INSIDE_THE_ELVEN_RUINS;
+	
+	/**
+	 * ID: 1010487<br>
+	 * Message: Entrance to the Elven Ruins
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_ELVEN_RUINS;
+	
+	/**
+	 * ID: 1010488<br>
+	 * Message: Entrance to the School of Dark Arts
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_SCHOOL_OF_DARK_ARTS;
+	
+	/**
+	 * ID: 1010489<br>
+	 * Message: Center of the School of Dark Arts
+	 */
+	public static final NpcStringId CENTER_OF_THE_SCHOOL_OF_DARK_ARTS;
+	
+	/**
+	 * ID: 1010490<br>
+	 * Message: Entrance to the Elven Fortress
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_ELVEN_FORTRESS;
+	
+	/**
+	 * ID: 1010491<br>
+	 * Message: Varka Silenos Stronghold
+	 */
+	public static final NpcStringId VARKA_SILENOS_STRONGHOLD;
+	
+	/**
+	 * ID: 1010492<br>
+	 * Message: Ketra Orc Outpost
+	 */
+	public static final NpcStringId KETRA_ORC_OUTPOST;
+	
+	/**
+	 * ID: 1010493<br>
+	 * Message: Rune Township Guild
+	 */
+	public static final NpcStringId RUNE_TOWNSHIP_GUILD;
+	
+	/**
+	 * ID: 1010494<br>
+	 * Message: Rune Township Temple
+	 */
+	public static final NpcStringId RUNE_TOWNSHIP_TEMPLE;
+	
+	/**
+	 * ID: 1010495<br>
+	 * Message: Rune Township Store
+	 */
+	public static final NpcStringId RUNE_TOWNSHIP_STORE;
+	
+	/**
+	 * ID: 1010496<br>
+	 * Message: Entrance to the Forest of the Dead
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_FOREST_OF_THE_DEAD;
+	
+	/**
+	 * ID: 1010497<br>
+	 * Message: Western Entrance to the Swamp of Screams
+	 */
+	public static final NpcStringId WESTERN_ENTRANCE_TO_THE_SWAMP_OF_SCREAMS;
+	
+	/**
+	 * ID: 1010498<br>
+	 * Message: Entrance to the Forgotten Temple
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_FORGOTTEN_TEMPLE;
+	
+	/**
+	 * ID: 1010499<br>
+	 * Message: Center of the Forgotten Temple
+	 */
+	public static final NpcStringId CENTER_OF_THE_FORGOTTEN_TEMPLE;
+	
+	/**
+	 * ID: 1010500<br>
+	 * Message: Entrance to the Cruma Tower
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_CRUMA_TOWER;
+	
+	/**
+	 * ID: 1010501<br>
+	 * Message: Cruma Tower - First Floor
+	 */
+	public static final NpcStringId CRUMA_TOWER_FIRST_FLOOR;
+	
+	/**
+	 * ID: 1010502<br>
+	 * Message: Cruma Tower - Second Floor
+	 */
+	public static final NpcStringId CRUMA_TOWER_SECOND_FLOOR;
+	
+	/**
+	 * ID: 1010503<br>
+	 * Message: Cruma Tower - Third Floor
+	 */
+	public static final NpcStringId CRUMA_TOWER_THIRD_FLOOR;
+	
+	/**
+	 * ID: 1010504<br>
+	 * Message: Entrance to Devil's Isle
+	 */
+	public static final NpcStringId ENTRANCE_TO_DEVILS_ISLE;
+	
+	/**
+	 * ID: 1010506<br>
+	 * Message: Gludin Arena
+	 */
+	public static final NpcStringId GLUDIN_ARENA;
+	
+	/**
+	 * ID: 1010507<br>
+	 * Message: Giran Arena
+	 */
+	public static final NpcStringId GIRAN_ARENA;
+	
+	/**
+	 * ID: 1010508<br>
+	 * Message: Entrance to Antharas's Lair
+	 */
+	public static final NpcStringId ENTRANCE_TO_ANTHARASS_LAIR;
+	
+	/**
+	 * ID: 1010509<br>
+	 * Message: Antharas's Lair - 1st Level
+	 */
+	public static final NpcStringId ANTHARASS_LAIR_1ST_LEVEL;
+	
+	/**
+	 * ID: 1010510<br>
+	 * Message: Antharas's Lair - 2nd Level
+	 */
+	public static final NpcStringId ANTHARASS_LAIR_2ND_LEVEL;
+	
+	/**
+	 * ID: 1010511<br>
+	 * Message: Antharas's Lair - Magic Force Field Bridge
+	 */
+	public static final NpcStringId ANTHARASS_LAIR_MAGIC_FORCE_FIELD_BRIDGE;
+	
+	/**
+	 * ID: 1010512<br>
+	 * Message: The Heart of Antharas's Lair
+	 */
+	public static final NpcStringId THE_HEART_OF_ANTHARASS_LAIR;
+	
+	/**
+	 * ID: 1010513<br>
+	 * Message: East of the Field of Silence
+	 */
+	public static final NpcStringId EAST_OF_THE_FIELD_OF_SILENCE;
+	
+	/**
+	 * ID: 1010514<br>
+	 * Message: West of the Field of Silence
+	 */
+	public static final NpcStringId WEST_OF_THE_FIELD_OF_SILENCE;
+	
+	/**
+	 * ID: 1010515<br>
+	 * Message: East of the Field of Whispers
+	 */
+	public static final NpcStringId EAST_OF_THE_FIELD_OF_WHISPERS;
+	
+	/**
+	 * ID: 1010516<br>
+	 * Message: West of the Field of Whispers
+	 */
+	public static final NpcStringId WEST_OF_THE_FIELD_OF_WHISPERS;
+	
+	/**
+	 * ID: 1010517<br>
+	 * Message: Entrance to the Garden of Eva
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_GARDEN_OF_EVA;
+	
+	/**
+	 * ID: 1010520<br>
+	 * Message: Northern part of Alligator Island
+	 */
+	public static final NpcStringId NORTHERN_PART_OF_ALLIGATOR_ISLAND;
+	
+	/**
+	 * ID: 1010521<br>
+	 * Message: Central part of Alligator Island
+	 */
+	public static final NpcStringId CENTRAL_PART_OF_ALLIGATOR_ISLAND;
+	
+	/**
+	 * ID: 1010522<br>
+	 * Message: Garden of Eva - 2nd Level
+	 */
+	public static final NpcStringId GARDEN_OF_EVA_2ND_LEVEL;
+	
+	/**
+	 * ID: 1010523<br>
+	 * Message: Garden of Eva - 3rd Level
+	 */
+	public static final NpcStringId GARDEN_OF_EVA_3RD_LEVEL;
+	
+	/**
+	 * ID: 1010524<br>
+	 * Message: Garden of Eva - 4th Level
+	 */
+	public static final NpcStringId GARDEN_OF_EVA_4TH_LEVEL;
+	
+	/**
+	 * ID: 1010525<br>
+	 * Message: Garden of Eva - 5th Level
+	 */
+	public static final NpcStringId GARDEN_OF_EVA_5TH_LEVEL;
+	
+	/**
+	 * ID: 1010526<br>
+	 * Message: Inside the Garden of Eva
+	 */
+	public static final NpcStringId INSIDE_THE_GARDEN_OF_EVA;
+	
+	/**
+	 * ID: 1010527<br>
+	 * Message: Four Sepulchers
+	 */
+	public static final NpcStringId FOUR_SEPULCHERS;
+	
+	/**
+	 * ID: 1010528<br>
+	 * Message: Imperial Tomb
+	 */
+	public static final NpcStringId IMPERIAL_TOMB;
+	
+	/**
+	 * ID: 1010529<br>
+	 * Message: Shrine of Loyalty
+	 */
+	public static final NpcStringId SHRINE_OF_LOYALTY;
+	
+	/**
+	 * ID: 1010530<br>
+	 * Message: Entrance to the Forge of the Gods
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_FORGE_OF_THE_GODS;
+	
+	/**
+	 * ID: 1010531<br>
+	 * Message: Forge of the Gods - Top Level
+	 */
+	public static final NpcStringId FORGE_OF_THE_GODS_TOP_LEVEL;
+	
+	/**
+	 * ID: 1010532<br>
+	 * Message: Forge of the Gods - Lower Level
+	 */
+	public static final NpcStringId FORGE_OF_THE_GODS_LOWER_LEVEL;
+	
+	/**
+	 * ID: 1010533<br>
+	 * Message: Entrance to the Wall of Argos
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_WALL_OF_ARGOS;
+	
+	/**
+	 * ID: 1010534<br>
+	 * Message: Varka Silenos Village
+	 */
+	public static final NpcStringId VARKA_SILENOS_VILLAGE;
+	
+	/**
+	 * ID: 1010535<br>
+	 * Message: Ketra Orc Village
+	 */
+	public static final NpcStringId KETRA_ORC_VILLAGE;
+	
+	/**
+	 * ID: 1010536<br>
+	 * Message: Entrance to the Hot Springs Region
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_HOT_SPRINGS_REGION;
+	
+	/**
+	 * ID: 1010537<br>
+	 * Message: Wild Beast Pastures
+	 */
+	public static final NpcStringId WILD_BEAST_PASTURES;
+	
+	/**
+	 * ID: 1010538<br>
+	 * Message: Entrance to the Valley of Saints
+	 */
+	public static final NpcStringId ENTRANCE_TO_THE_VALLEY_OF_SAINTS;
+	
+	/**
+	 * ID: 1010539<br>
+	 * Message: Cursed Village
+	 */
+	public static final NpcStringId CURSED_VILLAGE;
+	
+	/**
+	 * ID: 1010540<br>
+	 * Message: Southern Entrance of the Wild Beast Pastures
+	 */
+	public static final NpcStringId SOUTHERN_ENTRANCE_OF_THE_WILD_BEAST_PASTURES;
+	
+	/**
+	 * ID: 1010541<br>
+	 * Message: Eastern Part of the Wild Beast Pastures
+	 */
+	public static final NpcStringId EASTERN_PART_OF_THE_WILD_BEAST_PASTURES;
+	
+	/**
+	 * ID: 1010542<br>
+	 * Message: Western Part of the Wild Beast Pastures
+	 */
+	public static final NpcStringId WESTERN_PART_OF_THE_WILD_BEAST_PASTURES;
+	
+	/**
+	 * ID: 1010543<br>
+	 * Message: Eastern Part of the Swamp of Screams
+	 */
+	public static final NpcStringId EASTERN_PART_OF_THE_SWAMP_OF_SCREAMS;
+	
+	/**
+	 * ID: 1010544<br>
+	 * Message: Western Part of the Swamp of Screams
+	 */
+	public static final NpcStringId WESTERN_PART_OF_THE_SWAMP_OF_SCREAMS;
+	
+	/**
+	 * ID: 1010545<br>
+	 * Message: Center of the Swamp of Screams
+	 */
+	public static final NpcStringId CENTER_OF_THE_SWAMP_OF_SCREAMS;
+	
+	/**
+	 * ID: 1010547<br>
+	 * Message: Aden Frontier Gateway
+	 */
+	public static final NpcStringId ADEN_FRONTIER_GATEWAY;
+	
+	/**
+	 * ID: 1010548<br>
+	 * Message: Oren Frontier Gateway
+	 */
+	public static final NpcStringId OREN_FRONTIER_GATEWAY;
+	
+	/**
+	 * ID: 1010549<br>
+	 * Message: Garden of Wild Beasts
+	 */
+	public static final NpcStringId GARDEN_OF_WILD_BEASTS;
+	
+	/**
+	 * ID: 1010550<br>
+	 * Message: Devil's Pass
+	 */
+	public static final NpcStringId DEVILS_PASS;
+	
+	/**
+	 * ID: 1010551<br>
+	 * Message: The bullets are being loaded.
+	 */
+	public static final NpcStringId THE_BULLETS_ARE_BEING_LOADED;
+	
+	/**
+	 * ID: 1010552<br>
+	 * Message: You can start at the scheduled time.
+	 */
+	public static final NpcStringId YOU_CAN_START_AT_THE_SCHEDULED_TIME;
+	
+	/**
+	 * ID: 1010554<br>
+	 * Message: Upper Level of The Giant's Cave
+	 */
+	public static final NpcStringId UPPER_LEVEL_OF_THE_GIANTS_CAVE;
+	
+	/**
+	 * ID: 1010555<br>
+	 * Message: Lower Level of The Giant's Cave
+	 */
+	public static final NpcStringId LOWER_LEVEL_OF_THE_GIANTS_CAVE;
+	
+	/**
+	 * ID: 1010556<br>
+	 * Message: Immortal Plateau, Northern Region
+	 */
+	public static final NpcStringId IMMORTAL_PLATEAU_NORTHERN_REGION;
+	
+	/**
+	 * ID: 1010557<br>
+	 * Message: Elven Ruins
+	 */
+	public static final NpcStringId ELVEN_RUINS;
+	
+	/**
+	 * ID: 1010558<br>
+	 * Message: Singing Waterfall
+	 */
+	public static final NpcStringId SINGING_WATERFALL;
+	
+	/**
+	 * ID: 1010559<br>
+	 * Message: Talking Island, Northern Territory
+	 */
+	public static final NpcStringId TALKING_ISLAND_NORTHERN_TERRITORY;
+	
+	/**
+	 * ID: 1010560<br>
+	 * Message: Elven Fortress
+	 */
+	public static final NpcStringId ELVEN_FORTRESS;
+	
+	/**
+	 * ID: 1010561<br>
+	 * Message: Pilgrim's Temple
+	 */
+	public static final NpcStringId PILGRIMS_TEMPLE;
+	
+	/**
+	 * ID: 1010562<br>
+	 * Message: Gludin Harbor
+	 */
+	public static final NpcStringId GLUDIN_HARBOR;
+	
+	/**
+	 * ID: 1010563<br>
+	 * Message: Shilen's Garden
+	 */
+	public static final NpcStringId SHILENS_GARDEN;
+	
+	/**
+	 * ID: 1010564<br>
+	 * Message: School of Dark Arts
+	 */
+	public static final NpcStringId SCHOOL_OF_DARK_ARTS;
+	
+	/**
+	 * ID: 1010565<br>
+	 * Message: Swamp of Screams
+	 */
+	public static final NpcStringId SWAMP_OF_SCREAMS;
+	
+	/**
+	 * ID: 1010566<br>
+	 * Message: The Ant Nest
+	 */
+	public static final NpcStringId THE_ANT_NEST;
+	
+	/**
+	 * ID: 1010568<br>
+	 * Message: Wall of Argos
+	 */
+	public static final NpcStringId WALL_OF_ARGOS;
+	
+	/**
+	 * ID: 1010569<br>
+	 * Message: Den of Evil
+	 */
+	public static final NpcStringId DEN_OF_EVIL;
+	
+	/**
+	 * ID: 1010570<br>
+	 * Message: Iceman's Hut
+	 */
+	public static final NpcStringId ICEMANS_HUT;
+	
+	/**
+	 * ID: 1010571<br>
+	 * Message: Crypts of Disgrace
+	 */
+	public static final NpcStringId CRYPTS_OF_DISGRACE;
+	
+	/**
+	 * ID: 1010572<br>
+	 * Message: Plunderous Plains
+	 */
+	public static final NpcStringId PLUNDEROUS_PLAINS;
+	
+	/**
+	 * ID: 1010573<br>
+	 * Message: Pavel Ruins
+	 */
+	public static final NpcStringId PAVEL_RUINS;
+	
+	/**
+	 * ID: 1010574<br>
+	 * Message: Town of Schuttgart
+	 */
+	public static final NpcStringId TOWN_OF_SCHUTTGART;
+	
+	/**
+	 * ID: 1010575<br>
+	 * Message: Monastery of Silence
+	 */
+	public static final NpcStringId MONASTERY_OF_SILENCE;
+	
+	/**
+	 * ID: 1010576<br>
+	 * Message: Monastery of Silence: Rear Gate
+	 */
+	public static final NpcStringId MONASTERY_OF_SILENCE_REAR_GATE;
+	
+	/**
+	 * ID: 1010577<br>
+	 * Message: Stakato Nest
+	 */
+	public static final NpcStringId STAKATO_NEST;
+	
+	/**
+	 * ID: 1010578<br>
+	 * Message: How dare you trespass into my territory! Have you no fear?
+	 */
+	public static final NpcStringId HOW_DARE_YOU_TRESPASS_INTO_MY_TERRITORY_HAVE_YOU_NO_FEAR;
+	
+	/**
+	 * ID: 1010579<br>
+	 * Message: Fools! Why haven't you fled yet? Prepare to learn a lesson!
+	 */
+	public static final NpcStringId FOOLS_WHY_HAVENT_YOU_FLED_YET_PREPARE_TO_LEARN_A_LESSON;
+	
+	/**
+	 * ID: 1010580<br>
+	 * Message: Bwah-ha-ha! Your doom is at hand! Behold the Ultra Secret Super Weapon!
+	 */
+	public static final NpcStringId BWAH_HA_HA_YOUR_DOOM_IS_AT_HAND_BEHOLD_THE_ULTRA_SECRET_SUPER_WEAPON;
+	
+	/**
+	 * ID: 1010581<br>
+	 * Message: Foolish, insignificant creatures! How dare you challenge me!
+	 */
+	public static final NpcStringId FOOLISH_INSIGNIFICANT_CREATURES_HOW_DARE_YOU_CHALLENGE_ME;
+	
+	/**
+	 * ID: 1010582<br>
+	 * Message: I see that none will challenge me now!
+	 */
+	public static final NpcStringId I_SEE_THAT_NONE_WILL_CHALLENGE_ME_NOW;
+	
+	/**
+	 * ID: 1010583<br>
+	 * Message: Urggh! You will pay dearly for this insult.
+	 */
+	public static final NpcStringId URGGH_YOU_WILL_PAY_DEARLY_FOR_THIS_INSULT;
+	
+	/**
+	 * ID: 1010584<br>
+	 * Message: What? You haven't even two pennies to rub together? Harumph!
+	 */
+	public static final NpcStringId WHAT_YOU_HAVENT_EVEN_TWO_PENNIES_TO_RUB_TOGETHER_HARUMPH;
+	
+	/**
+	 * ID: 1010585<br>
+	 * Message: Forest of Mirrors
+	 */
+	public static final NpcStringId FOREST_OF_MIRRORS;
+	
+	/**
+	 * ID: 1010586<br>
+	 * Message: The Center of the Forest of Mirrors
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_FOREST_OF_MIRRORS;
+	
+	/**
+	 * ID: 1010588<br>
+	 * Message: Sky Wagon Relic
+	 */
+	public static final NpcStringId SKY_WAGON_RELIC;
+	
+	/**
+	 * ID: 1010590<br>
+	 * Message: The Center of the Dark Forest
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_DARK_FOREST;
+	
+	/**
+	 * ID: 1010591<br>
+	 * Message: Grave Robber Hideout
+	 */
+	public static final NpcStringId GRAVE_ROBBER_HIDEOUT;
+	
+	/**
+	 * ID: 1010592<br>
+	 * Message: Forest of the Dead
+	 */
+	public static final NpcStringId FOREST_OF_THE_DEAD;
+	
+	/**
+	 * ID: 1010593<br>
+	 * Message: The Center of the Forest of the Dead
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_FOREST_OF_THE_DEAD;
+	
+	/**
+	 * ID: 1010594<br>
+	 * Message: Mithril Mines
+	 */
+	public static final NpcStringId MITHRIL_MINES;
+	
+	/**
+	 * ID: 1010595<br>
+	 * Message: The Center of the Mithril Mines
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_MITHRIL_MINES;
+	
+	/**
+	 * ID: 1010596<br>
+	 * Message: Abandoned Coal Mines
+	 */
+	public static final NpcStringId ABANDONED_COAL_MINES;
+	
+	/**
+	 * ID: 1010597<br>
+	 * Message: The Center of the Abandoned Coal Mines
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_ABANDONED_COAL_MINES;
+	
+	/**
+	 * ID: 1010598<br>
+	 * Message: Immortal Plateau, Western Region
+	 */
+	public static final NpcStringId IMMORTAL_PLATEAU_WESTERN_REGION;
+	
+	/**
+	 * ID: 1010600<br>
+	 * Message: Valley of Saints
+	 */
+	public static final NpcStringId VALLEY_OF_SAINTS;
+	
+	/**
+	 * ID: 1010601<br>
+	 * Message: The Center of the Valley of Saints
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_VALLEY_OF_SAINTS;
+	
+	/**
+	 * ID: 1010603<br>
+	 * Message: Cave of Trials
+	 */
+	public static final NpcStringId CAVE_OF_TRIALS;
+	
+	/**
+	 * ID: 1010604<br>
+	 * Message: Seal of Shilen
+	 */
+	public static final NpcStringId SEAL_OF_SHILEN;
+	
+	/**
+	 * ID: 1010605<br>
+	 * Message: The Center of the Wall of Argos
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_WALL_OF_ARGOS;
+	
+	/**
+	 * ID: 1010606<br>
+	 * Message: The Center of Alligator Island
+	 */
+	public static final NpcStringId THE_CENTER_OF_ALLIGATOR_ISLAND;
+	
+	/**
+	 * ID: 1010607<br>
+	 * Message: Anghel Waterfall
+	 */
+	public static final NpcStringId ANGHEL_WATERFALL;
+	
+	/**
+	 * ID: 1010608<br>
+	 * Message: Center of the Elven Ruins
+	 */
+	public static final NpcStringId CENTER_OF_THE_ELVEN_RUINS;
+	
+	/**
+	 * ID: 1010609<br>
+	 * Message: Hot Springs
+	 */
+	public static final NpcStringId HOT_SPRINGS;
+	
+	/**
+	 * ID: 1010610<br>
+	 * Message: The Center of the Hot Springs
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_HOT_SPRINGS;
+	
+	/**
+	 * ID: 1010611<br>
+	 * Message: The Center of Dragon Valley
+	 */
+	public static final NpcStringId THE_CENTER_OF_DRAGON_VALLEY;
+	
+	/**
+	 * ID: 1010613<br>
+	 * Message: The Center of the Neutral Zone
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_NEUTRAL_ZONE;
+	
+	/**
+	 * ID: 1010614<br>
+	 * Message: Cruma Marshlands
+	 */
+	public static final NpcStringId CRUMA_MARSHLANDS;
+	
+	/**
+	 * ID: 1010615<br>
+	 * Message: The Center of the Cruma Marshlands
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_CRUMA_MARSHLANDS;
+	
+	/**
+	 * ID: 1010617<br>
+	 * Message: The Center of the Enchanted Valley
+	 */
+	public static final NpcStringId THE_CENTER_OF_THE_ENCHANTED_VALLEY;
+	
+	/**
+	 * ID: 1010618<br>
+	 * Message: Enchanted Valley, Southern Region
+	 */
+	public static final NpcStringId ENCHANTED_VALLEY_SOUTHERN_REGION;
+	
+	/**
+	 * ID: 1010619<br>
+	 * Message: Enchanted Valley, Northern Region
+	 */
+	public static final NpcStringId ENCHANTED_VALLEY_NORTHERN_REGION;
+	
+	/**
+	 * ID: 1010620<br>
+	 * Message: Frost Lake
+	 */
+	public static final NpcStringId FROST_LAKE;
+	
+	/**
+	 * ID: 1010621<br>
+	 * Message: Wastelands
+	 */
+	public static final NpcStringId WASTELANDS;
+	
+	/**
+	 * ID: 1010622<br>
+	 * Message: Wastelands, Western Region
+	 */
+	public static final NpcStringId WASTELANDS_WESTERN_REGION;
+	
+	/**
+	 * ID: 1010623<br>
+	 * Message: Who dares to covet the throne of our castle! Leave immediately or you will pay the price of your audacity with your very own blood!
+	 */
+	public static final NpcStringId WHO_DARES_TO_COVET_THE_THRONE_OF_OUR_CASTLE_LEAVE_IMMEDIATELY_OR_YOU_WILL_PAY_THE_PRICE_OF_YOUR_AUDACITY_WITH_YOUR_VERY_OWN_BLOOD;
+	
+	/**
+	 * ID: 1010624<br>
+	 * Message: Hmm, those who are not of the bloodline are coming this way to take over the castle?! Humph! The bitter grudges of the dead. You must not make light of their power!
+	 */
+	public static final NpcStringId HMM_THOSE_WHO_ARE_NOT_OF_THE_BLOODLINE_ARE_COMING_THIS_WAY_TO_TAKE_OVER_THE_CASTLE_HUMPH_THE_BITTER_GRUDGES_OF_THE_DEAD_YOU_MUST_NOT_MAKE_LIGHT_OF_THEIR_POWER;
+	
+	/**
+	 * ID: 1010625<br>
+	 * Message: Aargh...! If I die, then the magic force field of blood will...!
+	 */
+	public static final NpcStringId AARGH_IF_I_DIE_THEN_THE_MAGIC_FORCE_FIELD_OF_BLOOD_WILL;
+	
+	/**
+	 * ID: 1010626<br>
+	 * Message: It's not over yet... It won't be... over... like this... Never...
+	 */
+	public static final NpcStringId ITS_NOT_OVER_YET_IT_WONT_BE_OVER_LIKE_THIS_NEVER;
+	
+	/**
+	 * ID: 1010627<br>
+	 * Message: Oooh! Who poured nectar on my head while I was sleeping?
+	 */
+	public static final NpcStringId OOOH_WHO_POURED_NECTAR_ON_MY_HEAD_WHILE_I_WAS_SLEEPING;
+	
+	/**
+	 * ID: 1010628<br>
+	 * Message: Please wait a moment.
+	 */
+	public static final NpcStringId PLEASE_WAIT_A_MOMENT;
+	
+	/**
+	 * ID: 1010629<br>
+	 * Message: The word you need this time is $s1.
+	 */
+	public static final NpcStringId THE_WORD_YOU_NEED_THIS_TIME_IS_S1;
+	
+	/**
+	 * ID: 1010630<br>
+	 * Message: Intruders! Sound the alarm!
+	 */
+	public static final NpcStringId INTRUDERS_SOUND_THE_ALARM;
+	
+	/**
+	 * ID: 1010631<br>
+	 * Message: De-activate the alarm.
+	 */
+	public static final NpcStringId DE_ACTIVATE_THE_ALARM;
+	
+	/**
+	 * ID: 1010632<br>
+	 * Message: Oh no! The defenses have failed. It is too dangerous to remain inside the castle. Flee! Every man for himself!
+	 */
+	public static final NpcStringId OH_NO_THE_DEFENSES_HAVE_FAILED_IT_IS_TOO_DANGEROUS_TO_REMAIN_INSIDE_THE_CASTLE_FLEE_EVERY_MAN_FOR_HIMSELF;
+	
+	/**
+	 * ID: 1010633<br>
+	 * Message: The game has begun. Participants, prepare to learn an important word.
+	 */
+	public static final NpcStringId THE_GAME_HAS_BEGUN_PARTICIPANTS_PREPARE_TO_LEARN_AN_IMPORTANT_WORD;
+	
+	/**
+	 * ID: 1010634<br>
+	 * Message: $s1 team's jackpot has $s2 percent of its HP remaining.
+	 */
+	public static final NpcStringId S1_TEAMS_JACKPOT_HAS_S2_PERCENT_OF_ITS_HP_REMAINING;
+	
+	/**
+	 * ID: 1010635<br>
+	 * Message: Undecided
+	 */
+	public static final NpcStringId UNDECIDED;
+	
+	/**
+	 * ID: 1010636<br>
+	 * Message: Heh Heh... I see that the feast has begun! Be wary! The curse of the Hellmann family has poisoned this land!
+	 */
+	public static final NpcStringId HEH_HEH_I_SEE_THAT_THE_FEAST_HAS_BEGUN_BE_WARY_THE_CURSE_OF_THE_HELLMANN_FAMILY_HAS_POISONED_THIS_LAND;
+	
+	/**
+	 * ID: 1010637<br>
+	 * Message: Arise, my faithful servants! You, my people who have inherited the blood. It is the calling of my daughter. The feast of blood will now begin!
+	 */
+	public static final NpcStringId ARISE_MY_FAITHFUL_SERVANTS_YOU_MY_PEOPLE_WHO_HAVE_INHERITED_THE_BLOOD_IT_IS_THE_CALLING_OF_MY_DAUGHTER_THE_FEAST_OF_BLOOD_WILL_NOW_BEGIN;
+	
+	/**
+	 * ID: 1010639<br>
+	 * Message: Grarr! For the next 2 minutes or so, the game arena are will be cleaned. Throw any items you don't need to the floor now.
+	 */
+	public static final NpcStringId GRARR_FOR_THE_NEXT_2_MINUTES_OR_SO_THE_GAME_ARENA_ARE_WILL_BE_CLEANED_THROW_ANY_ITEMS_YOU_DONT_NEED_TO_THE_FLOOR_NOW;
+	
+	/**
+	 * ID: 1010640<br>
+	 * Message: Grarr! $s1 team is using the hot springs sulfur on the opponent's camp.
+	 */
+	public static final NpcStringId GRARR_S1_TEAM_IS_USING_THE_HOT_SPRINGS_SULFUR_ON_THE_OPPONENTS_CAMP;
+	
+	/**
+	 * ID: 1010641<br>
+	 * Message: Grarr! $s1 team is attempting to steal the jackpot.
+	 */
+	public static final NpcStringId GRARR_S1_TEAM_IS_ATTEMPTING_TO_STEAL_THE_JACKPOT;
+	
+	/**
+	 * ID: 1010642<br>
+	 * Message: ** Vacant Seat **
+	 */
+	public static final NpcStringId _VACANT_SEAT;
+	
+	/**
+	 * ID: 1010643<br>
+	 * Message: $s1 minute(s) are remaining.
+	 */
+	public static final NpcStringId S1_MINUTES_REMAINING;
+	
+	/**
+	 * ID: 1010644<br>
+	 * Message: How dare you ruin the performance of the Dark Choir... Unforgivable!
+	 */
+	public static final NpcStringId HOW_DARE_YOU_RUIN_THE_PERFORMANCE_OF_THE_DARK_CHOIR_UNFORGIVABLE;
+	
+	/**
+	 * ID: 1010645<br>
+	 * Message: Get rid of the invaders who interrupt the performance of the Dark Choir!
+	 */
+	public static final NpcStringId GET_RID_OF_THE_INVADERS_WHO_INTERRUPT_THE_PERFORMANCE_OF_THE_DARK_CHOIR;
+	
+	/**
+	 * ID: 1010646<br>
+	 * Message: Don't you hear the music of death? Reveal the horror of the Dark Choir!
+	 */
+	public static final NpcStringId DONT_YOU_HEAR_THE_MUSIC_OF_DEATH_REVEAL_THE_HORROR_OF_THE_DARK_CHOIR;
+	
+	/**
+	 * ID: 1010647<br>
+	 * Message: The Immortal Plateau
+	 */
+	public static final NpcStringId THE_IMMORTAL_PLATEAU;
+	
+	/**
+	 * ID: 1010648<br>
+	 * Message: Kamael Village
+	 */
+	public static final NpcStringId KAMAEL_VILLAGE;
+	
+	/**
+	 * ID: 1010649<br>
+	 * Message: Isle of Souls Base
+	 */
+	public static final NpcStringId ISLE_OF_SOULS_BASE;
+	
+	/**
+	 * ID: 1010650<br>
+	 * Message: Golden Hills Base
+	 */
+	public static final NpcStringId GOLDEN_HILLS_BASE;
+	
+	/**
+	 * ID: 1010651<br>
+	 * Message: Mimir's Forest Base
+	 */
+	public static final NpcStringId MIMIRS_FOREST_BASE;
+	
+	/**
+	 * ID: 1010652<br>
+	 * Message: Isle of Souls Harbor
+	 */
+	public static final NpcStringId ISLE_OF_SOULS_HARBOR;
+	
+	/**
+	 * ID: 1010653<br>
+	 * Message: Stronghold I
+	 */
+	public static final NpcStringId STRONGHOLD_I;
+	
+	/**
+	 * ID: 1010654<br>
+	 * Message: Stronghold II
+	 */
+	public static final NpcStringId STRONGHOLD_II;
+	
+	/**
+	 * ID: 1010655<br>
+	 * Message: Stronghold III
+	 */
+	public static final NpcStringId STRONGHOLD_III;
+	
+	/**
+	 * ID: 1010656<br>
+	 * Message: Fortress West Gate
+	 */
+	public static final NpcStringId FORTRESS_WEST_GATE;
+	
+	/**
+	 * ID: 1010657<br>
+	 * Message: Fortress East Gate
+	 */
+	public static final NpcStringId FORTRESS_EAST_GATE;
+	
+	/**
+	 * ID: 1010658<br>
+	 * Message: Fortress North Gate
+	 */
+	public static final NpcStringId FORTRESS_NORTH_GATE;
+	
+	/**
+	 * ID: 1010659<br>
+	 * Message: Fortress South Gate
+	 */
+	public static final NpcStringId FORTRESS_SOUTH_GATE;
+	
+	/**
+	 * ID: 1010660<br>
+	 * Message: Front of the Valley Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_VALLEY_FORTRESS;
+	
+	/**
+	 * ID: 1010661<br>
+	 * Message: Goddard Town Square
+	 */
+	public static final NpcStringId GODDARD_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010662<br>
+	 * Message: Front of the Goddard Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_GODDARD_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010663<br>
+	 * Message: Gludio Town Square
+	 */
+	public static final NpcStringId GLUDIO_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010664<br>
+	 * Message: Front of the Gludio Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_GLUDIO_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010665<br>
+	 * Message: Giran Town Square
+	 */
+	public static final NpcStringId GIRAN_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010666<br>
+	 * Message: Front of the Giran Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_GIRAN_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010667<br>
+	 * Message: Front of the Southern Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_SOUTHERN_FORTRESS;
+	
+	/**
+	 * ID: 1010668<br>
+	 * Message: Front of the Swamp Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_SWAMP_FORTRESS;
+	
+	/**
+	 * ID: 1010669<br>
+	 * Message: Dion Town Square
+	 */
+	public static final NpcStringId DION_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010670<br>
+	 * Message: Front of the Dion Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_DION_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010671<br>
+	 * Message: Rune Town Square
+	 */
+	public static final NpcStringId RUNE_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010672<br>
+	 * Message: Front of the Rune Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_RUNE_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010673<br>
+	 * Message: Front of the White Sand Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_WHITE_SAND_FORTRESS;
+	
+	/**
+	 * ID: 1010674<br>
+	 * Message: Front of the Basin Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_BASIN_FORTRESS;
+	
+	/**
+	 * ID: 1010675<br>
+	 * Message: Front of the Ivory Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_IVORY_FORTRESS;
+	
+	/**
+	 * ID: 1010676<br>
+	 * Message: Schuttgart Town Square
+	 */
+	public static final NpcStringId SCHUTTGART_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010677<br>
+	 * Message: Front of the Schuttgart Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_SCHUTTGART_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010678<br>
+	 * Message: Aden Town Square
+	 */
+	public static final NpcStringId ADEN_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010679<br>
+	 * Message: Front of the Aden Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_ADEN_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010680<br>
+	 * Message: Front of the Shanty Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_SHANTY_FORTRESS;
+	
+	/**
+	 * ID: 1010681<br>
+	 * Message: Oren Town Square
+	 */
+	public static final NpcStringId OREN_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010682<br>
+	 * Message: Front of the Oren Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_OREN_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010683<br>
+	 * Message: Front of the Archaic Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_ARCHAIC_FORTRESS;
+	
+	/**
+	 * ID: 1010684<br>
+	 * Message: Front of the Innadril Castle Gate
+	 */
+	public static final NpcStringId FRONT_OF_THE_INNADRIL_CASTLE_GATE;
+	
+	/**
+	 * ID: 1010685<br>
+	 * Message: Front of the Border Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_BORDER_FORTRESS;
+	
+	/**
+	 * ID: 1010686<br>
+	 * Message: Heine Town Square
+	 */
+	public static final NpcStringId HEINE_TOWN_SQUARE;
+	
+	/**
+	 * ID: 1010687<br>
+	 * Message: Front of the Hive Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_HIVE_FORTRESS;
+	
+	/**
+	 * ID: 1010688<br>
+	 * Message: Front of the Narsell Fortress
+	 */
+	public static final NpcStringId FRONT_OF_THE_NARSELL_FORTRESS;
+	
+	/**
+	 * ID: 1010689<br>
+	 * Message: Front of the Gludio Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_GLUDIO_CASTLE;
+	
+	/**
+	 * ID: 1010690<br>
+	 * Message: Front of the Dion Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_DION_CASTLE;
+	
+	/**
+	 * ID: 1010691<br>
+	 * Message: Front of the Giran Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_GIRAN_CASTLE;
+	
+	/**
+	 * ID: 1010692<br>
+	 * Message: Front of the Oren Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_OREN_CASTLE;
+	
+	/**
+	 * ID: 1010693<br>
+	 * Message: Front of the Aden Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_ADEN_CASTLE;
+	
+	/**
+	 * ID: 1010694<br>
+	 * Message: Front of the Innadril Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_INNADRIL_CASTLE;
+	
+	/**
+	 * ID: 1010695<br>
+	 * Message: Front of the Goddard Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_GODDARD_CASTLE;
+	
+	/**
+	 * ID: 1010696<br>
+	 * Message: Front of the Rune Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_RUNE_CASTLE;
+	
+	/**
+	 * ID: 1010697<br>
+	 * Message: Front of the Schuttgart Castle
+	 */
+	public static final NpcStringId FRONT_OF_THE_SCHUTTGART_CASTLE;
+	
+	/**
+	 * ID: 1010698<br>
+	 * Message: Primeval Isle Wharf
+	 */
+	public static final NpcStringId PRIMEVAL_ISLE_WHARF;
+	
+	/**
+	 * ID: 1010699<br>
+	 * Message: Isle of Prayer
+	 */
+	public static final NpcStringId ISLE_OF_PRAYER;
+	
+	/**
+	 * ID: 1010700<br>
+	 * Message: Mithril Mines Western Entrance
+	 */
+	public static final NpcStringId MITHRIL_MINES_WESTERN_ENTRANCE;
+	
+	/**
+	 * ID: 1010701<br>
+	 * Message: Mithril Mines Eastern Entrance
+	 */
+	public static final NpcStringId MITHRIL_MINES_EASTERN_ENTRANCE;
+	
+	/**
+	 * ID: 1010702<br>
+	 * Message: The Giant's Cave Upper Layer
+	 */
+	public static final NpcStringId THE_GIANTS_CAVE_UPPER_LAYER;
+	
+	/**
+	 * ID: 1010703<br>
+	 * Message: The Giant's Cave Lower Layer
+	 */
+	public static final NpcStringId THE_GIANTS_CAVE_LOWER_LAYER;
+	
+	/**
+	 * ID: 1010704<br>
+	 * Message: Field of Silence Center
+	 */
+	public static final NpcStringId FIELD_OF_SILENCE_CENTER;
+	
+	/**
+	 * ID: 1010705<br>
+	 * Message: Field of Whispers Center
+	 */
+	public static final NpcStringId FIELD_OF_WHISPERS_CENTER;
+	
+	/**
+	 * ID: 1010706<br>
+	 * Message: Shyeed's Cavern
+	 */
+	public static final NpcStringId SHYEEDS_CAVERN;
+	
+	/**
+	 * ID: 1010709<br>
+	 * Message: Seed of Infinity Dock
+	 */
+	public static final NpcStringId SEED_OF_INFINITY_DOCK;
+	
+	/**
+	 * ID: 1010710<br>
+	 * Message: Seed of Destruction Dock
+	 */
+	public static final NpcStringId SEED_OF_DESTRUCTION_DOCK;
+	
+	/**
+	 * ID: 1010711<br>
+	 * Message: Seed of Annihilation Dock
+	 */
+	public static final NpcStringId SEED_OF_ANNIHILATION_DOCK;
+	
+	/**
+	 * ID: 1010712<br>
+	 * Message: Town of Aden Einhasad Temple Priest Wood
+	 */
+	public static final NpcStringId TOWN_OF_ADEN_EINHASAD_TEMPLE_PRIEST_WOOD;
+	
+	/**
+	 * ID: 1010713<br>
+	 * Message: Hunter's Village Separated Soul Front
+	 */
+	public static final NpcStringId HUNTERS_VILLAGE_SEPARATED_SOUL_FRONT;
+	
+	/**
+	 * ID: 1029350<br>
+	 * Message: What took so long? I waited for ever.
+	 */
+	public static final NpcStringId WHAT_TOOK_SO_LONG_I_WAITED_FOR_EVER;
+	
+	/**
+	 * ID: 1029351<br>
+	 * Message: I must ask Librarian Sophia about the book.
+	 */
+	public static final NpcStringId I_MUST_ASK_LIBRARIAN_SOPHIA_ABOUT_THE_BOOK;
+	
+	/**
+	 * ID: 1029352<br>
+	 * Message: This library... It's huge but there aren't many useful books, right?
+	 */
+	public static final NpcStringId THIS_LIBRARY_ITS_HUGE_BUT_THERE_ARENT_MANY_USEFUL_BOOKS_RIGHT;
+	
+	/**
+	 * ID: 1029353<br>
+	 * Message: An underground library... I hate damp and smelly places...
+	 */
+	public static final NpcStringId AN_UNDERGROUND_LIBRARY_I_HATE_DAMP_AND_SMELLY_PLACES;
+	
+	/**
+	 * ID: 1029354<br>
+	 * Message: The book that we seek is certainly here. Search inch by inch.
+	 */
+	public static final NpcStringId THE_BOOK_THAT_WE_SEEK_IS_CERTAINLY_HERE_SEARCH_INCH_BY_INCH;
+	
+	/**
+	 * ID: 1029450<br>
+	 * Message: We must search high and low in every room for the reading desk that contains the book we seek.
+	 */
+	public static final NpcStringId WE_MUST_SEARCH_HIGH_AND_LOW_IN_EVERY_ROOM_FOR_THE_READING_DESK_THAT_CONTAINS_THE_BOOK_WE_SEEK;
+	
+	/**
+	 * ID: 1029451<br>
+	 * Message: Remember the content of the books that you found. You can't take them out with you.
+	 */
+	public static final NpcStringId REMEMBER_THE_CONTENT_OF_THE_BOOKS_THAT_YOU_FOUND_YOU_CANT_TAKE_THEM_OUT_WITH_YOU;
+	
+	/**
+	 * ID: 1029452<br>
+	 * Message: It seems that you cannot remember to the room of the watcher who found the book.
+	 */
+	public static final NpcStringId IT_SEEMS_THAT_YOU_CANNOT_REMEMBER_TO_THE_ROOM_OF_THE_WATCHER_WHO_FOUND_THE_BOOK;
+	
+	/**
+	 * ID: 1029453<br>
+	 * Message: Your work here is done, so return to the central guardian.
+	 */
+	public static final NpcStringId YOUR_WORK_HERE_IS_DONE_SO_RETURN_TO_THE_CENTRAL_GUARDIAN;
+	
+	/**
+	 * ID: 1029460<br>
+	 * Message: You foolish invaders who disturb the rest of Solina, be gone from this place.
+	 */
+	public static final NpcStringId YOU_FOOLISH_INVADERS_WHO_DISTURB_THE_REST_OF_SOLINA_BE_GONE_FROM_THIS_PLACE;
+	
+	/**
+	 * ID: 1029461<br>
+	 * Message: I know not what you seek, but this truth cannot be handled by mere humans.
+	 */
+	public static final NpcStringId I_KNOW_NOT_WHAT_YOU_SEEK_BUT_THIS_TRUTH_CANNOT_BE_HANDLED_BY_MERE_HUMANS;
+	
+	/**
+	 * ID: 1029462<br>
+	 * Message: I will not stand by and watch your foolish actions. I warn you, leave this place at once.
+	 */
+	public static final NpcStringId I_WILL_NOT_STAND_BY_AND_WATCH_YOUR_FOOLISH_ACTIONS_I_WARN_YOU_LEAVE_THIS_PLACE_AT_ONCE;
+	
+	/**
+	 * ID: 1029550<br>
+	 * Message: The guardian of the seal doesn't seem to get injured at all until the barrier is destroyed.
+	 */
+	public static final NpcStringId THE_GUARDIAN_OF_THE_SEAL_DOESNT_SEEM_TO_GET_INJURED_AT_ALL_UNTIL_THE_BARRIER_IS_DESTROYED;
+	
+	/**
+	 * ID: 1029551<br>
+	 * Message: The device located in the room in front of the guardian of the seal is definitely the barrier that controls the guardian's power.
+	 */
+	public static final NpcStringId THE_DEVICE_LOCATED_IN_THE_ROOM_IN_FRONT_OF_THE_GUARDIAN_OF_THE_SEAL_IS_DEFINITELY_THE_BARRIER_THAT_CONTROLS_THE_GUARDIANS_POWER;
+	
+	/**
+	 * ID: 1029552<br>
+	 * Message: To remove the barrier, you must find the relics that fit the barrier and activate the device.
+	 */
+	public static final NpcStringId TO_REMOVE_THE_BARRIER_YOU_MUST_FIND_THE_RELICS_THAT_FIT_THE_BARRIER_AND_ACTIVATE_THE_DEVICE;
+	
+	/**
+	 * ID: 1029553<br>
+	 * Message: All the guardians were defeated, and the seal was removed. Teleport to the center.
+	 */
+	public static final NpcStringId ALL_THE_GUARDIANS_WERE_DEFEATED_AND_THE_SEAL_WAS_REMOVED_TELEPORT_TO_THE_CENTER;
+	
+	/**
+	 * ID: 1110071<br>
+	 * Message: ... is the process of standing up.
+	 */
+	public static final NpcStringId _IS_THE_PROCESS_OF_STANDING_UP;
+	
+	/**
+	 * ID: 1110072<br>
+	 * Message: ... is the process of sitting down.
+	 */
+	public static final NpcStringId _IS_THE_PROCESS_OF_SITTING_DOWN;
+	
+	/**
+	 * ID: 1110073<br>
+	 * Message: It is possible to use a skill while sitting down.
+	 */
+	public static final NpcStringId IT_IS_POSSIBLE_TO_USE_A_SKILL_WHILE_SITTING_DOWN;
+	
+	/**
+	 * ID: 1110074<br>
+	 * Message: ...is out of range.
+	 */
+	public static final NpcStringId IS_OUT_OF_RANGE;
+	
+	/**
+	 * ID: 1120300<br>
+	 * Message: Thank you... My book... Child...
+	 */
+	public static final NpcStringId THANK_YOU_MY_BOOK_CHILD;
+	
+	/**
+	 * ID: 1120301<br>
+	 * Message: Killed by $s1
+	 */
+	public static final NpcStringId KILLED_BY_S2;
+	
+	/**
+	 * ID: 1121000<br>
+	 * Message: Steward: Please wait a moment.
+	 */
+	public static final NpcStringId STEWARD_PLEASE_WAIT_A_MOMENT;
+	
+	/**
+	 * ID: 1121001<br>
+	 * Message: Steward: Please restore the Queen's former appearance!
+	 */
+	public static final NpcStringId STEWARD_PLEASE_RESTORE_THE_QUEENS_FORMER_APPEARANCE;
+	
+	/**
+	 * ID: 1121002<br>
+	 * Message: Steward: Waste no time! Please hurry!
+	 */
+	public static final NpcStringId STEWARD_WASTE_NO_TIME_PLEASE_HURRY;
+	
+	/**
+	 * ID: 1121003<br>
+	 * Message: Steward: Was it indeed too much to ask...
+	 */
+	public static final NpcStringId STEWARD_WAS_IT_INDEED_TOO_MUCH_TO_ASK;
+	
+	/**
+	 * ID: 1121004<br>
+	 * Message: Freya: Heathens! Feel my chill!
+	 */
+	public static final NpcStringId FREYA_HEATHENS_FEEL_MY_CHILL;
+	
+	/**
+	 * ID: 1121005<br>
+	 * Message: Attention please! The gates will be closing shortly. All visitors to the Queen's Castle should leave immediately.
+	 */
+	public static final NpcStringId ATTENTION_PLEASE_THE_GATES_WILL_BE_CLOSING_SHORTLY_ALL_VISITORS_TO_THE_QUEENS_CASTLE_SHOULD_LEAVE_IMMEDIATELY;
+	
+	/**
+	 * ID: 1121006<br>
+	 * Message: You cannot carry a weapon without authorization!
+	 */
+	public static final NpcStringId YOU_CANNOT_CARRY_A_WEAPON_WITHOUT_AUTHORIZATION;
+	
+	/**
+	 * ID: 1121007<br>
+	 * Message: Are you trying to deceive me? I'm disappointed.
+	 */
+	public static final NpcStringId ARE_YOU_TRYING_TO_DECEIVE_ME_IM_DISAPPOINTED;
+	
+	/**
+	 * ID: 1121008<br>
+	 * Message: 30 minutes remain.
+	 */
+	public static final NpcStringId N30_MINUTES_REMAIN;
+	
+	/**
+	 * ID: 1121009<br>
+	 * Message: 20 minutes remain.
+	 */
+	public static final NpcStringId N20_MINUTES_REMAIN;
+	
+	/**
+	 * ID: 1200001<br>
+	 * Message: Chilly Coda
+	 */
+	public static final NpcStringId CHILLY_CODA;
+	
+	/**
+	 * ID: 1200002<br>
+	 * Message: Burning Coda
+	 */
+	public static final NpcStringId BURNING_CODA;
+	
+	/**
+	 * ID: 1200003<br>
+	 * Message: Blue Coda
+	 */
+	public static final NpcStringId BLUE_CODA;
+	
+	/**
+	 * ID: 1200004<br>
+	 * Message: Red Coda
+	 */
+	public static final NpcStringId RED_CODA;
+	
+	/**
+	 * ID: 1200005<br>
+	 * Message: Golden Coda
+	 */
+	public static final NpcStringId GOLDEN_CODA;
+	
+	/**
+	 * ID: 1200006<br>
+	 * Message: Desert Coda
+	 */
+	public static final NpcStringId DESERT_CODA;
+	
+	/**
+	 * ID: 1200007<br>
+	 * Message: Lute Coda
+	 */
+	public static final NpcStringId LUTE_CODA;
+	
+	/**
+	 * ID: 1200008<br>
+	 * Message: Twin Coda
+	 */
+	public static final NpcStringId TWIN_CODA;
+	
+	/**
+	 * ID: 1200009<br>
+	 * Message: Dark Coda
+	 */
+	public static final NpcStringId DARK_CODA;
+	
+	/**
+	 * ID: 1200010<br>
+	 * Message: Shining Coda
+	 */
+	public static final NpcStringId SHINING_CODA;
+	
+	/**
+	 * ID: 1200011<br>
+	 * Message: Chilly Cobol
+	 */
+	public static final NpcStringId CHILLY_COBOL;
+	
+	/**
+	 * ID: 1200012<br>
+	 * Message: Burning Cobol
+	 */
+	public static final NpcStringId BURNING_COBOL;
+	
+	/**
+	 * ID: 1200013<br>
+	 * Message: Blue Cobol
+	 */
+	public static final NpcStringId BLUE_COBOL;
+	
+	/**
+	 * ID: 1200014<br>
+	 * Message: Red Cobol
+	 */
+	public static final NpcStringId RED_COBOL;
+	
+	/**
+	 * ID: 1200015<br>
+	 * Message: Golden Cobol
+	 */
+	public static final NpcStringId GOLDEN_COBOL;
+	
+	/**
+	 * ID: 1200016<br>
+	 * Message: Desert Cobol
+	 */
+	public static final NpcStringId DESERT_COBOL;
+	
+	/**
+	 * ID: 1200017<br>
+	 * Message: Sea Cobol
+	 */
+	public static final NpcStringId SEA_COBOL;
+	
+	/**
+	 * ID: 1200018<br>
+	 * Message: Thorn Cobol
+	 */
+	public static final NpcStringId THORN_COBOL;
+	
+	/**
+	 * ID: 1200019<br>
+	 * Message: Dapple Cobol
+	 */
+	public static final NpcStringId DAPPLE_COBOL;
+	
+	/**
+	 * ID: 1200020<br>
+	 * Message: Great Cobol
+	 */
+	public static final NpcStringId GREAT_COBOL;
+	
+	/**
+	 * ID: 1200021<br>
+	 * Message: Chilly Codran
+	 */
+	public static final NpcStringId CHILLY_CODRAN;
+	
+	/**
+	 * ID: 1200022<br>
+	 * Message: Burning Codran
+	 */
+	public static final NpcStringId BURNING_CODRAN;
+	
+	/**
+	 * ID: 1200023<br>
+	 * Message: Blue Codran
+	 */
+	public static final NpcStringId BLUE_CODRAN;
+	
+	/**
+	 * ID: 1200024<br>
+	 * Message: Red Codran
+	 */
+	public static final NpcStringId RED_CODRAN;
+	
+	/**
+	 * ID: 1200025<br>
+	 * Message: Dapple Codran
+	 */
+	public static final NpcStringId DAPPLE_CODRAN;
+	
+	/**
+	 * ID: 1200026<br>
+	 * Message: Desert Codran
+	 */
+	public static final NpcStringId DESERT_CODRAN;
+	
+	/**
+	 * ID: 1200027<br>
+	 * Message: Sea Codran
+	 */
+	public static final NpcStringId SEA_CODRAN;
+	
+	/**
+	 * ID: 1200028<br>
+	 * Message: Twin Codran
+	 */
+	public static final NpcStringId TWIN_CODRAN;
+	
+	/**
+	 * ID: 1200029<br>
+	 * Message: Thorn Codran
+	 */
+	public static final NpcStringId THORN_CODRAN;
+	
+	/**
+	 * ID: 1200030<br>
+	 * Message: Great Codran
+	 */
+	public static final NpcStringId GREAT_CODRAN;
+	
+	/**
+	 * ID: 1200031<br>
+	 * Message: Alternative Dark Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_DARK_CODA;
+	
+	/**
+	 * ID: 1200032<br>
+	 * Message: Alternative Red Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_RED_CODA;
+	
+	/**
+	 * ID: 1200033<br>
+	 * Message: Alternative Chilly Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_CHILLY_CODA;
+	
+	/**
+	 * ID: 1200034<br>
+	 * Message: Alternative Blue Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_BLUE_CODA;
+	
+	/**
+	 * ID: 1200035<br>
+	 * Message: Alternative Golden Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_GOLDEN_CODA;
+	
+	/**
+	 * ID: 1200036<br>
+	 * Message: Alternative Lute Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_LUTE_CODA;
+	
+	/**
+	 * ID: 1200037<br>
+	 * Message: Alternative Desert Coda
+	 */
+	public static final NpcStringId ALTERNATIVE_DESERT_CODA;
+	
+	/**
+	 * ID: 1200038<br>
+	 * Message: Alternative Red Cobol
+	 */
+	public static final NpcStringId ALTERNATIVE_RED_COBOL;
+	
+	/**
+	 * ID: 1200039<br>
+	 * Message: Alternative Chilly Cobol
+	 */
+	public static final NpcStringId ALTERNATIVE_CHILLY_COBOL;
+	
+	/**
+	 * ID: 1200040<br>
+	 * Message: Alternative Blue Cobol
+	 */
+	public static final NpcStringId ALTERNATIVE_BLUE_COBOL;
+	
+	/**
+	 * ID: 1200041<br>
+	 * Message: Alternative Thorn Cobol
+	 */
+	public static final NpcStringId ALTERNATIVE_THORN_COBOL;
+	
+	/**
+	 * ID: 1200042<br>
+	 * Message: Alternative Golden Cobol
+	 */
+	public static final NpcStringId ALTERNATIVE_GOLDEN_COBOL;
+	
+	/**
+	 * ID: 1200043<br>
+	 * Message: Alternative Great Cobol
+	 */
+	public static final NpcStringId ALTERNATIVE_GREAT_COBOL;
+	
+	/**
+	 * ID: 1200044<br>
+	 * Message: Alternative Red Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_RED_CODRAN;
+	
+	/**
+	 * ID: 1200045<br>
+	 * Message: Alternative Sea Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_SEA_CODRAN;
+	
+	/**
+	 * ID: 1200046<br>
+	 * Message: Alternative Chilly Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_CHILLY_CODRAN;
+	
+	/**
+	 * ID: 1200047<br>
+	 * Message: Alternative Blue Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_BLUE_CODRAN;
+	
+	/**
+	 * ID: 1200048<br>
+	 * Message: Alternative Twin Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_TWIN_CODRAN;
+	
+	/**
+	 * ID: 1200049<br>
+	 * Message: Alternative Great Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_GREAT_CODRAN;
+	
+	/**
+	 * ID: 1200050<br>
+	 * Message: Alternative Desert Codran
+	 */
+	public static final NpcStringId ALTERNATIVE_DESERT_CODRAN;
+	
+	/**
+	 * ID: 1300001<br>
+	 * Message: We have broken through the gate! Destroy the encampment and move to the Command Post!
+	 */
+	public static final NpcStringId WE_HAVE_BROKEN_THROUGH_THE_GATE_DESTROY_THE_ENCAMPMENT_AND_MOVE_TO_THE_COMMAND_POST;
+	
+	/**
+	 * ID: 1300002<br>
+	 * Message: The command gate has opened! Capture the flag quickly and raise it high to proclaim our victory!
+	 */
+	public static final NpcStringId THE_COMMAND_GATE_HAS_OPENED_CAPTURE_THE_FLAG_QUICKLY_AND_RAISE_IT_HIGH_TO_PROCLAIM_OUR_VICTORY;
+	
+	/**
+	 * ID: 1300003<br>
+	 * Message: The gods have forsaken us... Retreat!!
+	 */
+	public static final NpcStringId THE_GODS_HAVE_FORSAKEN_US_RETREAT;
+	
+	/**
+	 * ID: 1300004<br>
+	 * Message: You may have broken our arrows, but you will never break our will! Archers, retreat!
+	 */
+	public static final NpcStringId YOU_MAY_HAVE_BROKEN_OUR_ARROWS_BUT_YOU_WILL_NEVER_BREAK_OUR_WILL_ARCHERS_RETREAT;
+	
+	/**
+	 * ID: 1300005<br>
+	 * Message: At last! The Magic Field that protects the fortress has weakened! Volunteers, stand back!
+	 */
+	public static final NpcStringId AT_LAST_THE_MAGIC_FIELD_THAT_PROTECTS_THE_FORTRESS_HAS_WEAKENED_VOLUNTEERS_STAND_BACK;
+	
+	/**
+	 * ID: 1300006<br>
+	 * Message: Aiieeee! Command Center! This is guard unit! We need backup right away!
+	 */
+	public static final NpcStringId AIIEEEE_COMMAND_CENTER_THIS_IS_GUARD_UNIT_WE_NEED_BACKUP_RIGHT_AWAY;
+	
+	/**
+	 * ID: 1300007<br>
+	 * Message: Fortress power disabled.
+	 */
+	public static final NpcStringId FORTRESS_POWER_DISABLED;
+	
+	/**
+	 * ID: 1300008<br>
+	 * Message: Oh my, what has become of me??? My fame.. my friends.. lost.. all lost...
+	 */
+	public static final NpcStringId OH_MY_WHAT_HAS_BECOME_OF_ME_MY_FAME_MY_FRIENDS_LOST_ALL_LOST;
+	
+	/**
+	 * ID: 1300009<br>
+	 * Message: Machine No. 1 - Power Off!
+	 */
+	public static final NpcStringId MACHINE_NO_1_POWER_OFF;
+	
+	/**
+	 * ID: 1300010<br>
+	 * Message: Machine No. 2 - Power Off!
+	 */
+	public static final NpcStringId MACHINE_NO_2_POWER_OFF;
+	
+	/**
+	 * ID: 1300011<br>
+	 * Message: Machine No. 3 - Power Off!
+	 */
+	public static final NpcStringId MACHINE_NO_3_POWER_OFF;
+	
+	/**
+	 * ID: 1300012<br>
+	 * Message: Everyone, concentrate your attacks on $s1! Show the enemy your resolve!
+	 */
+	public static final NpcStringId EVERYONE_CONCENTRATE_YOUR_ATTACKS_ON_S1_SHOW_THE_ENEMY_YOUR_RESOLVE;
+	
+	/**
+	 * ID: 1300013<br>
+	 * Message: Attacking the enemy's reinforcements is necessary. Time to die!
+	 */
+	public static final NpcStringId ATTACKING_THE_ENEMYS_REINFORCEMENTS_IS_NECESSARY_TIME_TO_DIE;
+	
+	/**
+	 * ID: 1300014<br>
+	 * Message: Spirit of Fire, unleash your power! Burn the enemy!!
+	 */
+	public static final NpcStringId SPIRIT_OF_FIRE_UNLEASH_YOUR_POWER_BURN_THE_ENEMY;
+	
+	/**
+	 * ID: 1300015<br>
+	 * Message: Hey, these foes are tougher than they look. I'm going to need some help here.
+	 */
+	public static final NpcStringId HEY_THESE_FOES_ARE_TOUGHER_THAN_THEY_LOOK_IM_GOING_TO_NEED_SOME_HELP_HERE;
+	
+	/**
+	 * ID: 1300016<br>
+	 * Message: Do you need my power? You seem to be struggling.
+	 */
+	public static final NpcStringId DO_YOU_NEED_MY_POWER_YOU_SEEM_TO_BE_STRUGGLING;
+	
+	/**
+	 * ID: 1300017<br>
+	 * Message: I'm rather busy here as well.
+	 */
+	public static final NpcStringId IM_RATHER_BUSY_HERE_AS_WELL;
+	
+	/**
+	 * ID: 1300018<br>
+	 * Message: Don't think that it's gonna end like this. Your ambition will soon be destroyed as well.
+	 */
+	public static final NpcStringId DONT_THINK_THAT_ITS_GONNA_END_LIKE_THIS_YOUR_AMBITION_WILL_SOON_BE_DESTROYED_AS_WELL;
+	
+	/**
+	 * ID: 1300019<br>
+	 * Message: You must have been prepared to die!
+	 */
+	public static final NpcStringId YOU_MUST_HAVE_BEEN_PREPARED_TO_DIE;
+	
+	/**
+	 * ID: 1300020<br>
+	 * Message: I feel so much grief that I can't even take care of myself. There isn't any reason for me to stay here any longer.
+	 */
+	public static final NpcStringId I_FEEL_SO_MUCH_GRIEF_THAT_I_CANT_EVEN_TAKE_CARE_OF_MYSELF_THERE_ISNT_ANY_REASON_FOR_ME_TO_STAY_HERE_ANY_LONGER;
+	
+	/**
+	 * ID: 1300101<br>
+	 * Message: Shanty Fortress
+	 */
+	public static final NpcStringId SHANTY_FORTRESS;
+	
+	/**
+	 * ID: 1300102<br>
+	 * Message: Southern Fortress
+	 */
+	public static final NpcStringId SOUTHERN_FORTRESS;
+	
+	/**
+	 * ID: 1300103<br>
+	 * Message: Hive Fortress
+	 */
+	public static final NpcStringId HIVE_FORTRESS;
+	
+	/**
+	 * ID: 1300104<br>
+	 * Message: Valley Fortress
+	 */
+	public static final NpcStringId VALLEY_FORTRESS;
+	
+	/**
+	 * ID: 1300105<br>
+	 * Message: Ivory Fortress
+	 */
+	public static final NpcStringId IVORY_FORTRESS;
+	
+	/**
+	 * ID: 1300106<br>
+	 * Message: Narsell Fortress
+	 */
+	public static final NpcStringId NARSELL_FORTRESS;
+	
+	/**
+	 * ID: 1300107<br>
+	 * Message: Basin Fortress
+	 */
+	public static final NpcStringId BASIN_FORTRESS;
+	
+	/**
+	 * ID: 1300108<br>
+	 * Message: White Sands Fortress
+	 */
+	public static final NpcStringId WHITE_SANDS_FORTRESS;
+	
+	/**
+	 * ID: 1300109<br>
+	 * Message: Borderland Fortress
+	 */
+	public static final NpcStringId BORDERLAND_FORTRESS;
+	
+	/**
+	 * ID: 1300110<br>
+	 * Message: Swamp Fortress
+	 */
+	public static final NpcStringId SWAMP_FORTRESS;
+	
+	/**
+	 * ID: 1300111<br>
+	 * Message: Archaic Fortress
+	 */
+	public static final NpcStringId ARCHAIC_FORTRESS;
+	
+	/**
+	 * ID: 1300112<br>
+	 * Message: Floran Fortress
+	 */
+	public static final NpcStringId FLORAN_FORTRESS;
+	
+	/**
+	 * ID: 1300113<br>
+	 * Message: Cloud Mountain Fortress
+	 */
+	public static final NpcStringId CLOUD_MOUNTAIN_FORTRESS;
+	
+	/**
+	 * ID: 1300114<br>
+	 * Message: Tanor Fortress
+	 */
+	public static final NpcStringId TANOR_FORTRESS;
+	
+	/**
+	 * ID: 1300115<br>
+	 * Message: Dragonspine Fortress
+	 */
+	public static final NpcStringId DRAGONSPINE_FORTRESS;
+	
+	/**
+	 * ID: 1300116<br>
+	 * Message: Antharas's Fortress
+	 */
+	public static final NpcStringId ANTHARASS_FORTRESS;
+	
+	/**
+	 * ID: 1300117<br>
+	 * Message: Western Fortress
+	 */
+	public static final NpcStringId WESTERN_FORTRESS;
+	
+	/**
+	 * ID: 1300118<br>
+	 * Message: Hunter's Fortress
+	 */
+	public static final NpcStringId HUNTERS_FORTRESS;
+	
+	/**
+	 * ID: 1300119<br>
+	 * Message: Aaru Fortress
+	 */
+	public static final NpcStringId AARU_FORTRESS;
+	
+	/**
+	 * ID: 1300120<br>
+	 * Message: Demon Fortress
+	 */
+	public static final NpcStringId DEMON_FORTRESS;
+	
+	/**
+	 * ID: 1300121<br>
+	 * Message: Monastic Fortress
+	 */
+	public static final NpcStringId MONASTIC_FORTRESS;
+	
+	/**
+	 * ID: 1300122<br>
+	 * Message: Independent State
+	 */
+	public static final NpcStringId INDEPENDENT_STATE;
+	
+	/**
+	 * ID: 1300123<br>
+	 * Message: Nonpartisan
+	 */
+	public static final NpcStringId NONPARTISAN;
+	
+	/**
+	 * ID: 1300124<br>
+	 * Message: Contract State
+	 */
+	public static final NpcStringId CONTRACT_STATE;
+	
+	/**
+	 * ID: 1300125<br>
+	 * Message: First password has been entered.
+	 */
+	public static final NpcStringId FIRST_PASSWORD_HAS_BEEN_ENTERED;
+	
+	/**
+	 * ID: 1300126<br>
+	 * Message: Second password has been entered.
+	 */
+	public static final NpcStringId SECOND_PASSWORD_HAS_BEEN_ENTERED;
+	
+	/**
+	 * ID: 1300127<br>
+	 * Message: Password has not been entered.
+	 */
+	public static final NpcStringId PASSWORD_HAS_NOT_BEEN_ENTERED;
+	
+	/**
+	 * ID: 1300128<br>
+	 * Message: Attempt $s1 / 3 is in progress. => This is the third attempt on $s1.
+	 */
+	public static final NpcStringId ATTEMPT_S1_3_IS_IN_PROGRESS_THIS_IS_THE_THIRD_ATTEMPT_ON_S1;
+	
+	/**
+	 * ID: 1300129<br>
+	 * Message: The 1st Mark is correct.
+	 */
+	public static final NpcStringId THE_1ST_MARK_IS_CORRECT;
+	
+	/**
+	 * ID: 1300130<br>
+	 * Message: The 2nd Mark is correct.
+	 */
+	public static final NpcStringId THE_2ND_MARK_IS_CORRECT;
+	
+	/**
+	 * ID: 1300131<br>
+	 * Message: The Marks have not been assembled.
+	 */
+	public static final NpcStringId THE_MARKS_HAVE_NOT_BEEN_ASSEMBLED;
+	
+	/**
+	 * ID: 1300132<br>
+	 * Message: Olympiad class-free team match is going to begin in Arena $s1 in a moment.
+	 */
+	public static final NpcStringId OLYMPIAD_CLASS_FREE_TEAM_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
+	
+	/**
+	 * ID: 1300133<br>
+	 * Message: Domain Fortress
+	 */
+	public static final NpcStringId DOMAIN_FORTRESS;
+	
+	/**
+	 * ID: 1300134<br>
+	 * Message: Boundary Fortress
+	 */
+	public static final NpcStringId BOUNDARY_FORTRESS;
+	
+	/**
+	 * ID: 1300135<br>
+	 * Message: $s1hour $s2minute
+	 */
+	public static final NpcStringId S1HOUR_S2MINUTE;
+	
+	/**
+	 * ID: 1300136<br>
+	 * Message: Not designated
+	 */
+	public static final NpcStringId NOT_DESIGNATED;
+	
+	/**
+	 * ID: 1300137<br>
+	 * Message: Warriors, have you come to help those who are imprisoned here?
+	 */
+	public static final NpcStringId WARRIORS_HAVE_YOU_COME_TO_HELP_THOSE_WHO_ARE_IMPRISONED_HERE;
+	
+	/**
+	 * ID: 1300138<br>
+	 * Message: Take that, you weakling!
+	 */
+	public static final NpcStringId TAKE_THAT_YOU_WEAKLING;
+	
+	/**
+	 * ID: 1300139<br>
+	 * Message: Behold my might!
+	 */
+	public static final NpcStringId BEHOLD_MY_MIGHT;
+	
+	/**
+	 * ID: 1300140<br>
+	 * Message: Your mind is going blank...
+	 */
+	public static final NpcStringId YOUR_MIND_IS_GOING_BLANK;
+	
+	/**
+	 * ID: 1300141<br>
+	 * Message: Ugh, it hurts down to the bones...
+	 */
+	public static final NpcStringId UGH_IT_HURTS_DOWN_TO_THE_BONES;
+	
+	/**
+	 * ID: 1300142<br>
+	 * Message: I can't stand it anymore. Aah...
+	 */
+	public static final NpcStringId I_CANT_STAND_IT_ANYMORE_AAH;
+	
+	/**
+	 * ID: 1300143<br>
+	 * Message: Kyaaak!
+	 */
+	public static final NpcStringId KYAAAK;
+	
+	/**
+	 * ID: 1300144<br>
+	 * Message: Gasp! How can this be?
+	 */
+	public static final NpcStringId GASP_HOW_CAN_THIS_BE;
+	
+	/**
+	 * ID: 1300145<br>
+	 * Message: I'll rip the flesh from your bones!
+	 */
+	public static final NpcStringId ILL_RIP_THE_FLESH_FROM_YOUR_BONES;
+	
+	/**
+	 * ID: 1300146<br>
+	 * Message: You'll flounder in delusion for the rest of your life!
+	 */
+	public static final NpcStringId YOULL_FLOUNDER_IN_DELUSION_FOR_THE_REST_OF_YOUR_LIFE;
+	
+	/**
+	 * ID: 1300147<br>
+	 * Message: There is no escape from this place!
+	 */
+	public static final NpcStringId THERE_IS_NO_ESCAPE_FROM_THIS_PLACE;
+	
+	/**
+	 * ID: 1300148<br>
+	 * Message: How dare you!
+	 */
+	public static final NpcStringId HOW_DARE_YOU;
+	
+	/**
+	 * ID: 1300149<br>
+	 * Message: I shall defeat you.
+	 */
+	public static final NpcStringId I_SHALL_DEFEAT_YOU;
+	
+	/**
+	 * ID: 1300150<br>
+	 * Message: Begin stage 1!
+	 */
+	public static final NpcStringId BEGIN_STAGE_1;
+	
+	/**
+	 * ID: 1300151<br>
+	 * Message: Begin stage 2!
+	 */
+	public static final NpcStringId BEGIN_STAGE_2;
+	
+	/**
+	 * ID: 1300152<br>
+	 * Message: Begin stage 3!
+	 */
+	public static final NpcStringId BEGIN_STAGE_3;
+	
+	/**
+	 * ID: 1300153<br>
+	 * Message: You've done it! We believed in you, warrior. We want to show our sincerity, though it is small. Please give me some of your time.
+	 */
+	public static final NpcStringId YOUVE_DONE_IT_WE_BELIEVED_IN_YOU_WARRIOR_WE_WANT_TO_SHOW_OUR_SINCERITY_THOUGH_IT_IS_SMALL_PLEASE_GIVE_ME_SOME_OF_YOUR_TIME;
+	
+	/**
+	 * ID: 1300154<br>
+	 * Message: The Central Stronghold's compressor is working.
+	 */
+	public static final NpcStringId THE_CENTRAL_STRONGHOLDS_COMPRESSOR_IS_WORKING;
+	
+	/**
+	 * ID: 1300155<br>
+	 * Message: Stronghold I's compressor is working.
+	 */
+	public static final NpcStringId STRONGHOLD_IS_COMPRESSOR_IS_WORKING;
+	
+	/**
+	 * ID: 1300156<br>
+	 * Message: Stronghold II's compressor is working.
+	 */
+	public static final NpcStringId STRONGHOLD_IIS_COMPRESSOR_IS_WORKING;
+	
+	/**
+	 * ID: 1300157<br>
+	 * Message: Stronghold III's compressor is working.
+	 */
+	public static final NpcStringId STRONGHOLD_IIIS_COMPRESSOR_IS_WORKING;
+	
+	/**
+	 * ID: 1300158<br>
+	 * Message: The Central Stronghold's compressor has been destroyed.
+	 */
+	public static final NpcStringId THE_CENTRAL_STRONGHOLDS_COMPRESSOR_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1300159<br>
+	 * Message: Stronghold I's compressor has been destroyed.
+	 */
+	public static final NpcStringId STRONGHOLD_IS_COMPRESSOR_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1300160<br>
+	 * Message: Stronghold II's compressor has been destroyed.
+	 */
+	public static final NpcStringId STRONGHOLD_IIS_COMPRESSOR_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1300161<br>
+	 * Message: Stronghold III's compressor has been destroyed.
+	 */
+	public static final NpcStringId STRONGHOLD_IIIS_COMPRESSOR_HAS_BEEN_DESTROYED;
+	
+	/**
+	 * ID: 1300162<br>
+	 * Message: What a predicament... my attempts were unsuccessful.
+	 */
+	public static final NpcStringId WHAT_A_PREDICAMENT_MY_ATTEMPTS_WERE_UNSUCCESSFUL;
+	
+	/**
+	 * ID: 1300163<br>
+	 * Message: Courage! Ambition! Passion! Mercenaries who want to realize their dream of fighting in the territory war, come to me! Fortune and glory are waiting for you!
+	 */
+	public static final NpcStringId COURAGE_AMBITION_PASSION_MERCENARIES_WHO_WANT_TO_REALIZE_THEIR_DREAM_OF_FIGHTING_IN_THE_TERRITORY_WAR_COME_TO_ME_FORTUNE_AND_GLORY_ARE_WAITING_FOR_YOU;
+	
+	/**
+	 * ID: 1300164<br>
+	 * Message: Do you wish to fight? Are you afraid? No matter how hard you try, you have nowhere to run. But if you face it head on, our mercenary troop will help you out!
+	 */
+	public static final NpcStringId DO_YOU_WISH_TO_FIGHT_ARE_YOU_AFRAID_NO_MATTER_HOW_HARD_YOU_TRY_YOU_HAVE_NOWHERE_TO_RUN_BUT_IF_YOU_FACE_IT_HEAD_ON_OUR_MERCENARY_TROOP_WILL_HELP_YOU_OUT;
+	
+	/**
+	 * ID: 1300165<br>
+	 * Message: Charge! Charge! Charge!
+	 */
+	public static final NpcStringId CHARGE_CHARGE_CHARGE;
+	
+	/**
+	 * ID: 1300166<br>
+	 * Message: Olympiad class-free individual match is going to begin in Arena $s1 in a moment.
+	 */
+	public static final NpcStringId OLYMPIAD_CLASS_FREE_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
+	
+	/**
+	 * ID: 1300167<br>
+	 * Message: Olympiad class individual match is going to begin in Arena $s1 in a moment.
+	 */
+	public static final NpcStringId OLYMPIAD_CLASS_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT;
+	
+	/**
+	 * ID: 1600001<br>
+	 * Message: Another player is currently being buffed. Please try again in a moment.
+	 */
+	public static final NpcStringId ANOTHER_PLAYER_IS_CURRENTLY_BEING_BUFFED_PLEASE_TRY_AGAIN_IN_A_MOMENT;
+	
+	/**
+	 * ID: 1600002<br>
+	 * Message: You cannot mount while you are polymorphed.
+	 */
+	public static final NpcStringId YOU_CANNOT_MOUNT_WHILE_YOU_ARE_POLYMORPHED;
+	
+	/**
+	 * ID: 1600003<br>
+	 * Message: You cannot mount a Wyvern while in battle mode or while mounted on a Strider.
+	 */
+	public static final NpcStringId YOU_CANNOT_MOUNT_A_WYVERN_WHILE_IN_BATTLE_MODE_OR_WHILE_MOUNTED_ON_A_STRIDER;
+	
+	/**
+	 * ID: 1600004<br>
+	 * Message: Boo-hoo... I hate...
+	 */
+	public static final NpcStringId BOO_HOO_I_HATE;
+	
+	/**
+	 * ID: 1600005<br>
+	 * Message: See you later.
+	 */
+	public static final NpcStringId SEE_YOU_LATER;
+	
+	/**
+	 * ID: 1600006<br>
+	 * Message: You've made a great choice.
+	 */
+	public static final NpcStringId YOUVE_MADE_A_GREAT_CHOICE;
+	
+	/**
+	 * ID: 1600007<br>
+	 * Message: Thanks! I feel more relaxed
+	 */
+	public static final NpcStringId THANKS_I_FEEL_MORE_RELAXED;
+	
+	/**
+	 * ID: 1600008<br>
+	 * Message: Did you see that Firecracker explode?
+	 */
+	public static final NpcStringId DID_YOU_SEE_THAT_FIRECRACKER_EXPLODE;
+	
+	/**
+	 * ID: 1600009<br>
+	 * Message: I am nothing.
+	 */
+	public static final NpcStringId I_AM_NOTHING;
+	
+	/**
+	 * ID: 1600010<br>
+	 * Message: I am telling the truth.
+	 */
+	public static final NpcStringId I_AM_TELLING_THE_TRUTH;
+	
+	/**
+	 * ID: 1600012<br>
+	 * Message: It's free to go back to the village you teleported from.
+	 */
+	public static final NpcStringId ITS_FREE_TO_GO_BACK_TO_THE_VILLAGE_YOU_TELEPORTED_FROM;
+	
+	/**
+	 * ID: 1600013<br>
+	 * Message: If you collect 50 individual Treasure Sack Pieces, you can exchange them for a Treasure Sack.
+	 */
+	public static final NpcStringId IF_YOU_COLLECT_50_INDIVIDUAL_TREASURE_SACK_PIECES_YOU_CAN_EXCHANGE_THEM_FOR_A_TREASURE_SACK;
+	
+	/**
+	 * ID: 1600014<br>
+	 * Message: You must be transformed into a Treasure Hunter to find a chest.
+	 */
+	public static final NpcStringId YOU_MUST_BE_TRANSFORMED_INTO_A_TREASURE_HUNTER_TO_FIND_A_CHEST;
+	
+	/**
+	 * ID: 1600015<br>
+	 * Message: You'd better use the Transformation spell at the right moment since it doesn't last long.
+	 */
+	public static final NpcStringId YOUD_BETTER_USE_THE_TRANSFORMATION_SPELL_AT_THE_RIGHT_MOMENT_SINCE_IT_DOESNT_LAST_LONG;
+	
+	/**
+	 * ID: 1600016<br>
+	 * Message: All of Fantasy Isle is a Peace Zone.
+	 */
+	public static final NpcStringId ALL_OF_FANTASY_ISLE_IS_A_PEACE_ZONE;
+	
+	/**
+	 * ID: 1600017<br>
+	 * Message: If you need to go to Fantasy Isle, come see me.
+	 */
+	public static final NpcStringId IF_YOU_NEED_TO_GO_TO_FANTASY_ISLE_COME_SEE_ME;
+	
+	/**
+	 * ID: 1600018<br>
+	 * Message: You can only purchase a Treasure Hunter Transformation Scroll once every 12 hours.
+	 */
+	public static final NpcStringId YOU_CAN_ONLY_PURCHASE_A_TREASURE_HUNTER_TRANSFORMATION_SCROLL_ONCE_EVERY_12_HOURS;
+	
+	/**
+	 * ID: 1600019<br>
+	 * Message: If your means of arrival was a bit unconventional, then I'll be sending you back to Rune Township, which is the nearest town.
+	 */
+	public static final NpcStringId IF_YOUR_MEANS_OF_ARRIVAL_WAS_A_BIT_UNCONVENTIONAL_THEN_ILL_BE_SENDING_YOU_BACK_TO_RUNE_TOWNSHIP_WHICH_IS_THE_NEAREST_TOWN;
+	
+	/**
+	 * ID: 1600020<br>
+	 * Message: *Rattle*
+	 */
+	public static final NpcStringId RATTLE;
+	
+	/**
+	 * ID: 1600021<br>
+	 * Message: *Bump*
+	 */
+	public static final NpcStringId BUMP;
+	
+	/**
+	 * ID: 1600022<br>
+	 * Message: You will regret this.
+	 */
+	public static final NpcStringId YOU_WILL_REGRET_THIS;
+	
+	/**
+	 * ID: 1600023<br>
+	 * Message: Care to challenge fate and test your luck?
+	 */
+	public static final NpcStringId CARE_TO_CHALLENGE_FATE_AND_TEST_YOUR_LUCK;
+	
+	/**
+	 * ID: 1600024<br>
+	 * Message: Don't pass up the chance to win an S80 weapon.
+	 */
+	public static final NpcStringId DONT_PASS_UP_THE_CHANCE_TO_WIN_AN_S80_WEAPON;
+	
+	/**
+	 * ID: 1800009<br>
+	 * Message: # $s1's Command Channel has looting rights.
+	 */
+	public static final NpcStringId _S1S_COMMAND_CHANNEL_HAS_LOOTING_RIGHTS;
+	
+	/**
+	 * ID: 1800010<br>
+	 * Message: Looting rules are no longer active.
+	 */
+	public static final NpcStringId LOOTING_RULES_ARE_NO_LONGER_ACTIVE;
+	
+	/**
+	 * ID: 1800011<br>
+	 * Message: Our master now comes to claim our vengeance. Soon you will all be nothing more than dirt...
+	 */
+	public static final NpcStringId OUR_MASTER_NOW_COMES_TO_CLAIM_OUR_VENGEANCE_SOON_YOU_WILL_ALL_BE_NOTHING_MORE_THAN_DIRT;
+	
+	/**
+	 * ID: 1800012<br>
+	 * Message: Death to those who challenge the Lords of Dawn!
+	 */
+	public static final NpcStringId DEATH_TO_THOSE_WHO_CHALLENGE_THE_LORDS_OF_DAWN;
+	
+	/**
+	 * ID: 1800013<br>
+	 * Message: Death to those who challenge the Lord!
+	 */
+	public static final NpcStringId DEATH_TO_THOSE_WHO_CHALLENGE_THE_LORD;
+	
+	/**
+	 * ID: 1800014<br>
+	 * Message: Oink oink! Pigs can do it too! Antharas-Surpassing Super Powered Pig Stun! How do like them apples?
+	 */
+	public static final NpcStringId OINK_OINK_PIGS_CAN_DO_IT_TOO_ANTHARAS_SURPASSING_SUPER_POWERED_PIG_STUN_HOW_DO_LIKE_THEM_APPLES;
+	
+	/**
+	 * ID: 1800015<br>
+	 * Message: Oink oink! Take that! Valakas-Terrorizing Ultra Pig Fear! Ha ha!
+	 */
+	public static final NpcStringId OINK_OINK_TAKE_THAT_VALAKAS_TERRORIZING_ULTRA_PIG_FEAR_HA_HA;
+	
+	/**
+	 * ID: 1800016<br>
+	 * Message: Oink oink! Go away! Stop bothering me!
+	 */
+	public static final NpcStringId OINK_OINK_GO_AWAY_STOP_BOTHERING_ME;
+	
+	/**
+	 * ID: 1800017<br>
+	 * Message: Oink oink! Pigs of the world unite! Let's show them our strength!
+	 */
+	public static final NpcStringId OINK_OINK_PIGS_OF_THE_WORLD_UNITE_LETS_SHOW_THEM_OUR_STRENGTH;
+	
+	/**
+	 * ID: 1800018<br>
+	 * Message: You healed me. Thanks a lot! Oink oink!
+	 */
+	public static final NpcStringId YOU_HEALED_ME_THANKS_A_LOT_OINK_OINK;
+	
+	/**
+	 * ID: 1800019<br>
+	 * Message: Oink oink! This treatment hurts too much! Are you sure that you're trying to heal me?
+	 */
+	public static final NpcStringId OINK_OINK_THIS_TREATMENT_HURTS_TOO_MUCH_ARE_YOU_SURE_THAT_YOURE_TRYING_TO_HEAL_ME;
+	
+	/**
+	 * ID: 1800020<br>
+	 * Message: Oink oink! Transform with Moon Crystal Prism Power!
+	 */
+	public static final NpcStringId OINK_OINK_TRANSFORM_WITH_MOON_CRYSTAL_PRISM_POWER;
+	
+	/**
+	 * ID: 1800021<br>
+	 * Message: Oink oink! Nooo! I don't want to go back to normal!
+	 */
+	public static final NpcStringId OINK_OINK_NOOO_I_DONT_WANT_TO_GO_BACK_TO_NORMAL;
+	
+	/**
+	 * ID: 1800022<br>
+	 * Message: Oink oink! I'm rich, so I've got plenty to share! Thanks!
+	 */
+	public static final NpcStringId OINK_OINK_IM_RICH_SO_IVE_GOT_PLENTY_TO_SHARE_THANKS;
+	
+	/**
+	 * ID: 1800023<br>
+	 * Message: It's a weapon surrounded by an ominous aura. I'll discard it because it may be dangerous. Miss...!
+	 */
+	public static final NpcStringId ITS_A_WEAPON_SURROUNDED_BY_AN_OMINOUS_AURA_ILL_DISCARD_IT_BECAUSE_IT_MAY_BE_DANGEROUS_MISS;
+	
+	/**
+	 * ID: 1800024<br>
+	 * Message: Thank you for saving me from the clutches of evil!
+	 */
+	public static final NpcStringId THANK_YOU_FOR_SAVING_ME_FROM_THE_CLUTCHES_OF_EVIL;
+	
+	/**
+	 * ID: 1800025<br>
+	 * Message: That is it for today...let's retreat. Everyone pull back!
+	 */
+	public static final NpcStringId THAT_IS_IT_FOR_TODAYLETS_RETREAT_EVERYONE_PULL_BACK;
+	
+	/**
+	 * ID: 1800026<br>
+	 * Message: Thank you for the rescue. It's a small gift.
+	 */
+	public static final NpcStringId THANK_YOU_FOR_THE_RESCUE_ITS_A_SMALL_GIFT;
+	
+	/**
+	 * ID: 1800027<br>
+	 * Message: $s1.. You don't have a Red Crystal...
+	 */
+	public static final NpcStringId S1_YOU_DONT_HAVE_A_RED_CRYSTAL;
+	
+	/**
+	 * ID: 1800028<br>
+	 * Message: $s1.. You don't have a Blue Crystal...
+	 */
+	public static final NpcStringId S1_YOU_DONT_HAVE_A_BLUE_CRYSTAL;
+	
+	/**
+	 * ID: 1800029<br>
+	 * Message: $s1.. You don't have a Clear Crystal...
+	 */
+	public static final NpcStringId S1_YOU_DONT_HAVE_A_CLEAR_CRYSTAL;
+	
+	/**
+	 * ID: 1800030<br>
+	 * Message: $s1.. If you are too far away from me...I can't let you go...
+	 */
+	public static final NpcStringId S1_IF_YOU_ARE_TOO_FAR_AWAY_FROM_MEI_CANT_LET_YOU_GO;
+	
+	/**
+	 * ID: 1800031<br>
+	 * Message: An alarm has been set off! Everybody will be in danger if they are not taken care of immediately!
+	 */
+	public static final NpcStringId AN_ALARM_HAS_BEEN_SET_OFF_EVERYBODY_WILL_BE_IN_DANGER_IF_THEY_ARE_NOT_TAKEN_CARE_OF_IMMEDIATELY;
+	
+	/**
+	 * ID: 1800032<br>
+	 * Message: It will not be that easy to kill me!
+	 */
+	public static final NpcStringId IT_WILL_NOT_BE_THAT_EASY_TO_KILL_ME;
+	
+	/**
+	 * ID: 1800033<br>
+	 * Message: No...You knew my weakness...
+	 */
+	public static final NpcStringId NOYOU_KNEW_MY_WEAKNESS;
+	
+	/**
+	 * ID: 1800034<br>
+	 * Message: Hello? Is anyone there?
+	 */
+	public static final NpcStringId HELLO_IS_ANYONE_THERE;
+	
+	/**
+	 * ID: 1800035<br>
+	 * Message: Is no one there? How long have I been hiding? I have been starving for days and cannot hold out anymore!
+	 */
+	public static final NpcStringId IS_NO_ONE_THERE_HOW_LONG_HAVE_I_BEEN_HIDING_I_HAVE_BEEN_STARVING_FOR_DAYS_AND_CANNOT_HOLD_OUT_ANYMORE;
+	
+	/**
+	 * ID: 1800036<br>
+	 * Message: If someone would give me some of those tasty Crystal Fragments, I would gladly tell them where Tears is hiding! Yummy, yummy!
+	 */
+	public static final NpcStringId IF_SOMEONE_WOULD_GIVE_ME_SOME_OF_THOSE_TASTY_CRYSTAL_FRAGMENTS_I_WOULD_GLADLY_TELL_THEM_WHERE_TEARS_IS_HIDING_YUMMY_YUMMY;
+	
+	/**
+	 * ID: 1800037<br>
+	 * Message: Hey! You from above the ground! Let's share some Crystal Fragments, if you have any.
+	 */
+	public static final NpcStringId HEY_YOU_FROM_ABOVE_THE_GROUND_LETS_SHARE_SOME_CRYSTAL_FRAGMENTS_IF_YOU_HAVE_ANY;
+	
+	/**
+	 * ID: 1800038<br>
+	 * Message: Crispy and cold feeling! Teehee! Delicious!!
+	 */
+	public static final NpcStringId CRISPY_AND_COLD_FEELING_TEEHEE_DELICIOUS;
+	
+	/**
+	 * ID: 1800039<br>
+	 * Message: Yummy! This is so tasty.
+	 */
+	public static final NpcStringId YUMMY_THIS_IS_SO_TASTY;
+	
+	/**
+	 * ID: 1800040<br>
+	 * Message: Sniff, sniff! Give me more Crystal Fragments!
+	 */
+	public static final NpcStringId SNIFF_SNIFF_GIVE_ME_MORE_CRYSTAL_FRAGMENTS;
+	
+	/**
+	 * ID: 1800041<br>
+	 * Message: How insensitive! It's not nice to give me just a piece! Can't you give me more?
+	 */
+	public static final NpcStringId HOW_INSENSITIVE_ITS_NOT_NICE_TO_GIVE_ME_JUST_A_PIECE_CANT_YOU_GIVE_ME_MORE;
+	
+	/**
+	 * ID: 1800042<br>
+	 * Message: Ah - I'm hungry!
+	 */
+	public static final NpcStringId AH_IM_HUNGRY;
+	
+	/**
+	 * ID: 1800043<br>
+	 * Message: I'm the real one!
+	 */
+	public static final NpcStringId IM_THE_REAL_ONE;
+	
+	/**
+	 * ID: 1800044<br>
+	 * Message: Pick me!
+	 */
+	public static final NpcStringId PICK_ME;
+	
+	/**
+	 * ID: 1800045<br>
+	 * Message: Trust me!
+	 */
+	public static final NpcStringId TRUST_ME;
+	
+	/**
+	 * ID: 1800046<br>
+	 * Message: Not that dude, I'm the real one!
+	 */
+	public static final NpcStringId NOT_THAT_DUDE_IM_THE_REAL_ONE;
+	
+	/**
+	 * ID: 1800047<br>
+	 * Message: Don't be fooled! Don't be fooled! I'm the real one!!
+	 */
+	public static final NpcStringId DONT_BE_FOOLED_DONT_BE_FOOLED_IM_THE_REAL_ONE;
+	
+	/**
+	 * ID: 1800048<br>
+	 * Message: Just act like the real one! Oops!
+	 */
+	public static final NpcStringId JUST_ACT_LIKE_THE_REAL_ONE_OOPS;
+	
+	/**
+	 * ID: 1800049<br>
+	 * Message: You've been fooled!
+	 */
+	public static final NpcStringId YOUVE_BEEN_FOOLED;
+	
+	/**
+	 * ID: 1800050<br>
+	 * Message: Sorry, but...I'm the fake one.
+	 */
+	public static final NpcStringId SORRY_BUT_IM_THE_FAKE_ONE;
+	
+	/**
+	 * ID: 1800051<br>
+	 * Message: I'm the real one! Phew!!
+	 */
+	public static final NpcStringId IM_THE_REAL_ONE_PHEW;
+	
+	/**
+	 * ID: 1800052<br>
+	 * Message: Can't you even find out?
+	 */
+	public static final NpcStringId CANT_YOU_EVEN_FIND_OUT;
+	
+	/**
+	 * ID: 1800053<br>
+	 * Message: Find me!
+	 */
+	public static final NpcStringId FIND_ME;
+	
+	/**
+	 * ID: 1800054<br>
+	 * Message: Huh?! How did you know it was me?
+	 */
+	public static final NpcStringId HUH_HOW_DID_YOU_KNOW_IT_WAS_ME;
+	
+	/**
+	 * ID: 1800055<br>
+	 * Message: Excellent choice! Teehee!
+	 */
+	public static final NpcStringId EXCELLENT_CHOICE_TEEHEE;
+	
+	/**
+	 * ID: 1800056<br>
+	 * Message: You've done well!
+	 */
+	public static final NpcStringId YOUVE_DONE_WELL;
+	
+	/**
+	 * ID: 1800057<br>
+	 * Message: Oh... very sensible?
+	 */
+	public static final NpcStringId OH_VERY_SENSIBLE;
+	
+	/**
+	 * ID: 1800058<br>
+	 * Message: Behold the mighty power of Baylor, foolish mortal!
+	 */
+	public static final NpcStringId BEHOLD_THE_MIGHTY_POWER_OF_BAYLOR_FOOLISH_MORTAL;
+	
+	/**
+	 * ID: 1800059<br>
+	 * Message: No one is going to survive!
+	 */
+	public static final NpcStringId NO_ONE_IS_GOING_TO_SURVIVE;
+	
+	/**
+	 * ID: 1800060<br>
+	 * Message: You'll see what hell is like...
+	 */
+	public static final NpcStringId YOULL_SEE_WHAT_HELL_IS_LIKE;
+	
+	/**
+	 * ID: 1800061<br>
+	 * Message: You will be put in jail!
+	 */
+	public static final NpcStringId YOU_WILL_BE_PUT_IN_JAIL;
+	
+	/**
+	 * ID: 1800062<br>
+	 * Message: Worthless creature... Go to hell!
+	 */
+	public static final NpcStringId WORTHLESS_CREATURE_GO_TO_HELL;
+	
+	/**
+	 * ID: 1800063<br>
+	 * Message: I'll give you something that you'll never forget!
+	 */
+	public static final NpcStringId ILL_GIVE_YOU_SOMETHING_THAT_YOULL_NEVER_FORGET;
+	
+	/**
+	 * ID: 1800064<br>
+	 * Message: Why did you trust to choose me? Hahahaha....
+	 */
+	public static final NpcStringId WHY_DID_YOU_TRUST_TO_CHOOSE_ME_HAHAHAHA;
+	
+	/**
+	 * ID: 1800065<br>
+	 * Message: I'll make you regret that you ever chose me...
+	 */
+	public static final NpcStringId ILL_MAKE_YOU_REGRET_THAT_YOU_EVER_CHOSE_ME;
+	
+	/**
+	 * ID: 1800066<br>
+	 * Message: Don't expect to get out alive..
+	 */
+	public static final NpcStringId DONT_EXPECT_TO_GET_OUT_ALIVE;
+	
+	/**
+	 * ID: 1800067<br>
+	 * Message: Demon King Beleth, give me the power! Aaahh!!!
+	 */
+	public static final NpcStringId DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH;
+	
+	/**
+	 * ID: 1800068<br>
+	 * Message: No....... I feel the power of Fafurion.......
+	 */
+	public static final NpcStringId NO_I_FEEL_THE_POWER_OF_FAFURION;
+	
+	/**
+	 * ID: 1800069<br>
+	 * Message: Fafurion! Please give power to this helpless witch!!
+	 */
+	public static final NpcStringId FAFURION_PLEASE_GIVE_POWER_TO_THIS_HELPLESS_WITCH;
+	
+	/**
+	 * ID: 1800070<br>
+	 * Message: I can't help you much, but I can weaken the power of Baylor since I'm locked up here.
+	 */
+	public static final NpcStringId I_CANT_HELP_YOU_MUCH_BUT_I_CAN_WEAKEN_THE_POWER_OF_BAYLOR_SINCE_IM_LOCKED_UP_HERE;
+	
+	/**
+	 * ID: 1800071<br>
+	 * Message: Your skill is impressive. I'll admit that you are good enough to pass. Take the key and leave this place.
+	 */
+	public static final NpcStringId YOUR_SKILL_IS_IMPRESSIVE_ILL_ADMIT_THAT_YOU_ARE_GOOD_ENOUGH_TO_PASS_TAKE_THE_KEY_AND_LEAVE_THIS_PLACE;
+	
+	/**
+	 * ID: 1800072<br>
+	 * Message: Give me all you have! It's the only way I'll let you live!!
+	 */
+	public static final NpcStringId GIVE_ME_ALL_YOU_HAVE_ITS_THE_ONLY_WAY_ILL_LET_YOU_LIVE;
+	
+	/**
+	 * ID: 1800073<br>
+	 * Message: Hun.. hungry
+	 */
+	public static final NpcStringId HUN_HUNGRY;
+	
+	/**
+	 * ID: 1800074<br>
+	 * Message: Don't be lazy! You bastards!
+	 */
+	public static final NpcStringId DONT_BE_LAZY_YOU_BASTARDS;
+	
+	/**
+	 * ID: 1800075<br>
+	 * Message: They are just henchmen of the Iron Castle... Why did we hide?
+	 */
+	public static final NpcStringId THEY_ARE_JUST_HENCHMEN_OF_THE_IRON_CASTLE_WHY_DID_WE_HIDE;
+	
+	/**
+	 * ID: 1800076<br>
+	 * Message: Guys, show them our power!!!!
+	 */
+	public static final NpcStringId GUYS_SHOW_THEM_OUR_POWER;
+	
+	/**
+	 * ID: 1800077<br>
+	 * Message: You have finally come here. But you will not be able to find the secret room!
+	 */
+	public static final NpcStringId YOU_HAVE_FINALLY_COME_HERE_BUT_YOU_WILL_NOT_BE_ABLE_TO_FIND_THE_SECRET_ROOM;
+	
+	/**
+	 * ID: 1800078<br>
+	 * Message: You have done well in finding me, but I cannot just hand you the key!
+	 */
+	public static final NpcStringId YOU_HAVE_DONE_WELL_IN_FINDING_ME_BUT_I_CANNOT_JUST_HAND_YOU_THE_KEY;
+	
+	/**
+	 * ID: 1800079<br>
+	 * Message: $s1 second(s) remaining.
+	 */
+	public static final NpcStringId S1_SECONDS_REMAINING;
+	
+	/**
+	 * ID: 1800081<br>
+	 * Message: The match is automatically canceled because you are too far from the admission manager.
+	 */
+	public static final NpcStringId THE_MATCH_IS_AUTOMATICALLY_CANCELED_BECAUSE_YOU_ARE_TOO_FAR_FROM_THE_ADMISSION_MANAGER;
+	
+	/**
+	 * ID: 1800082<br>
+	 * Message: Ugh, I have butterflies in my stomach.. The show starts soon...
+	 */
+	public static final NpcStringId UGH_I_HAVE_BUTTERFLIES_IN_MY_STOMACH_THE_SHOW_STARTS_SOON;
+	
+	/**
+	 * ID: 1800083<br>
+	 * Message: Thank you all for coming here tonight.
+	 */
+	public static final NpcStringId THANK_YOU_ALL_FOR_COMING_HERE_TONIGHT;
+	
+	/**
+	 * ID: 1800084<br>
+	 * Message: It is an honor to have the special show today.
+	 */
+	public static final NpcStringId IT_IS_AN_HONOR_TO_HAVE_THE_SPECIAL_SHOW_TODAY;
+	
+	/**
+	 * ID: 1800085<br>
+	 * Message: Fantasy Isle is fully committed to your happiness.
+	 */
+	public static final NpcStringId FANTASY_ISLE_IS_FULLY_COMMITTED_TO_YOUR_HAPPINESS;
+	
+	/**
+	 * ID: 1800086<br>
+	 * Message: Now I'd like to introduce the most beautiful singer in Aden. Please welcome...Leyla Mira!
+	 */
+	public static final NpcStringId NOW_ID_LIKE_TO_INTRODUCE_THE_MOST_BEAUTIFUL_SINGER_IN_ADEN_PLEASE_WELCOMELEYLA_MIRA;
+	
+	/**
+	 * ID: 1800087<br>
+	 * Message: Here she comes!
+	 */
+	public static final NpcStringId HERE_SHE_COMES;
+	
+	/**
+	 * ID: 1800088<br>
+	 * Message: Thank you very much, Leyla!
+	 */
+	public static final NpcStringId THANK_YOU_VERY_MUCH_LEYLA;
+	
+	/**
+	 * ID: 1800089<br>
+	 * Message: Now we're in for a real treat.
+	 */
+	public static final NpcStringId NOW_WERE_IN_FOR_A_REAL_TREAT;
+	
+	/**
+	 * ID: 1800090<br>
+	 * Message: Just back from their world tour put your hands together for the Fantasy Isle Circus!
+	 */
+	public static final NpcStringId JUST_BACK_FROM_THEIR_WORLD_TOUR_PUT_YOUR_HANDS_TOGETHER_FOR_THE_FANTASY_ISLE_CIRCUS;
+	
+	/**
+	 * ID: 1800091<br>
+	 * Message: Come on ~ everyone
+	 */
+	public static final NpcStringId COME_ON_EVERYONE;
+	
+	/**
+	 * ID: 1800092<br>
+	 * Message: Did you like it? That was so amazing.
+	 */
+	public static final NpcStringId DID_YOU_LIKE_IT_THAT_WAS_SO_AMAZING;
+	
+	/**
+	 * ID: 1800093<br>
+	 * Message: Now we also invited individuals with special talents.
+	 */
+	public static final NpcStringId NOW_WE_ALSO_INVITED_INDIVIDUALS_WITH_SPECIAL_TALENTS;
+	
+	/**
+	 * ID: 1800094<br>
+	 * Message: Let's welcome the first person here!
+	 */
+	public static final NpcStringId LETS_WELCOME_THE_FIRST_PERSON_HERE;
+	
+	/**
+	 * ID: 1800095<br>
+	 * Message: ;;;;;;Oh
+	 */
+	public static final NpcStringId OH;
+	
+	/**
+	 * ID: 1800096<br>
+	 * Message: Okay, now here comes the next person. Come on up please.
+	 */
+	public static final NpcStringId OKAY_NOW_HERE_COMES_THE_NEXT_PERSON_COME_ON_UP_PLEASE;
+	
+	/**
+	 * ID: 1800097<br>
+	 * Message: Oh, it looks like something great is going to happen, right?
+	 */
+	public static final NpcStringId OH_IT_LOOKS_LIKE_SOMETHING_GREAT_IS_GOING_TO_HAPPEN_RIGHT;
+	
+	/**
+	 * ID: 1800098<br>
+	 * Message: Oh, my ;;;;
+	 */
+	public static final NpcStringId OH_MY;
+	
+	/**
+	 * ID: 1800099<br>
+	 * Message: That's g- .. great. Now, here comes the last person.
+	 */
+	public static final NpcStringId THATS_G_GREAT_NOW_HERE_COMES_THE_LAST_PERSON;
+	
+	/**
+	 * ID: 1800100<br>
+	 * Message: Now this is the end of today's show.
+	 */
+	public static final NpcStringId NOW_THIS_IS_THE_END_OF_TODAYS_SHOW;
+	
+	/**
+	 * ID: 1800101<br>
+	 * Message: How was it? I hope you all enjoyed it.
+	 */
+	public static final NpcStringId HOW_WAS_IT_I_HOPE_YOU_ALL_ENJOYED_IT;
+	
+	/**
+	 * ID: 1800102<br>
+	 * Message: Please remember that Fantasy Isle is always planning a lot of great shows for you.
+	 */
+	public static final NpcStringId PLEASE_REMEMBER_THAT_FANTASY_ISLE_IS_ALWAYS_PLANNING_A_LOT_OF_GREAT_SHOWS_FOR_YOU;
+	
+	/**
+	 * ID: 1800103<br>
+	 * Message: Well, I wish I could continue all night long, but this is it for today. Thank you.
+	 */
+	public static final NpcStringId WELL_I_WISH_I_COULD_CONTINUE_ALL_NIGHT_LONG_BUT_THIS_IS_IT_FOR_TODAY_THANK_YOU;
+	
+	/**
+	 * ID: 1800104<br>
+	 * Message: We love you.
+	 */
+	public static final NpcStringId WE_LOVE_YOU;
+	
+	/**
+	 * ID: 1800105<br>
+	 * Message: How come people are not here... We are about to start the show.. Hmm
+	 */
+	public static final NpcStringId HOW_COME_PEOPLE_ARE_NOT_HERE_WE_ARE_ABOUT_TO_START_THE_SHOW_HMM;
+	
+	/**
+	 * ID: 1800106<br>
+	 * Message: The opponent team canceled the match.
+	 */
+	public static final NpcStringId THE_OPPONENT_TEAM_CANCELED_THE_MATCH;
+	
+	/**
+	 * ID: 1800107<br>
+	 * Message: It's not easy to obtain.
+	 */
+	public static final NpcStringId ITS_NOT_EASY_TO_OBTAIN;
+	
+	/**
+	 * ID: 1800108<br>
+	 * Message: You're out of your mind coming here...
+	 */
+	public static final NpcStringId YOURE_OUT_OF_YOUR_MIND_COMING_HERE;
+	
+	/**
+	 * ID: 1800109<br>
+	 * Message: Enemy invasion! Hurry up!
+	 */
+	public static final NpcStringId ENEMY_INVASION_HURRY_UP;
+	
+	/**
+	 * ID: 1800110<br>
+	 * Message: Process... shouldn't... be delayed... because of me...
+	 */
+	public static final NpcStringId PROCESS_SHOULDNT_BE_DELAYED_BECAUSE_OF_ME;
+	
+	/**
+	 * ID: 1800111<br>
+	 * Message: Alright, now Leodas is yours!
+	 */
+	public static final NpcStringId ALRIGHT_NOW_LEODAS_IS_YOURS;
+	
+	/**
+	 * ID: 1800112<br>
+	 * Message: We might need new slaves... I'll be back soon, so wait!
+	 */
+	public static final NpcStringId WE_MIGHT_NEED_NEW_SLAVES_ILL_BE_BACK_SOON_SO_WAIT;
+	
+	/**
+	 * ID: 1800113<br>
+	 * Message: Time rift device activation successful!
+	 */
+	public static final NpcStringId TIME_RIFT_DEVICE_ACTIVATION_SUCCESSFUL;
+	
+	/**
+	 * ID: 1800114<br>
+	 * Message: Freedom or death!!!
+	 */
+	public static final NpcStringId FREEDOM_OR_DEATH;
+	
+	/**
+	 * ID: 1800115<br>
+	 * Message: This is the will of true warriors!!!
+	 */
+	public static final NpcStringId THIS_IS_THE_WILL_OF_TRUE_WARRIORS;
+	
+	/**
+	 * ID: 1800116<br>
+	 * Message: We'll have dinner in hell!!!
+	 */
+	public static final NpcStringId WELL_HAVE_DINNER_IN_HELL;
+	
+	/**
+	 * ID: 1800117<br>
+	 * Message: Detonator initialization- time set for $s1 minute(s) from now-
+	 */
+	public static final NpcStringId DETONATOR_INITIALIZATION_TIME_S1_MINUTES_FROM_NOW;
+	
+	/**
+	 * ID: 1800118<br>
+	 * Message: Zzzz- city interference error - forward effect created-
+	 */
+	public static final NpcStringId ZZZZ_CITY_INTERFERENCE_ERROR_FORWARD_EFFECT_CREATED;
+	
+	/**
+	 * ID: 1800119<br>
+	 * Message: Zzzz- city interference error - recurrence effect created-
+	 */
+	public static final NpcStringId ZZZZ_CITY_INTERFERENCE_ERROR_RECURRENCE_EFFECT_CREATED;
+	
+	/**
+	 * ID: 1800120<br>
+	 * Message: Guards are coming, run!
+	 */
+	public static final NpcStringId GUARDS_ARE_COMING_RUN;
+	
+	/**
+	 * ID: 1800121<br>
+	 * Message: Now I can escape on my own!
+	 */
+	public static final NpcStringId NOW_I_CAN_ESCAPE_ON_MY_OWN;
+	
+	/**
+	 * ID: 1800122<br>
+	 * Message: Thanks for your help!
+	 */
+	public static final NpcStringId THANKS_FOR_YOUR_HELP;
+	
+	/**
+	 * ID: 1800123<br>
+	 * Message: Match cancelled. Opponent did not meet the stadium admission requirements.
+	 */
+	public static final NpcStringId MATCH_CANCELLED_OPPONENT_DID_NOT_MEET_THE_STADIUM_ADMISSION_REQUIREMENTS;
+	
+	/**
+	 * ID: 1800124<br>
+	 * Message: Ha-ha yes, die slowly writhing in pain and agony!
+	 */
+	public static final NpcStringId HA_HA_YES_DIE_SLOWLY_WRITHING_IN_PAIN_AND_AGONY;
+	
+	/**
+	 * ID: 1800125<br>
+	 * Message: More... need more... severe pain...
+	 */
+	public static final NpcStringId MORE_NEED_MORE_SEVERE_PAIN;
+	
+	/**
+	 * ID: 1800126<br>
+	 * Message: Ahh! My life is being drained out!
+	 */
+	public static final NpcStringId AHH_MY_LIFE_IS_BEING_DRAINED_OUT;
+	
+	/**
+	 * ID: 1800127<br>
+	 * Message: Something is burning inside my body!
+	 */
+	public static final NpcStringId SOMETHING_IS_BURNING_INSIDE_MY_BODY;
+	
+	/**
+	 * ID: 1800128<br>
+	 * Message: $s1. Not adequate for the stadium level.
+	 */
+	public static final NpcStringId S1_NOT_ADEQUATE_FOR_THE_STADIUM_LEVEL;
+	
+	/**
+	 * ID: 1800129<br>
+	 * Message: $s1, thank you... for giving me your life...
+	 */
+	public static final NpcStringId S1_THANK_YOU_FOR_GIVING_ME_YOUR_LIFE;
+	
+	/**
+	 * ID: 1800130<br>
+	 * Message: I failed... Please forgive me, Darion...
+	 */
+	public static final NpcStringId I_FAILED_PLEASE_FORGIVE_ME_DARION;
+	
+	/**
+	 * ID: 1800131<br>
+	 * Message: $s1, I'll be back... don't get comfortable...
+	 */
+	public static final NpcStringId S1_ILL_BE_BACK_DONT_GET_COMFORTABLE;
+	
+	/**
+	 * ID: 1800132<br>
+	 * Message: If you think I'm giving up like this.. You're wrong!!
+	 */
+	public static final NpcStringId IF_YOU_THINK_IM_GIVING_UP_LIKE_THIS_YOURE_WRONG;
+	
+	/**
+	 * ID: 1800133<br>
+	 * Message: So you're just going to watch me suffer?!
+	 */
+	public static final NpcStringId SO_YOURE_JUST_GOING_TO_WATCH_ME_SUFFER;
+	
+	/**
+	 * ID: 1800134<br>
+	 * Message: It's not over yet!!
+	 */
+	public static final NpcStringId ITS_NOT_OVER_YET;
+	
+	/**
+	 * ID: 1800135<br>
+	 * Message: HA-HA! You were so afraid of death... let me see... If you find me in time... maybe you can... find a way ...
+	 */
+	public static final NpcStringId HA_HA_YOU_WERE_SO_AFRAID_OF_DEATH_LET_ME_SEE_IF_YOU_FIND_ME_IN_TIME_MAYBE_YOU_CAN_FIND_A_WAY;
+	
+	/**
+	 * ID: 1800136<br>
+	 * Message: Don't kill me please.. Something's strangling me...
+	 */
+	public static final NpcStringId DONT_KILL_ME_PLEASE_SOMETHINGS_STRANGLING_ME;
+	
+	/**
+	 * ID: 1800137<br>
+	 * Message: Who will be the lucky one tonight? Ha-ha! Curious, very curious!
+	 */
+	public static final NpcStringId WHO_WILL_BE_THE_LUCKY_ONE_TONIGHT_HA_HA_CURIOUS_VERY_CURIOUS;
+	
+	/**
+	 * ID: 1800138<br>
+	 * Message: Squeak! This will be stronger than the stun the pig used last time!
+	 */
+	public static final NpcStringId SQUEAK_THIS_WILL_BE_STRONGER_THAN_THE_STUN_THE_PIG_USED_LAST_TIME;
+	
+	/**
+	 * ID: 1800139<br>
+	 * Message: Squeak! Here it goes! Extremely scary, even to Valakas!
+	 */
+	public static final NpcStringId SQUEAK_HERE_IT_GOES_EXTREMELY_SCARY_EVEN_TO_VALAKAS;
+	
+	/**
+	 * ID: 1800140<br>
+	 * Message: Squeak! Go away! Leave us alone!
+	 */
+	public static final NpcStringId SQUEAK_GO_AWAY_LEAVE_US_ALONE;
+	
+	/**
+	 * ID: 1800141<br>
+	 * Message: Squeak! Guys, gather up! Let's show our power!
+	 */
+	public static final NpcStringId SQUEAK_GUYS_GATHER_UP_LETS_SHOW_OUR_POWER;
+	
+	/**
+	 * ID: 1800142<br>
+	 * Message: It's not like I'm giving this because I'm grateful~ Squeak!
+	 */
+	public static final NpcStringId ITS_NOT_LIKE_IM_GIVING_THIS_BECAUSE_IM_GRATEFUL_SQUEAK;
+	
+	/**
+	 * ID: 1800143<br>
+	 * Message: Squeak! Even if it is treatment, my bottom hurts so much!
+	 */
+	public static final NpcStringId SQUEAK_EVEN_IF_IT_IS_TREATMENT_MY_BOTTOM_HURTS_SO_MUCH;
+	
+	/**
+	 * ID: 1800144<br>
+	 * Message: Squeak! Transform to Moon Crystal Prism Power!
+	 */
+	public static final NpcStringId SQUEAK_TRANSFORM_TO_MOON_CRYSTAL_PRISM_POWER;
+	
+	/**
+	 * ID: 1800145<br>
+	 * Message: Squeak! Oh, no! I don't want to turn back again...
+	 */
+	public static final NpcStringId SQUEAK_OH_NO_I_DONT_WANT_TO_TURN_BACK_AGAIN;
+	
+	/**
+	 * ID: 1800146<br>
+	 * Message: Squeak! I'm specially giving you a lot since I'm rich. Thank you
+	 */
+	public static final NpcStringId SQUEAK_IM_SPECIALLY_GIVING_YOU_A_LOT_SINCE_IM_RICH_THANK_YOU;
+	
+	/**
+	 * ID: 1800147<br>
+	 * Message: Oink-oink! Rage is boiling up inside of me! Power! Infinite power!!
+	 */
+	public static final NpcStringId OINK_OINK_RAGE_IS_BOILING_UP_INSIDE_OF_ME_POWER_INFINITE_POWER;
+	
+	/**
+	 * ID: 1800148<br>
+	 * Message: Oink-oink! I'm really furious right now!
+	 */
+	public static final NpcStringId OINK_OINK_IM_REALLY_FURIOUS_RIGHT_NOW;
+	
+	/**
+	 * ID: 1800149<br>
+	 * Message: Squeak! Rage is boiling up inside of me! Power! Infinite power!!
+	 */
+	public static final NpcStringId SQUEAK_RAGE_IS_BOILING_UP_INSIDE_OF_ME_POWER_INFINITE_POWER;
+	
+	/**
+	 * ID: 1800150<br>
+	 * Message: Squeak! I'm really furious right now!!
+	 */
+	public static final NpcStringId SQUEAK_IM_REALLY_FURIOUS_RIGHT_NOW;
+	
+	/**
+	 * ID: 1800162<br>
+	 * Message: G Rank
+	 */
+	public static final NpcStringId G_RANK;
+	
+	/**
+	 * ID: 1800163<br>
+	 * Message: Huh... No one would have guessed that a doomed creature would be so powerful...
+	 */
+	public static final NpcStringId HUH_NO_ONE_WOULD_HAVE_GUESSED_THAT_A_DOOMED_CREATURE_WOULD_BE_SO_POWERFUL;
+	
+	/**
+	 * ID: 1800164<br>
+	 * Message: S-Grade
+	 */
+	public static final NpcStringId S_GRADE;
+	
+	/**
+	 * ID: 1800165<br>
+	 * Message: A-Grade
+	 */
+	public static final NpcStringId A_GRADE;
+	
+	/**
+	 * ID: 1800166<br>
+	 * Message: B-Grade
+	 */
+	public static final NpcStringId B_GRADE;
+	
+	/**
+	 * ID: 1800167<br>
+	 * Message: C-Grade
+	 */
+	public static final NpcStringId C_GRADE;
+	
+	/**
+	 * ID: 1800168<br>
+	 * Message: D-Grade
+	 */
+	public static final NpcStringId D_GRADE;
+	
+	/**
+	 * ID: 1800169<br>
+	 * Message: F-Grade
+	 */
+	public static final NpcStringId F_GRADE;
+	
+	/**
+	 * ID: 1800170<br>
+	 * Message: This is... This is a great achievement that is worthy of the true heroes of legend!
+	 */
+	public static final NpcStringId THIS_IS_THIS_IS_A_GREAT_ACHIEVEMENT_THAT_IS_WORTHY_OF_THE_TRUE_HEROES_OF_LEGEND;
+	
+	/**
+	 * ID: 1800171<br>
+	 * Message: Admirable. You greatly decreased the speed of invasion through Kamaloka.
+	 */
+	public static final NpcStringId ADMIRABLE_YOU_GREATLY_DECREASED_THE_SPEED_OF_INVASION_THROUGH_KAMALOKA;
+	
+	/**
+	 * ID: 1800172<br>
+	 * Message: Very good. Your skill makes you a model for other adventurers to follow.
+	 */
+	public static final NpcStringId VERY_GOOD_YOUR_SKILL_MAKES_YOU_A_MODEL_FOR_OTHER_ADVENTURERS_TO_FOLLOW;
+	
+	/**
+	 * ID: 1800173<br>
+	 * Message: Good work. If all adventurers produce results like you, we will slowly start to see the glimmer of hope.
+	 */
+	public static final NpcStringId GOOD_WORK_IF_ALL_ADVENTURERS_PRODUCE_RESULTS_LIKE_YOU_WE_WILL_SLOWLY_START_TO_SEE_THE_GLIMMER_OF_HOPE;
+	
+	/**
+	 * ID: 1800174<br>
+	 * Message: Unfortunately, it seems that Rim Kamaloka cannot be easily approached by everyone.
+	 */
+	public static final NpcStringId UNFORTUNATELY_IT_SEEMS_THAT_RIM_KAMALOKA_CANNOT_BE_EASILY_APPROACHED_BY_EVERYONE;
+	
+	/**
+	 * ID: 1800175<br>
+	 * Message: How disappointing. It looks like I made a mistake in sending you inside Rim Kamaloka.
+	 */
+	public static final NpcStringId HOW_DISAPPOINTING_IT_LOOKS_LIKE_I_MADE_A_MISTAKE_IN_SENDING_YOU_INSIDE_RIM_KAMALOKA;
+	
+	/**
+	 * ID: 1800176<br>
+	 * Message: Intruder alert. Intruder alert.
+	 */
+	public static final NpcStringId INTRUDER_ALERT_INTRUDER_ALERT;
+	
+	/**
+	 * ID: 1800177<br>
+	 * Message: What are you doing? Hurry up and help me!
+	 */
+	public static final NpcStringId WHAT_ARE_YOU_DOING_HURRY_UP_AND_HELP_ME;
+	
+	/**
+	 * ID: 1800178<br>
+	 * Message: I've had it up to here with you! I'll take care of you!
+	 */
+	public static final NpcStringId IVE_HAD_IT_UP_TO_HERE_WITH_YOU_ILL_TAKE_CARE_OF_YOU;
+	
+	/**
+	 * ID: 1800179<br>
+	 * Message: Ah... My mind is a wreck.
+	 */
+	public static final NpcStringId AH_MY_MIND_IS_A_WRECK;
+	
+	/**
+	 * ID: 1800180<br>
+	 * Message: If you thought that my subordinates would be so few, you are mistaken!
+	 */
+	public static final NpcStringId IF_YOU_THOUGHT_THAT_MY_SUBORDINATES_WOULD_BE_SO_FEW_YOU_ARE_MISTAKEN;
+	
+	/**
+	 * ID: 1800181<br>
+	 * Message: There's not much I can do, but I want to help you.
+	 */
+	public static final NpcStringId THERES_NOT_MUCH_I_CAN_DO_BUT_I_WANT_TO_HELP_YOU;
+	
+	/**
+	 * ID: 1800182<br>
+	 * Message: You $s1! Attack them!
+	 */
+	public static final NpcStringId YOU_S1_ATTACK_THEM;
+	
+	/**
+	 * ID: 1800183<br>
+	 * Message: Come out! My subordinate! I summon you to drive them out!
+	 */
+	public static final NpcStringId COME_OUT_MY_SUBORDINATE_I_SUMMON_YOU_TO_DRIVE_THEM_OUT;
+	
+	/**
+	 * ID: 1800184<br>
+	 * Message: There's not much I can do, but I will risk my life to help you!
+	 */
+	public static final NpcStringId THERES_NOT_MUCH_I_CAN_DO_BUT_I_WILL_RISK_MY_LIFE_TO_HELP_YOU;
+	
+	/**
+	 * ID: 1800185<br>
+	 * Message: Arg! The pain is more than I can stand!
+	 */
+	public static final NpcStringId ARG_THE_PAIN_IS_MORE_THAN_I_CAN_STAND;
+	
+	/**
+	 * ID: 1800186<br>
+	 * Message: Ahh! How did he find my weakness?
+	 */
+	public static final NpcStringId AHH_HOW_DID_HE_FIND_MY_WEAKNESS;
+	
+	/**
+	 * ID: 1800187<br>
+	 * Message: We were able to successfully collect the Essence of Kamaloka from the Kanabions that you defeated. Here they are.
+	 */
+	public static final NpcStringId WE_WERE_ABLE_TO_SUCCESSFULLY_COLLECT_THE_ESSENCE_OF_KAMALOKA_FROM_THE_KANABIONS_THAT_YOU_DEFEATED_HERE_THEY_ARE;
+	
+	/**
+	 * ID: 1800188<br>
+	 * Message: But we were able to collect somehow the Essence of Kamaloka from the Kanabions that you defeated. Here they are.
+	 */
+	public static final NpcStringId BUT_WE_WERE_ABLE_TO_COLLECT_SOMEHOW_THE_ESSENCE_OF_KAMALOKA_FROM_THE_KANABIONS_THAT_YOU_DEFEATED_HERE_THEY_ARE;
+	
+	/**
+	 * ID: 1800189<br>
+	 * Message: I'm sorry, but we were unable to collect the Essence of Kamaloka from the Kanabions that you defeated because their dark energy was too weak.
+	 */
+	public static final NpcStringId IM_SORRY_BUT_WE_WERE_UNABLE_TO_COLLECT_THE_ESSENCE_OF_KAMALOKA_FROM_THE_KANABIONS_THAT_YOU_DEFEATED_BECAUSE_THEIR_DARK_ENERGY_WAS_TOO_WEAK;
+	
+	/**
+	 * ID: 1800190<br>
+	 * Message: Rather than simply defeating the enemies, you seem to understand our goal and purpose as well.
+	 */
+	public static final NpcStringId RATHER_THAN_SIMPLY_DEFEATING_THE_ENEMIES_YOU_SEEM_TO_UNDERSTAND_OUR_GOAL_AND_PURPOSE_AS_WELL;
+	
+	/**
+	 * ID: 1800191<br>
+	 * Message: Dopplers and Voids possess an enhanced amount of the Kanabions' dark energy, so it is important to concentrate on defeating them when blocking the Kamalokians attack.
+	 */
+	public static final NpcStringId DOPPLERS_AND_VOIDS_POSSESS_AN_ENHANCED_AMOUNT_OF_THE_KANABIONS_DARK_ENERGY_SO_IT_IS_IMPORTANT_TO_CONCENTRATE_ON_DEFEATING_THEM_WHEN_BLOCKING_THE_KAMALOKIANS_ATTACK;
+	
+	/**
+	 * ID: 1800192<br>
+	 * Message: Have you seen Kanabions being remade as new Kanabions sometimes? You can see it occur more often by inflicting great damage during an attack or at the moment you defeat them.
+	 */
+	public static final NpcStringId HAVE_YOU_SEEN_KANABIONS_BEING_REMADE_AS_NEW_KANABIONS_SOMETIMES_YOU_CAN_SEE_IT_OCCUR_MORE_OFTEN_BY_INFLICTING_GREAT_DAMAGE_DURING_AN_ATTACK_OR_AT_THE_MOMENT_YOU_DEFEAT_THEM;
+	
+	/**
+	 * ID: 1800193<br>
+	 * Message: As in any other battle, it is critical to protect yourself while you are inside Rim Kamaloka. We do not want to attack recklessly.
+	 */
+	public static final NpcStringId AS_IN_ANY_OTHER_BATTLE_IT_IS_CRITICAL_TO_PROTECT_YOURSELF_WHILE_YOU_ARE_INSIDE_RIM_KAMALOKA_WE_DO_NOT_WANT_TO_ATTACK_RECKLESSLY;
+	
+	/**
+	 * ID: 1800194<br>
+	 * Message: We value developing an individual's overall power rather than a one-time victory. If you relied on another person's support this time, why don't you try to rely on your own strength next time?
+	 */
+	public static final NpcStringId WE_VALUE_DEVELOPING_AN_INDIVIDUALS_OVERALL_POWER_RATHER_THAN_A_ONE_TIME_VICTORY_IF_YOU_RELIED_ON_ANOTHER_PERSONS_SUPPORT_THIS_TIME_WHY_DONT_YOU_TRY_TO_RELY_ON_YOUR_OWN_STRENGTH_NEXT_TIME;
+	
+	/**
+	 * ID: 1800195<br>
+	 * Message: Are you sure that the battle just now was at the appropriate level? Bothering lower Kanabions, as if for mere entertainment, is considered to be a wasted battle for us.
+	 */
+	public static final NpcStringId ARE_YOU_SURE_THAT_THE_BATTLE_JUST_NOW_WAS_AT_THE_APPROPRIATE_LEVEL_BOTHERING_LOWER_KANABIONS_AS_IF_FOR_MERE_ENTERTAINMENT_IS_CONSIDERED_TO_BE_A_WASTED_BATTLE_FOR_US;
+	
+	/**
+	 * ID: 1800196<br>
+	 * Message: The greatest victory involves using all available resources, eliminating all of the enemy's opportunities, and bringing it to the fastest possible end. Don't you think so?
+	 */
+	public static final NpcStringId THE_GREATEST_VICTORY_INVOLVES_USING_ALL_AVAILABLE_RESOURCES_ELIMINATING_ALL_OF_THE_ENEMYS_OPPORTUNITIES_AND_BRINGING_IT_TO_THE_FASTEST_POSSIBLE_END_DONT_YOU_THINK_SO;
+	
+	/**
+	 * ID: 1800197<br>
+	 * Message: Emergency! Emergency! The outer wall is weakening rapidly!
+	 */
+	public static final NpcStringId EMERGENCY_EMERGENCY_THE_OUTER_WALL_IS_WEAKENING_RAPIDLY;
+	
+	/**
+	 * ID: 1800198<br>
+	 * Message: The remaining strength of the outer wall is $s1!
+	 */
+	public static final NpcStringId THE_REMAINING_STRENGTH_OF_THE_OUTER_WALL_IS_S1;
+	
+	/**
+	 * ID: 1800199<br>
+	 * Message: Pathfinder Savior
+	 */
+	public static final NpcStringId PATHFINDER_SAVIOR;
+	
+	/**
+	 * ID: 1800200<br>
+	 * Message: Pathfinder Supporter
+	 */
+	public static final NpcStringId PATHFINDER_SUPPORTER;
+	
+	/**
+	 * ID: 1800201<br>
+	 * Message: Some Kanabions who haven't fully adjusted yet to their new physical form are known to exhibit symptoms of an extremely weakened body structure sometimes. If you attack them at that moment, you will have great results.
+	 */
+	public static final NpcStringId SOME_KANABIONS_WHO_HAVENT_FULLY_ADJUSTED_YET_TO_THEIR_NEW_PHYSICAL_FORM_ARE_KNOWN_TO_EXHIBIT_SYMPTOMS_OF_AN_EXTREMELY_WEAKENED_BODY_STRUCTURE_SOMETIMES_IF_YOU_ATTACK_THEM_AT_THAT_MOMENT_YOU_WILL_HAVE_GREAT_RESULTS;
+	
+	/**
+	 * ID: 1800202<br>
+	 * Message: Have you ever heard of $s1? They say it's a genuine $s2!
+	 */
+	public static final NpcStringId HAVE_YOU_EVER_HEARD_OF_S1_THEY_SAY_ITS_A_GENUINE_S2;
+	
+	/**
+	 * ID: 1800203<br>
+	 * Message: There are 5 minutes remaining to register for Kratei's cube match.
+	 */
+	public static final NpcStringId THERE_ARE_5_MINUTES_REMAINING_TO_REGISTER_FOR_KRATEIS_CUBE_MATCH;
+	
+	/**
+	 * ID: 1800204<br>
+	 * Message: There are 3 minutes remaining to register for Kratei's cube match.
+	 */
+	public static final NpcStringId THERE_ARE_3_MINUTES_REMAINING_TO_REGISTER_FOR_KRATEIS_CUBE_MATCH;
+	
+	/**
+	 * ID: 1800205<br>
+	 * Message: There are 1 minutes remaining to register for Kratei's cube match.
+	 */
+	public static final NpcStringId THERE_ARE_1_MINUTES_REMAINING_TO_REGISTER_FOR_KRATEIS_CUBE_MATCH;
+	
+	/**
+	 * ID: 1800207<br>
+	 * Message: The match will begin shortly.
+	 */
+	public static final NpcStringId THE_MATCH_WILL_BEGIN_SHORTLY;
+	
+	/**
+	 * ID: 1800209<br>
+	 * Message: Ohh...oh...oh...
+	 */
+	public static final NpcStringId OHHOHOH;
+	
+	/**
+	 * ID: 1800210<br>
+	 * Message: Fire
+	 */
+	public static final NpcStringId FIRE;
+	
+	/**
+	 * ID: 1800211<br>
+	 * Message: Water
+	 */
+	public static final NpcStringId WATER;
+	
+	/**
+	 * ID: 1800212<br>
+	 * Message: Wind
+	 */
+	public static final NpcStringId WIND;
+	
+	/**
+	 * ID: 1800213<br>
+	 * Message: Earth
+	 */
+	public static final NpcStringId EARTH;
+	
+	/**
+	 * ID: 1800214<br>
+	 * Message: ...It's $s1...
+	 */
+	public static final NpcStringId ITS_S1;
+	
+	/**
+	 * ID: 1800215<br>
+	 * Message: ...$s1 is strong...
+	 */
+	public static final NpcStringId S1_IS_STRONG;
+	
+	/**
+	 * ID: 1800216<br>
+	 * Message: ...It's always $s1...
+	 */
+	public static final NpcStringId ITS_ALWAYS_S1;
+	
+	/**
+	 * ID: 1800217<br>
+	 * Message: ...$s1 won't do...
+	 */
+	public static final NpcStringId S1_WONT_DO;
+	
+	/**
+	 * ID: 1800218<br>
+	 * Message: You will be cursed for seeking the treasure!
+	 */
+	public static final NpcStringId YOU_WILL_BE_CURSED_FOR_SEEKING_THE_TREASURE;
+	
+	/**
+	 * ID: 1800219<br>
+	 * Message: The airship has been summoned. It will automatically depart in 5 minutes.
+	 */
+	public static final NpcStringId THE_AIRSHIP_HAS_BEEN_SUMMONED_IT_WILL_AUTOMATICALLY_DEPART_IN_5_MINUTES;
+	
+	/**
+	 * ID: 1800220<br>
+	 * Message: The regularly scheduled airship has arrived. It will depart for the Aden continent in 1 minute.
+	 */
+	public static final NpcStringId THE_REGULARLY_SCHEDULED_AIRSHIP_HAS_ARRIVED_IT_WILL_DEPART_FOR_THE_ADEN_CONTINENT_IN_1_MINUTE;
+	
+	/**
+	 * ID: 1800221<br>
+	 * Message: The regularly scheduled airship that flies to the Aden continent has departed.
+	 */
+	public static final NpcStringId THE_REGULARLY_SCHEDULED_AIRSHIP_THAT_FLIES_TO_THE_ADEN_CONTINENT_HAS_DEPARTED;
+	
+	/**
+	 * ID: 1800222<br>
+	 * Message: The regularly scheduled airship has arrived. It will depart for the Gracia continent in 1 minute.
+	 */
+	public static final NpcStringId THE_REGULARLY_SCHEDULED_AIRSHIP_HAS_ARRIVED_IT_WILL_DEPART_FOR_THE_GRACIA_CONTINENT_IN_1_MINUTE;
+	
+	/**
+	 * ID: 1800223<br>
+	 * Message: The regularly scheduled airship that flies to the Gracia continent has departed.
+	 */
+	public static final NpcStringId THE_REGULARLY_SCHEDULED_AIRSHIP_THAT_FLIES_TO_THE_GRACIA_CONTINENT_HAS_DEPARTED;
+	
+	/**
+	 * ID: 1800224<br>
+	 * Message: Another airship has been summoned to the wharf. Please try again later.
+	 */
+	public static final NpcStringId ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER;
+	
+	/**
+	 * ID: 1800225<br>
+	 * Message: Huh? The sky looks funny. What's that?
+	 */
+	public static final NpcStringId HUH_THE_SKY_LOOKS_FUNNY_WHATS_THAT;
+	
+	/**
+	 * ID: 1800226<br>
+	 * Message: A powerful subordinate is being held by the Barrier Orb! This reaction means...!
+	 */
+	public static final NpcStringId A_POWERFUL_SUBORDINATE_IS_BEING_HELD_BY_THE_BARRIER_ORB_THIS_REACTION_MEANS;
+	
+	/**
+	 * ID: 1800227<br>
+	 * Message: Be careful...! Something's coming...!
+	 */
+	public static final NpcStringId BE_CAREFUL_SOMETHINGS_COMING;
+	
+	/**
+	 * ID: 1800228<br>
+	 * Message: You must first found a clan or belong to one.
+	 */
+	public static final NpcStringId YOU_MUST_FIRST_FOUND_A_CLAN_OR_BELONG_TO_ONE;
+	
+	/**
+	 * ID: 1800229<br>
+	 * Message: There is no party currently challenging Ekimus. \\n If no party enters within $s1 seconds, the attack on the Heart of Immortality will fail...
+	 */
+	public static final NpcStringId THERE_IS_NO_PARTY_CURRENTLY_CHALLENGING_EKIMUS_N_IF_NO_PARTY_ENTERS_WITHIN_S1_SECONDS_THE_ATTACK_ON_THE_HEART_OF_IMMORTALITY_WILL_FAIL;
+	
+	/**
+	 * ID: 1800230<br>
+	 * Message: Ekimus has gained strength from a tumor...
+	 */
+	public static final NpcStringId EKIMUS_HAS_GAINED_STRENGTH_FROM_A_TUMOR;
+	
+	/**
+	 * ID: 1800231<br>
+	 * Message: Ekimus has been weakened by losing strength from a tumor!
+	 */
+	public static final NpcStringId EKIMUS_HAS_BEEN_WEAKENED_BY_LOSING_STRENGTH_FROM_A_TUMOR;
+	
+	/**
+	 * ID: 1800233<br>
+	 * Message: C'mon, c'mon! Show your face, you little rats! Let me see what the doomed weaklings are scheming!
+	 */
+	public static final NpcStringId CMON_CMON_SHOW_YOUR_FACE_YOU_LITTLE_RATS_LET_ME_SEE_WHAT_THE_DOOMED_WEAKLINGS_ARE_SCHEMING;
+	
+	/**
+	 * ID: 1800234<br>
+	 * Message: Impressive.... Hahaha it's so much fun, but I need to chill a little while. Argekunte, clear the way!
+	 */
+	public static final NpcStringId IMPRESSIVE_HAHAHA_ITS_SO_MUCH_FUN_BUT_I_NEED_TO_CHILL_A_LITTLE_WHILE_ARGEKUNTE_CLEAR_THE_WAY;
+	
+	/**
+	 * ID: 1800235<br>
+	 * Message: Kyahaha! Since the tumor has been resurrected, I no longer need to waste my time on you!
+	 */
+	public static final NpcStringId KYAHAHA_SINCE_THE_TUMOR_HAS_BEEN_RESURRECTED_I_NO_LONGER_NEED_TO_WASTE_MY_TIME_ON_YOU;
+	
+	/**
+	 * ID: 1800236<br>
+	 * Message: Keu... I will leave for now... But don't think this is over... The Seed of Infinity can never die...
+	 */
+	public static final NpcStringId KEU_I_WILL_LEAVE_FOR_NOW_BUT_DONT_THINK_THIS_IS_OVER_THE_SEED_OF_INFINITY_CAN_NEVER_DIE;
+	
+	/**
+	 * ID: 1800237<br>
+	 * Message: Kahahaha! That guy's nothing! He can't even kill without my permission! See here! Ultimate forgotten magic! Deathless Guardian!
+	 */
+	public static final NpcStringId KAHAHAHA_THAT_GUYS_NOTHING_HE_CANT_EVEN_KILL_WITHOUT_MY_PERMISSION_SEE_HERE_ULTIMATE_FORGOTTEN_MAGIC_DEATHLESS_GUARDIAN;
+	
+	/**
+	 * ID: 1800238<br>
+	 * Message: I curse the day that I became your slave in order to escape death, Cohemenes! I swear that I shall see you die with my own eyes!
+	 */
+	public static final NpcStringId I_CURSE_THE_DAY_THAT_I_BECAME_YOUR_SLAVE_IN_ORDER_TO_ESCAPE_DEATH_COHEMENES_I_SWEAR_THAT_I_SHALL_SEE_YOU_DIE_WITH_MY_OWN_EYES;
+	
+	/**
+	 * ID: 1800239<br>
+	 * Message: My enemy is dying, and my blood is boiling! What cruel curse is this!
+	 */
+	public static final NpcStringId MY_ENEMY_IS_DYING_AND_MY_BLOOD_IS_BOILING_WHAT_CRUEL_CURSE_IS_THIS;
+	
+	/**
+	 * ID: 1800240<br>
+	 * Message: Hall of Suffering
+	 */
+	public static final NpcStringId HALL_OF_SUFFERING;
+	
+	/**
+	 * ID: 1800241<br>
+	 * Message: Hall of Erosion
+	 */
+	public static final NpcStringId HALL_OF_EROSION;
+	
+	/**
+	 * ID: 1800242<br>
+	 * Message: Heart of Immortality
+	 */
+	public static final NpcStringId HEART_OF_IMMORTALITY;
+	
+	/**
+	 * ID: 1800243<br>
+	 * Message: Attack
+	 */
+	public static final NpcStringId ATTACK;
+	
+	/**
+	 * ID: 1800244<br>
+	 * Message: Defend
+	 */
+	public static final NpcStringId DEFEND;
+	
+	/**
+	 * ID: 1800245<br>
+	 * Message: Congratulations! You have succeeded at $s1 $s2! The instance will shortly expire.
+	 */
+	public static final NpcStringId CONGRATULATIONS_YOU_HAVE_SUCCEEDED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE;
+	
+	/**
+	 * ID: 1800246<br>
+	 * Message: You have failed at $s1 $s2... The instance will shortly expire.
+	 */
+	public static final NpcStringId YOU_HAVE_FAILED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE;
+	
+	/**
+	 * ID: 1800247<br>
+	 * Message: $s1's party has moved to a different location through the crack in the tumor!
+	 */
+	public static final NpcStringId S1S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR;
+	
+	/**
+	 * ID: 1800248<br>
+	 * Message: $s1's party has entered the Chamber of Ekimus through the crack in the tumor!
+	 */
+	public static final NpcStringId S1S_PARTY_HAS_ENTERED_THE_CHAMBER_OF_EKIMUS_THROUGH_THE_CRACK_IN_THE_TUMOR;
+	
+	/**
+	 * ID: 1800249<br>
+	 * Message: Ekimus has sensed abnormal activity. \\nThe advancing party is forcefully expelled!
+	 */
+	public static final NpcStringId EKIMUS_HAS_SENSED_ABNORMAL_ACTIVITY_NTHE_ADVANCING_PARTY_IS_FORCEFULLY_EXPELLED;
+	
+	/**
+	 * ID: 1800250<br>
+	 * Message: There aren't enough items. In order to summon the airship, you need 5 Energy Star Stones.
+	 */
+	public static final NpcStringId THERE_ARENT_ENOUGH_ITEMS_IN_ORDER_TO_SUMMON_THE_AIRSHIP_YOU_NEED_5_ENERGY_STAR_STONES;
+	
+	/**
+	 * ID: 1800251<br>
+	 * Message: The Soul Devourers who are greedy to eat the Seeds of Life that remain alive until the end have awakened...!
+	 */
+	public static final NpcStringId THE_SOUL_DEVOURERS_WHO_ARE_GREEDY_TO_EAT_THE_SEEDS_OF_LIFE_THAT_REMAIN_ALIVE_UNTIL_THE_END_HAVE_AWAKENED;
+	
+	/**
+	 * ID: 1800252<br>
+	 * Message: The first Feral Hound of the Netherworld has awakened!
+	 */
+	public static final NpcStringId THE_FIRST_FERAL_HOUND_OF_THE_NETHERWORLD_HAS_AWAKENED;
+	
+	/**
+	 * ID: 1800253<br>
+	 * Message: The second Feral Hound of the Netherworld has awakened!
+	 */
+	public static final NpcStringId THE_SECOND_FERAL_HOUND_OF_THE_NETHERWORLD_HAS_AWAKENED;
+	
+	/**
+	 * ID: 1800254<br>
+	 * Message: Clinging on won't help you! Ultimate forgotten magic, Blade Turn!
+	 */
+	public static final NpcStringId CLINGING_ON_WONT_HELP_YOU_ULTIMATE_FORGOTTEN_MAGIC_BLADE_TURN;
+	
+	/**
+	 * ID: 1800255<br>
+	 * Message: Even special sauce can't help you! Ultimate forgotten magic, Force Shield!
+	 */
+	public static final NpcStringId EVEN_SPECIAL_SAUCE_CANT_HELP_YOU_ULTIMATE_FORGOTTEN_MAGIC_FORCE_SHIELD;
+	
+	/**
+	 * ID: 1800256<br>
+	 * Message: You little doomed maggots! Even if you keep swarming, the power of Immortality will only grow stronger!
+	 */
+	public static final NpcStringId YOU_LITTLE_DOOMED_MAGGOTS_EVEN_IF_YOU_KEEP_SWARMING_THE_POWER_OF_IMMORTALITY_WILL_ONLY_GROW_STRONGER;
+	
+	/**
+	 * ID: 1800257<br>
+	 * Message: The Airship Summon License has been awarded. Your clan can now summon an airship.
+	 */
+	public static final NpcStringId THE_AIRSHIP_SUMMON_LICENSE_HAS_BEEN_AWARDED_YOUR_CLAN_CAN_NOW_SUMMON_AN_AIRSHIP;
+	
+	/**
+	 * ID: 1800258<br>
+	 * Message: The Gracia treasure box has appeared!
+	 */
+	public static final NpcStringId THE_GRACIA_TREASURE_BOX_HAS_APPEARED;
+	
+	/**
+	 * ID: 1800259<br>
+	 * Message: The Gracia treasure box will soon disappear!
+	 */
+	public static final NpcStringId THE_GRACIA_TREASURE_BOX_WILL_SOON_DISAPPEAR;
+	
+	/**
+	 * ID: 1800260<br>
+	 * Message: You have been cursed by the tumor and have incurred $s1 damage.
+	 */
+	public static final NpcStringId YOU_HAVE_BEEN_CURSED_BY_THE_TUMOR_AND_HAVE_INCURRED_S1_DAMAGE;
+	
+	/**
+	 * ID: 1800261<br>
+	 * Message: I shall accept your challenge, $s1! Come and die in the arms of immortality!
+	 */
+	public static final NpcStringId I_SHALL_ACCEPT_YOUR_CHALLENGE_S1_COME_AND_DIE_IN_THE_ARMS_OF_IMMORTALITY;
+	
+	/**
+	 * ID: 1800262<br>
+	 * Message: You will participate in $s1 $s2 shortly. Be prepared for anything.
+	 */
+	public static final NpcStringId YOU_WILL_PARTICIPATE_IN_S1_S2_SHORTLY_BE_PREPARED_FOR_ANYTHING;
+	
+	/**
+	 * ID: 1800263<br>
+	 * Message: You can hear the undead of Ekimus rushing toward you. $s1 $s2, it has now begun!
+	 */
+	public static final NpcStringId YOU_CAN_HEAR_THE_UNDEAD_OF_EKIMUS_RUSHING_TOWARD_YOU_S1_S2_IT_HAS_NOW_BEGUN;
+	
+	/**
+	 * ID: 1800264<br>
+	 * Message: You can feel the surging energy of death from the tumor.
+	 */
+	public static final NpcStringId YOU_CAN_FEEL_THE_SURGING_ENERGY_OF_DEATH_FROM_THE_TUMOR;
+	
+	/**
+	 * ID: 1800265<br>
+	 * Message: The area near the tumor is full of ominous energy.
+	 */
+	public static final NpcStringId THE_AREA_NEAR_THE_TUMOR_IS_FULL_OF_OMINOUS_ENERGY;
+	
+	/**
+	 * ID: 1800266<br>
+	 * Message: You tried to drop us. How stupid!
+	 */
+	public static final NpcStringId YOU_TRIED_TO_DROP_US_HOW_STUPID;
+	
+	/**
+	 * ID: 1800267<br>
+	 * Message: We are blood brethren. I can't fall so easily here and leave my brother behind.
+	 */
+	public static final NpcStringId WE_ARE_BLOOD_BRETHREN_I_CANT_FALL_SO_EASILY_HERE_AND_LEAVE_MY_BROTHER_BEHIND;
+	
+	/**
+	 * ID: 1800268<br>
+	 * Message: You were always what I aspired to be. Do you think I would fall so easily here when I have a brother like that?
+	 */
+	public static final NpcStringId YOU_WERE_ALWAYS_WHAT_I_ASPIRED_TO_BE_DO_YOU_THINK_I_WOULD_FALL_SO_EASILY_HERE_WHEN_I_HAVE_A_BROTHER_LIKE_THAT;
+	
+	/**
+	 * ID: 1800269<br>
+	 * Message: With all connections to the tumor severed, Ekimus has lost its power to control the Feral Hound!
+	 */
+	public static final NpcStringId WITH_ALL_CONNECTIONS_TO_THE_TUMOR_SEVERED_EKIMUS_HAS_LOST_ITS_POWER_TO_CONTROL_THE_FERAL_HOUND;
+	
+	/**
+	 * ID: 1800270<br>
+	 * Message: With the connection to the tumor restored, Ekimus has regained control over the Feral Hound...
+	 */
+	public static final NpcStringId WITH_THE_CONNECTION_TO_THE_TUMOR_RESTORED_EKIMUS_HAS_REGAINED_CONTROL_OVER_THE_FERAL_HOUND;
+	
+	/**
+	 * ID: 1800271<br>
+	 * Message: Woooong!
+	 */
+	public static final NpcStringId WOOOONG;
+	
+	/**
+	 * ID: 1800272<br>
+	 * Message: Woong... Woong... Woo...
+	 */
+	public static final NpcStringId WOONG_WOONG_WOO;
+	
+	/**
+	 * ID: 1800273<br>
+	 * Message: The enemies have attacked. Everyone come out and fight!!!! ... Urgh~!
+	 */
+	public static final NpcStringId THE_ENEMIES_HAVE_ATTACKED_EVERYONE_COME_OUT_AND_FIGHT_URGH;
+	
+	/**
+	 * ID: 1800274<br>
+	 * Message: The tumor inside $s1 has been destroyed! \\nIn order to draw out the cowardly Cohemenes, you must destroy all the tumors!
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_BEEN_DESTROYED_NIN_ORDER_TO_DRAW_OUT_THE_COWARDLY_COHEMENES_YOU_MUST_DESTROY_ALL_THE_TUMORS;
+	
+	/**
+	 * ID: 1800275<br>
+	 * Message: The tumor inside $s1 has completely revived. \\nThe restrengthened Cohemenes has fled deeper inside the seed...
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_COMPLETELY_REVIVED_NTHE_RESTRENGTHENED_COHEMENES_HAS_FLED_DEEPER_INSIDE_THE_SEED;
+	
+	/**
+	 * ID: 1800276<br>
+	 * Message: The awarded Airship Summon License has been received.
+	 */
+	public static final NpcStringId THE_AWARDED_AIRSHIP_SUMMON_LICENSE_HAS_BEEN_RECEIVED;
+	
+	/**
+	 * ID: 1800277<br>
+	 * Message: You do not currently have an Airship Summon License. You can earn your Airship Summon License through Engineer Lekon.
+	 */
+	public static final NpcStringId YOU_DO_NOT_CURRENTLY_HAVE_AN_AIRSHIP_SUMMON_LICENSE_YOU_CAN_EARN_YOUR_AIRSHIP_SUMMON_LICENSE_THROUGH_ENGINEER_LEKON;
+	
+	/**
+	 * ID: 1800278<br>
+	 * Message: The Airship Summon License has already been awarded.
+	 */
+	public static final NpcStringId THE_AIRSHIP_SUMMON_LICENSE_HAS_ALREADY_BEEN_AWARDED;
+	
+	/**
+	 * ID: 1800279<br>
+	 * Message: If you have items, please give them to me.
+	 */
+	public static final NpcStringId IF_YOU_HAVE_ITEMS_PLEASE_GIVE_THEM_TO_ME;
+	
+	/**
+	 * ID: 1800280<br>
+	 * Message: My stomach is empty.
+	 */
+	public static final NpcStringId MY_STOMACH_IS_EMPTY;
+	
+	/**
+	 * ID: 1800281<br>
+	 * Message: I'm hungry, I'm hungry!
+	 */
+	public static final NpcStringId IM_HUNGRY_IM_HUNGRY;
+	
+	/**
+	 * ID: 1800282<br>
+	 * Message: I'm still not full...
+	 */
+	public static final NpcStringId IM_STILL_NOT_FULL;
+	
+	/**
+	 * ID: 1800283<br>
+	 * Message: I'm still hungry~
+	 */
+	public static final NpcStringId IM_STILL_HUNGRY;
+	
+	/**
+	 * ID: 1800284<br>
+	 * Message: I feel a little woozy...
+	 */
+	public static final NpcStringId I_FEEL_A_LITTLE_WOOZY;
+	
+	/**
+	 * ID: 1800285<br>
+	 * Message: Give me something to eat.
+	 */
+	public static final NpcStringId GIVE_ME_SOMETHING_TO_EAT;
+	
+	/**
+	 * ID: 1800286<br>
+	 * Message: Now it's time to eat~
+	 */
+	public static final NpcStringId NOW_ITS_TIME_TO_EAT;
+	
+	/**
+	 * ID: 1800287<br>
+	 * Message: I also need a dessert.
+	 */
+	public static final NpcStringId I_ALSO_NEED_A_DESSERT;
+	
+	/**
+	 * ID: 1800289<br>
+	 * Message: I'm full now, I don't want to eat anymore.
+	 */
+	public static final NpcStringId IM_FULL_NOW_I_DONT_WANT_TO_EAT_ANYMORE;
+	
+	/**
+	 * ID: 1800290<br>
+	 * Message: I haven't eaten anything, I'm so weak~
+	 */
+	public static final NpcStringId I_HAVENT_EATEN_ANYTHING_IM_SO_WEAK;
+	
+	/**
+	 * ID: 1800291<br>
+	 * Message: Yum-yum, yum-yum
+	 */
+	public static final NpcStringId YUM_YUM_YUM_YUM;
+	
+	/**
+	 * ID: 1800292<br>
+	 * Message: You've sustained $s1 damage as Tumor's shell started melting after touching the sacred seal on the shield!
+	 */
+	public static final NpcStringId YOUVE_SUSTAINED_S1_DAMAGE_AS_TUMORS_SHELL_STARTED_MELTING_AFTER_TOUCHING_THE_SACRED_SEAL_ON_THE_SHIELD;
+	
+	/**
+	 * ID: 1800293<br>
+	 * Message: You've sustained $s1 damage as Soul Coffin's shell started melting after touching the sacred seal on the shield!
+	 */
+	public static final NpcStringId YOUVE_SUSTAINED_S1_DAMAGE_AS_SOUL_COFFINS_SHELL_STARTED_MELTING_AFTER_TOUCHING_THE_SACRED_SEAL_ON_THE_SHIELD;
+	
+	/**
+	 * ID: 1800295<br>
+	 * Message: Obelisk has collapsed. Don't let the enemies jump around wildly anymore!!!!
+	 */
+	public static final NpcStringId OBELISK_HAS_COLLAPSED_DONT_LET_THE_ENEMIES_JUMP_AROUND_WILDLY_ANYMORE;
+	
+	/**
+	 * ID: 1800296<br>
+	 * Message: Enemies are trying to destroy the fortress. Everyone defend the fortress!!!!
+	 */
+	public static final NpcStringId ENEMIES_ARE_TRYING_TO_DESTROY_THE_FORTRESS_EVERYONE_DEFEND_THE_FORTRESS;
+	
+	/**
+	 * ID: 1800297<br>
+	 * Message: Come out, warriors. Protect Seed of Destruction.
+	 */
+	public static final NpcStringId COME_OUT_WARRIORS_PROTECT_SEED_OF_DESTRUCTION;
+	
+	/**
+	 * ID: 1800298<br>
+	 * Message: The undead of Ekimus is attacking Seed of Life. Defending Hall of Erosion will fail even if one Seed of Life is destroyed...
+	 */
+	public static final NpcStringId THE_UNDEAD_OF_EKIMUS_IS_ATTACKING_SEED_OF_LIFE_DEFENDING_HALL_OF_EROSION_WILL_FAIL_EVEN_IF_ONE_SEED_OF_LIFE_IS_DESTROYED;
+	
+	/**
+	 * ID: 1800299<br>
+	 * Message: All the tumors inside $s1 have been destroyed! Driven into a corner, Cohemenes appears close by!
+	 */
+	public static final NpcStringId ALL_THE_TUMORS_INSIDE_S1_HAVE_BEEN_DESTROYED_DRIVEN_INTO_A_CORNER_COHEMENES_APPEARS_CLOSE_BY;
+	
+	/**
+	 * ID: 1800300<br>
+	 * Message: The tumor inside $s1 has been destroyed! \\nThe nearby Undead that were attacking Seed of Life start losing their energy and run away!
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_BEEN_DESTROYED_NTHE_NEARBY_UNDEAD_THAT_WERE_ATTACKING_SEED_OF_LIFE_START_LOSING_THEIR_ENERGY_AND_RUN_AWAY;
+	
+	/**
+	 * ID: 1800301<br>
+	 * Message: The tumor inside $s1 has completely revived. \\nRecovered nearby Undead are swarming toward Seed of Life...
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_COMPLETELY_REVIVED_NRECOVERED_NEARBY_UNDEAD_ARE_SWARMING_TOWARD_SEED_OF_LIFE;
+	
+	/**
+	 * ID: 1800302<br>
+	 * Message: The tumor inside $s1 that has provided energy \\n to Ekimus is destroyed!
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_THAT_HAS_PROVIDED_ENERGY_N_TO_EKIMUS_IS_DESTROYED;
+	
+	/**
+	 * ID: 1800303<br>
+	 * Message: The tumor inside $s1 has been completely resurrected \\n and started to energize Ekimus again...
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_BEEN_COMPLETELY_RESURRECTED_N_AND_STARTED_TO_ENERGIZE_EKIMUS_AGAIN;
+	
+	/**
+	 * ID: 1800304<br>
+	 * Message: The tumor inside $s1 has been destroyed! \\nThe speed that Ekimus calls out his prey has slowed down!
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_BEEN_DESTROYED_NTHE_SPEED_THAT_EKIMUS_CALLS_OUT_HIS_PREY_HAS_SLOWED_DOWN;
+	
+	/**
+	 * ID: 1800305<br>
+	 * Message: The tumor inside $s1 has completely revived. \\nEkimus started to regain his energy and is desperately looking for his prey...
+	 */
+	public static final NpcStringId THE_TUMOR_INSIDE_S1_HAS_COMPLETELY_REVIVED_NEKIMUS_STARTED_TO_REGAIN_HIS_ENERGY_AND_IS_DESPERATELY_LOOKING_FOR_HIS_PREY;
+	
+	/**
+	 * ID: 1800306<br>
+	 * Message: Bring more, more souls...!
+	 */
+	public static final NpcStringId BRING_MORE_MORE_SOULS;
+	
+	/**
+	 * ID: 1800307<br>
+	 * Message: The Hall of Erosion attack will fail unless you make a quick attack against the tumor!
+	 */
+	public static final NpcStringId THE_HALL_OF_EROSION_ATTACK_WILL_FAIL_UNLESS_YOU_MAKE_A_QUICK_ATTACK_AGAINST_THE_TUMOR;
+	
+	/**
+	 * ID: 1800308<br>
+	 * Message: As the tumor was not threatened, Cohemenes completely ran away to deep inside the Seed...
+	 */
+	public static final NpcStringId AS_THE_TUMOR_WAS_NOT_THREATENED_COHEMENES_COMPLETELY_RAN_AWAY_TO_DEEP_INSIDE_THE_SEED;
+	
+	/**
+	 * ID: 1800309<br>
+	 * Message: Your goal will be obstructed or be under a restraint.
+	 */
+	public static final NpcStringId YOUR_GOAL_WILL_BE_OBSTRUCTED_OR_BE_UNDER_A_RESTRAINT;
+	
+	/**
+	 * ID: 1800310<br>
+	 * Message: You may face an unforeseen problem on your course toward the goal.
+	 */
+	public static final NpcStringId YOU_MAY_FACE_AN_UNFORESEEN_PROBLEM_ON_YOUR_COURSE_TOWARD_THE_GOAL;
+	
+	/**
+	 * ID: 1800311<br>
+	 * Message: You may feel nervous and anxious because of unfavorable situations.
+	 */
+	public static final NpcStringId YOU_MAY_FEEL_NERVOUS_AND_ANXIOUS_BECAUSE_OF_UNFAVORABLE_SITUATIONS;
+	
+	/**
+	 * ID: 1800312<br>
+	 * Message: Be warned when the situation is difficult because you may lose your judgment and make an irrational mistake.
+	 */
+	public static final NpcStringId BE_WARNED_WHEN_THE_SITUATION_IS_DIFFICULT_BECAUSE_YOU_MAY_LOSE_YOUR_JUDGMENT_AND_MAKE_AN_IRRATIONAL_MISTAKE;
+	
+	/**
+	 * ID: 1800313<br>
+	 * Message: You may meet a trustworthy person or a good opportunity.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_A_TRUSTWORTHY_PERSON_OR_A_GOOD_OPPORTUNITY;
+	
+	/**
+	 * ID: 1800314<br>
+	 * Message: Your downward life starts taking an upturn.
+	 */
+	public static final NpcStringId YOUR_DOWNWARD_LIFE_STARTS_TAKING_AN_UPTURN;
+	
+	/**
+	 * ID: 1800315<br>
+	 * Message: You will attract attention from people with your popularity.
+	 */
+	public static final NpcStringId YOU_WILL_ATTRACT_ATTENTION_FROM_PEOPLE_WITH_YOUR_POPULARITY;
+	
+	/**
+	 * ID: 1800316<br>
+	 * Message: Your star of fortune says there'll be fish snapping at your bait.
+	 */
+	public static final NpcStringId YOUR_STAR_OF_FORTUNE_SAYS_THERELL_BE_FISH_SNAPPING_AT_YOUR_BAIT;
+	
+	/**
+	 * ID: 1800317<br>
+	 * Message: There may be a conflict born of your dogmatic procedures.
+	 */
+	public static final NpcStringId THERE_MAY_BE_A_CONFLICT_BORN_OF_YOUR_DOGMATIC_PROCEDURES;
+	
+	/**
+	 * ID: 1800318<br>
+	 * Message: Your wisdom and creativity may lead you to success with your goal.
+	 */
+	public static final NpcStringId YOUR_WISDOM_AND_CREATIVITY_MAY_LEAD_YOU_TO_SUCCESS_WITH_YOUR_GOAL;
+	
+	/**
+	 * ID: 1800319<br>
+	 * Message: You may accomplish your goals if you diligently pursue them without giving up.
+	 */
+	public static final NpcStringId YOU_MAY_ACCOMPLISH_YOUR_GOALS_IF_YOU_DILIGENTLY_PURSUE_THEM_WITHOUT_GIVING_UP;
+	
+	/**
+	 * ID: 1800320<br>
+	 * Message: You may get help if you go through the front door without seeking tricks or maneuvers.
+	 */
+	public static final NpcStringId YOU_MAY_GET_HELP_IF_YOU_GO_THROUGH_THE_FRONT_DOOR_WITHOUT_SEEKING_TRICKS_OR_MANEUVERS;
+	
+	/**
+	 * ID: 1800321<br>
+	 * Message: A good result is on the way if you set a goal and bravely proceed toward it.
+	 */
+	public static final NpcStringId A_GOOD_RESULT_IS_ON_THE_WAY_IF_YOU_SET_A_GOAL_AND_BRAVELY_PROCEED_TOWARD_IT;
+	
+	/**
+	 * ID: 1800322<br>
+	 * Message: Everything will be smoothly managed no matter how difficult.
+	 */
+	public static final NpcStringId EVERYTHING_WILL_BE_SMOOTHLY_MANAGED_NO_MATTER_HOW_DIFFICULT;
+	
+	/**
+	 * ID: 1800323<br>
+	 * Message: Be firm and carefully scrutinize circumstances even when things are difficult.
+	 */
+	public static final NpcStringId BE_FIRM_AND_CAREFULLY_SCRUTINIZE_CIRCUMSTANCES_EVEN_WHEN_THINGS_ARE_DIFFICULT;
+	
+	/**
+	 * ID: 1800324<br>
+	 * Message: Always think over to find neglected problems you haven't taken care of yet.
+	 */
+	public static final NpcStringId ALWAYS_THINK_OVER_TO_FIND_NEGLECTED_PROBLEMS_YOU_HAVENT_TAKEN_CARE_OF_YET;
+	
+	/**
+	 * ID: 1800325<br>
+	 * Message: Financial fortune will greet your poor life.
+	 */
+	public static final NpcStringId FINANCIAL_FORTUNE_WILL_GREET_YOUR_POOR_LIFE;
+	
+	/**
+	 * ID: 1800326<br>
+	 * Message: You may acquire wealth and fame after unlucky circumstances.
+	 */
+	public static final NpcStringId YOU_MAY_ACQUIRE_WEALTH_AND_FAME_AFTER_UNLUCKY_CIRCUMSTANCES;
+	
+	/**
+	 * ID: 1800327<br>
+	 * Message: The difficult situations will turn to hope with unforeseen help.
+	 */
+	public static final NpcStringId THE_DIFFICULT_SITUATIONS_WILL_TURN_TO_HOPE_WITH_UNFORESEEN_HELP;
+	
+	/**
+	 * ID: 1800328<br>
+	 * Message: A great task will result in success.
+	 */
+	public static final NpcStringId A_GREAT_TASK_WILL_RESULT_IN_SUCCESS;
+	
+	/**
+	 * ID: 1800329<br>
+	 * Message: You may encounter a precious person who will lift your loneliness and discord.
+	 */
+	public static final NpcStringId YOU_MAY_ENCOUNTER_A_PRECIOUS_PERSON_WHO_WILL_LIFT_YOUR_LONELINESS_AND_DISCORD;
+	
+	/**
+	 * ID: 1800330<br>
+	 * Message: People around you will encourage your every task in the future.
+	 */
+	public static final NpcStringId PEOPLE_AROUND_YOU_WILL_ENCOURAGE_YOUR_EVERY_TASK_IN_THE_FUTURE;
+	
+	/**
+	 * ID: 1800331<br>
+	 * Message: Everything will be smoothly managed.
+	 */
+	public static final NpcStringId EVERYTHING_WILL_BE_SMOOTHLY_MANAGED;
+	
+	/**
+	 * ID: 1800332<br>
+	 * Message: You will meet a person who can cherish your values if you maintain good ties with people.
+	 */
+	public static final NpcStringId YOU_WILL_MEET_A_PERSON_WHO_CAN_CHERISH_YOUR_VALUES_IF_YOU_MAINTAIN_GOOD_TIES_WITH_PEOPLE;
+	
+	/**
+	 * ID: 1800333<br>
+	 * Message: Maintain cooperative attitude since you will meet someone to be of help.
+	 */
+	public static final NpcStringId MAINTAIN_COOPERATIVE_ATTITUDE_SINCE_YOU_WILL_MEET_SOMEONE_TO_BE_OF_HELP;
+	
+	/**
+	 * ID: 1800334<br>
+	 * Message: Keep your moderation and ego in check even in successful phases of your life.
+	 */
+	public static final NpcStringId KEEP_YOUR_MODERATION_AND_EGO_IN_CHECK_EVEN_IN_SUCCESSFUL_PHASES_OF_YOUR_LIFE;
+	
+	/**
+	 * ID: 1800335<br>
+	 * Message: When it comes to work, lifestyle and relationships you'll be better off to go by the text rather than tricks.
+	 */
+	public static final NpcStringId WHEN_IT_COMES_TO_WORK_LIFESTYLE_AND_RELATIONSHIPS_YOULL_BE_BETTER_OFF_TO_GO_BY_THE_TEXT_RATHER_THAN_TRICKS;
+	
+	/**
+	 * ID: 1800336<br>
+	 * Message: Your task will receive substantial support since the surroundings will fully develop.
+	 */
+	public static final NpcStringId YOUR_TASK_WILL_RECEIVE_SUBSTANTIAL_SUPPORT_SINCE_THE_SURROUNDINGS_WILL_FULLY_DEVELOP;
+	
+	/**
+	 * ID: 1800337<br>
+	 * Message: Your star of fortune indicate a success with mental and material assistance.
+	 */
+	public static final NpcStringId YOUR_STAR_OF_FORTUNE_INDICATE_A_SUCCESS_WITH_MENTAL_AND_MATERIAL_ASSISTANCE;
+	
+	/**
+	 * ID: 1800338<br>
+	 * Message: You will enjoy popularity with your creative talents and clever acts.
+	 */
+	public static final NpcStringId YOU_WILL_ENJOY_POPULARITY_WITH_YOUR_CREATIVE_TALENTS_AND_CLEVER_ACTS;
+	
+	/**
+	 * ID: 1800339<br>
+	 * Message: People will line up to be of assistance to you.
+	 */
+	public static final NpcStringId PEOPLE_WILL_LINE_UP_TO_BE_OF_ASSISTANCE_TO_YOU;
+	
+	/**
+	 * ID: 1800340<br>
+	 * Message: You may meet someone to share your journey.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_SOMEONE_TO_SHARE_YOUR_JOURNEY;
+	
+	/**
+	 * ID: 1800341<br>
+	 * Message: You may achieve connections in many fields.
+	 */
+	public static final NpcStringId YOU_MAY_ACHIEVE_CONNECTIONS_IN_MANY_FIELDS;
+	
+	/**
+	 * ID: 1800342<br>
+	 * Message: An attitude that continually studies and explores is needed, and always be sincere.
+	 */
+	public static final NpcStringId AN_ATTITUDE_THAT_CONTINUALLY_STUDIES_AND_EXPLORES_IS_NEEDED_AND_ALWAYS_BE_SINCERE;
+	
+	/**
+	 * ID: 1800343<br>
+	 * Message: It's an image of a butterfly on a flower in warm spring air.
+	 */
+	public static final NpcStringId ITS_AN_IMAGE_OF_A_BUTTERFLY_ON_A_FLOWER_IN_WARM_SPRING_AIR;
+	
+	/**
+	 * ID: 1800344<br>
+	 * Message: Your goals will move smoothly with peace and happiness in your life.
+	 */
+	public static final NpcStringId YOUR_GOALS_WILL_MOVE_SMOOTHLY_WITH_PEACE_AND_HAPPINESS_IN_YOUR_LIFE;
+	
+	/**
+	 * ID: 1800345<br>
+	 * Message: Love may sprout its leaves when you treat those around you with care.
+	 */
+	public static final NpcStringId LOVE_MAY_SPROUT_ITS_LEAVES_WHEN_YOU_TREAT_THOSE_AROUND_YOU_WITH_CARE;
+	
+	/**
+	 * ID: 1800346<br>
+	 * Message: You may climb into a higher position with others' trust if you faithfully carry out your duties.
+	 */
+	public static final NpcStringId YOU_MAY_CLIMB_INTO_A_HIGHER_POSITION_WITH_OTHERS_TRUST_IF_YOU_FAITHFULLY_CARRY_OUT_YOUR_DUTIES;
+	
+	/**
+	 * ID: 1800347<br>
+	 * Message: Everything can fall apart if you greedily aim by pure luck.
+	 */
+	public static final NpcStringId EVERYTHING_CAN_FALL_APART_IF_YOU_GREEDILY_AIM_BY_PURE_LUCK;
+	
+	/**
+	 * ID: 1800348<br>
+	 * Message: Do not underestimate the importance of meeting people.
+	 */
+	public static final NpcStringId DO_NOT_UNDERESTIMATE_THE_IMPORTANCE_OF_MEETING_PEOPLE;
+	
+	/**
+	 * ID: 1800349<br>
+	 * Message: An arrow will coalesce into the bow.
+	 */
+	public static final NpcStringId AN_ARROW_WILL_COALESCE_INTO_THE_BOW;
+	
+	/**
+	 * ID: 1800350<br>
+	 * Message: A bony limb of a tree may bear its fruit.
+	 */
+	public static final NpcStringId A_BONY_LIMB_OF_A_TREE_MAY_BEAR_ITS_FRUIT;
+	
+	/**
+	 * ID: 1800351<br>
+	 * Message: You will be rewarded for your efforts and accomplishments.
+	 */
+	public static final NpcStringId YOU_WILL_BE_REWARDED_FOR_YOUR_EFFORTS_AND_ACCOMPLISHMENTS;
+	
+	/**
+	 * ID: 1800352<br>
+	 * Message: No matter where it lies, your faithful drive leads you to success.
+	 */
+	public static final NpcStringId NO_MATTER_WHERE_IT_LIES_YOUR_FAITHFUL_DRIVE_LEADS_YOU_TO_SUCCESS;
+	
+	/**
+	 * ID: 1800353<br>
+	 * Message: People will be attracted to your loyalties.
+	 */
+	public static final NpcStringId PEOPLE_WILL_BE_ATTRACTED_TO_YOUR_LOYALTIES;
+	
+	/**
+	 * ID: 1800354<br>
+	 * Message: You may trust yourself rather than others' talks.
+	 */
+	public static final NpcStringId YOU_MAY_TRUST_YOURSELF_RATHER_THAN_OTHERS_TALKS;
+	
+	/**
+	 * ID: 1800355<br>
+	 * Message: Creative thinking away from the old viewpoint may help you.
+	 */
+	public static final NpcStringId CREATIVE_THINKING_AWAY_FROM_THE_OLD_VIEWPOINT_MAY_HELP_YOU;
+	
+	/**
+	 * ID: 1800356<br>
+	 * Message: Patience without being impetuous of the results will only bear a positive outcome.
+	 */
+	public static final NpcStringId PATIENCE_WITHOUT_BEING_IMPETUOUS_OF_THE_RESULTS_WILL_ONLY_BEAR_A_POSITIVE_OUTCOME;
+	
+	/**
+	 * ID: 1800357<br>
+	 * Message: The dead will come alive.
+	 */
+	public static final NpcStringId THE_DEAD_WILL_COME_ALIVE;
+	
+	/**
+	 * ID: 1800358<br>
+	 * Message: There will be a shocking incident.
+	 */
+	public static final NpcStringId THERE_WILL_BE_A_SHOCKING_INCIDENT;
+	
+	/**
+	 * ID: 1800359<br>
+	 * Message: You will enjoy a huge success after unforeseen luck comes before you.
+	 */
+	public static final NpcStringId YOU_WILL_ENJOY_A_HUGE_SUCCESS_AFTER_UNFORESEEN_LUCK_COMES_BEFORE_YOU;
+	
+	/**
+	 * ID: 1800360<br>
+	 * Message: Do not give up since there may be a miraculous rescue from the course of despair.
+	 */
+	public static final NpcStringId DO_NOT_GIVE_UP_SINCE_THERE_MAY_BE_A_MIRACULOUS_RESCUE_FROM_THE_COURSE_OF_DESPAIR;
+	
+	/**
+	 * ID: 1800361<br>
+	 * Message: An attitude to try one's best to pursue the goal is needed.
+	 */
+	public static final NpcStringId AN_ATTITUDE_TO_TRY_ONES_BEST_TO_PURSUE_THE_GOAL_IS_NEEDED;
+	
+	/**
+	 * ID: 1800362<br>
+	 * Message: You may get a shot in the arm in your life after meeting a good person.
+	 */
+	public static final NpcStringId YOU_MAY_GET_A_SHOT_IN_THE_ARM_IN_YOUR_LIFE_AFTER_MEETING_A_GOOD_PERSON;
+	
+	/**
+	 * ID: 1800363<br>
+	 * Message: You may get a big help in the course of your life.
+	 */
+	public static final NpcStringId YOU_MAY_GET_A_BIG_HELP_IN_THE_COURSE_OF_YOUR_LIFE;
+	
+	/**
+	 * ID: 1800364<br>
+	 * Message: A rare opportunity will come to you so you may prosper.
+	 */
+	public static final NpcStringId A_RARE_OPPORTUNITY_WILL_COME_TO_YOU_SO_YOU_MAY_PROSPER;
+	
+	/**
+	 * ID: 1800365<br>
+	 * Message: A hungry falcon will have meat.
+	 */
+	public static final NpcStringId A_HUNGRY_FALCON_WILL_HAVE_MEAT;
+	
+	/**
+	 * ID: 1800366<br>
+	 * Message: A household in need will acquire a fortune and meat.
+	 */
+	public static final NpcStringId A_HOUSEHOLD_IN_NEED_WILL_ACQUIRE_A_FORTUNE_AND_MEAT;
+	
+	/**
+	 * ID: 1800367<br>
+	 * Message: A hard situation will come to its end with materialistic and mental help from others.
+	 */
+	public static final NpcStringId A_HARD_SITUATION_WILL_COME_TO_ITS_END_WITH_MATERIALISTIC_AND_MENTAL_HELP_FROM_OTHERS;
+	
+	/**
+	 * ID: 1800368<br>
+	 * Message: If you set a firm goal without surrender, there will be a person who can offer help and care.
+	 */
+	public static final NpcStringId IF_YOU_SET_A_FIRM_GOAL_WITHOUT_SURRENDER_THERE_WILL_BE_A_PERSON_WHO_CAN_OFFER_HELP_AND_CARE;
+	
+	/**
+	 * ID: 1800369<br>
+	 * Message: You'll gain others' trust when you maintain a sincere and honest attitude.
+	 */
+	public static final NpcStringId YOULL_GAIN_OTHERS_TRUST_WHEN_YOU_MAINTAIN_A_SINCERE_AND_HONEST_ATTITUDE;
+	
+	/**
+	 * ID: 1800370<br>
+	 * Message: Be independent at all times.
+	 */
+	public static final NpcStringId BE_INDEPENDENT_AT_ALL_TIMES;
+	
+	/**
+	 * ID: 1800371<br>
+	 * Message: It's a wagon with no wheels.
+	 */
+	public static final NpcStringId ITS_A_WAGON_WITH_NO_WHEELS;
+	
+	/**
+	 * ID: 1800372<br>
+	 * Message: You've set a goal but there may be obstacles in reality.
+	 */
+	public static final NpcStringId YOUVE_SET_A_GOAL_BUT_THERE_MAY_BE_OBSTACLES_IN_REALITY;
+	
+	/**
+	 * ID: 1800373<br>
+	 * Message: You're running toward the goal but there won't be as many outcomes as you thought.
+	 */
+	public static final NpcStringId YOURE_RUNNING_TOWARD_THE_GOAL_BUT_THERE_WONT_BE_AS_MANY_OUTCOMES_AS_YOU_THOUGHT;
+	
+	/**
+	 * ID: 1800374<br>
+	 * Message: There are many things to consider after encountering hindrances.
+	 */
+	public static final NpcStringId THERE_ARE_MANY_THINGS_TO_CONSIDER_AFTER_ENCOUNTERING_HINDRANCES;
+	
+	/**
+	 * ID: 1800375<br>
+	 * Message: A reckless move may bring a failure.
+	 */
+	public static final NpcStringId A_RECKLESS_MOVE_MAY_BRING_A_FAILURE;
+	
+	/**
+	 * ID: 1800376<br>
+	 * Message: You may lose people's trust if you lack prudence at all times.
+	 */
+	public static final NpcStringId YOU_MAY_LOSE_PEOPLES_TRUST_IF_YOU_LACK_PRUDENCE_AT_ALL_TIMES;
+	
+	/**
+	 * ID: 1800377<br>
+	 * Message: You may need to reflect on yourself with deliberation and wait for an opportunity.
+	 */
+	public static final NpcStringId YOU_MAY_NEED_TO_REFLECT_ON_YOURSELF_WITH_DELIBERATION_AND_WAIT_FOR_AN_OPPORTUNITY;
+	
+	/**
+	 * ID: 1800378<br>
+	 * Message: A poor scholar receives a stipend.
+	 */
+	public static final NpcStringId A_POOR_SCHOLAR_RECEIVES_A_STIPEND;
+	
+	/**
+	 * ID: 1800379<br>
+	 * Message: A scholar gets a pass toward fame and fortune.
+	 */
+	public static final NpcStringId A_SCHOLAR_GETS_A_PASS_TOWARD_FAME_AND_FORTUNE;
+	
+	/**
+	 * ID: 1800380<br>
+	 * Message: Your ambition and dream will come true.
+	 */
+	public static final NpcStringId YOUR_AMBITION_AND_DREAM_WILL_COME_TRUE;
+	
+	/**
+	 * ID: 1800381<br>
+	 * Message: Complicated problems around you may start being solved one after another.
+	 */
+	public static final NpcStringId COMPLICATED_PROBLEMS_AROUND_YOU_MAY_START_BEING_SOLVED_ONE_AFTER_ANOTHER;
+	
+	/**
+	 * ID: 1800382<br>
+	 * Message: You will have a good result if you diligently pursue one goal without being dragged from your past.
+	 */
+	public static final NpcStringId YOU_WILL_HAVE_A_GOOD_RESULT_IF_YOU_DILIGENTLY_PURSUE_ONE_GOAL_WITHOUT_BEING_DRAGGED_FROM_YOUR_PAST;
+	
+	/**
+	 * ID: 1800383<br>
+	 * Message: You may need to rid yourself of old and worn habits.
+	 */
+	public static final NpcStringId YOU_MAY_NEED_TO_RID_YOURSELF_OF_OLD_AND_WORN_HABITS;
+	
+	/**
+	 * ID: 1800384<br>
+	 * Message: Be responsible with your tasks but do not hesitate to ask for colleagues' help.
+	 */
+	public static final NpcStringId BE_RESPONSIBLE_WITH_YOUR_TASKS_BUT_DO_NOT_HESITATE_TO_ASK_FOR_COLLEAGUES_HELP;
+	
+	/**
+	 * ID: 1800385<br>
+	 * Message: Fish transforms into a dragon.
+	 */
+	public static final NpcStringId FISH_TRANSFORMS_INTO_A_DRAGON;
+	
+	/**
+	 * ID: 1800386<br>
+	 * Message: Your dream may come true, and fame and fortune will come to you.
+	 */
+	public static final NpcStringId YOUR_DREAM_MAY_COME_TRUE_AND_FAME_AND_FORTUNE_WILL_COME_TO_YOU;
+	
+	/**
+	 * ID: 1800387<br>
+	 * Message: What you've planed will be accomplished.
+	 */
+	public static final NpcStringId WHAT_YOUVE_PLANED_WILL_BE_ACCOMPLISHED;
+	
+	/**
+	 * ID: 1800388<br>
+	 * Message: You may acquire money or a new opportunity from a place you wouldn't have thought of.
+	 */
+	public static final NpcStringId YOU_MAY_ACQUIRE_MONEY_OR_A_NEW_OPPORTUNITY_FROM_A_PLACE_YOU_WOULDNT_HAVE_THOUGHT_OF;
+	
+	/**
+	 * ID: 1800389<br>
+	 * Message: There will be many offers to you, you may think them over carefully.
+	 */
+	public static final NpcStringId THERE_WILL_BE_MANY_OFFERS_TO_YOU_YOU_MAY_THINK_THEM_OVER_CAREFULLY;
+	
+	/**
+	 * ID: 1800390<br>
+	 * Message: It may be a good idea not to become involved in others' business.
+	 */
+	public static final NpcStringId IT_MAY_BE_A_GOOD_IDEA_NOT_TO_BECOME_INVOLVED_IN_OTHERS_BUSINESS;
+	
+	/**
+	 * ID: 1800391<br>
+	 * Message: Everything will go smoothly but be aware of danger from being careless and remiss.
+	 */
+	public static final NpcStringId EVERYTHING_WILL_GO_SMOOTHLY_BUT_BE_AWARE_OF_DANGER_FROM_BEING_CARELESS_AND_REMISS;
+	
+	/**
+	 * ID: 1800392<br>
+	 * Message: If you sincerely care for someone you love, a big reward will return to you.
+	 */
+	public static final NpcStringId IF_YOU_SINCERELY_CARE_FOR_SOMEONE_YOU_LOVE_A_BIG_REWARD_WILL_RETURN_TO_YOU;
+	
+	/**
+	 * ID: 1800393<br>
+	 * Message: A remedy is on its way for a serious illness.
+	 */
+	public static final NpcStringId A_REMEDY_IS_ON_ITS_WAY_FOR_A_SERIOUS_ILLNESS;
+	
+	/**
+	 * ID: 1800394<br>
+	 * Message: You may acquire a precious medicine to recover after suffering a disease of a serious nature.
+	 */
+	public static final NpcStringId YOU_MAY_ACQUIRE_A_PRECIOUS_MEDICINE_TO_RECOVER_AFTER_SUFFERING_A_DISEASE_OF_A_SERIOUS_NATURE;
+	
+	/**
+	 * ID: 1800395<br>
+	 * Message: You may realize your dream by meeting a man of distinction at a difficult time.
+	 */
+	public static final NpcStringId YOU_MAY_REALIZE_YOUR_DREAM_BY_MEETING_A_MAN_OF_DISTINCTION_AT_A_DIFFICULT_TIME;
+	
+	/**
+	 * ID: 1800396<br>
+	 * Message: You may suffer one or two hardships on your journey.
+	 */
+	public static final NpcStringId YOU_MAY_SUFFER_ONE_OR_TWO_HARDSHIPS_ON_YOUR_JOURNEY;
+	
+	/**
+	 * ID: 1800397<br>
+	 * Message: If you keep smiling without despair, people will come to trust you and offer help.
+	 */
+	public static final NpcStringId IF_YOU_KEEP_SMILING_WITHOUT_DESPAIR_PEOPLE_WILL_COME_TO_TRUST_YOU_AND_OFFER_HELP;
+	
+	/**
+	 * ID: 1800398<br>
+	 * Message: Seek stability rather than dynamics in your life.
+	 */
+	public static final NpcStringId SEEK_STABILITY_RATHER_THAN_DYNAMICS_IN_YOUR_LIFE;
+	
+	/**
+	 * ID: 1800399<br>
+	 * Message: It's a good idea to be careful and secure at all times.
+	 */
+	public static final NpcStringId ITS_A_GOOD_IDEA_TO_BE_CAREFUL_AND_SECURE_AT_ALL_TIMES;
+	
+	/**
+	 * ID: 1800400<br>
+	 * Message: You can't perform the job with bound hands.
+	 */
+	public static final NpcStringId YOU_CANT_PERFORM_THE_JOB_WITH_BOUND_HANDS;
+	
+	/**
+	 * ID: 1800401<br>
+	 * Message: You may lose your drive and feel lost.
+	 */
+	public static final NpcStringId YOU_MAY_LOSE_YOUR_DRIVE_AND_FEEL_LOST;
+	
+	/**
+	 * ID: 1800402<br>
+	 * Message: You may be unable to concentrate with so many problems occurring.
+	 */
+	public static final NpcStringId YOU_MAY_BE_UNABLE_TO_CONCENTRATE_WITH_SO_MANY_PROBLEMS_OCCURRING;
+	
+	/**
+	 * ID: 1800403<br>
+	 * Message: Your achievement unfairly may go somewhere else.
+	 */
+	public static final NpcStringId YOUR_ACHIEVEMENT_UNFAIRLY_MAY_GO_SOMEWHERE_ELSE;
+	
+	/**
+	 * ID: 1800404<br>
+	 * Message: Do not start a task that's not clear to you.
+	 */
+	public static final NpcStringId DO_NOT_START_A_TASK_THATS_NOT_CLEAR_TO_YOU;
+	
+	/**
+	 * ID: 1800405<br>
+	 * Message: You will need to be prepared for all events.
+	 */
+	public static final NpcStringId YOU_WILL_NEED_TO_BE_PREPARED_FOR_ALL_EVENTS;
+	
+	/**
+	 * ID: 1800406<br>
+	 * Message: Someone will acknowledge you if you relentlessly keep trying and do not give up when facing hardships.
+	 */
+	public static final NpcStringId SOMEONE_WILL_ACKNOWLEDGE_YOU_IF_YOU_RELENTLESSLY_KEEP_TRYING_AND_DO_NOT_GIVE_UP_WHEN_FACING_HARDSHIPS;
+	
+	/**
+	 * ID: 1800407<br>
+	 * Message: You may perfect yourself like a dragon's horn decorates the dragon.
+	 */
+	public static final NpcStringId YOU_MAY_PERFECT_YOURSELF_LIKE_A_DRAGONS_HORN_DECORATES_THE_DRAGON;
+	
+	/**
+	 * ID: 1800408<br>
+	 * Message: Your true value starts to shine.
+	 */
+	public static final NpcStringId YOUR_TRUE_VALUE_STARTS_TO_SHINE;
+	
+	/**
+	 * ID: 1800409<br>
+	 * Message: Your steady pursuit of new information and staying ahead of others will raise your value.
+	 */
+	public static final NpcStringId YOUR_STEADY_PURSUIT_OF_NEW_INFORMATION_AND_STAYING_AHEAD_OF_OTHERS_WILL_RAISE_YOUR_VALUE;
+	
+	/**
+	 * ID: 1800410<br>
+	 * Message: Maintaining confidence with work or relationships may bring good results.
+	 */
+	public static final NpcStringId MAINTAINING_CONFIDENCE_WITH_WORK_OR_RELATIONSHIPS_MAY_BRING_GOOD_RESULTS;
+	
+	/**
+	 * ID: 1800411<br>
+	 * Message: Learn to work with others since overconfidence will bear wrath.
+	 */
+	public static final NpcStringId LEARN_TO_WORK_WITH_OTHERS_SINCE_OVERCONFIDENCE_WILL_BEAR_WRATH;
+	
+	/**
+	 * ID: 1800412<br>
+	 * Message: The dragon now acquires an eagle's wings.
+	 */
+	public static final NpcStringId THE_DRAGON_NOW_ACQUIRES_AN_EAGLES_WINGS;
+	
+	/**
+	 * ID: 1800413<br>
+	 * Message: As the dragon flies high in the sky, your goals and dreams may come true.
+	 */
+	public static final NpcStringId AS_THE_DRAGON_FLIES_HIGH_IN_THE_SKY_YOUR_GOALS_AND_DREAMS_MAY_COME_TRUE;
+	
+	/**
+	 * ID: 1800414<br>
+	 * Message: Luck enters into your work, hobby, family and love.
+	 */
+	public static final NpcStringId LUCK_ENTERS_INTO_YOUR_WORK_HOBBY_FAMILY_AND_LOVE;
+	
+	/**
+	 * ID: 1800415<br>
+	 * Message: Whatever you do, it will accompany winning.
+	 */
+	public static final NpcStringId WHATEVER_YOU_DO_IT_WILL_ACCOMPANY_WINNING;
+	
+	/**
+	 * ID: 1800416<br>
+	 * Message: It's as good as it gets with unforeseen fortune rolling your way.
+	 */
+	public static final NpcStringId ITS_AS_GOOD_AS_IT_GETS_WITH_UNFORESEEN_FORTUNE_ROLLING_YOUR_WAY;
+	
+	/**
+	 * ID: 1800417<br>
+	 * Message: A greedy act with no prudence will bring a surprise at the end.
+	 */
+	public static final NpcStringId A_GREEDY_ACT_WITH_NO_PRUDENCE_WILL_BRING_A_SURPRISE_AT_THE_END;
+	
+	/**
+	 * ID: 1800418<br>
+	 * Message: Think carefully and act with caution at all times.
+	 */
+	public static final NpcStringId THINK_CAREFULLY_AND_ACT_WITH_CAUTION_AT_ALL_TIMES;
+	
+	/**
+	 * ID: 1800419<br>
+	 * Message: If a tree doesn't have its roots, there will be no fruit.
+	 */
+	public static final NpcStringId IF_A_TREE_DOESNT_HAVE_ITS_ROOTS_THERE_WILL_BE_NO_FRUIT;
+	
+	/**
+	 * ID: 1800420<br>
+	 * Message: Hard work doesn't bear fruit.
+	 */
+	public static final NpcStringId HARD_WORK_DOESNT_BEAR_FRUIT;
+	
+	/**
+	 * ID: 1800421<br>
+	 * Message: Financial difficulties may bring an ordeal.
+	 */
+	public static final NpcStringId FINANCIAL_DIFFICULTIES_MAY_BRING_AN_ORDEAL;
+	
+	/**
+	 * ID: 1800422<br>
+	 * Message: What used to be well managed may stumble one after another.
+	 */
+	public static final NpcStringId WHAT_USED_TO_BE_WELL_MANAGED_MAY_STUMBLE_ONE_AFTER_ANOTHER;
+	
+	/**
+	 * ID: 1800423<br>
+	 * Message: A feeling of frustration may follow disappointment.
+	 */
+	public static final NpcStringId A_FEELING_OF_FRUSTRATION_MAY_FOLLOW_DISAPPOINTMENT;
+	
+	/**
+	 * ID: 1800424<br>
+	 * Message: Be cautioned as unharnessed behavior at difficult times can ruin relationships.
+	 */
+	public static final NpcStringId BE_CAUTIONED_AS_UNHARNESSED_BEHAVIOR_AT_DIFFICULT_TIMES_CAN_RUIN_RELATIONSHIPS;
+	
+	/**
+	 * ID: 1800425<br>
+	 * Message: Curtail greed and be grateful for small returns as modesty is needed.
+	 */
+	public static final NpcStringId CURTAIL_GREED_AND_BE_GRATEFUL_FOR_SMALL_RETURNS_AS_MODESTY_IS_NEEDED;
+	
+	/**
+	 * ID: 1800426<br>
+	 * Message: The person that came under your wings will leave.
+	 */
+	public static final NpcStringId THE_PERSON_THAT_CAME_UNDER_YOUR_WINGS_WILL_LEAVE;
+	
+	/**
+	 * ID: 1800427<br>
+	 * Message: Your work and relationship with colleagues will be well managed if you maintain your devotion.
+	 */
+	public static final NpcStringId YOUR_WORK_AND_RELATIONSHIP_WITH_COLLEAGUES_WILL_BE_WELL_MANAGED_IF_YOU_MAINTAIN_YOUR_DEVOTION;
+	
+	/**
+	 * ID: 1800428<br>
+	 * Message: Calculating your profit in relationships without displaying any courteous manners will bring malicious gossip and ruin your value.
+	 */
+	public static final NpcStringId CALCULATING_YOUR_PROFIT_IN_RELATIONSHIPS_WITHOUT_DISPLAYING_ANY_COURTEOUS_MANNERS_WILL_BRING_MALICIOUS_GOSSIP_AND_RUIN_YOUR_VALUE;
+	
+	/**
+	 * ID: 1800429<br>
+	 * Message: Consider other's situations and treat them sincerely at all times.
+	 */
+	public static final NpcStringId CONSIDER_OTHERS_SITUATIONS_AND_TREAT_THEM_SINCERELY_AT_ALL_TIMES;
+	
+	/**
+	 * ID: 1800430<br>
+	 * Message: Do not loosen up with your precautions.
+	 */
+	public static final NpcStringId DO_NOT_LOOSEN_UP_WITH_YOUR_PRECAUTIONS;
+	
+	/**
+	 * ID: 1800431<br>
+	 * Message: Reflect other's opinions as a mistake always lies ahead of an arbitrary decision.
+	 */
+	public static final NpcStringId REFLECT_OTHERS_OPINIONS_AS_A_MISTAKE_ALWAYS_LIES_AHEAD_OF_AN_ARBITRARY_DECISION;
+	
+	/**
+	 * ID: 1800432<br>
+	 * Message: A blind man goes right through the door.
+	 */
+	public static final NpcStringId A_BLIND_MAN_GOES_RIGHT_THROUGH_THE_DOOR;
+	
+	/**
+	 * ID: 1800433<br>
+	 * Message: A heart falls into hopelessness as things are in disarray.
+	 */
+	public static final NpcStringId A_HEART_FALLS_INTO_HOPELESSNESS_AS_THINGS_ARE_IN_DISARRAY;
+	
+	/**
+	 * ID: 1800434<br>
+	 * Message: Hopelessness may fill your heart as your work falls into a maze.
+	 */
+	public static final NpcStringId HOPELESSNESS_MAY_FILL_YOUR_HEART_AS_YOUR_WORK_FALLS_INTO_A_MAZE;
+	
+	/**
+	 * ID: 1800435<br>
+	 * Message: Difficulties lie ahead of an unforeseen problem even with your hard work.
+	 */
+	public static final NpcStringId DIFFICULTIES_LIE_AHEAD_OF_AN_UNFORESEEN_PROBLEM_EVEN_WITH_YOUR_HARD_WORK;
+	
+	/**
+	 * ID: 1800436<br>
+	 * Message: There may be more occasions you will want to ask favors from others as you lose confidence in you.
+	 */
+	public static final NpcStringId THERE_MAY_BE_MORE_OCCASIONS_YOU_WILL_WANT_TO_ASK_FAVORS_FROM_OTHERS_AS_YOU_LOSE_CONFIDENCE_IN_YOU;
+	
+	/**
+	 * ID: 1800437<br>
+	 * Message: Be brave and ambitious as no bird can fly into the sky by staying in their nest.
+	 */
+	public static final NpcStringId BE_BRAVE_AND_AMBITIOUS_AS_NO_BIRD_CAN_FLY_INTO_THE_SKY_BY_STAYING_IN_THEIR_NEST;
+	
+	/**
+	 * ID: 1800438<br>
+	 * Message: It's a good idea not to start an unclear task and always look for someone you can trust and rely upon.
+	 */
+	public static final NpcStringId ITS_A_GOOD_IDEA_NOT_TO_START_AN_UNCLEAR_TASK_AND_ALWAYS_LOOK_FOR_SOMEONE_YOU_CAN_TRUST_AND_RELY_UPON;
+	
+	/**
+	 * ID: 1800439<br>
+	 * Message: Hunting won't be successful as the falcon lacks its claws.
+	 */
+	public static final NpcStringId HUNTING_WONT_BE_SUCCESSFUL_AS_THE_FALCON_LACKS_ITS_CLAWS;
+	
+	/**
+	 * ID: 1800440<br>
+	 * Message: A prepared plan won't move smoothly.
+	 */
+	public static final NpcStringId A_PREPARED_PLAN_WONT_MOVE_SMOOTHLY;
+	
+	/**
+	 * ID: 1800441<br>
+	 * Message: An easy task may fail if one is consumed by greed and overconfidence.
+	 */
+	public static final NpcStringId AN_EASY_TASK_MAY_FAIL_IF_ONE_IS_CONSUMED_BY_GREED_AND_OVERCONFIDENCE;
+	
+	/**
+	 * ID: 1800442<br>
+	 * Message: Impatience may lie ahead as the situation is unfavorable.
+	 */
+	public static final NpcStringId IMPATIENCE_MAY_LIE_AHEAD_AS_THE_SITUATION_IS_UNFAVORABLE;
+	
+	/**
+	 * ID: 1800443<br>
+	 * Message: Thoughtful foresight is needed before a disaster may fall upon you.
+	 */
+	public static final NpcStringId THOUGHTFUL_FORESIGHT_IS_NEEDED_BEFORE_A_DISASTER_MAY_FALL_UPON_YOU;
+	
+	/**
+	 * ID: 1800444<br>
+	 * Message: Refrain from dictatorial acts as caring for others around you with dignity is much needed.
+	 */
+	public static final NpcStringId REFRAIN_FROM_DICTATORIAL_ACTS_AS_CARING_FOR_OTHERS_AROUND_YOU_WITH_DIGNITY_IS_MUCH_NEEDED;
+	
+	/**
+	 * ID: 1800445<br>
+	 * Message: Things are messy with no good sign.
+	 */
+	public static final NpcStringId THINGS_ARE_MESSY_WITH_NO_GOOD_SIGN;
+	
+	/**
+	 * ID: 1800446<br>
+	 * Message: You may fall into a vexing situation as bad circumstances will arise.
+	 */
+	public static final NpcStringId YOU_MAY_FALL_INTO_A_VEXING_SITUATION_AS_BAD_CIRCUMSTANCES_WILL_ARISE;
+	
+	/**
+	 * ID: 1800447<br>
+	 * Message: Relationships with people may be contrary to your expectations.
+	 */
+	public static final NpcStringId RELATIONSHIPS_WITH_PEOPLE_MAY_BE_CONTRARY_TO_YOUR_EXPECTATIONS;
+	
+	/**
+	 * ID: 1800448<br>
+	 * Message: Do not seek a quick fix as the problem needs a fundamental resolution.
+	 */
+	public static final NpcStringId DO_NOT_SEEK_A_QUICK_FIX_AS_THE_PROBLEM_NEEDS_A_FUNDAMENTAL_RESOLUTION;
+	
+	/**
+	 * ID: 1800449<br>
+	 * Message: Seek peace in your heart as vulgar display of your emotions may harm you.
+	 */
+	public static final NpcStringId SEEK_PEACE_IN_YOUR_HEART_AS_VULGAR_DISPLAY_OF_YOUR_EMOTIONS_MAY_HARM_YOU;
+	
+	/**
+	 * ID: 1800450<br>
+	 * Message: Information for success may come from the conversations with people around you.
+	 */
+	public static final NpcStringId INFORMATION_FOR_SUCCESS_MAY_COME_FROM_THE_CONVERSATIONS_WITH_PEOPLE_AROUND_YOU;
+	
+	/**
+	 * ID: 1800451<br>
+	 * Message: Be confident and act reliantly at all times.
+	 */
+	public static final NpcStringId BE_CONFIDENT_AND_ACT_RELIANTLY_AT_ALL_TIMES;
+	
+	/**
+	 * ID: 1800452<br>
+	 * Message: A child gets a treasure.
+	 */
+	public static final NpcStringId A_CHILD_GETS_A_TREASURE;
+	
+	/**
+	 * ID: 1800453<br>
+	 * Message: Good fortune and opportunity may lie ahead as if one's born in a golden spoon.
+	 */
+	public static final NpcStringId GOOD_FORTUNE_AND_OPPORTUNITY_MAY_LIE_AHEAD_AS_IF_ONES_BORN_IN_A_GOLDEN_SPOON;
+	
+	/**
+	 * ID: 1800454<br>
+	 * Message: Your life flows as if it's on a silk surface and unexpected fortune and success may come to you.
+	 */
+	public static final NpcStringId YOUR_LIFE_FLOWS_AS_IF_ITS_ON_A_SILK_SURFACE_AND_UNEXPECTED_FORTUNE_AND_SUCCESS_MAY_COME_TO_YOU;
+	
+	/**
+	 * ID: 1800455<br>
+	 * Message: Temporary luck may come to you with no effort.
+	 */
+	public static final NpcStringId TEMPORARY_LUCK_MAY_COME_TO_YOU_WITH_NO_EFFORT;
+	
+	/**
+	 * ID: 1800456<br>
+	 * Message: Plan ahead with patience but execute with swiftness.
+	 */
+	public static final NpcStringId PLAN_AHEAD_WITH_PATIENCE_BUT_EXECUTE_WITH_SWIFTNESS;
+	
+	/**
+	 * ID: 1800457<br>
+	 * Message: The abilities to amend, foresee and analyze may raise your value.
+	 */
+	public static final NpcStringId THE_ABILITIES_TO_AMEND_FORESEE_AND_ANALYZE_MAY_RAISE_YOUR_VALUE;
+	
+	/**
+	 * ID: 1800458<br>
+	 * Message: Bigger mistakes will be on the road if you fail to correct a small mistake.
+	 */
+	public static final NpcStringId BIGGER_MISTAKES_WILL_BE_ON_THE_ROAD_IF_YOU_FAIL_TO_CORRECT_A_SMALL_MISTAKE;
+	
+	/**
+	 * ID: 1800459<br>
+	 * Message: Don't be evasive to accept new findings or experiences.
+	 */
+	public static final NpcStringId DONT_BE_EVASIVE_TO_ACCEPT_NEW_FINDINGS_OR_EXPERIENCES;
+	
+	/**
+	 * ID: 1800460<br>
+	 * Message: Don't be irritated as the situations don't move as planned.
+	 */
+	public static final NpcStringId DONT_BE_IRRITATED_AS_THE_SITUATIONS_DONT_MOVE_AS_PLANNED;
+	
+	/**
+	 * ID: 1800461<br>
+	 * Message: Be warned as you may be overwhelmed by surroundings if you lack a clear opinion.
+	 */
+	public static final NpcStringId BE_WARNED_AS_YOU_MAY_BE_OVERWHELMED_BY_SURROUNDINGS_IF_YOU_LACK_A_CLEAR_OPINION;
+	
+	/**
+	 * ID: 1800462<br>
+	 * Message: You may live an affluent life even without possessions.
+	 */
+	public static final NpcStringId YOU_MAY_LIVE_AN_AFFLUENT_LIFE_EVEN_WITHOUT_POSSESSIONS;
+	
+	/**
+	 * ID: 1800463<br>
+	 * Message: You will gain popularity as you help people with money you earnestly earned.
+	 */
+	public static final NpcStringId YOU_WILL_GAIN_POPULARITY_AS_YOU_HELP_PEOPLE_WITH_MONEY_YOU_EARNESTLY_EARNED;
+	
+	/**
+	 * ID: 1800464<br>
+	 * Message: Your heart and body may be in health.
+	 */
+	public static final NpcStringId YOUR_HEART_AND_BODY_MAY_BE_IN_HEALTH;
+	
+	/**
+	 * ID: 1800465<br>
+	 * Message: Be warned as you may be dragged to an unwanted direction if not cautious.
+	 */
+	public static final NpcStringId BE_WARNED_AS_YOU_MAY_BE_DRAGGED_TO_AN_UNWANTED_DIRECTION_IF_NOT_CAUTIOUS;
+	
+	/**
+	 * ID: 1800466<br>
+	 * Message: You may meet many new people but it will be difficult to find a perfect person who wins your heart.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_MANY_NEW_PEOPLE_BUT_IT_WILL_BE_DIFFICULT_TO_FIND_A_PERFECT_PERSON_WHO_WINS_YOUR_HEART;
+	
+	/**
+	 * ID: 1800467<br>
+	 * Message: There may be an occasion where you are consoled by people.
+	 */
+	public static final NpcStringId THERE_MAY_BE_AN_OCCASION_WHERE_YOU_ARE_CONSOLED_BY_PEOPLE;
+	
+	/**
+	 * ID: 1800468<br>
+	 * Message: It may not be a good time for a change even if there's tedium in daily life.
+	 */
+	public static final NpcStringId IT_MAY_NOT_BE_A_GOOD_TIME_FOR_A_CHANGE_EVEN_IF_THERES_TEDIUM_IN_DAILY_LIFE;
+	
+	/**
+	 * ID: 1800469<br>
+	 * Message: The money you spend for yourself may act as an investment and bring you a return.
+	 */
+	public static final NpcStringId THE_MONEY_YOU_SPEND_FOR_YOURSELF_MAY_ACT_AS_AN_INVESTMENT_AND_BRING_YOU_A_RETURN;
+	
+	/**
+	 * ID: 1800470<br>
+	 * Message: The money you spend for others will be wasted so be cautious.
+	 */
+	public static final NpcStringId THE_MONEY_YOU_SPEND_FOR_OTHERS_WILL_BE_WASTED_SO_BE_CAUTIOUS;
+	
+	/**
+	 * ID: 1800471<br>
+	 * Message: Be warned so as not to have unnecessary expenses.
+	 */
+	public static final NpcStringId BE_WARNED_SO_AS_NOT_TO_HAVE_UNNECESSARY_EXPENSES;
+	
+	/**
+	 * ID: 1800472<br>
+	 * Message: Your star indicated such good luck, participate in bonus giveaways or events.
+	 */
+	public static final NpcStringId YOUR_STAR_INDICATED_SUCH_GOOD_LUCK_PARTICIPATE_IN_BONUS_GIVEAWAYS_OR_EVENTS;
+	
+	/**
+	 * ID: 1800473<br>
+	 * Message: You may grab unexpected luck.
+	 */
+	public static final NpcStringId YOU_MAY_GRAB_UNEXPECTED_LUCK;
+	
+	/**
+	 * ID: 1800474<br>
+	 * Message: The person in your heart may naturally come to you.
+	 */
+	public static final NpcStringId THE_PERSON_IN_YOUR_HEART_MAY_NATURALLY_COME_TO_YOU;
+	
+	/**
+	 * ID: 1800475<br>
+	 * Message: There will be a good result if you keep your own pace regardless of others' judgment.
+	 */
+	public static final NpcStringId THERE_WILL_BE_A_GOOD_RESULT_IF_YOU_KEEP_YOUR_OWN_PACE_REGARDLESS_OF_OTHERS_JUDGMENT;
+	
+	/**
+	 * ID: 1800476<br>
+	 * Message: Be warned as unexpected luck may be wasted with your reckless comments.
+	 */
+	public static final NpcStringId BE_WARNED_AS_UNEXPECTED_LUCK_MAY_BE_WASTED_WITH_YOUR_RECKLESS_COMMENTS;
+	
+	/**
+	 * ID: 1800477<br>
+	 * Message: Overconfidence will convince you to carry a task above your reach and there will be consequences.
+	 */
+	public static final NpcStringId OVERCONFIDENCE_WILL_CONVINCE_YOU_TO_CARRY_A_TASK_ABOVE_YOUR_REACH_AND_THERE_WILL_BE_CONSEQUENCES;
+	
+	/**
+	 * ID: 1800478<br>
+	 * Message: Momentarily delay an important decision.
+	 */
+	public static final NpcStringId MOMENTARILY_DELAY_AN_IMPORTANT_DECISION;
+	
+	/**
+	 * ID: 1800479<br>
+	 * Message: Trouble spots lie ahead when talking to superiors or people close to you.
+	 */
+	public static final NpcStringId TROUBLE_SPOTS_LIE_AHEAD_WHEN_TALKING_TO_SUPERIORS_OR_PEOPLE_CLOSE_TO_YOU;
+	
+	/**
+	 * ID: 1800480<br>
+	 * Message: Be warned as your words can hurt others or others' words can hurt you.
+	 */
+	public static final NpcStringId BE_WARNED_AS_YOUR_WORDS_CAN_HURT_OTHERS_OR_OTHERS_WORDS_CAN_HURT_YOU;
+	
+	/**
+	 * ID: 1800481<br>
+	 * Message: Make a loud boast and you may have to pay to cover unnecessary expenses.
+	 */
+	public static final NpcStringId MAKE_A_LOUD_BOAST_AND_YOU_MAY_HAVE_TO_PAY_TO_COVER_UNNECESSARY_EXPENSES;
+	
+	/**
+	 * ID: 1800482<br>
+	 * Message: Skillful evasion is needed when dealing with people who pick fights as a disaster may arise from it.
+	 */
+	public static final NpcStringId SKILLFUL_EVASION_IS_NEEDED_WHEN_DEALING_WITH_PEOPLE_WHO_PICK_FIGHTS_AS_A_DISASTER_MAY_ARISE_FROM_IT;
+	
+	/**
+	 * ID: 1800483<br>
+	 * Message: Keep a low profile as too strong an opinion will attract adverse reactions.
+	 */
+	public static final NpcStringId KEEP_A_LOW_PROFILE_AS_TOO_STRONG_AN_OPINION_WILL_ATTRACT_ADVERSE_REACTIONS;
+	
+	/**
+	 * ID: 1800484<br>
+	 * Message: Do not unnecessarily provoke misunderstanding as you may be involved in malicious gossip.
+	 */
+	public static final NpcStringId DO_NOT_UNNECESSARILY_PROVOKE_MISUNDERSTANDING_AS_YOU_MAY_BE_INVOLVED_IN_MALICIOUS_GOSSIP;
+	
+	/**
+	 * ID: 1800485<br>
+	 * Message: Check your belongings as you may lose what you possess.
+	 */
+	public static final NpcStringId CHECK_YOUR_BELONGINGS_AS_YOU_MAY_LOSE_WHAT_YOU_POSSESS;
+	
+	/**
+	 * ID: 1800486<br>
+	 * Message: Be flexible enough to play up to others.
+	 */
+	public static final NpcStringId BE_FLEXIBLE_ENOUGH_TO_PLAY_UP_TO_OTHERS;
+	
+	/**
+	 * ID: 1800487<br>
+	 * Message: Pay special attention when meeting or talking to people as relationships may go amiss.
+	 */
+	public static final NpcStringId PAY_SPECIAL_ATTENTION_WHEN_MEETING_OR_TALKING_TO_PEOPLE_AS_RELATIONSHIPS_MAY_GO_AMISS;
+	
+	/**
+	 * ID: 1800488<br>
+	 * Message: When the important moment arrives, decide upon what you truly want without measuring others' judgment.
+	 */
+	public static final NpcStringId WHEN_THE_IMPORTANT_MOMENT_ARRIVES_DECIDE_UPON_WHAT_YOU_TRULY_WANT_WITHOUT_MEASURING_OTHERS_JUDGMENT;
+	
+	/**
+	 * ID: 1800489<br>
+	 * Message: Luck will always follow you if you travel and read many books.
+	 */
+	public static final NpcStringId LUCK_WILL_ALWAYS_FOLLOW_YOU_IF_YOU_TRAVEL_AND_READ_MANY_BOOKS;
+	
+	/**
+	 * ID: 1800490<br>
+	 * Message: Head to a place that needs your advice as good ideas and wisdom will flourish.
+	 */
+	public static final NpcStringId HEAD_TO_A_PLACE_THAT_NEEDS_YOUR_ADVICE_AS_GOOD_IDEAS_AND_WISDOM_WILL_FLOURISH;
+	
+	/**
+	 * ID: 1800491<br>
+	 * Message: Someone's life may change upon your advice.
+	 */
+	public static final NpcStringId SOMEONES_LIFE_MAY_CHANGE_UPON_YOUR_ADVICE;
+	
+	/**
+	 * ID: 1800492<br>
+	 * Message: It's a proper time to plan for the future rather than a short term plan.
+	 */
+	public static final NpcStringId ITS_A_PROPER_TIME_TO_PLAN_FOR_THE_FUTURE_RATHER_THAN_A_SHORT_TERM_PLAN;
+	
+	/**
+	 * ID: 1800493<br>
+	 * Message: Many thoughtful plans at present time will be of great help in the future.
+	 */
+	public static final NpcStringId MANY_THOUGHTFUL_PLANS_AT_PRESENT_TIME_WILL_BE_OF_GREAT_HELP_IN_THE_FUTURE;
+	
+	/**
+	 * ID: 1800494<br>
+	 * Message: Patience may be needed as a big quarrel arises between you and a person close to you.
+	 */
+	public static final NpcStringId PATIENCE_MAY_BE_NEEDED_AS_A_BIG_QUARREL_ARISES_BETWEEN_YOU_AND_A_PERSON_CLOSE_TO_YOU;
+	
+	/**
+	 * ID: 1800495<br>
+	 * Message: Do not ask for financial help when the time is difficult. Your pride will be hurt without gaining any money.
+	 */
+	public static final NpcStringId DO_NOT_ASK_FOR_FINANCIAL_HELP_WHEN_THE_TIME_IS_DIFFICULT_YOUR_PRIDE_WILL_BE_HURT_WITHOUT_GAINING_ANY_MONEY;
+	
+	/**
+	 * ID: 1800496<br>
+	 * Message: Connection with a special person starts with a mere incident.
+	 */
+	public static final NpcStringId CONNECTION_WITH_A_SPECIAL_PERSON_STARTS_WITH_A_MERE_INCIDENT;
+	
+	/**
+	 * ID: 1800497<br>
+	 * Message: Stubbornness regardless of the matter will only bear danger.
+	 */
+	public static final NpcStringId STUBBORNNESS_REGARDLESS_OF_THE_MATTER_WILL_ONLY_BEAR_DANGER;
+	
+	/**
+	 * ID: 1800498<br>
+	 * Message: Keep good manners and value taciturnity as light-heartedness may bring misfortune.
+	 */
+	public static final NpcStringId KEEP_GOOD_MANNERS_AND_VALUE_TACITURNITY_AS_LIGHT_HEARTEDNESS_MAY_BRING_MISFORTUNE;
+	
+	/**
+	 * ID: 1800499<br>
+	 * Message: You may meet the opposite sex.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_THE_OPPOSITE_SEX;
+	
+	/**
+	 * ID: 1800500<br>
+	 * Message: Greed by wanting to take wealth may bring unfortunate disaster.
+	 */
+	public static final NpcStringId GREED_BY_WANTING_TO_TAKE_WEALTH_MAY_BRING_UNFORTUNATE_DISASTER;
+	
+	/**
+	 * ID: 1800501<br>
+	 * Message: Loss is ahead, refrain from investing. Try to save the money in your pockets.
+	 */
+	public static final NpcStringId LOSS_IS_AHEAD_REFRAIN_FROM_INVESTING_TRY_TO_SAVE_THE_MONEY_IN_YOUR_POCKETS;
+	
+	/**
+	 * ID: 1800502<br>
+	 * Message: Your wealth luck is dim, avoid any offers.
+	 */
+	public static final NpcStringId YOUR_WEALTH_LUCK_IS_DIM_AVOID_ANY_OFFERS;
+	
+	/**
+	 * ID: 1800503<br>
+	 * Message: A bigger challenge may be when delaying today's work.
+	 */
+	public static final NpcStringId A_BIGGER_CHALLENGE_MAY_BE_WHEN_DELAYING_TODAYS_WORK;
+	
+	/**
+	 * ID: 1800504<br>
+	 * Message: There will be difficulty, but a good result may be ahead when facing it responsibly.
+	 */
+	public static final NpcStringId THERE_WILL_BE_DIFFICULTY_BUT_A_GOOD_RESULT_MAY_BE_AHEAD_WHEN_FACING_IT_RESPONSIBLY;
+	
+	/**
+	 * ID: 1800505<br>
+	 * Message: Even with some difficulties, expand the range of your scope where you are in charge. It will return to you as help.
+	 */
+	public static final NpcStringId EVEN_WITH_SOME_DIFFICULTIES_EXPAND_THE_RANGE_OF_YOUR_SCOPE_WHERE_YOU_ARE_IN_CHARGE_IT_WILL_RETURN_TO_YOU_AS_HELP;
+	
+	/**
+	 * ID: 1800506<br>
+	 * Message: Focus on maintaining organized surroundings to help reduce your losses.
+	 */
+	public static final NpcStringId FOCUS_ON_MAINTAINING_ORGANIZED_SURROUNDINGS_TO_HELP_REDUCE_YOUR_LOSSES;
+	
+	/**
+	 * ID: 1800507<br>
+	 * Message: Luck lies ahead when waiting for people rather than following them.
+	 */
+	public static final NpcStringId LUCK_LIES_AHEAD_WHEN_WAITING_FOR_PEOPLE_RATHER_THAN_FOLLOWING_THEM;
+	
+	/**
+	 * ID: 1800508<br>
+	 * Message: Do not offer your hand first even when things are hasty. The relationship may fall apart.
+	 */
+	public static final NpcStringId DO_NOT_OFFER_YOUR_HAND_FIRST_EVEN_WHEN_THINGS_ARE_HASTY_THE_RELATIONSHIP_MAY_FALL_APART;
+	
+	/**
+	 * ID: 1800509<br>
+	 * Message: Your wealth luck is rising, there will be some good result.
+	 */
+	public static final NpcStringId YOUR_WEALTH_LUCK_IS_RISING_THERE_WILL_BE_SOME_GOOD_RESULT;
+	
+	/**
+	 * ID: 1800510<br>
+	 * Message: You may fall in danger each time when acting upon improvisation.
+	 */
+	public static final NpcStringId YOU_MAY_FALL_IN_DANGER_EACH_TIME_WHEN_ACTING_UPON_IMPROVISATION;
+	
+	/**
+	 * ID: 1800511<br>
+	 * Message: Be warned as a childishly act before elders may ruin everything.
+	 */
+	public static final NpcStringId BE_WARNED_AS_A_CHILDISHLY_ACT_BEFORE_ELDERS_MAY_RUIN_EVERYTHING;
+	
+	/**
+	 * ID: 1800512<br>
+	 * Message: Things will move effortlessly but luck will vanish with your audacity.
+	 */
+	public static final NpcStringId THINGS_WILL_MOVE_EFFORTLESSLY_BUT_LUCK_WILL_VANISH_WITH_YOUR_AUDACITY;
+	
+	/**
+	 * ID: 1800513<br>
+	 * Message: Luck may be continued only when humility is maintained after success.
+	 */
+	public static final NpcStringId LUCK_MAY_BE_CONTINUED_ONLY_WHEN_HUMILITY_IS_MAINTAINED_AFTER_SUCCESS;
+	
+	/**
+	 * ID: 1800514<br>
+	 * Message: A new person may appear to create a love triangle.
+	 */
+	public static final NpcStringId A_NEW_PERSON_MAY_APPEAR_TO_CREATE_A_LOVE_TRIANGLE;
+	
+	/**
+	 * ID: 1800515<br>
+	 * Message: Look for someone with a similar style. It will open up for the good.
+	 */
+	public static final NpcStringId LOOK_FOR_SOMEONE_WITH_A_SIMILAR_STYLE_IT_WILL_OPEN_UP_FOR_THE_GOOD;
+	
+	/**
+	 * ID: 1800516<br>
+	 * Message: An offer may soon be made to collaborate a task but delaying it will be a good idea.
+	 */
+	public static final NpcStringId AN_OFFER_MAY_SOON_BE_MADE_TO_COLLABORATE_A_TASK_BUT_DELAYING_IT_WILL_BE_A_GOOD_IDEA;
+	
+	/**
+	 * ID: 1800517<br>
+	 * Message: Partnership is out of luck, avoid someone who rushes you to start a collaboration.
+	 */
+	public static final NpcStringId PARTNERSHIP_IS_OUT_OF_LUCK_AVOID_SOMEONE_WHO_RUSHES_YOU_TO_START_A_COLLABORATION;
+	
+	/**
+	 * ID: 1800518<br>
+	 * Message: Focus on networking with like-minded people. They may join you for a big mission in the future.
+	 */
+	public static final NpcStringId FOCUS_ON_NETWORKING_WITH_LIKE_MINDED_PEOPLE_THEY_MAY_JOIN_YOU_FOR_A_BIG_MISSION_IN_THE_FUTURE;
+	
+	/**
+	 * ID: 1800519<br>
+	 * Message: Be warned when someone says you are innocent as that's not a compliment.
+	 */
+	public static final NpcStringId BE_WARNED_WHEN_SOMEONE_SAYS_YOU_ARE_INNOCENT_AS_THATS_NOT_A_COMPLIMENT;
+	
+	/**
+	 * ID: 1800520<br>
+	 * Message: You may be scammed. Be cautious as there may be a big loss by underestimating others.
+	 */
+	public static final NpcStringId YOU_MAY_BE_SCAMMED_BE_CAUTIOUS_AS_THERE_MAY_BE_A_BIG_LOSS_BY_UNDERESTIMATING_OTHERS;
+	
+	/**
+	 * ID: 1800521<br>
+	 * Message: Luck at decision-making is dim, avoid subjective conclusions and rely on universal common-sense.
+	 */
+	public static final NpcStringId LUCK_AT_DECISION_MAKING_IS_DIM_AVOID_SUBJECTIVE_CONCLUSIONS_AND_RELY_ON_UNIVERSAL_COMMON_SENSE;
+	
+	/**
+	 * ID: 1800522<br>
+	 * Message: Your weakness may invite hardships, cautiously take a strong position as needed.
+	 */
+	public static final NpcStringId YOUR_WEAKNESS_MAY_INVITE_HARDSHIPS_CAUTIOUSLY_TAKE_A_STRONG_POSITION_AS_NEEDED;
+	
+	/**
+	 * ID: 1800523<br>
+	 * Message: Be wary of someone who talks and entertains too much. The person may bring you misfortune.
+	 */
+	public static final NpcStringId BE_WARY_OF_SOMEONE_WHO_TALKS_AND_ENTERTAINS_TOO_MUCH_THE_PERSON_MAY_BRING_YOU_MISFORTUNE;
+	
+	/**
+	 * ID: 1800524<br>
+	 * Message: You may enjoy a beginner's luck.
+	 */
+	public static final NpcStringId YOU_MAY_ENJOY_A_BEGINNERS_LUCK;
+	
+	/**
+	 * ID: 1800525<br>
+	 * Message: Your wealth luck is strong but you should know when to withdraw.
+	 */
+	public static final NpcStringId YOUR_WEALTH_LUCK_IS_STRONG_BUT_YOU_SHOULD_KNOW_WHEN_TO_WITHDRAW;
+	
+	/**
+	 * ID: 1800526<br>
+	 * Message: Already acquired wealth can be lost by greed.
+	 */
+	public static final NpcStringId ALREADY_ACQUIRED_WEALTH_CAN_BE_LOST_BY_GREED;
+	
+	/**
+	 * ID: 1800527<br>
+	 * Message: Even if you can complete it by yourself, it's a good idea to have someone help you.
+	 */
+	public static final NpcStringId EVEN_IF_YOU_CAN_COMPLETE_IT_BY_YOURSELF_ITS_A_GOOD_IDEA_TO_HAVE_SOMEONE_HELP_YOU;
+	
+	/**
+	 * ID: 1800528<br>
+	 * Message: Make harmony with people the priority. Stubbornness may bring hardships.
+	 */
+	public static final NpcStringId MAKE_HARMONY_WITH_PEOPLE_THE_PRIORITY_STUBBORNNESS_MAY_BRING_HARDSHIPS;
+	
+	/**
+	 * ID: 1800529<br>
+	 * Message: There may be a chance when you can see a new aspect of a close friend.
+	 */
+	public static final NpcStringId THERE_MAY_BE_A_CHANCE_WHEN_YOU_CAN_SEE_A_NEW_ASPECT_OF_A_CLOSE_FRIEND;
+	
+	/**
+	 * ID: 1800530<br>
+	 * Message: Try to be close to someone different from you without any stereotypical judgment.
+	 */
+	public static final NpcStringId TRY_TO_BE_CLOSE_TO_SOMEONE_DIFFERENT_FROM_YOU_WITHOUT_ANY_STEREOTYPICAL_JUDGMENT;
+	
+	/**
+	 * ID: 1800531<br>
+	 * Message: Good luck in becoming a leader with many followers. However, it'll only be after hard work.
+	 */
+	public static final NpcStringId GOOD_LUCK_IN_BECOMING_A_LEADER_WITH_MANY_FOLLOWERS_HOWEVER_ITLL_ONLY_BE_AFTER_HARD_WORK;
+	
+	/**
+	 * ID: 1800532<br>
+	 * Message: Your wealth luck is rising, expenditures will be followed by substantial income as you are able to sustain.
+	 */
+	public static final NpcStringId YOUR_WEALTH_LUCK_IS_RISING_EXPENDITURES_WILL_BE_FOLLOWED_BY_SUBSTANTIAL_INCOME_AS_YOU_ARE_ABLE_TO_SUSTAIN;
+	
+	/**
+	 * ID: 1800533<br>
+	 * Message: Be cautious as your wealth luck can be either very good or very bad.
+	 */
+	public static final NpcStringId BE_CAUTIOUS_AS_YOUR_WEALTH_LUCK_CAN_BE_EITHER_VERY_GOOD_OR_VERY_BAD;
+	
+	/**
+	 * ID: 1800534<br>
+	 * Message: Be warned as a small argument can distance you from a close friend.
+	 */
+	public static final NpcStringId BE_WARNED_AS_A_SMALL_ARGUMENT_CAN_DISTANCE_YOU_FROM_A_CLOSE_FRIEND;
+	
+	/**
+	 * ID: 1800535<br>
+	 * Message: There is luck in love with a new person.
+	 */
+	public static final NpcStringId THERE_IS_LUCK_IN_LOVE_WITH_A_NEW_PERSON;
+	
+	/**
+	 * ID: 1800536<br>
+	 * Message: A bigger fortune will be followed by your good deed.
+	 */
+	public static final NpcStringId A_BIGGER_FORTUNE_WILL_BE_FOLLOWED_BY_YOUR_GOOD_DEED;
+	
+	/**
+	 * ID: 1800537<br>
+	 * Message: There may be a relationship breaking, try to eliminate misunderstandings.
+	 */
+	public static final NpcStringId THERE_MAY_BE_A_RELATIONSHIP_BREAKING_TRY_TO_ELIMINATE_MISUNDERSTANDINGS;
+	
+	/**
+	 * ID: 1800538<br>
+	 * Message: Be cautious not to be emotionally moved even if it's convincing.
+	 */
+	public static final NpcStringId BE_CAUTIOUS_NOT_TO_BE_EMOTIONALLY_MOVED_EVEN_IF_ITS_CONVINCING;
+	
+	/**
+	 * ID: 1800539<br>
+	 * Message: Smiling will bring good luck.
+	 */
+	public static final NpcStringId SMILING_WILL_BRING_GOOD_LUCK;
+	
+	/**
+	 * ID: 1800540<br>
+	 * Message: It's a good idea to let go of a small loss.
+	 */
+	public static final NpcStringId ITS_A_GOOD_IDEA_TO_LET_GO_OF_A_SMALL_LOSS;
+	
+	/**
+	 * ID: 1800541<br>
+	 * Message: Conveying your own truth may be difficult and easy misunderstandings will follow.
+	 */
+	public static final NpcStringId CONVEYING_YOUR_OWN_TRUTH_MAY_BE_DIFFICULT_AND_EASY_MISUNDERSTANDINGS_WILL_FOLLOW;
+	
+	/**
+	 * ID: 1800542<br>
+	 * Message: There is good luck in a place with many people.
+	 */
+	public static final NpcStringId THERE_IS_GOOD_LUCK_IN_A_PLACE_WITH_MANY_PEOPLE;
+	
+	/**
+	 * ID: 1800543<br>
+	 * Message: Try to avoid directness if you can.
+	 */
+	public static final NpcStringId TRY_TO_AVOID_DIRECTNESS_IF_YOU_CAN;
+	
+	/**
+	 * ID: 1800544<br>
+	 * Message: Value substance opposed to the sake honor and look beyond what's in front of you.
+	 */
+	public static final NpcStringId VALUE_SUBSTANCE_OPPOSED_TO_THE_SAKE_HONOR_AND_LOOK_BEYOND_WHATS_IN_FRONT_OF_YOU;
+	
+	/**
+	 * ID: 1800545<br>
+	 * Message: Expanding a relationship with humor may be a good idea.
+	 */
+	public static final NpcStringId EXPANDING_A_RELATIONSHIP_WITH_HUMOR_MAY_BE_A_GOOD_IDEA;
+	
+	/**
+	 * ID: 1800546<br>
+	 * Message: An enjoyable event may be ahead if you accept a simple bet.
+	 */
+	public static final NpcStringId AN_ENJOYABLE_EVENT_MAY_BE_AHEAD_IF_YOU_ACCEPT_A_SIMPLE_BET;
+	
+	/**
+	 * ID: 1800547<br>
+	 * Message: Being level-headed not focusing on emotions may help with relationships.
+	 */
+	public static final NpcStringId BEING_LEVEL_HEADED_NOT_FOCUSING_ON_EMOTIONS_MAY_HELP_WITH_RELATIONSHIPS;
+	
+	/**
+	 * ID: 1800548<br>
+	 * Message: It's a good idea to take care of matters in sequential order without measuring their importance.
+	 */
+	public static final NpcStringId ITS_A_GOOD_IDEA_TO_TAKE_CARE_OF_MATTERS_IN_SEQUENTIAL_ORDER_WITHOUT_MEASURING_THEIR_IMPORTANCE;
+	
+	/**
+	 * ID: 1800549<br>
+	 * Message: A determined act after prepared research will attract people.
+	 */
+	public static final NpcStringId A_DETERMINED_ACT_AFTER_PREPARED_RESEARCH_WILL_ATTRACT_PEOPLE;
+	
+	/**
+	 * ID: 1800550<br>
+	 * Message: A little humor may bring complete attention to you.
+	 */
+	public static final NpcStringId A_LITTLE_HUMOR_MAY_BRING_COMPLETE_ATTENTION_TO_YOU;
+	
+	/**
+	 * ID: 1800551<br>
+	 * Message: It may not be a good time for an important decision, be wary of temptations and avoid monetary dealings.
+	 */
+	public static final NpcStringId IT_MAY_NOT_BE_A_GOOD_TIME_FOR_AN_IMPORTANT_DECISION_BE_WARY_OF_TEMPTATIONS_AND_AVOID_MONETARY_DEALINGS;
+	
+	/**
+	 * ID: 1800552<br>
+	 * Message: Pay special attention to advice from a close friend.
+	 */
+	public static final NpcStringId PAY_SPECIAL_ATTENTION_TO_ADVICE_FROM_A_CLOSE_FRIEND;
+	
+	/**
+	 * ID: 1800553<br>
+	 * Message: There may be moderate solutions to every problem when they're viewed from a 3rd party's point of view.
+	 */
+	public static final NpcStringId THERE_MAY_BE_MODERATE_SOLUTIONS_TO_EVERY_PROBLEM_WHEN_THEYRE_VIEWED_FROM_A_3RD_PARTYS_POINT_OF_VIEW;
+	
+	/**
+	 * ID: 1800554<br>
+	 * Message: Dealings with close friends only bring frustration and headache, politely decline and mention another chance.
+	 */
+	public static final NpcStringId DEALINGS_WITH_CLOSE_FRIENDS_ONLY_BRING_FRUSTRATION_AND_HEADACHE_POLITELY_DECLINE_AND_MENTION_ANOTHER_CHANCE;
+	
+	/**
+	 * ID: 1800555<br>
+	 * Message: There may be a problem at completion if the basic matters are not considered from the beginning.
+	 */
+	public static final NpcStringId THERE_MAY_BE_A_PROBLEM_AT_COMPLETION_IF_THE_BASIC_MATTERS_ARE_NOT_CONSIDERED_FROM_THE_BEGINNING;
+	
+	/**
+	 * ID: 1800556<br>
+	 * Message: Distinguishing business from a private matter is needed to succeed.
+	 */
+	public static final NpcStringId DISTINGUISHING_BUSINESS_FROM_A_PRIVATE_MATTER_IS_NEEDED_TO_SUCCEED;
+	
+	/**
+	 * ID: 1800557<br>
+	 * Message: A change in rules may be helpful when problems are persistent.
+	 */
+	public static final NpcStringId A_CHANGE_IN_RULES_MAY_BE_HELPFUL_WHEN_PROBLEMS_ARE_PERSISTENT;
+	
+	/**
+	 * ID: 1800558<br>
+	 * Message: Preparing for an unforeseen situation will be difficult when small matters are ignored.
+	 */
+	public static final NpcStringId PREPARING_FOR_AN_UNFORESEEN_SITUATION_WILL_BE_DIFFICULT_WHEN_SMALL_MATTERS_ARE_IGNORED;
+	
+	/**
+	 * ID: 1800559<br>
+	 * Message: Refrain from getting involved in others' business, try to be loose as a goose.
+	 */
+	public static final NpcStringId REFRAIN_FROM_GETTING_INVOLVED_IN_OTHERS_BUSINESS_TRY_TO_BE_LOOSE_AS_A_GOOSE;
+	
+	/**
+	 * ID: 1800560<br>
+	 * Message: Being neutral is a good way to go, but clarity may be helpful contrary to your hesitance.
+	 */
+	public static final NpcStringId BEING_NEUTRAL_IS_A_GOOD_WAY_TO_GO_BUT_CLARITY_MAY_BE_HELPFUL_CONTRARY_TO_YOUR_HESITANCE;
+	
+	/**
+	 * ID: 1800561<br>
+	 * Message: Be cautious of your own actions, the past may bring misunderstandings.
+	 */
+	public static final NpcStringId BE_CAUTIOUS_OF_YOUR_OWN_ACTIONS_THE_PAST_MAY_BRING_MISUNDERSTANDINGS;
+	
+	/**
+	 * ID: 1800562<br>
+	 * Message: Pay attention to time management, emotions may waste your time.
+	 */
+	public static final NpcStringId PAY_ATTENTION_TO_TIME_MANAGEMENT_EMOTIONS_MAY_WASTE_YOUR_TIME;
+	
+	/**
+	 * ID: 1800563<br>
+	 * Message: Heroism will be rewarded, but be careful not to display arrogance or lack of sincerity.
+	 */
+	public static final NpcStringId HEROISM_WILL_BE_REWARDED_BUT_BE_CAREFUL_NOT_TO_DISPLAY_ARROGANCE_OR_LACK_OF_SINCERITY;
+	
+	/**
+	 * ID: 1800564<br>
+	 * Message: If you want to maintain relationship connections, offer reconciliation to those who had misunderstandings with you.
+	 */
+	public static final NpcStringId IF_YOU_WANT_TO_MAINTAIN_RELATIONSHIP_CONNECTIONS_OFFER_RECONCILIATION_TO_THOSE_WHO_HAD_MISUNDERSTANDINGS_WITH_YOU;
+	
+	/**
+	 * ID: 1800565<br>
+	 * Message: Step forward to solve others' problems when they are unable.
+	 */
+	public static final NpcStringId STEP_FORWARD_TO_SOLVE_OTHERS_PROBLEMS_WHEN_THEY_ARE_UNABLE;
+	
+	/**
+	 * ID: 1800566<br>
+	 * Message: There may be a little loss, but think of it as an investment for yourself.
+	 */
+	public static final NpcStringId THERE_MAY_BE_A_LITTLE_LOSS_BUT_THINK_OF_IT_AS_AN_INVESTMENT_FOR_YOURSELF;
+	
+	/**
+	 * ID: 1800567<br>
+	 * Message: Avarice bears a bigger greed, being satisfied with moderation is needed.
+	 */
+	public static final NpcStringId AVARICE_BEARS_A_BIGGER_GREED_BEING_SATISFIED_WITH_MODERATION_IS_NEEDED;
+	
+	/**
+	 * ID: 1800568<br>
+	 * Message: A rational analysis is needed as unplanned actions may bring criticism.
+	 */
+	public static final NpcStringId A_RATIONAL_ANALYSIS_IS_NEEDED_AS_UNPLANNED_ACTIONS_MAY_BRING_CRITICISM;
+	
+	/**
+	 * ID: 1800569<br>
+	 * Message: Reflect upon your shortcomings before criticizing others.
+	 */
+	public static final NpcStringId REFLECT_UPON_YOUR_SHORTCOMINGS_BEFORE_CRITICIZING_OTHERS;
+	
+	/**
+	 * ID: 1800570<br>
+	 * Message: Follow-up care is always needed after an emergency evasion.
+	 */
+	public static final NpcStringId FOLLOW_UP_CARE_IS_ALWAYS_NEEDED_AFTER_AN_EMERGENCY_EVASION;
+	
+	/**
+	 * ID: 1800571<br>
+	 * Message: You may look for a new challenge but vast knowledge is required.
+	 */
+	public static final NpcStringId YOU_MAY_LOOK_FOR_A_NEW_CHALLENGE_BUT_VAST_KNOWLEDGE_IS_REQUIRED;
+	
+	/**
+	 * ID: 1800572<br>
+	 * Message: When one puts aside their ego any misunderstanding will be solved.
+	 */
+	public static final NpcStringId WHEN_ONE_PUTS_ASIDE_THEIR_EGO_ANY_MISUNDERSTANDING_WILL_BE_SOLVED;
+	
+	/**
+	 * ID: 1800573<br>
+	 * Message: Listen to the advice that's given to you with a humble attitude.
+	 */
+	public static final NpcStringId LISTEN_TO_THE_ADVICE_THATS_GIVEN_TO_YOU_WITH_A_HUMBLE_ATTITUDE;
+	
+	/**
+	 * ID: 1800574<br>
+	 * Message: Equilibrium is achieved when one understands a downshift is evident after the rise.
+	 */
+	public static final NpcStringId EQUILIBRIUM_IS_ACHIEVED_WHEN_ONE_UNDERSTANDS_A_DOWNSHIFT_IS_EVIDENT_AFTER_THE_RISE;
+	
+	/**
+	 * ID: 1800575<br>
+	 * Message: What you sow is what you reap, faithfully follow the plan.
+	 */
+	public static final NpcStringId WHAT_YOU_SOW_IS_WHAT_YOU_REAP_FAITHFULLY_FOLLOW_THE_PLAN;
+	
+	/**
+	 * ID: 1800576<br>
+	 * Message: Meticulous preparation is needed as spontaneous actions only bear mental and monetary losses.
+	 */
+	public static final NpcStringId METICULOUS_PREPARATION_IS_NEEDED_AS_SPONTANEOUS_ACTIONS_ONLY_BEAR_MENTAL_AND_MONETARY_LOSSES;
+	
+	/**
+	 * ID: 1800577<br>
+	 * Message: The right time to bear fruit is delayed while the farmer ponders opinions.
+	 */
+	public static final NpcStringId THE_RIGHT_TIME_TO_BEAR_FRUIT_IS_DELAYED_WHILE_THE_FARMER_PONDERS_OPINIONS;
+	
+	/**
+	 * ID: 1800578<br>
+	 * Message: Help each other among close friends.
+	 */
+	public static final NpcStringId HELP_EACH_OTHER_AMONG_CLOSE_FRIENDS;
+	
+	/**
+	 * ID: 1800579<br>
+	 * Message: Obsessing over a small profit will place people apart.
+	 */
+	public static final NpcStringId OBSESSING_OVER_A_SMALL_PROFIT_WILL_PLACE_PEOPLE_APART;
+	
+	/**
+	 * ID: 1800580<br>
+	 * Message: Don't cling to the result of a gamble.
+	 */
+	public static final NpcStringId DONT_CLING_TO_THE_RESULT_OF_A_GAMBLE;
+	
+	/**
+	 * ID: 1800581<br>
+	 * Message: Small troubles and arguments are ahead, face them with a mature attitude.
+	 */
+	public static final NpcStringId SMALL_TROUBLES_AND_ARGUMENTS_ARE_AHEAD_FACE_THEM_WITH_A_MATURE_ATTITUDE;
+	
+	/**
+	 * ID: 1800582<br>
+	 * Message: Neglecting a promise may put you in distress.
+	 */
+	public static final NpcStringId NEGLECTING_A_PROMISE_MAY_PUT_YOU_IN_DISTRESS;
+	
+	/**
+	 * ID: 1800583<br>
+	 * Message: Delay any dealings as you may easily omit addressing what's important to you.
+	 */
+	public static final NpcStringId DELAY_ANY_DEALINGS_AS_YOU_MAY_EASILY_OMIT_ADDRESSING_WHATS_IMPORTANT_TO_YOU;
+	
+	/**
+	 * ID: 1800584<br>
+	 * Message: A comparison to others may be helpful.
+	 */
+	public static final NpcStringId A_COMPARISON_TO_OTHERS_MAY_BE_HELPFUL;
+	
+	/**
+	 * ID: 1800585<br>
+	 * Message: What you've endured will return as a benefit.
+	 */
+	public static final NpcStringId WHAT_YOUVE_ENDURED_WILL_RETURN_AS_A_BENEFIT;
+	
+	/**
+	 * ID: 1800586<br>
+	 * Message: Try to be courteous to the opposite sex and follow a virtuous path.
+	 */
+	public static final NpcStringId TRY_TO_BE_COURTEOUS_TO_THE_OPPOSITE_SEX_AND_FOLLOW_A_VIRTUOUS_PATH;
+	
+	/**
+	 * ID: 1800587<br>
+	 * Message: Joy may come from small things.
+	 */
+	public static final NpcStringId JOY_MAY_COME_FROM_SMALL_THINGS;
+	
+	/**
+	 * ID: 1800588<br>
+	 * Message: Be confident in your actions as good luck shadows the result.
+	 */
+	public static final NpcStringId BE_CONFIDENT_IN_YOUR_ACTIONS_AS_GOOD_LUCK_SHADOWS_THE_RESULT;
+	
+	/**
+	 * ID: 1800589<br>
+	 * Message: Be confident without hesitation when your honesty is above reproach in dealings.
+	 */
+	public static final NpcStringId BE_CONFIDENT_WITHOUT_HESITATION_WHEN_YOUR_HONESTY_IS_ABOVE_REPROACH_IN_DEALINGS;
+	
+	/**
+	 * ID: 1800590<br>
+	 * Message: A matter related to a close friend can isolate you, keep staying on the right path.
+	 */
+	public static final NpcStringId A_MATTER_RELATED_TO_A_CLOSE_FRIEND_CAN_ISOLATE_YOU_KEEP_STAYING_ON_THE_RIGHT_PATH;
+	
+	/**
+	 * ID: 1800591<br>
+	 * Message: Too much focus on the result may bring continuous misfortune.
+	 */
+	public static final NpcStringId TOO_MUCH_FOCUS_ON_THE_RESULT_MAY_BRING_CONTINUOUS_MISFORTUNE;
+	
+	/**
+	 * ID: 1800592<br>
+	 * Message: Be tenacious until the finish as halfway abandonment causes a troubled ending.
+	 */
+	public static final NpcStringId BE_TENACIOUS_UNTIL_THE_FINISH_AS_HALFWAY_ABANDONMENT_CAUSES_A_TROUBLED_ENDING;
+	
+	/**
+	 * ID: 1800593<br>
+	 * Message: There will be no advantage in a group deal.
+	 */
+	public static final NpcStringId THERE_WILL_BE_NO_ADVANTAGE_IN_A_GROUP_DEAL;
+	
+	/**
+	 * ID: 1800594<br>
+	 * Message: Refrain from stepping-up but take a moment to ponder to be flexible with situations.
+	 */
+	public static final NpcStringId REFRAIN_FROM_STEPPING_UP_BUT_TAKE_A_MOMENT_TO_PONDER_TO_BE_FLEXIBLE_WITH_SITUATIONS;
+	
+	/**
+	 * ID: 1800595<br>
+	 * Message: There will be a small opportunity when information is best utilized.
+	 */
+	public static final NpcStringId THERE_WILL_BE_A_SMALL_OPPORTUNITY_WHEN_INFORMATION_IS_BEST_UTILIZED;
+	
+	/**
+	 * ID: 1800596<br>
+	 * Message: Belongings are at loose ends, keep track of the things you value.
+	 */
+	public static final NpcStringId BELONGINGS_ARE_AT_LOOSE_ENDS_KEEP_TRACK_OF_THE_THINGS_YOU_VALUE;
+	
+	/**
+	 * ID: 1800597<br>
+	 * Message: What you sow is what you reap, try your best.
+	 */
+	public static final NpcStringId WHAT_YOU_SOW_IS_WHAT_YOU_REAP_TRY_YOUR_BEST;
+	
+	/**
+	 * ID: 1800598<br>
+	 * Message: With the beginner's attitude, shortcomings can be easily mended.
+	 */
+	public static final NpcStringId WITH_THE_BEGINNERS_ATTITUDE_SHORTCOMINGS_CAN_BE_EASILY_MENDED;
+	
+	/**
+	 * ID: 1800599<br>
+	 * Message: When facing difficulties, seek a totally different direction.
+	 */
+	public static final NpcStringId WHEN_FACING_DIFFICULTIES_SEEK_A_TOTALLY_DIFFERENT_DIRECTION;
+	
+	/**
+	 * ID: 1800600<br>
+	 * Message: Lifetime savings can disappear with one-time greed.
+	 */
+	public static final NpcStringId LIFETIME_SAVINGS_CAN_DISAPPEAR_WITH_ONE_TIME_GREED;
+	
+	/**
+	 * ID: 1800601<br>
+	 * Message: With your heart avoid extremes and peace will stay.
+	 */
+	public static final NpcStringId WITH_YOUR_HEART_AVOID_EXTREMES_AND_PEACE_WILL_STAY;
+	
+	/**
+	 * ID: 1800602<br>
+	 * Message: Be cautious as instant recklessness may bring malicious gossip.
+	 */
+	public static final NpcStringId BE_CAUTIOUS_AS_INSTANT_RECKLESSNESS_MAY_BRING_MALICIOUS_GOSSIP;
+	
+	/**
+	 * ID: 1800603<br>
+	 * Message: Be tenacious to the end because a strong luck with winning is ahead.
+	 */
+	public static final NpcStringId BE_TENACIOUS_TO_THE_END_BECAUSE_A_STRONG_LUCK_WITH_WINNING_IS_AHEAD;
+	
+	/**
+	 * ID: 1800604<br>
+	 * Message: Be kind to and care for those close to you, they may help in the future.
+	 */
+	public static final NpcStringId BE_KIND_TO_AND_CARE_FOR_THOSE_CLOSE_TO_YOU_THEY_MAY_HELP_IN_THE_FUTURE;
+	
+	/**
+	 * ID: 1800605<br>
+	 * Message: Positivity may bring good results.
+	 */
+	public static final NpcStringId POSITIVITY_MAY_BRING_GOOD_RESULTS;
+	
+	/**
+	 * ID: 1800606<br>
+	 * Message: Be gracious to cover a close friend's fault.
+	 */
+	public static final NpcStringId BE_GRACIOUS_TO_COVER_A_CLOSE_FRIENDS_FAULT;
+	
+	/**
+	 * ID: 1800607<br>
+	 * Message: Be prepared for an expected cost.
+	 */
+	public static final NpcStringId BE_PREPARED_FOR_AN_EXPECTED_COST;
+	
+	/**
+	 * ID: 1800608<br>
+	 * Message: Be considerate to others and avoid focusing only on winning or a wound will be left untreated.
+	 */
+	public static final NpcStringId BE_CONSIDERATE_TO_OTHERS_AND_AVOID_FOCUSING_ONLY_ON_WINNING_OR_A_WOUND_WILL_BE_LEFT_UNTREATED;
+	
+	/**
+	 * ID: 1800609<br>
+	 * Message: An accessory or decoration may bring a good luck.
+	 */
+	public static final NpcStringId AN_ACCESSORY_OR_DECORATION_MAY_BRING_A_GOOD_LUCK;
+	
+	/**
+	 * ID: 1800610<br>
+	 * Message: Only reflection and humility may bring success.
+	 */
+	public static final NpcStringId ONLY_REFLECTION_AND_HUMILITY_MAY_BRING_SUCCESS;
+	
+	/**
+	 * ID: 1800611<br>
+	 * Message: A small misunderstanding may cause quarrels.
+	 */
+	public static final NpcStringId A_SMALL_MISUNDERSTANDING_MAY_CAUSE_QUARRELS;
+	
+	/**
+	 * ID: 1800612<br>
+	 * Message: Avoid advancing beyond your ability and focus on the flowing stream.
+	 */
+	public static final NpcStringId AVOID_ADVANCING_BEYOND_YOUR_ABILITY_AND_FOCUS_ON_THE_FLOWING_STREAM;
+	
+	/**
+	 * ID: 1800613<br>
+	 * Message: Considering others with a good heart before self-interest will bring a triumph.
+	 */
+	public static final NpcStringId CONSIDERING_OTHERS_WITH_A_GOOD_HEART_BEFORE_SELF_INTEREST_WILL_BRING_A_TRIUMPH;
+	
+	/**
+	 * ID: 1800614<br>
+	 * Message: Visiting a place you've never been before may bring luck.
+	 */
+	public static final NpcStringId VISITING_A_PLACE_YOUVE_NEVER_BEEN_BEFORE_MAY_BRING_LUCK;
+	
+	/**
+	 * ID: 1800615<br>
+	 * Message: A good thing may happen in a place with a few people.
+	 */
+	public static final NpcStringId A_GOOD_THING_MAY_HAPPEN_IN_A_PLACE_WITH_A_FEW_PEOPLE;
+	
+	/**
+	 * ID: 1800616<br>
+	 * Message: Being high-strung can cause loss of trust from others because it can be viewed as light-hearted, act sincerely but yet do not lack humor.
+	 */
+	public static final NpcStringId BEING_HIGH_STRUNG_CAN_CAUSE_LOSS_OF_TRUST_FROM_OTHERS_BECAUSE_IT_CAN_BE_VIEWED_AS_LIGHT_HEARTED_ACT_SINCERELY_BUT_YET_DO_NOT_LACK_HUMOR;
+	
+	/**
+	 * ID: 1800617<br>
+	 * Message: Perfection at the finish can cover faulty work in the process.
+	 */
+	public static final NpcStringId PERFECTION_AT_THE_FINISH_CAN_COVER_FAULTY_WORK_IN_THE_PROCESS;
+	
+	/**
+	 * ID: 1800618<br>
+	 * Message: Abstain from laziness, much work brings many gains and satisfactory rewards.
+	 */
+	public static final NpcStringId ABSTAIN_FROM_LAZINESS_MUCH_WORK_BRINGS_MANY_GAINS_AND_SATISFACTORY_REWARDS;
+	
+	/**
+	 * ID: 1800619<br>
+	 * Message: Staying busy rather than being stationary will help.
+	 */
+	public static final NpcStringId STAYING_BUSY_RATHER_THAN_BEING_STATIONARY_WILL_HELP;
+	
+	/**
+	 * ID: 1800620<br>
+	 * Message: Handling the work by yourself may lead you into temptation.
+	 */
+	public static final NpcStringId HANDLING_THE_WORK_BY_YOURSELF_MAY_LEAD_YOU_INTO_TEMPTATION;
+	
+	/**
+	 * ID: 1800621<br>
+	 * Message: Pay attention to any small advice without being indifferent.
+	 */
+	public static final NpcStringId PAY_ATTENTION_TO_ANY_SMALL_ADVICE_WITHOUT_BEING_INDIFFERENT;
+	
+	/**
+	 * ID: 1800622<br>
+	 * Message: Small things make up big things so even value trivial matters.
+	 */
+	public static final NpcStringId SMALL_THINGS_MAKE_UP_BIG_THINGS_SO_EVEN_VALUE_TRIVIAL_MATTERS;
+	
+	/**
+	 * ID: 1800623<br>
+	 * Message: Action toward the result rather than waiting for the right circumstances may lead you to a fast success.
+	 */
+	public static final NpcStringId ACTION_TOWARD_THE_RESULT_RATHER_THAN_WAITING_FOR_THE_RIGHT_CIRCUMSTANCES_MAY_LEAD_YOU_TO_A_FAST_SUCCESS;
+	
+	/**
+	 * ID: 1800624<br>
+	 * Message: Don't try to save small expenditures, it will lead to future returns.
+	 */
+	public static final NpcStringId DONT_TRY_TO_SAVE_SMALL_EXPENDITURES_IT_WILL_LEAD_TO_FUTURE_RETURNS;
+	
+	/**
+	 * ID: 1800625<br>
+	 * Message: Be cautious to control emotions as temptations are nearby.
+	 */
+	public static final NpcStringId BE_CAUTIOUS_TO_CONTROL_EMOTIONS_AS_TEMPTATIONS_ARE_NEARBY;
+	
+	/**
+	 * ID: 1800626<br>
+	 * Message: Be warned as neglecting a matter because it's small can cause you trouble.
+	 */
+	public static final NpcStringId BE_WARNED_AS_NEGLECTING_A_MATTER_BECAUSE_ITS_SMALL_CAN_CAUSE_YOU_TROUBLE;
+	
+	/**
+	 * ID: 1800627<br>
+	 * Message: Spend when needed rather than trying to unconditionally save.
+	 */
+	public static final NpcStringId SPEND_WHEN_NEEDED_RATHER_THAN_TRYING_TO_UNCONDITIONALLY_SAVE;
+	
+	/**
+	 * ID: 1800628<br>
+	 * Message: Prejudice will take you to a small gain with a big loss.
+	 */
+	public static final NpcStringId PREJUDICE_WILL_TAKE_YOU_TO_A_SMALL_GAIN_WITH_A_BIG_LOSS;
+	
+	/**
+	 * ID: 1800629<br>
+	 * Message: Sweet food may bring good luck.
+	 */
+	public static final NpcStringId SWEET_FOOD_MAY_BRING_GOOD_LUCK;
+	
+	/**
+	 * ID: 1800630<br>
+	 * Message: You may be paid for what you're owed or for your past loss.
+	 */
+	public static final NpcStringId YOU_MAY_BE_PAID_FOR_WHAT_YOURE_OWED_OR_FOR_YOUR_PAST_LOSS;
+	
+	/**
+	 * ID: 1800631<br>
+	 * Message: There may be conflict in basic matters.
+	 */
+	public static final NpcStringId THERE_MAY_BE_CONFLICT_IN_BASIC_MATTERS;
+	
+	/**
+	 * ID: 1800632<br>
+	 * Message: Be observant to close friends' small behaviors while refraining from excessive kindness.
+	 */
+	public static final NpcStringId BE_OBSERVANT_TO_CLOSE_FRIENDS_SMALL_BEHAVIORS_WHILE_REFRAINING_FROM_EXCESSIVE_KINDNESS;
+	
+	/**
+	 * ID: 1800633<br>
+	 * Message: Do not show your distress nor lose your smile.
+	 */
+	public static final NpcStringId DO_NOT_SHOW_YOUR_DISTRESS_NOR_LOSE_YOUR_SMILE;
+	
+	/**
+	 * ID: 1800634<br>
+	 * Message: Showing change may be of help.
+	 */
+	public static final NpcStringId SHOWING_CHANGE_MAY_BE_OF_HELP;
+	
+	/**
+	 * ID: 1800635<br>
+	 * Message: The intended result may be on your way if the time is perfectly managed.
+	 */
+	public static final NpcStringId THE_INTENDED_RESULT_MAY_BE_ON_YOUR_WAY_IF_THE_TIME_IS_PERFECTLY_MANAGED;
+	
+	/**
+	 * ID: 1800636<br>
+	 * Message: Hardships may arise if flexibility is not well played.
+	 */
+	public static final NpcStringId HARDSHIPS_MAY_ARISE_IF_FLEXIBILITY_IS_NOT_WELL_PLAYED;
+	
+	/**
+	 * ID: 1800637<br>
+	 * Message: Keep cool headed because carelessness or inattentiveness may cause misfortune.
+	 */
+	public static final NpcStringId KEEP_COOL_HEADED_BECAUSE_CARELESSNESS_OR_INATTENTIVENESS_MAY_CAUSE_MISFORTUNE;
+	
+	/**
+	 * ID: 1800638<br>
+	 * Message: Be cautious as you may get hurt after last night's sinister dream.
+	 */
+	public static final NpcStringId BE_CAUTIOUS_AS_YOU_MAY_GET_HURT_AFTER_LAST_NIGHTS_SINISTER_DREAM;
+	
+	/**
+	 * ID: 1800639<br>
+	 * Message: A strong wealth luck is ahead but be careful with emotions that may bring losses.
+	 */
+	public static final NpcStringId A_STRONG_WEALTH_LUCK_IS_AHEAD_BUT_BE_CAREFUL_WITH_EMOTIONS_THAT_MAY_BRING_LOSSES;
+	
+	/**
+	 * ID: 1800640<br>
+	 * Message: Proceed as you wish when it's pertinent to the person you like.
+	 */
+	public static final NpcStringId PROCEED_AS_YOU_WISH_WHEN_ITS_PERTINENT_TO_THE_PERSON_YOU_LIKE;
+	
+	/**
+	 * ID: 1800641<br>
+	 * Message: You may deepen the relationship with the opposite sex through conversation.
+	 */
+	public static final NpcStringId YOU_MAY_DEEPEN_THE_RELATIONSHIP_WITH_THE_OPPOSITE_SEX_THROUGH_CONVERSATION;
+	
+	/**
+	 * ID: 1800642<br>
+	 * Message: Investment into solid material may bring profit.
+	 */
+	public static final NpcStringId INVESTMENT_INTO_SOLID_MATERIAL_MAY_BRING_PROFIT;
+	
+	/**
+	 * ID: 1800643<br>
+	 * Message: Investment into what you enjoy may be of help.
+	 */
+	public static final NpcStringId INVESTMENT_INTO_WHAT_YOU_ENJOY_MAY_BE_OF_HELP;
+	
+	/**
+	 * ID: 1800644<br>
+	 * Message: Being busy may help catching up with many changes.
+	 */
+	public static final NpcStringId BEING_BUSY_MAY_HELP_CATCHING_UP_WITH_MANY_CHANGES;
+	
+	/**
+	 * ID: 1800645<br>
+	 * Message: Choose substance over honor.
+	 */
+	public static final NpcStringId CHOOSE_SUBSTANCE_OVER_HONOR;
+	
+	/**
+	 * ID: 1800646<br>
+	 * Message: Remember to decline any financial dealings because a good deed may return as resentment.
+	 */
+	public static final NpcStringId REMEMBER_TO_DECLINE_ANY_FINANCIAL_DEALINGS_BECAUSE_A_GOOD_DEED_MAY_RETURN_AS_RESENTMENT;
+	
+	/**
+	 * ID: 1800647<br>
+	 * Message: Be careful not to make a mistake with a new person.
+	 */
+	public static final NpcStringId BE_CAREFUL_NOT_TO_MAKE_A_MISTAKE_WITH_A_NEW_PERSON;
+	
+	/**
+	 * ID: 1800648<br>
+	 * Message: Do not be obsessive over a dragged out project since it won't get any better with more time.
+	 */
+	public static final NpcStringId DO_NOT_BE_OBSESSIVE_OVER_A_DRAGGED_OUT_PROJECT_SINCE_IT_WONT_GET_ANY_BETTER_WITH_MORE_TIME;
+	
+	/**
+	 * ID: 1800649<br>
+	 * Message: Do not yield what's rightfully yours or tolerate losses.
+	 */
+	public static final NpcStringId DO_NOT_YIELD_WHATS_RIGHTFULLY_YOURS_OR_TOLERATE_LOSSES;
+	
+	/**
+	 * ID: 1800650<br>
+	 * Message: There's luck in relationships so become interested in the opposite sex.
+	 */
+	public static final NpcStringId THERES_LUCK_IN_RELATIONSHIPS_SO_BECOME_INTERESTED_IN_THE_OPPOSITE_SEX;
+	
+	/**
+	 * ID: 1800651<br>
+	 * Message: Seeking others' help rather than trying by yourself may result in two birds with one stone.
+	 */
+	public static final NpcStringId SEEKING_OTHERS_HELP_RATHER_THAN_TRYING_BY_YOURSELF_MAY_RESULT_IN_TWO_BIRDS_WITH_ONE_STONE;
+	
+	/**
+	 * ID: 1800652<br>
+	 * Message: Persuading the other may result in your gain.
+	 */
+	public static final NpcStringId PERSUADING_THE_OTHER_MAY_RESULT_IN_YOUR_GAIN;
+	
+	/**
+	 * ID: 1800653<br>
+	 * Message: A good opportunity may come when keeping patience without excessiveness.
+	 */
+	public static final NpcStringId A_GOOD_OPPORTUNITY_MAY_COME_WHEN_KEEPING_PATIENCE_WITHOUT_EXCESSIVENESS;
+	
+	/**
+	 * ID: 1800654<br>
+	 * Message: The opposite sex may bring fortune.
+	 */
+	public static final NpcStringId THE_OPPOSITE_SEX_MAY_BRING_FORTUNE;
+	
+	/**
+	 * ID: 1800655<br>
+	 * Message: Doing favor for other people may bring fortune in the future.
+	 */
+	public static final NpcStringId DOING_FAVOR_FOR_OTHER_PEOPLE_MAY_BRING_FORTUNE_IN_THE_FUTURE;
+	
+	/**
+	 * ID: 1800656<br>
+	 * Message: Luck may stay near if a smile is kept during difficult times.
+	 */
+	public static final NpcStringId LUCK_MAY_STAY_NEAR_IF_A_SMILE_IS_KEPT_DURING_DIFFICULT_TIMES;
+	
+	/**
+	 * ID: 1800657<br>
+	 * Message: You may reveal your true self like iron is molten into an strong sword.
+	 */
+	public static final NpcStringId YOU_MAY_REVEAL_YOUR_TRUE_SELF_LIKE_IRON_IS_MOLTEN_INTO_AN_STRONG_SWORD;
+	
+	/**
+	 * ID: 1800658<br>
+	 * Message: Your value will shine as your potential is finally realized.
+	 */
+	public static final NpcStringId YOUR_VALUE_WILL_SHINE_AS_YOUR_POTENTIAL_IS_FINALLY_REALIZED;
+	
+	/**
+	 * ID: 1800659<br>
+	 * Message: Tenacious efforts in solving a difficult mission or hardship may bring good results as well as realizing your hidden potential.
+	 */
+	public static final NpcStringId TENACIOUS_EFFORTS_IN_SOLVING_A_DIFFICULT_MISSION_OR_HARDSHIP_MAY_BRING_GOOD_RESULTS_AS_WELL_AS_REALIZING_YOUR_HIDDEN_POTENTIAL;
+	
+	/**
+	 * ID: 1800660<br>
+	 * Message: People will appreciate your positivity and joyful entertaining.
+	 */
+	public static final NpcStringId PEOPLE_WILL_APPRECIATE_YOUR_POSITIVITY_AND_JOYFUL_ENTERTAINING;
+	
+	/**
+	 * ID: 1800661<br>
+	 * Message: Things will move smoothly with your full wisdom and abilities.
+	 */
+	public static final NpcStringId THINGS_WILL_MOVE_SMOOTHLY_WITH_YOUR_FULL_WISDOM_AND_ABILITIES;
+	
+	/**
+	 * ID: 1800662<br>
+	 * Message: You may meet a sage who can help you find the right path.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_A_SAGE_WHO_CAN_HELP_YOU_FIND_THE_RIGHT_PATH;
+	
+	/**
+	 * ID: 1800663<br>
+	 * Message: Keen instinct and foresight will shine their values.
+	 */
+	public static final NpcStringId KEEN_INSTINCT_AND_FORESIGHT_WILL_SHINE_THEIR_VALUES;
+	
+	/**
+	 * ID: 1800664<br>
+	 * Message: You may bring good luck to those around you.
+	 */
+	public static final NpcStringId YOU_MAY_BRING_GOOD_LUCK_TO_THOSE_AROUND_YOU;
+	
+	/**
+	 * ID: 1800665<br>
+	 * Message: Your goal may be realized when emotional details are well defined.
+	 */
+	public static final NpcStringId YOUR_GOAL_MAY_BE_REALIZED_WHEN_EMOTIONAL_DETAILS_ARE_WELL_DEFINED;
+	
+	/**
+	 * ID: 1800666<br>
+	 * Message: You may enjoy affluence after meeting a precious person.
+	 */
+	public static final NpcStringId YOU_MAY_ENJOY_AFFLUENCE_AFTER_MEETING_A_PRECIOUS_PERSON;
+	
+	/**
+	 * ID: 1800667<br>
+	 * Message: You may meet the opposite sex who has materialistic attractions.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_THE_OPPOSITE_SEX_WHO_HAS_MATERIALISTIC_ATTRACTIONS;
+	
+	/**
+	 * ID: 1800668<br>
+	 * Message: A big success will follow all possible efforts in competition.
+	 */
+	public static final NpcStringId A_BIG_SUCCESS_WILL_FOLLOW_ALL_POSSIBLE_EFFORTS_IN_COMPETITION;
+	
+	/**
+	 * ID: 1800669<br>
+	 * Message: A consequence from past actions will be on display.
+	 */
+	public static final NpcStringId A_CONSEQUENCE_FROM_PAST_ACTIONS_WILL_BE_ON_DISPLAY;
+	
+	/**
+	 * ID: 1800670<br>
+	 * Message: Whatever happened to you and the other person will replay, but this time, the opposite will be the result.
+	 */
+	public static final NpcStringId WHATEVER_HAPPENED_TO_YOU_AND_THE_OTHER_PERSON_WILL_REPLAY_BUT_THIS_TIME_THE_OPPOSITE_WILL_BE_THE_RESULT;
+	
+	/**
+	 * ID: 1800671<br>
+	 * Message: You may need to sacrifice for a higher cause.
+	 */
+	public static final NpcStringId YOU_MAY_NEED_TO_SACRIFICE_FOR_A_HIGHER_CAUSE;
+	
+	/**
+	 * ID: 1800672<br>
+	 * Message: You may lose an item but will gain honor.
+	 */
+	public static final NpcStringId YOU_MAY_LOSE_AN_ITEM_BUT_WILL_GAIN_HONOR;
+	
+	/**
+	 * ID: 1800673<br>
+	 * Message: A new trial or start may be successful as luck shadows changes.
+	 */
+	public static final NpcStringId A_NEW_TRIAL_OR_START_MAY_BE_SUCCESSFUL_AS_LUCK_SHADOWS_CHANGES;
+	
+	/**
+	 * ID: 1800674<br>
+	 * Message: Be sophisticated without showing your true emotions as tricks and materialistic temptations lie ahead.
+	 */
+	public static final NpcStringId BE_SOPHISTICATED_WITHOUT_SHOWING_YOUR_TRUE_EMOTIONS_AS_TRICKS_AND_MATERIALISTIC_TEMPTATIONS_LIE_AHEAD;
+	
+	/**
+	 * ID: 1800675<br>
+	 * Message: Do not attempt a dangerous adventure.
+	 */
+	public static final NpcStringId DO_NOT_ATTEMPT_A_DANGEROUS_ADVENTURE;
+	
+	/**
+	 * ID: 1800676<br>
+	 * Message: Do not be afraid of change. A risk will be another opportunity.
+	 */
+	public static final NpcStringId DO_NOT_BE_AFRAID_OF_CHANGE_A_RISK_WILL_BE_ANOTHER_OPPORTUNITY;
+	
+	/**
+	 * ID: 1800677<br>
+	 * Message: Be confident and act tenaciously at all times. You may be able to accomplish to perfection during somewhat unstable situations.
+	 */
+	public static final NpcStringId BE_CONFIDENT_AND_ACT_TENACIOUSLY_AT_ALL_TIMES_YOU_MAY_BE_ABLE_TO_ACCOMPLISH_TO_PERFECTION_DURING_SOMEWHAT_UNSTABLE_SITUATIONS;
+	
+	/**
+	 * ID: 1800678<br>
+	 * Message: You may expect a bright and hopeful future.
+	 */
+	public static final NpcStringId YOU_MAY_EXPECT_A_BRIGHT_AND_HOPEFUL_FUTURE;
+	
+	/**
+	 * ID: 1800679<br>
+	 * Message: A rest will promise a bigger development.
+	 */
+	public static final NpcStringId A_REST_WILL_PROMISE_A_BIGGER_DEVELOPMENT;
+	
+	/**
+	 * ID: 1800680<br>
+	 * Message: Fully utilize positive views.
+	 */
+	public static final NpcStringId FULLY_UTILIZE_POSITIVE_VIEWS;
+	
+	/**
+	 * ID: 1800681<br>
+	 * Message: Positive thinking and energetic actions will take you to the center of the glorious stage.
+	 */
+	public static final NpcStringId POSITIVE_THINKING_AND_ENERGETIC_ACTIONS_WILL_TAKE_YOU_TO_THE_CENTER_OF_THE_GLORIOUS_STAGE;
+	
+	/**
+	 * ID: 1800682<br>
+	 * Message: Your self confidence and intuition may solve the difficulties.
+	 */
+	public static final NpcStringId YOUR_SELF_CONFIDENCE_AND_INTUITION_MAY_SOLVE_THE_DIFFICULTIES;
+	
+	/**
+	 * ID: 1800683<br>
+	 * Message: Everything is brilliant and joyful, share it with others. A bigger fortune will follow.
+	 */
+	public static final NpcStringId EVERYTHING_IS_BRILLIANT_AND_JOYFUL_SHARE_IT_WITH_OTHERS_A_BIGGER_FORTUNE_WILL_FOLLOW;
+	
+	/**
+	 * ID: 1800684<br>
+	 * Message: A fair assessment and reward for past actions lie ahead.
+	 */
+	public static final NpcStringId A_FAIR_ASSESSMENT_AND_REWARD_FOR_PAST_ACTIONS_LIE_AHEAD;
+	
+	/**
+	 * ID: 1800685<br>
+	 * Message: Pay accurately the old liability or debt, if applicable. A new joy lies ahead.
+	 */
+	public static final NpcStringId PAY_ACCURATELY_THE_OLD_LIABILITY_OR_DEBT_IF_APPLICABLE_A_NEW_JOY_LIES_AHEAD;
+	
+	/**
+	 * ID: 1800686<br>
+	 * Message: An excessive humility can harm you back.
+	 */
+	public static final NpcStringId AN_EXCESSIVE_HUMILITY_CAN_HARM_YOU_BACK;
+	
+	/**
+	 * ID: 1800687<br>
+	 * Message: A reward for the past work will come through.
+	 */
+	public static final NpcStringId A_REWARD_FOR_THE_PAST_WORK_WILL_COME_THROUGH;
+	
+	/**
+	 * ID: 1800688<br>
+	 * Message: Your past fruitless effort will finally be rewarded with something unexpected.
+	 */
+	public static final NpcStringId YOUR_PAST_FRUITLESS_EFFORT_WILL_FINALLY_BE_REWARDED_WITH_SOMETHING_UNEXPECTED;
+	
+	/**
+	 * ID: 1800689<br>
+	 * Message: There's strong luck in a revival, abandon the old and create the new.
+	 */
+	public static final NpcStringId THERES_STRONG_LUCK_IN_A_REVIVAL_ABANDON_THE_OLD_AND_CREATE_THE_NEW;
+	
+	/**
+	 * ID: 1800690<br>
+	 * Message: You may gain materialistic or mental aid from close friends.
+	 */
+	public static final NpcStringId YOU_MAY_GAIN_MATERIALISTIC_OR_MENTAL_AID_FROM_CLOSE_FRIENDS;
+	
+	/**
+	 * ID: 1800691<br>
+	 * Message: A good beginning is awaiting you.
+	 */
+	public static final NpcStringId A_GOOD_BEGINNING_IS_AWAITING_YOU;
+	
+	/**
+	 * ID: 1800692<br>
+	 * Message: You may meet the person you've longed to see.
+	 */
+	public static final NpcStringId YOU_MAY_MEET_THE_PERSON_YOUVE_LONGED_TO_SEE;
+	
+	/**
+	 * ID: 1800693<br>
+	 * Message: You may sustain a loss due to your kindness.
+	 */
+	public static final NpcStringId YOU_MAY_SUSTAIN_A_LOSS_DUE_TO_YOUR_KINDNESS;
+	
+	/**
+	 * ID: 1800694<br>
+	 * Message: Closely observe people who pass by since you may meet a precious person who can help you.
+	 */
+	public static final NpcStringId CLOSELY_OBSERVE_PEOPLE_WHO_PASS_BY_SINCE_YOU_MAY_MEET_A_PRECIOUS_PERSON_WHO_CAN_HELP_YOU;
+	
+	/**
+	 * ID: 1800695<br>
+	 * Message: Messenger, inform the patrons of the Keucereus Alliance Base! We're gathering brave adventurers to attack Tiat's Mounted Troop that's rooted in the Seed of Destruction.
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_WERE_GATHERING_BRAVE_ADVENTURERS_TO_ATTACK_TIATS_MOUNTED_TROOP_THATS_ROOTED_IN_THE_SEED_OF_DESTRUCTION;
+	
+	/**
+	 * ID: 1800696<br>
+	 * Message: Messenger, inform the patrons of the Keucereus Alliance Base! The Seed of Destruction is currently secured under the flag of the Keucereus Alliance!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_THE_SEED_OF_DESTRUCTION_IS_CURRENTLY_SECURED_UNDER_THE_FLAG_OF_THE_KEUCEREUS_ALLIANCE;
+	
+	/**
+	 * ID: 1800697<br>
+	 * Message: Messenger, inform the patrons of the Keucereus Alliance Base! Tiat's Mounted Troop is currently trying to retake Seed of Destruction! Commit all the available reinforcements into Seed of Destruction!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_TIATS_MOUNTED_TROOP_IS_CURRENTLY_TRYING_TO_RETAKE_SEED_OF_DESTRUCTION_COMMIT_ALL_THE_AVAILABLE_REINFORCEMENTS_INTO_SEED_OF_DESTRUCTION;
+	
+	/**
+	 * ID: 1800698<br>
+	 * Message: Messenger, inform the brothers in Kucereus' clan outpost! Brave adventurers who have challenged the Seed of Infinity are currently infiltrating the Hall of Erosion through the defensively weak Hall of Suffering!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_BRAVE_ADVENTURERS_WHO_HAVE_CHALLENGED_THE_SEED_OF_INFINITY_ARE_CURRENTLY_INFILTRATING_THE_HALL_OF_EROSION_THROUGH_THE_DEFENSIVELY_WEAK_HALL_OF_SUFFERING;
+	
+	/**
+	 * ID: 1800699<br>
+	 * Message: Messenger, inform the brothers in Kucereus' clan outpost! Brave adventurers who have challenged the Seed of Infinity are currently infiltrating the Hall of Erosion through the defensively weak Hall of Suffering!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_SWEEPING_THE_SEED_OF_INFINITY_IS_CURRENTLY_COMPLETE_TO_THE_HEART_OF_THE_SEED_EKIMUS_IS_BEING_DIRECTLY_ATTACKED_AND_THE_UNDEAD_REMAINING_IN_THE_HALL_OF_SUFFERING_ARE_BEING_ERADICATED;
+	
+	/**
+	 * ID: 1800700<br>
+	 * Message: Messenger, inform the patrons of the Keucereus Alliance Base! The Seed of Infinity is currently secured under the flag of the Keucereus Alliance!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_THE_SEED_OF_INFINITY_IS_CURRENTLY_SECURED_UNDER_THE_FLAG_OF_THE_KEUCEREUS_ALLIANCE;
+	
+	/**
+	 * ID: 1800701<br>
+	 * Message:
+	 */
+	public static final NpcStringId EMPTY_STRING;
+	
+	/**
+	 * ID: 1800702<br>
+	 * Message: Messenger, inform the patrons of the Keucereus Alliance Base! The resurrected Undead in the Seed of Infinity are pouring into the Hall of Suffering and the Hall of Erosion!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_THE_RESURRECTED_UNDEAD_IN_THE_SEED_OF_INFINITY_ARE_POURING_INTO_THE_HALL_OF_SUFFERING_AND_THE_HALL_OF_EROSION;
+	
+	/**
+	 * ID: 1800703<br>
+	 * Message: Messenger, inform the brothers in Kucereus' clan outpost! Ekimus is about to be revived by the resurrected Undead in Seed of Infinity. Send all reinforcements to the Heart and the Hall of Suffering!
+	 */
+	public static final NpcStringId MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_EKIMUS_IS_ABOUT_TO_BE_REVIVED_BY_THE_RESURRECTED_UNDEAD_IN_SEED_OF_INFINITY_SEND_ALL_REINFORCEMENTS_TO_THE_HEART_AND_THE_HALL_OF_SUFFERING;
+	
+	/**
+	 * ID: 1800704<br>
+	 * Message: Stabbing three times!
+	 */
+	public static final NpcStringId STABBING_THREE_TIMES;
+	
+	/**
+	 * ID: 1800705<br>
+	 * Message: Poor creatures, feel the power of darkness!
+	 */
+	public static final NpcStringId POOR_CREATURES_FEEL_THE_POWER_OF_DARKNESS;
+	
+	/**
+	 * ID: 1800706<br>
+	 * Message: Whoaaaaaa!!!!
+	 */
+	public static final NpcStringId WHOAAAAAA;
+	
+	/**
+	 * ID: 1800707<br>
+	 * Message: You'll regret challenging me!!!!
+	 */
+	public static final NpcStringId YOULL_REGRET_CHALLENGING_ME;
+	
+	/**
+	 * ID: 1800708<br>
+	 * Message: It's currently occupied by the enemy and our troops are attacking.
+	 */
+	public static final NpcStringId ITS_CURRENTLY_OCCUPIED_BY_THE_ENEMY_AND_OUR_TROOPS_ARE_ATTACKING;
+	
+	/**
+	 * ID: 1800709<br>
+	 * Message: It's under occupation by our forces, and I heard that Kucereus' clan is organizing the remnants.
+	 */
+	public static final NpcStringId ITS_UNDER_OCCUPATION_BY_OUR_FORCES_AND_I_HEARD_THAT_KUCEREUS_CLAN_IS_ORGANIZING_THE_REMNANTS;
+	
+	/**
+	 * ID: 1800710<br>
+	 * Message: Although we currently have control of it, the enemy is pushing back with a powerful attack.
+	 */
+	public static final NpcStringId ALTHOUGH_WE_CURRENTLY_HAVE_CONTROL_OF_IT_THE_ENEMY_IS_PUSHING_BACK_WITH_A_POWERFUL_ATTACK;
+	
+	/**
+	 * ID: 1800711<br>
+	 * Message: It's under the enemy's occupation, and the military forces of adventurers and clan members are unleashing an onslaught upon the Hall of Suffering and the Hall of Erosion.
+	 */
+	public static final NpcStringId ITS_UNDER_THE_ENEMYS_OCCUPATION_AND_THE_MILITARY_FORCES_OF_ADVENTURERS_AND_CLAN_MEMBERS_ARE_UNLEASHING_AN_ONSLAUGHT_UPON_THE_HALL_OF_SUFFERING_AND_THE_HALL_OF_EROSION;
+	
+	/**
+	 * ID: 1800713<br>
+	 * Message: Our forces have occupied it and are currently investigating the depths.
+	 */
+	public static final NpcStringId OUR_FORCES_HAVE_OCCUPIED_IT_AND_ARE_CURRENTLY_INVESTIGATING_THE_DEPTHS;
+	
+	/**
+	 * ID: 1800714<br>
+	 * Message: It's under occupation by our forces, but the enemy has resurrected and is attacking toward the Hall of Suffering and the Hall of Erosion.
+	 */
+	public static final NpcStringId ITS_UNDER_OCCUPATION_BY_OUR_FORCES_BUT_THE_ENEMY_HAS_RESURRECTED_AND_IS_ATTACKING_TOWARD_THE_HALL_OF_SUFFERING_AND_THE_HALL_OF_EROSION;
+	
+	/**
+	 * ID: 1800715<br>
+	 * Message: It's under occupation by our forces, but the enemy has already overtaken the Hall of Erosion and is driving out our forces from the Hall of Suffering toward the Heart. It seems that Ekimus will revive shortly.
+	 */
+	public static final NpcStringId ITS_UNDER_OCCUPATION_BY_OUR_FORCES_BUT_THE_ENEMY_HAS_ALREADY_OVERTAKEN_THE_HALL_OF_EROSION_AND_IS_DRIVING_OUT_OUR_FORCES_FROM_THE_HALL_OF_SUFFERING_TOWARD_THE_HEART_IT_SEEMS_THAT_EKIMUS_WILL_REVIVE_SHORTLY;
+	
+	/**
+	 * ID: 1800717<br>
+	 * Message: Tiat's followers are coming to retake the Seed of Destruction! Get ready to stop the enemies!
+	 */
+	public static final NpcStringId TIATS_FOLLOWERS_ARE_COMING_TO_RETAKE_THE_SEED_OF_DESTRUCTION_GET_READY_TO_STOP_THE_ENEMIES;
+	
+	/**
+	 * ID: 1800718<br>
+	 * Message: It's hurting... I'm in pain... What can I do for the pain...
+	 */
+	public static final NpcStringId ITS_HURTING_IM_IN_PAIN_WHAT_CAN_I_DO_FOR_THE_PAIN;
+	
+	/**
+	 * ID: 1800719<br>
+	 * Message: No... When I lose that one... I'll be in more pain...
+	 */
+	public static final NpcStringId NO_WHEN_I_LOSE_THAT_ONE_ILL_BE_IN_MORE_PAIN;
+	
+	/**
+	 * ID: 1800720<br>
+	 * Message: Hahahah!!! I captured Santa Claus!! There will be no gifts this year!!!
+	 */
+	public static final NpcStringId HAHAHAH_I_CAPTURED_SANTA_CLAUS_THERE_WILL_BE_NO_GIFTS_THIS_YEAR;
+	
+	/**
+	 * ID: 1800721<br>
+	 * Message: Now! Why don't you take up the challenge?
+	 */
+	public static final NpcStringId NOW_WHY_DONT_YOU_TAKE_UP_THE_CHALLENGE;
+	
+	/**
+	 * ID: 1800722<br>
+	 * Message: Come on, I'll take all of you on!
+	 */
+	public static final NpcStringId COME_ON_ILL_TAKE_ALL_OF_YOU_ON;
+	
+	/**
+	 * ID: 1800723<br>
+	 * Message: How about it? I think I won?
+	 */
+	public static final NpcStringId HOW_ABOUT_IT_I_THINK_I_WON;
+	
+	/**
+	 * ID: 1800724<br>
+	 * Message: Now!! Those of you who lost, go away!
+	 */
+	public static final NpcStringId NOW_THOSE_OF_YOU_WHO_LOST_GO_AWAY;
+	
+	/**
+	 * ID: 1800725<br>
+	 * Message: What a bunch of losers.
+	 */
+	public static final NpcStringId WHAT_A_BUNCH_OF_LOSERS;
+	
+	/**
+	 * ID: 1800726<br>
+	 * Message: I guess you came to rescue Santa. But you picked the wrong person.
+	 */
+	public static final NpcStringId I_GUESS_YOU_CAME_TO_RESCUE_SANTA_BUT_YOU_PICKED_THE_WRONG_PERSON;
+	
+	/**
+	 * ID: 1800727<br>
+	 * Message: Ah, okay...
+	 */
+	public static final NpcStringId AH_OKAY;
+	
+	/**
+	 * ID: 1800728<br>
+	 * Message: Agh!! I wasn't going to do that!
+	 */
+	public static final NpcStringId UAGH_I_WASNT_GOING_TO_DO_THAT;
+	
+	/**
+	 * ID: 1800729<br>
+	 * Message: You're cursed!! Oh.. What?
+	 */
+	public static final NpcStringId YOURE_CURSED_OH_WHAT;
+	
+	/**
+	 * ID: 1800730<br>
+	 * Message: Have you done nothing but rock-paper-scissors??
+	 */
+	public static final NpcStringId HAVE_YOU_DONE_NOTHING_BUT_ROCK_PAPER_SCISSORS;
+	
+	/**
+	 * ID: 1800731<br>
+	 * Message: Stop it, no more... I did it because I was too lonely...
+	 */
+	public static final NpcStringId STOP_IT_NO_MORE_I_DID_IT_BECAUSE_I_WAS_TOO_LONELY;
+	
+	/**
+	 * ID: 1800732<br>
+	 * Message: I have to release Santa... How infuriating!!!
+	 */
+	public static final NpcStringId I_HAVE_TO_RELEASE_SANTA_HOW_INFURIATING;
+	
+	/**
+	 * ID: 1800733<br>
+	 * Message: I hate happy Merry Christmas!!!
+	 */
+	public static final NpcStringId I_HATE_HAPPY_MERRY_CHRISTMAS;
+	
+	/**
+	 * ID: 1800734<br>
+	 * Message: Oh. I'm bored.
+	 */
+	public static final NpcStringId OH_IM_BORED;
+	
+	/**
+	 * ID: 1800735<br>
+	 * Message: Shall I go to take a look if Santa is still there? Hehe
+	 */
+	public static final NpcStringId SHALL_I_GO_TO_TAKE_A_LOOK_IF_SANTA_IS_STILL_THERE_HEHE;
+	
+	/**
+	 * ID: 1800736<br>
+	 * Message: Oh ho ho.... Merry Christmas!!
+	 */
+	public static final NpcStringId OH_HO_HO_MERRY_CHRISTMAS;
+	
+	/**
+	 * ID: 1800737<br>
+	 * Message: Santa could give nice presents only if he's released from the Turkey...
+	 */
+	public static final NpcStringId SANTA_COULD_GIVE_NICE_PRESENTS_ONLY_IF_HES_RELEASED_FROM_THE_TURKEY;
+	
+	/**
+	 * ID: 1800738<br>
+	 * Message: Oh ho ho... Oh ho ho... Thank you. Ladies and gentlemen! I will repay you for sure.
+	 */
+	public static final NpcStringId OH_HO_HO_OH_HO_HO_THANK_YOU_LADIES_AND_GENTLEMEN_I_WILL_REPAY_YOU_FOR_SURE;
+	
+	/**
+	 * ID: 1800739<br>
+	 * Message: Merry Christmas~ You're doing a good job.
+	 */
+	public static final NpcStringId UMERRY_CHRISTMAS_YOURE_DOING_A_GOOD_JOB;
+	
+	/**
+	 * ID: 1800740<br>
+	 * Message: Merry Christmas~ Thank you for rescuing me from that wretched Turkey.
+	 */
+	public static final NpcStringId MERRY_CHRISTMAS_THANK_YOU_FOR_RESCUING_ME_FROM_THAT_WRETCHED_TURKEY;
+	
+	/**
+	 * ID: 1800741<br>
+	 * Message: $s1 . I have prepared a gift for you.
+	 */
+	public static final NpcStringId S1_I_HAVE_PREPARED_A_GIFT_FOR_YOU;
+	
+	/**
+	 * ID: 1800742<br>
+	 * Message: I have a gift for $s1.
+	 */
+	public static final NpcStringId I_HAVE_A_GIFT_FOR_S1;
+	
+	/**
+	 * ID: 1800743<br>
+	 * Message: Take a look at the inventory. I hope you like the gift I gave you.
+	 */
+	public static final NpcStringId TAKE_A_LOOK_AT_THE_INVENTORY_I_HOPE_YOU_LIKE_THE_GIFT_I_GAVE_YOU;
+	
+	/**
+	 * ID: 1800744<br>
+	 * Message: Take a look at the inventory. Perhaps there might be a big present~
+	 */
+	public static final NpcStringId TAKE_A_LOOK_AT_THE_INVENTORY_PERHAPS_THERE_MIGHT_BE_A_BIG_PRESENT;
+	
+	/**
+	 * ID: 1800745<br>
+	 * Message: I'm tired of dealing with you. I'm leaving.
+	 */
+	public static final NpcStringId IM_TIRED_OF_DEALING_WITH_YOU_IM_LEAVING;
+	
+	/**
+	 * ID: 1800746<br>
+	 * Message: When are you going to stop? I slowly started to be tired of it.
+	 */
+	public static final NpcStringId WHEN_ARE_YOU_GOING_TO_STOP_I_SLOWLY_STARTED_TO_BE_TIRED_OF_IT;
+	
+	/**
+	 * ID: 1800747<br>
+	 * Message: Message from Santa Claus: Many blessings to $s1, who saved me~
+	 */
+	public static final NpcStringId MESSAGE_FROM_SANTA_CLAUS_MANY_BLESSINGS_TO_S1_WHO_SAVED_ME;
+	
+	/**
+	 * ID: 1800748<br>
+	 * Message: I am already dead. You cannot kill me again...
+	 */
+	public static final NpcStringId I_AM_ALREADY_DEAD_YOU_CANNOT_KILL_ME_AGAIN;
+	
+	/**
+	 * ID: 1800749<br>
+	 * Message: Oh followers of the Dragon of Darkness, fight by my side!
+	 */
+	public static final NpcStringId OH_FOLLOWERS_OF_THE_DRAGON_OF_DARKNESS_FIGHT_BY_MY_SIDE;
+	
+	/**
+	 * ID: 1800750<br>
+	 * Message: The Dragon Race... are invading... Prepare... for battle...
+	 */
+	public static final NpcStringId THE_DRAGON_RACE_ARE_INVADING_PREPARE_FOR_BATTLE;
+	
+	/**
+	 * ID: 1800751<br>
+	 * Message: $s1 rescued Santa Claus of $s2 territory from the turkey.
+	 */
+	public static final NpcStringId S1_RESCUED_SANTA_CLAUS_OF_S2_TERRITORY_FROM_THE_TURKEY;
+	
+	/**
+	 * ID: 1800752<br>
+	 * Message: Santa Rescue Success!
+	 */
+	public static final NpcStringId SANTA_RESCUE_SUCCESS;
+	
+	/**
+	 * ID: 1800753<br>
+	 * Message: $s1 received +$s2 $s3 through the weapon exchange coupon.
+	 */
+	public static final NpcStringId S1_RECEIVED_S2_S3_THROUGH_THE_WEAPON_EXCHANGE_COUPON;
+	
+	/**
+	 * ID: 1800754<br>
+	 * Message: Don't go prattling on!
+	 */
+	public static final NpcStringId DONT_GO_PRATTLING_ON;
+	
+	/**
+	 * ID: 1800755<br>
+	 * Message: You lowlifes with not even an ounce of pride! You're not worthy of opposing me!
+	 */
+	public static final NpcStringId YOU_LOWLIFES_WITH_NOT_EVEN_AN_OUNCE_OF_PRIDE_YOURE_NOT_WORTHY_OF_OPPOSING_ME;
+	
+	/**
+	 * ID: 1800756<br>
+	 * Message: Roar~! No~ Oink oink~! See~! I'm a pig~! Oink oink~!!
+	 */
+	public static final NpcStringId ROAR_NO_OINK_OINK_SEE_IM_A_PIG_OINK_OINK;
+	
+	/**
+	 * ID: 1800757<br>
+	 * Message: Who am I~ Where am I... Oink oink!
+	 */
+	public static final NpcStringId WHO_AM_I_WHERE_AM_I_OINK_OINK;
+	
+	/**
+	 * ID: 1800758<br>
+	 * Message: I just followed my friend here for fun~ Oink oink!
+	 */
+	public static final NpcStringId I_JUST_FOLLOWED_MY_FRIEND_HERE_FOR_FUN_OINK_OINK;
+	
+	/**
+	 * ID: 1800759<br>
+	 * Message: Wow! That's what I call a Cure-All!
+	 */
+	public static final NpcStringId WOW_THATS_WHAT_I_CALL_A_CURE_ALL;
+	
+	/**
+	 * ID: 1800760<br>
+	 * Message: I'm starving. Should I go chew some grass?
+	 */
+	public static final NpcStringId IM_STARVING_SHOULD_I_GO_CHEW_SOME_GRASS;
+	
+	/**
+	 * ID: 1800761<br>
+	 * Message: Thank you, thank you!
+	 */
+	public static final NpcStringId THANK_YOU_THANK_YOU;
+	
+	/**
+	 * ID: 1800762<br>
+	 * Message: What's this feeling? Oh oh~! Feels like my energy is back~!
+	 */
+	public static final NpcStringId WHATS_THIS_FEELING_OH_OH_FEELS_LIKE_MY_ENERGY_IS_BACK;
+	
+	/**
+	 * ID: 1800763<br>
+	 * Message: My body's getting lighter~ This feeling! Feels familiar somehow!
+	 */
+	public static final NpcStringId MY_BODYS_GETTING_LIGHTER_THIS_FEELING_FEELS_FAMILIAR_SOMEHOW;
+	
+	/**
+	 * ID: 1800764<br>
+	 * Message: Wow~ My fatigue is completely gone!
+	 */
+	public static final NpcStringId WOW_MY_FATIGUE_IS_COMPLETELY_GONE;
+	
+	/**
+	 * ID: 1800765<br>
+	 * Message: Hey~ The ominous energy is disappeared~!
+	 */
+	public static final NpcStringId HEY_THE_OMINOUS_ENERGY_IS_DISAPPEARED;
+	
+	/**
+	 * ID: 1800766<br>
+	 * Message: My body feels as light as a feather~
+	 */
+	public static final NpcStringId MY_BODY_FEELS_AS_LIGHT_AS_A_FEATHER;
+	
+	/**
+	 * ID: 1800767<br>
+	 * Message: What's this? Food?
+	 */
+	public static final NpcStringId WHATS_THIS_FOOD;
+	
+	/**
+	 * ID: 1800768<br>
+	 * Message: My energy is overflowing!!! I don't need any Fatigue Recovery Potion~
+	 */
+	public static final NpcStringId MY_ENERGY_IS_OVERFLOWING_I_DONT_NEED_ANY_FATIGUE_RECOVERY_POTION;
+	
+	/**
+	 * ID: 1800769<br>
+	 * Message: What's the matter? That's an amateur move!
+	 */
+	public static final NpcStringId WHATS_THE_MATTER_THATS_AN_AMATEUR_MOVE;
+	
+	/**
+	 * ID: 1800770<br>
+	 * Message: Fortune Timer: Reward increases 2 times if completed within 10 seconds!
+	 */
+	public static final NpcStringId FORTUNE_TIMER_REWARD_INCREASES_2_TIMES_IF_COMPLETED_WITHIN_10_SECONDS;
+	
+	/**
+	 * ID: 1800771<br>
+	 * Message: Fortune Timer: Reward increases 2 times if completed within 40 seconds!
+	 */
+	public static final NpcStringId FORTUNE_TIMER_REWARD_INCREASES_2_TIMES_IF_COMPLETED_WITHIN_40_SECONDS;
+	
+	/**
+	 * ID: 1800772<br>
+	 * Message: 40 seconds are remaining.
+	 */
+	public static final NpcStringId N40_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800773<br>
+	 * Message: 39 seconds are remaining.
+	 */
+	public static final NpcStringId N39_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800774<br>
+	 * Message: 38 seconds are remaining.
+	 */
+	public static final NpcStringId N38_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800775<br>
+	 * Message: 37 seconds are remaining.
+	 */
+	public static final NpcStringId N37_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800776<br>
+	 * Message: 36 seconds are remaining.
+	 */
+	public static final NpcStringId N36_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800777<br>
+	 * Message: 35 seconds are remaining.
+	 */
+	public static final NpcStringId N35_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800778<br>
+	 * Message: 34 seconds are remaining.
+	 */
+	public static final NpcStringId N34_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800779<br>
+	 * Message: 33 seconds are remaining.
+	 */
+	public static final NpcStringId N33_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800780<br>
+	 * Message: 32 seconds are remaining.
+	 */
+	public static final NpcStringId N32_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800781<br>
+	 * Message: 31 seconds are remaining.
+	 */
+	public static final NpcStringId N31_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800782<br>
+	 * Message: 30 seconds are remaining.
+	 */
+	public static final NpcStringId N30_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800783<br>
+	 * Message: 29 seconds are remaining.
+	 */
+	public static final NpcStringId N29_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800784<br>
+	 * Message: 28 seconds are remaining.
+	 */
+	public static final NpcStringId N28_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800785<br>
+	 * Message: 27 seconds are remaining.
+	 */
+	public static final NpcStringId N27_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800786<br>
+	 * Message: 26 seconds are remaining.
+	 */
+	public static final NpcStringId N26_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800787<br>
+	 * Message: 25 seconds are remaining.
+	 */
+	public static final NpcStringId N25_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800788<br>
+	 * Message: 24 seconds are remaining.
+	 */
+	public static final NpcStringId N24_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800789<br>
+	 * Message: 23 seconds are remaining.
+	 */
+	public static final NpcStringId N23_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800790<br>
+	 * Message: 22 seconds are remaining.
+	 */
+	public static final NpcStringId N22_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800791<br>
+	 * Message: 21 seconds are remaining.
+	 */
+	public static final NpcStringId N21_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800792<br>
+	 * Message: 20 seconds are remaining.
+	 */
+	public static final NpcStringId N20_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800793<br>
+	 * Message: 19 seconds are remaining.
+	 */
+	public static final NpcStringId N19_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800794<br>
+	 * Message: 18 seconds are remaining.
+	 */
+	public static final NpcStringId N18_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800795<br>
+	 * Message: 17 seconds are remaining.
+	 */
+	public static final NpcStringId N17_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800796<br>
+	 * Message: 16 seconds are remaining.
+	 */
+	public static final NpcStringId N16_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800797<br>
+	 * Message: 15 seconds are remaining.
+	 */
+	public static final NpcStringId N15_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800798<br>
+	 * Message: 14 seconds are remaining.
+	 */
+	public static final NpcStringId N14_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800799<br>
+	 * Message: 13 seconds are remaining.
+	 */
+	public static final NpcStringId N13_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800800<br>
+	 * Message: 12 seconds are remaining.
+	 */
+	public static final NpcStringId N12_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800801<br>
+	 * Message: 11 seconds are remaining.
+	 */
+	public static final NpcStringId N11_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800802<br>
+	 * Message: 10 seconds are remaining.
+	 */
+	public static final NpcStringId N10_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800803<br>
+	 * Message: 9 seconds are remaining.
+	 */
+	public static final NpcStringId N9_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800804<br>
+	 * Message: 8 seconds are remaining.
+	 */
+	public static final NpcStringId N8_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800805<br>
+	 * Message: 7 seconds are remaining.
+	 */
+	public static final NpcStringId N7_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800806<br>
+	 * Message: 6 seconds are remaining.
+	 */
+	public static final NpcStringId N6_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800807<br>
+	 * Message: 5 seconds are remaining.
+	 */
+	public static final NpcStringId N5_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800808<br>
+	 * Message: 4 seconds are remaining.
+	 */
+	public static final NpcStringId N4_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800809<br>
+	 * Message: 3 seconds are remaining.
+	 */
+	public static final NpcStringId N3_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800810<br>
+	 * Message: 2 seconds are remaining.
+	 */
+	public static final NpcStringId N2_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800811<br>
+	 * Message: 1 seconds are remaining.
+	 */
+	public static final NpcStringId N1_SECONDS_ARE_REMAINING;
+	
+	/**
+	 * ID: 1800812<br>
+	 * Message: Time up!
+	 */
+	public static final NpcStringId TIME_UP;
+	
+	/**
+	 * ID: 1800813<br>
+	 * Message: Mission failed!
+	 */
+	public static final NpcStringId MISSION_FAILED;
+	
+	/**
+	 * ID: 1800814<br>
+	 * Message: Mission success!
+	 */
+	public static final NpcStringId MISSION_SUCCESS;
+	
+	/**
+	 * ID: 1800815<br>
+	 * Message: Hey! I already have an owner!
+	 */
+	public static final NpcStringId HEY_I_ALREADY_HAVE_AN_OWNER;
+	
+	/**
+	 * ID: 1800816<br>
+	 * Message: Hey~. Are you planning on eating me?! Use a Cupid's Fatigue Recovery Potion already!
+	 */
+	public static final NpcStringId HEY_ARE_YOU_PLANNING_ON_EATING_ME_USE_A_CUPIDS_FATIGUE_RECOVERY_POTION_ALREADY;
+	
+	/**
+	 * ID: 1800817<br>
+	 * Message: I'll pass on an amateur's meridian massage. Use a Cupid's Fatigue Recovery Potion already!
+	 */
+	public static final NpcStringId ILL_PASS_ON_AN_AMATEURS_MERIDIAN_MASSAGE_USE_A_CUPIDS_FATIGUE_RECOVERY_POTION_ALREADY;
+	
+	/**
+	 * ID: 1800818<br>
+	 * Message: I already feel more energetic. Thanks, $s1~
+	 */
+	public static final NpcStringId I_ALREADY_FEEL_MORE_ENERGETIC_THANKS_S1;
+	
+	/**
+	 * ID: 1800819<br>
+	 * Message: How refreshing! You wouldn't happen to be a master masseuse, $s1, would you?
+	 */
+	public static final NpcStringId HOW_REFRESHING_YOU_WOULDNT_HAPPEN_TO_BE_A_MASTER_MASSEUSE_S1_WOULD_YOU;
+	
+	/**
+	 * ID: 1800820<br>
+	 * Message: Incredible. From now on, I'll compare all massages to this one with $s1!
+	 */
+	public static final NpcStringId INCREDIBLE_FROM_NOW_ON_ILL_COMPARE_ALL_MASSAGES_TO_THIS_ONE_WITH_S1;
+	
+	/**
+	 * ID: 1800821<br>
+	 * Message: Isn't it tough doing it all on your own! Next time, try making a party with some comrades~
+	 */
+	public static final NpcStringId ISNT_IT_TOUGH_DOING_IT_ALL_ON_YOUR_OWN_NEXT_TIME_TRY_MAKING_A_PARTY_WITH_SOME_COMRADES;
+	
+	/**
+	 * ID: 1800822<br>
+	 * Message: Sorry, but I'll leave my friend in your care as well~ Thanks.
+	 */
+	public static final NpcStringId SORRY_BUT_ILL_LEAVE_MY_FRIEND_IN_YOUR_CARE_AS_WELL_THANKS;
+	
+	/**
+	 * ID: 1800823<br>
+	 * Message: Sniff sniff~ Do you smell the scent of a fresh-baked baguette?
+	 */
+	public static final NpcStringId SNIFF_SNIFF_DO_YOU_SMELL_THE_SCENT_OF_A_FRESH_BAKED_BAGUETTE;
+	
+	/**
+	 * ID: 1800824<br>
+	 * Message: Who am I~? Let me know if you wanna buy my bread~~
+	 */
+	public static final NpcStringId WHO_AM_I_LET_ME_KNOW_IF_YOU_WANNA_BUY_MY_BREAD;
+	
+	/**
+	 * ID: 1800825<br>
+	 * Message: I just want to make your weapons stronger~ Abra Kadabra~!
+	 */
+	public static final NpcStringId I_JUST_WANT_TO_MAKE_YOUR_WEAPONS_STRONGER_ABRA_KADABRA;
+	
+	/**
+	 * ID: 1800826<br>
+	 * Message: What? You don't like it? What's the matter with you~ Like an amateur!
+	 */
+	public static final NpcStringId WHAT_YOU_DONT_LIKE_IT_WHATS_THE_MATTER_WITH_YOU_LIKE_AN_AMATEUR;
+	
+	/**
+	 * ID: 1800827<br>
+	 * Message: Hey~ Did you tell a lie on April Fool's Day? Don't talk to me if you didn't~!
+	 */
+	public static final NpcStringId HEY_DID_YOU_TELL_A_LIE_ON_APRIL_FOOLS_DAY_DONT_TALK_TO_ME_IF_YOU_DIDNT;
+	
+	/**
+	 * ID: 1800828<br>
+	 * Message: Grunt... What's... wrong with me...
+	 */
+	public static final NpcStringId GRUNT_WHATS_WRONG_WITH_ME;
+	
+	/**
+	 * ID: 1800829<br>
+	 * Message: ...Grunt... Oh...
+	 */
+	public static final NpcStringId GRUNT_OH;
+	
+	/**
+	 * ID: 1800830<br>
+	 * Message: The grave robber warrior has been filled with dark energy and is attacking you!
+	 */
+	public static final NpcStringId THE_GRAVE_ROBBER_WARRIOR_HAS_BEEN_FILLED_WITH_DARK_ENERGY_AND_IS_ATTACKING_YOU;
+	
+	/**
+	 * ID: 1800831<br>
+	 * Message: The altar guardian is scrutinizing you!! \\nThose who dare to challenge using the power of evil shall be punished with death.
+	 */
+	public static final NpcStringId THE_ALTAR_GUARDIAN_IS_SCRUTINIZING_YOU_NTHOSE_WHO_DARE_TO_CHALLENGE_USING_THE_POWER_OF_EVIL_SHALL_BE_PUNISHED_WITH_DEATH;
+	
+	/**
+	 * ID: 1800832<br>
+	 * Message: Wait... Wait! Stop! Save me, and I'll give you 10,000,000 adena!!
+	 */
+	public static final NpcStringId WAIT_WAIT_STOP_SAVE_ME_AND_ILL_GIVE_YOU_10000000_ADENA;
+	
+	/**
+	 * ID: 1800833<br>
+	 * Message: I... don't want to fight...
+	 */
+	public static final NpcStringId I_DONT_WANT_TO_FIGHT;
+	
+	/**
+	 * ID: 1800834<br>
+	 * Message: Is this really necessary...?
+	 */
+	public static final NpcStringId IS_THIS_REALLY_NECESSARY;
+	
+	/**
+	 * ID: 1800835<br>
+	 * Message: Th... Thanks... I could have become good friends with you...
+	 */
+	public static final NpcStringId TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU;
+	
+	/**
+	 * ID: 1800836<br>
+	 * Message: I'll give you 10,000,000 adena, like I promised! I might be an orc who keeps my promises!
+	 */
+	public static final NpcStringId ILL_GIVE_YOU_10000000_ADENA_LIKE_I_PROMISED_I_MIGHT_BE_AN_ORC_WHO_KEEPS_MY_PROMISES;
+	
+	/**
+	 * ID: 1800837<br>
+	 * Message: Thanks, but that thing about 10,000,000 adena was a lie! See ya!!
+	 */
+	public static final NpcStringId THANKS_BUT_THAT_THING_ABOUT_10000000_ADENA_WAS_A_LIE_SEE_YA;
+	
+	/**
+	 * ID: 1800838<br>
+	 * Message: You're pretty dumb to believe me!
+	 */
+	public static final NpcStringId YOURE_PRETTY_DUMB_TO_BELIEVE_ME;
+	
+	/**
+	 * ID: 1800839<br>
+	 * Message: Ugh... A curse upon you...!
+	 */
+	public static final NpcStringId UGH_A_CURSE_UPON_YOU;
+	
+	/**
+	 * ID: 1800840<br>
+	 * Message: I really... didn't want... to fight...
+	 */
+	public static final NpcStringId I_REALLY_DIDNT_WANT_TO_FIGHT;
+	
+	/**
+	 * ID: 1800841<br>
+	 * Message: Kasha's Eye is scrutinizing you!!
+	 */
+	public static final NpcStringId KASHAS_EYE_IS_SCRUTINIZING_YOU;
+	
+	/**
+	 * ID: 1800842<br>
+	 * Message: The Kasha's Eye gives you a strange feeling.
+	 */
+	public static final NpcStringId THE_KASHAS_EYE_GIVES_YOU_A_STRANGE_FEELING;
+	
+	/**
+	 * ID: 1800843<br>
+	 * Message: The evil aura of the Kasha's Eye seems to be increasing quickly!!
+	 */
+	public static final NpcStringId THE_EVIL_AURA_OF_THE_KASHAS_EYE_SEEMS_TO_BE_INCREASING_QUICKLY;
+	
+	/**
+	 * ID: 1800844<br>
+	 * Message: I protect the altar! You can't escape the altar!
+	 */
+	public static final NpcStringId I_PROTECT_THE_ALTAR_YOU_CANT_ESCAPE_THE_ALTAR;
+	
+	/**
+	 * ID: 1800845<br>
+	 * Message: $s1! That stranger must be defeated. Here is the ultimate help!
+	 */
+	public static final NpcStringId S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP;
+	
+	/**
+	 * ID: 1800846<br>
+	 * Message: Look here!! $s1. Don't fall too far behind.
+	 */
+	public static final NpcStringId LOOK_HERE_S1_DONT_FALL_TOO_FAR_BEHIND;
+	
+	/**
+	 * ID: 1800847<br>
+	 * Message: Well done. $s1. Your help is much appreciated.
+	 */
+	public static final NpcStringId WELL_DONE_S1_YOUR_HELP_IS_MUCH_APPRECIATED;
+	
+	/**
+	 * ID: 1800848<br>
+	 * Message: Who has awakened us from our slumber?
+	 */
+	public static final NpcStringId WHO_HAS_AWAKENED_US_FROM_OUR_SLUMBER;
+	
+	/**
+	 * ID: 1800849<br>
+	 * Message: All will pay a severe price to me and these here.
+	 */
+	public static final NpcStringId ALL_WILL_PAY_A_SEVERE_PRICE_TO_ME_AND_THESE_HERE;
+	
+	/**
+	 * ID: 1800850<br>
+	 * Message: Shyeed's cry is steadily dying down.
+	 */
+	public static final NpcStringId SHYEEDS_CRY_IS_STEADILY_DYING_DOWN;
+	
+	/**
+	 * ID: 1800851<br>
+	 * Message: Alert! Alert! Damage detection recognized. Countermeasures enabled.
+	 */
+	public static final NpcStringId ALERT_ALERT_DAMAGE_DETECTION_RECOGNIZED_COUNTERMEASURES_ENABLED;
+	
+	/**
+	 * ID: 1800852<br>
+	 * Message: Target recognition achieved. Attack sequence commencing.
+	 */
+	public static final NpcStringId TARGET_RECOGNITION_ACHIEVED_ATTACK_SEQUENCE_COMMENCING;
+	
+	/**
+	 * ID: 1800853<br>
+	 * Message: Target. Threat. Level. Launching. Strongest. Countermeasure.
+	 */
+	public static final NpcStringId TARGET_THREAT_LEVEL_LAUNCHING_STRONGEST_COUNTERMEASURE;
+	
+	/**
+	 * ID: 1800854<br>
+	 * Message: The purification field is being attacked. Guardian Spirits! Protect the Magic Force!!
+	 */
+	public static final NpcStringId THE_PURIFICATION_FIELD_IS_BEING_ATTACKED_GUARDIAN_SPIRITS_PROTECT_THE_MAGIC_FORCE;
+	
+	/**
+	 * ID: 1800855<br>
+	 * Message: Protect the Braziers of Purity at all costs!!
+	 */
+	public static final NpcStringId PROTECT_THE_BRAZIERS_OF_PURITY_AT_ALL_COSTS;
+	
+	/**
+	 * ID: 1800856<br>
+	 * Message: Defend our domain even at risk of your own life!
+	 */
+	public static final NpcStringId DEFEND_OUR_DOMAIN_EVEN_AT_RISK_OF_YOUR_OWN_LIFE;
+	
+	/**
+	 * ID: 1800857<br>
+	 * Message: Peunglui muglanep!
+	 */
+	public static final NpcStringId PEUNGLUI_MUGLANEP;
+	
+	/**
+	 * ID: 1800858<br>
+	 * Message: Naia waganagel peutagun!
+	 */
+	public static final NpcStringId NAIA_WAGANAGEL_PEUTAGUN;
+	
+	/**
+	 * ID: 1800859<br>
+	 * Message: Drive device partial destruction impulse result
+	 */
+	public static final NpcStringId DRIVE_DEVICE_PARTIAL_DESTRUCTION_IMPULSE_RESULT;
+	
+	/**
+	 * ID: 1800860<br>
+	 * Message: Even the Magic Force binds you, you will never be forgiven...
+	 */
+	public static final NpcStringId EVEN_THE_MAGIC_FORCE_BINDS_YOU_YOU_WILL_NEVER_BE_FORGIVEN;
+	
+	/**
+	 * ID: 1800861<br>
+	 * Message: Oh giants, an intruder has been discovered.
+	 */
+	public static final NpcStringId OH_GIANTS_AN_INTRUDER_HAS_BEEN_DISCOVERED;
+	
+	/**
+	 * ID: 1800862<br>
+	 * Message: All is vanity! but this cannot be the end!
+	 */
+	public static final NpcStringId ALL_IS_VANITY_BUT_THIS_CANNOT_BE_THE_END;
+	
+	/**
+	 * ID: 1800863<br>
+	 * Message: Those who are in front of my eyes! will be destroyed!
+	 */
+	public static final NpcStringId THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED;
+	
+	/**
+	 * ID: 1800864<br>
+	 * Message: I am tired! Do not wake me up again!
+	 */
+	public static final NpcStringId I_AM_TIRED_DO_NOT_WAKE_ME_UP_AGAIN;
+	
+	/**
+	 * ID: 1800865<br>
+	 * Message: Intruder detected
+	 */
+	public static final NpcStringId _INTRUDER_DETECTED;
+	
+	/**
+	 * ID: 1800866<br>
+	 * Message: The candles can lead you to Zaken. Destroy him
+	 */
+	public static final NpcStringId THE_CANDLES_CAN_LEAD_YOU_TO_ZAKEN_DESTROY_HIM;
+	
+	/**
+	 * ID: 1800867<br>
+	 * Message: Who dares awkawen the mighty Zaken?
+	 */
+	public static final NpcStringId WHO_DARES_AWKAWEN_THE_MIGHTY_ZAKEN;
+	
+	/**
+	 * ID: 1800868<br>
+	 * Message: Ye not be finding me below the drink!
+	 */
+	public static final NpcStringId YE_NOT_BE_FINDING_ME_BELOW_THE_DRINK;
+	
+	/**
+	 * ID: 1800869<br>
+	 * Message: Ye must be three sheets to the wind if yer lookin for me there.
+	 */
+	public static final NpcStringId YE_MUST_BE_THREE_SHEETS_TO_THE_WIND_IF_YER_LOOKIN_FOR_ME_THERE;
+	
+	/**
+	 * ID: 1800870<br>
+	 * Message: Ye not be finding me in the Crows Nest.
+	 */
+	public static final NpcStringId YE_NOT_BE_FINDING_ME_IN_THE_CROWS_NEST;
+	
+	/**
+	 * ID: 1800871<br>
+	 * Message: Sorry but this is all I have.. Give me a break!
+	 */
+	public static final NpcStringId SORRY_BUT_THIS_IS_ALL_I_HAVE_GIVE_ME_A_BREAK;
+	
+	/**
+	 * ID: 1800872<br>
+	 * Message: Peunglui muglanep Naia waganagel peutagun!
+	 */
+	public static final NpcStringId PEUNGLUI_MUGLANEP_NAIA_WAGANAGEL_PEUTAGUN;
+	
+	/**
+	 * ID: 1800873<br>
+	 * Message: Drive device entire destruction moving suspension
+	 */
+	public static final NpcStringId DRIVE_DEVICE_ENTIRE_DESTRUCTION_MOVING_SUSPENSION;
+	
+	/**
+	 * ID: 1800874<br>
+	 * Message: Ah ah... From the Magic Force, no more... I will be freed
+	 */
+	public static final NpcStringId AH_AH_FROM_THE_MAGIC_FORCE_NO_MORE_I_WILL_BE_FREED;
+	
+	/**
+	 * ID: 1800875<br>
+	 * Message: You guys are detected!
+	 */
+	public static final NpcStringId YOU_GUYS_ARE_DETECTED;
+	
+	/**
+	 * ID: 1800876<br>
+	 * Message: What kind of creatures are you!
+	 */
+	public static final NpcStringId WHAT_KIND_OF_CREATURES_ARE_YOU;
+	
+	/**
+	 * ID: 1800877<br>
+	 * Message: $s2 of level $s1 is acquired
+	 */
+	public static final NpcStringId S2_OF_LEVEL_S1_IS_ACQUIRED;
+	
+	/**
+	 * ID: 1800878<br>
+	 * Message: Life Stone from the Beginning acquired
+	 */
+	public static final NpcStringId LIFE_STONE_FROM_THE_BEGINNING_ACQUIRED;
+	
+	/**
+	 * ID: 1800879<br>
+	 * Message: When inventory weight/number are more than 80%, the Life Stone from the Beginning cannot be acquired.
+	 */
+	public static final NpcStringId WHEN_INVENTORY_WEIGHT_NUMBER_ARE_MORE_THAN_80_THE_LIFE_STONE_FROM_THE_BEGINNING_CANNOT_BE_ACQUIRED;
+	
+	/**
+	 * ID: 1800880<br>
+	 * Message: You are under my thumb!!
+	 */
+	public static final NpcStringId YOU_ARE_UNDER_MY_THUMB;
+	
+	/**
+	 * ID: 1800881<br>
+	 * Message: 20 minutes are added to the remaining time in the Instant Zone.
+	 */
+	public static final NpcStringId N21_MINUTES_ARE_ADDED_TO_THE_REMAINING_TIME_IN_THE_INSTANT_ZONE;
+	
+	/**
+	 * ID: 1800882<br>
+	 * Message: Hurry hurry
+	 */
+	public static final NpcStringId HURRY_HURRY;
+	
+	/**
+	 * ID: 1800883<br>
+	 * Message: I am not that type of person who stays in one place for a long time
+	 */
+	public static final NpcStringId I_AM_NOT_THAT_TYPE_OF_PERSON_WHO_STAYS_IN_ONE_PLACE_FOR_A_LONG_TIME;
+	
+	/**
+	 * ID: 1800884<br>
+	 * Message: It's hard for me to keep standing like this
+	 */
+	public static final NpcStringId ITS_HARD_FOR_ME_TO_KEEP_STANDING_LIKE_THIS;
+	
+	/**
+	 * ID: 1800885<br>
+	 * Message: Why don't I go that way this time
+	 */
+	public static final NpcStringId WHY_DONT_I_GO_THAT_WAY_THIS_TIME;
+	
+	/**
+	 * ID: 1800886<br>
+	 * Message: Welcome!
+	 */
+	public static final NpcStringId WELCOME;
+	
+	/**
+	 * ID: 1800887<br>
+	 * Message: Is that it? Is that the extent of your abilities? Put in a little more effort!!
+	 */
+	public static final NpcStringId IS_THAT_IT_IS_THAT_THE_EXTENT_OF_YOUR_ABILITIES_PUT_IN_A_LITTLE_MORE_EFFORT;
+	
+	/**
+	 * ID: 1800888<br>
+	 * Message: Your abilities are pitiful... You are far from a worthy opponent.
+	 */
+	public static final NpcStringId YOUR_ABILITIES_ARE_PITIFUL_YOU_ARE_FAR_FROM_A_WORTHY_OPPONENT;
+	
+	/**
+	 * ID: 1800889<br>
+	 * Message: Even after death you order me to wander around looking for the scapegoats!
+	 */
+	public static final NpcStringId EVEN_AFTER_DEATH_YOU_ORDER_ME_TO_WANDER_AROUND_LOOKING_FOR_THE_SCAPEGOATS;
+	
+	/**
+	 * ID: 1800890<br>
+	 * Message: Here goes the Heatstroke! If you can withstand the hot heatstroke up to the 3rd stage, the Sultriness will come to you.
+	 */
+	public static final NpcStringId HERE_GOES_THE_HEATSTROKE_IF_YOU_CAN_WITHSTAND_THE_HOT_HEATSTROKE_UP_TO_THE_3RD_STAGE_THE_SULTRINESS_WILL_COME_TO_YOU;
+	
+	/**
+	 * ID: 1800891<br>
+	 * Message: Just you wait! Humidity is a blistering fireball which can easily withstand plenty of Cool Air Cannon attacks!
+	 */
+	public static final NpcStringId JUST_YOU_WAIT_HUMIDITY_IS_A_BLISTERING_FIREBALL_WHICH_CAN_EASILY_WITHSTAND_PLENTY_OF_COOL_AIR_CANNON_ATTACKS;
+	
+	/**
+	 * ID: 1800892<br>
+	 * Message: In order to defeat Humidity, you must obtain the Headstroke Prevention Effect from Doctor Ice and fire more than 10 rounds of the Cool Air Cannon on it!
+	 */
+	public static final NpcStringId IN_ORDER_TO_DEFEAT_HUMIDITY_YOU_MUST_OBTAIN_THE_HEADSTROKE_PREVENTION_EFFECT_FROM_DOCTOR_ICE_AND_FIRE_MORE_THAN_10_ROUNDS_OF_THE_COOL_AIR_CANNON_ON_IT;
+	
+	/**
+	 * ID: 1800893<br>
+	 * Message: You are here, $s1! I'll teach you a lesson! Bring it on!
+	 */
+	public static final NpcStringId YOU_ARE_HERE_S1_ILL_TEACH_YOU_A_LESSON_BRING_IT_ON;
+	
+	/**
+	 * ID: 1800894<br>
+	 * Message: That's cold! Isn't it one of those Cool Packs? I hate anything that's cold!
+	 */
+	public static final NpcStringId THATS_COLD_ISNT_IT_ONE_OF_THOSE_COOL_PACKS_I_HATE_ANYTHING_THATS_COLD;
+	
+	/**
+	 * ID: 1800895<br>
+	 * Message: Huh! You've missed! Is that all you have?
+	 */
+	public static final NpcStringId HUH_YOUVE_MISSED_IS_THAT_ALL_YOU_HAVE;
+	
+	/**
+	 * ID: 1800896<br>
+	 * Message: I will give you precious things that I have stolen. So stop bothering me!
+	 */
+	public static final NpcStringId I_WILL_GIVE_YOU_PRECIOUS_THINGS_THAT_I_HAVE_STOLEN_SO_STOP_BOTHERING_ME;
+	
+	/**
+	 * ID: 1800897<br>
+	 * Message: I was going to give you a jackpot item. You don't have enough inventory room. See you next time.
+	 */
+	public static final NpcStringId I_WAS_GOING_TO_GIVE_YOU_A_JACKPOT_ITEM_YOU_DONT_HAVE_ENOUGH_INVENTORY_ROOM_SEE_YOU_NEXT_TIME;
+	
+	/**
+	 * ID: 1800898<br>
+	 * Message: $s1 defeated the Sultriness and acquired item S84
+	 */
+	public static final NpcStringId S1_DEFEATED_THE_SULTRINESS_AND_ACQUIRED_ITEM_S84;
+	
+	/**
+	 * ID: 1800899<br>
+	 * Message: $s1 defeated the Sultriness and acquired item S80
+	 */
+	public static final NpcStringId S1_DEFEATED_THE_SULTRINESS_AND_ACQUIRED_ITEM_S80;
+	
+	/**
+	 * ID: 1800900<br>
+	 * Message: I am not here for you! Your Cool Pack attack does not work against me!
+	 */
+	public static final NpcStringId I_AM_NOT_HERE_FOR_YOU_YOUR_COOL_PACK_ATTACK_DOES_NOT_WORK_AGAINST_ME;
+	
+	/**
+	 * ID: 1800901<br>
+	 * Message: Uh oh? Where are you hiding? There is nobody who matches my skills? Well, I guess I'd better get going....
+	 */
+	public static final NpcStringId UH_OH_WHERE_ARE_YOU_HIDING_THERE_IS_NOBODY_WHO_MATCHES_MY_SKILLS_WELL_I_GUESS_ID_BETTER_GET_GOING;
+	
+	/**
+	 * ID: 1800902<br>
+	 * Message: Why are you not responding? You don't even have any Cool Packs! You can't fight me!
+	 */
+	public static final NpcStringId WHY_ARE_YOU_NOT_RESPONDING_YOU_DONT_EVEN_HAVE_ANY_COOL_PACKS_YOU_CANT_FIGHT_ME;
+	
+	/**
+	 * ID: 1800903<br>
+	 * Message: Oh~! Where I be~? Who call me~?
+	 */
+	public static final NpcStringId OH_WHERE_I_BE_WHO_CALL_ME;
+	
+	/**
+	 * ID: 1800904<br>
+	 * Message: Tada~! It's a watermelon~!
+	 */
+	public static final NpcStringId TADA_ITS_A_WATERMELON;
+	
+	/**
+	 * ID: 1800906<br>
+	 * Message: Enter the watermelon~! It's gonna grow and grow from now on!
+	 */
+	public static final NpcStringId ENTER_THE_WATERMELON_ITS_GONNA_GROW_AND_GROW_FROM_NOW_ON;
+	
+	/**
+	 * ID: 1800907<br>
+	 * Message: Oh, ouch~! Did I see you before~?
+	 */
+	public static final NpcStringId OH_OUCH_DID_I_SEE_YOU_BEFORE;
+	
+	/**
+	 * ID: 1800908<br>
+	 * Message: A new season! Summer is all about the watermelon~!
+	 */
+	public static final NpcStringId A_NEW_SEASON_SUMMER_IS_ALL_ABOUT_THE_WATERMELON;
+	
+	/**
+	 * ID: 1800909<br>
+	 * Message: Did ya call~? Ho! Thought you'd get something~?^^
+	 */
+	public static final NpcStringId DID_YA_CALL_HO_THOUGHT_YOUD_GET_SOMETHING;
+	
+	/**
+	 * ID: 1800910<br>
+	 * Message: Do you want to see my beautiful self~?
+	 */
+	public static final NpcStringId DO_YOU_WANT_TO_SEE_MY_BEAUTIFUL_SELF;
+	
+	/**
+	 * ID: 1800911<br>
+	 * Message: Hohoho! Let's do it together~!
+	 */
+	public static final NpcStringId HOHOHO_LETS_DO_IT_TOGETHER;
+	
+	/**
+	 * ID: 1800912<br>
+	 * Message: It's a giant watermelon if you raise it right~ And a watermelon slice if you mess up~!
+	 */
+	public static final NpcStringId ITS_A_GIANT_WATERMELON_IF_YOU_RAISE_IT_RIGHT_AND_A_WATERMELON_SLICE_IF_YOU_MESS_UP;
+	
+	/**
+	 * ID: 1800913<br>
+	 * Message: Tada~ Transformation~ complete~!
+	 */
+	public static final NpcStringId TADA_TRANSFORMATION_COMPLETE;
+	
+	/**
+	 * ID: 1800914<br>
+	 * Message: Am I a rain watermelon? Or a defective watermelon?
+	 */
+	public static final NpcStringId AM_I_A_RAIN_WATERMELON_OR_A_DEFECTIVE_WATERMELON;
+	
+	/**
+	 * ID: 1800915<br>
+	 * Message: Now! I've gotten big~! Everyone, come at me!
+	 */
+	public static final NpcStringId NOW_IVE_GOTTEN_BIG_EVERYONE_COME_AT_ME;
+	
+	/**
+	 * ID: 1800916<br>
+	 * Message: Get bigger~ Get stronger~! Tell me your wish~~!
+	 */
+	public static final NpcStringId GET_BIGGER_GET_STRONGER_TELL_ME_YOUR_WISH;
+	
+	/**
+	 * ID: 1800917<br>
+	 * Message: A watermelon slice's wish! But I'm bigger already?
+	 */
+	public static final NpcStringId A_WATERMELON_SLICES_WISH_BUT_IM_BIGGER_ALREADY;
+	
+	/**
+	 * ID: 1800918<br>
+	 * Message: A large watermelon's wish! Well, try to break me!
+	 */
+	public static final NpcStringId A_LARGE_WATERMELONS_WISH_WELL_TRY_TO_BREAK_ME;
+	
+	/**
+	 * ID: 1800919<br>
+	 * Message: I'm done growing~! I'm running away now~^^
+	 */
+	public static final NpcStringId IM_DONE_GROWING_IM_RUNNING_AWAY_NOW;
+	
+	/**
+	 * ID: 1800920<br>
+	 * Message: If you let me go, I'll give you ten million adena!
+	 */
+	public static final NpcStringId IF_YOU_LET_ME_GO_ILL_GIVE_YOU_TEN_MILLION_ADENA;
+	
+	/**
+	 * ID: 1800921<br>
+	 * Message: Freedom~! What do you think I have inside?
+	 */
+	public static final NpcStringId FREEDOM_WHAT_DO_YOU_THINK_I_HAVE_INSIDE;
+	
+	/**
+	 * ID: 1800922<br>
+	 * Message: OK~ OK~ Good job. You know what to do next, right?
+	 */
+	public static final NpcStringId OK_OK_GOOD_JOB_YOU_KNOW_WHAT_TO_DO_NEXT_RIGHT;
+	
+	/**
+	 * ID: 1800923<br>
+	 * Message: Look here! Do it right! You spilled! This precious...
+	 */
+	public static final NpcStringId LOOK_HERE_DO_IT_RIGHT_YOU_SPILLED_THIS_PRECIOUS;
+	
+	/**
+	 * ID: 1800924<br>
+	 * Message: Ah~ Refreshing! Spray a little more~!
+	 */
+	public static final NpcStringId AH_REFRESHING_SPRAY_A_LITTLE_MORE;
+	
+	/**
+	 * ID: 1800925<br>
+	 * Message: Gulp gulp~ Great! But isn't there more?
+	 */
+	public static final NpcStringId GULP_GULP_GREAT_BUT_ISNT_THERE_MORE;
+	
+	/**
+	 * ID: 1800926<br>
+	 * Message: Can't you even aim right? Have you even been to the army?
+	 */
+	public static final NpcStringId CANT_YOU_EVEN_AIM_RIGHT_HAVE_YOU_EVEN_BEEN_TO_THE_ARMY;
+	
+	/**
+	 * ID: 1800927<br>
+	 * Message: Did you mix this with water~? Why's it taste like this~!
+	 */
+	public static final NpcStringId DID_YOU_MIX_THIS_WITH_WATER_WHYS_IT_TASTE_LIKE_THIS;
+	
+	/**
+	 * ID: 1800928<br>
+	 * Message: Oh! Good! Do a little more. Yeah~
+	 */
+	public static final NpcStringId OH_GOOD_DO_A_LITTLE_MORE_YEAH;
+	
+	/**
+	 * ID: 1800929<br>
+	 * Message: Hoho! It's not there! Over here~! Am I so small that you can even spray me right?
+	 */
+	public static final NpcStringId HOHO_ITS_NOT_THERE_OVER_HERE_AM_I_SO_SMALL_THAT_YOU_CAN_EVEN_SPRAY_ME_RIGHT;
+	
+	/**
+	 * ID: 1800930<br>
+	 * Message: Yuck! What is this~! Are you sure this is nectar~?
+	 */
+	public static final NpcStringId YUCK_WHAT_IS_THIS_ARE_YOU_SURE_THIS_IS_NECTAR;
+	
+	/**
+	 * ID: 1800931<br>
+	 * Message: Do your best~! I become a big watermelon after just five bottles~!
+	 */
+	public static final NpcStringId DO_YOUR_BEST_I_BECOME_A_BIG_WATERMELON_AFTER_JUST_FIVE_BOTTLES;
+	
+	/**
+	 * ID: 1800932<br>
+	 * Message: Of course~! Watermelon is the best nectar! Hahaha~!
+	 */
+	public static final NpcStringId OF_COURSE_WATERMELON_IS_THE_BEST_NECTAR_HAHAHA;
+	
+	/**
+	 * ID: 1800934<br>
+	 * Message: Oww! You're just beating me now~ Give me nectar~
+	 */
+	public static final NpcStringId OWW_YOURE_JUST_BEATING_ME_NOW_GIVE_ME_NECTAR;
+	
+	/**
+	 * ID: 1800935<br>
+	 * Message: Look~!! It's gonna break~!
+	 */
+	public static final NpcStringId LOOK_ITS_GONNA_BREAK;
+	
+	/**
+	 * ID: 1800936<br>
+	 * Message: Now! Are you trying to eat without doing the work? Fine~ Do what you want~ I'll hate you if you don't give me any nectar!
+	 */
+	public static final NpcStringId NOW_ARE_YOU_TRYING_TO_EAT_WITHOUT_DOING_THE_WORK_FINE_DO_WHAT_YOU_WANT_ILL_HATE_YOU_IF_YOU_DONT_GIVE_ME_ANY_NECTAR;
+	
+	/**
+	 * ID: 1800937<br>
+	 * Message: Hit me more! Hit me more!
+	 */
+	public static final NpcStringId HIT_ME_MORE_HIT_ME_MORE;
+	
+	/**
+	 * ID: 1800938<br>
+	 * Message: I'm gonna wither like this~ Damn it~!
+	 */
+	public static final NpcStringId IM_GONNA_WITHER_LIKE_THIS_DAMN_IT;
+	
+	/**
+	 * ID: 1800939<br>
+	 * Message: Hey you~ If I die like this, there'll be no item either~ Are you really so stingy with the nectar?
+	 */
+	public static final NpcStringId HEY_YOU_IF_I_DIE_LIKE_THIS_THERELL_BE_NO_ITEM_EITHER_ARE_YOU_REALLY_SO_STINGY_WITH_THE_NECTAR;
+	
+	/**
+	 * ID: 1800940<br>
+	 * Message: It's just a little more!! Good luck~!
+	 */
+	public static final NpcStringId ITS_JUST_A_LITTLE_MORE_GOOD_LUCK;
+	
+	/**
+	 * ID: 1800941<br>
+	 * Message: Save me~ I'm about to die without tasting nectar even once~
+	 */
+	public static final NpcStringId SAVE_ME_IM_ABOUT_TO_DIE_WITHOUT_TASTING_NECTAR_EVEN_ONCE;
+	
+	/**
+	 * ID: 1800942<br>
+	 * Message: If I die like this, I'll just be a watermelon slice~!
+	 */
+	public static final NpcStringId IF_I_DIE_LIKE_THIS_ILL_JUST_BE_A_WATERMELON_SLICE;
+	
+	/**
+	 * ID: 1800943<br>
+	 * Message: I'm getting stronger~? I think I'll be able to run away in 30 seconds~ Hoho~
+	 */
+	public static final NpcStringId IM_GETTING_STRONGER_I_THINK_ILL_BE_ABLE_TO_RUN_AWAY_IN_30_SECONDS_HOHO;
+	
+	/**
+	 * ID: 1800944<br>
+	 * Message: It's goodbye after 20 seconds~!
+	 */
+	public static final NpcStringId ITS_GOODBYE_AFTER_20_SECONDS;
+	
+	/**
+	 * ID: 1800945<br>
+	 * Message: Yeah, 10 seconds left~! 9... 8... 7...!
+	 */
+	public static final NpcStringId YEAH_10_SECONDS_LEFT_9_8_7;
+	
+	/**
+	 * ID: 1800946<br>
+	 * Message: I'm leaving in 2 minutes if you don't give me any nectar~!
+	 */
+	public static final NpcStringId IM_LEAVING_IN_2_MINUTES_IF_YOU_DONT_GIVE_ME_ANY_NECTAR;
+	
+	/**
+	 * ID: 1800947<br>
+	 * Message: I'm leaving in 1 minutes if you don't give me any nectar~!
+	 */
+	public static final NpcStringId IM_LEAVING_IN_1_MINUTES_IF_YOU_DONT_GIVE_ME_ANY_NECTAR;
+	
+	/**
+	 * ID: 1800948<br>
+	 * Message: I'm leaving now~! Then, goodbye~!
+	 */
+	public static final NpcStringId IM_LEAVING_NOW_THEN_GOODBYE;
+	
+	/**
+	 * ID: 1800949<br>
+	 * Message: Sorry, but this large watermelon is disappearing here~!
+	 */
+	public static final NpcStringId SORRY_BUT_THIS_LARGE_WATERMELON_IS_DISAPPEARING_HERE;
+	
+	/**
+	 * ID: 1800950<br>
+	 * Message: Too late~! Have a good time~!
+	 */
+	public static final NpcStringId TOO_LATE_HAVE_A_GOOD_TIME;
+	
+	/**
+	 * ID: 1800951<br>
+	 * Message: Ding ding~ That's the bell. Put away your weapons and try for next time~!
+	 */
+	public static final NpcStringId DING_DING_THATS_THE_BELL_PUT_AWAY_YOUR_WEAPONS_AND_TRY_FOR_NEXT_TIME;
+	
+	/**
+	 * ID: 1800952<br>
+	 * Message: Too bad~! You raised it up, too! -_-
+	 */
+	public static final NpcStringId TOO_BAD_YOU_RAISED_IT_UP_TOO;
+	
+	/**
+	 * ID: 1800953<br>
+	 * Message: Oh~ What a nice sound~
+	 */
+	public static final NpcStringId OH_WHAT_A_NICE_SOUND;
+	
+	/**
+	 * ID: 1800954<br>
+	 * Message: The instrument is nice, but there's no song. Shall I sing for you?
+	 */
+	public static final NpcStringId THE_INSTRUMENT_IS_NICE_BUT_THERES_NO_SONG_SHALL_I_SING_FOR_YOU;
+	
+	/**
+	 * ID: 1800955<br>
+	 * Message: What beautiful music!
+	 */
+	public static final NpcStringId WHAT_BEAUTIFUL_MUSIC;
+	
+	/**
+	 * ID: 1800956<br>
+	 * Message: I feel good~ Play some more!
+	 */
+	public static final NpcStringId I_FEEL_GOOD_PLAY_SOME_MORE;
+	
+	/**
+	 * ID: 1800957<br>
+	 * Message: My heart is being captured by the sound of Crono!
+	 */
+	public static final NpcStringId MY_HEART_IS_BEING_CAPTURED_BY_THE_SOUND_OF_CRONO;
+	
+	/**
+	 * ID: 1800958<br>
+	 * Message: Get the notes right~! Hey old man~ That was wrong!
+	 */
+	public static final NpcStringId GET_THE_NOTES_RIGHT_HEY_OLD_MAN_THAT_WAS_WRONG;
+	
+	/**
+	 * ID: 1800959<br>
+	 * Message: I like it~!
+	 */
+	public static final NpcStringId I_LIKE_IT;
+	
+	/**
+	 * ID: 1800960<br>
+	 * Message: Ooh~~ My body wants to open!
+	 */
+	public static final NpcStringId OOH_MY_BODY_WANTS_TO_OPEN;
+	
+	/**
+	 * ID: 1800961<br>
+	 * Message: Oh~! This chord! My heart is being torn! Play a little more!
+	 */
+	public static final NpcStringId OH_THIS_CHORD_MY_HEART_IS_BEING_TORN_PLAY_A_LITTLE_MORE;
+	
+	/**
+	 * ID: 1800962<br>
+	 * Message: It's this~ This! I wanted this sound! Why don't you try becoming a singer?
+	 */
+	public static final NpcStringId ITS_THIS_THIS_I_WANTED_THIS_SOUND_WHY_DONT_YOU_TRY_BECOMING_A_SINGER;
+	
+	/**
+	 * ID: 1800963<br>
+	 * Message: You can try a hundred times on this~ You won't get anything good~!
+	 */
+	public static final NpcStringId YOU_CAN_TRY_A_HUNDRED_TIMES_ON_THIS_YOU_WONT_GET_ANYTHING_GOOD;
+	
+	/**
+	 * ID: 1800964<br>
+	 * Message: It hurts~! Play just the instrument~!
+	 */
+	public static final NpcStringId IT_HURTS_PLAY_JUST_THE_INSTRUMENT;
+	
+	/**
+	 * ID: 1800965<br>
+	 * Message: Only good music can open my body!
+	 */
+	public static final NpcStringId ONLY_GOOD_MUSIC_CAN_OPEN_MY_BODY;
+	
+	/**
+	 * ID: 1800966<br>
+	 * Message: Not this, but you know, that~ What you got as a Chronicle souvenir. Play with that!
+	 */
+	public static final NpcStringId NOT_THIS_BUT_YOU_KNOW_THAT_WHAT_YOU_GOT_AS_A_CHRONICLE_SOUVENIR_PLAY_WITH_THAT;
+	
+	/**
+	 * ID: 1800967<br>
+	 * Message: Why~ You have no music? Boring... I'm leaving now~
+	 */
+	public static final NpcStringId WHY_YOU_HAVE_NO_MUSIC_BORING_IM_LEAVING_NOW;
+	
+	/**
+	 * ID: 1800968<br>
+	 * Message: Not those sharp things~! Use the ones that make nice sounds!
+	 */
+	public static final NpcStringId NOT_THOSE_SHARP_THINGS_USE_THE_ONES_THAT_MAKE_NICE_SOUNDS;
+	
+	/**
+	 * ID: 1800969<br>
+	 * Message: Large watermelons only open with music~ Just striking with a weapon won't work~!
+	 */
+	public static final NpcStringId LARGE_WATERMELONS_ONLY_OPEN_WITH_MUSIC_JUST_STRIKING_WITH_A_WEAPON_WONT_WORK;
+	
+	/**
+	 * ID: 1800970<br>
+	 * Message: Strike with music~! Not with something like this. You need music~!
+	 */
+	public static final NpcStringId STRIKE_WITH_MUSIC_NOT_WITH_SOMETHING_LIKE_THIS_YOU_NEED_MUSIC;
+	
+	/**
+	 * ID: 1800971<br>
+	 * Message: You're pretty amazing~! But it's all for nothing~~!
+	 */
+	public static final NpcStringId YOURE_PRETTY_AMAZING_BUT_ITS_ALL_FOR_NOTHING;
+	
+	/**
+	 * ID: 1800972<br>
+	 * Message: Use that on monsters, OK? I want Crono~!
+	 */
+	public static final NpcStringId USE_THAT_ON_MONSTERS_OK_I_WANT_CRONO;
+	
+	/**
+	 * ID: 1800973<br>
+	 * Message: Everyone~ The watermelon is breaking!!!
+	 */
+	public static final NpcStringId EVERYONE_THE_WATERMELON_IS_BREAKING;
+	
+	/**
+	 * ID: 1800974<br>
+	 * Message: It's like a watermelon slice~!
+	 */
+	public static final NpcStringId ITS_LIKE_A_WATERMELON_SLICE;
+	
+	/**
+	 * ID: 1800976<br>
+	 * Message: Large watermelon~! Make a wish!!
+	 */
+	public static final NpcStringId LARGE_WATERMELON_MAKE_A_WISH;
+	
+	/**
+	 * ID: 1800977<br>
+	 * Message: Don't tell anyone about my death~
+	 */
+	public static final NpcStringId DONT_TELL_ANYONE_ABOUT_MY_DEATH;
+	
+	/**
+	 * ID: 1800978<br>
+	 * Message: Ugh~ The red juice is flowing out!
+	 */
+	public static final NpcStringId UGH_THE_RED_JUICE_IS_FLOWING_OUT;
+	
+	/**
+	 * ID: 1800979<br>
+	 * Message: This is all~
+	 */
+	public static final NpcStringId THIS_IS_ALL;
+	
+	/**
+	 * ID: 1800980<br>
+	 * Message: Kyaahh!!! I'm mad...!
+	 */
+	public static final NpcStringId KYAAHH_IM_MAD;
+	
+	/**
+	 * ID: 1800981<br>
+	 * Message: Everyone~ This watermelon broke open!! The item is falling out!
+	 */
+	public static final NpcStringId EVERYONE_THIS_WATERMELON_BROKE_OPEN_THE_ITEM_IS_FALLING_OUT;
+	
+	/**
+	 * ID: 1800982<br>
+	 * Message: Oh! It burst! The contents are spilling out~
+	 */
+	public static final NpcStringId OH_IT_BURST_THE_CONTENTS_ARE_SPILLING_OUT;
+	
+	/**
+	 * ID: 1800983<br>
+	 * Message: Hohoho~ Play better!
+	 */
+	public static final NpcStringId HOHOHO_PLAY_BETTER;
+	
+	/**
+	 * ID: 1800984<br>
+	 * Message: Oh~!! You're very talented, huh~?
+	 */
+	public static final NpcStringId OH_YOURE_VERY_TALENTED_HUH;
+	
+	/**
+	 * ID: 1800985<br>
+	 * Message: Play some more! More! More! More!
+	 */
+	public static final NpcStringId PLAY_SOME_MORE_MORE_MORE_MORE;
+	
+	/**
+	 * ID: 1800986<br>
+	 * Message: I eat hits and grow!!
+	 */
+	public static final NpcStringId I_EAT_HITS_AND_GROW;
+	
+	/**
+	 * ID: 1800987<br>
+	 * Message: Buck up~ There isn't much time~
+	 */
+	public static final NpcStringId BUCK_UP_THERE_ISNT_MUCH_TIME;
+	
+	/**
+	 * ID: 1800988<br>
+	 * Message: Do you think I'll burst with just that~?
+	 */
+	public static final NpcStringId DO_YOU_THINK_ILL_BURST_WITH_JUST_THAT;
+	
+	/**
+	 * ID: 1800989<br>
+	 * Message: What a nice attack~ You might be able to kill a passing fly~
+	 */
+	public static final NpcStringId WHAT_A_NICE_ATTACK_YOU_MIGHT_BE_ABLE_TO_KILL_A_PASSING_FLY;
+	
+	/**
+	 * ID: 1800990<br>
+	 * Message: Right there! A little to the right~! Ah~ Refreshing.
+	 */
+	public static final NpcStringId RIGHT_THERE_A_LITTLE_TO_THE_RIGHT_AH_REFRESHING;
+	
+	/**
+	 * ID: 1800991<br>
+	 * Message: You call that hitting? Bring some more talented friends!
+	 */
+	public static final NpcStringId YOU_CALL_THAT_HITTING_BRING_SOME_MORE_TALENTED_FRIENDS;
+	
+	/**
+	 * ID: 1800992<br>
+	 * Message: Don't think! Just hit! We're hitting!
+	 */
+	public static final NpcStringId DONT_THINK_JUST_HIT_WERE_HITTING;
+	
+	/**
+	 * ID: 1800993<br>
+	 * Message: I need nectar~ Gourd nectar!
+	 */
+	public static final NpcStringId I_NEED_NECTAR_GOURD_NECTAR;
+	
+	/**
+	 * ID: 1800994<br>
+	 * Message: I can only grow by drinking nectar~
+	 */
+	public static final NpcStringId I_CAN_ONLY_GROW_BY_DRINKING_NECTAR;
+	
+	/**
+	 * ID: 1800995<br>
+	 * Message: Grow me quick! If you're good, it's a large watermelon. If you're bad, it a watermelon slice~!
+	 */
+	public static final NpcStringId GROW_ME_QUICK_IF_YOURE_GOOD_ITS_A_LARGE_WATERMELON_IF_YOURE_BAD_IT_A_WATERMELON_SLICE;
+	
+	/**
+	 * ID: 1800996<br>
+	 * Message: Gimme nectar~ I'm hungry~
+	 */
+	public static final NpcStringId GIMME_NECTAR_IM_HUNGRY;
+	
+	/**
+	 * ID: 1800998<br>
+	 * Message: Bring me nectar. Then, I'll drink and grow!
+	 */
+	public static final NpcStringId BRING_ME_NECTAR_THEN_ILL_DRINK_AND_GROW;
+	
+	/**
+	 * ID: 1800999<br>
+	 * Message: You wanna eat a tiny watermelon like me? Try giving me some nectar. I'll get huge~!
+	 */
+	public static final NpcStringId YOU_WANNA_EAT_A_TINY_WATERMELON_LIKE_ME_TRY_GIVING_ME_SOME_NECTAR_ILL_GET_HUGE;
+	
+	/**
+	 * ID: 1801000<br>
+	 * Message: Hehehe... Grow me well and you'll get a reward. Grow me bad and who knows what'll happen~
+	 */
+	public static final NpcStringId HEHEHE_GROW_ME_WELL_AND_YOULL_GET_A_REWARD_GROW_ME_BAD_AND_WHO_KNOWS_WHATLL_HAPPEN;
+	
+	/**
+	 * ID: 1801001<br>
+	 * Message: You want a large watermelon? I'd like to be a watermelon slice~
+	 */
+	public static final NpcStringId YOU_WANT_A_LARGE_WATERMELON_ID_LIKE_TO_BE_A_WATERMELON_SLICE;
+	
+	/**
+	 * ID: 1801002<br>
+	 * Message: Trust me and bring me some nectar!! I'll become a large watermelon for you~!
+	 */
+	public static final NpcStringId TRUST_ME_AND_BRING_ME_SOME_NECTAR_ILL_BECOME_A_LARGE_WATERMELON_FOR_YOU;
+	
+	/**
+	 * ID: 1801003<br>
+	 * Message: I see. Beleth has recovered all of its magic power. What remains here is just its trace.
+	 */
+	public static final NpcStringId I_SEE_BELETH_HAS_RECOVERED_ALL_OF_ITS_MAGIC_POWER_WHAT_REMAINS_HERE_IS_JUST_ITS_TRACE;
+	
+	/**
+	 * ID: 1801004<br>
+	 * Message: Command Channel Leader $s1, Beleth's Ring has been acquired.
+	 */
+	public static final NpcStringId COMMAND_CHANNEL_LEADER_S1_BELETHS_RING_HAS_BEEN_ACQUIRED;
+	
+	/**
+	 * ID: 1801005<br>
+	 * Message: You summoned me, so you must be confident, huh? Here I come! Jack game!
+	 */
+	public static final NpcStringId YOU_SUMMONED_ME_SO_YOU_MUST_BE_CONFIDENT_HUH_HERE_I_COME_JACK_GAME;
+	
+	/**
+	 * ID: 1801006<br>
+	 * Message: Hello. Let's have a good Jack game.
+	 */
+	public static final NpcStringId HELLO_LETS_HAVE_A_GOOD_JACK_GAME;
+	
+	/**
+	 * ID: 1801007<br>
+	 * Message: I'm starting! Now, show me the card you want!
+	 */
+	public static final NpcStringId IM_STARTING_NOW_SHOW_ME_THE_CARD_YOU_WANT;
+	
+	/**
+	 * ID: 1801008<br>
+	 * Message: We'll start now! Show me the card you want!
+	 */
+	public static final NpcStringId WELL_START_NOW_SHOW_ME_THE_CARD_YOU_WANT;
+	
+	/**
+	 * ID: 1801009<br>
+	 * Message: I'm showing the Rotten Pumpkin Card!
+	 */
+	public static final NpcStringId IM_SHOWING_THE_ROTTEN_PUMPKIN_CARD;
+	
+	/**
+	 * ID: 1801010<br>
+	 * Message: I'll be showing the Rotten Pumpkin Card!
+	 */
+	public static final NpcStringId ILL_BE_SHOWING_THE_ROTTEN_PUMPKIN_CARD;
+	
+	/**
+	 * ID: 1801011<br>
+	 * Message: I'm showing the Jack Pumpkin Card!
+	 */
+	public static final NpcStringId IM_SHOWING_THE_JACK_PUMPKIN_CARD;
+	
+	/**
+	 * ID: 1801012<br>
+	 * Message: I'll be showing the Jack Pumpkin Card!
+	 */
+	public static final NpcStringId ILL_BE_SHOWING_THE_JACK_PUMPKIN_CARD;
+	
+	/**
+	 * ID: 1801013<br>
+	 * Message: That's my precious Fantastic Chocolate Banana Ultra Favor Candy!!! I'm definitely winning the next round!!
+	 */
+	public static final NpcStringId THATS_MY_PRECIOUS_FANTASTIC_CHOCOLATE_BANANA_ULTRA_FAVOR_CANDY_IM_DEFINITELY_WINNING_THE_NEXT_ROUND;
+	
+	/**
+	 * ID: 1801014<br>
+	 * Message: It's my precious candy, but... I'll happily give it to you~!
+	 */
+	public static final NpcStringId ITS_MY_PRECIOUS_CANDY_BUT_ILL_HAPPILY_GIVE_IT_TO_YOU;
+	
+	/**
+	 * ID: 1801015<br>
+	 * Message: The candy fell. I'll give you my toy chest instead.
+	 */
+	public static final NpcStringId THE_CANDY_FELL_ILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD;
+	
+	/**
+	 * ID: 1801016<br>
+	 * Message: Since the candy fell, I will give you my toy chest instead.
+	 */
+	public static final NpcStringId SINCE_THE_CANDY_FELL_I_WILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD;
+	
+	/**
+	 * ID: 1801017<br>
+	 * Message: You're not peeking at my card, are you? This time, I'll wager a special scroll.
+	 */
+	public static final NpcStringId YOURE_NOT_PEEKING_AT_MY_CARD_ARE_YOU_THIS_TIME_ILL_WAGER_A_SPECIAL_SCROLL;
+	
+	/**
+	 * ID: 1801018<br>
+	 * Message: We're getting serious now. If you win again, I'll give you a special scroll.
+	 */
+	public static final NpcStringId WERE_GETTING_SERIOUS_NOW_IF_YOU_WIN_AGAIN_ILL_GIVE_YOU_A_SPECIAL_SCROLL;
+	
+	/**
+	 * ID: 1801019<br>
+	 * Message: You could probably enter the underworld pro league!
+	 */
+	public static final NpcStringId YOU_COULD_PROBABLY_ENTER_THE_UNDERWORLD_PRO_LEAGUE;
+	
+	/**
+	 * ID: 1801020<br>
+	 * Message: Even pros can't do this much. You're amazing.
+	 */
+	public static final NpcStringId EVEN_PROS_CANT_DO_THIS_MUCH_YOURE_AMAZING;
+	
+	/**
+	 * ID: 1801021<br>
+	 * Message: Who's the monster here?! This time, I'll bet my precious Transformation Stick.
+	 */
+	public static final NpcStringId WHOS_THE_MONSTER_HERE_THIS_TIME_ILL_BET_MY_PRECIOUS_TRANSFORMATION_STICK;
+	
+	/**
+	 * ID: 1801022<br>
+	 * Message: I lost again. I won't lose this time. I'm betting my Transformation Stick.
+	 */
+	public static final NpcStringId I_LOST_AGAIN_I_WONT_LOSE_THIS_TIME_IM_BETTING_MY_TRANSFORMATION_STICK;
+	
+	/**
+	 * ID: 1801023<br>
+	 * Message: Lost again! Hmph. Next time, I'll bet an incredible gift! Wait for it if you want!
+	 */
+	public static final NpcStringId LOST_AGAIN_HMPH_NEXT_TIME_ILL_BET_AN_INCREDIBLE_GIFT_WAIT_FOR_IT_IF_YOU_WANT;
+	
+	/**
+	 * ID: 1801024<br>
+	 * Message: You're too good. Next time, I'll give you an incredible gift! Please wait for you.
+	 */
+	public static final NpcStringId YOURE_TOO_GOOD_NEXT_TIME_ILL_GIVE_YOU_AN_INCREDIBLE_GIFT_PLEASE_WAIT_FOR_YOU;
+	
+	/**
+	 * ID: 1801025<br>
+	 * Message: My pride can't handle you winning anymore!
+	 */
+	public static final NpcStringId MY_PRIDE_CANT_HANDLE_YOU_WINNING_ANYMORE;
+	
+	/**
+	 * ID: 1801026<br>
+	 * Message: I would be embarrassing to lose again here...
+	 */
+	public static final NpcStringId I_WOULD_BE_EMBARRASSING_TO_LOSE_AGAIN_HERE;
+	
+	/**
+	 * ID: 1801027<br>
+	 * Message: What's your name? I'm gonna remember you!
+	 */
+	public static final NpcStringId WHATS_YOUR_NAME_IM_GONNA_REMEMBER_YOU;
+	
+	/**
+	 * ID: 1801028<br>
+	 * Message: People from the above ground world are really good at games.
+	 */
+	public static final NpcStringId PEOPLE_FROM_THE_ABOVE_GROUND_WORLD_ARE_REALLY_GOOD_AT_GAMES;
+	
+	/**
+	 * ID: 1801029<br>
+	 * Message: You've played a lot in the underworld, haven't you?!
+	 */
+	public static final NpcStringId YOUVE_PLAYED_A_LOT_IN_THE_UNDERWORLD_HAVENT_YOU;
+	
+	/**
+	 * ID: 1801030<br>
+	 * Message: I've never met someone so good before.
+	 */
+	public static final NpcStringId IVE_NEVER_MET_SOMEONE_SO_GOOD_BEFORE;
+	
+	/**
+	 * ID: 1801031<br>
+	 * Message: 13 wins in a row. You're pretty lucky today, huh?
+	 */
+	public static final NpcStringId N13_WINS_IN_A_ROW_YOURE_PRETTY_LUCKY_TODAY_HUH;
+	
+	/**
+	 * ID: 1801032<br>
+	 * Message: I never thought I would see 13 wins in a row.
+	 */
+	public static final NpcStringId I_NEVER_THOUGHT_I_WOULD_SEE_13_WINS_IN_A_ROW;
+	
+	/**
+	 * ID: 1801033<br>
+	 * Message: This is the highest record in my life! Next time, I'll give you my treasure -- the Golden Jack O'Lantern!
+	 */
+	public static final NpcStringId THIS_IS_THE_HIGHEST_RECORD_IN_MY_LIFE_NEXT_TIME_ILL_GIVE_YOU_MY_TREASURE_THE_GOLDEN_JACK_OLANTERN;
+	
+	/**
+	 * ID: 1801034<br>
+	 * Message: Even pros can't do 14 wins...! Next time, I will give you my treasure, the Golden Jack O'Lantern.
+	 */
+	public static final NpcStringId EVEN_PROS_CANT_DO_14_WINS_NEXT_TIME_I_WILL_GIVE_YOU_MY_TREASURE_THE_GOLDEN_JACK_OLANTERN;
+	
+	/**
+	 * ID: 1801035<br>
+	 * Message: I can't do this anymore! You win! I acknowledge you as the best I've ever met in all my 583 years!
+	 */
+	public static final NpcStringId I_CANT_DO_THIS_ANYMORE_YOU_WIN_I_ACKNOWLEDGE_YOU_AS_THE_BEST_IVE_EVER_MET_IN_ALL_MY_583_YEARS;
+	
+	/**
+	 * ID: 1801036<br>
+	 * Message: Playing any more is meaningless. You were my greatest opponent.
+	 */
+	public static final NpcStringId PLAYING_ANY_MORE_IS_MEANINGLESS_YOU_WERE_MY_GREATEST_OPPONENT;
+	
+	/**
+	 * ID: 1801037<br>
+	 * Message: I won this round...! It was fun.
+	 */
+	public static final NpcStringId I_WON_THIS_ROUND_IT_WAS_FUN;
+	
+	/**
+	 * ID: 1801038<br>
+	 * Message: I won this round. It was enjoyable.
+	 */
+	public static final NpcStringId I_WON_THIS_ROUND_IT_WAS_ENJOYABLE;
+	
+	/**
+	 * ID: 1801039<br>
+	 * Message: Above world people are so fun...! Then, see you later!
+	 */
+	public static final NpcStringId ABOVE_WORLD_PEOPLE_ARE_SO_FUN_THEN_SEE_YOU_LATER;
+	
+	/**
+	 * ID: 1801040<br>
+	 * Message: Call me again next time. I want to play again with you.
+	 */
+	public static final NpcStringId CALL_ME_AGAIN_NEXT_TIME_I_WANT_TO_PLAY_AGAIN_WITH_YOU;
+	
+	/**
+	 * ID: 1801041<br>
+	 * Message: You wanna play some more? I'm out of presents, but I'll give you candy!
+	 */
+	public static final NpcStringId YOU_WANNA_PLAY_SOME_MORE_IM_OUT_OF_PRESENTS_BUT_ILL_GIVE_YOU_CANDY;
+	
+	/**
+	 * ID: 1801042<br>
+	 * Message: Will you play some more? I don't have any more presents, but I will give you candy if you win.
+	 */
+	public static final NpcStringId WILL_YOU_PLAY_SOME_MORE_I_DONT_HAVE_ANY_MORE_PRESENTS_BUT_I_WILL_GIVE_YOU_CANDY_IF_YOU_WIN;
+	
+	/**
+	 * ID: 1801043<br>
+	 * Message: You're the best. Out of all the Jack's game players I've ever met... I give up!
+	 */
+	public static final NpcStringId YOURE_THE_BEST_OUT_OF_ALL_THE_JACKS_GAME_PLAYERS_IVE_EVER_MET_I_GIVE_UP;
+	
+	/**
+	 * ID: 1801044<br>
+	 * Message: Wowww. Awesome. Really. I have never met someone as good as you before. Now... I can't play anymore.
+	 */
+	public static final NpcStringId WOWWW_AWESOME_REALLY_I_HAVE_NEVER_MET_SOMEONE_AS_GOOD_AS_YOU_BEFORE_NOW_I_CANT_PLAY_ANYMORE;
+	
+	/**
+	 * ID: 1801045<br>
+	 * Message: $s1 has won $s2 Jack's games in a row.
+	 */
+	public static final NpcStringId S1_HAS_WON_S2_JACKS_GAMES_IN_A_ROW;
+	
+	/**
+	 * ID: 1801046<br>
+	 * Message: Congratulations! $s1 has won $s2 Jack's games in a row.
+	 */
+	public static final NpcStringId CONGRATULATIONS_S1_HAS_WON_S2_JACKS_GAMES_IN_A_ROW;
+	
+	/**
+	 * ID: 1801047<br>
+	 * Message: Congratulations on getting 1st place in Jack's game!
+	 */
+	public static final NpcStringId CONGRATULATIONS_ON_GETTING_1ST_PLACE_IN_JACKS_GAME;
+	
+	/**
+	 * ID: 1801048<br>
+	 * Message: Hello~! I'm Belldandy. Congratulations on winning 1st place in Jack's game... If you go and find my sibling Skooldie in the village, you'll get an amazing gift! Let's play Jack's game again!
+	 */
+	public static final NpcStringId HELLO_IM_BELLDANDY_CONGRATULATIONS_ON_WINNING_1ST_PLACE_IN_JACKS_GAME_IF_YOU_GO_AND_FIND_MY_SIBLING_SKOOLDIE_IN_THE_VILLAGE_YOULL_GET_AN_AMAZING_GIFT_LETS_PLAY_JACKS_GAME_AGAIN;
+	
+	/**
+	 * ID: 1801049<br>
+	 * Message: Hmm. You're playing Jack's game for the first time, huh? You couldn't even take out your card at the right time~! My goodness...
+	 */
+	public static final NpcStringId HMM_YOURE_PLAYING_JACKS_GAME_FOR_THE_FIRST_TIME_HUH_YOU_COULDNT_EVEN_TAKE_OUT_YOUR_CARD_AT_THE_RIGHT_TIME_MY_GOODNESS;
+	
+	/**
+	 * ID: 1801050<br>
+	 * Message: Oh. You're not very familiar with Jack's game, right? You didn't take out your card at the right time...
+	 */
+	public static final NpcStringId OH_YOURE_NOT_VERY_FAMILIAR_WITH_JACKS_GAME_RIGHT_YOU_DIDNT_TAKE_OUT_YOUR_CARD_AT_THE_RIGHT_TIME;
+	
+	/**
+	 * ID: 1801051<br>
+	 * Message: You have to use the card skill on the mask before the gauge above my head disappears.
+	 */
+	public static final NpcStringId YOU_HAVE_TO_USE_THE_CARD_SKILL_ON_THE_MASK_BEFORE_THE_GAUGE_ABOVE_MY_HEAD_DISAPPEARS;
+	
+	/**
+	 * ID: 1801052<br>
+	 * Message: You must use the card skill on the mask before the gauge above my head disappears.
+	 */
+	public static final NpcStringId YOU_MUST_USE_THE_CARD_SKILL_ON_THE_MASK_BEFORE_THE_GAUGE_ABOVE_MY_HEAD_DISAPPEARS;
+	
+	/**
+	 * ID: 1801053<br>
+	 * Message: If you show the same card as me, you win. If they're different, I win. Understand? Now, let's go!
+	 */
+	public static final NpcStringId IF_YOU_SHOW_THE_SAME_CARD_AS_ME_YOU_WIN_IF_THEYRE_DIFFERENT_I_WIN_UNDERSTAND_NOW_LETS_GO;
+	
+	/**
+	 * ID: 1801054<br>
+	 * Message: You will win if you show the same card as me. It's my victory if the cards are different. Well, let's start again~
+	 */
+	public static final NpcStringId YOU_WILL_WIN_IF_YOU_SHOW_THE_SAME_CARD_AS_ME_ITS_MY_VICTORY_IF_THE_CARDS_ARE_DIFFERENT_WELL_LETS_START_AGAIN;
+	
+	/**
+	 * ID: 1801055<br>
+	 * Message: Ack! You didn't show a card? You have to use the card skill before the gauge disappears. Hmph. Then, I'm going.
+	 */
+	public static final NpcStringId ACK_YOU_DIDNT_SHOW_A_CARD_YOU_HAVE_TO_USE_THE_CARD_SKILL_BEFORE_THE_GAUGE_DISAPPEARS_HMPH_THEN_IM_GOING;
+	
+	/**
+	 * ID: 1801056<br>
+	 * Message: Ahh. You didn't show a card. You must use the card skill at the right time. It's unfortunate. Then, I will go now~
+	 */
+	public static final NpcStringId AHH_YOU_DIDNT_SHOW_A_CARD_YOU_MUST_USE_THE_CARD_SKILL_AT_THE_RIGHT_TIME_ITS_UNFORTUNATE_THEN_I_WILL_GO_NOW;
+	
+	/**
+	 * ID: 1801057<br>
+	 * Message: Let's learn about the Jack's game together~! You can play with me 3 times.
+	 */
+	public static final NpcStringId LETS_LEARN_ABOUT_THE_JACKS_GAME_TOGETHER_YOU_CAN_PLAY_WITH_ME_3_TIMES;
+	
+	/**
+	 * ID: 1801058<br>
+	 * Message: Let's start! Show the card you want! The card skill is attached to the mask.
+	 */
+	public static final NpcStringId LETS_START_SHOW_THE_CARD_YOU_WANT_THE_CARD_SKILL_IS_ATTACHED_TO_THE_MASK;
+	
+	/**
+	 * ID: 1801059<br>
+	 * Message: You showed the same card as me, so you win.
+	 */
+	public static final NpcStringId YOU_SHOWED_THE_SAME_CARD_AS_ME_SO_YOU_WIN;
+	
+	/**
+	 * ID: 1801060<br>
+	 * Message: You showed a different card from me, so you lose.
+	 */
+	public static final NpcStringId YOU_SHOWED_A_DIFFERENT_CARD_FROM_ME_SO_YOU_LOSE;
+	
+	/**
+	 * ID: 1801061<br>
+	 * Message: That was practice, so there's no candy even if you win~
+	 */
+	public static final NpcStringId THAT_WAS_PRACTICE_SO_THERES_NO_CANDY_EVEN_IF_YOU_WIN;
+	
+	/**
+	 * ID: 1801062<br>
+	 * Message: It's unfortunate. Let's practice one more time.
+	 */
+	public static final NpcStringId ITS_UNFORTUNATE_LETS_PRACTICE_ONE_MORE_TIME;
+	
+	/**
+	 * ID: 1801063<br>
+	 * Message: You gotta show the card at the right time. Use the card skill you want before the gauge above my head disappears!
+	 */
+	public static final NpcStringId YOU_GOTTA_SHOW_THE_CARD_AT_THE_RIGHT_TIME_USE_THE_CARD_SKILL_YOU_WANT_BEFORE_THE_GAUGE_ABOVE_MY_HEAD_DISAPPEARS;
+	
+	/**
+	 * ID: 1801064<br>
+	 * Message: The card skills are attached to the Jack O'Lantern mask, right? That's what you use.
+	 */
+	public static final NpcStringId THE_CARD_SKILLS_ARE_ATTACHED_TO_THE_JACK_OLANTERN_MASK_RIGHT_THATS_WHAT_YOU_USE;
+	
+	/**
+	 * ID: 1801065<br>
+	 * Message: You win if you show the same card as me, and I win if the cards are different. OK, let's go~
+	 */
+	public static final NpcStringId YOU_WIN_IF_YOU_SHOW_THE_SAME_CARD_AS_ME_AND_I_WIN_IF_THE_CARDS_ARE_DIFFERENT_OK_LETS_GO;
+	
+	/**
+	 * ID: 1801066<br>
+	 * Message: You didn't show a card again? We'll try again later. I'm gonna go now~
+	 */
+	public static final NpcStringId YOU_DIDNT_SHOW_A_CARD_AGAIN_WELL_TRY_AGAIN_LATER_IM_GONNA_GO_NOW;
+	
+	/**
+	 * ID: 1801067<br>
+	 * Message: Now, do you understand a little about Jack's game? The real game's with Uldie and Belldandy. Well, see you later!
+	 */
+	public static final NpcStringId NOW_DO_YOU_UNDERSTAND_A_LITTLE_ABOUT_JACKS_GAME_THE_REAL_GAMES_WITH_ULDIE_AND_BELLDANDY_WELL_SEE_YOU_LATER;
+	
+	/**
+	 * ID: 1801068<br>
+	 * Message: Hahahaha!
+	 */
+	public static final NpcStringId HAHAHAHA;
+	
+	/**
+	 * ID: 1801069<br>
+	 * Message: Where are you looking?
+	 */
+	public static final NpcStringId WHERE_ARE_YOU_LOOKING;
+	
+	/**
+	 * ID: 1801070<br>
+	 * Message: I'm right here.
+	 */
+	public static final NpcStringId IM_RIGHT_HERE;
+	
+	/**
+	 * ID: 1801071<br>
+	 * Message: Annoying concentration attacks are disrupting Valakas's concentration!\\nIf it continues, you may get a great opportunity!
+	 */
+	public static final NpcStringId ANNOYING_CONCENTRATION_ATTACKS_ARE_DISRUPTING_VALAKASS_CONCENTRATIONNIF_IT_CONTINUES_YOU_MAY_GET_A_GREAT_OPPORTUNITY;
+	
+	/**
+	 * ID: 1801072<br>
+	 * Message: Some warrior's blow has left a huge gash between the great scales of Valakas!\\nValakas's P. Def. is greatly decreased!
+	 */
+	public static final NpcStringId SOME_WARRIORS_BLOW_HAS_LEFT_A_HUGE_GASH_BETWEEN_THE_GREAT_SCALES_OF_VALAKASNVALAKASS_P_DEF_IS_GREATLY_DECREASED;
+	
+	/**
+	 * ID: 1801073<br>
+	 * Message: Annoying concentration attacks overwhelmed Valakas, making it forget its rage and become distracted!
+	 */
+	public static final NpcStringId ANNOYING_CONCENTRATION_ATTACKS_OVERWHELMED_VALAKAS_MAKING_IT_FORGET_ITS_RAGE_AND_BECOME_DISTRACTED;
+	
+	/**
+	 * ID: 1801074<br>
+	 * Message: Long-range concentration attacks have enraged Valakas!\\nIf you continue, it may become a dangerous situation!
+	 */
+	public static final NpcStringId LONG_RANGE_CONCENTRATION_ATTACKS_HAVE_ENRAGED_VALAKASNIF_YOU_CONTINUE_IT_MAY_BECOME_A_DANGEROUS_SITUATION;
+	
+	/**
+	 * ID: 1801075<br>
+	 * Message: Because the cowardly counterattacks continued, Valakas's fury has reached its maximum!\\nValakas's P. Atk. is greatly increased!
+	 */
+	public static final NpcStringId BECAUSE_THE_COWARDLY_COUNTERATTACKS_CONTINUED_VALAKASS_FURY_HAS_REACHED_ITS_MAXIMUMNVALAKASS_P_ATK_IS_GREATLY_INCREASED;
+	
+	/**
+	 * ID: 1801076<br>
+	 * Message: Valakas has been enraged by the long-range concentration attacks and is coming toward its target with even greater zeal!
+	 */
+	public static final NpcStringId VALAKAS_HAS_BEEN_ENRAGED_BY_THE_LONG_RANGE_CONCENTRATION_ATTACKS_AND_IS_COMING_TOWARD_ITS_TARGET_WITH_EVEN_GREATER_ZEAL;
+	
+	/**
+	 * ID: 1801077<br>
+	 * Message: Listen, oh Tantas! I have returned! The Prophet Yugoros of the Black Abyss is with me, so do not be afraid!
+	 */
+	public static final NpcStringId LISTEN_OH_TANTAS_I_HAVE_RETURNED_THE_PROPHET_YUGOROS_OF_THE_BLACK_ABYSS_IS_WITH_ME_SO_DO_NOT_BE_AFRAID;
+	
+	/**
+	 * ID: 1801078<br>
+	 * Message: Welcome, $s1! Let us see if you have brought a worthy offering for the Black Abyss!
+	 */
+	public static final NpcStringId WELCOME_S1_LET_US_SEE_IF_YOU_HAVE_BROUGHT_A_WORTHY_OFFERING_FOR_THE_BLACK_ABYSS;
+	
+	/**
+	 * ID: 1801079<br>
+	 * Message: What a formidable foe! But I have the Abyss Weed given to me by the Black Abyss! Let me see...
+	 */
+	public static final NpcStringId WHAT_A_FORMIDABLE_FOE_BUT_I_HAVE_THE_ABYSS_WEED_GIVEN_TO_ME_BY_THE_BLACK_ABYSS_LET_ME_SEE;
+	
+	/**
+	 * ID: 1801080<br>
+	 * Message: Muhahaha! Ah, this burning sensation in my mouth! The power of the Black Abyss is reviving me!
+	 */
+	public static final NpcStringId MUHAHAHA_AH_THIS_BURNING_SENSATION_IN_MY_MOUTH_THE_POWER_OF_THE_BLACK_ABYSS_IS_REVIVING_ME;
+	
+	/**
+	 * ID: 1801081<br>
+	 * Message: No! How dare you stop me from using the Abyss Weed... Do you know what you have done?!
+	 */
+	public static final NpcStringId NO_HOW_DARE_YOU_STOP_ME_FROM_USING_THE_ABYSS_WEED_DO_YOU_KNOW_WHAT_YOU_HAVE_DONE;
+	
+	/**
+	 * ID: 1801082<br>
+	 * Message: A limp creature like this is unworthy to be an offering... You have no right to sacrifice to the Black Abyss!
+	 */
+	public static final NpcStringId A_LIMP_CREATURE_LIKE_THIS_IS_UNWORTHY_TO_BE_AN_OFFERING_YOU_HAVE_NO_RIGHT_TO_SACRIFICE_TO_THE_BLACK_ABYSS;
+	
+	/**
+	 * ID: 1801083<br>
+	 * Message: Listen, oh Tantas! The Black Abyss is famished! Find some fresh offerings!
+	 */
+	public static final NpcStringId LISTEN_OH_TANTAS_THE_BLACK_ABYSS_IS_FAMISHED_FIND_SOME_FRESH_OFFERINGS;
+	
+	/**
+	 * ID: 1801084<br>
+	 * Message: Ah... How could I lose... Oh, Black Abyss, receive me...
+	 */
+	public static final NpcStringId AH_HOW_COULD_I_LOSE_OH_BLACK_ABYSS_RECEIVE_ME;
+	
+	/**
+	 * ID: 1801085<br>
+	 * Message: Alarm system destroyed. Intruder excluded.
+	 */
+	public static final NpcStringId ALARM_SYSTEM_DESTROYED_INTRUDER_EXCLUDED;
+	
+	/**
+	 * ID: 1801089<br>
+	 * Message: Begin stage 4
+	 */
+	public static final NpcStringId BEGIN_STAGE_4;
+	
+	/**
+	 * ID: 1801090<br>
+	 * Message: Time remaining until next battle
+	 */
+	public static final NpcStringId TIME_REMAINING_UNTIL_NEXT_BATTLE;
+	
+	/**
+	 * ID: 1801091<br>
+	 * Message: The beast ate the feed, but it isn't showing a response, perhaps because it's already full.
+	 */
+	public static final NpcStringId THE_BEAST_ATE_THE_FEED_BUT_IT_ISNT_SHOWING_A_RESPONSE_PERHAPS_BECAUSE_ITS_ALREADY_FULL;
+	
+	/**
+	 * ID: 1801092<br>
+	 * Message: The beast spit out the feed instead of eating it.
+	 */
+	public static final NpcStringId THE_BEAST_SPIT_OUT_THE_FEED_INSTEAD_OF_EATING_IT;
+	
+	/**
+	 * ID: 1801093<br>
+	 * Message: The beast spit out the feed and is instead attacking you!
+	 */
+	public static final NpcStringId THE_BEAST_SPIT_OUT_THE_FEED_AND_IS_INSTEAD_ATTACKING_YOU;
+	
+	/**
+	 * ID: 1801094<br>
+	 * Message: $s1 is leaving you because you don't have enough Golden Spices.
+	 */
+	public static final NpcStringId S1_IS_LEAVING_YOU_BECAUSE_YOU_DONT_HAVE_ENOUGH_GOLDEN_SPICES;
+	
+	/**
+	 * ID: 1801095<br>
+	 * Message: $s1 is leaving you because you don't have enough Crystal Spices.
+	 */
+	public static final NpcStringId S1_IS_LEAVING_YOU_BECAUSE_YOU_DONT_HAVE_ENOUGH_CRYSTAL_SPICES;
+	
+	/**
+	 * ID: 1801096<br>
+	 * Message: $s1. May the protection of the gods be upon you!
+	 */
+	public static final NpcStringId S1_MAY_THE_PROTECTION_OF_THE_GODS_BE_UPON_YOU;
+	
+	/**
+	 * ID: 1801097<br>
+	 * Message: Freya has started to move.
+	 */
+	public static final NpcStringId FREYA_HAS_STARTED_TO_MOVE;
+	
+	/**
+	 * ID: 1801098<br>
+	 * Message: How could I... fall... in a place like this...
+	 */
+	public static final NpcStringId HOW_COULD_I_FALL_IN_A_PLACE_LIKE_THIS;
+	
+	/**
+	 * ID: 1801099<br>
+	 * Message: I can finally take a breather. By the way, who are you? Hmm... I think I know who sent you.
+	 */
+	public static final NpcStringId I_CAN_FINALLY_TAKE_A_BREATHER_BY_THE_WAY_WHO_ARE_YOU_HMM_I_THINK_I_KNOW_WHO_SENT_YOU;
+	
+	/**
+	 * ID: 1801100<br>
+	 * Message: $s1 of Balance
+	 */
+	public static final NpcStringId S1_OF_BALANCE;
+	
+	/**
+	 * ID: 1801101<br>
+	 * Message: Swift $s1
+	 */
+	public static final NpcStringId SWIFT_S2;
+	
+	/**
+	 * ID: 1801102<br>
+	 * Message: $s1 of Blessing
+	 */
+	public static final NpcStringId S1_OF_BLESSING;
+	
+	/**
+	 * ID: 1801103<br>
+	 * Message: Sharp $s1
+	 */
+	public static final NpcStringId SHARP_S2;
+	
+	/**
+	 * ID: 1801104<br>
+	 * Message: Useful $s1
+	 */
+	public static final NpcStringId USEFUL_S2;
+	
+	/**
+	 * ID: 1801105<br>
+	 * Message: Reckless $s1
+	 */
+	public static final NpcStringId RECKLESS_S2;
+	
+	/**
+	 * ID: 1801106<br>
+	 * Message: Alpen Kookaburra
+	 */
+	public static final NpcStringId ALPEN_KOOKABURRA;
+	
+	/**
+	 * ID: 1801107<br>
+	 * Message: Alpen Cougar
+	 */
+	public static final NpcStringId ALPEN_COUGAR;
+	
+	/**
+	 * ID: 1801108<br>
+	 * Message: Alpen Buffalo
+	 */
+	public static final NpcStringId ALPEN_BUFFALO;
+	
+	/**
+	 * ID: 1801109<br>
+	 * Message: Alpen Grendel
+	 */
+	public static final NpcStringId ALPEN_GRENDEL;
+	
+	/**
+	 * ID: 1801110<br>
+	 * Message: Battle end limit time
+	 */
+	public static final NpcStringId BATTLE_END_LIMIT_TIME;
+	
+	/**
+	 * ID: 1801111<br>
+	 * Message: Strong magic power can be felt from somewhere!!
+	 */
+	public static final NpcStringId STRONG_MAGIC_POWER_CAN_BE_FELT_FROM_SOMEWHERE;
+	
+	/**
+	 * ID: 1801112<br>
+	 * Message: How dare you attack my recruits!!
+	 */
+	public static final NpcStringId HOW_DARE_YOU_ATTACK_MY_RECRUITS;
+	
+	/**
+	 * ID: 1801113<br>
+	 * Message: Who is disrupting the order?!
+	 */
+	public static final NpcStringId WHO_IS_DISRUPTING_THE_ORDER;
+	
+	/**
+	 * ID: 1801114<br>
+	 * Message: The drillmaster is dead!
+	 */
+	public static final NpcStringId THE_DRILLMASTER_IS_DEAD;
+	
+	/**
+	 * ID: 1801115<br>
+	 * Message: Line up the ranks!!
+	 */
+	public static final NpcStringId LINE_UP_THE_RANKS;
+	
+	/**
+	 * ID: 1801116<br>
+	 * Message: I brought the food.
+	 */
+	public static final NpcStringId I_BROUGHT_THE_FOOD;
+	
+	/**
+	 * ID: 1801117<br>
+	 * Message: Come and eat.
+	 */
+	public static final NpcStringId COME_AND_EAT;
+	
+	/**
+	 * ID: 1801118<br>
+	 * Message: Looks delicious.
+	 */
+	public static final NpcStringId LOOKS_DELICIOUS;
+	
+	/**
+	 * ID: 1801119<br>
+	 * Message: Let's go eat.
+	 */
+	public static final NpcStringId LETS_GO_EAT;
+	
+	/**
+	 * ID: 1801120<br>
+	 * Message: Archer. Give your breath for the intruder!
+	 */
+	public static final NpcStringId ARCHER_GIVE_YOUR_BREATH_FOR_THE_INTRUDER;
+	
+	/**
+	 * ID: 1801121<br>
+	 * Message: My knights. Show your loyalty!!
+	 */
+	public static final NpcStringId MY_KNIGHTS_SHOW_YOUR_LOYALTY;
+	
+	/**
+	 * ID: 1801122<br>
+	 * Message: I can take it no longer!!!
+	 */
+	public static final NpcStringId I_CAN_TAKE_IT_NO_LONGER;
+	
+	/**
+	 * ID: 1801123<br>
+	 * Message: Archer. Heed my call!
+	 */
+	public static final NpcStringId ARCHER_HEED_MY_CALL;
+	
+	/**
+	 * ID: 1801124<br>
+	 * Message: The space feels like its gradually starting to shake.
+	 */
+	public static final NpcStringId THE_SPACE_FEELS_LIKE_ITS_GRADUALLY_STARTING_TO_SHAKE;
+	
+	/**
+	 * ID: 1801125<br>
+	 * Message: I can no longer stand by.
+	 */
+	public static final NpcStringId I_CAN_NO_LONGER_STAND_BY;
+	
+	/**
+	 * ID: 1801126<br>
+	 * Message: Taklacan is gathering its strength and launching an attack.
+	 */
+	public static final NpcStringId TAKLACAN_IS_GATHERING_ITS_STRENGTH_AND_LAUNCHING_AN_ATTACK;
+	
+	/**
+	 * ID: 1801127<br>
+	 * Message: Taklacan received Cokrakon and became weaker.
+	 */
+	public static final NpcStringId TAKLACAN_RECEIVED_COKRAKON_AND_BECAME_WEAKER;
+	
+	/**
+	 * ID: 1801128<br>
+	 * Message: Cokrakon's power can be felt nearby.
+	 */
+	public static final NpcStringId COKRAKONS_POWER_CAN_BE_FELT_NEARBY;
+	
+	/**
+	 * ID: 1801129<br>
+	 * Message: Taklacan is preparing to hide itself.
+	 */
+	public static final NpcStringId TAKLACAN_IS_PREPARING_TO_HIDE_ITSELF;
+	
+	/**
+	 * ID: 1801130<br>
+	 * Message: Taklacan disappears into the space of futility with a roar.
+	 */
+	public static final NpcStringId TAKLACAN_DISAPPEARS_INTO_THE_SPACE_OF_FUTILITY_WITH_A_ROAR;
+	
+	/**
+	 * ID: 1801131<br>
+	 * Message: Torumba's body is starting to move.
+	 */
+	public static final NpcStringId TORUMBAS_BODY_IS_STARTING_TO_MOVE;
+	
+	/**
+	 * ID: 1801132<br>
+	 * Message: A response can be felt from Torumba's tough skin.
+	 */
+	public static final NpcStringId A_RESPONSE_CAN_BE_FELT_FROM_TORUMBAS_TOUGH_SKIN;
+	
+	/**
+	 * ID: 1801133<br>
+	 * Message: A mark remains on Torumba's tough skin.
+	 */
+	public static final NpcStringId A_MARK_REMAINS_ON_TORUMBAS_TOUGH_SKIN;
+	
+	/**
+	 * ID: 1801134<br>
+	 * Message: The light is beginning to weaken in Torumba's eyes.
+	 */
+	public static final NpcStringId THE_LIGHT_IS_BEGINNING_TO_WEAKEN_IN_TORUMBAS_EYES;
+	
+	/**
+	 * ID: 1801135<br>
+	 * Message: Torumba's left leg was damaged.
+	 */
+	public static final NpcStringId TORUMBAS_LEFT_LEG_WAS_DAMAGED;
+	
+	/**
+	 * ID: 1801136<br>
+	 * Message: Torumba's right leg was damaged.
+	 */
+	public static final NpcStringId TORUMBAS_RIGHT_LEG_WAS_DAMAGED;
+	
+	/**
+	 * ID: 1801137<br>
+	 * Message: Torumba's left arm was damaged.
+	 */
+	public static final NpcStringId TORUMBAS_LEFT_ARM_WAS_DAMAGED;
+	
+	/**
+	 * ID: 1801138<br>
+	 * Message: Torumba's right arm was damaged.
+	 */
+	public static final NpcStringId TORUMBAS_RIGHT_ARM_WAS_DAMAGED;
+	
+	/**
+	 * ID: 1801139<br>
+	 * Message: A deep wound appeared on Torumba's tough skin.
+	 */
+	public static final NpcStringId A_DEEP_WOUND_APPEARED_ON_TORUMBAS_TOUGH_SKIN;
+	
+	/**
+	 * ID: 1801140<br>
+	 * Message: The light is slowly fading from Torumba's eyes.
+	 */
+	public static final NpcStringId THE_LIGHT_IS_SLOWLY_FADING_FROM_TORUMBAS_EYES;
+	
+	/**
+	 * ID: 1801141<br>
+	 * Message: Torumba is preparing to hide its body.
+	 */
+	public static final NpcStringId TORUMBA_IS_PREPARING_TO_HIDE_ITS_BODY;
+	
+	/**
+	 * ID: 1801142<br>
+	 * Message: Torumba disappeared into his space.
+	 */
+	public static final NpcStringId TORUMBA_DISAPPEARED_INTO_HIS_SPACE;
+	
+	/**
+	 * ID: 1801143<br>
+	 * Message: Torumba is preparing to hide itself in the twisted space.
+	 */
+	public static final NpcStringId TORUMBA_IS_PREPARING_TO_HIDE_ITSELF_IN_THE_TWISTED_SPACE;
+	
+	/**
+	 * ID: 1801144<br>
+	 * Message: Dopagen has started to move.
+	 */
+	public static final NpcStringId DOPAGEN_HAS_STARTED_TO_MOVE;
+	
+	/**
+	 * ID: 1801145<br>
+	 * Message: Leptilikon's energy feels like it's being condensed.
+	 */
+	public static final NpcStringId LEPTILIKONS_ENERGY_FEELS_LIKE_ITS_BEING_CONDENSED;
+	
+	/**
+	 * ID: 1801146<br>
+	 * Message: Dopagen is preparing to hide itself with a strange scent.
+	 */
+	public static final NpcStringId DOPAGEN_IS_PREPARING_TO_HIDE_ITSELF_WITH_A_STRANGE_SCENT;
+	
+	/**
+	 * ID: 1801147<br>
+	 * Message: Dopagen is preparing to hide itself.
+	 */
+	public static final NpcStringId DOPAGEN_IS_PREPARING_TO_HIDE_ITSELF;
+	
+	/**
+	 * ID: 1801148<br>
+	 * Message: Dopagen is disappearing in between the twisted space.
+	 */
+	public static final NpcStringId DOPAGEN_IS_DISAPPEARING_IN_BETWEEN_THE_TWISTED_SPACE;
+	
+	/**
+	 * ID: 1801149<br>
+	 * Message: Maguen appearance!!!
+	 */
+	public static final NpcStringId MAGUEN_APPEARANCE;
+	
+	/**
+	 * ID: 1801150<br>
+	 * Message: Enough Maguen Plasma - Bistakon have gathered.
+	 */
+	public static final NpcStringId ENOUGH_MAGUEN_PLASMA_BISTAKON_HAVE_GATHERED;
+	
+	/**
+	 * ID: 1801151<br>
+	 * Message: Enough Maguen Plasma - Cokrakon have gathered.
+	 */
+	public static final NpcStringId ENOUGH_MAGUEN_PLASMA_COKRAKON_HAVE_GATHERED;
+	
+	/**
+	 * ID: 1801152<br>
+	 * Message: Enough Maguen Plasma - Leptilikon have gathered.
+	 */
+	public static final NpcStringId ENOUGH_MAGUEN_PLASMA_LEPTILIKON_HAVE_GATHERED;
+	
+	/**
+	 * ID: 1801153<br>
+	 * Message: The plasmas have filled the aeroscope and are harmonized.
+	 */
+	public static final NpcStringId THE_PLASMAS_HAVE_FILLED_THE_AEROSCOPE_AND_ARE_HARMONIZED;
+	
+	/**
+	 * ID: 1801154<br>
+	 * Message: The plasmas have filled the aeroscope but they are ramming into each other, exploding, and dying.
+	 */
+	public static final NpcStringId THE_PLASMAS_HAVE_FILLED_THE_AEROSCOPE_BUT_THEY_ARE_RAMMING_INTO_EACH_OTHER_EXPLODING_AND_DYING;
+	
+	/**
+	 * ID: 1801155<br>
+	 * Message: Amazing. $s1 took 100 of these soul stone fragments. What a complete swindler.
+	 */
+	public static final NpcStringId AMAZING_S1_TOOK_100_OF_THESE_SOUL_STONE_FRAGMENTS_WHAT_A_COMPLETE_SWINDLER;
+	
+	/**
+	 * ID: 1801156<br>
+	 * Message: Hmm? Hey, did you give $s1 something? But it was just 1. Haha.
+	 */
+	public static final NpcStringId HMM_HEY_DID_YOU_GIVE_S1_SOMETHING_BUT_IT_WAS_JUST_1_HAHA;
+	
+	/**
+	 * ID: 1801157<br>
+	 * Message: $s1 pulled one with $s2 digits. Lucky~ Not bad~
+	 */
+	public static final NpcStringId S1_PULLED_ONE_WITH_S2_DIGITS_LUCKY_NOT_BAD;
+	
+	/**
+	 * ID: 1801158<br>
+	 * Message: It's better than losing it all, right? Or does this feel worse?
+	 */
+	public static final NpcStringId ITS_BETTER_THAN_LOSING_IT_ALL_RIGHT_OR_DOES_THIS_FEEL_WORSE;
+	
+	/**
+	 * ID: 1801159<br>
+	 * Message: Ahem~! $s1 has no luck at all. Try praying.
+	 */
+	public static final NpcStringId AHEM_S1_HAS_NO_LUCK_AT_ALL_TRY_PRAYING;
+	
+	/**
+	 * ID: 1801160<br>
+	 * Message: Ah... It's over. What kind of guy is that? Damn... Fine, you $s1, take it and get outta here.
+	 */
+	public static final NpcStringId AH_ITS_OVER_WHAT_KIND_OF_GUY_IS_THAT_DAMN_FINE_YOU_S1_TAKE_IT_AND_GET_OUTTA_HERE;
+	
+	/**
+	 * ID: 1801161<br>
+	 * Message: A big piece is made up of little pieces. So here's a little piece~
+	 */
+	public static final NpcStringId A_BIG_PIECE_IS_MADE_UP_OF_LITTLE_PIECES_SO_HERES_A_LITTLE_PIECE;
+	
+	/**
+	 * ID: 1801162<br>
+	 * Message: You don't feel bad, right? Are you sad? But don't cry~
+	 */
+	public static final NpcStringId YOU_DONT_FEEL_BAD_RIGHT_ARE_YOU_SAD_BUT_DONT_CRY;
+	
+	/**
+	 * ID: 1801163<br>
+	 * Message: OK~ Who's next? It all depends on your fate and luck, right? At least come and take a look.
+	 */
+	public static final NpcStringId OK_WHOS_NEXT_IT_ALL_DEPENDS_ON_YOUR_FATE_AND_LUCK_RIGHT_AT_LEAST_COME_AND_TAKE_A_LOOK;
+	
+	/**
+	 * ID: 1801164<br>
+	 * Message: No one else? Don't worry~ I don't bite. Haha~!
+	 */
+	public static final NpcStringId NO_ONE_ELSE_DONT_WORRY_I_DONT_BITE_HAHA;
+	
+	/**
+	 * ID: 1801165<br>
+	 * Message: There was someone who won 10,000 from me. A warrior shouldn't just be good at fighting, right? You've gotta be good in everything.
+	 */
+	public static final NpcStringId THERE_WAS_SOMEONE_WHO_WON_10000_FROM_ME_A_WARRIOR_SHOULDNT_JUST_BE_GOOD_AT_FIGHTING_RIGHT_YOUVE_GOTTA_BE_GOOD_IN_EVERYTHING;
+	
+	/**
+	 * ID: 1801166<br>
+	 * Message: OK~ Master of luck? That's you? Haha~! Well, anyone can come after all.
+	 */
+	public static final NpcStringId OK_MASTER_OF_LUCK_THATS_YOU_HAHA_WELL_ANYONE_CAN_COME_AFTER_ALL;
+	
+	/**
+	 * ID: 1801167<br>
+	 * Message: Shedding blood is a given on the battlefield. At least it's safe here.
+	 */
+	public static final NpcStringId SHEDDING_BLOOD_IS_A_GIVEN_ON_THE_BATTLEFIELD_AT_LEAST_ITS_SAFE_HERE;
+	
+	/**
+	 * ID: 1801168<br>
+	 * Message: Gasp!
+	 */
+	public static final NpcStringId GASP;
+	
+	/**
+	 * ID: 1801169<br>
+	 * Message: Is it still long off?
+	 */
+	public static final NpcStringId IS_IT_STILL_LONG_OFF;
+	
+	/**
+	 * ID: 1801170<br>
+	 * Message: Is Ermian well? Even I can't believe that I survived in a place like this...
+	 */
+	public static final NpcStringId IS_ERMIAN_WELL_EVEN_I_CANT_BELIEVE_THAT_I_SURVIVED_IN_A_PLACE_LIKE_THIS;
+	
+	/**
+	 * ID: 1801171<br>
+	 * Message: I don't know how long it's been since I parted company with you... Time doesn't seem to move... It just feels too long...
+	 */
+	public static final NpcStringId I_DONT_KNOW_HOW_LONG_ITS_BEEN_SINCE_I_PARTED_COMPANY_WITH_YOU_TIME_DOESNT_SEEM_TO_MOVE_IT_JUST_FEELS_TOO_LONG;
+	
+	/**
+	 * ID: 1801172<br>
+	 * Message: Sorry to say this, but... The place you struck me before now hurts greatly...
+	 */
+	public static final NpcStringId SORRY_TO_SAY_THIS_BUT_THE_PLACE_YOU_STRUCK_ME_BEFORE_NOW_HURTS_GREATLY;
+	
+	/**
+	 * ID: 1801173<br>
+	 * Message: Ugh... I'm sorry... It looks like this is it for me... I wanted to live and see my family...
+	 */
+	public static final NpcStringId UGH_IM_SORRY_IT_LOOKS_LIKE_THIS_IS_IT_FOR_ME_I_WANTED_TO_LIVE_AND_SEE_MY_FAMILY;
+	
+	/**
+	 * ID: 1801174<br>
+	 * Message: Where are you? I can't see anything.
+	 */
+	public static final NpcStringId WHERE_ARE_YOU_I_CANT_SEE_ANYTHING;
+	
+	/**
+	 * ID: 1801175<br>
+	 * Message: Where are you, really? I can't follow you like this.
+	 */
+	public static final NpcStringId WHERE_ARE_YOU_REALLY_I_CANT_FOLLOW_YOU_LIKE_THIS;
+	
+	/**
+	 * ID: 1801176<br>
+	 * Message: I'm sorry... This is it for me.
+	 */
+	public static final NpcStringId IM_SORRY_THIS_IS_IT_FOR_ME;
+	
+	/**
+	 * ID: 1801177<br>
+	 * Message: Sob~ To see Ermian again... Can I go to my family now?
+	 */
+	public static final NpcStringId SOB_TO_SEE_ERMIAN_AGAIN_CAN_I_GO_TO_MY_FAMILY_NOW;
+	
+	/**
+	 * ID: 1801183<br>
+	 * Message: My energy was recovered so quickly. Thanks, $s1~
+	 */
+	public static final NpcStringId MY_ENERGY_WAS_RECOVERED_SO_QUICKLY_THANKS_S1;
+	
+	/**
+	 * ID: 1801187<br>
+	 * Message: I'm starving!
+	 */
+	public static final NpcStringId IM_STARVING;
+	
+	/**
+	 * ID: 1801189<br>
+	 * Message: Magic power so strong that it could make you lose your mind can be felt from somewhere!!
+	 */
+	public static final NpcStringId MAGIC_POWER_SO_STRONG_THAT_IT_COULD_MAKE_YOU_LOSE_YOUR_MIND_CAN_BE_FELT_FROM_SOMEWHERE;
+	
+	/**
+	 * ID: 1801190<br>
+	 * Message: Even though you bring something called a gift among your humans, it would just be problematic for me...
+	 */
+	public static final NpcStringId EVEN_THOUGH_YOU_BRING_SOMETHING_CALLED_A_GIFT_AMONG_YOUR_HUMANS_IT_WOULD_JUST_BE_PROBLEMATIC_FOR_ME;
+	
+	/**
+	 * ID: 1801191<br>
+	 * Message: I just don't know what expression I should have it appeared on me. Are human's emotions like this feeling?
+	 */
+	public static final NpcStringId I_JUST_DONT_KNOW_WHAT_EXPRESSION_I_SHOULD_HAVE_IT_APPEARED_ON_ME_ARE_HUMANS_EMOTIONS_LIKE_THIS_FEELING;
+	
+	/**
+	 * ID: 1801192<br>
+	 * Message: The feeling of thanks is just too much distant memory for me...
+	 */
+	public static final NpcStringId THE_FEELING_OF_THANKS_IS_JUST_TOO_MUCH_DISTANT_MEMORY_FOR_ME;
+	
+	/**
+	 * ID: 1801193<br>
+	 * Message: But I kind of miss it... Like I had felt this feeling before...
+	 */
+	public static final NpcStringId BUT_I_KIND_OF_MISS_IT_LIKE_I_HAD_FELT_THIS_FEELING_BEFORE;
+	
+	/**
+	 * ID: 1801194<br>
+	 * Message: I am Ice Queen Freya... This feeling and emotion are nothing but a part of Melissa'a memories.
+	 */
+	public static final NpcStringId I_AM_ICE_QUEEN_FREYA_THIS_FEELING_AND_EMOTION_ARE_NOTHING_BUT_A_PART_OF_MELISSAA_MEMORIES;
+	
+	/**
+	 * ID: 1801195<br>
+	 * Message: Dear $s1... Think of this as my appreciation for the gift. Take this with you. There's nothing strange about it. It's just a bit of my capriciousness...
+	 */
+	public static final NpcStringId DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERES_NOTHING_STRANGE_ABOUT_IT_ITS_JUST_A_BIT_OF_MY_CAPRICIOUSNESS;
+	
+	/**
+	 * ID: 1801196<br>
+	 * Message: The kindness of somebody is not a bad feeling... Dear $s1, I will take this gift out of respect your kindness.
+	 */
+	public static final NpcStringId THE_KINDNESS_OF_SOMEBODY_IS_NOT_A_BAD_FEELING_DEAR_S1_I_WILL_TAKE_THIS_GIFT_OUT_OF_RESPECT_YOUR_KINDNESS;
+	
+	/**
+	 * ID: 1811000<br>
+	 * Message: Fighter
+	 */
+	public static final NpcStringId FIGHTER;
+	
+	/**
+	 * ID: 1811001<br>
+	 * Message: Warrior
+	 */
+	public static final NpcStringId WARRIOR;
+	
+	/**
+	 * ID: 1811002<br>
+	 * Message: Gladiator
+	 */
+	public static final NpcStringId GLADIATOR;
+	
+	/**
+	 * ID: 1811003<br>
+	 * Message: Warlord
+	 */
+	public static final NpcStringId WARLORD;
+	
+	/**
+	 * ID: 1811004<br>
+	 * Message: Knight
+	 */
+	public static final NpcStringId KNIGHT;
+	
+	/**
+	 * ID: 1811005<br>
+	 * Message: Paladin
+	 */
+	public static final NpcStringId PALADIN;
+	
+	/**
+	 * ID: 1811006<br>
+	 * Message: Dark Avenger
+	 */
+	public static final NpcStringId DARK_AVENGER;
+	
+	/**
+	 * ID: 1811007<br>
+	 * Message: Rogue
+	 */
+	public static final NpcStringId ROGUE;
+	
+	/**
+	 * ID: 1811008<br>
+	 * Message: Treasure Hunter
+	 */
+	public static final NpcStringId TREASURE_HUNTER;
+	
+	/**
+	 * ID: 1811009<br>
+	 * Message: Hawkeye
+	 */
+	public static final NpcStringId HAWKEYE;
+	
+	/**
+	 * ID: 1811010<br>
+	 * Message: Mage
+	 */
+	public static final NpcStringId MAGE;
+	
+	/**
+	 * ID: 1811011<br>
+	 * Message: Wizard
+	 */
+	public static final NpcStringId WIZARD;
+	
+	/**
+	 * ID: 1811012<br>
+	 * Message: Sorcerer
+	 */
+	public static final NpcStringId SORCERER;
+	
+	/**
+	 * ID: 1811013<br>
+	 * Message: Necromancer
+	 */
+	public static final NpcStringId NECROMANCER;
+	
+	/**
+	 * ID: 1811014<br>
+	 * Message: Warlock
+	 */
+	public static final NpcStringId WARLOCK;
+	
+	/**
+	 * ID: 1811015<br>
+	 * Message: Cleric
+	 */
+	public static final NpcStringId CLERIC;
+	
+	/**
+	 * ID: 1811016<br>
+	 * Message: Bishop
+	 */
+	public static final NpcStringId BISHOP;
+	
+	/**
+	 * ID: 1811017<br>
+	 * Message: Prophet
+	 */
+	public static final NpcStringId PROPHET;
+	
+	/**
+	 * ID: 1811018<br>
+	 * Message: Elven Fighter
+	 */
+	public static final NpcStringId ELVEN_FIGHTER;
+	
+	/**
+	 * ID: 1811019<br>
+	 * Message: Elven Knight
+	 */
+	public static final NpcStringId ELVEN_KNIGHT;
+	
+	/**
+	 * ID: 1811020<br>
+	 * Message: Temple Knight
+	 */
+	public static final NpcStringId TEMPLE_KNIGHT;
+	
+	/**
+	 * ID: 1811021<br>
+	 * Message: Sword Singer
+	 */
+	public static final NpcStringId SWORD_SINGER;
+	
+	/**
+	 * ID: 1811022<br>
+	 * Message: Elven Scout
+	 */
+	public static final NpcStringId ELVEN_SCOUT;
+	
+	/**
+	 * ID: 1811023<br>
+	 * Message: Plain Walker
+	 */
+	public static final NpcStringId PLAIN_WALKER;
+	
+	/**
+	 * ID: 1811024<br>
+	 * Message: Silver Ranger
+	 */
+	public static final NpcStringId SILVER_RANGER;
+	
+	/**
+	 * ID: 1811025<br>
+	 * Message: Elven Mage
+	 */
+	public static final NpcStringId ELVEN_MAGE;
+	
+	/**
+	 * ID: 1811026<br>
+	 * Message: Elven Wizard
+	 */
+	public static final NpcStringId ELVEN_WIZARD;
+	
+	/**
+	 * ID: 1811027<br>
+	 * Message: Spell Singer
+	 */
+	public static final NpcStringId SPELL_SINGER;
+	
+	/**
+	 * ID: 1811028<br>
+	 * Message: Elemental Summoner
+	 */
+	public static final NpcStringId ELEMENTAL_SUMMONER;
+	
+	/**
+	 * ID: 1811029<br>
+	 * Message: Oracle
+	 */
+	public static final NpcStringId ORACLE;
+	
+	/**
+	 * ID: 1811030<br>
+	 * Message: Elder
+	 */
+	public static final NpcStringId ELDER;
+	
+	/**
+	 * ID: 1811031<br>
+	 * Message: Dark Fighter
+	 */
+	public static final NpcStringId DARK_FIGHTER;
+	
+	/**
+	 * ID: 1811032<br>
+	 * Message: Palace Knight
+	 */
+	public static final NpcStringId PALACE_KNIGHT;
+	
+	/**
+	 * ID: 1811033<br>
+	 * Message: Shillien Knight
+	 */
+	public static final NpcStringId SHILLIEN_KNIGHT;
+	
+	/**
+	 * ID: 1811034<br>
+	 * Message: Blade Dancer
+	 */
+	public static final NpcStringId BLADE_DANCER;
+	
+	/**
+	 * ID: 1811035<br>
+	 * Message: Assassin
+	 */
+	public static final NpcStringId ASSASSIN;
+	
+	/**
+	 * ID: 1811036<br>
+	 * Message: Abyss Walker
+	 */
+	public static final NpcStringId ABYSS_WALKER;
+	
+	/**
+	 * ID: 1811037<br>
+	 * Message: Phantom Ranger
+	 */
+	public static final NpcStringId PHANTOM_RANGER;
+	
+	/**
+	 * ID: 1811038<br>
+	 * Message: Dark Mage
+	 */
+	public static final NpcStringId DARK_MAGE;
+	
+	/**
+	 * ID: 1811039<br>
+	 * Message: Dark Wizard
+	 */
+	public static final NpcStringId DARK_WIZARD;
+	
+	/**
+	 * ID: 1811040<br>
+	 * Message: Spellhowler
+	 */
+	public static final NpcStringId SPELLHOWLER;
+	
+	/**
+	 * ID: 1811041<br>
+	 * Message: Phantom Summoner
+	 */
+	public static final NpcStringId PHANTOM_SUMMONER;
+	
+	/**
+	 * ID: 1811042<br>
+	 * Message: Shillien Oracle
+	 */
+	public static final NpcStringId SHILLIEN_ORACLE;
+	
+	/**
+	 * ID: 1811043<br>
+	 * Message: Shillien Elder
+	 */
+	public static final NpcStringId SHILLIEN_ELDER;
+	
+	/**
+	 * ID: 1811044<br>
+	 * Message: Orc Fighter
+	 */
+	public static final NpcStringId ORC_FIGHTER;
+	
+	/**
+	 * ID: 1811045<br>
+	 * Message: Orc Raider
+	 */
+	public static final NpcStringId ORC_RAIDER;
+	
+	/**
+	 * ID: 1811046<br>
+	 * Message: Destroyer
+	 */
+	public static final NpcStringId DESTROYER;
+	
+	/**
+	 * ID: 1811047<br>
+	 * Message: Orc Monk
+	 */
+	public static final NpcStringId ORC_MONK;
+	
+	/**
+	 * ID: 1811048<br>
+	 * Message: Tyrant
+	 */
+	public static final NpcStringId TYRANT;
+	
+	/**
+	 * ID: 1811049<br>
+	 * Message: Orc Mage
+	 */
+	public static final NpcStringId ORC_MAGE;
+	
+	/**
+	 * ID: 1811050<br>
+	 * Message: Orc Shaman
+	 */
+	public static final NpcStringId ORC_SHAMAN;
+	
+	/**
+	 * ID: 1811051<br>
+	 * Message: Overlord
+	 */
+	public static final NpcStringId OVERLORD;
+	
+	/**
+	 * ID: 1811052<br>
+	 * Message: Warcryer
+	 */
+	public static final NpcStringId WARCRYER;
+	
+	/**
+	 * ID: 1811053<br>
+	 * Message: Dwarven Fighter
+	 */
+	public static final NpcStringId DWARVEN_FIGHTER;
+	
+	/**
+	 * ID: 1811054<br>
+	 * Message: Scavenger
+	 */
+	public static final NpcStringId SCAVENGER;
+	
+	/**
+	 * ID: 1811055<br>
+	 * Message: Bounty Hunter
+	 */
+	public static final NpcStringId BOUNTY_HUNTER;
+	
+	/**
+	 * ID: 1811056<br>
+	 * Message: Artisan
+	 */
+	public static final NpcStringId ARTISAN;
+	
+	/**
+	 * ID: 1811057<br>
+	 * Message: Warsmith
+	 */
+	public static final NpcStringId WARSMITH;
+	
+	/**
+	 * ID: 1811088<br>
+	 * Message: Duelist
+	 */
+	public static final NpcStringId DUELIST;
+	
+	/**
+	 * ID: 1811089<br>
+	 * Message: Dreadnought
+	 */
+	public static final NpcStringId DREADNOUGHT;
+	
+	/**
+	 * ID: 1811090<br>
+	 * Message: Phoenix Knight
+	 */
+	public static final NpcStringId PHOENIX_KNIGHT;
+	
+	/**
+	 * ID: 1811091<br>
+	 * Message: Hell Knight
+	 */
+	public static final NpcStringId HELL_KNIGHT;
+	
+	/**
+	 * ID: 1811092<br>
+	 * Message: Sagittarius
+	 */
+	public static final NpcStringId SAGITTARIUS;
+	
+	/**
+	 * ID: 1811093<br>
+	 * Message: Adventurer
+	 */
+	public static final NpcStringId ADVENTURER;
+	
+	/**
+	 * ID: 1811094<br>
+	 * Message: Archmage
+	 */
+	public static final NpcStringId ARCHMAGE;
+	
+	/**
+	 * ID: 1811095<br>
+	 * Message: Soultaker
+	 */
+	public static final NpcStringId SOULTAKER;
+	
+	/**
+	 * ID: 1811096<br>
+	 * Message: Arcana Lord
+	 */
+	public static final NpcStringId ARCANA_LORD;
+	
+	/**
+	 * ID: 1811097<br>
+	 * Message: Cardinal
+	 */
+	public static final NpcStringId CARDINAL;
+	
+	/**
+	 * ID: 1811098<br>
+	 * Message: Hierophant
+	 */
+	public static final NpcStringId HIEROPHANT;
+	
+	/**
+	 * ID: 1811099<br>
+	 * Message: Eva's Templar
+	 */
+	public static final NpcStringId EVAS_TEMPLAR;
+	
+	/**
+	 * ID: 1811100<br>
+	 * Message: Sword Muse
+	 */
+	public static final NpcStringId SWORD_MUSE;
+	
+	/**
+	 * ID: 1811101<br>
+	 * Message: Wind Rider
+	 */
+	public static final NpcStringId WIND_RIDER;
+	
+	/**
+	 * ID: 1811102<br>
+	 * Message: Moonlight Sentinel
+	 */
+	public static final NpcStringId MOONLIGHT_SENTINEL;
+	
+	/**
+	 * ID: 1811103<br>
+	 * Message: Mystic Muse
+	 */
+	public static final NpcStringId MYSTIC_MUSE;
+	
+	/**
+	 * ID: 1811104<br>
+	 * Message: Elemental Master
+	 */
+	public static final NpcStringId ELEMENTAL_MASTER;
+	
+	/**
+	 * ID: 1811105<br>
+	 * Message: Eva's Saint
+	 */
+	public static final NpcStringId EVAS_SAINT;
+	
+	/**
+	 * ID: 1811106<br>
+	 * Message: Shillien Templar
+	 */
+	public static final NpcStringId SHILLIEN_TEMPLAR;
+	
+	/**
+	 * ID: 1811107<br>
+	 * Message: Spectral Dancer
+	 */
+	public static final NpcStringId SPECTRAL_DANCER;
+	
+	/**
+	 * ID: 1811108<br>
+	 * Message: Ghost Hunter
+	 */
+	public static final NpcStringId GHOST_HUNTER;
+	
+	/**
+	 * ID: 1811109<br>
+	 * Message: Ghost Sentinel
+	 */
+	public static final NpcStringId GHOST_SENTINEL;
+	
+	/**
+	 * ID: 1811110<br>
+	 * Message: Storm Screamer
+	 */
+	public static final NpcStringId STORM_SCREAMER;
+	
+	/**
+	 * ID: 1811111<br>
+	 * Message: Spectral Master
+	 */
+	public static final NpcStringId SPECTRAL_MASTER;
+	
+	/**
+	 * ID: 1811112<br>
+	 * Message: Shillien Saint
+	 */
+	public static final NpcStringId SHILLIEN_SAINT;
+	
+	/**
+	 * ID: 1811113<br>
+	 * Message: Titan
+	 */
+	public static final NpcStringId TITAN;
+	
+	/**
+	 * ID: 1811114<br>
+	 * Message: Grand Khavatari
+	 */
+	public static final NpcStringId GRAND_KHAVATARI;
+	
+	/**
+	 * ID: 1811115<br>
+	 * Message: Dominator
+	 */
+	public static final NpcStringId DOMINATOR;
+	
+	/**
+	 * ID: 1811116<br>
+	 * Message: Doom Cryer
+	 */
+	public static final NpcStringId DOOM_CRYER;
+	
+	/**
+	 * ID: 1811117<br>
+	 * Message: Fortune Seeker
+	 */
+	public static final NpcStringId FORTUNE_SEEKER;
+	
+	/**
+	 * ID: 1811118<br>
+	 * Message: Maestro
+	 */
+	public static final NpcStringId MAESTRO;
+	
+	/**
+	 * ID: 1811123<br>
+	 * Message: Kamael Soldier
+	 */
+	public static final NpcStringId KAMAEL_SOLDIER;
+	
+	/**
+	 * ID: 1811125<br>
+	 * Message: Trooper
+	 */
+	public static final NpcStringId TROOPER;
+	
+	/**
+	 * ID: 1811126<br>
+	 * Message: Warder
+	 */
+	public static final NpcStringId WARDER;
+	
+	/**
+	 * ID: 1811127<br>
+	 * Message: Berserker
+	 */
+	public static final NpcStringId BERSERKER;
+	
+	/**
+	 * ID: 1811128<br>
+	 * Message: Soul Breaker
+	 */
+	public static final NpcStringId SOUL_BREAKER;
+	
+	/**
+	 * ID: 1811130<br>
+	 * Message: Arbalester
+	 */
+	public static final NpcStringId ARBALESTER;
+	
+	/**
+	 * ID: 1811131<br>
+	 * Message: Doombringer
+	 */
+	public static final NpcStringId DOOMBRINGER;
+	
+	/**
+	 * ID: 1811132<br>
+	 * Message: Soul Hound
+	 */
+	public static final NpcStringId SOUL_HOUND;
+	
+	/**
+	 * ID: 1811134<br>
+	 * Message: Trickster
+	 */
+	public static final NpcStringId TRICKSTER;
+	
+	/**
+	 * ID: 1811135<br>
+	 * Message: Inspector
+	 */
+	public static final NpcStringId INSPECTOR;
+	
+	/**
+	 * ID: 1811136<br>
+	 * Message: Judicator
+	 */
+	public static final NpcStringId JUDICATOR;
+	
+	/**
+	 * ID: 1811137<br>
+	 * Message: Who's there? If you disturb the temper of the great Land Dragon Antharas, I will never forgive you!
+	 */
+	public static final NpcStringId WHOS_THERE_IF_YOU_DISTURB_THE_TEMPER_OF_THE_GREAT_LAND_DRAGON_ANTHARAS_I_WILL_NEVER_FORGIVE_YOU;
+	
+	/**
+	 * ID: 1900000<br>
+	 * Message: Kehahaha!!! I captured Santa Claus!! There will be no gifts this year!!!
+	 */
+	public static final NpcStringId KEHAHAHA_I_CAPTURED_SANTA_CLAUS_THERE_WILL_BE_NO_GIFTS_THIS_YEAR;
+	
+	/**
+	 * ID: 1900003<br>
+	 * Message: Well? I win, right?
+	 */
+	public static final NpcStringId WELL_I_WIN_RIGHT;
+	
+	/**
+	 * ID: 1900004<br>
+	 * Message: Now!! All of you losers, get out of here!
+	 */
+	public static final NpcStringId NOW_ALL_OF_YOU_LOSERS_GET_OUT_OF_HERE;
+	
+	/**
+	 * ID: 1900006<br>
+	 * Message: I guess you came to rescue Santa. But you picked the wrong opponent.
+	 */
+	public static final NpcStringId I_GUESS_YOU_CAME_TO_RESCUE_SANTA_BUT_YOU_PICKED_THE_WRONG_OPPONENT;
+	
+	/**
+	 * ID: 1900007<br>
+	 * Message: Oh, not bad...
+	 */
+	public static final NpcStringId OH_NOT_BAD;
+	
+	/**
+	 * ID: 1900008<br>
+	 * Message: Agh!! That's not what I meant to do!
+	 */
+	public static final NpcStringId AGH_THATS_NOT_WHAT_I_MEANT_TO_DO;
+	
+	/**
+	 * ID: 1900009<br>
+	 * Message: Curse you!! Huh... What...?
+	 */
+	public static final NpcStringId CURSE_YOU_HUH_WHAT;
+	
+	/**
+	 * ID: 1900015<br>
+	 * Message: Shall I go to see if Santa is still there? Hehe~
+	 */
+	public static final NpcStringId SHALL_I_GO_TO_SEE_IF_SANTA_IS_STILL_THERE_HEHE;
+	
+	/**
+	 * ID: 1900017<br>
+	 * Message: Santa can give nice presents only if he's released from the Turkey...
+	 */
+	public static final NpcStringId SANTA_CAN_GIVE_NICE_PRESENTS_ONLY_IF_HES_RELEASED_FROM_THE_TURKEY;
+	
+	/**
+	 * ID: 1900018<br>
+	 * Message: Oh ho ho... Oh ho ho... Thank you. Everyone! I will repay you for sure.
+	 */
+	public static final NpcStringId OH_HO_HO_OH_HO_HO_THANK_YOU_EVERYONE_I_WILL_REPAY_YOU_FOR_SURE;
+	
+	/**
+	 * ID: 1900019<br>
+	 * Message: Merry Christmas~ Well done.
+	 */
+	public static final NpcStringId MERRY_CHRISTMAS_WELL_DONE;
+	
+	/**
+	 * ID: 1900021<br>
+	 * Message: %s. I have prepared a gift for you.
+	 */
+	public static final NpcStringId S_I_HAVE_PREPARED_A_GIFT_FOR_YOU;
+	
+	/**
+	 * ID: 1900022<br>
+	 * Message: I have a gift for %s.
+	 */
+	public static final NpcStringId I_HAVE_A_GIFT_FOR_S;
+	
+	/**
+	 * ID: 1900024<br>
+	 * Message: Take a look at the inventory. Perhaps there will be a big present~
+	 */
+	public static final NpcStringId TAKE_A_LOOK_AT_THE_INVENTORY_PERHAPS_THERE_WILL_BE_A_BIG_PRESENT;
+	
+	/**
+	 * ID: 1900026<br>
+	 * Message: When are you going to stop? I'm slowly getting tired of this.
+	 */
+	public static final NpcStringId WHEN_ARE_YOU_GOING_TO_STOP_IM_SLOWLY_GETTING_TIRED_OF_THIS;
+	
+	/**
+	 * ID: 1900027<br>
+	 * Message: Message from Santa Claus: Many blessings to %s, who saved me~
+	 */
+	public static final NpcStringId MESSAGE_FROM_SANTA_CLAUS_MANY_BLESSINGS_TO_S_WHO_SAVED_ME;
+	
+	/**
+	 * ID: 1900028<br>
+	 * Message: How dare you awaken me. Feel the pain of the flames.
+	 */
+	public static final NpcStringId HOW_DARE_YOU_AWAKEN_ME_FEEL_THE_PAIN_OF_THE_FLAMES;
+	
+	/**
+	 * ID: 1900029<br>
+	 * Message: Who dares oppose the majesty of fire...?
+	 */
+	public static final NpcStringId WHO_DARES_OPPOSE_THE_MAJESTY_OF_FIRE;
+	
+	/**
+	 * ID: 1900030<br>
+	 * Message: Oh... Ouch! No, not there! Not my bead!
+	 */
+	public static final NpcStringId OH_OUCH_NO_NOT_THERE_NOT_MY_BEAD;
+	
+	/**
+	 * ID: 1900031<br>
+	 * Message: Co... Cold! That's cold! Ack! Ack!
+	 */
+	public static final NpcStringId CO_COLD_THATS_COLD_ACK_ACK;
+	
+	/**
+	 * ID: 1900032<br>
+	 * Message: Please, %s... Don't hit me... Please.
+	 */
+	public static final NpcStringId PLEASE_S_DONT_HIT_ME_PLEASE;
+	
+	/**
+	 * ID: 1900033<br>
+	 * Message: Kuaaannggg! Shake in fear!
+	 */
+	public static final NpcStringId KUAAANNGGG_SHAKE_IN_FEAR;
+	
+	/**
+	 * ID: 1900034<br>
+	 * Message: If you attack me right now, you're really going to get it!!!
+	 */
+	public static final NpcStringId IF_YOU_ATTACK_ME_RIGHT_NOW_YOURE_REALLY_GOING_TO_GET_IT;
+	
+	/**
+	 * ID: 1900035<br>
+	 * Message: Just you wait! I'm going to show you my killer technique.
+	 */
+	public static final NpcStringId JUST_YOU_WAIT_IM_GOING_TO_SHOW_YOU_MY_KILLER_TECHNIQUE;
+	
+	/**
+	 * ID: 1900036<br>
+	 * Message: You don't dare attack me!
+	 */
+	public static final NpcStringId YOU_DONT_DARE_ATTACK_ME;
+	
+	/**
+	 * ID: 1900037<br>
+	 * Message: It's different from the spirit of fire. It's not the spirit of fire! Feel my wrath!
+	 */
+	public static final NpcStringId ITS_DIFFERENT_FROM_THE_SPIRIT_OF_FIRE_ITS_NOT_THE_SPIRIT_OF_FIRE_FEEL_MY_WRATH;
+	
+	/**
+	 * ID: 1900038<br>
+	 * Message: Cold... This place... Is this where I die...?
+	 */
+	public static final NpcStringId COLD_THIS_PLACE_IS_THIS_WHERE_I_DIE;
+	
+	/**
+	 * ID: 1900039<br>
+	 * Message: My body is cooling. Oh, Gran Kain... Forgive me...
+	 */
+	public static final NpcStringId MY_BODY_IS_COOLING_OH_GRAN_KAIN_FORGIVE_ME;
+	
+	/**
+	 * ID: 1900040<br>
+	 * Message: Idiot! I only incur damage from bare-handed attacks!
+	 */
+	public static final NpcStringId IDIOT_I_ONLY_INCUR_DAMAGE_FROM_BARE_HANDED_ATTACKS;
+	
+	/**
+	 * ID: 1900051<br>
+	 * Message: I'm out of candy. I'll give you my toy chest instead.
+	 */
+	public static final NpcStringId IM_OUT_OF_CANDY_ILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD;
+	
+	/**
+	 * ID: 1900052<br>
+	 * Message: Since I'm out of candy, I will give you my toy chest instead.
+	 */
+	public static final NpcStringId SINCE_IM_OUT_OF_CANDY_I_WILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD;
+	
+	/**
+	 * ID: 1900060<br>
+	 * Message: You're too good. Next time, I'll give you an incredible gift! Please wait for it.
+	 */
+	public static final NpcStringId YOURE_TOO_GOOD_NEXT_TIME_ILL_GIVE_YOU_AN_INCREDIBLE_GIFT_PLEASE_WAIT_FOR_IT;
+	
+	/**
+	 * ID: 1900062<br>
+	 * Message: I would be embarrassed to lose again here...
+	 */
+	public static final NpcStringId I_WOULD_BE_EMBARRASSED_TO_LOSE_AGAIN_HERE;
+	
+	/**
+	 * ID: 1900070<br>
+	 * Message: Even pros can't do 14 wins in a row...! Next time, I'll give you my treasure, the Golden Jack O'Lantern.
+	 */
+	public static final NpcStringId EVEN_PROS_CANT_DO_14_WINS_IN_A_ROW_NEXT_TIME_ILL_GIVE_YOU_MY_TREASURE_THE_GOLDEN_JACK_OLANTERN;
+	
+	/**
+	 * ID: 1900071<br>
+	 * Message: I can't do this anymore! You win! In all my 583 years, you're the best that I've seen!
+	 */
+	public static final NpcStringId I_CANT_DO_THIS_ANYMORE_YOU_WIN_IN_ALL_MY_583_YEARS_YOURE_THE_BEST_THAT_IVE_SEEN;
+	
+	/**
+	 * ID: 1900081<br>
+	 * Message: %s has won %s Jack's games in a row.
+	 */
+	public static final NpcStringId S_HAS_WON_S_JACKS_GAMES_IN_A_ROW;
+	
+	/**
+	 * ID: 1900082<br>
+	 * Message: Congratulations! %s has won %s Jack's games in a row.
+	 */
+	public static final NpcStringId CONGRATULATIONS_S_HAS_WON_S_JACKS_GAMES_IN_A_ROW;
+	
+	/**
+	 * ID: 1900084<br>
+	 * Message: Hello~! I'm Belldandy. Congratulations on getting 1st place in Jack's game. If you go and find my sibling Skooldie in the village, you'll get an amazing gift! Let's play Jack's game again!
+	 */
+	public static final NpcStringId HELLO_IM_BELLDANDY_CONGRATULATIONS_ON_GETTING_1ST_PLACE_IN_JACKS_GAME_IF_YOU_GO_AND_FIND_MY_SIBLING_SKOOLDIE_IN_THE_VILLAGE_YOULL_GET_AN_AMAZING_GIFT_LETS_PLAY_JACKS_GAME_AGAIN;
+	
+	/**
+	 * ID: 1900104<br>
+	 * Message: Yawn~ Ahh... Hello~! Nice weather we're having.
+	 */
+	public static final NpcStringId YAWN_AHH_HELLO_NICE_WEATHER_WERE_HAVING;
+	
+	/**
+	 * ID: 1900105<br>
+	 * Message: Ah, I'm hungry. Do you have any baby food? That's what I need to eat to get bigger.
+	 */
+	public static final NpcStringId AH_IM_HUNGRY_DO_YOU_HAVE_ANY_BABY_FOOD_THATS_WHAT_I_NEED_TO_EAT_TO_GET_BIGGER;
+	
+	/**
+	 * ID: 1900106<br>
+	 * Message: I gotta grow up fast. I want to pull Santa's sled, too.
+	 */
+	public static final NpcStringId I_GOTTA_GROW_UP_FAST_I_WANT_TO_PULL_SANTAS_SLED_TOO;
+	
+	/**
+	 * ID: 1900107<br>
+	 * Message: Yummy! I think I can grow up now!
+	 */
+	public static final NpcStringId YUMMY_I_THINK_I_CAN_GROW_UP_NOW;
+	
+	/**
+	 * ID: 1900108<br>
+	 * Message: Thanks to you, I grew up into a Boy Rudolph!
+	 */
+	public static final NpcStringId THANKS_TO_YOU_I_GREW_UP_INTO_A_BOY_RUDOLPH;
+	
+	/**
+	 * ID: 1900109<br>
+	 * Message: It's great weather for running around.
+	 */
+	public static final NpcStringId ITS_GREAT_WEATHER_FOR_RUNNING_AROUND;
+	
+	/**
+	 * ID: 1900110<br>
+	 * Message: What'll I be when I grow up? I wonder.
+	 */
+	public static final NpcStringId WHATLL_I_BE_WHEN_I_GROW_UP_I_WONDER;
+	
+	/**
+	 * ID: 1900111<br>
+	 * Message: If you take good care of me, I'll never forget it!
+	 */
+	public static final NpcStringId IF_YOU_TAKE_GOOD_CARE_OF_ME_ILL_NEVER_FORGET_IT;
+	
+	/**
+	 * ID: 1900112<br>
+	 * Message: Please pet me lovingly. You can use the "Hand of Warmth" skill under the action tab.
+	 */
+	public static final NpcStringId PLEASE_PET_ME_LOVINGLY_YOU_CAN_USE_THE_HAND_OF_WARMTH_SKILL_UNDER_THE_ACTION_TAB;
+	
+	/**
+	 * ID: 1900113<br>
+	 * Message: I feel great! Thank you!
+	 */
+	public static final NpcStringId I_FEEL_GREAT_THANK_YOU;
+	
+	/**
+	 * ID: 1900114<br>
+	 * Message: Woo. What a good feeling~ I gotta grow more and more!
+	 */
+	public static final NpcStringId WOO_WHAT_A_GOOD_FEELING_I_GOTTA_GROW_MORE_AND_MORE;
+	
+	/**
+	 * ID: 1900115<br>
+	 * Message: Oh, yummy! If I keep eating this, I think I can grow up all the way.
+	 */
+	public static final NpcStringId OH_YUMMY_IF_I_KEEP_EATING_THIS_I_THINK_I_CAN_GROW_UP_ALL_THE_WAY;
+	
+	/**
+	 * ID: 1900116<br>
+	 * Message: Yum yum. Delicious. Give me more of this!
+	 */
+	public static final NpcStringId YUM_YUM_DELICIOUS_GIVE_ME_MORE_OF_THIS;
+	
+	/**
+	 * ID: 1900117<br>
+	 * Message: Wow. This taste. There's a whole new world in my mouth!
+	 */
+	public static final NpcStringId WOW_THIS_TASTE_THERES_A_WHOLE_NEW_WORLD_IN_MY_MOUTH;
+	
+	/**
+	 * ID: 1900118<br>
+	 * Message: Yeah. It's so delicious. This is that star food!
+	 */
+	public static final NpcStringId YEAH_ITS_SO_DELICIOUS_THIS_IS_THAT_STAR_FOOD;
+	
+	/**
+	 * ID: 1900119<br>
+	 * Message: Pay some attention to me! Hmph.
+	 */
+	public static final NpcStringId PAY_SOME_ATTENTION_TO_ME_HMPH;
+	
+	/**
+	 * ID: 1900120<br>
+	 * Message: Thank you. I was able to grow up into an adult. Here is my gift.
+	 */
+	public static final NpcStringId THANK_YOU_I_WAS_ABLE_TO_GROW_UP_INTO_AN_ADULT_HERE_IS_MY_GIFT;
+	
+	/**
+	 * ID: 1900121<br>
+	 * Message: Thank you. %s. Now, I can pull the sled.
+	 */
+	public static final NpcStringId THANK_YOU_S_NOW_I_CAN_PULL_THE_SLED;
+	
+	/**
+	 * ID: 1900122<br>
+	 * Message: %s. Thank you for taking care of me all this time. I enjoyed it very much.
+	 */
+	public static final NpcStringId S_THANK_YOU_FOR_TAKING_CARE_OF_ME_ALL_THIS_TIME_I_ENJOYED_IT_VERY_MUCH;
+	
+	/**
+	 * ID: 1900123<br>
+	 * Message: %s. It won't be long now until it becomes time to pull the sled. It's too bad.
+	 */
+	public static final NpcStringId S_IT_WONT_BE_LONG_NOW_UNTIL_IT_BECOMES_TIME_TO_PULL_THE_SLED_ITS_TOO_BAD;
+	
+	/**
+	 * ID: 1900124<br>
+	 * Message: I must return to Santa now. Thank you for everything!
+	 */
+	public static final NpcStringId I_MUST_RETURN_TO_SANTA_NOW_THANK_YOU_FOR_EVERYTHING;
+	
+	/**
+	 * ID: 1900125<br>
+	 * Message: Hello. I'm a girl Rudolph. I was able to find my true self thanks to you.
+	 */
+	public static final NpcStringId HELLO_IM_A_GIRL_RUDOLPH_I_WAS_ABLE_TO_FIND_MY_TRUE_SELF_THANKS_TO_YOU;
+	
+	/**
+	 * ID: 1900126<br>
+	 * Message: This is my gift of thanks. Thank you for taking care of me~
+	 */
+	public static final NpcStringId THIS_IS_MY_GIFT_OF_THANKS_THANK_YOU_FOR_TAKING_CARE_OF_ME;
+	
+	/**
+	 * ID: 1900127<br>
+	 * Message: %s. I was always grateful.
+	 */
+	public static final NpcStringId S_I_WAS_ALWAYS_GRATEFUL;
+	
+	/**
+	 * ID: 1900128<br>
+	 * Message: I'm a little sad. It's time to leave now.
+	 */
+	public static final NpcStringId IM_A_LITTLE_SAD_ITS_TIME_TO_LEAVE_NOW;
+	
+	/**
+	 * ID: 1900129<br>
+	 * Message: %s. The time has come for me to return to my home.
+	 */
+	public static final NpcStringId S_THE_TIME_HAS_COME_FOR_ME_TO_RETURN_TO_MY_HOME;
+	
+	/**
+	 * ID: 1900130<br>
+	 * Message: %s. Thank you.
+	 */
+	public static final NpcStringId S_THANK_YOU;
+	
+	/**
+	 * ID: 1900131<br>
+	 * Message: Hahaha!!! I captured Santa Claus!! Huh? Where is this? Who are you?
+	 */
+	public static final NpcStringId HAHAHA_I_CAPTURED_SANTA_CLAUS_HUH_WHERE_IS_THIS_WHO_ARE_YOU;
+	
+	/**
+	 * ID: 1900132<br>
+	 * Message: ...I lost at Rock Paper Scissors and was taken captive... I might as well take out my anger on you! Huh~ What?
+	 */
+	public static final NpcStringId I_LOST_AT_ROCK_PAPER_SCISSORS_AND_WAS_TAKEN_CAPTIVE_I_MIGHT_AS_WELL_TAKE_OUT_MY_ANGER_ON_YOU_HUH_WHAT;
+	
+	/**
+	 * ID: 1900133<br>
+	 * Message: Nothing's working... I'm leaving! I'll definitely capture Santa again! Just you wait!
+	 */
+	public static final NpcStringId NOTHINGS_WORKING_IM_LEAVING_ILL_DEFINITELY_CAPTURE_SANTA_AGAIN_JUST_YOU_WAIT;
+	
+	/**
+	 * ID: 1900134<br>
+	 * Message: I must raise Rudolph quickly. This year's Christmas gifts have to be delivered...
+	 */
+	public static final NpcStringId I_MUST_RAISE_RUDOLPH_QUICKLY_THIS_YEARS_CHRISTMAS_GIFTS_HAVE_TO_BE_DELIVERED;
+	
+	/**
+	 * ID: 1900135<br>
+	 * Message: Merry Christmas~ Thanks to your efforts in raising Rudolph, the gift delivery was a success.
+	 */
+	public static final NpcStringId MERRY_CHRISTMAS_THANKS_TO_YOUR_EFFORTS_IN_RAISING_RUDOLPH_THE_GIFT_DELIVERY_WAS_A_SUCCESS;
+	
+	/**
+	 * ID: 1900136<br>
+	 * Message: In 10 minutes, it will be 1 hour since you started raising me.
+	 */
+	public static final NpcStringId IN_10_MINUTES_IT_WILL_BE_1_HOUR_SINCE_YOU_STARTED_RAISING_ME;
+	
+	/**
+	 * ID: 1900137<br>
+	 * Message: After 5 minutes, if my Full Feeling and Affection Level reach 99%, I can grow bigger.
+	 */
+	public static final NpcStringId AFTER_5_MINUTES_IF_MY_FULL_FEELING_AND_AFFECTION_LEVEL_REACH_99_I_CAN_GROW_BIGGER;
+	
+	/**
+	 * ID: 1900139<br>
+	 * Message: Lucky! I'm Lucky, the spirit that loves adena
+	 */
+	public static final NpcStringId LUCKY_IM_LUCKY_THE_SPIRIT_THAT_LOVES_ADENA;
+	
+	/**
+	 * ID: 1900140<br>
+	 * Message: Lucky! I want to eat adena. Give it to me!
+	 */
+	public static final NpcStringId LUCKY_I_WANT_TO_EAT_ADENA_GIVE_IT_TO_ME;
+	
+	/**
+	 * ID: 1900141<br>
+	 * Message: Lucky! If I eat too much adena, my wings disappear!
+	 */
+	public static final NpcStringId LUCKY_IF_I_EAT_TOO_MUCH_ADENA_MY_WINGS_DISAPPEAR;
+	
+	/**
+	 * ID: 1900142<br>
+	 * Message: Yummy. Thanks! Lucky!
+	 */
+	public static final NpcStringId YUMMY_THANKS_LUCKY;
+	
+	/**
+	 * ID: 1900143<br>
+	 * Message: Grrrr... Yuck!
+	 */
+	public static final NpcStringId GRRRR_YUCK;
+	
+	/**
+	 * ID: 1900144<br>
+	 * Message: Lucky! The adena is so yummy! I'm getting bigger!
+	 */
+	public static final NpcStringId LUCKY_THE_ADENA_IS_SO_YUMMY_IM_GETTING_BIGGER;
+	
+	/**
+	 * ID: 1900145<br>
+	 * Message: Lucky! No more adena? Oh... I'm so heavy!
+	 */
+	public static final NpcStringId LUCKY_NO_MORE_ADENA_OH_IM_SO_HEAVY;
+	
+	/**
+	 * ID: 1900146<br>
+	 * Message: Lucky! I'm full~ Thanks for the yummy adena! Oh... I'm so heavy!
+	 */
+	public static final NpcStringId LUCKY_IM_FULL_THANKS_FOR_THE_YUMMY_ADENA_OH_IM_SO_HEAVY;
+	
+	/**
+	 * ID: 1900147<br>
+	 * Message: Lucky! It wasn't enough adena. It's gotta be at least %s!
+	 */
+	public static final NpcStringId LUCKY_IT_WASNT_ENOUGH_ADENA_ITS_GOTTA_BE_AT_LEAST_S;
+	
+	/**
+	 * ID: 1900148<br>
+	 * Message: Oh! My wings disappeared! Are you gonna hit me? If you hit me, I'll throw up everything that I ate!
+	 */
+	public static final NpcStringId OH_MY_WINGS_DISAPPEARED_ARE_YOU_GONNA_HIT_ME_IF_YOU_HIT_ME_ILL_THROW_UP_EVERYTHING_THAT_I_ATE;
+	
+	/**
+	 * ID: 1900149<br>
+	 * Message: Oh! My wings... Ack! Are you gonna hit me?! Scary, scary! If you hit me, something bad will happen!
+	 */
+	public static final NpcStringId OH_MY_WINGS_ACK_ARE_YOU_GONNA_HIT_ME_SCARY_SCARY_IF_YOU_HIT_ME_SOMETHING_BAD_WILL_HAPPEN;
+	
+	/**
+	 * ID: 1900150<br>
+	 * Message: The evil Land Dragon Antharas has been defeated!
+	 */
+	public static final NpcStringId THE_EVIL_LAND_DRAGON_ANTHARAS_HAS_BEEN_DEFEATED;
+	
+	/**
+	 * ID: 1900151<br>
+	 * Message: The evil Fire Dragon Valakas has been defeated!
+	 */
+	public static final NpcStringId THE_EVIL_FIRE_DRAGON_VALAKAS_HAS_BEEN_DEFEATED;
+	
+	/**
+	 * ID: 1900152<br>
+	 * Message: To serve him now means you will be able to escape a worse situation.
+	 */
+	public static final NpcStringId TO_SERVE_HIM_NOW_MEANS_YOU_WILL_BE_ABLE_TO_ESCAPE_A_WORSE_SITUATION;
+	
+	/**
+	 * ID: 1900153<br>
+	 * Message: Oh goddess of destruction, forgive us...
+	 */
+	public static final NpcStringId OH_GODDESS_OF_DESTRUCTION_FORGIVE_US;
+	
+	/**
+	 * ID: 1900154<br>
+	 * Message: When the sky turns blood red and the earth begins to crumble from the darkness she will return.
+	 */
+	public static final NpcStringId WHEN_THE_SKY_TURNS_BLOOD_RED_AND_THE_EARTH_BEGINS_TO_CRUMBLE_FROM_THE_DARKNESS_SHE_WILL_RETURN;
+	
+	/**
+	 * ID: 1900155<br>
+	 * Message: Earth energy is gathering near Antharas's legs.
+	 */
+	public static final NpcStringId EARTH_ENERGY_IS_GATHERING_NEAR_ANTHARASS_LEGS;
+	
+	/**
+	 * ID: 1900156<br>
+	 * Message: Antharas starts to absorb the earth energy.
+	 */
+	public static final NpcStringId ANTHARAS_STARTS_TO_ABSORB_THE_EARTH_ENERGY;
+	
+	/**
+	 * ID: 1900157<br>
+	 * Message: Antharas raises its thick tail.
+	 */
+	public static final NpcStringId ANTHARAS_RAISES_ITS_THICK_TAIL;
+	
+	/**
+	 * ID: 1900158<br>
+	 * Message: You are overcome by the strength of Antharas.
+	 */
+	public static final NpcStringId YOU_ARE_OVERCOME_BY_THE_STRENGTH_OF_ANTHARAS;
+	
+	/**
+	 * ID: 1900159<br>
+	 * Message: Antharas's eyes are filled with rage.
+	 */
+	public static final NpcStringId ANTHARASS_EYES_ARE_FILLED_WITH_RAGE;
+	
+	/**
+	 * ID: 1900160<br>
+	 * Message: $s1, I can feel their presence from you.
+	 */
+	public static final NpcStringId S1_I_CAN_FEEL_THEIR_PRESENCE_FROM_YOU;
+	
+	/**
+	 * ID: 1900161<br>
+	 * Message: $s1, brethren, come to my side and follow me.
+	 */
+	public static final NpcStringId S1_BRETHREN_COME_TO_MY_SIDE_AND_FOLLOW_ME;
+	
+	/**
+	 * ID: 1900162<br>
+	 * Message: Antharas roars.
+	 */
+	public static final NpcStringId ANTHARAS_ROARS;
+	
+	/**
+	 * ID: 1900163<br>
+	 * Message: Flame energy is being directed towards Valakas.
+	 */
+	public static final NpcStringId FLAME_ENERGY_IS_BEING_DIRECTED_TOWARDS_VALAKAS;
+	
+	/**
+	 * ID: 1900164<br>
+	 * Message: You are overcome by the strength of Valakas.
+	 */
+	public static final NpcStringId YOU_ARE_OVERCOME_BY_THE_STRENGTH_OF_VALAKAS;
+	
+	/**
+	 * ID: 1900165<br>
+	 * Message: Valakas's tail flails dangerously.
+	 */
+	public static final NpcStringId VALAKASS_TAIL_FLAILS_DANGEROUSLY;
+	
+	/**
+	 * ID: 1900166<br>
+	 * Message: Valakas raises its tail.
+	 */
+	public static final NpcStringId VALAKAS_RAISES_ITS_TAIL;
+	
+	/**
+	 * ID: 1900167<br>
+	 * Message: Valakas starts to absorb the flame energy.
+	 */
+	public static final NpcStringId VALAKAS_STARTS_TO_ABSORB_THE_FLAME_ENERGY;
+	
+	/**
+	 * ID: 1900168<br>
+	 * Message: Valakas looks to its left.
+	 */
+	public static final NpcStringId VALAKAS_LOOKS_TO_ITS_LEFT;
+	
+	/**
+	 * ID: 1900169<br>
+	 * Message: Valakas looks to its right.
+	 */
+	public static final NpcStringId VALAKAS_LOOKS_TO_ITS_RIGHT;
+	
+	/**
+	 * ID: 1900170<br>
+	 * Message: By my authority, I command you, creature, turn to dust.
+	 */
+	public static final NpcStringId BY_MY_AUTHORITY_I_COMMAND_YOU_CREATURE_TURN_TO_DUST;
+	
+	/**
+	 * ID: 1900171<br>
+	 * Message: By my wrath, I command you, creature, lose your mind.
+	 */
+	public static final NpcStringId BY_MY_WRATH_I_COMMAND_YOU_CREATURE_LOSE_YOUR_MIND;
+	
+	/**
+	 * ID: 1900172<br>
+	 * Message: Show respect to the heroes who defeated the evil dragon and protected this Aden world!
+	 */
+	public static final NpcStringId SHOW_RESPECT_TO_THE_HEROES_WHO_DEFEATED_THE_EVIL_DRAGON_AND_PROTECTED_THIS_ADEN_WORLD;
+	
+	/**
+	 * ID: 1900173<br>
+	 * Message: Shout to celebrate the victory of the heroes!
+	 */
+	public static final NpcStringId SHOUT_TO_CELEBRATE_THE_VICTORY_OF_THE_HEROES;
+	
+	/**
+	 * ID: 1900174<br>
+	 * Message: Praise the achievement of the heroes and receive Nevit's blessing!
+	 */
+	public static final NpcStringId PRAISE_THE_ACHIEVEMENT_OF_THE_HEROES_AND_RECEIVE_NEVITS_BLESSING;
+	
+	/**
+	 * ID: 1900175<br>
+	 * Message: Ugh I think this is it for me!
+	 */
+	public static final NpcStringId UGH_I_THINK_THIS_IS_IT_FOR_ME;
+	
+	/**
+	 * ID: 1900176<br>
+	 * Message: Valakas calls forth the servitor's master.
+	 */
+	public static final NpcStringId VALAKAS_CALLS_FORTH_THE_SERVITORS_MASTER;
+	
+	/**
+	 * ID: 1911111<br>
+	 * Message: You will soon become the sacrifice for us, those full of deceit and sin whom you despise!
+	 */
+	public static final NpcStringId YOU_WILL_SOON_BECOME_THE_SACRIFICE_FOR_US_THOSE_FULL_OF_DECEIT_AND_SIN_WHOM_YOU_DESPISE;
+	
+	/**
+	 * ID: 1911112<br>
+	 * Message: My brethren who are stronger than me will punish you. You will soon be covered in your own blood and crying in anguish!
+	 */
+	public static final NpcStringId MY_BRETHREN_WHO_ARE_STRONGER_THAN_ME_WILL_PUNISH_YOU_YOU_WILL_SOON_BE_COVERED_IN_YOUR_OWN_BLOOD_AND_CRYING_IN_ANGUISH;
+	
+	/**
+	 * ID: 1911113<br>
+	 * Message: How could I lose against these worthless creatures...?
+	 */
+	public static final NpcStringId HOW_COULD_I_LOSE_AGAINST_THESE_WORTHLESS_CREATURES;
+	
+	/**
+	 * ID: 1911114<br>
+	 * Message: Foolish creatures... the flames of hell are drawing closer.
+	 */
+	public static final NpcStringId FOOLISH_CREATURES_THE_FLAMES_OF_HELL_ARE_DRAWING_CLOSER;
+	
+	/**
+	 * ID: 1911115<br>
+	 * Message: No matter how you struggle this place will soon be covered with your blood.
+	 */
+	public static final NpcStringId NO_MATTER_HOW_YOU_STRUGGLE_THIS_PLACE_WILL_SOON_BE_COVERED_WITH_YOUR_BLOOD;
+	
+	/**
+	 * ID: 1911116<br>
+	 * Message: Those who set foot in this place shall not leave alive.
+	 */
+	public static final NpcStringId THOSE_WHO_SET_FOOT_IN_THIS_PLACE_SHALL_NOT_LEAVE_ALIVE;
+	
+	/**
+	 * ID: 1911117<br>
+	 * Message: Worthless creatures, I will grant you eternal sleep in fire and brimstone.
+	 */
+	public static final NpcStringId WORTHLESS_CREATURES_I_WILL_GRANT_YOU_ETERNAL_SLEEP_IN_FIRE_AND_BRIMSTONE;
+	
+	/**
+	 * ID: 1911118<br>
+	 * Message: If you wish to see hell, I will grant you your wish.
+	 */
+	public static final NpcStringId IF_YOU_WISH_TO_SEE_HELL_I_WILL_GRANT_YOU_YOUR_WISH;
+	
+	/**
+	 * ID: 1911119<br>
+	 * Message: Elapsed Time :
+	 */
+	public static final NpcStringId ELAPSED_TIME;
+	
+	/**
+	 * ID: 1911120<br>
+	 * Message: Time Remaining :
+	 */
+	public static final NpcStringId TIME_REMAINING;
+	
+	/**
+	 * ID: 10004431<br>
+	 * Message: It teleports the guard members of the Aden Imperial Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_ADEN_IMPERIAL_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004432<br>
+	 * Message: It teleports the guard members of the Gludio Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_GLUDIO_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004433<br>
+	 * Message: It teleports the guard members of the Dion Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_DION_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004434<br>
+	 * Message: It teleports the guard members of the Giran Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_GIRAN_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004436<br>
+	 * Message: It teleports the guard members of the Aden Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_ADEN_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004437<br>
+	 * Message: It teleports the guard members of the Innadril Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_INNADRIL_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004438<br>
+	 * Message: It teleports the guard members of the Goddard Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_GODDARD_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004439<br>
+	 * Message: It teleports the guard members of the Rune Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_RUNE_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004440<br>
+	 * Message: It teleports the guard members of the Schuttgart Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_SCHUTTGART_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * ID: 10004441<br>
+	 * Message: It teleports the guard members of the Elmore Imperial Castle to the inside of the castle.
+	 */
+	public static final NpcStringId IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_ELMORE_IMPERIAL_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE;
+	
+	/**
+	 * Map containing all NpcStringId<br>
+	 */
+	private static final Map<Integer, NpcStringId> VALUES = new HashMap<>();
+	
+	static {
+		HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE = new NpcStringId(1);
+		S1_S2_S3_S4_S5_HEHEHE = new NpcStringId(2);
+		WITHDRAW_THE_FEE_FOR_THE_NEXT_TIME_AT_S1_S2_S4 = new NpcStringId(5);
+		STAGE = new NpcStringId(8);
+		STAGE_S1 = new NpcStringId(9);
+		S1 = new NpcStringId(10);
+		WHAT_DID_YOU_JUST_DO_TO_ME = new NpcStringId(2004);
+		ARE_YOU_TRYING_TO_TAME_ME_DONT_DO_THAT = new NpcStringId(2005);
+		DONT_GIVE_SUCH_A_THING_YOU_CAN_ENDANGER_YOURSELF = new NpcStringId(2006);
+		YUCK_WHAT_IS_THIS_IT_TASTES_TERRIBLE = new NpcStringId(2007);
+		IM_HUNGRY_GIVE_ME_A_LITTLE_MORE_PLEASE = new NpcStringId(2008);
+		WHAT_IS_THIS_IS_THIS_EDIBLE = new NpcStringId(2009);
+		DONT_WORRY_ABOUT_ME = new NpcStringId(2010);
+		THANK_YOU_THAT_WAS_DELICIOUS = new NpcStringId(2011);
+		I_THINK_I_AM_STARTING_TO_LIKE_YOU = new NpcStringId(2012);
+		EEEEEK_EEEEEK = new NpcStringId(2013);
+		DONT_KEEP_TRYING_TO_TAME_ME_I_DONT_WANT_TO_BE_TAMED = new NpcStringId(2014);
+		IT_IS_JUST_FOOD_TO_ME_ALTHOUGH_IT_MAY_ALSO_BE_YOUR_HAND = new NpcStringId(2015);
+		IF_I_KEEP_EATING_LIKE_THIS_WONT_I_BECOME_FAT_CHOMP_CHOMP = new NpcStringId(2016);
+		WHY_DO_YOU_KEEP_FEEDING_ME = new NpcStringId(2017);
+		DONT_TRUST_ME_IM_AFRAID_I_MAY_BETRAY_YOU_LATER = new NpcStringId(2018);
+		GRRRRR = new NpcStringId(2019);
+		YOU_BROUGHT_THIS_UPON_YOURSELF = new NpcStringId(2020);
+		I_FEEL_STRANGE_I_KEEP_HAVING_THESE_EVIL_THOUGHTS = new NpcStringId(2021);
+		ALAS_SO_THIS_IS_HOW_IT_ALL_ENDS = new NpcStringId(2022);
+		I_DONT_FEEL_SO_GOOD_OH_MY_MIND_IS_VERY_TROUBLED = new NpcStringId(2023);
+		S1_SO_WHAT_DO_YOU_THINK_IT_IS_LIKE_TO_BE_TAMED = new NpcStringId(2024);
+		S1_WHENEVER_I_SEE_SPICE_I_THINK_I_WILL_MISS_YOUR_HAND_THAT_USED_TO_FEED_IT_TO_ME = new NpcStringId(2025);
+		S1_DONT_GO_TO_THE_VILLAGE_I_DONT_HAVE_THE_STRENGTH_TO_FOLLOW_YOU = new NpcStringId(2026);
+		THANK_YOU_FOR_TRUSTING_ME_S1_I_HOPE_I_WILL_BE_HELPFUL_TO_YOU = new NpcStringId(2027);
+		S1_WILL_I_BE_ABLE_TO_HELP_YOU = new NpcStringId(2028);
+		I_GUESS_ITS_JUST_MY_ANIMAL_MAGNETISM = new NpcStringId(2029);
+		TOO_MUCH_SPICY_FOOD_MAKES_ME_SWEAT_LIKE_A_BEAST = new NpcStringId(2030);
+		ANIMALS_NEED_LOVE_TOO = new NpcStringId(2031);
+		WHATD_I_MISS_WHATD_I_MISS = new NpcStringId(2032);
+		I_JUST_KNOW_BEFORE_THIS_IS_OVER_IM_GONNA_NEED_A_LOT_OF_SERIOUS_THERAPY = new NpcStringId(2033);
+		I_SENSE_GREAT_WISDOM_IN_YOU_IM_AN_ANIMAL_AND_I_GOT_INSTINCTS = new NpcStringId(2034);
+		REMEMBER_IM_HERE_TO_HELP = new NpcStringId(2035);
+		ARE_WE_THERE_YET = new NpcStringId(2036);
+		THAT_REALLY_MADE_ME_FEEL_GOOD_TO_SEE_THAT = new NpcStringId(2037);
+		OH_NO_NO_NO_NOOOOO = new NpcStringId(2038);
+		WHO_AWOKE_ME = new NpcStringId(2150);
+		MY_MASTER_HAS_INSTRUCTED_ME_TO_BE_YOUR_GUIDE_S1 = new NpcStringId(2151);
+		PLEASE_CHECK_THIS_BOOKCASE_S1 = new NpcStringId(2152);
+		DID_YOU_CALL_ME_S1 = new NpcStringId(2250);
+		IM_CONFUSED_MAYBE_ITS_TIME_TO_GO_BACK = new NpcStringId(2251);
+		THAT_SIGN = new NpcStringId(2450);
+		THAT_BOX_WAS_SEALED_BY_MY_MASTER_S1_DONT_TOUCH_IT = new NpcStringId(2550);
+		YOUVE_ENDED_MY_IMMORTAL_LIFE_YOURE_PROTECTED_BY_THE_FEUDAL_LORD_ARENT_YOU = new NpcStringId(2551);
+		DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE = new NpcStringId(4151);
+		ACQUISITION_OF_SOULSHOT_FOR_BEGINNERS_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE = new NpcStringId(4152);
+		ACQUISITION_OF_WEAPON_EXCHANGE_COUPON_FOR_BEGINNERS_COMPLETE_N_GO_SPEAK_WITH_THE_NEWBIE_GUIDE = new NpcStringId(4153);
+		ACQUISITION_OF_RACE_SPECIFIC_WEAPON_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE = new NpcStringId(4154);
+		LAST_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE = new NpcStringId(4155);
+		S1_I_MUST_KILL_YOU_BLAME_YOUR_OWN_CURIOSITY = new NpcStringId(6051);
+		YOU_HAVE_GOOD_LUCK_I_SHALL_RETURN = new NpcStringId(6052);
+		YOU_ARE_STRONG_THIS_WAS_A_MISTAKE = new NpcStringId(6053);
+		WHO_ARE_YOU_TO_JOIN_IN_THE_BATTLE_HOW_UPSETTING = new NpcStringId(6054);
+		S1_DID_YOU_COME_TO_HELP_ME = new NpcStringId(6451);
+		DRATS_HOW_COULD_I_BE_SO_WRONG = new NpcStringId(6551);
+		S1_STEP_BACK_FROM_THE_CONFOUNDED_BOX_I_WILL_TAKE_IT_MYSELF = new NpcStringId(6552);
+		S1_I_WILL_BE_BACK_SOON_STAY_THERE_AND_DONT_YOU_DARE_WANDER_OFF = new NpcStringId(6553);
+		GRR_IVE_BEEN_HIT = new NpcStringId(6554);
+		GRR_WHO_ARE_YOU_AND_WHY_HAVE_YOU_STOPPED_ME = new NpcStringId(6555);
+		I_AM_LATE = new NpcStringId(6556);
+		GOOD_LUCK = new NpcStringId(6557);
+		S1_YOU_SEEK_THE_FORBIDDEN_KNOWLEDGE_AND_I_CANNOT_LET_YOU_HAVE_IT = new NpcStringId(6750);
+		IS_THIS_ALL_I_AM_ALLOWED_TO_HAVE = new NpcStringId(6751);
+		YOU_DEFEATED_ME_BUT_OUR_DOOM_APPROACHES = new NpcStringId(6752);
+		S1_WHO_ARE_YOU_WHY_ARE_YOU_BOTHERING_MY_MINIONS = new NpcStringId(6753);
+		BEEFCAKE = new NpcStringId(6754);
+		GRR_WHY_ARE_YOU_STICKING_YOUR_NOSE_IN_OUR_BUSINESS = new NpcStringId(6755);
+		FAREWELL_AND_WATCH_YOUR_BACK = new NpcStringId(6756);
+		KAMAEL_GOOD_TO_SEE_YOU_I_HAVE_SOMETHING_TO_ASK_YOU = new NpcStringId(6757);
+		S1_GO_GET_HIM = new NpcStringId(6758);
+		S1_WHAT_ARE_YOU_DOING_ATTACK_HIM = new NpcStringId(6759);
+		S1_IS_YOUR_FULL_POTENTIAL = new NpcStringId(6760);
+		THANKS_I_MUST_GO_AND_HUNT_DOWN_THOSE_THAT_OPPOSE_ME = new NpcStringId(6761);
+		YOU_ARE_SO_STUBBORN_I_MUST_FOLLOW_HIM_NOW = new NpcStringId(6762);
+		SEEK_ENLIGHTENMENT_FROM_THE_TABLET = new NpcStringId(6763);
+		ARROGANT_BEINGS_YOU_ARE_ALL_DOOMED = new NpcStringId(6764);
+		MY_TIME_IN_YOUR_WORLD_HAS_COME_TO_AN_END_CONSIDER_YOURSELVES_LUCKY = new NpcStringId(6765);
+		S1_HOW_DARE_YOU = new NpcStringId(6766);
+		S1_AHHAA_YOUR_GOD_FORSAKES_YOU = new NpcStringId(6767);
+		S1_YOUR_TIME_IS_UP_PREPARE_TO_DIE_A_HORRIBLE_DEATH = new NpcStringId(6851);
+		CONSIDER_YOURSELF_LUCKY_THE_NEXT_TIME_WE_MEET_YOU_WILL_DIE_PERMANENTLY = new NpcStringId(6852);
+		FARE_THEE_WELL_WE_SHALL_MEET_AGAIN = new NpcStringId(6853);
+		S1_WHO_ARE_YOU_AND_BETTER_YET_WHY_ARE_YOU_BOTHERING_MY_MINIONS = new NpcStringId(6854);
+		STRENGTH_BEYOND_STRENGTH = new NpcStringId(6855);
+		GRR_WHY_ARE_YOU_STICKING_YOUR_NOSE_WHERE_IT_DOESNT_BELONG = new NpcStringId(6856);
+		YOUVE_WON_FOR_NOW_BUT_WE_WILL_MEET_AGAIN = new NpcStringId(6857);
+		ARE_THEY_TIRED_OF_FOLLOWING_ME = new NpcStringId(6858);
+		S1_CAN_YOU_HELP_ME = new NpcStringId(6859);
+		IS_THAT_ALL_YOU_GOT_LITTLE_S1 = new NpcStringId(6860);
+		S1_WAKE_UP_FOOL_DONT_LET_HIM_GET_AWAY = new NpcStringId(6861);
+		THE_PATH_IS_CLEAR_BUT_BE_CAREFUL = new NpcStringId(6862);
+		I_MUST_FOLLOW_SOMEONE_NOW_SEE_YOU_AROUND = new NpcStringId(6863);
+		MAY_WE_MEET_AGAIN = new NpcStringId(6864);
+		CURSES_ON_THOSE_WHO_BLASPHEME_THE_GODS = new NpcStringId(6865);
+		EINHASAD_IS_CALLING_ME_YOU_ARE_LUCKY_AND_I_SHALL_CONTINUE_MY_PUNISHMENT_LATER = new NpcStringId(6866);
+		BY_THE_POWER_VESTED_IN_ME_BY_THE_GODS_YOU_S1_SHALL_DIE = new NpcStringId(6867);
+		S1_I_WILL_NOT_FORGET_YOU = new NpcStringId(6868);
+		S1_HOW_DARE_YOU_INTERFERE_YOU_SHALL_PAY_FOR_THIS = new NpcStringId(6950);
+		BELETH_IS_CALLING_ME_YOU_ARE_LUCKY_BUT_STILL_A_FOOL = new NpcStringId(6951);
+		I_SHALL_TAKE_MY_LEAVE_BUT_WILL_NEVER_SURRENDER = new NpcStringId(6952);
+		COWER_BEFORE_MY_AWESOME_AND_MIGHTY_POWER = new NpcStringId(6954);
+		GRR_CANT_YOU_FIND_SOMETHING_BETTER_TO_DO_WITH_YOUR_TIME = new NpcStringId(6955);
+		I_SHALL_TAKE_MY_LEAVE_BUT_YOUR_HEAD_WILL_BE_MINE_SOME_DAY_OH_YESYES_IT_WILL = new NpcStringId(6956);
+		MY_CHILDREN_ARE_STRONGER = new NpcStringId(6957);
+		S1_LETS_KILL_THEM_ALL = new NpcStringId(6958);
+		S1_COME_MY_CHILDREN = new NpcStringId(6959);
+		S1_MUSTER_YOUR_STRENGTH_PICK_THEM_OFF_LIKE_CHICKENS = new NpcStringId(6960);
+		THANK_YOU_MY_CHILDREN_SOMEDAY_WE_WILL_MEET_AGAIN = new NpcStringId(6961);
+		MY_CHILDREN_SEEK_MY_ENEMIES = new NpcStringId(6962);
+		MY_CHILDREN_I_GRANT_YOU_MY_BLESSINGS = new NpcStringId(6963);
+		YOU_WORTHLESS_BEINGS = new NpcStringId(6964);
+		MY_TIME_ON_THE_MATERIAL_PLANE_HAS_ENDED_YOU_ARE_LUCKY = new NpcStringId(6965);
+		S1_WORTHLESS_BEINGS_BEGONE = new NpcStringId(6966);
+		S1_YOU_ARE_THE_MEANING_OF_THE_WORD_DANGER = new NpcStringId(6967);
+		YOU_MADE_IT_HERE_S1_ILL_SHOW_MY_STRENGTH_DIE = new NpcStringId(7050);
+		HA_YOU_FAILED_ARE_YOU_READY_TO_QUIT = new NpcStringId(7051);
+		IM_THE_STRONGEST_I_LOST_EVERYTHING_TO_WIN = new NpcStringId(7052);
+		S1_ARE_YOU_DOING_THIS_BECAUSE_THEYRE_HALISHAS_MINIONS = new NpcStringId(7053);
+		MY_SPIRIT_IS_RELEASED_FROM_THIS_SHELL_IM_GETTING_CLOSE_TO_HALISHA = new NpcStringId(7054);
+		MIND_YOUR_OWN_BUSINESS = new NpcStringId(7055);
+		THIS_FIGHT_IS_A_WASTE_OF_TIME_GOODBYE = new NpcStringId(7056);
+		EVERY_CLOUD_HAS_A_SILVER_LINING_DONT_YOU_THINK = new NpcStringId(7057);
+		S1_DONT_LISTEN_TO_THIS_DEMON = new NpcStringId(7058);
+		S1_HESITATION_BETRAYS_YOUR_HEART_FIGHT = new NpcStringId(7059);
+		S1_ISNT_PROTECTING_SOMEBODY_WORTHY_ISNT_THAT_JUSTICE = new NpcStringId(7060);
+		I_HAVE_URGENT_BUSINESS_I_GOTTA_GO = new NpcStringId(7061);
+		ARE_MY_EFFORTS_IN_VAIN_IS_THIS_THE_END = new NpcStringId(7062);
+		GOODBYE_FRIEND_I_HOPE_TO_SEE_YOU_AGAIN = new NpcStringId(7063);
+		KNIGHTS_ARE_ALWAYS_FOOLISH = new NpcStringId(7064);
+		ILL_SHOW_MERCY_ON_YOU_FOR_NOW = new NpcStringId(7065);
+		S1_YOUR_JUSTICE_IS_JUST_HYPOCRISY_IF_YOU_GIVE_UP_ON_WHAT_YOUVE_PROMISED_TO_PROTECT = new NpcStringId(7066);
+		S1DONT_THINK_YOUVE_WON_YOUR_DARK_SHADOW_WILL_ALWAYS_FOLLOW_YOUHYPOCRITE = new NpcStringId(7067);
+		A_TEMPLE_KNIGHT_GUARDS_THE_MOTHER_TREE_S1_HAS_HUMAN_CONTACT_MADE_YOU_FORGET_THAT = new NpcStringId(7150);
+		I_MUST_STOP_REMEMBER_THE_ONES_YOURE_PROTECTING_WILL_SOMEDAY_DEFEAT_THE_ELVES = new NpcStringId(7151);
+		WHAT_THAT_WILL_JUST_STRENGTHEN_THE_ENEMY = new NpcStringId(7152);
+		YOU_DARE_TO_DISTURB_THE_ORDER_OF_THE_SHRINE_DIE_S1 = new NpcStringId(7153);
+		MY_SPIRIT_IS_RELEASING_FROM_THIS_SHELL_IM_GETTING_CLOSE_TO_HALISHA = new NpcStringId(7154);
+		THIS_IS_A_WASTE_OF_TIME_GOODBYE = new NpcStringId(7156);
+		IM_NOT_LIKE_MY_BROTHER_PANACEA_GHOST_OF_THE_PAST_BEGONE = new NpcStringId(7157);
+		THE_ELVES_NO_LONGER_RULE_HELP_ME_S1 = new NpcStringId(7158);
+		DONT_GIVE_UP_S1_HE_A_DEMON_FROM_THE_PAST = new NpcStringId(7159);
+		BE_PROUD_S1_WE_PROTECT_THIS_WORLD_TOGETHER = new NpcStringId(7160);
+		I_HAVE_TO_GO_IVE_GOT_SOME_BUSINESS_TO_TAKE_CARE_OF = new NpcStringId(7161);
+		UGH_DONT_LET_HIM_GET_AWAY = new NpcStringId(7162);
+		DONT_FORGET_YOUR_PRIDE_YOURE_PROTECTING_THE_WORLD = new NpcStringId(7163);
+		HA_HA_HA = new NpcStringId(7164);
+		KUH_HUH = new NpcStringId(7165);
+		AAH_KUHS1KUH_HUH = new NpcStringId(7166);
+		S1RE_MEM_UGHUH = new NpcStringId(7167);
+		S1_YOUD_BETTER_LISTEN = new NpcStringId(7250);
+		HUH_ITS_CURTAIN_TIME_I_WONT_GET_ANY_MONEY = new NpcStringId(7251);
+		UGHIT_CANT_BE = new NpcStringId(7252);
+		YOU_WONT_GET_AWAY_THIS_TIME_NARCISSUS = new NpcStringId(7257);
+		S1_HELP_ME = new NpcStringId(7258);
+		YOU_MUST_BE_AWARE_OF_YOUR_AUDIENCE_WHEN_SINGING_S_JOIN_US_S1_A_SONG_THAT_NOBODY_LISTENS_TO_IS_EMPTY = new NpcStringId(7259);
+		YOU_MUST_WORK_HARDER_TO_BE_VICTORIOUS_S1 = new NpcStringId(7260);
+		MY_SONG_IS_OVER_I_MUST_GO_GOODBYE = new NpcStringId(7261);
+		HOW_COULD_I_MISS = new NpcStringId(7262);
+		DONT_FORGET_SONG_COMES_WITH_HARMONY = new NpcStringId(7263);
+		SING_EVERYONE_WILL_LISTEN = new NpcStringId(7264);
+		YOU_DONT_DESERVE_MY_BLESSING = new NpcStringId(7265);
+		DO_YOU_REJECT_MY_BLESSING_S1 = new NpcStringId(7266);
+		BUT_WHY_S1_EVERYONE_WOULD_PRAISE_YOU = new NpcStringId(7267);
+		S1_ATTACK_ME_IM_IMMORTAL_IM_UNRIVALED = new NpcStringId(7350);
+		HA_IM_IMMORTAL_THIS_SCAR_WILL_SOON_HEAL_YOULL_DIE_NEXT_TIME = new NpcStringId(7351);
+		METELLUS_YOU_PROMISED_ME_AN_IMMORTAL_LIFE_HOW_COULD_I_SWORDMASTER_IRON_LOSE = new NpcStringId(7352);
+		FALLEN_ANGEL_ITS_WORTH_TRYING = new NpcStringId(7357);
+		HEY_S1_WHY_DONT_YOU_JOIN_ITS_YOUR_BEST_SHOT = new NpcStringId(7358);
+		ARE_YOU_INTERESTED_IN_IMMORTAL_LIFE_S1_ITS_TOO_BORING_FOR_ME = new NpcStringId(7359);
+		EXCELLENT_S1_SHOW_ME_WHAT_YOU_LEARNED_WHEN_YOUR_LIFE_WAS_ON_THE_LINE = new NpcStringId(7360);
+		I_HAVE_TO_GO_TAKE_A_BREAK = new NpcStringId(7361);
+		YOU_MISSED_WHAT_A_FOOL_YOU_ARE = new NpcStringId(7362);
+		FIGHTING_WITHOUT_RISK_TRAINING_WITHOUT_DANGER_AND_GROWING_WITHOUT_HARDSHIP_WILL_ONLY_LEAD_TO_AN_INFLATED_EGO_DONT_FORGET = new NpcStringId(7363);
+		DO_YOU_WANT_AN_IMMORTAL_LIFE = new NpcStringId(7364);
+		THINK_IT_OVER_AN_IMMORTAL_LIFE_AND_ASSURED_VICTORY = new NpcStringId(7365);
+		THATS_GOOD_S1_DO_YOU_WANT_MY_BLESSING_TO_IMPROVE_YOUR_SKILLS = new NpcStringId(7366);
+		S1_WHY_DO_YOU_REJECT_GUARANTEED_VICTORY = new NpcStringId(7367);
+		IN_THE_NAME_OF_GODS_I_PUNISH_YOU_S1_YOU_CANT_RIVAL_US_ALL_NO_MATTER_HOW_STRONG_YOU_THINK_YOU_ARE = new NpcStringId(7450);
+		I_HAVE_TO_STOP_FOR_NOW_BUT_ILL_DEFEAT_THE_POWER_OF_THE_DRAGON_YET = new NpcStringId(7451);
+		IT_ISTHE_POWER_THAT_SHOULDNT_LIVE = new NpcStringId(7452);
+		ISNT_IT_UNWISE_FOR_AN_ANGEL_TO_INTERFERE_IN_HUMAN_AFFAIRS = new NpcStringId(7457);
+		THIS_IS_TOUGH_S1_WOULD_YOU_HELP_ME = new NpcStringId(7458);
+		S1_HES_KEEPING_AN_EYE_ON_ALL_THOSE_IN_SUCCESSION_TO_THE_BLOOD_OF_DRAGONS_INCLUDING_YOU = new NpcStringId(7459);
+		ATTACK_THE_REAR_S1_IF_IM_KILLED_YOURE_NEXT = new NpcStringId(7460);
+		I_CANT_STAY_ANY_LONGER_THERE_ARE_TOO_MANY_EYES_ON_US_FAREWELL = new NpcStringId(7461);
+		GET_AWAY_YOURE_STILL_ALIVE_BUT = new NpcStringId(7462);
+		IF_WE_CANT_AVOID_THIS_FIGHT_WELL_NEED_GREAT_STRENGTH_ITS_THE_ONLY_WAY_TO_PEACE = new NpcStringId(7463);
+		WARLORD_YOULL_NEVER_LEARN_THE_TECHNIQUES_OF_THE_DRAGON = new NpcStringId(7464);
+		HEY_WHY_BOTHER_WITH_THIS_ISNT_IT_YOUR_MOTHERS_BUSINESS = new NpcStringId(7465);
+		S1_ARE_YOU_AGAINST_YOUR_MOTHERS_WISHES_YOURE_NOT_WORTHY_OF_THE_SECRETS_OF_SHILENS_CHILDREN = new NpcStringId(7466);
+		EXCELLENT_TECHNIQUE_S1_UNFORTUNATELY_YOURE_THE_ONE_DESTINED_FOR_TRAGEDY = new NpcStringId(7467);
+		S1_YOU_MAY_FOLLOW_ME_BUT_AN_ORC_IS_NO_MATCH_FOR_MY_GIANTS_STRENGTH = new NpcStringId(7550);
+		KUHMY_BODY_FAILSTHIS_IS_THE_END = new NpcStringId(7551);
+		HOW_COULD_I_LOSE_WITH_THE_POWERS_OF_A_GIANT_AARGH = new NpcStringId(7552);
+		THATS_THE_ENEMY = new NpcStringId(7557);
+		HMM_S1_WILL_YOU_JUST_STAND_THERE_DOING_NOTHING = new NpcStringId(7558);
+		S1_NOTHING_RISKED_NOTHING_GAINED_ONLY_THOSE_WHO_FIGHT_ENJOY_THE_SPOILS_OF_VICTORY = new NpcStringId(7559);
+		A_SWORD_ISNT_JEWELRY_S1_DONT_YOU_AGREE = new NpcStringId(7560);
+		WITH_NO_FIGHT_I_HAVE_NO_REASON_TO_STAY = new NpcStringId(7561);
+		MISS = new NpcStringId(7562);
+		PICK_YOUR_BATTLES_WISELY_OR_YOULL_REGRET_IT = new NpcStringId(7563);
+		WHAT_A_FOOL_TO_CHALLENGE_THE_GIANT_OF_THE_OROKA_TRIBE = new NpcStringId(7564);
+		RUNNING_LOW_ON_STEAM_I_MUST_WITHDRAW = new NpcStringId(7565);
+		S1_YOURE_THE_ONE_WHO_DEFEATED_GUARDIAN_MUHARK = new NpcStringId(7566);
+		S1_I_MUST_SUCCEED = new NpcStringId(7567);
+		S1_WOULD_YOU_FIGHT_URUZ_WHO_HAS_REACHED_THE_POWER_OF_AZIRA = new NpcStringId(7650);
+		I_CANT_HANDLE_THE_POWER_OF_AZIRA_YET_FIRST = new NpcStringId(7651);
+		THIS_CANT_BE_HAPPENING_I_HAVE_THE_POWER_OF_AZIRA_HOW_COULD_I_FALL_SO_EASILY = new NpcStringId(7652);
+		AZIRA_BORN_FROM_THE_EVIL_FLAME_ILL_KILL_YOU_WITH_MY_BARE_HANDS = new NpcStringId(7657);
+		S1_IN_THE_NAME_OF_KHAVATARI_HUBAI_STRIKE_THIS_EVIL_WITH_YOUR_FISTS = new NpcStringId(7658);
+		S1_ATTACK_FROM_BOTH_SIDES_HIT_HARD = new NpcStringId(7659);
+		S1_STRIKE_WITH_ALL_YOUR_HEART_IT_MUST_WORK = new NpcStringId(7660);
+		DAMN_ITS_TIME_TO_GO_UNTIL_NEXT_TIME = new NpcStringId(7661);
+		EVIL_SPIRIT_OF_FLAME_I_WONT_GIVE_UP = new NpcStringId(7662);
+		MY_FIST_WORKS_EVEN_ON_THE_EVIL_SPIRIT_DONT_FORGET = new NpcStringId(7663);
+		FOOLISH_KHAVATARIDO_YOU_THINK_YOUR_POWER_WILL_WORK_ON_ME_IM_THE_SOURCE_OF_YOUR_MARTIAL_ART = new NpcStringId(7664);
+		NO_MORE_GAMES = new NpcStringId(7665);
+		S1ARE_YOU_NEXT_AFTER_KHAVATARI_DO_YOU_KNOW_WHO_I_AM = new NpcStringId(7666);
+		S1KASHU_NOT_A_BAD_ATTACK_I_CANT_HOLD_ON_MUCH_LONGER = new NpcStringId(7667);
+		S1_AKKAN_YOU_CANT_BE_MY_RIVAL_ILL_KILL_EVERYTHING_ILL_BE_THE_KING = new NpcStringId(7750);
+		HA_ILL_SHOW_MERCY_ON_YOU_THIS_TIME_I_KNOW_WELL_OF_YOUR_TECHNIQUE = new NpcStringId(7751);
+		I_HAVE_IN_ME_THE_BLOOD_OF_A_KING_HOW_COULD_I_LOSE = new NpcStringId(7752);
+		ARE_YOUTYRANT = new NpcStringId(7757);
+		YOURE_NOT_A_KING_YOURE_JUST_A_TYRANT_S1_WE_MUST_FIGHT_TOGETHER = new NpcStringId(7758);
+		SUCH_RULE_IS_RUINING_THE_COUNTRY_S1_I_CANT_BEAR_THIS_TYRANNY_ANY_LONGER = new NpcStringId(7759);
+		S1_LEADERS_MUST_ALWAYS_RESIST_TYRANNY = new NpcStringId(7760);
+		I_STAYED_TOO_LONG_ILL_BE_PUNISHED_FOR_BEING_AWAY_SO_LONG = new NpcStringId(7761);
+		HE_GOT_AWAY_DAMMIT_WE_MUST_CATCH_THIS_DARK_SOUL = new NpcStringId(7762);
+		WHAT_IS_A_KING_WHAT_MUST_ONE_DO_TO_BE_A_GOOD_KING_THINK_IT_OVER = new NpcStringId(7763);
+		KNEEL_DOWN_BEFORE_ME_FOOLISH_PEOPLE = new NpcStringId(7764);
+		ITS_TIME_FOR_THE_KING_TO_LEAVE_BOW_YOUR_HEAD_AND_SAY_GOODBYE = new NpcStringId(7765);
+		S1_YOU_DARE_TO_FIGHT_ME_A_KINGS_POWER_MUST_BE_GREAT_TO_RULE = new NpcStringId(7766);
+		YOU_WOULD_FIGHT_THE_KING_S1_TRAITOR = new NpcStringId(7767);
+		TEJAKAR_SHARUHI_S1_ILL_SHOW_YOU_THE_POWER_OF_SHARUHI_MOUTH_MUDAHA = new NpcStringId(7850);
+		AAARGH_MY_SOUL_WONT_KEEP_QUIET_NOW_I_MUST_TAKE_MY_LEAVE = new NpcStringId(7851);
+		NO_SHARUHI_YOURE_SOUL_IS_MINE = new NpcStringId(7852);
+		TEJAKAR_OROCA_TEJAKAR_DUDA_MARA = new NpcStringId(7857);
+		S1_WE_MUST_FIGHT_THIS_SOUL_TOGETHER_TO_PREVENT_AN_EVERLASTING_WINTER = new NpcStringId(7858);
+		S1_THE_SOUL_RESPONDS_TO_YOU_MAY_YOUR_ATTACK_QUIET_HIM = new NpcStringId(7859);
+		S1_CALM_SHARUHI_HE_DOESNT_LISTEN_TO_ME_ANYMORE = new NpcStringId(7860);
+		ITS_TIME_TO_GO_MAY_THE_ETERNAL_FLAME_BLESS_YOU = new NpcStringId(7861);
+		HE_LEFTTHATS_TOO_BADTOO_BAD = new NpcStringId(7862);
+		DONT_FORGET_YOUR_STRONG_WILL_NOW = new NpcStringId(7863);
+		HA_NOBODY_WILL_RULE_OVER_ME_ANYMORE = new NpcStringId(7864);
+		FREEDOM_FREEDOM_FREEDOM = new NpcStringId(7865);
+		S1_YOU_RELEASED_ME_BUT_YOU_ALSO_WANT_TO_CATCH_ME_HA = new NpcStringId(7866);
+		S1MEALL_RIGHTILL_HELP_YOU = new NpcStringId(7867);
+		GET_OUT_OF_HERE_THIS_PLACE_IS_FORBIDDEN_BY_GOD = new NpcStringId(7950);
+		EINHASAD_IS_CALLING_ME = new NpcStringId(7951);
+		YOU_KILLED_ME_ARENT_YOU_AFRAID_OF_GODS_CURSE = new NpcStringId(7952);
+		YOU_BOTHER_MY_MINIONS_S1_DO_YOU_WANT_TO_DIE = new NpcStringId(7953);
+		WHAT_THE_HELL_I_LOST = new NpcStringId(7954);
+		WHO_ARE_YOU_WHY_ARE_YOU_INTERFERING_IN_OUR_BUSINESS = new NpcStringId(7955);
+		YOURE_STRONG_ILL_GET_YOU_NEXT_TIME = new NpcStringId(7956);
+		WE_MEET_AGAIN_ILL_HAVE_YOU_THIS_TIME = new NpcStringId(7957);
+		A_WORTHY_OPPONENT_S1_HELP_ME = new NpcStringId(7958);
+		S1_HURRY_BEFORE_HE_GETS_AWAY = new NpcStringId(7959);
+		ILL_KILL_YOU = new NpcStringId(7960);
+		WHY_DONT_YOU_FIGHT_ME_SOMEDAY = new NpcStringId(7961);
+		I_MISSED_AGAIN_DAMMIT = new NpcStringId(7962);
+		IM_SURE_WELL_MEET_AGAIN_SOMEDAY = new NpcStringId(7963);
+		CURSE_THOSE_WHO_DEFY_THE_GODS = new NpcStringId(7964);
+		YOU_WOULD_FIGHT_ME_A_MESSENGER_OF_THE_GODS = new NpcStringId(7966);
+		S1_I_WONT_FORGET_YOU = new NpcStringId(7967);
+		S1_HOW_COULD_YOU_DESECRATE_A_HOLY_PLACE = new NpcStringId(8050);
+		LEAVE_BEFORE_YOU_ARE_SEVERELY_PUNISHED = new NpcStringId(8051);
+		EINHASAD_DONT_GIVE_UP_ON_ME = new NpcStringId(8052);
+		S1_SO_YOURE_THE_ONE_WHOS_LOOKING_FOR_ME = new NpcStringId(8053);
+		A_MERE_MORTAL_HAS_DEFEATED_ME = new NpcStringId(8054);
+		HOW_COWARDLY_TO_INTRUDE_IN_OTHER_PEOPLES_BUSINESS = new NpcStringId(8055);
+		TIME_IS_UP = new NpcStringId(8056);
+		ILL_KILL_YOU_WITH_MY_SWORD = new NpcStringId(8057);
+		HELP_ME = new NpcStringId(8058);
+		DONT_MISS = new NpcStringId(8059);
+		KEEP_PUSHING = new NpcStringId(8060);
+		ILL_GET_HIM_YOULL_HAVE_YOUR_REVENGE = new NpcStringId(8061);
+		I_MISSED_HIM_AGAIN_ILL_KILL_YOU = new NpcStringId(8062);
+		I_MUST_FOLLOW_HIM = new NpcStringId(8063);
+		S1_YOU_SHOULD_LEAVE_IF_YOU_FEAR_GODS_WRATH = new NpcStringId(8150);
+		WHATS_GOING_ON = new NpcStringId(8151);
+		ILL_SEE_YOU_AGAIN = new NpcStringId(8152);
+		WHO_ARE_YOU_WHY_ARE_YOU_BOTHERING_MY_MINIONS = new NpcStringId(8153);
+		NO_WAY = new NpcStringId(8154);
+		WHY_ARE_YOU_STICKING_YOUR_NOSE_IN_OUR_BUSINESS = new NpcStringId(8155);
+		WHO_ARE_YOU_HOW_CAN_A_CREATURE_FROM_THE_NETHERWORLD_BE_SO_POWERFUL = new NpcStringId(8156);
+		IS_THIS_THE_END = new NpcStringId(8157);
+		SHOW_ME_WHAT_YOURE_MADE_OF_KILL_HIM = new NpcStringId(8158);
+		YOU_THINK_YOU_CAN_GET_HIM_WITH_THAT = new NpcStringId(8159);
+		PULL_YOURSELF_TOGETHER_HES_TRYING_TO_GET_AWAY = new NpcStringId(8160);
+		TELL_THE_BLACK_CAT_THAT_I_GOT_HIS_PAID_BACK = new NpcStringId(8161);
+		BLACK_CAT_HELL_BLAME_ME = new NpcStringId(8162);
+		I_GOTTA_GO_NOW = new NpcStringId(8163);
+		ILL_KILL_YOU_IN_THE_NAME_OF_GOD = new NpcStringId(8166);
+		S1_SEE_YOU_LATER = new NpcStringId(8167);
+		GET_OUT_BEFORE_YOURE_PUNISHED = new NpcStringId(8251);
+		EINHASAD_PLEASE_DONT_GIVE_UP_ON_ME = new NpcStringId(8252);
+		S1_ARE_YOU_LOOKING_FOR_ME = new NpcStringId(8253);
+		A_MERE_MORTAL_IS_KILLING_ME = new NpcStringId(8254);
+		MORTAL_DONT_YOU_RECOGNIZE_MY_GREATNESS = new NpcStringId(8256);
+		ILL_GET_YOU_THIS_TIME = new NpcStringId(8257);
+		ILL_NEVER_FORGET_THE_TASTE_OF_HIS_STEEL_S1_LETS_FIGHT_HIM_TOGETHER = new NpcStringId(8258);
+		S1_PULL_YOURSELF_TOGETHER_WELL_MISS_HIM = new NpcStringId(8259);
+		S1_HES_TRYING_TO_GET_AWAY = new NpcStringId(8260);
+		I_MISSED_AGAIN_NEXT_TIME = new NpcStringId(8261);
+		DAMMIT_FAILED_AGAIN = new NpcStringId(8262);
+		YOU_ARE_THE_ONE_WHOS_LOOKING_FOR_ME_S1 = new NpcStringId(8353);
+		A_MERE_MORTAL_HAS_KILLED_ME = new NpcStringId(8354);
+		WHO_ARE_YOU_THIS_IS_NONE_OF_YOUR_BUSINESS = new NpcStringId(8355);
+		S1_PULL_YOURSELF_TOGETHER = new NpcStringId(8359);
+		S1_HELL_GET_AWAY = new NpcStringId(8360);
+		EINHASAD_PLEASE_DONT_FORSAKE_ME = new NpcStringId(8452);
+		LOOKING_FOR_ME_S1 = new NpcStringId(8453);
+		S1_BISHOP_HOW_FOOLISH_TO_GO_AGAINST_THE_WILL_OF_GOD = new NpcStringId(8550);
+		YOUR_FAITH_IS_STRONGER_THAN_I_THOUGHT_ILL_PAY_YOU_BACK_NEXT_TIME = new NpcStringId(8551);
+		TANAKIA_FORGIVE_ME_I_COULDNT_FULFILL_YOUR_DREAM = new NpcStringId(8552);
+		S1_YOU_ARE_THE_WON_WHOS_BEEN_BOTHERING_MY_MINIONS = new NpcStringId(8553);
+		DAMN_YOUVE_BEATEN_ME = new NpcStringId(8554);
+		WHO_ARE_YOU_THIS_ISNT_YOUR_BUSINESS_COWARD = new NpcStringId(8555);
+		HOW_WEAK_ILL_FORGIVE_YOU_THIS_TIME_BECAUSE_YOU_MADE_ME_LAUGH = new NpcStringId(8556);
+		YOU_ARE_STRONGER_THAN_I_THOUGHT_BUT_IM_NO_WEAKLING = new NpcStringId(8557);
+		HES_GOT_A_TOUGH_SHELL_S1_LETS_FIGHT_TOGETHER_AND_CRACK_HIS_SKULL = new NpcStringId(8558);
+		S1_WE_WONT_BEAT_HIM_UNLESS_WE_GIVE_IT_OUR_ALL_COME_ON = new NpcStringId(8560);
+		ILL_FOLLOW_HIM = new NpcStringId(8561);
+		I_MISSED_AGAIN_HES_HARD_TO_FOLLOW = new NpcStringId(8562);
+		WELL_SEE_WHAT_THE_FUTURE_BRINGS = new NpcStringId(8563);
+		FOR_SHILEN = new NpcStringId(8564);
+		ILL_BE_BACK_ILL_DEAL_WITH_YOU_THEN = new NpcStringId(8565);
+		S1_ARE_YOU_GOING_TO_FIGHT_ME = new NpcStringId(8566);
+		S1_ILL_PAY_YOU_BACK_I_WONT_FORGET_YOU = new NpcStringId(8567);
+		S1_PROPHET_HOW_FOOLISH_TO_GO_AGAINST_THE_WILL_OF_GOD = new NpcStringId(8650);
+		YOUR_FAITH_IS_STRONGER_THAN_I_THOUGHT_ILL_DEAL_WITH_YOU_NEXT_TIME = new NpcStringId(8651);
+		ARE_YOU_THE_ONE_WHOS_BEEN_BOTHERING_MY_MINIONS_S1 = new NpcStringId(8653);
+		DAMN_I_CANT_BELIEVE_IVE_BEEN_BEATEN_BY_YOU = new NpcStringId(8654);
+		WHO_ARE_YOU_THIS_IS_NONE_OF_YOUR_BUSINESS_COWARD = new NpcStringId(8655);
+		ILL_DESTROY_THE_DARKNESS_SURROUNDING_THE_WORLD_WITH_THE_POWER_OF_LIGHT = new NpcStringId(8657);
+		S1_FIGHT_THE_FALLEN_ANGEL_WITH_ME_SHOW_THE_TRUE_POWER_OF_LIGHT = new NpcStringId(8658);
+		S1_GO_WE_MUST_STOP_FIGHTING_HERE = new NpcStringId(8659);
+		WE_MUSTNT_LOSE_S1_PULL_YOURSELF_TOGETHER = new NpcStringId(8660);
+		WELL_MEET_AGAIN_IF_FATE_WILLS_IT = new NpcStringId(8661);
+		ILL_FOLLOW_THE_COWARDLY_DEVIL = new NpcStringId(8662);
+		S1_ELDER_ITS_FOOLISH_OF_YOU_TO_GO_AGAINST_THE_WILL_OF_THE_GODS = new NpcStringId(8750);
+		YOURE_STRONGER_THAN_I_THOUGHT_BUT_IM_NO_WEAKLING_EITHER = new NpcStringId(8757);
+		S1_WELL_NEVER_WIN_UNLESS_WE_GIVE_IT_OUR_ALL_COME_ON = new NpcStringId(8760);
+		ARE_YOU_S1_OH_I_HAVE_THE_RESONANCE_AMULET = new NpcStringId(8850);
+		YOURE_FEISTIER_THAN_I_THOUGHT_ILL_QUIT_HERE_FOR_TODAY = new NpcStringId(8851);
+		AAARGH_I_CANT_BELIEVE_I_LOST = new NpcStringId(8852);
+		YIKES_YOURE_TOUGH = new NpcStringId(8854);
+		WHY_DO_YOU_INTERFERE_IN_OTHER_PEOPLES_BUSINESS = new NpcStringId(8855);
+		ILL_STOP_HERE_FOR_TODAY = new NpcStringId(8856);
+		I_WONT_MISS_YOU_THIS_TIME = new NpcStringId(8857);
+		DAMMIT_THIS_IS_TOO_HARD_BY_MYSELF_S1_GIVE_ME_A_HAND = new NpcStringId(8858);
+		S1_HURRY_UP_WELL_MISS_HIM = new NpcStringId(8859);
+		S1_COME_ON_HURRY_UP = new NpcStringId(8860);
+		I_GOTTA_GO_FOLLOW_HIM = new NpcStringId(8861);
+		HEY_QUIT_RUNNING_STOP = new NpcStringId(8862);
+		SEE_YOU_NEXT_TIME = new NpcStringId(8863);
+		WHAT_THINK_YOU_CAN_GET_IN_MY_WAY = new NpcStringId(8864);
+		YOU_ARE_SO_WEAK_I_GOTTA_GO_NOW = new NpcStringId(8865);
+		S1_GOOD_ILL_HELP_YOU = new NpcStringId(8866);
+		S1_YOURE_STRONGER_THAN_I_THOUGHT_SEE_YOU_NEXT_TIME = new NpcStringId(8867);
+		YOURE_FEISTIER_THAN_I_THOUGHT_ILL_STOP_HERE_TODAY = new NpcStringId(8951);
+		AARGH_I_CANT_BELIEVE_I_LOST = new NpcStringId(8952);
+		ILL_STOP_HERE_TODAY = new NpcStringId(8956);
+		DAMN_ITS_TOO_MUCH_BY_MYSELFS1_GIVE_ME_A_HAND = new NpcStringId(8958);
+		S1_HURRY_WELL_MISS_HIM = new NpcStringId(8959);
+		S1_HURRY_PLEASE = new NpcStringId(8960);
+		I_GOTTA_GO_FOLLOW_HIM_NOW = new NpcStringId(8961);
+		ARE_YOU_RUNNING_AWAY_STOP = new NpcStringId(8962);
+		DO_YOU_THINK_YOU_CAN_STOP_ME = new NpcStringId(8964);
+		YOURE_SO_WEAK_I_GOTTA_GO_NOW = new NpcStringId(8965);
+		YOURE_S1_GOOD_ILL_HELP_YOU = new NpcStringId(8966);
+		ARE_YOU_S1_OH_I_HAVE_A_RESONANCE_AMULET = new NpcStringId(9050);
+		HEY_YOURE_MORE_TENACIOUS_THAN_I_THOUGHT_ILL_STOP_HERE_TODAY = new NpcStringId(9051);
+		DAMMIT_I_CANT_DO_THIS_ALONE_S1_GIVE_ME_A_HAND = new NpcStringId(9058);
+		S1_HURRY_OR_WELL_MISS_HIM = new NpcStringId(9059);
+		S1_HURRY_UP = new NpcStringId(9060);
+		I_GOTTA_FOLLOW_HIM_NOW = new NpcStringId(9061);
+		HEY_ARE_YOU_RUNNING_STOP = new NpcStringId(9062);
+		OH_YOURE_S1_GOOD_ILL_HELP_YOU = new NpcStringId(9066);
+		YOU_CAROUSE_WITH_EVIL_SPIRITS_S1_YOURE_NOT_WORTHY_OF_THE_HOLY_WISDOM = new NpcStringId(9150);
+		YOURE_SO_STUBBORN_I_CANT_BOSS_YOU_AROUND_ANY_MORE_CAN_I = new NpcStringId(9151);
+		HOW_COULD_IT_HAPPEN_DEFEATED_BY_A_HUMAN = new NpcStringId(9152);
+		MY_MASTER_SENT_ME_HERE_ILL_GIVE_YOU_A_HAND = new NpcStringId(9157);
+		MEOW_MASTER_S1_HELP_ME = new NpcStringId(9158);
+		MASTER_S1_PUNISH_HIM_SO_HE_CANT_BOTHER_BELINDA = new NpcStringId(9159);
+		MASTER_S1_WELL_MISS_HIM = new NpcStringId(9160);
+		MEOW_MY_MASTER_IS_CALLING_MEOW_I_GOTTA_GO_NOW = new NpcStringId(9161);
+		MEOW_I_MISSED_HIM_MEOW = new NpcStringId(9162);
+		GOOD_LUCK_MEOW_I_GOTTA_GO_NOW = new NpcStringId(9163);
+		CURIOSITY_KILLED_THE_CAT_ILL_SHOW_YOU = new NpcStringId(9164);
+		THATS_ALL_FOR_TODAY = new NpcStringId(9165);
+		ARE_YOU_TRYING_TO_TAKE_BELINDA_FROM_ME_S1_ILL_SHOW_YOU = new NpcStringId(9166);
+		BELINDA_I_LOVE_YOU_YIKES = new NpcStringId(9167);
+		YOURE_STUBBORN_AS_A_MULE_GUESS_I_CANT_BOSS_YOU_AROUND_ANY_MORE = new NpcStringId(9251);
+		HOW_COULD_IT_BEDEFEATED_BY_AN_ELF = new NpcStringId(9252);
+		I_CAME_TO_HELP_YOU_ITS_THE_WILL_OF_RADYSS = new NpcStringId(9257);
+		S1_FIGHT_WITH_ME = new NpcStringId(9258);
+		S1_WE_MUST_DEFEAT_HIM = new NpcStringId(9259);
+		S1_THERES_NO_TIME_WE_MUST_DEFEAT_HIM = new NpcStringId(9260);
+		RADYSS_IS_CALLING_ME_I_GOTTA_GO_NOW = new NpcStringId(9261);
+		I_WAS_UNABLE_TO_AVENGE_MY_BROTHER = new NpcStringId(9262);
+		MAY_YOU_BE_BLESSED = new NpcStringId(9263);
+		THE_PROUD_REPENT_THE_FOOLISH_AWAKEN_SINNERS_DIE = new NpcStringId(9264);
+		HELLS_MASTER_IS_CALLING_ATONEMENT_WILL_HAVE_TO_WAIT = new NpcStringId(9265);
+		S1_ILL_REMEMBER_YOUR_NAME_HEATHEN = new NpcStringId(9266);
+		I_WONT_FORGET_THE_NAME_OF_ONE_WHO_DOESNT_OBEY_HOLY_JUDGMENT_S1 = new NpcStringId(9267);
+		YOURE_STUBBORN_AS_A_MULE_I_GUESS_I_CANT_BOSS_YOU_AROUND_ANY_MORE = new NpcStringId(9351);
+		COULD_IT_BE_DEFEATED_BY_A_DARK_ELF = new NpcStringId(9352);
+		SHADOW_SUMMONER_I_CAME_HERE_TO_HELP_YOU = new NpcStringId(9357);
+		SHADOW_SUMMONER_S1_FIGHT_WITH_ME = new NpcStringId(9358);
+		S1_YOULL_DIE_IF_YOU_DONT_KILL_HIM = new NpcStringId(9359);
+		HURRY_S1_DONT_MISS_HIM = new NpcStringId(9360);
+		I_CANT_HOLD_ON_ANY_LONGER = new NpcStringId(9361);
+		AFTER_ALL_THATI_MISSED_HIM = new NpcStringId(9362);
+		SHADOW_SUMMONER_MAY_YOU_BE_BLESSED = new NpcStringId(9363);
+		MY_MASTER_SENT_ME_HERE_TO_KILL_YOU = new NpcStringId(9364);
+		THE_SHADOW_IS_CALLING_ME = new NpcStringId(9365);
+		S1_YOU_WANT_TO_DIE_EARLY_ILL_SEND_YOU_TO_THE_DARKNESS = new NpcStringId(9366);
+		YOU_DEAL_IN_DARKNESS_S1_ILL_PAY_YOU_BACK = new NpcStringId(9367);
+		YOURE_S1_I_WONT_BE_LIKE_HINDEMITH = new NpcStringId(9450);
+		YOURE_FEISTIER_THAN_I_THOUGHT_ILL_STOP_HERE_FOR_TODAY = new NpcStringId(9451);
+		ARE_YOU_THE_ONE_WHO_IS_BOTHERING_MY_MINIONS_S1 = new NpcStringId(9453);
+		I_CANT_LET_YOU_COMMUNE_WITH_TABLET_OF_VISION_GIVE_ME_THE_RESONANCE_AMULET = new NpcStringId(9457);
+		S1_PLEASE_HURRY = new NpcStringId(9460);
+		I_MUST_FOLLOW_HIM_NOW = new NpcStringId(9461);
+		ARE_YOU_RUNNING_STOP = new NpcStringId(9462);
+		ARE_YOU_BETRAYING_ME_I_THOUGHT_SOMETHING_WAS_WRONGILL_STOP_HERE = new NpcStringId(9464);
+		YOURE_S1_EVEN_TWO_OF_YOU_CANT_STOP_ME = new NpcStringId(9466);
+		DAMMIT_MY_RESONANCE_AMULETS1_ILL_NEVER_FORGET_TO_PAY_YOU_BACK = new NpcStringId(9467);
+		ARE_YOU_S1_I_WONT_BE_LIKE_WALDSTEIN = new NpcStringId(9550);
+		YIKES_I_CANT_BELIEVE_I_LOST = new NpcStringId(9552);
+		ARE_YOU_THE_ONE_BOTHERING_MY_MINIONS_S1 = new NpcStringId(9553);
+		YOU_CANT_COMMUNE_WITH_THE_TABLET_OF_VISION_GIVE_ME_THE_RESONANCE_AMULET = new NpcStringId(9557);
+		DAMMIT_MY_RESONANCE_AMULETS1_ILL_NEVER_FORGET_THIS = new NpcStringId(9567);
+		YOURE_S1_ILL_KILL_YOU_FOR_HALLATE = new NpcStringId(9650);
+		YOURE_TOUGHER_THAN_I_THOUGHT_BUT_YOU_STILL_CANT_RIVAL_ME = new NpcStringId(9651);
+		HALLATE_FORGIVE_ME_I_CANT_HELP_YOU = new NpcStringId(9652);
+		DAMMIT_I_CANT_BELIEVE_YOU_BEAT_ME = new NpcStringId(9654);
+		WHO_ARE_YOU_MIND_YOUR_OWN_BUSINESS_COWARD = new NpcStringId(9655);
+		PURGATORY_LORD_I_WONT_FAIL_THIS_TIME = new NpcStringId(9657);
+		S1_NOWS_THE_TIME_TO_PUT_YOUR_TRAINING_TO_THE_TEST = new NpcStringId(9658);
+		S1_YOUR_SWORD_SKILLS_CANT_BE_THAT_BAD = new NpcStringId(9659);
+		S1_SHOW_YOUR_STRENGTH = new NpcStringId(9660);
+		I_HAVE_SOME_PRESSING_BUSINESS_I_HAVE_TO_GO = new NpcStringId(9661);
+		I_MISSED_HIM_DAMMIT = new NpcStringId(9662);
+		TRY_AGAIN_SOMETIME = new NpcStringId(9663);
+		ILL_KILL_ANYONE_WHO_GETS_IN_MY_WAY = new NpcStringId(9664);
+		THIS_IS_PATHETIC_YOU_MAKE_ME_LAUGH = new NpcStringId(9665);
+		S1_ARE_YOU_TRYING_TO_GET_IN_MY_WAY = new NpcStringId(9666);
+		S1_WHEN_I_COME_BACK_ILL_KILL_YOU = new NpcStringId(9667);
+		S1_WAKE_UP_TIME_TO_DIE = new NpcStringId(9750);
+		YOURE_TOUGHER_THAN_I_THOUGHT_ILL_BE_BACK = new NpcStringId(9751);
+		I_LOST_IT_CANT_BE = new NpcStringId(9752);
+		YOURE_A_CUNNING_FIEND_I_WONT_FAIL_AGAIN = new NpcStringId(9757);
+		S1_ITS_AFTER_YOU_FIGHT = new NpcStringId(9758);
+		S1_YOU_HAVE_TO_FIGHT_BETTER_THAN_THAT_IF_YOU_EXPECT_TO_SURVIVE = new NpcStringId(9759);
+		S1_PULL_YOURSELF_TOGETHER_FIGHT = new NpcStringId(9760);
+		ILL_CATCH_THE_CUNNING_FIEND = new NpcStringId(9761);
+		I_MISSED_HIM_AGAIN_HES_CLEVER = new NpcStringId(9762);
+		DONT_COWER_LIKE_A_PUPPY_NEXT_TIME = new NpcStringId(9763);
+		I_HAVE_ONLY_ONE_GOAL_GET_OUT_OF_MY_WAY = new NpcStringId(9764);
+		JUST_WAIT_YOULL_GET_YOURS = new NpcStringId(9765);
+		S1_YOURE_A_COWARD_ARENT_YOU = new NpcStringId(9766);
+		S1_ILL_KILL_YOU_NEXT_TIME = new NpcStringId(9767);
+		S1_HOW_FOOLISH_TO_ACT_AGAINST_THE_WILL_OF_GOD = new NpcStringId(9850);
+		YOUR_FAITH_IS_STRONGER_THAN_I_THOUGHT_ILL_GET_YOU_NEXT_TIME = new NpcStringId(9851);
+		WHO_ARE_YOU_MIND_YOUR_OWN_BUSINESS_YOU_COWARD = new NpcStringId(9855);
+		TANAKIA_YOUR_LIE_HAS_ALREADY_BEEN_EXPOSED = new NpcStringId(9857);
+		S1_HELP_ME_OVERCOME_THIS = new NpcStringId(9858);
+		S1_WE_CANT_DEFEAT_TANAKIA_THIS_WAY = new NpcStringId(9859);
+		S1_HERES_OUR_CHANCE_DONT_SQUANDER_THE_OPPORTUNITY = new NpcStringId(9860);
+		GOODBYE_WELL_MEET_AGAIN_IF_FATE_ALLOWS = new NpcStringId(9861);
+		ILL_FOLLOW_TANAKIA_TO_CORRECT_THIS_FALSEHOOD = new NpcStringId(9862);
+		ILL_BE_BACK_IF_FATE_ALLOWS = new NpcStringId(9863);
+		ILL_BE_BACK_YOULL_PAY = new NpcStringId(9865);
+		S1_ARE_YOU_TRYING_TO_SPOIL_MY_PLAN = new NpcStringId(9866);
+		S1_I_WONT_FORGET_YOU_YOULL_PAY = new NpcStringId(9867);
+		S1_YOU_HAVE_AN_AFFINITY_FOR_DANGEROUS_IDEAS_ARE_YOU_READY_TO_DIE = new NpcStringId(9950);
+		MY_TIME_IS_UP = new NpcStringId(9951);
+		I_CANT_BELIEVE_I_MUST_KNEEL_TO_A_HUMAN = new NpcStringId(9952);
+		MINERVIA_WHATS_THE_MATTER = new NpcStringId(9957);
+		THE_PRINCESS_IS_IN_DANGER_WHY_ARE_YOU_STARING = new NpcStringId(9958);
+		MASTER_S1_COME_ON_HURRY_UP = new NpcStringId(9959);
+		WE_CANT_FAIL_MASTER_S1_PULL_YOURSELF_TOGETHER = new NpcStringId(9960);
+		WHAT_AM_I_DOING_I_GOTTA_GO_GOODBYE = new NpcStringId(9961);
+		DAMMIT_I_MISSED = new NpcStringId(9962);
+		SORRY_BUT_I_MUST_SAY_GOODBYE_AGAIN_GOOD_LUCK_TO_YOU = new NpcStringId(9963);
+		I_CANT_YIELD_THE_SECRET_OF_THE_TABLET = new NpcStringId(9964);
+		ILL_STOP_HERE_FOR_NOW = new NpcStringId(9965);
+		S1_YOU_DARED_TO_LEAVE_SCAR_ON_MY_FACE_ILL_KILL_YOU = new NpcStringId(9966);
+		S1_I_WONT_FORGET_YOUR_NAMEHA = new NpcStringId(9967);
+		S1_YOU_HAVE_AN_AFFINITY_FOR_BAD_IDEAS_ARE_YOU_READY_TO_DIE = new NpcStringId(10050);
+		I_CANT_BELIEVE_I_MUST_KNEEL_BEFORE_A_HUMAN = new NpcStringId(10052);
+		YOU_THIEF_GIVE_ME_THE_RESONANCE_AMULET = new NpcStringId(10057);
+		UGH_S1_HELP_ME = new NpcStringId(10058);
+		S1_PLEASE_HELP_ME_TOGETHER_WE_CAN_BEAT_HIM = new NpcStringId(10059);
+		S1_ARE_YOU_GOING_TO_LET_A_GUILD_MEMBER_DIE = new NpcStringId(10060);
+		IM_SORRY_BUT_I_GOTTA_GO_FIRST = new NpcStringId(10061);
+		AAAAH_I_COULDNT_GET_THE_RESONANCE_AMULET = new NpcStringId(10062);
+		TAKE_CARE_I_GOTTA_GO_NOW = new NpcStringId(10063);
+		IM_SORRY_BUT_ITS_MY_JOB_TO_KILL_YOU_NOW = new NpcStringId(10064);
+		WHAT_A_WASTE_OF_TIME = new NpcStringId(10065);
+		S1_HOW_COULD_YOU_DO_THIS_ILL_KILL_YOU = new NpcStringId(10066);
+		S1_ILL_PAY_YOU_BACK = new NpcStringId(10067);
+		WHY_DONT_YOU_JUST_DIE = new NpcStringId(10068);
+		TASTE_THE_STING_OF_LEVEL_5_SPOIL = new NpcStringId(10069);
+		THE_ITEM_IS_ALREADY_INSIDE_YOU = new NpcStringId(10070);
+		THIS_POTION_YOURE_MAKING_ME_DRINK_IS_WORTH_ITS_WEIGHT_IN_GOLD = new NpcStringId(10071);
+		THIS_POTION_IS_PREPARED_FROM_THE_GROUND_GALL_OF_A_BEAR_BE_CAREFUL_IT_PACKS_QUITE_A_PUNCH = new NpcStringId(10072);
+		HOW_CAN_YOU_USE_A_POTION_ON_A_NEWBIE = new NpcStringId(10073);
+		LISTEN_TO_ME_S1_UNLESS_YOU_HAVE_PRIOR_AUTHORIZATION_YOU_CANT_CARRY_A_WEAPON_HERE = new NpcStringId(10074);
+		DEAR_S1_MAY_THE_BLESSINGS_OF_EINHASAD_BE_WITH_YOU_ALWAYS = new NpcStringId(10075);
+		DEAR_BROTHER_S1_FOLLOW_THE_PATH_OF_LIGHT_WITH_ME = new NpcStringId(10076);
+		S1_WHY_WOULD_YOU_CHOOSE_THE_PATH_OF_DARKNESS = new NpcStringId(10077);
+		S1_HOW_DARE_YOU_DEFY_THE_WILL_OF_EINHASAD = new NpcStringId(10078);
+		THE_DOOR_TO_THE_3RD_FLOOR_OF_THE_ALTAR_IS_NOW_OPEN = new NpcStringId(10079);
+		ELROKIAN_HUNTERS = new NpcStringId(11101);
+		YOU_S1_YOU_ATTACKED_WENDY_PREPARE_TO_DIE = new NpcStringId(11450);
+		S1_YOUR_ENEMY_WAS_DRIVEN_OUT_I_WILL_NOW_WITHDRAW_AND_AWAIT_YOUR_NEXT_COMMAND = new NpcStringId(11451);
+		THIS_ENEMY_IS_FAR_TOO_POWERFUL_FOR_ME_TO_FIGHT_I_MUST_WITHDRAW = new NpcStringId(11452);
+		THE_RADIO_SIGNAL_DETECTOR_IS_RESPONDING_A_SUSPICIOUS_PILE_OF_STONES_CATCHES_YOUR_EYE = new NpcStringId(11453);
+		THIS_LOOKS_LIKE_THE_RIGHT_PLACE = new NpcStringId(11550);
+		I_SEE_SOMEONE_IS_THIS_FATE = new NpcStringId(11551);
+		WE_MEET_AGAIN = new NpcStringId(11552);
+		DONT_BOTHER_TRYING_TO_FIND_OUT_MORE_ABOUT_ME_FOLLOW_YOUR_OWN_DESTINY = new NpcStringId(11553);
+		FALLEN_ANGEL_SELECT = new NpcStringId(14204);
+		_HOW_DARE_YOU_CHALLENGE_ME = new NpcStringId(15804);
+		THE_POWER_OF_LORD_BELETH_RULES_THE_WHOLE_WORLD = new NpcStringId(15805);
+		I_WILL_TASTE_YOUR_BLOOD = new NpcStringId(16404);
+		I_HAVE_FULFILLED_MY_CONTRACT_WITH_TRADER_CREAMEES = new NpcStringId(16405);
+		ILL_CAST_YOU_INTO_AN_ETERNAL_NIGHTMARE = new NpcStringId(17004);
+		SEND_MY_SOUL_TO_LICH_KING_ICARUS = new NpcStringId(17005);
+		YOU_SHOULD_CONSIDER_GOING_BACK = new NpcStringId(17151);
+		THE_VEILED_CREATOR = new NpcStringId(17951);
+		THE_CONSPIRACY_OF_THE_ANCIENT_RACE = new NpcStringId(17952);
+		CHAOS_AND_TIME = new NpcStringId(17953);
+		INTRUDER_ALERT_THE_ALARM_WILL_SELF_DESTRUCT_IN_2_MINUTES = new NpcStringId(18451);
+		THE_ALARM_WILL_SELF_DESTRUCT_IN_60_SECONDS_ENTER_PASSCODE_TO_OVERRIDE = new NpcStringId(18452);
+		THE_ALARM_WILL_SELF_DESTRUCT_IN_30_SECONDS_ENTER_PASSCODE_TO_OVERRIDE = new NpcStringId(18453);
+		THE_ALARM_WILL_SELF_DESTRUCT_IN_10_SECONDS_ENTER_PASSCODE_TO_OVERRIDE = new NpcStringId(18454);
+		RECORDER_CRUSHED = new NpcStringId(18455);
+		THE_ALARM_WILL_SELF_DESTRUCT_IN_60_SECONDS_PLEASE_EVACUATE_IMMEDIATELY = new NpcStringId(18552);
+		THE_ALARM_WILL_SELF_DESTRUCT_IN_30_SECONDS_PLEASE_EVACUATE_IMMEDIATELY = new NpcStringId(18553);
+		THE_ALARM_WILL_SELF_DESTRUCT_IN_10_SECONDS_PLEASE_EVACUATE_IMMEDIATELY = new NpcStringId(18554);
+		S1_YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM = new NpcStringId(19304);
+		NEXT_TIME_YOU_WILL_NOT_ESCAPE = new NpcStringId(19305);
+		S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU = new NpcStringId(19306);
+		INTRUDER_PROTECT_THE_PRIESTS_OF_DAWN = new NpcStringId(19504);
+		WHO_ARE_YOU_A_NEW_FACE_LIKE_YOU_CAN_T_APPROACH_THIS_PLACE = new NpcStringId(19505);
+		HOW_DARE_YOU_INTRUDE_WITH_THAT_TRANSFORMATION_GET_LOST = new NpcStringId(19506);
+		WHO_DARES_SUMMON_THE_MERCHANT_OF_MAMMON = new NpcStringId(19604);
+		THE_ANCIENT_PROMISE_TO_THE_EMPEROR_HAS_BEEN_FULFILLED = new NpcStringId(19605);
+		FOR_THE_ETERNITY_OF_EINHASAD = new NpcStringId(19606);
+		DEAR_SHILLIENS_OFFSPRINGS_YOU_ARE_NOT_CAPABLE_OF_CONFRONTING_US = new NpcStringId(19607);
+		ILL_SHOW_YOU_THE_REAL_POWER_OF_EINHASAD = new NpcStringId(19608);
+		DEAR_MILITARY_FORCE_OF_LIGHT_GO_DESTROY_THE_OFFSPRINGS_OF_SHILLIEN = new NpcStringId(19609);
+		EVERYTHING_IS_OWING_TO_S1_THANK_YOU = new NpcStringId(19610);
+		MY_POWERS_WEAKENING_HURRY_AND_TURN_ON_THE_SEALING_DEVICE = new NpcStringId(19611);
+		ALL_4_SEALING_DEVICES_MUST_BE_TURNED_ON = new NpcStringId(19612);
+		LILITHS_ATTACK_IS_GETTING_STRONGER_GO_AHEAD_AND_TURN_IT_ON = new NpcStringId(19613);
+		DEAR_S1_GIVE_ME_MORE_STRENGTH = new NpcStringId(19614);
+		YOU_SUCH_A_FOOL_THE_VICTORY_OVER_THIS_WAR_BELONGS_TO_SHILIEN = new NpcStringId(19615);
+		HOW_DARE_YOU_TRY_TO_CONTEND_AGAINST_ME_IN_STRENGTH_RIDICULOUS = new NpcStringId(19616);
+		ANAKIM_IN_THE_NAME_OF_GREAT_SHILIEN_I_WILL_CUT_YOUR_THROAT = new NpcStringId(19617);
+		YOU_CANNOT_BE_THE_MATCH_OF_LILITH_I_LL_TEACH_YOU_A_LESSON = new NpcStringId(19618);
+		I_MUST_GO_BACK_TO_SHILIEN_JUST_LIKE_THIS_OUTRAGEOUS = new NpcStringId(19619);
+		DEATH_TO_THE_ENEMIES_OF_THE_LORDS_OF_DAWN = new NpcStringId(19804);
+		WE_WILL_BE_WITH_YOU_ALWAYS = new NpcStringId(19805);
+		YOU_ARE_NOT_THE_OWNER_OF_THAT_ITEM = new NpcStringId(19806);
+		EMBRYO = new NpcStringId(19807);
+		KAMAEL_TUTORIAL = new NpcStringId(20901);
+		IS_IT_A_LACKEY_OF_KAKAI = new NpcStringId(22051);
+		TOO_LATE = new NpcStringId(22052);
+		HOW_REGRETFUL_UNJUST_DISHONOR = new NpcStringId(22055);
+		ILL_GET_REVENGE_SOMEDAY = new NpcStringId(22056);
+		INDIGNANT_AND_UNFAIR_DEATH = new NpcStringId(22057);
+		THE_CONCEALED_TRUTH_WILL_ALWAYS_BE_REVEALED = new NpcStringId(22719);
+		COWARDLY_GUY = new NpcStringId(22720);
+		I_AM_A_TREE_OF_NOTHING_A_TREE_THAT_KNOWS_WHERE_TO_RETURN = new NpcStringId(22819);
+		I_AM_A_CREATURE_THAT_SHOWS_THE_TRUTH_OF_THE_PLACE_DEEP_IN_MY_HEART = new NpcStringId(22820);
+		I_AM_A_MIRROR_OF_DARKNESS_A_VIRTUAL_IMAGE_OF_DARKNESS = new NpcStringId(22821);
+		I_ABSOLUTELY_CANNOT_GIVE_IT_TO_YOU_IT_IS_MY_PRECIOUS_JEWEL = new NpcStringId(22933);
+		ILL_TAKE_YOUR_LIVES_LATER = new NpcStringId(22934);
+		THAT_SWORD_IS_REALLY = new NpcStringId(22935);
+		NO_I_HAVENT_COMPLETELY_FINISHED_THE_COMMAND_FOR_DESTRUCTION_AND_SLAUGHTER_YET = new NpcStringId(22936);
+		HOW_DARE_YOU_WAKE_ME_NOW_YOU_SHALL_DIE = new NpcStringId(22937);
+		START_DUEL = new NpcStringId(23060);
+		RULE_VIOLATION = new NpcStringId(23061);
+		I_LOSE = new NpcStringId(23062);
+		WHHIISSHH = new NpcStringId(23063);
+		IM_SORRY_LORD = new NpcStringId(23065);
+		WHISH_FIGHT = new NpcStringId(23066);
+		LOST_SORRY_LORD = new NpcStringId(23068);
+		SO_SHALL_WE_START = new NpcStringId(23072);
+		UGH_I_LOST = new NpcStringId(23074);
+		ILL_WALK_ALL_OVER_YOU = new NpcStringId(23075);
+		UGH_CAN_THIS_BE_HAPPENING = new NpcStringId(23077);
+		ITS_THE_NATURAL_RESULT = new NpcStringId(23078);
+		HO_HO_I_WIN = new NpcStringId(23079);
+		I_WIN = new NpcStringId(23080);
+		WHISH_I_WON = new NpcStringId(23081);
+		WHO_DARES_TO_TRY_AND_STEAL_MY_NOBLE_BLOOD = new NpcStringId(23434);
+		S1_FINALLY_WE_MEET = new NpcStringId(23651);
+		HMM_WHERE_DID_MY_FRIEND_GO = new NpcStringId(23652);
+		BEST_OF_LUCK_WITH_YOUR_FUTURE_ENDEAVOURS = new NpcStringId(23653);
+		S1_DID_YOU_WAIT_FOR_LONG = new NpcStringId(23661);
+		DID_YOU_BRING_WHAT_I_ASKED_S1 = new NpcStringId(23671);
+		HMM_IS_SOMEONE_APPROACHING = new NpcStringId(23681);
+		GRAAAH_WERE_BEING_ATTACKED = new NpcStringId(23682);
+		IN_THAT_CASE_I_WISH_YOU_GOOD_LUCK = new NpcStringId(23683);
+		S1_HAS_EVERYTHING_BEEN_FOUND = new NpcStringId(23685);
+		SAFE_TRAVELS = new NpcStringId(23687);
+		REQUEST_FROM_THE_FARM_OWNER = new NpcStringId(25901);
+		WHY_DO_YOU_OPPRESS_US_SO = new NpcStringId(31603);
+		DONT_INTERRUPT_MY_REST_AGAIN = new NpcStringId(33409);
+		YOURE_A_GREAT_DEVIL_NOW = new NpcStringId(33410);
+		OH_ITS_NOT_AN_OPPONENT_OF_MINE_HA_HA_HA = new NpcStringId(33411);
+		OH_GREAT_DEMON_KING = new NpcStringId(33412);
+		REVENGE_IS_OVERLORD_RAMSEBALIUS_OF_THE_EVIL_WORLD = new NpcStringId(33413);
+		BONAPARTERIUS_ABYSS_KING_WILL_PUNISH_YOU = new NpcStringId(33414);
+		OK_EVERYBODY_PRAY_FERVENTLY = new NpcStringId(33415);
+		BOTH_HANDS_TO_HEAVEN_EVERYBODY_YELL_TOGETHER = new NpcStringId(33416);
+		ONE_TWO_MAY_YOUR_DREAMS_COME_TRUE = new NpcStringId(33417);
+		WHO_KILLED_MY_UNDERLING_DEVIL = new NpcStringId(33418);
+		I_WILL_MAKE_YOUR_LOVE_COME_TRUE_LOVE_LOVE_LOVE = new NpcStringId(33420);
+		I_HAVE_WISDOM_IN_ME_I_AM_THE_BOX_OF_WISDOM = new NpcStringId(33421);
+		OH_OH_OH = new NpcStringId(33422);
+		DO_YOU_WANT_US_TO_LOVE_YOU_OH = new NpcStringId(33423);
+		WHO_IS_CALLING_THE_LORD_OF_DARKNESS = new NpcStringId(33424);
+		I_AM_A_GREAT_EMPIRE_BONAPARTERIUS = new NpcStringId(33425);
+		LET_YOUR_HEAD_DOWN_BEFORE_THE_LORD = new NpcStringId(33426);
+		THE_SONG_OF_THE_HUNTER = new NpcStringId(33501);
+		WELL_TAKE_THE_PROPERTY_OF_THE_ANCIENT_EMPIRE = new NpcStringId(33511);
+		SHOW_ME_THE_PRETTY_SPARKLING_THINGS_THEYRE_ALL_MINE = new NpcStringId(33512);
+		PRETTY_GOOD = new NpcStringId(33513);
+		HA_THAT_WAS_FUN_IF_YOU_WISH_TO_FIND_THE_KEY_SEARCH_THE_CORPSE = new NpcStringId(34830);
+		I_HAVE_THE_KEY_WHY_DONT_YOU_COME_AND_TAKE_IT = new NpcStringId(34831);
+		YOU_FOOLS_WILL_GET_WHATS_COMING_TO_YOU = new NpcStringId(34832);
+		SORRY_ABOUT_THIS_BUT_I_MUST_KILL_YOU_NOW = new NpcStringId(34833);
+		YOU_GUYS_WOULDNT_KNOW_THE_SEVEN_SEALS_ARE_ARRRGH = new NpcStringId(34835);
+		I_SHALL_DRENCH_THIS_MOUNTAIN_WITH_YOUR_BLOOD = new NpcStringId(34836);
+		THAT_DOESNT_BELONG_TO_YOU_DONT_TOUCH_IT = new NpcStringId(34837);
+		GET_OUT_OF_MY_SIGHT_YOU_INFIDELS = new NpcStringId(34838);
+		WE_DONT_HAVE_ANY_FURTHER_BUSINESS_TO_DISCUSS_HAVE_YOU_SEARCHED_THE_CORPSE_FOR_THE_KEY = new NpcStringId(34839);
+		S1_HAS_EARNED_A_STAGE_S2_BLUE_SOUL_CRYSTAL = new NpcStringId(35051);
+		S1_HAS_EARNED_A_STAGE_S2_RED_SOUL_CRYSTAL = new NpcStringId(35052);
+		S1_HAS_EARNED_A_STAGE_S2_GREEN_SOUL_CRYSTAL = new NpcStringId(35053);
+		S1_HAS_EARNED_A_STAGE_S2_BLUE_CURSED_SOUL_CRYSTAL = new NpcStringId(35054);
+		S1_HAS_EARNED_A_STAGE_S2_RED_CURSED_SOUL_CRYSTAL = new NpcStringId(35055);
+		S1_HAS_EARNED_A_STAGE_S2_GREEN_CURSED_SOUL_CRYSTAL = new NpcStringId(35056);
+		SHRIEKS_OF_GHOSTS = new NpcStringId(37101);
+		SLOT_S1_S3 = new NpcStringId(38451);
+		YOU_CHILDISH_FOOL_DO_YOU_THINK_YOU_CAN_CATCH_ME = new NpcStringId(40306);
+		I_MUST_DO_SOMETHING_ABOUT_THIS_SHAMEFUL_INCIDENT = new NpcStringId(40307);
+		WHAT_DO_YOU_DARE_TO_CHALLENGE_ME = new NpcStringId(40308);
+		THE_RED_EYED_THIEVES_WILL_REVENGE = new NpcStringId(40309);
+		GO_AHEAD_YOU_CHILD = new NpcStringId(40310);
+		MY_FRIENDS_ARE_SURE_TO_REVENGE = new NpcStringId(40311);
+		YOU_RUTHLESS_FOOL_I_WILL_SHOW_YOU_WHAT_REAL_FIGHTING_IS_ALL_ABOUT = new NpcStringId(40312);
+		AHH_HOW_CAN_IT_END_LIKE_THIS_IT_IS_NOT_FAIR = new NpcStringId(40313);
+		THE_SACRED_FLAME_IS_OURS = new NpcStringId(40909);
+		ARRGHHWE_SHALL_NEVER_SURRENDER = new NpcStringId(40910);
+		AS_YOU_WISH_MASTER = new NpcStringId(40913);
+		MY_DEAR_FRIEND_OF_S1_WHO_HAS_GONE_ON_AHEAD_OF_ME = new NpcStringId(41651);
+		LISTEN_TO_TEJAKAR_GANDI_YOUNG_OROKA_THE_SPIRIT_OF_THE_SLAIN_LEOPARD_IS_CALLING_YOU_S1 = new NpcStringId(41652);
+		HEY_EVERYBODY_WATCH_THE_EGGS = new NpcStringId(42046);
+		I_THOUGHT_ID_CAUGHT_ONE_SHARE_WHEW = new NpcStringId(42047);
+		THE_STONE_THE_ELVEN_STONE_BROKE = new NpcStringId(42048);
+		IF_THE_EGGS_GET_TAKEN_WERE_DEAD = new NpcStringId(42049);
+		GIVE_ME_A_FAIRY_LEAF = new NpcStringId(42111);
+		WHY_DO_YOU_BOTHER_ME_AGAIN = new NpcStringId(42112);
+		HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_WIND = new NpcStringId(42113);
+		LEAVE_NOW_BEFORE_YOU_INCUR_THE_WRATH_OF_THE_GUARDIAN_GHOST = new NpcStringId(42114);
+		HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_A_STAR = new NpcStringId(42115);
+		HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_DUSK = new NpcStringId(42116);
+		HEY_YOUVE_ALREADY_DRUNK_THE_ESSENCE_OF_THE_ABYSS = new NpcStringId(42117);
+		WE_MUST_PROTECT_THE_FAIRY_TREE = new NpcStringId(42118);
+		GET_OUT_OF_THE_SACRED_TREE_YOU_SCOUNDRELS = new NpcStringId(42119);
+		DEATH_TO_THE_THIEVES_OF_THE_PURE_WATER_OF_THE_WORLD = new NpcStringId(42120);
+		HEY_IT_SEEMS_LIKE_YOU_NEED_MY_HELP_DOESNT_IT = new NpcStringId(42231);
+		ALMOST_GOT_IT_OUCH_STOP_DAMN_THESE_BLOODY_MANACLES = new NpcStringId(42232);
+		OH_THAT_SMARTS = new NpcStringId(42233);
+		HEY_MASTER_PAY_ATTENTION_IM_DYING_OVER_HERE = new NpcStringId(42234);
+		WHAT_HAVE_I_DONE_TO_DESERVE_THIS = new NpcStringId(42235);
+		OH_THIS_IS_JUST_GREAT_WHAT_ARE_YOU_GOING_TO_DO_NOW = new NpcStringId(42236);
+		YOU_INCONSIDERATE_MORON_CANT_YOU_EVEN_TAKE_CARE_OF_LITTLE_OLD_ME = new NpcStringId(42237);
+		OH_NO_THE_MAN_WHO_EATS_ONES_SINS_HAS_DIED_PENITENCE_IS_FURTHER_AWAY = new NpcStringId(42238);
+		USING_A_SPECIAL_SKILL_HERE_COULD_TRIGGER_A_BLOODBATH = new NpcStringId(42239);
+		HEY_WHAT_DO_YOU_EXPECT_OF_ME = new NpcStringId(42240);
+		UGGGGGH_PUSH_ITS_NOT_COMING_OUT = new NpcStringId(42241);
+		AH_I_MISSED_THE_MARK = new NpcStringId(42242);
+		YAWWWWN_ITS_SO_BORING_HERE_WE_SHOULD_GO_AND_FIND_SOME_ACTION = new NpcStringId(42243);
+		HEY_IF_YOU_CONTINUE_TO_WASTE_TIME_YOU_WILL_NEVER_FINISH_YOUR_PENANCE = new NpcStringId(42244);
+		I_KNOW_YOU_DONT_LIKE_ME_THE_FEELING_IS_MUTUAL = new NpcStringId(42245);
+		I_NEED_A_DRINK = new NpcStringId(42246);
+		OH_THIS_IS_DRAGGING_ON_TOO_LONG_AT_THIS_RATE_I_WONT_MAKE_IT_HOME_BEFORE_THE_SEVEN_SEALS_ARE_BROKEN = new NpcStringId(42247);
+		S1_RECEIVED_A_S2_ITEM_AS_A_REWARD_FROM_THE_SEPARATED_SOUL = new NpcStringId(45650);
+		SEALED_VORPAL_HELMET = new NpcStringId(45651);
+		SEALED_VORPAL_LEATHER_HELMET = new NpcStringId(45652);
+		SEALED_VORPAL_CIRCLET = new NpcStringId(45653);
+		SEALED_VORPAL_BREASTPLATE = new NpcStringId(45654);
+		SEALED_VORPAL_LEATHER_BREASTPLATE = new NpcStringId(45655);
+		SEALED_VORPAL_TUNIC = new NpcStringId(45656);
+		SEALED_VORPAL_GAITERS = new NpcStringId(45657);
+		SEALED_VORPAL_LEATHER_LEGGING = new NpcStringId(45658);
+		SEALED_VORPAL_STOCKING = new NpcStringId(45659);
+		SEALED_VORPAL_GAUNTLET = new NpcStringId(45660);
+		SEALED_VORPAL_LEATHER_GLOVES = new NpcStringId(45661);
+		SEALED_VORPAL_GLOVES = new NpcStringId(45662);
+		SEALED_VORPAL_BOOTS = new NpcStringId(45663);
+		SEALED_VORPAL_LEATHER_BOOTS = new NpcStringId(45664);
+		SEALED_VORPAL_SHOES = new NpcStringId(45665);
+		SEALED_VORPAL_SHIELD = new NpcStringId(45666);
+		SEALED_VORPAL_SIGIL = new NpcStringId(45667);
+		SEALED_VORPAL_RING = new NpcStringId(45668);
+		SEALED_VORPAL_EARRING = new NpcStringId(45669);
+		SEALED_VORPAL_NECKLACE = new NpcStringId(45670);
+		PERIEL_SWORD = new NpcStringId(45671);
+		SKULL_EDGE = new NpcStringId(45672);
+		VIGWIK_AXE = new NpcStringId(45673);
+		DEVILISH_MAUL = new NpcStringId(45674);
+		FEATHER_EYE_BLADE = new NpcStringId(45675);
+		OCTO_CLAW = new NpcStringId(45676);
+		DOUBLETOP_SPEAR = new NpcStringId(45677);
+		RISING_STAR = new NpcStringId(45678);
+		BLACK_VISAGE = new NpcStringId(45679);
+		VENIPLANT_SWORD = new NpcStringId(45680);
+		SKULL_CARNIUM_BOW = new NpcStringId(45681);
+		GEMTAIL_RAPIER = new NpcStringId(45682);
+		FINALE_BLADE = new NpcStringId(45683);
+		DOMINION_CROSSBOW = new NpcStringId(45684);
+		BLESSED_WEAPON_ENCHANT_SCROLL_S_GRADE = new NpcStringId(45685);
+		BLESSED_ARMOR_ENCHANT_SCROLL_S_GRADE = new NpcStringId(45686);
+		FIRE_CRYSTAL = new NpcStringId(45687);
+		WATER_CRYSTAL = new NpcStringId(45688);
+		EARTH_CRYSTAL = new NpcStringId(45689);
+		WIND_CRYSTAL = new NpcStringId(45690);
+		HOLY_CRYSTAL = new NpcStringId(45691);
+		DARK_CRYSTAL = new NpcStringId(45692);
+		WEAPON_ENCHANT_SCROLL_S_GRADE = new NpcStringId(45693);
+		ATT_ATTACK_S1_RO_ROGUE_S2 = new NpcStringId(46350);
+		BINGO = new NpcStringId(50110);
+		BLOOD_AND_HONOR = new NpcStringId(50338);
+		CURSE_OF_THE_GODS_ON_THE_ONE_THAT_DEFILES_THE_PROPERTY_OF_THE_EMPIRE = new NpcStringId(50339);
+		WAR_AND_DEATH = new NpcStringId(50340);
+		AMBITION_AND_POWER = new NpcStringId(50341);
+		S1_HAS_WON_THE_MAIN_EVENT_FOR_PLAYERS_UNDER_LEVEL_S2_AND_EARNED_S3_POINTS = new NpcStringId(50503);
+		S1_HAS_EARNED_S2_POINTS_IN_THE_MAIN_EVENT_FOR_UNLIMITED_LEVELS = new NpcStringId(50504);
+		INTO_THE_CHAOS = new NpcStringId(50701);
+		YOU_HAVE_SUCCESSFULLY_COMPLETED_A_CLAN_QUEST_S1_POINTS_HAVE_BEEN_ADDED_TO_YOUR_CLANS_REPUTATION_SCORE = new NpcStringId(50851);
+		THE_FURNACE_WILL_GO_OUT_WATCH_AND_SEE = new NpcStringId(60000);
+		THERES_ABOUT_1_MINUTE_LEFT = new NpcStringId(60001);
+		THERES_JUST_10_SECONDS_LEFT = new NpcStringId(60002);
+		NOW_LIGHT_THE_FURNACES_FIRE = new NpcStringId(60003);
+		TIME_IS_UP_AND_YOU_HAVE_FAILED_ANY_MORE_WILL_BE_DIFFICULT = new NpcStringId(60004);
+		OH_YOUVE_SUCCEEDED = new NpcStringId(60005);
+		AH_IS_THIS_FAILURE_BUT_IT_LOOKS_LIKE_I_CAN_KEEP_GOING = new NpcStringId(60006);
+		AH_IVE_FAILED_GOING_FURTHER_WILL_BE_DIFFICULT = new NpcStringId(60007);
+		FURNACE_OF_BALANCE = new NpcStringId(60008);
+		FURNACE_OF_PROTECTION = new NpcStringId(60009);
+		FURNACE_OF_WILL = new NpcStringId(60010);
+		FURNACE_OF_MAGIC = new NpcStringId(60011);
+		DIVINE_ENERGY_IS_BEGINNING_TO_ENCIRCLE = new NpcStringId(60012);
+		FOR_THE_GLORY_OF_SOLINA = new NpcStringId(60013);
+		PUNISH_ALL_THOSE_WHO_TREAD_FOOTSTEPS_IN_THIS_PLACE = new NpcStringId(60014);
+		WE_ARE_THE_SWORD_OF_TRUTH_THE_SWORD_OF_SOLINA = new NpcStringId(60015);
+		WE_RAISE_OUR_BLADES_FOR_THE_GLORY_OF_SOLINA = new NpcStringId(60016);
+		HEY_DONT_GO_SO_FAST = new NpcStringId(60018);
+		ITS_HARD_TO_FOLLOW = new NpcStringId(60019);
+		HUFF_HUFF_YOURE_TOO_FAST_I_CANT_FOLLOW_ANYMORE = new NpcStringId(60020);
+		AH_I_THINK_I_REMEMBER_THIS_PLACE = new NpcStringId(60021);
+		AH_FRESH_AIR = new NpcStringId(60022);
+		WHAT_WERE_YOU_DOING_HERE = new NpcStringId(60023);
+		I_GUESS_YOURE_THE_SILENT_TYPE_THEN_ARE_YOU_LOOKING_FOR_TREASURE_LIKE_ME = new NpcStringId(60024);
+		WHO_IS_CALLING_ME = new NpcStringId(60403);
+		CAN_LIGHT_EXIST_WITHOUT_DARKNESS = new NpcStringId(60404);
+		YOU_CANT_AVOID_THE_EYES_OF_UDAN = new NpcStringId(60903);
+		UDAN_HAS_ALREADY_SEEN_YOUR_FACE = new NpcStringId(60904);
+		THE_MAGICAL_POWER_OF_WATER_COMES_FROM_THE_POWER_OF_STORM_AND_HAIL_IF_YOU_DARE_TO_CONFRONT_IT_ONLY_DEATH_WILL_AWAIT_YOU = new NpcStringId(61050);
+		THE_POWER_OF_CONSTRAINT_IS_GETTING_WEAKER_YOUR_RITUAL_HAS_FAILED = new NpcStringId(61051);
+		YOU_CANT_AVOID_THE_EYES_OF_ASEFA = new NpcStringId(61503);
+		ASEFA_HAS_ALREADY_SEEN_YOUR_FACE = new NpcStringId(61504);
+		THE_MAGICAL_POWER_OF_FIRE_IS_ALSO_THE_POWER_OF_FLAMES_AND_LAVA_IF_YOU_DARE_TO_CONFRONT_IT_ONLY_DEATH_WILL_AWAIT_YOU = new NpcStringId(61650);
+		I_SMELL_SOMETHING_DELICIOUS = new NpcStringId(62503);
+		OOOH = new NpcStringId(62504);
+		AIDING_THE_FLORAN_VILLAGE = new NpcStringId(66001);
+		NO_SUCH_CARD = new NpcStringId(66300);
+		DEFEAT_THE_ELROKIAN_RAIDERS = new NpcStringId(68801);
+		HAVE_YOU_COMPLETED_YOUR_PREPARATIONS_TO_BECOME_A_LORD = new NpcStringId(70851);
+		S1_NOW_DEPART = new NpcStringId(70852);
+		GO_FIND_SAIUS = new NpcStringId(70853);
+		LISTEN_YOU_VILLAGERS_OUR_LIEGE_WHO_WILL_SOON_BECOME_A_LORD_HAS_DEFEATED_THE_HEADLESS_KNIGHT_YOU_CAN_NOW_REST_EASY = new NpcStringId(70854);
+		S1_DO_YOU_DARE_DEFY_MY_SUBORDINATES = new NpcStringId(70855);
+		DOES_MY_MISSION_TO_BLOCK_THE_SUPPLIES_END_HERE = new NpcStringId(70856);
+		S1_HAS_BECOME_LORD_OF_THE_TOWN_OF_GLUDIO_LONG_MAY_HE_REIGN = new NpcStringId(70859);
+		YOULL_SEE_I_WONT_FORGIVE_YOU_NEXT_TIME = new NpcStringId(70957);
+		S1_HAS_BECOME_LORD_OF_THE_TOWN_OF_DION_LONG_MAY_HE_REIGN = new NpcStringId(70959);
+		ITS_THE_ENEMY_NO_MERCY = new NpcStringId(71052);
+		WHAT_ARE_YOU_DOING_WE_ARE_STILL_SUPERIOR = new NpcStringId(71053);
+		HOW_INFURIATING_THIS_ENEMY = new NpcStringId(71054);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_GIRAN_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_GIRAN = new NpcStringId(71059);
+		MY_LIEGE_WHERE_ARE_YOU = new NpcStringId(71151);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_INNADRIL_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_INNADRIL = new NpcStringId(71159);
+		YOU_HAVE_FOUND_ALL_THE_NEBULITE_ORBS = new NpcStringId(71252);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_OREN_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_OREN = new NpcStringId(71259);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_ADEN_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_ADEN = new NpcStringId(71351);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_SCHUTTGART_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_SCHUTTGART = new NpcStringId(71459);
+		S1_I_WILL_REMEMBER_YOU = new NpcStringId(71551);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_GODDARD_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_GODDARD = new NpcStringId(71559);
+		FREDERICK_IS_LOOKING_FOR_YOU_MY_LIEGE = new NpcStringId(71653);
+		HO_HO_DID_YOU_THINK_YOU_COULD_REALLY_STOP_TRADING_WITH_US = new NpcStringId(71654);
+		YOU_HAVE_CHARGED_INTO_THE_TEMPLE = new NpcStringId(71655);
+		YOU_ARE_IN_THE_MIDST_OF_DEALING_WITH_THE_HERETIC_OF_HERETIC_TEMPLE = new NpcStringId(71656);
+		THE_HERETIC_TEMPLE_IS_DESCENDING_INTO_CHAOS = new NpcStringId(71657);
+		S1_HAS_BECOME_THE_LORD_OF_THE_TOWN_OF_RUNE_MAY_THERE_BE_GLORY_IN_THE_TERRITORY_OF_RUNE = new NpcStringId(71659);
+		S1_RAISE_YOUR_WEAPONS_FOR_THE_SAKE_OF_THE_TERRITORY = new NpcStringId(71751);
+		S1_THE_WAR_IS_OVER_LOWER_YOUR_SWORD_FOR_THE_SAKE_OF_THE_FUTURE = new NpcStringId(71752);
+		N91_TERRITORY_BADGES_450_SCORES_IN_INDIVIDUAL_FAME_AND_S2_ADENAS = new NpcStringId(71755);
+		THE_MERCENARY_QUEST_NUMBER_IS_S1_MEMOSTATE1_IS_S2_AND_MEMOSTATE2_IS_S3 = new NpcStringId(72903);
+		USER_CONNECTED_EVENT_OCCURRENCE_SUCCESS_SIEGE_ID_IS_S1_NUMBER_728_MEMO2_IS_S2_729_MEMO2_IS_S3_AND_255_MEMO1_IS_S4 = new NpcStringId(72904);
+		TERRITORY_CATAPULT_DYING_EVENT_CATAPULTS_TERRITORY_ID_S1_PARTY_STATUS_S2 = new NpcStringId(72905);
+		PROTECT_THE_CATAPULT_OF_GLUDIO = new NpcStringId(72951);
+		PROTECT_THE_CATAPULT_OF_DION = new NpcStringId(72952);
+		PROTECT_THE_CATAPULT_OF_GIRAN = new NpcStringId(72953);
+		PROTECT_THE_CATAPULT_OF_OREN = new NpcStringId(72954);
+		PROTECT_THE_CATAPULT_OF_ADEN = new NpcStringId(72955);
+		PROTECT_THE_CATAPULT_OF_INNADRIL = new NpcStringId(72956);
+		PROTECT_THE_CATAPULT_OF_GODDARD = new NpcStringId(72957);
+		PROTECT_THE_CATAPULT_OF_RUNE = new NpcStringId(72958);
+		PROTECT_THE_CATAPULT_OF_SCHUTTGART = new NpcStringId(72959);
+		THE_CATAPULT_OF_GLUDIO_HAS_BEEN_DESTROYED = new NpcStringId(72961);
+		THE_CATAPULT_OF_DION_HAS_BEEN_DESTROYED = new NpcStringId(72962);
+		THE_CATAPULT_OF_GIRAN_HAS_BEEN_DESTROYED = new NpcStringId(72963);
+		THE_CATAPULT_OF_OREN_HAS_BEEN_DESTROYED = new NpcStringId(72964);
+		THE_CATAPULT_OF_ADEN_HAS_BEEN_DESTROYED = new NpcStringId(72965);
+		THE_CATAPULT_OF_INNADRIL_HAS_BEEN_DESTROYED = new NpcStringId(72966);
+		THE_CATAPULT_OF_GODDARD_HAS_BEEN_DESTROYED = new NpcStringId(72967);
+		THE_CATAPULT_OF_RUNE_HAS_BEEN_DESTROYED = new NpcStringId(72968);
+		THE_CATAPULT_OF_SCHUTTGART_HAS_BEEN_DESTROYED = new NpcStringId(72969);
+		GLUDIO = new NpcStringId(72981);
+		DION = new NpcStringId(72982);
+		GIRAN = new NpcStringId(72983);
+		OREN = new NpcStringId(72984);
+		ADEN = new NpcStringId(72985);
+		INNADRIL = new NpcStringId(72986);
+		GODDARD = new NpcStringId(72987);
+		RUNE = new NpcStringId(72988);
+		SCHUTTGART = new NpcStringId(72989);
+		PROTECT_THE_SUPPLIES_SAFE_OF_GLUDIO = new NpcStringId(73051);
+		PROTECT_THE_SUPPLIES_SAFE_OF_DION = new NpcStringId(73052);
+		PROTECT_THE_SUPPLIES_SAFE_OF_GIRAN = new NpcStringId(73053);
+		PROTECT_THE_SUPPLIES_SAFE_OF_OREN = new NpcStringId(73054);
+		PROTECT_THE_SUPPLIES_SAFE_OF_ADEN = new NpcStringId(73055);
+		PROTECT_THE_SUPPLIES_SAFE_OF_INNADRIL = new NpcStringId(73056);
+		PROTECT_THE_SUPPLIES_SAFE_OF_GODDARD = new NpcStringId(73057);
+		PROTECT_THE_SUPPLIES_SAFE_OF_RUNE = new NpcStringId(73058);
+		PROTECT_THE_SUPPLIES_SAFE_OF_SCHUTTGART = new NpcStringId(73059);
+		THE_SUPPLIES_SAFE_OF_GLUDIO_HAS_BEEN_DESTROYED = new NpcStringId(73061);
+		THE_SUPPLIES_SAFE_OF_DION_HAS_BEEN_DESTROYED = new NpcStringId(73062);
+		THE_SUPPLIES_SAFE_OF_GIRAN_HAS_BEEN_DESTROYED = new NpcStringId(73063);
+		THE_SUPPLIES_SAFE_OF_OREN_HAS_BEEN_DESTROYED = new NpcStringId(73064);
+		THE_SUPPLIES_SAFE_OF_ADEN_HAS_BEEN_DESTROYED = new NpcStringId(73065);
+		THE_SUPPLIES_SAFE_OF_INNADRIL_HAS_BEEN_DESTROYED = new NpcStringId(73066);
+		THE_SUPPLIES_SAFE_OF_GODDARD_HAS_BEEN_DESTROYED = new NpcStringId(73067);
+		THE_SUPPLIES_SAFE_OF_RUNE_HAS_BEEN_DESTROYED = new NpcStringId(73068);
+		THE_SUPPLIES_SAFE_OF_SCHUTTGART_HAS_BEEN_DESTROYED = new NpcStringId(73069);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_GLUDIO = new NpcStringId(73151);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_DION = new NpcStringId(73152);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_GIRAN = new NpcStringId(73153);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_OREN = new NpcStringId(73154);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_ADEN = new NpcStringId(73155);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_INNADRIL = new NpcStringId(73156);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_GODDARD = new NpcStringId(73157);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_RUNE = new NpcStringId(73158);
+		PROTECT_THE_MILITARY_ASSOCIATION_LEADER_OF_SCHUTTGART = new NpcStringId(73159);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_GLUDIO_IS_DEAD = new NpcStringId(73161);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_DION_IS_DEAD = new NpcStringId(73162);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_GIRAN_IS_DEAD = new NpcStringId(73163);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_OREN_IS_DEAD = new NpcStringId(73164);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_ADEN_IS_DEAD = new NpcStringId(73165);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_INNADRIL_IS_DEAD = new NpcStringId(73166);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_GODDARD_IS_DEAD = new NpcStringId(73167);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_RUNE_IS_DEAD = new NpcStringId(73168);
+		THE_MILITARY_ASSOCIATION_LEADER_OF_SCHUTTGART_IS_DEAD = new NpcStringId(73169);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GLUDIO = new NpcStringId(73251);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_DION = new NpcStringId(73252);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GIRAN = new NpcStringId(73253);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_OREN = new NpcStringId(73254);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_ADEN = new NpcStringId(73255);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_INNADRIL = new NpcStringId(73256);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GODDARD = new NpcStringId(73257);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_RUNE = new NpcStringId(73258);
+		PROTECT_THE_RELIGIOUS_ASSOCIATION_LEADER_OF_SCHUTTGART = new NpcStringId(73259);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GLUDIO_IS_DEAD = new NpcStringId(73261);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_DION_IS_DEAD = new NpcStringId(73262);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GIRAN_IS_DEAD = new NpcStringId(73263);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_OREN_IS_DEAD = new NpcStringId(73264);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_ADEN_IS_DEAD = new NpcStringId(73265);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_INNADRIL_IS_DEAD = new NpcStringId(73266);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_GODDARD_IS_DEAD = new NpcStringId(73267);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_RUNE_IS_DEAD = new NpcStringId(73268);
+		THE_RELIGIOUS_ASSOCIATION_LEADER_OF_SCHUTTGART_IS_DEAD = new NpcStringId(73269);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_GLUDIO = new NpcStringId(73351);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_DION = new NpcStringId(73352);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_GIRAN = new NpcStringId(73353);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_OREN = new NpcStringId(73354);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_ADEN = new NpcStringId(73355);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_INNADRIL = new NpcStringId(73356);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_GODDARD = new NpcStringId(73357);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_RUNE = new NpcStringId(73358);
+		PROTECT_THE_ECONOMIC_ASSOCIATION_LEADER_OF_SCHUTTGART = new NpcStringId(73359);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_GLUDIO_IS_DEAD = new NpcStringId(73361);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_DION_IS_DEAD = new NpcStringId(73362);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_GIRAN_IS_DEAD = new NpcStringId(73363);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_OREN_IS_DEAD = new NpcStringId(73364);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_ADEN_IS_DEAD = new NpcStringId(73365);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_INNADRIL_IS_DEAD = new NpcStringId(73366);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_GODDARD_IS_DEAD = new NpcStringId(73367);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_RUNE_IS_DEAD = new NpcStringId(73368);
+		THE_ECONOMIC_ASSOCIATION_LEADER_OF_SCHUTTGART_IS_DEAD = new NpcStringId(73369);
+		DEFEAT_S1_ENEMY_KNIGHTS = new NpcStringId(73451);
+		YOU_HAVE_DEFEATED_S2_OF_S1_KNIGHTS = new NpcStringId(73461);
+		YOU_WEAKENED_THE_ENEMYS_DEFENSE = new NpcStringId(73462);
+		DEFEAT_S1_WARRIORS_AND_ROGUES = new NpcStringId(73551);
+		YOU_HAVE_DEFEATED_S2_OF_S1_WARRIORS_AND_ROGUES = new NpcStringId(73561);
+		YOU_WEAKENED_THE_ENEMYS_ATTACK = new NpcStringId(73562);
+		DEFEAT_S1_WIZARDS_AND_SUMMONERS = new NpcStringId(73651);
+		YOU_HAVE_DEFEATED_S2_OF_S1_ENEMIES = new NpcStringId(73661);
+		YOU_WEAKENED_THE_ENEMYS_MAGIC = new NpcStringId(73662);
+		DEFEAT_S1_HEALERS_AND_BUFFERS = new NpcStringId(73751);
+		YOU_HAVE_DEFEATED_S2_OF_S1_HEALERS_AND_BUFFERS = new NpcStringId(73761);
+		YOU_HAVE_WEAKENED_THE_ENEMYS_SUPPORT = new NpcStringId(73762);
+		DEFEAT_S1_WARSMITHS_AND_OVERLORDS = new NpcStringId(73851);
+		YOU_HAVE_DEFEATED_S2_OF_S1_WARSMITHS_AND_OVERLORDS = new NpcStringId(73861);
+		YOU_DESTROYED_THE_ENEMYS_PROFESSIONALS = new NpcStringId(73862);
+		TRA_LA_LA_TODAY_IM_GOING_TO_MAKE_ANOTHER_FUN_FILLED_TRIP_I_WONDER_WHAT_I_SHOULD_LOOK_FOR_THIS_TIME = new NpcStringId(99601);
+		WHATS_THIS_WHY_AM_I_BEING_DISTURBED = new NpcStringId(99700);
+		TA_DA_HERE_I_AM = new NpcStringId(99701);
+		WHAT_ARE_YOU_LOOKING_AT = new NpcStringId(99702);
+		IF_YOU_GIVE_ME_NECTAR_THIS_LITTLE_SQUASH_WILL_GROW_UP_QUICKLY = new NpcStringId(99703);
+		ARE_YOU_MY_MOMMY = new NpcStringId(99704);
+		FANCY_MEETING_YOU_HERE = new NpcStringId(99705);
+		ARE_YOU_AFRAID_OF_THE_BIG_BAD_SQUASH = new NpcStringId(99706);
+		IMPRESSIVE_ARENT_I = new NpcStringId(99707);
+		OBEY_ME = new NpcStringId(99708);
+		RAISE_ME_WELL_AND_YOULL_BE_REWARDED_NEGLECT_ME_AND_SUFFER_THE_CONSEQUENCES = new NpcStringId(99709);
+		TRANSFORM = new NpcStringId(99710);
+		I_FEEL_DIFFERENT = new NpcStringId(99711);
+		IM_BIGGER_NOW_BRING_IT_ON = new NpcStringId(99712);
+		IM_NOT_A_KID_ANYMORE = new NpcStringId(99713);
+		BIG_TIME = new NpcStringId(99714);
+		IM_ALL_GROWN_UP_NOW = new NpcStringId(99716);
+		IF_YOU_LET_ME_GO_ILL_BE_YOUR_BEST_FRIEND = new NpcStringId(99717);
+		IM_CHUCK_FULL_OF_GOODNESS = new NpcStringId(99718);
+		GOOD_JOB_NOW_WHAT_ARE_YOU_GOING_TO_DO = new NpcStringId(99719);
+		KEEP_IT_COMING = new NpcStringId(99720);
+		THATS_WHAT_IM_TALKING_ABOUT = new NpcStringId(99721);
+		MAY_I_HAVE_SOME_MORE = new NpcStringId(99722);
+		THAT_HIT_THE_SPOT = new NpcStringId(99723);
+		I_FEEL_SPECIAL = new NpcStringId(99724);
+		I_THINK_ITS_WORKING = new NpcStringId(99725);
+		YOU_DO_UNDERSTAND = new NpcStringId(99726);
+		YUCK_WHAT_IS_THIS_HA_HA_JUST_KIDDING = new NpcStringId(99727);
+		A_TOTAL_OF_FIVE_AND_ILL_BE_TWICE_AS_ALIVE = new NpcStringId(99728);
+		NECTAR_IS_SUBLIME = new NpcStringId(99729);
+		YOU_CALL_THAT_A_HIT = new NpcStringId(99730);
+		WHY_ARE_YOU_HITTING_ME_OUCH_STOP_IT_GIVE_ME_NECTAR = new NpcStringId(99731);
+		STOP_OR_ILL_WILT = new NpcStringId(99732);
+		IM_NOT_FULLY_GROWN_YET_OH_WELL_DO_WHAT_YOU_WILL_ILL_FADE_AWAY_WITHOUT_NECTAR_ANYWAY = new NpcStringId(99733);
+		GO_AHEAD_AND_HIT_ME_AGAIN_IT_WONT_DO_YOU_ANY_GOOD = new NpcStringId(99734);
+		WOE_IS_ME_IM_WILTING = new NpcStringId(99735);
+		IM_NOT_FULLY_GROWN_YET_HOW_ABOUT_SOME_NECTAR_TO_EASE_MY_PAIN = new NpcStringId(99736);
+		THE_END_IS_NEAR = new NpcStringId(99737);
+		PRETTY_PLEASE_WITH_SUGAR_ON_TOP_GIVE_ME_SOME_NECTAR = new NpcStringId(99738);
+		IF_I_DIE_WITHOUT_NECTAR_YOULL_GET_NOTHING = new NpcStringId(99739);
+		IM_FEELING_BETTER_ANOTHER_THIRTY_SECONDS_AND_ILL_BE_OUT_OF_HERE = new NpcStringId(99740);
+		TWENTY_SECONDS_AND_ITS_CIAO_BABY = new NpcStringId(99741);
+		WOOHOO_JUST_TEN_SECONDS_LEFT_NINE_EIGHT_SEVEN = new NpcStringId(99742);
+		GIVE_ME_NECTAR_OR_ILL_BE_GONE_IN_TWO_MINUTES = new NpcStringId(99743);
+		GIVE_ME_NECTAR_OR_ILL_BE_GONE_IN_ONE_MINUTE = new NpcStringId(99744);
+		SO_LONG_SUCKERS = new NpcStringId(99745);
+		IM_OUT_OF_HERE = new NpcStringId(99746);
+		I_MUST_BE_GOING_HAVE_FUN_EVERYBODY = new NpcStringId(99747);
+		TIME_IS_UP_PUT_YOUR_WEAPONS_DOWN = new NpcStringId(99748);
+		GOOD_FOR_ME_BAD_FOR_YOU = new NpcStringId(99749);
+		SOUNDTASTIC = new NpcStringId(99750);
+		I_CAN_SING_ALONG_IF_YOU_LIKE = new NpcStringId(99751);
+		I_THINK_YOU_NEED_SOME_BACKUP = new NpcStringId(99752);
+		KEEP_UP_THAT_RHYTHM_AND_YOULL_BE_A_STAR = new NpcStringId(99753);
+		MY_HEART_YEARNS_FOR_MORE_MUSIC = new NpcStringId(99754);
+		YOURE_OUT_OF_TUNE_AGAIN = new NpcStringId(99755);
+		THIS_IS_AWFUL = new NpcStringId(99756);
+		I_THINK_I_BROKE_SOMETHING = new NpcStringId(99757);
+		WHAT_A_LOVELY_MELODY_PLAY_IT_AGAIN = new NpcStringId(99758);
+		MUSIC_TO_MY_UH_EARS = new NpcStringId(99759);
+		YOU_NEED_MUSIC_LESSONS = new NpcStringId(99760);
+		I_CANT_HEAR_YOU = new NpcStringId(99761);
+		YOU_CANT_HURT_ME_LIKE_THAT = new NpcStringId(99762);
+		IM_STRONGER_THAN_YOU_ARE = new NpcStringId(99763);
+		NO_MUSIC_IM_OUT_OF_HERE = new NpcStringId(99764);
+		THAT_RACKET_IS_GETTING_ON_MY_NERVES_TONE_IT_DOWN_A_BIT = new NpcStringId(99765);
+		YOU_CAN_ONLY_HURT_ME_THROUGH_MUSIC = new NpcStringId(99766);
+		ONLY_MUSICAL_INSTRUMENTS_CAN_HURT_ME_NOTHING_ELSE = new NpcStringId(99767);
+		YOUR_SKILLS_ARE_IMPRESSIVE_BUT_SADLY_USELESS = new NpcStringId(99768);
+		CATCH_A_CHRONO_FOR_ME_PLEASE = new NpcStringId(99769);
+		YOU_GOT_ME = new NpcStringId(99770);
+		NOW_LOOK_AT_WHAT_YOUVE_DONE = new NpcStringId(99771);
+		YOU_WIN = new NpcStringId(99772);
+		SQUASHED = new NpcStringId(99773);
+		DONT_TELL_ANYONE = new NpcStringId(99774);
+		GROSS_MY_GUTS_ARE_COMING_OUT = new NpcStringId(99775);
+		TAKE_IT_AND_GO = new NpcStringId(99776);
+		I_SHOULDVE_LEFT_WHEN_I_COULD = new NpcStringId(99777);
+		NOW_LOOK_WHAT_YOU_HAVE_DONE = new NpcStringId(99778);
+		I_FEEL_DIRTY = new NpcStringId(99779);
+		BETTER_LUCK_NEXT_TIME = new NpcStringId(99780);
+		NICE_SHOT = new NpcStringId(99781);
+		IM_NOT_AFRAID_OF_YOU = new NpcStringId(99782);
+		IF_I_KNEW_THIS_WAS_GOING_TO_HAPPEN_I_WOULD_HAVE_STAYED_HOME = new NpcStringId(99783);
+		TRY_HARDER_OR_IM_OUT_OF_HERE = new NpcStringId(99784);
+		IM_TOUGHER_THAN_I_LOOK = new NpcStringId(99785);
+		GOOD_STRIKE = new NpcStringId(99786);
+		OH_MY_GOURD = new NpcStringId(99787);
+		THATS_ALL_YOUVE_GOT = new NpcStringId(99788);
+		WHY_ME = new NpcStringId(99789);
+		BRING_ME_NECTAR = new NpcStringId(99790);
+		I_MUST_HAVE_NECTAR_TO_GROW = new NpcStringId(99791);
+		GIVE_ME_SOME_NECTAR_QUICKLY_OR_YOULL_GET_NOTHING = new NpcStringId(99792);
+		PLEASE_GIVE_ME_SOME_NECTAR_IM_HUNGRY = new NpcStringId(99793);
+		NECTAR_PLEASE = new NpcStringId(99794);
+		NECTAR_WILL_MAKE_ME_GROW_QUICKLY = new NpcStringId(99795);
+		DONT_YOU_WANT_A_BIGGER_SQUASH_GIVE_ME_SOME_NECTAR_AND_ILL_GROW_MUCH_LARGER = new NpcStringId(99796);
+		IF_YOU_RAISE_ME_WELL_YOULL_GET_PRIZES_OR_NOT = new NpcStringId(99797);
+		YOU_ARE_HERE_FOR_THE_STUFF_EH_WELL_ITS_MINE_ALL_MINE = new NpcStringId(99798);
+		TRUST_ME_GIVE_ME_NECTAR_AND_ILL_BECOME_A_GIANT_SQUASH = new NpcStringId(99799);
+		THERES_NOTHING_YOU_CANT_SAY_I_CANT_LISTEN_TO_YOU_ANYMORE = new NpcStringId(528551);
+		YOU_ADVANCED_BRAVELY_BUT_GOT_SUCH_A_TINY_RESULT_HOHOHO = new NpcStringId(528651);
+		A_NON_PERMITTED_TARGET_HAS_BEEN_DISCOVERED = new NpcStringId(1000001);
+		INTRUDER_REMOVAL_SYSTEM_INITIATED = new NpcStringId(1000002);
+		REMOVING_INTRUDERS = new NpcStringId(1000003);
+		A_FATAL_ERROR_HAS_OCCURRED = new NpcStringId(1000004);
+		SYSTEM_IS_BEING_SHUT_DOWN = new NpcStringId(1000005);
+		DOT_DOT_DOT_DOT_DOT_DOT = new NpcStringId(1000006);
+		WE_SHALL_SEE_ABOUT_THAT = new NpcStringId(1000007);
+		I_WILL_DEFINITELY_REPAY_THIS_HUMILIATION = new NpcStringId(1000008);
+		RETREAT = new NpcStringId(1000009);
+		TACTICAL_RETREAT = new NpcStringId(1000010);
+		MASS_FLEEING = new NpcStringId(1000011);
+		ITS_STRONGER_THAN_EXPECTED = new NpcStringId(1000012);
+		ILL_KILL_YOU_NEXT_TIME = new NpcStringId(1000013);
+		ILL_DEFINITELY_KILL_YOU_NEXT_TIME = new NpcStringId(1000014);
+		OH_HOW_STRONG = new NpcStringId(1000015);
+		INVADER = new NpcStringId(1000016);
+		THERE_IS_NO_REASON_FOR_YOU_TO_KILL_ME_I_HAVE_NOTHING_YOU_NEED = new NpcStringId(1000017);
+		SOMEDAY_YOU_WILL_PAY = new NpcStringId(1000018);
+		I_WONT_JUST_STAND_STILL_WHILE_YOU_HIT_ME = new NpcStringId(1000019);
+		STOP_HITTING = new NpcStringId(1000020);
+		IT_HURTS_TO_THE_BONE = new NpcStringId(1000021);
+		AM_I_THE_NEIGHBORHOOD_DRUM_FOR_BEATING = new NpcStringId(1000022);
+		FOLLOW_ME_IF_YOU_WANT = new NpcStringId(1000023);
+		SURRENDER = new NpcStringId(1000024);
+		OH_IM_DEAD = new NpcStringId(1000025);
+		ILL_BE_BACK = new NpcStringId(1000026);
+		ILL_GIVE_YOU_TEN_MILLION_ARENA_IF_YOU_LET_ME_LIVE = new NpcStringId(1000027);
+		S1_STOP_KIDDING_YOURSELF_ABOUT_YOUR_OWN_POWERLESSNESS = new NpcStringId(1000028);
+		S1_ILL_MAKE_YOU_FEEL_WHAT_TRUE_FEAR_IS = new NpcStringId(1000029);
+		YOURE_REALLY_STUPID_TO_HAVE_CHALLENGED_ME_S1_GET_READY = new NpcStringId(1000030);
+		S1_DO_YOU_THINK_THATS_GOING_TO_WORK = new NpcStringId(1000031);
+		I_WILL_DEFINITELY_RECLAIM_MY_HONOR_WHICH_HAS_BEEN_TARNISHED = new NpcStringId(1000032);
+		SHOW_ME_THE_WRATH_OF_THE_KNIGHT_WHOSE_HONOR_HAS_BEEN_DOWNTRODDEN = new NpcStringId(1000033);
+		DEATH_TO_THE_HYPOCRITE = new NpcStringId(1000034);
+		ILL_NEVER_SLEEP_UNTIL_IVE_SHED_MY_DISHONOR = new NpcStringId(1000035);
+		IM_HERE_FOR_THE_ONES_THAT_ARE_CURSING_THE_WORLD = new NpcStringId(1000036);
+		ILL_TURN_YOU_INTO_A_MALIGNANT_SPIRIT = new NpcStringId(1000037);
+		ILL_CURSE_YOU_WITH_THE_POWER_OF_REVENGE_AND_HATE = new NpcStringId(1000038);
+		FOR_THE_GLORY_OF_GRACIA = new NpcStringId(1000039);
+		DO_YOU_DARE_PIT_YOUR_POWER_AGAINST_ME = new NpcStringId(1000040);
+		I_I_AM_DEFEATED = new NpcStringId(1000041);
+		I_AM_CONVEYING_THE_WILL_OF_NURKA_EVERYBODY_GET_OUT_OF_MY_WAY = new NpcStringId(1000042);
+		THOSE_WHO_STAND_AGAINST_ME_SHALL_DIE_HORRIBLY = new NpcStringId(1000043);
+		DO_YOU_DARE_TO_BLOCK_MY_WAY = new NpcStringId(1000044);
+		MY_COMRADES_WILL_GET_REVENGE = new NpcStringId(1000045);
+		YOU_HEATHEN_BLASPHEMERS_OF_THIS_HOLY_PLACE_WILL_BE_PUNISHED = new NpcStringId(1000046);
+		STEP_FORWARD_YOU_WORTHLESS_CREATURES_WHO_CHALLENGE_MY_AUTHORITY = new NpcStringId(1000047);
+		MY_CREATOR_THE_UNCHANGING_FAITHFULNESS_TO_MY_MASTER = new NpcStringId(1000048);
+		MASTER_OF_THE_TOWER_MY_MASTER_MASTER_WHERE_IS_HE = new NpcStringId(1000049);
+		I_AM_THE_ONE_CARRYING_OUT_THE_WILL_OF_CORE = new NpcStringId(1000050);
+		DESTROY_THE_INVADER = new NpcStringId(1000051);
+		STRANGE_CONDITION_DOESNT_WORK = new NpcStringId(1000052);
+		ACCORDING_TO_THE_COMMAND_OF_BELETH_IM_GOING_TO_OBSERVE_YOU_GUYS = new NpcStringId(1000053);
+		YOU_PEOPLE_MAKE_ME_SICK_NO_SENSE_OF_LOYALTY_WHATSOEVER = new NpcStringId(1000054);
+		A_CHALLENGE_AGAINST_ME_IS_THE_SAME_AS_A_CHALLENGE_AGAINST_BELETH = new NpcStringId(1000055);
+		BELETH_IS_ALWAYS_WATCHING_OVER_YOU_GUYS = new NpcStringId(1000056);
+		THAT_WAS_REALLY_CLOSE_ANTHARAS_OPENED_ITS_EYES = new NpcStringId(1000057);
+		YOU_WHO_DISOBEY_THE_WILL_OF_ANTHARAS_DIE = new NpcStringId(1000058);
+		ANTHARAS_HAS_TAKEN_MY_LIFE = new NpcStringId(1000059);
+		I_CROSSED_BACK_OVER_THE_MARSHLANDS_OF_DEATH_TO_RECLAIM_THE_TREASURE = new NpcStringId(1000060);
+		BRING_OVER_AND_SURRENDER_YOUR_PRECIOUS_GOLD_TREASURE_TO_ME = new NpcStringId(1000061);
+		ILL_KILL_YOU_IN_AN_INSTANT = new NpcStringId(1000062);
+		NO_THE_TREASURE_IS_STILL = new NpcStringId(1000063);
+		INVADERS_OF_DRAGON_VALLEY_WILL_NEVER_LIVE_TO_RETURN = new NpcStringId(1000064);
+		I_AM_THE_GUARDIAN_THAT_HONORS_THE_COMMAND_OF_ANTHARAS_TO_WATCH_OVER_THIS_PLACE = new NpcStringId(1000065);
+		YOUVE_SET_FOOT_IN_DRAGON_VALLEY_WITHOUT_PERMISSION_THE_PENALTY_IS_DEATH = new NpcStringId(1000066);
+		THE_JOY_OF_KILLING_THE_ECSTASY_OF_LOOTING_HEY_GUYS_LETS_HAVE_A_GO_AT_IT_AGAIN = new NpcStringId(1000068);
+		THERE_REALLY_ARE_STILL_LOTS_OF_FOLKS_IN_THE_WORLD_WITHOUT_FEAR_ILL_TEACH_YOU_A_LESSON = new NpcStringId(1000069);
+		IF_YOU_HAND_OVER_EVERYTHING_YOUVE_GOT_ILL_AT_LEAST_SPARE_YOUR_LIFE = new NpcStringId(1000070);
+		KNEEL_DOWN_BEFORE_ONE_SUCH_AS_THIS = new NpcStringId(1000071);
+		HONOR_THE_MASTERS_WISHES_AND_PUNISH_ALL_THE_INVADERS = new NpcStringId(1000072);
+		FOLLOW_THE_MASTERS_WISHES_AND_PUNISH_THE_INVADERS = new NpcStringId(1000073);
+		DEATH_IS_NOTHING_MORE_THAN_A_MOMENTARY_REST = new NpcStringId(1000074);
+		LISTEN_THIS_IS_THE_END_OF_THE_HUMAN_ERA_ANTHARAS_HAS_AWOKEN = new NpcStringId(1000075);
+		PRESENT_THE_LIVES_OF_FOUR_PEOPLE_TO_ANTHARAS = new NpcStringId(1000076);
+		THIS_IS_UNBELIEVABLE_HOW_COULD_I_HAVE_LOST_TO_ONE_SO_INFERIOR_TO_MYSELF = new NpcStringId(1000077);
+		I_CARRY_THE_POWER_OF_DARKNESS_AND_HAVE_RETURNED_FROM_THE_ABYSS = new NpcStringId(1000078);
+		ITS_DETESTABLE = new NpcStringId(1000079);
+		I_FINALLY_FIND_REST = new NpcStringId(1000080);
+		GLORY_TO_ORFEN = new NpcStringId(1000081);
+		IN_THE_NAME_OF_ORFEN_I_CAN_NEVER_FORGIVE_YOU_WHO_ARE_INVADING_THIS_PLACE = new NpcStringId(1000082);
+		ILL_MAKE_YOU_PAY_THE_PRICE_FOR_FEARLESSLY_ENTERING_ORFENS_LAND = new NpcStringId(1000083);
+		EVEN_IF_YOU_DISAPPEAR_INTO_NOTHINGNESS_YOU_WILL_STILL_FACE_THE_LIFE_LONG_SUFFERING_OF_THE_CURSE_THAT_I_HAVE_GIVEN_YOU = new NpcStringId(1000084);
+		ILL_STAND_AGAINST_ANYONE_THAT_MAKES_LIGHT_OF_THE_SACRED_PLACE_OF_THE_ELVES = new NpcStringId(1000085);
+		I_WILL_KILL_WITH_MY_OWN_HANDS_ANYONE_THAT_DEFILES_OUR_HOME = new NpcStringId(1000086);
+		MY_BROTHERS_WILL_NEVER_REST_UNTIL_WE_PUSH_YOU_AND_YOUR_GANG_OUT_OF_THIS_VALLEY = new NpcStringId(1000087);
+		UNTIL_THE_DAY_OF_DESTRUCTION_OF_HESTUI = new NpcStringId(1000088);
+		IF_ANY_INTREPID_ORCS_REMAIN_ATTACK_THEM = new NpcStringId(1000089);
+		ILL_BREAK_YOUR_WINDPIPE = new NpcStringId(1000090);
+		IS_REVENGE_A_FAILURE = new NpcStringId(1000091);
+		THE_SPARKLING_MITHRIL_OF_THE_DWARVES_AND_THEIR_PRETTY_TREASURES_ILL_GET_THEM_ALL = new NpcStringId(1000092);
+		WHERE_ARE_ALL_THE_DREADFUL_DWARVES_AND_THEIR_SPARKLING_THINGS = new NpcStringId(1000093);
+		HAND_OVER_YOUR_PRETTY_TREASURES = new NpcStringId(1000094);
+		HEY_YOU_SHOULD_HAVE_RUN_AWAY = new NpcStringId(1000095);
+		DESTRUCTION_EXTINCTION_SLAUGHTER_COLLAPSE_DESTRUCTION_EXTINCTION_SLAUGHTER_COLLAPSE = new NpcStringId(1000096);
+		DESTRUCTION_DESTRUCTION_DESTRUCTION_DESTRUCTION = new NpcStringId(1000097);
+		DESTRUCTION_DESTRUCTION_DESTRUCTION = new NpcStringId(1000098);
+		TA_DA_UTHANKA_HAS_RETURNED = new NpcStringId(1000099);
+		WAH_HA_HA_HA_UTHANKA_HAS_TAKEN_OVER_THIS_ISLAND_TODAY = new NpcStringId(1000100);
+		WHEW_HES_QUITE_A_GUY = new NpcStringId(1000101);
+		HOW_EXASPERATING_AND_UNFAIR_TO_HAVE_THINGS_HAPPEN_IN_SUCH_A_MEANINGLESS_WAY_LIKE_THIS = new NpcStringId(1000102);
+		THIS_WORLD_SHOULD_BE_FILLED_WITH_FEAR_AND_SADNESS = new NpcStringId(1000103);
+		I_WONT_FORGIVE_THE_WORLD_THAT_CURSED_ME = new NpcStringId(1000104);
+		ILL_MAKE_EVERYONE_FEEL_THE_SAME_SUFFERING_AS_ME = new NpcStringId(1000105);
+		ILL_GIVE_YOU_A_CURSE_THAT_YOULL_NEVER_BE_ABLE_TO_REMOVE_FOREVER = new NpcStringId(1000106);
+		ILL_GET_REVENGE_ON_YOU_WHO_SLAUGHTERED_MY_COMPATRIOTS = new NpcStringId(1000107);
+		THOSE_WHO_ARE_AFRAID_SHOULD_GET_AWAY_AND_THOSE_WHO_ARE_BRAVE_SHOULD_FIGHT = new NpcStringId(1000108);
+		IVE_GOT_POWER_FROM_BELETH_SO_DO_YOU_THINK_ILL_BE_EASILY_DEFEATED = new NpcStringId(1000109);
+		I_AM_LEAVING_NOW_BUT_SOON_SOMEONE_WILL_COME_WHO_WILL_TEACH_YOU_ALL_A_LESSON = new NpcStringId(1000110);
+		HEY_GUYS_LETS_MAKE_A_ROUND_OF_OUR_TERRITORY = new NpcStringId(1000111);
+		THE_RUMOR_IS_THAT_THERE_ARE_WILD_UNCIVILIZED_RUFFIANS_WHO_HAVE_RECENTLY_ARRIVED_IN_MY_TERRITORY = new NpcStringId(1000112);
+		DO_YOU_KNOW_WHO_I_AM_I_AM_SIROCCO_EVERYONE_ATTACK = new NpcStringId(1000113);
+		WHATS_JUST_HAPPENED_THE_INVINCIBLE_SIROCCO_WAS_DEFEATED_BY_SOMEONE_LIKE_YOU = new NpcStringId(1000114);
+		OH_IM_REALLY_HUNGRY = new NpcStringId(1000115);
+		I_SMELL_FOOD_OOH = new NpcStringId(1000116);
+		OOH = new NpcStringId(1000117);
+		WHAT_DOES_HONEY_OF_THIS_PLACE_TASTE_LIKE = new NpcStringId(1000118);
+		GIVE_ME_SOME_SWEET_DELICIOUS_GOLDEN_HONEY = new NpcStringId(1000119);
+		IF_YOU_GIVE_ME_SOME_HONEY_ILL_AT_LEAST_SPARE_YOUR_LIFE = new NpcStringId(1000120);
+		ONLY_FOR_LACK_OF_HONEY_DID_I_LOSE_TO_THE_LIKES_OF_YOU = new NpcStringId(1000121);
+		WHERE_IS_THE_TRAITOR_KUROBOROS = new NpcStringId(1000122);
+		LOOK_IN_EVERY_NOOK_AND_CRANNY_AROUND_HERE = new NpcStringId(1000123);
+		ARE_YOU_LACKEY_OF_KUROBOROS_ILL_KNOCK_YOU_OUT_IN_ONE_SHOT = new NpcStringId(1000124);
+		HE_JUST_CLOSED_HIS_EYES_WITHOUT_DISPOSING_OF_THE_TRAITOR_HOW_UNFAIR = new NpcStringId(1000125);
+		HELL_FOR_UNBELIEVERS_IN_KUROBOROS = new NpcStringId(1000126);
+		THE_PERSON_THAT_DOES_NOT_BELIEVE_IN_KUROBOROS_HIS_LIFE_WILL_SOON_BECOME_HELL = new NpcStringId(1000127);
+		THE_LACKEY_OF_THAT_DEMENTED_DEVIL_THE_SERVANT_OF_A_FALSE_GOD_ILL_SEND_THAT_FOOL_STRAIGHT_TO_HELL = new NpcStringId(1000128);
+		UH_IM_NOT_DYING_IM_JUST_DISAPPEARING_FOR_A_MOMENT_ILL_RESURRECT_AGAIN = new NpcStringId(1000129);
+		HAIL_TO_KUROBOROS_THE_FOUNDER_OF_OUR_RELIGION = new NpcStringId(1000130);
+		ONLY_THOSE_WHO_BELIEVE_IN_PATRIARCH_KUROBOROS_SHALL_RECEIVE_SALVATION = new NpcStringId(1000131);
+		ARE_YOU_THE_ONES_THAT_SHARUK_HAS_INCITED_YOU_ALSO_SHOULD_TRUST_IN_KUROBOROS_AND_BE_SAVED = new NpcStringId(1000132);
+		KUROBOROS_WILL_PUNISH_YOU = new NpcStringId(1000133);
+		YOU_WHO_HAVE_BEAUTIFUL_SPIRITS_THAT_SHINE_BRIGHTLY_I_HAVE_RETURNED = new NpcStringId(1000134);
+		YOU_THAT_ARE_WEARY_AND_EXHAUSTED_ENTRUST_YOUR_SOULS_TO_ME = new NpcStringId(1000135);
+		THE_COLOR_OF_YOUR_SOUL_IS_VERY_ATTRACTIVE = new NpcStringId(1000136);
+		THOSE_OF_YOU_WHO_LIVE_DO_YOU_KNOW_HOW_BEAUTIFUL_YOUR_SOULS_ARE = new NpcStringId(1000137);
+		IT_WILL_KILL_EVERYONE = new NpcStringId(1000138);
+		IM_SO_LONELY = new NpcStringId(1000139);
+		MY_ENEMY = new NpcStringId(1000140);
+		_NOW_IM_NOT_SO_LONELY = new NpcStringId(1000141);
+		I_WILL_NEVER_FORGIVE_THE_PIXY_MURIKA_THAT_IS_TRYING_TO_KILL_US = new NpcStringId(1000142);
+		ATTACK_ALL_THE_DULL_AND_STUPID_FOLLOWERS_OF_MURIKA = new NpcStringId(1000143);
+		I_DIDNT_HAVE_ANY_IDEA_ABOUT_SUCH_AMBITIONS = new NpcStringId(1000144);
+		THIS_IS_NOT_THE_END_ITS_JUST_THE_BEGINNING = new NpcStringId(1000145);
+		HEY_SHALL_WE_HAVE_SOME_FUN_FOR_THE_FIRST_TIME_IN_A_LONG_WHILE = new NpcStringId(1000146);
+		THEREVE_BEEN_SOME_THINGS_GOING_AROUND_LIKE_CRAZY_HERE_RECENTLY = new NpcStringId(1000147);
+		HEY_DO_YOU_KNOW_WHO_I_AM_I_AM_MALEX_HERALD_OF_DAGONIEL_ATTACK = new NpcStringId(1000148);
+		WHATS_JUST_HAPPENED_THE_INVINCIBLE_MALEX_JUST_LOST_TO_THE_LIKES_OF_YOU = new NpcStringId(1000149);
+		ITS_SOMETHING_REPEATED_IN_A_VAIN_LIFE = new NpcStringId(1000150);
+		SHAKE_IN_FEAR_ALL_YOU_WHO_VALUE_YOUR_LIVES = new NpcStringId(1000151);
+		ILL_MAKE_YOU_FEEL_SUFFERING_LIKE_A_FLAME_THAT_IS_NEVER_EXTINGUISHED = new NpcStringId(1000152);
+		BACK_TO_THE_DIRT = new NpcStringId(1000153);
+		HAIL_VARIKA = new NpcStringId(1000154);
+		NOBODY_CAN_STOP_US = new NpcStringId(1000155);
+		YOU_MOVE_SLOWLY = new NpcStringId(1000156);
+		VARIKA_GO_FIRST = new NpcStringId(1000157);
+		WHERE_AM_I_WHO_AM_I = new NpcStringId(1000158);
+		UH_MY_HEAD_HURTS_LIKE_ITS_GOING_TO_BURST_WHO_AM_I = new NpcStringId(1000159);
+		YOU_JERK_YOURE_A_DEVIL_YOURE_A_DEVIL_TO_HAVE_MADE_ME_LIKE_THIS = new NpcStringId(1000160);
+		WHERE_AM_I_WHAT_HAPPENED_THANK_YOU = new NpcStringId(1000161);
+		UKRU_MASTER = new NpcStringId(1000162);
+		ARE_YOU_MATU = new NpcStringId(1000163);
+		MARAK_TUBARIN_SABARACHA = new NpcStringId(1000164);
+		PAAGRIO_TAMA = new NpcStringId(1000165);
+		ACCEPT_THE_WILL_OF_ICARUS = new NpcStringId(1000166);
+		THE_PEOPLE_WHO_ARE_BLOCKING_MY_WAY_WILL_NOT_BE_FORGIVEN = new NpcStringId(1000167);
+		YOU_ARE_SCUM = new NpcStringId(1000168);
+		YOU_LACK_POWER = new NpcStringId(1000169);
+		RETURN = new NpcStringId(1000170);
+		ADENA_HAS_BEEN_TRANSFERRED = new NpcStringId(1000171);
+		EVENT_NUMBER = new NpcStringId(1000172);
+		FIRST_PRIZE = new NpcStringId(1000173);
+		SECOND_PRIZE = new NpcStringId(1000174);
+		THIRD_PRIZE = new NpcStringId(1000175);
+		FOURTH_PRIZE = new NpcStringId(1000176);
+		THERE_HAS_BEEN_NO_WINNING_LOTTERY_TICKET = new NpcStringId(1000177);
+		THE_MOST_RECENT_WINNING_LOTTERY_NUMBERS = new NpcStringId(1000178);
+		YOUR_LUCKY_NUMBERS_HAVE_BEEN_SELECTED_ABOVE = new NpcStringId(1000179);
+		I_WONDER_WHO_IT_IS_THAT_IS_LURKING_ABOUT = new NpcStringId(1000180);
+		SACRED_MAGICAL_RESEARCH_IS_CONDUCTED_HERE = new NpcStringId(1000181);
+		BEHOLD_THE_AWESOME_POWER_OF_MAGIC = new NpcStringId(1000182);
+		YOUR_POWERS_ARE_IMPRESSIVE_BUT_YOU_MUST_NOT_ANNOY_OUR_HIGH_LEVEL_SORCERER = new NpcStringId(1000183);
+		I_AM_BARDA_MASTER_OF_THE_BANDIT_STRONGHOLD = new NpcStringId(1000184);
+		I_MASTER_BARDA_ONCE_OWNED_THAT_STRONGHOLD = new NpcStringId(1000185);
+		AH_VERY_INTERESTING = new NpcStringId(1000186);
+		YOU_ARE_MORE_POWERFUL_THAN_YOU_APPEAR_WELL_MEET_AGAIN = new NpcStringId(1000187);
+		YOU_FILTHY_SORCERERS_DISGUST_ME = new NpcStringId(1000188);
+		WHY_WOULD_YOU_BUILD_A_TOWER_IN_OUR_TERRITORY = new NpcStringId(1000189);
+		ARE_YOU_PART_OF_THAT_EVIL_GANG_OF_SORCERERS = new NpcStringId(1000190);
+		THAT_IS_WHY_I_DONT_BOTHER_WITH_ANYONE_BELOW_THE_LEVEL_OF_SORCERER = new NpcStringId(1000191);
+		AH_ANOTHER_BEAUTIFUL_DAY = new NpcStringId(1000192);
+		OUR_SPECIALTIES_ARE_ARSON_AND_LOOTING = new NpcStringId(1000193);
+		YOU_WILL_LEAVE_EMPTY_HANDED = new NpcStringId(1000194);
+		AH_SO_YOU_ADMIRE_MY_TREASURE_DO_YOU_TRY_FINDING_IT_HA = new NpcStringId(1000195);
+		IS_EVERYBODY_LISTENING_SIRION_HAS_COME_BACK_EVERYONE_CHANT_AND_BOW = new NpcStringId(1000196);
+		BOW_DOWN_YOU_WORTHLESS_HUMANS = new NpcStringId(1000197);
+		VERY_TACKY = new NpcStringId(1000198);
+		DONT_THINK_THAT_YOU_ARE_INVINCIBLE_JUST_BECAUSE_YOU_DEFEATED_ME = new NpcStringId(1000199);
+		THE_MATERIAL_DESIRES_OF_MORTALS_ARE_ULTIMATELY_MEANINGLESS = new NpcStringId(1000200);
+		DO_NOT_FORGET_THE_REASON_THE_TOWER_OF_INSOLENCE_COLLAPSED = new NpcStringId(1000201);
+		YOU_HUMANS_ARE_ALL_ALIKE_FULL_OF_GREED_AND_AVARICE = new NpcStringId(1000202);
+		ALL_FOR_NOTHING = new NpcStringId(1000203);
+		WHAT_ARE_ALL_THESE_PEOPLE_DOING_HERE = new NpcStringId(1000204);
+		I_MUST_FIND_THE_SECRET_OF_ETERNAL_LIFE_HERE_AMONG_THESE_ROTTEN_ANGELS = new NpcStringId(1000205);
+		DO_YOU_ALSO_SEEK_THE_SECRET_OF_IMMORTALITY = new NpcStringId(1000206);
+		I_SHALL_NEVER_REVEAL_MY_SECRETS = new NpcStringId(1000207);
+		WHO_DARES_ENTER_THIS_PLACE = new NpcStringId(1000208);
+		THIS_IS_NO_PLACE_FOR_HUMANS_YOU_MUST_LEAVE_IMMEDIATELY = new NpcStringId(1000209);
+		YOU_POOR_CREATURES_TOO_STUPID_TO_REALIZE_YOUR_OWN_IGNORANCE = new NpcStringId(1000210);
+		YOU_MUSTNT_GO_THERE = new NpcStringId(1000211);
+		WHO_DARES_DISTURB_THIS_MARSH = new NpcStringId(1000212);
+		THE_HUMANS_MUST_NOT_BE_ALLOWED_TO_DESTROY_THE_MARSHLAND_FOR_THEIR_GREEDY_PURPOSES = new NpcStringId(1000213);
+		YOU_ARE_A_BRAVE_MAN = new NpcStringId(1000214);
+		YOU_IDIOTS_SOME_DAY_YOU_SHALL_ALSO_BE_GONE = new NpcStringId(1000215);
+		SOMEONE_HAS_ENTERED_THE_FOREST = new NpcStringId(1000216);
+		THE_FOREST_IS_VERY_QUIET_AND_PEACEFUL = new NpcStringId(1000217);
+		STAY_HERE_IN_THIS_WONDERFUL_FOREST = new NpcStringId(1000218);
+		MY_MY_SOULS = new NpcStringId(1000219);
+		THIS_FOREST_IS_A_DANGEROUS_PLACE = new NpcStringId(1000220);
+		UNLESS_YOU_LEAVE_THIS_FOREST_IMMEDIATELY_YOU_ARE_BOUND_TO_RUN_INTO_SERIOUS_TROUBLE = new NpcStringId(1000221);
+		LEAVE_NOW = new NpcStringId(1000222);
+		WHY_DO_YOU_IGNORE_MY_WARNING = new NpcStringId(1000223);
+		HARITS_OF_THE_WORLD_I_BRING_YOU_PEACE = new NpcStringId(1000224);
+		HARITS_BE_COURAGEOUS = new NpcStringId(1000225);
+		I_SHALL_EAT_YOUR_STILL_BEATING_HEART = new NpcStringId(1000226);
+		HARITS_KEEP_FAITH_UNTIL_THE_DAY_I_RETURN_NEVER_LOSE_HOPE = new NpcStringId(1000227);
+		EVEN_THE_GIANTS_ARE_GONE_THERES_NOTHING_LEFT_TO_BE_AFRAID_OF_NOW = new NpcStringId(1000228);
+		HAVE_YOU_HEARD_OF_THE_GIANTS_THEIR_DOWNFALL_WAS_INEVITABLE = new NpcStringId(1000229);
+		WHAT_NERVE_DO_YOU_DARE_TO_CHALLENGE_ME = new NpcStringId(1000230);
+		YOU_ARE_AS_EVIL_AS_THE_GIANTS = new NpcStringId(1000231);
+		THIS_DUNGEON_IS_STILL_IN_GOOD_CONDITION = new NpcStringId(1000232);
+		THIS_PLACE_IS_SPECTACULAR_WOULDNT_YOU_SAY = new NpcStringId(1000233);
+		YOU_ARE_VERY_BRAVE_WARRIORS = new NpcStringId(1000234);
+		ARE_THE_GIANTS_TRULY_GONE_FOR_GOOD = new NpcStringId(1000235);
+		THESE_GRAVES_ARE_GOOD = new NpcStringId(1000236);
+		GOLD_AND_SILVER_ARE_MEANINGLESS_TO_A_DEAD_MAN = new NpcStringId(1000237);
+		WHY_WOULD_THOSE_CORRUPT_ARISTOCRATS_BURY_SUCH_USEFUL_THINGS = new NpcStringId(1000238);
+		YOU_FILTHY_PIG_EAT_AND_BE_MERRY_NOW_THAT_YOU_HAVE_SHIRKED_YOUR_RESPONSIBILITIES = new NpcStringId(1000239);
+		THOSE_THUGS_IT_WOULD_BE_TOO_MERCIFUL_TO_RIP_THEM_APART_AND_CHEW_THEM_UP_ONE_AT_A_TIME = new NpcStringId(1000240);
+		YOU_ACCURSED_SCOUNDRELS = new NpcStringId(1000241);
+		HMM_COULD_THIS_BE_THE_ASSASSIN_SENT_BY_THOSE_IDIOTS_FROM_ADEN = new NpcStringId(1000242);
+		I_SHALL_CURSE_YOUR_NAME_WITH_MY_LAST_BREATH = new NpcStringId(1000243);
+		MY_BELOVED_LORD_SHILEN = new NpcStringId(1000244);
+		I_MUST_BREAK_THE_SEAL_AND_RELEASE_LORD_SHILEN_AS_SOON_AS_POSSIBLE = new NpcStringId(1000245);
+		YOU_SHALL_TASTE_THE_VENGEANCE_OF_LORD_SHILEN = new NpcStringId(1000246);
+		LORD_SHILEN_SOME_DAY_YOU_WILL_ACCOMPLISH_THIS_MISSION = new NpcStringId(1000247);
+		TOWARDS_IMMORTALITY = new NpcStringId(1000248);
+		HE_WHO_DESIRES_IMMORTALITY_COME_UNTO_ME = new NpcStringId(1000249);
+		YOU_SHALL_BE_SACRIFICED_TO_GAIN_MY_IMMORTALITY = new NpcStringId(1000250);
+		ETERNAL_LIFE_IN_FRONT_OF_MY_EYES_I_HAVE_COLLAPSED_IN_SUCH_A_WORTHLESS_WAY_LIKE_THIS = new NpcStringId(1000251);
+		ZAKEN_YOU_ARE_A_COWARDLY_CUR = new NpcStringId(1000252);
+		YOU_ARE_IMMORTAL_ARENT_YOU_ZAKEN = new NpcStringId(1000253);
+		PLEASE_RETURN_MY_BODY_TO_ME = new NpcStringId(1000254);
+		FINALLY_WILL_I_BE_ABLE_TO_REST = new NpcStringId(1000255);
+		WHAT_IS_ALL_THAT_RACKET = new NpcStringId(1000256);
+		MASTER_GILDOR_DOES_NOT_LIKE_TO_BE_DISTURBED = new NpcStringId(1000257);
+		PLEASE_JUST_HOLD_IT_DOWN = new NpcStringId(1000258);
+		IF_YOU_DISTURB_MASTER_GILDOR_I_WONT_BE_ABLE_TO_HELP_YOU = new NpcStringId(1000259);
+		WHO_DARES_APPROACH = new NpcStringId(1000260);
+		THESE_REEDS_ARE_MY_TERRITORY = new NpcStringId(1000261);
+		YOU_FOOLS_TODAY_YOU_SHALL_LEARN_A_LESSON = new NpcStringId(1000262);
+		THE_PAST_GOES_BY_IS_A_NEW_ERA_BEGINNING = new NpcStringId(1000263);
+		THIS_IS_THE_GARDEN_OF_EVA = new NpcStringId(1000264);
+		THE_GARDEN_OF_EVA_IS_A_SACRED_PLACE = new NpcStringId(1000265);
+		DO_YOU_MEAN_TO_INSULT_EVA = new NpcStringId(1000266);
+		HOW_RUDE_EVAS_LOVE_IS_AVAILABLE_TO_ALL_EVEN_TO_AN_ILL_MANNERED_LOUT_LIKE_YOURSELF = new NpcStringId(1000267);
+		THIS_PLACE_ONCE_BELONGED_TO_LORD_SHILEN = new NpcStringId(1000268);
+		LEAVE_THIS_PALACE_TO_US_SPIRITS_OF_EVA = new NpcStringId(1000269);
+		WHY_ARE_YOU_GETTING_IN_OUR_WAY = new NpcStringId(1000270);
+		SHILEN_OUR_SHILEN = new NpcStringId(1000271);
+		ALL_WHO_FEAR_OF_FAFURION_LEAVE_THIS_PLACE_AT_ONCE = new NpcStringId(1000272);
+		YOU_ARE_BEING_PUNISHED_IN_THE_NAME_OF_FAFURION = new NpcStringId(1000273);
+		OH_MASTER_PLEASE_FORGIVE_YOUR_HUMBLE_SERVANT = new NpcStringId(1000274);
+		PREPARE_TO_DIE_FOREIGN_INVADERS_I_AM_GUSTAV_THE_ETERNAL_RULER_OF_THIS_FORTRESS_AND_I_HAVE_TAKEN_UP_MY_SWORD_TO_REPEL_THEE = new NpcStringId(1000275);
+		GLORY_TO_ADEN_THE_KINGDOM_OF_THE_LION_GLORY_TO_SIR_GUSTAV_OUR_IMMORTAL_LORD = new NpcStringId(1000276);
+		SOLDIERS_OF_GUSTAV_GO_FORTH_AND_DESTROY_THE_INVADERS = new NpcStringId(1000277);
+		THIS_IS_UNBELIEVABLE_HAVE_I_REALLY_BEEN_DEFEATED_I_SHALL_RETURN_AND_TAKE_YOUR_HEAD = new NpcStringId(1000278);
+		COULD_IT_BE_THAT_I_HAVE_REACHED_MY_END_I_CANNOT_DIE_WITHOUT_HONOR_WITHOUT_THE_PERMISSION_OF_SIR_GUSTAV = new NpcStringId(1000279);
+		AH_THE_BITTER_TASTE_OF_DEFEAT_I_FEAR_MY_TORMENTS_ARE_NOT_OVER = new NpcStringId(1000280);
+		I_FOLLOW_THE_WILL_OF_FAFURION = new NpcStringId(1000281);
+		TICKETS_FOR_THE_LUCKY_LOTTERY_ARE_NOW_ON_SALE = new NpcStringId(1000282);
+		THE_LUCKY_LOTTERY_DRAWING_IS_ABOUT_TO_BEGIN = new NpcStringId(1000283);
+		THE_WINNING_NUMBERS_FOR_LUCKY_LOTTERY_S1_ARE_S2_CONGRATULATIONS_TO_THE_WINNERS = new NpcStringId(1000284);
+		YOURE_TOO_YOUNG_TO_PLAY_LUCKY_LOTTERY = new NpcStringId(1000285);
+		S1_WATCH_YOUR_BACK = new NpcStringId(1000286);
+		S1_COME_ON_ILL_TAKE_YOU_ON = new NpcStringId(1000287);
+		S1_HOW_DARE_YOU_INTERRUPT_OUR_FIGHT_HEY_GUYS_HELP = new NpcStringId(1000288);
+		ILL_HELP_YOU_IM_NO_COWARD = new NpcStringId(1000289);
+		DEAR_ULTIMATE_POWER = new NpcStringId(1000290);
+		EVERYBODY_ATTACK_S1 = new NpcStringId(1000291);
+		I_WILL_FOLLOW_YOUR_ORDER = new NpcStringId(1000292);
+		BET_YOU_DIDNT_EXPECT_THIS = new NpcStringId(1000293);
+		COME_OUT_YOU_CHILDREN_OF_DARKNESS = new NpcStringId(1000294);
+		SUMMON_PARTY_MEMBERS = new NpcStringId(1000295);
+		MASTER_DID_YOU_CALL_ME = new NpcStringId(1000296);
+		YOU_IDIOT = new NpcStringId(1000297);
+		WHAT_ABOUT_THIS = new NpcStringId(1000298);
+		VERY_IMPRESSIVE_S1_THIS_IS_THE_LAST = new NpcStringId(1000299);
+		DAWN = new NpcStringId(1000300);
+		DUSK = new NpcStringId(1000301);
+		NOTHINGNESS = new NpcStringId(1000302);
+		THIS_WORLD_WILL_SOON_BE_ANNIHILATED = new NpcStringId(1000303);
+		A_CURSE_UPON_YOU = new NpcStringId(1000304);
+		THE_DAY_OF_JUDGMENT_IS_NEAR = new NpcStringId(1000305);
+		I_BESTOW_UPON_YOU_A_BLESSING = new NpcStringId(1000306);
+		THE_FIRST_RULE_OF_FIGHTING_IS_TO_START_BY_KILLING_THE_WEAK_ONES = new NpcStringId(1000307);
+		ADENA = new NpcStringId(1000308);
+		ANCIENT_ADENA = new NpcStringId(1000309);
+		LEVEL_31_OR_LOWER = new NpcStringId(1000312);
+		LEVEL_42_OR_LOWER = new NpcStringId(1000313);
+		LEVEL_53_OR_LOWER = new NpcStringId(1000314);
+		LEVEL_64_OR_LOWER = new NpcStringId(1000315);
+		NO_LEVEL_LIMIT = new NpcStringId(1000316);
+		THE_MAIN_EVENT_WILL_START_IN_2_MINUTES_PLEASE_REGISTER_NOW = new NpcStringId(1000317);
+		THE_MAIN_EVENT_IS_NOW_STARTING = new NpcStringId(1000318);
+		THE_MAIN_EVENT_WILL_CLOSE_IN_5_MINUTES = new NpcStringId(1000319);
+		THE_MAIN_EVENT_WILL_FINISH_IN_2_MINUTES_PLEASE_PREPARE_FOR_THE_NEXT_GAME = new NpcStringId(1000320);
+		THE_AMOUNT_OF_SSQ_CONTRIBUTION_HAS_INCREASED_BY_S1 = new NpcStringId(1000321);
+		NO_RECORD_EXISTS = new NpcStringId(1000322);
+		THAT_WILL_DO_ILL_MOVE_YOU_TO_THE_OUTSIDE_SOON = new NpcStringId(1000380);
+		YOUR_REAR_IS_PRACTICALLY_UNGUARDED = new NpcStringId(1000382);
+		HOW_DARE_YOU_TURN_YOUR_BACK_ON_ME = new NpcStringId(1000383);
+		S1_ILL_DEAL_WITH_YOU_MYSELF = new NpcStringId(1000384);
+		S1_THIS_IS_PERSONAL = new NpcStringId(1000385);
+		S1_LEAVE_US_ALONE_THIS_IS_BETWEEN_US = new NpcStringId(1000386);
+		S1_KILLING_YOU_WILL_BE_A_PLEASURE = new NpcStringId(1000387);
+		S1_HEY_WERE_HAVING_A_DUEL_HERE = new NpcStringId(1000388);
+		THE_DUEL_IS_OVER_ATTACK = new NpcStringId(1000389);
+		FOUL_KILL_THE_COWARD = new NpcStringId(1000390);
+		HOW_DARE_YOU_INTERRUPT_A_SACRED_DUEL_YOU_MUST_BE_TAUGHT_A_LESSON = new NpcStringId(1000391);
+		DIE_YOU_COWARD = new NpcStringId(1000392);
+		KILL_THE_COWARD = new NpcStringId(1000394);
+		I_NEVER_THOUGHT_ID_USE_THIS_AGAINST_A_NOVICE = new NpcStringId(1000395);
+		YOU_WONT_TAKE_ME_DOWN_EASILY = new NpcStringId(1000396);
+		THE_BATTLE_HAS_JUST_BEGUN = new NpcStringId(1000397);
+		KILL_S1_FIRST = new NpcStringId(1000398);
+		ATTACK_S1 = new NpcStringId(1000399);
+		ATTACK_ATTACK = new NpcStringId(1000400);
+		OVER_HERE = new NpcStringId(1000401);
+		ROGER = new NpcStringId(1000402);
+		SHOW_YOURSELVES = new NpcStringId(1000403);
+		FORCES_OF_DARKNESS_FOLLOW_ME = new NpcStringId(1000404);
+		DESTROY_THE_ENEMY_MY_BROTHERS = new NpcStringId(1000405);
+		NOW_THE_FUN_STARTS = new NpcStringId(1000406);
+		ENOUGH_FOOLING_AROUND_GET_READY_TO_DIE = new NpcStringId(1000407);
+		YOU_IDIOT_IVE_JUST_BEEN_TOYING_WITH_YOU = new NpcStringId(1000408);
+		WITNESS_MY_TRUE_POWER = new NpcStringId(1000409);
+		NOW_THE_BATTLE_BEGINS = new NpcStringId(1000410);
+		I_MUST_ADMIT_NO_ONE_MAKES_MY_BLOOD_BOIL_QUITE_LIKE_YOU_DO = new NpcStringId(1000411);
+		YOU_HAVE_MORE_SKILL_THAN_I_THOUGHT = new NpcStringId(1000412);
+		ILL_DOUBLE_MY_STRENGTH = new NpcStringId(1000413);
+		PREPARE_TO_DIE = new NpcStringId(1000414);
+		ALL_IS_LOST_PREPARE_TO_MEET_THE_GODDESS_OF_DEATH = new NpcStringId(1000415);
+		ALL_IS_LOST_THE_PROPHECY_OF_DESTRUCTION_HAS_BEEN_FULFILLED = new NpcStringId(1000416);
+		THE_END_OF_TIME_HAS_COME_THE_PROPHECY_OF_DESTRUCTION_HAS_BEEN_FULFILLED = new NpcStringId(1000417);
+		S1_YOU_BRING_AN_ILL_WIND = new NpcStringId(1000418);
+		S1_YOU_MIGHT_AS_WELL_GIVE_UP = new NpcStringId(1000419);
+		YOU_DONT_HAVE_ANY_HOPE_YOUR_END_HAS_COME = new NpcStringId(1000420);
+		THE_PROPHECY_OF_DARKNESS_HAS_BEEN_FULFILLED = new NpcStringId(1000421);
+		AS_FORETOLD_IN_THE_PROPHECY_OF_DARKNESS_THE_ERA_OF_CHAOS_HAS_BEGUN = new NpcStringId(1000422);
+		THE_PROPHECY_OF_DARKNESS_HAS_COME_TO_PASS = new NpcStringId(1000423);
+		S1_I_GIVE_YOU_THE_BLESSING_OF_PROPHECY = new NpcStringId(1000424);
+		S1_I_BESTOW_UPON_YOU_THE_AUTHORITY_OF_THE_ABYSS = new NpcStringId(1000425);
+		HERALD_OF_THE_NEW_ERA_OPEN_YOUR_EYES = new NpcStringId(1000426);
+		REMEMBER_KILL_THE_WEAKLINGS_FIRST = new NpcStringId(1000427);
+		PREPARE_TO_DIE_MAGGOT = new NpcStringId(1000428);
+		THAT_WILL_DO_PREPARE_TO_BE_RELEASED = new NpcStringId(1000429);
+		DRAW = new NpcStringId(1000430);
+		RULERS_OF_THE_SEAL_I_BRING_YOU_WONDROUS_GIFTS = new NpcStringId(1000431);
+		RULERS_OF_THE_SEAL_I_HAVE_SOME_EXCELLENT_WEAPONS_TO_SHOW_YOU = new NpcStringId(1000432);
+		IVE_BEEN_SO_BUSY_LATELY_IN_ADDITION_TO_PLANNING_MY_TRIP = new NpcStringId(1000433);
+		YOUR_TREATMENT_OF_WEAKLINGS_IS_UNFORGIVABLE = new NpcStringId(1000434);
+		IM_HERE_TO_HELP_YOU_HI_YAH = new NpcStringId(1000435);
+		JUSTICE_WILL_BE_SERVED = new NpcStringId(1000436);
+		ON_TO_IMMORTAL_GLORY = new NpcStringId(1000437);
+		JUSTICE_ALWAYS_AVENGES_THE_POWERLESS = new NpcStringId(1000438);
+		ARE_YOU_HURT_HANG_IN_THERE_WEVE_ALMOST_GOT_THEM = new NpcStringId(1000439);
+		WHY_SHOULD_I_TELL_YOU_MY_NAME_YOU_CREEP = new NpcStringId(1000440);
+		N1_MINUTE = new NpcStringId(1000441);
+		THE_DEFENDERS_OF_S1_CASTLE_WILL_BE_TELEPORTED_TO_THE_INNER_CASTLE = new NpcStringId(1000443);
+		SUNDAY = new NpcStringId(1000444);
+		MONDAY = new NpcStringId(1000445);
+		TUESDAY = new NpcStringId(1000446);
+		WEDNESDAY = new NpcStringId(1000447);
+		THURSDAY = new NpcStringId(1000448);
+		FRIDAY = new NpcStringId(1000449);
+		SATURDAY = new NpcStringId(1000450);
+		HOUR = new NpcStringId(1000451);
+		ITS_A_GOOD_DAY_TO_DIE_WELCOME_TO_HELL_MAGGOT = new NpcStringId(1000452);
+		THE_FESTIVAL_OF_DARKNESS_WILL_END_IN_TWO_MINUTES = new NpcStringId(1000453);
+		NOBLESSE_GATE_PASS = new NpcStringId(1000454);
+		MINUTES_HAVE_PASSED = new NpcStringId(1000456);
+		GAME_OVER_THE_TELEPORT_WILL_APPEAR_MOMENTARILY = new NpcStringId(1000457);
+		YOU_WHO_ARE_LIKE_THE_SLUGS_CRAWLING_ON_THE_GROUND_THE_GENEROSITY_AND_GREATNESS_OF_ME_DAIMON_THE_WHITE_EYED_IS_ENDLESS_HA_HA_HA = new NpcStringId(1000458);
+		IF_YOU_WANT_TO_BE_THE_OPPONENT_OF_ME_DAIMON_THE_WHITE_EYED_YOU_SHOULD_AT_LEAST_HAVE_THE_BASIC_SKILLS = new NpcStringId(1000459);
+		YOU_STUPID_CREATURES_THAT_ARE_BOUND_TO_THE_EARTH_YOU_ARE_SUFFERING_TOO_MUCH_WHILE_DRAGGING_YOUR_FAT_HEAVY_BODIES_I_DAIMON_WILL_LIGHTEN_YOUR_BURDEN = new NpcStringId(1000460);
+		A_WEAK_AND_STUPID_TRIBE_LIKE_YOURS_DOESNT_DESERVE_TO_BE_MY_ENEMY_BWA_HA_HA_HA = new NpcStringId(1000461);
+		YOU_DARE_TO_INVADE_THE_TERRITORY_OF_DAIMON_THE_WHITE_EYED_NOW_YOU_WILL_PAY_THE_PRICE_FOR_YOUR_ACTION = new NpcStringId(1000462);
+		THIS_IS_THE_GRACE_OF_DAIMON_THE_WHITE_EYED_THE_GREAT_MONSTER_EYE_LORD_HA_HA_HA = new NpcStringId(1000463);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_DUELISTS_CONGRATULATIONS = new NpcStringId(1000464);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_DREADNOUGHTS_CONGRATULATIONS = new NpcStringId(1000465);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_PHOENIX_KNIGHTS_CONGRATULATIONS = new NpcStringId(1000466);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_HELL_KNIGHTS_CONGRATULATIONS = new NpcStringId(1000467);
+		S1_YOU_HAVE_BECOME_A_SAGITTARIUS_HERO_CONGRATULATIONS = new NpcStringId(1000468);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_ADVENTURERS_CONGRATULATIONS = new NpcStringId(1000469);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_ARCHMAGES_CONGRATULATIONS = new NpcStringId(1000470);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_SOULTAKERS_CONGRATULATIONS = new NpcStringId(1000471);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_ARCANA_LORDS_CONGRATULATIONS = new NpcStringId(1000472);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_CARDINALS_CONGRATULATIONS = new NpcStringId(1000473);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_HIEROPHANTS_CONGRATULATIONS = new NpcStringId(1000474);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_EVAS_TEMPLARS_CONGRATULATIONS = new NpcStringId(1000475);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_SWORD_MUSES_CONGRATULATIONS = new NpcStringId(1000476);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_WIND_RIDERS_CONGRATULATIONS = new NpcStringId(1000477);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_MOONLIGHT_SENTINELS_CONGRATULATIONS = new NpcStringId(1000478);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_MYSTIC_MUSES_CONGRATULATIONS = new NpcStringId(1000479);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_ELEMENTAL_MASTERS_CONGRATULATIONS = new NpcStringId(1000480);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_EVAS_SAINTS_CONGRATULATIONS = new NpcStringId(1000481);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_THE_SHILLIEN_TEMPLARS_CONGRATULATIONS = new NpcStringId(1000482);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_SPECTRAL_DANCERS_CONGRATULATIONS = new NpcStringId(1000483);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_GHOST_HUNTERS_CONGRATULATIONS = new NpcStringId(1000484);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_GHOST_SENTINELS_CONGRATULATIONS = new NpcStringId(1000485);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_STORM_SCREAMERS_CONGRATULATIONS = new NpcStringId(1000486);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_SPECTRAL_MASTERS_CONGRATULATIONS = new NpcStringId(1000487);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_THE_SHILLIEN_SAINTS_CONGRATULATIONS = new NpcStringId(1000488);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_TITANS_CONGRATULATIONS = new NpcStringId(1000489);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_GRAND_KHAVATARIS_CONGRATULATIONS = new NpcStringId(1000490);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_DOMINATORS_CONGRATULATIONS = new NpcStringId(1000491);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_DOOMCRYERS_CONGRATULATIONS = new NpcStringId(1000492);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_FORTUNE_SEEKERS_CONGRATULATIONS = new NpcStringId(1000493);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_MAESTROS_CONGRATULATIONS = new NpcStringId(1000494);
+		UNREGISTERED = new NpcStringId(1000495);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_DOOMBRINGERS_CONGRATULATIONS = new NpcStringId(1000496);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_SOUL_HOUNDS_CONGRATULATIONS = new NpcStringId(1000497);
+		S1_YOU_HAVE_BECOME_A_HERO_OF_TRICKSTERS_CONGRATULATIONS = new NpcStringId(1000499);
+		YOU_MAY_NOW_ENTER_THE_SEPULCHER = new NpcStringId(1000500);
+		IF_YOU_PLACE_YOUR_HAND_ON_THE_STONE_STATUE_IN_FRONT_OF_EACH_SEPULCHER_YOU_WILL_BE_ABLE_TO_ENTER = new NpcStringId(1000501);
+		THE_MONSTERS_HAVE_SPAWNED = new NpcStringId(1000502);
+		THANK_YOU_FOR_SAVING_ME = new NpcStringId(1000503);
+		FEWER_THAN_S2 = new NpcStringId(1000504);
+		MORE_THAN_S2 = new NpcStringId(1000505);
+		POINT = new NpcStringId(1000506);
+		COMPETITION = new NpcStringId(1000507);
+		SEAL_VALIDATION = new NpcStringId(1000508);
+		PREPARATION = new NpcStringId(1000509);
+		NO_OWNER = new NpcStringId(1000512);
+		THIS_PLACE_IS_DANGEROUS_S1_PLEASE_TURN_BACK = new NpcStringId(1000513);
+		WHO_DISTURBS_MY_SACRED_SLEEP = new NpcStringId(1000514);
+		BEGONE_THIEF_LET_OUR_BONES_REST_IN_PEACE = new NpcStringId(1000515);
+		_LEAVE_US_BE_HESTUI_SCUM = new NpcStringId(1000516);
+		THIEVING_KAKAI_MAY_BLOODBUGS_GNAW_YOU_IN_YOUR_SLEEP = new NpcStringId(1000517);
+		NEWBIE_TRAVEL_TOKEN = new NpcStringId(1000518);
+		ARROGANT_FOOL_YOU_DARE_TO_CHALLENGE_ME_THE_RULER_OF_FLAMES_HERE_IS_YOUR_REWARD = new NpcStringId(1000519);
+		S1_YOU_CANNOT_HOPE_TO_DEFEAT_ME_WITH_YOUR_MEAGER_STRENGTH = new NpcStringId(1000520);
+		NOT_EVEN_THE_GODS_THEMSELVES_COULD_TOUCH_ME_BUT_YOU_S1_YOU_DARE_CHALLENGE_ME_IGNORANT_MORTAL = new NpcStringId(1000521);
+		REQUIEM_OF_HATRED = new NpcStringId(1000522);
+		FUGUE_OF_JUBILATION = new NpcStringId(1000523);
+		FRENETIC_TOCCATA = new NpcStringId(1000524);
+		HYPNOTIC_MAZURKA = new NpcStringId(1000525);
+		MOURNFUL_CHORALE_PRELUDE = new NpcStringId(1000526);
+		RONDO_OF_SOLITUDE = new NpcStringId(1000527);
+		OLYMPIAD_TOKEN = new NpcStringId(1000528);
+		THE_KINGDOM_OF_ADEN = new NpcStringId(1001000);
+		THE_KINGDOM_OF_ELMORE = new NpcStringId(1001100);
+		TALKING_ISLAND_VILLAGE = new NpcStringId(1010001);
+		THE_ELVEN_VILLAGE = new NpcStringId(1010002);
+		THE_DARK_ELF_VILLAGE = new NpcStringId(1010003);
+		THE_VILLAGE_OF_GLUDIN = new NpcStringId(1010004);
+		THE_TOWN_OF_GLUDIO = new NpcStringId(1010005);
+		THE_TOWN_OF_DION = new NpcStringId(1010006);
+		THE_TOWN_OF_GIRAN = new NpcStringId(1010007);
+		ORC_VILLAGE = new NpcStringId(1010008);
+		DWARVEN_VILLAGE = new NpcStringId(1010009);
+		THE_SOUTHERN_PART_OF_THE_DARK_FOREST = new NpcStringId(1010010);
+		THE_NORTHEAST_COAST = new NpcStringId(1010011);
+		THE_SOUTHERN_ENTRANCE_TO_THE_WASTELANDSS = new NpcStringId(1010012);
+		TOWN_OF_OREN = new NpcStringId(1010013);
+		IVORY_TOWER = new NpcStringId(1010014);
+		N1ST_FLOOR_LOBBY = new NpcStringId(1010015);
+		UNDERGROUND_SHOPPING_AREA = new NpcStringId(1010016);
+		N2ND_FLOOR_HUMAN_WIZARD_GUILD = new NpcStringId(1010017);
+		N3RD_FLOOR_ELVEN_WIZARD_GUILD = new NpcStringId(1010018);
+		N4TH_FLOOR_DARK_WIZARD_GUILD = new NpcStringId(1010019);
+		HUNTERS_VILLAGE = new NpcStringId(1010020);
+		GIRAN_HARBOR = new NpcStringId(1010021);
+		HARDINS_PRIVATE_ACADEMY = new NpcStringId(1010022);
+		TOWN_OF_ADEN = new NpcStringId(1010023);
+		VILLAGE_SQUARE = new NpcStringId(1010024);
+		NORTH_GATE_ENTRANCE = new NpcStringId(1010025);
+		EAST_GATE_ENTRANCE = new NpcStringId(1010026);
+		WEST_GATE_ENTRANCE = new NpcStringId(1010027);
+		SOUTH_GATE_ENTRANCE = new NpcStringId(1010028);
+		ENTRANCE_TO_TUREK_ORC_CAMP = new NpcStringId(1010029);
+		ENTRANCE_TO_FORGOTTEN_TEMPLE = new NpcStringId(1010030);
+		ENTRANCE_TO_THE_WASTELANDS = new NpcStringId(1010031);
+		ENTRANCE_TO_ABANDONED_CAMP = new NpcStringId(1010032);
+		ENTRANCE_TO_CRUMA_MARSHLANDS = new NpcStringId(1010033);
+		ENTRANCE_TO_EXECUTION_GROUNDS = new NpcStringId(1010034);
+		ENTRANCE_TO_THE_FORTRESS_OF_RESISTANCE = new NpcStringId(1010035);
+		ENTRANCE_TO_FLORAN_VILLAGE = new NpcStringId(1010036);
+		NEUTRAL_ZONE = new NpcStringId(1010037);
+		WESTERN_ROAD_OF_GIRAN = new NpcStringId(1010038);
+		EASTERN_ROAD_OF_GLUDIN_VILLAGE = new NpcStringId(1010039);
+		ENTRANCE_TO_CRUMA_TOWER = new NpcStringId(1010041);
+		DEATH_PASS = new NpcStringId(1010042);
+		NORTHERN_PART_OF_THE_MARSHLANDS = new NpcStringId(1010043);
+		NORTHEAST_OF_THE_NEUTRAL_ZONE = new NpcStringId(1010044);
+		IMMORTAL_PLATEAU_CENTRAL_REGION = new NpcStringId(1010045);
+		IMMORTAL_PLATEAU_SOUTHERN_REGION = new NpcStringId(1010046);
+		IMMORTAL_PLATEAU_SOUTHEAST_REGION = new NpcStringId(1010047);
+		FROZEN_WATERFALL = new NpcStringId(1010048);
+		HEINE = new NpcStringId(1010049);
+		TOWER_OF_INSOLENCE_1ST_FLOOR = new NpcStringId(1010050);
+		TOWER_OF_INSOLENCE_5TH_FLOOR = new NpcStringId(1010051);
+		TOWER_OF_INSOLENCE_10TH_FLOOR = new NpcStringId(1010052);
+		COLISEUM = new NpcStringId(1010053);
+		MONSTER_DERBY = new NpcStringId(1010054);
+		NEAR_THE_FRONTIER_POST = new NpcStringId(1010055);
+		ENTRANCE_TO_THE_SEA_OF_SPORES = new NpcStringId(1010056);
+		AN_OLD_BATTLEFIELD = new NpcStringId(1010057);
+		ENTRANCE_TO_ENCHANTED_VALLEY = new NpcStringId(1010058);
+		ENTRANCE_TO_THE_TOWER_OF_INSOLENCE = new NpcStringId(1010059);
+		BLAZING_SWAMP = new NpcStringId(1010060);
+		ENTRANCE_TO_THE_CEMETERY = new NpcStringId(1010061);
+		ENTRANCE_TO_THE_GIANTS_CAVE = new NpcStringId(1010062);
+		ENTRANCE_TO_THE_FOREST_OF_MIRRORS = new NpcStringId(1010063);
+		THE_FORBIDDEN_GATEWAY = new NpcStringId(1010064);
+		ENTRANCE_TO_THE_TANOR_SILENOS_BARRACKS = new NpcStringId(1010066);
+		DRAGON_VALLEY = new NpcStringId(1010067);
+		ORACLE_OF_DAWN = new NpcStringId(1010068);
+		ORACLE_OF_DUSK = new NpcStringId(1010069);
+		NECROPOLIS_OF_SACRIFICE = new NpcStringId(1010070);
+		THE_PILGRIMS_NECROPOLIS = new NpcStringId(1010071);
+		NECROPOLIS_OF_WORSHIP = new NpcStringId(1010072);
+		THE_PATRIOTS_NECROPOLIS = new NpcStringId(1010073);
+		NECROPOLIS_OF_DEVOTION = new NpcStringId(1010074);
+		NECROPOLIS_OF_MARTYRDOM = new NpcStringId(1010075);
+		THE_DISCIPLES_NECROPOLIS = new NpcStringId(1010076);
+		THE_SAINTS_NECROPOLIS = new NpcStringId(1010077);
+		THE_CATACOMB_OF_THE_HERETIC = new NpcStringId(1010078);
+		CATACOMB_OF_THE_BRANDED = new NpcStringId(1010079);
+		CATACOMB_OF_THE_APOSTATE = new NpcStringId(1010080);
+		CATACOMB_OF_THE_WITCH = new NpcStringId(1010081);
+		CATACOMB_OF_DARK_OMENS = new NpcStringId(1010082);
+		CATACOMB_OF_THE_FORBIDDEN_PATH = new NpcStringId(1010083);
+		ENTRANCE_TO_THE_RUINS_OF_AGONY = new NpcStringId(1010084);
+		ENTRANCE_TO_THE_RUINS_OF_DESPAIR = new NpcStringId(1010085);
+		ENTRANCE_TO_THE_ANT_NEST = new NpcStringId(1010086);
+		SOUTHERN_DION = new NpcStringId(1010087);
+		ENTRANCE_TO_DRAGON_VALLEY = new NpcStringId(1010088);
+		FIELD_OF_SILENCE = new NpcStringId(1010089);
+		FIELD_OF_WHISPERS = new NpcStringId(1010090);
+		ENTRANCE_TO_ALLIGATOR_ISLAND = new NpcStringId(1010091);
+		SOUTHERN_PLAIN_OF_OREN = new NpcStringId(1010092);
+		ENTRANCE_TO_THE_BANDIT_STRONGHOLD = new NpcStringId(1010093);
+		WINDY_HILL = new NpcStringId(1010094);
+		ORC_BARRACKS = new NpcStringId(1010095);
+		FELLMERE_HARVESTING_GROUNDS = new NpcStringId(1010096);
+		RUINS_OF_AGONY = new NpcStringId(1010097);
+		ABANDONED_CAMP = new NpcStringId(1010098);
+		RED_ROCK_RIDGE = new NpcStringId(1010099);
+		LANGK_LIZARDMAN_DWELLINGS = new NpcStringId(1010100);
+		RUINS_OF_DESPAIR = new NpcStringId(1010101);
+		WINDAWOOD_MANOR = new NpcStringId(1010102);
+		NORTHERN_PATHWAY_TO_THE_WASTELANDS = new NpcStringId(1010103);
+		WESTERN_PATHWAY_TO_THE_WASTELANDS = new NpcStringId(1010104);
+		SOUTHERN_PATHWAY_TO_THE_WASTELANDS = new NpcStringId(1010105);
+		FORGOTTEN_TEMPLE = new NpcStringId(1010106);
+		SOUTH_ENTRANCE_OF_ANT_NEST = new NpcStringId(1010107);
+		EAST_ENTRANCE_OF_ANT_NEST = new NpcStringId(1010108);
+		WEST_ENTRANCE_OF_ANT_NEST = new NpcStringId(1010109);
+		CRUMA_MARSHLAND = new NpcStringId(1010110);
+		PLAINS_OF_DION = new NpcStringId(1010111);
+		BEE_HIVE = new NpcStringId(1010112);
+		FORTRESS_OF_RESISTANCE = new NpcStringId(1010113);
+		EXECUTION_GROUNDS = new NpcStringId(1010114);
+		TANOR_CANYON = new NpcStringId(1010115);
+		CRUMA_TOWER = new NpcStringId(1010116);
+		THREE_WAY_CROSSROADS_AT_DRAGON_VALLEY = new NpcStringId(1010117);
+		BREKAS_STRONGHOLD = new NpcStringId(1010118);
+		GORGON_FLOWER_GARDEN = new NpcStringId(1010119);
+		ANTHARASS_LAIR = new NpcStringId(1010120);
+		SEA_OF_SPORES = new NpcStringId(1010121);
+		OUTLAW_FOREST = new NpcStringId(1010122);
+		FOREST_OF_EVIL_AND_THE_IVORY_TOWER = new NpcStringId(1010123);
+		TIMAK_OUTPOST = new NpcStringId(1010124);
+		GREAT_PLAINS_OF_OREN = new NpcStringId(1010125);
+		ALCHEMISTS_HUT = new NpcStringId(1010126);
+		ANCIENT_BATTLEGROUND = new NpcStringId(1010127);
+		NORTHERN_PATHWAY_OF_THE_ENCHANTED_VALLEY = new NpcStringId(1010128);
+		SOUTHERN_PATHWAY_OF_THE_ENCHANTED_VALLEY = new NpcStringId(1010129);
+		HUNTERS_VALLEY = new NpcStringId(1010130);
+		WESTERN_ENTRANCE_OF_BLAZING_SWAMP = new NpcStringId(1010131);
+		EASTERN_ENTRANCE_OF_BLAZING_SWAMP = new NpcStringId(1010132);
+		PLAINS_OF_GLORY = new NpcStringId(1010133);
+		WAR_TORN_PLAINS = new NpcStringId(1010134);
+		NORTHWESTERN_PASSAGE_TO_THE_FOREST_OF_MIRRORS = new NpcStringId(1010135);
+		THE_FRONT_OF_ANGHEL_WATERFALL = new NpcStringId(1010136);
+		SOUTH_ENTRANCE_OF_DEVASTATED_CASTLE = new NpcStringId(1010137);
+		NORTH_ENTRANCE_OF_DEVASTATED_CASTLE = new NpcStringId(1010138);
+		NORTH_ENTRANCE_OF_THE_CEMETERY = new NpcStringId(1010139);
+		SOUTH_ENTRANCE_OF_THE_CEMETERY = new NpcStringId(1010140);
+		WEST_ENTRANCE_OF_THE_CEMETERY = new NpcStringId(1010141);
+		ENTRANCE_OF_THE_FORBIDDEN_GATEWAY = new NpcStringId(1010142);
+		FORSAKEN_PLAINS = new NpcStringId(1010143);
+		TOWER_OF_INSOLENCE = new NpcStringId(1010144);
+		THE_GIANTS_CAVE = new NpcStringId(1010145);
+		NORTHERN_PART_OF_THE_FIELD_OF_SILENCE = new NpcStringId(1010146);
+		WESTERN_PART_OF_THE_FIELD_OF_SILENCE = new NpcStringId(1010147);
+		EASTERN_PART_OF_THE_FIELD_OF_SILENCE = new NpcStringId(1010148);
+		WESTERN_PART_OF_THE_FIELD_OF_WHISPERS = new NpcStringId(1010149);
+		ALLIGATOR_ISLAND = new NpcStringId(1010150);
+		ALLIGATOR_BEACH = new NpcStringId(1010151);
+		DEVILS_ISLE = new NpcStringId(1010152);
+		GARDEN_OF_EVA = new NpcStringId(1010153);
+		TALKING_ISLAND = new NpcStringId(1010154);
+		ELVEN_VILLAGE = new NpcStringId(1010155);
+		DARK_ELF_VILLAGE = new NpcStringId(1010156);
+		SCENIC_DECK_OF_IRIS_LAKE = new NpcStringId(1010159);
+		ALTAR_OF_RITES = new NpcStringId(1010160);
+		DARK_FOREST_WATERFALL = new NpcStringId(1010161);
+		THREE_WAY_CROSSROADS_OF_THE_NEUTRAL_ZONE = new NpcStringId(1010162);
+		DARK_FOREST = new NpcStringId(1010163);
+		SWAMPLAND = new NpcStringId(1010164);
+		BLACK_ROCK_HILL = new NpcStringId(1010165);
+		SPIDER_NEST = new NpcStringId(1010166);
+		ELVEN_FOREST = new NpcStringId(1010167);
+		OBELISK_OF_VICTORY = new NpcStringId(1010168);
+		NORTHERN_TERRITORY_OF_TALKING_ISLAND = new NpcStringId(1010169);
+		SOUTHERN_TERRITORY_OF_TALKING_ISLAND = new NpcStringId(1010170);
+		EVIL_HUNTING_GROUNDS = new NpcStringId(1010171);
+		MAILLE_LIZARDMEN_BARRACKS = new NpcStringId(1010172);
+		RUINS_OF_AGONY_BEND = new NpcStringId(1010173);
+		THE_ENTRANCE_TO_THE_RUINS_OF_DESPAIR = new NpcStringId(1010174);
+		WINDMILL_HILL = new NpcStringId(1010175);
+		FLORAN_AGRICULTURAL_AREA = new NpcStringId(1010177);
+		WESTERN_TANOR_CANYON = new NpcStringId(1010178);
+		PLAINS_OF_THE_LIZARDMEN = new NpcStringId(1010179);
+		FOREST_OF_EVIL = new NpcStringId(1010180);
+		FIELDS_OF_MASSACRE = new NpcStringId(1010181);
+		SILENT_VALLEY = new NpcStringId(1010182);
+		NORTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_NORTHERN_REGION = new NpcStringId(1010183);
+		SOUTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_NORTHERN_REGION = new NpcStringId(1010184);
+		NORTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_SOUTHERN_REGION = new NpcStringId(1010185);
+		SOUTHERN_AREA_OF_THE_IMMORTAL_PLATEAU_SOUTHERN_REGION = new NpcStringId(1010186);
+		WESTERN_MINING_ZONE = new NpcStringId(1010187);
+		ENTRANCE_TO_THE_ABANDONED_COAL_MINES = new NpcStringId(1010190);
+		ENTRANCE_TO_THE_MITHRIL_MINES = new NpcStringId(1010191);
+		WEST_AREA_OF_THE_DEVASTATED_CASTLE = new NpcStringId(1010192);
+		TOWER_OF_INSOLENCE_3RD_FLOOR = new NpcStringId(1010193);
+		TOWER_OF_INSOLENCE_7TH_FLOOR = new NpcStringId(1010195);
+		TOWER_OF_INSOLENCE_13TH_FLOOR = new NpcStringId(1010197);
+		TOWN_OF_GODDARD = new NpcStringId(1010199);
+		RUNE_TOWNSHIP = new NpcStringId(1010200);
+		A_DELIVERY_FOR_MR_LECTOR_VERY_GOOD = new NpcStringId(1010201);
+		I_NEED_A_BREAK = new NpcStringId(1010202);
+		HELLO_MR_LECTOR_LONG_TIME_NO_SEE_MR_JACKSON = new NpcStringId(1010203);
+		LULU = new NpcStringId(1010204);
+		WHERE_HAS_HE_GONE = new NpcStringId(1010205);
+		HAVE_YOU_SEEN_WINDAWOOD = new NpcStringId(1010206);
+		WHERE_DID_HE_GO = new NpcStringId(1010207);
+		THE_MOTHER_TREE_IS_SLOWLY_DYING = new NpcStringId(1010208);
+		HOW_CAN_WE_SAVE_THE_MOTHER_TREE = new NpcStringId(1010209);
+		THE_MOTHER_TREE_IS_ALWAYS_SO_GORGEOUS = new NpcStringId(1010210);
+		LADY_MIRABEL_MAY_THE_PEACE_OF_THE_LAKE_BE_WITH_YOU = new NpcStringId(1010211);
+		YOURE_A_HARD_WORKER_RAYLA = new NpcStringId(1010212);
+		YOURE_A_HARD_WORKER = new NpcStringId(1010213);
+		THE_MASS_OF_DARKNESS_WILL_START_IN_A_COUPLE_OF_DAYS_PAY_MORE_ATTENTION_TO_THE_GUARD = new NpcStringId(1010214);
+		HAVE_YOU_SEEN_TOROCCO_TODAY = new NpcStringId(1010215);
+		HAVE_YOU_SEEN_TOROCCO = new NpcStringId(1010216);
+		WHERE_IS_THAT_FOOL_HIDING = new NpcStringId(1010217);
+		CARE_TO_GO_A_ROUND = new NpcStringId(1010218);
+		HAVE_A_NICE_DAY_MR_GARITA_AND_MION = new NpcStringId(1010219);
+		MR_LID_MURDOC_AND_AIRY_HOW_ARE_YOU_DOING = new NpcStringId(1010220);
+		A_BLACK_MOON_NOW_DO_YOU_UNDERSTAND_THAT_HE_HAS_OPENED_HIS_EYES = new NpcStringId(1010221);
+		CLOUDS_OF_BLOOD_ARE_GATHERING_SOON_IT_WILL_START_TO_RAIN_THE_RAIN_OF_CRIMSON_BLOOD = new NpcStringId(1010222);
+		WHILE_THE_FOOLISH_LIGHT_WAS_ASLEEP_THE_DARKNESS_WILL_AWAKEN_FIRST_UH_HUH_HUH = new NpcStringId(1010223);
+		IT_IS_THE_DEEPEST_DARKNESS_WITH_ITS_ARRIVAL_THE_WORLD_WILL_SOON_DIE = new NpcStringId(1010224);
+		DEATH_IS_JUST_A_NEW_BEGINNING_HUHU_FEAR_NOT = new NpcStringId(1010225);
+		AHH_BEAUTIFUL_GODDESS_OF_DEATH_COVER_OVER_THE_FILTH_OF_THIS_WORLD_WITH_YOUR_DARKNESS = new NpcStringId(1010226);
+		THE_GODDESSS_RESURRECTION_HAS_ALREADY_BEGUN_HUHU_INSIGNIFICANT_CREATURES_LIKE_YOU_CAN_DO_NOTHING = new NpcStringId(1010227);
+		CROAK_CROAK_FOOD_LIKE_S1_IN_THIS_PLACE = new NpcStringId(1010400);
+		S1_HOW_LUCKY_I_AM = new NpcStringId(1010401);
+		PRAY_THAT_YOU_CAUGHT_A_WRONG_FISH_S1 = new NpcStringId(1010402);
+		DO_YOU_KNOW_WHAT_A_FROG_TASTES_LIKE = new NpcStringId(1010403);
+		I_WILL_SHOW_YOU_THE_POWER_OF_A_FROG = new NpcStringId(1010404);
+		I_WILL_SWALLOW_AT_A_MOUTHFUL = new NpcStringId(1010405);
+		UGH_NO_CHANCE_HOW_COULD_THIS_ELDER_PASS_AWAY_LIKE_THIS = new NpcStringId(1010406);
+		CROAK_CROAK_A_FROG_IS_DYING = new NpcStringId(1010407);
+		A_FROG_TASTES_BAD_YUCK = new NpcStringId(1010408);
+		KAAK_S1_WHAT_ARE_YOU_DOING_NOW = new NpcStringId(1010409);
+		HUH_S1_YOU_PIERCED_INTO_THE_BODY_OF_THE_SPIRIT_WITH_A_NEEDLE_ARE_YOU_READY = new NpcStringId(1010410);
+		OOH_S1_THATS_YOU_BUT_NO_LADY_IS_PLEASED_WITH_THIS_SAVAGE_INVITATION = new NpcStringId(1010411);
+		YOU_MADE_ME_ANGRY = new NpcStringId(1010412);
+		IT_IS_BUT_A_SCRATCH_IS_THAT_ALL_YOU_CAN_DO = new NpcStringId(1010413);
+		FEEL_MY_PAIN = new NpcStringId(1010414);
+		ILL_GET_YOU_FOR_THIS = new NpcStringId(1010415);
+		I_WILL_TELL_FISH_NOT_TO_TAKE_YOUR_BAIT = new NpcStringId(1010416);
+		YOU_BOTHERED_SUCH_A_WEAK_SPIRITHUH_HUH = new NpcStringId(1010417);
+		KE_KE_KES1IM_EATINGKE = new NpcStringId(1010418);
+		KUHOOHS1ENMITYFISH = new NpcStringId(1010419);
+		S1_HUH_HUHHUH = new NpcStringId(1010420);
+		KE_KE_KE_RAKUL_SPIN_EH_EH_EH = new NpcStringId(1010421);
+		AH_FAFURION_AH_AH = new NpcStringId(1010422);
+		RAKUL_RAKUL_RA_KUL = new NpcStringId(1010423);
+		EHENMITYFISH = new NpcStringId(1010424);
+		I_WONT_BE_EATEN_UPKAH_AH_AH = new NpcStringId(1010425);
+		COUGH_RAKUL_COUGH_COUGH_KEH = new NpcStringId(1010426);
+		GLORY_TO_FAFURION_DEATH_TO_S1 = new NpcStringId(1010427);
+		S1_YOU_ARE_THE_ONE_WHO_BOTHERED_MY_POOR_FISH = new NpcStringId(1010428);
+		FAFURION_A_CURSE_UPON_S1 = new NpcStringId(1010429);
+		GIANT_SPECIAL_ATTACK = new NpcStringId(1010430);
+		KNOW_THE_ENMITY_OF_FISH = new NpcStringId(1010431);
+		I_WILL_SHOW_YOU_THE_POWER_OF_A_SPEAR = new NpcStringId(1010432);
+		GLORY_TO_FAFURION = new NpcStringId(1010433);
+		YIPES = new NpcStringId(1010434);
+		AN_OLD_SOLDIER_DOES_NOT_DIE_BUT_JUST_DISAPPEAR = new NpcStringId(1010435);
+		S1_TAKE_MY_CHALLENGE_THE_KNIGHT_OF_WATER = new NpcStringId(1010436);
+		DISCOVER_S1_IN_THE_TREASURE_CHEST_OF_FISH = new NpcStringId(1010437);
+		S1_I_TOOK_YOUR_BAIT = new NpcStringId(1010438);
+		I_WILL_SHOW_YOU_SPEARMANSHIP_USED_IN_DRAGON_KINGS_PALACE = new NpcStringId(1010439);
+		THIS_IS_THE_LAST_GIFT_I_GIVE_YOU = new NpcStringId(1010440);
+		YOUR_BAIT_WAS_TOO_DELICIOUS_NOW_I_WILL_KILL_YOU = new NpcStringId(1010441);
+		WHAT_A_REGRET_THE_ENMITY_OF_MY_BRETHREN = new NpcStringId(1010442);
+		ILL_PAY_YOU_BACK_SOMEBODY_WILL_HAVE_MY_REVENGE = new NpcStringId(1010443);
+		COUGH_BUT_I_WONT_BE_EATEN_UP_BY_YOU = new NpcStringId(1010444);
+		_S1_I_WILL_KILL_YOU = new NpcStringId(1010445);
+		S1_HOW_COULD_YOU_CATCH_ME_FROM_THE_DEEP_SEA = new NpcStringId(1010446);
+		S1_DO_YOU_THINK_I_AM_A_FISH = new NpcStringId(1010447);
+		EBIBIBI = new NpcStringId(1010448);
+		HE_HE_HE_DO_YOU_WANT_ME_TO_ROAST_YOU_WELL = new NpcStringId(1010449);
+		YOU_DIDNT_KEEP_YOUR_EYES_ON_ME_BECAUSE_I_COME_FROM_THE_SEA = new NpcStringId(1010450);
+		EEEK_I_FEEL_SICKYOW = new NpcStringId(1010451);
+		I_HAVE_FAILED = new NpcStringId(1010452);
+		ACTIVITY_OF_LIFE_IS_STOPPED_CHIZIFC = new NpcStringId(1010453);
+		GROWLING_S1_GROWLING = new NpcStringId(1010454);
+		I_CAN_SMELL_S1 = new NpcStringId(1010455);
+		LOOKS_DELICIOUS_S1 = new NpcStringId(1010456);
+		I_WILL_CATCH_YOU = new NpcStringId(1010457);
+		UAH_AH_AH_I_COULDNT_EAT_ANYTHING_FOR_A_LONG_TIME = new NpcStringId(1010458);
+		I_CAN_SWALLOW_YOU_AT_A_MOUTHFUL = new NpcStringId(1010459);
+		WHAT_I_AM_DEFEATED_BY_THE_PREY = new NpcStringId(1010460);
+		YOU_ARE_MY_FOOD_I_HAVE_TO_KILL_YOU = new NpcStringId(1010461);
+		I_CANT_BELIEVE_I_AM_EATEN_UP_BY_MY_PREY_GAH = new NpcStringId(1010462);
+		YOU_CAUGHT_ME_S1 = new NpcStringId(1010463);
+		YOURE_LUCKY_TO_HAVE_EVEN_SEEN_ME_S1 = new NpcStringId(1010464);
+		S1_YOU_CANT_LEAVE_HERE_ALIVE_GIVE_UP = new NpcStringId(1010465);
+		I_WILL_SHOW_YOU_THE_POWER_OF_THE_DEEP_SEA = new NpcStringId(1010466);
+		I_WILL_BREAK_THE_FISHING_POLE = new NpcStringId(1010467);
+		YOUR_CORPSE_WILL_BE_GOOD_FOOD_FOR_ME = new NpcStringId(1010468);
+		YOU_ARE_A_GOOD_FISHERMAN = new NpcStringId(1010469);
+		ARENT_YOU_AFRAID_OF_FAFURION = new NpcStringId(1010470);
+		YOU_ARE_EXCELLENT = new NpcStringId(1010471);
+		THE_POISON_DEVICE_HAS_BEEN_ACTIVATED = new NpcStringId(1010472);
+		THE_P_ATK_REDUCTION_DEVICE_WILL_BE_ACTIVATED_IN_1_MINUTE = new NpcStringId(1010473);
+		THE_DEFENSE_REDUCTION_DEVICE_WILL_BE_ACTIVATED_IN_2_MINUTES = new NpcStringId(1010474);
+		THE_HP_REGENERATION_REDUCTION_DEVICE_WILL_BE_ACTIVATED_IN_3_MINUTES = new NpcStringId(1010475);
+		THE_P_ATK_REDUCTION_DEVICE_HAS_BEEN_ACTIVATED = new NpcStringId(1010476);
+		THE_DEFENSE_REDUCTION_DEVICE_HAS_BEEN_ACTIVATED = new NpcStringId(1010477);
+		THE_HP_REGENERATION_REDUCTION_DEVICE_HAS_BEEN_ACTIVATED = new NpcStringId(1010478);
+		THE_POISON_DEVICE_HAS_NOW_BEEN_DESTROYED = new NpcStringId(1010479);
+		THE_P_ATK_REDUCTION_DEVICE_HAS_NOW_BEEN_DESTROYED = new NpcStringId(1010480);
+		THE_DEFENSE_REDUCTION_DEVICE_HAS_BEEN_DESTROYED = new NpcStringId(1010481);
+		ENTRANCE_TO_THE_CAVE_OF_TRIALS = new NpcStringId(1010485);
+		INSIDE_THE_ELVEN_RUINS = new NpcStringId(1010486);
+		ENTRANCE_TO_THE_ELVEN_RUINS = new NpcStringId(1010487);
+		ENTRANCE_TO_THE_SCHOOL_OF_DARK_ARTS = new NpcStringId(1010488);
+		CENTER_OF_THE_SCHOOL_OF_DARK_ARTS = new NpcStringId(1010489);
+		ENTRANCE_TO_THE_ELVEN_FORTRESS = new NpcStringId(1010490);
+		VARKA_SILENOS_STRONGHOLD = new NpcStringId(1010491);
+		KETRA_ORC_OUTPOST = new NpcStringId(1010492);
+		RUNE_TOWNSHIP_GUILD = new NpcStringId(1010493);
+		RUNE_TOWNSHIP_TEMPLE = new NpcStringId(1010494);
+		RUNE_TOWNSHIP_STORE = new NpcStringId(1010495);
+		ENTRANCE_TO_THE_FOREST_OF_THE_DEAD = new NpcStringId(1010496);
+		WESTERN_ENTRANCE_TO_THE_SWAMP_OF_SCREAMS = new NpcStringId(1010497);
+		ENTRANCE_TO_THE_FORGOTTEN_TEMPLE = new NpcStringId(1010498);
+		CENTER_OF_THE_FORGOTTEN_TEMPLE = new NpcStringId(1010499);
+		ENTRANCE_TO_THE_CRUMA_TOWER = new NpcStringId(1010500);
+		CRUMA_TOWER_FIRST_FLOOR = new NpcStringId(1010501);
+		CRUMA_TOWER_SECOND_FLOOR = new NpcStringId(1010502);
+		CRUMA_TOWER_THIRD_FLOOR = new NpcStringId(1010503);
+		ENTRANCE_TO_DEVILS_ISLE = new NpcStringId(1010504);
+		GLUDIN_ARENA = new NpcStringId(1010506);
+		GIRAN_ARENA = new NpcStringId(1010507);
+		ENTRANCE_TO_ANTHARASS_LAIR = new NpcStringId(1010508);
+		ANTHARASS_LAIR_1ST_LEVEL = new NpcStringId(1010509);
+		ANTHARASS_LAIR_2ND_LEVEL = new NpcStringId(1010510);
+		ANTHARASS_LAIR_MAGIC_FORCE_FIELD_BRIDGE = new NpcStringId(1010511);
+		THE_HEART_OF_ANTHARASS_LAIR = new NpcStringId(1010512);
+		EAST_OF_THE_FIELD_OF_SILENCE = new NpcStringId(1010513);
+		WEST_OF_THE_FIELD_OF_SILENCE = new NpcStringId(1010514);
+		EAST_OF_THE_FIELD_OF_WHISPERS = new NpcStringId(1010515);
+		WEST_OF_THE_FIELD_OF_WHISPERS = new NpcStringId(1010516);
+		ENTRANCE_TO_THE_GARDEN_OF_EVA = new NpcStringId(1010517);
+		NORTHERN_PART_OF_ALLIGATOR_ISLAND = new NpcStringId(1010520);
+		CENTRAL_PART_OF_ALLIGATOR_ISLAND = new NpcStringId(1010521);
+		GARDEN_OF_EVA_2ND_LEVEL = new NpcStringId(1010522);
+		GARDEN_OF_EVA_3RD_LEVEL = new NpcStringId(1010523);
+		GARDEN_OF_EVA_4TH_LEVEL = new NpcStringId(1010524);
+		GARDEN_OF_EVA_5TH_LEVEL = new NpcStringId(1010525);
+		INSIDE_THE_GARDEN_OF_EVA = new NpcStringId(1010526);
+		FOUR_SEPULCHERS = new NpcStringId(1010527);
+		IMPERIAL_TOMB = new NpcStringId(1010528);
+		SHRINE_OF_LOYALTY = new NpcStringId(1010529);
+		ENTRANCE_TO_THE_FORGE_OF_THE_GODS = new NpcStringId(1010530);
+		FORGE_OF_THE_GODS_TOP_LEVEL = new NpcStringId(1010531);
+		FORGE_OF_THE_GODS_LOWER_LEVEL = new NpcStringId(1010532);
+		ENTRANCE_TO_THE_WALL_OF_ARGOS = new NpcStringId(1010533);
+		VARKA_SILENOS_VILLAGE = new NpcStringId(1010534);
+		KETRA_ORC_VILLAGE = new NpcStringId(1010535);
+		ENTRANCE_TO_THE_HOT_SPRINGS_REGION = new NpcStringId(1010536);
+		WILD_BEAST_PASTURES = new NpcStringId(1010537);
+		ENTRANCE_TO_THE_VALLEY_OF_SAINTS = new NpcStringId(1010538);
+		CURSED_VILLAGE = new NpcStringId(1010539);
+		SOUTHERN_ENTRANCE_OF_THE_WILD_BEAST_PASTURES = new NpcStringId(1010540);
+		EASTERN_PART_OF_THE_WILD_BEAST_PASTURES = new NpcStringId(1010541);
+		WESTERN_PART_OF_THE_WILD_BEAST_PASTURES = new NpcStringId(1010542);
+		EASTERN_PART_OF_THE_SWAMP_OF_SCREAMS = new NpcStringId(1010543);
+		WESTERN_PART_OF_THE_SWAMP_OF_SCREAMS = new NpcStringId(1010544);
+		CENTER_OF_THE_SWAMP_OF_SCREAMS = new NpcStringId(1010545);
+		ADEN_FRONTIER_GATEWAY = new NpcStringId(1010547);
+		OREN_FRONTIER_GATEWAY = new NpcStringId(1010548);
+		GARDEN_OF_WILD_BEASTS = new NpcStringId(1010549);
+		DEVILS_PASS = new NpcStringId(1010550);
+		THE_BULLETS_ARE_BEING_LOADED = new NpcStringId(1010551);
+		YOU_CAN_START_AT_THE_SCHEDULED_TIME = new NpcStringId(1010552);
+		UPPER_LEVEL_OF_THE_GIANTS_CAVE = new NpcStringId(1010554);
+		LOWER_LEVEL_OF_THE_GIANTS_CAVE = new NpcStringId(1010555);
+		IMMORTAL_PLATEAU_NORTHERN_REGION = new NpcStringId(1010556);
+		ELVEN_RUINS = new NpcStringId(1010557);
+		SINGING_WATERFALL = new NpcStringId(1010558);
+		TALKING_ISLAND_NORTHERN_TERRITORY = new NpcStringId(1010559);
+		ELVEN_FORTRESS = new NpcStringId(1010560);
+		PILGRIMS_TEMPLE = new NpcStringId(1010561);
+		GLUDIN_HARBOR = new NpcStringId(1010562);
+		SHILENS_GARDEN = new NpcStringId(1010563);
+		SCHOOL_OF_DARK_ARTS = new NpcStringId(1010564);
+		SWAMP_OF_SCREAMS = new NpcStringId(1010565);
+		THE_ANT_NEST = new NpcStringId(1010566);
+		WALL_OF_ARGOS = new NpcStringId(1010568);
+		DEN_OF_EVIL = new NpcStringId(1010569);
+		ICEMANS_HUT = new NpcStringId(1010570);
+		CRYPTS_OF_DISGRACE = new NpcStringId(1010571);
+		PLUNDEROUS_PLAINS = new NpcStringId(1010572);
+		PAVEL_RUINS = new NpcStringId(1010573);
+		TOWN_OF_SCHUTTGART = new NpcStringId(1010574);
+		MONASTERY_OF_SILENCE = new NpcStringId(1010575);
+		MONASTERY_OF_SILENCE_REAR_GATE = new NpcStringId(1010576);
+		STAKATO_NEST = new NpcStringId(1010577);
+		HOW_DARE_YOU_TRESPASS_INTO_MY_TERRITORY_HAVE_YOU_NO_FEAR = new NpcStringId(1010578);
+		FOOLS_WHY_HAVENT_YOU_FLED_YET_PREPARE_TO_LEARN_A_LESSON = new NpcStringId(1010579);
+		BWAH_HA_HA_YOUR_DOOM_IS_AT_HAND_BEHOLD_THE_ULTRA_SECRET_SUPER_WEAPON = new NpcStringId(1010580);
+		FOOLISH_INSIGNIFICANT_CREATURES_HOW_DARE_YOU_CHALLENGE_ME = new NpcStringId(1010581);
+		I_SEE_THAT_NONE_WILL_CHALLENGE_ME_NOW = new NpcStringId(1010582);
+		URGGH_YOU_WILL_PAY_DEARLY_FOR_THIS_INSULT = new NpcStringId(1010583);
+		WHAT_YOU_HAVENT_EVEN_TWO_PENNIES_TO_RUB_TOGETHER_HARUMPH = new NpcStringId(1010584);
+		FOREST_OF_MIRRORS = new NpcStringId(1010585);
+		THE_CENTER_OF_THE_FOREST_OF_MIRRORS = new NpcStringId(1010586);
+		SKY_WAGON_RELIC = new NpcStringId(1010588);
+		THE_CENTER_OF_THE_DARK_FOREST = new NpcStringId(1010590);
+		GRAVE_ROBBER_HIDEOUT = new NpcStringId(1010591);
+		FOREST_OF_THE_DEAD = new NpcStringId(1010592);
+		THE_CENTER_OF_THE_FOREST_OF_THE_DEAD = new NpcStringId(1010593);
+		MITHRIL_MINES = new NpcStringId(1010594);
+		THE_CENTER_OF_THE_MITHRIL_MINES = new NpcStringId(1010595);
+		ABANDONED_COAL_MINES = new NpcStringId(1010596);
+		THE_CENTER_OF_THE_ABANDONED_COAL_MINES = new NpcStringId(1010597);
+		IMMORTAL_PLATEAU_WESTERN_REGION = new NpcStringId(1010598);
+		VALLEY_OF_SAINTS = new NpcStringId(1010600);
+		THE_CENTER_OF_THE_VALLEY_OF_SAINTS = new NpcStringId(1010601);
+		CAVE_OF_TRIALS = new NpcStringId(1010603);
+		SEAL_OF_SHILEN = new NpcStringId(1010604);
+		THE_CENTER_OF_THE_WALL_OF_ARGOS = new NpcStringId(1010605);
+		THE_CENTER_OF_ALLIGATOR_ISLAND = new NpcStringId(1010606);
+		ANGHEL_WATERFALL = new NpcStringId(1010607);
+		CENTER_OF_THE_ELVEN_RUINS = new NpcStringId(1010608);
+		HOT_SPRINGS = new NpcStringId(1010609);
+		THE_CENTER_OF_THE_HOT_SPRINGS = new NpcStringId(1010610);
+		THE_CENTER_OF_DRAGON_VALLEY = new NpcStringId(1010611);
+		THE_CENTER_OF_THE_NEUTRAL_ZONE = new NpcStringId(1010613);
+		CRUMA_MARSHLANDS = new NpcStringId(1010614);
+		THE_CENTER_OF_THE_CRUMA_MARSHLANDS = new NpcStringId(1010615);
+		THE_CENTER_OF_THE_ENCHANTED_VALLEY = new NpcStringId(1010617);
+		ENCHANTED_VALLEY_SOUTHERN_REGION = new NpcStringId(1010618);
+		ENCHANTED_VALLEY_NORTHERN_REGION = new NpcStringId(1010619);
+		FROST_LAKE = new NpcStringId(1010620);
+		WASTELANDS = new NpcStringId(1010621);
+		WASTELANDS_WESTERN_REGION = new NpcStringId(1010622);
+		WHO_DARES_TO_COVET_THE_THRONE_OF_OUR_CASTLE_LEAVE_IMMEDIATELY_OR_YOU_WILL_PAY_THE_PRICE_OF_YOUR_AUDACITY_WITH_YOUR_VERY_OWN_BLOOD = new NpcStringId(1010623);
+		HMM_THOSE_WHO_ARE_NOT_OF_THE_BLOODLINE_ARE_COMING_THIS_WAY_TO_TAKE_OVER_THE_CASTLE_HUMPH_THE_BITTER_GRUDGES_OF_THE_DEAD_YOU_MUST_NOT_MAKE_LIGHT_OF_THEIR_POWER = new NpcStringId(1010624);
+		AARGH_IF_I_DIE_THEN_THE_MAGIC_FORCE_FIELD_OF_BLOOD_WILL = new NpcStringId(1010625);
+		ITS_NOT_OVER_YET_IT_WONT_BE_OVER_LIKE_THIS_NEVER = new NpcStringId(1010626);
+		OOOH_WHO_POURED_NECTAR_ON_MY_HEAD_WHILE_I_WAS_SLEEPING = new NpcStringId(1010627);
+		PLEASE_WAIT_A_MOMENT = new NpcStringId(1010628);
+		THE_WORD_YOU_NEED_THIS_TIME_IS_S1 = new NpcStringId(1010629);
+		INTRUDERS_SOUND_THE_ALARM = new NpcStringId(1010630);
+		DE_ACTIVATE_THE_ALARM = new NpcStringId(1010631);
+		OH_NO_THE_DEFENSES_HAVE_FAILED_IT_IS_TOO_DANGEROUS_TO_REMAIN_INSIDE_THE_CASTLE_FLEE_EVERY_MAN_FOR_HIMSELF = new NpcStringId(1010632);
+		THE_GAME_HAS_BEGUN_PARTICIPANTS_PREPARE_TO_LEARN_AN_IMPORTANT_WORD = new NpcStringId(1010633);
+		S1_TEAMS_JACKPOT_HAS_S2_PERCENT_OF_ITS_HP_REMAINING = new NpcStringId(1010634);
+		UNDECIDED = new NpcStringId(1010635);
+		HEH_HEH_I_SEE_THAT_THE_FEAST_HAS_BEGUN_BE_WARY_THE_CURSE_OF_THE_HELLMANN_FAMILY_HAS_POISONED_THIS_LAND = new NpcStringId(1010636);
+		ARISE_MY_FAITHFUL_SERVANTS_YOU_MY_PEOPLE_WHO_HAVE_INHERITED_THE_BLOOD_IT_IS_THE_CALLING_OF_MY_DAUGHTER_THE_FEAST_OF_BLOOD_WILL_NOW_BEGIN = new NpcStringId(1010637);
+		GRARR_FOR_THE_NEXT_2_MINUTES_OR_SO_THE_GAME_ARENA_ARE_WILL_BE_CLEANED_THROW_ANY_ITEMS_YOU_DONT_NEED_TO_THE_FLOOR_NOW = new NpcStringId(1010639);
+		GRARR_S1_TEAM_IS_USING_THE_HOT_SPRINGS_SULFUR_ON_THE_OPPONENTS_CAMP = new NpcStringId(1010640);
+		GRARR_S1_TEAM_IS_ATTEMPTING_TO_STEAL_THE_JACKPOT = new NpcStringId(1010641);
+		_VACANT_SEAT = new NpcStringId(1010642);
+		S1_MINUTES_REMAINING = new NpcStringId(1010643);
+		HOW_DARE_YOU_RUIN_THE_PERFORMANCE_OF_THE_DARK_CHOIR_UNFORGIVABLE = new NpcStringId(1010644);
+		GET_RID_OF_THE_INVADERS_WHO_INTERRUPT_THE_PERFORMANCE_OF_THE_DARK_CHOIR = new NpcStringId(1010645);
+		DONT_YOU_HEAR_THE_MUSIC_OF_DEATH_REVEAL_THE_HORROR_OF_THE_DARK_CHOIR = new NpcStringId(1010646);
+		THE_IMMORTAL_PLATEAU = new NpcStringId(1010647);
+		KAMAEL_VILLAGE = new NpcStringId(1010648);
+		ISLE_OF_SOULS_BASE = new NpcStringId(1010649);
+		GOLDEN_HILLS_BASE = new NpcStringId(1010650);
+		MIMIRS_FOREST_BASE = new NpcStringId(1010651);
+		ISLE_OF_SOULS_HARBOR = new NpcStringId(1010652);
+		STRONGHOLD_I = new NpcStringId(1010653);
+		STRONGHOLD_II = new NpcStringId(1010654);
+		STRONGHOLD_III = new NpcStringId(1010655);
+		FORTRESS_WEST_GATE = new NpcStringId(1010656);
+		FORTRESS_EAST_GATE = new NpcStringId(1010657);
+		FORTRESS_NORTH_GATE = new NpcStringId(1010658);
+		FORTRESS_SOUTH_GATE = new NpcStringId(1010659);
+		FRONT_OF_THE_VALLEY_FORTRESS = new NpcStringId(1010660);
+		GODDARD_TOWN_SQUARE = new NpcStringId(1010661);
+		FRONT_OF_THE_GODDARD_CASTLE_GATE = new NpcStringId(1010662);
+		GLUDIO_TOWN_SQUARE = new NpcStringId(1010663);
+		FRONT_OF_THE_GLUDIO_CASTLE_GATE = new NpcStringId(1010664);
+		GIRAN_TOWN_SQUARE = new NpcStringId(1010665);
+		FRONT_OF_THE_GIRAN_CASTLE_GATE = new NpcStringId(1010666);
+		FRONT_OF_THE_SOUTHERN_FORTRESS = new NpcStringId(1010667);
+		FRONT_OF_THE_SWAMP_FORTRESS = new NpcStringId(1010668);
+		DION_TOWN_SQUARE = new NpcStringId(1010669);
+		FRONT_OF_THE_DION_CASTLE_GATE = new NpcStringId(1010670);
+		RUNE_TOWN_SQUARE = new NpcStringId(1010671);
+		FRONT_OF_THE_RUNE_CASTLE_GATE = new NpcStringId(1010672);
+		FRONT_OF_THE_WHITE_SAND_FORTRESS = new NpcStringId(1010673);
+		FRONT_OF_THE_BASIN_FORTRESS = new NpcStringId(1010674);
+		FRONT_OF_THE_IVORY_FORTRESS = new NpcStringId(1010675);
+		SCHUTTGART_TOWN_SQUARE = new NpcStringId(1010676);
+		FRONT_OF_THE_SCHUTTGART_CASTLE_GATE = new NpcStringId(1010677);
+		ADEN_TOWN_SQUARE = new NpcStringId(1010678);
+		FRONT_OF_THE_ADEN_CASTLE_GATE = new NpcStringId(1010679);
+		FRONT_OF_THE_SHANTY_FORTRESS = new NpcStringId(1010680);
+		OREN_TOWN_SQUARE = new NpcStringId(1010681);
+		FRONT_OF_THE_OREN_CASTLE_GATE = new NpcStringId(1010682);
+		FRONT_OF_THE_ARCHAIC_FORTRESS = new NpcStringId(1010683);
+		FRONT_OF_THE_INNADRIL_CASTLE_GATE = new NpcStringId(1010684);
+		FRONT_OF_THE_BORDER_FORTRESS = new NpcStringId(1010685);
+		HEINE_TOWN_SQUARE = new NpcStringId(1010686);
+		FRONT_OF_THE_HIVE_FORTRESS = new NpcStringId(1010687);
+		FRONT_OF_THE_NARSELL_FORTRESS = new NpcStringId(1010688);
+		FRONT_OF_THE_GLUDIO_CASTLE = new NpcStringId(1010689);
+		FRONT_OF_THE_DION_CASTLE = new NpcStringId(1010690);
+		FRONT_OF_THE_GIRAN_CASTLE = new NpcStringId(1010691);
+		FRONT_OF_THE_OREN_CASTLE = new NpcStringId(1010692);
+		FRONT_OF_THE_ADEN_CASTLE = new NpcStringId(1010693);
+		FRONT_OF_THE_INNADRIL_CASTLE = new NpcStringId(1010694);
+		FRONT_OF_THE_GODDARD_CASTLE = new NpcStringId(1010695);
+		FRONT_OF_THE_RUNE_CASTLE = new NpcStringId(1010696);
+		FRONT_OF_THE_SCHUTTGART_CASTLE = new NpcStringId(1010697);
+		PRIMEVAL_ISLE_WHARF = new NpcStringId(1010698);
+		ISLE_OF_PRAYER = new NpcStringId(1010699);
+		MITHRIL_MINES_WESTERN_ENTRANCE = new NpcStringId(1010700);
+		MITHRIL_MINES_EASTERN_ENTRANCE = new NpcStringId(1010701);
+		THE_GIANTS_CAVE_UPPER_LAYER = new NpcStringId(1010702);
+		THE_GIANTS_CAVE_LOWER_LAYER = new NpcStringId(1010703);
+		FIELD_OF_SILENCE_CENTER = new NpcStringId(1010704);
+		FIELD_OF_WHISPERS_CENTER = new NpcStringId(1010705);
+		SHYEEDS_CAVERN = new NpcStringId(1010706);
+		SEED_OF_INFINITY_DOCK = new NpcStringId(1010709);
+		SEED_OF_DESTRUCTION_DOCK = new NpcStringId(1010710);
+		SEED_OF_ANNIHILATION_DOCK = new NpcStringId(1010711);
+		TOWN_OF_ADEN_EINHASAD_TEMPLE_PRIEST_WOOD = new NpcStringId(1010712);
+		HUNTERS_VILLAGE_SEPARATED_SOUL_FRONT = new NpcStringId(1010713);
+		WHAT_TOOK_SO_LONG_I_WAITED_FOR_EVER = new NpcStringId(1029350);
+		I_MUST_ASK_LIBRARIAN_SOPHIA_ABOUT_THE_BOOK = new NpcStringId(1029351);
+		THIS_LIBRARY_ITS_HUGE_BUT_THERE_ARENT_MANY_USEFUL_BOOKS_RIGHT = new NpcStringId(1029352);
+		AN_UNDERGROUND_LIBRARY_I_HATE_DAMP_AND_SMELLY_PLACES = new NpcStringId(1029353);
+		THE_BOOK_THAT_WE_SEEK_IS_CERTAINLY_HERE_SEARCH_INCH_BY_INCH = new NpcStringId(1029354);
+		WE_MUST_SEARCH_HIGH_AND_LOW_IN_EVERY_ROOM_FOR_THE_READING_DESK_THAT_CONTAINS_THE_BOOK_WE_SEEK = new NpcStringId(1029450);
+		REMEMBER_THE_CONTENT_OF_THE_BOOKS_THAT_YOU_FOUND_YOU_CANT_TAKE_THEM_OUT_WITH_YOU = new NpcStringId(1029451);
+		IT_SEEMS_THAT_YOU_CANNOT_REMEMBER_TO_THE_ROOM_OF_THE_WATCHER_WHO_FOUND_THE_BOOK = new NpcStringId(1029452);
+		YOUR_WORK_HERE_IS_DONE_SO_RETURN_TO_THE_CENTRAL_GUARDIAN = new NpcStringId(1029453);
+		YOU_FOOLISH_INVADERS_WHO_DISTURB_THE_REST_OF_SOLINA_BE_GONE_FROM_THIS_PLACE = new NpcStringId(1029460);
+		I_KNOW_NOT_WHAT_YOU_SEEK_BUT_THIS_TRUTH_CANNOT_BE_HANDLED_BY_MERE_HUMANS = new NpcStringId(1029461);
+		I_WILL_NOT_STAND_BY_AND_WATCH_YOUR_FOOLISH_ACTIONS_I_WARN_YOU_LEAVE_THIS_PLACE_AT_ONCE = new NpcStringId(1029462);
+		THE_GUARDIAN_OF_THE_SEAL_DOESNT_SEEM_TO_GET_INJURED_AT_ALL_UNTIL_THE_BARRIER_IS_DESTROYED = new NpcStringId(1029550);
+		THE_DEVICE_LOCATED_IN_THE_ROOM_IN_FRONT_OF_THE_GUARDIAN_OF_THE_SEAL_IS_DEFINITELY_THE_BARRIER_THAT_CONTROLS_THE_GUARDIANS_POWER = new NpcStringId(1029551);
+		TO_REMOVE_THE_BARRIER_YOU_MUST_FIND_THE_RELICS_THAT_FIT_THE_BARRIER_AND_ACTIVATE_THE_DEVICE = new NpcStringId(1029552);
+		ALL_THE_GUARDIANS_WERE_DEFEATED_AND_THE_SEAL_WAS_REMOVED_TELEPORT_TO_THE_CENTER = new NpcStringId(1029553);
+		_IS_THE_PROCESS_OF_STANDING_UP = new NpcStringId(1110071);
+		_IS_THE_PROCESS_OF_SITTING_DOWN = new NpcStringId(1110072);
+		IT_IS_POSSIBLE_TO_USE_A_SKILL_WHILE_SITTING_DOWN = new NpcStringId(1110073);
+		IS_OUT_OF_RANGE = new NpcStringId(1110074);
+		THANK_YOU_MY_BOOK_CHILD = new NpcStringId(1120300);
+		KILLED_BY_S2 = new NpcStringId(1120301);
+		STEWARD_PLEASE_WAIT_A_MOMENT = new NpcStringId(1121000);
+		STEWARD_PLEASE_RESTORE_THE_QUEENS_FORMER_APPEARANCE = new NpcStringId(1121001);
+		STEWARD_WASTE_NO_TIME_PLEASE_HURRY = new NpcStringId(1121002);
+		STEWARD_WAS_IT_INDEED_TOO_MUCH_TO_ASK = new NpcStringId(1121003);
+		FREYA_HEATHENS_FEEL_MY_CHILL = new NpcStringId(1121004);
+		ATTENTION_PLEASE_THE_GATES_WILL_BE_CLOSING_SHORTLY_ALL_VISITORS_TO_THE_QUEENS_CASTLE_SHOULD_LEAVE_IMMEDIATELY = new NpcStringId(1121005);
+		YOU_CANNOT_CARRY_A_WEAPON_WITHOUT_AUTHORIZATION = new NpcStringId(1121006);
+		ARE_YOU_TRYING_TO_DECEIVE_ME_IM_DISAPPOINTED = new NpcStringId(1121007);
+		N30_MINUTES_REMAIN = new NpcStringId(1121008);
+		N20_MINUTES_REMAIN = new NpcStringId(1121009);
+		CHILLY_CODA = new NpcStringId(1200001);
+		BURNING_CODA = new NpcStringId(1200002);
+		BLUE_CODA = new NpcStringId(1200003);
+		RED_CODA = new NpcStringId(1200004);
+		GOLDEN_CODA = new NpcStringId(1200005);
+		DESERT_CODA = new NpcStringId(1200006);
+		LUTE_CODA = new NpcStringId(1200007);
+		TWIN_CODA = new NpcStringId(1200008);
+		DARK_CODA = new NpcStringId(1200009);
+		SHINING_CODA = new NpcStringId(1200010);
+		CHILLY_COBOL = new NpcStringId(1200011);
+		BURNING_COBOL = new NpcStringId(1200012);
+		BLUE_COBOL = new NpcStringId(1200013);
+		RED_COBOL = new NpcStringId(1200014);
+		GOLDEN_COBOL = new NpcStringId(1200015);
+		DESERT_COBOL = new NpcStringId(1200016);
+		SEA_COBOL = new NpcStringId(1200017);
+		THORN_COBOL = new NpcStringId(1200018);
+		DAPPLE_COBOL = new NpcStringId(1200019);
+		GREAT_COBOL = new NpcStringId(1200020);
+		CHILLY_CODRAN = new NpcStringId(1200021);
+		BURNING_CODRAN = new NpcStringId(1200022);
+		BLUE_CODRAN = new NpcStringId(1200023);
+		RED_CODRAN = new NpcStringId(1200024);
+		DAPPLE_CODRAN = new NpcStringId(1200025);
+		DESERT_CODRAN = new NpcStringId(1200026);
+		SEA_CODRAN = new NpcStringId(1200027);
+		TWIN_CODRAN = new NpcStringId(1200028);
+		THORN_CODRAN = new NpcStringId(1200029);
+		GREAT_CODRAN = new NpcStringId(1200030);
+		ALTERNATIVE_DARK_CODA = new NpcStringId(1200031);
+		ALTERNATIVE_RED_CODA = new NpcStringId(1200032);
+		ALTERNATIVE_CHILLY_CODA = new NpcStringId(1200033);
+		ALTERNATIVE_BLUE_CODA = new NpcStringId(1200034);
+		ALTERNATIVE_GOLDEN_CODA = new NpcStringId(1200035);
+		ALTERNATIVE_LUTE_CODA = new NpcStringId(1200036);
+		ALTERNATIVE_DESERT_CODA = new NpcStringId(1200037);
+		ALTERNATIVE_RED_COBOL = new NpcStringId(1200038);
+		ALTERNATIVE_CHILLY_COBOL = new NpcStringId(1200039);
+		ALTERNATIVE_BLUE_COBOL = new NpcStringId(1200040);
+		ALTERNATIVE_THORN_COBOL = new NpcStringId(1200041);
+		ALTERNATIVE_GOLDEN_COBOL = new NpcStringId(1200042);
+		ALTERNATIVE_GREAT_COBOL = new NpcStringId(1200043);
+		ALTERNATIVE_RED_CODRAN = new NpcStringId(1200044);
+		ALTERNATIVE_SEA_CODRAN = new NpcStringId(1200045);
+		ALTERNATIVE_CHILLY_CODRAN = new NpcStringId(1200046);
+		ALTERNATIVE_BLUE_CODRAN = new NpcStringId(1200047);
+		ALTERNATIVE_TWIN_CODRAN = new NpcStringId(1200048);
+		ALTERNATIVE_GREAT_CODRAN = new NpcStringId(1200049);
+		ALTERNATIVE_DESERT_CODRAN = new NpcStringId(1200050);
+		WE_HAVE_BROKEN_THROUGH_THE_GATE_DESTROY_THE_ENCAMPMENT_AND_MOVE_TO_THE_COMMAND_POST = new NpcStringId(1300001);
+		THE_COMMAND_GATE_HAS_OPENED_CAPTURE_THE_FLAG_QUICKLY_AND_RAISE_IT_HIGH_TO_PROCLAIM_OUR_VICTORY = new NpcStringId(1300002);
+		THE_GODS_HAVE_FORSAKEN_US_RETREAT = new NpcStringId(1300003);
+		YOU_MAY_HAVE_BROKEN_OUR_ARROWS_BUT_YOU_WILL_NEVER_BREAK_OUR_WILL_ARCHERS_RETREAT = new NpcStringId(1300004);
+		AT_LAST_THE_MAGIC_FIELD_THAT_PROTECTS_THE_FORTRESS_HAS_WEAKENED_VOLUNTEERS_STAND_BACK = new NpcStringId(1300005);
+		AIIEEEE_COMMAND_CENTER_THIS_IS_GUARD_UNIT_WE_NEED_BACKUP_RIGHT_AWAY = new NpcStringId(1300006);
+		FORTRESS_POWER_DISABLED = new NpcStringId(1300007);
+		OH_MY_WHAT_HAS_BECOME_OF_ME_MY_FAME_MY_FRIENDS_LOST_ALL_LOST = new NpcStringId(1300008);
+		MACHINE_NO_1_POWER_OFF = new NpcStringId(1300009);
+		MACHINE_NO_2_POWER_OFF = new NpcStringId(1300010);
+		MACHINE_NO_3_POWER_OFF = new NpcStringId(1300011);
+		EVERYONE_CONCENTRATE_YOUR_ATTACKS_ON_S1_SHOW_THE_ENEMY_YOUR_RESOLVE = new NpcStringId(1300012);
+		ATTACKING_THE_ENEMYS_REINFORCEMENTS_IS_NECESSARY_TIME_TO_DIE = new NpcStringId(1300013);
+		SPIRIT_OF_FIRE_UNLEASH_YOUR_POWER_BURN_THE_ENEMY = new NpcStringId(1300014);
+		HEY_THESE_FOES_ARE_TOUGHER_THAN_THEY_LOOK_IM_GOING_TO_NEED_SOME_HELP_HERE = new NpcStringId(1300015);
+		DO_YOU_NEED_MY_POWER_YOU_SEEM_TO_BE_STRUGGLING = new NpcStringId(1300016);
+		IM_RATHER_BUSY_HERE_AS_WELL = new NpcStringId(1300017);
+		DONT_THINK_THAT_ITS_GONNA_END_LIKE_THIS_YOUR_AMBITION_WILL_SOON_BE_DESTROYED_AS_WELL = new NpcStringId(1300018);
+		YOU_MUST_HAVE_BEEN_PREPARED_TO_DIE = new NpcStringId(1300019);
+		I_FEEL_SO_MUCH_GRIEF_THAT_I_CANT_EVEN_TAKE_CARE_OF_MYSELF_THERE_ISNT_ANY_REASON_FOR_ME_TO_STAY_HERE_ANY_LONGER = new NpcStringId(1300020);
+		SHANTY_FORTRESS = new NpcStringId(1300101);
+		SOUTHERN_FORTRESS = new NpcStringId(1300102);
+		HIVE_FORTRESS = new NpcStringId(1300103);
+		VALLEY_FORTRESS = new NpcStringId(1300104);
+		IVORY_FORTRESS = new NpcStringId(1300105);
+		NARSELL_FORTRESS = new NpcStringId(1300106);
+		BASIN_FORTRESS = new NpcStringId(1300107);
+		WHITE_SANDS_FORTRESS = new NpcStringId(1300108);
+		BORDERLAND_FORTRESS = new NpcStringId(1300109);
+		SWAMP_FORTRESS = new NpcStringId(1300110);
+		ARCHAIC_FORTRESS = new NpcStringId(1300111);
+		FLORAN_FORTRESS = new NpcStringId(1300112);
+		CLOUD_MOUNTAIN_FORTRESS = new NpcStringId(1300113);
+		TANOR_FORTRESS = new NpcStringId(1300114);
+		DRAGONSPINE_FORTRESS = new NpcStringId(1300115);
+		ANTHARASS_FORTRESS = new NpcStringId(1300116);
+		WESTERN_FORTRESS = new NpcStringId(1300117);
+		HUNTERS_FORTRESS = new NpcStringId(1300118);
+		AARU_FORTRESS = new NpcStringId(1300119);
+		DEMON_FORTRESS = new NpcStringId(1300120);
+		MONASTIC_FORTRESS = new NpcStringId(1300121);
+		INDEPENDENT_STATE = new NpcStringId(1300122);
+		NONPARTISAN = new NpcStringId(1300123);
+		CONTRACT_STATE = new NpcStringId(1300124);
+		FIRST_PASSWORD_HAS_BEEN_ENTERED = new NpcStringId(1300125);
+		SECOND_PASSWORD_HAS_BEEN_ENTERED = new NpcStringId(1300126);
+		PASSWORD_HAS_NOT_BEEN_ENTERED = new NpcStringId(1300127);
+		ATTEMPT_S1_3_IS_IN_PROGRESS_THIS_IS_THE_THIRD_ATTEMPT_ON_S1 = new NpcStringId(1300128);
+		THE_1ST_MARK_IS_CORRECT = new NpcStringId(1300129);
+		THE_2ND_MARK_IS_CORRECT = new NpcStringId(1300130);
+		THE_MARKS_HAVE_NOT_BEEN_ASSEMBLED = new NpcStringId(1300131);
+		OLYMPIAD_CLASS_FREE_TEAM_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT = new NpcStringId(1300132);
+		DOMAIN_FORTRESS = new NpcStringId(1300133);
+		BOUNDARY_FORTRESS = new NpcStringId(1300134);
+		S1HOUR_S2MINUTE = new NpcStringId(1300135);
+		NOT_DESIGNATED = new NpcStringId(1300136);
+		WARRIORS_HAVE_YOU_COME_TO_HELP_THOSE_WHO_ARE_IMPRISONED_HERE = new NpcStringId(1300137);
+		TAKE_THAT_YOU_WEAKLING = new NpcStringId(1300138);
+		BEHOLD_MY_MIGHT = new NpcStringId(1300139);
+		YOUR_MIND_IS_GOING_BLANK = new NpcStringId(1300140);
+		UGH_IT_HURTS_DOWN_TO_THE_BONES = new NpcStringId(1300141);
+		I_CANT_STAND_IT_ANYMORE_AAH = new NpcStringId(1300142);
+		KYAAAK = new NpcStringId(1300143);
+		GASP_HOW_CAN_THIS_BE = new NpcStringId(1300144);
+		ILL_RIP_THE_FLESH_FROM_YOUR_BONES = new NpcStringId(1300145);
+		YOULL_FLOUNDER_IN_DELUSION_FOR_THE_REST_OF_YOUR_LIFE = new NpcStringId(1300146);
+		THERE_IS_NO_ESCAPE_FROM_THIS_PLACE = new NpcStringId(1300147);
+		HOW_DARE_YOU = new NpcStringId(1300148);
+		I_SHALL_DEFEAT_YOU = new NpcStringId(1300149);
+		BEGIN_STAGE_1 = new NpcStringId(1300150);
+		BEGIN_STAGE_2 = new NpcStringId(1300151);
+		BEGIN_STAGE_3 = new NpcStringId(1300152);
+		YOUVE_DONE_IT_WE_BELIEVED_IN_YOU_WARRIOR_WE_WANT_TO_SHOW_OUR_SINCERITY_THOUGH_IT_IS_SMALL_PLEASE_GIVE_ME_SOME_OF_YOUR_TIME = new NpcStringId(1300153);
+		THE_CENTRAL_STRONGHOLDS_COMPRESSOR_IS_WORKING = new NpcStringId(1300154);
+		STRONGHOLD_IS_COMPRESSOR_IS_WORKING = new NpcStringId(1300155);
+		STRONGHOLD_IIS_COMPRESSOR_IS_WORKING = new NpcStringId(1300156);
+		STRONGHOLD_IIIS_COMPRESSOR_IS_WORKING = new NpcStringId(1300157);
+		THE_CENTRAL_STRONGHOLDS_COMPRESSOR_HAS_BEEN_DESTROYED = new NpcStringId(1300158);
+		STRONGHOLD_IS_COMPRESSOR_HAS_BEEN_DESTROYED = new NpcStringId(1300159);
+		STRONGHOLD_IIS_COMPRESSOR_HAS_BEEN_DESTROYED = new NpcStringId(1300160);
+		STRONGHOLD_IIIS_COMPRESSOR_HAS_BEEN_DESTROYED = new NpcStringId(1300161);
+		WHAT_A_PREDICAMENT_MY_ATTEMPTS_WERE_UNSUCCESSFUL = new NpcStringId(1300162);
+		COURAGE_AMBITION_PASSION_MERCENARIES_WHO_WANT_TO_REALIZE_THEIR_DREAM_OF_FIGHTING_IN_THE_TERRITORY_WAR_COME_TO_ME_FORTUNE_AND_GLORY_ARE_WAITING_FOR_YOU = new NpcStringId(1300163);
+		DO_YOU_WISH_TO_FIGHT_ARE_YOU_AFRAID_NO_MATTER_HOW_HARD_YOU_TRY_YOU_HAVE_NOWHERE_TO_RUN_BUT_IF_YOU_FACE_IT_HEAD_ON_OUR_MERCENARY_TROOP_WILL_HELP_YOU_OUT = new NpcStringId(1300164);
+		CHARGE_CHARGE_CHARGE = new NpcStringId(1300165);
+		OLYMPIAD_CLASS_FREE_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT = new NpcStringId(1300166);
+		OLYMPIAD_CLASS_INDIVIDUAL_MATCH_IS_GOING_TO_BEGIN_IN_ARENA_S1_IN_A_MOMENT = new NpcStringId(1300167);
+		ANOTHER_PLAYER_IS_CURRENTLY_BEING_BUFFED_PLEASE_TRY_AGAIN_IN_A_MOMENT = new NpcStringId(1600001);
+		YOU_CANNOT_MOUNT_WHILE_YOU_ARE_POLYMORPHED = new NpcStringId(1600002);
+		YOU_CANNOT_MOUNT_A_WYVERN_WHILE_IN_BATTLE_MODE_OR_WHILE_MOUNTED_ON_A_STRIDER = new NpcStringId(1600003);
+		BOO_HOO_I_HATE = new NpcStringId(1600004);
+		SEE_YOU_LATER = new NpcStringId(1600005);
+		YOUVE_MADE_A_GREAT_CHOICE = new NpcStringId(1600006);
+		THANKS_I_FEEL_MORE_RELAXED = new NpcStringId(1600007);
+		DID_YOU_SEE_THAT_FIRECRACKER_EXPLODE = new NpcStringId(1600008);
+		I_AM_NOTHING = new NpcStringId(1600009);
+		I_AM_TELLING_THE_TRUTH = new NpcStringId(1600010);
+		ITS_FREE_TO_GO_BACK_TO_THE_VILLAGE_YOU_TELEPORTED_FROM = new NpcStringId(1600012);
+		IF_YOU_COLLECT_50_INDIVIDUAL_TREASURE_SACK_PIECES_YOU_CAN_EXCHANGE_THEM_FOR_A_TREASURE_SACK = new NpcStringId(1600013);
+		YOU_MUST_BE_TRANSFORMED_INTO_A_TREASURE_HUNTER_TO_FIND_A_CHEST = new NpcStringId(1600014);
+		YOUD_BETTER_USE_THE_TRANSFORMATION_SPELL_AT_THE_RIGHT_MOMENT_SINCE_IT_DOESNT_LAST_LONG = new NpcStringId(1600015);
+		ALL_OF_FANTASY_ISLE_IS_A_PEACE_ZONE = new NpcStringId(1600016);
+		IF_YOU_NEED_TO_GO_TO_FANTASY_ISLE_COME_SEE_ME = new NpcStringId(1600017);
+		YOU_CAN_ONLY_PURCHASE_A_TREASURE_HUNTER_TRANSFORMATION_SCROLL_ONCE_EVERY_12_HOURS = new NpcStringId(1600018);
+		IF_YOUR_MEANS_OF_ARRIVAL_WAS_A_BIT_UNCONVENTIONAL_THEN_ILL_BE_SENDING_YOU_BACK_TO_RUNE_TOWNSHIP_WHICH_IS_THE_NEAREST_TOWN = new NpcStringId(1600019);
+		RATTLE = new NpcStringId(1600020);
+		BUMP = new NpcStringId(1600021);
+		YOU_WILL_REGRET_THIS = new NpcStringId(1600022);
+		CARE_TO_CHALLENGE_FATE_AND_TEST_YOUR_LUCK = new NpcStringId(1600023);
+		DONT_PASS_UP_THE_CHANCE_TO_WIN_AN_S80_WEAPON = new NpcStringId(1600024);
+		_S1S_COMMAND_CHANNEL_HAS_LOOTING_RIGHTS = new NpcStringId(1800009);
+		LOOTING_RULES_ARE_NO_LONGER_ACTIVE = new NpcStringId(1800010);
+		OUR_MASTER_NOW_COMES_TO_CLAIM_OUR_VENGEANCE_SOON_YOU_WILL_ALL_BE_NOTHING_MORE_THAN_DIRT = new NpcStringId(1800011);
+		DEATH_TO_THOSE_WHO_CHALLENGE_THE_LORDS_OF_DAWN = new NpcStringId(1800012);
+		DEATH_TO_THOSE_WHO_CHALLENGE_THE_LORD = new NpcStringId(1800013);
+		OINK_OINK_PIGS_CAN_DO_IT_TOO_ANTHARAS_SURPASSING_SUPER_POWERED_PIG_STUN_HOW_DO_LIKE_THEM_APPLES = new NpcStringId(1800014);
+		OINK_OINK_TAKE_THAT_VALAKAS_TERRORIZING_ULTRA_PIG_FEAR_HA_HA = new NpcStringId(1800015);
+		OINK_OINK_GO_AWAY_STOP_BOTHERING_ME = new NpcStringId(1800016);
+		OINK_OINK_PIGS_OF_THE_WORLD_UNITE_LETS_SHOW_THEM_OUR_STRENGTH = new NpcStringId(1800017);
+		YOU_HEALED_ME_THANKS_A_LOT_OINK_OINK = new NpcStringId(1800018);
+		OINK_OINK_THIS_TREATMENT_HURTS_TOO_MUCH_ARE_YOU_SURE_THAT_YOURE_TRYING_TO_HEAL_ME = new NpcStringId(1800019);
+		OINK_OINK_TRANSFORM_WITH_MOON_CRYSTAL_PRISM_POWER = new NpcStringId(1800020);
+		OINK_OINK_NOOO_I_DONT_WANT_TO_GO_BACK_TO_NORMAL = new NpcStringId(1800021);
+		OINK_OINK_IM_RICH_SO_IVE_GOT_PLENTY_TO_SHARE_THANKS = new NpcStringId(1800022);
+		ITS_A_WEAPON_SURROUNDED_BY_AN_OMINOUS_AURA_ILL_DISCARD_IT_BECAUSE_IT_MAY_BE_DANGEROUS_MISS = new NpcStringId(1800023);
+		THANK_YOU_FOR_SAVING_ME_FROM_THE_CLUTCHES_OF_EVIL = new NpcStringId(1800024);
+		THAT_IS_IT_FOR_TODAYLETS_RETREAT_EVERYONE_PULL_BACK = new NpcStringId(1800025);
+		THANK_YOU_FOR_THE_RESCUE_ITS_A_SMALL_GIFT = new NpcStringId(1800026);
+		S1_YOU_DONT_HAVE_A_RED_CRYSTAL = new NpcStringId(1800027);
+		S1_YOU_DONT_HAVE_A_BLUE_CRYSTAL = new NpcStringId(1800028);
+		S1_YOU_DONT_HAVE_A_CLEAR_CRYSTAL = new NpcStringId(1800029);
+		S1_IF_YOU_ARE_TOO_FAR_AWAY_FROM_MEI_CANT_LET_YOU_GO = new NpcStringId(1800030);
+		AN_ALARM_HAS_BEEN_SET_OFF_EVERYBODY_WILL_BE_IN_DANGER_IF_THEY_ARE_NOT_TAKEN_CARE_OF_IMMEDIATELY = new NpcStringId(1800031);
+		IT_WILL_NOT_BE_THAT_EASY_TO_KILL_ME = new NpcStringId(1800032);
+		NOYOU_KNEW_MY_WEAKNESS = new NpcStringId(1800033);
+		HELLO_IS_ANYONE_THERE = new NpcStringId(1800034);
+		IS_NO_ONE_THERE_HOW_LONG_HAVE_I_BEEN_HIDING_I_HAVE_BEEN_STARVING_FOR_DAYS_AND_CANNOT_HOLD_OUT_ANYMORE = new NpcStringId(1800035);
+		IF_SOMEONE_WOULD_GIVE_ME_SOME_OF_THOSE_TASTY_CRYSTAL_FRAGMENTS_I_WOULD_GLADLY_TELL_THEM_WHERE_TEARS_IS_HIDING_YUMMY_YUMMY = new NpcStringId(1800036);
+		HEY_YOU_FROM_ABOVE_THE_GROUND_LETS_SHARE_SOME_CRYSTAL_FRAGMENTS_IF_YOU_HAVE_ANY = new NpcStringId(1800037);
+		CRISPY_AND_COLD_FEELING_TEEHEE_DELICIOUS = new NpcStringId(1800038);
+		YUMMY_THIS_IS_SO_TASTY = new NpcStringId(1800039);
+		SNIFF_SNIFF_GIVE_ME_MORE_CRYSTAL_FRAGMENTS = new NpcStringId(1800040);
+		HOW_INSENSITIVE_ITS_NOT_NICE_TO_GIVE_ME_JUST_A_PIECE_CANT_YOU_GIVE_ME_MORE = new NpcStringId(1800041);
+		AH_IM_HUNGRY = new NpcStringId(1800042);
+		IM_THE_REAL_ONE = new NpcStringId(1800043);
+		PICK_ME = new NpcStringId(1800044);
+		TRUST_ME = new NpcStringId(1800045);
+		NOT_THAT_DUDE_IM_THE_REAL_ONE = new NpcStringId(1800046);
+		DONT_BE_FOOLED_DONT_BE_FOOLED_IM_THE_REAL_ONE = new NpcStringId(1800047);
+		JUST_ACT_LIKE_THE_REAL_ONE_OOPS = new NpcStringId(1800048);
+		YOUVE_BEEN_FOOLED = new NpcStringId(1800049);
+		SORRY_BUT_IM_THE_FAKE_ONE = new NpcStringId(1800050);
+		IM_THE_REAL_ONE_PHEW = new NpcStringId(1800051);
+		CANT_YOU_EVEN_FIND_OUT = new NpcStringId(1800052);
+		FIND_ME = new NpcStringId(1800053);
+		HUH_HOW_DID_YOU_KNOW_IT_WAS_ME = new NpcStringId(1800054);
+		EXCELLENT_CHOICE_TEEHEE = new NpcStringId(1800055);
+		YOUVE_DONE_WELL = new NpcStringId(1800056);
+		OH_VERY_SENSIBLE = new NpcStringId(1800057);
+		BEHOLD_THE_MIGHTY_POWER_OF_BAYLOR_FOOLISH_MORTAL = new NpcStringId(1800058);
+		NO_ONE_IS_GOING_TO_SURVIVE = new NpcStringId(1800059);
+		YOULL_SEE_WHAT_HELL_IS_LIKE = new NpcStringId(1800060);
+		YOU_WILL_BE_PUT_IN_JAIL = new NpcStringId(1800061);
+		WORTHLESS_CREATURE_GO_TO_HELL = new NpcStringId(1800062);
+		ILL_GIVE_YOU_SOMETHING_THAT_YOULL_NEVER_FORGET = new NpcStringId(1800063);
+		WHY_DID_YOU_TRUST_TO_CHOOSE_ME_HAHAHAHA = new NpcStringId(1800064);
+		ILL_MAKE_YOU_REGRET_THAT_YOU_EVER_CHOSE_ME = new NpcStringId(1800065);
+		DONT_EXPECT_TO_GET_OUT_ALIVE = new NpcStringId(1800066);
+		DEMON_KING_BELETH_GIVE_ME_THE_POWER_AAAHH = new NpcStringId(1800067);
+		NO_I_FEEL_THE_POWER_OF_FAFURION = new NpcStringId(1800068);
+		FAFURION_PLEASE_GIVE_POWER_TO_THIS_HELPLESS_WITCH = new NpcStringId(1800069);
+		I_CANT_HELP_YOU_MUCH_BUT_I_CAN_WEAKEN_THE_POWER_OF_BAYLOR_SINCE_IM_LOCKED_UP_HERE = new NpcStringId(1800070);
+		YOUR_SKILL_IS_IMPRESSIVE_ILL_ADMIT_THAT_YOU_ARE_GOOD_ENOUGH_TO_PASS_TAKE_THE_KEY_AND_LEAVE_THIS_PLACE = new NpcStringId(1800071);
+		GIVE_ME_ALL_YOU_HAVE_ITS_THE_ONLY_WAY_ILL_LET_YOU_LIVE = new NpcStringId(1800072);
+		HUN_HUNGRY = new NpcStringId(1800073);
+		DONT_BE_LAZY_YOU_BASTARDS = new NpcStringId(1800074);
+		THEY_ARE_JUST_HENCHMEN_OF_THE_IRON_CASTLE_WHY_DID_WE_HIDE = new NpcStringId(1800075);
+		GUYS_SHOW_THEM_OUR_POWER = new NpcStringId(1800076);
+		YOU_HAVE_FINALLY_COME_HERE_BUT_YOU_WILL_NOT_BE_ABLE_TO_FIND_THE_SECRET_ROOM = new NpcStringId(1800077);
+		YOU_HAVE_DONE_WELL_IN_FINDING_ME_BUT_I_CANNOT_JUST_HAND_YOU_THE_KEY = new NpcStringId(1800078);
+		S1_SECONDS_REMAINING = new NpcStringId(1800079);
+		THE_MATCH_IS_AUTOMATICALLY_CANCELED_BECAUSE_YOU_ARE_TOO_FAR_FROM_THE_ADMISSION_MANAGER = new NpcStringId(1800081);
+		UGH_I_HAVE_BUTTERFLIES_IN_MY_STOMACH_THE_SHOW_STARTS_SOON = new NpcStringId(1800082);
+		THANK_YOU_ALL_FOR_COMING_HERE_TONIGHT = new NpcStringId(1800083);
+		IT_IS_AN_HONOR_TO_HAVE_THE_SPECIAL_SHOW_TODAY = new NpcStringId(1800084);
+		FANTASY_ISLE_IS_FULLY_COMMITTED_TO_YOUR_HAPPINESS = new NpcStringId(1800085);
+		NOW_ID_LIKE_TO_INTRODUCE_THE_MOST_BEAUTIFUL_SINGER_IN_ADEN_PLEASE_WELCOMELEYLA_MIRA = new NpcStringId(1800086);
+		HERE_SHE_COMES = new NpcStringId(1800087);
+		THANK_YOU_VERY_MUCH_LEYLA = new NpcStringId(1800088);
+		NOW_WERE_IN_FOR_A_REAL_TREAT = new NpcStringId(1800089);
+		JUST_BACK_FROM_THEIR_WORLD_TOUR_PUT_YOUR_HANDS_TOGETHER_FOR_THE_FANTASY_ISLE_CIRCUS = new NpcStringId(1800090);
+		COME_ON_EVERYONE = new NpcStringId(1800091);
+		DID_YOU_LIKE_IT_THAT_WAS_SO_AMAZING = new NpcStringId(1800092);
+		NOW_WE_ALSO_INVITED_INDIVIDUALS_WITH_SPECIAL_TALENTS = new NpcStringId(1800093);
+		LETS_WELCOME_THE_FIRST_PERSON_HERE = new NpcStringId(1800094);
+		OH = new NpcStringId(1800095);
+		OKAY_NOW_HERE_COMES_THE_NEXT_PERSON_COME_ON_UP_PLEASE = new NpcStringId(1800096);
+		OH_IT_LOOKS_LIKE_SOMETHING_GREAT_IS_GOING_TO_HAPPEN_RIGHT = new NpcStringId(1800097);
+		OH_MY = new NpcStringId(1800098);
+		THATS_G_GREAT_NOW_HERE_COMES_THE_LAST_PERSON = new NpcStringId(1800099);
+		NOW_THIS_IS_THE_END_OF_TODAYS_SHOW = new NpcStringId(1800100);
+		HOW_WAS_IT_I_HOPE_YOU_ALL_ENJOYED_IT = new NpcStringId(1800101);
+		PLEASE_REMEMBER_THAT_FANTASY_ISLE_IS_ALWAYS_PLANNING_A_LOT_OF_GREAT_SHOWS_FOR_YOU = new NpcStringId(1800102);
+		WELL_I_WISH_I_COULD_CONTINUE_ALL_NIGHT_LONG_BUT_THIS_IS_IT_FOR_TODAY_THANK_YOU = new NpcStringId(1800103);
+		WE_LOVE_YOU = new NpcStringId(1800104);
+		HOW_COME_PEOPLE_ARE_NOT_HERE_WE_ARE_ABOUT_TO_START_THE_SHOW_HMM = new NpcStringId(1800105);
+		THE_OPPONENT_TEAM_CANCELED_THE_MATCH = new NpcStringId(1800106);
+		ITS_NOT_EASY_TO_OBTAIN = new NpcStringId(1800107);
+		YOURE_OUT_OF_YOUR_MIND_COMING_HERE = new NpcStringId(1800108);
+		ENEMY_INVASION_HURRY_UP = new NpcStringId(1800109);
+		PROCESS_SHOULDNT_BE_DELAYED_BECAUSE_OF_ME = new NpcStringId(1800110);
+		ALRIGHT_NOW_LEODAS_IS_YOURS = new NpcStringId(1800111);
+		WE_MIGHT_NEED_NEW_SLAVES_ILL_BE_BACK_SOON_SO_WAIT = new NpcStringId(1800112);
+		TIME_RIFT_DEVICE_ACTIVATION_SUCCESSFUL = new NpcStringId(1800113);
+		FREEDOM_OR_DEATH = new NpcStringId(1800114);
+		THIS_IS_THE_WILL_OF_TRUE_WARRIORS = new NpcStringId(1800115);
+		WELL_HAVE_DINNER_IN_HELL = new NpcStringId(1800116);
+		DETONATOR_INITIALIZATION_TIME_S1_MINUTES_FROM_NOW = new NpcStringId(1800117);
+		ZZZZ_CITY_INTERFERENCE_ERROR_FORWARD_EFFECT_CREATED = new NpcStringId(1800118);
+		ZZZZ_CITY_INTERFERENCE_ERROR_RECURRENCE_EFFECT_CREATED = new NpcStringId(1800119);
+		GUARDS_ARE_COMING_RUN = new NpcStringId(1800120);
+		NOW_I_CAN_ESCAPE_ON_MY_OWN = new NpcStringId(1800121);
+		THANKS_FOR_YOUR_HELP = new NpcStringId(1800122);
+		MATCH_CANCELLED_OPPONENT_DID_NOT_MEET_THE_STADIUM_ADMISSION_REQUIREMENTS = new NpcStringId(1800123);
+		HA_HA_YES_DIE_SLOWLY_WRITHING_IN_PAIN_AND_AGONY = new NpcStringId(1800124);
+		MORE_NEED_MORE_SEVERE_PAIN = new NpcStringId(1800125);
+		AHH_MY_LIFE_IS_BEING_DRAINED_OUT = new NpcStringId(1800126);
+		SOMETHING_IS_BURNING_INSIDE_MY_BODY = new NpcStringId(1800127);
+		S1_NOT_ADEQUATE_FOR_THE_STADIUM_LEVEL = new NpcStringId(1800128);
+		S1_THANK_YOU_FOR_GIVING_ME_YOUR_LIFE = new NpcStringId(1800129);
+		I_FAILED_PLEASE_FORGIVE_ME_DARION = new NpcStringId(1800130);
+		S1_ILL_BE_BACK_DONT_GET_COMFORTABLE = new NpcStringId(1800131);
+		IF_YOU_THINK_IM_GIVING_UP_LIKE_THIS_YOURE_WRONG = new NpcStringId(1800132);
+		SO_YOURE_JUST_GOING_TO_WATCH_ME_SUFFER = new NpcStringId(1800133);
+		ITS_NOT_OVER_YET = new NpcStringId(1800134);
+		HA_HA_YOU_WERE_SO_AFRAID_OF_DEATH_LET_ME_SEE_IF_YOU_FIND_ME_IN_TIME_MAYBE_YOU_CAN_FIND_A_WAY = new NpcStringId(1800135);
+		DONT_KILL_ME_PLEASE_SOMETHINGS_STRANGLING_ME = new NpcStringId(1800136);
+		WHO_WILL_BE_THE_LUCKY_ONE_TONIGHT_HA_HA_CURIOUS_VERY_CURIOUS = new NpcStringId(1800137);
+		SQUEAK_THIS_WILL_BE_STRONGER_THAN_THE_STUN_THE_PIG_USED_LAST_TIME = new NpcStringId(1800138);
+		SQUEAK_HERE_IT_GOES_EXTREMELY_SCARY_EVEN_TO_VALAKAS = new NpcStringId(1800139);
+		SQUEAK_GO_AWAY_LEAVE_US_ALONE = new NpcStringId(1800140);
+		SQUEAK_GUYS_GATHER_UP_LETS_SHOW_OUR_POWER = new NpcStringId(1800141);
+		ITS_NOT_LIKE_IM_GIVING_THIS_BECAUSE_IM_GRATEFUL_SQUEAK = new NpcStringId(1800142);
+		SQUEAK_EVEN_IF_IT_IS_TREATMENT_MY_BOTTOM_HURTS_SO_MUCH = new NpcStringId(1800143);
+		SQUEAK_TRANSFORM_TO_MOON_CRYSTAL_PRISM_POWER = new NpcStringId(1800144);
+		SQUEAK_OH_NO_I_DONT_WANT_TO_TURN_BACK_AGAIN = new NpcStringId(1800145);
+		SQUEAK_IM_SPECIALLY_GIVING_YOU_A_LOT_SINCE_IM_RICH_THANK_YOU = new NpcStringId(1800146);
+		OINK_OINK_RAGE_IS_BOILING_UP_INSIDE_OF_ME_POWER_INFINITE_POWER = new NpcStringId(1800147);
+		OINK_OINK_IM_REALLY_FURIOUS_RIGHT_NOW = new NpcStringId(1800148);
+		SQUEAK_RAGE_IS_BOILING_UP_INSIDE_OF_ME_POWER_INFINITE_POWER = new NpcStringId(1800149);
+		SQUEAK_IM_REALLY_FURIOUS_RIGHT_NOW = new NpcStringId(1800150);
+		G_RANK = new NpcStringId(1800162);
+		HUH_NO_ONE_WOULD_HAVE_GUESSED_THAT_A_DOOMED_CREATURE_WOULD_BE_SO_POWERFUL = new NpcStringId(1800163);
+		S_GRADE = new NpcStringId(1800164);
+		A_GRADE = new NpcStringId(1800165);
+		B_GRADE = new NpcStringId(1800166);
+		C_GRADE = new NpcStringId(1800167);
+		D_GRADE = new NpcStringId(1800168);
+		F_GRADE = new NpcStringId(1800169);
+		THIS_IS_THIS_IS_A_GREAT_ACHIEVEMENT_THAT_IS_WORTHY_OF_THE_TRUE_HEROES_OF_LEGEND = new NpcStringId(1800170);
+		ADMIRABLE_YOU_GREATLY_DECREASED_THE_SPEED_OF_INVASION_THROUGH_KAMALOKA = new NpcStringId(1800171);
+		VERY_GOOD_YOUR_SKILL_MAKES_YOU_A_MODEL_FOR_OTHER_ADVENTURERS_TO_FOLLOW = new NpcStringId(1800172);
+		GOOD_WORK_IF_ALL_ADVENTURERS_PRODUCE_RESULTS_LIKE_YOU_WE_WILL_SLOWLY_START_TO_SEE_THE_GLIMMER_OF_HOPE = new NpcStringId(1800173);
+		UNFORTUNATELY_IT_SEEMS_THAT_RIM_KAMALOKA_CANNOT_BE_EASILY_APPROACHED_BY_EVERYONE = new NpcStringId(1800174);
+		HOW_DISAPPOINTING_IT_LOOKS_LIKE_I_MADE_A_MISTAKE_IN_SENDING_YOU_INSIDE_RIM_KAMALOKA = new NpcStringId(1800175);
+		INTRUDER_ALERT_INTRUDER_ALERT = new NpcStringId(1800176);
+		WHAT_ARE_YOU_DOING_HURRY_UP_AND_HELP_ME = new NpcStringId(1800177);
+		IVE_HAD_IT_UP_TO_HERE_WITH_YOU_ILL_TAKE_CARE_OF_YOU = new NpcStringId(1800178);
+		AH_MY_MIND_IS_A_WRECK = new NpcStringId(1800179);
+		IF_YOU_THOUGHT_THAT_MY_SUBORDINATES_WOULD_BE_SO_FEW_YOU_ARE_MISTAKEN = new NpcStringId(1800180);
+		THERES_NOT_MUCH_I_CAN_DO_BUT_I_WANT_TO_HELP_YOU = new NpcStringId(1800181);
+		YOU_S1_ATTACK_THEM = new NpcStringId(1800182);
+		COME_OUT_MY_SUBORDINATE_I_SUMMON_YOU_TO_DRIVE_THEM_OUT = new NpcStringId(1800183);
+		THERES_NOT_MUCH_I_CAN_DO_BUT_I_WILL_RISK_MY_LIFE_TO_HELP_YOU = new NpcStringId(1800184);
+		ARG_THE_PAIN_IS_MORE_THAN_I_CAN_STAND = new NpcStringId(1800185);
+		AHH_HOW_DID_HE_FIND_MY_WEAKNESS = new NpcStringId(1800186);
+		WE_WERE_ABLE_TO_SUCCESSFULLY_COLLECT_THE_ESSENCE_OF_KAMALOKA_FROM_THE_KANABIONS_THAT_YOU_DEFEATED_HERE_THEY_ARE = new NpcStringId(1800187);
+		BUT_WE_WERE_ABLE_TO_COLLECT_SOMEHOW_THE_ESSENCE_OF_KAMALOKA_FROM_THE_KANABIONS_THAT_YOU_DEFEATED_HERE_THEY_ARE = new NpcStringId(1800188);
+		IM_SORRY_BUT_WE_WERE_UNABLE_TO_COLLECT_THE_ESSENCE_OF_KAMALOKA_FROM_THE_KANABIONS_THAT_YOU_DEFEATED_BECAUSE_THEIR_DARK_ENERGY_WAS_TOO_WEAK = new NpcStringId(1800189);
+		RATHER_THAN_SIMPLY_DEFEATING_THE_ENEMIES_YOU_SEEM_TO_UNDERSTAND_OUR_GOAL_AND_PURPOSE_AS_WELL = new NpcStringId(1800190);
+		DOPPLERS_AND_VOIDS_POSSESS_AN_ENHANCED_AMOUNT_OF_THE_KANABIONS_DARK_ENERGY_SO_IT_IS_IMPORTANT_TO_CONCENTRATE_ON_DEFEATING_THEM_WHEN_BLOCKING_THE_KAMALOKIANS_ATTACK = new NpcStringId(1800191);
+		HAVE_YOU_SEEN_KANABIONS_BEING_REMADE_AS_NEW_KANABIONS_SOMETIMES_YOU_CAN_SEE_IT_OCCUR_MORE_OFTEN_BY_INFLICTING_GREAT_DAMAGE_DURING_AN_ATTACK_OR_AT_THE_MOMENT_YOU_DEFEAT_THEM = new NpcStringId(1800192);
+		AS_IN_ANY_OTHER_BATTLE_IT_IS_CRITICAL_TO_PROTECT_YOURSELF_WHILE_YOU_ARE_INSIDE_RIM_KAMALOKA_WE_DO_NOT_WANT_TO_ATTACK_RECKLESSLY = new NpcStringId(1800193);
+		WE_VALUE_DEVELOPING_AN_INDIVIDUALS_OVERALL_POWER_RATHER_THAN_A_ONE_TIME_VICTORY_IF_YOU_RELIED_ON_ANOTHER_PERSONS_SUPPORT_THIS_TIME_WHY_DONT_YOU_TRY_TO_RELY_ON_YOUR_OWN_STRENGTH_NEXT_TIME = new NpcStringId(1800194);
+		ARE_YOU_SURE_THAT_THE_BATTLE_JUST_NOW_WAS_AT_THE_APPROPRIATE_LEVEL_BOTHERING_LOWER_KANABIONS_AS_IF_FOR_MERE_ENTERTAINMENT_IS_CONSIDERED_TO_BE_A_WASTED_BATTLE_FOR_US = new NpcStringId(1800195);
+		THE_GREATEST_VICTORY_INVOLVES_USING_ALL_AVAILABLE_RESOURCES_ELIMINATING_ALL_OF_THE_ENEMYS_OPPORTUNITIES_AND_BRINGING_IT_TO_THE_FASTEST_POSSIBLE_END_DONT_YOU_THINK_SO = new NpcStringId(1800196);
+		EMERGENCY_EMERGENCY_THE_OUTER_WALL_IS_WEAKENING_RAPIDLY = new NpcStringId(1800197);
+		THE_REMAINING_STRENGTH_OF_THE_OUTER_WALL_IS_S1 = new NpcStringId(1800198);
+		PATHFINDER_SAVIOR = new NpcStringId(1800199);
+		PATHFINDER_SUPPORTER = new NpcStringId(1800200);
+		SOME_KANABIONS_WHO_HAVENT_FULLY_ADJUSTED_YET_TO_THEIR_NEW_PHYSICAL_FORM_ARE_KNOWN_TO_EXHIBIT_SYMPTOMS_OF_AN_EXTREMELY_WEAKENED_BODY_STRUCTURE_SOMETIMES_IF_YOU_ATTACK_THEM_AT_THAT_MOMENT_YOU_WILL_HAVE_GREAT_RESULTS = new NpcStringId(1800201);
+		HAVE_YOU_EVER_HEARD_OF_S1_THEY_SAY_ITS_A_GENUINE_S2 = new NpcStringId(1800202);
+		THERE_ARE_5_MINUTES_REMAINING_TO_REGISTER_FOR_KRATEIS_CUBE_MATCH = new NpcStringId(1800203);
+		THERE_ARE_3_MINUTES_REMAINING_TO_REGISTER_FOR_KRATEIS_CUBE_MATCH = new NpcStringId(1800204);
+		THERE_ARE_1_MINUTES_REMAINING_TO_REGISTER_FOR_KRATEIS_CUBE_MATCH = new NpcStringId(1800205);
+		THE_MATCH_WILL_BEGIN_SHORTLY = new NpcStringId(1800207);
+		OHHOHOH = new NpcStringId(1800209);
+		FIRE = new NpcStringId(1800210);
+		WATER = new NpcStringId(1800211);
+		WIND = new NpcStringId(1800212);
+		EARTH = new NpcStringId(1800213);
+		ITS_S1 = new NpcStringId(1800214);
+		S1_IS_STRONG = new NpcStringId(1800215);
+		ITS_ALWAYS_S1 = new NpcStringId(1800216);
+		S1_WONT_DO = new NpcStringId(1800217);
+		YOU_WILL_BE_CURSED_FOR_SEEKING_THE_TREASURE = new NpcStringId(1800218);
+		THE_AIRSHIP_HAS_BEEN_SUMMONED_IT_WILL_AUTOMATICALLY_DEPART_IN_5_MINUTES = new NpcStringId(1800219);
+		THE_REGULARLY_SCHEDULED_AIRSHIP_HAS_ARRIVED_IT_WILL_DEPART_FOR_THE_ADEN_CONTINENT_IN_1_MINUTE = new NpcStringId(1800220);
+		THE_REGULARLY_SCHEDULED_AIRSHIP_THAT_FLIES_TO_THE_ADEN_CONTINENT_HAS_DEPARTED = new NpcStringId(1800221);
+		THE_REGULARLY_SCHEDULED_AIRSHIP_HAS_ARRIVED_IT_WILL_DEPART_FOR_THE_GRACIA_CONTINENT_IN_1_MINUTE = new NpcStringId(1800222);
+		THE_REGULARLY_SCHEDULED_AIRSHIP_THAT_FLIES_TO_THE_GRACIA_CONTINENT_HAS_DEPARTED = new NpcStringId(1800223);
+		ANOTHER_AIRSHIP_HAS_BEEN_SUMMONED_TO_THE_WHARF_PLEASE_TRY_AGAIN_LATER = new NpcStringId(1800224);
+		HUH_THE_SKY_LOOKS_FUNNY_WHATS_THAT = new NpcStringId(1800225);
+		A_POWERFUL_SUBORDINATE_IS_BEING_HELD_BY_THE_BARRIER_ORB_THIS_REACTION_MEANS = new NpcStringId(1800226);
+		BE_CAREFUL_SOMETHINGS_COMING = new NpcStringId(1800227);
+		YOU_MUST_FIRST_FOUND_A_CLAN_OR_BELONG_TO_ONE = new NpcStringId(1800228);
+		THERE_IS_NO_PARTY_CURRENTLY_CHALLENGING_EKIMUS_N_IF_NO_PARTY_ENTERS_WITHIN_S1_SECONDS_THE_ATTACK_ON_THE_HEART_OF_IMMORTALITY_WILL_FAIL = new NpcStringId(1800229);
+		EKIMUS_HAS_GAINED_STRENGTH_FROM_A_TUMOR = new NpcStringId(1800230);
+		EKIMUS_HAS_BEEN_WEAKENED_BY_LOSING_STRENGTH_FROM_A_TUMOR = new NpcStringId(1800231);
+		CMON_CMON_SHOW_YOUR_FACE_YOU_LITTLE_RATS_LET_ME_SEE_WHAT_THE_DOOMED_WEAKLINGS_ARE_SCHEMING = new NpcStringId(1800233);
+		IMPRESSIVE_HAHAHA_ITS_SO_MUCH_FUN_BUT_I_NEED_TO_CHILL_A_LITTLE_WHILE_ARGEKUNTE_CLEAR_THE_WAY = new NpcStringId(1800234);
+		KYAHAHA_SINCE_THE_TUMOR_HAS_BEEN_RESURRECTED_I_NO_LONGER_NEED_TO_WASTE_MY_TIME_ON_YOU = new NpcStringId(1800235);
+		KEU_I_WILL_LEAVE_FOR_NOW_BUT_DONT_THINK_THIS_IS_OVER_THE_SEED_OF_INFINITY_CAN_NEVER_DIE = new NpcStringId(1800236);
+		KAHAHAHA_THAT_GUYS_NOTHING_HE_CANT_EVEN_KILL_WITHOUT_MY_PERMISSION_SEE_HERE_ULTIMATE_FORGOTTEN_MAGIC_DEATHLESS_GUARDIAN = new NpcStringId(1800237);
+		I_CURSE_THE_DAY_THAT_I_BECAME_YOUR_SLAVE_IN_ORDER_TO_ESCAPE_DEATH_COHEMENES_I_SWEAR_THAT_I_SHALL_SEE_YOU_DIE_WITH_MY_OWN_EYES = new NpcStringId(1800238);
+		MY_ENEMY_IS_DYING_AND_MY_BLOOD_IS_BOILING_WHAT_CRUEL_CURSE_IS_THIS = new NpcStringId(1800239);
+		HALL_OF_SUFFERING = new NpcStringId(1800240);
+		HALL_OF_EROSION = new NpcStringId(1800241);
+		HEART_OF_IMMORTALITY = new NpcStringId(1800242);
+		ATTACK = new NpcStringId(1800243);
+		DEFEND = new NpcStringId(1800244);
+		CONGRATULATIONS_YOU_HAVE_SUCCEEDED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE = new NpcStringId(1800245);
+		YOU_HAVE_FAILED_AT_S1_S2_THE_INSTANCE_WILL_SHORTLY_EXPIRE = new NpcStringId(1800246);
+		S1S_PARTY_HAS_MOVED_TO_A_DIFFERENT_LOCATION_THROUGH_THE_CRACK_IN_THE_TUMOR = new NpcStringId(1800247);
+		S1S_PARTY_HAS_ENTERED_THE_CHAMBER_OF_EKIMUS_THROUGH_THE_CRACK_IN_THE_TUMOR = new NpcStringId(1800248);
+		EKIMUS_HAS_SENSED_ABNORMAL_ACTIVITY_NTHE_ADVANCING_PARTY_IS_FORCEFULLY_EXPELLED = new NpcStringId(1800249);
+		THERE_ARENT_ENOUGH_ITEMS_IN_ORDER_TO_SUMMON_THE_AIRSHIP_YOU_NEED_5_ENERGY_STAR_STONES = new NpcStringId(1800250);
+		THE_SOUL_DEVOURERS_WHO_ARE_GREEDY_TO_EAT_THE_SEEDS_OF_LIFE_THAT_REMAIN_ALIVE_UNTIL_THE_END_HAVE_AWAKENED = new NpcStringId(1800251);
+		THE_FIRST_FERAL_HOUND_OF_THE_NETHERWORLD_HAS_AWAKENED = new NpcStringId(1800252);
+		THE_SECOND_FERAL_HOUND_OF_THE_NETHERWORLD_HAS_AWAKENED = new NpcStringId(1800253);
+		CLINGING_ON_WONT_HELP_YOU_ULTIMATE_FORGOTTEN_MAGIC_BLADE_TURN = new NpcStringId(1800254);
+		EVEN_SPECIAL_SAUCE_CANT_HELP_YOU_ULTIMATE_FORGOTTEN_MAGIC_FORCE_SHIELD = new NpcStringId(1800255);
+		YOU_LITTLE_DOOMED_MAGGOTS_EVEN_IF_YOU_KEEP_SWARMING_THE_POWER_OF_IMMORTALITY_WILL_ONLY_GROW_STRONGER = new NpcStringId(1800256);
+		THE_AIRSHIP_SUMMON_LICENSE_HAS_BEEN_AWARDED_YOUR_CLAN_CAN_NOW_SUMMON_AN_AIRSHIP = new NpcStringId(1800257);
+		THE_GRACIA_TREASURE_BOX_HAS_APPEARED = new NpcStringId(1800258);
+		THE_GRACIA_TREASURE_BOX_WILL_SOON_DISAPPEAR = new NpcStringId(1800259);
+		YOU_HAVE_BEEN_CURSED_BY_THE_TUMOR_AND_HAVE_INCURRED_S1_DAMAGE = new NpcStringId(1800260);
+		I_SHALL_ACCEPT_YOUR_CHALLENGE_S1_COME_AND_DIE_IN_THE_ARMS_OF_IMMORTALITY = new NpcStringId(1800261);
+		YOU_WILL_PARTICIPATE_IN_S1_S2_SHORTLY_BE_PREPARED_FOR_ANYTHING = new NpcStringId(1800262);
+		YOU_CAN_HEAR_THE_UNDEAD_OF_EKIMUS_RUSHING_TOWARD_YOU_S1_S2_IT_HAS_NOW_BEGUN = new NpcStringId(1800263);
+		YOU_CAN_FEEL_THE_SURGING_ENERGY_OF_DEATH_FROM_THE_TUMOR = new NpcStringId(1800264);
+		THE_AREA_NEAR_THE_TUMOR_IS_FULL_OF_OMINOUS_ENERGY = new NpcStringId(1800265);
+		YOU_TRIED_TO_DROP_US_HOW_STUPID = new NpcStringId(1800266);
+		WE_ARE_BLOOD_BRETHREN_I_CANT_FALL_SO_EASILY_HERE_AND_LEAVE_MY_BROTHER_BEHIND = new NpcStringId(1800267);
+		YOU_WERE_ALWAYS_WHAT_I_ASPIRED_TO_BE_DO_YOU_THINK_I_WOULD_FALL_SO_EASILY_HERE_WHEN_I_HAVE_A_BROTHER_LIKE_THAT = new NpcStringId(1800268);
+		WITH_ALL_CONNECTIONS_TO_THE_TUMOR_SEVERED_EKIMUS_HAS_LOST_ITS_POWER_TO_CONTROL_THE_FERAL_HOUND = new NpcStringId(1800269);
+		WITH_THE_CONNECTION_TO_THE_TUMOR_RESTORED_EKIMUS_HAS_REGAINED_CONTROL_OVER_THE_FERAL_HOUND = new NpcStringId(1800270);
+		WOOOONG = new NpcStringId(1800271);
+		WOONG_WOONG_WOO = new NpcStringId(1800272);
+		THE_ENEMIES_HAVE_ATTACKED_EVERYONE_COME_OUT_AND_FIGHT_URGH = new NpcStringId(1800273);
+		THE_TUMOR_INSIDE_S1_HAS_BEEN_DESTROYED_NIN_ORDER_TO_DRAW_OUT_THE_COWARDLY_COHEMENES_YOU_MUST_DESTROY_ALL_THE_TUMORS = new NpcStringId(1800274);
+		THE_TUMOR_INSIDE_S1_HAS_COMPLETELY_REVIVED_NTHE_RESTRENGTHENED_COHEMENES_HAS_FLED_DEEPER_INSIDE_THE_SEED = new NpcStringId(1800275);
+		THE_AWARDED_AIRSHIP_SUMMON_LICENSE_HAS_BEEN_RECEIVED = new NpcStringId(1800276);
+		YOU_DO_NOT_CURRENTLY_HAVE_AN_AIRSHIP_SUMMON_LICENSE_YOU_CAN_EARN_YOUR_AIRSHIP_SUMMON_LICENSE_THROUGH_ENGINEER_LEKON = new NpcStringId(1800277);
+		THE_AIRSHIP_SUMMON_LICENSE_HAS_ALREADY_BEEN_AWARDED = new NpcStringId(1800278);
+		IF_YOU_HAVE_ITEMS_PLEASE_GIVE_THEM_TO_ME = new NpcStringId(1800279);
+		MY_STOMACH_IS_EMPTY = new NpcStringId(1800280);
+		IM_HUNGRY_IM_HUNGRY = new NpcStringId(1800281);
+		IM_STILL_NOT_FULL = new NpcStringId(1800282);
+		IM_STILL_HUNGRY = new NpcStringId(1800283);
+		I_FEEL_A_LITTLE_WOOZY = new NpcStringId(1800284);
+		GIVE_ME_SOMETHING_TO_EAT = new NpcStringId(1800285);
+		NOW_ITS_TIME_TO_EAT = new NpcStringId(1800286);
+		I_ALSO_NEED_A_DESSERT = new NpcStringId(1800287);
+		IM_FULL_NOW_I_DONT_WANT_TO_EAT_ANYMORE = new NpcStringId(1800289);
+		I_HAVENT_EATEN_ANYTHING_IM_SO_WEAK = new NpcStringId(1800290);
+		YUM_YUM_YUM_YUM = new NpcStringId(1800291);
+		YOUVE_SUSTAINED_S1_DAMAGE_AS_TUMORS_SHELL_STARTED_MELTING_AFTER_TOUCHING_THE_SACRED_SEAL_ON_THE_SHIELD = new NpcStringId(1800292);
+		YOUVE_SUSTAINED_S1_DAMAGE_AS_SOUL_COFFINS_SHELL_STARTED_MELTING_AFTER_TOUCHING_THE_SACRED_SEAL_ON_THE_SHIELD = new NpcStringId(1800293);
+		OBELISK_HAS_COLLAPSED_DONT_LET_THE_ENEMIES_JUMP_AROUND_WILDLY_ANYMORE = new NpcStringId(1800295);
+		ENEMIES_ARE_TRYING_TO_DESTROY_THE_FORTRESS_EVERYONE_DEFEND_THE_FORTRESS = new NpcStringId(1800296);
+		COME_OUT_WARRIORS_PROTECT_SEED_OF_DESTRUCTION = new NpcStringId(1800297);
+		THE_UNDEAD_OF_EKIMUS_IS_ATTACKING_SEED_OF_LIFE_DEFENDING_HALL_OF_EROSION_WILL_FAIL_EVEN_IF_ONE_SEED_OF_LIFE_IS_DESTROYED = new NpcStringId(1800298);
+		ALL_THE_TUMORS_INSIDE_S1_HAVE_BEEN_DESTROYED_DRIVEN_INTO_A_CORNER_COHEMENES_APPEARS_CLOSE_BY = new NpcStringId(1800299);
+		THE_TUMOR_INSIDE_S1_HAS_BEEN_DESTROYED_NTHE_NEARBY_UNDEAD_THAT_WERE_ATTACKING_SEED_OF_LIFE_START_LOSING_THEIR_ENERGY_AND_RUN_AWAY = new NpcStringId(1800300);
+		THE_TUMOR_INSIDE_S1_HAS_COMPLETELY_REVIVED_NRECOVERED_NEARBY_UNDEAD_ARE_SWARMING_TOWARD_SEED_OF_LIFE = new NpcStringId(1800301);
+		THE_TUMOR_INSIDE_S1_THAT_HAS_PROVIDED_ENERGY_N_TO_EKIMUS_IS_DESTROYED = new NpcStringId(1800302);
+		THE_TUMOR_INSIDE_S1_HAS_BEEN_COMPLETELY_RESURRECTED_N_AND_STARTED_TO_ENERGIZE_EKIMUS_AGAIN = new NpcStringId(1800303);
+		THE_TUMOR_INSIDE_S1_HAS_BEEN_DESTROYED_NTHE_SPEED_THAT_EKIMUS_CALLS_OUT_HIS_PREY_HAS_SLOWED_DOWN = new NpcStringId(1800304);
+		THE_TUMOR_INSIDE_S1_HAS_COMPLETELY_REVIVED_NEKIMUS_STARTED_TO_REGAIN_HIS_ENERGY_AND_IS_DESPERATELY_LOOKING_FOR_HIS_PREY = new NpcStringId(1800305);
+		BRING_MORE_MORE_SOULS = new NpcStringId(1800306);
+		THE_HALL_OF_EROSION_ATTACK_WILL_FAIL_UNLESS_YOU_MAKE_A_QUICK_ATTACK_AGAINST_THE_TUMOR = new NpcStringId(1800307);
+		AS_THE_TUMOR_WAS_NOT_THREATENED_COHEMENES_COMPLETELY_RAN_AWAY_TO_DEEP_INSIDE_THE_SEED = new NpcStringId(1800308);
+		YOUR_GOAL_WILL_BE_OBSTRUCTED_OR_BE_UNDER_A_RESTRAINT = new NpcStringId(1800309);
+		YOU_MAY_FACE_AN_UNFORESEEN_PROBLEM_ON_YOUR_COURSE_TOWARD_THE_GOAL = new NpcStringId(1800310);
+		YOU_MAY_FEEL_NERVOUS_AND_ANXIOUS_BECAUSE_OF_UNFAVORABLE_SITUATIONS = new NpcStringId(1800311);
+		BE_WARNED_WHEN_THE_SITUATION_IS_DIFFICULT_BECAUSE_YOU_MAY_LOSE_YOUR_JUDGMENT_AND_MAKE_AN_IRRATIONAL_MISTAKE = new NpcStringId(1800312);
+		YOU_MAY_MEET_A_TRUSTWORTHY_PERSON_OR_A_GOOD_OPPORTUNITY = new NpcStringId(1800313);
+		YOUR_DOWNWARD_LIFE_STARTS_TAKING_AN_UPTURN = new NpcStringId(1800314);
+		YOU_WILL_ATTRACT_ATTENTION_FROM_PEOPLE_WITH_YOUR_POPULARITY = new NpcStringId(1800315);
+		YOUR_STAR_OF_FORTUNE_SAYS_THERELL_BE_FISH_SNAPPING_AT_YOUR_BAIT = new NpcStringId(1800316);
+		THERE_MAY_BE_A_CONFLICT_BORN_OF_YOUR_DOGMATIC_PROCEDURES = new NpcStringId(1800317);
+		YOUR_WISDOM_AND_CREATIVITY_MAY_LEAD_YOU_TO_SUCCESS_WITH_YOUR_GOAL = new NpcStringId(1800318);
+		YOU_MAY_ACCOMPLISH_YOUR_GOALS_IF_YOU_DILIGENTLY_PURSUE_THEM_WITHOUT_GIVING_UP = new NpcStringId(1800319);
+		YOU_MAY_GET_HELP_IF_YOU_GO_THROUGH_THE_FRONT_DOOR_WITHOUT_SEEKING_TRICKS_OR_MANEUVERS = new NpcStringId(1800320);
+		A_GOOD_RESULT_IS_ON_THE_WAY_IF_YOU_SET_A_GOAL_AND_BRAVELY_PROCEED_TOWARD_IT = new NpcStringId(1800321);
+		EVERYTHING_WILL_BE_SMOOTHLY_MANAGED_NO_MATTER_HOW_DIFFICULT = new NpcStringId(1800322);
+		BE_FIRM_AND_CAREFULLY_SCRUTINIZE_CIRCUMSTANCES_EVEN_WHEN_THINGS_ARE_DIFFICULT = new NpcStringId(1800323);
+		ALWAYS_THINK_OVER_TO_FIND_NEGLECTED_PROBLEMS_YOU_HAVENT_TAKEN_CARE_OF_YET = new NpcStringId(1800324);
+		FINANCIAL_FORTUNE_WILL_GREET_YOUR_POOR_LIFE = new NpcStringId(1800325);
+		YOU_MAY_ACQUIRE_WEALTH_AND_FAME_AFTER_UNLUCKY_CIRCUMSTANCES = new NpcStringId(1800326);
+		THE_DIFFICULT_SITUATIONS_WILL_TURN_TO_HOPE_WITH_UNFORESEEN_HELP = new NpcStringId(1800327);
+		A_GREAT_TASK_WILL_RESULT_IN_SUCCESS = new NpcStringId(1800328);
+		YOU_MAY_ENCOUNTER_A_PRECIOUS_PERSON_WHO_WILL_LIFT_YOUR_LONELINESS_AND_DISCORD = new NpcStringId(1800329);
+		PEOPLE_AROUND_YOU_WILL_ENCOURAGE_YOUR_EVERY_TASK_IN_THE_FUTURE = new NpcStringId(1800330);
+		EVERYTHING_WILL_BE_SMOOTHLY_MANAGED = new NpcStringId(1800331);
+		YOU_WILL_MEET_A_PERSON_WHO_CAN_CHERISH_YOUR_VALUES_IF_YOU_MAINTAIN_GOOD_TIES_WITH_PEOPLE = new NpcStringId(1800332);
+		MAINTAIN_COOPERATIVE_ATTITUDE_SINCE_YOU_WILL_MEET_SOMEONE_TO_BE_OF_HELP = new NpcStringId(1800333);
+		KEEP_YOUR_MODERATION_AND_EGO_IN_CHECK_EVEN_IN_SUCCESSFUL_PHASES_OF_YOUR_LIFE = new NpcStringId(1800334);
+		WHEN_IT_COMES_TO_WORK_LIFESTYLE_AND_RELATIONSHIPS_YOULL_BE_BETTER_OFF_TO_GO_BY_THE_TEXT_RATHER_THAN_TRICKS = new NpcStringId(1800335);
+		YOUR_TASK_WILL_RECEIVE_SUBSTANTIAL_SUPPORT_SINCE_THE_SURROUNDINGS_WILL_FULLY_DEVELOP = new NpcStringId(1800336);
+		YOUR_STAR_OF_FORTUNE_INDICATE_A_SUCCESS_WITH_MENTAL_AND_MATERIAL_ASSISTANCE = new NpcStringId(1800337);
+		YOU_WILL_ENJOY_POPULARITY_WITH_YOUR_CREATIVE_TALENTS_AND_CLEVER_ACTS = new NpcStringId(1800338);
+		PEOPLE_WILL_LINE_UP_TO_BE_OF_ASSISTANCE_TO_YOU = new NpcStringId(1800339);
+		YOU_MAY_MEET_SOMEONE_TO_SHARE_YOUR_JOURNEY = new NpcStringId(1800340);
+		YOU_MAY_ACHIEVE_CONNECTIONS_IN_MANY_FIELDS = new NpcStringId(1800341);
+		AN_ATTITUDE_THAT_CONTINUALLY_STUDIES_AND_EXPLORES_IS_NEEDED_AND_ALWAYS_BE_SINCERE = new NpcStringId(1800342);
+		ITS_AN_IMAGE_OF_A_BUTTERFLY_ON_A_FLOWER_IN_WARM_SPRING_AIR = new NpcStringId(1800343);
+		YOUR_GOALS_WILL_MOVE_SMOOTHLY_WITH_PEACE_AND_HAPPINESS_IN_YOUR_LIFE = new NpcStringId(1800344);
+		LOVE_MAY_SPROUT_ITS_LEAVES_WHEN_YOU_TREAT_THOSE_AROUND_YOU_WITH_CARE = new NpcStringId(1800345);
+		YOU_MAY_CLIMB_INTO_A_HIGHER_POSITION_WITH_OTHERS_TRUST_IF_YOU_FAITHFULLY_CARRY_OUT_YOUR_DUTIES = new NpcStringId(1800346);
+		EVERYTHING_CAN_FALL_APART_IF_YOU_GREEDILY_AIM_BY_PURE_LUCK = new NpcStringId(1800347);
+		DO_NOT_UNDERESTIMATE_THE_IMPORTANCE_OF_MEETING_PEOPLE = new NpcStringId(1800348);
+		AN_ARROW_WILL_COALESCE_INTO_THE_BOW = new NpcStringId(1800349);
+		A_BONY_LIMB_OF_A_TREE_MAY_BEAR_ITS_FRUIT = new NpcStringId(1800350);
+		YOU_WILL_BE_REWARDED_FOR_YOUR_EFFORTS_AND_ACCOMPLISHMENTS = new NpcStringId(1800351);
+		NO_MATTER_WHERE_IT_LIES_YOUR_FAITHFUL_DRIVE_LEADS_YOU_TO_SUCCESS = new NpcStringId(1800352);
+		PEOPLE_WILL_BE_ATTRACTED_TO_YOUR_LOYALTIES = new NpcStringId(1800353);
+		YOU_MAY_TRUST_YOURSELF_RATHER_THAN_OTHERS_TALKS = new NpcStringId(1800354);
+		CREATIVE_THINKING_AWAY_FROM_THE_OLD_VIEWPOINT_MAY_HELP_YOU = new NpcStringId(1800355);
+		PATIENCE_WITHOUT_BEING_IMPETUOUS_OF_THE_RESULTS_WILL_ONLY_BEAR_A_POSITIVE_OUTCOME = new NpcStringId(1800356);
+		THE_DEAD_WILL_COME_ALIVE = new NpcStringId(1800357);
+		THERE_WILL_BE_A_SHOCKING_INCIDENT = new NpcStringId(1800358);
+		YOU_WILL_ENJOY_A_HUGE_SUCCESS_AFTER_UNFORESEEN_LUCK_COMES_BEFORE_YOU = new NpcStringId(1800359);
+		DO_NOT_GIVE_UP_SINCE_THERE_MAY_BE_A_MIRACULOUS_RESCUE_FROM_THE_COURSE_OF_DESPAIR = new NpcStringId(1800360);
+		AN_ATTITUDE_TO_TRY_ONES_BEST_TO_PURSUE_THE_GOAL_IS_NEEDED = new NpcStringId(1800361);
+		YOU_MAY_GET_A_SHOT_IN_THE_ARM_IN_YOUR_LIFE_AFTER_MEETING_A_GOOD_PERSON = new NpcStringId(1800362);
+		YOU_MAY_GET_A_BIG_HELP_IN_THE_COURSE_OF_YOUR_LIFE = new NpcStringId(1800363);
+		A_RARE_OPPORTUNITY_WILL_COME_TO_YOU_SO_YOU_MAY_PROSPER = new NpcStringId(1800364);
+		A_HUNGRY_FALCON_WILL_HAVE_MEAT = new NpcStringId(1800365);
+		A_HOUSEHOLD_IN_NEED_WILL_ACQUIRE_A_FORTUNE_AND_MEAT = new NpcStringId(1800366);
+		A_HARD_SITUATION_WILL_COME_TO_ITS_END_WITH_MATERIALISTIC_AND_MENTAL_HELP_FROM_OTHERS = new NpcStringId(1800367);
+		IF_YOU_SET_A_FIRM_GOAL_WITHOUT_SURRENDER_THERE_WILL_BE_A_PERSON_WHO_CAN_OFFER_HELP_AND_CARE = new NpcStringId(1800368);
+		YOULL_GAIN_OTHERS_TRUST_WHEN_YOU_MAINTAIN_A_SINCERE_AND_HONEST_ATTITUDE = new NpcStringId(1800369);
+		BE_INDEPENDENT_AT_ALL_TIMES = new NpcStringId(1800370);
+		ITS_A_WAGON_WITH_NO_WHEELS = new NpcStringId(1800371);
+		YOUVE_SET_A_GOAL_BUT_THERE_MAY_BE_OBSTACLES_IN_REALITY = new NpcStringId(1800372);
+		YOURE_RUNNING_TOWARD_THE_GOAL_BUT_THERE_WONT_BE_AS_MANY_OUTCOMES_AS_YOU_THOUGHT = new NpcStringId(1800373);
+		THERE_ARE_MANY_THINGS_TO_CONSIDER_AFTER_ENCOUNTERING_HINDRANCES = new NpcStringId(1800374);
+		A_RECKLESS_MOVE_MAY_BRING_A_FAILURE = new NpcStringId(1800375);
+		YOU_MAY_LOSE_PEOPLES_TRUST_IF_YOU_LACK_PRUDENCE_AT_ALL_TIMES = new NpcStringId(1800376);
+		YOU_MAY_NEED_TO_REFLECT_ON_YOURSELF_WITH_DELIBERATION_AND_WAIT_FOR_AN_OPPORTUNITY = new NpcStringId(1800377);
+		A_POOR_SCHOLAR_RECEIVES_A_STIPEND = new NpcStringId(1800378);
+		A_SCHOLAR_GETS_A_PASS_TOWARD_FAME_AND_FORTUNE = new NpcStringId(1800379);
+		YOUR_AMBITION_AND_DREAM_WILL_COME_TRUE = new NpcStringId(1800380);
+		COMPLICATED_PROBLEMS_AROUND_YOU_MAY_START_BEING_SOLVED_ONE_AFTER_ANOTHER = new NpcStringId(1800381);
+		YOU_WILL_HAVE_A_GOOD_RESULT_IF_YOU_DILIGENTLY_PURSUE_ONE_GOAL_WITHOUT_BEING_DRAGGED_FROM_YOUR_PAST = new NpcStringId(1800382);
+		YOU_MAY_NEED_TO_RID_YOURSELF_OF_OLD_AND_WORN_HABITS = new NpcStringId(1800383);
+		BE_RESPONSIBLE_WITH_YOUR_TASKS_BUT_DO_NOT_HESITATE_TO_ASK_FOR_COLLEAGUES_HELP = new NpcStringId(1800384);
+		FISH_TRANSFORMS_INTO_A_DRAGON = new NpcStringId(1800385);
+		YOUR_DREAM_MAY_COME_TRUE_AND_FAME_AND_FORTUNE_WILL_COME_TO_YOU = new NpcStringId(1800386);
+		WHAT_YOUVE_PLANED_WILL_BE_ACCOMPLISHED = new NpcStringId(1800387);
+		YOU_MAY_ACQUIRE_MONEY_OR_A_NEW_OPPORTUNITY_FROM_A_PLACE_YOU_WOULDNT_HAVE_THOUGHT_OF = new NpcStringId(1800388);
+		THERE_WILL_BE_MANY_OFFERS_TO_YOU_YOU_MAY_THINK_THEM_OVER_CAREFULLY = new NpcStringId(1800389);
+		IT_MAY_BE_A_GOOD_IDEA_NOT_TO_BECOME_INVOLVED_IN_OTHERS_BUSINESS = new NpcStringId(1800390);
+		EVERYTHING_WILL_GO_SMOOTHLY_BUT_BE_AWARE_OF_DANGER_FROM_BEING_CARELESS_AND_REMISS = new NpcStringId(1800391);
+		IF_YOU_SINCERELY_CARE_FOR_SOMEONE_YOU_LOVE_A_BIG_REWARD_WILL_RETURN_TO_YOU = new NpcStringId(1800392);
+		A_REMEDY_IS_ON_ITS_WAY_FOR_A_SERIOUS_ILLNESS = new NpcStringId(1800393);
+		YOU_MAY_ACQUIRE_A_PRECIOUS_MEDICINE_TO_RECOVER_AFTER_SUFFERING_A_DISEASE_OF_A_SERIOUS_NATURE = new NpcStringId(1800394);
+		YOU_MAY_REALIZE_YOUR_DREAM_BY_MEETING_A_MAN_OF_DISTINCTION_AT_A_DIFFICULT_TIME = new NpcStringId(1800395);
+		YOU_MAY_SUFFER_ONE_OR_TWO_HARDSHIPS_ON_YOUR_JOURNEY = new NpcStringId(1800396);
+		IF_YOU_KEEP_SMILING_WITHOUT_DESPAIR_PEOPLE_WILL_COME_TO_TRUST_YOU_AND_OFFER_HELP = new NpcStringId(1800397);
+		SEEK_STABILITY_RATHER_THAN_DYNAMICS_IN_YOUR_LIFE = new NpcStringId(1800398);
+		ITS_A_GOOD_IDEA_TO_BE_CAREFUL_AND_SECURE_AT_ALL_TIMES = new NpcStringId(1800399);
+		YOU_CANT_PERFORM_THE_JOB_WITH_BOUND_HANDS = new NpcStringId(1800400);
+		YOU_MAY_LOSE_YOUR_DRIVE_AND_FEEL_LOST = new NpcStringId(1800401);
+		YOU_MAY_BE_UNABLE_TO_CONCENTRATE_WITH_SO_MANY_PROBLEMS_OCCURRING = new NpcStringId(1800402);
+		YOUR_ACHIEVEMENT_UNFAIRLY_MAY_GO_SOMEWHERE_ELSE = new NpcStringId(1800403);
+		DO_NOT_START_A_TASK_THATS_NOT_CLEAR_TO_YOU = new NpcStringId(1800404);
+		YOU_WILL_NEED_TO_BE_PREPARED_FOR_ALL_EVENTS = new NpcStringId(1800405);
+		SOMEONE_WILL_ACKNOWLEDGE_YOU_IF_YOU_RELENTLESSLY_KEEP_TRYING_AND_DO_NOT_GIVE_UP_WHEN_FACING_HARDSHIPS = new NpcStringId(1800406);
+		YOU_MAY_PERFECT_YOURSELF_LIKE_A_DRAGONS_HORN_DECORATES_THE_DRAGON = new NpcStringId(1800407);
+		YOUR_TRUE_VALUE_STARTS_TO_SHINE = new NpcStringId(1800408);
+		YOUR_STEADY_PURSUIT_OF_NEW_INFORMATION_AND_STAYING_AHEAD_OF_OTHERS_WILL_RAISE_YOUR_VALUE = new NpcStringId(1800409);
+		MAINTAINING_CONFIDENCE_WITH_WORK_OR_RELATIONSHIPS_MAY_BRING_GOOD_RESULTS = new NpcStringId(1800410);
+		LEARN_TO_WORK_WITH_OTHERS_SINCE_OVERCONFIDENCE_WILL_BEAR_WRATH = new NpcStringId(1800411);
+		THE_DRAGON_NOW_ACQUIRES_AN_EAGLES_WINGS = new NpcStringId(1800412);
+		AS_THE_DRAGON_FLIES_HIGH_IN_THE_SKY_YOUR_GOALS_AND_DREAMS_MAY_COME_TRUE = new NpcStringId(1800413);
+		LUCK_ENTERS_INTO_YOUR_WORK_HOBBY_FAMILY_AND_LOVE = new NpcStringId(1800414);
+		WHATEVER_YOU_DO_IT_WILL_ACCOMPANY_WINNING = new NpcStringId(1800415);
+		ITS_AS_GOOD_AS_IT_GETS_WITH_UNFORESEEN_FORTUNE_ROLLING_YOUR_WAY = new NpcStringId(1800416);
+		A_GREEDY_ACT_WITH_NO_PRUDENCE_WILL_BRING_A_SURPRISE_AT_THE_END = new NpcStringId(1800417);
+		THINK_CAREFULLY_AND_ACT_WITH_CAUTION_AT_ALL_TIMES = new NpcStringId(1800418);
+		IF_A_TREE_DOESNT_HAVE_ITS_ROOTS_THERE_WILL_BE_NO_FRUIT = new NpcStringId(1800419);
+		HARD_WORK_DOESNT_BEAR_FRUIT = new NpcStringId(1800420);
+		FINANCIAL_DIFFICULTIES_MAY_BRING_AN_ORDEAL = new NpcStringId(1800421);
+		WHAT_USED_TO_BE_WELL_MANAGED_MAY_STUMBLE_ONE_AFTER_ANOTHER = new NpcStringId(1800422);
+		A_FEELING_OF_FRUSTRATION_MAY_FOLLOW_DISAPPOINTMENT = new NpcStringId(1800423);
+		BE_CAUTIONED_AS_UNHARNESSED_BEHAVIOR_AT_DIFFICULT_TIMES_CAN_RUIN_RELATIONSHIPS = new NpcStringId(1800424);
+		CURTAIL_GREED_AND_BE_GRATEFUL_FOR_SMALL_RETURNS_AS_MODESTY_IS_NEEDED = new NpcStringId(1800425);
+		THE_PERSON_THAT_CAME_UNDER_YOUR_WINGS_WILL_LEAVE = new NpcStringId(1800426);
+		YOUR_WORK_AND_RELATIONSHIP_WITH_COLLEAGUES_WILL_BE_WELL_MANAGED_IF_YOU_MAINTAIN_YOUR_DEVOTION = new NpcStringId(1800427);
+		CALCULATING_YOUR_PROFIT_IN_RELATIONSHIPS_WITHOUT_DISPLAYING_ANY_COURTEOUS_MANNERS_WILL_BRING_MALICIOUS_GOSSIP_AND_RUIN_YOUR_VALUE = new NpcStringId(1800428);
+		CONSIDER_OTHERS_SITUATIONS_AND_TREAT_THEM_SINCERELY_AT_ALL_TIMES = new NpcStringId(1800429);
+		DO_NOT_LOOSEN_UP_WITH_YOUR_PRECAUTIONS = new NpcStringId(1800430);
+		REFLECT_OTHERS_OPINIONS_AS_A_MISTAKE_ALWAYS_LIES_AHEAD_OF_AN_ARBITRARY_DECISION = new NpcStringId(1800431);
+		A_BLIND_MAN_GOES_RIGHT_THROUGH_THE_DOOR = new NpcStringId(1800432);
+		A_HEART_FALLS_INTO_HOPELESSNESS_AS_THINGS_ARE_IN_DISARRAY = new NpcStringId(1800433);
+		HOPELESSNESS_MAY_FILL_YOUR_HEART_AS_YOUR_WORK_FALLS_INTO_A_MAZE = new NpcStringId(1800434);
+		DIFFICULTIES_LIE_AHEAD_OF_AN_UNFORESEEN_PROBLEM_EVEN_WITH_YOUR_HARD_WORK = new NpcStringId(1800435);
+		THERE_MAY_BE_MORE_OCCASIONS_YOU_WILL_WANT_TO_ASK_FAVORS_FROM_OTHERS_AS_YOU_LOSE_CONFIDENCE_IN_YOU = new NpcStringId(1800436);
+		BE_BRAVE_AND_AMBITIOUS_AS_NO_BIRD_CAN_FLY_INTO_THE_SKY_BY_STAYING_IN_THEIR_NEST = new NpcStringId(1800437);
+		ITS_A_GOOD_IDEA_NOT_TO_START_AN_UNCLEAR_TASK_AND_ALWAYS_LOOK_FOR_SOMEONE_YOU_CAN_TRUST_AND_RELY_UPON = new NpcStringId(1800438);
+		HUNTING_WONT_BE_SUCCESSFUL_AS_THE_FALCON_LACKS_ITS_CLAWS = new NpcStringId(1800439);
+		A_PREPARED_PLAN_WONT_MOVE_SMOOTHLY = new NpcStringId(1800440);
+		AN_EASY_TASK_MAY_FAIL_IF_ONE_IS_CONSUMED_BY_GREED_AND_OVERCONFIDENCE = new NpcStringId(1800441);
+		IMPATIENCE_MAY_LIE_AHEAD_AS_THE_SITUATION_IS_UNFAVORABLE = new NpcStringId(1800442);
+		THOUGHTFUL_FORESIGHT_IS_NEEDED_BEFORE_A_DISASTER_MAY_FALL_UPON_YOU = new NpcStringId(1800443);
+		REFRAIN_FROM_DICTATORIAL_ACTS_AS_CARING_FOR_OTHERS_AROUND_YOU_WITH_DIGNITY_IS_MUCH_NEEDED = new NpcStringId(1800444);
+		THINGS_ARE_MESSY_WITH_NO_GOOD_SIGN = new NpcStringId(1800445);
+		YOU_MAY_FALL_INTO_A_VEXING_SITUATION_AS_BAD_CIRCUMSTANCES_WILL_ARISE = new NpcStringId(1800446);
+		RELATIONSHIPS_WITH_PEOPLE_MAY_BE_CONTRARY_TO_YOUR_EXPECTATIONS = new NpcStringId(1800447);
+		DO_NOT_SEEK_A_QUICK_FIX_AS_THE_PROBLEM_NEEDS_A_FUNDAMENTAL_RESOLUTION = new NpcStringId(1800448);
+		SEEK_PEACE_IN_YOUR_HEART_AS_VULGAR_DISPLAY_OF_YOUR_EMOTIONS_MAY_HARM_YOU = new NpcStringId(1800449);
+		INFORMATION_FOR_SUCCESS_MAY_COME_FROM_THE_CONVERSATIONS_WITH_PEOPLE_AROUND_YOU = new NpcStringId(1800450);
+		BE_CONFIDENT_AND_ACT_RELIANTLY_AT_ALL_TIMES = new NpcStringId(1800451);
+		A_CHILD_GETS_A_TREASURE = new NpcStringId(1800452);
+		GOOD_FORTUNE_AND_OPPORTUNITY_MAY_LIE_AHEAD_AS_IF_ONES_BORN_IN_A_GOLDEN_SPOON = new NpcStringId(1800453);
+		YOUR_LIFE_FLOWS_AS_IF_ITS_ON_A_SILK_SURFACE_AND_UNEXPECTED_FORTUNE_AND_SUCCESS_MAY_COME_TO_YOU = new NpcStringId(1800454);
+		TEMPORARY_LUCK_MAY_COME_TO_YOU_WITH_NO_EFFORT = new NpcStringId(1800455);
+		PLAN_AHEAD_WITH_PATIENCE_BUT_EXECUTE_WITH_SWIFTNESS = new NpcStringId(1800456);
+		THE_ABILITIES_TO_AMEND_FORESEE_AND_ANALYZE_MAY_RAISE_YOUR_VALUE = new NpcStringId(1800457);
+		BIGGER_MISTAKES_WILL_BE_ON_THE_ROAD_IF_YOU_FAIL_TO_CORRECT_A_SMALL_MISTAKE = new NpcStringId(1800458);
+		DONT_BE_EVASIVE_TO_ACCEPT_NEW_FINDINGS_OR_EXPERIENCES = new NpcStringId(1800459);
+		DONT_BE_IRRITATED_AS_THE_SITUATIONS_DONT_MOVE_AS_PLANNED = new NpcStringId(1800460);
+		BE_WARNED_AS_YOU_MAY_BE_OVERWHELMED_BY_SURROUNDINGS_IF_YOU_LACK_A_CLEAR_OPINION = new NpcStringId(1800461);
+		YOU_MAY_LIVE_AN_AFFLUENT_LIFE_EVEN_WITHOUT_POSSESSIONS = new NpcStringId(1800462);
+		YOU_WILL_GAIN_POPULARITY_AS_YOU_HELP_PEOPLE_WITH_MONEY_YOU_EARNESTLY_EARNED = new NpcStringId(1800463);
+		YOUR_HEART_AND_BODY_MAY_BE_IN_HEALTH = new NpcStringId(1800464);
+		BE_WARNED_AS_YOU_MAY_BE_DRAGGED_TO_AN_UNWANTED_DIRECTION_IF_NOT_CAUTIOUS = new NpcStringId(1800465);
+		YOU_MAY_MEET_MANY_NEW_PEOPLE_BUT_IT_WILL_BE_DIFFICULT_TO_FIND_A_PERFECT_PERSON_WHO_WINS_YOUR_HEART = new NpcStringId(1800466);
+		THERE_MAY_BE_AN_OCCASION_WHERE_YOU_ARE_CONSOLED_BY_PEOPLE = new NpcStringId(1800467);
+		IT_MAY_NOT_BE_A_GOOD_TIME_FOR_A_CHANGE_EVEN_IF_THERES_TEDIUM_IN_DAILY_LIFE = new NpcStringId(1800468);
+		THE_MONEY_YOU_SPEND_FOR_YOURSELF_MAY_ACT_AS_AN_INVESTMENT_AND_BRING_YOU_A_RETURN = new NpcStringId(1800469);
+		THE_MONEY_YOU_SPEND_FOR_OTHERS_WILL_BE_WASTED_SO_BE_CAUTIOUS = new NpcStringId(1800470);
+		BE_WARNED_SO_AS_NOT_TO_HAVE_UNNECESSARY_EXPENSES = new NpcStringId(1800471);
+		YOUR_STAR_INDICATED_SUCH_GOOD_LUCK_PARTICIPATE_IN_BONUS_GIVEAWAYS_OR_EVENTS = new NpcStringId(1800472);
+		YOU_MAY_GRAB_UNEXPECTED_LUCK = new NpcStringId(1800473);
+		THE_PERSON_IN_YOUR_HEART_MAY_NATURALLY_COME_TO_YOU = new NpcStringId(1800474);
+		THERE_WILL_BE_A_GOOD_RESULT_IF_YOU_KEEP_YOUR_OWN_PACE_REGARDLESS_OF_OTHERS_JUDGMENT = new NpcStringId(1800475);
+		BE_WARNED_AS_UNEXPECTED_LUCK_MAY_BE_WASTED_WITH_YOUR_RECKLESS_COMMENTS = new NpcStringId(1800476);
+		OVERCONFIDENCE_WILL_CONVINCE_YOU_TO_CARRY_A_TASK_ABOVE_YOUR_REACH_AND_THERE_WILL_BE_CONSEQUENCES = new NpcStringId(1800477);
+		MOMENTARILY_DELAY_AN_IMPORTANT_DECISION = new NpcStringId(1800478);
+		TROUBLE_SPOTS_LIE_AHEAD_WHEN_TALKING_TO_SUPERIORS_OR_PEOPLE_CLOSE_TO_YOU = new NpcStringId(1800479);
+		BE_WARNED_AS_YOUR_WORDS_CAN_HURT_OTHERS_OR_OTHERS_WORDS_CAN_HURT_YOU = new NpcStringId(1800480);
+		MAKE_A_LOUD_BOAST_AND_YOU_MAY_HAVE_TO_PAY_TO_COVER_UNNECESSARY_EXPENSES = new NpcStringId(1800481);
+		SKILLFUL_EVASION_IS_NEEDED_WHEN_DEALING_WITH_PEOPLE_WHO_PICK_FIGHTS_AS_A_DISASTER_MAY_ARISE_FROM_IT = new NpcStringId(1800482);
+		KEEP_A_LOW_PROFILE_AS_TOO_STRONG_AN_OPINION_WILL_ATTRACT_ADVERSE_REACTIONS = new NpcStringId(1800483);
+		DO_NOT_UNNECESSARILY_PROVOKE_MISUNDERSTANDING_AS_YOU_MAY_BE_INVOLVED_IN_MALICIOUS_GOSSIP = new NpcStringId(1800484);
+		CHECK_YOUR_BELONGINGS_AS_YOU_MAY_LOSE_WHAT_YOU_POSSESS = new NpcStringId(1800485);
+		BE_FLEXIBLE_ENOUGH_TO_PLAY_UP_TO_OTHERS = new NpcStringId(1800486);
+		PAY_SPECIAL_ATTENTION_WHEN_MEETING_OR_TALKING_TO_PEOPLE_AS_RELATIONSHIPS_MAY_GO_AMISS = new NpcStringId(1800487);
+		WHEN_THE_IMPORTANT_MOMENT_ARRIVES_DECIDE_UPON_WHAT_YOU_TRULY_WANT_WITHOUT_MEASURING_OTHERS_JUDGMENT = new NpcStringId(1800488);
+		LUCK_WILL_ALWAYS_FOLLOW_YOU_IF_YOU_TRAVEL_AND_READ_MANY_BOOKS = new NpcStringId(1800489);
+		HEAD_TO_A_PLACE_THAT_NEEDS_YOUR_ADVICE_AS_GOOD_IDEAS_AND_WISDOM_WILL_FLOURISH = new NpcStringId(1800490);
+		SOMEONES_LIFE_MAY_CHANGE_UPON_YOUR_ADVICE = new NpcStringId(1800491);
+		ITS_A_PROPER_TIME_TO_PLAN_FOR_THE_FUTURE_RATHER_THAN_A_SHORT_TERM_PLAN = new NpcStringId(1800492);
+		MANY_THOUGHTFUL_PLANS_AT_PRESENT_TIME_WILL_BE_OF_GREAT_HELP_IN_THE_FUTURE = new NpcStringId(1800493);
+		PATIENCE_MAY_BE_NEEDED_AS_A_BIG_QUARREL_ARISES_BETWEEN_YOU_AND_A_PERSON_CLOSE_TO_YOU = new NpcStringId(1800494);
+		DO_NOT_ASK_FOR_FINANCIAL_HELP_WHEN_THE_TIME_IS_DIFFICULT_YOUR_PRIDE_WILL_BE_HURT_WITHOUT_GAINING_ANY_MONEY = new NpcStringId(1800495);
+		CONNECTION_WITH_A_SPECIAL_PERSON_STARTS_WITH_A_MERE_INCIDENT = new NpcStringId(1800496);
+		STUBBORNNESS_REGARDLESS_OF_THE_MATTER_WILL_ONLY_BEAR_DANGER = new NpcStringId(1800497);
+		KEEP_GOOD_MANNERS_AND_VALUE_TACITURNITY_AS_LIGHT_HEARTEDNESS_MAY_BRING_MISFORTUNE = new NpcStringId(1800498);
+		YOU_MAY_MEET_THE_OPPOSITE_SEX = new NpcStringId(1800499);
+		GREED_BY_WANTING_TO_TAKE_WEALTH_MAY_BRING_UNFORTUNATE_DISASTER = new NpcStringId(1800500);
+		LOSS_IS_AHEAD_REFRAIN_FROM_INVESTING_TRY_TO_SAVE_THE_MONEY_IN_YOUR_POCKETS = new NpcStringId(1800501);
+		YOUR_WEALTH_LUCK_IS_DIM_AVOID_ANY_OFFERS = new NpcStringId(1800502);
+		A_BIGGER_CHALLENGE_MAY_BE_WHEN_DELAYING_TODAYS_WORK = new NpcStringId(1800503);
+		THERE_WILL_BE_DIFFICULTY_BUT_A_GOOD_RESULT_MAY_BE_AHEAD_WHEN_FACING_IT_RESPONSIBLY = new NpcStringId(1800504);
+		EVEN_WITH_SOME_DIFFICULTIES_EXPAND_THE_RANGE_OF_YOUR_SCOPE_WHERE_YOU_ARE_IN_CHARGE_IT_WILL_RETURN_TO_YOU_AS_HELP = new NpcStringId(1800505);
+		FOCUS_ON_MAINTAINING_ORGANIZED_SURROUNDINGS_TO_HELP_REDUCE_YOUR_LOSSES = new NpcStringId(1800506);
+		LUCK_LIES_AHEAD_WHEN_WAITING_FOR_PEOPLE_RATHER_THAN_FOLLOWING_THEM = new NpcStringId(1800507);
+		DO_NOT_OFFER_YOUR_HAND_FIRST_EVEN_WHEN_THINGS_ARE_HASTY_THE_RELATIONSHIP_MAY_FALL_APART = new NpcStringId(1800508);
+		YOUR_WEALTH_LUCK_IS_RISING_THERE_WILL_BE_SOME_GOOD_RESULT = new NpcStringId(1800509);
+		YOU_MAY_FALL_IN_DANGER_EACH_TIME_WHEN_ACTING_UPON_IMPROVISATION = new NpcStringId(1800510);
+		BE_WARNED_AS_A_CHILDISHLY_ACT_BEFORE_ELDERS_MAY_RUIN_EVERYTHING = new NpcStringId(1800511);
+		THINGS_WILL_MOVE_EFFORTLESSLY_BUT_LUCK_WILL_VANISH_WITH_YOUR_AUDACITY = new NpcStringId(1800512);
+		LUCK_MAY_BE_CONTINUED_ONLY_WHEN_HUMILITY_IS_MAINTAINED_AFTER_SUCCESS = new NpcStringId(1800513);
+		A_NEW_PERSON_MAY_APPEAR_TO_CREATE_A_LOVE_TRIANGLE = new NpcStringId(1800514);
+		LOOK_FOR_SOMEONE_WITH_A_SIMILAR_STYLE_IT_WILL_OPEN_UP_FOR_THE_GOOD = new NpcStringId(1800515);
+		AN_OFFER_MAY_SOON_BE_MADE_TO_COLLABORATE_A_TASK_BUT_DELAYING_IT_WILL_BE_A_GOOD_IDEA = new NpcStringId(1800516);
+		PARTNERSHIP_IS_OUT_OF_LUCK_AVOID_SOMEONE_WHO_RUSHES_YOU_TO_START_A_COLLABORATION = new NpcStringId(1800517);
+		FOCUS_ON_NETWORKING_WITH_LIKE_MINDED_PEOPLE_THEY_MAY_JOIN_YOU_FOR_A_BIG_MISSION_IN_THE_FUTURE = new NpcStringId(1800518);
+		BE_WARNED_WHEN_SOMEONE_SAYS_YOU_ARE_INNOCENT_AS_THATS_NOT_A_COMPLIMENT = new NpcStringId(1800519);
+		YOU_MAY_BE_SCAMMED_BE_CAUTIOUS_AS_THERE_MAY_BE_A_BIG_LOSS_BY_UNDERESTIMATING_OTHERS = new NpcStringId(1800520);
+		LUCK_AT_DECISION_MAKING_IS_DIM_AVOID_SUBJECTIVE_CONCLUSIONS_AND_RELY_ON_UNIVERSAL_COMMON_SENSE = new NpcStringId(1800521);
+		YOUR_WEAKNESS_MAY_INVITE_HARDSHIPS_CAUTIOUSLY_TAKE_A_STRONG_POSITION_AS_NEEDED = new NpcStringId(1800522);
+		BE_WARY_OF_SOMEONE_WHO_TALKS_AND_ENTERTAINS_TOO_MUCH_THE_PERSON_MAY_BRING_YOU_MISFORTUNE = new NpcStringId(1800523);
+		YOU_MAY_ENJOY_A_BEGINNERS_LUCK = new NpcStringId(1800524);
+		YOUR_WEALTH_LUCK_IS_STRONG_BUT_YOU_SHOULD_KNOW_WHEN_TO_WITHDRAW = new NpcStringId(1800525);
+		ALREADY_ACQUIRED_WEALTH_CAN_BE_LOST_BY_GREED = new NpcStringId(1800526);
+		EVEN_IF_YOU_CAN_COMPLETE_IT_BY_YOURSELF_ITS_A_GOOD_IDEA_TO_HAVE_SOMEONE_HELP_YOU = new NpcStringId(1800527);
+		MAKE_HARMONY_WITH_PEOPLE_THE_PRIORITY_STUBBORNNESS_MAY_BRING_HARDSHIPS = new NpcStringId(1800528);
+		THERE_MAY_BE_A_CHANCE_WHEN_YOU_CAN_SEE_A_NEW_ASPECT_OF_A_CLOSE_FRIEND = new NpcStringId(1800529);
+		TRY_TO_BE_CLOSE_TO_SOMEONE_DIFFERENT_FROM_YOU_WITHOUT_ANY_STEREOTYPICAL_JUDGMENT = new NpcStringId(1800530);
+		GOOD_LUCK_IN_BECOMING_A_LEADER_WITH_MANY_FOLLOWERS_HOWEVER_ITLL_ONLY_BE_AFTER_HARD_WORK = new NpcStringId(1800531);
+		YOUR_WEALTH_LUCK_IS_RISING_EXPENDITURES_WILL_BE_FOLLOWED_BY_SUBSTANTIAL_INCOME_AS_YOU_ARE_ABLE_TO_SUSTAIN = new NpcStringId(1800532);
+		BE_CAUTIOUS_AS_YOUR_WEALTH_LUCK_CAN_BE_EITHER_VERY_GOOD_OR_VERY_BAD = new NpcStringId(1800533);
+		BE_WARNED_AS_A_SMALL_ARGUMENT_CAN_DISTANCE_YOU_FROM_A_CLOSE_FRIEND = new NpcStringId(1800534);
+		THERE_IS_LUCK_IN_LOVE_WITH_A_NEW_PERSON = new NpcStringId(1800535);
+		A_BIGGER_FORTUNE_WILL_BE_FOLLOWED_BY_YOUR_GOOD_DEED = new NpcStringId(1800536);
+		THERE_MAY_BE_A_RELATIONSHIP_BREAKING_TRY_TO_ELIMINATE_MISUNDERSTANDINGS = new NpcStringId(1800537);
+		BE_CAUTIOUS_NOT_TO_BE_EMOTIONALLY_MOVED_EVEN_IF_ITS_CONVINCING = new NpcStringId(1800538);
+		SMILING_WILL_BRING_GOOD_LUCK = new NpcStringId(1800539);
+		ITS_A_GOOD_IDEA_TO_LET_GO_OF_A_SMALL_LOSS = new NpcStringId(1800540);
+		CONVEYING_YOUR_OWN_TRUTH_MAY_BE_DIFFICULT_AND_EASY_MISUNDERSTANDINGS_WILL_FOLLOW = new NpcStringId(1800541);
+		THERE_IS_GOOD_LUCK_IN_A_PLACE_WITH_MANY_PEOPLE = new NpcStringId(1800542);
+		TRY_TO_AVOID_DIRECTNESS_IF_YOU_CAN = new NpcStringId(1800543);
+		VALUE_SUBSTANCE_OPPOSED_TO_THE_SAKE_HONOR_AND_LOOK_BEYOND_WHATS_IN_FRONT_OF_YOU = new NpcStringId(1800544);
+		EXPANDING_A_RELATIONSHIP_WITH_HUMOR_MAY_BE_A_GOOD_IDEA = new NpcStringId(1800545);
+		AN_ENJOYABLE_EVENT_MAY_BE_AHEAD_IF_YOU_ACCEPT_A_SIMPLE_BET = new NpcStringId(1800546);
+		BEING_LEVEL_HEADED_NOT_FOCUSING_ON_EMOTIONS_MAY_HELP_WITH_RELATIONSHIPS = new NpcStringId(1800547);
+		ITS_A_GOOD_IDEA_TO_TAKE_CARE_OF_MATTERS_IN_SEQUENTIAL_ORDER_WITHOUT_MEASURING_THEIR_IMPORTANCE = new NpcStringId(1800548);
+		A_DETERMINED_ACT_AFTER_PREPARED_RESEARCH_WILL_ATTRACT_PEOPLE = new NpcStringId(1800549);
+		A_LITTLE_HUMOR_MAY_BRING_COMPLETE_ATTENTION_TO_YOU = new NpcStringId(1800550);
+		IT_MAY_NOT_BE_A_GOOD_TIME_FOR_AN_IMPORTANT_DECISION_BE_WARY_OF_TEMPTATIONS_AND_AVOID_MONETARY_DEALINGS = new NpcStringId(1800551);
+		PAY_SPECIAL_ATTENTION_TO_ADVICE_FROM_A_CLOSE_FRIEND = new NpcStringId(1800552);
+		THERE_MAY_BE_MODERATE_SOLUTIONS_TO_EVERY_PROBLEM_WHEN_THEYRE_VIEWED_FROM_A_3RD_PARTYS_POINT_OF_VIEW = new NpcStringId(1800553);
+		DEALINGS_WITH_CLOSE_FRIENDS_ONLY_BRING_FRUSTRATION_AND_HEADACHE_POLITELY_DECLINE_AND_MENTION_ANOTHER_CHANCE = new NpcStringId(1800554);
+		THERE_MAY_BE_A_PROBLEM_AT_COMPLETION_IF_THE_BASIC_MATTERS_ARE_NOT_CONSIDERED_FROM_THE_BEGINNING = new NpcStringId(1800555);
+		DISTINGUISHING_BUSINESS_FROM_A_PRIVATE_MATTER_IS_NEEDED_TO_SUCCEED = new NpcStringId(1800556);
+		A_CHANGE_IN_RULES_MAY_BE_HELPFUL_WHEN_PROBLEMS_ARE_PERSISTENT = new NpcStringId(1800557);
+		PREPARING_FOR_AN_UNFORESEEN_SITUATION_WILL_BE_DIFFICULT_WHEN_SMALL_MATTERS_ARE_IGNORED = new NpcStringId(1800558);
+		REFRAIN_FROM_GETTING_INVOLVED_IN_OTHERS_BUSINESS_TRY_TO_BE_LOOSE_AS_A_GOOSE = new NpcStringId(1800559);
+		BEING_NEUTRAL_IS_A_GOOD_WAY_TO_GO_BUT_CLARITY_MAY_BE_HELPFUL_CONTRARY_TO_YOUR_HESITANCE = new NpcStringId(1800560);
+		BE_CAUTIOUS_OF_YOUR_OWN_ACTIONS_THE_PAST_MAY_BRING_MISUNDERSTANDINGS = new NpcStringId(1800561);
+		PAY_ATTENTION_TO_TIME_MANAGEMENT_EMOTIONS_MAY_WASTE_YOUR_TIME = new NpcStringId(1800562);
+		HEROISM_WILL_BE_REWARDED_BUT_BE_CAREFUL_NOT_TO_DISPLAY_ARROGANCE_OR_LACK_OF_SINCERITY = new NpcStringId(1800563);
+		IF_YOU_WANT_TO_MAINTAIN_RELATIONSHIP_CONNECTIONS_OFFER_RECONCILIATION_TO_THOSE_WHO_HAD_MISUNDERSTANDINGS_WITH_YOU = new NpcStringId(1800564);
+		STEP_FORWARD_TO_SOLVE_OTHERS_PROBLEMS_WHEN_THEY_ARE_UNABLE = new NpcStringId(1800565);
+		THERE_MAY_BE_A_LITTLE_LOSS_BUT_THINK_OF_IT_AS_AN_INVESTMENT_FOR_YOURSELF = new NpcStringId(1800566);
+		AVARICE_BEARS_A_BIGGER_GREED_BEING_SATISFIED_WITH_MODERATION_IS_NEEDED = new NpcStringId(1800567);
+		A_RATIONAL_ANALYSIS_IS_NEEDED_AS_UNPLANNED_ACTIONS_MAY_BRING_CRITICISM = new NpcStringId(1800568);
+		REFLECT_UPON_YOUR_SHORTCOMINGS_BEFORE_CRITICIZING_OTHERS = new NpcStringId(1800569);
+		FOLLOW_UP_CARE_IS_ALWAYS_NEEDED_AFTER_AN_EMERGENCY_EVASION = new NpcStringId(1800570);
+		YOU_MAY_LOOK_FOR_A_NEW_CHALLENGE_BUT_VAST_KNOWLEDGE_IS_REQUIRED = new NpcStringId(1800571);
+		WHEN_ONE_PUTS_ASIDE_THEIR_EGO_ANY_MISUNDERSTANDING_WILL_BE_SOLVED = new NpcStringId(1800572);
+		LISTEN_TO_THE_ADVICE_THATS_GIVEN_TO_YOU_WITH_A_HUMBLE_ATTITUDE = new NpcStringId(1800573);
+		EQUILIBRIUM_IS_ACHIEVED_WHEN_ONE_UNDERSTANDS_A_DOWNSHIFT_IS_EVIDENT_AFTER_THE_RISE = new NpcStringId(1800574);
+		WHAT_YOU_SOW_IS_WHAT_YOU_REAP_FAITHFULLY_FOLLOW_THE_PLAN = new NpcStringId(1800575);
+		METICULOUS_PREPARATION_IS_NEEDED_AS_SPONTANEOUS_ACTIONS_ONLY_BEAR_MENTAL_AND_MONETARY_LOSSES = new NpcStringId(1800576);
+		THE_RIGHT_TIME_TO_BEAR_FRUIT_IS_DELAYED_WHILE_THE_FARMER_PONDERS_OPINIONS = new NpcStringId(1800577);
+		HELP_EACH_OTHER_AMONG_CLOSE_FRIENDS = new NpcStringId(1800578);
+		OBSESSING_OVER_A_SMALL_PROFIT_WILL_PLACE_PEOPLE_APART = new NpcStringId(1800579);
+		DONT_CLING_TO_THE_RESULT_OF_A_GAMBLE = new NpcStringId(1800580);
+		SMALL_TROUBLES_AND_ARGUMENTS_ARE_AHEAD_FACE_THEM_WITH_A_MATURE_ATTITUDE = new NpcStringId(1800581);
+		NEGLECTING_A_PROMISE_MAY_PUT_YOU_IN_DISTRESS = new NpcStringId(1800582);
+		DELAY_ANY_DEALINGS_AS_YOU_MAY_EASILY_OMIT_ADDRESSING_WHATS_IMPORTANT_TO_YOU = new NpcStringId(1800583);
+		A_COMPARISON_TO_OTHERS_MAY_BE_HELPFUL = new NpcStringId(1800584);
+		WHAT_YOUVE_ENDURED_WILL_RETURN_AS_A_BENEFIT = new NpcStringId(1800585);
+		TRY_TO_BE_COURTEOUS_TO_THE_OPPOSITE_SEX_AND_FOLLOW_A_VIRTUOUS_PATH = new NpcStringId(1800586);
+		JOY_MAY_COME_FROM_SMALL_THINGS = new NpcStringId(1800587);
+		BE_CONFIDENT_IN_YOUR_ACTIONS_AS_GOOD_LUCK_SHADOWS_THE_RESULT = new NpcStringId(1800588);
+		BE_CONFIDENT_WITHOUT_HESITATION_WHEN_YOUR_HONESTY_IS_ABOVE_REPROACH_IN_DEALINGS = new NpcStringId(1800589);
+		A_MATTER_RELATED_TO_A_CLOSE_FRIEND_CAN_ISOLATE_YOU_KEEP_STAYING_ON_THE_RIGHT_PATH = new NpcStringId(1800590);
+		TOO_MUCH_FOCUS_ON_THE_RESULT_MAY_BRING_CONTINUOUS_MISFORTUNE = new NpcStringId(1800591);
+		BE_TENACIOUS_UNTIL_THE_FINISH_AS_HALFWAY_ABANDONMENT_CAUSES_A_TROUBLED_ENDING = new NpcStringId(1800592);
+		THERE_WILL_BE_NO_ADVANTAGE_IN_A_GROUP_DEAL = new NpcStringId(1800593);
+		REFRAIN_FROM_STEPPING_UP_BUT_TAKE_A_MOMENT_TO_PONDER_TO_BE_FLEXIBLE_WITH_SITUATIONS = new NpcStringId(1800594);
+		THERE_WILL_BE_A_SMALL_OPPORTUNITY_WHEN_INFORMATION_IS_BEST_UTILIZED = new NpcStringId(1800595);
+		BELONGINGS_ARE_AT_LOOSE_ENDS_KEEP_TRACK_OF_THE_THINGS_YOU_VALUE = new NpcStringId(1800596);
+		WHAT_YOU_SOW_IS_WHAT_YOU_REAP_TRY_YOUR_BEST = new NpcStringId(1800597);
+		WITH_THE_BEGINNERS_ATTITUDE_SHORTCOMINGS_CAN_BE_EASILY_MENDED = new NpcStringId(1800598);
+		WHEN_FACING_DIFFICULTIES_SEEK_A_TOTALLY_DIFFERENT_DIRECTION = new NpcStringId(1800599);
+		LIFETIME_SAVINGS_CAN_DISAPPEAR_WITH_ONE_TIME_GREED = new NpcStringId(1800600);
+		WITH_YOUR_HEART_AVOID_EXTREMES_AND_PEACE_WILL_STAY = new NpcStringId(1800601);
+		BE_CAUTIOUS_AS_INSTANT_RECKLESSNESS_MAY_BRING_MALICIOUS_GOSSIP = new NpcStringId(1800602);
+		BE_TENACIOUS_TO_THE_END_BECAUSE_A_STRONG_LUCK_WITH_WINNING_IS_AHEAD = new NpcStringId(1800603);
+		BE_KIND_TO_AND_CARE_FOR_THOSE_CLOSE_TO_YOU_THEY_MAY_HELP_IN_THE_FUTURE = new NpcStringId(1800604);
+		POSITIVITY_MAY_BRING_GOOD_RESULTS = new NpcStringId(1800605);
+		BE_GRACIOUS_TO_COVER_A_CLOSE_FRIENDS_FAULT = new NpcStringId(1800606);
+		BE_PREPARED_FOR_AN_EXPECTED_COST = new NpcStringId(1800607);
+		BE_CONSIDERATE_TO_OTHERS_AND_AVOID_FOCUSING_ONLY_ON_WINNING_OR_A_WOUND_WILL_BE_LEFT_UNTREATED = new NpcStringId(1800608);
+		AN_ACCESSORY_OR_DECORATION_MAY_BRING_A_GOOD_LUCK = new NpcStringId(1800609);
+		ONLY_REFLECTION_AND_HUMILITY_MAY_BRING_SUCCESS = new NpcStringId(1800610);
+		A_SMALL_MISUNDERSTANDING_MAY_CAUSE_QUARRELS = new NpcStringId(1800611);
+		AVOID_ADVANCING_BEYOND_YOUR_ABILITY_AND_FOCUS_ON_THE_FLOWING_STREAM = new NpcStringId(1800612);
+		CONSIDERING_OTHERS_WITH_A_GOOD_HEART_BEFORE_SELF_INTEREST_WILL_BRING_A_TRIUMPH = new NpcStringId(1800613);
+		VISITING_A_PLACE_YOUVE_NEVER_BEEN_BEFORE_MAY_BRING_LUCK = new NpcStringId(1800614);
+		A_GOOD_THING_MAY_HAPPEN_IN_A_PLACE_WITH_A_FEW_PEOPLE = new NpcStringId(1800615);
+		BEING_HIGH_STRUNG_CAN_CAUSE_LOSS_OF_TRUST_FROM_OTHERS_BECAUSE_IT_CAN_BE_VIEWED_AS_LIGHT_HEARTED_ACT_SINCERELY_BUT_YET_DO_NOT_LACK_HUMOR = new NpcStringId(1800616);
+		PERFECTION_AT_THE_FINISH_CAN_COVER_FAULTY_WORK_IN_THE_PROCESS = new NpcStringId(1800617);
+		ABSTAIN_FROM_LAZINESS_MUCH_WORK_BRINGS_MANY_GAINS_AND_SATISFACTORY_REWARDS = new NpcStringId(1800618);
+		STAYING_BUSY_RATHER_THAN_BEING_STATIONARY_WILL_HELP = new NpcStringId(1800619);
+		HANDLING_THE_WORK_BY_YOURSELF_MAY_LEAD_YOU_INTO_TEMPTATION = new NpcStringId(1800620);
+		PAY_ATTENTION_TO_ANY_SMALL_ADVICE_WITHOUT_BEING_INDIFFERENT = new NpcStringId(1800621);
+		SMALL_THINGS_MAKE_UP_BIG_THINGS_SO_EVEN_VALUE_TRIVIAL_MATTERS = new NpcStringId(1800622);
+		ACTION_TOWARD_THE_RESULT_RATHER_THAN_WAITING_FOR_THE_RIGHT_CIRCUMSTANCES_MAY_LEAD_YOU_TO_A_FAST_SUCCESS = new NpcStringId(1800623);
+		DONT_TRY_TO_SAVE_SMALL_EXPENDITURES_IT_WILL_LEAD_TO_FUTURE_RETURNS = new NpcStringId(1800624);
+		BE_CAUTIOUS_TO_CONTROL_EMOTIONS_AS_TEMPTATIONS_ARE_NEARBY = new NpcStringId(1800625);
+		BE_WARNED_AS_NEGLECTING_A_MATTER_BECAUSE_ITS_SMALL_CAN_CAUSE_YOU_TROUBLE = new NpcStringId(1800626);
+		SPEND_WHEN_NEEDED_RATHER_THAN_TRYING_TO_UNCONDITIONALLY_SAVE = new NpcStringId(1800627);
+		PREJUDICE_WILL_TAKE_YOU_TO_A_SMALL_GAIN_WITH_A_BIG_LOSS = new NpcStringId(1800628);
+		SWEET_FOOD_MAY_BRING_GOOD_LUCK = new NpcStringId(1800629);
+		YOU_MAY_BE_PAID_FOR_WHAT_YOURE_OWED_OR_FOR_YOUR_PAST_LOSS = new NpcStringId(1800630);
+		THERE_MAY_BE_CONFLICT_IN_BASIC_MATTERS = new NpcStringId(1800631);
+		BE_OBSERVANT_TO_CLOSE_FRIENDS_SMALL_BEHAVIORS_WHILE_REFRAINING_FROM_EXCESSIVE_KINDNESS = new NpcStringId(1800632);
+		DO_NOT_SHOW_YOUR_DISTRESS_NOR_LOSE_YOUR_SMILE = new NpcStringId(1800633);
+		SHOWING_CHANGE_MAY_BE_OF_HELP = new NpcStringId(1800634);
+		THE_INTENDED_RESULT_MAY_BE_ON_YOUR_WAY_IF_THE_TIME_IS_PERFECTLY_MANAGED = new NpcStringId(1800635);
+		HARDSHIPS_MAY_ARISE_IF_FLEXIBILITY_IS_NOT_WELL_PLAYED = new NpcStringId(1800636);
+		KEEP_COOL_HEADED_BECAUSE_CARELESSNESS_OR_INATTENTIVENESS_MAY_CAUSE_MISFORTUNE = new NpcStringId(1800637);
+		BE_CAUTIOUS_AS_YOU_MAY_GET_HURT_AFTER_LAST_NIGHTS_SINISTER_DREAM = new NpcStringId(1800638);
+		A_STRONG_WEALTH_LUCK_IS_AHEAD_BUT_BE_CAREFUL_WITH_EMOTIONS_THAT_MAY_BRING_LOSSES = new NpcStringId(1800639);
+		PROCEED_AS_YOU_WISH_WHEN_ITS_PERTINENT_TO_THE_PERSON_YOU_LIKE = new NpcStringId(1800640);
+		YOU_MAY_DEEPEN_THE_RELATIONSHIP_WITH_THE_OPPOSITE_SEX_THROUGH_CONVERSATION = new NpcStringId(1800641);
+		INVESTMENT_INTO_SOLID_MATERIAL_MAY_BRING_PROFIT = new NpcStringId(1800642);
+		INVESTMENT_INTO_WHAT_YOU_ENJOY_MAY_BE_OF_HELP = new NpcStringId(1800643);
+		BEING_BUSY_MAY_HELP_CATCHING_UP_WITH_MANY_CHANGES = new NpcStringId(1800644);
+		CHOOSE_SUBSTANCE_OVER_HONOR = new NpcStringId(1800645);
+		REMEMBER_TO_DECLINE_ANY_FINANCIAL_DEALINGS_BECAUSE_A_GOOD_DEED_MAY_RETURN_AS_RESENTMENT = new NpcStringId(1800646);
+		BE_CAREFUL_NOT_TO_MAKE_A_MISTAKE_WITH_A_NEW_PERSON = new NpcStringId(1800647);
+		DO_NOT_BE_OBSESSIVE_OVER_A_DRAGGED_OUT_PROJECT_SINCE_IT_WONT_GET_ANY_BETTER_WITH_MORE_TIME = new NpcStringId(1800648);
+		DO_NOT_YIELD_WHATS_RIGHTFULLY_YOURS_OR_TOLERATE_LOSSES = new NpcStringId(1800649);
+		THERES_LUCK_IN_RELATIONSHIPS_SO_BECOME_INTERESTED_IN_THE_OPPOSITE_SEX = new NpcStringId(1800650);
+		SEEKING_OTHERS_HELP_RATHER_THAN_TRYING_BY_YOURSELF_MAY_RESULT_IN_TWO_BIRDS_WITH_ONE_STONE = new NpcStringId(1800651);
+		PERSUADING_THE_OTHER_MAY_RESULT_IN_YOUR_GAIN = new NpcStringId(1800652);
+		A_GOOD_OPPORTUNITY_MAY_COME_WHEN_KEEPING_PATIENCE_WITHOUT_EXCESSIVENESS = new NpcStringId(1800653);
+		THE_OPPOSITE_SEX_MAY_BRING_FORTUNE = new NpcStringId(1800654);
+		DOING_FAVOR_FOR_OTHER_PEOPLE_MAY_BRING_FORTUNE_IN_THE_FUTURE = new NpcStringId(1800655);
+		LUCK_MAY_STAY_NEAR_IF_A_SMILE_IS_KEPT_DURING_DIFFICULT_TIMES = new NpcStringId(1800656);
+		YOU_MAY_REVEAL_YOUR_TRUE_SELF_LIKE_IRON_IS_MOLTEN_INTO_AN_STRONG_SWORD = new NpcStringId(1800657);
+		YOUR_VALUE_WILL_SHINE_AS_YOUR_POTENTIAL_IS_FINALLY_REALIZED = new NpcStringId(1800658);
+		TENACIOUS_EFFORTS_IN_SOLVING_A_DIFFICULT_MISSION_OR_HARDSHIP_MAY_BRING_GOOD_RESULTS_AS_WELL_AS_REALIZING_YOUR_HIDDEN_POTENTIAL = new NpcStringId(1800659);
+		PEOPLE_WILL_APPRECIATE_YOUR_POSITIVITY_AND_JOYFUL_ENTERTAINING = new NpcStringId(1800660);
+		THINGS_WILL_MOVE_SMOOTHLY_WITH_YOUR_FULL_WISDOM_AND_ABILITIES = new NpcStringId(1800661);
+		YOU_MAY_MEET_A_SAGE_WHO_CAN_HELP_YOU_FIND_THE_RIGHT_PATH = new NpcStringId(1800662);
+		KEEN_INSTINCT_AND_FORESIGHT_WILL_SHINE_THEIR_VALUES = new NpcStringId(1800663);
+		YOU_MAY_BRING_GOOD_LUCK_TO_THOSE_AROUND_YOU = new NpcStringId(1800664);
+		YOUR_GOAL_MAY_BE_REALIZED_WHEN_EMOTIONAL_DETAILS_ARE_WELL_DEFINED = new NpcStringId(1800665);
+		YOU_MAY_ENJOY_AFFLUENCE_AFTER_MEETING_A_PRECIOUS_PERSON = new NpcStringId(1800666);
+		YOU_MAY_MEET_THE_OPPOSITE_SEX_WHO_HAS_MATERIALISTIC_ATTRACTIONS = new NpcStringId(1800667);
+		A_BIG_SUCCESS_WILL_FOLLOW_ALL_POSSIBLE_EFFORTS_IN_COMPETITION = new NpcStringId(1800668);
+		A_CONSEQUENCE_FROM_PAST_ACTIONS_WILL_BE_ON_DISPLAY = new NpcStringId(1800669);
+		WHATEVER_HAPPENED_TO_YOU_AND_THE_OTHER_PERSON_WILL_REPLAY_BUT_THIS_TIME_THE_OPPOSITE_WILL_BE_THE_RESULT = new NpcStringId(1800670);
+		YOU_MAY_NEED_TO_SACRIFICE_FOR_A_HIGHER_CAUSE = new NpcStringId(1800671);
+		YOU_MAY_LOSE_AN_ITEM_BUT_WILL_GAIN_HONOR = new NpcStringId(1800672);
+		A_NEW_TRIAL_OR_START_MAY_BE_SUCCESSFUL_AS_LUCK_SHADOWS_CHANGES = new NpcStringId(1800673);
+		BE_SOPHISTICATED_WITHOUT_SHOWING_YOUR_TRUE_EMOTIONS_AS_TRICKS_AND_MATERIALISTIC_TEMPTATIONS_LIE_AHEAD = new NpcStringId(1800674);
+		DO_NOT_ATTEMPT_A_DANGEROUS_ADVENTURE = new NpcStringId(1800675);
+		DO_NOT_BE_AFRAID_OF_CHANGE_A_RISK_WILL_BE_ANOTHER_OPPORTUNITY = new NpcStringId(1800676);
+		BE_CONFIDENT_AND_ACT_TENACIOUSLY_AT_ALL_TIMES_YOU_MAY_BE_ABLE_TO_ACCOMPLISH_TO_PERFECTION_DURING_SOMEWHAT_UNSTABLE_SITUATIONS = new NpcStringId(1800677);
+		YOU_MAY_EXPECT_A_BRIGHT_AND_HOPEFUL_FUTURE = new NpcStringId(1800678);
+		A_REST_WILL_PROMISE_A_BIGGER_DEVELOPMENT = new NpcStringId(1800679);
+		FULLY_UTILIZE_POSITIVE_VIEWS = new NpcStringId(1800680);
+		POSITIVE_THINKING_AND_ENERGETIC_ACTIONS_WILL_TAKE_YOU_TO_THE_CENTER_OF_THE_GLORIOUS_STAGE = new NpcStringId(1800681);
+		YOUR_SELF_CONFIDENCE_AND_INTUITION_MAY_SOLVE_THE_DIFFICULTIES = new NpcStringId(1800682);
+		EVERYTHING_IS_BRILLIANT_AND_JOYFUL_SHARE_IT_WITH_OTHERS_A_BIGGER_FORTUNE_WILL_FOLLOW = new NpcStringId(1800683);
+		A_FAIR_ASSESSMENT_AND_REWARD_FOR_PAST_ACTIONS_LIE_AHEAD = new NpcStringId(1800684);
+		PAY_ACCURATELY_THE_OLD_LIABILITY_OR_DEBT_IF_APPLICABLE_A_NEW_JOY_LIES_AHEAD = new NpcStringId(1800685);
+		AN_EXCESSIVE_HUMILITY_CAN_HARM_YOU_BACK = new NpcStringId(1800686);
+		A_REWARD_FOR_THE_PAST_WORK_WILL_COME_THROUGH = new NpcStringId(1800687);
+		YOUR_PAST_FRUITLESS_EFFORT_WILL_FINALLY_BE_REWARDED_WITH_SOMETHING_UNEXPECTED = new NpcStringId(1800688);
+		THERES_STRONG_LUCK_IN_A_REVIVAL_ABANDON_THE_OLD_AND_CREATE_THE_NEW = new NpcStringId(1800689);
+		YOU_MAY_GAIN_MATERIALISTIC_OR_MENTAL_AID_FROM_CLOSE_FRIENDS = new NpcStringId(1800690);
+		A_GOOD_BEGINNING_IS_AWAITING_YOU = new NpcStringId(1800691);
+		YOU_MAY_MEET_THE_PERSON_YOUVE_LONGED_TO_SEE = new NpcStringId(1800692);
+		YOU_MAY_SUSTAIN_A_LOSS_DUE_TO_YOUR_KINDNESS = new NpcStringId(1800693);
+		CLOSELY_OBSERVE_PEOPLE_WHO_PASS_BY_SINCE_YOU_MAY_MEET_A_PRECIOUS_PERSON_WHO_CAN_HELP_YOU = new NpcStringId(1800694);
+		MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_WERE_GATHERING_BRAVE_ADVENTURERS_TO_ATTACK_TIATS_MOUNTED_TROOP_THATS_ROOTED_IN_THE_SEED_OF_DESTRUCTION = new NpcStringId(1800695);
+		MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_THE_SEED_OF_DESTRUCTION_IS_CURRENTLY_SECURED_UNDER_THE_FLAG_OF_THE_KEUCEREUS_ALLIANCE = new NpcStringId(1800696);
+		MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_TIATS_MOUNTED_TROOP_IS_CURRENTLY_TRYING_TO_RETAKE_SEED_OF_DESTRUCTION_COMMIT_ALL_THE_AVAILABLE_REINFORCEMENTS_INTO_SEED_OF_DESTRUCTION = new NpcStringId(1800697);
+		MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_BRAVE_ADVENTURERS_WHO_HAVE_CHALLENGED_THE_SEED_OF_INFINITY_ARE_CURRENTLY_INFILTRATING_THE_HALL_OF_EROSION_THROUGH_THE_DEFENSIVELY_WEAK_HALL_OF_SUFFERING = new NpcStringId(1800698);
+		MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_SWEEPING_THE_SEED_OF_INFINITY_IS_CURRENTLY_COMPLETE_TO_THE_HEART_OF_THE_SEED_EKIMUS_IS_BEING_DIRECTLY_ATTACKED_AND_THE_UNDEAD_REMAINING_IN_THE_HALL_OF_SUFFERING_ARE_BEING_ERADICATED = new NpcStringId(1800699);
+		MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_THE_SEED_OF_INFINITY_IS_CURRENTLY_SECURED_UNDER_THE_FLAG_OF_THE_KEUCEREUS_ALLIANCE = new NpcStringId(1800700);
+		EMPTY_STRING = new NpcStringId(1800701);
+		MESSENGER_INFORM_THE_PATRONS_OF_THE_KEUCEREUS_ALLIANCE_BASE_THE_RESURRECTED_UNDEAD_IN_THE_SEED_OF_INFINITY_ARE_POURING_INTO_THE_HALL_OF_SUFFERING_AND_THE_HALL_OF_EROSION = new NpcStringId(1800702);
+		MESSENGER_INFORM_THE_BROTHERS_IN_KUCEREUS_CLAN_OUTPOST_EKIMUS_IS_ABOUT_TO_BE_REVIVED_BY_THE_RESURRECTED_UNDEAD_IN_SEED_OF_INFINITY_SEND_ALL_REINFORCEMENTS_TO_THE_HEART_AND_THE_HALL_OF_SUFFERING = new NpcStringId(1800703);
+		STABBING_THREE_TIMES = new NpcStringId(1800704);
+		POOR_CREATURES_FEEL_THE_POWER_OF_DARKNESS = new NpcStringId(1800705);
+		WHOAAAAAA = new NpcStringId(1800706);
+		YOULL_REGRET_CHALLENGING_ME = new NpcStringId(1800707);
+		ITS_CURRENTLY_OCCUPIED_BY_THE_ENEMY_AND_OUR_TROOPS_ARE_ATTACKING = new NpcStringId(1800708);
+		ITS_UNDER_OCCUPATION_BY_OUR_FORCES_AND_I_HEARD_THAT_KUCEREUS_CLAN_IS_ORGANIZING_THE_REMNANTS = new NpcStringId(1800709);
+		ALTHOUGH_WE_CURRENTLY_HAVE_CONTROL_OF_IT_THE_ENEMY_IS_PUSHING_BACK_WITH_A_POWERFUL_ATTACK = new NpcStringId(1800710);
+		ITS_UNDER_THE_ENEMYS_OCCUPATION_AND_THE_MILITARY_FORCES_OF_ADVENTURERS_AND_CLAN_MEMBERS_ARE_UNLEASHING_AN_ONSLAUGHT_UPON_THE_HALL_OF_SUFFERING_AND_THE_HALL_OF_EROSION = new NpcStringId(1800711);
+		OUR_FORCES_HAVE_OCCUPIED_IT_AND_ARE_CURRENTLY_INVESTIGATING_THE_DEPTHS = new NpcStringId(1800713);
+		ITS_UNDER_OCCUPATION_BY_OUR_FORCES_BUT_THE_ENEMY_HAS_RESURRECTED_AND_IS_ATTACKING_TOWARD_THE_HALL_OF_SUFFERING_AND_THE_HALL_OF_EROSION = new NpcStringId(1800714);
+		ITS_UNDER_OCCUPATION_BY_OUR_FORCES_BUT_THE_ENEMY_HAS_ALREADY_OVERTAKEN_THE_HALL_OF_EROSION_AND_IS_DRIVING_OUT_OUR_FORCES_FROM_THE_HALL_OF_SUFFERING_TOWARD_THE_HEART_IT_SEEMS_THAT_EKIMUS_WILL_REVIVE_SHORTLY = new NpcStringId(1800715);
+		TIATS_FOLLOWERS_ARE_COMING_TO_RETAKE_THE_SEED_OF_DESTRUCTION_GET_READY_TO_STOP_THE_ENEMIES = new NpcStringId(1800717);
+		ITS_HURTING_IM_IN_PAIN_WHAT_CAN_I_DO_FOR_THE_PAIN = new NpcStringId(1800718);
+		NO_WHEN_I_LOSE_THAT_ONE_ILL_BE_IN_MORE_PAIN = new NpcStringId(1800719);
+		HAHAHAH_I_CAPTURED_SANTA_CLAUS_THERE_WILL_BE_NO_GIFTS_THIS_YEAR = new NpcStringId(1800720);
+		NOW_WHY_DONT_YOU_TAKE_UP_THE_CHALLENGE = new NpcStringId(1800721);
+		COME_ON_ILL_TAKE_ALL_OF_YOU_ON = new NpcStringId(1800722);
+		HOW_ABOUT_IT_I_THINK_I_WON = new NpcStringId(1800723);
+		NOW_THOSE_OF_YOU_WHO_LOST_GO_AWAY = new NpcStringId(1800724);
+		WHAT_A_BUNCH_OF_LOSERS = new NpcStringId(1800725);
+		I_GUESS_YOU_CAME_TO_RESCUE_SANTA_BUT_YOU_PICKED_THE_WRONG_PERSON = new NpcStringId(1800726);
+		AH_OKAY = new NpcStringId(1800727);
+		UAGH_I_WASNT_GOING_TO_DO_THAT = new NpcStringId(1800728);
+		YOURE_CURSED_OH_WHAT = new NpcStringId(1800729);
+		HAVE_YOU_DONE_NOTHING_BUT_ROCK_PAPER_SCISSORS = new NpcStringId(1800730);
+		STOP_IT_NO_MORE_I_DID_IT_BECAUSE_I_WAS_TOO_LONELY = new NpcStringId(1800731);
+		I_HAVE_TO_RELEASE_SANTA_HOW_INFURIATING = new NpcStringId(1800732);
+		I_HATE_HAPPY_MERRY_CHRISTMAS = new NpcStringId(1800733);
+		OH_IM_BORED = new NpcStringId(1800734);
+		SHALL_I_GO_TO_TAKE_A_LOOK_IF_SANTA_IS_STILL_THERE_HEHE = new NpcStringId(1800735);
+		OH_HO_HO_MERRY_CHRISTMAS = new NpcStringId(1800736);
+		SANTA_COULD_GIVE_NICE_PRESENTS_ONLY_IF_HES_RELEASED_FROM_THE_TURKEY = new NpcStringId(1800737);
+		OH_HO_HO_OH_HO_HO_THANK_YOU_LADIES_AND_GENTLEMEN_I_WILL_REPAY_YOU_FOR_SURE = new NpcStringId(1800738);
+		UMERRY_CHRISTMAS_YOURE_DOING_A_GOOD_JOB = new NpcStringId(1800739);
+		MERRY_CHRISTMAS_THANK_YOU_FOR_RESCUING_ME_FROM_THAT_WRETCHED_TURKEY = new NpcStringId(1800740);
+		S1_I_HAVE_PREPARED_A_GIFT_FOR_YOU = new NpcStringId(1800741);
+		I_HAVE_A_GIFT_FOR_S1 = new NpcStringId(1800742);
+		TAKE_A_LOOK_AT_THE_INVENTORY_I_HOPE_YOU_LIKE_THE_GIFT_I_GAVE_YOU = new NpcStringId(1800743);
+		TAKE_A_LOOK_AT_THE_INVENTORY_PERHAPS_THERE_MIGHT_BE_A_BIG_PRESENT = new NpcStringId(1800744);
+		IM_TIRED_OF_DEALING_WITH_YOU_IM_LEAVING = new NpcStringId(1800745);
+		WHEN_ARE_YOU_GOING_TO_STOP_I_SLOWLY_STARTED_TO_BE_TIRED_OF_IT = new NpcStringId(1800746);
+		MESSAGE_FROM_SANTA_CLAUS_MANY_BLESSINGS_TO_S1_WHO_SAVED_ME = new NpcStringId(1800747);
+		I_AM_ALREADY_DEAD_YOU_CANNOT_KILL_ME_AGAIN = new NpcStringId(1800748);
+		OH_FOLLOWERS_OF_THE_DRAGON_OF_DARKNESS_FIGHT_BY_MY_SIDE = new NpcStringId(1800749);
+		THE_DRAGON_RACE_ARE_INVADING_PREPARE_FOR_BATTLE = new NpcStringId(1800750);
+		S1_RESCUED_SANTA_CLAUS_OF_S2_TERRITORY_FROM_THE_TURKEY = new NpcStringId(1800751);
+		SANTA_RESCUE_SUCCESS = new NpcStringId(1800752);
+		S1_RECEIVED_S2_S3_THROUGH_THE_WEAPON_EXCHANGE_COUPON = new NpcStringId(1800753);
+		DONT_GO_PRATTLING_ON = new NpcStringId(1800754);
+		YOU_LOWLIFES_WITH_NOT_EVEN_AN_OUNCE_OF_PRIDE_YOURE_NOT_WORTHY_OF_OPPOSING_ME = new NpcStringId(1800755);
+		ROAR_NO_OINK_OINK_SEE_IM_A_PIG_OINK_OINK = new NpcStringId(1800756);
+		WHO_AM_I_WHERE_AM_I_OINK_OINK = new NpcStringId(1800757);
+		I_JUST_FOLLOWED_MY_FRIEND_HERE_FOR_FUN_OINK_OINK = new NpcStringId(1800758);
+		WOW_THATS_WHAT_I_CALL_A_CURE_ALL = new NpcStringId(1800759);
+		IM_STARVING_SHOULD_I_GO_CHEW_SOME_GRASS = new NpcStringId(1800760);
+		THANK_YOU_THANK_YOU = new NpcStringId(1800761);
+		WHATS_THIS_FEELING_OH_OH_FEELS_LIKE_MY_ENERGY_IS_BACK = new NpcStringId(1800762);
+		MY_BODYS_GETTING_LIGHTER_THIS_FEELING_FEELS_FAMILIAR_SOMEHOW = new NpcStringId(1800763);
+		WOW_MY_FATIGUE_IS_COMPLETELY_GONE = new NpcStringId(1800764);
+		HEY_THE_OMINOUS_ENERGY_IS_DISAPPEARED = new NpcStringId(1800765);
+		MY_BODY_FEELS_AS_LIGHT_AS_A_FEATHER = new NpcStringId(1800766);
+		WHATS_THIS_FOOD = new NpcStringId(1800767);
+		MY_ENERGY_IS_OVERFLOWING_I_DONT_NEED_ANY_FATIGUE_RECOVERY_POTION = new NpcStringId(1800768);
+		WHATS_THE_MATTER_THATS_AN_AMATEUR_MOVE = new NpcStringId(1800769);
+		FORTUNE_TIMER_REWARD_INCREASES_2_TIMES_IF_COMPLETED_WITHIN_10_SECONDS = new NpcStringId(1800770);
+		FORTUNE_TIMER_REWARD_INCREASES_2_TIMES_IF_COMPLETED_WITHIN_40_SECONDS = new NpcStringId(1800771);
+		N40_SECONDS_ARE_REMAINING = new NpcStringId(1800772);
+		N39_SECONDS_ARE_REMAINING = new NpcStringId(1800773);
+		N38_SECONDS_ARE_REMAINING = new NpcStringId(1800774);
+		N37_SECONDS_ARE_REMAINING = new NpcStringId(1800775);
+		N36_SECONDS_ARE_REMAINING = new NpcStringId(1800776);
+		N35_SECONDS_ARE_REMAINING = new NpcStringId(1800777);
+		N34_SECONDS_ARE_REMAINING = new NpcStringId(1800778);
+		N33_SECONDS_ARE_REMAINING = new NpcStringId(1800779);
+		N32_SECONDS_ARE_REMAINING = new NpcStringId(1800780);
+		N31_SECONDS_ARE_REMAINING = new NpcStringId(1800781);
+		N30_SECONDS_ARE_REMAINING = new NpcStringId(1800782);
+		N29_SECONDS_ARE_REMAINING = new NpcStringId(1800783);
+		N28_SECONDS_ARE_REMAINING = new NpcStringId(1800784);
+		N27_SECONDS_ARE_REMAINING = new NpcStringId(1800785);
+		N26_SECONDS_ARE_REMAINING = new NpcStringId(1800786);
+		N25_SECONDS_ARE_REMAINING = new NpcStringId(1800787);
+		N24_SECONDS_ARE_REMAINING = new NpcStringId(1800788);
+		N23_SECONDS_ARE_REMAINING = new NpcStringId(1800789);
+		N22_SECONDS_ARE_REMAINING = new NpcStringId(1800790);
+		N21_SECONDS_ARE_REMAINING = new NpcStringId(1800791);
+		N20_SECONDS_ARE_REMAINING = new NpcStringId(1800792);
+		N19_SECONDS_ARE_REMAINING = new NpcStringId(1800793);
+		N18_SECONDS_ARE_REMAINING = new NpcStringId(1800794);
+		N17_SECONDS_ARE_REMAINING = new NpcStringId(1800795);
+		N16_SECONDS_ARE_REMAINING = new NpcStringId(1800796);
+		N15_SECONDS_ARE_REMAINING = new NpcStringId(1800797);
+		N14_SECONDS_ARE_REMAINING = new NpcStringId(1800798);
+		N13_SECONDS_ARE_REMAINING = new NpcStringId(1800799);
+		N12_SECONDS_ARE_REMAINING = new NpcStringId(1800800);
+		N11_SECONDS_ARE_REMAINING = new NpcStringId(1800801);
+		N10_SECONDS_ARE_REMAINING = new NpcStringId(1800802);
+		N9_SECONDS_ARE_REMAINING = new NpcStringId(1800803);
+		N8_SECONDS_ARE_REMAINING = new NpcStringId(1800804);
+		N7_SECONDS_ARE_REMAINING = new NpcStringId(1800805);
+		N6_SECONDS_ARE_REMAINING = new NpcStringId(1800806);
+		N5_SECONDS_ARE_REMAINING = new NpcStringId(1800807);
+		N4_SECONDS_ARE_REMAINING = new NpcStringId(1800808);
+		N3_SECONDS_ARE_REMAINING = new NpcStringId(1800809);
+		N2_SECONDS_ARE_REMAINING = new NpcStringId(1800810);
+		N1_SECONDS_ARE_REMAINING = new NpcStringId(1800811);
+		TIME_UP = new NpcStringId(1800812);
+		MISSION_FAILED = new NpcStringId(1800813);
+		MISSION_SUCCESS = new NpcStringId(1800814);
+		HEY_I_ALREADY_HAVE_AN_OWNER = new NpcStringId(1800815);
+		HEY_ARE_YOU_PLANNING_ON_EATING_ME_USE_A_CUPIDS_FATIGUE_RECOVERY_POTION_ALREADY = new NpcStringId(1800816);
+		ILL_PASS_ON_AN_AMATEURS_MERIDIAN_MASSAGE_USE_A_CUPIDS_FATIGUE_RECOVERY_POTION_ALREADY = new NpcStringId(1800817);
+		I_ALREADY_FEEL_MORE_ENERGETIC_THANKS_S1 = new NpcStringId(1800818);
+		HOW_REFRESHING_YOU_WOULDNT_HAPPEN_TO_BE_A_MASTER_MASSEUSE_S1_WOULD_YOU = new NpcStringId(1800819);
+		INCREDIBLE_FROM_NOW_ON_ILL_COMPARE_ALL_MASSAGES_TO_THIS_ONE_WITH_S1 = new NpcStringId(1800820);
+		ISNT_IT_TOUGH_DOING_IT_ALL_ON_YOUR_OWN_NEXT_TIME_TRY_MAKING_A_PARTY_WITH_SOME_COMRADES = new NpcStringId(1800821);
+		SORRY_BUT_ILL_LEAVE_MY_FRIEND_IN_YOUR_CARE_AS_WELL_THANKS = new NpcStringId(1800822);
+		SNIFF_SNIFF_DO_YOU_SMELL_THE_SCENT_OF_A_FRESH_BAKED_BAGUETTE = new NpcStringId(1800823);
+		WHO_AM_I_LET_ME_KNOW_IF_YOU_WANNA_BUY_MY_BREAD = new NpcStringId(1800824);
+		I_JUST_WANT_TO_MAKE_YOUR_WEAPONS_STRONGER_ABRA_KADABRA = new NpcStringId(1800825);
+		WHAT_YOU_DONT_LIKE_IT_WHATS_THE_MATTER_WITH_YOU_LIKE_AN_AMATEUR = new NpcStringId(1800826);
+		HEY_DID_YOU_TELL_A_LIE_ON_APRIL_FOOLS_DAY_DONT_TALK_TO_ME_IF_YOU_DIDNT = new NpcStringId(1800827);
+		GRUNT_WHATS_WRONG_WITH_ME = new NpcStringId(1800828);
+		GRUNT_OH = new NpcStringId(1800829);
+		THE_GRAVE_ROBBER_WARRIOR_HAS_BEEN_FILLED_WITH_DARK_ENERGY_AND_IS_ATTACKING_YOU = new NpcStringId(1800830);
+		THE_ALTAR_GUARDIAN_IS_SCRUTINIZING_YOU_NTHOSE_WHO_DARE_TO_CHALLENGE_USING_THE_POWER_OF_EVIL_SHALL_BE_PUNISHED_WITH_DEATH = new NpcStringId(1800831);
+		WAIT_WAIT_STOP_SAVE_ME_AND_ILL_GIVE_YOU_10000000_ADENA = new NpcStringId(1800832);
+		I_DONT_WANT_TO_FIGHT = new NpcStringId(1800833);
+		IS_THIS_REALLY_NECESSARY = new NpcStringId(1800834);
+		TH_THANKS_I_COULD_HAVE_BECOME_GOOD_FRIENDS_WITH_YOU = new NpcStringId(1800835);
+		ILL_GIVE_YOU_10000000_ADENA_LIKE_I_PROMISED_I_MIGHT_BE_AN_ORC_WHO_KEEPS_MY_PROMISES = new NpcStringId(1800836);
+		THANKS_BUT_THAT_THING_ABOUT_10000000_ADENA_WAS_A_LIE_SEE_YA = new NpcStringId(1800837);
+		YOURE_PRETTY_DUMB_TO_BELIEVE_ME = new NpcStringId(1800838);
+		UGH_A_CURSE_UPON_YOU = new NpcStringId(1800839);
+		I_REALLY_DIDNT_WANT_TO_FIGHT = new NpcStringId(1800840);
+		KASHAS_EYE_IS_SCRUTINIZING_YOU = new NpcStringId(1800841);
+		THE_KASHAS_EYE_GIVES_YOU_A_STRANGE_FEELING = new NpcStringId(1800842);
+		THE_EVIL_AURA_OF_THE_KASHAS_EYE_SEEMS_TO_BE_INCREASING_QUICKLY = new NpcStringId(1800843);
+		I_PROTECT_THE_ALTAR_YOU_CANT_ESCAPE_THE_ALTAR = new NpcStringId(1800844);
+		S1_THAT_STRANGER_MUST_BE_DEFEATED_HERE_IS_THE_ULTIMATE_HELP = new NpcStringId(1800845);
+		LOOK_HERE_S1_DONT_FALL_TOO_FAR_BEHIND = new NpcStringId(1800846);
+		WELL_DONE_S1_YOUR_HELP_IS_MUCH_APPRECIATED = new NpcStringId(1800847);
+		WHO_HAS_AWAKENED_US_FROM_OUR_SLUMBER = new NpcStringId(1800848);
+		ALL_WILL_PAY_A_SEVERE_PRICE_TO_ME_AND_THESE_HERE = new NpcStringId(1800849);
+		SHYEEDS_CRY_IS_STEADILY_DYING_DOWN = new NpcStringId(1800850);
+		ALERT_ALERT_DAMAGE_DETECTION_RECOGNIZED_COUNTERMEASURES_ENABLED = new NpcStringId(1800851);
+		TARGET_RECOGNITION_ACHIEVED_ATTACK_SEQUENCE_COMMENCING = new NpcStringId(1800852);
+		TARGET_THREAT_LEVEL_LAUNCHING_STRONGEST_COUNTERMEASURE = new NpcStringId(1800853);
+		THE_PURIFICATION_FIELD_IS_BEING_ATTACKED_GUARDIAN_SPIRITS_PROTECT_THE_MAGIC_FORCE = new NpcStringId(1800854);
+		PROTECT_THE_BRAZIERS_OF_PURITY_AT_ALL_COSTS = new NpcStringId(1800855);
+		DEFEND_OUR_DOMAIN_EVEN_AT_RISK_OF_YOUR_OWN_LIFE = new NpcStringId(1800856);
+		PEUNGLUI_MUGLANEP = new NpcStringId(1800857);
+		NAIA_WAGANAGEL_PEUTAGUN = new NpcStringId(1800858);
+		DRIVE_DEVICE_PARTIAL_DESTRUCTION_IMPULSE_RESULT = new NpcStringId(1800859);
+		EVEN_THE_MAGIC_FORCE_BINDS_YOU_YOU_WILL_NEVER_BE_FORGIVEN = new NpcStringId(1800860);
+		OH_GIANTS_AN_INTRUDER_HAS_BEEN_DISCOVERED = new NpcStringId(1800861);
+		ALL_IS_VANITY_BUT_THIS_CANNOT_BE_THE_END = new NpcStringId(1800862);
+		THOSE_WHO_ARE_IN_FRONT_OF_MY_EYES_WILL_BE_DESTROYED = new NpcStringId(1800863);
+		I_AM_TIRED_DO_NOT_WAKE_ME_UP_AGAIN = new NpcStringId(1800864);
+		_INTRUDER_DETECTED = new NpcStringId(1800865);
+		THE_CANDLES_CAN_LEAD_YOU_TO_ZAKEN_DESTROY_HIM = new NpcStringId(1800866);
+		WHO_DARES_AWKAWEN_THE_MIGHTY_ZAKEN = new NpcStringId(1800867);
+		YE_NOT_BE_FINDING_ME_BELOW_THE_DRINK = new NpcStringId(1800868);
+		YE_MUST_BE_THREE_SHEETS_TO_THE_WIND_IF_YER_LOOKIN_FOR_ME_THERE = new NpcStringId(1800869);
+		YE_NOT_BE_FINDING_ME_IN_THE_CROWS_NEST = new NpcStringId(1800870);
+		SORRY_BUT_THIS_IS_ALL_I_HAVE_GIVE_ME_A_BREAK = new NpcStringId(1800871);
+		PEUNGLUI_MUGLANEP_NAIA_WAGANAGEL_PEUTAGUN = new NpcStringId(1800872);
+		DRIVE_DEVICE_ENTIRE_DESTRUCTION_MOVING_SUSPENSION = new NpcStringId(1800873);
+		AH_AH_FROM_THE_MAGIC_FORCE_NO_MORE_I_WILL_BE_FREED = new NpcStringId(1800874);
+		YOU_GUYS_ARE_DETECTED = new NpcStringId(1800875);
+		WHAT_KIND_OF_CREATURES_ARE_YOU = new NpcStringId(1800876);
+		S2_OF_LEVEL_S1_IS_ACQUIRED = new NpcStringId(1800877);
+		LIFE_STONE_FROM_THE_BEGINNING_ACQUIRED = new NpcStringId(1800878);
+		WHEN_INVENTORY_WEIGHT_NUMBER_ARE_MORE_THAN_80_THE_LIFE_STONE_FROM_THE_BEGINNING_CANNOT_BE_ACQUIRED = new NpcStringId(1800879);
+		YOU_ARE_UNDER_MY_THUMB = new NpcStringId(1800880);
+		N21_MINUTES_ARE_ADDED_TO_THE_REMAINING_TIME_IN_THE_INSTANT_ZONE = new NpcStringId(1800881);
+		HURRY_HURRY = new NpcStringId(1800882);
+		I_AM_NOT_THAT_TYPE_OF_PERSON_WHO_STAYS_IN_ONE_PLACE_FOR_A_LONG_TIME = new NpcStringId(1800883);
+		ITS_HARD_FOR_ME_TO_KEEP_STANDING_LIKE_THIS = new NpcStringId(1800884);
+		WHY_DONT_I_GO_THAT_WAY_THIS_TIME = new NpcStringId(1800885);
+		WELCOME = new NpcStringId(1800886);
+		IS_THAT_IT_IS_THAT_THE_EXTENT_OF_YOUR_ABILITIES_PUT_IN_A_LITTLE_MORE_EFFORT = new NpcStringId(1800887);
+		YOUR_ABILITIES_ARE_PITIFUL_YOU_ARE_FAR_FROM_A_WORTHY_OPPONENT = new NpcStringId(1800888);
+		EVEN_AFTER_DEATH_YOU_ORDER_ME_TO_WANDER_AROUND_LOOKING_FOR_THE_SCAPEGOATS = new NpcStringId(1800889);
+		HERE_GOES_THE_HEATSTROKE_IF_YOU_CAN_WITHSTAND_THE_HOT_HEATSTROKE_UP_TO_THE_3RD_STAGE_THE_SULTRINESS_WILL_COME_TO_YOU = new NpcStringId(1800890);
+		JUST_YOU_WAIT_HUMIDITY_IS_A_BLISTERING_FIREBALL_WHICH_CAN_EASILY_WITHSTAND_PLENTY_OF_COOL_AIR_CANNON_ATTACKS = new NpcStringId(1800891);
+		IN_ORDER_TO_DEFEAT_HUMIDITY_YOU_MUST_OBTAIN_THE_HEADSTROKE_PREVENTION_EFFECT_FROM_DOCTOR_ICE_AND_FIRE_MORE_THAN_10_ROUNDS_OF_THE_COOL_AIR_CANNON_ON_IT = new NpcStringId(1800892);
+		YOU_ARE_HERE_S1_ILL_TEACH_YOU_A_LESSON_BRING_IT_ON = new NpcStringId(1800893);
+		THATS_COLD_ISNT_IT_ONE_OF_THOSE_COOL_PACKS_I_HATE_ANYTHING_THATS_COLD = new NpcStringId(1800894);
+		HUH_YOUVE_MISSED_IS_THAT_ALL_YOU_HAVE = new NpcStringId(1800895);
+		I_WILL_GIVE_YOU_PRECIOUS_THINGS_THAT_I_HAVE_STOLEN_SO_STOP_BOTHERING_ME = new NpcStringId(1800896);
+		I_WAS_GOING_TO_GIVE_YOU_A_JACKPOT_ITEM_YOU_DONT_HAVE_ENOUGH_INVENTORY_ROOM_SEE_YOU_NEXT_TIME = new NpcStringId(1800897);
+		S1_DEFEATED_THE_SULTRINESS_AND_ACQUIRED_ITEM_S84 = new NpcStringId(1800898);
+		S1_DEFEATED_THE_SULTRINESS_AND_ACQUIRED_ITEM_S80 = new NpcStringId(1800899);
+		I_AM_NOT_HERE_FOR_YOU_YOUR_COOL_PACK_ATTACK_DOES_NOT_WORK_AGAINST_ME = new NpcStringId(1800900);
+		UH_OH_WHERE_ARE_YOU_HIDING_THERE_IS_NOBODY_WHO_MATCHES_MY_SKILLS_WELL_I_GUESS_ID_BETTER_GET_GOING = new NpcStringId(1800901);
+		WHY_ARE_YOU_NOT_RESPONDING_YOU_DONT_EVEN_HAVE_ANY_COOL_PACKS_YOU_CANT_FIGHT_ME = new NpcStringId(1800902);
+		OH_WHERE_I_BE_WHO_CALL_ME = new NpcStringId(1800903);
+		TADA_ITS_A_WATERMELON = new NpcStringId(1800904);
+		ENTER_THE_WATERMELON_ITS_GONNA_GROW_AND_GROW_FROM_NOW_ON = new NpcStringId(1800906);
+		OH_OUCH_DID_I_SEE_YOU_BEFORE = new NpcStringId(1800907);
+		A_NEW_SEASON_SUMMER_IS_ALL_ABOUT_THE_WATERMELON = new NpcStringId(1800908);
+		DID_YA_CALL_HO_THOUGHT_YOUD_GET_SOMETHING = new NpcStringId(1800909);
+		DO_YOU_WANT_TO_SEE_MY_BEAUTIFUL_SELF = new NpcStringId(1800910);
+		HOHOHO_LETS_DO_IT_TOGETHER = new NpcStringId(1800911);
+		ITS_A_GIANT_WATERMELON_IF_YOU_RAISE_IT_RIGHT_AND_A_WATERMELON_SLICE_IF_YOU_MESS_UP = new NpcStringId(1800912);
+		TADA_TRANSFORMATION_COMPLETE = new NpcStringId(1800913);
+		AM_I_A_RAIN_WATERMELON_OR_A_DEFECTIVE_WATERMELON = new NpcStringId(1800914);
+		NOW_IVE_GOTTEN_BIG_EVERYONE_COME_AT_ME = new NpcStringId(1800915);
+		GET_BIGGER_GET_STRONGER_TELL_ME_YOUR_WISH = new NpcStringId(1800916);
+		A_WATERMELON_SLICES_WISH_BUT_IM_BIGGER_ALREADY = new NpcStringId(1800917);
+		A_LARGE_WATERMELONS_WISH_WELL_TRY_TO_BREAK_ME = new NpcStringId(1800918);
+		IM_DONE_GROWING_IM_RUNNING_AWAY_NOW = new NpcStringId(1800919);
+		IF_YOU_LET_ME_GO_ILL_GIVE_YOU_TEN_MILLION_ADENA = new NpcStringId(1800920);
+		FREEDOM_WHAT_DO_YOU_THINK_I_HAVE_INSIDE = new NpcStringId(1800921);
+		OK_OK_GOOD_JOB_YOU_KNOW_WHAT_TO_DO_NEXT_RIGHT = new NpcStringId(1800922);
+		LOOK_HERE_DO_IT_RIGHT_YOU_SPILLED_THIS_PRECIOUS = new NpcStringId(1800923);
+		AH_REFRESHING_SPRAY_A_LITTLE_MORE = new NpcStringId(1800924);
+		GULP_GULP_GREAT_BUT_ISNT_THERE_MORE = new NpcStringId(1800925);
+		CANT_YOU_EVEN_AIM_RIGHT_HAVE_YOU_EVEN_BEEN_TO_THE_ARMY = new NpcStringId(1800926);
+		DID_YOU_MIX_THIS_WITH_WATER_WHYS_IT_TASTE_LIKE_THIS = new NpcStringId(1800927);
+		OH_GOOD_DO_A_LITTLE_MORE_YEAH = new NpcStringId(1800928);
+		HOHO_ITS_NOT_THERE_OVER_HERE_AM_I_SO_SMALL_THAT_YOU_CAN_EVEN_SPRAY_ME_RIGHT = new NpcStringId(1800929);
+		YUCK_WHAT_IS_THIS_ARE_YOU_SURE_THIS_IS_NECTAR = new NpcStringId(1800930);
+		DO_YOUR_BEST_I_BECOME_A_BIG_WATERMELON_AFTER_JUST_FIVE_BOTTLES = new NpcStringId(1800931);
+		OF_COURSE_WATERMELON_IS_THE_BEST_NECTAR_HAHAHA = new NpcStringId(1800932);
+		OWW_YOURE_JUST_BEATING_ME_NOW_GIVE_ME_NECTAR = new NpcStringId(1800934);
+		LOOK_ITS_GONNA_BREAK = new NpcStringId(1800935);
+		NOW_ARE_YOU_TRYING_TO_EAT_WITHOUT_DOING_THE_WORK_FINE_DO_WHAT_YOU_WANT_ILL_HATE_YOU_IF_YOU_DONT_GIVE_ME_ANY_NECTAR = new NpcStringId(1800936);
+		HIT_ME_MORE_HIT_ME_MORE = new NpcStringId(1800937);
+		IM_GONNA_WITHER_LIKE_THIS_DAMN_IT = new NpcStringId(1800938);
+		HEY_YOU_IF_I_DIE_LIKE_THIS_THERELL_BE_NO_ITEM_EITHER_ARE_YOU_REALLY_SO_STINGY_WITH_THE_NECTAR = new NpcStringId(1800939);
+		ITS_JUST_A_LITTLE_MORE_GOOD_LUCK = new NpcStringId(1800940);
+		SAVE_ME_IM_ABOUT_TO_DIE_WITHOUT_TASTING_NECTAR_EVEN_ONCE = new NpcStringId(1800941);
+		IF_I_DIE_LIKE_THIS_ILL_JUST_BE_A_WATERMELON_SLICE = new NpcStringId(1800942);
+		IM_GETTING_STRONGER_I_THINK_ILL_BE_ABLE_TO_RUN_AWAY_IN_30_SECONDS_HOHO = new NpcStringId(1800943);
+		ITS_GOODBYE_AFTER_20_SECONDS = new NpcStringId(1800944);
+		YEAH_10_SECONDS_LEFT_9_8_7 = new NpcStringId(1800945);
+		IM_LEAVING_IN_2_MINUTES_IF_YOU_DONT_GIVE_ME_ANY_NECTAR = new NpcStringId(1800946);
+		IM_LEAVING_IN_1_MINUTES_IF_YOU_DONT_GIVE_ME_ANY_NECTAR = new NpcStringId(1800947);
+		IM_LEAVING_NOW_THEN_GOODBYE = new NpcStringId(1800948);
+		SORRY_BUT_THIS_LARGE_WATERMELON_IS_DISAPPEARING_HERE = new NpcStringId(1800949);
+		TOO_LATE_HAVE_A_GOOD_TIME = new NpcStringId(1800950);
+		DING_DING_THATS_THE_BELL_PUT_AWAY_YOUR_WEAPONS_AND_TRY_FOR_NEXT_TIME = new NpcStringId(1800951);
+		TOO_BAD_YOU_RAISED_IT_UP_TOO = new NpcStringId(1800952);
+		OH_WHAT_A_NICE_SOUND = new NpcStringId(1800953);
+		THE_INSTRUMENT_IS_NICE_BUT_THERES_NO_SONG_SHALL_I_SING_FOR_YOU = new NpcStringId(1800954);
+		WHAT_BEAUTIFUL_MUSIC = new NpcStringId(1800955);
+		I_FEEL_GOOD_PLAY_SOME_MORE = new NpcStringId(1800956);
+		MY_HEART_IS_BEING_CAPTURED_BY_THE_SOUND_OF_CRONO = new NpcStringId(1800957);
+		GET_THE_NOTES_RIGHT_HEY_OLD_MAN_THAT_WAS_WRONG = new NpcStringId(1800958);
+		I_LIKE_IT = new NpcStringId(1800959);
+		OOH_MY_BODY_WANTS_TO_OPEN = new NpcStringId(1800960);
+		OH_THIS_CHORD_MY_HEART_IS_BEING_TORN_PLAY_A_LITTLE_MORE = new NpcStringId(1800961);
+		ITS_THIS_THIS_I_WANTED_THIS_SOUND_WHY_DONT_YOU_TRY_BECOMING_A_SINGER = new NpcStringId(1800962);
+		YOU_CAN_TRY_A_HUNDRED_TIMES_ON_THIS_YOU_WONT_GET_ANYTHING_GOOD = new NpcStringId(1800963);
+		IT_HURTS_PLAY_JUST_THE_INSTRUMENT = new NpcStringId(1800964);
+		ONLY_GOOD_MUSIC_CAN_OPEN_MY_BODY = new NpcStringId(1800965);
+		NOT_THIS_BUT_YOU_KNOW_THAT_WHAT_YOU_GOT_AS_A_CHRONICLE_SOUVENIR_PLAY_WITH_THAT = new NpcStringId(1800966);
+		WHY_YOU_HAVE_NO_MUSIC_BORING_IM_LEAVING_NOW = new NpcStringId(1800967);
+		NOT_THOSE_SHARP_THINGS_USE_THE_ONES_THAT_MAKE_NICE_SOUNDS = new NpcStringId(1800968);
+		LARGE_WATERMELONS_ONLY_OPEN_WITH_MUSIC_JUST_STRIKING_WITH_A_WEAPON_WONT_WORK = new NpcStringId(1800969);
+		STRIKE_WITH_MUSIC_NOT_WITH_SOMETHING_LIKE_THIS_YOU_NEED_MUSIC = new NpcStringId(1800970);
+		YOURE_PRETTY_AMAZING_BUT_ITS_ALL_FOR_NOTHING = new NpcStringId(1800971);
+		USE_THAT_ON_MONSTERS_OK_I_WANT_CRONO = new NpcStringId(1800972);
+		EVERYONE_THE_WATERMELON_IS_BREAKING = new NpcStringId(1800973);
+		ITS_LIKE_A_WATERMELON_SLICE = new NpcStringId(1800974);
+		LARGE_WATERMELON_MAKE_A_WISH = new NpcStringId(1800976);
+		DONT_TELL_ANYONE_ABOUT_MY_DEATH = new NpcStringId(1800977);
+		UGH_THE_RED_JUICE_IS_FLOWING_OUT = new NpcStringId(1800978);
+		THIS_IS_ALL = new NpcStringId(1800979);
+		KYAAHH_IM_MAD = new NpcStringId(1800980);
+		EVERYONE_THIS_WATERMELON_BROKE_OPEN_THE_ITEM_IS_FALLING_OUT = new NpcStringId(1800981);
+		OH_IT_BURST_THE_CONTENTS_ARE_SPILLING_OUT = new NpcStringId(1800982);
+		HOHOHO_PLAY_BETTER = new NpcStringId(1800983);
+		OH_YOURE_VERY_TALENTED_HUH = new NpcStringId(1800984);
+		PLAY_SOME_MORE_MORE_MORE_MORE = new NpcStringId(1800985);
+		I_EAT_HITS_AND_GROW = new NpcStringId(1800986);
+		BUCK_UP_THERE_ISNT_MUCH_TIME = new NpcStringId(1800987);
+		DO_YOU_THINK_ILL_BURST_WITH_JUST_THAT = new NpcStringId(1800988);
+		WHAT_A_NICE_ATTACK_YOU_MIGHT_BE_ABLE_TO_KILL_A_PASSING_FLY = new NpcStringId(1800989);
+		RIGHT_THERE_A_LITTLE_TO_THE_RIGHT_AH_REFRESHING = new NpcStringId(1800990);
+		YOU_CALL_THAT_HITTING_BRING_SOME_MORE_TALENTED_FRIENDS = new NpcStringId(1800991);
+		DONT_THINK_JUST_HIT_WERE_HITTING = new NpcStringId(1800992);
+		I_NEED_NECTAR_GOURD_NECTAR = new NpcStringId(1800993);
+		I_CAN_ONLY_GROW_BY_DRINKING_NECTAR = new NpcStringId(1800994);
+		GROW_ME_QUICK_IF_YOURE_GOOD_ITS_A_LARGE_WATERMELON_IF_YOURE_BAD_IT_A_WATERMELON_SLICE = new NpcStringId(1800995);
+		GIMME_NECTAR_IM_HUNGRY = new NpcStringId(1800996);
+		BRING_ME_NECTAR_THEN_ILL_DRINK_AND_GROW = new NpcStringId(1800998);
+		YOU_WANNA_EAT_A_TINY_WATERMELON_LIKE_ME_TRY_GIVING_ME_SOME_NECTAR_ILL_GET_HUGE = new NpcStringId(1800999);
+		HEHEHE_GROW_ME_WELL_AND_YOULL_GET_A_REWARD_GROW_ME_BAD_AND_WHO_KNOWS_WHATLL_HAPPEN = new NpcStringId(1801000);
+		YOU_WANT_A_LARGE_WATERMELON_ID_LIKE_TO_BE_A_WATERMELON_SLICE = new NpcStringId(1801001);
+		TRUST_ME_AND_BRING_ME_SOME_NECTAR_ILL_BECOME_A_LARGE_WATERMELON_FOR_YOU = new NpcStringId(1801002);
+		I_SEE_BELETH_HAS_RECOVERED_ALL_OF_ITS_MAGIC_POWER_WHAT_REMAINS_HERE_IS_JUST_ITS_TRACE = new NpcStringId(1801003);
+		COMMAND_CHANNEL_LEADER_S1_BELETHS_RING_HAS_BEEN_ACQUIRED = new NpcStringId(1801004);
+		YOU_SUMMONED_ME_SO_YOU_MUST_BE_CONFIDENT_HUH_HERE_I_COME_JACK_GAME = new NpcStringId(1801005);
+		HELLO_LETS_HAVE_A_GOOD_JACK_GAME = new NpcStringId(1801006);
+		IM_STARTING_NOW_SHOW_ME_THE_CARD_YOU_WANT = new NpcStringId(1801007);
+		WELL_START_NOW_SHOW_ME_THE_CARD_YOU_WANT = new NpcStringId(1801008);
+		IM_SHOWING_THE_ROTTEN_PUMPKIN_CARD = new NpcStringId(1801009);
+		ILL_BE_SHOWING_THE_ROTTEN_PUMPKIN_CARD = new NpcStringId(1801010);
+		IM_SHOWING_THE_JACK_PUMPKIN_CARD = new NpcStringId(1801011);
+		ILL_BE_SHOWING_THE_JACK_PUMPKIN_CARD = new NpcStringId(1801012);
+		THATS_MY_PRECIOUS_FANTASTIC_CHOCOLATE_BANANA_ULTRA_FAVOR_CANDY_IM_DEFINITELY_WINNING_THE_NEXT_ROUND = new NpcStringId(1801013);
+		ITS_MY_PRECIOUS_CANDY_BUT_ILL_HAPPILY_GIVE_IT_TO_YOU = new NpcStringId(1801014);
+		THE_CANDY_FELL_ILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD = new NpcStringId(1801015);
+		SINCE_THE_CANDY_FELL_I_WILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD = new NpcStringId(1801016);
+		YOURE_NOT_PEEKING_AT_MY_CARD_ARE_YOU_THIS_TIME_ILL_WAGER_A_SPECIAL_SCROLL = new NpcStringId(1801017);
+		WERE_GETTING_SERIOUS_NOW_IF_YOU_WIN_AGAIN_ILL_GIVE_YOU_A_SPECIAL_SCROLL = new NpcStringId(1801018);
+		YOU_COULD_PROBABLY_ENTER_THE_UNDERWORLD_PRO_LEAGUE = new NpcStringId(1801019);
+		EVEN_PROS_CANT_DO_THIS_MUCH_YOURE_AMAZING = new NpcStringId(1801020);
+		WHOS_THE_MONSTER_HERE_THIS_TIME_ILL_BET_MY_PRECIOUS_TRANSFORMATION_STICK = new NpcStringId(1801021);
+		I_LOST_AGAIN_I_WONT_LOSE_THIS_TIME_IM_BETTING_MY_TRANSFORMATION_STICK = new NpcStringId(1801022);
+		LOST_AGAIN_HMPH_NEXT_TIME_ILL_BET_AN_INCREDIBLE_GIFT_WAIT_FOR_IT_IF_YOU_WANT = new NpcStringId(1801023);
+		YOURE_TOO_GOOD_NEXT_TIME_ILL_GIVE_YOU_AN_INCREDIBLE_GIFT_PLEASE_WAIT_FOR_YOU = new NpcStringId(1801024);
+		MY_PRIDE_CANT_HANDLE_YOU_WINNING_ANYMORE = new NpcStringId(1801025);
+		I_WOULD_BE_EMBARRASSING_TO_LOSE_AGAIN_HERE = new NpcStringId(1801026);
+		WHATS_YOUR_NAME_IM_GONNA_REMEMBER_YOU = new NpcStringId(1801027);
+		PEOPLE_FROM_THE_ABOVE_GROUND_WORLD_ARE_REALLY_GOOD_AT_GAMES = new NpcStringId(1801028);
+		YOUVE_PLAYED_A_LOT_IN_THE_UNDERWORLD_HAVENT_YOU = new NpcStringId(1801029);
+		IVE_NEVER_MET_SOMEONE_SO_GOOD_BEFORE = new NpcStringId(1801030);
+		N13_WINS_IN_A_ROW_YOURE_PRETTY_LUCKY_TODAY_HUH = new NpcStringId(1801031);
+		I_NEVER_THOUGHT_I_WOULD_SEE_13_WINS_IN_A_ROW = new NpcStringId(1801032);
+		THIS_IS_THE_HIGHEST_RECORD_IN_MY_LIFE_NEXT_TIME_ILL_GIVE_YOU_MY_TREASURE_THE_GOLDEN_JACK_OLANTERN = new NpcStringId(1801033);
+		EVEN_PROS_CANT_DO_14_WINS_NEXT_TIME_I_WILL_GIVE_YOU_MY_TREASURE_THE_GOLDEN_JACK_OLANTERN = new NpcStringId(1801034);
+		I_CANT_DO_THIS_ANYMORE_YOU_WIN_I_ACKNOWLEDGE_YOU_AS_THE_BEST_IVE_EVER_MET_IN_ALL_MY_583_YEARS = new NpcStringId(1801035);
+		PLAYING_ANY_MORE_IS_MEANINGLESS_YOU_WERE_MY_GREATEST_OPPONENT = new NpcStringId(1801036);
+		I_WON_THIS_ROUND_IT_WAS_FUN = new NpcStringId(1801037);
+		I_WON_THIS_ROUND_IT_WAS_ENJOYABLE = new NpcStringId(1801038);
+		ABOVE_WORLD_PEOPLE_ARE_SO_FUN_THEN_SEE_YOU_LATER = new NpcStringId(1801039);
+		CALL_ME_AGAIN_NEXT_TIME_I_WANT_TO_PLAY_AGAIN_WITH_YOU = new NpcStringId(1801040);
+		YOU_WANNA_PLAY_SOME_MORE_IM_OUT_OF_PRESENTS_BUT_ILL_GIVE_YOU_CANDY = new NpcStringId(1801041);
+		WILL_YOU_PLAY_SOME_MORE_I_DONT_HAVE_ANY_MORE_PRESENTS_BUT_I_WILL_GIVE_YOU_CANDY_IF_YOU_WIN = new NpcStringId(1801042);
+		YOURE_THE_BEST_OUT_OF_ALL_THE_JACKS_GAME_PLAYERS_IVE_EVER_MET_I_GIVE_UP = new NpcStringId(1801043);
+		WOWWW_AWESOME_REALLY_I_HAVE_NEVER_MET_SOMEONE_AS_GOOD_AS_YOU_BEFORE_NOW_I_CANT_PLAY_ANYMORE = new NpcStringId(1801044);
+		S1_HAS_WON_S2_JACKS_GAMES_IN_A_ROW = new NpcStringId(1801045);
+		CONGRATULATIONS_S1_HAS_WON_S2_JACKS_GAMES_IN_A_ROW = new NpcStringId(1801046);
+		CONGRATULATIONS_ON_GETTING_1ST_PLACE_IN_JACKS_GAME = new NpcStringId(1801047);
+		HELLO_IM_BELLDANDY_CONGRATULATIONS_ON_WINNING_1ST_PLACE_IN_JACKS_GAME_IF_YOU_GO_AND_FIND_MY_SIBLING_SKOOLDIE_IN_THE_VILLAGE_YOULL_GET_AN_AMAZING_GIFT_LETS_PLAY_JACKS_GAME_AGAIN = new NpcStringId(1801048);
+		HMM_YOURE_PLAYING_JACKS_GAME_FOR_THE_FIRST_TIME_HUH_YOU_COULDNT_EVEN_TAKE_OUT_YOUR_CARD_AT_THE_RIGHT_TIME_MY_GOODNESS = new NpcStringId(1801049);
+		OH_YOURE_NOT_VERY_FAMILIAR_WITH_JACKS_GAME_RIGHT_YOU_DIDNT_TAKE_OUT_YOUR_CARD_AT_THE_RIGHT_TIME = new NpcStringId(1801050);
+		YOU_HAVE_TO_USE_THE_CARD_SKILL_ON_THE_MASK_BEFORE_THE_GAUGE_ABOVE_MY_HEAD_DISAPPEARS = new NpcStringId(1801051);
+		YOU_MUST_USE_THE_CARD_SKILL_ON_THE_MASK_BEFORE_THE_GAUGE_ABOVE_MY_HEAD_DISAPPEARS = new NpcStringId(1801052);
+		IF_YOU_SHOW_THE_SAME_CARD_AS_ME_YOU_WIN_IF_THEYRE_DIFFERENT_I_WIN_UNDERSTAND_NOW_LETS_GO = new NpcStringId(1801053);
+		YOU_WILL_WIN_IF_YOU_SHOW_THE_SAME_CARD_AS_ME_ITS_MY_VICTORY_IF_THE_CARDS_ARE_DIFFERENT_WELL_LETS_START_AGAIN = new NpcStringId(1801054);
+		ACK_YOU_DIDNT_SHOW_A_CARD_YOU_HAVE_TO_USE_THE_CARD_SKILL_BEFORE_THE_GAUGE_DISAPPEARS_HMPH_THEN_IM_GOING = new NpcStringId(1801055);
+		AHH_YOU_DIDNT_SHOW_A_CARD_YOU_MUST_USE_THE_CARD_SKILL_AT_THE_RIGHT_TIME_ITS_UNFORTUNATE_THEN_I_WILL_GO_NOW = new NpcStringId(1801056);
+		LETS_LEARN_ABOUT_THE_JACKS_GAME_TOGETHER_YOU_CAN_PLAY_WITH_ME_3_TIMES = new NpcStringId(1801057);
+		LETS_START_SHOW_THE_CARD_YOU_WANT_THE_CARD_SKILL_IS_ATTACHED_TO_THE_MASK = new NpcStringId(1801058);
+		YOU_SHOWED_THE_SAME_CARD_AS_ME_SO_YOU_WIN = new NpcStringId(1801059);
+		YOU_SHOWED_A_DIFFERENT_CARD_FROM_ME_SO_YOU_LOSE = new NpcStringId(1801060);
+		THAT_WAS_PRACTICE_SO_THERES_NO_CANDY_EVEN_IF_YOU_WIN = new NpcStringId(1801061);
+		ITS_UNFORTUNATE_LETS_PRACTICE_ONE_MORE_TIME = new NpcStringId(1801062);
+		YOU_GOTTA_SHOW_THE_CARD_AT_THE_RIGHT_TIME_USE_THE_CARD_SKILL_YOU_WANT_BEFORE_THE_GAUGE_ABOVE_MY_HEAD_DISAPPEARS = new NpcStringId(1801063);
+		THE_CARD_SKILLS_ARE_ATTACHED_TO_THE_JACK_OLANTERN_MASK_RIGHT_THATS_WHAT_YOU_USE = new NpcStringId(1801064);
+		YOU_WIN_IF_YOU_SHOW_THE_SAME_CARD_AS_ME_AND_I_WIN_IF_THE_CARDS_ARE_DIFFERENT_OK_LETS_GO = new NpcStringId(1801065);
+		YOU_DIDNT_SHOW_A_CARD_AGAIN_WELL_TRY_AGAIN_LATER_IM_GONNA_GO_NOW = new NpcStringId(1801066);
+		NOW_DO_YOU_UNDERSTAND_A_LITTLE_ABOUT_JACKS_GAME_THE_REAL_GAMES_WITH_ULDIE_AND_BELLDANDY_WELL_SEE_YOU_LATER = new NpcStringId(1801067);
+		HAHAHAHA = new NpcStringId(1801068);
+		WHERE_ARE_YOU_LOOKING = new NpcStringId(1801069);
+		IM_RIGHT_HERE = new NpcStringId(1801070);
+		ANNOYING_CONCENTRATION_ATTACKS_ARE_DISRUPTING_VALAKASS_CONCENTRATIONNIF_IT_CONTINUES_YOU_MAY_GET_A_GREAT_OPPORTUNITY = new NpcStringId(1801071);
+		SOME_WARRIORS_BLOW_HAS_LEFT_A_HUGE_GASH_BETWEEN_THE_GREAT_SCALES_OF_VALAKASNVALAKASS_P_DEF_IS_GREATLY_DECREASED = new NpcStringId(1801072);
+		ANNOYING_CONCENTRATION_ATTACKS_OVERWHELMED_VALAKAS_MAKING_IT_FORGET_ITS_RAGE_AND_BECOME_DISTRACTED = new NpcStringId(1801073);
+		LONG_RANGE_CONCENTRATION_ATTACKS_HAVE_ENRAGED_VALAKASNIF_YOU_CONTINUE_IT_MAY_BECOME_A_DANGEROUS_SITUATION = new NpcStringId(1801074);
+		BECAUSE_THE_COWARDLY_COUNTERATTACKS_CONTINUED_VALAKASS_FURY_HAS_REACHED_ITS_MAXIMUMNVALAKASS_P_ATK_IS_GREATLY_INCREASED = new NpcStringId(1801075);
+		VALAKAS_HAS_BEEN_ENRAGED_BY_THE_LONG_RANGE_CONCENTRATION_ATTACKS_AND_IS_COMING_TOWARD_ITS_TARGET_WITH_EVEN_GREATER_ZEAL = new NpcStringId(1801076);
+		LISTEN_OH_TANTAS_I_HAVE_RETURNED_THE_PROPHET_YUGOROS_OF_THE_BLACK_ABYSS_IS_WITH_ME_SO_DO_NOT_BE_AFRAID = new NpcStringId(1801077);
+		WELCOME_S1_LET_US_SEE_IF_YOU_HAVE_BROUGHT_A_WORTHY_OFFERING_FOR_THE_BLACK_ABYSS = new NpcStringId(1801078);
+		WHAT_A_FORMIDABLE_FOE_BUT_I_HAVE_THE_ABYSS_WEED_GIVEN_TO_ME_BY_THE_BLACK_ABYSS_LET_ME_SEE = new NpcStringId(1801079);
+		MUHAHAHA_AH_THIS_BURNING_SENSATION_IN_MY_MOUTH_THE_POWER_OF_THE_BLACK_ABYSS_IS_REVIVING_ME = new NpcStringId(1801080);
+		NO_HOW_DARE_YOU_STOP_ME_FROM_USING_THE_ABYSS_WEED_DO_YOU_KNOW_WHAT_YOU_HAVE_DONE = new NpcStringId(1801081);
+		A_LIMP_CREATURE_LIKE_THIS_IS_UNWORTHY_TO_BE_AN_OFFERING_YOU_HAVE_NO_RIGHT_TO_SACRIFICE_TO_THE_BLACK_ABYSS = new NpcStringId(1801082);
+		LISTEN_OH_TANTAS_THE_BLACK_ABYSS_IS_FAMISHED_FIND_SOME_FRESH_OFFERINGS = new NpcStringId(1801083);
+		AH_HOW_COULD_I_LOSE_OH_BLACK_ABYSS_RECEIVE_ME = new NpcStringId(1801084);
+		ALARM_SYSTEM_DESTROYED_INTRUDER_EXCLUDED = new NpcStringId(1801085);
+		BEGIN_STAGE_4 = new NpcStringId(1801089);
+		TIME_REMAINING_UNTIL_NEXT_BATTLE = new NpcStringId(1801090);
+		THE_BEAST_ATE_THE_FEED_BUT_IT_ISNT_SHOWING_A_RESPONSE_PERHAPS_BECAUSE_ITS_ALREADY_FULL = new NpcStringId(1801091);
+		THE_BEAST_SPIT_OUT_THE_FEED_INSTEAD_OF_EATING_IT = new NpcStringId(1801092);
+		THE_BEAST_SPIT_OUT_THE_FEED_AND_IS_INSTEAD_ATTACKING_YOU = new NpcStringId(1801093);
+		S1_IS_LEAVING_YOU_BECAUSE_YOU_DONT_HAVE_ENOUGH_GOLDEN_SPICES = new NpcStringId(1801094);
+		S1_IS_LEAVING_YOU_BECAUSE_YOU_DONT_HAVE_ENOUGH_CRYSTAL_SPICES = new NpcStringId(1801095);
+		S1_MAY_THE_PROTECTION_OF_THE_GODS_BE_UPON_YOU = new NpcStringId(1801096);
+		FREYA_HAS_STARTED_TO_MOVE = new NpcStringId(1801097);
+		HOW_COULD_I_FALL_IN_A_PLACE_LIKE_THIS = new NpcStringId(1801098);
+		I_CAN_FINALLY_TAKE_A_BREATHER_BY_THE_WAY_WHO_ARE_YOU_HMM_I_THINK_I_KNOW_WHO_SENT_YOU = new NpcStringId(1801099);
+		S1_OF_BALANCE = new NpcStringId(1801100);
+		SWIFT_S2 = new NpcStringId(1801101);
+		S1_OF_BLESSING = new NpcStringId(1801102);
+		SHARP_S2 = new NpcStringId(1801103);
+		USEFUL_S2 = new NpcStringId(1801104);
+		RECKLESS_S2 = new NpcStringId(1801105);
+		ALPEN_KOOKABURRA = new NpcStringId(1801106);
+		ALPEN_COUGAR = new NpcStringId(1801107);
+		ALPEN_BUFFALO = new NpcStringId(1801108);
+		ALPEN_GRENDEL = new NpcStringId(1801109);
+		BATTLE_END_LIMIT_TIME = new NpcStringId(1801110);
+		STRONG_MAGIC_POWER_CAN_BE_FELT_FROM_SOMEWHERE = new NpcStringId(1801111);
+		HOW_DARE_YOU_ATTACK_MY_RECRUITS = new NpcStringId(1801112);
+		WHO_IS_DISRUPTING_THE_ORDER = new NpcStringId(1801113);
+		THE_DRILLMASTER_IS_DEAD = new NpcStringId(1801114);
+		LINE_UP_THE_RANKS = new NpcStringId(1801115);
+		I_BROUGHT_THE_FOOD = new NpcStringId(1801116);
+		COME_AND_EAT = new NpcStringId(1801117);
+		LOOKS_DELICIOUS = new NpcStringId(1801118);
+		LETS_GO_EAT = new NpcStringId(1801119);
+		ARCHER_GIVE_YOUR_BREATH_FOR_THE_INTRUDER = new NpcStringId(1801120);
+		MY_KNIGHTS_SHOW_YOUR_LOYALTY = new NpcStringId(1801121);
+		I_CAN_TAKE_IT_NO_LONGER = new NpcStringId(1801122);
+		ARCHER_HEED_MY_CALL = new NpcStringId(1801123);
+		THE_SPACE_FEELS_LIKE_ITS_GRADUALLY_STARTING_TO_SHAKE = new NpcStringId(1801124);
+		I_CAN_NO_LONGER_STAND_BY = new NpcStringId(1801125);
+		TAKLACAN_IS_GATHERING_ITS_STRENGTH_AND_LAUNCHING_AN_ATTACK = new NpcStringId(1801126);
+		TAKLACAN_RECEIVED_COKRAKON_AND_BECAME_WEAKER = new NpcStringId(1801127);
+		COKRAKONS_POWER_CAN_BE_FELT_NEARBY = new NpcStringId(1801128);
+		TAKLACAN_IS_PREPARING_TO_HIDE_ITSELF = new NpcStringId(1801129);
+		TAKLACAN_DISAPPEARS_INTO_THE_SPACE_OF_FUTILITY_WITH_A_ROAR = new NpcStringId(1801130);
+		TORUMBAS_BODY_IS_STARTING_TO_MOVE = new NpcStringId(1801131);
+		A_RESPONSE_CAN_BE_FELT_FROM_TORUMBAS_TOUGH_SKIN = new NpcStringId(1801132);
+		A_MARK_REMAINS_ON_TORUMBAS_TOUGH_SKIN = new NpcStringId(1801133);
+		THE_LIGHT_IS_BEGINNING_TO_WEAKEN_IN_TORUMBAS_EYES = new NpcStringId(1801134);
+		TORUMBAS_LEFT_LEG_WAS_DAMAGED = new NpcStringId(1801135);
+		TORUMBAS_RIGHT_LEG_WAS_DAMAGED = new NpcStringId(1801136);
+		TORUMBAS_LEFT_ARM_WAS_DAMAGED = new NpcStringId(1801137);
+		TORUMBAS_RIGHT_ARM_WAS_DAMAGED = new NpcStringId(1801138);
+		A_DEEP_WOUND_APPEARED_ON_TORUMBAS_TOUGH_SKIN = new NpcStringId(1801139);
+		THE_LIGHT_IS_SLOWLY_FADING_FROM_TORUMBAS_EYES = new NpcStringId(1801140);
+		TORUMBA_IS_PREPARING_TO_HIDE_ITS_BODY = new NpcStringId(1801141);
+		TORUMBA_DISAPPEARED_INTO_HIS_SPACE = new NpcStringId(1801142);
+		TORUMBA_IS_PREPARING_TO_HIDE_ITSELF_IN_THE_TWISTED_SPACE = new NpcStringId(1801143);
+		DOPAGEN_HAS_STARTED_TO_MOVE = new NpcStringId(1801144);
+		LEPTILIKONS_ENERGY_FEELS_LIKE_ITS_BEING_CONDENSED = new NpcStringId(1801145);
+		DOPAGEN_IS_PREPARING_TO_HIDE_ITSELF_WITH_A_STRANGE_SCENT = new NpcStringId(1801146);
+		DOPAGEN_IS_PREPARING_TO_HIDE_ITSELF = new NpcStringId(1801147);
+		DOPAGEN_IS_DISAPPEARING_IN_BETWEEN_THE_TWISTED_SPACE = new NpcStringId(1801148);
+		MAGUEN_APPEARANCE = new NpcStringId(1801149);
+		ENOUGH_MAGUEN_PLASMA_BISTAKON_HAVE_GATHERED = new NpcStringId(1801150);
+		ENOUGH_MAGUEN_PLASMA_COKRAKON_HAVE_GATHERED = new NpcStringId(1801151);
+		ENOUGH_MAGUEN_PLASMA_LEPTILIKON_HAVE_GATHERED = new NpcStringId(1801152);
+		THE_PLASMAS_HAVE_FILLED_THE_AEROSCOPE_AND_ARE_HARMONIZED = new NpcStringId(1801153);
+		THE_PLASMAS_HAVE_FILLED_THE_AEROSCOPE_BUT_THEY_ARE_RAMMING_INTO_EACH_OTHER_EXPLODING_AND_DYING = new NpcStringId(1801154);
+		AMAZING_S1_TOOK_100_OF_THESE_SOUL_STONE_FRAGMENTS_WHAT_A_COMPLETE_SWINDLER = new NpcStringId(1801155);
+		HMM_HEY_DID_YOU_GIVE_S1_SOMETHING_BUT_IT_WAS_JUST_1_HAHA = new NpcStringId(1801156);
+		S1_PULLED_ONE_WITH_S2_DIGITS_LUCKY_NOT_BAD = new NpcStringId(1801157);
+		ITS_BETTER_THAN_LOSING_IT_ALL_RIGHT_OR_DOES_THIS_FEEL_WORSE = new NpcStringId(1801158);
+		AHEM_S1_HAS_NO_LUCK_AT_ALL_TRY_PRAYING = new NpcStringId(1801159);
+		AH_ITS_OVER_WHAT_KIND_OF_GUY_IS_THAT_DAMN_FINE_YOU_S1_TAKE_IT_AND_GET_OUTTA_HERE = new NpcStringId(1801160);
+		A_BIG_PIECE_IS_MADE_UP_OF_LITTLE_PIECES_SO_HERES_A_LITTLE_PIECE = new NpcStringId(1801161);
+		YOU_DONT_FEEL_BAD_RIGHT_ARE_YOU_SAD_BUT_DONT_CRY = new NpcStringId(1801162);
+		OK_WHOS_NEXT_IT_ALL_DEPENDS_ON_YOUR_FATE_AND_LUCK_RIGHT_AT_LEAST_COME_AND_TAKE_A_LOOK = new NpcStringId(1801163);
+		NO_ONE_ELSE_DONT_WORRY_I_DONT_BITE_HAHA = new NpcStringId(1801164);
+		THERE_WAS_SOMEONE_WHO_WON_10000_FROM_ME_A_WARRIOR_SHOULDNT_JUST_BE_GOOD_AT_FIGHTING_RIGHT_YOUVE_GOTTA_BE_GOOD_IN_EVERYTHING = new NpcStringId(1801165);
+		OK_MASTER_OF_LUCK_THATS_YOU_HAHA_WELL_ANYONE_CAN_COME_AFTER_ALL = new NpcStringId(1801166);
+		SHEDDING_BLOOD_IS_A_GIVEN_ON_THE_BATTLEFIELD_AT_LEAST_ITS_SAFE_HERE = new NpcStringId(1801167);
+		GASP = new NpcStringId(1801168);
+		IS_IT_STILL_LONG_OFF = new NpcStringId(1801169);
+		IS_ERMIAN_WELL_EVEN_I_CANT_BELIEVE_THAT_I_SURVIVED_IN_A_PLACE_LIKE_THIS = new NpcStringId(1801170);
+		I_DONT_KNOW_HOW_LONG_ITS_BEEN_SINCE_I_PARTED_COMPANY_WITH_YOU_TIME_DOESNT_SEEM_TO_MOVE_IT_JUST_FEELS_TOO_LONG = new NpcStringId(1801171);
+		SORRY_TO_SAY_THIS_BUT_THE_PLACE_YOU_STRUCK_ME_BEFORE_NOW_HURTS_GREATLY = new NpcStringId(1801172);
+		UGH_IM_SORRY_IT_LOOKS_LIKE_THIS_IS_IT_FOR_ME_I_WANTED_TO_LIVE_AND_SEE_MY_FAMILY = new NpcStringId(1801173);
+		WHERE_ARE_YOU_I_CANT_SEE_ANYTHING = new NpcStringId(1801174);
+		WHERE_ARE_YOU_REALLY_I_CANT_FOLLOW_YOU_LIKE_THIS = new NpcStringId(1801175);
+		IM_SORRY_THIS_IS_IT_FOR_ME = new NpcStringId(1801176);
+		SOB_TO_SEE_ERMIAN_AGAIN_CAN_I_GO_TO_MY_FAMILY_NOW = new NpcStringId(1801177);
+		MY_ENERGY_WAS_RECOVERED_SO_QUICKLY_THANKS_S1 = new NpcStringId(1801183);
+		IM_STARVING = new NpcStringId(1801187);
+		MAGIC_POWER_SO_STRONG_THAT_IT_COULD_MAKE_YOU_LOSE_YOUR_MIND_CAN_BE_FELT_FROM_SOMEWHERE = new NpcStringId(1801189);
+		EVEN_THOUGH_YOU_BRING_SOMETHING_CALLED_A_GIFT_AMONG_YOUR_HUMANS_IT_WOULD_JUST_BE_PROBLEMATIC_FOR_ME = new NpcStringId(1801190);
+		I_JUST_DONT_KNOW_WHAT_EXPRESSION_I_SHOULD_HAVE_IT_APPEARED_ON_ME_ARE_HUMANS_EMOTIONS_LIKE_THIS_FEELING = new NpcStringId(1801191);
+		THE_FEELING_OF_THANKS_IS_JUST_TOO_MUCH_DISTANT_MEMORY_FOR_ME = new NpcStringId(1801192);
+		BUT_I_KIND_OF_MISS_IT_LIKE_I_HAD_FELT_THIS_FEELING_BEFORE = new NpcStringId(1801193);
+		I_AM_ICE_QUEEN_FREYA_THIS_FEELING_AND_EMOTION_ARE_NOTHING_BUT_A_PART_OF_MELISSAA_MEMORIES = new NpcStringId(1801194);
+		DEAR_S1_THINK_OF_THIS_AS_MY_APPRECIATION_FOR_THE_GIFT_TAKE_THIS_WITH_YOU_THERES_NOTHING_STRANGE_ABOUT_IT_ITS_JUST_A_BIT_OF_MY_CAPRICIOUSNESS = new NpcStringId(1801195);
+		THE_KINDNESS_OF_SOMEBODY_IS_NOT_A_BAD_FEELING_DEAR_S1_I_WILL_TAKE_THIS_GIFT_OUT_OF_RESPECT_YOUR_KINDNESS = new NpcStringId(1801196);
+		FIGHTER = new NpcStringId(1811000);
+		WARRIOR = new NpcStringId(1811001);
+		GLADIATOR = new NpcStringId(1811002);
+		WARLORD = new NpcStringId(1811003);
+		KNIGHT = new NpcStringId(1811004);
+		PALADIN = new NpcStringId(1811005);
+		DARK_AVENGER = new NpcStringId(1811006);
+		ROGUE = new NpcStringId(1811007);
+		TREASURE_HUNTER = new NpcStringId(1811008);
+		HAWKEYE = new NpcStringId(1811009);
+		MAGE = new NpcStringId(1811010);
+		WIZARD = new NpcStringId(1811011);
+		SORCERER = new NpcStringId(1811012);
+		NECROMANCER = new NpcStringId(1811013);
+		WARLOCK = new NpcStringId(1811014);
+		CLERIC = new NpcStringId(1811015);
+		BISHOP = new NpcStringId(1811016);
+		PROPHET = new NpcStringId(1811017);
+		ELVEN_FIGHTER = new NpcStringId(1811018);
+		ELVEN_KNIGHT = new NpcStringId(1811019);
+		TEMPLE_KNIGHT = new NpcStringId(1811020);
+		SWORD_SINGER = new NpcStringId(1811021);
+		ELVEN_SCOUT = new NpcStringId(1811022);
+		PLAIN_WALKER = new NpcStringId(1811023);
+		SILVER_RANGER = new NpcStringId(1811024);
+		ELVEN_MAGE = new NpcStringId(1811025);
+		ELVEN_WIZARD = new NpcStringId(1811026);
+		SPELL_SINGER = new NpcStringId(1811027);
+		ELEMENTAL_SUMMONER = new NpcStringId(1811028);
+		ORACLE = new NpcStringId(1811029);
+		ELDER = new NpcStringId(1811030);
+		DARK_FIGHTER = new NpcStringId(1811031);
+		PALACE_KNIGHT = new NpcStringId(1811032);
+		SHILLIEN_KNIGHT = new NpcStringId(1811033);
+		BLADE_DANCER = new NpcStringId(1811034);
+		ASSASSIN = new NpcStringId(1811035);
+		ABYSS_WALKER = new NpcStringId(1811036);
+		PHANTOM_RANGER = new NpcStringId(1811037);
+		DARK_MAGE = new NpcStringId(1811038);
+		DARK_WIZARD = new NpcStringId(1811039);
+		SPELLHOWLER = new NpcStringId(1811040);
+		PHANTOM_SUMMONER = new NpcStringId(1811041);
+		SHILLIEN_ORACLE = new NpcStringId(1811042);
+		SHILLIEN_ELDER = new NpcStringId(1811043);
+		ORC_FIGHTER = new NpcStringId(1811044);
+		ORC_RAIDER = new NpcStringId(1811045);
+		DESTROYER = new NpcStringId(1811046);
+		ORC_MONK = new NpcStringId(1811047);
+		TYRANT = new NpcStringId(1811048);
+		ORC_MAGE = new NpcStringId(1811049);
+		ORC_SHAMAN = new NpcStringId(1811050);
+		OVERLORD = new NpcStringId(1811051);
+		WARCRYER = new NpcStringId(1811052);
+		DWARVEN_FIGHTER = new NpcStringId(1811053);
+		SCAVENGER = new NpcStringId(1811054);
+		BOUNTY_HUNTER = new NpcStringId(1811055);
+		ARTISAN = new NpcStringId(1811056);
+		WARSMITH = new NpcStringId(1811057);
+		DUELIST = new NpcStringId(1811088);
+		DREADNOUGHT = new NpcStringId(1811089);
+		PHOENIX_KNIGHT = new NpcStringId(1811090);
+		HELL_KNIGHT = new NpcStringId(1811091);
+		SAGITTARIUS = new NpcStringId(1811092);
+		ADVENTURER = new NpcStringId(1811093);
+		ARCHMAGE = new NpcStringId(1811094);
+		SOULTAKER = new NpcStringId(1811095);
+		ARCANA_LORD = new NpcStringId(1811096);
+		CARDINAL = new NpcStringId(1811097);
+		HIEROPHANT = new NpcStringId(1811098);
+		EVAS_TEMPLAR = new NpcStringId(1811099);
+		SWORD_MUSE = new NpcStringId(1811100);
+		WIND_RIDER = new NpcStringId(1811101);
+		MOONLIGHT_SENTINEL = new NpcStringId(1811102);
+		MYSTIC_MUSE = new NpcStringId(1811103);
+		ELEMENTAL_MASTER = new NpcStringId(1811104);
+		EVAS_SAINT = new NpcStringId(1811105);
+		SHILLIEN_TEMPLAR = new NpcStringId(1811106);
+		SPECTRAL_DANCER = new NpcStringId(1811107);
+		GHOST_HUNTER = new NpcStringId(1811108);
+		GHOST_SENTINEL = new NpcStringId(1811109);
+		STORM_SCREAMER = new NpcStringId(1811110);
+		SPECTRAL_MASTER = new NpcStringId(1811111);
+		SHILLIEN_SAINT = new NpcStringId(1811112);
+		TITAN = new NpcStringId(1811113);
+		GRAND_KHAVATARI = new NpcStringId(1811114);
+		DOMINATOR = new NpcStringId(1811115);
+		DOOM_CRYER = new NpcStringId(1811116);
+		FORTUNE_SEEKER = new NpcStringId(1811117);
+		MAESTRO = new NpcStringId(1811118);
+		KAMAEL_SOLDIER = new NpcStringId(1811123);
+		TROOPER = new NpcStringId(1811125);
+		WARDER = new NpcStringId(1811126);
+		BERSERKER = new NpcStringId(1811127);
+		SOUL_BREAKER = new NpcStringId(1811128);
+		ARBALESTER = new NpcStringId(1811130);
+		DOOMBRINGER = new NpcStringId(1811131);
+		SOUL_HOUND = new NpcStringId(1811132);
+		TRICKSTER = new NpcStringId(1811134);
+		INSPECTOR = new NpcStringId(1811135);
+		JUDICATOR = new NpcStringId(1811136);
+		WHOS_THERE_IF_YOU_DISTURB_THE_TEMPER_OF_THE_GREAT_LAND_DRAGON_ANTHARAS_I_WILL_NEVER_FORGIVE_YOU = new NpcStringId(1811137);
+		KEHAHAHA_I_CAPTURED_SANTA_CLAUS_THERE_WILL_BE_NO_GIFTS_THIS_YEAR = new NpcStringId(1900000);
+		WELL_I_WIN_RIGHT = new NpcStringId(1900003);
+		NOW_ALL_OF_YOU_LOSERS_GET_OUT_OF_HERE = new NpcStringId(1900004);
+		I_GUESS_YOU_CAME_TO_RESCUE_SANTA_BUT_YOU_PICKED_THE_WRONG_OPPONENT = new NpcStringId(1900006);
+		OH_NOT_BAD = new NpcStringId(1900007);
+		AGH_THATS_NOT_WHAT_I_MEANT_TO_DO = new NpcStringId(1900008);
+		CURSE_YOU_HUH_WHAT = new NpcStringId(1900009);
+		SHALL_I_GO_TO_SEE_IF_SANTA_IS_STILL_THERE_HEHE = new NpcStringId(1900015);
+		SANTA_CAN_GIVE_NICE_PRESENTS_ONLY_IF_HES_RELEASED_FROM_THE_TURKEY = new NpcStringId(1900017);
+		OH_HO_HO_OH_HO_HO_THANK_YOU_EVERYONE_I_WILL_REPAY_YOU_FOR_SURE = new NpcStringId(1900018);
+		MERRY_CHRISTMAS_WELL_DONE = new NpcStringId(1900019);
+		S_I_HAVE_PREPARED_A_GIFT_FOR_YOU = new NpcStringId(1900021);
+		I_HAVE_A_GIFT_FOR_S = new NpcStringId(1900022);
+		TAKE_A_LOOK_AT_THE_INVENTORY_PERHAPS_THERE_WILL_BE_A_BIG_PRESENT = new NpcStringId(1900024);
+		WHEN_ARE_YOU_GOING_TO_STOP_IM_SLOWLY_GETTING_TIRED_OF_THIS = new NpcStringId(1900026);
+		MESSAGE_FROM_SANTA_CLAUS_MANY_BLESSINGS_TO_S_WHO_SAVED_ME = new NpcStringId(1900027);
+		HOW_DARE_YOU_AWAKEN_ME_FEEL_THE_PAIN_OF_THE_FLAMES = new NpcStringId(1900028);
+		WHO_DARES_OPPOSE_THE_MAJESTY_OF_FIRE = new NpcStringId(1900029);
+		OH_OUCH_NO_NOT_THERE_NOT_MY_BEAD = new NpcStringId(1900030);
+		CO_COLD_THATS_COLD_ACK_ACK = new NpcStringId(1900031);
+		PLEASE_S_DONT_HIT_ME_PLEASE = new NpcStringId(1900032);
+		KUAAANNGGG_SHAKE_IN_FEAR = new NpcStringId(1900033);
+		IF_YOU_ATTACK_ME_RIGHT_NOW_YOURE_REALLY_GOING_TO_GET_IT = new NpcStringId(1900034);
+		JUST_YOU_WAIT_IM_GOING_TO_SHOW_YOU_MY_KILLER_TECHNIQUE = new NpcStringId(1900035);
+		YOU_DONT_DARE_ATTACK_ME = new NpcStringId(1900036);
+		ITS_DIFFERENT_FROM_THE_SPIRIT_OF_FIRE_ITS_NOT_THE_SPIRIT_OF_FIRE_FEEL_MY_WRATH = new NpcStringId(1900037);
+		COLD_THIS_PLACE_IS_THIS_WHERE_I_DIE = new NpcStringId(1900038);
+		MY_BODY_IS_COOLING_OH_GRAN_KAIN_FORGIVE_ME = new NpcStringId(1900039);
+		IDIOT_I_ONLY_INCUR_DAMAGE_FROM_BARE_HANDED_ATTACKS = new NpcStringId(1900040);
+		IM_OUT_OF_CANDY_ILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD = new NpcStringId(1900051);
+		SINCE_IM_OUT_OF_CANDY_I_WILL_GIVE_YOU_MY_TOY_CHEST_INSTEAD = new NpcStringId(1900052);
+		YOURE_TOO_GOOD_NEXT_TIME_ILL_GIVE_YOU_AN_INCREDIBLE_GIFT_PLEASE_WAIT_FOR_IT = new NpcStringId(1900060);
+		I_WOULD_BE_EMBARRASSED_TO_LOSE_AGAIN_HERE = new NpcStringId(1900062);
+		EVEN_PROS_CANT_DO_14_WINS_IN_A_ROW_NEXT_TIME_ILL_GIVE_YOU_MY_TREASURE_THE_GOLDEN_JACK_OLANTERN = new NpcStringId(1900070);
+		I_CANT_DO_THIS_ANYMORE_YOU_WIN_IN_ALL_MY_583_YEARS_YOURE_THE_BEST_THAT_IVE_SEEN = new NpcStringId(1900071);
+		S_HAS_WON_S_JACKS_GAMES_IN_A_ROW = new NpcStringId(1900081);
+		CONGRATULATIONS_S_HAS_WON_S_JACKS_GAMES_IN_A_ROW = new NpcStringId(1900082);
+		HELLO_IM_BELLDANDY_CONGRATULATIONS_ON_GETTING_1ST_PLACE_IN_JACKS_GAME_IF_YOU_GO_AND_FIND_MY_SIBLING_SKOOLDIE_IN_THE_VILLAGE_YOULL_GET_AN_AMAZING_GIFT_LETS_PLAY_JACKS_GAME_AGAIN = new NpcStringId(1900084);
+		YAWN_AHH_HELLO_NICE_WEATHER_WERE_HAVING = new NpcStringId(1900104);
+		AH_IM_HUNGRY_DO_YOU_HAVE_ANY_BABY_FOOD_THATS_WHAT_I_NEED_TO_EAT_TO_GET_BIGGER = new NpcStringId(1900105);
+		I_GOTTA_GROW_UP_FAST_I_WANT_TO_PULL_SANTAS_SLED_TOO = new NpcStringId(1900106);
+		YUMMY_I_THINK_I_CAN_GROW_UP_NOW = new NpcStringId(1900107);
+		THANKS_TO_YOU_I_GREW_UP_INTO_A_BOY_RUDOLPH = new NpcStringId(1900108);
+		ITS_GREAT_WEATHER_FOR_RUNNING_AROUND = new NpcStringId(1900109);
+		WHATLL_I_BE_WHEN_I_GROW_UP_I_WONDER = new NpcStringId(1900110);
+		IF_YOU_TAKE_GOOD_CARE_OF_ME_ILL_NEVER_FORGET_IT = new NpcStringId(1900111);
+		PLEASE_PET_ME_LOVINGLY_YOU_CAN_USE_THE_HAND_OF_WARMTH_SKILL_UNDER_THE_ACTION_TAB = new NpcStringId(1900112);
+		I_FEEL_GREAT_THANK_YOU = new NpcStringId(1900113);
+		WOO_WHAT_A_GOOD_FEELING_I_GOTTA_GROW_MORE_AND_MORE = new NpcStringId(1900114);
+		OH_YUMMY_IF_I_KEEP_EATING_THIS_I_THINK_I_CAN_GROW_UP_ALL_THE_WAY = new NpcStringId(1900115);
+		YUM_YUM_DELICIOUS_GIVE_ME_MORE_OF_THIS = new NpcStringId(1900116);
+		WOW_THIS_TASTE_THERES_A_WHOLE_NEW_WORLD_IN_MY_MOUTH = new NpcStringId(1900117);
+		YEAH_ITS_SO_DELICIOUS_THIS_IS_THAT_STAR_FOOD = new NpcStringId(1900118);
+		PAY_SOME_ATTENTION_TO_ME_HMPH = new NpcStringId(1900119);
+		THANK_YOU_I_WAS_ABLE_TO_GROW_UP_INTO_AN_ADULT_HERE_IS_MY_GIFT = new NpcStringId(1900120);
+		THANK_YOU_S_NOW_I_CAN_PULL_THE_SLED = new NpcStringId(1900121);
+		S_THANK_YOU_FOR_TAKING_CARE_OF_ME_ALL_THIS_TIME_I_ENJOYED_IT_VERY_MUCH = new NpcStringId(1900122);
+		S_IT_WONT_BE_LONG_NOW_UNTIL_IT_BECOMES_TIME_TO_PULL_THE_SLED_ITS_TOO_BAD = new NpcStringId(1900123);
+		I_MUST_RETURN_TO_SANTA_NOW_THANK_YOU_FOR_EVERYTHING = new NpcStringId(1900124);
+		HELLO_IM_A_GIRL_RUDOLPH_I_WAS_ABLE_TO_FIND_MY_TRUE_SELF_THANKS_TO_YOU = new NpcStringId(1900125);
+		THIS_IS_MY_GIFT_OF_THANKS_THANK_YOU_FOR_TAKING_CARE_OF_ME = new NpcStringId(1900126);
+		S_I_WAS_ALWAYS_GRATEFUL = new NpcStringId(1900127);
+		IM_A_LITTLE_SAD_ITS_TIME_TO_LEAVE_NOW = new NpcStringId(1900128);
+		S_THE_TIME_HAS_COME_FOR_ME_TO_RETURN_TO_MY_HOME = new NpcStringId(1900129);
+		S_THANK_YOU = new NpcStringId(1900130);
+		HAHAHA_I_CAPTURED_SANTA_CLAUS_HUH_WHERE_IS_THIS_WHO_ARE_YOU = new NpcStringId(1900131);
+		I_LOST_AT_ROCK_PAPER_SCISSORS_AND_WAS_TAKEN_CAPTIVE_I_MIGHT_AS_WELL_TAKE_OUT_MY_ANGER_ON_YOU_HUH_WHAT = new NpcStringId(1900132);
+		NOTHINGS_WORKING_IM_LEAVING_ILL_DEFINITELY_CAPTURE_SANTA_AGAIN_JUST_YOU_WAIT = new NpcStringId(1900133);
+		I_MUST_RAISE_RUDOLPH_QUICKLY_THIS_YEARS_CHRISTMAS_GIFTS_HAVE_TO_BE_DELIVERED = new NpcStringId(1900134);
+		MERRY_CHRISTMAS_THANKS_TO_YOUR_EFFORTS_IN_RAISING_RUDOLPH_THE_GIFT_DELIVERY_WAS_A_SUCCESS = new NpcStringId(1900135);
+		IN_10_MINUTES_IT_WILL_BE_1_HOUR_SINCE_YOU_STARTED_RAISING_ME = new NpcStringId(1900136);
+		AFTER_5_MINUTES_IF_MY_FULL_FEELING_AND_AFFECTION_LEVEL_REACH_99_I_CAN_GROW_BIGGER = new NpcStringId(1900137);
+		LUCKY_IM_LUCKY_THE_SPIRIT_THAT_LOVES_ADENA = new NpcStringId(1900139);
+		LUCKY_I_WANT_TO_EAT_ADENA_GIVE_IT_TO_ME = new NpcStringId(1900140);
+		LUCKY_IF_I_EAT_TOO_MUCH_ADENA_MY_WINGS_DISAPPEAR = new NpcStringId(1900141);
+		YUMMY_THANKS_LUCKY = new NpcStringId(1900142);
+		GRRRR_YUCK = new NpcStringId(1900143);
+		LUCKY_THE_ADENA_IS_SO_YUMMY_IM_GETTING_BIGGER = new NpcStringId(1900144);
+		LUCKY_NO_MORE_ADENA_OH_IM_SO_HEAVY = new NpcStringId(1900145);
+		LUCKY_IM_FULL_THANKS_FOR_THE_YUMMY_ADENA_OH_IM_SO_HEAVY = new NpcStringId(1900146);
+		LUCKY_IT_WASNT_ENOUGH_ADENA_ITS_GOTTA_BE_AT_LEAST_S = new NpcStringId(1900147);
+		OH_MY_WINGS_DISAPPEARED_ARE_YOU_GONNA_HIT_ME_IF_YOU_HIT_ME_ILL_THROW_UP_EVERYTHING_THAT_I_ATE = new NpcStringId(1900148);
+		OH_MY_WINGS_ACK_ARE_YOU_GONNA_HIT_ME_SCARY_SCARY_IF_YOU_HIT_ME_SOMETHING_BAD_WILL_HAPPEN = new NpcStringId(1900149);
+		THE_EVIL_LAND_DRAGON_ANTHARAS_HAS_BEEN_DEFEATED = new NpcStringId(1900150);
+		THE_EVIL_FIRE_DRAGON_VALAKAS_HAS_BEEN_DEFEATED = new NpcStringId(1900151);
+		TO_SERVE_HIM_NOW_MEANS_YOU_WILL_BE_ABLE_TO_ESCAPE_A_WORSE_SITUATION = new NpcStringId(1900152);
+		OH_GODDESS_OF_DESTRUCTION_FORGIVE_US = new NpcStringId(1900153);
+		WHEN_THE_SKY_TURNS_BLOOD_RED_AND_THE_EARTH_BEGINS_TO_CRUMBLE_FROM_THE_DARKNESS_SHE_WILL_RETURN = new NpcStringId(1900154);
+		EARTH_ENERGY_IS_GATHERING_NEAR_ANTHARASS_LEGS = new NpcStringId(1900155);
+		ANTHARAS_STARTS_TO_ABSORB_THE_EARTH_ENERGY = new NpcStringId(1900156);
+		ANTHARAS_RAISES_ITS_THICK_TAIL = new NpcStringId(1900157);
+		YOU_ARE_OVERCOME_BY_THE_STRENGTH_OF_ANTHARAS = new NpcStringId(1900158);
+		ANTHARASS_EYES_ARE_FILLED_WITH_RAGE = new NpcStringId(1900159);
+		S1_I_CAN_FEEL_THEIR_PRESENCE_FROM_YOU = new NpcStringId(1900160);
+		S1_BRETHREN_COME_TO_MY_SIDE_AND_FOLLOW_ME = new NpcStringId(1900161);
+		ANTHARAS_ROARS = new NpcStringId(1900162);
+		FLAME_ENERGY_IS_BEING_DIRECTED_TOWARDS_VALAKAS = new NpcStringId(1900163);
+		YOU_ARE_OVERCOME_BY_THE_STRENGTH_OF_VALAKAS = new NpcStringId(1900164);
+		VALAKASS_TAIL_FLAILS_DANGEROUSLY = new NpcStringId(1900165);
+		VALAKAS_RAISES_ITS_TAIL = new NpcStringId(1900166);
+		VALAKAS_STARTS_TO_ABSORB_THE_FLAME_ENERGY = new NpcStringId(1900167);
+		VALAKAS_LOOKS_TO_ITS_LEFT = new NpcStringId(1900168);
+		VALAKAS_LOOKS_TO_ITS_RIGHT = new NpcStringId(1900169);
+		BY_MY_AUTHORITY_I_COMMAND_YOU_CREATURE_TURN_TO_DUST = new NpcStringId(1900170);
+		BY_MY_WRATH_I_COMMAND_YOU_CREATURE_LOSE_YOUR_MIND = new NpcStringId(1900171);
+		SHOW_RESPECT_TO_THE_HEROES_WHO_DEFEATED_THE_EVIL_DRAGON_AND_PROTECTED_THIS_ADEN_WORLD = new NpcStringId(1900172);
+		SHOUT_TO_CELEBRATE_THE_VICTORY_OF_THE_HEROES = new NpcStringId(1900173);
+		PRAISE_THE_ACHIEVEMENT_OF_THE_HEROES_AND_RECEIVE_NEVITS_BLESSING = new NpcStringId(1900174);
+		UGH_I_THINK_THIS_IS_IT_FOR_ME = new NpcStringId(1900175);
+		VALAKAS_CALLS_FORTH_THE_SERVITORS_MASTER = new NpcStringId(1900176);
+		YOU_WILL_SOON_BECOME_THE_SACRIFICE_FOR_US_THOSE_FULL_OF_DECEIT_AND_SIN_WHOM_YOU_DESPISE = new NpcStringId(1911111);
+		MY_BRETHREN_WHO_ARE_STRONGER_THAN_ME_WILL_PUNISH_YOU_YOU_WILL_SOON_BE_COVERED_IN_YOUR_OWN_BLOOD_AND_CRYING_IN_ANGUISH = new NpcStringId(1911112);
+		HOW_COULD_I_LOSE_AGAINST_THESE_WORTHLESS_CREATURES = new NpcStringId(1911113);
+		FOOLISH_CREATURES_THE_FLAMES_OF_HELL_ARE_DRAWING_CLOSER = new NpcStringId(1911114);
+		NO_MATTER_HOW_YOU_STRUGGLE_THIS_PLACE_WILL_SOON_BE_COVERED_WITH_YOUR_BLOOD = new NpcStringId(1911115);
+		THOSE_WHO_SET_FOOT_IN_THIS_PLACE_SHALL_NOT_LEAVE_ALIVE = new NpcStringId(1911116);
+		WORTHLESS_CREATURES_I_WILL_GRANT_YOU_ETERNAL_SLEEP_IN_FIRE_AND_BRIMSTONE = new NpcStringId(1911117);
+		IF_YOU_WISH_TO_SEE_HELL_I_WILL_GRANT_YOU_YOUR_WISH = new NpcStringId(1911118);
+		ELAPSED_TIME = new NpcStringId(1911119);
+		TIME_REMAINING = new NpcStringId(1911120);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_ADEN_IMPERIAL_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004431);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_GLUDIO_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004432);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_DION_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004433);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_GIRAN_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004434);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_ADEN_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004436);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_INNADRIL_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004437);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_GODDARD_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004438);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_RUNE_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004439);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_SCHUTTGART_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004440);
+		IT_TELEPORTS_THE_GUARD_MEMBERS_OF_THE_ELMORE_IMPERIAL_CASTLE_TO_THE_INSIDE_OF_THE_CASTLE = new NpcStringId(10004441);
+		
+		buildFastLookupTable();
+	}
+	
+	private static void buildFastLookupTable() {
+		final Field[] fields = NpcStringId.class.getDeclaredFields();
+		
+		int mod;
+		NpcStringId nsId;
+		for (final Field field : fields) {
+			mod = field.getModifiers();
+			if (Modifier.isStatic(mod) && Modifier.isPublic(mod) && Modifier.isFinal(mod) && field.getType().equals(NpcStringId.class)) {
+				try {
+					nsId = (NpcStringId) field.get(null);
+					nsId.setName(field.getName());
+					nsId.setParamCount(parseMessageParameters(field.getName()));
+					
+					VALUES.put(nsId.getId(), nsId);
+				} catch (final Exception e) {
+					LOG.warn("Failed field access for '{}'", field.getName(), e);
+				}
+			}
+		}
+	}
+	
+	private static int parseMessageParameters(final String name) {
+		int paramCount = 0;
+		char c1, c2;
+		for (int i = 0; i < (name.length() - 1); i++) {
+			c1 = name.charAt(i);
+			if ((c1 == 'C') || (c1 == 'S')) {
+				c2 = name.charAt(i + 1);
+				if (Character.isDigit(c2)) {
+					paramCount = Math.max(paramCount, Character.getNumericValue(c2));
+					i++;
+				}
+			}
+		}
+		return paramCount;
+	}
+	
+	public static NpcStringId getNpcStringId(final int id) {
+		final NpcStringId nsi = getNpcStringIdInternal(id);
+		return nsi == null ? new NpcStringId(id) : nsi;
+	}
+	
+	private static NpcStringId getNpcStringIdInternal(final int id) {
+		return VALUES.get(id);
+	}
+	
+	public static NpcStringId getNpcStringId(final String name) {
+		try {
+			return (NpcStringId) NpcStringId.class.getField(name).get(null);
+		} catch (final Exception e) {
+			return null;
+		}
+	}
+	
+	public static void reloadLocalisations() {
+		for (var nsId : VALUES.values()) {
+			if (nsId != null) {
+				nsId.removeAllLocalisations();
+			}
+		}
+		
+		final var factory = DocumentBuilderFactory.newInstance();
+		factory.setValidating(false);
+		factory.setIgnoringComments(true);
+		
+		for (var lang : customs().getMultiLangNpcStringAllowed()) {
+			final var file = new File(server().getDatapackRoot(), "data/lang/" + lang + "/ns/NpcStringLocalisation.xml");
+			if (!file.isFile()) {
+				continue;
+			}
+			
+			LOG.info("Loading localisation for '{}'", lang);
+			
+			try {
+				final var doc = factory.newDocumentBuilder().parse(file);
+				for (var na = doc.getFirstChild(); na != null; na = na.getNextSibling()) {
+					if ("list".equals(na.getNodeName())) {
+						for (var nb = na.getFirstChild(); nb != null; nb = nb.getNextSibling()) {
+							if ("ns".equals(nb.getNodeName())) {
+								final var nnmb = nb.getAttributes();
+								var node = nnmb.getNamedItem("id");
+								NpcStringId nsId;
+								if (node != null) {
+									nsId = getNpcStringId(Integer.parseInt(node.getNodeValue()));
+									if (nsId == null) {
+										LOG.warn("Unknown NSID '{}', lang '{}'.", node.getNodeValue(), lang);
+										continue;
+									}
+								} else {
+									node = nnmb.getNamedItem("name");
+									nsId = getNpcStringId(node.getNodeValue());
+									if (nsId == null) {
+										LOG.warn("Unknown NSID '{}', lang '{}'.", node.getNodeValue(), lang);
+										continue;
+									}
+								}
+								
+								node = nnmb.getNamedItem("text");
+								if (node == null) {
+									LOG.warn("No text defined for NSID '{}', lang '{}'.", nsId, lang);
+									continue;
+								}
+								
+								final var text = node.getNodeValue();
+								if (text.isEmpty() || (text.length() > 255)) {
+									LOG.warn("Invalid text defined for NSID '{}' (to long or empty), lang '{}'.", nsId, lang);
+									continue;
+								}
+								
+								nsId.attachLocalizedText(lang, text);
+							}
+						}
+					}
+				}
+			} catch (final Exception e) {
+				LOG.error("Failed loading '{}'", file, e);
+			}
+		}
+	}
+	
+	private final int _id;
+	private String _name;
+	private int _params;
+	private Map<String, Localization> _localisations;
+	private ExShowScreenMessage _staticScreenMessage;
+	
+	private NpcStringId(int id) {
+		_id = id;
+		_localisations = null;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	private void setName(String name) {
+		_name = name;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int getParamCount() {
+		return _params;
+	}
+	
+	public void setParamCount(int params) {
+		if (params < 0) {
+			throw new IllegalArgumentException("Invalid negative param count: " + params);
+		}
+		
+		if (params > 10) {
+			throw new IllegalArgumentException("Maximum param count exceeded: " + params);
+		}
+		
+		if (params != 0) {
+			_staticScreenMessage = null;
+		}
+		
+		_params = params;
+	}
+	
+	public Localization getLocalisation(String lang) {
+		return (_localisations == null) ? null : _localisations.get(lang);
+	}
+	
+	public void attachLocalizedText(String lang, String text) {
+		if (_localisations == null) {
+			_localisations = new HashMap<>();
+		}
+		_localisations.put(lang, new Localization(lang, text));
+	}
+	
+	public void removeAllLocalisations() {
+		_localisations = null;
+	}
+	
+	public ExShowScreenMessage getStaticScreenMessage() {
+		return _staticScreenMessage;
+	}
+	
+	public void setStaticSystemMessage(ExShowScreenMessage ns) {
+		_staticScreenMessage = ns;
+	}
+	
+	@Override
+	public String toString() {
+		return "NS[" + getId() + ":" + getName() + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/SystemMessageId.java b/src/main/java/com/l2jserver/gameserver/network/SystemMessageId.java
new file mode 100644
index 00000000..e0103ede
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/SystemMessageId.java
@@ -0,0 +1,15428 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.clientstrings.Localization;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * System Message Id.
+ * @author Noctarius
+ * @author Nille02
+ * @author crion
+ * @author Forsaiken
+ * @author Zealar
+ * @author Zoey76
+ */
+public final class SystemMessageId {
+	private static final Logger LOG = LoggerFactory.getLogger(SystemMessageId.class);
+	
+	/**
+	 * Map containing all SystemMessageIds.
+	 */
+	private static final Map<Integer, SystemMessageId> VALUES = new HashMap<>(2524);
+	
+	/**
+	 * ID: 0<br>
+	 * Message: You have been disconnected from the server.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_DISCONNECTED = new SystemMessageId(0);
+	
+	/**
+	 * ID: 1<br>
+	 * Message: The server will be coming down in $s1 second(s). Please find a safe place to log out.
+	 */
+	public static final SystemMessageId THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECONDS = new SystemMessageId(1);
+	
+	/**
+	 * ID: 2<br>
+	 * Message: $s1 does not exist.
+	 */
+	public static final SystemMessageId S1_DOES_NOT_EXIST = new SystemMessageId(2);
+	
+	/**
+	 * ID: 3<br>
+	 * Message: $s1 is not currently logged in.
+	 */
+	public static final SystemMessageId S1_IS_NOT_ONLINE = new SystemMessageId(3);
+	
+	/**
+	 * ID: 4<br>
+	 * Message: You cannot ask yourself to apply to a clan.
+	 */
+	public static final SystemMessageId CANNOT_INVITE_YOURSELF = new SystemMessageId(4);
+	
+	/**
+	 * ID: 5<br>
+	 * Message: $s1 already exists.
+	 */
+	public static final SystemMessageId S1_ALREADY_EXISTS = new SystemMessageId(5);
+	
+	/**
+	 * ID: 6<br>
+	 * Message: $s1 does not exist.
+	 */
+	public static final SystemMessageId S1_DOES_NOT_EXIST2 = new SystemMessageId(6);
+	
+	/**
+	 * ID: 7<br>
+	 * Message: You are already a member of $s1.
+	 */
+	public static final SystemMessageId ALREADY_MEMBER_OF_S1 = new SystemMessageId(7);
+	
+	/**
+	 * ID: 8<br>
+	 * Message: You are already a member of another clan.
+	 */
+	public static final SystemMessageId YOU_ARE_WORKING_WITH_ANOTHER_CLAN = new SystemMessageId(8);
+	
+	/**
+	 * ID: 9<br>
+	 * Message: $s1 is not a clan leader.
+	 */
+	public static final SystemMessageId S1_IS_NOT_A_CLAN_LEADER = new SystemMessageId(9);
+	
+	/**
+	 * ID: 10<br>
+	 * Message: $s1 is already a member of another clan.
+	 */
+	public static final SystemMessageId S1_WORKING_WITH_ANOTHER_CLAN = new SystemMessageId(10);
+	
+	/**
+	 * ID: 11<br>
+	 * Message: There are no applicants for this clan.
+	 */
+	public static final SystemMessageId NO_APPLICANTS_FOR_THIS_CLAN = new SystemMessageId(11);
+	
+	/**
+	 * ID: 12<br>
+	 * Message: Applicant information is incorrect.
+	 */
+	public static final SystemMessageId APPLICANT_INFORMATION_INCORRECT = new SystemMessageId(12);
+	
+	/**
+	 * ID: 13<br>
+	 * Message: Unable to dissolve: your clan has requested to participate in a castle siege.
+	 */
+	public static final SystemMessageId CANNOT_DISSOLVE_CAUSE_CLAN_WILL_PARTICIPATE_IN_CASTLE_SIEGE = new SystemMessageId(13);
+	
+	/**
+	 * ID: 14<br>
+	 * Message: Unable to dissolve: your clan owns one or more castles or hideouts.
+	 */
+	public static final SystemMessageId CANNOT_DISSOLVE_CAUSE_CLAN_OWNS_CASTLES_HIDEOUTS = new SystemMessageId(14);
+	
+	/**
+	 * ID: 15<br>
+	 * Message: You are in siege.
+	 */
+	public static final SystemMessageId YOU_ARE_IN_SIEGE = new SystemMessageId(15);
+	
+	/**
+	 * ID: 16<br>
+	 * Message: You are not in siege.
+	 */
+	public static final SystemMessageId YOU_ARE_NOT_IN_SIEGE = new SystemMessageId(16);
+	
+	/**
+	 * ID: 17<br>
+	 * Message: The castle siege has begun.
+	 */
+	public static final SystemMessageId CASTLE_SIEGE_HAS_BEGUN = new SystemMessageId(17);
+	
+	/**
+	 * ID: 18<br>
+	 * Message: The castle siege has ended.
+	 */
+	public static final SystemMessageId CASTLE_SIEGE_HAS_ENDED = new SystemMessageId(18);
+	
+	/**
+	 * ID: 19<br>
+	 * Message: There is a new Lord of the castle!
+	 */
+	public static final SystemMessageId NEW_CASTLE_LORD = new SystemMessageId(19);
+	
+	/**
+	 * ID: 20<br>
+	 * Message: The gate is being opened.
+	 */
+	public static final SystemMessageId GATE_IS_OPENING = new SystemMessageId(20);
+	
+	/**
+	 * ID: 21<br>
+	 * Message: The gate is being destroyed.
+	 */
+	public static final SystemMessageId GATE_IS_DESTROYED = new SystemMessageId(21);
+	
+	/**
+	 * ID: 22<br>
+	 * Message: Your target is out of range.
+	 */
+	public static final SystemMessageId TARGET_TOO_FAR = new SystemMessageId(22);
+	
+	/**
+	 * ID: 23<br>
+	 * Message: Not enough HP.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_HP = new SystemMessageId(23);
+	
+	/**
+	 * ID: 24<br>
+	 * Message: Not enough MP.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_MP = new SystemMessageId(24);
+	
+	/**
+	 * ID: 25<br>
+	 * Message: Rejuvenating HP.
+	 */
+	public static final SystemMessageId REJUVENATING_HP = new SystemMessageId(25);
+	
+	/**
+	 * ID: 26<br>
+	 * Message: Rejuvenating MP.
+	 */
+	public static final SystemMessageId REJUVENATING_MP = new SystemMessageId(26);
+	
+	/**
+	 * ID: 27<br>
+	 * Message: Your casting has been interrupted.
+	 */
+	public static final SystemMessageId CASTING_INTERRUPTED = new SystemMessageId(27);
+	
+	/**
+	 * ID: 28<br>
+	 * Message: You have obtained $s1 adena.
+	 */
+	public static final SystemMessageId YOU_PICKED_UP_S1_ADENA = new SystemMessageId(28);
+	
+	/**
+	 * ID: 29<br>
+	 * Message: You have obtained $s2 $s1.
+	 */
+	public static final SystemMessageId YOU_PICKED_UP_S1_S2 = new SystemMessageId(29);
+	
+	/**
+	 * ID: 30<br>
+	 * Message: You have obtained $s1.
+	 */
+	public static final SystemMessageId YOU_PICKED_UP_S1 = new SystemMessageId(30);
+	
+	/**
+	 * ID: 31<br>
+	 * Message: You cannot move while sitting.
+	 */
+	public static final SystemMessageId CANT_MOVE_SITTING = new SystemMessageId(31);
+	
+	/**
+	 * ID: 32<br>
+	 * Message: You are unable to engage in combat. Please go to the nearest restart point.
+	 */
+	public static final SystemMessageId UNABLE_COMBAT_PLEASE_GO_RESTART = new SystemMessageId(32);
+	
+	/**
+	 * ID: 33<br>
+	 * Message: You cannot move while casting.
+	 */
+	public static final SystemMessageId CANT_MOVE_CASTING = new SystemMessageId(33);
+	
+	/**
+	 * ID: 34<br>
+	 * Message: Welcome to the World of Lineage II.
+	 */
+	public static final SystemMessageId WELCOME_TO_LINEAGE = new SystemMessageId(34);
+	
+	/**
+	 * ID: 35<br>
+	 * Message: You hit for $s1 damage.
+	 */
+	public static final SystemMessageId YOU_DID_S1_DMG = new SystemMessageId(35);
+	
+	/**
+	 * ID: 36<br>
+	 * Message: $c1 hit you for $s2 damage.
+	 */
+	public static final SystemMessageId C1_GAVE_YOU_S2_DMG = new SystemMessageId(36);
+	
+	/**
+	 * ID: 37<br>
+	 * Message: $c1 hit you for $s2 damage.
+	 */
+	public static final SystemMessageId C1_GAVE_YOU_S2_DMG2 = new SystemMessageId(37);
+	
+	/**
+	 * ID: 41<br>
+	 * Message: You carefully nock an arrow.
+	 */
+	public static final SystemMessageId GETTING_READY_TO_SHOOT_AN_ARROW = new SystemMessageId(41);
+	
+	/**
+	 * ID: 42<br>
+	 * Message: You have avoided $c1's attack.
+	 */
+	public static final SystemMessageId AVOIDED_C1_ATTACK = new SystemMessageId(42);
+	
+	/**
+	 * ID: 43<br>
+	 * Message: You have missed.
+	 */
+	public static final SystemMessageId MISSED_TARGET = new SystemMessageId(43);
+	
+	/**
+	 * ID: 44<br>
+	 * Message: Critical hit!
+	 */
+	public static final SystemMessageId CRITICAL_HIT = new SystemMessageId(44);
+	
+	/**
+	 * ID: 45<br>
+	 * Message: You have earned $s1 experience.
+	 */
+	public static final SystemMessageId EARNED_S1_EXPERIENCE = new SystemMessageId(45);
+	
+	/**
+	 * ID: 46<br>
+	 * Message: You use $s1.
+	 */
+	public static final SystemMessageId USE_S1 = new SystemMessageId(46);
+	
+	/**
+	 * ID: 47<br>
+	 * Message: You begin to use a(n) $s1.
+	 */
+	public static final SystemMessageId BEGIN_TO_USE_S1 = new SystemMessageId(47);
+	
+	/**
+	 * ID: 48<br>
+	 * Message: $s1 is not available at this time: being prepared for reuse.
+	 */
+	public static final SystemMessageId S1_PREPARED_FOR_REUSE = new SystemMessageId(48);
+	
+	/**
+	 * ID: 49<br>
+	 * Message: You have equipped your $s1.
+	 */
+	public static final SystemMessageId S1_EQUIPPED = new SystemMessageId(49);
+	
+	/**
+	 * ID: 50<br>
+	 * Message: Your target cannot be found.
+	 */
+	public static final SystemMessageId TARGET_CANT_FOUND = new SystemMessageId(50);
+	
+	/**
+	 * ID: 51<br>
+	 * Message: You cannot use this on yourself.
+	 */
+	public static final SystemMessageId CANNOT_USE_ON_YOURSELF = new SystemMessageId(51);
+	
+	/**
+	 * ID: 52<br>
+	 * Message: You have earned $s1 adena.
+	 */
+	public static final SystemMessageId EARNED_S1_ADENA = new SystemMessageId(52);
+	
+	/**
+	 * ID: 53<br>
+	 * Message: You have earned $s2 $s1(s).
+	 */
+	public static final SystemMessageId EARNED_S2_S1_S = new SystemMessageId(53);
+	
+	/**
+	 * ID: 54<br>
+	 * Message: You have earned $s1.
+	 */
+	public static final SystemMessageId EARNED_ITEM_S1 = new SystemMessageId(54);
+	
+	/**
+	 * ID: 55<br>
+	 * Message: You have failed to pick up $s1 adena.
+	 */
+	public static final SystemMessageId FAILED_TO_PICKUP_S1_ADENA = new SystemMessageId(55);
+	
+	/**
+	 * ID: 56<br>
+	 * Message: You have failed to pick up $s1.
+	 */
+	public static final SystemMessageId FAILED_TO_PICKUP_S1 = new SystemMessageId(56);
+	
+	/**
+	 * ID: 57<br>
+	 * Message: You have failed to pick up $s2 $s1(s).
+	 */
+	public static final SystemMessageId FAILED_TO_PICKUP_S2_S1_S = new SystemMessageId(57);
+	
+	/**
+	 * ID: 58<br>
+	 * Message: You have failed to earn $s1 adena.
+	 */
+	public static final SystemMessageId FAILED_TO_EARN_S1_ADENA = new SystemMessageId(58);
+	
+	/**
+	 * ID: 59<br>
+	 * Message: You have failed to earn $s1.
+	 */
+	public static final SystemMessageId FAILED_TO_EARN_S1 = new SystemMessageId(59);
+	
+	/**
+	 * ID: 60<br>
+	 * Message: You have failed to earn $s2 $s1(s).
+	 */
+	public static final SystemMessageId FAILED_TO_EARN_S2_S1_S = new SystemMessageId(60);
+	
+	/**
+	 * ID: 61<br>
+	 * Message: Nothing happened.
+	 */
+	public static final SystemMessageId NOTHING_HAPPENED = new SystemMessageId(61);
+	
+	/**
+	 * ID: 62<br>
+	 * Message: Your $s1 has been successfully enchanted.
+	 */
+	public static final SystemMessageId S1_SUCCESSFULLY_ENCHANTED = new SystemMessageId(62);
+	
+	/**
+	 * ID: 63<br>
+	 * Message: Your +$S1 $S2 has been successfully enchanted.
+	 */
+	public static final SystemMessageId S1_S2_SUCCESSFULLY_ENCHANTED = new SystemMessageId(63);
+	
+	/**
+	 * ID: 64<br>
+	 * Message: The enchantment has failed! Your $s1 has been crystallized.
+	 */
+	public static final SystemMessageId ENCHANTMENT_FAILED_S1_EVAPORATED = new SystemMessageId(64);
+	
+	/**
+	 * ID: 65<br>
+	 * Message: The enchantment has failed! Your +$s1 $s2 has been crystallized.
+	 */
+	public static final SystemMessageId ENCHANTMENT_FAILED_S1_S2_EVAPORATED = new SystemMessageId(65);
+	
+	/**
+	 * ID: 66<br>
+	 * Message: $c1 is inviting you to join a party. Do you accept?
+	 */
+	public static final SystemMessageId C1_INVITED_YOU_TO_PARTY = new SystemMessageId(66);
+	
+	/**
+	 * ID: 67<br>
+	 * Message: $s1 has invited you to join their clan, $s2. Do you wish to join?
+	 */
+	public static final SystemMessageId S1_HAS_INVITED_YOU_TO_JOIN_THE_CLAN_S2 = new SystemMessageId(67);
+	
+	/**
+	 * ID: 68<br>
+	 * Message: Would you like to withdraw from clan $s1? If you leave, you will have to wait at least a day before joining another clan.
+	 */
+	public static final SystemMessageId WOULD_YOU_LIKE_TO_WITHDRAW_FROM_THE_S1_CLAN = new SystemMessageId(68);
+	
+	/**
+	 * ID: 69<br>
+	 * Message: Would you like to dismiss $s1 from the clan? If you do so, you will have to wait at least a day before accepting a new member.
+	 */
+	public static final SystemMessageId WOULD_YOU_LIKE_TO_DISMISS_S1_FROM_THE_CLAN = new SystemMessageId(69);
+	
+	/**
+	 * ID: 70<br>
+	 * Message: Do you wish to disperse the clan, $s1?
+	 */
+	public static final SystemMessageId DO_YOU_WISH_TO_DISPERSE_THE_CLAN_S1 = new SystemMessageId(70);
+	
+	/**
+	 * ID: 71<br>
+	 * Message: How much $s1(s) do you wish to discard?
+	 */
+	public static final SystemMessageId HOW_MANY_S1_DISCARD = new SystemMessageId(71);
+	
+	/**
+	 * ID: 72<br>
+	 * Message: How much $s1(s) do you wish to move?
+	 */
+	public static final SystemMessageId HOW_MANY_S1_MOVE = new SystemMessageId(72);
+	
+	/**
+	 * ID: 73<br>
+	 * Message: How much $s1(s) do you wish to destroy?
+	 */
+	public static final SystemMessageId HOW_MANY_S1_DESTROY = new SystemMessageId(73);
+	
+	/**
+	 * ID: 74<br>
+	 * Message: Do you wish to destroy your $s1?
+	 */
+	public static final SystemMessageId WISH_DESTROY_S1 = new SystemMessageId(74);
+	
+	/**
+	 * ID: 75<br>
+	 * Message: ID does not exist.
+	 */
+	public static final SystemMessageId ID_NOT_EXIST = new SystemMessageId(75);
+	
+	/**
+	 * ID: 76<br>
+	 * Message: Incorrect password.
+	 */
+	public static final SystemMessageId INCORRECT_PASSWORD = new SystemMessageId(76);
+	
+	/**
+	 * ID: 77<br>
+	 * Message: You cannot create another character. Please delete an existing character and try again.
+	 */
+	public static final SystemMessageId CANNOT_CREATE_CHARACTER = new SystemMessageId(77);
+	
+	/**
+	 * ID: 78<br>
+	 * Message: When you delete a character, any items in his/her possession will also be deleted. Do you really wish to delete $s1?
+	 */
+	public static final SystemMessageId WISH_DELETE_S1 = new SystemMessageId(78);
+	
+	/**
+	 * ID: 79<br>
+	 * Message: This name already exists.
+	 */
+	public static final SystemMessageId NAMING_NAME_ALREADY_EXISTS = new SystemMessageId(79);
+	
+	/**
+	 * ID: 80<br>
+	 * Message: Your title cannot exceed 16 characters in length.  Please try again.
+	 */
+	public static final SystemMessageId NAMING_CHARNAME_UP_TO_16CHARS = new SystemMessageId(80);
+	
+	/**
+	 * ID: 81<br>
+	 * Message: Please select your race.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_RACE = new SystemMessageId(81);
+	
+	/**
+	 * ID: 82<br>
+	 * Message: Please select your occupation.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_OCCUPATION = new SystemMessageId(82);
+	
+	/**
+	 * ID: 83<br>
+	 * Message: Please select your gender.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_GENDER = new SystemMessageId(83);
+	
+	/**
+	 * ID: 84<br>
+	 * Message: You may not attack in a peaceful zone.
+	 */
+	public static final SystemMessageId CANT_ATK_PEACEZONE = new SystemMessageId(84);
+	
+	/**
+	 * ID: 85<br>
+	 * Message: You may not attack this target in a peaceful zone.
+	 */
+	public static final SystemMessageId TARGET_IN_PEACEZONE = new SystemMessageId(85);
+	
+	/**
+	 * ID: 86<br>
+	 * Message: Please enter your ID.
+	 */
+	public static final SystemMessageId PLEASE_ENTER_ID = new SystemMessageId(86);
+	
+	/**
+	 * ID: 87<br>
+	 * Message: Please enter your password.
+	 */
+	public static final SystemMessageId PLEASE_ENTER_PASSWORD = new SystemMessageId(87);
+	
+	/**
+	 * ID: 88<br>
+	 * Message: Your protocol version is different, please restart your client and run a full check.
+	 */
+	public static final SystemMessageId WRONG_PROTOCOL_CHECK = new SystemMessageId(88);
+	
+	/**
+	 * ID: 89<br>
+	 * Message: Your protocol version is different, please continue.
+	 */
+	public static final SystemMessageId WRONG_PROTOCOL_CONTINUE = new SystemMessageId(89);
+	
+	/**
+	 * ID: 90<br>
+	 * Message: You are unable to connect to the server.
+	 */
+	public static final SystemMessageId UNABLE_TO_CONNECT = new SystemMessageId(90);
+	
+	/**
+	 * ID: 91<br>
+	 * Message: Please select your hairstyle.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_HAIRSTYLE = new SystemMessageId(91);
+	
+	/**
+	 * ID: 92<br>
+	 * Message: $s1 has worn off.
+	 */
+	public static final SystemMessageId S1_HAS_WORN_OFF = new SystemMessageId(92);
+	
+	/**
+	 * ID: 93<br>
+	 * Message: You do not have enough SP for this.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SP = new SystemMessageId(93);
+	
+	/**
+	 * ID: 94<br>
+	 * Message: 2004-2011 © NC Interactive, Inc. All Rights Reserved.
+	 */
+	public static final SystemMessageId COPYRIGHT = new SystemMessageId(94);
+	
+	/**
+	 * ID: 95<br>
+	 * Message: You have earned $s1 experience and $s2 SP.
+	 */
+	public static final SystemMessageId YOU_EARNED_S1_EXP_AND_S2_SP = new SystemMessageId(95);
+	
+	/**
+	 * ID: 96<br>
+	 * Message: Your level has increased!
+	 */
+	public static final SystemMessageId YOU_INCREASED_YOUR_LEVEL = new SystemMessageId(96);
+	
+	/**
+	 * ID: 97<br>
+	 * Message: This item cannot be moved.
+	 */
+	public static final SystemMessageId CANNOT_MOVE_THIS_ITEM = new SystemMessageId(97);
+	
+	/**
+	 * ID: 98<br>
+	 * Message: This item cannot be discarded.
+	 */
+	public static final SystemMessageId CANNOT_DISCARD_THIS_ITEM = new SystemMessageId(98);
+	
+	/**
+	 * ID: 99<br>
+	 * Message: This item cannot be traded or sold.
+	 */
+	public static final SystemMessageId CANNOT_TRADE_THIS_ITEM = new SystemMessageId(99);
+	
+	/**
+	 * ID: 100<br>
+	 * Message: $c1 is requesting a trade. Do you wish to continue?
+	 */
+	public static final SystemMessageId C1_REQUESTS_TRADE = new SystemMessageId(100);
+	
+	/**
+	 * ID: 101<br>
+	 * Message: You cannot exit the game while in combat.
+	 */
+	public static final SystemMessageId CANT_LOGOUT_WHILE_FIGHTING = new SystemMessageId(101);
+	
+	/**
+	 * ID: 102<br>
+	 * Message: You cannot restart while in combat.
+	 */
+	public static final SystemMessageId CANT_RESTART_WHILE_FIGHTING = new SystemMessageId(102);
+	
+	/**
+	 * ID: 103<br>
+	 * Message: This ID is currently logged in.
+	 */
+	public static final SystemMessageId ID_LOGGED_IN = new SystemMessageId(103);
+	
+	/**
+	 * ID: 104<br>
+	 * Message: You cannot change weapons during an attack.
+	 */
+	public static final SystemMessageId CANNOT_CHANGE_WEAPON_DURING_AN_ATTACK = new SystemMessageId(104);
+	
+	/**
+	 * ID: 105<br>
+	 * Message: $c1 has been invited to the party.
+	 */
+	public static final SystemMessageId C1_INVITED_TO_PARTY = new SystemMessageId(105);
+	
+	/**
+	 * ID: 106<br>
+	 * Message: You have joined $s1's party.
+	 */
+	public static final SystemMessageId YOU_JOINED_S1_PARTY = new SystemMessageId(106);
+	
+	/**
+	 * ID: 107<br>
+	 * Message: $c1 has joined the party.
+	 */
+	public static final SystemMessageId C1_JOINED_PARTY = new SystemMessageId(107);
+	
+	/**
+	 * ID: 108<br>
+	 * Message: $c1 has left the party.
+	 */
+	public static final SystemMessageId C1_LEFT_PARTY = new SystemMessageId(108);
+	
+	/**
+	 * ID: 109<br>
+	 * Message: Invalid target.
+	 */
+	public static final SystemMessageId INCORRECT_TARGET = new SystemMessageId(109);
+	
+	/**
+	 * ID: 110<br>
+	 * Message: $s1’s effect can be felt.
+	 */
+	public static final SystemMessageId YOU_FEEL_S1_EFFECT = new SystemMessageId(110);
+	
+	/**
+	 * ID: 111<br>
+	 * Message: Your shield defense has succeeded.
+	 */
+	public static final SystemMessageId SHIELD_DEFENCE_SUCCESSFULL = new SystemMessageId(111);
+	
+	/**
+	 * ID: 112<br>
+	 * Message: You have run out of arrows.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_ARROWS = new SystemMessageId(112);
+	
+	/**
+	 * ID: 113<br>
+	 * Message: $s1 cannot be used due to unsuitable terms.
+	 */
+	public static final SystemMessageId S1_CANNOT_BE_USED = new SystemMessageId(113);
+	
+	/**
+	 * ID: 114<br>
+	 * Message: You have entered the shadow of the Mother Tree.
+	 */
+	public static final SystemMessageId ENTER_SHADOW_MOTHER_TREE = new SystemMessageId(114);
+	
+	/**
+	 * ID: 115<br>
+	 * Message: You have left the shadow of the Mother Tree.
+	 */
+	public static final SystemMessageId EXIT_SHADOW_MOTHER_TREE = new SystemMessageId(115);
+	
+	/**
+	 * ID: 116<br>
+	 * Message: You have entered a peace zone.
+	 */
+	public static final SystemMessageId ENTER_PEACEFUL_ZONE = new SystemMessageId(116);
+	
+	/**
+	 * ID: 117<br>
+	 * Message: You have left the peace zone.
+	 */
+	public static final SystemMessageId EXIT_PEACEFUL_ZONE = new SystemMessageId(117);
+	
+	/**
+	 * ID: 118<br>
+	 * Message: You have requested a trade with $c1.
+	 */
+	public static final SystemMessageId REQUEST_C1_FOR_TRADE = new SystemMessageId(118);
+	
+	/**
+	 * ID: 119<br>
+	 * Message: $c1 has denied your request to trade.
+	 */
+	public static final SystemMessageId C1_DENIED_TRADE_REQUEST = new SystemMessageId(119);
+	
+	/**
+	 * ID: 120<br>
+	 * Message: You begin trading with $c1.
+	 */
+	public static final SystemMessageId BEGIN_TRADE_WITH_C1 = new SystemMessageId(120);
+	
+	/**
+	 * ID: 121<br>
+	 * Message: $c1 has confirmed the trade.
+	 */
+	public static final SystemMessageId C1_CONFIRMED_TRADE = new SystemMessageId(121);
+	
+	/**
+	 * ID: 122<br>
+	 * Message: You may no longer adjust items in the trade because the trade has been confirmed.
+	 */
+	public static final SystemMessageId CANNOT_ADJUST_ITEMS_AFTER_TRADE_CONFIRMED = new SystemMessageId(122);
+	
+	/**
+	 * ID: 123<br>
+	 * Message: Your trade was successful.
+	 */
+	public static final SystemMessageId TRADE_SUCCESSFUL = new SystemMessageId(123);
+	
+	/**
+	 * ID: 124<br>
+	 * Message: $c1 has cancelled the trade.
+	 */
+	public static final SystemMessageId C1_CANCELED_TRADE = new SystemMessageId(124);
+	
+	/**
+	 * ID: 125<br>
+	 * Message: Do you wish to exit the game?
+	 */
+	public static final SystemMessageId WISH_EXIT_GAME = new SystemMessageId(125);
+	
+	/**
+	 * ID: 126<br>
+	 * Message: Do you wish to exit to the character select screen?
+	 */
+	public static final SystemMessageId WISH_RESTART_GAME = new SystemMessageId(126);
+	
+	/**
+	 * ID: 127<br>
+	 * Message: You have been disconnected from the server. Please login again.
+	 */
+	public static final SystemMessageId DISCONNECTED_FROM_SERVER = new SystemMessageId(127);
+	
+	/**
+	 * ID: 128<br>
+	 * Message: Your character creation has failed.
+	 */
+	public static final SystemMessageId CHARACTER_CREATION_FAILED = new SystemMessageId(128);
+	
+	/**
+	 * ID: 129<br>
+	 * Message: Your inventory is full.
+	 */
+	public static final SystemMessageId SLOTS_FULL = new SystemMessageId(129);
+	
+	/**
+	 * ID: 130<br>
+	 * Message: Your warehouse is full.
+	 */
+	public static final SystemMessageId WAREHOUSE_FULL = new SystemMessageId(130);
+	
+	/**
+	 * ID: 131<br>
+	 * Message: $s1 has logged in.
+	 */
+	public static final SystemMessageId S1_LOGGED_IN = new SystemMessageId(131);
+	
+	/**
+	 * ID: 132<br>
+	 * Message: $s1 has been added to your friends list.
+	 */
+	public static final SystemMessageId S1_ADDED_TO_FRIENDS = new SystemMessageId(132);
+	
+	/**
+	 * ID: 133<br>
+	 * Message: $s1 has been removed from your friends list.
+	 */
+	public static final SystemMessageId S1_REMOVED_FROM_YOUR_FRIENDS_LIST = new SystemMessageId(133);
+	
+	/**
+	 * ID: 134<br>
+	 * Message: Please check your friends list again.
+	 */
+	public static final SystemMessageId PLEACE_CHECK_YOUR_FRIEND_LIST_AGAIN = new SystemMessageId(134);
+	
+	/**
+	 * ID: 135<br>
+	 * Message: $c1 did not reply to your invitation. Your invitation has been cancelled.
+	 */
+	public static final SystemMessageId C1_DID_NOT_REPLY_TO_YOUR_INVITE = new SystemMessageId(135);
+	
+	/**
+	 * ID: 136<br>
+	 * Message: You have not replied to $c1's invitation. The offer has been cancelled.
+	 */
+	public static final SystemMessageId YOU_DID_NOT_REPLY_TO_C1_INVITE = new SystemMessageId(136);
+	
+	/**
+	 * ID: 137<br>
+	 * Message: There are no more items in the shortcut.
+	 */
+	public static final SystemMessageId NO_MORE_ITEMS_SHORTCUT = new SystemMessageId(137);
+	
+	/**
+	 * ID: 138<br>
+	 * Message: Designate shortcut.
+	 */
+	public static final SystemMessageId DESIGNATE_SHORTCUT = new SystemMessageId(138);
+	
+	/**
+	 * ID: 139<br>
+	 * Message: $c1 has resisted your $s2.
+	 */
+	public static final SystemMessageId C1_RESISTED_YOUR_S2 = new SystemMessageId(139);
+	
+	/**
+	 * ID: 140<br>
+	 * Message: Your skill was deactivated due to lack of MP.
+	 */
+	public static final SystemMessageId SKILL_REMOVED_DUE_LACK_MP = new SystemMessageId(140);
+	
+	/**
+	 * ID: 141<br>
+	 * Message: Once a trade is confirmed, the items involved cannot be moved again. If you wish to make a change, cancel the trade and start again.
+	 */
+	public static final SystemMessageId ONCE_THE_TRADE_IS_CONFIRMED_THE_ITEM_CANNOT_BE_MOVED_AGAIN = new SystemMessageId(141);
+	
+	/**
+	 * ID: 142<br>
+	 * Message: You are already trading with someone.
+	 */
+	public static final SystemMessageId ALREADY_TRADING = new SystemMessageId(142);
+	
+	/**
+	 * ID: 143<br>
+	 * Message: $c1 is already trading with another person. Please try again later.
+	 */
+	public static final SystemMessageId C1_ALREADY_TRADING = new SystemMessageId(143);
+	
+	/**
+	 * ID: 144<br>
+	 * Message: That is an incorrect target.
+	 */
+	public static final SystemMessageId TARGET_IS_INCORRECT = new SystemMessageId(144);
+	
+	/**
+	 * ID: 145<br>
+	 * Message: That player is not online.
+	 */
+	public static final SystemMessageId TARGET_IS_NOT_FOUND_IN_THE_GAME = new SystemMessageId(145);
+	
+	/**
+	 * ID: 146<br>
+	 * Message: Chatting is now permitted.
+	 */
+	public static final SystemMessageId CHATTING_PERMITTED = new SystemMessageId(146);
+	
+	/**
+	 * ID: 147<br>
+	 * Message: Chatting is currently prohibited.
+	 */
+	public static final SystemMessageId CHATTING_PROHIBITED = new SystemMessageId(147);
+	
+	/**
+	 * ID: 148<br>
+	 * Message: You cannot use quest items.
+	 */
+	public static final SystemMessageId CANNOT_USE_QUEST_ITEMS = new SystemMessageId(148);
+	
+	/**
+	 * ID: 149<br>
+	 * Message: You cannot pick up or use items while trading.
+	 */
+	public static final SystemMessageId CANNOT_USE_ITEM_WHILE_TRADING = new SystemMessageId(149);
+	
+	/**
+	 * ID: 150<br>
+	 * Message: You cannot discard or destroy an item while trading at a private store.
+	 */
+	public static final SystemMessageId CANNOT_DISCARD_OR_DESTROY_ITEM_WHILE_TRADING = new SystemMessageId(150);
+	
+	/**
+	 * ID: 151<br>
+	 * Message: You cannot discard something that far away from you.
+	 */
+	public static final SystemMessageId CANNOT_DISCARD_DISTANCE_TOO_FAR = new SystemMessageId(151);
+	
+	/**
+	 * ID: 152<br>
+	 * Message: You have invited the wrong target.
+	 */
+	public static final SystemMessageId YOU_HAVE_INVITED_THE_WRONG_TARGET = new SystemMessageId(152);
+	
+	/**
+	 * ID: 153<br>
+	 * Message: $c1 is on another task. Please try again later.
+	 */
+	public static final SystemMessageId C1_IS_BUSY_TRY_LATER = new SystemMessageId(153);
+	
+	/**
+	 * ID: 154<br>
+	 * Message: Only the leader can give out invitations.
+	 */
+	public static final SystemMessageId ONLY_LEADER_CAN_INVITE = new SystemMessageId(154);
+	
+	/**
+	 * ID: 155<br>
+	 * Message: The party is full.
+	 */
+	public static final SystemMessageId PARTY_FULL = new SystemMessageId(155);
+	
+	/**
+	 * ID: 156<br>
+	 * Message: Drain was only 50 percent successful.
+	 */
+	public static final SystemMessageId DRAIN_HALF_SUCCESFUL = new SystemMessageId(156);
+	
+	/**
+	 * ID: 157<br>
+	 * Message: You resisted $c1's drain.
+	 */
+	public static final SystemMessageId RESISTED_C1_DRAIN = new SystemMessageId(157);
+	
+	/**
+	 * ID: 158<br>
+	 * Message: Your attack has failed.
+	 */
+	public static final SystemMessageId ATTACK_FAILED = new SystemMessageId(158);
+	
+	/**
+	 * ID: 159<br>
+	 * Message: You resisted $c1's magic.
+	 */
+	public static final SystemMessageId RESISTED_C1_MAGIC = new SystemMessageId(159);
+	
+	/**
+	 * ID: 160<br>
+	 * Message: $c1 is a member of another party and cannot be invited.
+	 */
+	public static final SystemMessageId C1_IS_ALREADY_IN_PARTY = new SystemMessageId(160);
+	
+	/**
+	 * ID: 161<br>
+	 * Message: That player is not currently online.
+	 */
+	public static final SystemMessageId INVITED_USER_NOT_ONLINE = new SystemMessageId(161);
+	
+	/**
+	 * ID: 162<br>
+	 * Message: You have moved too far away from the warehouse to perform that action.
+	 */
+	public static final SystemMessageId WAREHOUSE_TOO_FAR = new SystemMessageId(162);
+	
+	/**
+	 * ID: 163<br>
+	 * Message: You cannot destroy it because the number is incorrect.
+	 */
+	public static final SystemMessageId CANNOT_DESTROY_NUMBER_INCORRECT = new SystemMessageId(163);
+	
+	/**
+	 * ID: 164<br>
+	 * Message: Waiting for another reply.
+	 */
+	public static final SystemMessageId WAITING_FOR_ANOTHER_REPLY = new SystemMessageId(164);
+	
+	/**
+	 * ID: 165<br>
+	 * Message: You cannot add yourself to your own friend list.
+	 */
+	public static final SystemMessageId YOU_CANNOT_ADD_YOURSELF_TO_OWN_FRIEND_LIST = new SystemMessageId(165);
+	
+	/**
+	 * ID: 166<br>
+	 * Message: Friend list is not ready yet. Please register again later.
+	 */
+	public static final SystemMessageId FRIEND_LIST_NOT_READY_YET_REGISTER_LATER = new SystemMessageId(166);
+	
+	/**
+	 * ID: 167<br>
+	 * Message: $c1 is already on your friend list.
+	 */
+	public static final SystemMessageId C1_ALREADY_ON_FRIEND_LIST = new SystemMessageId(167);
+	
+	/**
+	 * ID: 168<br>
+	 * Message: $c1 has sent a friend request.
+	 */
+	public static final SystemMessageId C1_REQUESTED_TO_BECOME_FRIENDS = new SystemMessageId(168);
+	
+	/**
+	 * ID: 169<br>
+	 * Message: Accept friendship 0/1 (1 to accept, 0 to deny)
+	 */
+	public static final SystemMessageId ACCEPT_THE_FRIENDSHIP = new SystemMessageId(169);
+	
+	/**
+	 * ID: 170<br>
+	 * Message: The user who requested to become friends is not found in the game.
+	 */
+	public static final SystemMessageId THE_USER_YOU_REQUESTED_IS_NOT_IN_GAME = new SystemMessageId(170);
+	
+	/**
+	 * ID: 171<br>
+	 * Message: $c1 is not on your friend list.
+	 */
+	public static final SystemMessageId C1_NOT_ON_YOUR_FRIENDS_LIST = new SystemMessageId(171);
+	
+	/**
+	 * ID: 172<br>
+	 * Message: You lack the funds needed to pay for this transaction.
+	 */
+	public static final SystemMessageId LACK_FUNDS_FOR_TRANSACTION1 = new SystemMessageId(172);
+	
+	/**
+	 * ID: 173<br>
+	 * Message: You lack the funds needed to pay for this transaction.
+	 */
+	public static final SystemMessageId LACK_FUNDS_FOR_TRANSACTION2 = new SystemMessageId(173);
+	
+	/**
+	 * ID: 174<br>
+	 * Message: That person's inventory is full.
+	 */
+	public static final SystemMessageId OTHER_INVENTORY_FULL = new SystemMessageId(174);
+	
+	/**
+	 * ID: 175<br>
+	 * Message: That skill has been de-activated as HP was fully recovered.
+	 */
+	public static final SystemMessageId SKILL_DEACTIVATED_HP_FULL = new SystemMessageId(175);
+	
+	/**
+	 * ID: 176<br>
+	 * Message: That person is in message refusal mode.
+	 */
+	public static final SystemMessageId THE_PERSON_IS_IN_MESSAGE_REFUSAL_MODE = new SystemMessageId(176);
+	
+	/**
+	 * ID: 177<br>
+	 * Message: Message refusal mode.
+	 */
+	public static final SystemMessageId MESSAGE_REFUSAL_MODE = new SystemMessageId(177);
+	
+	/**
+	 * ID: 178<br>
+	 * Message: Message acceptance mode.
+	 */
+	public static final SystemMessageId MESSAGE_ACCEPTANCE_MODE = new SystemMessageId(178);
+	
+	/**
+	 * ID: 179<br>
+	 * Message: You cannot discard those items here.
+	 */
+	public static final SystemMessageId CANT_DISCARD_HERE = new SystemMessageId(179);
+	
+	/**
+	 * ID: 180<br>
+	 * Message: You have $s1 day(s) left until deletion. Do you wish to cancel this action?
+	 */
+	public static final SystemMessageId S1_DAYS_LEFT_CANCEL_ACTION = new SystemMessageId(180);
+	
+	/**
+	 * ID: 181<br>
+	 * Message: Cannot see target.
+	 */
+	public static final SystemMessageId CANT_SEE_TARGET = new SystemMessageId(181);
+	
+	/**
+	 * ID: 182<br>
+	 * Message: Do you wish to stop the currently selected "$s1" quest?
+	 */
+	public static final SystemMessageId WANT_QUIT_CURRENT_QUEST = new SystemMessageId(182);
+	
+	/**
+	 * ID: 183<br>
+	 * Message: There are too many users on the server. Please try again later.
+	 */
+	public static final SystemMessageId TOO_MANY_USERS = new SystemMessageId(183);
+	
+	/**
+	 * ID: 184<br>
+	 * Message: Please try again later.
+	 */
+	public static final SystemMessageId TRY_AGAIN_LATER = new SystemMessageId(184);
+	
+	/**
+	 * ID: 185<br>
+	 * Message: You must first select a user to invite to your party.
+	 */
+	public static final SystemMessageId FIRST_SELECT_USER_TO_INVITE_TO_PARTY = new SystemMessageId(185);
+	
+	/**
+	 * ID: 186<br>
+	 * Message: You must first select a user to invite to your clan.
+	 */
+	public static final SystemMessageId FIRST_SELECT_USER_TO_INVITE_TO_CLAN = new SystemMessageId(186);
+	
+	/**
+	 * ID: 187<br>
+	 * Message: Select user to expel.
+	 */
+	public static final SystemMessageId SELECT_USER_TO_EXPEL = new SystemMessageId(187);
+	
+	/**
+	 * ID: 188<br>
+	 * Message: Please create your clan name.
+	 */
+	public static final SystemMessageId PLEASE_CREATE_CLAN_NAME = new SystemMessageId(188);
+	
+	/**
+	 * ID: 189<br>
+	 * Message: Your clan has been created.
+	 */
+	public static final SystemMessageId CLAN_CREATED = new SystemMessageId(189);
+	
+	/**
+	 * ID: 190<br>
+	 * Message: You have failed to create a clan.
+	 */
+	public static final SystemMessageId FAILED_TO_CREATE_CLAN = new SystemMessageId(190);
+	
+	/**
+	 * ID: 191<br>
+	 * Message: Clan member $s1 has been expelled.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_S1_EXPELLED = new SystemMessageId(191);
+	
+	/**
+	 * ID: 192<br>
+	 * Message: You have failed to expel $s1 from the clan.
+	 */
+	public static final SystemMessageId FAILED_EXPEL_S1 = new SystemMessageId(192);
+	
+	/**
+	 * ID: 193<br>
+	 * Message: Clan has dispersed.
+	 */
+	public static final SystemMessageId CLAN_HAS_DISPERSED = new SystemMessageId(193);
+	
+	/**
+	 * ID: 194<br>
+	 * Message: You have failed to disperse the clan.
+	 */
+	public static final SystemMessageId FAILED_TO_DISPERSE_CLAN = new SystemMessageId(194);
+	
+	/**
+	 * ID: 195<br>
+	 * Message: Entered the clan.
+	 */
+	public static final SystemMessageId ENTERED_THE_CLAN = new SystemMessageId(195);
+	
+	/**
+	 * ID: 196<br>
+	 * Message: $s1 declined your clan invitation.
+	 */
+	public static final SystemMessageId S1_REFUSED_TO_JOIN_CLAN = new SystemMessageId(196);
+	
+	/**
+	 * ID: 197<br>
+	 * Message: You have withdrawn from the clan.
+	 */
+	public static final SystemMessageId YOU_HAVE_WITHDRAWN_FROM_CLAN = new SystemMessageId(197);
+	
+	/**
+	 * ID: 198<br>
+	 * Message: You have failed to withdraw from the $s1 clan.
+	 */
+	public static final SystemMessageId FAILED_TO_WITHDRAW_FROM_S1_CLAN = new SystemMessageId(198);
+	
+	/**
+	 * ID: 199<br>
+	 * Message: You have recently been dismissed from a clan. You are not allowed to join another clan for 24-hours.
+	 */
+	public static final SystemMessageId CLAN_MEMBERSHIP_TERMINATED = new SystemMessageId(199);
+	
+	/**
+	 * ID: 200<br>
+	 * Message: You have withdrawn from the party.
+	 */
+	public static final SystemMessageId YOU_LEFT_PARTY = new SystemMessageId(200);
+	
+	/**
+	 * ID: 201<br>
+	 * Message: $c1 was expelled from the party.
+	 */
+	public static final SystemMessageId C1_WAS_EXPELLED_FROM_PARTY = new SystemMessageId(201);
+	
+	/**
+	 * ID: 202<br>
+	 * Message: You have been expelled from the party.
+	 */
+	public static final SystemMessageId HAVE_BEEN_EXPELLED_FROM_PARTY = new SystemMessageId(202);
+	
+	/**
+	 * ID: 203<br>
+	 * Message: The party has dispersed.
+	 */
+	public static final SystemMessageId PARTY_DISPERSED = new SystemMessageId(203);
+	
+	/**
+	 * ID: 204<br>
+	 * Message: Incorrect name. Please try again.
+	 */
+	public static final SystemMessageId INCORRECT_NAME_TRY_AGAIN = new SystemMessageId(204);
+	
+	/**
+	 * ID: 205<br>
+	 * Message: Incorrect character name. Please try again.
+	 */
+	public static final SystemMessageId INCORRECT_CHARACTER_NAME_TRY_AGAIN = new SystemMessageId(205);
+	
+	/**
+	 * ID: 206<br>
+	 * Message: Please enter the name of the clan you wish to declare war on.
+	 */
+	public static final SystemMessageId ENTER_CLAN_NAME_TO_DECLARE_WAR = new SystemMessageId(206);
+	
+	/**
+	 * ID: 207<br>
+	 * Message: $s2 of the clan $s1 requests a declaration of war. Do you accept?
+	 */
+	public static final SystemMessageId S2_OF_THE_CLAN_S1_REQUESTS_WAR = new SystemMessageId(207);
+	
+	/**
+	 * ID: 209<br>
+	 * Message: The size of the image file is inappropriate. Please adjust to 16x12 pixels.
+	 */
+	public static final SystemMessageId THE_SIZE_OF_THE_IMAGE_FILE_IS_INAPPROPRIATE = new SystemMessageId(209);
+	
+	/**
+	 * ID: 212<br>
+	 * Message: You are not a clan member and cannot perform this action.
+	 */
+	public static final SystemMessageId YOU_ARE_NOT_A_CLAN_MEMBER = new SystemMessageId(212);
+	
+	/**
+	 * ID: 213<br>
+	 * Message: Not working. Please try again later.
+	 */
+	public static final SystemMessageId NOT_WORKING_PLEASE_TRY_AGAIN_LATER = new SystemMessageId(213);
+	
+	/**
+	 * ID: 214<br>
+	 * Message: Your title has been changed.
+	 */
+	public static final SystemMessageId TITLE_CHANGED = new SystemMessageId(214);
+	
+	/**
+	 * ID: 215<br>
+	 * Message: War with the $s1 clan has begun.
+	 */
+	public static final SystemMessageId WAR_WITH_THE_S1_CLAN_HAS_BEGUN = new SystemMessageId(215);
+	
+	/**
+	 * ID: 216<br>
+	 * Message: War with the $s1 clan has ended.
+	 */
+	public static final SystemMessageId WAR_WITH_THE_S1_CLAN_HAS_ENDED = new SystemMessageId(216);
+	
+	/**
+	 * ID: 217<br>
+	 * Message: You have won the war over the $s1 clan!
+	 */
+	public static final SystemMessageId YOU_HAVE_WON_THE_WAR_OVER_THE_S1_CLAN = new SystemMessageId(217);
+	
+	/**
+	 * ID: 218<br>
+	 * Message: You have surrendered to the $s1 clan.
+	 */
+	public static final SystemMessageId YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN = new SystemMessageId(218);
+	
+	/**
+	 * ID: 219<br>
+	 * Message: Your clan leader has died. You have been defeated by the $s1 Clan.
+	 */
+	public static final SystemMessageId YOU_WERE_DEFEATED_BY_S1_CLAN = new SystemMessageId(219);
+	
+	/**
+	 * ID: 220<br>
+	 * Message: You have $s1 minute(s) left until the clan war ends.
+	 */
+	public static final SystemMessageId S1_MINUTES_LEFT_UNTIL_CLAN_WAR_ENDS = new SystemMessageId(220);
+	
+	/**
+	 * ID: 221<br>
+	 * Message: The time limit for the clan war is up. War with the $s1 clan is over.
+	 */
+	public static final SystemMessageId CLAN_WAR_WITH_S1_CLAN_HAS_ENDED = new SystemMessageId(221);
+	
+	/**
+	 * ID: 222<br>
+	 * Message: $s1 has joined the clan.
+	 */
+	public static final SystemMessageId S1_HAS_JOINED_CLAN = new SystemMessageId(222);
+	
+	/**
+	 * ID: 223<br>
+	 * Message: $s1 has withdrawn from the clan.
+	 */
+	public static final SystemMessageId S1_HAS_WITHDRAWN_FROM_THE_CLAN = new SystemMessageId(223);
+	
+	/**
+	 * ID: 224<br>
+	 * Message: $s1 did not respond: Invitation to the clan has been cancelled.
+	 */
+	public static final SystemMessageId S1_DID_NOT_RESPOND_TO_CLAN_INVITATION = new SystemMessageId(224);
+	
+	/**
+	 * ID: 225<br>
+	 * Message: You didn't respond to $s1's invitation: joining has been cancelled.
+	 */
+	public static final SystemMessageId YOU_DID_NOT_RESPOND_TO_S1_CLAN_INVITATION = new SystemMessageId(225);
+	
+	/**
+	 * ID: 226<br>
+	 * Message: The $s1 clan did not respond: war proclamation has been refused.
+	 */
+	public static final SystemMessageId S1_CLAN_DID_NOT_RESPOND = new SystemMessageId(226);
+	
+	/**
+	 * ID: 227<br>
+	 * Message: Clan war has been refused because you did not respond to $s1 clan's war proclamation.
+	 */
+	public static final SystemMessageId CLAN_WAR_REFUSED_YOU_DID_NOT_RESPOND_TO_S1 = new SystemMessageId(227);
+	
+	/**
+	 * ID: 228<br>
+	 * Message: Request to end war has been denied.
+	 */
+	public static final SystemMessageId REQUEST_TO_END_WAR_HAS_BEEN_DENIED = new SystemMessageId(228);
+	
+	/**
+	 * ID: 229<br>
+	 * Message: You do not meet the criteria in order to create a clan.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN = new SystemMessageId(229);
+	
+	/**
+	 * ID: 230<br>
+	 * Message: You must wait 10 days before creating a new clan.
+	 */
+	public static final SystemMessageId YOU_MUST_WAIT_XX_DAYS_BEFORE_CREATING_A_NEW_CLAN = new SystemMessageId(230);
+	
+	/**
+	 * ID: 231<br>
+	 * Message: After a clan member is dismissed from a clan, the clan must wait at least a day before accepting a new member.
+	 */
+	public static final SystemMessageId YOU_MUST_WAIT_BEFORE_ACCEPTING_A_NEW_MEMBER = new SystemMessageId(231);
+	
+	/**
+	 * ID: 232<br>
+	 * Message: After leaving or having been dismissed from a clan, you must wait at least a day before joining another clan.
+	 */
+	public static final SystemMessageId YOU_MUST_WAIT_BEFORE_JOINING_ANOTHER_CLAN = new SystemMessageId(232);
+	
+	/**
+	 * ID: 233<br>
+	 * Message: The Academy/Royal Guard/Order of Knights is full and cannot accept new members at this time.
+	 */
+	public static final SystemMessageId SUBCLAN_IS_FULL = new SystemMessageId(233);
+	
+	/**
+	 * ID: 234<br>
+	 * Message: The target must be a clan member.
+	 */
+	public static final SystemMessageId TARGET_MUST_BE_IN_CLAN = new SystemMessageId(234);
+	
+	/**
+	 * ID: 235<br>
+	 * Message: You are not authorized to bestow these rights.
+	 */
+	public static final SystemMessageId NOT_AUTHORIZED_TO_BESTOW_RIGHTS = new SystemMessageId(235);
+	
+	/**
+	 * ID: 236<br>
+	 * Message: Only the clan leader is enabled.
+	 */
+	public static final SystemMessageId ONLY_THE_CLAN_LEADER_IS_ENABLED = new SystemMessageId(236);
+	
+	/**
+	 * ID: 237<br>
+	 * Message: The clan leader could not be found.
+	 */
+	public static final SystemMessageId CLAN_LEADER_NOT_FOUND = new SystemMessageId(237);
+	
+	/**
+	 * ID: 238<br>
+	 * Message: Not joined in any clan.
+	 */
+	public static final SystemMessageId NOT_JOINED_IN_ANY_CLAN = new SystemMessageId(238);
+	
+	/**
+	 * ID: 239<br>
+	 * Message: A clan leader cannot withdraw from their own clan.
+	 */
+	public static final SystemMessageId CLAN_LEADER_CANNOT_WITHDRAW = new SystemMessageId(239);
+	
+	/**
+	 * ID: 240<br>
+	 * Message: You are currently involved in clan war.
+	 */
+	public static final SystemMessageId CURRENTLY_INVOLVED_IN_CLAN_WAR = new SystemMessageId(240);
+	
+	/**
+	 * ID: 241<br>
+	 * Message: Leader of the $s1 Clan is not logged in.
+	 */
+	public static final SystemMessageId LEADER_OF_S1_CLAN_NOT_FOUND = new SystemMessageId(241);
+	
+	/**
+	 * ID: 242<br>
+	 * Message: Select target.
+	 */
+	public static final SystemMessageId SELECT_TARGET = new SystemMessageId(242);
+	
+	/**
+	 * ID: 243<br>
+	 * Message: You cannot declare war on an allied clan.
+	 */
+	public static final SystemMessageId CANNOT_DECLARE_WAR_ON_ALLIED_CLAN = new SystemMessageId(243);
+	
+	/**
+	 * ID: 244<br>
+	 * Message: You are not allowed to issue this challenge.
+	 */
+	public static final SystemMessageId NOT_ALLOWED_TO_CHALLENGE = new SystemMessageId(244);
+	
+	/**
+	 * ID: 245<br>
+	 * Message: It has not been 5 days since you refused a clan war. Do you wish to continue?
+	 */
+	public static final SystemMessageId FIVE_DAYS_NOT_PASSED_SINCE_REFUSED_WAR = new SystemMessageId(245);
+	
+	/**
+	 * ID: 246<br>
+	 * Message: That clan is currently at war.
+	 */
+	public static final SystemMessageId CLAN_CURRENTLY_AT_WAR = new SystemMessageId(246);
+	
+	/**
+	 * ID: 247<br>
+	 * Message: You have already been at war with the $s1 clan: 5 days must pass before you can challenge this clan again.
+	 */
+	public static final SystemMessageId FIVE_DAYS_MUST_PASS_BEFORE_CHALLENGE_AGAIN = new SystemMessageId(247);
+	
+	/**
+	 * ID: 248<br>
+	 * Message: You cannot proclaim war: the $s1 clan does not have enough members.
+	 */
+	public static final SystemMessageId S1_CLAN_NOT_ENOUGH_MEMBERS_FOR_WAR = new SystemMessageId(248);
+	
+	/**
+	 * ID: 249<br>
+	 * Message: Do you wish to surrender to clan $s1?
+	 */
+	public static final SystemMessageId WISH_SURRENDER_TO_S1_CLAN = new SystemMessageId(249);
+	
+	/**
+	 * ID: 250<br>
+	 * Message: You have personally surrendered to the $s1 clan. You are no longer participating in this clan war.
+	 */
+	public static final SystemMessageId YOU_HAVE_PERSONALLY_SURRENDERED_TO_THE_S1_CLAN = new SystemMessageId(250);
+	
+	/**
+	 * ID: 251<br>
+	 * Message: You cannot proclaim war: you are at war with another clan.
+	 */
+	public static final SystemMessageId ALREADY_AT_WAR_WITH_ANOTHER_CLAN = new SystemMessageId(251);
+	
+	/**
+	 * ID: 252<br>
+	 * Message: Enter the name of the clan you wish to surrender to.
+	 */
+	public static final SystemMessageId ENTER_CLAN_NAME_TO_SURRENDER_TO = new SystemMessageId(252);
+	
+	/**
+	 * ID: 253<br>
+	 * Message: Enter the name of the clan you wish to end the war with.
+	 */
+	public static final SystemMessageId ENTER_CLAN_NAME_TO_END_WAR = new SystemMessageId(253);
+	
+	/**
+	 * ID: 254<br>
+	 * Message: A clan leader cannot personally surrender.
+	 */
+	public static final SystemMessageId LEADER_CANT_PERSONALLY_SURRENDER = new SystemMessageId(254);
+	
+	/**
+	 * ID: 255<br>
+	 * Message: The $s1 Clan has requested to end war. Do you agree?
+	 */
+	public static final SystemMessageId S1_CLAN_REQUESTED_END_WAR = new SystemMessageId(255);
+	
+	/**
+	 * ID: 256<br>
+	 * Message: Enter Title
+	 */
+	public static final SystemMessageId ENTER_TITLE = new SystemMessageId(256);
+	
+	/**
+	 * ID: 257<br>
+	 * Message: Do you offer the $s1 clan a proposal to end the war?
+	 */
+	public static final SystemMessageId DO_YOU_OFFER_S1_CLAN_END_WAR = new SystemMessageId(257);
+	
+	/**
+	 * ID: 258<br>
+	 * Message: You are not involved in a clan war.
+	 */
+	public static final SystemMessageId NOT_INVOLVED_CLAN_WAR = new SystemMessageId(258);
+	
+	/**
+	 * ID: 259<br>
+	 * Message: Select clan members from list.
+	 */
+	public static final SystemMessageId SELECT_MEMBERS_FROM_LIST = new SystemMessageId(259);
+	
+	/**
+	 * ID: 260<br>
+	 * Message: The clan reputation score was reduced because it hasn't been 5 days since refusing a clan war.
+	 */
+	public static final SystemMessageId FIVE_DAYS_NOT_PASSED_SINCE_YOU_WERE_REFUSED_WAR = new SystemMessageId(260);
+	
+	/**
+	 * ID: 261<br>
+	 * Message: Clan name is invalid.
+	 */
+	public static final SystemMessageId CLAN_NAME_INCORRECT = new SystemMessageId(261);
+	
+	/**
+	 * ID: 262<br>
+	 * Message: Clan name's length is incorrect.
+	 */
+	public static final SystemMessageId CLAN_NAME_TOO_LONG = new SystemMessageId(262);
+	
+	/**
+	 * ID: 263<br>
+	 * Message: You have already requested the dissolution of your clan.
+	 */
+	public static final SystemMessageId DISSOLUTION_IN_PROGRESS = new SystemMessageId(263);
+	
+	/**
+	 * ID: 264<br>
+	 * Message: You cannot dissolve a clan while engaged in a war.
+	 */
+	public static final SystemMessageId CANNOT_DISSOLVE_WHILE_IN_WAR = new SystemMessageId(264);
+	
+	/**
+	 * ID: 265<br>
+	 * Message: You cannot dissolve a clan during a siege or while protecting a castle.
+	 */
+	public static final SystemMessageId CANNOT_DISSOLVE_WHILE_IN_SIEGE = new SystemMessageId(265);
+	
+	/**
+	 * ID: 266<br>
+	 * Message: You cannot dissolve a clan while owning a clan hall or castle.
+	 */
+	public static final SystemMessageId CANNOT_DISSOLVE_WHILE_OWNING_CLAN_HALL_OR_CASTLE = new SystemMessageId(266);
+	
+	/**
+	 * ID: 267<br>
+	 * Message: There are no requests to disperse.
+	 */
+	public static final SystemMessageId NO_REQUESTS_TO_DISPERSE = new SystemMessageId(267);
+	
+	/**
+	 * ID: 268<br>
+	 * Message: That player already belongs to another clan.
+	 */
+	public static final SystemMessageId PLAYER_ALREADY_ANOTHER_CLAN = new SystemMessageId(268);
+	
+	/**
+	 * ID: 269<br>
+	 * Message: You cannot dismiss yourself.
+	 */
+	public static final SystemMessageId YOU_CANNOT_DISMISS_YOURSELF = new SystemMessageId(269);
+	
+	/**
+	 * ID: 270<br>
+	 * Message: You have already surrendered.
+	 */
+	public static final SystemMessageId YOU_HAVE_ALREADY_SURRENDERED = new SystemMessageId(270);
+	
+	/**
+	 * ID: 271<br>
+	 * Message: A player can only be granted a title if the clan is level 3 or above.
+	 */
+	public static final SystemMessageId CLAN_LVL_3_NEEDED_TO_ENDOWE_TITLE = new SystemMessageId(271);
+	
+	/**
+	 * ID: 272<br>
+	 * Message: A clan crest can only be registered when the clan's skill level is 3 or above.
+	 */
+	public static final SystemMessageId CLAN_LVL_3_NEEDED_TO_SET_CREST = new SystemMessageId(272);
+	
+	/**
+	 * ID: 273<br>
+	 * Message: A clan war can only be declared when a clan's level is 3 or above.
+	 */
+	public static final SystemMessageId CLAN_LVL_3_NEEDED_TO_DECLARE_WAR = new SystemMessageId(273);
+	
+	/**
+	 * ID: 274<br>
+	 * Message: Your clan's level has increased.
+	 */
+	public static final SystemMessageId CLAN_LEVEL_INCREASED = new SystemMessageId(274);
+	
+	/**
+	 * ID: 275<br>
+	 * Message: The clan has failed to increase its level.
+	 */
+	public static final SystemMessageId CLAN_LEVEL_INCREASE_FAILED = new SystemMessageId(275);
+	
+	/**
+	 * ID: 276<br>
+	 * Message: You do not have the necessary materials or prerequisites to learn this skill.
+	 */
+	public static final SystemMessageId ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL = new SystemMessageId(276);
+	
+	/**
+	 * ID: 277<br>
+	 * Message: You have earned $s1.
+	 */
+	public static final SystemMessageId LEARNED_SKILL_S1 = new SystemMessageId(277);
+	
+	/**
+	 * ID: 278<br>
+	 * Message: You do not have enough SP to learn this skill.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SP_TO_LEARN_SKILL = new SystemMessageId(278);
+	
+	/**
+	 * ID: 279<br>
+	 * Message: You do not have enough adena.
+	 */
+	public static final SystemMessageId YOU_NOT_ENOUGH_ADENA = new SystemMessageId(279);
+	
+	/**
+	 * ID: 280<br>
+	 * Message: You do not have any items to sell.
+	 */
+	public static final SystemMessageId NO_ITEMS_TO_SELL = new SystemMessageId(280);
+	
+	/**
+	 * ID: 281<br>
+	 * Message: You do not have enough adena to pay the fee.
+	 */
+	public static final SystemMessageId YOU_NOT_ENOUGH_ADENA_PAY_FEE = new SystemMessageId(281);
+	
+	/**
+	 * ID: 282<br>
+	 * Message: You have not deposited any items in your warehouse.
+	 */
+	public static final SystemMessageId NO_ITEM_DEPOSITED_IN_WH = new SystemMessageId(282);
+	
+	/**
+	 * ID: 283<br>
+	 * Message: You have entered a combat zone.
+	 */
+	public static final SystemMessageId ENTERED_COMBAT_ZONE = new SystemMessageId(283);
+	
+	/**
+	 * ID: 284<br>
+	 * Message: You have left a combat zone.
+	 */
+	public static final SystemMessageId LEFT_COMBAT_ZONE = new SystemMessageId(284);
+	
+	/**
+	 * ID: 285<br>
+	 * Message: Clan $s1 has successfully engraved the holy artifact!
+	 */
+	public static final SystemMessageId CLAN_S1_ENGRAVED_RULER = new SystemMessageId(285);
+	
+	/**
+	 * ID: 286<br>
+	 * Message: Your base is being attacked.
+	 */
+	public static final SystemMessageId BASE_UNDER_ATTACK = new SystemMessageId(286);
+	
+	/**
+	 * ID: 287<br>
+	 * Message: The opposing clan has started to engrave the holy artifact!
+	 */
+	public static final SystemMessageId OPPONENT_STARTED_ENGRAVING = new SystemMessageId(287);
+	
+	/**
+	 * ID: 288<br>
+	 * Message: The castle gate has been destroyed.
+	 */
+	public static final SystemMessageId CASTLE_GATE_BROKEN_DOWN = new SystemMessageId(288);
+	
+	/**
+	 * ID: 289<br>
+	 * Message: An outpost or headquarters cannot be built because one already exists.
+	 */
+	public static final SystemMessageId NOT_ANOTHER_HEADQUARTERS = new SystemMessageId(289);
+	
+	/**
+	 * ID: 290<br>
+	 * Message: You cannot set up a base here.
+	 */
+	public static final SystemMessageId NOT_SET_UP_BASE_HERE = new SystemMessageId(290);
+	
+	/**
+	 * ID: 291<br>
+	 * Message: Clan $s1 is victorious over $s2's castle siege!
+	 */
+	public static final SystemMessageId CLAN_S1_VICTORIOUS_OVER_S2_S_SIEGE = new SystemMessageId(291);
+	
+	/**
+	 * ID: 292<br>
+	 * Message: $s1 has announced the next castle siege time.
+	 */
+	public static final SystemMessageId S1_ANNOUNCED_SIEGE_TIME = new SystemMessageId(292);
+	
+	/**
+	 * ID: 293<br>
+	 * Message: The registration term for $s1 has ended.
+	 */
+	public static final SystemMessageId REGISTRATION_TERM_FOR_S1_ENDED = new SystemMessageId(293);
+	
+	/**
+	 * ID: 294<br>
+	 * Message: You cannot summon the encampment because you are not a member of the siege clan involved in the castle / fortress / hideout siege.
+	 */
+	public static final SystemMessageId BECAUSE_YOUR_CLAN_IS_NOT_CURRENTLY_ON_THE_OFFENSIVE_IN_A_CLAN_HALL_SIEGE_WAR_IT_CANNOT_SUMMON_ITS_BASE_CAMP = new SystemMessageId(294);
+	
+	/**
+	 * ID: 295<br>
+	 * Message: $s1's siege was canceled because there were no clans that participated.
+	 */
+	public static final SystemMessageId S1_SIEGE_WAS_CANCELED_BECAUSE_NO_CLANS_PARTICIPATED = new SystemMessageId(295);
+	
+	/**
+	 * ID: 296<br>
+	 * Message: You received $s1 falling damage.
+	 */
+	public static final SystemMessageId FALL_DAMAGE_S1 = new SystemMessageId(296);
+	
+	/**
+	 * ID: 297<br>
+	 * Message: You have taken $s1 damage because you were unable to breathe.
+	 */
+	public static final SystemMessageId DROWN_DAMAGE_S1 = new SystemMessageId(297);
+	
+	/**
+	 * ID: 298<br>
+	 * Message: You have dropped $s1.
+	 */
+	public static final SystemMessageId YOU_DROPPED_S1 = new SystemMessageId(298);
+	
+	/**
+	 * ID: 299<br>
+	 * Message: $c1 has obtained $s3 $s2.
+	 */
+	public static final SystemMessageId C1_OBTAINED_S3_S2 = new SystemMessageId(299);
+	
+	/**
+	 * ID: 300<br>
+	 * Message: $c1 has obtained $s2.
+	 */
+	public static final SystemMessageId C1_OBTAINED_S2 = new SystemMessageId(300);
+	
+	/**
+	 * ID: 301<br>
+	 * Message: $s2 $s1 has disappeared.
+	 */
+	public static final SystemMessageId S2_S1_DISAPPEARED = new SystemMessageId(301);
+	
+	/**
+	 * ID: 302<br>
+	 * Message: $s1 has disappeared.
+	 */
+	public static final SystemMessageId S1_DISAPPEARED = new SystemMessageId(302);
+	
+	/**
+	 * ID: 303<br>
+	 * Message: Select item to enchant.
+	 */
+	public static final SystemMessageId SELECT_ITEM_TO_ENCHANT = new SystemMessageId(303);
+	
+	/**
+	 * ID: 304<br>
+	 * Message: Clan member $s1 has logged into game.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_S1_LOGGED_IN = new SystemMessageId(304);
+	
+	/**
+	 * ID: 305<br>
+	 * Message: The player declined to join your party.
+	 */
+	public static final SystemMessageId PLAYER_DECLINED = new SystemMessageId(305);
+	
+	/**
+	 * ID: 306<br>
+	 * Message: You have failed to delete the character.
+	 */
+	public static final SystemMessageId FAILED_TO_DELETE_CHAR = new SystemMessageId(306);
+	
+	/**
+	 * ID: 307<br>
+	 * Message: You cannot trade with a warehouse keeper.
+	 */
+	public static final SystemMessageId CANNOT_TRADE_WAREHOUSE_KEEPER = new SystemMessageId(307);
+	
+	/**
+	 * ID: 308<br>
+	 * Message: The player declined your clan invitation.
+	 */
+	public static final SystemMessageId PLAYER_DECLINED_CLAN_INVITATION = new SystemMessageId(308);
+	
+	/**
+	 * ID: 309<br>
+	 * Message: You have succeeded in expelling the clan member.
+	 */
+	public static final SystemMessageId YOU_HAVE_SUCCEEDED_IN_EXPELLING_CLAN_MEMBER = new SystemMessageId(309);
+	
+	/**
+	 * ID: 310<br>
+	 * Message: You have failed to expel the clan member.
+	 */
+	public static final SystemMessageId FAILED_TO_EXPEL_CLAN_MEMBER = new SystemMessageId(310);
+	
+	/**
+	 * ID: 311<br>
+	 * Message: The clan war declaration has been accepted.
+	 */
+	public static final SystemMessageId CLAN_WAR_DECLARATION_ACCEPTED = new SystemMessageId(311);
+	
+	/**
+	 * ID: 312<br>
+	 * Message: The clan war declaration has been refused.
+	 */
+	public static final SystemMessageId CLAN_WAR_DECLARATION_REFUSED = new SystemMessageId(312);
+	
+	/**
+	 * ID: 313<br>
+	 * Message: The cease war request has been accepted.
+	 */
+	public static final SystemMessageId CEASE_WAR_REQUEST_ACCEPTED = new SystemMessageId(313);
+	
+	/**
+	 * ID: 314<br>
+	 * Message: You have failed to surrender.
+	 */
+	public static final SystemMessageId FAILED_TO_SURRENDER = new SystemMessageId(314);
+	
+	/**
+	 * ID: 315<br>
+	 * Message: You have failed to personally surrender.
+	 */
+	public static final SystemMessageId FAILED_TO_PERSONALLY_SURRENDER = new SystemMessageId(315);
+	
+	/**
+	 * ID: 316<br>
+	 * Message: You have failed to withdraw from the party.
+	 */
+	public static final SystemMessageId FAILED_TO_WITHDRAW_FROM_THE_PARTY = new SystemMessageId(316);
+	
+	/**
+	 * ID: 317<br>
+	 * Message: You have failed to expel the party member.
+	 */
+	public static final SystemMessageId FAILED_TO_EXPEL_THE_PARTY_MEMBER = new SystemMessageId(317);
+	
+	/**
+	 * ID: 318<br>
+	 * Message: You have failed to disperse the party.
+	 */
+	public static final SystemMessageId FAILED_TO_DISPERSE_THE_PARTY = new SystemMessageId(318);
+	
+	/**
+	 * ID: 319<br>
+	 * Message: This door cannot be unlocked.
+	 */
+	public static final SystemMessageId UNABLE_TO_UNLOCK_DOOR = new SystemMessageId(319);
+	
+	/**
+	 * ID: 320<br>
+	 * Message: You have failed to unlock the door.
+	 */
+	public static final SystemMessageId FAILED_TO_UNLOCK_DOOR = new SystemMessageId(320);
+	
+	/**
+	 * ID: 321<br>
+	 * Message: It is not locked.
+	 */
+	public static final SystemMessageId ITS_NOT_LOCKED = new SystemMessageId(321);
+	
+	/**
+	 * ID: 322<br>
+	 * Message: Please decide on the sales price.
+	 */
+	public static final SystemMessageId DECIDE_SALES_PRICE = new SystemMessageId(322);
+	
+	/**
+	 * ID: 323<br>
+	 * Message: Your force has increased to level $s1.
+	 */
+	public static final SystemMessageId FORCE_INCREASED_TO_S1 = new SystemMessageId(323);
+	
+	/**
+	 * ID: 324<br>
+	 * Message: Your force has reached maximum capacity.
+	 */
+	public static final SystemMessageId FORCE_MAXLEVEL_REACHED = new SystemMessageId(324);
+	
+	/**
+	 * ID: 325<br>
+	 * Message: The corpse has already disappeared.
+	 */
+	public static final SystemMessageId CORPSE_ALREADY_DISAPPEARED = new SystemMessageId(325);
+	
+	/**
+	 * ID: 326<br>
+	 * Message: Select target from list.
+	 */
+	public static final SystemMessageId SELECT_TARGET_FROM_LIST = new SystemMessageId(326);
+	
+	/**
+	 * ID: 327<br>
+	 * Message: You cannot exceed 80 characters.
+	 */
+	public static final SystemMessageId CANNOT_EXCEED_80_CHARACTERS = new SystemMessageId(327);
+	
+	/**
+	 * ID: 328<br>
+	 * Message: Please input title using less than 128 characters.
+	 */
+	public static final SystemMessageId PLEASE_INPUT_TITLE_LESS_128_CHARACTERS = new SystemMessageId(328);
+	
+	/**
+	 * ID: 329<br>
+	 * Message: Please input contents using less than 3000 characters.
+	 */
+	public static final SystemMessageId PLEASE_INPUT_CONTENT_LESS_3000_CHARACTERS = new SystemMessageId(329);
+	
+	/**
+	 * ID: 330<br>
+	 * Message: A one-line response may not exceed 128 characters.
+	 */
+	public static final SystemMessageId ONE_LINE_RESPONSE_NOT_EXCEED_128_CHARACTERS = new SystemMessageId(330);
+	
+	/**
+	 * ID: 331<br>
+	 * Message: You have acquired $s1 SP.
+	 */
+	public static final SystemMessageId ACQUIRED_S1_SP = new SystemMessageId(331);
+	
+	/**
+	 * ID: 332<br>
+	 * Message: Do you want to be restored?
+	 */
+	public static final SystemMessageId DO_YOU_WANT_TO_BE_RESTORED = new SystemMessageId(332);
+	
+	/**
+	 * ID: 333<br>
+	 * Message: You have received $s1 damage by Core's barrier.
+	 */
+	public static final SystemMessageId S1_DAMAGE_BY_CORE_BARRIER = new SystemMessageId(333);
+	
+	/**
+	 * ID: 334<br>
+	 * Message: Please enter your private store display message.
+	 */
+	public static final SystemMessageId ENTER_PRIVATE_STORE_MESSAGE = new SystemMessageId(334);
+	
+	/**
+	 * ID: 335<br>
+	 * Message: $s1 has been aborted.
+	 */
+	public static final SystemMessageId S1_HAS_BEEN_ABORTED = new SystemMessageId(335);
+	
+	/**
+	 * ID: 336<br>
+	 * Message: You are attempting to crystallize $s1. Do you wish to continue?
+	 */
+	public static final SystemMessageId WISH_TO_CRYSTALLIZE_S1 = new SystemMessageId(336);
+	
+	/**
+	 * ID: 337<br>
+	 * Message: The soulshot you are attempting to use does not match the grade of your equipped weapon.
+	 */
+	public static final SystemMessageId SOULSHOTS_GRADE_MISMATCH = new SystemMessageId(337);
+	
+	/**
+	 * ID: 338<br>
+	 * Message: You do not have enough soulshots for that.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SOULSHOTS = new SystemMessageId(338);
+	
+	/**
+	 * ID: 339<br>
+	 * Message: Cannot use soulshots.
+	 */
+	public static final SystemMessageId CANNOT_USE_SOULSHOTS = new SystemMessageId(339);
+	
+	/**
+	 * ID: 340<br>
+	 * Message: Your private store is now open for business.
+	 */
+	public static final SystemMessageId PRIVATE_STORE_UNDER_WAY = new SystemMessageId(340);
+	
+	/**
+	 * ID: 341<br>
+	 * Message: You do not have enough materials to perform that action.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_MATERIALS = new SystemMessageId(341);
+	
+	/**
+	 * ID: 342<br>
+	 * Message: Your soulshots are enabled.
+	 */
+	public static final SystemMessageId ENABLED_SOULSHOT = new SystemMessageId(342);
+	
+	/**
+	 * ID: 343<br>
+	 * Message: Sweeper failed, target not spoiled.
+	 */
+	public static final SystemMessageId SWEEPER_FAILED_TARGET_NOT_SPOILED = new SystemMessageId(343);
+	
+	/**
+	 * ID: 344<br>
+	 * Message: Your soulshots are disabled.
+	 */
+	public static final SystemMessageId SOULSHOTS_DISABLED = new SystemMessageId(344);
+	
+	/**
+	 * ID: 345<br>
+	 * Message: Chat enabled.
+	 */
+	public static final SystemMessageId CHAT_ENABLED = new SystemMessageId(345);
+	
+	/**
+	 * ID: 346<br>
+	 * Message: Chat disabled.
+	 */
+	public static final SystemMessageId CHAT_DISABLED = new SystemMessageId(346);
+	
+	/**
+	 * ID: 347<br>
+	 * Message: Incorrect item count.
+	 */
+	public static final SystemMessageId INCORRECT_ITEM_COUNT = new SystemMessageId(347);
+	
+	/**
+	 * ID: 348<br>
+	 * Message: Incorrect item price.
+	 */
+	public static final SystemMessageId INCORRECT_ITEM_PRICE = new SystemMessageId(348);
+	
+	/**
+	 * ID: 349<br>
+	 * Message: Private store already closed.
+	 */
+	public static final SystemMessageId PRIVATE_STORE_ALREADY_CLOSED = new SystemMessageId(349);
+	
+	/**
+	 * ID: 350<br>
+	 * Message: Item out of stock.
+	 */
+	public static final SystemMessageId ITEM_OUT_OF_STOCK = new SystemMessageId(350);
+	
+	/**
+	 * ID: 351<br>
+	 * Message: Incorrect item count.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_ITEMS = new SystemMessageId(351);
+	
+	/**
+	 * ID: 352<br>
+	 * Message: Incorrect item.
+	 */
+	public static final SystemMessageId INCORRECT_ITEM = new SystemMessageId(352);
+	
+	/**
+	 * ID: 353<br>
+	 * Message: Cannot purchase.
+	 */
+	public static final SystemMessageId CANNOT_PURCHASE = new SystemMessageId(353);
+	
+	/**
+	 * ID: 354<br>
+	 * Message: Cancel enchant.
+	 */
+	public static final SystemMessageId CANCEL_ENCHANT = new SystemMessageId(354);
+	
+	/**
+	 * ID: 355<br>
+	 * Message: Inappropriate enchant conditions.
+	 */
+	public static final SystemMessageId INAPPROPRIATE_ENCHANT_CONDITION = new SystemMessageId(355);
+	
+	/**
+	 * ID: 356<br>
+	 * Message: Reject resurrection.
+	 */
+	public static final SystemMessageId REJECT_RESURRECTION = new SystemMessageId(356);
+	
+	/**
+	 * ID: 357<br>
+	 * Message: It has already been spoiled.
+	 */
+	public static final SystemMessageId ALREADY_SPOILED = new SystemMessageId(357);
+	
+	/**
+	 * ID: 358<br>
+	 * Message: $s1 hour(s) until castle siege conclusion.
+	 */
+	public static final SystemMessageId S1_HOURS_UNTIL_SIEGE_CONCLUSION = new SystemMessageId(358);
+	
+	/**
+	 * ID: 359<br>
+	 * Message: $s1 minute(s) until castle siege conclusion.
+	 */
+	public static final SystemMessageId S1_MINUTES_UNTIL_SIEGE_CONCLUSION = new SystemMessageId(359);
+	
+	/**
+	 * ID: 360<br>
+	 * Message: This castle siege will end in $s1 second(s)!
+	 */
+	public static final SystemMessageId CASTLE_SIEGE_S1_SECONDS_LEFT = new SystemMessageId(360);
+	
+	/**
+	 * ID: 361<br>
+	 * Message: Over-hit!
+	 */
+	public static final SystemMessageId OVER_HIT = new SystemMessageId(361);
+	
+	/**
+	 * ID: 362<br>
+	 * Message: You have acquired $s1 bonus experience from a successful over-hit.
+	 */
+	public static final SystemMessageId ACQUIRED_BONUS_EXPERIENCE_THROUGH_OVER_HIT = new SystemMessageId(362);
+	
+	/**
+	 * ID: 363<br>
+	 * Message: Chat available time: $s1 minute.
+	 */
+	public static final SystemMessageId CHAT_AVAILABLE_S1_MINUTE = new SystemMessageId(363);
+	
+	/**
+	 * ID: 364<br>
+	 * Message: Enter user's name to search.
+	 */
+	public static final SystemMessageId ENTER_USER_NAME_TO_SEARCH = new SystemMessageId(364);
+	
+	/**
+	 * ID: 365<br>
+	 * Message: Are you sure?
+	 */
+	public static final SystemMessageId ARE_YOU_SURE = new SystemMessageId(365);
+	
+	/**
+	 * ID: 366<br>
+	 * Message: Please select your hair color.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_HAIR_COLOR = new SystemMessageId(366);
+	
+	/**
+	 * ID: 367<br>
+	 * Message: You cannot remove that clan character at this time.
+	 */
+	public static final SystemMessageId CANNOT_REMOVE_CLAN_CHARACTER = new SystemMessageId(367);
+	
+	/**
+	 * ID: 368<br>
+	 * Message: Equipped +$s1 $s2.
+	 */
+	public static final SystemMessageId S1_S2_EQUIPPED = new SystemMessageId(368);
+	
+	/**
+	 * ID: 369<br>
+	 * Message: You have obtained a +$s1 $s2.
+	 */
+	public static final SystemMessageId YOU_PICKED_UP_A_S1_S2 = new SystemMessageId(369);
+	
+	/**
+	 * ID: 370<br>
+	 * Message: Failed to pick up $s1.
+	 */
+	public static final SystemMessageId FAILED_PICKUP_S1 = new SystemMessageId(370);
+	
+	/**
+	 * ID: 371<br>
+	 * Message: Acquired +$s1 $s2.
+	 */
+	public static final SystemMessageId ACQUIRED_S1_S2 = new SystemMessageId(371);
+	
+	/**
+	 * ID: 372<br>
+	 * Message: Failed to earn $s1.
+	 */
+	public static final SystemMessageId FAILED_EARN_S1 = new SystemMessageId(372);
+	
+	/**
+	 * ID: 373<br>
+	 * Message: You are trying to destroy +$s1 $s2. Do you wish to continue?
+	 */
+	public static final SystemMessageId WISH_DESTROY_S1_S2 = new SystemMessageId(373);
+	
+	/**
+	 * ID: 374<br>
+	 * Message: You are attempting to crystallize +$s1 $s2. Do you wish to continue?
+	 */
+	public static final SystemMessageId WISH_CRYSTALLIZE_S1_S2 = new SystemMessageId(374);
+	
+	/**
+	 * ID: 375<br>
+	 * Message: You have dropped +$s1 $s2.
+	 */
+	public static final SystemMessageId DROPPED_S1_S2 = new SystemMessageId(375);
+	
+	/**
+	 * ID: 376<br>
+	 * Message: $c1 has obtained +$s2$s3.
+	 */
+	public static final SystemMessageId C1_OBTAINED_S2_S3 = new SystemMessageId(376);
+	
+	/**
+	 * ID: 377<br>
+	 * Message: $S1 $S2 disappeared.
+	 */
+	public static final SystemMessageId S1_S2_DISAPPEARED = new SystemMessageId(377);
+	
+	/**
+	 * ID: 378<br>
+	 * Message: $c1 purchased $s2.
+	 */
+	public static final SystemMessageId C1_PURCHASED_S2 = new SystemMessageId(378);
+	
+	/**
+	 * ID: 379<br>
+	 * Message: $c1 purchased +$s2$s3.
+	 */
+	public static final SystemMessageId C1_PURCHASED_S2_S3 = new SystemMessageId(379);
+	
+	/**
+	 * ID: 380<br>
+	 * Message: $c1 purchased $s3 $s2(s).
+	 */
+	public static final SystemMessageId C1_PURCHASED_S3_S2_S = new SystemMessageId(380);
+	
+	/**
+	 * ID: 381<br>
+	 * Message: The game client encountered an error and was unable to connect to the petition server.
+	 */
+	public static final SystemMessageId GAME_CLIENT_UNABLE_TO_CONNECT_TO_PETITION_SERVER = new SystemMessageId(381);
+	
+	/**
+	 * ID: 382<br>
+	 * Message: Currently there are no users that have checked out a GM ID.
+	 */
+	public static final SystemMessageId NO_USERS_CHECKED_OUT_GM_ID = new SystemMessageId(382);
+	
+	/**
+	 * ID: 383<br>
+	 * Message: Request confirmed to end consultation at petition server.
+	 */
+	public static final SystemMessageId REQUEST_CONFIRMED_TO_END_CONSULTATION = new SystemMessageId(383);
+	
+	/**
+	 * ID: 384<br>
+	 * Message: The client is not logged onto the game server.
+	 */
+	public static final SystemMessageId CLIENT_NOT_LOGGED_ONTO_GAME_SERVER = new SystemMessageId(384);
+	
+	/**
+	 * ID: 385<br>
+	 * Message: Request confirmed to begin consultation at petition server.
+	 */
+	public static final SystemMessageId REQUEST_CONFIRMED_TO_BEGIN_CONSULTATION = new SystemMessageId(385);
+	
+	/**
+	 * ID: 386<br>
+	 * Message: The body of your petition must be more than five characters in length.
+	 */
+	public static final SystemMessageId PETITION_MORE_THAN_FIVE_CHARACTERS = new SystemMessageId(386);
+	
+	/**
+	 * ID: 387<br>
+	 * Message: This ends the GM petition consultation. \\nPlease give us feedback on the petition service.
+	 */
+	public static final SystemMessageId THIS_END_THE_PETITION_PLEASE_PROVIDE_FEEDBACK = new SystemMessageId(387);
+	
+	/**
+	 * ID: 388<br>
+	 * Message: Not under petition consultation.
+	 */
+	public static final SystemMessageId NOT_UNDER_PETITION_CONSULTATION = new SystemMessageId(388);
+	
+	/**
+	 * ID: 389<br>
+	 * Message: Your petition application has been accepted. \\n - Receipt No. is $s1.
+	 */
+	public static final SystemMessageId PETITION_ACCEPTED_RECENT_NO_S1 = new SystemMessageId(389);
+	
+	/**
+	 * ID: 390<br>
+	 * Message: You may only submit one petition (active) at a time.
+	 */
+	public static final SystemMessageId ONLY_ONE_ACTIVE_PETITION_AT_TIME = new SystemMessageId(390);
+	
+	/**
+	 * ID: 391<br>
+	 * Message: Receipt No. $s1: petition cancelled.
+	 */
+	public static final SystemMessageId RECENT_NO_S1_CANCELED = new SystemMessageId(391);
+	
+	/**
+	 * ID: 392<br>
+	 * Message: Petition underway.
+	 */
+	public static final SystemMessageId UNDER_PETITION_ADVICE = new SystemMessageId(392);
+	
+	/**
+	 * ID: 393<br>
+	 * Message: Failed to cancel petition. Please try again later.
+	 */
+	public static final SystemMessageId FAILED_CANCEL_PETITION_TRY_LATER = new SystemMessageId(393);
+	
+	/**
+	 * ID: 394<br>
+	 * Message: Starting petition consultation with $c1.
+	 */
+	public static final SystemMessageId STARTING_PETITION_WITH_C1 = new SystemMessageId(394);
+	
+	/**
+	 * ID: 395<br>
+	 * Message: Ending petition consultation with $c1.
+	 */
+	public static final SystemMessageId PETITION_ENDED_WITH_C1 = new SystemMessageId(395);
+	
+	/**
+	 * ID: 396<br>
+	 * Message: Please login after changing your temporary password.
+	 */
+	public static final SystemMessageId TRY_AGAIN_AFTER_CHANGING_PASSWORD = new SystemMessageId(396);
+	
+	/**
+	 * ID: 397<br>
+	 * Message: This is not a paid account.
+	 */
+	public static final SystemMessageId NO_PAID_ACCOUNT = new SystemMessageId(397);
+	
+	/**
+	 * ID: 398<br>
+	 * Message: There is no time left on this account.
+	 */
+	public static final SystemMessageId NO_TIME_LEFT_ON_ACCOUNT = new SystemMessageId(398);
+	
+	/**
+	 * ID: 399<br>
+	 * Message: System error.
+	 */
+	public static final SystemMessageId SYSTEM_ERROR = new SystemMessageId(399);
+	
+	/**
+	 * ID: 400<br>
+	 * Message: You are attempting to drop $s1. Do you wish to continue?
+	 */
+	public static final SystemMessageId WISH_TO_DROP_S1 = new SystemMessageId(400);
+	
+	/**
+	 * ID: 401<br>
+	 * Message: You have too many ongoing quests.
+	 */
+	public static final SystemMessageId TOO_MANY_QUESTS = new SystemMessageId(401);
+	
+	/**
+	 * ID: 402<br>
+	 * Message: You do not possess the correct ticket to board the boat.
+	 */
+	public static final SystemMessageId NOT_CORRECT_BOAT_TICKET = new SystemMessageId(402);
+	
+	/**
+	 * ID: 403<br>
+	 * Message: You have exceeded your out-of-pocket adena limit.
+	 */
+	public static final SystemMessageId EXCEECED_POCKET_ADENA_LIMIT = new SystemMessageId(403);
+	
+	/**
+	 * ID: 404<br>
+	 * Message: Your Create Item level is too low to register this recipe.
+	 */
+	public static final SystemMessageId CREATE_LVL_TOO_LOW_TO_REGISTER = new SystemMessageId(404);
+	
+	/**
+	 * ID: 405<br>
+	 * Message: The total price of the product is too high.
+	 */
+	public static final SystemMessageId TOTAL_PRICE_TOO_HIGH = new SystemMessageId(405);
+	
+	/**
+	 * ID: 406<br>
+	 * Message: Petition application accepted.
+	 */
+	public static final SystemMessageId PETITION_APP_ACCEPTED = new SystemMessageId(406);
+	
+	/**
+	 * ID: 407<br>
+	 * Message: Your petition is being processed.
+	 */
+	public static final SystemMessageId PETITION_UNDER_PROCESS = new SystemMessageId(407);
+	
+	/**
+	 * ID: 408<br>
+	 * Message: Set Period
+	 */
+	public static final SystemMessageId SET_PERIOD = new SystemMessageId(408);
+	
+	/**
+	 * ID: 409<br>
+	 * Message: Set Time-$s1: $s2: $s3
+	 */
+	public static final SystemMessageId SET_TIME_S1_S2_S3 = new SystemMessageId(409);
+	
+	/**
+	 * ID: 410<br>
+	 * Message: Registration Period
+	 */
+	public static final SystemMessageId REGISTRATION_PERIOD = new SystemMessageId(410);
+	
+	/**
+	 * ID: 411<br>
+	 * Message: Registration TIme-$s1: $s2: $s3
+	 */
+	public static final SystemMessageId REGISTRATION_TIME_S1_S2_S3 = new SystemMessageId(411);
+	
+	/**
+	 * ID: 412<br>
+	 * Message: Battle begins in $s1: $s2: $s4
+	 */
+	public static final SystemMessageId BATTLE_BEGINS_S1_S2_S3 = new SystemMessageId(412);
+	
+	/**
+	 * ID: 413<br>
+	 * Message: Battle ends in $s1: $s2: $s5
+	 */
+	public static final SystemMessageId BATTLE_ENDS_S1_S2_S3 = new SystemMessageId(413);
+	
+	/**
+	 * ID: 414<br>
+	 * Message: Standby
+	 */
+	public static final SystemMessageId STANDBY = new SystemMessageId(414);
+	
+	/**
+	 * ID: 415<br>
+	 * Message: Siege is underway
+	 */
+	public static final SystemMessageId UNDER_SIEGE = new SystemMessageId(415);
+	
+	/**
+	 * ID: 416<br>
+	 * Message: This item cannot be exchanged.
+	 */
+	public static final SystemMessageId ITEM_CANNOT_EXCHANGE = new SystemMessageId(416);
+	
+	/**
+	 * ID: 417<br>
+	 * Message: $s1 has been disarmed.
+	 */
+	public static final SystemMessageId S1_DISARMED = new SystemMessageId(417);
+	
+	/**
+	 * ID: 419<br>
+	 * Message: $s1 minute(s) of usage time left.
+	 */
+	public static final SystemMessageId S1_MINUTES_USAGE_LEFT = new SystemMessageId(419);
+	
+	/**
+	 * ID: 420<br>
+	 * Message: Time expired.
+	 */
+	public static final SystemMessageId TIME_EXPIRED = new SystemMessageId(420);
+	
+	/**
+	 * ID: 421<br>
+	 * Message: Another person has logged in with the same account.
+	 */
+	public static final SystemMessageId ANOTHER_LOGIN_WITH_ACCOUNT = new SystemMessageId(421);
+	
+	/**
+	 * ID: 422<br>
+	 * Message: You have exceeded the weight limit.
+	 */
+	public static final SystemMessageId WEIGHT_LIMIT_EXCEEDED = new SystemMessageId(422);
+	
+	/**
+	 * ID: 423<br>
+	 * Message: You have cancelled the enchanting process.
+	 */
+	public static final SystemMessageId ENCHANT_SCROLL_CANCELLED = new SystemMessageId(423);
+	
+	/**
+	 * ID: 424<br>
+	 * Message: Does not fit strengthening conditions of the scroll.
+	 */
+	public static final SystemMessageId DOES_NOT_FIT_SCROLL_CONDITIONS = new SystemMessageId(424);
+	
+	/**
+	 * ID: 425<br>
+	 * Message: Your Create Item level is too low to register this recipe.
+	 */
+	public static final SystemMessageId CREATE_LVL_TOO_LOW_TO_REGISTER2 = new SystemMessageId(425);
+	
+	/**
+	 * ID: 445<br>
+	 * Message: (Reference Number Regarding Membership Withdrawal Request: $s1)
+	 */
+	public static final SystemMessageId REFERENCE_MEMBERSHIP_WITHDRAWAL_S1 = new SystemMessageId(445);
+	
+	/**
+	 * ID: 447<br>
+	 * Message: .
+	 */
+	public static final SystemMessageId DOT = new SystemMessageId(447);
+	
+	/**
+	 * ID: 448<br>
+	 * Message: There is a system error. Please log in again later.
+	 */
+	public static final SystemMessageId SYSTEM_ERROR_LOGIN_LATER = new SystemMessageId(448);
+	
+	/**
+	 * ID: 449<br>
+	 * Message: The password you have entered is incorrect.
+	 */
+	public static final SystemMessageId PASSWORD_ENTERED_INCORRECT1 = new SystemMessageId(449);
+	
+	/**
+	 * ID: 450<br>
+	 * Message: Confirm your account information and log in again later.
+	 */
+	public static final SystemMessageId CONFIRM_ACCOUNT_LOGIN_LATER = new SystemMessageId(450);
+	
+	/**
+	 * ID: 451<br>
+	 * Message: The password you have entered is incorrect.
+	 */
+	public static final SystemMessageId PASSWORD_ENTERED_INCORRECT2 = new SystemMessageId(451);
+	
+	/**
+	 * ID: 452<br>
+	 * Message: Please confirm your account information and try logging in again.
+	 */
+	public static final SystemMessageId PLEASE_CONFIRM_ACCOUNT_LOGIN_LATER = new SystemMessageId(452);
+	
+	/**
+	 * ID: 453<br>
+	 * Message: Your account information is incorrect.
+	 */
+	public static final SystemMessageId ACCOUNT_INFORMATION_INCORRECT = new SystemMessageId(453);
+	
+	/**
+	 * ID: 455<br>
+	 * Message: Account is already in use. Unable to log in.
+	 */
+	public static final SystemMessageId ACCOUNT_IN_USE = new SystemMessageId(455);
+	
+	/**
+	 * ID: 456<br>
+	 * Message: Lineage II game services may be used by individuals 15 years of age or older except for PvP servers, which may only be used by adults 18 years of age and older. (Korea Only)
+	 */
+	public static final SystemMessageId LINAGE_MINIMUM_AGE = new SystemMessageId(456);
+	
+	/**
+	 * ID: 457<br>
+	 * Message: We are currently undergoing game server maintenance. Please log in again later.
+	 */
+	public static final SystemMessageId SERVER_MAINTENANCE = new SystemMessageId(457);
+	
+	/**
+	 * ID: 458<br>
+	 * Message: Your game time has expired. You can not login.
+	 */
+	public static final SystemMessageId USAGE_TERM_EXPIRED = new SystemMessageId(458);
+	
+	/**
+	 * ID: 460<br>
+	 * Message: either directly from the PlayNC Store or from any leading games retailer.
+	 */
+	public static final SystemMessageId TO_REACTIVATE_YOUR_ACCOUNT = new SystemMessageId(460);
+	
+	/**
+	 * ID: 461<br>
+	 * Message: Access failed.
+	 */
+	public static final SystemMessageId ACCESS_FAILED = new SystemMessageId(461);
+	
+	/**
+	 * ID: 462<br>
+	 * Message: Please try again later.
+	 */
+	public static final SystemMessageId PLEASE_TRY_AGAIN_LATER = new SystemMessageId(462);
+	
+	/**
+	 * ID: 464<br>
+	 * Message: This feature is only available to alliance leaders.
+	 */
+	public static final SystemMessageId FEATURE_ONLY_FOR_ALLIANCE_LEADER = new SystemMessageId(464);
+	
+	/**
+	 * ID: 465<br>
+	 * Message: You are not currently allied with any clans.
+	 */
+	public static final SystemMessageId NO_CURRENT_ALLIANCES = new SystemMessageId(465);
+	
+	/**
+	 * ID: 466<br>
+	 * Message: You have exceeded the limit.
+	 */
+	public static final SystemMessageId YOU_HAVE_EXCEEDED_THE_LIMIT = new SystemMessageId(466);
+	
+	/**
+	 * ID: 467<br>
+	 * Message: You may not accept any clan within a day after expelling another clan.
+	 */
+	public static final SystemMessageId CANT_INVITE_CLAN_WITHIN_1_DAY = new SystemMessageId(467);
+	
+	/**
+	 * ID: 468<br>
+	 * Message: A clan that has withdrawn or been expelled cannot enter into an alliance within one day of withdrawal or expulsion.
+	 */
+	public static final SystemMessageId CANT_ENTER_ALLIANCE_WITHIN_1_DAY = new SystemMessageId(468);
+	
+	/**
+	 * ID: 469<br>
+	 * Message: You may not ally with a clan you are currently at war with. That would be diabolical and treacherous.
+	 */
+	public static final SystemMessageId MAY_NOT_ALLY_CLAN_BATTLE = new SystemMessageId(469);
+	
+	/**
+	 * ID: 470<br>
+	 * Message: Only the clan leader may apply for withdrawal from the alliance.
+	 */
+	public static final SystemMessageId ONLY_CLAN_LEADER_WITHDRAW_ALLY = new SystemMessageId(470);
+	
+	/**
+	 * ID: 471<br>
+	 * Message: Alliance leaders cannot withdraw.
+	 */
+	public static final SystemMessageId ALLIANCE_LEADER_CANT_WITHDRAW = new SystemMessageId(471);
+	
+	/**
+	 * ID: 472<br>
+	 * Message: You cannot expel yourself from the clan.
+	 */
+	public static final SystemMessageId CANNOT_EXPEL_YOURSELF = new SystemMessageId(472);
+	
+	/**
+	 * ID: 473<br>
+	 * Message: Different alliance.
+	 */
+	public static final SystemMessageId DIFFERENT_ALLIANCE = new SystemMessageId(473);
+	
+	/**
+	 * ID: 474<br>
+	 * Message: That clan does not exist.
+	 */
+	public static final SystemMessageId CLAN_DOESNT_EXISTS = new SystemMessageId(474);
+	
+	/**
+	 * ID: 475<br>
+	 * Message: Different alliance.
+	 */
+	public static final SystemMessageId DIFFERENT_ALLIANCE2 = new SystemMessageId(475);
+	
+	/**
+	 * ID: 476<br>
+	 * Message: Please adjust the image size to 8x12.
+	 */
+	public static final SystemMessageId ADJUST_IMAGE_8_12 = new SystemMessageId(476);
+	
+	/**
+	 * ID: 477<br>
+	 * Message: No response. Invitation to join an alliance has been cancelled.
+	 */
+	public static final SystemMessageId NO_RESPONSE_TO_ALLY_INVITATION = new SystemMessageId(477);
+	
+	/**
+	 * ID: 478<br>
+	 * Message: No response. Your entrance to the alliance has been cancelled.
+	 */
+	public static final SystemMessageId YOU_DID_NOT_RESPOND_TO_ALLY_INVITATION = new SystemMessageId(478);
+	
+	/**
+	 * ID: 479<br>
+	 * Message: $s1 has joined as a friend.
+	 */
+	public static final SystemMessageId S1_JOINED_AS_FRIEND = new SystemMessageId(479);
+	
+	/**
+	 * ID: 480<br>
+	 * Message: Please check your friends list.
+	 */
+	public static final SystemMessageId PLEASE_CHECK_YOUR_FRIENDS_LIST = new SystemMessageId(480);
+	
+	/**
+	 * ID: 481<br>
+	 * Message: $s1 has been deleted from your friends list.
+	 */
+	public static final SystemMessageId S1_HAS_BEEN_DELETED_FROM_YOUR_FRIENDS_LIST = new SystemMessageId(481);
+	
+	/**
+	 * ID: 482<br>
+	 * Message: You cannot add yourself to your own friend list.
+	 */
+	public static final SystemMessageId YOU_CANNOT_ADD_YOURSELF_TO_YOUR_OWN_FRIENDS_LIST = new SystemMessageId(482);
+	
+	/**
+	 * ID: 483<br>
+	 * Message: This function is inaccessible right now. Please try again later.
+	 */
+	public static final SystemMessageId FUNCTION_INACCESSIBLE_NOW = new SystemMessageId(483);
+	
+	/**
+	 * ID: 484<br>
+	 * Message: This player is already registered on your friends list.
+	 */
+	public static final SystemMessageId S1_ALREADY_IN_FRIENDS_LIST = new SystemMessageId(484);
+	
+	/**
+	 * ID: 485<br>
+	 * Message: No new friend invitations may be accepted.
+	 */
+	public static final SystemMessageId NO_NEW_INVITATIONS_ACCEPTED = new SystemMessageId(485);
+	
+	/**
+	 * ID: 486<br>
+	 * Message: The following user is not on your friends list.
+	 */
+	public static final SystemMessageId THE_USER_NOT_IN_FRIENDS_LIST = new SystemMessageId(486);
+	
+	/**
+	 * ID: 487<br>
+	 * Message: ======<Friends List>======
+	 */
+	public static final SystemMessageId FRIEND_LIST_HEADER = new SystemMessageId(487);
+	
+	/**
+	 * ID: 488<br>
+	 * Message: $s1 (Currently: Online)
+	 */
+	public static final SystemMessageId S1_ONLINE = new SystemMessageId(488);
+	
+	/**
+	 * ID: 489<br>
+	 * Message: $s1 (Currently: Offline)
+	 */
+	public static final SystemMessageId S1_OFFLINE = new SystemMessageId(489);
+	
+	/**
+	 * ID: 490<br>
+	 * Message: ========================
+	 */
+	public static final SystemMessageId FRIEND_LIST_FOOTER = new SystemMessageId(490);
+	
+	/**
+	 * ID: 491<br>
+	 * Message: =======<Alliance Information>=======
+	 */
+	public static final SystemMessageId ALLIANCE_INFO_HEAD = new SystemMessageId(491);
+	
+	/**
+	 * ID: 492<br>
+	 * Message: Alliance Name: $s1
+	 */
+	public static final SystemMessageId ALLIANCE_NAME_S1 = new SystemMessageId(492);
+	
+	/**
+	 * ID: 493<br>
+	 * Message: Connection: $s1 / Total $s2
+	 */
+	public static final SystemMessageId CONNECTION_S1_TOTAL_S2 = new SystemMessageId(493);
+	
+	/**
+	 * ID: 494<br>
+	 * Message: Alliance Leader: $s2 of $s1
+	 */
+	public static final SystemMessageId ALLIANCE_LEADER_S2_OF_S1 = new SystemMessageId(494);
+	
+	/**
+	 * ID: 495<br>
+	 * Message: Affiliated clans: Total $s1 clan(s)
+	 */
+	public static final SystemMessageId ALLIANCE_CLAN_TOTAL_S1 = new SystemMessageId(495);
+	
+	/**
+	 * ID: 496<br>
+	 * Message: =====<Clan Information>=====
+	 */
+	public static final SystemMessageId CLAN_INFO_HEAD = new SystemMessageId(496);
+	
+	/**
+	 * ID: 497<br>
+	 * Message: Clan Name: $s1
+	 */
+	public static final SystemMessageId CLAN_INFO_NAME_S1 = new SystemMessageId(497);
+	
+	/**
+	 * ID: 498<br>
+	 * Message: Clan Leader: $s1
+	 */
+	public static final SystemMessageId CLAN_INFO_LEADER_S1 = new SystemMessageId(498);
+	
+	/**
+	 * ID: 499<br>
+	 * Message: Clan Level: $s1
+	 */
+	public static final SystemMessageId CLAN_INFO_LEVEL_S1 = new SystemMessageId(499);
+	
+	/**
+	 * ID: 500<br>
+	 * Message: ------------------------
+	 */
+	public static final SystemMessageId CLAN_INFO_SEPARATOR = new SystemMessageId(500);
+	
+	/**
+	 * ID: 501<br>
+	 * Message: ========================
+	 */
+	public static final SystemMessageId CLAN_INFO_FOOT = new SystemMessageId(501);
+	
+	/**
+	 * ID: 502<br>
+	 * Message: You already belong to another alliance.
+	 */
+	public static final SystemMessageId ALREADY_JOINED_ALLIANCE = new SystemMessageId(502);
+	
+	/**
+	 * ID: 503<br>
+	 * Message: Your friend $s1 just logged in.
+	 */
+	public static final SystemMessageId FRIEND_S1_HAS_LOGGED_IN = new SystemMessageId(503);
+	
+	/**
+	 * ID: 504<br>
+	 * Message: Only clan leaders may create alliances.
+	 */
+	public static final SystemMessageId ONLY_CLAN_LEADER_CREATE_ALLIANCE = new SystemMessageId(504);
+	
+	/**
+	 * ID: 505<br>
+	 * Message: You cannot create a new alliance within 1 day of dissolution.
+	 */
+	public static final SystemMessageId CANT_CREATE_ALLIANCE_10_DAYS_DISOLUTION = new SystemMessageId(505);
+	
+	/**
+	 * ID: 506<br>
+	 * Message: Incorrect alliance name. Please try again.
+	 */
+	public static final SystemMessageId INCORRECT_ALLIANCE_NAME = new SystemMessageId(506);
+	
+	/**
+	 * ID: 507<br>
+	 * Message: Incorrect length for an alliance name.
+	 */
+	public static final SystemMessageId INCORRECT_ALLIANCE_NAME_LENGTH = new SystemMessageId(507);
+	
+	/**
+	 * ID: 508<br>
+	 * Message: That alliance name already exists.
+	 */
+	public static final SystemMessageId ALLIANCE_ALREADY_EXISTS = new SystemMessageId(508);
+	
+	/**
+	 * ID: 509<br>
+	 * Message: Unable to proceed. Clan ally is currently registered as an enemy for the siege.
+	 */
+	public static final SystemMessageId CANT_ACCEPT_ALLY_ENEMY_FOR_SIEGE = new SystemMessageId(509);
+	
+	/**
+	 * ID: 510<br>
+	 * Message: You have invited someone to your alliance.
+	 */
+	public static final SystemMessageId YOU_INVITED_FOR_ALLIANCE = new SystemMessageId(510);
+	
+	/**
+	 * ID: 511<br>
+	 * Message: You must first select a user to invite.
+	 */
+	public static final SystemMessageId SELECT_USER_TO_INVITE = new SystemMessageId(511);
+	
+	/**
+	 * ID: 512<br>
+	 * Message: Do you really wish to withdraw from the alliance?
+	 */
+	public static final SystemMessageId DO_YOU_WISH_TO_WITHDRW = new SystemMessageId(512);
+	
+	/**
+	 * ID: 513<br>
+	 * Message: Enter the name of the clan you wish to expel.
+	 */
+	public static final SystemMessageId ENTER_NAME_CLAN_TO_EXPEL = new SystemMessageId(513);
+	
+	/**
+	 * ID: 514<br>
+	 * Message: Do you really wish to dissolve the alliance? You cannot create a new alliance for 1 day.
+	 */
+	public static final SystemMessageId DO_YOU_WISH_TO_DISOLVE = new SystemMessageId(514);
+	
+	/**
+	 * ID: 516<br>
+	 * Message: $s1 has invited you to be their friend.
+	 */
+	public static final SystemMessageId SI_INVITED_YOU_AS_FRIEND = new SystemMessageId(516);
+	
+	/**
+	 * ID: 517<br>
+	 * Message: You have accepted the alliance.
+	 */
+	public static final SystemMessageId YOU_ACCEPTED_ALLIANCE = new SystemMessageId(517);
+	
+	/**
+	 * ID: 518<br>
+	 * Message: You have failed to invite a clan into the alliance.
+	 */
+	public static final SystemMessageId FAILED_TO_INVITE_CLAN_IN_ALLIANCE = new SystemMessageId(518);
+	
+	/**
+	 * ID: 519<br>
+	 * Message: You have withdrawn from the alliance.
+	 */
+	public static final SystemMessageId YOU_HAVE_WITHDRAWN_FROM_ALLIANCE = new SystemMessageId(519);
+	
+	/**
+	 * ID: 520<br>
+	 * Message: You have failed to withdraw from the alliance.
+	 */
+	public static final SystemMessageId YOU_HAVE_FAILED_TO_WITHDRAWN_FROM_ALLIANCE = new SystemMessageId(520);
+	
+	/**
+	 * ID: 521<br>
+	 * Message: You have succeeded in expelling the clan.
+	 */
+	public static final SystemMessageId YOU_HAVE_EXPELED_A_CLAN = new SystemMessageId(521);
+	
+	/**
+	 * ID: 522<br>
+	 * Message: You have failed to expel a clan.
+	 */
+	public static final SystemMessageId FAILED_TO_EXPELED_A_CLAN = new SystemMessageId(522);
+	
+	/**
+	 * ID: 523<br>
+	 * Message: The alliance has been dissolved.
+	 */
+	public static final SystemMessageId ALLIANCE_DISOLVED = new SystemMessageId(523);
+	
+	/**
+	 * ID: 524<br>
+	 * Message: You have failed to dissolve the alliance.
+	 */
+	public static final SystemMessageId FAILED_TO_DISOLVE_ALLIANCE = new SystemMessageId(524);
+	
+	/**
+	 * ID: 525<br>
+	 * Message: That person has been successfully added to your Friend List
+	 */
+	public static final SystemMessageId YOU_HAVE_SUCCEEDED_INVITING_FRIEND = new SystemMessageId(525);
+	
+	/**
+	 * ID: 526<br>
+	 * Message: You have failed to add a friend to your friends list.
+	 */
+	public static final SystemMessageId FAILED_TO_INVITE_A_FRIEND = new SystemMessageId(526);
+	
+	/**
+	 * ID: 527<br>
+	 * Message: $s1 leader, $s2, has requested an alliance.
+	 */
+	public static final SystemMessageId S2_ALLIANCE_LEADER_OF_S1_REQUESTED_ALLIANCE = new SystemMessageId(527);
+	
+	/**
+	 * ID: 530<br>
+	 * Message: Your Spiritshot does not match the weapon's grade.
+	 */
+	public static final SystemMessageId SPIRITSHOTS_GRADE_MISMATCH = new SystemMessageId(530);
+	
+	/**
+	 * ID: 531<br>
+	 * Message: You do not have enough Spiritshot for that.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SPIRITSHOTS = new SystemMessageId(531);
+	
+	/**
+	 * ID: 532<br>
+	 * Message: You may not use Spiritshots.
+	 */
+	public static final SystemMessageId CANNOT_USE_SPIRITSHOTS = new SystemMessageId(532);
+	
+	/**
+	 * ID: 533<br>
+	 * Message: Your spiritshot has been enabled.
+	 */
+	public static final SystemMessageId ENABLED_SPIRITSHOT = new SystemMessageId(533);
+	
+	/**
+	 * ID: 534<br>
+	 * Message: Your spiritshot has been disabled.
+	 */
+	public static final SystemMessageId DISABLED_SPIRITSHOT = new SystemMessageId(534);
+	
+	/**
+	 * ID: 536<br>
+	 * Message: How much adena do you wish to transfer to your Inventory?
+	 */
+	public static final SystemMessageId HOW_MUCH_ADENA_TRANSFER = new SystemMessageId(536);
+	
+	/**
+	 * ID: 537<br>
+	 * Message: How much will you transfer?
+	 */
+	public static final SystemMessageId HOW_MUCH_TRANSFER = new SystemMessageId(537);
+	
+	/**
+	 * ID: 538<br>
+	 * Message: Your SP has decreased by $s1.
+	 */
+	public static final SystemMessageId SP_DECREASED_S1 = new SystemMessageId(538);
+	
+	/**
+	 * ID: 539<br>
+	 * Message: Your Experience has decreased by $s1.
+	 */
+	public static final SystemMessageId EXP_DECREASED_BY_S1 = new SystemMessageId(539);
+	
+	/**
+	 * ID: 540<br>
+	 * Message: Clan leaders may not be deleted. Dissolve the clan first and try again.
+	 */
+	public static final SystemMessageId CLAN_LEADERS_MAY_NOT_BE_DELETED = new SystemMessageId(540);
+	
+	/**
+	 * ID: 541<br>
+	 * Message: You may not delete a clan member. Withdraw from the clan first and try again.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_MAY_NOT_BE_DELETED = new SystemMessageId(541);
+	
+	/**
+	 * ID: 542<br>
+	 * Message: The NPC server is currently down. Pets and servitors cannot be summoned at this time.
+	 */
+	public static final SystemMessageId THE_NPC_SERVER_IS_CURRENTLY_DOWN = new SystemMessageId(542);
+	
+	/**
+	 * ID: 543<br>
+	 * Message: You already have a pet.
+	 */
+	public static final SystemMessageId YOU_ALREADY_HAVE_A_PET = new SystemMessageId(543);
+	
+	/**
+	 * ID: 544<br>
+	 * Message: Your pet cannot carry this item.
+	 */
+	public static final SystemMessageId ITEM_NOT_FOR_PETS = new SystemMessageId(544);
+	
+	/**
+	 * ID: 545<br>
+	 * Message: Your pet cannot carry any more items. Remove some, then try again.
+	 */
+	public static final SystemMessageId YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS = new SystemMessageId(545);
+	
+	/**
+	 * ID: 546<br>
+	 * Message: Your pet cannot carry any more items.
+	 */
+	public static final SystemMessageId UNABLE_TO_PLACE_ITEM_YOUR_PET_IS_TOO_ENCUMBERED = new SystemMessageId(546);
+	
+	/**
+	 * ID: 547<br>
+	 * Message: Summoning your pet…
+	 */
+	public static final SystemMessageId SUMMON_A_PET = new SystemMessageId(547);
+	
+	/**
+	 * ID: 548<br>
+	 * Message: Your pet's name can be up to 8 characters in length.
+	 */
+	public static final SystemMessageId NAMING_PETNAME_UP_TO_8CHARS = new SystemMessageId(548);
+	
+	/**
+	 * ID: 549<br>
+	 * Message: To create an alliance, your clan must be Level 5 or higher.
+	 */
+	public static final SystemMessageId TO_CREATE_AN_ALLY_YOU_CLAN_MUST_BE_LEVEL_5_OR_HIGHER = new SystemMessageId(549);
+	
+	/**
+	 * ID: 550<br>
+	 * Message: As you are currently schedule for clan dissolution, no alliance can be created.
+	 */
+	public static final SystemMessageId YOU_MAY_NOT_CREATE_ALLY_WHILE_DISSOLVING = new SystemMessageId(550);
+	
+	/**
+	 * ID: 551<br>
+	 * Message: As you are currently schedule for clan dissolution, your clan level cannot be increased.
+	 */
+	public static final SystemMessageId CANNOT_RISE_LEVEL_WHILE_DISSOLUTION_IN_PROGRESS = new SystemMessageId(551);
+	
+	/**
+	 * ID: 552<br>
+	 * Message: As you are currently schedule for clan dissolution, you cannot register or delete a Clan Crest.
+	 */
+	public static final SystemMessageId CANNOT_SET_CREST_WHILE_DISSOLUTION_IN_PROGRESS = new SystemMessageId(552);
+	
+	/**
+	 * ID: 553<br>
+	 * Message: The opposing clan has applied for dispersion.
+	 */
+	public static final SystemMessageId OPPOSING_CLAN_APPLIED_DISPERSION = new SystemMessageId(553);
+	
+	/**
+	 * ID: 554<br>
+	 * Message: You cannot disperse the clans in your alliance.
+	 */
+	public static final SystemMessageId CANNOT_DISPERSE_THE_CLANS_IN_ALLY = new SystemMessageId(554);
+	
+	/**
+	 * ID: 555<br>
+	 * Message: You cannot move - you are too encumbered.
+	 */
+	public static final SystemMessageId CANT_MOVE_TOO_ENCUMBERED = new SystemMessageId(555);
+	
+	/**
+	 * ID: 556<br>
+	 * Message: You cannot move in this state.
+	 */
+	public static final SystemMessageId CANT_MOVE_IN_THIS_STATE = new SystemMessageId(556);
+	
+	/**
+	 * ID: 557<br>
+	 * Message: As your pet is currently out, its summoning item cannot be destroyed.
+	 */
+	public static final SystemMessageId PET_SUMMONED_MAY_NOT_DESTROYED = new SystemMessageId(557);
+	
+	/**
+	 * ID: 558<br>
+	 * Message: As your pet is currently summoned, you cannot discard the summoning item.
+	 */
+	public static final SystemMessageId PET_SUMMONED_MAY_NOT_LET_GO = new SystemMessageId(558);
+	
+	/**
+	 * ID: 559<br>
+	 * Message: You have purchased $s2 from $c1.
+	 */
+	public static final SystemMessageId PURCHASED_S2_FROM_C1 = new SystemMessageId(559);
+	
+	/**
+	 * ID: 560<br>
+	 * Message: You have purchased +$s2 $s3 from $c1.
+	 */
+	public static final SystemMessageId PURCHASED_S2_S3_FROM_C1 = new SystemMessageId(560);
+	
+	/**
+	 * ID: 561<br>
+	 * Message: You have purchased $s3 $s2(s) from $c1.
+	 */
+	public static final SystemMessageId PURCHASED_S3_S2_S_FROM_C1 = new SystemMessageId(561);
+	
+	/**
+	 * ID: 562<br>
+	 * Message: You may not crystallize this item. Your crystallization skill level is too low.
+	 */
+	public static final SystemMessageId CRYSTALLIZE_LEVEL_TOO_LOW = new SystemMessageId(562);
+	
+	/**
+	 * ID: 563<br>
+	 * Message: Failed to disable attack target.
+	 */
+	public static final SystemMessageId FAILED_DISABLE_TARGET = new SystemMessageId(563);
+	
+	/**
+	 * ID: 564<br>
+	 * Message: Failed to change attack target.
+	 */
+	public static final SystemMessageId FAILED_CHANGE_TARGET = new SystemMessageId(564);
+	
+	/**
+	 * ID: 565<br>
+	 * Message: You don't have enough luck.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_LUCK = new SystemMessageId(565);
+	
+	/**
+	 * ID: 566<br>
+	 * Message: Your confusion spell failed.
+	 */
+	public static final SystemMessageId CONFUSION_FAILED = new SystemMessageId(566);
+	
+	/**
+	 * ID: 567<br>
+	 * Message: Your fear spell failed.
+	 */
+	public static final SystemMessageId FEAR_FAILED = new SystemMessageId(567);
+	
+	/**
+	 * ID: 568<br>
+	 * Message: Cubic Summoning failed.
+	 */
+	public static final SystemMessageId CUBIC_SUMMONING_FAILED = new SystemMessageId(568);
+	
+	/**
+	 * ID: 572<br>
+	 * Message: Do you accept $c1's party invitation? (Item Distribution: Finders Keepers.)
+	 */
+	public static final SystemMessageId C1_INVITED_YOU_TO_PARTY_FINDERS_KEEPERS = new SystemMessageId(572);
+	
+	/**
+	 * ID: 573<br>
+	 * Message: Do you accept $c1's party invitation? (Item Distribution: Random.)
+	 */
+	public static final SystemMessageId C1_INVITED_YOU_TO_PARTY_RANDOM = new SystemMessageId(573);
+	
+	/**
+	 * ID: 574<br>
+	 * Message: Pets and Servitors are not available at this time.
+	 */
+	public static final SystemMessageId PETS_ARE_NOT_AVAILABLE_AT_THIS_TIME = new SystemMessageId(574);
+	
+	/**
+	 * ID: 575<br>
+	 * Message: How much adena do you wish to transfer to your pet?
+	 */
+	public static final SystemMessageId HOW_MUCH_ADENA_TRANSFER_TO_PET = new SystemMessageId(575);
+	
+	/**
+	 * ID: 576<br>
+	 * Message: How much do you wish to transfer?
+	 */
+	public static final SystemMessageId HOW_MUCH_TRANSFER2 = new SystemMessageId(576);
+	
+	/**
+	 * ID: 577<br>
+	 * Message: You cannot summon during a trade or while using a private store.
+	 */
+	public static final SystemMessageId CANNOT_SUMMON_DURING_TRADE_SHOP = new SystemMessageId(577);
+	
+	/**
+	 * ID: 578<br>
+	 * Message: You cannot summon during combat.
+	 */
+	public static final SystemMessageId YOU_CANNOT_SUMMON_IN_COMBAT = new SystemMessageId(578);
+	
+	/**
+	 * ID: 579<br>
+	 * Message: A pet cannot be unsummoned during battle.
+	 */
+	public static final SystemMessageId PET_CANNOT_SENT_BACK_DURING_BATTLE = new SystemMessageId(579);
+	
+	/**
+	 * ID: 580<br>
+	 * Message: You may not use multiple pets or servitors at the same time.
+	 */
+	public static final SystemMessageId SUMMON_ONLY_ONE = new SystemMessageId(580);
+	
+	/**
+	 * ID: 581<br>
+	 * Message: There is a space in the name.
+	 */
+	public static final SystemMessageId NAMING_THERE_IS_A_SPACE = new SystemMessageId(581);
+	
+	/**
+	 * ID: 582<br>
+	 * Message: Inappropriate character name.
+	 */
+	public static final SystemMessageId NAMING_INAPPROPRIATE_CHARACTER_NAME = new SystemMessageId(582);
+	
+	/**
+	 * ID: 583<br>
+	 * Message: Name includes forbidden words.
+	 */
+	public static final SystemMessageId NAMING_INCLUDES_FORBIDDEN_WORDS = new SystemMessageId(583);
+	
+	/**
+	 * ID: 584<br>
+	 * Message: This is already in use by another pet.
+	 */
+	public static final SystemMessageId NAMING_ALREADY_IN_USE_BY_ANOTHER_PET = new SystemMessageId(584);
+	
+	/**
+	 * ID: 585<br>
+	 * Message: Select the purchasing price
+	 */
+	public static final SystemMessageId DECIDE_ON_PRICE = new SystemMessageId(585);
+	
+	/**
+	 * ID: 586<br>
+	 * Message: Pet items cannot be registered as shortcuts.
+	 */
+	public static final SystemMessageId PET_NO_SHORTCUT = new SystemMessageId(586);
+	
+	/**
+	 * ID: 588<br>
+	 * Message: Your pet's inventory is full.
+	 */
+	public static final SystemMessageId PET_INVENTORY_FULL = new SystemMessageId(588);
+	
+	/**
+	 * ID: 589<br>
+	 * Message: Dead pets cannot be returned to their summoning item.
+	 */
+	public static final SystemMessageId DEAD_PET_CANNOT_BE_RETURNED = new SystemMessageId(589);
+	
+	/**
+	 * ID: 590<br>
+	 * Message: Your pet is dead and any attempt you make to give it something goes unrecognized.
+	 */
+	public static final SystemMessageId CANNOT_GIVE_ITEMS_TO_DEAD_PET = new SystemMessageId(590);
+	
+	/**
+	 * ID: 591<br>
+	 * Message: An invalid character is included in the pet's name.
+	 */
+	public static final SystemMessageId NAMING_PETNAME_CONTAINS_INVALID_CHARS = new SystemMessageId(591);
+	
+	/**
+	 * ID: 592<br>
+	 * Message: Do you wish to dismiss your pet? Dismissing your pet will cause the pet necklace to disappear.
+	 */
+	public static final SystemMessageId WISH_TO_DISMISS_PET = new SystemMessageId(592);
+	
+	/**
+	 * ID: 593<br>
+	 * Message: Starving, grumpy and fed up, your pet has left.
+	 */
+	public static final SystemMessageId STARVING_GRUMPY_AND_FED_UP_YOUR_PET_HAS_LEFT = new SystemMessageId(593);
+	
+	/**
+	 * ID: 594<br>
+	 * Message: You may not restore a hungry pet.
+	 */
+	public static final SystemMessageId YOU_CANNOT_RESTORE_HUNGRY_PETS = new SystemMessageId(594);
+	
+	/**
+	 * ID: 595<br>
+	 * Message: Your pet is very hungry.
+	 */
+	public static final SystemMessageId YOUR_PET_IS_VERY_HUNGRY = new SystemMessageId(595);
+	
+	/**
+	 * ID: 596<br>
+	 * Message: Your pet ate a little, but is still hungry.
+	 */
+	public static final SystemMessageId YOUR_PET_ATE_A_LITTLE_BUT_IS_STILL_HUNGRY = new SystemMessageId(596);
+	
+	/**
+	 * ID: 597<br>
+	 * Message: Your pet is very hungry. Please be careful.
+	 */
+	public static final SystemMessageId YOUR_PET_IS_VERY_HUNGRY_PLEASE_BE_CAREFULL = new SystemMessageId(597);
+	
+	/**
+	 * ID: 598<br>
+	 * Message: You may not chat while you are invisible.
+	 */
+	public static final SystemMessageId NOT_CHAT_WHILE_INVISIBLE = new SystemMessageId(598);
+	
+	/**
+	 * ID: 599<br>
+	 * Message: The GM has an important notice. Chat has been temporarily disabled.
+	 */
+	public static final SystemMessageId GM_NOTICE_CHAT_DISABLED = new SystemMessageId(599);
+	
+	/**
+	 * ID: 600<br>
+	 * Message: You may not equip a pet item.
+	 */
+	public static final SystemMessageId CANNOT_EQUIP_PET_ITEM = new SystemMessageId(600);
+	
+	/**
+	 * ID: 601<br>
+	 * Message: There are $S1 petitions currently on the waiting list.
+	 */
+	public static final SystemMessageId S1_PETITION_ON_WAITING_LIST = new SystemMessageId(601);
+	
+	/**
+	 * ID: 602<br>
+	 * Message: The petition system is currently unavailable. Please try again later.
+	 */
+	public static final SystemMessageId PETITION_SYSTEM_CURRENT_UNAVAILABLE = new SystemMessageId(602);
+	
+	/**
+	 * ID: 603<br>
+	 * Message: That item cannot be discarded or exchanged.
+	 */
+	public static final SystemMessageId CANNOT_DISCARD_EXCHANGE_ITEM = new SystemMessageId(603);
+	
+	/**
+	 * ID: 604<br>
+	 * Message: You may not call forth a pet or summoned creature from this location.
+	 */
+	public static final SystemMessageId NOT_CALL_PET_FROM_THIS_LOCATION = new SystemMessageId(604);
+	
+	/**
+	 * ID: 605<br>
+	 * Message: You can only enter up 128 names in your friends list.
+	 */
+	public static final SystemMessageId YOU_CAN_ONLY_ENTER_UP_128_NAMES_IN_YOUR_FRIENDS_LIST = new SystemMessageId(605);
+	
+	/**
+	 * ID: 606<br>
+	 * Message: The Friend's List of the person you are trying to add is full, so registration is not possible.
+	 */
+	public static final SystemMessageId THE_FRIENDS_LIST_OF_THE_PERSON_YOU_ARE_TRYING_TO_ADD_IS_FULL_SO_REGISTRATION_IS_NOT_POSSIBLE = new SystemMessageId(606);
+	
+	/**
+	 * ID: 607<br>
+	 * Message: You do not have any further skills to learn. Come back when you have reached Level $s1.
+	 */
+	public static final SystemMessageId DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1 = new SystemMessageId(607);
+	
+	/**
+	 * ID: 608<br>
+	 * Message: $c1 has obtained $s3 $s2 by using sweeper.
+	 */
+	public static final SystemMessageId C1_SWEEPED_UP_S3_S2 = new SystemMessageId(608);
+	
+	/**
+	 * ID: 609<br>
+	 * Message: $c1 has obtained $s2 by using sweeper.
+	 */
+	public static final SystemMessageId C1_SWEEPED_UP_S2 = new SystemMessageId(609);
+	
+	/**
+	 * ID: 610<br>
+	 * Message: Your skill has been canceled due to lack of HP.
+	 */
+	public static final SystemMessageId SKILL_REMOVED_DUE_LACK_HP = new SystemMessageId(610);
+	
+	/**
+	 * ID: 611<br>
+	 * Message: You have succeeded in Confusing the enemy.
+	 */
+	public static final SystemMessageId CONFUSING_SUCCEEDED = new SystemMessageId(611);
+	
+	/**
+	 * ID: 612<br>
+	 * Message: The Spoil condition has been activated.
+	 */
+	public static final SystemMessageId SPOIL_SUCCESS = new SystemMessageId(612);
+	
+	/**
+	 * ID: 613<br>
+	 * Message: ======<Ignore List>======
+	 */
+	public static final SystemMessageId BLOCK_LIST_HEADER = new SystemMessageId(613);
+	
+	/**
+	 * ID: 614<br>
+	 * Message: $c1 : $c2
+	 */
+	public static final SystemMessageId C1_D_C2 = new SystemMessageId(614);
+	
+	/**
+	 * ID: 615<br>
+	 * Message: You have failed to register the user to your Ignore List.
+	 */
+	public static final SystemMessageId FAILED_TO_REGISTER_TO_IGNORE_LIST = new SystemMessageId(615);
+	
+	/**
+	 * ID: 616<br>
+	 * Message: You have failed to delete the character.
+	 */
+	public static final SystemMessageId FAILED_TO_DELETE_CHARACTER = new SystemMessageId(616);
+	
+	/**
+	 * ID: 617<br>
+	 * Message: $s1 has been added to your Ignore List.
+	 */
+	public static final SystemMessageId S1_WAS_ADDED_TO_YOUR_IGNORE_LIST = new SystemMessageId(617);
+	
+	/**
+	 * ID: 618<br>
+	 * Message: $s1 has been removed from your Ignore List.
+	 */
+	public static final SystemMessageId S1_WAS_REMOVED_FROM_YOUR_IGNORE_LIST = new SystemMessageId(618);
+	
+	/**
+	 * ID: 619<br>
+	 * Message: $s1 has placed you on his/her Ignore List.
+	 */
+	public static final SystemMessageId S1_HAS_ADDED_YOU_TO_IGNORE_LIST = new SystemMessageId(619);
+	
+	/**
+	 * ID: 620<br>
+	 * Message: $s1 has placed you on his/her Ignore List.
+	 */
+	public static final SystemMessageId S1_HAS_ADDED_YOU_TO_IGNORE_LIST2 = new SystemMessageId(620);
+	
+	/**
+	 * ID: 621<br>
+	 * Message: Game connection attempted through a restricted IP.
+	 */
+	public static final SystemMessageId CONNECTION_RESTRICTED_IP = new SystemMessageId(621);
+	
+	/**
+	 * ID: 622<br>
+	 * Message: You may not make a declaration of war during an alliance battle.
+	 */
+	public static final SystemMessageId NO_WAR_DURING_ALLY_BATTLE = new SystemMessageId(622);
+	
+	/**
+	 * ID: 623<br>
+	 * Message: Your opponent has exceeded the number of simultaneous alliance battles allowed.
+	 */
+	public static final SystemMessageId OPPONENT_TOO_MUCH_ALLY_BATTLES1 = new SystemMessageId(623);
+	
+	/**
+	 * ID: 624<br>
+	 * Message: Clan leader $s1 is not currently connected to the game server.
+	 */
+	public static final SystemMessageId S1_LEADER_NOT_CONNECTED = new SystemMessageId(624);
+	
+	/**
+	 * ID: 625<br>
+	 * Message: Your request for an Alliance Battle truce has been denied.
+	 */
+	public static final SystemMessageId ALLY_BATTLE_TRUCE_DENIED = new SystemMessageId(625);
+	
+	/**
+	 * ID: 626<br>
+	 * Message: The $s1 clan did not respond: war proclamation has been refused.
+	 */
+	public static final SystemMessageId WAR_PROCLAMATION_HAS_BEEN_REFUSED = new SystemMessageId(626);
+	
+	/**
+	 * ID: 627<br>
+	 * Message: Clan battle has been refused because you did not respond to $s1's war proclamation.
+	 */
+	public static final SystemMessageId YOU_REFUSED_CLAN_WAR_PROCLAMATION = new SystemMessageId(627);
+	
+	/**
+	 * ID: 628<br>
+	 * Message: You have already been at war with the $s1 clan: 5 days must pass before you can declare war again.
+	 */
+	public static final SystemMessageId ALREADY_AT_WAR_WITH_S1_WAIT_5_DAYS = new SystemMessageId(628);
+	
+	/**
+	 * ID: 629<br>
+	 * Message: Your opponent has exceeded the number of simultaneous alliance battles allowed.
+	 */
+	public static final SystemMessageId OPPONENT_TOO_MUCH_ALLY_BATTLES2 = new SystemMessageId(629);
+	
+	/**
+	 * ID: 630<br>
+	 * Message: War with clan $s1 has begun.
+	 */
+	public static final SystemMessageId WAR_WITH_CLAN_BEGUN = new SystemMessageId(630);
+	
+	/**
+	 * ID: 631<br>
+	 * Message: War with clan $s1 is over.
+	 */
+	public static final SystemMessageId WAR_WITH_CLAN_ENDED = new SystemMessageId(631);
+	
+	/**
+	 * ID: 632<br>
+	 * Message: You have won the war over the $s1 clan!
+	 */
+	public static final SystemMessageId WON_WAR_OVER_CLAN = new SystemMessageId(632);
+	
+	/**
+	 * ID: 633<br>
+	 * Message: You have surrendered to the $s1 clan.
+	 */
+	public static final SystemMessageId SURRENDERED_TO_CLAN = new SystemMessageId(633);
+	
+	/**
+	 * ID: 634<br>
+	 * Message: Your alliance leader has been slain. You have been defeated by the $s1 clan.
+	 */
+	public static final SystemMessageId DEFEATED_BY_CLAN = new SystemMessageId(634);
+	
+	/**
+	 * ID: 635<br>
+	 * Message: The time limit for the clan war has been exceeded. War with the $s1 clan is over.
+	 */
+	public static final SystemMessageId TIME_UP_WAR_OVER = new SystemMessageId(635);
+	
+	/**
+	 * ID: 636<br>
+	 * Message: You are not involved in a clan war.
+	 */
+	public static final SystemMessageId NOT_INVOLVED_IN_WAR = new SystemMessageId(636);
+	
+	/**
+	 * ID: 637<br>
+	 * Message: A clan ally has registered itself to the opponent.
+	 */
+	public static final SystemMessageId ALLY_REGISTERED_SELF_TO_OPPONENT = new SystemMessageId(637);
+	
+	/**
+	 * ID: 638<br>
+	 * Message: You have already requested a Castle Siege.
+	 */
+	public static final SystemMessageId ALREADY_REQUESTED_SIEGE_BATTLE = new SystemMessageId(638);
+	
+	/**
+	 * ID: 639<br>
+	 * Message: Your application has been denied because you have already submitted a request for another Castle Siege.
+	 */
+	public static final SystemMessageId APPLICATION_DENIED_BECAUSE_ALREADY_SUBMITTED_A_REQUEST_FOR_ANOTHER_SIEGE_BATTLE = new SystemMessageId(639);
+	
+	/**
+	 * ID: 640<br>
+	 * Message: You have failed to refuse castle defense aid.
+	 */
+	public static final SystemMessageId FAILED_TO_REFUSE_CASTLE_DEFENSE_AID = new SystemMessageId(640);
+	
+	/**
+	 * ID: 641<br>
+	 * Message: You have failed to approve castle defense aid.
+	 */
+	public static final SystemMessageId FAILED_TO_APPROVE_CASTLE_DEFENSE_AID = new SystemMessageId(641);
+	
+	/**
+	 * ID: 642<br>
+	 * Message: You are already registered to the attacker side and must cancel your registration before submitting your request.
+	 */
+	public static final SystemMessageId ALREADY_ATTACKER_NOT_CANCEL = new SystemMessageId(642);
+	
+	/**
+	 * ID: 643<br>
+	 * Message: You have already registered to the defender side and must cancel your registration before submitting your request.
+	 */
+	public static final SystemMessageId ALREADY_DEFENDER_NOT_CANCEL = new SystemMessageId(643);
+	
+	/**
+	 * ID: 644<br>
+	 * Message: You are not yet registered for the castle siege.
+	 */
+	public static final SystemMessageId NOT_REGISTERED_FOR_SIEGE = new SystemMessageId(644);
+	
+	/**
+	 * ID: 645<br>
+	 * Message: Only clans of level 5 or higher may register for a castle siege.
+	 */
+	public static final SystemMessageId ONLY_CLAN_LEVEL_5_ABOVE_MAY_SIEGE = new SystemMessageId(645);
+	
+	/**
+	 * ID: 646<br>
+	 * Message: You do not have the authority to modify the castle defender list.
+	 */
+	public static final SystemMessageId DO_NOT_HAVE_AUTHORITY_TO_MODIFY_CASTLE_DEFENDER_LIST = new SystemMessageId(646);
+	
+	/**
+	 * ID: 647<br>
+	 * Message: You do not have the authority to modify the siege time.
+	 */
+	public static final SystemMessageId DO_NOT_HAVE_AUTHORITY_TO_MODIFY_SIEGE_TIME = new SystemMessageId(647);
+	
+	/**
+	 * ID: 648<br>
+	 * Message: No more registrations may be accepted for the attacker side.
+	 */
+	public static final SystemMessageId ATTACKER_SIDE_FULL = new SystemMessageId(648);
+	
+	/**
+	 * ID: 649<br>
+	 * Message: No more registrations may be accepted for the defender side.
+	 */
+	public static final SystemMessageId DEFENDER_SIDE_FULL = new SystemMessageId(649);
+	
+	/**
+	 * ID: 650<br>
+	 * Message: You may not summon from your current location.
+	 */
+	public static final SystemMessageId YOU_MAY_NOT_SUMMON_FROM_YOUR_CURRENT_LOCATION = new SystemMessageId(650);
+	
+	/**
+	 * ID: 651<br>
+	 * Message: Place $s1 in the current location and direction. Do you wish to continue?
+	 */
+	public static final SystemMessageId PLACE_CURRENT_LOCATION_DIRECTION = new SystemMessageId(651);
+	
+	/**
+	 * ID: 652<br>
+	 * Message: The target of the summoned monster is wrong.
+	 */
+	public static final SystemMessageId TARGET_OF_SUMMON_WRONG = new SystemMessageId(652);
+	
+	/**
+	 * ID: 653<br>
+	 * Message: You do not have the authority to position mercenaries.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_HAVE_AUTHORITY_TO_POSITION_MERCENARIES = new SystemMessageId(653);
+	
+	/**
+	 * ID: 654<br>
+	 * Message: You do not have the authority to cancel mercenary positioning.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_HAVE_AUTHORITY_TO_CANCEL_MERCENARY_POSITIONING = new SystemMessageId(654);
+	
+	/**
+	 * ID: 655<br>
+	 * Message: Mercenaries cannot be positioned here.
+	 */
+	public static final SystemMessageId MERCENARIES_CANNOT_BE_POSITIONED_HERE = new SystemMessageId(655);
+	
+	/**
+	 * ID: 656<br>
+	 * Message: This mercenary cannot be positioned anymore.
+	 */
+	public static final SystemMessageId THIS_MERCENARY_CANNOT_BE_POSITIONED_ANYMORE = new SystemMessageId(656);
+	
+	/**
+	 * ID: 657<br>
+	 * Message: Positioning cannot be done here because the distance between mercenaries is too short.
+	 */
+	public static final SystemMessageId POSITIONING_CANNOT_BE_DONE_BECAUSE_DISTANCE_BETWEEN_MERCENARIES_TOO_SHORT = new SystemMessageId(657);
+	
+	/**
+	 * ID: 658<br>
+	 * Message: This is not a mercenary of a castle that you own and so you cannot cancel its positioning.
+	 */
+	public static final SystemMessageId THIS_IS_NOT_A_MERCENARY_OF_A_CASTLE_THAT_YOU_OWN_AND_SO_CANNOT_CANCEL_POSITIONING = new SystemMessageId(658);
+	
+	/**
+	 * ID: 659<br>
+	 * Message: This is not the time for siege registration and so registrations cannot be accepted or rejected.
+	 */
+	public static final SystemMessageId NOT_SIEGE_REGISTRATION_TIME1 = new SystemMessageId(659);
+	
+	/**
+	 * ID: 660<br>
+	 * Message: This is not the time for siege registration and so registration and cancellation cannot be done.
+	 */
+	public static final SystemMessageId NOT_SIEGE_REGISTRATION_TIME2 = new SystemMessageId(660);
+	
+	/**
+	 * ID: 661<br>
+	 * Message: This character cannot be spoiled.
+	 */
+	public static final SystemMessageId SPOIL_CANNOT_USE = new SystemMessageId(661);
+	
+	/**
+	 * ID: 662<br>
+	 * Message: The other player is rejecting friend invitations.
+	 */
+	public static final SystemMessageId THE_PLAYER_IS_REJECTING_FRIEND_INVITATIONS = new SystemMessageId(662);
+	
+	/**
+	 * ID: 663<br>
+	 * Message: The siege time has been declared for $s. It is not possible to change the time after a siege time has been declared. Do you want to continue?
+	 */
+	public static final SystemMessageId SIEGE_TIME_DECLARED_FOR_S1 = new SystemMessageId(663);
+	
+	/**
+	 * ID: 664<br>
+	 * Message: Please choose a person to receive.
+	 */
+	public static final SystemMessageId CHOOSE_PERSON_TO_RECEIVE = new SystemMessageId(664);
+	
+	/**
+	 * ID: 665<br>
+	 * Message: $s2 of $s1 alliance is applying for alliance war. Do you want to accept the challenge?
+	 */
+	public static final SystemMessageId APPLYING_ALLIANCE_WAR = new SystemMessageId(665);
+	
+	/**
+	 * ID: 666<br>
+	 * Message: A request for ceasefire has been received from $s1 alliance. Do you agree?
+	 */
+	public static final SystemMessageId REQUEST_FOR_CEASEFIRE = new SystemMessageId(666);
+	
+	/**
+	 * ID: 667<br>
+	 * Message: You are registering on the attacking side of the $s1 siege. Do you want to continue?
+	 */
+	public static final SystemMessageId REGISTERING_ON_ATTACKING_SIDE = new SystemMessageId(667);
+	
+	/**
+	 * ID: 668<br>
+	 * Message: You are registering on the defending side of the $s1 siege. Do you want to continue?
+	 */
+	public static final SystemMessageId REGISTERING_ON_DEFENDING_SIDE = new SystemMessageId(668);
+	
+	/**
+	 * ID: 669<br>
+	 * Message: You are canceling your application to participate in the $s1 castle siege. Do you want to continue?
+	 */
+	public static final SystemMessageId CANCELING_REGISTRATION = new SystemMessageId(669);
+	
+	/**
+	 * ID: 670<br>
+	 * Message: You are declining the registration of clan $s1 as a defender. Do you want to continue?
+	 */
+	public static final SystemMessageId REFUSING_REGISTRATION = new SystemMessageId(670);
+	
+	/**
+	 * ID: 671<br>
+	 * Message: You are accepting the registration of clan $s1 as a defender. Do you want to continue?
+	 */
+	public static final SystemMessageId AGREEING_REGISTRATION = new SystemMessageId(671);
+	
+	/**
+	 * ID: 672<br>
+	 * Message: $s1 adena disappeared.
+	 */
+	public static final SystemMessageId S1_DISAPPEARED_ADENA = new SystemMessageId(672);
+	
+	/**
+	 * ID: 673<br>
+	 * Message: Only a clan leader whose clan is of level 2 or higher is allowed to participate in a clan hall auction.
+	 */
+	public static final SystemMessageId AUCTION_ONLY_CLAN_LEVEL_2_HIGHER = new SystemMessageId(673);
+	
+	/**
+	 * ID: 674<br>
+	 * Message: It has not yet been seven days since canceling an auction.
+	 */
+	public static final SystemMessageId NOT_SEVEN_DAYS_SINCE_CANCELING_AUCTION = new SystemMessageId(674);
+	
+	/**
+	 * ID: 675<br>
+	 * Message: There are no clan halls up for auction.
+	 */
+	public static final SystemMessageId NO_CLAN_HALLS_UP_FOR_AUCTION = new SystemMessageId(675);
+	
+	/**
+	 * ID: 676<br>
+	 * Message: Since you have already submitted a bid, you are not allowed to participate in another auction at this time.
+	 */
+	public static final SystemMessageId ALREADY_SUBMITTED_BID = new SystemMessageId(676);
+	
+	/**
+	 * ID: 677<br>
+	 * Message: Your bid price must be higher than the minimum price currently being bid.
+	 */
+	public static final SystemMessageId BID_PRICE_MUST_BE_HIGHER = new SystemMessageId(677);
+	
+	/**
+	 * ID: 678<br>
+	 * Message: You have submitted a bid for the auction of $s1.
+	 */
+	public static final SystemMessageId SUBMITTED_A_BID_OF_S1 = new SystemMessageId(678);
+	
+	/**
+	 * ID: 679<br>
+	 * Message: You have canceled your bid.
+	 */
+	public static final SystemMessageId CANCELED_BID = new SystemMessageId(679);
+	
+	/**
+	 * ID: 680<br>
+	 * Message: You do not meet the requirements to participate in an auction.
+	 */
+	public static final SystemMessageId CANNOT_PARTICIPATE_IN_AN_AUCTION = new SystemMessageId(680);
+	
+	/**
+	 * ID: 681<br>
+	 * Message: The clan does not own a clan hall.
+	 */
+	public static final SystemMessageId CLAN_HAS_NO_CLAN_HALL = new SystemMessageId(681);
+	
+	/**
+	 * ID: 682<br>
+	 * Message: You are moving to another village. Do you want to continue?
+	 */
+	public static final SystemMessageId MOVING_TO_ANOTHER_VILLAGE = new SystemMessageId(682);
+	
+	/**
+	 * ID: 683<br>
+	 * Message: There are no priority rights on a sweeper.
+	 */
+	public static final SystemMessageId SWEEP_NOT_ALLOWED = new SystemMessageId(683);
+	
+	/**
+	 * ID: 684<br>
+	 * Message: You cannot position mercenaries during a siege.
+	 */
+	public static final SystemMessageId CANNOT_POSITION_MERCS_DURING_SIEGE = new SystemMessageId(684);
+	
+	/**
+	 * ID: 685<br>
+	 * Message: You cannot apply for clan war with a clan that belongs to the same alliance.
+	 */
+	public static final SystemMessageId CANNOT_DECLARE_WAR_ON_ALLY = new SystemMessageId(685);
+	
+	/**
+	 * ID: 686<br>
+	 * Message: You have received $s1 damage from the fire of magic.
+	 */
+	public static final SystemMessageId S1_DAMAGE_FROM_FIRE_MAGIC = new SystemMessageId(686);
+	
+	/**
+	 * ID: 687<br>
+	 * Message: You cannot move while frozen. Please wait.
+	 */
+	public static final SystemMessageId CANNOT_MOVE_FROZEN = new SystemMessageId(687);
+	
+	/**
+	 * ID: 688<br>
+	 * Message: Castle-owning clans are automatically registered on the defending side.
+	 */
+	public static final SystemMessageId CLAN_THAT_OWNS_CASTLE_IS_AUTOMATICALLY_REGISTERED_DEFENDING = new SystemMessageId(688);
+	
+	/**
+	 * ID: 689<br>
+	 * Message: A clan that owns a castle cannot participate in another siege.
+	 */
+	public static final SystemMessageId CLAN_THAT_OWNS_CASTLE_CANNOT_PARTICIPATE_OTHER_SIEGE = new SystemMessageId(689);
+	
+	/**
+	 * ID: 690<br>
+	 * Message: You cannot register as an attacker because you are in an alliance with the castle-owning clan.
+	 */
+	public static final SystemMessageId CANNOT_ATTACK_ALLIANCE_CASTLE = new SystemMessageId(690);
+	
+	/**
+	 * ID: 691<br>
+	 * Message: $s1 clan is already a member of $s2 alliance.
+	 */
+	public static final SystemMessageId S1_CLAN_ALREADY_MEMBER_OF_S2_ALLIANCE = new SystemMessageId(691);
+	
+	/**
+	 * ID: 692<br>
+	 * Message: The other party is frozen. Please wait a moment.
+	 */
+	public static final SystemMessageId OTHER_PARTY_IS_FROZEN = new SystemMessageId(692);
+	
+	/**
+	 * ID: 693<br>
+	 * Message: The package that arrived is in another warehouse.
+	 */
+	public static final SystemMessageId PACKAGE_IN_ANOTHER_WAREHOUSE = new SystemMessageId(693);
+	
+	/**
+	 * ID: 694<br>
+	 * Message: No packages have arrived.
+	 */
+	public static final SystemMessageId NO_PACKAGES_ARRIVED = new SystemMessageId(694);
+	
+	/**
+	 * ID: 695<br>
+	 * Message: You cannot set the name of the pet.
+	 */
+	public static final SystemMessageId NAMING_YOU_CANNOT_SET_NAME_OF_THE_PET = new SystemMessageId(695);
+	
+	/**
+	 * ID: 697<br>
+	 * Message: The item enchant value is strange.
+	 */
+	public static final SystemMessageId ITEM_ENCHANT_VALUE_STRANGE = new SystemMessageId(697);
+	
+	/**
+	 * ID: 698<br>
+	 * Message: The price is different than the same item on the sales list.
+	 */
+	public static final SystemMessageId PRICE_DIFFERENT_FROM_SALES_LIST = new SystemMessageId(698);
+	
+	/**
+	 * ID: 699<br>
+	 * Message: Currently not purchasing.
+	 */
+	public static final SystemMessageId CURRENTLY_NOT_PURCHASING = new SystemMessageId(699);
+	
+	/**
+	 * ID: 700<br>
+	 * Message: The purchase is complete.
+	 */
+	public static final SystemMessageId THE_PURCHASE_IS_COMPLETE = new SystemMessageId(700);
+	
+	/**
+	 * ID: 701<br>
+	 * Message: You do not have enough required items.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_REQUIRED_ITEMS = new SystemMessageId(701);
+	
+	/**
+	 * ID: 702<br>
+	 * Message: There are no GMs currently visible in the public list as they may be performing other functions at the moment.
+	 */
+	public static final SystemMessageId NO_GM_PROVIDING_SERVICE_NOW = new SystemMessageId(702);
+	
+	/**
+	 * ID: 703<br>
+	 * Message: ======<GM List>======
+	 */
+	public static final SystemMessageId GM_LIST = new SystemMessageId(703);
+	
+	/**
+	 * ID: 704<br>
+	 * Message: GM : $c1
+	 */
+	public static final SystemMessageId GM_C1 = new SystemMessageId(704);
+	
+	/**
+	 * ID: 705<br>
+	 * Message: You cannot exclude yourself.
+	 */
+	public static final SystemMessageId YOU_CANNOT_EXCLUDE_YOURSELF = new SystemMessageId(705);
+	
+	/**
+	 * ID: 706<br>
+	 * Message: You can only enter up to 128 names in your block list.
+	 */
+	public static final SystemMessageId YOU_CAN_ONLY_ENTER_UP_TO_128_NAMES_IN_YOUR_BLOCK_LIST = new SystemMessageId(706);
+	
+	/**
+	 * ID: 707<br>
+	 * Message: You cannot teleport to a village that is in a siege.
+	 */
+	public static final SystemMessageId NO_PORT_THAT_IS_IN_SIGE = new SystemMessageId(707);
+	
+	/**
+	 * ID: 708<br>
+	 * Message: You do not have the right to use the castle warehouse.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_CASTLE_WAREHOUSE = new SystemMessageId(708);
+	
+	/**
+	 * ID: 709<br>
+	 * Message: You do not have the right to use the clan warehouse.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_HAVE_THE_RIGHT_TO_USE_CLAN_WAREHOUSE = new SystemMessageId(709);
+	
+	/**
+	 * ID: 710<br>
+	 * Message: Only clans of clan level 1 or higher can use a clan warehouse.
+	 */
+	public static final SystemMessageId ONLY_LEVEL_1_CLAN_OR_HIGHER_CAN_USE_WAREHOUSE = new SystemMessageId(710);
+	
+	/**
+	 * ID: 711<br>
+	 * Message: The $s1 siege has started.
+	 */
+	public static final SystemMessageId SIEGE_OF_S1_HAS_STARTED = new SystemMessageId(711);
+	
+	/**
+	 * ID: 712<br>
+	 * Message: The $s1 siege has finished.
+	 */
+	public static final SystemMessageId SIEGE_OF_S1_HAS_ENDED = new SystemMessageId(712);
+	
+	/**
+	 * ID: 713<br>
+	 * Message: $s1/$s2/$s3 $s4:$s5
+	 */
+	public static final SystemMessageId S1_S2_S3_D = new SystemMessageId(713);
+	
+	/**
+	 * ID: 714<br>
+	 * Message: A trap device has been tripped.
+	 */
+	public static final SystemMessageId A_TRAP_DEVICE_HAS_BEEN_TRIPPED = new SystemMessageId(714);
+	
+	/**
+	 * ID: 715<br>
+	 * Message: The trap device has been stopped.
+	 */
+	public static final SystemMessageId A_TRAP_DEVICE_HAS_BEEN_STOPPED = new SystemMessageId(715);
+	
+	/**
+	 * ID: 716<br>
+	 * Message: If a base camp does not exist, resurrection is not possible.
+	 */
+	public static final SystemMessageId NO_RESURRECTION_WITHOUT_BASE_CAMP = new SystemMessageId(716);
+	
+	/**
+	 * ID: 717<br>
+	 * Message: The guardian tower has been destroyed and resurrection is not possible.
+	 */
+	public static final SystemMessageId TOWER_DESTROYED_NO_RESURRECTION = new SystemMessageId(717);
+	
+	/**
+	 * ID: 718<br>
+	 * Message: The castle gates cannot be opened and closed during a siege.
+	 */
+	public static final SystemMessageId GATES_NOT_OPENED_CLOSED_DURING_SIEGE = new SystemMessageId(718);
+	
+	/**
+	 * ID: 719<br>
+	 * Message: You failed at mixing the item.
+	 */
+	public static final SystemMessageId ITEM_MIXING_FAILED = new SystemMessageId(719);
+	
+	/**
+	 * ID: 720<br>
+	 * Message: The purchase price is higher than the amount of money that you have and so you cannot open a personal store.
+	 */
+	public static final SystemMessageId THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY = new SystemMessageId(720);
+	
+	/**
+	 * ID: 721<br>
+	 * Message: You cannot create an alliance while participating in a siege.
+	 */
+	public static final SystemMessageId NO_ALLY_CREATION_WHILE_SIEGE = new SystemMessageId(721);
+	
+	/**
+	 * ID: 722<br>
+	 * Message: You cannot dissolve an alliance while an affiliated clan is participating in a siege battle.
+	 */
+	public static final SystemMessageId CANNOT_DISSOLVE_ALLY_WHILE_IN_SIEGE = new SystemMessageId(722);
+	
+	/**
+	 * ID: 723<br>
+	 * Message: The opposing clan is participating in a siege battle.
+	 */
+	public static final SystemMessageId OPPOSING_CLAN_IS_PARTICIPATING_IN_SIEGE = new SystemMessageId(723);
+	
+	/**
+	 * ID: 724<br>
+	 * Message: You cannot leave while participating in a siege battle.
+	 */
+	public static final SystemMessageId CANNOT_LEAVE_WHILE_SIEGE = new SystemMessageId(724);
+	
+	/**
+	 * ID: 725<br>
+	 * Message: You cannot banish a clan from an alliance while the clan is participating in a siege.
+	 */
+	public static final SystemMessageId CANNOT_DISMISS_WHILE_SIEGE = new SystemMessageId(725);
+	
+	/**
+	 * ID: 726<br>
+	 * Message: The frozen condition has started. Please wait a moment.
+	 */
+	public static final SystemMessageId FROZEN_CONDITION_STARTED = new SystemMessageId(726);
+	
+	/**
+	 * ID: 727<br>
+	 * Message: The frozen condition was removed.
+	 */
+	public static final SystemMessageId FROZEN_CONDITION_REMOVED = new SystemMessageId(727);
+	
+	/**
+	 * ID: 728<br>
+	 * Message: You cannot apply for dissolution again within seven days after a previous application for dissolution.
+	 */
+	public static final SystemMessageId CANNOT_APPLY_DISSOLUTION_AGAIN = new SystemMessageId(728);
+	
+	/**
+	 * ID: 729<br>
+	 * Message: That item cannot be discarded.
+	 */
+	public static final SystemMessageId ITEM_NOT_DISCARDED = new SystemMessageId(729);
+	
+	/**
+	 * ID: 730<br>
+	 * Message: You have submitted $s1 petition(s). \\n - You may submit $s2 more petition(s) today.
+	 */
+	public static final SystemMessageId SUBMITTED_YOU_S1_TH_PETITION_S2_LEFT = new SystemMessageId(730);
+	
+	/**
+	 * ID: 731<br>
+	 * Message: A petition has been received by the GM on behalf of $s1. The petition code is $s2.
+	 */
+	public static final SystemMessageId PETITION_S1_RECEIVED_CODE_IS_S2 = new SystemMessageId(731);
+	
+	/**
+	 * ID: 732<br>
+	 * Message: $c1 has received a request for a consultation with the GM.
+	 */
+	public static final SystemMessageId C1_RECEIVED_CONSULTATION_REQUEST = new SystemMessageId(732);
+	
+	/**
+	 * ID: 733<br>
+	 * Message: We have received $s1 petitions from you today and that is the maximum that you can submit in one day. You cannot submit any more petitions.
+	 */
+	public static final SystemMessageId WE_HAVE_RECEIVED_S1_PETITIONS_TODAY = new SystemMessageId(733);
+	
+	/**
+	 * ID: 734<br>
+	 * Message: You have failed at submitting a petition on behalf of someone else. $c1 already submitted a petition.
+	 */
+	public static final SystemMessageId PETITION_FAILED_C1_ALREADY_SUBMITTED = new SystemMessageId(734);
+	
+	/**
+	 * ID: 735<br>
+	 * Message: You have failed at submitting a petition on behalf of $c1. The error number is $s2.
+	 */
+	public static final SystemMessageId PETITION_FAILED_FOR_C1_ERROR_NUMBER_S2 = new SystemMessageId(735);
+	
+	/**
+	 * ID: 736<br>
+	 * Message: The petition was canceled. You may submit $s1 more petition(s) today.
+	 */
+	public static final SystemMessageId PETITION_CANCELED_SUBMIT_S1_MORE_TODAY = new SystemMessageId(736);
+	
+	/**
+	 * ID: 737<br>
+	 * Message: You have cancelled submitting a petition on behalf of $s1.
+	 */
+	public static final SystemMessageId CANCELED_PETITION_ON_S1 = new SystemMessageId(737);
+	
+	/**
+	 * ID: 738<br>
+	 * Message: You have not submitted a petition.
+	 */
+	public static final SystemMessageId PETITION_NOT_SUBMITTED = new SystemMessageId(738);
+	
+	/**
+	 * ID: 739<br>
+	 * Message: You have failed at cancelling a petition on behalf of $c1. The error code is $s2.
+	 */
+	public static final SystemMessageId PETITION_CANCEL_FAILED_FOR_C1_ERROR_NUMBER_S2 = new SystemMessageId(739);
+	
+	/**
+	 * ID: 740<br>
+	 * Message: $c1 participated in a petition chat at the request of the GM.
+	 */
+	public static final SystemMessageId C1_PARTICIPATE_PETITION = new SystemMessageId(740);
+	
+	/**
+	 * ID: 741<br>
+	 * Message: You have failed at adding $c1 to the petition chat. Petition has already been submitted.
+	 */
+	public static final SystemMessageId FAILED_ADDING_C1_TO_PETITION = new SystemMessageId(741);
+	
+	/**
+	 * ID: 742<br>
+	 * Message: You have failed at adding $c1 to the petition chat. The error code is $s2.
+	 */
+	public static final SystemMessageId PETITION_ADDING_C1_FAILED_ERROR_NUMBER_S2 = new SystemMessageId(742);
+	
+	/**
+	 * ID: 743<br>
+	 * Message: $c1 left the petition chat.
+	 */
+	public static final SystemMessageId C1_LEFT_PETITION_CHAT = new SystemMessageId(743);
+	
+	/**
+	 * ID: 744<br>
+	 * Message: You failed at removing $s1 from the petition chat. The error code is $s2.
+	 */
+	public static final SystemMessageId PETITION_REMOVING_S1_FAILED_ERROR_NUMBER_S2 = new SystemMessageId(744);
+	
+	/**
+	 * ID: 745<br>
+	 * Message: You are currently not in a petition chat.
+	 */
+	public static final SystemMessageId YOU_ARE_NOT_IN_PETITION_CHAT = new SystemMessageId(745);
+	
+	/**
+	 * ID: 746<br>
+	 * Message: It is not currently a petition.
+	 */
+	public static final SystemMessageId CURRENTLY_NO_PETITION = new SystemMessageId(746);
+	
+	/**
+	 * ID: 748<br>
+	 * Message: The distance is too far and so the casting has been stopped.
+	 */
+	public static final SystemMessageId DIST_TOO_FAR_CASTING_STOPPED = new SystemMessageId(748);
+	
+	/**
+	 * ID: 749<br>
+	 * Message: The effect of $s1 has been removed.
+	 */
+	public static final SystemMessageId EFFECT_S1_HAS_BEEN_REMOVED = new SystemMessageId(749);
+	
+	/**
+	 * ID: 750<br>
+	 * Message: There are no other skills to learn.
+	 */
+	public static final SystemMessageId NO_MORE_SKILLS_TO_LEARN = new SystemMessageId(750);
+	
+	/**
+	 * ID: 751<br>
+	 * Message: As there is a conflict in the siege relationship with a clan in the alliance, you cannot invite that clan to the alliance.
+	 */
+	public static final SystemMessageId CANNOT_INVITE_CONFLICT_CLAN = new SystemMessageId(751);
+	
+	/**
+	 * ID: 752<br>
+	 * Message: That name cannot be used.
+	 */
+	public static final SystemMessageId CANNOT_USE_NAME = new SystemMessageId(752);
+	
+	/**
+	 * ID: 753<br>
+	 * Message: You cannot position mercenaries here.
+	 */
+	public static final SystemMessageId NO_MERCS_HERE = new SystemMessageId(753);
+	
+	/**
+	 * ID: 754<br>
+	 * Message: There are $s1 hours and $s2 minutes left in this week's usage time.
+	 */
+	public static final SystemMessageId S1_HOURS_S2_MINUTES_LEFT_THIS_WEEK = new SystemMessageId(754);
+	
+	/**
+	 * ID: 755<br>
+	 * Message: There are $s1 minutes left in this week's usage time.
+	 */
+	public static final SystemMessageId S1_MINUTES_LEFT_THIS_WEEK = new SystemMessageId(755);
+	
+	/**
+	 * ID: 756<br>
+	 * Message: This week's usage time has finished.
+	 */
+	public static final SystemMessageId WEEKS_USAGE_TIME_FINISHED = new SystemMessageId(756);
+	
+	/**
+	 * ID: 757<br>
+	 * Message: There are $s1 hours and $s2 minutes left in the fixed use time.
+	 */
+	public static final SystemMessageId S1_HOURS_S2_MINUTES_LEFT_IN_TIME = new SystemMessageId(757);
+	
+	/**
+	 * ID: 758<br>
+	 * Message: There are $s1 hour(s) $s2 minute(s) left in this week's play time.
+	 */
+	public static final SystemMessageId S1_HOURS_S2_MINUTES_LEFT_THIS_WEEKS_PLAY_TIME = new SystemMessageId(758);
+	
+	/**
+	 * ID: 759<br>
+	 * Message: There are $s1 minutes left in this week's play time.
+	 */
+	public static final SystemMessageId S1_MINUTES_LEFT_THIS_WEEKS_PLAY_TIME = new SystemMessageId(759);
+	
+	/**
+	 * ID: 760<br>
+	 * Message: $c1 cannot join the clan because one day has not yet passed since they left another clan.
+	 */
+	public static final SystemMessageId C1_MUST_WAIT_BEFORE_JOINING_ANOTHER_CLAN = new SystemMessageId(760);
+	
+	/**
+	 * ID: 761<br>
+	 * Message: $s1 clan cannot join the alliance because one day has not yet passed since they left another alliance.
+	 */
+	public static final SystemMessageId S1_CANT_ENTER_ALLIANCE_WITHIN_1_DAY = new SystemMessageId(761);
+	
+	/**
+	 * ID: 762<br>
+	 * Message: $c1 rolled $s2 and $s3's eye came out.
+	 */
+	public static final SystemMessageId C1_ROLLED_S2_S3_EYE_CAME_OUT = new SystemMessageId(762);
+	
+	/**
+	 * ID: 763<br>
+	 * Message: You failed at sending the package because you are too far from the warehouse.
+	 */
+	public static final SystemMessageId FAILED_SENDING_PACKAGE_TOO_FAR = new SystemMessageId(763);
+	
+	/**
+	 * ID: 764<br>
+	 * Message: You have been playing for an extended period of time. Please consider taking a break.
+	 */
+	public static final SystemMessageId PLAYING_FOR_LONG_TIME = new SystemMessageId(764);
+	
+	/**
+	 * ID: 769<br>
+	 * Message: A hacking tool has been discovered. Please try playing again after closing unnecessary programs.
+	 */
+	public static final SystemMessageId HACKING_TOOL = new SystemMessageId(769);
+	
+	/**
+	 * ID: 774<br>
+	 * Message: Play time is no longer accumulating.
+	 */
+	public static final SystemMessageId PLAY_TIME_NO_LONGER_ACCUMULATING = new SystemMessageId(774);
+	
+	/**
+	 * ID: 775<br>
+	 * Message: From here on, play time will be expended.
+	 */
+	public static final SystemMessageId PLAY_TIME_EXPENDED = new SystemMessageId(775);
+	
+	/**
+	 * ID: 776<br>
+	 * Message: The clan hall which was put up for auction has been awarded to $s1 clan.
+	 */
+	public static final SystemMessageId CLANHALL_AWARDED_TO_CLAN = new SystemMessageId(776);
+	
+	/**
+	 * ID: 777<br>
+	 * Message: The clan hall which had been put up for auction was not sold and therefore has been re-listed.
+	 */
+	public static final SystemMessageId CLANHALL_NOT_SOLD = new SystemMessageId(777);
+	
+	/**
+	 * ID: 778<br>
+	 * Message: You may not log out from this location.
+	 */
+	public static final SystemMessageId NO_LOGOUT_HERE = new SystemMessageId(778);
+	
+	/**
+	 * ID: 779<br>
+	 * Message: You may not restart in this location.
+	 */
+	public static final SystemMessageId NO_RESTART_HERE = new SystemMessageId(779);
+	
+	/**
+	 * ID: 780<br>
+	 * Message: Observation is only possible during a siege.
+	 */
+	public static final SystemMessageId ONLY_VIEW_SIEGE = new SystemMessageId(780);
+	
+	/**
+	 * ID: 781<br>
+	 * Message: Observers cannot participate.
+	 */
+	public static final SystemMessageId OBSERVERS_CANNOT_PARTICIPATE = new SystemMessageId(781);
+	
+	/**
+	 * ID: 782<br>
+	 * Message: You may not observe a siege with a pet or servitor summoned.
+	 */
+	public static final SystemMessageId NO_OBSERVE_WITH_PET = new SystemMessageId(782);
+	
+	/**
+	 * ID: 783<br>
+	 * Message: Lottery ticket sales have been temporarily suspended.
+	 */
+	public static final SystemMessageId LOTTERY_TICKET_SALES_TEMP_SUSPENDED = new SystemMessageId(783);
+	
+	/**
+	 * ID: 784<br>
+	 * Message: Tickets for the current lottery are no longer available.
+	 */
+	public static final SystemMessageId NO_LOTTERY_TICKETS_AVAILABLE = new SystemMessageId(784);
+	
+	/**
+	 * ID: 785<br>
+	 * Message: The results of lottery number $s1 have not yet been published.
+	 */
+	public static final SystemMessageId LOTTERY_S1_RESULT_NOT_PUBLISHED = new SystemMessageId(785);
+	
+	/**
+	 * ID: 786<br>
+	 * Message: Incorrect syntax.
+	 */
+	public static final SystemMessageId INCORRECT_SYNTAX = new SystemMessageId(786);
+	
+	/**
+	 * ID: 787<br>
+	 * Message: The tryouts are finished.
+	 */
+	public static final SystemMessageId CLANHALL_SIEGE_TRYOUTS_FINISHED = new SystemMessageId(787);
+	
+	/**
+	 * ID: 788<br>
+	 * Message: The finals are finished.
+	 */
+	public static final SystemMessageId CLANHALL_SIEGE_FINALS_FINISHED = new SystemMessageId(788);
+	
+	/**
+	 * ID: 789<br>
+	 * Message: The tryouts have begun.
+	 */
+	public static final SystemMessageId CLANHALL_SIEGE_TRYOUTS_BEGUN = new SystemMessageId(789);
+	
+	/**
+	 * ID: 790<br>
+	 * Message: The finals have begun.
+	 */
+	public static final SystemMessageId CLANHALL_SIEGE_FINALS_BEGUN = new SystemMessageId(790);
+	
+	/**
+	 * ID: 791<br>
+	 * Message: The final match is about to begin. Line up!
+	 */
+	public static final SystemMessageId FINAL_MATCH_BEGIN = new SystemMessageId(791);
+	
+	/**
+	 * ID: 792<br>
+	 * Message: The siege of the clan hall is finished.
+	 */
+	public static final SystemMessageId CLANHALL_SIEGE_ENDED = new SystemMessageId(792);
+	
+	/**
+	 * ID: 793<br>
+	 * Message: The siege of the clan hall has begun.
+	 */
+	public static final SystemMessageId CLANHALL_SIEGE_BEGUN = new SystemMessageId(793);
+	
+	/**
+	 * ID: 794<br>
+	 * Message: You are not authorized to do that.
+	 */
+	public static final SystemMessageId YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT = new SystemMessageId(794);
+	
+	/**
+	 * ID: 795<br>
+	 * Message: Only clan leaders are authorized to set rights.
+	 */
+	public static final SystemMessageId ONLY_LEADERS_CAN_SET_RIGHTS = new SystemMessageId(795);
+	
+	/**
+	 * ID: 796<br>
+	 * Message: Your remaining observation time is $s1 minutes.
+	 */
+	public static final SystemMessageId REMAINING_OBSERVATION_TIME = new SystemMessageId(796);
+	
+	/**
+	 * ID: 797<br>
+	 * Message: You may create up to 48 macros.
+	 */
+	public static final SystemMessageId YOU_MAY_CREATE_UP_TO_48_MACROS = new SystemMessageId(797);
+	
+	/**
+	 * ID: 798<br>
+	 * Message: Item registration is irreversible. Do you wish to continue?
+	 */
+	public static final SystemMessageId ITEM_REGISTRATION_IRREVERSIBLE = new SystemMessageId(798);
+	
+	/**
+	 * ID: 799<br>
+	 * Message: The observation time has expired.
+	 */
+	public static final SystemMessageId OBSERVATION_TIME_EXPIRED = new SystemMessageId(799);
+	
+	/**
+	 * ID: 800<br>
+	 * Message: You are too late. The registration period is over.
+	 */
+	public static final SystemMessageId REGISTRATION_PERIOD_OVER = new SystemMessageId(800);
+	
+	/**
+	 * ID: 801<br>
+	 * Message: Registration for the clan hall siege is closed.
+	 */
+	public static final SystemMessageId REGISTRATION_CLOSED = new SystemMessageId(801);
+	
+	/**
+	 * ID: 802<br>
+	 * Message: Petitions are not being accepted at this time. You may submit your petition after $s1 a.m./p.m.
+	 */
+	public static final SystemMessageId PETITION_NOT_ACCEPTED_NOW = new SystemMessageId(802);
+	
+	/**
+	 * ID: 803<br>
+	 * Message: Enter the specifics of your petition.
+	 */
+	public static final SystemMessageId PETITION_NOT_SPECIFIED = new SystemMessageId(803);
+	
+	/**
+	 * ID: 804<br>
+	 * Message: Select your type and check the FAQ content.
+	 */
+	public static final SystemMessageId SELECT_TYPE = new SystemMessageId(804);
+	
+	/**
+	 * ID: 805<br>
+	 * Message: Petitions are not being accepted at this time. You may submit your petition after $s1 a.m./p.m.
+	 */
+	public static final SystemMessageId PETITION_NOT_ACCEPTED_SUBMIT_AT_S1 = new SystemMessageId(805);
+	
+	/**
+	 * ID: 806<br>
+	 * Message: If you are unable to move, try typing "/unstuck".
+	 */
+	public static final SystemMessageId TRY_UNSTUCK_WHEN_TRAPPED = new SystemMessageId(806);
+	
+	/**
+	 * ID: 807<br>
+	 * Message: This terrain is navigable. Prepare for transport to the nearest village.
+	 */
+	public static final SystemMessageId STUCK_PREPARE_FOR_TRANSPORT = new SystemMessageId(807);
+	
+	/**
+	 * ID: 808<br>
+	 * Message: You are stuck. You may submit a petition by typing "/gm".
+	 */
+	public static final SystemMessageId STUCK_SUBMIT_PETITION = new SystemMessageId(808);
+	
+	/**
+	 * ID: 809<br>
+	 * Message: You are stuck. You will be transported to the nearest village in five minutes.
+	 */
+	public static final SystemMessageId STUCK_TRANSPORT_IN_FIVE_MINUTES = new SystemMessageId(809);
+	
+	/**
+	 * ID: 810<br>
+	 * Message: Invalid macro. Refer to the Help file for instructions.
+	 */
+	public static final SystemMessageId INVALID_MACRO = new SystemMessageId(810);
+	
+	/**
+	 * ID: 811<br>
+	 * Message: You have requested a teleport to ($s1). Do you wish to continue?
+	 */
+	public static final SystemMessageId WILL_BE_MOVED = new SystemMessageId(811);
+	
+	/**
+	 * ID: 812<br>
+	 * Message: The secret trap has inflicted $s1 damage on you.
+	 */
+	public static final SystemMessageId TRAP_DID_S1_DAMAGE = new SystemMessageId(812);
+	
+	/**
+	 * ID: 813<br>
+	 * Message: You have been poisoned by a Secret Trap.
+	 */
+	public static final SystemMessageId POISONED_BY_TRAP = new SystemMessageId(813);
+	
+	/**
+	 * ID: 814<br>
+	 * Message: Your speed has been decreased by a Secret Trap.
+	 */
+	public static final SystemMessageId SLOWED_BY_TRAP = new SystemMessageId(814);
+	
+	/**
+	 * ID: 815<br>
+	 * Message: The tryouts are about to begin. Line up!
+	 */
+	public static final SystemMessageId TRYOUTS_ABOUT_TO_BEGIN = new SystemMessageId(815);
+	
+	/**
+	 * ID: 816<br>
+	 * Message: Tickets are now available for Monster Race $s1!
+	 */
+	public static final SystemMessageId MONSRACE_TICKETS_AVAILABLE_FOR_S1_RACE = new SystemMessageId(816);
+	
+	/**
+	 * ID: 817<br>
+	 * Message: Now selling tickets for Monster Race $s1!
+	 */
+	public static final SystemMessageId MONSRACE_TICKETS_NOW_AVAILABLE_FOR_S1_RACE = new SystemMessageId(817);
+	
+	/**
+	 * ID: 818<br>
+	 * Message: Ticket sales for the Monster Race will end in $s1 minute(s).
+	 */
+	public static final SystemMessageId MONSRACE_TICKETS_STOP_IN_S1_MINUTES = new SystemMessageId(818);
+	
+	/**
+	 * ID: 819<br>
+	 * Message: Tickets sales are closed for Monster Race $s1. Odds are posted.
+	 */
+	public static final SystemMessageId MONSRACE_S1_TICKET_SALES_CLOSED = new SystemMessageId(819);
+	
+	/**
+	 * ID: 820<br>
+	 * Message: Monster Race $s2 will begin in $s1 minute(s)!
+	 */
+	public static final SystemMessageId MONSRACE_S2_BEGINS_IN_S1_MINUTES = new SystemMessageId(820);
+	
+	/**
+	 * ID: 821<br>
+	 * Message: Monster Race $s1 will begin in 30 seconds!
+	 */
+	public static final SystemMessageId MONSRACE_S1_BEGINS_IN_30_SECONDS = new SystemMessageId(821);
+	
+	/**
+	 * ID: 822<br>
+	 * Message: Monster Race $s1 is about to begin! Countdown in five seconds!
+	 */
+	public static final SystemMessageId MONSRACE_S1_COUNTDOWN_IN_FIVE_SECONDS = new SystemMessageId(822);
+	
+	/**
+	 * ID: 823<br>
+	 * Message: The race will begin in $s1 second(s)!
+	 */
+	public static final SystemMessageId MONSRACE_BEGINS_IN_S1_SECONDS = new SystemMessageId(823);
+	
+	/**
+	 * ID: 824<br>
+	 * Message: They're off!
+	 */
+	public static final SystemMessageId MONSRACE_RACE_START = new SystemMessageId(824);
+	
+	/**
+	 * ID: 825<br>
+	 * Message: Monster Race $s1 is finished!
+	 */
+	public static final SystemMessageId MONSRACE_S1_RACE_END = new SystemMessageId(825);
+	
+	/**
+	 * ID: 826<br>
+	 * Message: First prize goes to the player in lane $s1. Second prize goes to the player in lane $s2.
+	 */
+	public static final SystemMessageId MONSRACE_FIRST_PLACE_S1_SECOND_S2 = new SystemMessageId(826);
+	
+	/**
+	 * ID: 827<br>
+	 * Message: You may not impose a block on a GM.
+	 */
+	public static final SystemMessageId YOU_MAY_NOT_IMPOSE_A_BLOCK_ON_GM = new SystemMessageId(827);
+	
+	/**
+	 * ID: 828<br>
+	 * Message: Are you sure you wish to delete the $s1 macro?
+	 */
+	public static final SystemMessageId WISH_TO_DELETE_S1_MACRO = new SystemMessageId(828);
+	
+	/**
+	 * ID: 829<br>
+	 * Message: You cannot recommend yourself.
+	 */
+	public static final SystemMessageId YOU_CANNOT_RECOMMEND_YOURSELF = new SystemMessageId(829);
+	
+	/**
+	 * ID: 830<br>
+	 * Message: You have recommended $c1. You have $s2 recommendations left.
+	 */
+	public static final SystemMessageId YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT = new SystemMessageId(830);
+	
+	/**
+	 * ID: 831<br>
+	 * Message: You have been recommended by $c1.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_RECOMMENDED_BY_C1 = new SystemMessageId(831);
+	
+	/**
+	 * ID: 832<br>
+	 * Message: That character has already been recommended.
+	 */
+	public static final SystemMessageId THAT_CHARACTER_IS_RECOMMENDED = new SystemMessageId(832);
+	
+	/**
+	 * ID: 833<br>
+	 * Message: You are not authorized to make further recommendations at this time. You will receive more recommendation credits each day at 1 p.m.
+	 */
+	public static final SystemMessageId NO_MORE_RECOMMENDATIONS_TO_HAVE = new SystemMessageId(833);
+	
+	/**
+	 * ID: 834<br>
+	 * Message: $c1 has rolled a $s2.
+	 */
+	public static final SystemMessageId C1_ROLLED_S2 = new SystemMessageId(834);
+	
+	/**
+	 * ID: 835<br>
+	 * Message: You may not throw the dice at this time. Try again later.
+	 */
+	public static final SystemMessageId YOU_MAY_NOT_THROW_THE_DICE_AT_THIS_TIME_TRY_AGAIN_LATER = new SystemMessageId(835);
+	
+	/**
+	 * ID: 836<br>
+	 * Message: You have exceeded your inventory volume limit and cannot take this item.
+	 */
+	public static final SystemMessageId YOU_HAVE_EXCEEDED_YOUR_INVENTORY_VOLUME_LIMIT_AND_CANNOT_TAKE_THIS_ITEM = new SystemMessageId(836);
+	
+	/**
+	 * ID: 837<br>
+	 * Message: Macro descriptions may contain up to 32 characters.
+	 */
+	public static final SystemMessageId MACRO_DESCRIPTION_MAX_32_CHARS = new SystemMessageId(837);
+	
+	/**
+	 * ID: 838<br>
+	 * Message: Enter the name of the macro.
+	 */
+	public static final SystemMessageId ENTER_THE_MACRO_NAME = new SystemMessageId(838);
+	
+	/**
+	 * ID: 839<br>
+	 * Message: That name is already assigned to another macro.
+	 */
+	public static final SystemMessageId MACRO_NAME_ALREADY_USED = new SystemMessageId(839);
+	
+	/**
+	 * ID: 840<br>
+	 * Message: That recipe is already registered.
+	 */
+	public static final SystemMessageId RECIPE_ALREADY_REGISTERED = new SystemMessageId(840);
+	
+	/**
+	 * ID: 841<br>
+	 * Message: No further recipes may be registered.
+	 */
+	public static final SystemMessageId NO_FUTHER_RECIPES_CAN_BE_ADDED = new SystemMessageId(841);
+	
+	/**
+	 * ID: 842<br>
+	 * Message: You are not authorized to register a recipe.
+	 */
+	public static final SystemMessageId NOT_AUTHORIZED_REGISTER_RECIPE = new SystemMessageId(842);
+	
+	/**
+	 * ID: 843<br>
+	 * Message: The siege of $s1 is finished.
+	 */
+	public static final SystemMessageId SIEGE_OF_S1_FINISHED = new SystemMessageId(843);
+	
+	/**
+	 * ID: 844<br>
+	 * Message: The siege to conquer $s1 has begun.
+	 */
+	public static final SystemMessageId SIEGE_OF_S1_BEGUN = new SystemMessageId(844);
+	
+	/**
+	 * ID: 845<br>
+	 * Message: The deadline to register for the siege of $s1 has passed.
+	 */
+	public static final SystemMessageId DEADLINE_FOR_SIEGE_S1_PASSED = new SystemMessageId(845);
+	
+	/**
+	 * ID: 846<br>
+	 * Message: The siege of $s1 has been canceled due to lack of interest.
+	 */
+	public static final SystemMessageId SIEGE_OF_S1_HAS_BEEN_CANCELED_DUE_TO_LACK_OF_INTEREST = new SystemMessageId(846);
+	
+	/**
+	 * ID: 847<br>
+	 * Message: A clan that owns a clan hall may not participate in a clan hall siege.
+	 */
+	public static final SystemMessageId CLAN_OWNING_CLANHALL_MAY_NOT_SIEGE_CLANHALL = new SystemMessageId(847);
+	
+	/**
+	 * ID: 848<br>
+	 * Message: $s1 has been deleted.
+	 */
+	public static final SystemMessageId S1_HAS_BEEN_DELETED = new SystemMessageId(848);
+	
+	/**
+	 * ID: 849<br>
+	 * Message: $s1 cannot be found.
+	 */
+	public static final SystemMessageId S1_NOT_FOUND = new SystemMessageId(849);
+	
+	/**
+	 * ID: 850<br>
+	 * Message: $s1 already exists.
+	 */
+	public static final SystemMessageId S1_ALREADY_EXISTS2 = new SystemMessageId(850);
+	
+	/**
+	 * ID: 851<br>
+	 * Message: $s1 has been added.
+	 */
+	public static final SystemMessageId S1_ADDED = new SystemMessageId(851);
+	
+	/**
+	 * ID: 852<br>
+	 * Message: The recipe is incorrect.
+	 */
+	public static final SystemMessageId RECIPE_INCORRECT = new SystemMessageId(852);
+	
+	/**
+	 * ID: 853<br>
+	 * Message: You may not alter your recipe book while engaged in manufacturing.
+	 */
+	public static final SystemMessageId CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING = new SystemMessageId(853);
+	
+	/**
+	 * ID: 854<br>
+	 * Message: You are missing $s2 $s1 required to create that.
+	 */
+	public static final SystemMessageId MISSING_S2_S1_TO_CREATE = new SystemMessageId(854);
+	
+	/**
+	 * ID: 855<br>
+	 * Message: $s1 clan has defeated $s2.
+	 */
+	public static final SystemMessageId S1_CLAN_DEFEATED_S2 = new SystemMessageId(855);
+	
+	/**
+	 * ID: 856<br>
+	 * Message: The siege of $s1 has ended in a draw.
+	 */
+	public static final SystemMessageId SIEGE_S1_DRAW = new SystemMessageId(856);
+	
+	/**
+	 * ID: 857<br>
+	 * Message: $s1 clan has won in the preliminary match of $s2.
+	 */
+	public static final SystemMessageId S1_CLAN_WON_MATCH_S2 = new SystemMessageId(857);
+	
+	/**
+	 * ID: 858<br>
+	 * Message: The preliminary match of $s1 has ended in a draw.
+	 */
+	public static final SystemMessageId MATCH_OF_S1_DRAW = new SystemMessageId(858);
+	
+	/**
+	 * ID: 859<br>
+	 * Message: Please register a recipe.
+	 */
+	public static final SystemMessageId PLEASE_REGISTER_RECIPE = new SystemMessageId(859);
+	
+	/**
+	 * ID: 860<br>
+	 * Message: You may not build your headquarters in close proximity to another headquarters.
+	 */
+	public static final SystemMessageId HEADQUARTERS_TOO_CLOSE = new SystemMessageId(860);
+	
+	/**
+	 * ID: 861<br>
+	 * Message: You have exceeded the maximum number of memos.
+	 */
+	public static final SystemMessageId TOO_MANY_MEMOS = new SystemMessageId(861);
+	
+	/**
+	 * ID: 862<br>
+	 * Message: Odds are not posted until ticket sales have closed.
+	 */
+	public static final SystemMessageId ODDS_NOT_POSTED = new SystemMessageId(862);
+	
+	/**
+	 * ID: 863<br>
+	 * Message: You feel the energy of fire.
+	 */
+	public static final SystemMessageId FEEL_ENERGY_FIRE = new SystemMessageId(863);
+	
+	/**
+	 * ID: 864<br>
+	 * Message: You feel the energy of water.
+	 */
+	public static final SystemMessageId FEEL_ENERGY_WATER = new SystemMessageId(864);
+	
+	/**
+	 * ID: 865<br>
+	 * Message: You feel the energy of wind.
+	 */
+	public static final SystemMessageId FEEL_ENERGY_WIND = new SystemMessageId(865);
+	
+	/**
+	 * ID: 866<br>
+	 * Message: You may no longer gather energy.
+	 */
+	public static final SystemMessageId NO_LONGER_ENERGY = new SystemMessageId(866);
+	
+	/**
+	 * ID: 867<br>
+	 * Message: The energy is depleted.
+	 */
+	public static final SystemMessageId ENERGY_DEPLETED = new SystemMessageId(867);
+	
+	/**
+	 * ID: 868<br>
+	 * Message: The energy of fire has been delivered.
+	 */
+	public static final SystemMessageId ENERGY_FIRE_DELIVERED = new SystemMessageId(868);
+	
+	/**
+	 * ID: 869<br>
+	 * Message: The energy of water has been delivered.
+	 */
+	public static final SystemMessageId ENERGY_WATER_DELIVERED = new SystemMessageId(869);
+	
+	/**
+	 * ID: 870<br>
+	 * Message: The energy of wind has been delivered.
+	 */
+	public static final SystemMessageId ENERGY_WIND_DELIVERED = new SystemMessageId(870);
+	
+	/**
+	 * ID: 871<br>
+	 * Message: The seed has been sown.
+	 */
+	public static final SystemMessageId THE_SEED_HAS_BEEN_SOWN = new SystemMessageId(871);
+	
+	/**
+	 * ID: 872<br>
+	 * Message: This seed may not be sown here.
+	 */
+	public static final SystemMessageId THIS_SEED_MAY_NOT_BE_SOWN_HERE = new SystemMessageId(872);
+	
+	/**
+	 * ID: 873<br>
+	 * Message: That character does not exist.
+	 */
+	public static final SystemMessageId CHARACTER_DOES_NOT_EXIST = new SystemMessageId(873);
+	
+	/**
+	 * ID: 874<br>
+	 * Message: The capacity of the warehouse has been exceeded.
+	 */
+	public static final SystemMessageId WAREHOUSE_CAPACITY_EXCEEDED = new SystemMessageId(874);
+	
+	/**
+	 * ID: 875<br>
+	 * Message: The transport of the cargo has been canceled.
+	 */
+	public static final SystemMessageId CARGO_CANCELED = new SystemMessageId(875);
+	
+	/**
+	 * ID: 876<br>
+	 * Message: The cargo was not delivered.
+	 */
+	public static final SystemMessageId CARGO_NOT_DELIVERED = new SystemMessageId(876);
+	
+	/**
+	 * ID: 877<br>
+	 * Message: The symbol has been added.
+	 */
+	public static final SystemMessageId SYMBOL_ADDED = new SystemMessageId(877);
+	
+	/**
+	 * ID: 878<br>
+	 * Message: The symbol has been deleted.
+	 */
+	public static final SystemMessageId SYMBOL_DELETED = new SystemMessageId(878);
+	
+	/**
+	 * ID: 879<br>
+	 * Message: The manor system is currently under maintenance.
+	 */
+	public static final SystemMessageId THE_MANOR_SYSTEM_IS_CURRENTLY_UNDER_MAINTENANCE = new SystemMessageId(879);
+	
+	/**
+	 * ID: 880<br>
+	 * Message: The transaction is complete.
+	 */
+	public static final SystemMessageId THE_TRANSACTION_IS_COMPLETE = new SystemMessageId(880);
+	
+	/**
+	 * ID: 881<br>
+	 * Message: There is a discrepancy on the invoice.
+	 */
+	public static final SystemMessageId THERE_IS_A_DISCREPANCY_ON_THE_INVOICE = new SystemMessageId(881);
+	
+	/**
+	 * ID: 882<br>
+	 * Message: The seed quantity is incorrect.
+	 */
+	public static final SystemMessageId THE_SEED_QUANTITY_IS_INCORRECT = new SystemMessageId(882);
+	
+	/**
+	 * ID: 883<br>
+	 * Message: The seed information is incorrect.
+	 */
+	public static final SystemMessageId THE_SEED_INFORMATION_IS_INCORRECT = new SystemMessageId(883);
+	
+	/**
+	 * ID: 884<br>
+	 * Message: The manor information has been updated.
+	 */
+	public static final SystemMessageId THE_MANOR_INFORMATION_HAS_BEEN_UPDATED = new SystemMessageId(884);
+	
+	/**
+	 * ID: 885<br>
+	 * Message: The number of crops is incorrect.
+	 */
+	public static final SystemMessageId THE_NUMBER_OF_CROPS_IS_INCORRECT = new SystemMessageId(885);
+	
+	/**
+	 * ID: 886<br>
+	 * Message: The crops are priced incorrectly.
+	 */
+	public static final SystemMessageId THE_CROPS_ARE_PRICED_INCORRECTLY = new SystemMessageId(886);
+	
+	/**
+	 * ID: 887<br>
+	 * Message: The type is incorrect.
+	 */
+	public static final SystemMessageId THE_TYPE_IS_INCORRECT = new SystemMessageId(887);
+	
+	/**
+	 * ID: 888<br>
+	 * Message: No crops can be purchased at this time.
+	 */
+	public static final SystemMessageId NO_CROPS_CAN_BE_PURCHASED_AT_THIS_TIME = new SystemMessageId(888);
+	
+	/**
+	 * ID: 889<br>
+	 * Message: The seed was successfully sown.
+	 */
+	public static final SystemMessageId THE_SEED_WAS_SUCCESSFULLY_SOWN = new SystemMessageId(889);
+	
+	/**
+	 * ID: 890<br>
+	 * Message: The seed was not sown.
+	 */
+	public static final SystemMessageId THE_SEED_WAS_NOT_SOWN = new SystemMessageId(890);
+	
+	/**
+	 * ID: 891<br>
+	 * Message: You are not authorized to harvest.
+	 */
+	public static final SystemMessageId YOU_ARE_NOT_AUTHORIZED_TO_HARVEST = new SystemMessageId(891);
+	
+	/**
+	 * ID: 892<br>
+	 * Message: The harvest has failed.
+	 */
+	public static final SystemMessageId THE_HARVEST_HAS_FAILED = new SystemMessageId(892);
+	
+	/**
+	 * ID: 893<br>
+	 * Message: The harvest failed because the seed was not sown.
+	 */
+	public static final SystemMessageId THE_HARVEST_FAILED_BECAUSE_THE_SEED_WAS_NOT_SOWN = new SystemMessageId(893);
+	
+	/**
+	 * ID: 894<br>
+	 * Message: Up to $s1 recipes can be registered.
+	 */
+	public static final SystemMessageId UP_TO_S1_RECIPES_CAN_REGISTER = new SystemMessageId(894);
+	
+	/**
+	 * ID: 895<br>
+	 * Message: No recipes have been registered.
+	 */
+	public static final SystemMessageId NO_RECIPES_REGISTERED = new SystemMessageId(895);
+	
+	/**
+	 * ID: 896<br>
+	 * Message: Quest recipes can not be registered.
+	 */
+	public static final SystemMessageId FERRY_AT_GLUDIN = new SystemMessageId(896);
+	
+	/**
+	 * ID: 897<br>
+	 * Message: The fee to create the item is incorrect.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_TALKING = new SystemMessageId(897);
+	
+	/**
+	 * ID: 898<br>
+	 * Message: Only characters of level 10 or above are authorized to make recommendations.
+	 */
+	public static final SystemMessageId ONLY_LEVEL_SUP_10_CAN_RECOMMEND = new SystemMessageId(898);
+	
+	/**
+	 * ID: 899<br>
+	 * Message: The symbol cannot be drawn.
+	 */
+	public static final SystemMessageId CANT_DRAW_SYMBOL = new SystemMessageId(899);
+	
+	/**
+	 * ID: 900<br>
+	 * Message: No slot exists to draw the symbol.
+	 */
+	public static final SystemMessageId SYMBOLS_FULL = new SystemMessageId(900);
+	
+	/**
+	 * ID: 901<br>
+	 * Message: The symbol information cannot be found.
+	 */
+	public static final SystemMessageId SYMBOL_NOT_FOUND = new SystemMessageId(901);
+	
+	/**
+	 * ID: 902<br>
+	 * Message: You don't possess the correct number of items.
+	 */
+	public static final SystemMessageId NUMBER_INCORRECT = new SystemMessageId(902);
+	
+	/**
+	 * ID: 903<br>
+	 * Message: You may not submit a petition while frozen. Be patient.
+	 */
+	public static final SystemMessageId NO_PETITION_WHILE_FROZEN = new SystemMessageId(903);
+	
+	/**
+	 * ID: 904<br>
+	 * Message: Items cannot be discarded while in a private store.
+	 */
+	public static final SystemMessageId NO_DISCARD_WHILE_PRIVATE_STORE = new SystemMessageId(904);
+	
+	/**
+	 * ID: 905<br>
+	 * Message: The current score for the Humans is $s1.
+	 */
+	public static final SystemMessageId HUMAN_SCORE_S1 = new SystemMessageId(905);
+	
+	/**
+	 * ID: 906<br>
+	 * Message: The current score for the Elves is $s1.
+	 */
+	public static final SystemMessageId ELVES_SCORE_S1 = new SystemMessageId(906);
+	
+	/**
+	 * ID: 907<br>
+	 * Message: The current score for the Dark Elves is $s1.
+	 */
+	public static final SystemMessageId DARK_ELVES_SCORE_S1 = new SystemMessageId(907);
+	
+	/**
+	 * ID: 908<br>
+	 * Message: The current score for the Orcs is $s1.
+	 */
+	public static final SystemMessageId ORCS_SCORE_S1 = new SystemMessageId(908);
+	
+	/**
+	 * ID: 909<br>
+	 * Message: The current score for the Dwarves is $s1.
+	 */
+	public static final SystemMessageId DWARVEN_SCORE_S1 = new SystemMessageId(909);
+	
+	/**
+	 * ID: 910<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near Talking Island Village)
+	 */
+	public static final SystemMessageId LOC_TI_S1_S2_S3 = new SystemMessageId(910);
+	
+	/**
+	 * ID: 911<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near Gludin Village)
+	 */
+	public static final SystemMessageId LOC_GLUDIN_S1_S2_S3 = new SystemMessageId(911);
+	
+	/**
+	 * ID: 912<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Town of Gludio)
+	 */
+	public static final SystemMessageId LOC_GLUDIO_S1_S2_S3 = new SystemMessageId(912);
+	
+	/**
+	 * ID: 913<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Neutral Zone)
+	 */
+	public static final SystemMessageId LOC_NEUTRAL_ZONE_S1_S2_S3 = new SystemMessageId(913);
+	
+	/**
+	 * ID: 914<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Elven Village)
+	 */
+	public static final SystemMessageId LOC_ELVEN_S1_S2_S3 = new SystemMessageId(914);
+	
+	/**
+	 * ID: 915<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Dark Elf Village)
+	 */
+	public static final SystemMessageId LOC_DARK_ELVEN_S1_S2_S3 = new SystemMessageId(915);
+	
+	/**
+	 * ID: 916<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Town of Dion)
+	 */
+	public static final SystemMessageId LOC_DION_S1_S2_S3 = new SystemMessageId(916);
+	
+	/**
+	 * ID: 917<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Floran Village)
+	 */
+	public static final SystemMessageId LOC_FLORAN_S1_S2_S3 = new SystemMessageId(917);
+	
+	/**
+	 * ID: 918<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Town of Giran)
+	 */
+	public static final SystemMessageId LOC_GIRAN_S1_S2_S3 = new SystemMessageId(918);
+	
+	/**
+	 * ID: 919<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near Giran Harbor)
+	 */
+	public static final SystemMessageId LOC_GIRAN_HARBOR_S1_S2_S3 = new SystemMessageId(919);
+	
+	/**
+	 * ID: 920<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Orc Village)
+	 */
+	public static final SystemMessageId LOC_ORC_S1_S2_S3 = new SystemMessageId(920);
+	
+	/**
+	 * ID: 921<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Dwarven Village)
+	 */
+	public static final SystemMessageId LOC_DWARVEN_S1_S2_S3 = new SystemMessageId(921);
+	
+	/**
+	 * ID: 922<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Town of Oren)
+	 */
+	public static final SystemMessageId LOC_OREN_S1_S2_S3 = new SystemMessageId(922);
+	
+	/**
+	 * ID: 923<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near Hunters Village)
+	 */
+	public static final SystemMessageId LOC_HUNTER_S1_S2_S3 = new SystemMessageId(923);
+	
+	/**
+	 * ID: 924<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near Aden Castle Town)
+	 */
+	public static final SystemMessageId LOC_ADEN_S1_S2_S3 = new SystemMessageId(924);
+	
+	/**
+	 * ID: 925<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near the Coliseum)
+	 */
+	public static final SystemMessageId LOC_COLISEUM_S1_S2_S3 = new SystemMessageId(925);
+	
+	/**
+	 * ID: 926<br>
+	 * Message: Current location : $s1, $s2, $s3 (Near Heine)
+	 */
+	public static final SystemMessageId LOC_HEINE_S1_S2_S3 = new SystemMessageId(926);
+	
+	/**
+	 * ID: 927<br>
+	 * Message: The current time is $s1:$s2.
+	 */
+	public static final SystemMessageId TIME_S1_S2_IN_THE_DAY = new SystemMessageId(927);
+	
+	/**
+	 * ID: 928<br>
+	 * Message: The current time is $s1:$s2.
+	 */
+	public static final SystemMessageId TIME_S1_S2_IN_THE_NIGHT = new SystemMessageId(928);
+	
+	/**
+	 * ID: 929<br>
+	 * Message: No compensation was given for the farm products.
+	 */
+	public static final SystemMessageId NO_COMPENSATION_FOR_FARM_PRODUCTS = new SystemMessageId(929);
+	
+	/**
+	 * ID: 930<br>
+	 * Message: Lottery tickets are not currently being sold.
+	 */
+	public static final SystemMessageId NO_LOTTERY_TICKETS_CURRENT_SOLD = new SystemMessageId(930);
+	
+	/**
+	 * ID: 931<br>
+	 * Message: The winning lottery ticket numbers have not yet been announced.
+	 */
+	public static final SystemMessageId LOTTERY_WINNERS_NOT_ANNOUNCED_YET = new SystemMessageId(931);
+	
+	/**
+	 * ID: 932<br>
+	 * Message: You cannot chat while in observation mode.
+	 */
+	public static final SystemMessageId NO_ALLCHAT_WHILE_OBSERVING = new SystemMessageId(932);
+	
+	/**
+	 * ID: 933<br>
+	 * Message: The seed pricing greatly differs from standard seed prices.
+	 */
+	public static final SystemMessageId THE_SEED_PRICING_GREATLY_DIFFERS_FROM_STANDARD_SEED_PRICES = new SystemMessageId(933);
+	
+	/**
+	 * ID: 934<br>
+	 * Message: It is a deleted recipe.
+	 */
+	public static final SystemMessageId A_DELETED_RECIPE = new SystemMessageId(934);
+	
+	/**
+	 * ID: 935<br>
+	 * Message: You do not have enough funds in the clan warehouse for the Manor to operate.
+	 */
+	public static final SystemMessageId THE_AMOUNT_IS_NOT_SUFFICIENT_AND_SO_THE_MANOR_IS_NOT_IN_OPERATION = new SystemMessageId(935);
+	
+	/**
+	 * ID: 936<br>
+	 * Message: Use $s1.
+	 */
+	public static final SystemMessageId USE_S1_ = new SystemMessageId(936);
+	
+	/**
+	 * ID: 937<br>
+	 * Message: Currently preparing for private workshop.
+	 */
+	public static final SystemMessageId PREPARING_PRIVATE_WORKSHOP = new SystemMessageId(937);
+	
+	/**
+	 * ID: 938<br>
+	 * Message: The community server is currently offline.
+	 */
+	public static final SystemMessageId CB_OFFLINE = new SystemMessageId(938);
+	
+	/**
+	 * ID: 939<br>
+	 * Message: You cannot exchange while blocking everything.
+	 */
+	public static final SystemMessageId NO_EXCHANGE_WHILE_BLOCKING = new SystemMessageId(939);
+	
+	/**
+	 * ID: 940<br>
+	 * Message: $s1 is blocking everything.
+	 */
+	public static final SystemMessageId S1_BLOCKED_EVERYTHING = new SystemMessageId(940);
+	
+	/**
+	 * ID: 941<br>
+	 * Message: Restart at Talking Island Village.
+	 */
+	public static final SystemMessageId RESTART_AT_TI = new SystemMessageId(941);
+	
+	/**
+	 * ID: 942<br>
+	 * Message: Restart at Gludin Village.
+	 */
+	public static final SystemMessageId RESTART_AT_GLUDIN = new SystemMessageId(942);
+	
+	/**
+	 * ID: 943<br>
+	 * Message: Restart at the Town of Gludin.
+	 */
+	public static final SystemMessageId RESTART_AT_GLUDIO = new SystemMessageId(943);
+	
+	/**
+	 * ID: 944<br>
+	 * Message: Restart at the Neutral Zone.
+	 */
+	public static final SystemMessageId RESTART_AT_NEUTRAL_ZONE = new SystemMessageId(944);
+	
+	/**
+	 * ID: 945<br>
+	 * Message: Restart at the Elven Village.
+	 */
+	public static final SystemMessageId RESTART_AT_ELFEN_VILLAGE = new SystemMessageId(945);
+	
+	/**
+	 * ID: 946<br>
+	 * Message: Restart at the Dark Elf Village.
+	 */
+	public static final SystemMessageId RESTART_AT_DARKELF_VILLAGE = new SystemMessageId(946);
+	
+	/**
+	 * ID: 947<br>
+	 * Message: Restart at the Town of Dion.
+	 */
+	public static final SystemMessageId RESTART_AT_DION = new SystemMessageId(947);
+	
+	/**
+	 * ID: 948<br>
+	 * Message: Restart at Floran Village.
+	 */
+	public static final SystemMessageId RESTART_AT_FLORAN = new SystemMessageId(948);
+	
+	/**
+	 * ID: 949<br>
+	 * Message: Restart at the Town of Giran.
+	 */
+	public static final SystemMessageId RESTART_AT_GIRAN = new SystemMessageId(949);
+	
+	/**
+	 * ID: 950<br>
+	 * Message: Restart at Giran Harbor.
+	 */
+	public static final SystemMessageId RESTART_AT_GIRAN_HARBOR = new SystemMessageId(950);
+	
+	/**
+	 * ID: 951<br>
+	 * Message: Restart at the Orc Village.
+	 */
+	public static final SystemMessageId RESTART_AT_ORC_VILLAGE = new SystemMessageId(951);
+	
+	/**
+	 * ID: 952<br>
+	 * Message: Restart at the Dwarven Village.
+	 */
+	public static final SystemMessageId RESTART_AT_DWARFEN_VILLAGE = new SystemMessageId(952);
+	
+	/**
+	 * ID: 953<br>
+	 * Message: Restart at the Town of Oren.
+	 */
+	public static final SystemMessageId RESTART_AT_OREN = new SystemMessageId(953);
+	
+	/**
+	 * ID: 954<br>
+	 * Message: Restart at Hunters Village.
+	 */
+	public static final SystemMessageId RESTART_AT_HUNTERS_VILLAGE = new SystemMessageId(954);
+	
+	/**
+	 * ID: 955<br>
+	 * Message: Restart at the Town of Aden.
+	 */
+	public static final SystemMessageId RESTART_AT_ADEN = new SystemMessageId(955);
+	
+	/**
+	 * ID: 956<br>
+	 * Message: Restart at the Coliseum.
+	 */
+	public static final SystemMessageId RESTART_AT_COLISEUM = new SystemMessageId(956);
+	
+	/**
+	 * ID: 957<br>
+	 * Message: Restart at Heine.
+	 */
+	public static final SystemMessageId RESTART_AT_HEINE = new SystemMessageId(957);
+	
+	/**
+	 * ID: 958<br>
+	 * Message: Items cannot be discarded or destroyed while operating a private store or workshop.
+	 */
+	public static final SystemMessageId ITEMS_CANNOT_BE_DISCARDED_OR_DESTROYED_WHILE_OPERATING_PRIVATE_STORE_OR_WORKSHOP = new SystemMessageId(958);
+	
+	/**
+	 * ID: 959<br>
+	 * Message: $s1 (*$s2) manufactured successfully.
+	 */
+	public static final SystemMessageId S1_S2_MANUFACTURED_SUCCESSFULLY = new SystemMessageId(959);
+	
+	/**
+	 * ID: 960<br>
+	 * Message: You failed to manufacture $s1.
+	 */
+	public static final SystemMessageId S1_MANUFACTURE_FAILURE = new SystemMessageId(960);
+	
+	/**
+	 * ID: 961<br>
+	 * Message: You are now blocking everything.
+	 */
+	public static final SystemMessageId BLOCKING_ALL = new SystemMessageId(961);
+	
+	/**
+	 * ID: 962<br>
+	 * Message: You are no longer blocking everything.
+	 */
+	public static final SystemMessageId NOT_BLOCKING_ALL = new SystemMessageId(962);
+	
+	/**
+	 * ID: 963<br>
+	 * Message: Please determine the manufacturing price.
+	 */
+	public static final SystemMessageId DETERMINE_MANUFACTURE_PRICE = new SystemMessageId(963);
+	
+	/**
+	 * ID: 964<br>
+	 * Message: Chatting is prohibited for one minute.
+	 */
+	public static final SystemMessageId CHATBAN_FOR_1_MINUTE = new SystemMessageId(964);
+	
+	/**
+	 * ID: 965<br>
+	 * Message: The chatting prohibition has been removed.
+	 */
+	public static final SystemMessageId CHATBAN_REMOVED = new SystemMessageId(965);
+	
+	/**
+	 * ID: 966<br>
+	 * Message: Chatting is currently prohibited. If you try to chat before the prohibition is removed, the prohibition time will increase even further.
+	 */
+	public static final SystemMessageId CHATTING_IS_CURRENTLY_PROHIBITED = new SystemMessageId(966);
+	
+	/**
+	 * ID: 967<br>
+	 * Message: Do you accept $c1's party invitation? (Item Distribution: Random including spoil.)
+	 */
+	public static final SystemMessageId C1_PARTY_INVITE_RANDOM_INCLUDING_SPOIL = new SystemMessageId(967);
+	
+	/**
+	 * ID: 968<br>
+	 * Message: Do you accept $c1's party invitation? (Item Distribution: By Turn.)
+	 */
+	public static final SystemMessageId C1_PARTY_INVITE_BY_TURN = new SystemMessageId(968);
+	
+	/**
+	 * ID: 969<br>
+	 * Message: Do you accept $c1's party invitation? (Item Distribution: By Turn including spoil.)
+	 */
+	public static final SystemMessageId C1_PARTY_INVITE_BY_TURN_INCLUDING_SPOIL = new SystemMessageId(969);
+	
+	/**
+	 * ID: 970<br>
+	 * Message: $s2's MP has been drained by $c1.
+	 */
+	public static final SystemMessageId S2_MP_HAS_BEEN_DRAINED_BY_C1 = new SystemMessageId(970);
+	
+	/**
+	 * ID: 971<br>
+	 * Message: Petitions cannot exceed 255 characters.
+	 */
+	public static final SystemMessageId PETITION_MAX_CHARS_255 = new SystemMessageId(971);
+	
+	/**
+	 * ID: 972<br>
+	 * Message: This pet cannot use this item.
+	 */
+	public static final SystemMessageId PET_CANNOT_USE_ITEM = new SystemMessageId(972);
+	
+	/**
+	 * ID: 973<br>
+	 * Message: Please input no more than the number you have.
+	 */
+	public static final SystemMessageId INPUT_NO_MORE_YOU_HAVE = new SystemMessageId(973);
+	
+	/**
+	 * ID: 974<br>
+	 * Message: The soul crystal succeeded in absorbing a soul.
+	 */
+	public static final SystemMessageId SOUL_CRYSTAL_ABSORBING_SUCCEEDED = new SystemMessageId(974);
+	
+	/**
+	 * ID: 975<br>
+	 * Message: The soul crystal was not able to absorb the soul.
+	 */
+	public static final SystemMessageId SOUL_CRYSTAL_ABSORBING_FAILED = new SystemMessageId(975);
+	
+	/**
+	 * ID: 976<br>
+	 * Message: The soul crystal broke because it was not able to endure the soul energy.
+	 */
+	public static final SystemMessageId SOUL_CRYSTAL_BROKE = new SystemMessageId(976);
+	
+	/**
+	 * ID: 977<br>
+	 * Message: The soul crystal caused resonation and failed at absorbing a soul.
+	 */
+	public static final SystemMessageId SOUL_CRYSTAL_ABSORBING_FAILED_RESONATION = new SystemMessageId(977);
+	
+	/**
+	 * ID: 978<br>
+	 * Message: The soul crystal is refusing to absorb the soul.
+	 */
+	public static final SystemMessageId SOUL_CRYSTAL_ABSORBING_REFUSED = new SystemMessageId(978);
+	
+	/**
+	 * ID: 979<br>
+	 * Message: The ferry has arrived at Talking Island Harbor.
+	 */
+	public static final SystemMessageId FERRY_ARRIVED_AT_TALKING = new SystemMessageId(979);
+	
+	/**
+	 * ID: 980<br>
+	 * Message: The ferry will leave for Gludin Harbor after anchoring for ten minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_GLUDIN_AFTER_10_MINUTES = new SystemMessageId(980);
+	
+	/**
+	 * ID: 981<br>
+	 * Message: The ferry will leave for Gludin Harbor in five minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_GLUDIN_IN_5_MINUTES = new SystemMessageId(981);
+	
+	/**
+	 * ID: 982<br>
+	 * Message: The ferry will leave for Gludin Harbor in one minute.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_GLUDIN_IN_1_MINUTE = new SystemMessageId(982);
+	
+	/**
+	 * ID: 983<br>
+	 * Message: Those wishing to ride the ferry should make haste to get on.
+	 */
+	public static final SystemMessageId MAKE_HASTE_GET_ON_BOAT = new SystemMessageId(983);
+	
+	/**
+	 * ID: 984<br>
+	 * Message: The ferry will be leaving soon for Gludin Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_SOON_FOR_GLUDIN = new SystemMessageId(984);
+	
+	/**
+	 * ID: 985<br>
+	 * Message: The ferry is leaving for Gludin Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_FOR_GLUDIN = new SystemMessageId(985);
+	
+	/**
+	 * ID: 986<br>
+	 * Message: The ferry has arrived at Gludin Harbor.
+	 */
+	public static final SystemMessageId FERRY_ARRIVED_AT_GLUDIN = new SystemMessageId(986);
+	
+	/**
+	 * ID: 987<br>
+	 * Message: The ferry will leave for Talking Island Harbor after anchoring for ten minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_TALKING_AFTER_10_MINUTES = new SystemMessageId(987);
+	
+	/**
+	 * ID: 988<br>
+	 * Message: The ferry will leave for Talking Island Harbor in five minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_TALKING_IN_5_MINUTES = new SystemMessageId(988);
+	
+	/**
+	 * ID: 989<br>
+	 * Message: The ferry will leave for Talking Island Harbor in one minute.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_TALKING_IN_1_MINUTE = new SystemMessageId(989);
+	
+	/**
+	 * ID: 990<br>
+	 * Message: The ferry will be leaving soon for Talking Island Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_SOON_FOR_TALKING = new SystemMessageId(990);
+	
+	/**
+	 * ID: 991<br>
+	 * Message: The ferry is leaving for Talking Island Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_FOR_TALKING = new SystemMessageId(991);
+	
+	/**
+	 * ID: 992<br>
+	 * Message: The ferry has arrived at Giran Harbor.
+	 */
+	public static final SystemMessageId FERRY_ARRIVED_AT_GIRAN = new SystemMessageId(992);
+	
+	/**
+	 * ID: 993<br>
+	 * Message: The ferry will leave for Giran Harbor after anchoring for ten minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_GIRAN_AFTER_10_MINUTES = new SystemMessageId(993);
+	
+	/**
+	 * ID: 994<br>
+	 * Message: The ferry will leave for Giran Harbor in five minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_GIRAN_IN_5_MINUTES = new SystemMessageId(994);
+	
+	/**
+	 * ID: 995<br>
+	 * Message: The ferry will leave for Giran Harbor in one minute.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_FOR_GIRAN_IN_1_MINUTE = new SystemMessageId(995);
+	
+	/**
+	 * ID: 996<br>
+	 * Message: The ferry will be leaving soon for Giran Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVE_SOON_FOR_GIRAN = new SystemMessageId(996);
+	
+	/**
+	 * ID: 997<br>
+	 * Message: The ferry is leaving for Giran Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_FOR_GIRAN = new SystemMessageId(997);
+	
+	/**
+	 * ID: 998<br>
+	 * Message: The Innadril pleasure boat has arrived. It will anchor for ten minutes.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_ANCHOR_10_MINUTES = new SystemMessageId(998);
+	
+	/**
+	 * ID: 999<br>
+	 * Message: The Innadril pleasure boat will leave in five minutes.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_LEAVE_IN_5_MINUTES = new SystemMessageId(999);
+	
+	/**
+	 * ID: 1000<br>
+	 * Message: The Innadril pleasure boat will leave in one minute.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_LEAVE_IN_1_MINUTE = new SystemMessageId(1000);
+	
+	/**
+	 * ID: 1001<br>
+	 * Message: The Innadril pleasure boat will be leaving soon.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_LEAVE_SOON = new SystemMessageId(1001);
+	
+	/**
+	 * ID: 1002<br>
+	 * Message: The Innadril pleasure boat is leaving.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_LEAVING = new SystemMessageId(1002);
+	
+	/**
+	 * ID: 1003<br>
+	 * Message: Cannot process a monster race ticket.
+	 */
+	public static final SystemMessageId CANNOT_POSSES_MONS_TICKET = new SystemMessageId(1003);
+	
+	/**
+	 * ID: 1004<br>
+	 * Message: You have registered for a clan hall auction.
+	 */
+	public static final SystemMessageId REGISTERED_FOR_CLANHALL = new SystemMessageId(1004);
+	
+	/**
+	 * ID: 1005<br>
+	 * Message: There is not enough adena in the clan hall warehouse.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_ADENA_IN_CWH = new SystemMessageId(1005);
+	
+	/**
+	 * ID: 1006<br>
+	 * Message: Your bid has been successfully placed.
+	 */
+	public static final SystemMessageId BID_IN_CLANHALL_AUCTION = new SystemMessageId(1006);
+	
+	/**
+	 * ID: 1007<br>
+	 * Message: The preliminary match registration for $s1 has finished.
+	 */
+	public static final SystemMessageId PRELIMINARY_REGISTRATION_OF_S1_FINISHED = new SystemMessageId(1007);
+	
+	/**
+	 * ID: 1008<br>
+	 * Message: A hungry strider cannot be mounted or dismounted.
+	 */
+	public static final SystemMessageId HUNGRY_STRIDER_NOT_MOUNT = new SystemMessageId(1008);
+	
+	/**
+	 * ID: 1009<br>
+	 * Message: A strider cannot be ridden when dead.
+	 */
+	public static final SystemMessageId STRIDER_CANT_BE_RIDDEN_WHILE_DEAD = new SystemMessageId(1009);
+	
+	/**
+	 * ID: 1010<br>
+	 * Message: A dead strider cannot be ridden.
+	 */
+	public static final SystemMessageId DEAD_STRIDER_CANT_BE_RIDDEN = new SystemMessageId(1010);
+	
+	/**
+	 * ID: 1011<br>
+	 * Message: A strider in battle cannot be ridden.
+	 */
+	public static final SystemMessageId STRIDER_IN_BATLLE_CANT_BE_RIDDEN = new SystemMessageId(1011);
+	
+	/**
+	 * ID: 1012<br>
+	 * Message: A strider cannot be ridden while in battle.
+	 */
+	public static final SystemMessageId STRIDER_CANT_BE_RIDDEN_WHILE_IN_BATTLE = new SystemMessageId(1012);
+	
+	/**
+	 * ID: 1013<br>
+	 * Message: A strider can be ridden only when standing.
+	 */
+	public static final SystemMessageId STRIDER_CAN_BE_RIDDEN_ONLY_WHILE_STANDING = new SystemMessageId(1013);
+	
+	/**
+	 * ID: 1014<br>
+	 * Message: Your pet gained $s1 experience points.
+	 */
+	public static final SystemMessageId PET_EARNED_S1_EXP = new SystemMessageId(1014);
+	
+	/**
+	 * ID: 1015<br>
+	 * Message: Your pet hit for $s1 damage.
+	 */
+	public static final SystemMessageId PET_HIT_FOR_S1_DAMAGE = new SystemMessageId(1015);
+	
+	/**
+	 * ID: 1016<br>
+	 * Message: Your pet received $s2 damage by $c1.
+	 */
+	public static final SystemMessageId PET_RECEIVED_S2_DAMAGE_BY_C1 = new SystemMessageId(1016);
+	
+	/**
+	 * ID: 1017<br>
+	 * Message: Pet's critical hit!
+	 */
+	public static final SystemMessageId CRITICAL_HIT_BY_PET = new SystemMessageId(1017);
+	
+	/**
+	 * ID: 1018<br>
+	 * Message: Your pet uses $s1.
+	 */
+	public static final SystemMessageId PET_USES_S1 = new SystemMessageId(1018);
+	
+	/**
+	 * ID: 1019<br>
+	 * Message: Your pet uses $s1.
+	 */
+	public static final SystemMessageId PET_USES_S1_ = new SystemMessageId(1019);
+	
+	/**
+	 * ID: 1020<br>
+	 * Message: Your pet picked up $s1.
+	 */
+	public static final SystemMessageId PET_PICKED_S1 = new SystemMessageId(1020);
+	
+	/**
+	 * ID: 1021<br>
+	 * Message: Your pet picked up $s2 $s1(s).
+	 */
+	public static final SystemMessageId PET_PICKED_S2_S1_S = new SystemMessageId(1021);
+	
+	/**
+	 * ID: 1022<br>
+	 * Message: Your pet picked up +$s1 $s2.
+	 */
+	public static final SystemMessageId PET_PICKED_S1_S2 = new SystemMessageId(1022);
+	
+	/**
+	 * ID: 1023<br>
+	 * Message: Your pet picked up $s1 adena.
+	 */
+	public static final SystemMessageId PET_PICKED_S1_ADENA = new SystemMessageId(1023);
+	
+	/**
+	 * ID: 1024<br>
+	 * Message: Your pet put on $s1.
+	 */
+	public static final SystemMessageId PET_PUT_ON_S1 = new SystemMessageId(1024);
+	
+	/**
+	 * ID: 1025<br>
+	 * Message: Your pet took off $s1.
+	 */
+	public static final SystemMessageId PET_TOOK_OFF_S1 = new SystemMessageId(1025);
+	
+	/**
+	 * ID: 1026<br>
+	 * Message: The summoned monster gave damage of $s1.
+	 */
+	public static final SystemMessageId SUMMON_GAVE_DAMAGE_S1 = new SystemMessageId(1026);
+	
+	/**
+	 * ID: 1027<br>
+	 * Message: Servitor received $s2 damage caused by $s1.
+	 */
+	public static final SystemMessageId SUMMON_RECEIVED_DAMAGE_S2_BY_S1 = new SystemMessageId(1027);
+	
+	/**
+	 * ID: 1028<br>
+	 * Message: Summoned monster's critical hit!
+	 */
+	public static final SystemMessageId CRITICAL_HIT_BY_SUMMONED_MOB = new SystemMessageId(1028);
+	
+	/**
+	 * ID: 1029<br>
+	 * Message: A summoned monster uses $s1.
+	 */
+	public static final SystemMessageId SUMMONED_MOB_USES_S1 = new SystemMessageId(1029);
+	
+	/**
+	 * ID: 1030<br>
+	 * Message: <Party Information>
+	 */
+	public static final SystemMessageId PARTY_INFORMATION = new SystemMessageId(1030);
+	
+	/**
+	 * ID: 1031<br>
+	 * Message: Looting method: Finders keepers
+	 */
+	public static final SystemMessageId LOOTING_FINDERS_KEEPERS = new SystemMessageId(1031);
+	
+	/**
+	 * ID: 1032<br>
+	 * Message: Looting method: Random
+	 */
+	public static final SystemMessageId LOOTING_RANDOM = new SystemMessageId(1032);
+	
+	/**
+	 * ID: 1033<br>
+	 * Message: Looting method: Random including spoil
+	 */
+	public static final SystemMessageId LOOTING_RANDOM_INCLUDE_SPOIL = new SystemMessageId(1033);
+	
+	/**
+	 * ID: 1034<br>
+	 * Message: Looting method: By turn
+	 */
+	public static final SystemMessageId LOOTING_BY_TURN = new SystemMessageId(1034);
+	
+	/**
+	 * ID: 1035<br>
+	 * Message: Looting method: By turn including spoil
+	 */
+	public static final SystemMessageId LOOTING_BY_TURN_INCLUDE_SPOIL = new SystemMessageId(1035);
+	
+	/**
+	 * ID: 1036<br>
+	 * Message: You have exceeded the quantity that can be inputted.
+	 */
+	public static final SystemMessageId YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED = new SystemMessageId(1036);
+	
+	/**
+	 * ID: 1037<br>
+	 * Message: $c1 manufactured $s2.
+	 */
+	public static final SystemMessageId C1_MANUFACTURED_S2 = new SystemMessageId(1037);
+	
+	/**
+	 * ID: 1038<br>
+	 * Message: $c1 manufactured $s3 $s2(s).
+	 */
+	public static final SystemMessageId C1_MANUFACTURED_S3_S2_S = new SystemMessageId(1038);
+	
+	/**
+	 * ID: 1039<br>
+	 * Message: Items left at the clan hall warehouse can only be retrieved by the clan leader. Do you want to continue?
+	 */
+	public static final SystemMessageId ONLY_CLAN_LEADER_CAN_RETRIEVE_ITEMS_FROM_CLAN_WAREHOUSE = new SystemMessageId(1039);
+	
+	/**
+	 * ID: 1040<br>
+	 * Message: Dimensional Items sent that way can be retrieved from any Dimensional Merchant in all regions. Do you wish to continue?
+	 */
+	public static final SystemMessageId ITEMS_SENT_BY_FREIGHT_PICKED_UP_FROM_ANYWHERE = new SystemMessageId(1040);
+	
+	/**
+	 * ID: 1041<br>
+	 * Message: The next seed purchase price is $s1 adena.
+	 */
+	public static final SystemMessageId THE_NEXT_SEED_PURCHASE_PRICE_IS_S1_ADENA = new SystemMessageId(1041);
+	
+	/**
+	 * ID: 1042<br>
+	 * Message: The next farm goods purchase price is $s1 adena.
+	 */
+	public static final SystemMessageId THE_NEXT_FARM_GOODS_PURCHASE_PRICE_IS_S1_ADENA = new SystemMessageId(1042);
+	
+	/**
+	 * ID: 1043<br>
+	 * Message: At the current time, the "/unstuck" command cannot be used. Please send in a petition.
+	 */
+	public static final SystemMessageId NO_UNSTUCK_PLEASE_SEND_PETITION = new SystemMessageId(1043);
+	
+	/**
+	 * ID: 1044<br>
+	 * Message: Monster race payout information is not available while tickets are being sold.
+	 */
+	public static final SystemMessageId MONSRACE_NO_PAYOUT_INFO = new SystemMessageId(1044);
+	
+	/**
+	 * ID: 1046<br>
+	 * Message: Monster race tickets are no longer available.
+	 */
+	public static final SystemMessageId MONSRACE_TICKETS_NOT_AVAILABLE = new SystemMessageId(1046);
+	
+	/**
+	 * ID: 1047<br>
+	 * Message: We did not succeed in producing $s1 item.
+	 */
+	public static final SystemMessageId NOT_SUCCEED_PRODUCING_S1 = new SystemMessageId(1047);
+	
+	/**
+	 * ID: 1048<br>
+	 * Message: While 'blocking' everything, whispering is not possible.
+	 */
+	public static final SystemMessageId NO_WHISPER_WHEN_BLOCKING = new SystemMessageId(1048);
+	
+	/**
+	 * ID: 1049<br>
+	 * Message: While 'blocking' everything, it is not possible to send invitations for organizing parties.
+	 */
+	public static final SystemMessageId NO_PARTY_WHEN_BLOCKING = new SystemMessageId(1049);
+	
+	/**
+	 * ID: 1050<br>
+	 * Message: There are no communities in my clan. Clan communities are allowed for clans with skill levels of 2 and higher.
+	 */
+	public static final SystemMessageId NO_CB_IN_MY_CLAN = new SystemMessageId(1050);
+	
+	/**
+	 * ID: 1051<br>
+	 * Message: Payment for your clan hall has not been made. Please make payment to your clan warehouse by $s1 tomorrow.
+	 */
+	public static final SystemMessageId PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW = new SystemMessageId(1051);
+	
+	/**
+	 * ID: 1052<br>
+	 * Message: The clan hall fee is one week overdue; therefore the clan hall ownership has been revoked.
+	 */
+	public static final SystemMessageId THE_CLAN_HALL_FEE_IS_ONE_WEEK_OVERDUE_THEREFORE_THE_CLAN_HALL_OWNERSHIP_HAS_BEEN_REVOKED = new SystemMessageId(1052);
+	
+	/**
+	 * ID: 1053<br>
+	 * Message: It is not possible to resurrect in battlefields where a siege war is taking place.
+	 */
+	public static final SystemMessageId CANNOT_BE_RESURRECTED_DURING_SIEGE = new SystemMessageId(1053);
+	
+	/**
+	 * ID: 1054<br>
+	 * Message: You have entered a mystical land.
+	 */
+	public static final SystemMessageId ENTERED_MYSTICAL_LAND = new SystemMessageId(1054);
+	
+	/**
+	 * ID: 1055<br>
+	 * Message: You have left a mystical land.
+	 */
+	public static final SystemMessageId EXITED_MYSTICAL_LAND = new SystemMessageId(1055);
+	
+	/**
+	 * ID: 1056<br>
+	 * Message: You have exceeded the storage capacity of the castle's vault.
+	 */
+	public static final SystemMessageId VAULT_CAPACITY_EXCEEDED = new SystemMessageId(1056);
+	
+	/**
+	 * ID: 1057<br>
+	 * Message: This command can only be used in the relax server.
+	 */
+	public static final SystemMessageId RELAX_SERVER_ONLY = new SystemMessageId(1057);
+	
+	/**
+	 * ID: 1058<br>
+	 * Message: The sales price for seeds is $s1 adena.
+	 */
+	public static final SystemMessageId THE_SALES_PRICE_FOR_SEEDS_IS_S1_ADENA = new SystemMessageId(1058);
+	
+	/**
+	 * ID: 1059<br>
+	 * Message: The remaining purchasing amount is $s1 adena.
+	 */
+	public static final SystemMessageId THE_REMAINING_PURCHASING_IS_S1_ADENA = new SystemMessageId(1059);
+	
+	/**
+	 * ID: 1060<br>
+	 * Message: The remainder after selling the seeds is $s1.
+	 */
+	public static final SystemMessageId THE_REMAINDER_AFTER_SELLING_THE_SEEDS_IS_S1 = new SystemMessageId(1060);
+	
+	/**
+	 * ID: 1061<br>
+	 * Message: The recipe cannot be registered. You do not have the ability to create items.
+	 */
+	public static final SystemMessageId CANT_REGISTER_NO_ABILITY_TO_CRAFT = new SystemMessageId(1061);
+	
+	/**
+	 * ID: 1062<br>
+	 * Message: Writing something new is possible after level 10.
+	 */
+	public static final SystemMessageId WRITING_SOMETHING_NEW_POSSIBLE_AFTER_LEVEL_10 = new SystemMessageId(1062);
+	
+	/**
+	 * ID: 1063<br>
+	 * Message: The Petition Service is currently unavailable, please try again later; in the interim, if you become trapped or unable to move, please use the '/unstuck' command.
+	 */
+	public static final SystemMessageId PETITION_UNAVAILABLE = new SystemMessageId(1063);
+	
+	/**
+	 * ID: 1064<br>
+	 * Message: The equipment, +$s1 $s2, has been removed.
+	 */
+	public static final SystemMessageId EQUIPMENT_S1_S2_REMOVED = new SystemMessageId(1064);
+	
+	/**
+	 * ID: 1065<br>
+	 * Message: While operating a private store or workshop, you cannot discard, destroy, or trade an item.
+	 */
+	public static final SystemMessageId CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE = new SystemMessageId(1065);
+	
+	/**
+	 * ID: 1066<br>
+	 * Message: $s1 HP has been restored.
+	 */
+	public static final SystemMessageId S1_HP_HAS_BEEN_RESTORED = new SystemMessageId(1066);
+	
+	/**
+	 * ID: 1067<br>
+	 * Message: $s2 HP has been restored by $c1.
+	 */
+	public static final SystemMessageId S2_HP_HAS_BEEN_RESTORED_BY_C1 = new SystemMessageId(1067);
+	
+	/**
+	 * ID: 1068<br>
+	 * Message: $s1 MP has been restored.
+	 */
+	public static final SystemMessageId S1_MP_HAS_BEEN_RESTORED = new SystemMessageId(1068);
+	
+	/**
+	 * ID: 1069<br>
+	 * Message: $s2 MP has been restored by $c1.
+	 */
+	public static final SystemMessageId S2_MP_HAS_BEEN_RESTORED_BY_C1 = new SystemMessageId(1069);
+	
+	/**
+	 * ID: 1070<br>
+	 * Message: You do not have 'read' permission.
+	 */
+	public static final SystemMessageId NO_READ_PERMISSION = new SystemMessageId(1070);
+	
+	/**
+	 * ID: 1071<br>
+	 * Message: You do not have 'write' permission.
+	 */
+	public static final SystemMessageId NO_WRITE_PERMISSION = new SystemMessageId(1071);
+	
+	/**
+	 * ID: 1072<br>
+	 * Message: You have obtained a ticket for the Monster Race #$s1 - Single.
+	 */
+	public static final SystemMessageId OBTAINED_TICKET_FOR_MONS_RACE_S1_SINGLE = new SystemMessageId(1072);
+	
+	/**
+	 * ID: 1073<br>
+	 * Message: You have obtained a ticket for the Monster Race #$s1 - Single.
+	 */
+	public static final SystemMessageId OBTAINED_TICKET_FOR_MONS_RACE_S1_SINGLE_ = new SystemMessageId(1073);
+	
+	/**
+	 * ID: 1074<br>
+	 * Message: You do not meet the age requirement to purchase a Monster Race Ticket.
+	 */
+	public static final SystemMessageId NOT_MEET_AGE_REQUIREMENT_FOR_MONS_RACE = new SystemMessageId(1074);
+	
+	/**
+	 * ID: 1075<br>
+	 * Message: The bid amount must be higher than the previous bid.
+	 */
+	public static final SystemMessageId BID_AMOUNT_HIGHER_THAN_PREVIOUS_BID = new SystemMessageId(1075);
+	
+	/**
+	 * ID: 1076<br>
+	 * Message: The game cannot be terminated at this time.
+	 */
+	public static final SystemMessageId GAME_CANNOT_TERMINATE_NOW = new SystemMessageId(1076);
+	
+	/**
+	 * ID: 1077<br>
+	 * Message: A GameGuard Execution error has occurred. Please send the *.erl file(s) located in the GameGuard folder to game@inca.co.kr.
+	 */
+	public static final SystemMessageId GG_EXECUTION_ERROR = new SystemMessageId(1077);
+	
+	/**
+	 * ID: 1078<br>
+	 * Message: When a user's keyboard input exceeds a certain cumulative score a chat ban will be applied. This is done to discourage spamming. Please avoid posting the same message multiple times during a short period.
+	 */
+	public static final SystemMessageId DONT_SPAM = new SystemMessageId(1078);
+	
+	/**
+	 * ID: 1079<br>
+	 * Message:  The target is currently banned from chatting.
+	 */
+	public static final SystemMessageId TARGET_IS_CHAT_BANNED = new SystemMessageId(1079);
+	
+	/**
+	 * ID: 1080<br>
+	 * Message: Being permanent, are you sure you wish to use the facelift potion - Type A?
+	 */
+	public static final SystemMessageId FACELIFT_POTION_TYPE_A = new SystemMessageId(1080);
+	
+	/**
+	 * ID: 1081<br>
+	 * Message: Being permanent, are you sure you wish to use the hair dye potion - Type A?
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_A = new SystemMessageId(1081);
+	
+	/**
+	 * ID: 1082<br>
+	 * Message: Do you wish to use the hair style change potion – Type A? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_A = new SystemMessageId(1082);
+	
+	/**
+	 * ID: 1083<br>
+	 * Message: Facelift potion - Type A is being applied.
+	 */
+	public static final SystemMessageId FACELIFT_POTION_TYPE_A_APPLIED = new SystemMessageId(1083);
+	
+	/**
+	 * ID: 1084<br>
+	 * Message: Hair dye potion - Type A is being applied.
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_A_APPLIED = new SystemMessageId(1084);
+	
+	/**
+	 * ID: 1085<br>
+	 * Message: The hair style change potion - Type A is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_A_USED = new SystemMessageId(1085);
+	
+	/**
+	 * ID: 1086<br>
+	 * Message: Your facial appearance has been changed.
+	 */
+	public static final SystemMessageId FACE_APPEARANCE_CHANGED = new SystemMessageId(1086);
+	
+	/**
+	 * ID: 1087<br>
+	 * Message: Your hair color has been changed.
+	 */
+	public static final SystemMessageId HAIR_COLOR_CHANGED = new SystemMessageId(1087);
+	
+	/**
+	 * ID: 1088<br>
+	 * Message: Your hair style has been changed.
+	 */
+	public static final SystemMessageId HAIR_STYLE_CHANGED = new SystemMessageId(1088);
+	
+	/**
+	 * ID: 1089<br>
+	 * Message: $c1 has obtained a first anniversary commemorative item.
+	 */
+	public static final SystemMessageId C1_OBTAINED_ANNIVERSARY_ITEM = new SystemMessageId(1089);
+	
+	/**
+	 * ID: 1090<br>
+	 * Message: Being permanent, are you sure you wish to use the facelift potion - Type B?
+	 */
+	public static final SystemMessageId FACELIFT_POTION_TYPE_B = new SystemMessageId(1090);
+	
+	/**
+	 * ID: 1091<br>
+	 * Message: Being permanent, are you sure you wish to use the facelift potion - Type C?
+	 */
+	public static final SystemMessageId FACELIFT_POTION_TYPE_C = new SystemMessageId(1091);
+	
+	/**
+	 * ID: 1092<br>
+	 * Message: Being permanent, are you sure you wish to use the hair dye potion - Type B?
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_B = new SystemMessageId(1092);
+	
+	/**
+	 * ID: 1093<br>
+	 * Message: Being permanent, are you sure you wish to use the hair dye potion - Type C?
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_C = new SystemMessageId(1093);
+	
+	/**
+	 * ID: 1094<br>
+	 * Message: Being permanent, are you sure you wish to use the hair dye potion - Type D?
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_D = new SystemMessageId(1094);
+	
+	/**
+	 * ID: 1095<br>
+	 * Message: Do you wish to use the hair style change potion – Type B? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_B = new SystemMessageId(1095);
+	
+	/**
+	 * ID: 1096<br>
+	 * Message: Do you wish to use the hair style change potion – Type C? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_C = new SystemMessageId(1096);
+	
+	/**
+	 * ID: 1097<br>
+	 * Message: Do you wish to use the hair style change potion – Type D? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_D = new SystemMessageId(1097);
+	
+	/**
+	 * ID: 1098<br>
+	 * Message: Do you wish to use the hair style change potion – Type E? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_E = new SystemMessageId(1098);
+	
+	/**
+	 * ID: 1099<br>
+	 * Message: Do you wish to use the hair style change potion – Type F? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_F = new SystemMessageId(1099);
+	
+	/**
+	 * ID: 1100<br>
+	 * Message: Do you wish to use the hair style change potion – Type G? It is permanent.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_G = new SystemMessageId(1100);
+	
+	/**
+	 * ID: 1101<br>
+	 * Message: Facelift potion - Type B is being applied.
+	 */
+	public static final SystemMessageId FACELIFT_POTION_TYPE_B_APPLIED = new SystemMessageId(1101);
+	
+	/**
+	 * ID: 1102<br>
+	 * Message: Facelift potion - Type C is being applied.
+	 */
+	public static final SystemMessageId FACELIFT_POTION_TYPE_C_APPLIED = new SystemMessageId(1102);
+	
+	/**
+	 * ID: 1103<br>
+	 * Message: Hair dye potion - Type B is being applied.
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_B_APPLIED = new SystemMessageId(1103);
+	
+	/**
+	 * ID: 1104<br>
+	 * Message: Hair dye potion - Type C is being applied.
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_C_APPLIED = new SystemMessageId(1104);
+	
+	/**
+	 * ID: 1105<br>
+	 * Message: Hair dye potion - Type D is being applied.
+	 */
+	public static final SystemMessageId HAIRDYE_POTION_TYPE_D_APPLIED = new SystemMessageId(1105);
+	
+	/**
+	 * ID: 1106<br>
+	 * Message: The hair style change potion - Type B is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_B_USED = new SystemMessageId(1106);
+	
+	/**
+	 * ID: 1107<br>
+	 * Message: The hair style change potion - Type C is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_C_USED = new SystemMessageId(1107);
+	
+	/**
+	 * ID: 1108<br>
+	 * Message: The hair style change potion - Type D is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_D_USED = new SystemMessageId(1108);
+	
+	/**
+	 * ID: 1109<br>
+	 * Message: The hair style change potion - Type E is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_E_USED = new SystemMessageId(1109);
+	
+	/**
+	 * ID: 1110<br>
+	 * Message: The hair style change potion - Type F is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_F_USED = new SystemMessageId(1110);
+	
+	/**
+	 * ID: 1111<br>
+	 * Message: The hair style change potion - Type G is being used.
+	 */
+	public static final SystemMessageId HAIRSTYLE_POTION_TYPE_G_USED = new SystemMessageId(1111);
+	
+	/**
+	 * ID: 1112<br>
+	 * Message: The prize amount for the winner of Lottery #$s1 is $s2 adena. We have $s3 first prize winners.
+	 */
+	public static final SystemMessageId AMOUNT_FOR_WINNER_S1_IS_S2_ADENA_WE_HAVE_S3_PRIZE_WINNER = new SystemMessageId(1112);
+	
+	/**
+	 * ID: 1113<br>
+	 * Message: The prize amount for Lucky Lottery #$s1 is $s2 adena. There was no first prize winner in this drawing, therefore the jackpot will be added to the next drawing.
+	 */
+	public static final SystemMessageId AMOUNT_FOR_LOTTERY_S1_IS_S2_ADENA_NO_WINNER = new SystemMessageId(1113);
+	
+	/**
+	 * ID: 1114<br>
+	 * Message: Your clan may not register to participate in a siege while under a grace period of the clan's dissolution.
+	 */
+	public static final SystemMessageId CANT_PARTICIPATE_IN_SIEGE_WHILE_DISSOLUTION_IN_PROGRESS = new SystemMessageId(1114);
+	
+	/**
+	 * ID: 1115<br>
+	 * Message: Individuals may not surrender during combat.
+	 */
+	public static final SystemMessageId INDIVIDUALS_NOT_SURRENDER_DURING_COMBAT = new SystemMessageId(1115);
+	
+	/**
+	 * ID: 1116<br>
+	 * Message: You cannot leave a clan while engaged in combat.
+	 */
+	public static final SystemMessageId YOU_CANNOT_LEAVE_DURING_COMBAT = new SystemMessageId(1116);
+	
+	/**
+	 * ID: 1117<br>
+	 * Message: A clan member may not be dismissed during combat.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_CANNOT_BE_DISMISSED_DURING_COMBAT = new SystemMessageId(1117);
+	
+	/**
+	 * ID: 1118<br>
+	 * Message: Unable to process this request until your inventory's weight and slot count are less than 80 percent of capacity.
+	 */
+	public static final SystemMessageId INVENTORY_LESS_THAN_80_PERCENT = new SystemMessageId(1118);
+	
+	/**
+	 * ID: 1119<br>
+	 * Message: Quest was automatically canceled when you attempted to settle the accounts of your quest while your inventory exceeded 80 percent of capacity.
+	 */
+	public static final SystemMessageId QUEST_CANCELED_INVENTORY_EXCEEDS_80_PERCENT = new SystemMessageId(1119);
+	
+	/**
+	 * ID: 1120<br>
+	 * Message: You are still a member of the clan.
+	 */
+	public static final SystemMessageId STILL_CLAN_MEMBER = new SystemMessageId(1120);
+	
+	/**
+	 * ID: 1121<br>
+	 * Message: You do not have the right to vote.
+	 */
+	public static final SystemMessageId NO_RIGHT_TO_VOTE = new SystemMessageId(1121);
+	
+	/**
+	 * ID: 1122<br>
+	 * Message: There is no candidate.
+	 */
+	public static final SystemMessageId NO_CANDIDATE = new SystemMessageId(1122);
+	
+	/**
+	 * ID: 1123<br>
+	 * Message: Weight and volume limit have been exceeded. That skill is currently unavailable.
+	 */
+	public static final SystemMessageId WEIGHT_EXCEEDED_SKILL_UNAVAILABLE = new SystemMessageId(1123);
+	
+	/**
+	 * ID: 1124<br>
+	 * Message: Your recipe book may not be accessed while using a skill.
+	 */
+	public static final SystemMessageId NO_RECIPE_BOOK_WHILE_CASTING = new SystemMessageId(1124);
+	
+	/**
+	 * ID: 1125<br>
+	 * Message: Item creation is not possible while engaged in a trade.
+	 */
+	public static final SystemMessageId CANNOT_CREATED_WHILE_ENGAGED_IN_TRADING = new SystemMessageId(1125);
+	
+	/**
+	 * ID: 1126<br>
+	 * Message: You cannot enter a negative number.
+	 */
+	public static final SystemMessageId NO_NEGATIVE_NUMBER = new SystemMessageId(1126);
+	
+	/**
+	 * ID: 1127<br>
+	 * Message: The reward must be less than 10 times the standard price.
+	 */
+	public static final SystemMessageId REWARD_LESS_THAN_10_TIMES_STANDARD_PRICE = new SystemMessageId(1127);
+	
+	/**
+	 * ID: 1128<br>
+	 * Message: A private store may not be opened while using a skill.
+	 */
+	public static final SystemMessageId PRIVATE_STORE_NOT_WHILE_CASTING = new SystemMessageId(1128);
+	
+	/**
+	 * ID: 1129<br>
+	 * Message: This is not allowed while riding a ferry or boat.
+	 */
+	public static final SystemMessageId NOT_ALLOWED_ON_BOAT = new SystemMessageId(1129);
+	
+	/**
+	 * ID: 1130<br>
+	 * Message: You have dealt $s1 damage to your target and $s2 damage to the servitor.
+	 */
+	public static final SystemMessageId GIVEN_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_SERVITOR = new SystemMessageId(1130);
+	
+	/**
+	 * ID: 1131<br>
+	 * Message: It is now midnight and the effect of $s1 can be felt.
+	 */
+	public static final SystemMessageId NIGHT_EFFECT_APPLIES = new SystemMessageId(1131);
+	
+	/**
+	 * ID: 1132<br>
+	 * Message: It is dawn and the effect of $s1 will now disappear.
+	 */
+	public static final SystemMessageId DAY_EFFECT_DISAPPEARS = new SystemMessageId(1132);
+	
+	/**
+	 * ID: 1133<br>
+	 * Message: Since your HP has decreased, the effect of $s1 can be felt.
+	 */
+	public static final SystemMessageId HP_DECREASED_EFFECT_APPLIES = new SystemMessageId(1133);
+	
+	/**
+	 * ID: 1134<br>
+	 * Message: Since your HP has increased, the effect of $s1 will disappear.
+	 */
+	public static final SystemMessageId HP_INCREASED_EFFECT_DISAPPEARS = new SystemMessageId(1134);
+	
+	/**
+	 * ID: 1135<br>
+	 * Message: While you are engaged in combat, you cannot operate a private store or private workshop.
+	 */
+	public static final SystemMessageId CANT_OPERATE_PRIVATE_STORE_DURING_COMBAT = new SystemMessageId(1135);
+	
+	/**
+	 * ID: 1136<br>
+	 * Message: Since there was an account that used this IP and attempted to log in illegally, this account is not allowed to connect to the game server for $s1 minutes. Please use another game server.
+	 */
+	public static final SystemMessageId ACCOUNT_NOT_ALLOWED_TO_CONNECT = new SystemMessageId(1136);
+	
+	/**
+	 * ID: 1137<br>
+	 * Message: $c1 harvested $s3 $s2(s).
+	 */
+	public static final SystemMessageId C1_HARVESTED_S3_S2S = new SystemMessageId(1137);
+	
+	/**
+	 * ID: 1138<br>
+	 * Message: $c1 harvested $s2.
+	 */
+	public static final SystemMessageId C1_HARVESTED_S2S = new SystemMessageId(1138);
+	
+	/**
+	 * ID: 1139<br>
+	 * Message: The weight and volume limit of your inventory cannot be exceeded.
+	 */
+	public static final SystemMessageId INVENTORY_LIMIT_MUST_NOT_BE_EXCEEDED = new SystemMessageId(1139);
+	
+	/**
+	 * ID: 1140<br>
+	 * Message: Would you like to open the gate?
+	 */
+	public static final SystemMessageId WOULD_YOU_LIKE_TO_OPEN_THE_GATE = new SystemMessageId(1140);
+	
+	/**
+	 * ID: 1141<br>
+	 * Message: Would you like to close the gate?
+	 */
+	public static final SystemMessageId WOULD_YOU_LIKE_TO_CLOSE_THE_GATE = new SystemMessageId(1141);
+	
+	/**
+	 * ID: 1142<br>
+	 * Message: Since $s1 already exists nearby, you cannot summon it again.
+	 */
+	public static final SystemMessageId CANNOT_SUMMON_S1_AGAIN = new SystemMessageId(1142);
+	
+	/**
+	 * ID: 1143<br>
+	 * Message: Since you do not have enough items to maintain the servitor's stay, the servitor has disappeared.
+	 */
+	public static final SystemMessageId SERVITOR_DISAPPEARED_NOT_ENOUGH_ITEMS = new SystemMessageId(1143);
+	
+	/**
+	 * ID: 1144<br>
+	 * Message: You don't have anybody to chat with in the game.
+	 */
+	public static final SystemMessageId NOBODY_IN_GAME_TO_CHAT = new SystemMessageId(1144);
+	
+	/**
+	 * ID: 1145<br>
+	 * Message: $s2 has been created for $c1 after the payment of $s3 adena was received.
+	 */
+	public static final SystemMessageId S2_CREATED_FOR_C1_FOR_S3_ADENA = new SystemMessageId(1145);
+	
+	/**
+	 * ID: 1146<br>
+	 * Message: $c1 created $s2 after receiving $s3 adena.
+	 */
+	public static final SystemMessageId C1_CREATED_S2_FOR_S3_ADENA = new SystemMessageId(1146);
+	
+	/**
+	 * ID: 1147<br>
+	 * Message: $s2 $s3 have been created for $c1 at the price of $s4 adena.
+	 */
+	public static final SystemMessageId S2_S3_S_CREATED_FOR_C1_FOR_S4_ADENA = new SystemMessageId(1147);
+	
+	/**
+	 * ID: 1148<br>
+	 * Message: $c1 created $s2 $s3 at the price of $s4 adena.
+	 */
+	public static final SystemMessageId C1_CREATED_S2_S3_S_FOR_S4_ADENA = new SystemMessageId(1148);
+	
+	/**
+	 * ID: 1149<br>
+	 * Message: Your attempt to create $s2 for $c1 at the price of $s3 adena has failed.
+	 */
+	public static final SystemMessageId CREATION_OF_S2_FOR_C1_AT_S3_ADENA_FAILED = new SystemMessageId(1149);
+	
+	/**
+	 * ID: 1150<br>
+	 * Message: $c1 has failed to create $s2 at the price of $s3 adena.
+	 */
+	public static final SystemMessageId C1_FAILED_TO_CREATE_S2_FOR_S3_ADENA = new SystemMessageId(1150);
+	
+	/**
+	 * ID: 1151<br>
+	 * Message: $s2 is sold to $c1 for the price of $s3 adena.
+	 */
+	public static final SystemMessageId S2_SOLD_TO_C1_FOR_S3_ADENA = new SystemMessageId(1151);
+	
+	/**
+	 * ID: 1152<br>
+	 * Message: $s2 $s3 have been sold to $c1 for $s4 adena.
+	 */
+	public static final SystemMessageId S3_S2_S_SOLD_TO_C1_FOR_S4_ADENA = new SystemMessageId(1152);
+	
+	/**
+	 * ID: 1153<br>
+	 * Message: $s2 has been purchased from $c1 at the price of $s3 adena.
+	 */
+	public static final SystemMessageId S2_PURCHASED_FROM_C1_FOR_S3_ADENA = new SystemMessageId(1153);
+	
+	/**
+	 * ID: 1154<br>
+	 * Message: $s3 $s2 has been purchased from $c1 for $s4 adena.
+	 */
+	public static final SystemMessageId S3_S2_S_PURCHASED_FROM_C1_FOR_S4_ADENA = new SystemMessageId(1154);
+	
+	/**
+	 * ID: 1155<br>
+	 * Message: +$s2$s3 has been sold to $c1 at the price of $s4 adena.
+	 */
+	public static final SystemMessageId S3_S2_SOLD_TO_C1_FOR_S4_ADENA = new SystemMessageId(1155);
+	
+	/**
+	 * ID: 1156<br>
+	 * Message: +$s2$s3 has been purchased from $c1 at the price of $s4 adena.
+	 */
+	public static final SystemMessageId S2_S3_PURCHASED_FROM_C1_FOR_S4_ADENA = new SystemMessageId(1156);
+	
+	/**
+	 * ID: 1157<br>
+	 * Message: The preview state only lasts for 5 seconds. If you wish to continue, please click Confirm.
+	 */
+	public static final SystemMessageId TRYING_ON_STATE = new SystemMessageId(1157);
+	
+	/**
+	 * ID: 1158<br>
+	 * Message: You cannot dismount from this elevation.
+	 */
+	public static final SystemMessageId CANNOT_DISMOUNT_FROM_ELEVATION = new SystemMessageId(1158);
+	
+	/**
+	 * ID: 1159<br>
+	 * Message: The ferry from Talking Island will arrive at Gludin Harbor in approximately 10 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GLUDIN_10_MINUTES = new SystemMessageId(1159);
+	
+	/**
+	 * ID: 1160<br>
+	 * Message: The ferry from Talking Island will be arriving at Gludin Harbor in approximately 5 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GLUDIN_5_MINUTES = new SystemMessageId(1160);
+	
+	/**
+	 * ID: 1161<br>
+	 * Message: The ferry from Talking Island will be arriving at Gludin Harbor in approximately 1 minute.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GLUDIN_1_MINUTE = new SystemMessageId(1161);
+	
+	/**
+	 * ID: 1162<br>
+	 * Message: The ferry from Giran Harbor will be arriving at Talking Island in approximately 15 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GIRAN_ARRIVE_AT_TALKING_15_MINUTES = new SystemMessageId(1162);
+	
+	/**
+	 * ID: 1163<br>
+	 * Message: The ferry from Giran Harbor will be arriving at Talking Island in approximately 10 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GIRAN_ARRIVE_AT_TALKING_10_MINUTES = new SystemMessageId(1163);
+	
+	/**
+	 * ID: 1164<br>
+	 * Message: The ferry from Giran Harbor will be arriving at Talking Island in approximately 5 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GIRAN_ARRIVE_AT_TALKING_5_MINUTES = new SystemMessageId(1164);
+	
+	/**
+	 * ID: 1165<br>
+	 * Message: The ferry from Giran Harbor will be arriving at Talking Island in approximately 1 minute.
+	 */
+	public static final SystemMessageId FERRY_FROM_GIRAN_ARRIVE_AT_TALKING_1_MINUTE = new SystemMessageId(1165);
+	
+	/**
+	 * ID: 1166<br>
+	 * Message: The ferry from Talking Island will be arriving at Giran Harbor in approximately 20 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GIRAN_20_MINUTES = new SystemMessageId(1166);
+	
+	/**
+	 * ID: 1167<br>
+	 * Message: The ferry from Talking Island will be arriving at Giran Harbor in approximately 15 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GIRAN_15_MINUTES = new SystemMessageId(1167);
+	
+	/**
+	 * ID: 1168<br>
+	 * Message: The ferry from Talking Island will be arriving at Giran Harbor in approximately 10 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GIRAN_10_MINUTES = new SystemMessageId(1168);
+	
+	/**
+	 * ID: 1169<br>
+	 * Message: The ferry from Talking Island will be arriving at Giran Harbor in approximately 5 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GIRAN_5_MINUTES = new SystemMessageId(1169);
+	
+	/**
+	 * ID: 1170<br>
+	 * Message: The ferry from Talking Island will be arriving at Giran Harbor in approximately 1 minute.
+	 */
+	public static final SystemMessageId FERRY_FROM_TALKING_ARRIVE_AT_GIRAN_1_MINUTE = new SystemMessageId(1170);
+	
+	/**
+	 * ID: 1171<br>
+	 * Message: The Innadril pleasure boat will arrive in approximately 20 minutes.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_ARRIVE_20_MINUTES = new SystemMessageId(1171);
+	
+	/**
+	 * ID: 1172<br>
+	 * Message: The Innadril pleasure boat will arrive in approximately 15 minutes.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_ARRIVE_15_MINUTES = new SystemMessageId(1172);
+	
+	/**
+	 * ID: 1173<br>
+	 * Message: The Innadril pleasure boat will arrive in approximately 10 minutes.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_ARRIVE_10_MINUTES = new SystemMessageId(1173);
+	
+	/**
+	 * ID: 1174<br>
+	 * Message: The Innadril pleasure boat will arrive in approximately 5 minutes.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_ARRIVE_5_MINUTES = new SystemMessageId(1174);
+	
+	/**
+	 * ID: 1175<br>
+	 * Message: The Innadril pleasure boat will arrive in approximately 1 minute.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_ARRIVE_1_MINUTE = new SystemMessageId(1175);
+	
+	/**
+	 * ID: 1176<br>
+	 * Message: The SSQ Competition period is underway.
+	 */
+	public static final SystemMessageId SSQ_COMPETITION_UNDERWAY = new SystemMessageId(1176);
+	
+	/**
+	 * ID: 1177<br>
+	 * Message: This is the seal validation period.
+	 */
+	public static final SystemMessageId VALIDATION_PERIOD = new SystemMessageId(1177);
+	
+	/**
+	 * ID: 1178<br>
+	 * Message: This seal permits the group that holds it to exclusive entry to the dungeons opened by the Seal of Avarice during the seal validation period. It also permits trading with the Merchant of Mammon and permits meetings with Anakim or Lilith in the Disciple's Necropolis.
+	 */
+	public static final SystemMessageId AVARICE_DESCRIPTION = new SystemMessageId(1178);
+	
+	/**
+	 * ID: 1179<br>
+	 * Message: This seal permits the group that holds it to enter the dungeon opened by the Seal of Gnosis, use the teleportation service offered by the priest in the village, and do business with the Blacksmith of Mammon. The Orator of Revelations appears and casts good magic on the winners, and
+	 * the Preacher of Doom appears and casts bad magic on the losers.
+	 */
+	public static final SystemMessageId GNOSIS_DESCRIPTION = new SystemMessageId(1179);
+	
+	/**
+	 * ID: 1180<br>
+	 * Message: During the Seal Validation period, the cabal's maximum CP amount increases. In addition, the cabal possessing the seal will benefit from favorable changes in the cost to upgrade castle defense mercenaries, castle gates and walls; basic P. Def. of castle gates and walls; and the limit
+	 * imposed on the castle tax rate. The use of siege war weapons will also be limited. If the Revolutionary Army of Dusk takes possession of this seal during the castle siege war, only the clan that owns the castle can come to its defense.
+	 */
+	public static final SystemMessageId STRIFE_DESCRIPTION = new SystemMessageId(1180);
+	
+	/**
+	 * ID: 1181<br>
+	 * Message: Do you really wish to change the title?
+	 */
+	public static final SystemMessageId CHANGE_TITLE_CONFIRM = new SystemMessageId(1181);
+	
+	/**
+	 * ID: 1182<br>
+	 * Message: Are you sure you wish to delete the clan crest?
+	 */
+	public static final SystemMessageId CREST_DELETE_CONFIRM = new SystemMessageId(1182);
+	
+	/**
+	 * ID: 1183<br>
+	 * Message: This is the initial period.
+	 */
+	public static final SystemMessageId INITIAL_PERIOD = new SystemMessageId(1183);
+	
+	/**
+	 * ID: 1184<br>
+	 * Message: This is a period when server statistics are calculated.
+	 */
+	public static final SystemMessageId RESULTS_PERIOD = new SystemMessageId(1184);
+	
+	/**
+	 * ID: 1185<br>
+	 * Message: days left until deletion.
+	 */
+	public static final SystemMessageId DAYS_LEFT_UNTIL_DELETION = new SystemMessageId(1185);
+	
+	/**
+	 * ID: 1186<br>
+	 * Message: To create a new account, please visit the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId TO_CREATE_ACCOUNT_VISIT_WEBSITE = new SystemMessageId(1186);
+	
+	/**
+	 * ID: 1187<br>
+	 * Message: If you've forgotten your account information or password, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ACCOUNT_INFORMATION_FORGOTTON_VISIT_WEBSITE = new SystemMessageId(1187);
+	
+	/**
+	 * ID: 1188<br>
+	 * Message: Your selected target can no longer receive a recommendation.
+	 */
+	public static final SystemMessageId YOUR_TARGET_NO_LONGER_RECEIVE_A_RECOMMENDATION = new SystemMessageId(1188);
+	
+	/**
+	 * ID: 1189<br>
+	 * Message: The temporary alliance of the Castle Attacker team is in effect. It will be dissolved when the Castle Lord is replaced.
+	 */
+	public static final SystemMessageId TEMPORARY_ALLIANCE = new SystemMessageId(1189);
+	
+	/**
+	 * ID: 1190<br>
+	 * Message: The temporary alliance of the Castle Attacker team has been dissolved.
+	 */
+	public static final SystemMessageId TEMPORARY_ALLIANCE_DISSOLVED = new SystemMessageId(1190);
+	
+	/**
+	 * ID: 1191<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Talking Island in approximately 10 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_ARRIVE_AT_TALKING_10_MINUTES = new SystemMessageId(1191);
+	
+	/**
+	 * ID: 1192<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Talking Island in approximately 5 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_ARRIVE_AT_TALKING_5_MINUTES = new SystemMessageId(1192);
+	
+	/**
+	 * ID: 1193<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Talking Island in approximately 1 minute.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_ARRIVE_AT_TALKING_1_MINUTE = new SystemMessageId(1193);
+	
+	/**
+	 * ID: 1194<br>
+	 * Message: A mercenary can be assigned to a position from the beginning of the Seal Validation period until the time when a siege starts.
+	 */
+	public static final SystemMessageId MERC_CAN_BE_ASSIGNED = new SystemMessageId(1194);
+	
+	/**
+	 * ID: 1195<br>
+	 * Message: This mercenary cannot be assigned to a position by using the Seal of Strife.
+	 */
+	public static final SystemMessageId MERC_CANT_BE_ASSIGNED_USING_STRIFE = new SystemMessageId(1195);
+	
+	/**
+	 * ID: 1196<br>
+	 * Message: Your force has reached maximum capacity.
+	 */
+	public static final SystemMessageId FORCE_MAXIMUM = new SystemMessageId(1196);
+	
+	/**
+	 * ID: 1197<br>
+	 * Message: Summoning a servitor costs $s2 $s1.
+	 */
+	public static final SystemMessageId SUMMONING_SERVITOR_COSTS_S2_S1 = new SystemMessageId(1197);
+	
+	/**
+	 * ID: 1198<br>
+	 * Message: The item has been successfully crystallized.
+	 */
+	public static final SystemMessageId CRYSTALLIZATION_SUCCESSFUL = new SystemMessageId(1198);
+	
+	/**
+	 * ID: 1199<br>
+	 * Message: =======<Clan War Target>=======
+	 */
+	public static final SystemMessageId CLAN_WAR_HEADER = new SystemMessageId(1199);
+	
+	/**
+	 * ID: 1200<br>
+	 * Message: = $s1 ($s2 Alliance)
+	 */
+	public static final SystemMessageId S1_S2_ALLIANCE = new SystemMessageId(1200);
+	
+	/**
+	 * ID: 1201<br>
+	 * Message: Please select the quest you wish to abort.
+	 */
+	public static final SystemMessageId SELECT_QUEST_TO_ABOR = new SystemMessageId(1201);
+	
+	/**
+	 * ID: 1202<br>
+	 * Message: = $s1 (No alliance exists)
+	 */
+	public static final SystemMessageId S1_NO_ALLI_EXISTS = new SystemMessageId(1202);
+	
+	/**
+	 * ID: 1203<br>
+	 * Message: There is no clan war in progress.
+	 */
+	public static final SystemMessageId NO_WAR_IN_PROGRESS = new SystemMessageId(1203);
+	
+	/**
+	 * ID: 1204<br>
+	 * Message: The screenshot has been saved. ($s1 $s2x$s3)
+	 */
+	public static final SystemMessageId SCREENSHOT = new SystemMessageId(1204);
+	
+	/**
+	 * ID: 1205<br>
+	 * Message: Your mailbox is full. There is a 100 message limit.
+	 */
+	public static final SystemMessageId MAILBOX_FULL = new SystemMessageId(1205);
+	
+	/**
+	 * ID: 1206<br>
+	 * Message: The memo box is full. There is a 100 memo limit.
+	 */
+	public static final SystemMessageId MEMOBOX_FULL = new SystemMessageId(1206);
+	
+	/**
+	 * ID: 1207<br>
+	 * Message: Please make an entry in the field.
+	 */
+	public static final SystemMessageId MAKE_AN_ENTRY = new SystemMessageId(1207);
+	
+	/**
+	 * ID: 1208<br>
+	 * Message: $c1 died and dropped $s3 $s2.
+	 */
+	public static final SystemMessageId C1_DIED_DROPPED_S3_S2 = new SystemMessageId(1208);
+	
+	/**
+	 * ID: 1209<br>
+	 * Message: Congratulations. Your raid was successful.
+	 */
+	public static final SystemMessageId RAID_WAS_SUCCESSFUL = new SystemMessageId(1209);
+	
+	/**
+	 * ID: 1210<br>
+	 * Message: Seven Signs: The competition period has begun. Visit a Priest of Dawn or Priestess of Dusk to participate in the event.
+	 */
+	public static final SystemMessageId QUEST_EVENT_PERIOD_BEGUN = new SystemMessageId(1210);
+	
+	/**
+	 * ID: 1211<br>
+	 * Message: Seven Signs: The competition period has ended. The next quest event will start in one week.
+	 */
+	public static final SystemMessageId QUEST_EVENT_PERIOD_ENDED = new SystemMessageId(1211);
+	
+	/**
+	 * ID: 1212<br>
+	 * Message: Seven Signs: The Lords of Dawn have obtained the Seal of Avarice.
+	 */
+	public static final SystemMessageId DAWN_OBTAINED_AVARICE = new SystemMessageId(1212);
+	
+	/**
+	 * ID: 1213<br>
+	 * Message: Seven Signs: The Lords of Dawn have obtained the Seal of Gnosis.
+	 */
+	public static final SystemMessageId DAWN_OBTAINED_GNOSIS = new SystemMessageId(1213);
+	
+	/**
+	 * ID: 1214<br>
+	 * Message: Seven Signs: The Lords of Dawn have obtained the Seal of Strife.
+	 */
+	public static final SystemMessageId DAWN_OBTAINED_STRIFE = new SystemMessageId(1214);
+	
+	/**
+	 * ID: 1215<br>
+	 * Message: Seven Signs: The Revolutionaries of Dusk have obtained the Seal of Avarice.
+	 */
+	public static final SystemMessageId DUSK_OBTAINED_AVARICE = new SystemMessageId(1215);
+	
+	/**
+	 * ID: 1216<br>
+	 * Message: Seven Signs: The Revolutionaries of Dusk have obtained the Seal of Gnosis.
+	 */
+	public static final SystemMessageId DUSK_OBTAINED_GNOSIS = new SystemMessageId(1216);
+	
+	/**
+	 * ID: 1217<br>
+	 * Message: Seven Signs: The Revolutionaries of Dusk have obtained the Seal of Strife.
+	 */
+	public static final SystemMessageId DUSK_OBTAINED_STRIFE = new SystemMessageId(1217);
+	
+	/**
+	 * ID: 1218<br>
+	 * Message: Seven Signs: The Seal Validation period has begun.
+	 */
+	public static final SystemMessageId SEAL_VALIDATION_PERIOD_BEGUN = new SystemMessageId(1218);
+	
+	/**
+	 * ID: 1219<br>
+	 * Message: Seven Signs: The Seal Validation period has ended.
+	 */
+	public static final SystemMessageId SEAL_VALIDATION_PERIOD_ENDED = new SystemMessageId(1219);
+	
+	/**
+	 * ID: 1220<br>
+	 * Message: Are you sure you wish to summon it?
+	 */
+	public static final SystemMessageId SUMMON_CONFIRM = new SystemMessageId(1220);
+	
+	/**
+	 * ID: 1221<br>
+	 * Message: Do you really wish to return it?
+	 */
+	public static final SystemMessageId RETURN_CONFIRM = new SystemMessageId(1221);
+	
+	/**
+	 * ID: 1222<br>
+	 * Message: Current Location: $s1, $s2, $s3 (GM Consultation Area)
+	 */
+	public static final SystemMessageId LOC_GM_CONSULATION_SERVICE_S1_S2_S3 = new SystemMessageId(1222);
+	
+	/**
+	 * ID: 1223<br>
+	 * Message: We depart for Talking Island in five minutes.
+	 */
+	public static final SystemMessageId DEPART_FOR_TALKING_5_MINUTES = new SystemMessageId(1223);
+	
+	/**
+	 * ID: 1224<br>
+	 * Message: We depart for Talking Island in one minute.
+	 */
+	public static final SystemMessageId DEPART_FOR_TALKING_1_MINUTE = new SystemMessageId(1224);
+	
+	/**
+	 * ID: 1225<br>
+	 * Message: All aboard for Talking Island!
+	 */
+	public static final SystemMessageId DEPART_FOR_TALKING = new SystemMessageId(1225);
+	
+	/**
+	 * ID: 1226<br>
+	 * Message: We are now leaving for Talking Island.
+	 */
+	public static final SystemMessageId LEAVING_FOR_TALKING = new SystemMessageId(1226);
+	
+	/**
+	 * ID: 1227<br>
+	 * Message: You have $s1 unread messages.
+	 */
+	public static final SystemMessageId S1_UNREAD_MESSAGES = new SystemMessageId(1227);
+	
+	/**
+	 * ID: 1228<br>
+	 * Message: $c1 has blocked you. You cannot send mail to $c1.
+	 */
+	public static final SystemMessageId C1_BLOCKED_YOU_CANNOT_MAIL = new SystemMessageId(1228);
+	
+	/**
+	 * ID: 1229<br>
+	 * Message: No more messages may be sent at this time. Each account is allowed 10 messages per day.
+	 */
+	public static final SystemMessageId NO_MORE_MESSAGES_TODAY = new SystemMessageId(1229);
+	
+	/**
+	 * ID: 1230<br>
+	 * Message: You are limited to five recipients at a time.
+	 */
+	public static final SystemMessageId ONLY_FIVE_RECIPIENTS = new SystemMessageId(1230);
+	
+	/**
+	 * ID: 1231<br>
+	 * Message: You've sent mail.
+	 */
+	public static final SystemMessageId SENT_MAIL = new SystemMessageId(1231);
+	
+	/**
+	 * ID: 1232<br>
+	 * Message: The message was not sent.
+	 */
+	public static final SystemMessageId MESSAGE_NOT_SENT = new SystemMessageId(1232);
+	
+	/**
+	 * ID: 1233<br>
+	 * Message: You've got mail.
+	 */
+	public static final SystemMessageId NEW_MAIL = new SystemMessageId(1233);
+	
+	/**
+	 * ID: 1234<br>
+	 * Message: The mail has been stored in your temporary mailbox.
+	 */
+	public static final SystemMessageId MAIL_STORED_IN_MAILBOX = new SystemMessageId(1234);
+	
+	/**
+	 * ID: 1235<br>
+	 * Message: Do you wish to delete all your friends?
+	 */
+	public static final SystemMessageId ALL_FRIENDS_DELETE_CONFIRM = new SystemMessageId(1235);
+	
+	/**
+	 * ID: 1236<br>
+	 * Message: Please enter security card number.
+	 */
+	public static final SystemMessageId ENTER_SECURITY_CARD_NUMBER = new SystemMessageId(1236);
+	
+	/**
+	 * ID: 1237<br>
+	 * Message: Please enter the card number for number $s1.
+	 */
+	public static final SystemMessageId ENTER_CARD_NUMBER_FOR_S1 = new SystemMessageId(1237);
+	
+	/**
+	 * ID: 1238<br>
+	 * Message: Your temporary mailbox is full. No more mail can be stored; you have reached the 10 message limit.
+	 */
+	public static final SystemMessageId TEMP_MAILBOX_FULL = new SystemMessageId(1238);
+	
+	/**
+	 * ID: 1239<br>
+	 * Message: The keyboard security module has failed to load. Please exit the game and try again.
+	 */
+	public static final SystemMessageId KEYBOARD_MODULE_FAILED_LOAD = new SystemMessageId(1239);
+	
+	/**
+	 * ID: 1240<br>
+	 * Message: Seven Signs: The Revolutionaries of Dusk have won.
+	 */
+	public static final SystemMessageId DUSK_WON = new SystemMessageId(1240);
+	
+	/**
+	 * ID: 1241<br>
+	 * Message: Seven Signs: The Lords of Dawn have won.
+	 */
+	public static final SystemMessageId DAWN_WON = new SystemMessageId(1241);
+	
+	/**
+	 * ID: 1242<br>
+	 * Message: Users who have not verified their age may not log in between the hours of 10:00 p.m. and 6:00 a.m.
+	 */
+	public static final SystemMessageId NOT_VERIFIED_AGE_NO_LOGIN = new SystemMessageId(1242);
+	
+	/**
+	 * ID: 1243<br>
+	 * Message: The security card number is invalid.
+	 */
+	public static final SystemMessageId SECURITY_CARD_NUMBER_INVALID = new SystemMessageId(1243);
+	
+	/**
+	 * ID: 1244<br>
+	 * Message: Users who have not verified their age may not log in between the hours of 10:00 p.m. and 6:00 a.m. Logging off now.
+	 */
+	public static final SystemMessageId NOT_VERIFIED_AGE_LOG_OFF = new SystemMessageId(1244);
+	
+	/**
+	 * ID: 1245<br>
+	 * Message: You will be logged out in $s1 minutes.
+	 */
+	public static final SystemMessageId LOGOUT_IN_S1_MINUTES = new SystemMessageId(1245);
+	
+	/**
+	 * ID: 1246<br>
+	 * Message: $c1 has died and dropped $s2 adena.
+	 */
+	public static final SystemMessageId C1_DIED_DROPPED_S2_ADENA = new SystemMessageId(1246);
+	
+	/**
+	 * ID: 1247<br>
+	 * Message: The corpse is too old. The skill cannot be used.
+	 */
+	public static final SystemMessageId CORPSE_TOO_OLD_SKILL_NOT_USED = new SystemMessageId(1247);
+	
+	/**
+	 * ID: 1248<br>
+	 * Message: You are out of feed. Mount status canceled.
+	 */
+	public static final SystemMessageId OUT_OF_FEED_MOUNT_CANCELED = new SystemMessageId(1248);
+	
+	/**
+	 * ID: 1249<br>
+	 * Message: You may only ride a wyvern while you're riding a strider.
+	 */
+	public static final SystemMessageId YOU_MAY_ONLY_RIDE_WYVERN_WHILE_RIDING_STRIDER = new SystemMessageId(1249);
+	
+	/**
+	 * ID: 1250<br>
+	 * Message: Do you really want to surrender? If you surrender during an alliance war, your Exp will drop the same as if you were to die once.
+	 */
+	public static final SystemMessageId SURRENDER_ALLY_WAR_CONFIRM = new SystemMessageId(1250);
+	
+	/**
+	 * ID: 1251<br>
+	 * Message: Are you sure you want to dismiss the alliance? If you use the /allydismiss command, you will not be able to accept another clan to your alliance for one day.
+	 */
+	public static final SystemMessageId DISMISS_ALLY_CONFIRM = new SystemMessageId(1251);
+	
+	/**
+	 * ID: 1252<br>
+	 * Message: Are you sure you want to surrender? Exp penalty will be the same as death.
+	 */
+	public static final SystemMessageId SURRENDER_CONFIRM1 = new SystemMessageId(1252);
+	
+	/**
+	 * ID: 1253<br>
+	 * Message: Are you sure you want to surrender? Exp penalty will be the same as death and you will not be allowed to participate in clan war.
+	 */
+	public static final SystemMessageId SURRENDER_CONFIRM2 = new SystemMessageId(1253);
+	
+	/**
+	 * ID: 1254<br>
+	 * Message: Thank you for submitting feedback.
+	 */
+	public static final SystemMessageId THANKS_FOR_FEEDBACK = new SystemMessageId(1254);
+	
+	/**
+	 * ID: 1255<br>
+	 * Message: GM consultation has begun.
+	 */
+	public static final SystemMessageId GM_CONSULTATION_BEGUN = new SystemMessageId(1255);
+	
+	/**
+	 * ID: 1256<br>
+	 * Message: Please write the name after the command.
+	 */
+	public static final SystemMessageId PLEASE_WRITE_NAME_AFTER_COMMAND = new SystemMessageId(1256);
+	
+	/**
+	 * ID: 1257<br>
+	 * Message: The special skill of a servitor or pet cannot be registered as a macro.
+	 */
+	public static final SystemMessageId PET_SKILL_NOT_AS_MACRO = new SystemMessageId(1257);
+	
+	/**
+	 * ID: 1258<br>
+	 * Message: $s1 has been crystallized.
+	 */
+	public static final SystemMessageId S1_CRYSTALLIZED = new SystemMessageId(1258);
+	
+	/**
+	 * ID: 1259<br>
+	 * Message: =======<Alliance Target>=======
+	 */
+	public static final SystemMessageId ALLIANCE_TARGET_HEADER = new SystemMessageId(1259);
+	
+	/**
+	 * ID: 1260<br>
+	 * Message: Seven Signs: Preparations have begun for the next quest event.
+	 */
+	public static final SystemMessageId PREPARATIONS_PERIOD_BEGUN = new SystemMessageId(1260);
+	
+	/**
+	 * ID: 1261<br>
+	 * Message: Seven Signs: The quest event period has begun. Speak with a Priest of Dawn or Dusk Priestess if you wish to participate in the event.
+	 */
+	public static final SystemMessageId COMPETITION_PERIOD_BEGUN = new SystemMessageId(1261);
+	
+	/**
+	 * ID: 1262<br>
+	 * Message: Seven Signs: Quest event has ended. Results are being tallied.
+	 */
+	public static final SystemMessageId RESULTS_PERIOD_BEGUN = new SystemMessageId(1262);
+	
+	/**
+	 * ID: 1263<br>
+	 * Message: Seven Signs: This is the seal validation period. A new quest event period begins next Monday.
+	 */
+	public static final SystemMessageId VALIDATION_PERIOD_BEGUN = new SystemMessageId(1263);
+	
+	/**
+	 * ID: 1264<br>
+	 * Message: This soul stone cannot currently absorb souls. Absorption has failed.
+	 */
+	public static final SystemMessageId STONE_CANNOT_ABSORB = new SystemMessageId(1264);
+	
+	/**
+	 * ID: 1265<br>
+	 * Message: You can't absorb souls without a soul stone.
+	 */
+	public static final SystemMessageId CANT_ABSORB_WITHOUT_STONE = new SystemMessageId(1265);
+	
+	/**
+	 * ID: 1266<br>
+	 * Message: The exchange has ended.
+	 */
+	public static final SystemMessageId EXCHANGE_HAS_ENDED = new SystemMessageId(1266);
+	
+	/**
+	 * ID: 1267<br>
+	 * Message: Your contribution score has increased by $s1.
+	 */
+	public static final SystemMessageId CONTRIB_SCORE_INCREASED_S1 = new SystemMessageId(1267);
+	
+	/**
+	 * ID: 1268<br>
+	 * Message: Do you wish to add $s1 as your sub class?
+	 */
+	public static final SystemMessageId ADD_SUBCLASS_CONFIRM = new SystemMessageId(1268);
+	
+	/**
+	 * ID: 1269<br>
+	 * Message: The new subclass has been added.
+	 */
+	public static final SystemMessageId ADD_NEW_SUBCLASS = new SystemMessageId(1269);
+	
+	/**
+	 * ID: 1270<br>
+	 * Message: You have successfully switched to your subclass.
+	 */
+	public static final SystemMessageId SUBCLASS_TRANSFER_COMPLETED = new SystemMessageId(1270);
+	
+	/**
+	 * ID: 1271<br>
+	 * Message: Do you wish to participate? Until the next seal validation period, you will be a member of the Lords of Dawn.
+	 */
+	public static final SystemMessageId DAWN_CONFIRM = new SystemMessageId(1271);
+	
+	/**
+	 * ID: 1272<br>
+	 * Message: Do you wish to participate? Until the next seal validation period, you will be a member of the Revolutionaries of Dusk.
+	 */
+	public static final SystemMessageId DUSK_CONFIRM = new SystemMessageId(1272);
+	
+	/**
+	 * ID: 1273<br>
+	 * Message: You will participate in the Seven Signs as a member of the Lords of Dawn.
+	 */
+	public static final SystemMessageId SEVENSIGNS_PARTECIPATION_DAWN = new SystemMessageId(1273);
+	
+	/**
+	 * ID: 1274<br>
+	 * Message: You will participate in the Seven Signs as a member of the Revolutionaries of Dusk.
+	 */
+	public static final SystemMessageId SEVENSIGNS_PARTECIPATION_DUSK = new SystemMessageId(1274);
+	
+	/**
+	 * ID: 1275<br>
+	 * Message: You've chosen to fight for the Seal of Avarice during this quest event period.
+	 */
+	public static final SystemMessageId FIGHT_FOR_AVARICE = new SystemMessageId(1275);
+	
+	/**
+	 * ID: 1276<br>
+	 * Message: You've chosen to fight for the Seal of Gnosis during this quest event period.
+	 */
+	public static final SystemMessageId FIGHT_FOR_GNOSIS = new SystemMessageId(1276);
+	
+	/**
+	 * ID: 1277<br>
+	 * Message: You've chosen to fight for the Seal of Strife during this quest event period.
+	 */
+	public static final SystemMessageId FIGHT_FOR_STRIFE = new SystemMessageId(1277);
+	
+	/**
+	 * ID: 1278<br>
+	 * Message: The NPC server is not operating at this time.
+	 */
+	public static final SystemMessageId NPC_SERVER_NOT_OPERATING = new SystemMessageId(1278);
+	
+	/**
+	 * ID: 1279<br>
+	 * Message: Contribution level has exceeded the limit. You may not continue.
+	 */
+	public static final SystemMessageId CONTRIB_SCORE_EXCEEDED = new SystemMessageId(1279);
+	
+	/**
+	 * ID: 1280<br>
+	 * Message: Magic Critical Hit!
+	 */
+	public static final SystemMessageId CRITICAL_HIT_MAGIC = new SystemMessageId(1280);
+	
+	/**
+	 * ID: 1281<br>
+	 * Message: Your excellent shield defense was a success!
+	 */
+	public static final SystemMessageId YOUR_EXCELLENT_SHIELD_DEFENSE_WAS_A_SUCCESS = new SystemMessageId(1281);
+	
+	/**
+	 * ID: 1282<br>
+	 * Message: Your Karma has been changed to $s1.
+	 */
+	public static final SystemMessageId YOUR_KARMA_HAS_BEEN_CHANGED_TO_S1 = new SystemMessageId(1282);
+	
+	/**
+	 * ID: 1283<br>
+	 * Message: The Lower Detail option has been activated.
+	 */
+	public static final SystemMessageId MINIMUM_FRAME_ACTIVATED = new SystemMessageId(1283);
+	
+	/**
+	 * ID: 1284<br>
+	 * Message: The Lower Detail option has been deactivated.
+	 */
+	public static final SystemMessageId MINIMUM_FRAME_DEACTIVATED = new SystemMessageId(1284);
+	
+	/**
+	 * ID: 1285<br>
+	 * Message: No inventory exists. You cannot purchase an item.
+	 */
+	public static final SystemMessageId NO_INVENTORY_CANNOT_PURCHASE = new SystemMessageId(1285);
+	
+	/**
+	 * ID: 1286<br>
+	 * Message: (Until next Monday at 6:00 p.m.)
+	 */
+	public static final SystemMessageId UNTIL_MONDAY_6PM = new SystemMessageId(1286);
+	
+	/**
+	 * ID: 1287<br>
+	 * Message: (Until today at 6:00 p.m.)
+	 */
+	public static final SystemMessageId UNTIL_TODAY_6PM = new SystemMessageId(1287);
+	
+	/**
+	 * ID: 1288<br>
+	 * Message: If trends continue, $s1 will win and the seal will belong to:
+	 */
+	public static final SystemMessageId S1_WILL_WIN_COMPETITION = new SystemMessageId(1288);
+	
+	/**
+	 * ID: 1289<br>
+	 * Message: Since the seal was owned during the previous period and 10% or more people have participated.
+	 */
+	public static final SystemMessageId SEAL_OWNED_10_MORE_VOTED = new SystemMessageId(1289);
+	
+	/**
+	 * ID: 1290<br>
+	 * Message: Although the seal was not owned, 35% or more people have participated.
+	 */
+	public static final SystemMessageId SEAL_NOT_OWNED_35_MORE_VOTED = new SystemMessageId(1290);
+	
+	/**
+	 * ID: 1291<br>
+	 * Message: Although the seal was owned during the previous period, less than 10% of people have voted.
+	 */
+	public static final SystemMessageId SEAL_OWNED_10_LESS_VOTED = new SystemMessageId(1291);
+	
+	/**
+	 * ID: 1292<br>
+	 * Message: Since the seal was not owned during the previous period, and since less than 35 percent of people have voted.
+	 */
+	public static final SystemMessageId SEAL_NOT_OWNED_35_LESS_VOTED = new SystemMessageId(1292);
+	
+	/**
+	 * ID: 1293<br>
+	 * Message: If current trends continue, it will end in a tie.
+	 */
+	public static final SystemMessageId COMPETITION_WILL_TIE = new SystemMessageId(1293);
+	
+	/**
+	 * ID: 1294<br>
+	 * Message: The competition has ended in a tie. Therefore, nobody has been awarded the seal.
+	 */
+	public static final SystemMessageId COMPETITION_TIE_SEAL_NOT_AWARDED = new SystemMessageId(1294);
+	
+	/**
+	 * ID: 1295<br>
+	 * Message: Subclasses may not be created or changed while a skill is in use.
+	 */
+	public static final SystemMessageId SUBCLASS_NO_CHANGE_OR_CREATE_WHILE_SKILL_IN_USE = new SystemMessageId(1295);
+	
+	/**
+	 * ID: 1296<br>
+	 * Message: You cannot open a Private Store here.
+	 */
+	public static final SystemMessageId NO_PRIVATE_STORE_HERE = new SystemMessageId(1296);
+	
+	/**
+	 * ID: 1297<br>
+	 * Message: You cannot open a Private Workshop here.
+	 */
+	public static final SystemMessageId NO_PRIVATE_WORKSHOP_HERE = new SystemMessageId(1297);
+	
+	/**
+	 * ID: 1298<br>
+	 * Message: Please confirm that you would like to exit the Monster Race Track.
+	 */
+	public static final SystemMessageId MONS_EXIT_CONFIRM = new SystemMessageId(1298);
+	
+	/**
+	 * ID: 1299<br>
+	 * Message: $c1's casting has been interrupted.
+	 */
+	public static final SystemMessageId C1_CASTING_INTERRUPTED = new SystemMessageId(1299);
+	
+	/**
+	 * ID: 1300<br>
+	 * Message: You are no longer trying on equipment.
+	 */
+	public static final SystemMessageId WEAR_ITEMS_STOPPED = new SystemMessageId(1300);
+	
+	/**
+	 * ID: 1301<br>
+	 * Message: Only a Lord of Dawn may use this.
+	 */
+	public static final SystemMessageId CAN_BE_USED_BY_DAWN = new SystemMessageId(1301);
+	
+	/**
+	 * ID: 1302<br>
+	 * Message: Only a Revolutionary of Dusk may use this.
+	 */
+	public static final SystemMessageId CAN_BE_USED_BY_DUSK = new SystemMessageId(1302);
+	
+	/**
+	 * ID: 1303<br>
+	 * Message: This may only be used during the quest event period.
+	 */
+	public static final SystemMessageId CAN_BE_USED_DURING_QUEST_EVENT_PERIOD = new SystemMessageId(1303);
+	
+	/**
+	 * ID: 1304<br>
+	 * Message: The influence of the Seal of Strife has caused all defensive registrations to be canceled.
+	 */
+	public static final SystemMessageId STRIFE_CANCELED_DEFENSIVE_REGISTRATION = new SystemMessageId(1304);
+	
+	/**
+	 * ID: 1305<br>
+	 * Message: Seal Stones may only be transferred during the quest event period.
+	 */
+	public static final SystemMessageId SEAL_STONES_ONLY_WHILE_QUEST = new SystemMessageId(1305);
+	
+	/**
+	 * ID: 1306<br>
+	 * Message: You are no longer trying on equipment.
+	 */
+	public static final SystemMessageId NO_LONGER_TRYING_ON = new SystemMessageId(1306);
+	
+	/**
+	 * ID: 1307<br>
+	 * Message: Only during the seal validation period may you settle your account.
+	 */
+	public static final SystemMessageId SETTLE_ACCOUNT_ONLY_IN_SEAL_VALIDATION = new SystemMessageId(1307);
+	
+	/**
+	 * ID: 1308<br>
+	 * Message: Congratulations - You've completed a class transfer!
+	 */
+	public static final SystemMessageId CLASS_TRANSFER = new SystemMessageId(1308);
+	
+	/**
+	 * ID: 1309<br>
+	 * Message: To use this option, you must have the latest version of MSN Messenger installed on your computer.
+	 */
+	public static final SystemMessageId LATEST_MSN_REQUIRED = new SystemMessageId(1309);
+	
+	/**
+	 * ID: 1310<br>
+	 * Message: For full functionality, the latest version of MSN Messenger must be installed on your computer.
+	 */
+	public static final SystemMessageId LATEST_MSN_RECOMMENDED = new SystemMessageId(1310);
+	
+	/**
+	 * ID: 1311<br>
+	 * Message: Previous versions of MSN Messenger only provide the basic features for in-game MSN Messenger chat. Add/Delete Contacts and other MSN Messenger options are not available.
+	 */
+	public static final SystemMessageId MSN_ONLY_BASIC = new SystemMessageId(1311);
+	
+	/**
+	 * ID: 1312<br>
+	 * Message: The latest version of MSN Messenger may be obtained from the MSN web site (http://messenger.msn.com).
+	 */
+	public static final SystemMessageId MSN_OBTAINED_FROM = new SystemMessageId(1312);
+	
+	/**
+	 * ID: 1313<br>
+	 * Message: $s1, to better server our customers, all chat histories are stored and maintained by NCsoft. If you do not agree to have your chat records stored, please close the chat window now. For more information regarding this procedure, please visit our home page at www.PlayNC.com. Thank you!
+	 */
+	public static final SystemMessageId S1_CHAT_HISTORIES_STORED = new SystemMessageId(1313);
+	
+	/**
+	 * ID: 1314<br>
+	 * Message: Please enter the passport ID of the person you wish to add to your contact list.
+	 */
+	public static final SystemMessageId ENTER_PASSPORT_FOR_ADDING = new SystemMessageId(1314);
+	
+	/**
+	 * ID: 1315<br>
+	 * Message: Deleting a contact will remove that contact from MSN Messenger as well. The contact can still check your online status and will not be blocked from sending you a message.
+	 */
+	public static final SystemMessageId DELETING_A_CONTACT = new SystemMessageId(1315);
+	
+	/**
+	 * ID: 1316<br>
+	 * Message: The contact will be deleted and blocked from your contact list.
+	 */
+	public static final SystemMessageId CONTACT_WILL_DELETED = new SystemMessageId(1316);
+	
+	/**
+	 * ID: 1317<br>
+	 * Message: Would you like to delete this contact?
+	 */
+	public static final SystemMessageId CONTACT_DELETE_CONFIRM = new SystemMessageId(1317);
+	
+	/**
+	 * ID: 1318<br>
+	 * Message: Please select the contact you want to block or unblock.
+	 */
+	public static final SystemMessageId SELECT_CONTACT_FOR_BLOCK_UNBLOCK = new SystemMessageId(1318);
+	
+	/**
+	 * ID: 1319<br>
+	 * Message: Please select the name of the contact you wish to change to another group.
+	 */
+	public static final SystemMessageId SELECT_CONTACT_FOR_CHANGE_GROUP = new SystemMessageId(1319);
+	
+	/**
+	 * ID: 1320<br>
+	 * Message: After selecting the group you wish to move your contact to, press the OK button.
+	 */
+	public static final SystemMessageId SELECT_GROUP_PRESS_OK = new SystemMessageId(1320);
+	
+	/**
+	 * ID: 1321<br>
+	 * Message: Enter the name of the group you wish to add.
+	 */
+	public static final SystemMessageId ENTER_GROUP_NAME = new SystemMessageId(1321);
+	
+	/**
+	 * ID: 1322<br>
+	 * Message: Select the group and enter the new name.
+	 */
+	public static final SystemMessageId SELECT_GROUP_ENTER_NAME = new SystemMessageId(1322);
+	
+	/**
+	 * ID: 1323<br>
+	 * Message: Select the group you wish to delete and click the OK button.
+	 */
+	public static final SystemMessageId SELECT_GROUP_TO_DELETE = new SystemMessageId(1323);
+	
+	/**
+	 * ID: 1324<br>
+	 * Message: Signing in...
+	 */
+	public static final SystemMessageId SIGNING_IN = new SystemMessageId(1324);
+	
+	/**
+	 * ID: 1325<br>
+	 * Message: You've logged into another computer and have been logged out of the .NET Messenger Service on this computer.
+	 */
+	public static final SystemMessageId ANOTHER_COMPUTER_LOGOUT = new SystemMessageId(1325);
+	
+	/**
+	 * ID: 1326<br>
+	 * Message: $s1:
+	 */
+	public static final SystemMessageId S1_D = new SystemMessageId(1326);
+	
+	/**
+	 * ID: 1327<br>
+	 * Message: The following message could not be delivered:
+	 */
+	public static final SystemMessageId MESSAGE_NOT_DELIVERED = new SystemMessageId(1327);
+	
+	/**
+	 * ID: 1328<br>
+	 * Message: Members of the Revolutionaries of Dusk will not be resurrected.
+	 */
+	public static final SystemMessageId DUSK_NOT_RESURRECTED = new SystemMessageId(1328);
+	
+	/**
+	 * ID: 1329<br>
+	 * Message: You are currently blocked from using the Private Store and Private Workshop.
+	 */
+	public static final SystemMessageId BLOCKED_FROM_USING_STORE = new SystemMessageId(1329);
+	
+	/**
+	 * ID: 1330<br>
+	 * Message: You may not open a Private Store or Private Workshop for another $s1 minute(s).
+	 */
+	public static final SystemMessageId NO_STORE_FOR_S1_MINUTES = new SystemMessageId(1330);
+	
+	/**
+	 * ID: 1331<br>
+	 * Message: You are no longer blocked from using Private Stores or Private Workshops.
+	 */
+	public static final SystemMessageId NO_LONGER_BLOCKED_USING_STORE = new SystemMessageId(1331);
+	
+	/**
+	 * ID: 1332<br>
+	 * Message: Items may not be used after your character or pet dies.
+	 */
+	public static final SystemMessageId NO_ITEMS_AFTER_DEATH = new SystemMessageId(1332);
+	
+	/**
+	 * ID: 1333<br>
+	 * Message: The replay file is not accessible. Please verify that the replay.ini file exists in your Lineage 2 directory. Please note that footage from previous major updates are not accessible in newer updates.
+	 */
+	public static final SystemMessageId REPLAY_INACCESSIBLE = new SystemMessageId(1333);
+	
+	/**
+	 * ID: 1334<br>
+	 * Message: Your recording has been stored in the Replay folder.
+	 */
+	public static final SystemMessageId NEW_CAMERA_STORED = new SystemMessageId(1334);
+	
+	/**
+	 * ID: 1335<br>
+	 * Message: Your attempt to store this recording has failed.
+	 */
+	public static final SystemMessageId CAMERA_STORING_FAILED = new SystemMessageId(1335);
+	
+	/**
+	 * ID: 1336<br>
+	 * Message: The replay file, $s1.$s2 has been corrupted, please check the file.
+	 */
+	public static final SystemMessageId REPLAY_S1_S2_CORRUPTED = new SystemMessageId(1336);
+	
+	/**
+	 * ID: 1337<br>
+	 * Message: This will terminate the replay. Do you wish to continue?
+	 */
+	public static final SystemMessageId REPLAY_TERMINATE_CONFIRM = new SystemMessageId(1337);
+	
+	/**
+	 * ID: 1338<br>
+	 * Message: You have exceeded the maximum amount that may be transferred at one time.
+	 */
+	public static final SystemMessageId EXCEEDED_MAXIMUM_AMOUNT = new SystemMessageId(1338);
+	
+	/**
+	 * ID: 1339<br>
+	 * Message: Once a macro is assigned to a shortcut, it cannot be run as part of a new macro.
+	 */
+	public static final SystemMessageId MACRO_SHORTCUT_NOT_RUN = new SystemMessageId(1339);
+	
+	/**
+	 * ID: 1340<br>
+	 * Message: This server cannot be accessed with the coupon you are using.
+	 */
+	public static final SystemMessageId SERVER_NOT_ACCESSED_BY_COUPON = new SystemMessageId(1340);
+	
+	/**
+	 * ID: 1341<br>
+	 * Message: Incorrect name and/or email address.
+	 */
+	public static final SystemMessageId INCORRECT_NAME_OR_ADDRESS = new SystemMessageId(1341);
+	
+	/**
+	 * ID: 1342<br>
+	 * Message: You are already logged in.
+	 */
+	public static final SystemMessageId ALREADY_LOGGED_IN = new SystemMessageId(1342);
+	
+	/**
+	 * ID: 1343<br>
+	 * Message: Incorrect email address and/or password. Your attempt to log into .NET Messenger Service has failed.
+	 */
+	public static final SystemMessageId INCORRECT_ADDRESS_OR_PASSWORD = new SystemMessageId(1343);
+	
+	/**
+	 * ID: 1344<br>
+	 * Message: Your request to log into the .NET Messenger Service has failed. Please verify that you are currently connected to the internet.
+	 */
+	public static final SystemMessageId NET_LOGIN_FAILED = new SystemMessageId(1344);
+	
+	/**
+	 * ID: 1345<br>
+	 * Message: Click on the OK button after you have selected a contact name.
+	 */
+	public static final SystemMessageId SELECT_CONTACT_CLICK_OK = new SystemMessageId(1345);
+	
+	/**
+	 * ID: 1346<br>
+	 * Message: You are currently entering a chat message.
+	 */
+	public static final SystemMessageId CURRENTLY_ENTERING_CHAT = new SystemMessageId(1346);
+	
+	/**
+	 * ID: 1347<br>
+	 * Message: The Lineage II messenger could not carry out the task you requested.
+	 */
+	public static final SystemMessageId MESSENGER_FAILED_CARRYING_OUT_TASK = new SystemMessageId(1347);
+	
+	/**
+	 * ID: 1348<br>
+	 * Message: $s1 has entered the chat room.
+	 */
+	public static final SystemMessageId S1_ENTERED_CHAT_ROOM = new SystemMessageId(1348);
+	
+	/**
+	 * ID: 1349<br>
+	 * Message: $s1 has left the chat room.
+	 */
+	public static final SystemMessageId S1_LEFT_CHAT_ROOM = new SystemMessageId(1349);
+	
+	/**
+	 * ID: 1350<br>
+	 * Message: Your status will be changed to indicate that you are "off-line." All chat windows currently open will be closed.
+	 */
+	public static final SystemMessageId GOING_OFFLINE = new SystemMessageId(1350);
+	
+	/**
+	 * ID: 1351<br>
+	 * Message: Click the Delete button after selecting the contact you wish to remove.
+	 */
+	public static final SystemMessageId SELECT_CONTACT_CLICK_REMOVE = new SystemMessageId(1351);
+	
+	/**
+	 * ID: 1352<br>
+	 * Message: You have been added to $s1 ($s2)'s contact list.
+	 */
+	public static final SystemMessageId ADDED_TO_S1_S2_CONTACT_LIST = new SystemMessageId(1352);
+	
+	/**
+	 * ID: 1353<br>
+	 * Message: You can set the option to show your status as always being off-line to all of your contacts.
+	 */
+	public static final SystemMessageId CAN_SET_OPTION_TO_ALWAYS_SHOW_OFFLINE = new SystemMessageId(1353);
+	
+	/**
+	 * ID: 1354<br>
+	 * Message: You are not allowed to chat with a contact while a chatting block is imposed.
+	 */
+	public static final SystemMessageId NO_CHAT_WHILE_BLOCKED = new SystemMessageId(1354);
+	
+	/**
+	 * ID: 1355<br>
+	 * Message: That contact is currently blocked from chatting.
+	 */
+	public static final SystemMessageId CONTACT_CURRENTLY_BLOCKED = new SystemMessageId(1355);
+	
+	/**
+	 * ID: 1356<br>
+	 * Message: That contact is not currently logged in.
+	 */
+	public static final SystemMessageId CONTACT_CURRENTLY_OFFLINE = new SystemMessageId(1356);
+	
+	/**
+	 * ID: 1357<br>
+	 * Message: You have been blocked from chatting with that contact.
+	 */
+	public static final SystemMessageId YOU_ARE_BLOCKED = new SystemMessageId(1357);
+	
+	/**
+	 * ID: 1358<br>
+	 * Message: You are being logged out...
+	 */
+	public static final SystemMessageId YOU_ARE_LOGGING_OUT = new SystemMessageId(1358);
+	
+	/**
+	 * ID: 1359<br>
+	 * Message: $s1 has logged in.
+	 */
+	public static final SystemMessageId S1_LOGGED_IN2 = new SystemMessageId(1359);
+	
+	/**
+	 * ID: 1360<br>
+	 * Message: You have received a message from $s1.
+	 */
+	public static final SystemMessageId GOT_MESSAGE_FROM_S1 = new SystemMessageId(1360);
+	
+	/**
+	 * ID: 1361<br>
+	 * Message: Due to a system error, you have been logged out of the .NET Messenger Service.
+	 */
+	public static final SystemMessageId LOGGED_OUT_DUE_TO_ERROR = new SystemMessageId(1361);
+	
+	/**
+	 * ID: 1362<br>
+	 * Message: Please select the contact you wish to delete. If you would like to delete a group, click the button next to My Status, and then use the Options menu.
+	 */
+	public static final SystemMessageId SELECT_CONTACT_TO_DELETE = new SystemMessageId(1362);
+	
+	/**
+	 * ID: 1363<br>
+	 * Message: Your request to participate to initiate an alliance war has been denied.
+	 */
+	public static final SystemMessageId YOUR_REQUEST_ALLIANCE_WAR_DENIED = new SystemMessageId(1363);
+	
+	/**
+	 * ID: 1364<br>
+	 * Message: The request for an alliance war has been rejected.
+	 */
+	public static final SystemMessageId REQUEST_ALLIANCE_WAR_REJECTED = new SystemMessageId(1364);
+	
+	/**
+	 * ID: 1365<br>
+	 * Message: $s2 of $s1 clan has surrendered as an individual.
+	 */
+	public static final SystemMessageId S2_OF_S1_SURRENDERED_AS_INDIVIDUAL = new SystemMessageId(1365);
+	
+	/**
+	 * ID: 1366<br>
+	 * Message: In order to delete a group, you must not have any contacts listed under that group. Please transfer your contact(s) to another group before continuing with deletion.
+	 */
+	public static final SystemMessageId DELTE_GROUP_INSTRUCTION = new SystemMessageId(1366);
+	
+	/**
+	 * ID: 1367<br>
+	 * Message: Only members of the group are allowed to add records.
+	 */
+	public static final SystemMessageId ONLY_GROUP_CAN_ADD_RECORDS = new SystemMessageId(1367);
+	
+	/**
+	 * ID: 1368<br>
+	 * Message: You can not try those items on at the same time.
+	 */
+	public static final SystemMessageId YOU_CAN_NOT_TRY_THOSE_ITEMS_ON_AT_THE_SAME_TIME = new SystemMessageId(1368);
+	
+	/**
+	 * ID: 1369<br>
+	 * Message: You've exceeded the maximum.
+	 */
+	public static final SystemMessageId EXCEEDED_THE_MAXIMUM = new SystemMessageId(1369);
+	
+	/**
+	 * ID: 1370<br>
+	 * Message: Your message to $c1 did not reach its recipient. You cannot send mail to the GM staff.
+	 */
+	public static final SystemMessageId CANNOT_MAIL_GM_C1 = new SystemMessageId(1370);
+	
+	/**
+	 * ID: 1371<br>
+	 * Message: It has been determined that you're not engaged in normal gameplay and a restriction has been imposed upon you. You may not move for $s1 minutes.
+	 */
+	public static final SystemMessageId GAMEPLAY_RESTRICTION_PENALTY_S1 = new SystemMessageId(1371);
+	
+	/**
+	 * ID: 1372<br>
+	 * Message: Your punishment will continue for $s1 minutes.
+	 */
+	public static final SystemMessageId PUNISHMENT_CONTINUE_S1_MINUTES = new SystemMessageId(1372);
+	
+	/**
+	 * ID: 1373<br>
+	 * Message: $c1 has picked up $s2 that was dropped by the Raid Boss.
+	 */
+	public static final SystemMessageId C1_PICKED_UP_S2_FROM_RAIDBOSS = new SystemMessageId(1373);
+	
+	/**
+	 * ID: 1374<br>
+	 * Message: $c1 has picked up $s3 $s2(s) that were dropped by the Raid Boss.
+	 */
+	public static final SystemMessageId C1_PICKED_UP_S3_S2_S_FROM_RAIDBOSS = new SystemMessageId(1374);
+	
+	/**
+	 * ID: 1375<br>
+	 * Message: $c1 has picked up $s2 adena that was dropped by the Raid Boss.
+	 */
+	public static final SystemMessageId C1_PICKED_UP_S2_ADENA_FROM_RAIDBOSS = new SystemMessageId(1375);
+	
+	/**
+	 * ID: 1376<br>
+	 * Message: $c1 has picked up $s2 that was dropped by another character.
+	 */
+	public static final SystemMessageId C1_PICKED_UP_S2_FROM_ANOTHER_CHARACTER = new SystemMessageId(1376);
+	
+	/**
+	 * ID: 1377<br>
+	 * Message: $c1 has picked up $s3 $s2(s) that were dropped by another character.
+	 */
+	public static final SystemMessageId C1_PICKED_UP_S3_S2_S_FROM_ANOTHER_CHARACTER = new SystemMessageId(1377);
+	
+	/**
+	 * ID: 1378<br>
+	 * Message: $c1 has picked up +$s3 $s2 that was dropped by another character.
+	 */
+	public static final SystemMessageId C1_PICKED_UP_S3_S2_FROM_ANOTHER_CHARACTER = new SystemMessageId(1378);
+	
+	/**
+	 * ID: 1379<br>
+	 * Message: $c1 has obtained $s2 adena.
+	 */
+	public static final SystemMessageId C1_OBTAINED_S2_ADENA = new SystemMessageId(1379);
+	
+	/**
+	 * ID: 1380<br>
+	 * Message: You can't summon a $s1 while on the battleground.
+	 */
+	public static final SystemMessageId CANT_SUMMON_S1_ON_BATTLEGROUND = new SystemMessageId(1380);
+	
+	/**
+	 * ID: 1381<br>
+	 * Message: The party leader has obtained $s2 of $s1.
+	 */
+	public static final SystemMessageId LEADER_OBTAINED_S2_OF_S1 = new SystemMessageId(1381);
+	
+	/**
+	 * ID: 1382<br>
+	 * Message: To fulfill the quest, you must bring the chosen weapon. Are you sure you want to choose this weapon?
+	 */
+	public static final SystemMessageId CHOOSE_WEAPON_CONFIRM = new SystemMessageId(1382);
+	
+	/**
+	 * ID: 1383<br>
+	 * Message: Are you sure you want to exchange?
+	 */
+	public static final SystemMessageId EXCHANGE_CONFIRM = new SystemMessageId(1383);
+	
+	/**
+	 * ID: 1384<br>
+	 * Message: $c1 has become the party leader.
+	 */
+	public static final SystemMessageId C1_HAS_BECOME_A_PARTY_LEADER = new SystemMessageId(1384);
+	
+	/**
+	 * ID: 1385<br>
+	 * Message: You are not allowed to dismount in this location.
+	 */
+	public static final SystemMessageId NO_DISMOUNT_HERE = new SystemMessageId(1385);
+	
+	/**
+	 * ID: 1386<br>
+	 * Message: You are no longer immobile.
+	 */
+	public static final SystemMessageId NO_LONGER_HELD_IN_PLACE = new SystemMessageId(1386);
+	
+	/**
+	 * ID: 1387<br>
+	 * Message: Please select the item you would like to try on.
+	 */
+	public static final SystemMessageId SELECT_ITEM_TO_TRY_ON = new SystemMessageId(1387);
+	
+	/**
+	 * ID: 1388<br>
+	 * Message: You have created a party room.
+	 */
+	public static final SystemMessageId PARTY_ROOM_CREATED = new SystemMessageId(1388);
+	
+	/**
+	 * ID: 1389<br>
+	 * Message: The party room's information has been revised.
+	 */
+	public static final SystemMessageId PARTY_ROOM_REVISED = new SystemMessageId(1389);
+	
+	/**
+	 * ID: 1390<br>
+	 * Message: You are not allowed to enter the party room.
+	 */
+	public static final SystemMessageId PARTY_ROOM_FORBIDDEN = new SystemMessageId(1390);
+	
+	/**
+	 * ID: 1391<br>
+	 * Message: You have exited the party room.
+	 */
+	public static final SystemMessageId PARTY_ROOM_EXITED = new SystemMessageId(1391);
+	
+	/**
+	 * ID: 1392<br>
+	 * Message: $c1 has left the party room.
+	 */
+	public static final SystemMessageId C1_LEFT_PARTY_ROOM = new SystemMessageId(1392);
+	
+	/**
+	 * ID: 1393<br>
+	 * Message: You have been ousted from the party room.
+	 */
+	public static final SystemMessageId OUSTED_FROM_PARTY_ROOM = new SystemMessageId(1393);
+	
+	/**
+	 * ID: 1394<br>
+	 * Message: $c1 has been kicked from the party room.
+	 */
+	public static final SystemMessageId C1_KICKED_FROM_PARTY_ROOM = new SystemMessageId(1394);
+	
+	/**
+	 * ID: 1395<br>
+	 * Message: The party room has been disbanded.
+	 */
+	public static final SystemMessageId PARTY_ROOM_DISBANDED = new SystemMessageId(1395);
+	
+	/**
+	 * ID: 1396<br>
+	 * Message: The list of party rooms can only be viewed by a person who is not part of a party.
+	 */
+	public static final SystemMessageId CANT_VIEW_PARTY_ROOMS = new SystemMessageId(1396);
+	
+	/**
+	 * ID: 1397<br>
+	 * Message: The leader of the party room has changed.
+	 */
+	public static final SystemMessageId PARTY_ROOM_LEADER_CHANGED = new SystemMessageId(1397);
+	
+	/**
+	 * ID: 1398<br>
+	 * Message: We are recruiting party members.
+	 */
+	public static final SystemMessageId RECRUITING_PARTY_MEMBERS = new SystemMessageId(1398);
+	
+	/**
+	 * ID: 1399<br>
+	 * Message: Only the leader of the party can transfer party leadership to another player.
+	 */
+	public static final SystemMessageId ONLY_A_PARTY_LEADER_CAN_TRANSFER_ONES_RIGHTS_TO_ANOTHER_PLAYER = new SystemMessageId(1399);
+	
+	/**
+	 * ID: 1400<br>
+	 * Message: Please select the person you wish to make the party leader.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_THE_PERSON_TO_WHOM_YOU_WOULD_LIKE_TO_TRANSFER_THE_RIGHTS_OF_A_PARTY_LEADER = new SystemMessageId(1400);
+	
+	/**
+	 * ID: 1401<br>
+	 * Message: Slow down, you are already the party leader.
+	 */
+	public static final SystemMessageId YOU_CANNOT_TRANSFER_RIGHTS_TO_YOURSELF = new SystemMessageId(1401);
+	
+	/**
+	 * ID: 1402<br>
+	 * Message: You may only transfer party leadership to another member of the party.
+	 */
+	public static final SystemMessageId YOU_CAN_TRANSFER_RIGHTS_ONLY_TO_ANOTHER_PARTY_MEMBER = new SystemMessageId(1402);
+	
+	/**
+	 * ID: 1403<br>
+	 * Message: You have failed to transfer party leadership.
+	 */
+	public static final SystemMessageId YOU_HAVE_FAILED_TO_TRANSFER_THE_PARTY_LEADER_RIGHTS = new SystemMessageId(1403);
+	
+	/**
+	 * ID: 1404<br>
+	 * Message: The owner of the private manufacturing store has changed the price for creating this item. Please check the new price before trying again.
+	 */
+	public static final SystemMessageId MANUFACTURE_PRICE_HAS_CHANGED = new SystemMessageId(1404);
+	
+	/**
+	 * ID: 1405<br>
+	 * Message: $s1 CP has been restored.
+	 */
+	public static final SystemMessageId S1_CP_HAS_BEEN_RESTORED = new SystemMessageId(1405);
+	
+	/**
+	 * ID: 1406<br>
+	 * Message: $s2 CP has been restored by $c1.
+	 */
+	public static final SystemMessageId S2_CP_HAS_BEEN_RESTORED_BY_C1 = new SystemMessageId(1406);
+	
+	/**
+	 * ID: 1407<br>
+	 * Message: You are using a computer that does not allow you to log in with two accounts at the same time.
+	 */
+	public static final SystemMessageId NO_LOGIN_WITH_TWO_ACCOUNTS = new SystemMessageId(1407);
+	
+	/**
+	 * ID: 1408<br>
+	 * Message: Your prepaid remaining usage time is $s1 hours and $s2 minutes. You have $s3 paid reservations left.
+	 */
+	public static final SystemMessageId PREPAID_LEFT_S1_S2_S3 = new SystemMessageId(1408);
+	
+	/**
+	 * ID: 1409<br>
+	 * Message: Your prepaid usage time has expired. Your new prepaid reservation will be used. The remaining usage time is $s1 hours and $s2 minutes.
+	 */
+	public static final SystemMessageId PREPAID_EXPIRED_S1_S2 = new SystemMessageId(1409);
+	
+	/**
+	 * ID: 1410<br>
+	 * Message: Your prepaid usage time has expired. You do not have any more prepaid reservations left.
+	 */
+	public static final SystemMessageId PREPAID_EXPIRED = new SystemMessageId(1410);
+	
+	/**
+	 * ID: 1411<br>
+	 * Message: The number of your prepaid reservations has changed.
+	 */
+	public static final SystemMessageId PREPAID_CHANGED = new SystemMessageId(1411);
+	
+	/**
+	 * ID: 1412<br>
+	 * Message: Your prepaid usage time has $s1 minutes left.
+	 */
+	public static final SystemMessageId PREPAID_LEFT_S1 = new SystemMessageId(1412);
+	
+	/**
+	 * ID: 1413<br>
+	 * Message: You do not meet the requirements to enter that party room.
+	 */
+	public static final SystemMessageId CANT_ENTER_PARTY_ROOM = new SystemMessageId(1413);
+	
+	/**
+	 * ID: 1414<br>
+	 * Message: The width and length should be 100 or more grids and less than 5000 grids respectively.
+	 */
+	public static final SystemMessageId WRONG_GRID_COUNT = new SystemMessageId(1414);
+	
+	/**
+	 * ID: 1415<br>
+	 * Message: The command file is not set.
+	 */
+	public static final SystemMessageId COMMAND_FILE_NOT_SENT = new SystemMessageId(1415);
+	
+	/**
+	 * ID: 1416<br>
+	 * Message: The party representative of Team 1 has not been selected.
+	 */
+	public static final SystemMessageId TEAM_1_NO_REPRESENTATIVE = new SystemMessageId(1416);
+	
+	/**
+	 * ID: 1417<br>
+	 * Message: The party representative of Team 2 has not been selected.
+	 */
+	public static final SystemMessageId TEAM_2_NO_REPRESENTATIVE = new SystemMessageId(1417);
+	
+	/**
+	 * ID: 1418<br>
+	 * Message: The name of Team 1 has not yet been chosen.
+	 */
+	public static final SystemMessageId TEAM_1_NO_NAME = new SystemMessageId(1418);
+	
+	/**
+	 * ID: 1419<br>
+	 * Message: The name of Team 2 has not yet been chosen.
+	 */
+	public static final SystemMessageId TEAM_2_NO_NAME = new SystemMessageId(1419);
+	
+	/**
+	 * ID: 1420<br>
+	 * Message: The name of Team 1 and the name of Team 2 are identical.
+	 */
+	public static final SystemMessageId TEAM_NAME_IDENTICAL = new SystemMessageId(1420);
+	
+	/**
+	 * ID: 1421<br>
+	 * Message: The race setup file has not been designated.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE1 = new SystemMessageId(1421);
+	
+	/**
+	 * ID: 1422<br>
+	 * Message: Race setup file error - BuffCnt is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE2 = new SystemMessageId(1422);
+	
+	/**
+	 * ID: 1423<br>
+	 * Message: Race setup file error - BuffID$s1 is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE3 = new SystemMessageId(1423);
+	
+	/**
+	 * ID: 1424<br>
+	 * Message: Race setup file error - BuffLv$s1 is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE4 = new SystemMessageId(1424);
+	
+	/**
+	 * ID: 1425<br>
+	 * Message: Race setup file error - DefaultAllow is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE5 = new SystemMessageId(1425);
+	
+	/**
+	 * ID: 1426<br>
+	 * Message: Race setup file error - ExpSkillCnt is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE6 = new SystemMessageId(1426);
+	
+	/**
+	 * ID: 1427<br>
+	 * Message: Race setup file error - ExpSkillID$s1 is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE7 = new SystemMessageId(1427);
+	
+	/**
+	 * ID: 1428<br>
+	 * Message: Race setup file error - ExpItemCnt is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE8 = new SystemMessageId(1428);
+	
+	/**
+	 * ID: 1429<br>
+	 * Message: Race setup file error - ExpItemID$s1 is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE9 = new SystemMessageId(1429);
+	
+	/**
+	 * ID: 1430<br>
+	 * Message: Race setup file error - TeleportDelay is not specified.
+	 */
+	public static final SystemMessageId RACE_SETUP_FILE10 = new SystemMessageId(1430);
+	
+	/**
+	 * ID: 1431<br>
+	 * Message: The race will be stopped temporarily.
+	 */
+	public static final SystemMessageId RACE_STOPPED_TEMPORARILY = new SystemMessageId(1431);
+	
+	/**
+	 * ID: 1432<br>
+	 * Message: Your opponent is currently in a petrified state.
+	 */
+	public static final SystemMessageId OPPONENT_PETRIFIED = new SystemMessageId(1432);
+	
+	/**
+	 * ID: 1433<br>
+	 * Message: The automatic use of $s1 has been activated.
+	 */
+	public static final SystemMessageId USE_OF_S1_WILL_BE_AUTO = new SystemMessageId(1433);
+	
+	/**
+	 * ID: 1434<br>
+	 * Message: The automatic use of $s1 has been deactivated.
+	 */
+	public static final SystemMessageId AUTO_USE_OF_S1_CANCELLED = new SystemMessageId(1434);
+	
+	/**
+	 * ID: 1435<br>
+	 * Message: Due to insufficient $s1, the automatic use function has been deactivated.
+	 */
+	public static final SystemMessageId AUTO_USE_CANCELLED_LACK_OF_S1 = new SystemMessageId(1435);
+	
+	/**
+	 * ID: 1436<br>
+	 * Message: Due to insufficient $s1, the automatic use function cannot be activated.
+	 */
+	public static final SystemMessageId CANNOT_AUTO_USE_LACK_OF_S1 = new SystemMessageId(1436);
+	
+	/**
+	 * ID: 1437<br>
+	 * Message: Players are no longer allowed to play dice. Dice can no longer be purchased from a village store. However, you can still sell them to any village store.
+	 */
+	public static final SystemMessageId DICE_NO_LONGER_ALLOWED = new SystemMessageId(1437);
+	
+	/**
+	 * ID: 1438<br>
+	 * Message: There is no skill that enables enchant.
+	 */
+	public static final SystemMessageId THERE_IS_NO_SKILL_THAT_ENABLES_ENCHANT = new SystemMessageId(1438);
+	
+	/**
+	 * ID: 1439<br>
+	 * Message: You do not have all of the items needed to enchant that skill.
+	 */
+	public static final SystemMessageId YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL = new SystemMessageId(1439);
+	
+	/**
+	 * ID: 1440<br>
+	 * Message: Skill enchant was successful! $s1 has been enchanted.
+	 */
+	public static final SystemMessageId YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1 = new SystemMessageId(1440);
+	
+	/**
+	 * ID: 1441<br>
+	 * Message: Skill enchant failed. The skill will be initialized.
+	 */
+	public static final SystemMessageId YOU_HAVE_FAILED_TO_ENCHANT_THE_SKILL_S1 = new SystemMessageId(1441);
+	
+	/**
+	 * ID: 1443<br>
+	 * Message: You do not have enough SP to enchant that skill.
+	 */
+	public static final SystemMessageId YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL = new SystemMessageId(1443);
+	
+	/**
+	 * ID: 1444<br>
+	 * Message: You do not have enough experience (Exp) to enchant that skill.
+	 */
+	public static final SystemMessageId YOU_DONT_HAVE_ENOUGH_EXP_TO_ENCHANT_THAT_SKILL = new SystemMessageId(1444);
+	
+	/**
+	 * ID: 1445<br>
+	 * Message: Your previous subclass will be removed and replaced with the new subclass at level 40. Do you wish to continue?
+	 */
+	public static final SystemMessageId REPLACE_SUBCLASS_CONFIRM = new SystemMessageId(1445);
+	
+	/**
+	 * ID: 1446<br>
+	 * Message: The ferry from $s1 to $s2 has been delayed.
+	 */
+	public static final SystemMessageId FERRY_FROM_S1_TO_S2_DELAYED = new SystemMessageId(1446);
+	
+	/**
+	 * ID: 1447<br>
+	 * Message: You cannot do that while fishing.
+	 */
+	public static final SystemMessageId CANNOT_DO_WHILE_FISHING_1 = new SystemMessageId(1447);
+	
+	/**
+	 * ID: 1448<br>
+	 * Message: Only fishing skills may be used at this time.
+	 */
+	public static final SystemMessageId ONLY_FISHING_SKILLS_NOW = new SystemMessageId(1448);
+	
+	/**
+	 * ID: 1449<br>
+	 * Message: You've got a bite!
+	 */
+	public static final SystemMessageId GOT_A_BITE = new SystemMessageId(1449);
+	
+	/**
+	 * ID: 1450<br>
+	 * Message: That fish is more determined than you are - it spit the hook!
+	 */
+	public static final SystemMessageId FISH_SPIT_THE_HOOK = new SystemMessageId(1450);
+	
+	/**
+	 * ID: 1451<br>
+	 * Message: Your bait was stolen by that fish!
+	 */
+	public static final SystemMessageId BAIT_STOLEN_BY_FISH = new SystemMessageId(1451);
+	
+	/**
+	 * ID: 1452<br>
+	 * Message: The bait has been lost because the fish got away.
+	 */
+	public static final SystemMessageId BAIT_LOST_FISH_GOT_AWAY = new SystemMessageId(1452);
+	
+	/**
+	 * ID: 1453<br>
+	 * Message: You do not have a fishing pole equipped.
+	 */
+	public static final SystemMessageId FISHING_POLE_NOT_EQUIPPED = new SystemMessageId(1453);
+	
+	/**
+	 * ID: 1454<br>
+	 * Message: You must put bait on your hook before you can fish.
+	 */
+	public static final SystemMessageId BAIT_ON_HOOK_BEFORE_FISHING = new SystemMessageId(1454);
+	
+	/**
+	 * ID: 1455<br>
+	 * Message: You cannot fish while under water.
+	 */
+	public static final SystemMessageId CANNOT_FISH_UNDER_WATER = new SystemMessageId(1455);
+	
+	/**
+	 * ID: 1456<br>
+	 * Message: You cannot fish while riding as a passenger of a boat - it's against the rules.
+	 */
+	public static final SystemMessageId CANNOT_FISH_ON_BOAT = new SystemMessageId(1456);
+	
+	/**
+	 * ID: 1457<br>
+	 * Message: You can't fish here.
+	 */
+	public static final SystemMessageId CANNOT_FISH_HERE = new SystemMessageId(1457);
+	
+	/**
+	 * ID: 1458<br>
+	 * Message: Your attempt at fishing has been cancelled.
+	 */
+	public static final SystemMessageId FISHING_ATTEMPT_CANCELLED = new SystemMessageId(1458);
+	
+	/**
+	 * ID: 1459<br>
+	 * Message: You do not have enough bait.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_BAIT = new SystemMessageId(1459);
+	
+	/**
+	 * ID: 1460<br>
+	 * Message: You reel your line in and stop fishing.
+	 */
+	public static final SystemMessageId REEL_LINE_AND_STOP_FISHING = new SystemMessageId(1460);
+	
+	/**
+	 * ID: 1461<br>
+	 * Message: You cast your line and start to fish.
+	 */
+	public static final SystemMessageId CAST_LINE_AND_START_FISHING = new SystemMessageId(1461);
+	
+	/**
+	 * ID: 1462<br>
+	 * Message: You may only use the Pumping skill while you are fishing.
+	 */
+	public static final SystemMessageId CAN_USE_PUMPING_ONLY_WHILE_FISHING = new SystemMessageId(1462);
+	
+	/**
+	 * ID: 1463<br>
+	 * Message: You may only use the Reeling skill while you are fishing.
+	 */
+	public static final SystemMessageId CAN_USE_REELING_ONLY_WHILE_FISHING = new SystemMessageId(1463);
+	
+	/**
+	 * ID: 1464<br>
+	 * Message: The fish has resisted your attempt to bring it in.
+	 */
+	public static final SystemMessageId FISH_RESISTED_ATTEMPT_TO_BRING_IT_IN = new SystemMessageId(1464);
+	
+	/**
+	 * ID: 1465<br>
+	 * Message: Your pumping is successful, causing $s1 damage.
+	 */
+	public static final SystemMessageId PUMPING_SUCCESFUL_S1_DAMAGE = new SystemMessageId(1465);
+	
+	/**
+	 * ID: 1466<br>
+	 * Message: You failed to do anything with the fish and it regains $s1 HP.
+	 */
+	public static final SystemMessageId FISH_RESISTED_PUMPING_S1_HP_REGAINED = new SystemMessageId(1466);
+	
+	/**
+	 * ID: 1467<br>
+	 * Message: You reel that fish in closer and cause $s1 damage.
+	 */
+	public static final SystemMessageId REELING_SUCCESFUL_S1_DAMAGE = new SystemMessageId(1467);
+	
+	/**
+	 * ID: 1468<br>
+	 * Message: You failed to reel that fish in further and it regains $s1 HP.
+	 */
+	public static final SystemMessageId FISH_RESISTED_REELING_S1_HP_REGAINED = new SystemMessageId(1468);
+	
+	/**
+	 * ID: 1469<br>
+	 * Message: You caught something!
+	 */
+	public static final SystemMessageId YOU_CAUGHT_SOMETHING = new SystemMessageId(1469);
+	
+	/**
+	 * ID: 1470<br>
+	 * Message: You cannot do that while fishing.
+	 */
+	public static final SystemMessageId CANNOT_DO_WHILE_FISHING_2 = new SystemMessageId(1470);
+	
+	/**
+	 * ID: 1471<br>
+	 * Message: You cannot do that while fishing.
+	 */
+	public static final SystemMessageId CANNOT_DO_WHILE_FISHING_3 = new SystemMessageId(1471);
+	
+	/**
+	 * ID: 1472<br>
+	 * Message: You look oddly at the fishing pole in disbelief and realize that you can't attack anything with this.
+	 */
+	public static final SystemMessageId CANNOT_ATTACK_WITH_FISHING_POLE = new SystemMessageId(1472);
+	
+	/**
+	 * ID: 1473<br>
+	 * Message: $s1 is not sufficient.
+	 */
+	public static final SystemMessageId S1_NOT_SUFFICIENT = new SystemMessageId(1473);
+	
+	/**
+	 * ID: 1474<br>
+	 * Message: $s1 is not available.
+	 */
+	public static final SystemMessageId S1_NOT_AVAILABLE = new SystemMessageId(1474);
+	
+	/**
+	 * ID: 1475<br>
+	 * Message: You pet has dropped $s1.
+	 */
+	public static final SystemMessageId PET_DROPPED_S1 = new SystemMessageId(1475);
+	
+	/**
+	 * ID: 1476<br>
+	 * Message: You pet has dropped +$s1$s2.
+	 */
+	public static final SystemMessageId PET_DROPPED_S1_S2 = new SystemMessageId(1476);
+	
+	/**
+	 * ID: 1477<br>
+	 * Message: You pet has dropped $s2 of $s1.
+	 */
+	public static final SystemMessageId PET_DROPPED_S2_S1_S = new SystemMessageId(1477);
+	
+	/**
+	 * ID: 1478<br>
+	 * Message: You may only register a 64 x 64 pixel, 256-color BMP.
+	 */
+	public static final SystemMessageId ONLY_64_PIXEL_256_COLOR_BMP = new SystemMessageId(1478);
+	
+	/**
+	 * ID: 1479<br>
+	 * Message: That is the wrong grade of soulshot for that fishing pole.
+	 */
+	public static final SystemMessageId WRONG_FISHINGSHOT_GRADE = new SystemMessageId(1479);
+	
+	/**
+	 * ID: 1480<br>
+	 * Message: Are you sure you wish to remove yourself from the Grand Olympiad waiting list?
+	 */
+	public static final SystemMessageId OLYMPIAD_REMOVE_CONFIRM = new SystemMessageId(1480);
+	
+	/**
+	 * ID: 1481<br>
+	 * Message: You have selected a class irrelevant individual match. Do you wish to participate?
+	 */
+	public static final SystemMessageId OLYMPIAD_NON_CLASS_CONFIRM = new SystemMessageId(1481);
+	
+	/**
+	 * ID: 1482<br>
+	 * Message: You've selected to join a class specific game. Continue?
+	 */
+	public static final SystemMessageId OLYMPIAD_CLASS_CONFIRM = new SystemMessageId(1482);
+	
+	/**
+	 * ID: 1483<br>
+	 * Message: Are you ready to become a Hero?
+	 */
+	public static final SystemMessageId HERO_CONFIRM = new SystemMessageId(1483);
+	
+	/**
+	 * ID: 1484<br>
+	 * Message: Are you sure this is the Hero weapon you wish to use?
+	 */
+	public static final SystemMessageId HERO_WEAPON_CONFIRM = new SystemMessageId(1484);
+	
+	/**
+	 * ID: 1485<br>
+	 * Message: The ferry from Talking Island to Gludin Harbor has been delayed.
+	 */
+	public static final SystemMessageId FERRY_TALKING_GLUDIN_DELAYED = new SystemMessageId(1485);
+	
+	/**
+	 * ID: 1486<br>
+	 * Message: The ferry from Gludin Harbor to Talking Island has been delayed.
+	 */
+	public static final SystemMessageId FERRY_GLUDIN_TALKING_DELAYED = new SystemMessageId(1486);
+	
+	/**
+	 * ID: 1487<br>
+	 * Message: The ferry from Giran Harbor to Talking Island has been delayed.
+	 */
+	public static final SystemMessageId FERRY_GIRAN_TALKING_DELAYED = new SystemMessageId(1487);
+	
+	/**
+	 * ID: 1488<br>
+	 * Message: The ferry from Talking Island to Giran Harbor has been delayed.
+	 */
+	public static final SystemMessageId FERRY_TALKING_GIRAN_DELAYED = new SystemMessageId(1488);
+	
+	/**
+	 * ID: 1489<br>
+	 * Message: The Innadril cruise service has been delayed.
+	 */
+	public static final SystemMessageId INNADRIL_BOAT_DELAYED = new SystemMessageId(1489);
+	
+	/**
+	 * ID: 1490<br>
+	 * Message: Traded $s2 of $s1 crops.
+	 */
+	public static final SystemMessageId TRADED_S2_OF_CROP_S1 = new SystemMessageId(1490);
+	
+	/**
+	 * ID: 1491<br>
+	 * Message: Failed in trading $s2 of $s1 crops.
+	 */
+	public static final SystemMessageId FAILED_IN_TRADING_S2_OF_CROP_S1 = new SystemMessageId(1491);
+	
+	/**
+	 * ID: 1492<br>
+	 * Message: You will be moved to the Olympiad Stadium in $s1 second(s).
+	 */
+	public static final SystemMessageId YOU_WILL_ENTER_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S = new SystemMessageId(1492);
+	
+	/**
+	 * ID: 1493<br>
+	 * Message: Your opponent made haste with their tail between their legs; the match has been cancelled.
+	 */
+	public static final SystemMessageId THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_ENDS_THE_GAME = new SystemMessageId(1493);
+	
+	/**
+	 * ID: 1494<br>
+	 * Message: Your opponent does not meet the requirements to do battle; the match has been cancelled.
+	 */
+	public static final SystemMessageId THE_GAME_HAS_BEEN_CANCELLED_BECAUSE_THE_OTHER_PARTY_DOES_NOT_MEET_THE_REQUIREMENTS_FOR_JOINING_THE_GAME = new SystemMessageId(1494);
+	
+	/**
+	 * ID: 1495<br>
+	 * Message: The match will start in $s1 second(s).
+	 */
+	public static final SystemMessageId THE_GAME_WILL_START_IN_S1_SECOND_S = new SystemMessageId(1495);
+	
+	/**
+	 * ID: 1496<br>
+	 * Message: The match has started. Fight!
+	 */
+	public static final SystemMessageId STARTS_THE_GAME = new SystemMessageId(1496);
+	
+	/**
+	 * ID: 1497<br>
+	 * Message: Congratulations, $c1! You win the match!
+	 */
+	public static final SystemMessageId C1_HAS_WON_THE_GAME = new SystemMessageId(1497);
+	
+	/**
+	 * ID: 1498<br>
+	 * Message: There is no victor; the match ends in a tie.
+	 */
+	public static final SystemMessageId THE_GAME_ENDED_IN_A_TIE = new SystemMessageId(1498);
+	
+	/**
+	 * ID: 1499<br>
+	 * Message: You will be moved back to town in $s1 second(s).
+	 */
+	public static final SystemMessageId YOU_WILL_BE_MOVED_TO_TOWN_IN_S1_SECONDS = new SystemMessageId(1499);
+	
+	/**
+	 * ID: 1500<br>
+	 * Message: $c1 does not meet the participation requirements. A subclass character cannot participate in the Olympiad.
+	 */
+	public static final SystemMessageId C1_CANT_JOIN_THE_OLYMPIAD_WITH_A_SUB_CLASS_CHARACTER = new SystemMessageId(1500);
+	
+	/**
+	 * ID: 1501<br>
+	 * Message: $c1 does not meet the participation requirements. Only Noblesse characters can participate in the Olympiad.
+	 */
+	public static final SystemMessageId C1_DOES_NOT_MEET_REQUIREMENTS_ONLY_NOBLESS_CAN_PARTICIPATE_IN_THE_OLYMPIAD = new SystemMessageId(1501);
+	
+	/**
+	 * ID: 1502<br>
+	 * Message: $c1 is already registered on the match waiting list.
+	 */
+	public static final SystemMessageId C1_IS_ALREADY_REGISTERED_ON_THE_MATCH_WAITING_LIST = new SystemMessageId(1502);
+	
+	/**
+	 * ID: 1503<br>
+	 * Message: You have been registered for the Grand Olympiad waiting list for a class specific match.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REGISTERED_IN_A_WAITING_LIST_OF_CLASSIFIED_GAMES = new SystemMessageId(1503);
+	
+	/**
+	 * ID: 1504<br>
+	 * Message: You are currently registered for a 1v1 class irrelevant match.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REGISTERED_IN_A_WAITING_LIST_OF_NO_CLASS_GAMES = new SystemMessageId(1504);
+	
+	/**
+	 * ID: 1505<br>
+	 * Message: You have been removed from the Grand Olympiad waiting list.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_DELETED_FROM_THE_WAITING_LIST_OF_A_GAME = new SystemMessageId(1505);
+	
+	/**
+	 * ID: 1506<br>
+	 * Message: You are not currently registered for the Grand Olympiad.
+	 */
+	public static final SystemMessageId YOU_HAVE_NOT_BEEN_REGISTERED_IN_A_WAITING_LIST_OF_A_GAME = new SystemMessageId(1506);
+	
+	/**
+	 * ID: 1507<br>
+	 * Message: You cannot equip that item in a Grand Olympiad match.
+	 */
+	public static final SystemMessageId THIS_ITEM_CANT_BE_EQUIPPED_FOR_THE_OLYMPIAD_EVENT = new SystemMessageId(1507);
+	
+	/**
+	 * ID: 1508<br>
+	 * Message: You cannot use that item in a Grand Olympiad match.
+	 */
+	public static final SystemMessageId THIS_ITEM_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT = new SystemMessageId(1508);
+	
+	/**
+	 * ID: 1509<br>
+	 * Message: You cannot use that skill in a Grand Olympiad match.
+	 */
+	public static final SystemMessageId THIS_SKILL_IS_NOT_AVAILABLE_FOR_THE_OLYMPIAD_EVENT = new SystemMessageId(1509);
+	
+	/**
+	 * ID: 1510<br>
+	 * Message: $c1 is making an attempt to resurrect you. If you choose this path, $s2 experience points will be returned to you. Do you want to be resurrected?
+	 */
+	public static final SystemMessageId RESURRECTION_REQUEST_BY_C1_FOR_S2_XP = new SystemMessageId(1510);
+	
+	/**
+	 * ID: 1511<br>
+	 * Message: While a pet is being resurrected, it cannot help in resurrecting its master.
+	 */
+	public static final SystemMessageId MASTER_CANNOT_RES = new SystemMessageId(1511);
+	
+	/**
+	 * ID: 1512<br>
+	 * Message: You cannot resurrect a pet while their owner is being resurrected.
+	 */
+	public static final SystemMessageId CANNOT_RES_PET = new SystemMessageId(1512);
+	
+	/**
+	 * ID: 1513<br>
+	 * Message: Resurrection has already been proposed.
+	 */
+	public static final SystemMessageId RES_HAS_ALREADY_BEEN_PROPOSED = new SystemMessageId(1513);
+	
+	/**
+	 * ID: 1514<br>
+	 * Message: You cannot resurrect the owner of a pet while their pet is being resurrected.
+	 */
+	public static final SystemMessageId CANNOT_RES_MASTER = new SystemMessageId(1514);
+	
+	/**
+	 * ID: 1515<br>
+	 * Message: A pet cannot be resurrected while it's owner is in the process of resurrecting.
+	 */
+	public static final SystemMessageId CANNOT_RES_PET2 = new SystemMessageId(1515);
+	
+	/**
+	 * ID: 1516<br>
+	 * Message: The target is unavailable for seeding.
+	 */
+	public static final SystemMessageId THE_TARGET_IS_UNAVAILABLE_FOR_SEEDING = new SystemMessageId(1516);
+	
+	/**
+	 * ID: 1517<br>
+	 * Message: The Blessed Enchant failed. The enchant value of the item became 0.
+	 */
+	public static final SystemMessageId BLESSED_ENCHANT_FAILED = new SystemMessageId(1517);
+	
+	/**
+	 * ID: 1518<br>
+	 * Message: You do not meet the required condition to equip that item.
+	 */
+	public static final SystemMessageId CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION = new SystemMessageId(1518);
+	
+	/**
+	 * ID: 1519<br>
+	 * Message: The pet has been killed. If you don't resurrect it within 24 hours, the pet's body will disappear along with all the pet's items.
+	 */
+	public static final SystemMessageId MAKE_SURE_YOU_RESSURECT_YOUR_PET_WITHIN_24_HOURS = new SystemMessageId(1519);
+	
+	/**
+	 * ID: 1520<br>
+	 * Message: Your servitor passed away.
+	 */
+	public static final SystemMessageId SERVITOR_PASSED_AWAY = new SystemMessageId(1520);
+	
+	/**
+	 * ID: 1521<br>
+	 * Message: Your servitor has vanished! You'll need to summon a new one.
+	 */
+	public static final SystemMessageId YOUR_SERVITOR_HAS_VANISHED = new SystemMessageId(1521);
+	
+	/**
+	 * ID: 1522<br>
+	 * Message: Your pet's corpse has decayed!
+	 */
+	public static final SystemMessageId YOUR_PETS_CORPSE_HAS_DECAYED = new SystemMessageId(1522);
+	
+	/**
+	 * ID: 1523<br>
+	 * Message: You should release your pet or servitor so that it does not fall off of the boat and drown!
+	 */
+	public static final SystemMessageId RELEASE_PET_ON_BOAT = new SystemMessageId(1523);
+	
+	/**
+	 * ID: 1524<br>
+	 * Message: $c1's pet gained $s2.
+	 */
+	public static final SystemMessageId C1_PET_GAINED_S2 = new SystemMessageId(1524);
+	
+	/**
+	 * ID: 1525<br>
+	 * Message: $c1's pet gained $s3 of $s2.
+	 */
+	public static final SystemMessageId C1_PET_GAINED_S3_S2_S = new SystemMessageId(1525);
+	
+	/**
+	 * ID: 1526<br>
+	 * Message: $c1's pet gained +$s2$s3.
+	 */
+	public static final SystemMessageId C1_PET_GAINED_S2_S3 = new SystemMessageId(1526);
+	
+	/**
+	 * ID: 1527<br>
+	 * Message: Your pet was hungry so it ate $s1.
+	 */
+	public static final SystemMessageId PET_TOOK_S1_BECAUSE_HE_WAS_HUNGRY = new SystemMessageId(1527);
+	
+	/**
+	 * ID: 1528<br>
+	 * Message: You've sent a petition to the GM staff.
+	 */
+	public static final SystemMessageId SENT_PETITION_TO_GM = new SystemMessageId(1528);
+	
+	/**
+	 * ID: 1529<br>
+	 * Message: $c1 is inviting you to a Command Channel. Do you accept?
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_CONFIRM_FROM_C1 = new SystemMessageId(1529);
+	
+	/**
+	 * ID: 1530<br>
+	 * Message: Select a target or enter the name.
+	 */
+	public static final SystemMessageId SELECT_TARGET_OR_ENTER_NAME = new SystemMessageId(1530);
+	
+	/**
+	 * ID: 1531<br>
+	 * Message: Enter the name of the clan that you wish to declare war on.
+	 */
+	public static final SystemMessageId ENTER_CLAN_NAME_TO_DECLARE_WAR2 = new SystemMessageId(1531);
+	
+	/**
+	 * ID: 1532<br>
+	 * Message: Enter the name of the clan that you wish to request a cease-fire with.
+	 */
+	public static final SystemMessageId ENTER_CLAN_NAME_TO_CEASE_FIRE = new SystemMessageId(1532);
+	
+	/**
+	 * ID: 1533<br>
+	 * Message: Attention: $c1 has picked up $s2.
+	 */
+	public static final SystemMessageId ANNOUNCEMENT_C1_PICKED_UP_S2 = new SystemMessageId(1533);
+	
+	/**
+	 * ID: 1534<br>
+	 * Message: Attention: $c1 has picked up +$s2$s3.
+	 */
+	public static final SystemMessageId ANNOUNCEMENT_C1_PICKED_UP_S2_S3 = new SystemMessageId(1534);
+	
+	/**
+	 * ID: 1535<br>
+	 * Message: Attention: $c1's pet has picked up $s2.
+	 */
+	public static final SystemMessageId ANNOUNCEMENT_C1_PET_PICKED_UP_S2 = new SystemMessageId(1535);
+	
+	/**
+	 * ID: 1536<br>
+	 * Message: Attention: $c1's pet has picked up +$s2$s3.
+	 */
+	public static final SystemMessageId ANNOUNCEMENT_C1_PET_PICKED_UP_S2_S3 = new SystemMessageId(1536);
+	
+	/**
+	 * ID: 1537<br>
+	 * Message: Current Location: $s1, $s2, $s3 (near Rune Village)
+	 */
+	public static final SystemMessageId LOC_RUNE_S1_S2_S3 = new SystemMessageId(1537);
+	
+	/**
+	 * ID: 1538<br>
+	 * Message: Current Location: $s1, $s2, $s3 (near the Town of Goddard)
+	 */
+	public static final SystemMessageId LOC_GODDARD_S1_S2_S3 = new SystemMessageId(1538);
+	
+	/**
+	 * ID: 1539<br>
+	 * Message: Cargo has arrived at Talking Island Village.
+	 */
+	public static final SystemMessageId CARGO_AT_TALKING_VILLAGE = new SystemMessageId(1539);
+	
+	/**
+	 * ID: 1540<br>
+	 * Message: Cargo has arrived at the Dark Elf Village.
+	 */
+	public static final SystemMessageId CARGO_AT_DARKELF_VILLAGE = new SystemMessageId(1540);
+	
+	/**
+	 * ID: 1541<br>
+	 * Message: Cargo has arrived at Elven Village.
+	 */
+	public static final SystemMessageId CARGO_AT_ELVEN_VILLAGE = new SystemMessageId(1541);
+	
+	/**
+	 * ID: 1542<br>
+	 * Message: Cargo has arrived at Orc Village.
+	 */
+	public static final SystemMessageId CARGO_AT_ORC_VILLAGE = new SystemMessageId(1542);
+	
+	/**
+	 * ID: 1543<br>
+	 * Message: Cargo has arrived at Dwarven Village.
+	 */
+	public static final SystemMessageId CARGO_AT_DWARVEN_VILLAGE = new SystemMessageId(1543);
+	
+	/**
+	 * ID: 1544<br>
+	 * Message: Cargo has arrived at Aden Castle Town.
+	 */
+	public static final SystemMessageId CARGO_AT_ADEN = new SystemMessageId(1544);
+	
+	/**
+	 * ID: 1545<br>
+	 * Message: Cargo has arrived at the Town of Oren.
+	 */
+	public static final SystemMessageId CARGO_AT_OREN = new SystemMessageId(1545);
+	
+	/**
+	 * ID: 1546<br>
+	 * Message: Cargo has arrived at Hunters Village.
+	 */
+	public static final SystemMessageId CARGO_AT_HUNTERS = new SystemMessageId(1546);
+	
+	/**
+	 * ID: 1547<br>
+	 * Message: Cargo has arrived at the Town of Dion.
+	 */
+	public static final SystemMessageId CARGO_AT_DION = new SystemMessageId(1547);
+	
+	/**
+	 * ID: 1548<br>
+	 * Message: Cargo has arrived at Floran Village.
+	 */
+	public static final SystemMessageId CARGO_AT_FLORAN = new SystemMessageId(1548);
+	
+	/**
+	 * ID: 1549<br>
+	 * Message: Cargo has arrived at Gludin Village.
+	 */
+	public static final SystemMessageId CARGO_AT_GLUDIN = new SystemMessageId(1549);
+	
+	/**
+	 * ID: 1550<br>
+	 * Message: Cargo has arrived at the Town of Gludio.
+	 */
+	public static final SystemMessageId CARGO_AT_GLUDIO = new SystemMessageId(1550);
+	
+	/**
+	 * ID: 1551<br>
+	 * Message: Cargo has arrived at Giran Castle Town.
+	 */
+	public static final SystemMessageId CARGO_AT_GIRAN = new SystemMessageId(1551);
+	
+	/**
+	 * ID: 1552<br>
+	 * Message: Cargo has arrived at Heine.
+	 */
+	public static final SystemMessageId CARGO_AT_HEINE = new SystemMessageId(1552);
+	
+	/**
+	 * ID: 1553<br>
+	 * Message: Cargo has arrived at Rune Village.
+	 */
+	public static final SystemMessageId CARGO_AT_RUNE = new SystemMessageId(1553);
+	
+	/**
+	 * ID: 1554<br>
+	 * Message: Cargo has arrived at the Town of Goddard.
+	 */
+	public static final SystemMessageId CARGO_AT_GODDARD = new SystemMessageId(1554);
+	
+	/**
+	 * ID: 1555<br>
+	 * Message: Do you want to cancel character deletion?
+	 */
+	public static final SystemMessageId CANCEL_CHARACTER_DELETION_CONFIRM = new SystemMessageId(1555);
+	
+	/**
+	 * ID: 1556<br>
+	 * Message: Your clan notice has been saved.
+	 */
+	public static final SystemMessageId CLAN_NOTICE_SAVED = new SystemMessageId(1556);
+	
+	/**
+	 * ID: 1557<br>
+	 * Message: Seed price should be more than $s1 and less than $s2.
+	 */
+	public static final SystemMessageId SEED_PRICE_SHOULD_BE_MORE_THAN_S1_AND_LESS_THAN_S2 = new SystemMessageId(1557);
+	
+	/**
+	 * ID: 1558<br>
+	 * Message: The seed quantity should be more than $s1 and less than $s2.
+	 */
+	public static final SystemMessageId THE_QUANTITY_OF_SEED_SHOULD_BE_MORE_THAN_S1_AND_LESS_THAN_S2 = new SystemMessageId(1558);
+	
+	/**
+	 * ID: 1559<br>
+	 * Message: Crop price should be more than $s1 and less than $s2.
+	 */
+	public static final SystemMessageId CROP_PRICE_SHOULD_BE_MORE_THAN_S1_AND_LESS_THAN_S2 = new SystemMessageId(1559);
+	
+	/**
+	 * ID: 1560<br>
+	 * Message: The crop quantity should be more than $s1 and less than $s2 .
+	 */
+	public static final SystemMessageId THE_QUANTITY_OF_CROP_SHOULD_BE_MORE_THAN_S1_AND_LESS_THAN_S2 = new SystemMessageId(1560);
+	
+	/**
+	 * ID: 1561<br>
+	 * Message: $s1 has declared a Clan War.
+	 */
+	public static final SystemMessageId CLAN_S1_DECLARED_WAR = new SystemMessageId(1561);
+	
+	/**
+	 * ID: 1562<br>
+	 * Message: A Clan War has been declared against the clan, $s1. If you are killed during the Clan War by members of the opposing clan, you will only lose a quarter of the normal experience from death.
+	 */
+	public static final SystemMessageId CLAN_WAR_DECLARED_AGAINST_S1_IF_KILLED_LOSE_LOW_EXP = new SystemMessageId(1562);
+	
+	/**
+	 * ID: 1563<br>
+	 * Message: The clan, $s1, cannot declare a clan war because their clan is level 2 or lower, and or they do not have enough members.
+	 */
+	public static final SystemMessageId CANNOT_DECLARE_WAR_TOO_LOW_LEVEL_OR_NOT_ENOUGH_MEMBERS = new SystemMessageId(1563);
+	
+	/**
+	 * ID: 1564<br>
+	 * Message: A clan war can only be declared if the clan is level 3 or above, and the number of clan members is fifteen or greater.
+	 */
+	public static final SystemMessageId CLAN_WAR_DECLARED_IF_CLAN_LVL3_OR_15_MEMBER = new SystemMessageId(1564);
+	
+	/**
+	 * ID: 1565<br>
+	 * Message: A clan war cannot be declared against a clan that does not exist!
+	 */
+	public static final SystemMessageId CLAN_WAR_CANNOT_DECLARED_CLAN_NOT_EXIST = new SystemMessageId(1565);
+	
+	/**
+	 * ID: 1566<br>
+	 * Message: The clan, $s1, has decided to stop the war.
+	 */
+	public static final SystemMessageId CLAN_S1_HAS_DECIDED_TO_STOP = new SystemMessageId(1566);
+	
+	/**
+	 * ID: 1567<br>
+	 * Message: The war against $s1 Clan has been stopped.
+	 */
+	public static final SystemMessageId WAR_AGAINST_S1_HAS_STOPPED = new SystemMessageId(1567);
+	
+	/**
+	 * ID: 1568<br>
+	 * Message: The target for declaration is wrong.
+	 */
+	public static final SystemMessageId WRONG_DECLARATION_TARGET = new SystemMessageId(1568);
+	
+	/**
+	 * ID: 1569<br>
+	 * Message: A declaration of Clan War against an allied clan can't be made.
+	 */
+	public static final SystemMessageId CLAN_WAR_AGAINST_A_ALLIED_CLAN_NOT_WORK = new SystemMessageId(1569);
+	
+	/**
+	 * ID: 1570<br>
+	 * Message: A declaration of war against more than 30 Clans can't be made at the same time.
+	 */
+	public static final SystemMessageId TOO_MANY_CLAN_WARS = new SystemMessageId(1570);
+	
+	/**
+	 * ID: 1571<br>
+	 * Message: ======<Clans You've Declared War On>======
+	 */
+	public static final SystemMessageId CLANS_YOU_DECLARED_WAR_ON = new SystemMessageId(1571);
+	
+	/**
+	 * ID: 1572<br>
+	 * Message: ======<Clans That Have Declared War On You>======
+	 */
+	public static final SystemMessageId CLANS_THAT_HAVE_DECLARED_WAR_ON_YOU = new SystemMessageId(1572);
+	
+	/**
+	 * ID: 1573<br>
+	 * Message: All is well. There are no clans that have declared war against your clan.
+	 */
+	public static final SystemMessageId NO_WARS_AGAINST_YOU = new SystemMessageId(1573);
+	
+	/**
+	 * ID: 1574<br>
+	 * Message: Command Channels can only be formed by a party leader who is also the leader of a level 5 clan.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_ONLY_BY_LEVEL_5_CLAN_LEADER_PARTY_LEADER = new SystemMessageId(1574);
+	
+	/**
+	 * ID: 1575<br>
+	 * Message: Your pet uses spiritshot.
+	 */
+	public static final SystemMessageId PET_USE_SPIRITSHOT = new SystemMessageId(1575);
+	
+	/**
+	 * ID: 1576<br>
+	 * Message: Your servitor uses spiritshot.
+	 */
+	public static final SystemMessageId SERVITOR_USE_SPIRITSHOT = new SystemMessageId(1576);
+	
+	/**
+	 * ID: 1577<br>
+	 * Message: Servitor uses the power of spirit.
+	 */
+	public static final SystemMessageId SERVITOR_USE_THE_POWER_OF_SPIRIT = new SystemMessageId(1577);
+	
+	/**
+	 * ID: 1578<br>
+	 * Message: Items are not available for a private store or private manufacture.
+	 */
+	public static final SystemMessageId ITEMS_UNAVAILABLE_FOR_STORE_MANUFACTURE = new SystemMessageId(1578);
+	
+	/**
+	 * ID: 1579<br>
+	 * Message: $c1's pet gained $s2 adena.
+	 */
+	public static final SystemMessageId C1_PET_GAINED_S2_ADENA = new SystemMessageId(1579);
+	
+	/**
+	 * ID: 1580<br>
+	 * Message: The Command Channel has been formed.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_FORMED = new SystemMessageId(1580);
+	
+	/**
+	 * ID: 1581<br>
+	 * Message: The Command Channel has been disbanded.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_DISBANDED = new SystemMessageId(1581);
+	
+	/**
+	 * ID: 1582<br>
+	 * Message: You have joined the Command Channel.
+	 */
+	public static final SystemMessageId JOINED_COMMAND_CHANNEL = new SystemMessageId(1582);
+	
+	/**
+	 * ID: 1583<br>
+	 * Message: You were dismissed from the Command Channel.
+	 */
+	public static final SystemMessageId DISMISSED_FROM_COMMAND_CHANNEL = new SystemMessageId(1583);
+	
+	/**
+	 * ID: 1584<br>
+	 * Message: $c1's party has been dismissed from the Command Channel.
+	 */
+	public static final SystemMessageId C1_PARTY_DISMISSED_FROM_COMMAND_CHANNEL = new SystemMessageId(1584);
+	
+	/**
+	 * ID: 1585<br>
+	 * Message: The Command Channel has been disbanded.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_DISBANDED2 = new SystemMessageId(1585);
+	
+	/**
+	 * ID: 1586<br>
+	 * Message: You have quit the Command Channel.
+	 */
+	public static final SystemMessageId LEFT_COMMAND_CHANNEL = new SystemMessageId(1586);
+	
+	/**
+	 * ID: 1587<br>
+	 * Message: $c1's party has left the Command Channel.
+	 */
+	public static final SystemMessageId C1_PARTY_LEFT_COMMAND_CHANNEL = new SystemMessageId(1587);
+	
+	/**
+	 * ID: 1588<br>
+	 * Message: The Command Channel is activated only when there are at least 5 parties participating.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_ONLY_AT_LEAST_5_PARTIES = new SystemMessageId(1588);
+	
+	/**
+	 * ID: 1589<br>
+	 * Message: Command Channel authority has been transferred to $c1.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_LEADER_NOW_C1 = new SystemMessageId(1589);
+	
+	/**
+	 * ID: 1590<br>
+	 * Message: ===<Guild Info (Total Parties: $s1)>===
+	 */
+	public static final SystemMessageId GUILD_INFO_HEADER = new SystemMessageId(1590);
+	
+	/**
+	 * ID: 1591<br>
+	 * Message: No user has been invited to the Command Channel.
+	 */
+	public static final SystemMessageId NO_USER_INVITED_TO_COMMAND_CHANNEL = new SystemMessageId(1591);
+	
+	/**
+	 * ID: 1592<br>
+	 * Message: You can no longer set up a Command Channel.
+	 */
+	public static final SystemMessageId CANNOT_LONGER_SETUP_COMMAND_CHANNEL = new SystemMessageId(1592);
+	
+	/**
+	 * ID: 1593<br>
+	 * Message: You do not have authority to invite someone to the Command Channel.
+	 */
+	public static final SystemMessageId CANNOT_INVITE_TO_COMMAND_CHANNEL = new SystemMessageId(1593);
+	
+	/**
+	 * ID: 1594<br>
+	 * Message: $c1's party is already a member of the Command Channel.
+	 */
+	public static final SystemMessageId C1_ALREADY_MEMBER_OF_COMMAND_CHANNEL = new SystemMessageId(1594);
+	
+	/**
+	 * ID: 1595<br>
+	 * Message: $s1 has succeeded.
+	 */
+	public static final SystemMessageId S1_SUCCEEDED = new SystemMessageId(1595);
+	
+	/**
+	 * ID: 1596<br>
+	 * Message: You were hit by $s1!
+	 */
+	public static final SystemMessageId HIT_BY_S1 = new SystemMessageId(1596);
+	
+	/**
+	 * ID: 1597<br>
+	 * Message: $s1 has failed.
+	 */
+	public static final SystemMessageId S1_FAILED = new SystemMessageId(1597);
+	
+	/**
+	 * ID: 1598<br>
+	 * Message: Soulshots and spiritshots are not available for a dead pet or servitor. Sad, isn't it?
+	 */
+	public static final SystemMessageId SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET = new SystemMessageId(1598);
+	
+	/**
+	 * ID: 1599<br>
+	 * Message: You cannot "observe" while you are in combat!
+	 */
+	public static final SystemMessageId CANNOT_OBSERVE_IN_COMBAT = new SystemMessageId(1599);
+	
+	/**
+	 * ID: 1600<br>
+	 * Message: Tomorrow's items will ALL be set to 0. Do you wish to continue?
+	 */
+	public static final SystemMessageId TOMORROW_ITEM_ZERO_CONFIRM = new SystemMessageId(1600);
+	
+	/**
+	 * ID: 1601<br>
+	 * Message: Tomorrow's items will all be set to the same value as today's items. Do you wish to continue?
+	 */
+	public static final SystemMessageId TOMORROW_ITEM_SAME_CONFIRM = new SystemMessageId(1601);
+	
+	/**
+	 * ID: 1602<br>
+	 * Message: Only a party leader can access the Command Channel.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_ONLY_FOR_PARTY_LEADER = new SystemMessageId(1602);
+	
+	/**
+	 * ID: 1603<br>
+	 * Message: Only the Command Channel creator can use the Raid Leader text.
+	 */
+	public static final SystemMessageId ONLY_COMMANDER_GIVE_COMMAND = new SystemMessageId(1603);
+	
+	/**
+	 * ID: 1604<br>
+	 * Message: While dressed in formal wear, you can't use items that require all skills and casting operations.
+	 */
+	public static final SystemMessageId CANNOT_USE_ITEMS_SKILLS_WITH_FORMALWEAR = new SystemMessageId(1604);
+	
+	/**
+	 * ID: 1605<br>
+	 * Message: * Here, you can buy only seeds of $s1 Manor.
+	 */
+	public static final SystemMessageId HERE_YOU_CAN_BUY_ONLY_SEEDS_OF_S1_MANOR = new SystemMessageId(1605);
+	
+	/**
+	 * ID: 1606<br>
+	 * Message: Congratulations - You've completed your third-class transfer quest!
+	 */
+	public static final SystemMessageId THIRD_CLASS_TRANSFER = new SystemMessageId(1606);
+	
+	/**
+	 * ID: 1607<br>
+	 * Message: $s1 adena has been withdrawn to pay for purchasing fees.
+	 */
+	public static final SystemMessageId S1_ADENA_HAS_BEEN_WITHDRAWN_TO_PAY_FOR_PURCHASING_FEES = new SystemMessageId(1607);
+	
+	/**
+	 * ID: 1608<br>
+	 * Message: Due to insufficient adena you cannot buy another castle.
+	 */
+	public static final SystemMessageId INSUFFICIENT_ADENA_TO_BUY_CASTLE = new SystemMessageId(1608);
+	
+	/**
+	 * ID: 1609<br>
+	 * Message: War has already been declared against that clan… but I'll make note that you really don't like them.
+	 */
+	public static final SystemMessageId WAR_ALREADY_DECLARED = new SystemMessageId(1609);
+	
+	/**
+	 * ID: 1610<br>
+	 * Message: Fool! You cannot declare war against your own clan!
+	 */
+	public static final SystemMessageId CANNOT_DECLARE_AGAINST_OWN_CLAN = new SystemMessageId(1610);
+	
+	/**
+	 * ID: 1611<br>
+	 * Message: Party Leader: $c1
+	 */
+	public static final SystemMessageId PARTY_LEADER_C1 = new SystemMessageId(1611);
+	
+	/**
+	 * ID: 1612<br>
+	 * Message: =====<War List>=====
+	 */
+	public static final SystemMessageId WAR_LIST = new SystemMessageId(1612);
+	
+	/**
+	 * ID: 1613<br>
+	 * Message: There is no clan listed on your War List.
+	 */
+	public static final SystemMessageId NO_CLAN_ON_WAR_LIST = new SystemMessageId(1613);
+	
+	/**
+	 * ID: 1614<br>
+	 * Message: You have joined a channel that was already open.
+	 */
+	public static final SystemMessageId JOINED_CHANNEL_ALREADY_OPEN = new SystemMessageId(1614);
+	
+	/**
+	 * ID: 1615<br>
+	 * Message: The number of remaining parties is $s1 until a channel is activated.
+	 */
+	public static final SystemMessageId S1_PARTIES_REMAINING_UNTIL_CHANNEL = new SystemMessageId(1615);
+	
+	/**
+	 * ID: 1616<br>
+	 * Message: The Command Channel has been activated.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_ACTIVATED = new SystemMessageId(1616);
+	
+	/**
+	 * ID: 1617<br>
+	 * Message: You do not have the authority to use the Command Channel.
+	 */
+	public static final SystemMessageId CANT_USE_COMMAND_CHANNEL = new SystemMessageId(1617);
+	
+	/**
+	 * ID: 1618<br>
+	 * Message: The ferry from Rune Harbor to Gludin Harbor has been delayed.
+	 */
+	public static final SystemMessageId FERRY_RUNE_GLUDIN_DELAYED = new SystemMessageId(1618);
+	
+	/**
+	 * ID: 1619<br>
+	 * Message: The ferry from Gludin Harbor to Rune Harbor has been delayed.
+	 */
+	public static final SystemMessageId FERRY_GLUDIN_RUNE_DELAYED = new SystemMessageId(1619);
+	
+	/**
+	 * ID: 1620<br>
+	 * Message: Welcome to Rune Harbor.
+	 */
+	public static final SystemMessageId ARRIVED_AT_RUNE = new SystemMessageId(1620);
+	
+	/**
+	 * ID: 1621<br>
+	 * Message: Departure for Gludin Harbor will take place in five minutes!
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_GLUDIN_5_MINUTES = new SystemMessageId(1621);
+	
+	/**
+	 * ID: 1622<br>
+	 * Message: Departure for Gludin Harbor will take place in one minute!
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_GLUDIN_1_MINUTE = new SystemMessageId(1622);
+	
+	/**
+	 * ID: 1623<br>
+	 * Message: Make haste! We will be departing for Gludin Harbor shortly…
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_GLUDIN_SHORTLY = new SystemMessageId(1623);
+	
+	/**
+	 * ID: 1624<br>
+	 * Message: We are now departing for Gludin Harbor. Hold on and enjoy the ride!
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_GLUDIN_NOW = new SystemMessageId(1624);
+	
+	/**
+	 * ID: 1625<br>
+	 * Message: Departure for Rune Harbor will take place after anchoring for ten minutes.
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_RUNE_10_MINUTES = new SystemMessageId(1625);
+	
+	/**
+	 * ID: 1626<br>
+	 * Message: Departure for Rune Harbor will take place in five minutes!
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_RUNE_5_MINUTES = new SystemMessageId(1626);
+	
+	/**
+	 * ID: 1627<br>
+	 * Message: Departure for Rune Harbor will take place in one minute!
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_RUNE_1_MINUTE = new SystemMessageId(1627);
+	
+	/**
+	 * ID: 1628<br>
+	 * Message: Make haste! We will be departing for Gludin Harbor shortly…
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_GLUDIN_SHORTLY2 = new SystemMessageId(1628);
+	
+	/**
+	 * ID: 1629<br>
+	 * Message: We are now departing for Rune Harbor. Hold on and enjoy the ride!
+	 */
+	public static final SystemMessageId DEPARTURE_FOR_RUNE_NOW = new SystemMessageId(1629);
+	
+	/**
+	 * ID: 1630<br>
+	 * Message: The ferry from Rune Harbor will be arriving at Gludin Harbor in approximately 15 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_RUNE_AT_GLUDIN_15_MINUTES = new SystemMessageId(1630);
+	
+	/**
+	 * ID: 1631<br>
+	 * Message: The ferry from Rune Harbor will be arriving at Gludin Harbor in approximately 10 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_RUNE_AT_GLUDIN_10_MINUTES = new SystemMessageId(1631);
+	
+	/**
+	 * ID: 1632<br>
+	 * Message: The ferry from Rune Harbor will be arriving at Gludin Harbor in approximately 5 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_RUNE_AT_GLUDIN_5_MINUTES = new SystemMessageId(1632);
+	
+	/**
+	 * ID: 1633<br>
+	 * Message: The ferry from Rune Harbor will be arriving at Gludin Harbor in approximately 1 minute.
+	 */
+	public static final SystemMessageId FERRY_FROM_RUNE_AT_GLUDIN_1_MINUTE = new SystemMessageId(1633);
+	
+	/**
+	 * ID: 1634<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Rune Harbor in approximately 15 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_AT_RUNE_15_MINUTES = new SystemMessageId(1634);
+	
+	/**
+	 * ID: 1635<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Rune Harbor in approximately 10 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_AT_RUNE_10_MINUTES = new SystemMessageId(1635);
+	
+	/**
+	 * ID: 1636<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Rune Harbor in approximately 5 minutes.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_AT_RUNE_5_MINUTES = new SystemMessageId(1636);
+	
+	/**
+	 * ID: 1637<br>
+	 * Message: The ferry from Gludin Harbor will be arriving at Rune Harbor in approximately 1 minute.
+	 */
+	public static final SystemMessageId FERRY_FROM_GLUDIN_AT_RUNE_1_MINUTE = new SystemMessageId(1637);
+	
+	/**
+	 * ID: 1638<br>
+	 * Message: You cannot fish while using a recipe book, private manufacture or private store.
+	 */
+	public static final SystemMessageId CANNOT_FISH_WHILE_USING_RECIPE_BOOK = new SystemMessageId(1638);
+	
+	/**
+	 * ID: 1639<br>
+	 * Message: Round $s1 of the Grand Olympiad Games has started!
+	 */
+	public static final SystemMessageId OLYMPIAD_PERIOD_S1_HAS_STARTED = new SystemMessageId(1639);
+	
+	/**
+	 * ID: 1640<br>
+	 * Message: Round $s1 of the Grand Olympiad Games has now ended.
+	 */
+	public static final SystemMessageId OLYMPIAD_PERIOD_S1_HAS_ENDED = new SystemMessageId(1640);
+	
+	/**
+	 * ID: 1641<br>
+	 * Message: Sharpen your swords, tighten the stitching in your armor, and make haste to a Grand Olympiad Manager! Battles in the Grand Olympiad Games are now taking place!
+	 */
+	public static final SystemMessageId THE_OLYMPIAD_GAME_HAS_STARTED = new SystemMessageId(1641);
+	
+	/**
+	 * ID: 1642<br>
+	 * Message: Much carnage has been left for the cleanup crew of the Olympiad Stadium. Battles in the Grand Olympiad Games are now over!
+	 */
+	public static final SystemMessageId THE_OLYMPIAD_GAME_HAS_ENDED = new SystemMessageId(1642);
+	
+	/**
+	 * ID: 1643<br>
+	 * Message: Current Location: $s1, $s2, $s3 (Dimensional Gap)
+	 */
+	public static final SystemMessageId LOC_DIMENSIONAL_GAP_S1_S2_S3 = new SystemMessageId(1643);
+	
+	/**
+	 * ID: 1649<br>
+	 * Message: Play time is now accumulating.
+	 */
+	public static final SystemMessageId PLAY_TIME_NOW_ACCUMULATING = new SystemMessageId(1649);
+	
+	/**
+	 * ID: 1650<br>
+	 * Message: Due to high server traffic, your login attempt has failed. Please try again soon.
+	 */
+	public static final SystemMessageId TRY_LOGIN_LATER = new SystemMessageId(1650);
+	
+	/**
+	 * ID: 1651<br>
+	 * Message: The Grand Olympiad Games are not currently in progress.
+	 */
+	public static final SystemMessageId THE_OLYMPIAD_GAME_IS_NOT_CURRENTLY_IN_PROGRESS = new SystemMessageId(1651);
+	
+	/**
+	 * ID: 1652<br>
+	 * Message: You are now recording gameplay.
+	 */
+	public static final SystemMessageId RECORDING_GAMEPLAY_START = new SystemMessageId(1652);
+	
+	/**
+	 * ID: 1653<br>
+	 * Message: Your recording has been successfully stored. ($s1)
+	 */
+	public static final SystemMessageId RECORDING_GAMEPLAY_STOP_S1 = new SystemMessageId(1653);
+	
+	/**
+	 * ID: 1654<br>
+	 * Message: The attempt to record the replay file has failed.
+	 */
+	public static final SystemMessageId RECORDING_GAMEPLAY_FAILED = new SystemMessageId(1654);
+	
+	/**
+	 * ID: 1655<br>
+	 * Message: You caught something smelly and scary, maybe you should throw it back!?
+	 */
+	public static final SystemMessageId YOU_CAUGHT_SOMETHING_SMELLY_THROW_IT_BACK = new SystemMessageId(1655);
+	
+	/**
+	 * ID: 1656<br>
+	 * Message: You have successfully traded the item with the NPC.
+	 */
+	public static final SystemMessageId SUCCESSFULLY_TRADED_WITH_NPC = new SystemMessageId(1656);
+	
+	/**
+	 * ID: 1657<br>
+	 * Message: $c1 has earned $s2 points in the Grand Olympiad Games.
+	 */
+	public static final SystemMessageId C1_HAS_GAINED_S2_OLYMPIAD_POINTS = new SystemMessageId(1657);
+	
+	/**
+	 * ID: 1658<br>
+	 * Message: $c1 has lost $s2 points in the Grand Olympiad Games.
+	 */
+	public static final SystemMessageId C1_HAS_LOST_S2_OLYMPIAD_POINTS = new SystemMessageId(1658);
+	
+	/**
+	 * ID: 1659<br>
+	 * Message: Current Location: $s1, $s2, $s3 (Cemetery of the Empire).
+	 */
+	public static final SystemMessageId LOC_CEMETARY_OF_THE_EMPIRE_S1_S2_S3 = new SystemMessageId(1659);
+	
+	/**
+	 * ID: 1660<br>
+	 * Message: Channel Creator: $c1
+	 */
+	public static final SystemMessageId CHANNEL_CREATOR_C1 = new SystemMessageId(1660);
+	
+	/**
+	 * ID: 1661<br>
+	 * Message: $c1 has obtained $s3 $s2s.
+	 */
+	public static final SystemMessageId C1_OBTAINED_S3_S2_S = new SystemMessageId(1661);
+	
+	/**
+	 * ID: 1662<br>
+	 * Message: The fish are no longer biting here because you've caught too many! Try fishing in another location.
+	 */
+	public static final SystemMessageId FISH_NO_MORE_BITING_TRY_OTHER_LOCATION = new SystemMessageId(1662);
+	
+	/**
+	 * ID: 1663<br>
+	 * Message: The clan crest was successfully registered. Remember, only a clan that owns a clan hall or castle can display a crest.
+	 */
+	public static final SystemMessageId CLAN_EMBLEM_WAS_SUCCESSFULLY_REGISTERED = new SystemMessageId(1663);
+	
+	/**
+	 * ID: 1664<br>
+	 * Message: The fish is resisting your efforts to haul it in! Look at that bobber go!
+	 */
+	public static final SystemMessageId FISH_RESISTING_LOOK_BOBBLER = new SystemMessageId(1664);
+	
+	/**
+	 * ID: 1665<br>
+	 * Message: You've worn that fish out! It can't even pull the bobber under the water!
+	 */
+	public static final SystemMessageId YOU_WORN_FISH_OUT = new SystemMessageId(1665);
+	
+	/**
+	 * ID: 1666<br>
+	 * Message: You have obtained +$s1$s2.
+	 */
+	public static final SystemMessageId OBTAINED_S1_S2 = new SystemMessageId(1666);
+	
+	/**
+	 * ID: 1667<br>
+	 * Message: Lethal Strike!
+	 */
+	public static final SystemMessageId LETHAL_STRIKE = new SystemMessageId(1667);
+	
+	/**
+	 * ID: 1668<br>
+	 * Message: Your lethal strike was successful!
+	 */
+	public static final SystemMessageId LETHAL_STRIKE_SUCCESSFUL = new SystemMessageId(1668);
+	
+	/**
+	 * ID: 1669<br>
+	 * Message: There was nothing found inside.
+	 */
+	public static final SystemMessageId NOTHING_INSIDE_THAT = new SystemMessageId(1669);
+	
+	/**
+	 * ID: 1670<br>
+	 * Message: Due to your Reeling and/or Pumping skill being three or more levels higher than your Fishing skill, a 50 damage penalty will be applied.
+	 */
+	public static final SystemMessageId REELING_PUMPING_3_LEVELS_HIGHER_THAN_FISHING_PENALTY = new SystemMessageId(1670);
+	
+	/**
+	 * ID: 1671<br>
+	 * Message: Your reeling was successful! (Mastery Penalty:$s1 )
+	 */
+	public static final SystemMessageId REELING_SUCCESSFUL_PENALTY_S1 = new SystemMessageId(1671);
+	
+	/**
+	 * ID: 1672<br>
+	 * Message: Your pumping was successful! (Mastery Penalty:$s1 )
+	 */
+	public static final SystemMessageId PUMPING_SUCCESSFUL_PENALTY_S1 = new SystemMessageId(1672);
+	
+	/**
+	 * ID: 1673<br>
+	 * Message: For the current Grand Olympiad you have participated in $s1 match(es). $s2 win(s) and $s3 defeat(s). You currently have $s4 Olympiad Point(s).
+	 */
+	public static final SystemMessageId THE_CURRENT_RECORD_FOR_THIS_OLYMPIAD_SESSION_IS_S1_MATCHES_S2_WINS_S3_DEFEATS_YOU_HAVE_EARNED_S4_OLYMPIAD_POINTS = new SystemMessageId(1673);
+	
+	/**
+	 * ID: 1674<br>
+	 * Message: This command can only be used by a Noblesse.
+	 */
+	public static final SystemMessageId NOBLESSE_ONLY = new SystemMessageId(1674);
+	
+	/**
+	 * ID: 1675<br>
+	 * Message: A manor cannot be set up between 4:30 am and 8 pm.
+	 */
+	public static final SystemMessageId A_MANOR_CANNOT_BE_SET_UP_BETWEEN_4_30_AM_AND_8_PM = new SystemMessageId(1675);
+	
+	/**
+	 * ID: 1676<br>
+	 * Message: You do not have a servitor or pet and therefore cannot use the automatic-use function.
+	 */
+	public static final SystemMessageId NO_SERVITOR_CANNOT_AUTOMATE_USE = new SystemMessageId(1676);
+	
+	/**
+	 * ID: 1677<br>
+	 * Message: A cease-fire during a Clan War can not be called while members of your clan are engaged in battle.
+	 */
+	public static final SystemMessageId CANT_STOP_CLAN_WAR_WHILE_IN_COMBAT = new SystemMessageId(1677);
+	
+	/**
+	 * ID: 1678<br>
+	 * Message: You have not declared a Clan War against the clan $s1.
+	 */
+	public static final SystemMessageId NO_CLAN_WAR_AGAINST_CLAN_S1 = new SystemMessageId(1678);
+	
+	/**
+	 * ID: 1679<br>
+	 * Message: Only the creator of a command channel can issue a global command.
+	 */
+	public static final SystemMessageId ONLY_CHANNEL_CREATOR_CAN_GLOBAL_COMMAND = new SystemMessageId(1679);
+	
+	/**
+	 * ID: 1680<br>
+	 * Message: $c1 has declined the channel invitation.
+	 */
+	public static final SystemMessageId C1_DECLINED_CHANNEL_INVITATION = new SystemMessageId(1680);
+	
+	/**
+	 * ID: 1681<br>
+	 * Message: Since $c1 did not respond, your channel invitation has failed.
+	 */
+	public static final SystemMessageId C1_DID_NOT_RESPOND_CHANNEL_INVITATION_FAILED = new SystemMessageId(1681);
+	
+	/**
+	 * ID: 1682<br>
+	 * Message: Only the creator of a command channel can use the channel dismiss command.
+	 */
+	public static final SystemMessageId ONLY_CHANNEL_CREATOR_CAN_DISMISS = new SystemMessageId(1682);
+	
+	/**
+	 * ID: 1683<br>
+	 * Message: Only a party leader can leave a command channel.
+	 */
+	public static final SystemMessageId ONLY_PARTY_LEADER_CAN_LEAVE_CHANNEL = new SystemMessageId(1683);
+	
+	/**
+	 * ID: 1684<br>
+	 * Message: A Clan War can not be declared against a clan that is being dissolved.
+	 */
+	public static final SystemMessageId NO_CLAN_WAR_AGAINST_DISSOLVING_CLAN = new SystemMessageId(1684);
+	
+	/**
+	 * ID: 1685<br>
+	 * Message: You are unable to equip this item when your PK count is greater than or equal to one.
+	 */
+	public static final SystemMessageId YOU_ARE_UNABLE_TO_EQUIP_THIS_ITEM_WHEN_YOUR_PK_COUNT_IS_GREATER_THAN_OR_EQUAL_TO_ONE = new SystemMessageId(1685);
+	
+	/**
+	 * ID: 1686<br>
+	 * Message: Stones and mortar tumble to the earth - the castle wall has taken damage!
+	 */
+	public static final SystemMessageId CASTLE_WALL_DAMAGED = new SystemMessageId(1686);
+	
+	/**
+	 * ID: 1687<br>
+	 * Message: This area cannot be entered while mounted atop of a Wyvern. You will be dismounted from your Wyvern if you do not leave!
+	 */
+	public static final SystemMessageId AREA_CANNOT_BE_ENTERED_WHILE_MOUNTED_WYVERN = new SystemMessageId(1687);
+	
+	/**
+	 * ID: 1688<br>
+	 * Message: You cannot enchant while operating a Private Store or Private Workshop.
+	 */
+	public static final SystemMessageId CANNOT_ENCHANT_WHILE_STORE = new SystemMessageId(1688);
+	
+	/**
+	 * ID: 1689<br>
+	 * Message: $c1 is already registered on the class match waiting list.
+	 */
+	public static final SystemMessageId C1_IS_ALREADY_REGISTERED_ON_THE_CLASS_MATCH_WAITING_LIST = new SystemMessageId(1689);
+	
+	/**
+	 * ID: 1690<br>
+	 * Message: $c1 is already registered on the waiting list for the class irrelevant individual match.
+	 */
+	public static final SystemMessageId C1_IS_ALREADY_REGISTERED_ON_THE_NON_CLASS_LIMITED_MATCH_WAITING_LIST = new SystemMessageId(1690);
+	
+	/**
+	 * ID: 1691<br>
+	 * Message: $c1 does not meet the participation requirements. You cannot participate in the Olympiad because your inventory slot exceeds 80%.
+	 */
+	public static final SystemMessageId C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_INVENTORY_SLOT_EXCEEDS_80_PERCENT = new SystemMessageId(1691);
+	
+	/**
+	 * ID: 1692<br>
+	 * Message: $c1 does not meet the participation requirements. You cannot participate in the Olympiad because you have changed to your sub-class.
+	 */
+	public static final SystemMessageId C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_WHILE_CHANGED_TO_SUB_CLASS = new SystemMessageId(1692);
+	
+	/**
+	 * ID: 1693<br>
+	 * Message: You may not observe a Grand Olympiad Games match while you are on the waiting list.
+	 */
+	public static final SystemMessageId WHILE_YOU_ARE_ON_THE_WAITING_LIST_YOU_ARE_NOT_ALLOWED_TO_WATCH_THE_GAME = new SystemMessageId(1693);
+	
+	/**
+	 * ID: 1694<br>
+	 * Message: Only a clan leader that is a Noblesse can view the Siege War Status window during a siege war.
+	 */
+	public static final SystemMessageId ONLY_NOBLESSE_LEADER_CAN_VIEW_SIEGE_STATUS_WINDOW = new SystemMessageId(1694);
+	
+	/**
+	 * ID: 1695<br>
+	 * Message: You can only use that during a Siege War!
+	 */
+	public static final SystemMessageId ONLY_DURING_SIEGE = new SystemMessageId(1695);
+	
+	/**
+	 * ID: 1696<br>
+	 * Message: Your accumulated play time is $s1.
+	 */
+	public static final SystemMessageId ACCUMULATED_PLAY_TIME_IS_S1 = new SystemMessageId(1696);
+	
+	/**
+	 * ID: 1697<br>
+	 * Message: Your accumulated play time has reached Fatigue level, so you will receive experience or item drops at only 50 percent of the normal rate. For the sake of you physical and emotional health, we encourage you to log out as soon as possible and take a break before returning.
+	 */
+	public static final SystemMessageId ACCUMULATED_PLAY_TIME_WARNING1 = new SystemMessageId(1697);
+	
+	/**
+	 * ID: 1698<br>
+	 * Message: Your accumulated play time has reached Ill-health level, so you will no longer gain experience or item drops. For the sake of your physical and emotional health, please log out as soon as possible and take a break. Once you have been logged out for at least 5 hours, the experience
+	 * and item drop rate penalties will be removed.
+	 */
+	public static final SystemMessageId ACCUMULATED_PLAY_TIME_WARNING2 = new SystemMessageId(1698);
+	
+	/**
+	 * ID: 1699<br>
+	 * Message: You cannot dismiss a party member by force.
+	 */
+	public static final SystemMessageId CANNOT_DISMISS_PARTY_MEMBER = new SystemMessageId(1699);
+	
+	/**
+	 * ID: 1700<br>
+	 * Message: You don't have enough spiritshots needed for a pet/servitor.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SPIRITHOTS_FOR_PET = new SystemMessageId(1700);
+	
+	/**
+	 * ID: 1701<br>
+	 * Message: You don't have enough soulshots needed for a pet/servitor.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SOULSHOTS_FOR_PET = new SystemMessageId(1701);
+	
+	/**
+	 * ID: 1702<br>
+	 * Message: $s1 is using a third party program.
+	 */
+	public static final SystemMessageId S1_USING_THIRD_PARTY_PROGRAM = new SystemMessageId(1702);
+	
+	/**
+	 * ID: 1703<br>
+	 * Message: The previously investigated user is not using a third party program.
+	 */
+	public static final SystemMessageId NOT_USING_THIRD_PARTY_PROGRAM = new SystemMessageId(1703);
+	
+	/**
+	 * ID: 1704<br>
+	 * Message: Please close the setup window for your private manufacturing store or private store, and try again.
+	 */
+	public static final SystemMessageId CLOSE_STORE_WINDOW_AND_TRY_AGAIN = new SystemMessageId(1704);
+	
+	/**
+	 * ID: 1705<br>
+	 * Message: PC Points acquisition period. Time left: $s1 hour(s).
+	 */
+	public static final SystemMessageId PCPOINT_ACQUISITION_PERIOD = new SystemMessageId(1705);
+	
+	/**
+	 * ID: 1706<br>
+	 * Message: PC Points use period. Time left: $s1 hour(s).
+	 */
+	public static final SystemMessageId PCPOINT_USE_PERIOD = new SystemMessageId(1706);
+	
+	/**
+	 * ID: 1707<br>
+	 * Message: You acquired $s1 PC Point(s).
+	 */
+	public static final SystemMessageId ACQUIRED_S1_PCPOINT = new SystemMessageId(1707);
+	
+	/**
+	 * ID: 1708<br>
+	 * Message: Double points! You acquired $s1 PC Point(s).
+	 */
+	public static final SystemMessageId ACQUIRED_S1_PCPOINT_DOUBLE = new SystemMessageId(1708);
+	
+	/**
+	 * ID: 1709<br>
+	 * Message: You are using $s1 PC Point(s).
+	 */
+	public static final SystemMessageId USING_S1_PCPOINT = new SystemMessageId(1709);
+	
+	/**
+	 * ID: 1710<br>
+	 * Message: You don't have enough PC Points.
+	 */
+	public static final SystemMessageId SHORT_OF_ACCUMULATED_POINTS = new SystemMessageId(1710);
+	
+	/**
+	 * ID: 1711<br>
+	 * Message: PC Points use period has expired.
+	 */
+	public static final SystemMessageId PCPOINT_USE_PERIOD_EXPIRED = new SystemMessageId(1711);
+	
+	/**
+	 * ID: 1712<br>
+	 * Message: PC Points acquisition period has expired.
+	 */
+	public static final SystemMessageId PCPOINT_ACCUMULATION_PERIOD_EXPIRED = new SystemMessageId(1712);
+	
+	/**
+	 * ID: 1713<br>
+	 * Message: The games may be delayed due to an insufficient number of players waiting.
+	 */
+	public static final SystemMessageId GAMES_DELAYED = new SystemMessageId(1713);
+	
+	/**
+	 * ID: 1714<br>
+	 * Message: Current Location: $s1, $s2, $s3 (Near the Town of Schuttgart)
+	 */
+	public static final SystemMessageId LOC_SCHUTTGART_S1_S2_S3 = new SystemMessageId(1714);
+	
+	/**
+	 * ID: 1715<br>
+	 * Message: This is a Peaceful Zone\\n- PvP is not allowed in this area.
+	 */
+	public static final SystemMessageId PEACEFUL_ZONE = new SystemMessageId(1715);
+	
+	/**
+	 * ID: 1716<br>
+	 * Message: Altered Zone
+	 */
+	public static final SystemMessageId ALTERED_ZONE = new SystemMessageId(1716);
+	
+	/**
+	 * ID: 1717<br>
+	 * Message: Siege War Zone \\n- A siege is currently in progress in this area. \\n If a character dies in this zone, their resurrection ability may be restricted.
+	 */
+	public static final SystemMessageId SIEGE_ZONE = new SystemMessageId(1717);
+	
+	/**
+	 * ID: 1718<br>
+	 * Message: General Field
+	 */
+	public static final SystemMessageId GENERAL_ZONE = new SystemMessageId(1718);
+	
+	/**
+	 * ID: 1719<br>
+	 * Message: Seven Signs Zone \\n- Although a character's level may increase while in this area, HP and MP \\n will not be regenerated.
+	 */
+	public static final SystemMessageId SEVENSIGNS_ZONE = new SystemMessageId(1719);
+	
+	/**
+	 * ID: 1720<br>
+	 * Message: ---
+	 */
+	public static final SystemMessageId UNKNOWN1 = new SystemMessageId(1720);
+	
+	/**
+	 * ID: 1721<br>
+	 * Message: Combat Zone
+	 */
+	public static final SystemMessageId COMBAT_ZONE = new SystemMessageId(1721);
+	
+	/**
+	 * ID: 1722<br>
+	 * Message: Please enter the name of the item you wish to search for.
+	 */
+	public static final SystemMessageId ENTER_ITEM_NAME_SEARCH = new SystemMessageId(1722);
+	
+	/**
+	 * ID: 1723<br>
+	 * Message: Please take a moment to provide feedback about the petition service.
+	 */
+	public static final SystemMessageId PLEASE_PROVIDE_PETITION_FEEDBACK = new SystemMessageId(1723);
+	
+	/**
+	 * ID: 1724<br>
+	 * Message: A servitor whom is engaged in battle cannot be de-activated.
+	 */
+	public static final SystemMessageId SERVITOR_NOT_RETURN_IN_BATTLE = new SystemMessageId(1724);
+	
+	/**
+	 * ID: 1725<br>
+	 * Message: You have earned $s1 raid point(s).
+	 */
+	public static final SystemMessageId EARNED_S1_RAID_POINTS = new SystemMessageId(1725);
+	
+	/**
+	 * ID: 1726<br>
+	 * Message: $s1 has disappeared because its time period has expired.
+	 */
+	public static final SystemMessageId S1_PERIOD_EXPIRED_DISAPPEARED = new SystemMessageId(1726);
+	
+	/**
+	 * ID: 1727<br>
+	 * Message: $s1 has invited you to room <$s2>. Do you wish to accept?
+	 */
+	public static final SystemMessageId C1_INVITED_YOU_TO_PARTY_ROOM_CONFIRM = new SystemMessageId(1727);
+	
+	/**
+	 * ID: 1728<br>
+	 * Message: The recipient of your invitation did not accept the party matching invitation.
+	 */
+	public static final SystemMessageId PARTY_MATCHING_REQUEST_NO_RESPONSE = new SystemMessageId(1728);
+	
+	/**
+	 * ID: 1729<br>
+	 * Message: You cannot join a Command Channel while teleporting.
+	 */
+	public static final SystemMessageId NOT_JOIN_CHANNEL_WHILE_TELEPORTING = new SystemMessageId(1729);
+	
+	/**
+	 * ID: 1730<br>
+	 * Message: To establish a Clan Academy, your clan must be Level 5 or higher.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_CLAN_ACADEMY = new SystemMessageId(1730);
+	
+	/**
+	 * ID: 1731<br>
+	 * Message: Only the clan leader can create a Clan Academy.
+	 */
+	public static final SystemMessageId ONLY_LEADER_CAN_CREATE_ACADEMY = new SystemMessageId(1731);
+	
+	/**
+	 * ID: 1732<br>
+	 * Message: To create a Clan Academy, a Blood Mark is needed.
+	 */
+	public static final SystemMessageId NEED_BLOODMARK_FOR_ACADEMY = new SystemMessageId(1732);
+	
+	/**
+	 * ID: 1733<br>
+	 * Message: You do not have enough adena to create a Clan Academy.
+	 */
+	public static final SystemMessageId NEED_ADENA_FOR_ACADEMY = new SystemMessageId(1733);
+	
+	/**
+	 * ID: 1734<br>
+	 * Message: To join a Clan Academy, characters must be Level 40 or below, not belong another clan and not yet completed their 2nd class transfer.
+	 */
+	public static final SystemMessageId ACADEMY_REQUIREMENTS = new SystemMessageId(1734);
+	
+	/**
+	 * ID: 1735<br>
+	 * Message: $s1 does not meet the requirements to join a Clan Academy.
+	 */
+	public static final SystemMessageId S1_DOESNOT_MEET_REQUIREMENTS_TO_JOIN_ACADEMY = new SystemMessageId(1735);
+	
+	/**
+	 * ID: 1736<br>
+	 * Message: The Clan Academy has reached its maximum enrollment.
+	 */
+	public static final SystemMessageId ACADEMY_MAXIMUM = new SystemMessageId(1736);
+	
+	/**
+	 * ID: 1737<br>
+	 * Message: Your clan has not established a Clan Academy but is eligible to do so.
+	 */
+	public static final SystemMessageId CLAN_CAN_CREATE_ACADEMY = new SystemMessageId(1737);
+	
+	/**
+	 * ID: 1738<br>
+	 * Message: Your clan has already established a Clan Academy.
+	 */
+	public static final SystemMessageId CLAN_HAS_ALREADY_ESTABLISHED_A_CLAN_ACADEMY = new SystemMessageId(1738);
+	
+	/**
+	 * ID: 1739<br>
+	 * Message: Would you like to create a Clan Academy?
+	 */
+	public static final SystemMessageId CLAN_ACADEMY_CREATE_CONFIRM = new SystemMessageId(1739);
+	
+	/**
+	 * ID: 1740<br>
+	 * Message: Please enter the name of the Clan Academy.
+	 */
+	public static final SystemMessageId ACADEMY_CREATE_ENTER_NAME = new SystemMessageId(1740);
+	
+	/**
+	 * ID: 1741<br>
+	 * Message: Congratulations! The $s1's Clan Academy has been created.
+	 */
+	public static final SystemMessageId THE_S1S_CLAN_ACADEMY_HAS_BEEN_CREATED = new SystemMessageId(1741);
+	
+	/**
+	 * ID: 1742<br>
+	 * Message: A message inviting $s1 to join the Clan Academy is being sent.
+	 */
+	public static final SystemMessageId ACADEMY_INVITATION_SENT_TO_S1 = new SystemMessageId(1742);
+	
+	/**
+	 * ID: 1743<br>
+	 * Message: To open a Clan Academy, the leader of a Level 5 clan or above must pay XX Proofs of Blood or a certain amount of adena.
+	 */
+	public static final SystemMessageId OPEN_ACADEMY_CONDITIONS = new SystemMessageId(1743);
+	
+	/**
+	 * ID: 1744<br>
+	 * Message: There was no response to your invitation to join the Clan Academy, so the invitation has been rescinded.
+	 */
+	public static final SystemMessageId ACADEMY_JOIN_NO_RESPONSE = new SystemMessageId(1744);
+	
+	/**
+	 * ID: 1745<br>
+	 * Message: The recipient of your invitation to join the Clan Academy has declined.
+	 */
+	public static final SystemMessageId ACADEMY_JOIN_DECLINE = new SystemMessageId(1745);
+	
+	/**
+	 * ID: 1746<br>
+	 * Message: You have already joined a Clan Academy.
+	 */
+	public static final SystemMessageId ALREADY_JOINED_ACADEMY = new SystemMessageId(1746);
+	
+	/**
+	 * ID: 1747<br>
+	 * Message: $s1 has sent you an invitation to join the Clan Academy belonging to the $s2 clan. Do you accept?
+	 */
+	public static final SystemMessageId JOIN_ACADEMY_REQUEST_BY_S1_FOR_CLAN_S2 = new SystemMessageId(1747);
+	
+	/**
+	 * ID: 1748<br>
+	 * Message: Clan Academy member $s1 has successfully completed the 2nd class transfer and obtained $s2 Clan Reputation points.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_GRADUATED_FROM_ACADEMY = new SystemMessageId(1748);
+	
+	/**
+	 * ID: 1749<br>
+	 * Message: Congratulations! You will now graduate from the Clan Academy and leave your current clan. As a graduate of the academy, you can immediately join a clan as a regular member without being subject to any penalties.
+	 */
+	public static final SystemMessageId ACADEMY_MEMBERSHIP_TERMINATED = new SystemMessageId(1749);
+	
+	/**
+	 * ID: 1750<br>
+	 * Message: $c1 does not meet the participation requirements. The owner of $s2 cannot participate in the Olympiad.
+	 */
+	public static final SystemMessageId C1_CANNOT_JOIN_OLYMPIAD_POSSESSING_S2 = new SystemMessageId(1750);
+	
+	/**
+	 * ID: 1751<br>
+	 * Message: The Grand Master has given you a commemorative item.
+	 */
+	public static final SystemMessageId GRAND_MASTER_COMMEMORATIVE_ITEM = new SystemMessageId(1751);
+	
+	/**
+	 * ID: 1752<br>
+	 * Message: Since the clan has received a graduate of the Clan Academy, it has earned $s1 points toward its reputation score.
+	 */
+	public static final SystemMessageId MEMBER_GRADUATED_EARNED_S1_REPU = new SystemMessageId(1752);
+	
+	/**
+	 * ID: 1753<br>
+	 * Message: The clan leader has decreed that that particular privilege cannot be granted to a Clan Academy member.
+	 */
+	public static final SystemMessageId CANT_TRANSFER_PRIVILEGE_TO_ACADEMY_MEMBER = new SystemMessageId(1753);
+	
+	/**
+	 * ID: 1754<br>
+	 * Message: That privilege cannot be granted to a Clan Academy member.
+	 */
+	public static final SystemMessageId RIGHT_CANT_TRANSFERRED_TO_ACADEMY_MEMBER = new SystemMessageId(1754);
+	
+	/**
+	 * ID: 1755<br>
+	 * Message: $s2 has been designated as the apprentice of clan member $s1.
+	 */
+	public static final SystemMessageId S2_HAS_BEEN_DESIGNATED_AS_APPRENTICE_OF_CLAN_MEMBER_S1 = new SystemMessageId(1755);
+	
+	/**
+	 * ID: 1756<br>
+	 * Message: Your apprentice, $s1, has logged in.
+	 */
+	public static final SystemMessageId YOUR_APPRENTICE_S1_HAS_LOGGED_IN = new SystemMessageId(1756);
+	
+	/**
+	 * ID: 1757<br>
+	 * Message: Your apprentice, $c1, has logged out.
+	 */
+	public static final SystemMessageId YOUR_APPRENTICE_C1_HAS_LOGGED_OUT = new SystemMessageId(1757);
+	
+	/**
+	 * ID: 1758<br>
+	 * Message: Your sponsor, $c1, has logged in.
+	 */
+	public static final SystemMessageId YOUR_SPONSOR_C1_HAS_LOGGED_IN = new SystemMessageId(1758);
+	
+	/**
+	 * ID: 1759<br>
+	 * Message: Your sponsor, $c1, has logged out.
+	 */
+	public static final SystemMessageId YOUR_SPONSOR_C1_HAS_LOGGED_OUT = new SystemMessageId(1759);
+	
+	/**
+	 * ID: 1760<br>
+	 * Message: Clan member $c1's title has been changed to $s2.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_C1_TITLE_CHANGED_TO_S2 = new SystemMessageId(1760);
+	
+	/**
+	 * ID: 1761<br>
+	 * Message: Clan member $c1's privilege level has been changed to $s2.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_C1_PRIVILEGE_CHANGED_TO_S2 = new SystemMessageId(1761);
+	
+	/**
+	 * ID: 1762<br>
+	 * Message: You do not have the right to dismiss an apprentice.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_HAVE_THE_RIGHT_TO_DISMISS_AN_APPRENTICE = new SystemMessageId(1762);
+	
+	/**
+	 * ID: 1763<br>
+	 * Message: $s2, clan member $c1's apprentice, has been removed.
+	 */
+	public static final SystemMessageId S2_CLAN_MEMBER_C1_APPRENTICE_HAS_BEEN_REMOVED = new SystemMessageId(1763);
+	
+	/**
+	 * ID: 1764<br>
+	 * Message: This item can only be worn by a member of the Clan Academy.
+	 */
+	public static final SystemMessageId EQUIP_ONLY_FOR_ACADEMY = new SystemMessageId(1764);
+	
+	/**
+	 * ID: 1765<br>
+	 * Message: As a graduate of the Clan Academy, you can no longer wear this item.
+	 */
+	public static final SystemMessageId EQUIP_NOT_FOR_GRADUATES = new SystemMessageId(1765);
+	
+	/**
+	 * ID: 1766<br>
+	 * Message: An application to join the clan has been sent to $c1 in $s2.
+	 */
+	public static final SystemMessageId CLAN_JOIN_APPLICATION_SENT_TO_C1_IN_S2 = new SystemMessageId(1766);
+	
+	/**
+	 * ID: 1767<br>
+	 * Message: An application to join the Clan Academy has been sent to $c1.
+	 */
+	public static final SystemMessageId ACADEMY_JOIN_APPLICATION_SENT_TO_C1 = new SystemMessageId(1767);
+	
+	/**
+	 * ID: 1768<br>
+	 * Message: $c1 has invited you to join the Clan Academy of $s2 clan. Would you like to join?
+	 */
+	public static final SystemMessageId JOIN_REQUEST_BY_C1_TO_CLAN_S2_ACADEMY = new SystemMessageId(1768);
+	
+	/**
+	 * ID: 1769<br>
+	 * Message: $c1 has sent you an invitation to join the $s3 Order of Knights under the $s2 clan. Would you like to join?
+	 */
+	public static final SystemMessageId JOIN_REQUEST_BY_C1_TO_ORDER_OF_KNIGHTS_S3_UNDER_CLAN_S2 = new SystemMessageId(1769);
+	
+	/**
+	 * ID: 1770<br>
+	 * Message: The clan's reputation score has dropped below 0. The clan may face certain penalties as a result.
+	 */
+	public static final SystemMessageId CLAN_REPU_0_MAY_FACE_PENALTIES = new SystemMessageId(1770);
+	
+	/**
+	 * ID: 1771<br>
+	 * Message: Now that your clan level is above Level 5, it can accumulate clan reputation points.
+	 */
+	public static final SystemMessageId CLAN_CAN_ACCUMULATE_CLAN_REPUTATION_POINTS = new SystemMessageId(1771);
+	
+	/**
+	 * ID: 1772<br>
+	 * Message: Since your clan was defeated in a siege, $s1 points have been deducted from your clan's reputation score and given to the opposing clan.
+	 */
+	public static final SystemMessageId CLAN_WAS_DEFEATED_IN_SIEGE_AND_LOST_S1_REPUTATION_POINTS = new SystemMessageId(1772);
+	
+	/**
+	 * ID: 1773<br>
+	 * Message: Since your clan emerged victorious from the siege, $s1 points have been added to your clan's reputation score.
+	 */
+	public static final SystemMessageId CLAN_VICTORIOUS_IN_SIEGE_AND_GAINED_S1_REPUTATION_POINTS = new SystemMessageId(1773);
+	
+	/**
+	 * ID: 1774<br>
+	 * Message: Your clan's newly acquired contested clan hall has added $s1 points to your clan's reputation score.
+	 */
+	public static final SystemMessageId CLAN_ACQUIRED_CONTESTED_CLAN_HALL_AND_S1_REPUTATION_POINTS = new SystemMessageId(1774);
+	
+	/**
+	 * ID: 1775<br>
+	 * Message: Clan member $c1 was an active member of the highest-ranked party in the Festival of Darkness. $s2 points have been added to your clan's reputation score.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_C1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION = new SystemMessageId(1775);
+	
+	/**
+	 * ID: 1776<br>
+	 * Message: Clan member $c1 was named a hero. $2s points have been added to your clan's reputation score.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_C1_BECAME_HERO_AND_GAINED_S2_REPUTATION_POINTS = new SystemMessageId(1776);
+	
+	/**
+	 * ID: 1777<br>
+	 * Message: You have successfully completed a clan quest. $s1 points have been added to your clan's reputation score.
+	 */
+	public static final SystemMessageId CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED = new SystemMessageId(1777);
+	
+	/**
+	 * ID: 1778<br>
+	 * Message: An opposing clan has captured your clan's contested clan hall. $s1 points have been deducted from your clan's reputation score.
+	 */
+	public static final SystemMessageId OPPOSING_CLAN_CAPTURED_CLAN_HALL_AND_YOUR_CLAN_LOSES_S1_POINTS = new SystemMessageId(1778);
+	
+	/**
+	 * ID: 1779<br>
+	 * Message: After losing the contested clan hall, 300 points have been deducted from your clan's reputation score.
+	 */
+	public static final SystemMessageId CLAN_LOST_CONTESTED_CLAN_HALL_AND_300_POINTS = new SystemMessageId(1779);
+	
+	/**
+	 * ID: 1780<br>
+	 * Message: Your clan has captured your opponent's contested clan hall. $s1 points have been deducted from your opponent's clan reputation score.
+	 */
+	public static final SystemMessageId CLAN_CAPTURED_CONTESTED_CLAN_HALL_AND_S1_POINTS_DEDUCTED_FROM_OPPONENT = new SystemMessageId(1780);
+	
+	/**
+	 * ID: 1781<br>
+	 * Message: Your clan has added $1s points to its clan reputation score.
+	 */
+	public static final SystemMessageId CLAN_ADDED_S1S_POINTS_TO_REPUTATION_SCORE = new SystemMessageId(1781);
+	
+	/**
+	 * ID: 1782<br>
+	 * Message: Your clan member, $c1, was killed. $s2 points have been deducted from your clan's reputation score and added to your opponent's clan reputation score.
+	 */
+	public static final SystemMessageId CLAN_MEMBER_C1_WAS_KILLED_AND_S2_POINTS_DEDUCTED_FROM_REPUTATION = new SystemMessageId(1782);
+	
+	/**
+	 * ID: 1783<br>
+	 * Message: For killing an opposing clan member, $s1 points have been deducted from your opponents' clan reputation score.
+	 */
+	public static final SystemMessageId FOR_KILLING_OPPOSING_MEMBER_S1_POINTS_WERE_DEDUCTED_FROM_OPPONENTS = new SystemMessageId(1783);
+	
+	/**
+	 * ID: 1784<br>
+	 * Message: Your clan has failed to defend the castle. $s1 points have been deducted from your clan's reputation score and added to your opponents'.
+	 */
+	public static final SystemMessageId YOUR_CLAN_FAILED_TO_DEFEND_CASTLE_AND_S1_POINTS_LOST_AND_ADDED_TO_OPPONENT = new SystemMessageId(1784);
+	
+	/**
+	 * ID: 1785<br>
+	 * Message: The clan you belong to has been initialized. $s1 points have been deducted from your clan reputation score.
+	 */
+	public static final SystemMessageId YOUR_CLAN_HAS_BEEN_INITIALIZED_AND_S1_POINTS_LOST = new SystemMessageId(1785);
+	
+	/**
+	 * ID: 1786<br>
+	 * Message: Your clan has failed to defend the castle. $s1 points have been deducted from your clan's reputation score.
+	 */
+	public static final SystemMessageId YOUR_CLAN_FAILED_TO_DEFEND_CASTLE_AND_S1_POINTS_LOST = new SystemMessageId(1786);
+	
+	/**
+	 * ID: 1787<br>
+	 * Message: $s1 points have been deducted from the clan's reputation score.
+	 */
+	public static final SystemMessageId S1_DEDUCTED_FROM_CLAN_REP = new SystemMessageId(1787);
+	
+	/**
+	 * ID: 1788<br>
+	 * Message: The clan skill $s1 has been added.
+	 */
+	public static final SystemMessageId CLAN_SKILL_S1_ADDED = new SystemMessageId(1788);
+	
+	/**
+	 * ID: 1789<br>
+	 * Message: Since the Clan Reputation Score has dropped to 0 or lower, your clan skill(s) will be de-activated.
+	 */
+	public static final SystemMessageId REPUTATION_POINTS_0_OR_LOWER_CLAN_SKILLS_DEACTIVATED = new SystemMessageId(1789);
+	
+	/**
+	 * ID: 1790<br>
+	 * Message: The conditions necessary to increase the clan's level have not been met.
+	 */
+	public static final SystemMessageId FAILED_TO_INCREASE_CLAN_LEVEL = new SystemMessageId(1790);
+	
+	/**
+	 * ID: 1791<br>
+	 * Message: The conditions necessary to create a military unit have not been met.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_MEET_CRITERIA_IN_ORDER_TO_CREATE_A_MILITARY_UNIT = new SystemMessageId(1791);
+	
+	/**
+	 * ID: 1792<br>
+	 * Message: Please assign a manager for your new Order of Knights.
+	 */
+	public static final SystemMessageId ASSIGN_MANAGER_FOR_ORDER_OF_KNIGHTS = new SystemMessageId(1792);
+	
+	/**
+	 * ID: 1793<br>
+	 * Message: $c1 has been selected as the captain of $s2.
+	 */
+	public static final SystemMessageId C1_HAS_BEEN_SELECTED_AS_CAPTAIN_OF_S2 = new SystemMessageId(1793);
+	
+	/**
+	 * ID: 1794<br>
+	 * Message: The Knights of $s1 have been created.
+	 */
+	public static final SystemMessageId THE_KNIGHTS_OF_S1_HAVE_BEEN_CREATED = new SystemMessageId(1794);
+	
+	/**
+	 * ID: 1795<br>
+	 * Message: The Royal Guard of $s1 have been created.
+	 */
+	public static final SystemMessageId THE_ROYAL_GUARD_OF_S1_HAVE_BEEN_CREATED = new SystemMessageId(1795);
+	
+	/**
+	 * ID: 1796<br>
+	 * Message: Your account has been temporarily suspended because of involvement in account theft or other abnormal game play which has harmed or inconvenienced other players. If you feel that you were not involved with any of these violations, please visit the Support Center on the PlayNC website
+	 * (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE17 = new SystemMessageId(1796);
+	
+	/**
+	 * ID: 1797<br>
+	 * Message: $c1 has been promoted to $s2.
+	 */
+	public static final SystemMessageId C1_PROMOTED_TO_S2 = new SystemMessageId(1797);
+	
+	/**
+	 * ID: 1798<br>
+	 * Message: Clan lord privileges have been transferred to $c1.
+	 */
+	public static final SystemMessageId CLAN_LEADER_PRIVILEGES_HAVE_BEEN_TRANSFERRED_TO_C1 = new SystemMessageId(1798);
+	
+	/**
+	 * ID: 1799<br>
+	 * Message: We are searching for BOT users. Please try again later.
+	 */
+	public static final SystemMessageId SEARCHING_FOR_BOT_USERS_TRY_AGAIN_LATER = new SystemMessageId(1799);
+	
+	/**
+	 * ID: 1800<br>
+	 * Message: User $c1 has a history of using BOT.
+	 */
+	public static final SystemMessageId C1_HISTORY_USING_BOT = new SystemMessageId(1800);
+	
+	/**
+	 * ID: 1801<br>
+	 * Message: The attempt to sell has failed.
+	 */
+	public static final SystemMessageId SELL_ATTEMPT_FAILED = new SystemMessageId(1801);
+	
+	/**
+	 * ID: 1802<br>
+	 * Message: The attempt to trade has failed.
+	 */
+	public static final SystemMessageId TRADE_ATTEMPT_FAILED = new SystemMessageId(1802);
+	
+	/**
+	 * ID: 1803<br>
+	 * Message: Participation requests are no longer being accepted.
+	 */
+	public static final SystemMessageId GAME_REQUEST_CANNOT_BE_MADE = new SystemMessageId(1803);
+	
+	/**
+	 * ID: 1804<br>
+	 * Message: Your account has been suspended for 7 days because an illicit cash/account transaction has been detected. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE18 = new SystemMessageId(1804);
+	
+	/**
+	 * ID: 1805<br>
+	 * Message: Your account has been suspended for 30 days because an illicit cash/account transaction has been detected for the second time. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE19 = new SystemMessageId(1805);
+	
+	/**
+	 * ID: 1806<br>
+	 * Message: Your account has been permanently suspended because an illicit cash/account transaction has been detected for the third time. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE20 = new SystemMessageId(1806);
+	
+	/**
+	 * ID: 1807<br>
+	 * Message: Your account has been suspended for 30 days because of your involvement in an illicit cash transaction. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE21 = new SystemMessageId(1807);
+	
+	/**
+	 * ID: 1808<br>
+	 * Message: Your account has been permanently suspended because of your involvement in an illicit cash/account transaction. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE22 = new SystemMessageId(1808);
+	
+	/**
+	 * ID: 1809<br>
+	 * Message: Your account must be verified. For information on verification procedures, please visit the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ACCOUNT_MUST_VERIFIED = new SystemMessageId(1809);
+	
+	/**
+	 * ID: 1810<br>
+	 * Message: The refuse invitation state has been activated.
+	 */
+	public static final SystemMessageId REFUSE_INVITATION_ACTIVATED = new SystemMessageId(1810);
+	
+	/**
+	 * ID: 1812<br>
+	 * Message: Since the refuse invitation state is currently activated, no invitation can be made.
+	 */
+	public static final SystemMessageId REFUSE_INVITATION_CURRENTLY_ACTIVE = new SystemMessageId(1812);
+	
+	/**
+	 * ID: 1813<br>
+	 * Message: $s1 has $s2 hour(s) of usage time remaining.
+	 */
+	public static final SystemMessageId THERE_IS_S1_HOUR_AND_S2_MINUTE_LEFT_OF_THE_FIXED_USAGE_TIME = new SystemMessageId(1813);
+	
+	/**
+	 * ID: 1814<br>
+	 * Message: $s1 has $s2 minute(s) of usage time remaining.
+	 */
+	public static final SystemMessageId S2_MINUTE_OF_USAGE_TIME_ARE_LEFT_FOR_S1 = new SystemMessageId(1814);
+	
+	/**
+	 * ID: 1815<br>
+	 * Message: $s2 was dropped in the $s1 region.
+	 */
+	public static final SystemMessageId S2_WAS_DROPPED_IN_THE_S1_REGION = new SystemMessageId(1815);
+	
+	/**
+	 * ID: 1816<br>
+	 * Message: The owner of $s2 has appeared in the $s1 region.
+	 */
+	public static final SystemMessageId THE_OWNER_OF_S2_HAS_APPEARED_IN_THE_S1_REGION = new SystemMessageId(1816);
+	
+	/**
+	 * ID: 1817<br>
+	 * Message: $s2's owner has logged into the $s1 region.
+	 */
+	public static final SystemMessageId S2_OWNER_HAS_LOGGED_INTO_THE_S1_REGION = new SystemMessageId(1817);
+	
+	/**
+	 * ID: 1818<br>
+	 * Message: $s1 has disappeared.
+	 */
+	public static final SystemMessageId S1_HAS_DISAPPEARED = new SystemMessageId(1818);
+	
+	/**
+	 * ID: 1819<br>
+	 * Message: An evil is pulsating from $s2 in $s1.
+	 */
+	public static final SystemMessageId EVIL_FROM_S2_IN_S1 = new SystemMessageId(1819);
+	
+	/**
+	 * ID: 1820<br>
+	 * Message: $s1 is currently asleep.
+	 */
+	public static final SystemMessageId S1_CURRENTLY_SLEEP = new SystemMessageId(1820);
+	
+	/**
+	 * ID: 1821<br>
+	 * Message: $s2's evil presence is felt in $s1.
+	 */
+	public static final SystemMessageId S2_EVIL_PRESENCE_FELT_IN_S1 = new SystemMessageId(1821);
+	
+	/**
+	 * ID: 1822<br>
+	 * Message: $s1 has been sealed.
+	 */
+	public static final SystemMessageId S1_SEALED = new SystemMessageId(1822);
+	
+	/**
+	 * ID: 1823<br>
+	 * Message: The registration period for a clan hall war has ended.
+	 */
+	public static final SystemMessageId CLANHALL_WAR_REGISTRATION_PERIOD_ENDED = new SystemMessageId(1823);
+	
+	/**
+	 * ID: 1824<br>
+	 * Message: You have been registered for a clan hall war. Please move to the left side of the clan hall's arena and get ready.
+	 */
+	public static final SystemMessageId REGISTERED_FOR_CLANHALL_WAR = new SystemMessageId(1824);
+	
+	/**
+	 * ID: 1825<br>
+	 * Message: You have failed in your attempt to register for the clan hall war. Please try again.
+	 */
+	public static final SystemMessageId CLANHALL_WAR_REGISTRATION_FAILED = new SystemMessageId(1825);
+	
+	/**
+	 * ID: 1826<br>
+	 * Message: In $s1 minute(s), the game will begin. All players must hurry and move to the left side of the clan hall's arena.
+	 */
+	public static final SystemMessageId CLANHALL_WAR_BEGINS_IN_S1_MINUTES = new SystemMessageId(1826);
+	
+	/**
+	 * ID: 1827<br>
+	 * Message: In $s1 minute(s), the game will begin. All players, please enter the arena now.
+	 */
+	public static final SystemMessageId CLANHALL_WAR_BEGINS_IN_S1_MINUTES_ENTER_NOW = new SystemMessageId(1827);
+	
+	/**
+	 * ID: 1828<br>
+	 * Message: In $s1 second(s), the game will begin.
+	 */
+	public static final SystemMessageId CLANHALL_WAR_BEGINS_IN_S1_SECONDS = new SystemMessageId(1828);
+	
+	/**
+	 * ID: 1829<br>
+	 * Message: The Command Channel is full.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_FULL = new SystemMessageId(1829);
+	
+	/**
+	 * ID: 1830<br>
+	 * Message: $c1 is not allowed to use the party room invite command. Please update the waiting list.
+	 */
+	public static final SystemMessageId C1_NOT_ALLOWED_INVITE_TO_PARTY_ROOM = new SystemMessageId(1830);
+	
+	/**
+	 * ID: 1831<br>
+	 * Message: $c1 does not meet the conditions of the party room. Please update the waiting list.
+	 */
+	public static final SystemMessageId C1_NOT_MEET_CONDITIONS_FOR_PARTY_ROOM = new SystemMessageId(1831);
+	
+	/**
+	 * ID: 1832<br>
+	 * Message: Only a room leader may invite others to a party room.
+	 */
+	public static final SystemMessageId ONLY_ROOM_LEADER_CAN_INVITE = new SystemMessageId(1832);
+	
+	/**
+	 * ID: 1833<br>
+	 * Message: All of $s1 will be dropped. Would you like to continue?
+	 */
+	public static final SystemMessageId CONFIRM_DROP_ALL_OF_S1 = new SystemMessageId(1833);
+	
+	/**
+	 * ID: 1834<br>
+	 * Message: The party room is full. No more characters can be invited in.
+	 */
+	public static final SystemMessageId PARTY_ROOM_FULL = new SystemMessageId(1834);
+	
+	/**
+	 * ID: 1835<br>
+	 * Message: $s1 is full and cannot accept additional clan members at this time.
+	 */
+	public static final SystemMessageId S1_CLAN_IS_FULL = new SystemMessageId(1835);
+	
+	/**
+	 * ID: 1836<br>
+	 * Message: You cannot join a Clan Academy because you have successfully completed your 2nd class transfer.
+	 */
+	public static final SystemMessageId CANNOT_JOIN_ACADEMY_AFTER_2ND_OCCUPATION = new SystemMessageId(1836);
+	
+	/**
+	 * ID: 1837<br>
+	 * Message: $c1 has sent you an invitation to join the $s3 Royal Guard under the $s2 clan. Would you like to join?
+	 */
+	public static final SystemMessageId C1_SENT_INVITATION_TO_ROYAL_GUARD_S3_OF_CLAN_S2 = new SystemMessageId(1837);
+	
+	/**
+	 * ID: 1838<br>
+	 * Message: 1. The coupon can be used once per character.
+	 */
+	public static final SystemMessageId COUPON_ONCE_PER_CHARACTER = new SystemMessageId(1838);
+	
+	/**
+	 * ID: 1839<br>
+	 * Message: 2. A used serial number may not be used again.
+	 */
+	public static final SystemMessageId SERIAL_MAY_USED_ONCE = new SystemMessageId(1839);
+	
+	/**
+	 * ID: 1840<br>
+	 * Message: 3. If you enter the incorrect serial number more than 5 times,\\n you may use it again after a certain amount of time passes.
+	 */
+	public static final SystemMessageId SERIAL_INPUT_INCORRECT = new SystemMessageId(1840);
+	
+	/**
+	 * ID: 1841<br>
+	 * Message: This clan hall war has been cancelled. Not enough clans have registered.
+	 */
+	public static final SystemMessageId CLANHALL_WAR_CANCELLED = new SystemMessageId(1841);
+	
+	/**
+	 * ID: 1842<br>
+	 * Message: $c1 wishes to summon you from $s2. Do you accept?
+	 */
+	public static final SystemMessageId C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT = new SystemMessageId(1842);
+	
+	/**
+	 * ID: 1843<br>
+	 * Message: $c1 is engaged in combat and cannot be summoned.
+	 */
+	public static final SystemMessageId C1_IS_ENGAGED_IN_COMBAT_AND_CANNOT_BE_SUMMONED = new SystemMessageId(1843);
+	
+	/**
+	 * ID: 1844<br>
+	 * Message: $c1 is dead at the moment and cannot be summoned.
+	 */
+	public static final SystemMessageId C1_IS_DEAD_AT_THE_MOMENT_AND_CANNOT_BE_SUMMONED = new SystemMessageId(1844);
+	
+	/**
+	 * ID: 1845<br>
+	 * Message: Hero weapons cannot be destroyed.
+	 */
+	public static final SystemMessageId HERO_WEAPONS_CANT_DESTROYED = new SystemMessageId(1845);
+	
+	/**
+	 * ID: 1846<br>
+	 * Message: You are too far away from your mount to ride.
+	 */
+	public static final SystemMessageId TOO_FAR_AWAY_FROM_FENRIR_TO_MOUNT = new SystemMessageId(1846);
+	
+	/**
+	 * ID: 1847<br>
+	 * Message: You caught a fish $s1 in length.
+	 */
+	public static final SystemMessageId CAUGHT_FISH_S1_LENGTH = new SystemMessageId(1847);
+	
+	/**
+	 * ID: 1848<br>
+	 * Message: Because of the size of fish caught, you will be registered in the ranking.
+	 */
+	public static final SystemMessageId REGISTERED_IN_FISH_SIZE_RANKING = new SystemMessageId(1848);
+	
+	/**
+	 * ID: 1849<br>
+	 * Message: All of $s1 will be discarded. Would you like to continue?
+	 */
+	public static final SystemMessageId CONFIRM_DISCARD_ALL_OF_S1 = new SystemMessageId(1849);
+	
+	/**
+	 * ID: 1850<br>
+	 * Message: The Captain of the Order of Knights cannot be appointed.
+	 */
+	public static final SystemMessageId CAPTAIN_OF_ORDER_OF_KNIGHTS_CANNOT_BE_APPOINTED = new SystemMessageId(1850);
+	
+	/**
+	 * ID: 1851<br>
+	 * Message: The Captain of the Royal Guard cannot be appointed.
+	 */
+	public static final SystemMessageId CAPTAIN_OF_ROYAL_GUARD_CANNOT_BE_APPOINTED = new SystemMessageId(1851);
+	
+	/**
+	 * ID: 1852<br>
+	 * Message: The attempt to acquire the skill has failed because of an insufficient Clan Reputation Score.
+	 */
+	public static final SystemMessageId ACQUIRE_SKILL_FAILED_BAD_CLAN_REP_SCORE = new SystemMessageId(1852);
+	
+	/**
+	 * ID: 1853<br>
+	 * Message: Quantity items of the same type cannot be exchanged at the same time.
+	 */
+	public static final SystemMessageId CANT_EXCHANGE_QUANTITY_ITEMS_OF_SAME_TYPE = new SystemMessageId(1853);
+	
+	/**
+	 * ID: 1854<br>
+	 * Message: The item was converted successfully.
+	 */
+	public static final SystemMessageId ITEM_CONVERTED_SUCCESSFULLY = new SystemMessageId(1854);
+	
+	/**
+	 * ID: 1855<br>
+	 * Message: Another military unit is already using that name. Please enter a different name.
+	 */
+	public static final SystemMessageId ANOTHER_MILITARY_UNIT_IS_ALREADY_USING_THAT_NAME = new SystemMessageId(1855);
+	
+	/**
+	 * ID: 1856<br>
+	 * Message: Since your opponent is now the owner of $s1, the Olympiad has been cancelled.
+	 */
+	public static final SystemMessageId OPPONENT_POSSESSES_S1_OLYMPIAD_CANCELLED = new SystemMessageId(1856);
+	
+	/**
+	 * ID: 1857<br>
+	 * Message: $c1 is the owner of $s2 and cannot participate in the Olympiad.
+	 */
+	public static final SystemMessageId C1_OWNS_S2_AND_CANNOT_PARTICIPATE_IN_OLYMPIAD = new SystemMessageId(1857);
+	
+	/**
+	 * ID: 1858<br>
+	 * Message: $c1 is currently dead and cannot participate in the Olympiad.
+	 */
+	public static final SystemMessageId C1_CANNOT_PARTICIPATE_OLYMPIAD_WHILE_DEAD = new SystemMessageId(1858);
+	
+	/**
+	 * ID: 1859<br>
+	 * Message: You have exceeded the quantity that can be moved at one time.
+	 */
+	public static final SystemMessageId EXCEEDED_QUANTITY_FOR_MOVED = new SystemMessageId(1859);
+	
+	/**
+	 * ID: 1860<br>
+	 * Message: The Clan Reputation Score is too low.
+	 */
+	public static final SystemMessageId THE_CLAN_REPUTATION_SCORE_IS_TOO_LOW = new SystemMessageId(1860);
+	
+	/**
+	 * ID: 1861<br>
+	 * Message: The clan's crest has been deleted.
+	 */
+	public static final SystemMessageId CLAN_CREST_HAS_BEEN_DELETED = new SystemMessageId(1861);
+	
+	/**
+	 * ID: 1862<br>
+	 * Message: Clan skills will now be activated since the clan's reputation score is 0 or higher.
+	 */
+	public static final SystemMessageId CLAN_SKILLS_WILL_BE_ACTIVATED_SINCE_REPUTATION_IS_0_OR_HIGHER = new SystemMessageId(1862);
+	
+	/**
+	 * ID: 1863<br>
+	 * Message: $c1 purchased a clan item, reducing the Clan Reputation by $s2 points.
+	 */
+	public static final SystemMessageId C1_PURCHASED_CLAN_ITEM_REDUCING_S2_REPU_POINTS = new SystemMessageId(1863);
+	
+	/**
+	 * ID: 1864<br>
+	 * Message: Your pet/servitor is unresponsive and will not obey any orders.
+	 */
+	public static final SystemMessageId PET_REFUSING_ORDER = new SystemMessageId(1864);
+	
+	/**
+	 * ID: 1865<br>
+	 * Message: Your pet/servitor is currently in a state of distress.
+	 */
+	public static final SystemMessageId PET_IN_STATE_OF_DISTRESS = new SystemMessageId(1865);
+	
+	/**
+	 * ID: 1866<br>
+	 * Message: MP was reduced by $s1.
+	 */
+	public static final SystemMessageId MP_REDUCED_BY_S1 = new SystemMessageId(1866);
+	
+	/**
+	 * ID: 1867<br>
+	 * Message: Your opponent's MP was reduced by $s1.
+	 */
+	public static final SystemMessageId YOUR_OPPONENTS_MP_WAS_REDUCED_BY_S1 = new SystemMessageId(1867);
+	
+	/**
+	 * ID: 1868<br>
+	 * Message: You cannot exchange an item while it is being used.
+	 */
+	public static final SystemMessageId CANNOT_EXCHANCE_USED_ITEM = new SystemMessageId(1868);
+	
+	/**
+	 * ID: 1869<br>
+	 * Message: $c1 has granted the Command Channel's master party the privilege of item looting.
+	 */
+	public static final SystemMessageId C1_GRANTED_MASTER_PARTY_LOOTING_RIGHTS = new SystemMessageId(1869);
+	
+	/**
+	 * ID: 1870<br>
+	 * Message: A Command Channel with looting rights already exists.
+	 */
+	public static final SystemMessageId COMMAND_CHANNEL_WITH_LOOTING_RIGHTS_EXISTS = new SystemMessageId(1870);
+	
+	/**
+	 * ID: 1871<br>
+	 * Message: Do you want to dismiss $c1 from the clan?
+	 */
+	public static final SystemMessageId CONFIRM_DISMISS_C1_FROM_CLAN = new SystemMessageId(1871);
+	
+	/**
+	 * ID: 1872<br>
+	 * Message: You have $s1 hour(s) and $s2 minute(s) left.
+	 */
+	public static final SystemMessageId S1_HOURS_S2_MINUTES_LEFT = new SystemMessageId(1872);
+	
+	/**
+	 * ID: 1873<br>
+	 * Message: There are $s1 hour(s) and $s2 minute(s) left of Player Commendation Time.
+	 */
+	public static final SystemMessageId S1_HOURS_S2_MINUTES_LEFT_FOR_THIS_PCCAFE = new SystemMessageId(1873);
+	
+	/**
+	 * ID: 1874<br>
+	 * Message: There are $s1 minute(s) left for this individual user.
+	 */
+	public static final SystemMessageId S1_MINUTES_LEFT_FOR_THIS_USER = new SystemMessageId(1874);
+	
+	/**
+	 * ID: 1875<br>
+	 * Message: There are $s1 minute(s) left of fixed Player Commendation Time.
+	 */
+	public static final SystemMessageId S1_MINUTES_LEFT_FOR_THIS_PCCAFE = new SystemMessageId(1875);
+	
+	/**
+	 * ID: 1876<br>
+	 * Message: Do you want to leave $s1 clan?
+	 */
+	public static final SystemMessageId CONFIRM_LEAVE_S1_CLAN = new SystemMessageId(1876);
+	
+	/**
+	 * ID: 1877<br>
+	 * Message: The game will end in $s1 minute(s).
+	 */
+	public static final SystemMessageId GAME_WILL_END_IN_S1_MINUTES = new SystemMessageId(1877);
+	
+	/**
+	 * ID: 1878<br>
+	 * Message: The game will end in $s1 second(s).
+	 */
+	public static final SystemMessageId GAME_WILL_END_IN_S1_SECONDS = new SystemMessageId(1878);
+	
+	/**
+	 * ID: 1879<br>
+	 * Message: In $s1 minute(s), you will be teleported outside of the game arena.
+	 */
+	public static final SystemMessageId IN_S1_MINUTES_TELEPORTED_OUTSIDE_OF_GAME_ARENA = new SystemMessageId(1879);
+	
+	/**
+	 * ID: 1880<br>
+	 * Message: In $s1 second(s), you will be teleported outside of the game arena.
+	 */
+	public static final SystemMessageId IN_S1_SECONDS_TELEPORTED_OUTSIDE_OF_GAME_ARENA = new SystemMessageId(1880);
+	
+	/**
+	 * ID: 1881<br>
+	 * Message: The preliminary match will begin in $s1 second(s). Prepare yourself.
+	 */
+	public static final SystemMessageId PRELIMINARY_MATCH_BEGIN_IN_S1_SECONDS = new SystemMessageId(1881);
+	
+	/**
+	 * ID: 1882<br>
+	 * Message: Characters cannot be created from this server.
+	 */
+	public static final SystemMessageId CHARACTERS_NOT_CREATED_FROM_THIS_SERVER = new SystemMessageId(1882);
+	
+	/**
+	 * ID: 1883<br>
+	 * Message: There are no offerings I own or I made a bid for.
+	 */
+	public static final SystemMessageId NO_OFFERINGS_OWN_OR_MADE_BID_FOR = new SystemMessageId(1883);
+	
+	/**
+	 * ID: 1884<br>
+	 * Message: Enter the Player Commendation serial number:
+	 */
+	public static final SystemMessageId ENTER_PCROOM_SERIAL_NUMBER = new SystemMessageId(1884);
+	
+	/**
+	 * ID: 1885<br>
+	 * Message: This serial number cannot be entered. Please try again in $s1 minute(s).
+	 */
+	public static final SystemMessageId SERIAL_NUMBER_CANT_ENTERED = new SystemMessageId(1885);
+	
+	/**
+	 * ID: 1886<br>
+	 * Message: This serial number has already been used.
+	 */
+	public static final SystemMessageId SERIAL_NUMBER_ALREADY_USED = new SystemMessageId(1886);
+	
+	/**
+	 * ID: 1887<br>
+	 * Message: Invalid serial number. Your attempt to enter the number has failed $s1 time(s). You will be allowed to make $s2 more attempt(s).
+	 */
+	public static final SystemMessageId SERIAL_NUMBER_ENTERING_FAILED = new SystemMessageId(1887);
+	
+	/**
+	 * ID: 1888<br>
+	 * Message: Invalid serial number. Your attempt to enter the number has failed 5 times. Please try again in 4 hours.
+	 */
+	public static final SystemMessageId SERIAL_NUMBER_ENTERING_FAILED_5_TIMES = new SystemMessageId(1888);
+	
+	/**
+	 * ID: 1889<br>
+	 * Message: Congratulations! You have received $s1.
+	 */
+	public static final SystemMessageId CONGRATULATIONS_RECEIVED_S1 = new SystemMessageId(1889);
+	
+	/**
+	 * ID: 1890<br>
+	 * Message: Since you have already used this coupon, you may not use this serial number.
+	 */
+	public static final SystemMessageId ALREADY_USED_COUPON_NOT_USE_SERIAL_NUMBER = new SystemMessageId(1890);
+	
+	/**
+	 * ID: 1891<br>
+	 * Message: You may not use items in a private store or private work shop.
+	 */
+	public static final SystemMessageId NOT_USE_ITEMS_IN_PRIVATE_STORE = new SystemMessageId(1891);
+	
+	/**
+	 * ID: 1892<br>
+	 * Message: The replay file for the previous version cannot be played.
+	 */
+	public static final SystemMessageId REPLAY_FILE_PREVIOUS_VERSION_CANT_PLAYED = new SystemMessageId(1892);
+	
+	/**
+	 * ID: 1893<br>
+	 * Message: This file cannot be replayed.
+	 */
+	public static final SystemMessageId FILE_CANT_REPLAYED = new SystemMessageId(1893);
+	
+	/**
+	 * ID: 1894<br>
+	 * Message: A sub-class cannot be created or changed while you are over your weight limit.
+	 */
+	public static final SystemMessageId NOT_SUBCLASS_WHILE_OVERWEIGHT = new SystemMessageId(1894);
+	
+	/**
+	 * ID: 1895<br>
+	 * Message: $c1 is in an area which blocks summoning.
+	 */
+	public static final SystemMessageId C1_IN_SUMMON_BLOCKING_AREA = new SystemMessageId(1895);
+	
+	/**
+	 * ID: 1896<br>
+	 * Message: $c1 has already been summoned.
+	 */
+	public static final SystemMessageId C1_ALREADY_SUMMONED = new SystemMessageId(1896);
+	
+	/**
+	 * ID: 1897<br>
+	 * Message: $s1 is required for summoning.
+	 */
+	public static final SystemMessageId S1_REQUIRED_FOR_SUMMONING = new SystemMessageId(1897);
+	
+	/**
+	 * ID: 1898<br>
+	 * Message: $c1 is currently trading or operating a private store and cannot be summoned.
+	 */
+	public static final SystemMessageId C1_CURRENTLY_TRADING_OR_OPERATING_PRIVATE_STORE_AND_CANNOT_BE_SUMMONED = new SystemMessageId(1898);
+	
+	/**
+	 * ID: 1899<br>
+	 * Message: Your target is in an area which blocks summoning.
+	 */
+	public static final SystemMessageId YOUR_TARGET_IS_IN_AN_AREA_WHICH_BLOCKS_SUMMONING = new SystemMessageId(1899);
+	
+	/**
+	 * ID: 1900<br>
+	 * Message: $c1 has entered the party room.
+	 */
+	public static final SystemMessageId C1_ENTERED_PARTY_ROOM = new SystemMessageId(1900);
+	
+	/**
+	 * ID: 1901<br>
+	 * Message: $s1 has sent an invitation to room <$s2>.
+	 */
+	public static final SystemMessageId C1_INVITED_YOU_TO_PARTY_ROOM = new SystemMessageId(1901);
+	
+	/**
+	 * ID: 1902<br>
+	 * Message: Incompatible item grade. This item cannot be used.
+	 */
+	public static final SystemMessageId INCOMPATIBLE_ITEM_GRADE = new SystemMessageId(1902);
+	
+	/**
+	 * ID: 1903<br>
+	 * Message: Those of you who have requested NCOTP should run NCOTP \\n by using your cell phone to get the NCOTP \\n password and enter it within 1 minute.\\n If you have not requested NCOTP, leave this field blank and\\n click the Login button.
+	 */
+	public static final SystemMessageId NCOTP = new SystemMessageId(1903);
+	
+	/**
+	 * ID: 1904<br>
+	 * Message: A sub-class may not be created or changed while a servitor or pet is summoned.
+	 */
+	public static final SystemMessageId CANT_SUBCLASS_WITH_SUMMONED_SERVITOR = new SystemMessageId(1904);
+	
+	/**
+	 * ID: 1905<br>
+	 * Message: $s2 of $s1 will be replaced with $c4 of $s3.
+	 */
+	public static final SystemMessageId S2_OF_S1_WILL_REPLACED_WITH_S4_OF_S3 = new SystemMessageId(1905);
+	
+	/**
+	 * ID: 1906<br>
+	 * Message: Select the combat unit\\n to transfer to.
+	 */
+	public static final SystemMessageId SELECT_COMBAT_UNIT = new SystemMessageId(1906);
+	
+	/**
+	 * ID: 1907<br>
+	 * Message: Select the character who will\\n replace the current character.
+	 */
+	public static final SystemMessageId SELECT_CHARACTER_WHO_WILL = new SystemMessageId(1907);
+	
+	/**
+	 * ID: 1908<br>
+	 * Message: $c1 is in a state which prevents summoning.
+	 */
+	public static final SystemMessageId C1_STATE_FORBIDS_SUMMONING = new SystemMessageId(1908);
+	
+	/**
+	 * ID: 1909<br>
+	 * Message: ==< List of Clan Academy Graduates During the Past Week >==
+	 */
+	public static final SystemMessageId ACADEMY_LIST_HEADER = new SystemMessageId(1909);
+	
+	/**
+	 * ID: 1910<br>
+	 * Message: Graduates: $c1.
+	 */
+	public static final SystemMessageId GRADUATES_C1 = new SystemMessageId(1910);
+	
+	/**
+	 * ID: 1911<br>
+	 * Message: You cannot summon players who are currently participating in the Grand Olympiad.
+	 */
+	public static final SystemMessageId YOU_CANNOT_SUMMON_PLAYERS_WHO_ARE_IN_OLYMPIAD = new SystemMessageId(1911);
+	
+	/**
+	 * ID: 1912<br>
+	 * Message: Only those requesting NCOTP should make an entry into this field.
+	 */
+	public static final SystemMessageId NCOTP2 = new SystemMessageId(1912);
+	
+	/**
+	 * ID: 1913<br>
+	 * Message: The remaining recycle time for $s1 is $s2 minute(s).
+	 */
+	public static final SystemMessageId TIME_FOR_S1_IS_S2_MINUTES_REMAINING = new SystemMessageId(1913);
+	
+	/**
+	 * ID: 1914<br>
+	 * Message: The remaining recycle time for $s1 is $s2 second(s).
+	 */
+	public static final SystemMessageId TIME_FOR_S1_IS_S2_SECONDS_REMAINING = new SystemMessageId(1914);
+	
+	/**
+	 * ID: 1915<br>
+	 * Message: The game will end in $s1 second(s).
+	 */
+	public static final SystemMessageId GAME_ENDS_IN_S1_SECONDS = new SystemMessageId(1915);
+	
+	/**
+	 * ID: 1916<br>
+	 * Message: Your Death Penalty is now level $s1.
+	 */
+	public static final SystemMessageId DEATH_PENALTY_LEVEL_S1_ADDED = new SystemMessageId(1916);
+	
+	/**
+	 * ID: 1917<br>
+	 * Message: Your Death Penalty has been lifted.
+	 */
+	public static final SystemMessageId DEATH_PENALTY_LIFTED = new SystemMessageId(1917);
+	
+	/**
+	 * ID: 1918<br>
+	 * Message: Your pet is too high level to control.
+	 */
+	public static final SystemMessageId PET_TOO_HIGH_TO_CONTROL = new SystemMessageId(1918);
+	
+	/**
+	 * ID: 1919<br>
+	 * Message: The Grand Olympiad registration period has ended.
+	 */
+	public static final SystemMessageId OLYMPIAD_REGISTRATION_PERIOD_ENDED = new SystemMessageId(1919);
+	
+	/**
+	 * ID: 1920<br>
+	 * Message: Your account is currently inactive because you have not logged into the game for some time. You may reactivate your account by visiting the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ACCOUNT_INACTIVITY = new SystemMessageId(1920);
+	
+	/**
+	 * ID: 1921<br>
+	 * Message: $s2 hour(s) and $s3 minute(s) have passed since $s1 has killed.
+	 */
+	public static final SystemMessageId S2_HOURS_S3_MINUTES_SINCE_S1_KILLED = new SystemMessageId(1921);
+	
+	/**
+	 * ID: 1922<br>
+	 * Message: Because $s1 failed to kill for one full day, it has expired.
+	 */
+	public static final SystemMessageId S1_FAILED_KILLING_EXPIRED = new SystemMessageId(1922);
+	
+	/**
+	 * ID: 1923<br>
+	 * Message: Court Magician: The portal has been created!
+	 */
+	public static final SystemMessageId COURT_MAGICIAN_CREATED_PORTAL = new SystemMessageId(1923);
+	
+	/**
+	 * ID: 1924<br>
+	 * Message: Current Location: $s1, $s2, $s3 (near the Primeval Isle)
+	 */
+	public static final SystemMessageId LOC_PRIMEVAL_ISLE_S1_S2_S3 = new SystemMessageId(1924);
+	
+	/**
+	 * ID: 1925<br>
+	 * Message: Due to the affects of the Seal of Strife, it is not possible to summon at this time.
+	 */
+	public static final SystemMessageId SEAL_OF_STRIFE_FORBIDS_SUMMONING = new SystemMessageId(1925);
+	
+	/**
+	 * ID: 1926<br>
+	 * Message: There is no opponent to receive your challenge for a duel.
+	 */
+	public static final SystemMessageId THERE_IS_NO_OPPONENT_TO_RECEIVE_YOUR_CHALLENGE_FOR_A_DUEL = new SystemMessageId(1926);
+	
+	/**
+	 * ID: 1927<br>
+	 * Message: $c1 has been challenged to a duel.
+	 */
+	public static final SystemMessageId C1_HAS_BEEN_CHALLENGED_TO_A_DUEL = new SystemMessageId(1927);
+	
+	/**
+	 * ID: 1928<br>
+	 * Message: $c1's party has been challenged to a duel.
+	 */
+	public static final SystemMessageId C1_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL = new SystemMessageId(1928);
+	
+	/**
+	 * ID: 1929<br>
+	 * Message: $c1 has accepted your challenge to a duel. The duel will begin in a few moments.
+	 */
+	public static final SystemMessageId C1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_A_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS = new SystemMessageId(1929);
+	
+	/**
+	 * ID: 1930<br>
+	 * Message: You have accepted $c1's challenge a duel. The duel will begin in a few moments.
+	 */
+	public static final SystemMessageId YOU_HAVE_ACCEPTED_C1_CHALLENGE_TO_A_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS = new SystemMessageId(1930);
+	
+	/**
+	 * ID: 1931<br>
+	 * Message: $c1 has declined your challenge to a duel.
+	 */
+	public static final SystemMessageId C1_HAS_DECLINED_YOUR_CHALLENGE_TO_A_DUEL = new SystemMessageId(1931);
+	
+	/**
+	 * ID: 1932<br>
+	 * Message: $c1 has declined your challenge to a duel.
+	 */
+	public static final SystemMessageId C1_HAS_DECLINED_YOUR_CHALLENGE_TO_A_DUEL2 = new SystemMessageId(1932);
+	
+	/**
+	 * ID: 1933<br>
+	 * Message: You have accepted $c1's challenge to a party duel. The duel will begin in a few moments.
+	 */
+	public static final SystemMessageId YOU_HAVE_ACCEPTED_C1_CHALLENGE_TO_A_PARTY_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS = new SystemMessageId(1933);
+	
+	/**
+	 * ID: 1934<br>
+	 * Message: $s1 has accepted your challenge to duel against their party. The duel will begin in a few moments.
+	 */
+	public static final SystemMessageId S1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_DUEL_AGAINST_THEIR_PARTY_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS = new SystemMessageId(1934);
+	
+	/**
+	 * ID: 1935<br>
+	 * Message: $c1 has declined your challenge to a party duel.
+	 */
+	public static final SystemMessageId C1_HAS_DECLINED_YOUR_CHALLENGE_TO_A_PARTY_DUEL = new SystemMessageId(1935);
+	
+	/**
+	 * ID: 1936<br>
+	 * Message: The opposing party has declined your challenge to a duel.
+	 */
+	public static final SystemMessageId THE_OPPOSING_PARTY_HAS_DECLINED_YOUR_CHALLENGE_TO_A_DUEL = new SystemMessageId(1936);
+	
+	/**
+	 * ID: 1937<br>
+	 * Message: Since the person you challenged is not currently in a party, they cannot duel against your party.
+	 */
+	public static final SystemMessageId SINCE_THE_PERSON_YOU_CHALLENGED_IS_NOT_CURRENTLY_IN_A_PARTY_THEY_CANNOT_DUEL_AGAINST_YOUR_PARTY = new SystemMessageId(1937);
+	
+	/**
+	 * ID: 1938<br>
+	 * Message: $c1 has challenged you to a duel.
+	 */
+	public static final SystemMessageId C1_HAS_CHALLENGED_YOU_TO_A_DUEL = new SystemMessageId(1938);
+	
+	/**
+	 * ID: 1939<br>
+	 * Message: $c1's party has challenged your party to a duel.
+	 */
+	public static final SystemMessageId C1_PARTY_HAS_CHALLENGED_YOUR_PARTY_TO_A_DUEL = new SystemMessageId(1939);
+	
+	/**
+	 * ID: 1940<br>
+	 * Message: You are unable to request a duel at this time.
+	 */
+	public static final SystemMessageId YOU_ARE_UNABLE_TO_REQUEST_A_DUEL_AT_THIS_TIME = new SystemMessageId(1940);
+	
+	/**
+	 * ID: 1941<br>
+	 * Message: This is not a suitable place to challenge anyone or party to a duel.
+	 */
+	public static final SystemMessageId NO_PLACE_FOR_DUEL = new SystemMessageId(1941);
+	
+	/**
+	 * ID: 1942<br>
+	 * Message: The opposing party is currently unable to accept a challenge to a duel.
+	 */
+	public static final SystemMessageId THE_OPPOSING_PARTY_IS_CURRENTLY_UNABLE_TO_ACCEPT_A_CHALLENGE_TO_A_DUEL = new SystemMessageId(1942);
+	
+	/**
+	 * ID: 1943<br>
+	 * Message: The opposing party is currently not in a suitable location for a duel.
+	 */
+	public static final SystemMessageId THE_OPPOSING_PARTY_IS_AT_BAD_LOCATION_FOR_A_DUEL = new SystemMessageId(1943);
+	
+	/**
+	 * ID: 1944<br>
+	 * Message: In a moment, you will be transported to the site where the duel will take place.
+	 */
+	public static final SystemMessageId IN_A_MOMENT_YOU_WILL_BE_TRANSPORTED_TO_THE_SITE_WHERE_THE_DUEL_WILL_TAKE_PLACE = new SystemMessageId(1944);
+	
+	/**
+	 * ID: 1945<br>
+	 * Message: The duel will begin in $s1 second(s).
+	 */
+	public static final SystemMessageId THE_DUEL_WILL_BEGIN_IN_S1_SECONDS = new SystemMessageId(1945);
+	
+	/**
+	 * ID: 1946<br>
+	 * Message: $c1 has challenged you to a duel. Will you accept?
+	 */
+	public static final SystemMessageId C1_CHALLENGED_YOU_TO_A_DUEL = new SystemMessageId(1946);
+	
+	/**
+	 * ID: 1947<br>
+	 * Message: $c1's party has challenged your party to a duel. Will you accept?
+	 */
+	public static final SystemMessageId C1_CHALLENGED_YOU_TO_A_PARTY_DUEL = new SystemMessageId(1947);
+	
+	/**
+	 * ID: 1948<br>
+	 * Message: The duel will begin in $s1 second(s).
+	 */
+	public static final SystemMessageId THE_DUEL_WILL_BEGIN_IN_S1_SECONDS2 = new SystemMessageId(1948);
+	
+	/**
+	 * ID: 1949<br>
+	 * Message: Let the duel begin!
+	 */
+	public static final SystemMessageId LET_THE_DUEL_BEGIN = new SystemMessageId(1949);
+	
+	/**
+	 * ID: 1950<br>
+	 * Message: $c1 has won the duel.
+	 */
+	public static final SystemMessageId C1_HAS_WON_THE_DUEL = new SystemMessageId(1950);
+	
+	/**
+	 * ID: 1951<br>
+	 * Message: $c1's party has won the duel.
+	 */
+	public static final SystemMessageId C1_PARTY_HAS_WON_THE_DUEL = new SystemMessageId(1951);
+	
+	/**
+	 * ID: 1952<br>
+	 * Message: The duel has ended in a tie.
+	 */
+	public static final SystemMessageId THE_DUEL_HAS_ENDED_IN_A_TIE = new SystemMessageId(1952);
+	
+	/**
+	 * ID: 1953<br>
+	 * Message: Since $c1 was disqualified, $s2 has won.
+	 */
+	public static final SystemMessageId SINCE_C1_WAS_DISQUALIFIED_S2_HAS_WON = new SystemMessageId(1953);
+	
+	/**
+	 * ID: 1954<br>
+	 * Message: Since $c1's party was disqualified, $s2's party has won.
+	 */
+	public static final SystemMessageId SINCE_C1_PARTY_WAS_DISQUALIFIED_S2_PARTY_HAS_WON = new SystemMessageId(1954);
+	
+	/**
+	 * ID: 1955<br>
+	 * Message: Since $c1 withdrew from the duel, $s2 has won.
+	 */
+	public static final SystemMessageId SINCE_C1_WITHDREW_FROM_THE_DUEL_S2_HAS_WON = new SystemMessageId(1955);
+	
+	/**
+	 * ID: 1956<br>
+	 * Message: Since $c1's party withdrew from the duel, $s2's party has won.
+	 */
+	public static final SystemMessageId SINCE_C1_PARTY_WITHDREW_FROM_THE_DUEL_S2_PARTY_HAS_WON = new SystemMessageId(1956);
+	
+	/**
+	 * ID: 1957<br>
+	 * Message: Select the item to be augmented.
+	 */
+	public static final SystemMessageId SELECT_THE_ITEM_TO_BE_AUGMENTED = new SystemMessageId(1957);
+	
+	/**
+	 * ID: 1958<br>
+	 * Message: Select the catalyst for augmentation.
+	 */
+	public static final SystemMessageId SELECT_THE_CATALYST_FOR_AUGMENTATION = new SystemMessageId(1958);
+	
+	/**
+	 * ID: 1959<br>
+	 * Message: Requires $s2 $s1.
+	 */
+	public static final SystemMessageId REQUIRES_S1_S2 = new SystemMessageId(1959);
+	
+	/**
+	 * ID: 1960<br>
+	 * Message: This is not a suitable item.
+	 */
+	public static final SystemMessageId THIS_IS_NOT_A_SUITABLE_ITEM = new SystemMessageId(1960);
+	
+	/**
+	 * ID: 1961<br>
+	 * Message: Gemstone quantity is incorrect.
+	 */
+	public static final SystemMessageId GEMSTONE_QUANTITY_IS_INCORRECT = new SystemMessageId(1961);
+	
+	/**
+	 * ID: 1962<br>
+	 * Message: The item was successfully augmented!
+	 */
+	public static final SystemMessageId THE_ITEM_WAS_SUCCESSFULLY_AUGMENTED = new SystemMessageId(1962);
+	
+	/**
+	 * ID: 1963<br>
+	 * Message: Select the item from which you wish to remove augmentation.
+	 */
+	public static final SystemMessageId SELECT_THE_ITEM_FROM_WHICH_YOU_WISH_TO_REMOVE_AUGMENTATION = new SystemMessageId(1963);
+	
+	/**
+	 * ID: 1964<br>
+	 * Message: Augmentation removal can only be done on an augmented item.
+	 */
+	public static final SystemMessageId AUGMENTATION_REMOVAL_CAN_ONLY_BE_DONE_ON_AN_AUGMENTED_ITEM = new SystemMessageId(1964);
+	
+	/**
+	 * ID: 1965<br>
+	 * Message: Augmentation has been successfully removed from your $s1.
+	 */
+	public static final SystemMessageId AUGMENTATION_HAS_BEEN_SUCCESSFULLY_REMOVED_FROM_YOUR_S1 = new SystemMessageId(1965);
+	
+	/**
+	 * ID: 1966<br>
+	 * Message: Only the clan leader may issue commands.
+	 */
+	public static final SystemMessageId ONLY_CLAN_LEADER_CAN_ISSUE_COMMANDS = new SystemMessageId(1966);
+	
+	/**
+	 * ID: 1967<br>
+	 * Message: The gate is firmly locked. Please try again later.
+	 */
+	public static final SystemMessageId GATE_LOCKED_TRY_AGAIN_LATER = new SystemMessageId(1967);
+	
+	/**
+	 * ID: 1968<br>
+	 * Message: $s1's owner.
+	 */
+	public static final SystemMessageId S1_OWNER = new SystemMessageId(1968);
+	
+	/**
+	 * ID: 1969<br>
+	 * Message: Area where $s1 appears.
+	 */
+	public static final SystemMessageId AREA_S1_APPEARS = new SystemMessageId(1969);
+	
+	/**
+	 * ID: 1970<br>
+	 * Message: Once an item is augmented, it cannot be augmented again.
+	 */
+	public static final SystemMessageId ONCE_AN_ITEM_IS_AUGMENTED_IT_CANNOT_BE_AUGMENTED_AGAIN = new SystemMessageId(1970);
+	
+	/**
+	 * ID: 1971<br>
+	 * Message: The level of the hardener is too high to be used.
+	 */
+	public static final SystemMessageId HARDENER_LEVEL_TOO_HIGH = new SystemMessageId(1971);
+	
+	/**
+	 * ID: 1972<br>
+	 * Message: You cannot augment items while a private store or private workshop is in operation.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP_IS_IN_OPERATION = new SystemMessageId(1972);
+	
+	/**
+	 * ID: 1973<br>
+	 * Message: You cannot augment items while frozen.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_FROZEN = new SystemMessageId(1973);
+	
+	/**
+	 * ID: 1974<br>
+	 * Message: You cannot augment items while dead.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_DEAD = new SystemMessageId(1974);
+	
+	/**
+	 * ID: 1975<br>
+	 * Message: You cannot augment items while engaged in trade activities.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_TRADING = new SystemMessageId(1975);
+	
+	/**
+	 * ID: 1976<br>
+	 * Message: You cannot augment items while paralyzed.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_PARALYZED = new SystemMessageId(1976);
+	
+	/**
+	 * ID: 1977<br>
+	 * Message: You cannot augment items while fishing.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_FISHING = new SystemMessageId(1977);
+	
+	/**
+	 * ID: 1978<br>
+	 * Message: You cannot augment items while sitting down.
+	 */
+	public static final SystemMessageId YOU_CANNOT_AUGMENT_ITEMS_WHILE_SITTING_DOWN = new SystemMessageId(1978);
+	
+	/**
+	 * ID: 1979<br>
+	 * Message: $s1's remaining Mana is now 10.
+	 */
+	public static final SystemMessageId S1S_REMAINING_MANA_IS_NOW_10 = new SystemMessageId(1979);
+	
+	/**
+	 * ID: 1980<br>
+	 * Message: $s1's remaining Mana is now 5.
+	 */
+	public static final SystemMessageId S1S_REMAINING_MANA_IS_NOW_5 = new SystemMessageId(1980);
+	
+	/**
+	 * ID: 1981<br>
+	 * Message: $s1's remaining Mana is now 1. It will disappear soon.
+	 */
+	public static final SystemMessageId S1S_REMAINING_MANA_IS_NOW_1 = new SystemMessageId(1981);
+	
+	/**
+	 * ID: 1982<br>
+	 * Message: $s1's remaining Mana is now 0, and the item has disappeared.
+	 */
+	public static final SystemMessageId S1S_REMAINING_MANA_IS_NOW_0 = new SystemMessageId(1982);
+	
+	/**
+	 * ID: 1984<br>
+	 * Message: Press the Augment button to begin.
+	 */
+	public static final SystemMessageId PRESS_THE_AUGMENT_BUTTON_TO_BEGIN = new SystemMessageId(1984);
+	
+	/**
+	 * ID: 1985<br>
+	 * Message: $s1's drop area ($s2)
+	 */
+	public static final SystemMessageId S1_DROP_AREA_S2 = new SystemMessageId(1985);
+	
+	/**
+	 * ID: 1986<br>
+	 * Message: $s1's owner ($s2)
+	 */
+	public static final SystemMessageId S1_OWNER_S2 = new SystemMessageId(1986);
+	
+	/**
+	 * ID: 1987<br>
+	 * Message: $s1
+	 */
+	public static final SystemMessageId S1 = new SystemMessageId(1987);
+	
+	/**
+	 * ID: 1988<br>
+	 * Message: The ferry has arrived at Primeval Isle.
+	 */
+	public static final SystemMessageId FERRY_ARRIVED_AT_PRIMEVAL = new SystemMessageId(1988);
+	
+	/**
+	 * ID: 1989<br>
+	 * Message: The ferry will leave for Rune Harbor after anchoring for three minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_FOR_RUNE_3_MINUTES = new SystemMessageId(1989);
+	
+	/**
+	 * ID: 1990<br>
+	 * Message: The ferry is now departing Primeval Isle for Rune Harbor.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_PRIMEVAL_FOR_RUNE_NOW = new SystemMessageId(1990);
+	
+	/**
+	 * ID: 1991<br>
+	 * Message: The ferry will leave for Primeval Isle after anchoring for three minutes.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_FOR_PRIMEVAL_3_MINUTES = new SystemMessageId(1991);
+	
+	/**
+	 * ID: 1992<br>
+	 * Message: The ferry is now departing Rune Harbor for Primeval Isle.
+	 */
+	public static final SystemMessageId FERRY_LEAVING_RUNE_FOR_PRIMEVAL_NOW = new SystemMessageId(1992);
+	
+	/**
+	 * ID: 1993<br>
+	 * Message: The ferry from Primeval Isle to Rune Harbor has been delayed.
+	 */
+	public static final SystemMessageId FERRY_FROM_PRIMEVAL_TO_RUNE_DELAYED = new SystemMessageId(1993);
+	
+	/**
+	 * ID: 1994<br>
+	 * Message: The ferry from Rune Harbor to Primeval Isle has been delayed.
+	 */
+	public static final SystemMessageId FERRY_FROM_RUNE_TO_PRIMEVAL_DELAYED = new SystemMessageId(1994);
+	
+	/**
+	 * ID: 1995<br>
+	 * Message: $s1 channel filtering option
+	 */
+	public static final SystemMessageId S1_CHANNEL_FILTER_OPTION = new SystemMessageId(1995);
+	
+	/**
+	 * ID: 1996<br>
+	 * Message: The attack has been blocked.
+	 */
+	public static final SystemMessageId ATTACK_WAS_BLOCKED = new SystemMessageId(1996);
+	
+	/**
+	 * ID: 1997<br>
+	 * Message: $c1 is performing a counterattack.
+	 */
+	public static final SystemMessageId C1_PERFORMING_COUNTERATTACK = new SystemMessageId(1997);
+	
+	/**
+	 * ID: 1998<br>
+	 * Message: You countered $c1's attack.
+	 */
+	public static final SystemMessageId COUNTERED_C1_ATTACK = new SystemMessageId(1998);
+	
+	/**
+	 * ID: 1999<br>
+	 * Message: $c1 dodges the attack.
+	 */
+	public static final SystemMessageId C1_DODGES_ATTACK = new SystemMessageId(1999);
+	
+	/**
+	 * ID: 2000<br>
+	 * Message: You have avoided $c1's attack.
+	 */
+	public static final SystemMessageId AVOIDED_C1_ATTACK2 = new SystemMessageId(2000);
+	
+	/**
+	 * ID: 2001<br>
+	 * Message: Augmentation failed due to inappropriate conditions.
+	 */
+	public static final SystemMessageId AUGMENTATION_FAILED_DUE_TO_INAPPROPRIATE_CONDITIONS = new SystemMessageId(2001);
+	
+	/**
+	 * ID: 2002<br>
+	 * Message: Trap failed.
+	 */
+	public static final SystemMessageId TRAP_FAILED = new SystemMessageId(2002);
+	
+	/**
+	 * ID: 2003<br>
+	 * Message: You obtained an ordinary material.
+	 */
+	public static final SystemMessageId OBTAINED_ORDINARY_MATERIAL = new SystemMessageId(2003);
+	
+	/**
+	 * ID: 2004<br>
+	 * Message: You obtained a rare material.
+	 */
+	public static final SystemMessageId OBTAINED_RATE_MATERIAL = new SystemMessageId(2004);
+	
+	/**
+	 * ID: 2005<br>
+	 * Message: You obtained a unique material.
+	 */
+	public static final SystemMessageId OBTAINED_UNIQUE_MATERIAL = new SystemMessageId(2005);
+	
+	/**
+	 * ID: 2006<br>
+	 * Message: You obtained the only material of this kind.
+	 */
+	public static final SystemMessageId OBTAINED_ONLY_MATERIAL = new SystemMessageId(2006);
+	
+	/**
+	 * ID: 2007<br>
+	 * Message: Please enter the recipient's name.
+	 */
+	public static final SystemMessageId ENTER_RECIPIENTS_NAME = new SystemMessageId(2007);
+	
+	/**
+	 * ID: 2008<br>
+	 * Message: Please enter the text.
+	 */
+	public static final SystemMessageId ENTER_TEXT = new SystemMessageId(2008);
+	
+	/**
+	 * ID: 2009<br>
+	 * Message: You cannot exceed 1500 characters.
+	 */
+	public static final SystemMessageId CANT_EXCEED_1500_CHARACTERS = new SystemMessageId(2009);
+	
+	/**
+	 * ID: 2010<br>
+	 * Message: $s2 $s1
+	 */
+	public static final SystemMessageId S2_S1 = new SystemMessageId(2010);
+	
+	/**
+	 * ID: 2011<br>
+	 * Message: The augmented item cannot be discarded.
+	 */
+	public static final SystemMessageId AUGMENTED_ITEM_CANNOT_BE_DISCARDED = new SystemMessageId(2011);
+	
+	/**
+	 * ID: 2012<br>
+	 * Message: $s1 has been activated.
+	 */
+	public static final SystemMessageId S1_HAS_BEEN_ACTIVATED = new SystemMessageId(2012);
+	
+	/**
+	 * ID: 2013<br>
+	 * Message: Your seed or remaining purchase amount is inadequate.
+	 */
+	public static final SystemMessageId YOUR_SEED_OR_REMAINING_PURCHASE_AMOUNT_IS_INADEQUATE = new SystemMessageId(2013);
+	
+	/**
+	 * ID: 2014<br>
+	 * Message: You cannot proceed because the manor cannot accept any more crops. All crops have been returned and no adena withdrawn.
+	 */
+	public static final SystemMessageId MANOR_CANT_ACCEPT_MORE_CROPS = new SystemMessageId(2014);
+	
+	/**
+	 * ID: 2015<br>
+	 * Message: A skill is ready to be used again.
+	 */
+	public static final SystemMessageId SKILL_READY_TO_USE_AGAIN = new SystemMessageId(2015);
+	
+	/**
+	 * ID: 2016<br>
+	 * Message: A skill is ready to be used again but its re-use counter time has increased.
+	 */
+	public static final SystemMessageId SKILL_READY_TO_USE_AGAIN_BUT_TIME_INCREASED = new SystemMessageId(2016);
+	
+	/**
+	 * ID: 2017<br>
+	 * Message: $c1 cannot duel because $c1 is currently engaged in a private store or manufacture.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_A_PRIVATE_STORE_OR_MANUFACTURE = new SystemMessageId(2017);
+	
+	/**
+	 * ID: 2018<br>
+	 * Message: $c1 cannot duel because $c1 is currently fishing.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_FISHING = new SystemMessageId(2018);
+	
+	/**
+	 * ID: 2019<br>
+	 * Message: $c1 cannot duel because $c1's HP or MP is below 50%.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_HP_OR_MP_IS_BELOW_50_PERCENT = new SystemMessageId(2019);
+	
+	/**
+	 * ID: 2020<br>
+	 * Message: $c1 cannot make a challenge to a duel because $c1 is currently in a duel-prohibited area (Peaceful Zone / Seven Signs Zone / Near Water / Restart Prohibited Area).
+	 */
+	public static final SystemMessageId C1_CANNOT_MAKE_A_CHALLANGE_TO_A_DUEL_BECAUSE_C1_IS_CURRENTLY_IN_A_DUEL_PROHIBITED_AREA = new SystemMessageId(2020);
+	
+	/**
+	 * ID: 2021<br>
+	 * Message: $c1 cannot duel because $c1 is currently engaged in battle.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_ENGAGED_IN_BATTLE = new SystemMessageId(2021);
+	
+	/**
+	 * ID: 2022<br>
+	 * Message: $c1 cannot duel because $c1 is already engaged in a duel.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL = new SystemMessageId(2022);
+	
+	/**
+	 * ID: 2023<br>
+	 * Message: $c1 cannot duel because $c1 is in a chaotic state.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_IN_A_CHAOTIC_STATE = new SystemMessageId(2023);
+	
+	/**
+	 * ID: 2024<br>
+	 * Message: $c1 cannot duel because $c1 is participating in the Olympiad.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_THE_OLYMPIAD = new SystemMessageId(2024);
+	
+	/**
+	 * ID: 2025<br>
+	 * Message: $c1 cannot duel because $c1 is participating in a clan hall war.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_A_CLAN_HALL_WAR = new SystemMessageId(2025);
+	
+	/**
+	 * ID: 2026<br>
+	 * Message: $c1 cannot duel because $c1 is participating in a siege war.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_PARTICIPATING_IN_A_SIEGE_WAR = new SystemMessageId(2026);
+	
+	/**
+	 * ID: 2027<br>
+	 * Message: $c1 cannot duel because $c1 is currently riding a boat, steed, or strider.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_BECAUSE_C1_IS_CURRENTLY_RIDING_A_BOAT_STEED_OR_STRIDER = new SystemMessageId(2027);
+	
+	/**
+	 * ID: 2028<br>
+	 * Message: $c1 cannot receive a duel challenge because $c1 is too far away.
+	 */
+	public static final SystemMessageId C1_CANNOT_RECEIVE_A_DUEL_CHALLENGE_BECAUSE_C1_IS_TOO_FAR_AWAY = new SystemMessageId(2028);
+	
+	/**
+	 * ID: 2029<br>
+	 * Message: $c1 is currently teleporting and cannot participate in the Olympiad.
+	 */
+	public static final SystemMessageId C1_CANNOT_PARTICIPATE_IN_OLYMPIAD_DURING_TELEPORT = new SystemMessageId(2029);
+	
+	/**
+	 * ID: 2030<br>
+	 * Message: You are currently logging in.
+	 */
+	public static final SystemMessageId CURRENTLY_LOGGING_IN = new SystemMessageId(2030);
+	
+	/**
+	 * ID: 2031<br>
+	 * Message: Please wait a moment.
+	 */
+	public static final SystemMessageId PLEASE_WAIT_A_MOMENT = new SystemMessageId(2031);
+	
+	/**
+	 * ID: 2032<br>
+	 * Message: It is not the right time for purchasing the item.
+	 */
+	public static final SystemMessageId NOT_TIME_TO_PURCHASE_ITEM = new SystemMessageId(2032);
+	
+	/**
+	 * ID: 2033<br>
+	 * Message: A sub-class cannot be created or changed because you have exceeded your inventory limit.
+	 */
+	public static final SystemMessageId NOT_SUBCLASS_WHILE_INVENTORY_FULL = new SystemMessageId(2033);
+	
+	/**
+	 * ID: 2034<br>
+	 * Message: There are $s1 hours(s) and $s2 minute(s) remaining until the item can be purchased again.
+	 */
+	public static final SystemMessageId ITEM_PURCHASABLE_IN_S1_HOURS_S2_MINUTES = new SystemMessageId(2034);
+	
+	/**
+	 * ID: 2035<br>
+	 * Message: There are $s1 minute(s) remaining until the item can be purchased again.
+	 */
+	public static final SystemMessageId ITEM_PURCHASABLE_IN_S1_MINUTES = new SystemMessageId(2035);
+	
+	/**
+	 * ID: 2036<br>
+	 * Message: Unable to invite because the party is locked.
+	 */
+	public static final SystemMessageId NO_INVITE_PARTY_LOCKED = new SystemMessageId(2036);
+	
+	/**
+	 * ID: 2037<br>
+	 * Message: Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please choose another server.
+	 */
+	public static final SystemMessageId CANT_CREATE_CHARACTER_DURING_RESTRICTION = new SystemMessageId(2037);
+	
+	/**
+	 * ID: 2038<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed to drop items and/or Adena. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId ACCOUNT_CANT_DROP_ITEMS = new SystemMessageId(2038);
+	
+	/**
+	 * ID: 2039<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed to trade items and/or Adena. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId ACCOUNT_CANT_TRADE_ITEMS = new SystemMessageId(2039);
+	
+	/**
+	 * ID: 2040<br>
+	 * Message: Cannot trade items with the targeted user.
+	 */
+	public static final SystemMessageId CANT_TRADE_WITH_TARGET = new SystemMessageId(2040);
+	
+	/**
+	 * ID: 2041<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed to setup private stores. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId CANT_OPEN_PRIVATE_STORE = new SystemMessageId(2041);
+	
+	/**
+	 * ID: 2042<br>
+	 * Message: This account has been suspended for non-payment based on the cell phone payment agreement.\\n Please submit proof of payment by fax (02-2186-3499) and contact customer service at 1600-0020.
+	 */
+	public static final SystemMessageId ILLEGAL_USE23 = new SystemMessageId(2042);
+	
+	/**
+	 * ID: 2043<br>
+	 * Message: You have exceeded your inventory volume limit and may not take this quest item. Please make room in your inventory and try again.
+	 */
+	public static final SystemMessageId YOU_HAVE_EXCEEDED_YOUR_INVENTORY_VOLUME_LIMIT_AND_CANNOT_TAKE_THIS_QUESTITEM = new SystemMessageId(2043);
+	
+	/**
+	 * ID: 2044<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed to set up private manufacturing stores. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId CANT_SETUP_PRIVATE_WORKSHOP = new SystemMessageId(2044);
+	
+	/**
+	 * ID: 2045<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed to use private manufacturing stores. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId CANT_USE_PRIVATE_WORKSHOP = new SystemMessageId(2045);
+	
+	/**
+	 * ID: 2046<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed buy items from private stores. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId CANT_USE_PRIVATE_STORES = new SystemMessageId(2046);
+	
+	/**
+	 * ID: 2047<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts aren’t allowed to access clan warehouses. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId CANT_USE_CLAN_WH = new SystemMessageId(2047);
+	
+	/**
+	 * ID: 2048<br>
+	 * Message: The shortcut in use conflicts with $s1. Do you wish to reset the conflicting shortcuts and use the saved shortcut?
+	 */
+	public static final SystemMessageId CONFLICTING_SHORTCUT = new SystemMessageId(2048);
+	
+	/**
+	 * ID: 2049<br>
+	 * Message: The shortcut will be applied and saved in the server. Will you continue?
+	 */
+	public static final SystemMessageId CONFIRM_SHORTCUT_WILL_SAVED_ON_SERVER = new SystemMessageId(2049);
+	
+	/**
+	 * ID: 2050<br>
+	 * Message: $s1 clan is trying to display a flag.
+	 */
+	public static final SystemMessageId S1_TRYING_RAISE_FLAG = new SystemMessageId(2050);
+	
+	/**
+	 * ID: 2051<br>
+	 * Message: You must accept the User Agreement before this account can access Lineage II.\\n Please try again after accepting the agreement on the PlayNC website (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId MUST_ACCEPT_AGREEMENT = new SystemMessageId(2051);
+	
+	/**
+	 * ID: 2052<br>
+	 * Message: A guardian's consent is required before this account can be used to play Lineage II.\\nPlease try again after this consent is provided.
+	 */
+	public static final SystemMessageId NEED_CONSENT_TO_PLAY_THIS_ACCOUNT = new SystemMessageId(2052);
+	
+	/**
+	 * ID: 2053<br>
+	 * Message: This account has declined the User Agreement or is pending a withdrawal request. \\nPlease try again after cancelling this request.
+	 */
+	public static final SystemMessageId ACCOUNT_DECLINED_AGREEMENT_OR_PENDING = new SystemMessageId(2053);
+	
+	/**
+	 * ID: 2054<br>
+	 * Message: This account has been suspended. \\nFor more information, please call the Customer's Center (Tel. 1600-0020).
+	 */
+	public static final SystemMessageId ACCOUNT_SUSPENDED = new SystemMessageId(2054);
+	
+	/**
+	 * ID: 2055<br>
+	 * Message: Your account has been suspended from all game services.\\nFor more information, please visit the PlayNC website Customer's Center (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId ACCOUNT_SUSPENDED_FROM_ALL_SERVICES = new SystemMessageId(2055);
+	
+	/**
+	 * ID: 2056<br>
+	 * Message: Your account has been converted to an integrated account, and is unable to be accessed. \\nPlease logon with the converted integrated account.
+	 */
+	public static final SystemMessageId ACCOUNT_CONVERTED = new SystemMessageId(2056);
+	
+	/**
+	 * ID: 2057<br>
+	 * Message: You have blocked $c1.
+	 */
+	public static final SystemMessageId BLOCKED_C1 = new SystemMessageId(2057);
+	
+	/**
+	 * ID: 2058<br>
+	 * Message: You already polymorphed and cannot polymorph again.
+	 */
+	public static final SystemMessageId YOU_ALREADY_POLYMORPHED_AND_CANNOT_POLYMORPH_AGAIN = new SystemMessageId(2058);
+	
+	/**
+	 * ID: 2059<br>
+	 * Message: The nearby area is too narrow for you to polymorph. Please move to another area and try to polymorph again.
+	 */
+	public static final SystemMessageId AREA_UNSUITABLE_FOR_POLYMORPH = new SystemMessageId(2059);
+	
+	/**
+	 * ID: 2060<br>
+	 * Message: You cannot polymorph into the desired form in water.
+	 */
+	public static final SystemMessageId YOU_CANNOT_POLYMORPH_INTO_THE_DESIRED_FORM_IN_WATER = new SystemMessageId(2060);
+	
+	/**
+	 * ID: 2061<br>
+	 * Message: You are still under transform penalty and cannot be polymorphed.
+	 */
+	public static final SystemMessageId CANT_MORPH_DUE_TO_MORPH_PENALTY = new SystemMessageId(2061);
+	
+	/**
+	 * ID: 2062<br>
+	 * Message: You cannot polymorph when you have summoned a servitor/pet.
+	 */
+	public static final SystemMessageId YOU_CANNOT_POLYMORPH_WHEN_YOU_HAVE_SUMMONED_A_SERVITOR = new SystemMessageId(2062);
+	
+	/**
+	 * ID: 2063<br>
+	 * Message: You cannot polymorph while riding a pet.
+	 */
+	public static final SystemMessageId YOU_CANNOT_POLYMORPH_WHILE_RIDING_A_PET = new SystemMessageId(2063);
+	
+	/**
+	 * ID: 2064<br>
+	 * Message: You cannot polymorph while under the effect of a special skill.
+	 */
+	public static final SystemMessageId CANT_MORPH_WHILE_UNDER_SPECIAL_SKILL_EFFECT = new SystemMessageId(2064);
+	
+	/**
+	 * ID: 2065<br>
+	 * Message: That item cannot be taken off.
+	 */
+	public static final SystemMessageId ITEM_CANNOT_BE_TAKEN_OFF = new SystemMessageId(2065);
+	
+	/**
+	 * ID: 2066<br>
+	 * Message: That weapon cannot perform any attacks.
+	 */
+	public static final SystemMessageId THAT_WEAPON_CANT_ATTACK = new SystemMessageId(2066);
+	
+	/**
+	 * ID: 2067<br>
+	 * Message: That weapon cannot use any other skill except the weapon's skill.
+	 */
+	public static final SystemMessageId WEAPON_CAN_USE_ONLY_WEAPON_SKILL = new SystemMessageId(2067);
+	
+	/**
+	 * ID: 2068<br>
+	 * Message: You do not have all of the items needed to untrain the enchant skill.
+	 */
+	public static final SystemMessageId YOU_DONT_HAVE_ALL_ITENS_NEEDED_TO_UNTRAIN_SKILL_ENCHANT = new SystemMessageId(2068);
+	
+	/**
+	 * ID: 2069<br>
+	 * Message: Untrain of enchant skill was successful. Current level of enchant skill $s1 has been decreased by 1.
+	 */
+	public static final SystemMessageId UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_DECREASED_BY_ONE = new SystemMessageId(2069);
+	
+	/**
+	 * ID: 2070<br>
+	 * Message: Untrain of enchant skill was successful. Current level of enchant skill $s1 became 0 and enchant skill will be initialized.
+	 */
+	public static final SystemMessageId UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_RESETED = new SystemMessageId(2070);
+	
+	/**
+	 * ID: 2071<br>
+	 * Message: You do not have all of the items needed to enchant skill route change.
+	 */
+	public static final SystemMessageId YOU_DONT_HAVE_ALL_ITENS_NEEDED_TO_CHANGE_SKILL_ENCHANT_ROUTE = new SystemMessageId(2071);
+	
+	/**
+	 * ID: 2072<br>
+	 * Message: Enchant skill route change was successful. Lv of enchant skill $s1 has been decreased by $s2.
+	 */
+	public static final SystemMessageId SKILL_ENCHANT_CHANGE_SUCCESSFUL_S1_LEVEL_WAS_DECREASED_BY_S2 = new SystemMessageId(2072);
+	
+	/**
+	 * ID: 2073<br>
+	 * Message: Enchant skill route change was successful. Lv of enchant skill $s1 will remain.
+	 */
+	public static final SystemMessageId SKILL_ENCHANT_CHANGE_SUCCESSFUL_S1_LEVEL_WILL_REMAIN = new SystemMessageId(2073);
+	
+	/**
+	 * ID: 2074<br>
+	 * Message: Skill enchant failed. Current level of enchant skill $s1 will remain unchanged.
+	 */
+	public static final SystemMessageId SKILL_ENCHANT_FAILED_S1_LEVEL_WILL_REMAIN = new SystemMessageId(2074);
+	
+	/**
+	 * ID: 2075<br>
+	 * Message: It is not an auction period.
+	 */
+	public static final SystemMessageId NO_AUCTION_PERIOD = new SystemMessageId(2075);
+	
+	/**
+	 * ID: 2076<br>
+	 * Message: Bidding is not allowed because the maximum bidding price exceeds 100 billion.
+	 */
+	public static final SystemMessageId BID_CANT_EXCEED_100_BILLION = new SystemMessageId(2076);
+	
+	/**
+	 * ID: 2077<br>
+	 * Message: Your bid must be higher than the current highest bid.
+	 */
+	public static final SystemMessageId BID_MUST_BE_HIGHER_THAN_CURRENT_BID = new SystemMessageId(2077);
+	
+	/**
+	 * ID: 2078<br>
+	 * Message: You do not have enough adena for this bid.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_ADENA_FOR_THIS_BID = new SystemMessageId(2078);
+	
+	/**
+	 * ID: 2079<br>
+	 * Message: You currently have the highest bid, but the reserve has not been met.
+	 */
+	public static final SystemMessageId HIGHEST_BID_BUT_RESERVE_NOT_MET = new SystemMessageId(2079);
+	
+	/**
+	 * ID: 2080<br>
+	 * Message: You have been outbid.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_OUTBID = new SystemMessageId(2080);
+	
+	/**
+	 * ID: 2081<br>
+	 * Message: There are no funds presently due to you.
+	 */
+	public static final SystemMessageId NO_FUNDS_DUE = new SystemMessageId(2081);
+	
+	/**
+	 * ID: 2082<br>
+	 * Message: You have exceeded the total amount of adena allowed in inventory.
+	 */
+	public static final SystemMessageId EXCEEDED_MAX_ADENA_AMOUNT_IN_INVENTORY = new SystemMessageId(2082);
+	
+	/**
+	 * ID: 2083<br>
+	 * Message: The auction has begun.
+	 */
+	public static final SystemMessageId AUCTION_BEGUN = new SystemMessageId(2083);
+	
+	/**
+	 * ID: 2084<br>
+	 * Message: Enemy Blood Pledges have intruded into the fortress.
+	 */
+	public static final SystemMessageId ENEMIES_INTRUDED_FORTRESS = new SystemMessageId(2084);
+	
+	/**
+	 * ID: 2085<br>
+	 * Message: Shout and trade chatting cannot be used while possessing a cursed weapon.
+	 */
+	public static final SystemMessageId SHOUT_AND_TRADE_CHAT_CANNOT_BE_USED_WHILE_POSSESSING_CURSED_WEAPON = new SystemMessageId(2085);
+	
+	/**
+	 * ID: 2086<br>
+	 * Message: Search on user $c2 for third-party program use will be completed in $s1 minute(s).
+	 */
+	public static final SystemMessageId SEARCH_ON_S2_FOR_BOT_USE_COMPLETED_IN_S1_MINUTES = new SystemMessageId(2086);
+	
+	/**
+	 * ID: 2087<br>
+	 * Message: A fortress is under attack!
+	 */
+	public static final SystemMessageId A_FORTRESS_IS_UNDER_ATTACK = new SystemMessageId(2087);
+	
+	/**
+	 * ID: 2088<br>
+	 * Message: $s1 minute(s) until the fortress battle starts.
+	 */
+	public static final SystemMessageId S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS = new SystemMessageId(2088);
+	
+	/**
+	 * ID: 2089<br>
+	 * Message: $s1 second(s) until the fortress battle starts.
+	 */
+	public static final SystemMessageId S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS = new SystemMessageId(2089);
+	
+	/**
+	 * ID: 2090<br>
+	 * Message: The fortress battle $s1 has begun.
+	 */
+	public static final SystemMessageId THE_FORTRESS_BATTLE_S1_HAS_BEGUN = new SystemMessageId(2090);
+	
+	/**
+	 * ID: 2091<br>
+	 * Message: Your account can only be used after changing your password and quiz. \\n Services will be available after changing your password and quiz from the PlayNC website (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId CHANGE_PASSWORT_FIRST = new SystemMessageId(2091);
+	
+	/**
+	 * ID: 2092<br>
+	 * Message: You cannot bid due to a passed-in price.
+	 */
+	public static final SystemMessageId CANNOT_BID_DUE_TO_PASSED_IN_PRICE = new SystemMessageId(2092);
+	
+	/**
+	 * ID: 2093<br>
+	 * Message: The bid amount was $s1 adena. Would you like to retrieve the bid amount?
+	 */
+	public static final SystemMessageId PASSED_IN_PRICE_IS_S1_ADENA_WOULD_YOU_LIKE_TO_RETURN_IT = new SystemMessageId(2093);
+	
+	/**
+	 * ID: 2094<br>
+	 * Message: Another user is purchasing. Please try again later.
+	 */
+	public static final SystemMessageId ANOTHER_USER_PURCHASING_TRY_AGAIN_LATER = new SystemMessageId(2094);
+	
+	/**
+	 * ID: 2095<br>
+	 * Message: Some Lineage II features have been limited for free trials. Trial accounts have limited chatting capabilities. To unlock all of the features of Lineage II, purchase the full version today.
+	 */
+	public static final SystemMessageId ACCOUNT_CANNOT_SHOUT = new SystemMessageId(2095);
+	
+	/**
+	 * ID: 2096<br>
+	 * Message: $c1 is in a location which cannot be entered, therefore it cannot be processed.
+	 */
+	public static final SystemMessageId C1_IS_IN_A_LOCATION_WHICH_CANNOT_BE_ENTERED_THEREFORE_IT_CANNOT_BE_PROCESSED = new SystemMessageId(2096);
+	
+	/**
+	 * ID: 2097<br>
+	 * Message: $c1's level does not correspond to the requirements for entry.
+	 */
+	public static final SystemMessageId C1_S_LEVEL_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED = new SystemMessageId(2097);
+	
+	/**
+	 * ID: 2098<br>
+	 * Message: $c1's quest requirement is not sufficient and cannot be entered.
+	 */
+	public static final SystemMessageId C1_S_QUEST_REQUIREMENT_IS_NOT_SUFFICIENT_AND_CANNOT_BE_ENTERED = new SystemMessageId(2098);
+	
+	/**
+	 * ID: 2099<br>
+	 * Message: $c1's item requirement is not sufficient and cannot be entered.
+	 */
+	public static final SystemMessageId C1_ITEM_REQUIREMENT_NOT_SUFFICIENT = new SystemMessageId(2099);
+	
+	/**
+	 * ID: 2100<br>
+	 * Message: $c1 may not re-enter yet.
+	 */
+	public static final SystemMessageId C1_MAY_NOT_RE_ENTER_YET = new SystemMessageId(2100);
+	
+	/**
+	 * ID: 2101<br>
+	 * Message: You are not currently in a party, so you cannot enter.
+	 */
+	public static final SystemMessageId NOT_IN_PARTY_CANT_ENTER = new SystemMessageId(2101);
+	
+	/**
+	 * ID: 2102<br>
+	 * Message: You cannot enter due to the party having exceeded the limit.
+	 */
+	public static final SystemMessageId PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER = new SystemMessageId(2102);
+	
+	/**
+	 * ID: 2103<br>
+	 * Message: You cannot enter because you are not associated with the current command channel.
+	 */
+	public static final SystemMessageId NOT_IN_COMMAND_CHANNEL_CANT_ENTER = new SystemMessageId(2103);
+	
+	/**
+	 * ID: 2104<br>
+	 * Message: The maximum number of instance zones has been exceeded. You cannot enter.
+	 */
+	public static final SystemMessageId MAXIMUM_INSTANCE_ZONE_NUMBER_EXCEEDED_CANT_ENTER = new SystemMessageId(2104);
+	
+	/**
+	 * ID: 2105<br>
+	 * Message: You have entered another instance zone, therefore you cannot enter corresponding dungeon.
+	 */
+	public static final SystemMessageId YOU_HAVE_ENTERED_ANOTHER_INSTANT_ZONE_THEREFORE_YOU_CANNOT_ENTER_CORRESPONDING_DUNGEON = new SystemMessageId(2105);
+	
+	/**
+	 * ID: 2106<br>
+	 * Message: This dungeon will expire in $s1 minute(s). You will be forced out of the dungeon when the time expires.
+	 */
+	public static final SystemMessageId DUNGEON_EXPIRES_IN_S1_MINUTES = new SystemMessageId(2106);
+	
+	/**
+	 * ID: 2107<br>
+	 * Message: This instance zone will be terminated in $s1 minute(s). You will be forced out of the dungeon when the time expires.
+	 */
+	public static final SystemMessageId INSTANCE_ZONE_TERMINATES_IN_S1_MINUTES = new SystemMessageId(2107);
+	
+	/**
+	 * ID: 2108<br>
+	 * Message: Your account has been suspended for 10 days for use of illegal software and may be permanently suspended. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE24 = new SystemMessageId(2108);
+	
+	/**
+	 * ID: 2109<br>
+	 * Message: During the server merge, your character name, $s1, conflicted with another. Your name may still be available. Please enter your desired name.
+	 */
+	public static final SystemMessageId CHARACTER_NAME_OVERLAPPING_RENAME_CHARACTER = new SystemMessageId(2109);
+	
+	/**
+	 * ID: 2110<br>
+	 * Message: This character name already exists or is an invalid name. Please enter a new name.
+	 */
+	public static final SystemMessageId CHARACTER_NAME_INVALID_RENAME_CHARACTER = new SystemMessageId(2110);
+	
+	/**
+	 * ID: 2111<br>
+	 * Message: Enter a shortcut to assign.
+	 */
+	public static final SystemMessageId ENTER_SHORTCUT_TO_ASSIGN = new SystemMessageId(2111);
+	
+	/**
+	 * ID: 2112<br>
+	 * Message: Sub-key can be CTRL, ALT, SHIFT and you may enter two sub-keys at a time. \\n Example) "CTRL + ALT + A"
+	 */
+	public static final SystemMessageId SUBKEY_EXPLANATION1 = new SystemMessageId(2112);
+	
+	/**
+	 * ID: 2113<br>
+	 * Message: CTRL, ALT, SHIFT keys may be used as sub-key in expanded sub-key mode, and only ALT may be used as a sub-key in standard sub-key mode.
+	 */
+	public static final SystemMessageId SUBKEY_EXPLANATION2 = new SystemMessageId(2113);
+	
+	/**
+	 * ID: 2114<br>
+	 * Message: Forced attack and stand-in-place attacks assigned previously to Ctrl and Shift will be changed to Alt + Q and Alt + E when set as expanded sub-key mode, and CTRL and SHIFT will be available to assign to another shortcut. Will you continue?
+	 */
+	public static final SystemMessageId SUBKEY_EXPLANATION3 = new SystemMessageId(2114);
+	
+	/**
+	 * ID: 2115<br>
+	 * Message: Your account has been suspended for abusing a bug related to the NCcoin. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE25 = new SystemMessageId(2115);
+	
+	/**
+	 * ID: 2116<br>
+	 * Message: Your account has been suspended for abusing a free NCcoin. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE26 = new SystemMessageId(2116);
+	
+	/**
+	 * ID: 2117<br>
+	 * Message: Your account has been suspended for using another person's identification. If you were not involved with any of these violations, please verify your identity. For more information, please visit the PlayNC website Customer's Center (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId ILLEGAL_USE27 = new SystemMessageId(2117);
+	
+	/**
+	 * ID: 2118<br>
+	 * Message: Your account has been suspended for misappropriating payment under another player's account. For more information, please visit the Customer Service Center of the PlayNC website (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId ILLEGAL_USE28 = new SystemMessageId(2118);
+	
+	/**
+	 * ID: 2119<br>
+	 * Message: Your account has been suspended from all game services after being detected with dealing an account.\\nFor more information, please visit the PlayNC website Customer's Center (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId ILLEGAL_USE29 = new SystemMessageId(2119);
+	
+	/**
+	 * ID: 2120<br>
+	 * Message: Your account has been suspended for 10 days for using illegal software. Your account may be suspended permanently if you have been previously caught for the same violation. For more information, please visit the PlayNC website Customer's Center (http://us.ncsoft.com).
+	 */
+	public static final SystemMessageId ILLEGAL_USE30 = new SystemMessageId(2120);
+	
+	/**
+	 * ID: 2121<br>
+	 * Message: Your account has been suspended from all game services for use of illegal software. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE31 = new SystemMessageId(2121);
+	
+	/**
+	 * ID: 2122<br>
+	 * Message: Your account has been suspended from all game services for use of illegal software. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE32 = new SystemMessageId(2122);
+	
+	/**
+	 * ID: 2123<br>
+	 * Message: Your account has been suspended at your own request. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE33 = new SystemMessageId(2123);
+	
+	/**
+	 * ID: 2124<br>
+	 * Message: During the server merge, your clan name, $s1, conflicted with another. Your clan name may still be available. Please enter your desired name.
+	 */
+	public static final SystemMessageId CLAN_NAME_OVERLAPPING_RENAME_CLAN = new SystemMessageId(2124);
+	
+	/**
+	 * ID: 2125<br>
+	 * Message: The clan name already exists or is an invalid name. Please enter aother clan name.
+	 */
+	public static final SystemMessageId CLAN_NAME_INVALID_RENAME_CLAN = new SystemMessageId(2125);
+	
+	/**
+	 * ID: 2126<br>
+	 * Message: Your account has been suspended for regularly posting illegal messages. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE34 = new SystemMessageId(2126);
+	
+	/**
+	 * ID: 2127<br>
+	 * Message: Your account has been suspended after being detected with an illegal message. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE35 = new SystemMessageId(2127);
+	
+	/**
+	 * ID: 2128<br>
+	 * Message: Your account has been suspended from all game services for using the game for commercial purposes. For more information, please visit the Support Center on the PlayNC website (http://us.ncsoft.com/support/).
+	 */
+	public static final SystemMessageId ILLEGAL_USE36 = new SystemMessageId(2128);
+	
+	/**
+	 * ID: 2129<br>
+	 * Message: The augmented item cannot be converted. Please convert after the augmentation has been removed.
+	 */
+	public static final SystemMessageId AUGMENTED_ITEM_CANT_CONVERTED = new SystemMessageId(2129);
+	
+	/**
+	 * ID: 2130<br>
+	 * Message: You cannot convert this item.
+	 */
+	public static final SystemMessageId CANT_CONVERT_THIS_ITEM = new SystemMessageId(2130);
+	
+	/**
+	 * ID: 2131<br>
+	 * Message: You have bid the highest price and have won the item. The item can be found in your personal warehouse.
+	 */
+	public static final SystemMessageId WON_BID_ITEM_CAN_BE_FOUND_IN_WAREHOUSE = new SystemMessageId(2131);
+	
+	/**
+	 * ID: 2132<br>
+	 * Message: You have entered a common sever.
+	 */
+	public static final SystemMessageId ENTERED_COMMON_SERVER = new SystemMessageId(2132);
+	
+	/**
+	 * ID: 2133<br>
+	 * Message: You have entered an adults-only sever.
+	 */
+	public static final SystemMessageId ENTERED_ADULTS_ONLY_SERVER = new SystemMessageId(2133);
+	
+	/**
+	 * ID: 2134<br>
+	 * Message: You have entered a server for juveniles.
+	 */
+	public static final SystemMessageId ENTERED_JUVENILES_SERVER = new SystemMessageId(2134);
+	
+	/**
+	 * ID: 2135<br>
+	 * Message: Because of your Fatigue level, this is not allowed.
+	 */
+	public static final SystemMessageId NOT_ALLOWED_DUE_TO_FATIGUE_LEVEL = new SystemMessageId(2135);
+	
+	/**
+	 * ID: 2136<br>
+	 * Message: A clan name change application has been submitted.
+	 */
+	public static final SystemMessageId CLAN_NAME_CHANCE_PETITION_SUBMITTED = new SystemMessageId(2136);
+	
+	/**
+	 * ID: 2137<br>
+	 * Message: You are about to bid $s1 item with $s2 adena. Will you continue?
+	 */
+	public static final SystemMessageId CONFIRM_BID_S2_ADENA_FOR_S1_ITEM = new SystemMessageId(2137);
+	
+	/**
+	 * ID: 2138<br>
+	 * Message: Please enter a bid price.
+	 */
+	public static final SystemMessageId ENTER_BID_PRICE = new SystemMessageId(2138);
+	
+	/**
+	 * ID: 2139<br>
+	 * Message: $c1's Pet.
+	 */
+	public static final SystemMessageId C1_PET = new SystemMessageId(2139);
+	
+	/**
+	 * ID: 2140<br>
+	 * Message: $c1's Servitor.
+	 */
+	public static final SystemMessageId C1_SERVITOR = new SystemMessageId(2140);
+	
+	/**
+	 * ID: 2141<br>
+	 * Message: You slightly resisted $c1's magic.
+	 */
+	public static final SystemMessageId SLIGHTLY_RESISTED_C1_MAGICC = new SystemMessageId(2141);
+	
+	/**
+	 * ID: 2142<br>
+	 * Message: You cannot expel $c1 because $c1 is not a party member.
+	 */
+	public static final SystemMessageId CANT_EXPEL_C1_NOT_A_PARTY_MEMBER = new SystemMessageId(2142);
+	
+	/**
+	 * ID: 2143<br>
+	 * Message: You cannot add elemental power while operating a Private Store or Private Workshop.
+	 */
+	public static final SystemMessageId CANNOT_ADD_ELEMENTAL_POWER_WHILE_OPERATING_PRIVATE_STORE_OR_WORKSHOP = new SystemMessageId(2143);
+	
+	/**
+	 * ID: 2144<br>
+	 * Message: Please select item to add elemental power.
+	 */
+	public static final SystemMessageId SELECT_ITEM_TO_ADD_ELEMENTAL_POWER = new SystemMessageId(2144);
+	
+	/**
+	 * ID: 2145<br>
+	 * Message: Attribute item usage has been cancelled.
+	 */
+	public static final SystemMessageId ELEMENTAL_ENHANCE_CANCELED = new SystemMessageId(2145);
+	
+	/**
+	 * ID: 2146<br>
+	 * Message: Elemental power enhancer usage requirement is not sufficient.
+	 */
+	public static final SystemMessageId ELEMENTAL_ENHANCE_REQUIREMENT_NOT_SUFFICIENT = new SystemMessageId(2146);
+	
+	/**
+	 * ID: 2147<br>
+	 * Message: $s2 elemental power has been added successfully to $s1.
+	 */
+	public static final SystemMessageId ELEMENTAL_POWER_S2_SUCCESSFULLY_ADDED_TO_S1 = new SystemMessageId(2147);
+	
+	/**
+	 * ID: 2148<br>
+	 * Message: $s3 elemental power has been added successfully to +$s1 $s2.
+	 */
+	public static final SystemMessageId ELEMENTAL_POWER_S3_SUCCESSFULLY_ADDED_TO_S1_S2 = new SystemMessageId(2148);
+	
+	/**
+	 * ID: 2149<br>
+	 * Message: You have failed to add elemental power.
+	 */
+	public static final SystemMessageId FAILED_ADDING_ELEMENTAL_POWER = new SystemMessageId(2149);
+	
+	/**
+	 * ID: 2150<br>
+	 * Message: Another elemental power has already been added. This elemental power cannot be added.
+	 */
+	public static final SystemMessageId ANOTHER_ELEMENTAL_POWER_ALREADY_ADDED = new SystemMessageId(2150);
+	
+	/**
+	 * ID: 2151<br>
+	 * Message: Your opponent has resistance to magic, the damage was decreased.
+	 */
+	public static final SystemMessageId OPPONENT_HAS_RESISTANCE_MAGIC_DAMAGE_DECREASED = new SystemMessageId(2151);
+	
+	/**
+	 * ID: 2152<br>
+	 * Message: The assigned shortcut will be deleted and the initial shortcut setting restored. Will you continue?
+	 */
+	public static final SystemMessageId CONFIRM_SHORCUT_DELETE = new SystemMessageId(2152);
+	
+	/**
+	 * ID: 2153<br>
+	 * Message: You are currently logged into 10 of your accounts and can no longer access your other accounts.
+	 */
+	public static final SystemMessageId MAXIMUM_ACCOUNT_LOGINS_REACHED = new SystemMessageId(2153);
+	
+	/**
+	 * ID: 2154<br>
+	 * Message: The target is not a flagpole so a flag cannot be displayed.
+	 */
+	public static final SystemMessageId THE_TARGET_IS_NOT_A_FLAGPOLE_SO_A_FLAG_CANNOT_BE_DISPLAYED = new SystemMessageId(2154);
+	
+	/**
+	 * ID: 2155<br>
+	 * Message: A flag is already being displayed, another flag cannot be displayed.
+	 */
+	public static final SystemMessageId A_FLAG_IS_ALREADY_BEING_DISPLAYED_ANOTHER_FLAG_CANNOT_BE_DISPLAYED = new SystemMessageId(2155);
+	
+	/**
+	 * ID: 2156<br>
+	 * Message: There are not enough necessary items to use the skill.
+	 */
+	public static final SystemMessageId THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL = new SystemMessageId(2156);
+	
+	/**
+	 * ID: 2157<br>
+	 * Message: Bid will be attempted with $s1 adena.
+	 */
+	public static final SystemMessageId BID_WILL_BE_ATTEMPTED_WITH_S1_ADENA = new SystemMessageId(2157);
+	
+	/**
+	 * ID: 2158<br>
+	 * Message: Force attack is impossible against a temporary allied member during a siege.
+	 */
+	public static final SystemMessageId FORCED_ATTACK_IS_IMPOSSIBLE_AGAINST_SIEGE_SIDE_TEMPORARY_ALLIED_MEMBERS = new SystemMessageId(2158);
+	
+	/**
+	 * ID: 2159<br>
+	 * Message: Bidder exists, the auction time has been extended by 5 minutes.
+	 */
+	public static final SystemMessageId BIDDER_EXISTS_AUCTION_TIME_EXTENDED_BY_5_MINUTES = new SystemMessageId(2159);
+	
+	/**
+	 * ID: 2160<br>
+	 * Message: Bidder exists, auction time has been extended by 3 minutes.
+	 */
+	public static final SystemMessageId BIDDER_EXISTS_AUCTION_TIME_EXTENDED_BY_3_MINUTES = new SystemMessageId(2160);
+	
+	/**
+	 * ID: 2161<br>
+	 * Message: There is not enough space to move, the skill cannot be used.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_SPACE_FOR_SKILL = new SystemMessageId(2161);
+	
+	/**
+	 * ID: 2162<br>
+	 * Message: Your soul count has increased by $s1. It is now at $s2.
+	 */
+	public static final SystemMessageId YOUR_SOUL_HAS_INCREASED_BY_S1_SO_IT_IS_NOW_AT_S2 = new SystemMessageId(2162);
+	
+	/**
+	 * ID: 2163<br>
+	 * Message: Soul cannot be increased anymore.
+	 */
+	public static final SystemMessageId SOUL_CANNOT_BE_INCREASED_ANYMORE = new SystemMessageId(2163);
+	
+	/**
+	 * ID: 2164<br>
+	 * Message: The barracks have been seized.
+	 */
+	public static final SystemMessageId SEIZED_BARRACKS = new SystemMessageId(2164);
+	
+	/**
+	 * ID: 2165<br>
+	 * Message: The barracks function has been restored.
+	 */
+	public static final SystemMessageId BARRACKS_FUNCTION_RESTORED = new SystemMessageId(2165);
+	
+	/**
+	 * ID: 2166<br>
+	 * Message: All barracks are occupied.
+	 */
+	public static final SystemMessageId ALL_BARRACKS_OCCUPIED = new SystemMessageId(2166);
+	
+	/**
+	 * ID: 2167<br>
+	 * Message: A malicious skill cannot be used in a peace zone.
+	 */
+	public static final SystemMessageId A_MALICIOUS_SKILL_CANNOT_BE_USED_IN_PEACE_ZONE = new SystemMessageId(2167);
+	
+	/**
+	 * ID: 2168<br>
+	 * Message: $c1 has acquired the flag.
+	 */
+	public static final SystemMessageId C1_ACQUIRED_THE_FLAG = new SystemMessageId(2168);
+	
+	/**
+	 * ID: 2169<br>
+	 * Message: Your clan has been registered to $s1's fortress battle.
+	 */
+	public static final SystemMessageId REGISTERED_TO_S1_FORTRESS_BATTLE = new SystemMessageId(2169);
+	
+	/**
+	 * ID: 2170<br>
+	 * Message: A malicious skill cannot be used when an opponent is in the peace zone.
+	 */
+	public static final SystemMessageId CANT_USE_BAD_MAGIC_WHEN_OPPONENT_IN_PEACE_ZONE = new SystemMessageId(2170);
+	
+	/**
+	 * ID: 2171<br>
+	 * Message: This item cannot be crystallized.
+	 */
+	public static final SystemMessageId ITEM_CANNOT_CRYSTALLIZED = new SystemMessageId(2171);
+	
+	/**
+	 * ID: 2172<br>
+	 * Message: +$s1$s2's auction has ended.
+	 */
+	public static final SystemMessageId S1_S2_AUCTION_ENDED = new SystemMessageId(2172);
+	
+	/**
+	 * ID: 2173<br>
+	 * Message: $s1's auction has ended.
+	 */
+	public static final SystemMessageId S1_AUCTION_ENDED = new SystemMessageId(2173);
+	
+	/**
+	 * ID: 2174<br>
+	 * Message: $c1 cannot duel because $c1 is currently polymorphed.
+	 */
+	public static final SystemMessageId C1_CANNOT_DUEL_WHILE_POLYMORPHED = new SystemMessageId(2174);
+	
+	/**
+	 * ID: 2175<br>
+	 * Message: Party duel cannot be initiated due to a polymorphed party member.
+	 */
+	public static final SystemMessageId CANNOT_PARTY_DUEL_WHILE_A_MEMBER_IS_POLYMORPHED = new SystemMessageId(2175);
+	
+	/**
+	 * ID: 2176<br>
+	 * Message: $s1's $s2 attribute has been removed.
+	 */
+	public static final SystemMessageId S1_ELEMENTAL_POWER_REMOVED = new SystemMessageId(2176);
+	
+	/**
+	 * ID: 2177<br>
+	 * Message: +$s1$s2's $s3 attribute has been removed.
+	 */
+	public static final SystemMessageId S1_S2_ELEMENTAL_POWER_REMOVED = new SystemMessageId(2177);
+	
+	/**
+	 * ID: 2178<br>
+	 * Message: Attribute removal has failed.
+	 */
+	public static final SystemMessageId FAILED_TO_REMOVE_ELEMENTAL_POWER = new SystemMessageId(2178);
+	
+	/**
+	 * ID: 2179<br>
+	 * Message: You have the highest bid submitted in a Giran Castle auction.
+	 */
+	public static final SystemMessageId HIGHEST_BID_FOR_GIRAN_CASTLE = new SystemMessageId(2179);
+	
+	/**
+	 * ID: 2180<br>
+	 * Message: You have the highest bid submitted in an Aden Castle auction.
+	 */
+	public static final SystemMessageId HIGHEST_BID_FOR_ADEN_CASTLE = new SystemMessageId(2180);
+	
+	/**
+	 * ID: 2181<br>
+	 * Message: You have highest the bid submitted in a Rune Castle auction.
+	 */
+	public static final SystemMessageId HIGHEST_BID_FOR_RUNE_CASTLE = new SystemMessageId(2181);
+	
+	/**
+	 * ID: 2182<br>
+	 * Message: You cannot polymorph while riding a boat.
+	 */
+	public static final SystemMessageId CANT_POLYMORPH_ON_BOAT = new SystemMessageId(2182);
+	
+	/**
+	 * ID: 2183<br>
+	 * Message: The fortress battle of $s1 has finished.
+	 */
+	public static final SystemMessageId THE_FORTRESS_BATTLE_OF_S1_HAS_FINISHED = new SystemMessageId(2183);
+	
+	/**
+	 * ID: 2184<br>
+	 * Message: $s1 is victorious in the fortress battle of $s2.
+	 */
+	public static final SystemMessageId S1_CLAN_IS_VICTORIOUS_IN_THE_FORTRESS_BATTLE_OF_S2 = new SystemMessageId(2184);
+	
+	/**
+	 * ID: 2185<br>
+	 * Message: Only a party leader can make the request to enter.
+	 */
+	public static final SystemMessageId ONLY_PARTY_LEADER_CAN_ENTER = new SystemMessageId(2185);
+	
+	/**
+	 * ID: 2186<br>
+	 * Message: Soul cannot be absorbed anymore.
+	 */
+	public static final SystemMessageId SOUL_CANNOT_BE_ABSORBED_ANYMORE = new SystemMessageId(2186);
+	
+	/**
+	 * ID: 2187<br>
+	 * Message: The target is located where you cannot charge.
+	 */
+	public static final SystemMessageId THE_TARGET_IS_LOCATED_WHERE_YOU_CANNOT_CHARGE = new SystemMessageId(2187);
+	
+	/**
+	 * ID: 2188<br>
+	 * Message: Another enchantment is in progress. Please complete the previous task, then try again
+	 */
+	public static final SystemMessageId ENCHANTMENT_ALREADY_IN_PROGRESS = new SystemMessageId(2188);
+	
+	/**
+	 * ID: 2189<br>
+	 * Message: Current Location : $s1, $s2, $s3 (Near Kamael Village)
+	 */
+	public static final SystemMessageId LOC_KAMAEL_VILLAGE_S1_S2_S3 = new SystemMessageId(2189);
+	
+	/**
+	 * ID: 2190<br>
+	 * Message: Current Location : $s1, $s2, $s3 (Near the south end of the Wastelands)
+	 */
+	public static final SystemMessageId LOC_WASTELANDS_CAMP_S1_S2_S3 = new SystemMessageId(2190);
+	
+	/**
+	 * ID: 2191<br>
+	 * Message: To apply selected options, the game needs to be reloaded. If you don't apply now, it will be applied when you start the game next time. Will you apply now?
+	 */
+	public static final SystemMessageId CONFIRM_APPLY_SELECTIONS = new SystemMessageId(2191);
+	
+	/**
+	 * ID: 2192<br>
+	 * Message: You have bid on an item auction.
+	 */
+	public static final SystemMessageId BID_ON_ITEM_AUCTION = new SystemMessageId(2192);
+	
+	/**
+	 * ID: 2193<br>
+	 * Message: You are too far from the NPC for that to work.
+	 */
+	public static final SystemMessageId TOO_FAR_FROM_NPC = new SystemMessageId(2193);
+	
+	/**
+	 * ID: 2194<br>
+	 * Message: Current polymorph form cannot be applied with corresponding effects.
+	 */
+	public static final SystemMessageId CANT_APPLY_CURRENT_POLYMORPH_WITH_CORRESPONDING_EFFECTS = new SystemMessageId(2194);
+	
+	/**
+	 * ID: 2195<br>
+	 * Message: You do not have enough souls.
+	 */
+	public static final SystemMessageId THERE_IS_NOT_ENOUGH_SOUL = new SystemMessageId(2195);
+	
+	/**
+	 * ID: 2196<br>
+	 * Message: No Owned Clan.
+	 */
+	public static final SystemMessageId NO_OWNED_CLAN = new SystemMessageId(2196);
+	
+	/**
+	 * ID: 2197<br>
+	 * Message: Owned by clan $s1.
+	 */
+	public static final SystemMessageId OWNED_S1_CLAN = new SystemMessageId(2197);
+	
+	/**
+	 * ID: 2198<br>
+	 * Message: You currently have the highest bid in an item auction.
+	 */
+	public static final SystemMessageId HIGHEST_BID_IN_ITEM_AUCTION = new SystemMessageId(2198);
+	
+	/**
+	 * ID: 2199<br>
+	 * Message: You cannot enter this instance zone while the NPC server is down.
+	 */
+	public static final SystemMessageId CANT_ENTER_INSTANCE_ZONE_NPC_SERVER_OFFLINE = new SystemMessageId(2199);
+	
+	/**
+	 * ID: 2200<br>
+	 * Message: This instance zone will be terminated as the NPC server is down. You will be forcibly removed from the dungeon shortly.
+	 */
+	public static final SystemMessageId INSTANCE_ZONE_TERMINATED_NPC_SERVER_OFFLINE = new SystemMessageId(2200);
+	
+	/**
+	 * ID: 2201<br>
+	 * Message: $s1 year(s) $s2 month(s) $s3 day(s)
+	 */
+	public static final SystemMessageId S1_YEARS_S2_MONTHS_S3_DAYS = new SystemMessageId(2201);
+	
+	/**
+	 * ID: 2202<br>
+	 * Message: $s1 hour(s) $s2 minute(s) $s3 second(s)
+	 */
+	public static final SystemMessageId S1_HOURS_S2_MINUTES_S3_SECONDS = new SystemMessageId(2202);
+	
+	/**
+	 * ID: 2203<br>
+	 * Message: $s1/$s2
+	 */
+	public static final SystemMessageId S1_MONTHS_S2_DAYS = new SystemMessageId(2203);
+	
+	/**
+	 * ID: 2204<br>
+	 * Message: $s1 hour(s)
+	 */
+	public static final SystemMessageId S1_HOURS = new SystemMessageId(2204);
+	
+	/**
+	 * ID: 2205<br>
+	 * Message: You have entered an area where the mini map cannot be used. Your mini map has been closed.
+	 */
+	public static final SystemMessageId AREA_FORBIDS_MINIMAP = new SystemMessageId(2205);
+	
+	/**
+	 * ID: 2206<br>
+	 * Message: You have entered an area where the mini map can now be used.
+	 */
+	public static final SystemMessageId AREA_ALLOWS_MINIMAP = new SystemMessageId(2206);
+	
+	/**
+	 * ID: 2207<br>
+	 * Message: This is an area where you cannot use the mini map. The mini map cannot be opened.
+	 */
+	public static final SystemMessageId CANT_OPEN_MINIMAP = new SystemMessageId(2207);
+	
+	/**
+	 * ID: 2208<br>
+	 * Message: You do not meet the skill level requirements.
+	 */
+	public static final SystemMessageId YOU_DONT_MEET_SKILL_LEVEL_REQUIREMENTS = new SystemMessageId(2208);
+	
+	/**
+	 * ID: 2209<br>
+	 * Message: This is an area where your radar cannot be used
+	 */
+	public static final SystemMessageId AREA_WHERE_RADAR_CANNOT_BE_USED = new SystemMessageId(2209);
+	
+	/**
+	 * ID: 2210<br>
+	 * Message: Your skill will be returned to an unenchanted state.
+	 */
+	public static final SystemMessageId RETURN_TO_UNENCHANTED_CONDITION = new SystemMessageId(2210);
+	
+	/**
+	 * ID: 2211<br>
+	 * Message: You must learn the Onyx Beast skill before you can acquire further skills.
+	 */
+	public static final SystemMessageId YOU_MUST_LEARN_ONYX_BEAST_SKILL = new SystemMessageId(2211);
+	
+	/**
+	 * ID: 2212<br>
+	 * Message: You have not completed the necessary quest for skill acquisition.
+	 */
+	public static final SystemMessageId NOT_COMPLETED_QUEST_FOR_SKILL_ACQUISITION = new SystemMessageId(2212);
+	
+	/**
+	 * ID: 2213<br>
+	 * Message: You cannot board a ship while you are polymorphed.
+	 */
+	public static final SystemMessageId CANT_BOARD_SHIP_POLYMORPHED = new SystemMessageId(2213);
+	
+	/**
+	 * ID: 2214<br>
+	 * Message: A new character will be created with the current settings. Continue?
+	 */
+	public static final SystemMessageId CONFIRM_CHARACTER_CREATION = new SystemMessageId(2214);
+	
+	/**
+	 * ID: 2215<br>
+	 * Message: $s1 P. Def.
+	 */
+	public static final SystemMessageId S1_PDEF = new SystemMessageId(2215);
+	
+	/**
+	 * ID: 2216<br>
+	 * Message: The CPU driver is not up-to-date. Please download the latest driver.
+	 */
+	public static final SystemMessageId PLEASE_UPDATE_CPU_DRIVER = new SystemMessageId(2216);
+	
+	/**
+	 * ID: 2217<br>
+	 * Message: The ballista has been successfully destroyed. The clan's reputation will be increased.
+	 */
+	public static final SystemMessageId BALLISTA_DESTROYED_CLAN_REPU_INCREASED = new SystemMessageId(2217);
+	
+	/**
+	 * ID: 2218<br>
+	 * Message: This is a main class skill only.
+	 */
+	public static final SystemMessageId MAIN_CLASS_SKILL_ONLY = new SystemMessageId(2218);
+	
+	/**
+	 * ID: 2219<br>
+	 * Message: This squad skill has already been acquired.
+	 */
+	public static final SystemMessageId SQUAD_SKILL_ALREADY_ACQUIRED = new SystemMessageId(2219);
+	
+	/**
+	 * ID: 2220<br>
+	 * Message: The previous level skill has not been learned.
+	 */
+	public static final SystemMessageId PREVIOUS_LEVEL_SKILL_NOT_LEARNED = new SystemMessageId(2220);
+	
+	/**
+	 * ID: 2221<br>
+	 * Message: Do you wish to activate the selected functions?
+	 */
+	public static final SystemMessageId ACTIVATE_SELECTED_FUNTIONS_CONFIRM = new SystemMessageId(2221);
+	
+	/**
+	 * ID: 2222<br>
+	 * Message: It will cost 150,000 adena to place scouts. Do you wish to continue?
+	 */
+	public static final SystemMessageId SCOUT_COSTS_150000_ADENA = new SystemMessageId(2222);
+	
+	/**
+	 * ID: 2223<br>
+	 * Message: It will cost 200,000 adena for a fortress gate enhancement. Do you wish to continue?
+	 */
+	public static final SystemMessageId FORTRESS_GATE_COSTS_200000_ADENA = new SystemMessageId(2223);
+	
+	/**
+	 * ID: 2224<br>
+	 * Message: Your crossbow is preparing to fire.
+	 */
+	public static final SystemMessageId CROSSBOW_PREPARING_TO_FIRE = new SystemMessageId(2224);
+	
+	/**
+	 * ID: 2225<br>
+	 * Message: There are no other skills to learn. Please come back after $s1nd class change.
+	 */
+	public static final SystemMessageId NO_SKILLS_TO_LEARN_RETURN_AFTER_S1_CLASS_CHANGE = new SystemMessageId(2225);
+	
+	/**
+	 * ID: 2226<br>
+	 * Message: Not enough bolts.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_BOLTS = new SystemMessageId(2226);
+	
+	/**
+	 * ID: 2227<br>
+	 * Message: It is not possible to register for the castle siege side or castle siege of a higher castle in the contract.
+	 */
+	public static final SystemMessageId NOT_POSSIBLE_TO_REGISTER_TO_CASTLE_SIEGE = new SystemMessageId(2227);
+	
+	/**
+	 * ID: 2228<br>
+	 * Message: Instance zone time limit:
+	 */
+	public static final SystemMessageId INSTANCE_ZONE_TIME_LIMIT = new SystemMessageId(2228);
+	
+	/**
+	 * ID: 2229<br>
+	 * Message: There is no instance zone under a time limit.
+	 */
+	public static final SystemMessageId NO_INSTANCEZONE_TIME_LIMIT = new SystemMessageId(2229);
+	
+	/**
+	 * ID: 2230<br>
+	 * Message: $s1 will be available for re-use after $s2 hour(s) $s3 minute(s).
+	 */
+	public static final SystemMessageId AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES = new SystemMessageId(2230);
+	
+	/**
+	 * ID: 2231<br>
+	 * Message: The supply items have not been provided because the castle you are in contract with doesn't have enough clan reputation.
+	 */
+	public static final SystemMessageId REPUTATION_SCORE_FOR_CONTRACT_NOT_ENOUGH = new SystemMessageId(2231);
+	
+	/**
+	 * ID: 2232<br>
+	 * Message: $s1 will be crystallized before destruction. Will you continue?
+	 */
+	public static final SystemMessageId S1_CRYSTALLIZED_BEFORE_DESTRUCTION = new SystemMessageId(2232);
+	
+	/**
+	 * ID: 2233<br>
+	 * Message: Siege registration is not possible due to your castle contract.
+	 */
+	public static final SystemMessageId CANT_REGISTER_TO_SIEGE_DUE_TO_CONTRACT = new SystemMessageId(2233);
+	
+	/**
+	 * ID: 2234<br>
+	 * Message: Do you wish to use this Kamael exclusive Hero Weapon?
+	 */
+	public static final SystemMessageId CONFIRM_KAMAEL_HERO_WEAPON = new SystemMessageId(2234);
+	
+	/**
+	 * ID: 2235<br>
+	 * Message: The instance zone in use has been deleted and cannot be accessed.
+	 */
+	public static final SystemMessageId INSTANCE_ZONE_DELETED_CANT_ACCESSED = new SystemMessageId(2235);
+	
+	/**
+	 * ID: 2236<br>
+	 * Message: You have $s1 minute(s) left on your wyvern.
+	 */
+	public static final SystemMessageId S1_MINUTES_LEFT_ON_WYVERN = new SystemMessageId(2236);
+	
+	/**
+	 * ID: 2237<br>
+	 * Message: You have $s1 second(s) left on your wyvern.
+	 */
+	public static final SystemMessageId S1_SECONDS_LEFT_ON_WYVERN = new SystemMessageId(2237);
+	
+	/**
+	 * ID: 2238<br>
+	 * Message: You are participating in the siege of $s1. This siege is scheduled for 2 hours.
+	 */
+	public static final SystemMessageId PARTICIPATING_IN_SIEGE_OF_S1 = new SystemMessageId(2238);
+	
+	/**
+	 * ID: 2239<br>
+	 * Message: The siege of $s1, in which you are participating, has finished.
+	 */
+	public static final SystemMessageId SIEGE_OF_S1_FINIHSED = new SystemMessageId(2239);
+	
+	/**
+	 * ID: 2240<br>
+	 * Message: You cannot register for a Clan Hall War when the Clan Lord is in the process of re-delegating clan authority to another leader.
+	 */
+	public static final SystemMessageId CANT_REGISTER_TO_TEAM_BATTLE_CLAN_HALL_WAR_WHILE_LORD_ON_TRANSACTION_WAITING_LIST = new SystemMessageId(2240);
+	
+	/**
+	 * ID: 2241<br>
+	 * Message: You cannot apply for a Clan Lord delegation request if your clan has registered for a Clan Hall War.
+	 */
+	public static final SystemMessageId CANT_APPLY_ON_LORD_TRANSACTION_WHILE_REGISTERED_TO_TEAM_BATTLE_CLAN_HALL_WAR = new SystemMessageId(2241);
+	
+	/**
+	 * ID: 2242<br>
+	 * Message: Clan members cannot leave or be expelled when they are registered for a Clan Hall War.
+	 */
+	public static final SystemMessageId MEMBERS_CANT_LEAVE_WHEN_REGISTERED_TO_TEAM_BATTLE_CLAN_HALL_WAR = new SystemMessageId(2242);
+	
+	/**
+	 * ID: 2243<br>
+	 * Message: During the Bandit Stronghold or Wild Beast Reserve clan hall war, the previous clan lord rather than the new clan lord participates in battle.
+	 */
+	public static final SystemMessageId WHEN_BANDITSTRONGHOLD_WILDBEASTRESERVRE_CLANLORD_IN_DANGER_PREVIOUS_LORD_PARTICIPATES_IN_BATTLE = new SystemMessageId(2243);
+	
+	/**
+	 * ID: 2244<br>
+	 * Message: $s1 minute(s) remaining.
+	 */
+	public static final SystemMessageId S1_MINUTES_REMAINING = new SystemMessageId(2244);
+	
+	/**
+	 * ID: 2245<br>
+	 * Message: $s1 second(s) remaining.
+	 */
+	public static final SystemMessageId S1_SECONDS_REMAINING = new SystemMessageId(2245);
+	
+	/**
+	 * ID: 2246<br>
+	 * Message: The contest will begin in $s1 minute(s).
+	 */
+	public static final SystemMessageId CONTEST_BEGIN_IN_S1_MINUTES = new SystemMessageId(2246);
+	
+	/**
+	 * ID: 2247<br>
+	 * Message: You cannot board an airship while transformed.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_TRANSFORMED = new SystemMessageId(2247);
+	
+	/**
+	 * ID: 2248<br>
+	 * Message: You cannot board an airship while petrified.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_PETRIFIED = new SystemMessageId(2248);
+	
+	/**
+	 * ID: 2249<br>
+	 * Message: You cannot board an airship while dead.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_DEAD = new SystemMessageId(2249);
+	
+	/**
+	 * ID: 2250<br>
+	 * Message: You cannot board an airship while fishing.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_FISHING = new SystemMessageId(2250);
+	
+	/**
+	 * ID: 2251<br>
+	 * Message: You cannot board an airship while in battle.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_IN_BATTLE = new SystemMessageId(2251);
+	
+	/**
+	 * ID: 2252<br>
+	 * Message: You cannot board an airship while in a duel.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_IN_A_DUEL = new SystemMessageId(2252);
+	
+	/**
+	 * ID: 2253<br>
+	 * Message: You cannot board an airship while sitting.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_SITTING = new SystemMessageId(2253);
+	
+	/**
+	 * ID: 2254<br>
+	 * Message: You cannot board an airship while casting.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_CASTING = new SystemMessageId(2254);
+	
+	/**
+	 * ID: 2255<br>
+	 * Message: You cannot board an airship when a cursed weapon is equipped.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_CURSED_WEAPON_IS_EQUIPPED = new SystemMessageId(2255);
+	
+	/**
+	 * ID: 2256<br>
+	 * Message: You cannot board an airship while holding a flag.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_HOLDING_A_FLAG = new SystemMessageId(2256);
+	
+	/**
+	 * ID: 2257<br>
+	 * Message: You cannot board an airship while a pet or a servitor is summoned.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED = new SystemMessageId(2257);
+	
+	/**
+	 * ID: 2258<br>
+	 * Message: You have already boarded another airship.
+	 */
+	public static final SystemMessageId YOU_HAVE_ALREADY_BOARDED_ANOTHER_AIRSHIP = new SystemMessageId(2258);
+	
+	/**
+	 * ID: 2259<br>
+	 * Message: Current Location: $s1, $s2, $s3 (near Fantasy Isle)
+	 */
+	public static final SystemMessageId LOC_FANTASY_ISLAND_S1_S2_S3 = new SystemMessageId(2259);
+	
+	/**
+	 * ID: 2260<br>
+	 * Message: Your pet's hunger gauge is below 10%. If your pet isn't fed soon, it may run away.
+	 */
+	public static final SystemMessageId PET_CAN_RUN_AWAY_WHEN_HUNGER_BELOW_10_PERCENT = new SystemMessageId(2260);
+	
+	/**
+	 * ID: 2261<br>
+	 * Message: $c1 has done $s3 points of damage to $c2.
+	 */
+	public static final SystemMessageId C1_DONE_S3_DAMAGE_TO_C2 = new SystemMessageId(2261);
+	
+	/**
+	 * ID: 2262<br>
+	 * Message: $c1 has received $s3 damage from $c2.
+	 */
+	public static final SystemMessageId C1_RECEIVED_DAMAGE_OF_S3_FROM_C2 = new SystemMessageId(2262);
+	
+	/**
+	 * ID: 2263<br>
+	 * Message: $c1 has received damage of $s3 through $c2.
+	 */
+	public static final SystemMessageId C1_RECEIVED_DAMAGE_OF_S3_THROUGH_C2 = new SystemMessageId(2263);
+	
+	/**
+	 * ID: 2264<br>
+	 * Message: $c1 has evaded $c2's attack.
+	 */
+	public static final SystemMessageId C1_EVADED_C2_ATTACK = new SystemMessageId(2264);
+	
+	/**
+	 * ID: 2265<br>
+	 * Message: $c1's attack went astray.
+	 */
+	public static final SystemMessageId C1_ATTACK_WENT_ASTRAY = new SystemMessageId(2265);
+	
+	/**
+	 * ID: 2266<br>
+	 * Message: $c1 landed a critical hit!
+	 */
+	public static final SystemMessageId C1_HAD_CRITICAL_HIT = new SystemMessageId(2266);
+	
+	/**
+	 * ID: 2267<br>
+	 * Message: $c1 resisted $c2's drain.
+	 */
+	public static final SystemMessageId C1_RESISTED_C2_DRAIN = new SystemMessageId(2267);
+	
+	/**
+	 * ID: 2268<br>
+	 * Message: $c1's attack failed.
+	 */
+	public static final SystemMessageId C1_ATTACK_FAILED = new SystemMessageId(2268);
+	
+	/**
+	 * ID: 2269<br>
+	 * Message: $c1 resisted $c2's magic.
+	 */
+	public static final SystemMessageId C1_RESISTED_C2_DRAIN2 = new SystemMessageId(2269);
+	
+	/**
+	 * ID: 2270<br>
+	 * Message: $c1 has received damage from $s2 through the fire of magic.
+	 */
+	public static final SystemMessageId C1_RECEIVED_DAMAGE_FROM_S2_THROUGH_FIRE_OF_MAGIC = new SystemMessageId(2270);
+	
+	/**
+	 * ID: 2271<br>
+	 * Message: $c1 weakly resisted $c2's magic.
+	 */
+	public static final SystemMessageId C1_WEAKLY_RESISTED_C2_MAGIC = new SystemMessageId(2271);
+	
+	/**
+	 * ID: 2272<br>
+	 * Message: The key you assigned as a shortcut key is not available in regular chatting mode.
+	 */
+	public static final SystemMessageId USE_SHORTCUT_CONFIRM = new SystemMessageId(2272);
+	
+	/**
+	 * ID: 2273<br>
+	 * Message: This skill cannot be learned while in the sub-class state. Please try again after changing to the main class.
+	 */
+	public static final SystemMessageId SKILL_NOT_FOR_SUBCLASS = new SystemMessageId(2273);
+	
+	/**
+	 * ID: 2276<br>
+	 * Message: The rebel army recaptured the fortress.
+	 */
+	public static final SystemMessageId NPCS_RECAPTURED_FORTRESS = new SystemMessageId(2276);
+	
+	/**
+	 * ID: 2280<br>
+	 * Message: Damage is decreased because $c1 resisted $c2's magic.
+	 */
+	public static final SystemMessageId DAMAGE_DECREASED_BECAUSE_C1_RESISTED_C2_MAGIC = new SystemMessageId(2280);
+	
+	/**
+	 * ID: 2283<br>
+	 * Message: You cannot transform while sitting.
+	 */
+	public static final SystemMessageId CANNOT_TRANSFORM_WHILE_SITTING = new SystemMessageId(2283);
+	
+	/**
+	 * ID: 2291<br>
+	 * Message: You must be in a party in order to operate the machine.
+	 */
+	public static final SystemMessageId CAN_OPERATE_MACHINE_WHEN_IN_PARTY = new SystemMessageId(2291);
+	
+	/**
+	 * ID: 2293<br>
+	 * Message: Current location: $s1, $s2, $s3 (inside the Steel Citadel)
+	 */
+	public static final SystemMessageId LOC_IN_STEEL_CITADEL_S1_S2_S3 = new SystemMessageId(2293);
+	
+	/**
+	 * ID: 2296<br>
+	 * Message: You have gained Vitality points.
+	 */
+	public static final SystemMessageId GAINED_VITALITY_POINTS = new SystemMessageId(2296);
+	
+	/**
+	 * ID: 2301<br>
+	 * Message: Current location: Steel Citadel
+	 */
+	public static final SystemMessageId LOC_STEEL_CITADEL = new SystemMessageId(2301);
+	
+	/**
+	 * ID: 2302<br>
+	 * Message: Your Dimensional Item has arrived! Visit the Dimensional Merchant in any village to obtain it.
+	 */
+	public static final SystemMessageId YOUR_VITAMIN_ITEM_HAS_ARRIVED = new SystemMessageId(2302);
+	
+	/**
+	 * ID: 2303<br>
+	 * Message: There are $s2 second(s) remaining in $s1's re-use time.
+	 */
+	public static final SystemMessageId S2_SECONDS_REMAINING_FOR_REUSE_S1 = new SystemMessageId(2303);
+	
+	/**
+	 * ID: 2304<br>
+	 * Message: There are $s2 minute(s), $s3 second(s) remaining in $s1's re-use time.
+	 */
+	public static final SystemMessageId S2_MINUTES_S3_SECONDS_REMAINING_FOR_REUSE_S1 = new SystemMessageId(2304);
+	
+	/**
+	 * ID: 2305<br>
+	 * Message: There are $s2 hour(s), $s3 minute(s), and $s4 second(s) remaining in $s1's re-use time.
+	 */
+	public static final SystemMessageId S2_HOURS_S3_MINUTES_S4_SECONDS_REMAINING_FOR_REUSE_S1 = new SystemMessageId(2305);
+	
+	/**
+	 * ID: 2306<br>
+	 * Message: Your Charm of Courage is trying to resurrect you. Would you like to resurrect now?
+	 */
+	public static final SystemMessageId RESURRECT_USING_CHARM_OF_COURAGE = new SystemMessageId(2306);
+	
+	/**
+	 * ID: 2311<br>
+	 * Message: You do not have a servitor.
+	 */
+	public static final SystemMessageId DONT_HAVE_SERVITOR = new SystemMessageId(2311);
+	
+	/**
+	 * ID: 2312<br>
+	 * Message: You do not have a pet.
+	 */
+	public static final SystemMessageId DONT_HAVE_PET = new SystemMessageId(2312);
+	
+	/**
+	 * ID: 2314<br>
+	 * Message: Your Vitality is at maximum.
+	 */
+	public static final SystemMessageId VITALITY_IS_AT_MAXIMUM = new SystemMessageId(2314);
+	
+	/**
+	 * ID: 2315<br>
+	 * Message: Your Vitality has increased.
+	 */
+	public static final SystemMessageId VITALITY_HAS_INCREASED = new SystemMessageId(2315);
+	
+	/**
+	 * ID: 2316<br>
+	 * Message: Your Vitality has decreased.
+	 */
+	public static final SystemMessageId VITALITY_HAS_DECREASED = new SystemMessageId(2316);
+	
+	/**
+	 * ID: 2317<br>
+	 * Message: Your Vitality is fully exhausted.
+	 */
+	public static final SystemMessageId VITALITY_IS_EXHAUSTED = new SystemMessageId(2317);
+	
+	/**
+	 * ID: 2319<br>
+	 * Message: You have acquired $s1 reputation.
+	 */
+	public static final SystemMessageId ACQUIRED_S1_REPUTATION_SCORE = new SystemMessageId(2319);
+	
+	/**
+	 * ID: 2321<br>
+	 * Message: Current location: Inside Kamaloka
+	 */
+	public static final SystemMessageId LOC_KAMALOKA = new SystemMessageId(2321);
+	
+	/**
+	 * ID: 2322<br>
+	 * Message: Current location: Inside Near Kamaloka
+	 */
+	public static final SystemMessageId LOC_NIA_KAMALOKA = new SystemMessageId(2322);
+	
+	/**
+	 * ID: 2323<br>
+	 * Message: Current location: Inside Rim Kamaloka
+	 */
+	public static final SystemMessageId LOC_RIM_KAMALOKA = new SystemMessageId(2323);
+	
+	/**
+	 * ID: 2326<br>
+	 * Message: You have acquired 50 Clan Fame Points.
+	 */
+	public static final SystemMessageId ACQUIRED_50_CLAN_FAME_POINTS = new SystemMessageId(2326);
+	
+	/**
+	 * ID: 2327<br>
+	 * Message: You don't have enough reputation to do that.
+	 */
+	public static final SystemMessageId NOT_ENOUGH_FAME_POINTS = new SystemMessageId(2327);
+	
+	/**
+	 * ID: 2333<br>
+	 * Message: You cannot receive the Dimensional Item because you have exceed your inventory weight/quantity limit.
+	 */
+	public static final SystemMessageId YOU_CANNOT_RECEIVE_THE_VITAMIN_ITEM = new SystemMessageId(2333);
+	
+	/**
+	 * ID: 2335<br>
+	 * Message: There are no more Dimensional Items to be found.
+	 */
+	public static final SystemMessageId THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND = new SystemMessageId(2335);
+	
+	/**
+	 * ID: 2336<br>
+	 * Message: Half-Kill!
+	 */
+	public static final SystemMessageId HALF_KILL = new SystemMessageId(2336);
+	
+	/**
+	 * ID: 2337<br>
+	 * Message: Your CP was drained because you were hit with a Half-Kill skill.
+	 */
+	public static final SystemMessageId CP_DISAPPEARS_WHEN_HIT_WITH_A_HALF_KILL_SKILL = new SystemMessageId(2337);
+	
+	/**
+	 * ID: 2348<br>
+	 * Message: You cannot use My Teleports during a battle.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_BATTLE = new SystemMessageId(2348);
+	
+	/**
+	 * ID: 2349<br>
+	 * Message: You cannot use My Teleports while participating a large-scale battle such as a castle siege, fortress siege, or hideout siege.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING = new SystemMessageId(2349);
+	
+	/**
+	 * ID: 2350<br>
+	 * Message: You cannot use My Teleports during a duel.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_DURING_A_DUEL = new SystemMessageId(2350);
+	
+	/**
+	 * ID: 2351<br>
+	 * Message: You cannot use My Teleports while flying.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_WHILE_FLYING = new SystemMessageId(2351);
+	
+	/**
+	 * ID: 2352<br>
+	 * Message: You cannot use My Teleports while participating in an Olympiad match.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_WHILE_PARTICIPATING_IN_AN_OLYMPIAD_MATCH = new SystemMessageId(2352);
+	
+	/**
+	 * ID: 2353<br>
+	 * Message: You cannot use My Teleports while you are in a petrified or paralyzed state.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_PARALYZED = new SystemMessageId(2353);
+	
+	/**
+	 * ID: 2354<br>
+	 * Message: You cannot use My Teleports while you are dead.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_WHILE_YOU_ARE_DEAD = new SystemMessageId(2354);
+	
+	/**
+	 * ID: 2355<br>
+	 * Message: You cannot use My Teleports in this area.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_IN_THIS_AREA = new SystemMessageId(2355);
+	
+	/**
+	 * ID: 2356<br>
+	 * Message: You cannot use My Teleports underwater.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_UNDERWATER = new SystemMessageId(2356);
+	
+	/**
+	 * ID: 2357<br>
+	 * Message: You cannot use My Teleports in an instant zone.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_IN_AN_INSTANT_ZONE = new SystemMessageId(2357);
+	
+	/**
+	 * ID: 2358<br>
+	 * Message: You have no space to save the teleport location.
+	 */
+	public static final SystemMessageId YOU_HAVE_NO_SPACE_TO_SAVE_THE_TELEPORT_LOCATION = new SystemMessageId(2358);
+	
+	/**
+	 * ID: 2359<br>
+	 * Message: You cannot teleport because you do not have a teleport item.
+	 */
+	public static final SystemMessageId YOU_CANNOT_TELEPORT_BECAUSE_YOU_DO_NOT_HAVE_A_TELEPORT_ITEM = new SystemMessageId(2359);
+	
+	/**
+	 * ID: 2361<br>
+	 * Message: Current location: $s1
+	 */
+	public static final SystemMessageId CURRENT_LOCATION_S1 = new SystemMessageId(2361);
+	
+	/**
+	 * ID: 2366<br>
+	 * Message: The limited-time item has disappeared because the remaining time ran out.
+	 */
+	public static final SystemMessageId TIME_LIMITED_ITEM_DELETED = new SystemMessageId(2366);
+	
+	/**
+	 * ID: 2371<br>
+	 * Message: $c1 was reported as a BOT.
+	 */
+	public static final SystemMessageId C1_WAS_REPORTED_AS_BOT = new SystemMessageId(2371);
+	
+	/**
+	 * ID: 2372<br>
+	 * Message: There is not much time remaining until the hunting helper pet leaves.
+	 */
+	public static final SystemMessageId THERE_NOT_MUCH_TIME_REMAINING_UNTIL_HELPER_LEAVES = new SystemMessageId(2372);
+	
+	/**
+	 * ID: 2373<br>
+	 * Message: Your minion is now leaving.
+	 */
+	public static final SystemMessageId THE_HELPER_PET_LEAVING = new SystemMessageId(2373);
+	
+	/**
+	 * ID: 2375<br>
+	 * Message: Your minion cannot be returned because there is not much time remaining until it leaves.
+	 */
+	public static final SystemMessageId THE_HELPER_PET_CANNOT_BE_RETURNED = new SystemMessageId(2375);
+	
+	/**
+	 * ID: 2376<br>
+	 * Message: You cannot receive a Dimensional Item during an exchange.
+	 */
+	public static final SystemMessageId YOU_CANNOT_RECEIVE_A_VITAMIN_ITEM_DURING_AN_EXCHANGE = new SystemMessageId(2376);
+	
+	/**
+	 * ID: 2377<br>
+	 * Message: You cannot report a character who is in a peace zone or a battlefield.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CHARACTER_IN_PEACE_OR_BATTLE_ZONE = new SystemMessageId(2377);
+	
+	/**
+	 * ID: 2378<br>
+	 * Message: You cannot report when a clan war has been declared.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CLAN_WAR_ENEMY = new SystemMessageId(2378);
+	
+	/**
+	 * ID: 2379<br>
+	 * Message: You cannot report a character who has not acquired any Exp. after connecting.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CHAR_WHO_ACQUIRED_XP = new SystemMessageId(2379);
+	
+	/**
+	 * ID: 2380<br>
+	 * Message: You cannot report this person again at this time.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_1 = new SystemMessageId(2380);
+	
+	/**
+	 * ID: 2381<br>
+	 * Message: You cannot report this person again at this time.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_2 = new SystemMessageId(2381);
+	
+	/**
+	 * ID: 2382<br>
+	 * Message: You cannot report this person again at this time.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_3 = new SystemMessageId(2382);
+	
+	/**
+	 * ID: 2383<br>
+	 * Message: You cannot report this person again at this time.
+	 */
+	public static final SystemMessageId YOU_CANNOT_REPORT_CHAR_AT_THIS_TIME_4 = new SystemMessageId(2383);
+	
+	/**
+	 * ID: 2390<br>
+	 * Message: Your number of My Teleports slots has reached its maximum limit.
+	 */
+	public static final SystemMessageId YOUR_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_REACHED_ITS_MAXIMUM_LIMIT = new SystemMessageId(2390);
+	
+	/**
+	 * ID: 2391<br>
+	 * Message: You have used the Feather of Blessing to resurrect.
+	 */
+	public static final SystemMessageId YOU_HAVE_USED_THE_FEATHER_OF_BLESSING_TO_RESURRECT = new SystemMessageId(2391);
+	
+	/**
+	 * ID: 2392<br>
+	 * Message: The Dimensional Item cannot be located because of a temporary connection error.
+	 */
+	public static final SystemMessageId THE_DIMENSIONAL_ITEM_CANNOT_BE_LOCATED_BECAUSE_OF_A_TEMPORARY_CONNECTION_ERROR = new SystemMessageId(2392);
+	
+	/**
+	 * ID: 2393<br>
+	 * Message: You have acquired $s1 PC Points.
+	 */
+	public static final SystemMessageId YOU_HAVE_ACQUIRED_S1_PC_POINTS = new SystemMessageId(2393);
+	
+	/**
+	 * ID: 2394<br>
+	 * Message: That skill cannot be used because your pet/servitor lacks sufficient MP.
+	 */
+	public static final SystemMessageId THAT_SKILL_CANNOT_BE_USED_BECAUSE_YOUR_PET_SERVITOR_LACKS_SUFFICIENT_MP = new SystemMessageId(2394);
+	
+	/**
+	 * ID: 2395<br>
+	 * Message: That skill cannot be used because your pet/servitor lacks sufficient HP.
+	 */
+	public static final SystemMessageId THAT_SKILL_CANNOT_BE_USED_BECAUSE_YOUR_PET_SERVITOR_LACKS_SUFFICIENT_HP = new SystemMessageId(2395);
+	
+	/**
+	 * ID: 2396<br>
+	 * Message: That pet/servitor skill cannot be used because it is recharging.
+	 */
+	public static final SystemMessageId PET_SKILL_CANNOT_BE_USED_RECHARCHING = new SystemMessageId(2396);
+	
+	/**
+	 * ID: 2398<br>
+	 * Message: You have no open My Teleports slots.
+	 */
+	public static final SystemMessageId YOU_HAVE_NO_OPEN_MY_TELEPORTS_SLOTS = new SystemMessageId(2398);
+	
+	/**
+	 * ID: 2400<br>
+	 * Message: Instant Zone currently in use: $s1
+	 */
+	public static final SystemMessageId INSTANT_ZONE_CURRENTLY_INUSE_S1 = new SystemMessageId(2400);
+	
+	/**
+	 * ID: 2402<br>
+	 * Message: The Territory War request period has ended.
+	 */
+	public static final SystemMessageId THE_TERRITORY_WAR_REGISTERING_PERIOD_ENDED = new SystemMessageId(2402);
+	
+	/**
+	 * ID: 2403<br>
+	 * Message: The Territory War begins in 10 minutes!
+	 */
+	public static final SystemMessageId TERRITORY_WAR_BEGINS_IN_10_MINUTES = new SystemMessageId(2403);
+	
+	/**
+	 * ID: 2404<br>
+	 * Message: The Territory War begins in 5 minutes!
+	 */
+	public static final SystemMessageId TERRITORY_WAR_BEGINS_IN_5_MINUTES = new SystemMessageId(2404);
+	
+	/**
+	 * ID: 2405<br>
+	 * Message: The Territory War begins in 1 minute!
+	 */
+	public static final SystemMessageId TERRITORY_WAR_BEGINS_IN_1_MINUTE = new SystemMessageId(2405);
+	
+	/**
+	 * ID: 2408<br>
+	 * Message: You are currently registered for a 3 vs. 3 class irrelevant team match.
+	 */
+	public static final SystemMessageId YOU_HAVE_REGISTERED_IN_A_WAITING_LIST_OF_TEAM_GAMES = new SystemMessageId(2408);
+	
+	/**
+	 * ID: 2409<br>
+	 * Message: The number of My Teleports slots has been increased.
+	 */
+	public static final SystemMessageId THE_NUMBER_OF_MY_TELEPORTS_SLOTS_HAS_BEEN_INCREASED = new SystemMessageId(2409);
+	
+	/**
+	 * ID: 2410<br>
+	 * Message: You cannot use My Teleports to reach this area!
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_MY_TELEPORTS_TO_REACH_THIS_AREA = new SystemMessageId(2410);
+	
+	/**
+	 * ID: 2424<br>
+	 * Message: The collection has failed.
+	 */
+	public static final SystemMessageId THE_COLLECTION_HAS_FAILED = new SystemMessageId(2424);
+	
+	/**
+	 * ID: 2440<br>
+	 * Message: $c1 is already registered on the waiting list for the 3 vs. 3 class irrelevant team match.
+	 */
+	public static final SystemMessageId C1_IS_ALREADY_REGISTERED_NON_CLASS_LIMITED_EVENT_TEAMS = new SystemMessageId(2440);
+	
+	/**
+	 * ID: 2441<br>
+	 * Message: Only a party leader can request a team match.
+	 */
+	public static final SystemMessageId ONLY_PARTY_LEADER_CAN_REQUEST_TEAM_MATCH = new SystemMessageId(2441);
+	
+	/**
+	 * ID: 2442<br>
+	 * Message: The request cannot be made because the requirements have not been met. To participate in a team match, you must first form a 3-member party.
+	 */
+	public static final SystemMessageId PARTY_REQUIREMENTS_NOT_MET = new SystemMessageId(2442);
+	
+	/**
+	 * ID: 2448<br>
+	 * Message: Happy birthday! Alegria has sent you a birthday gift.
+	 */
+	public static final SystemMessageId YOUR_BIRTHDAY_GIFT_HAS_ARRIVED = new SystemMessageId(2448);
+	
+	/**
+	 * ID: 2449<br>
+	 * Message: There are $s1 days remaining until your birthday. On your birthday, you will receive a gift that Alegria has carefully prepared.
+	 */
+	public static final SystemMessageId THERE_ARE_S1_DAYS_UNTIL_YOUR_CHARACTERS_BIRTHDAY = new SystemMessageId(2449);
+	
+	/**
+	 * ID: 2450<br>
+	 * Message: $c1's birthday is $s3/$s4/$s2.
+	 */
+	public static final SystemMessageId C1_BIRTHDAY_IS_S3_S4_S2 = new SystemMessageId(2450);
+	
+	/**
+	 * ID: 2451<br>
+	 * Message: Your cloak has been unequipped because your armor set is no longer complete.
+	 */
+	public static final SystemMessageId CLOAK_REMOVED_BECAUSE_ARMOR_SET_REMOVED = new SystemMessageId(2451);
+	
+	/**
+	 * ID: 2455<br>
+	 * Message: The airship must be summoned in order for you to board.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_MUST_BE_SUMMONED_TO_BOARD = new SystemMessageId(2455);
+	
+	/**
+	 * ID: 2456<br>
+	 * Message: In order to acquire an airship, the clan's level must be level 5 or higher.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_NEED_CLANLVL_5_TO_SUMMON = new SystemMessageId(2456);
+	
+	/**
+	 * ID: 2457<br>
+	 * Message: An airship cannot be summoned because either you have not registered your airship license, or the airship has not yet been summoned.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_NEED_LICENSE_TO_SUMMON = new SystemMessageId(2457);
+	
+	/**
+	 * ID: 2458<br>
+	 * Message: Your clan's airship is already being used by another clan member.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_ALREADY_USED = new SystemMessageId(2458);
+	
+	/**
+	 * ID: 2459<br>
+	 * Message: The Airship Summon License has already been acquired.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_SUMMON_LICENSE_ALREADY_ACQUIRED = new SystemMessageId(2459);
+	
+	/**
+	 * ID: 2460<br>
+	 * Message: The clan owned airship already exists.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_IS_ALREADY_EXISTS = new SystemMessageId(2460);
+	
+	/**
+	 * ID: 2461<br>
+	 * Message: Airship Summon License registration can only be done by the clan leader.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_NO_PRIVILEGES = new SystemMessageId(2461);
+	
+	/**
+	 * ID: 2462<br>
+	 * Message: An airship cannot be summoned because you don't have enough $s1.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_NEED_MORE_S1 = new SystemMessageId(2462);
+	
+	/**
+	 * ID: 2463<br>
+	 * Message: The airship's fuel (EP) will soon run out.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_FUEL_SOON_RUN_OUT = new SystemMessageId(2463);
+	
+	/**
+	 * ID: 2464<br>
+	 * Message: The airship's fuel (EP) has run out. The airship's speed will be greatly decreased in this condition.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_FUEL_RUN_OUT = new SystemMessageId(2464);
+	
+	/**
+	 * ID: 2465<br>
+	 * Message: You have selected a 3 vs. 3 class irrelevant team match. Do you wish to participate?
+	 */
+	public static final SystemMessageId OLYMPIAD_3VS3_CONFIRM = new SystemMessageId(2465);
+	
+	/**
+	 * ID: 2466<br>
+	 * Message: A pet on support stance cannot use skills.
+	 */
+	public static final SystemMessageId PET_AUXILIARY_MODE_CANNOT_USE_SKILLS = new SystemMessageId(2466);
+	
+	/**
+	 * ID: 2468<br>
+	 * Message: You have used a report point on $c1. You have $s2 points remaining on this account.
+	 */
+	public static final SystemMessageId YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT = new SystemMessageId(2468);
+	
+	/**
+	 * ID: 2469<br>
+	 * Message: You have used all available points. Points are reset everyday at noon.
+	 */
+	public static final SystemMessageId YOU_HAVE_USED_ALL_POINTS_POINTS_ARE_RESET_AT_NOON = new SystemMessageId(2469);
+	
+	/**
+	 * ID: 2470<br>
+	 * Message: This character cannot make a report. You cannot make a report while located inside a peace zone or a battlefield, while you are an opposing clan member during a clan war, or while participating in the Olympiad.
+	 */
+	public static final SystemMessageId TARGET_NOT_REPORT_CANNOT_REPORT_PEACE_PVP_ZONE_OR_OLYMPIAD_OR_CLAN_WAR_ENEMY = new SystemMessageId(2470);
+	
+	/**
+	 * ID: 2471<br>
+	 * Message: This character cannot make a report. The target has already been reported by either your clan or alliance, or has already been reported from your current IP.
+	 */
+	public static final SystemMessageId CANNOT_REPORT_TARGET_ALREDY_REPORTED_BY_CLAN_ALLY_MEMBER_OR_SAME_IP = new SystemMessageId(2471);
+	
+	/**
+	 * ID: 2472<br>
+	 * Message: This character cannot make a report because another character from this account has already done so.
+	 */
+	public static final SystemMessageId CANNOT_REPORT_ALREDY_REPORED_FROM_THIS_ACCOUNT = new SystemMessageId(2472);
+	
+	/**
+	 * ID: 2473<br>
+	 * Message: You have been reported as an illegal program user, so your chatting will be blocked for 10 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_10_MIN_CHAT_BLOCKED = new SystemMessageId(2473);
+	
+	/**
+	 * ID: 2474<br>
+	 * Message: You have been reported as an illegal program user, so your party participation will be blocked for 60 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_60_MIN_PARTY_BLOCKED = new SystemMessageId(2474);
+	
+	/**
+	 * ID: 2475<br>
+	 * Message: You have been reported as an illegal program user, so your party participation will be blocked for 120 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_120_MIN_PARTY_BLOCKED = new SystemMessageId(2475);
+	
+	/**
+	 * ID: 2476<br>
+	 * Message: You have been reported as an illegal program user, so your party participation will be blocked for 180 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_180_MIN_PARTY_BLOCKED = new SystemMessageId(2476);
+	
+	/**
+	 * ID: 2477<br>
+	 * Message: You have been reported as an illegal program user, so your actions will be restricted for 120 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_120_MIN_ACTION_BLOCKED = new SystemMessageId(2477);
+	
+	/**
+	 * ID: 2478<br>
+	 * Message: You have been reported as an illegal program user, so your actions will be restricted for 180 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_180_MIN_ACTION_BLOCKED = new SystemMessageId(2478);
+	
+	/**
+	 * ID: 2479<br>
+	 * Message: You have been reported as an illegal program user, so your actions will be restricted for 180 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_180_MIN_ACTION_BLOCKED_2 = new SystemMessageId(2479);
+	
+	/**
+	 * ID: 2480<br>
+	 * Message: You have been reported as an illegal program user, so movement is prohibited for 120 minutes.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_120_MIN_MOVEMENT_BLOCKED = new SystemMessageId(2480);
+	
+	/**
+	 * ID: 2481<br>
+	 * Message: $c1 has been reported as an illegal program user and is currently being investigated.
+	 */
+	public static final SystemMessageId C1_REPORTED_AND_IS_BEING_INVESTIGATED = new SystemMessageId(2481);
+	
+	/**
+	 * ID: 2482<br>
+	 * Message: $c1 has been reported as an illegal program user and cannot join a party.
+	 */
+	public static final SystemMessageId C1_REPORTED_AND_CANNOT_PARTY = new SystemMessageId(2482);
+	
+	/**
+	 * ID: 2483<br>
+	 * Message: You have been reported as an illegal program user, so chatting is not allowed.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_SO_CHATTING_NOT_ALLOWED = new SystemMessageId(2483);
+	
+	/**
+	 * ID: 2484<br>
+	 * Message: You have been reported as an illegal program user, so participating in a party is not allowed.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_SO_PARTY_NOT_ALLOWED = new SystemMessageId(2484);
+	
+	/**
+	 * ID: 2485<br>
+	 * Message: You have been reported as an illegal program user so your actions have been restricted.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_SO_ACTIONS_NOT_ALLOWED = new SystemMessageId(2485);
+	
+	/**
+	 * ID: 2486<br>
+	 * Message: You have been blocked due to verification that you are using a third party program. Subsequent violations may result in termination of your account rather than a penalty within the game.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_BLOCKED_SUBSEQUENT_VIOLATIONS_RESULT_ACCOUNT_TERMINATION = new SystemMessageId(2486);
+	
+	/**
+	 * ID: 2487<br>
+	 * Message: You have been reported as an illegal program user, and your connection has been ended. Please contact our CS team to confirm your identity.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_AS_BOT_CONTACT_OUR_CS_TEAM = new SystemMessageId(2487);
+	
+	/**
+	 * ID: 2491<br>
+	 * Message: Your ship cannot teleport because it does not have enough fuel for the trip.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_CANNOT_TELEPORT = new SystemMessageId(2491);
+	
+	/**
+	 * ID: 2492<br>
+	 * Message: The airship has been summoned. It will automatically depart in %s minutes.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_SUMMONED = new SystemMessageId(2492);
+	
+	/**
+	 * ID: 2500<br>
+	 * Message: Your collection has succeeded.
+	 */
+	public static final SystemMessageId THE_COLLECTION_HAS_SUCCEEDED = new SystemMessageId(2500);
+	
+	/**
+	 * ID: 2701<br>
+	 * Message: The match is being prepared. Please try again later.
+	 */
+	public static final SystemMessageId MATCH_BEING_PREPARED_TRY_LATER = new SystemMessageId(2701);
+	
+	/**
+	 * ID: 2702<br>
+	 * Message: You were excluded from the match because the registration count was not correct.
+	 */
+	public static final SystemMessageId EXCLUDED_FROM_MATCH_DUE_INCORRECT_COUNT = new SystemMessageId(2702);
+	
+	/**
+	 * ID: 2703<br>
+	 * Message: Team members were modified because the teams were unbalanced.
+	 */
+	public static final SystemMessageId TEAM_ADJUSTED_BECAUSE_WRONG_POPULATION_RATIO = new SystemMessageId(2703);
+	
+	/**
+	 * ID: 2704<br>
+	 * Message: You cannot register because capacity has been exceeded.
+	 */
+	public static final SystemMessageId CANNOT_REGISTER_CAUSE_QUEUE_FULL = new SystemMessageId(2704);
+	
+	/**
+	 * ID: 2705<br>
+	 * Message: The match waiting time was extended by 1 minute.
+	 */
+	public static final SystemMessageId MATCH_WAITING_TIME_EXTENDED = new SystemMessageId(2705);
+	
+	/**
+	 * ID: 2706<br>
+	 * Message: You cannot enter because you do not meet the requirements.
+	 */
+	public static final SystemMessageId CANNOT_ENTER_CAUSE_DONT_MATCH_REQUIREMENTS = new SystemMessageId(2706);
+	
+	/**
+	 * ID: 2707<br>
+	 * Message: You must wait 10 seconds before attempting to register again.
+	 */
+	public static final SystemMessageId CANNOT_REQUEST_REGISTRATION_10_SECS_AFTER = new SystemMessageId(2707);
+	
+	/**
+	 * ID: 2708<br>
+	 * Message: You cannot register while in possession of a cursed weapon.
+	 */
+	public static final SystemMessageId CANNOT_REGISTER_PROCESSING_CURSED_WEAPON = new SystemMessageId(2708);
+	
+	/**
+	 * ID: 2709<br>
+	 * Message: Applicants for the Olympiad, Underground Coliseum, or Kratei's Cube matches cannot register.
+	 */
+	public static final SystemMessageId COLISEUM_OLYMPIAD_KRATEIS_APPLICANTS_CANNOT_PARTICIPATE = new SystemMessageId(2709);
+	
+	/**
+	 * ID: 2710<br>
+	 * Message: Current location: $s1, $s2, $s3 (near the Keucereus Alliance Base)
+	 */
+	public static final SystemMessageId LOC_KEUCEREUS_S1_S2_S3 = new SystemMessageId(2710);
+	
+	/**
+	 * ID: 2711<br>
+	 * Message: Current location: $s1, $s2, $s3 (inside the Seed of Infinity)
+	 */
+	public static final SystemMessageId LOC_IN_SEED_INFINITY_S1_S2_S3 = new SystemMessageId(2711);
+	
+	/**
+	 * ID: 2712<br>
+	 * Message: Current location: $s1, $s2, $s3 (outside the Seed of Infinity)
+	 */
+	public static final SystemMessageId LOC_OUT_SEED_INFINITY_S1_S2_S3 = new SystemMessageId(2712);
+	
+	/**
+	 * ID: 2716<br>
+	 * Message: Current location: $s1, $s2, $s3 (inside Aerial Cleft)
+	 */
+	public static final SystemMessageId LOC_CLEFT_S1_S2_S3 = new SystemMessageId(2716);
+	
+	/**
+	 * ID: 2720<br>
+	 * Message: Instant zone: $s1's entry has been restricted. You can check the next possible entry time by using the command "/instancezone."
+	 */
+	public static final SystemMessageId INSTANT_ZONE_FROM_HERE_S1_S_ENTRY_HAS_BEEN_RESTRICTED = new SystemMessageId(2720);
+	
+	/**
+	 * ID: 2721<br>
+	 * Message: You are too high to perform this action. Please lower your altitude and try again.
+	 */
+	public static final SystemMessageId TOO_HIGH_TO_PERFORM_THIS_ACTION = new SystemMessageId(2721);
+	
+	/**
+	 * ID: 2722<br>
+	 * Message: Another airship has already been summoned. Please try again later.
+	 */
+	public static final SystemMessageId ANOTHER_AIRSHIP_ALREADY_SUMMONED = new SystemMessageId(2722);
+	
+	/**
+	 * ID: 2727<br>
+	 * Message: You cannot board because you do not meet the requirements.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOARD_NOT_MEET_REQUEIREMENTS = new SystemMessageId(2727);
+	
+	/**
+	 * ID: 2728<br>
+	 * Message: This action is prohibited while mounted or on an airship.
+	 */
+	public static final SystemMessageId ACTION_PROHIBITED_WHILE_MOUNTED_OR_ON_AN_AIRSHIP = new SystemMessageId(2728);
+	
+	/**
+	 * ID: 2729<br>
+	 * Message: You cannot control the helm while transformed.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_TRANSFORMED = new SystemMessageId(2729);
+	
+	/**
+	 * ID: 2730<br>
+	 * Message: You cannot control the helm while you are petrified.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_YOU_ARE_PETRIFIED = new SystemMessageId(2730);
+	
+	/**
+	 * ID: 2731<br>
+	 * Message: You cannot control the helm when you are dead.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHEN_YOU_ARE_DEAD = new SystemMessageId(2731);
+	
+	/**
+	 * ID: 2732<br>
+	 * Message: You cannot control the helm while fishing.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_FISHING = new SystemMessageId(2732);
+	
+	/**
+	 * ID: 2733<br>
+	 * Message: You cannot control the helm while in a battle.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_BATTLE = new SystemMessageId(2733);
+	
+	/**
+	 * ID: 2734<br>
+	 * Message: You cannot control the helm while in a duel.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_DUEL = new SystemMessageId(2734);
+	
+	/**
+	 * ID: 2735<br>
+	 * Message: You cannot control the helm while in a sitting position.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_IN_A_SITTING_POSITION = new SystemMessageId(2735);
+	
+	/**
+	 * ID: 2736<br>
+	 * Message: You cannot control the helm while using a skill.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_USING_A_SKILL = new SystemMessageId(2736);
+	
+	/**
+	 * ID: 2737<br>
+	 * Message: You cannot control the helm while a cursed weapon is equipped.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_A_CURSED_WEAPON_IS_EQUIPPED = new SystemMessageId(2737);
+	
+	/**
+	 * ID: 2738<br>
+	 * Message: You cannot control the helm while holding a flag.
+	 */
+	public static final SystemMessageId YOU_CANNOT_CONTROL_THE_HELM_WHILE_HOLDING_A_FLAG = new SystemMessageId(2738);
+	
+	/**
+	 * ID: 2748<br>
+	 * Message: You have been reported as an illegal program user and cannot report other users.
+	 */
+	public static final SystemMessageId YOU_HAVE_BEEN_REPORTED_AND_CANNOT_REPORT = new SystemMessageId(2748);
+	
+	/**
+	 * ID: 2750<br>
+	 * Message: The $s1 ward has been destroyed! $c2 now has the territory ward.
+	 */
+	public static final SystemMessageId THE_S1_WARD_HAS_BEEN_DESTROYED_C2_HAS_THE_WARD = new SystemMessageId(2750);
+	
+	/**
+	 * ID: 2751<br>
+	 * Message: The character that acquired $s1's ward has been killed.
+	 */
+	public static final SystemMessageId THE_CHAR_THAT_ACQUIRED_S1_WARD_HAS_BEEN_KILLED = new SystemMessageId(2751);
+	
+	/**
+	 * ID: 2762<br>
+	 * Message: You cannot control because you are too far.
+	 */
+	public static final SystemMessageId CANT_CONTROL_TOO_FAR = new SystemMessageId(2762);
+	
+	/**
+	 * ID: 2764<br>
+	 * Message: You cannot enter because the corresponding alliance channel's maximum number of entrants has been reached.
+	 */
+	public static final SystemMessageId YOU_CANNOT_ENTER_BECAUSE_MAXIMUM_ENTRANTS = new SystemMessageId(2764);
+	
+	/**
+	 * ID: 2765<br>
+	 * Message: Only the alliance channel leader can attempt entry.
+	 */
+	public static final SystemMessageId ONLY_ALLIANCE_CHANNEL_LEADER_CAN_ENTER = new SystemMessageId(2765);
+	
+	/**
+	 * ID: 2766<br>
+	 * Message: Seed of Infinity Stage 1 Attack In Progress
+	 */
+	public static final SystemMessageId SEED_OF_INFINITY_STAGE_1_ATTACK_IN_PROGRESS = new SystemMessageId(2766);
+	
+	/**
+	 * ID: 2767<br>
+	 * Message: Seed of Infinity Stage 2 Attack In Progress
+	 */
+	public static final SystemMessageId SEED_OF_INFINITY_STAGE_2_ATTACK_IN_PROGRESS = new SystemMessageId(2767);
+	
+	/**
+	 * ID: 2768<br>
+	 * Message: Seed of Infinity Conquest Complete
+	 */
+	public static final SystemMessageId SEED_OF_INFINITY_CONQUEST_COMPLETE = new SystemMessageId(2768);
+	
+	/**
+	 * ID: 2769<br>
+	 * Message: Seed of Infinity Stage 1 Defense In Progress
+	 */
+	public static final SystemMessageId SEED_OF_INFINITY_STAGE_1_DEFENSE_IN_PROGRESS = new SystemMessageId(2769);
+	
+	/**
+	 * ID: 2770<br>
+	 * Message: Seed of Infinity Stage 2 Defense In Progress
+	 */
+	public static final SystemMessageId SEED_OF_INFINITY_STAGE_2_DEFENSE_IN_PROGRESS = new SystemMessageId(2770);
+	
+	/**
+	 * ID: 2771<br>
+	 * Message: Seed of Destruction Attack in Progress
+	 */
+	public static final SystemMessageId SEED_OF_DESTRUCTION_ATTACK_IN_PROGRESS = new SystemMessageId(2771);
+	
+	/**
+	 * ID: 2772<br>
+	 * Message: Seed of Destruction Conquest Complete
+	 */
+	public static final SystemMessageId SEED_OF_DESTRUCTION_CONQUEST_COMPLETE = new SystemMessageId(2772);
+	
+	/**
+	 * ID: 2773<br>
+	 * Message: Seed of Destruction Defense in Progress
+	 */
+	public static final SystemMessageId SEED_OF_DESTRUCTION_DEFENSE_IN_PROGRESS = new SystemMessageId(2773);
+	
+	/**
+	 * ID: 2774<br>
+	 * Message: You can make another report in $s1-minute(s). You have $s2 points remaining on this account.
+	 */
+	public static final SystemMessageId YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT = new SystemMessageId(2774);
+	
+	/**
+	 * ID: 2777<br>
+	 * Message: The airship summon license has been entered. Your clan can now summon the airship.
+	 */
+	public static final SystemMessageId THE_AIRSHIP_SUMMON_LICENSE_ENTERED = new SystemMessageId(2777);
+	
+	/**
+	 * ID: 2778<br>
+	 * Message: You cannot teleport while in possession of a ward.
+	 */
+	public static final SystemMessageId YOU_CANNOT_TELEPORT_WHILE_IN_POSSESSION_OF_A_WARD = new SystemMessageId(2778);
+	
+	/**
+	 * ID: 2793<br>
+	 * Message: You must have a minimum of ($s1) people to enter this Instant Zone. Your request for entry is denied.
+	 */
+	public static final SystemMessageId YOU_MUST_HAVE_MINIMUM_OF_S1_PEOPLE_TO_ENTER = new SystemMessageId(2793);
+	
+	/**
+	 * ID: 2795<br>
+	 * Message: You've already requested a territory war in another territory elsewhere.
+	 */
+	public static final SystemMessageId YOU_ALREADY_REQUESTED_TW_REGISTRATION = new SystemMessageId(2795);
+	
+	/**
+	 * ID: 2796<br>
+	 * Message: The clan who owns the territory cannot participate in the territory war as mercenaries.
+	 */
+	public static final SystemMessageId THE_TERRITORY_OWNER_CLAN_CANNOT_PARTICIPATE_AS_MERCENARIES = new SystemMessageId(2796);
+	
+	/**
+	 * ID: 2797<br>
+	 * Message: It is not a territory war registration period, so a request cannot be made at this time.
+	 */
+	public static final SystemMessageId NOT_TERRITORY_REGISTRATION_PERIOD = new SystemMessageId(2797);
+	
+	/**
+	 * ID: 2798<br>
+	 * Message: The territory war will end in $s1-hour(s).
+	 */
+	public static final SystemMessageId THE_TERRITORY_WAR_WILL_END_IN_S1_HOURS = new SystemMessageId(2798);
+	
+	/**
+	 * ID: 2799<br>
+	 * Message: The territory war will end in $s1-minute(s).
+	 */
+	public static final SystemMessageId THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES = new SystemMessageId(2799);
+	
+	/**
+	 * ID: 2900<br>
+	 * Message: $s1-second(s) to the end of territory war!
+	 */
+	public static final SystemMessageId S1_SECONDS_TO_THE_END_OF_TERRITORY_WAR = new SystemMessageId(2900);
+	
+	/**
+	 * ID: 2901<br>
+	 * Message: You cannot force attack a member of the same territory.
+	 */
+	public static final SystemMessageId YOU_CANNOT_ATTACK_A_MEMBER_OF_THE_SAME_TERRITORY = new SystemMessageId(2901);
+	
+	/**
+	 * ID: 2902<br>
+	 * Message: You've acquired the ward. Move quickly to your forces' outpost.
+	 */
+	public static final SystemMessageId YOU_VE_ACQUIRED_THE_WARD = new SystemMessageId(2902);
+	
+	/**
+	 * ID: 2903<br>
+	 * Message: Territory war has begun.
+	 */
+	public static final SystemMessageId TERRITORY_WAR_HAS_BEGUN = new SystemMessageId(2903);
+	
+	/**
+	 * ID: 2904<br>
+	 * Message: Territory war has ended.
+	 */
+	public static final SystemMessageId TERRITORY_WAR_HAS_ENDED = new SystemMessageId(2904);
+	
+	/**
+	 * ID: 2911<br>
+	 * Message: You've requested $c1 to be on your Friends List.
+	 */
+	public static final SystemMessageId YOU_REQUESTED_C1_TO_BE_FRIEND = new SystemMessageId(2911);
+	
+	/**
+	 * ID: 2913<br>
+	 * Message: Clan $s1 has succeeded in capturing $s2's territory ward.
+	 */
+	public static final SystemMessageId CLAN_S1_HAS_SUCCEDED_IN_CAPTURING_S2_TERRITORY_WARD = new SystemMessageId(2913);
+	
+	/**
+	 * ID: 2914<br>
+	 * Message: The territory war will begin in 20 minutes! Territory related functions (i.e.: battlefield channel, Disguise Scrolls, Transformations, etc...) can now be used.
+	 */
+	public static final SystemMessageId TERRITORY_WAR_BEGINS_IN_20_MINUTES = new SystemMessageId(2914);
+	
+	/**
+	 * ID: 2922<br>
+	 * Message: Block Checker will end in 5 seconds!
+	 */
+	public static final SystemMessageId BLOCK_CHECKER_ENDS_5 = new SystemMessageId(2922);
+	
+	/**
+	 * ID: 2923<br>
+	 * Message: Block Checker will end in 4 seconds!!
+	 */
+	public static final SystemMessageId BLOCK_CHECKER_ENDS_4 = new SystemMessageId(2923);
+	
+	/**
+	 * ID: 2924<br>
+	 * Message: You cannot enter a Seed while in a flying transformation state.
+	 */
+	public static final SystemMessageId YOU_CANNOT_ENTER_SEED_IN_FLYING_TRANSFORM = new SystemMessageId(2924);
+	
+	/**
+	 * ID: 2925<br>
+	 * Message: Block Checker will end in 3 seconds!!!
+	 */
+	public static final SystemMessageId BLOCK_CHECKER_ENDS_3 = new SystemMessageId(2925);
+	
+	/**
+	 * ID: 2926<br>
+	 * Message: Block Checker will end in 2 seconds!!!!
+	 */
+	public static final SystemMessageId BLOCK_CHECKER_ENDS_2 = new SystemMessageId(2926);
+	
+	/**
+	 * ID: 2927<br>
+	 * Message: Block Checker will end in 1 second!!!!!
+	 */
+	public static final SystemMessageId BLOCK_CHECKER_ENDS_1 = new SystemMessageId(2927);
+	
+	/**
+	 * ID: 2928<br>
+	 * Message: The $c1 team has won.
+	 */
+	public static final SystemMessageId TEAM_C1_WON = new SystemMessageId(2928);
+	
+	/**
+	 * ID: 2936<br>
+	 * Message: The disguise scroll cannot be used because it is meant for use in a different territory.
+	 */
+	public static final SystemMessageId THE_DISGUISE_SCROLL_MEANT_FOR_DIFFERENT_TERRITORY = new SystemMessageId(2936);
+	
+	/**
+	 * ID: 2937<br>
+	 * Message: A territory owning clan member cannot use a disguise scroll.
+	 */
+	public static final SystemMessageId TERRITORY_OWNING_CLAN_CANNOT_USE_DISGUISE_SCROLL = new SystemMessageId(2937);
+	
+	/**
+	 * ID: 2955<br>
+	 * Message: The territory war exclusive disguise and transformation can be used 20 minutes before the start of the territory war to 10 minutes after its end.
+	 */
+	public static final SystemMessageId TERRITORY_WAR_SCROLL_CAN_NOT_USED_NOW = new SystemMessageId(2955);
+	
+	/**
+	 * ID: 2961<br>
+	 * Message: $s2 unit(s) of the item $s1 is/are required.
+	 */
+	public static final SystemMessageId S2_UNIT_OF_THE_ITEM_S1_REQUIRED = new SystemMessageId(2961);
+	
+	/**
+	 * ID: 2964<br>
+	 * Message: Being appointed as a Noblesse will cancel all related quests. Do you wish to continue?
+	 */
+	public static final SystemMessageId CANCEL_NOBLESSE_QUESTS = new SystemMessageId(2964);
+	
+	/**
+	 * ID: 2966<br>
+	 * Message: It's a Payment Request transaction. Please attach the item.
+	 */
+	public static final SystemMessageId PAYMENT_REQUEST_NO_ITEM = new SystemMessageId(2966);
+	
+	/**
+	 * ID: 2968<br>
+	 * Message: The mail limit (240) has been exceeded and this cannot be forwarded.
+	 */
+	public static final SystemMessageId CANT_FORWARD_MAIL_LIMIT_EXCEEDED = new SystemMessageId(2968);
+	
+	/**
+	 * ID: 2969<br>
+	 * Message: The previous mail was forwarded less than 1 minute ago and this cannot be forwarded.
+	 */
+	public static final SystemMessageId CANT_FORWARD_LESS_THAN_MINUTE = new SystemMessageId(2969);
+	
+	/**
+	 * ID: 2970<br>
+	 * Message: You cannot forward in a non-peace zone location.
+	 */
+	public static final SystemMessageId CANT_FORWARD_NOT_IN_PEACE_ZONE = new SystemMessageId(2970);
+	
+	/**
+	 * ID: 2971<br>
+	 * Message: You cannot forward during an exchange.
+	 */
+	public static final SystemMessageId CANT_FORWARD_DURING_EXCHANGE = new SystemMessageId(2971);
+	
+	/**
+	 * ID: 2972<br>
+	 * Message: You cannot forward because the private shop or workshop is in progress.
+	 */
+	public static final SystemMessageId CANT_FORWARD_PRIVATE_STORE = new SystemMessageId(2972);
+	
+	/**
+	 * ID: 2973<br>
+	 * Message: You cannot forward during an item enhancement or attribute enhancement.
+	 */
+	public static final SystemMessageId CANT_FORWARD_DURING_ENCHANT = new SystemMessageId(2973);
+	
+	/**
+	 * ID: 2974<br>
+	 * Message: The item that you're trying to send cannot be forwarded because it isn't proper.
+	 */
+	public static final SystemMessageId CANT_FORWARD_BAD_ITEM = new SystemMessageId(2974);
+	
+	/**
+	 * ID: 2975<br>
+	 * Message: You cannot forward because you don't have enough adena.
+	 */
+	public static final SystemMessageId CANT_FORWARD_NO_ADENA = new SystemMessageId(2975);
+	
+	/**
+	 * ID: 2976<br>
+	 * Message: You cannot receive in a non-peace zone location.
+	 */
+	public static final SystemMessageId CANT_RECEIVE_NOT_IN_PEACE_ZONE = new SystemMessageId(2976);
+	
+	/**
+	 * ID: 2977<br>
+	 * Message: You cannot receive during an exchange.
+	 */
+	public static final SystemMessageId CANT_RECEIVE_DURING_EXCHANGE = new SystemMessageId(2977);
+	
+	/**
+	 * ID: 2978<br>
+	 * Message: You cannot receive because the private shop or workshop is in progress.
+	 */
+	public static final SystemMessageId CANT_RECEIVE_PRIVATE_STORE = new SystemMessageId(2978);
+	
+	/**
+	 * ID: 2979<br>
+	 * Message: You cannot receive during an item enhancement or attribute enhancement.
+	 */
+	public static final SystemMessageId CANT_RECEIVE_DURING_ENCHANT = new SystemMessageId(2979);
+	
+	/**
+	 * ID: 2980<br>
+	 * Message: You cannot receive because you don't have enough adena.
+	 */
+	public static final SystemMessageId CANT_RECEIVE_NO_ADENA = new SystemMessageId(2980);
+	
+	/**
+	 * ID: 2981<br>
+	 * Message: You could not receive because your inventory is full.
+	 */
+	public static final SystemMessageId CANT_RECEIVE_INVENTORY_FULL = new SystemMessageId(2981);
+	
+	/**
+	 * ID: 2982<br>
+	 * Message: You cannot cancel in a non-peace zone location.
+	 */
+	public static final SystemMessageId CANT_CANCEL_NOT_IN_PEACE_ZONE = new SystemMessageId(2982);
+	
+	/**
+	 * ID: 2983<br>
+	 * Message: You cannot cancel during an exchange.
+	 */
+	public static final SystemMessageId CANT_CANCEL_DURING_EXCHANGE = new SystemMessageId(2983);
+	
+	/**
+	 * ID: 2984<br>
+	 * Message: You cannot cancel because the private shop or workshop is in progress.
+	 */
+	public static final SystemMessageId CANT_CANCEL_PRIVATE_STORE = new SystemMessageId(2984);
+	
+	/**
+	 * ID: 2985<br>
+	 * Message: You cannot cancel during an item enhancement or attribute enhancement.
+	 */
+	public static final SystemMessageId CANT_CANCEL_DURING_ENCHANT = new SystemMessageId(2985);
+	
+	/**
+	 * ID: 2988<br>
+	 * Message: You could not cancel receipt because your inventory is full.
+	 */
+	public static final SystemMessageId CANT_CANCEL_INVENTORY_FULL = new SystemMessageId(2988);
+	
+	/**
+	 * ID: 3002<br>
+	 * Message: When the recipient doesn't exist or the character has been deleted, sending mail is not possible.
+	 */
+	public static final SystemMessageId RECIPIENT_NOT_EXIST = new SystemMessageId(3002);
+	
+	/**
+	 * ID: 3008<br>
+	 * Message: The mail has arrived.
+	 */
+	public static final SystemMessageId MAIL_ARRIVED = new SystemMessageId(3008);
+	
+	/**
+	 * ID: 3009<br>
+	 * Message: Mail successfully sent.
+	 */
+	public static final SystemMessageId MAIL_SUCCESSFULLY_SENT = new SystemMessageId(3009);
+	
+	/**
+	 * ID: 3010<br>
+	 * Message: Mail successfully returned.
+	 */
+	public static final SystemMessageId MAIL_SUCCESSFULLY_RETURNED = new SystemMessageId(3010);
+	
+	/**
+	 * ID: 3011<br>
+	 * Message: Mail successfully cancelled.
+	 */
+	public static final SystemMessageId MAIL_SUCCESSFULLY_CANCELLED = new SystemMessageId(3011);
+	
+	/**
+	 * ID: 3012<br>
+	 * Message: Mail successfully received.
+	 */
+	public static final SystemMessageId MAIL_SUCCESSFULLY_RECEIVED = new SystemMessageId(3012);
+	
+	/**
+	 * ID: 3013<br>
+	 * Message: $c1 has successfully enchanted a +$s2 $s3.
+	 */
+	public static final SystemMessageId C1_SUCCESSFULY_ENCHANTED_A_S2_S3 = new SystemMessageId(3013);
+	
+	/**
+	 * ID: 3014<br>
+	 * Message: Do you wish to erase the selected mail?
+	 */
+	public static final SystemMessageId DO_YOU_WISH_TO_ERASE_MAIL = new SystemMessageId(3014);
+	
+	/**
+	 * ID: 3015<br>
+	 * Message: Please select the mail to be deleted.
+	 */
+	public static final SystemMessageId PLEASE_SELECT_MAIL_TO_BE_DELETED = new SystemMessageId(3015);
+	
+	/**
+	 * ID: 3016<br>
+	 * Message: Item selection is possible up to 8.
+	 */
+	public static final SystemMessageId ITEM_SELECTION_POSSIBLE_UP_TO_8 = new SystemMessageId(3016);
+	
+	/**
+	 * ID: 3019<br>
+	 * Message: You cannot send a mail to yourself.
+	 */
+	public static final SystemMessageId YOU_CANT_SEND_MAIL_TO_YOURSELF = new SystemMessageId(3019);
+	
+	/**
+	 * ID: 3020<br>
+	 * Message: When not entering the amount for the payment request, you cannot send any mail.
+	 */
+	public static final SystemMessageId PAYMENT_AMOUNT_NOT_ENTERED = new SystemMessageId(3020);
+	
+	/**
+	 * ID: 3023<br>
+	 * Message: I can feel that the energy being flown in the Kasha's eye is getting stronger rapidly.
+	 */
+	public static final SystemMessageId I_CAN_FEEL_ENERGY_KASHA_EYE_GETTING_STRONGER_RAPIDLY = new SystemMessageId(3023);
+	
+	/**
+	 * ID: 3024<br>
+	 * Message: Kasha's eye pitches and tosses like it's about to explode.
+	 */
+	public static final SystemMessageId KASHA_EYE_PITCHES_TOSSES_EXPLODE = new SystemMessageId(3024);
+	
+	/**
+	 * ID: 3025<br>
+	 * Message: $s2 has made a payment of $s1 Adena per your payment request mail.
+	 */
+	public static final SystemMessageId PAYMENT_OF_S1_ADENA_COMPLETED_BY_S2 = new SystemMessageId(3025);
+	
+	/**
+	 * ID: 3026<br>
+	 * Message: You cannot use the skill enhancing function on this level. You can use the corresponding function on levels higher than 76Lv .
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_SKILL_ENCHANT_ON_THIS_LEVEL = new SystemMessageId(3026);
+	
+	/**
+	 * ID: 3027<br>
+	 * Message: You cannot use the skill enhancing function in this class. You can use corresponding function when completing the third class change.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_SKILL_ENCHANT_IN_THIS_CLASS = new SystemMessageId(3027);
+	
+	/**
+	 * ID: 3028<br>
+	 * Message: You cannot use the skill enhancing function in this class. You can use the skill enhancing function under off-battle status, and cannot use the function while transforming, battling and on-board.
+	 */
+	public static final SystemMessageId YOU_CANNOT_USE_SKILL_ENCHANT_ATTACKING_TRANSFORMED_BOAT = new SystemMessageId(3028);
+	
+	/**
+	 * ID: 3029<br>
+	 * Message: $s1 returned the mail.
+	 */
+	public static final SystemMessageId S1_RETURNED_MAIL = new SystemMessageId(3029);
+	
+	/**
+	 * ID: 3030<br>
+	 * Message: You cannot cancel sent mail since the recipient received it.
+	 */
+	public static final SystemMessageId YOU_CANT_CANCEL_RECEIVED_MAIL = new SystemMessageId(3030);
+	
+	/**
+	 * ID: 3031<br>
+	 * Message: By using the skill of Einhasad's holy sword, defeat the evil Lilims!
+	 */
+	public static final SystemMessageId BY_USING_THE_SKILL_OF_EINHASAD_S_HOLY_SWORD_DEFEAT_THE_EVIL_LILIMS = new SystemMessageId(3031);
+	
+	/**
+	 * ID: 3033<br>
+	 * Message: By using the invisible skill, sneak into the Dawn's document storage!
+	 */
+	public static final SystemMessageId SNEAK_INTO_DAWNS_DOCUMENT_STORAGE = new SystemMessageId(3033);
+	
+	/**
+	 * ID: 3037<br>
+	 * Message: Male guards can detect the concealment but the female guards cannot.
+	 */
+	public static final SystemMessageId MALE_GUARDS_CAN_DETECT_FEMALES_DONT = new SystemMessageId(3037);
+	
+	/**
+	 * ID: 3038<br>
+	 * Message: Female guards notice the disguises from far away better than the male guards do, so beware.
+	 */
+	public static final SystemMessageId FEMALE_GUARDS_NOTICE_BETTER_THAN_MALE = new SystemMessageId(3038);
+	
+	/**
+	 * ID: 3039<br>
+	 * Message: By using the holy water of Einhasad, open the door possessed by the curse of flames.
+	 */
+	public static final SystemMessageId USING_EINHASAD_HOLY_WATER_TO_OPEN_DOOR = new SystemMessageId(3039);
+	
+	/**
+	 * ID: 3040<br>
+	 * Message: By using the Court Magician's Magic Staff, open the door on which the magician's barrier is placed.
+	 */
+	public static final SystemMessageId USING_COURT_MAGICIANS_STAFF_TO_OPEN_DOOR = new SystemMessageId(3040);
+	
+	/**
+	 * ID: 3059<br>
+	 * Message: $s1 did not receive it during the waiting time, so it was returned automatically. tntls.
+	 */
+	public static final SystemMessageId S1_NOT_RECEIVE_DURING_WAITING_TIME_MAIL_RETURNED = new SystemMessageId(3059);
+	
+	/**
+	 * ID: 3060<br>
+	 * Message: The sealing device glitters and moves. Activation complete normally!
+	 */
+	public static final SystemMessageId THE_SEALING_DEVICE_ACTIVATION_COMPLETE = new SystemMessageId(3060);
+	
+	/**
+	 * ID: 3062<br>
+	 * Message: Do you want to pay $s1 Adena?
+	 */
+	public static final SystemMessageId DO_YOU_WANT_TO_PAY_S1_ADENA = new SystemMessageId(3062);
+	
+	/**
+	 * ID: 3063<br>
+	 * Message: Do you really want to forward?
+	 */
+	public static final SystemMessageId DO_YOU_WANT_TO_FORWARD = new SystemMessageId(3063);
+	
+	/**
+	 * ID: 3064<br>
+	 * Message: You have new mail.
+	 */
+	public static final SystemMessageId UNREAD_MAIL = new SystemMessageId(3064);
+	
+	/**
+	 * ID: 3065<br>
+	 * Message: Current location: Inside the Chamber of Delusion
+	 */
+	public static final SystemMessageId LOC_DELUSION_CHAMBER = new SystemMessageId(3065);
+	
+	/**
+	 * ID: 3066<br>
+	 * Message: You cannot receive or send mail with attached items in non-peace zone regions.
+	 */
+	public static final SystemMessageId CANT_USE_MAIL_OUTSIDE_PEACE_ZONE = new SystemMessageId(3066);
+	
+	/**
+	 * ID: 3067<br>
+	 * Message: $s1 canceled the sent mail.
+	 */
+	public static final SystemMessageId S1_CANCELLED_MAIL = new SystemMessageId(3067);
+	
+	/**
+	 * ID: 3068<br>
+	 * Message: The mail was returned due to the exceeded waiting time.
+	 */
+	public static final SystemMessageId MAIL_RETURNED = new SystemMessageId(3068);
+	
+	/**
+	 * ID: 3069<br>
+	 * Message: Do you really want to return this mail to the sender?
+	 */
+	public static final SystemMessageId DO_YOU_WANT_TO_CANCEL_TRANSACTION = new SystemMessageId(3069);
+	
+	/**
+	 * ID: 3072<br>
+	 * Message: $s1 acquired the attached item to your mail.
+	 */
+	public static final SystemMessageId S1_ACQUIRED_ATTACHED_ITEM = new SystemMessageId(3072);
+	
+	/**
+	 * ID: 3073<br>
+	 * Message: You have acquired $s2 $s1.
+	 */
+	public static final SystemMessageId YOU_ACQUIRED_S2_S1 = new SystemMessageId(3073);
+	
+	/**
+	 * ID: 3074<br>
+	 * Message: The allowed length for recipient exceeded.
+	 */
+	public static final SystemMessageId ALLOWED_LENGTH_FOR_RECIPIENT_EXCEEDED = new SystemMessageId(3074);
+	
+	/**
+	 * ID: 3075<br>
+	 * Message: The allowed length for a title exceeded.
+	 */
+	public static final SystemMessageId ALLOWED_LENGTH_FOR_TITLE_EXCEEDED = new SystemMessageId(3075);
+	
+	/**
+	 * ID: 3077<br>
+	 * Message: The mail limit (240) of the opponent's character has been exceeded and this cannot be forwarded.
+	 */
+	public static final SystemMessageId MAIL_LIMIT_EXCEEDED = new SystemMessageId(3077);
+	
+	/**
+	 * ID: 3078<br>
+	 * Message: You're making a request for payment. Do you want to proceed?
+	 */
+	public static final SystemMessageId YOU_MAKING_PAYMENT_REQUEST = new SystemMessageId(3078);
+	
+	/**
+	 * ID: 3079<br>
+	 * Message: There are items in your Pet Inventory rendering you unable to sell/trade/drop pet summoning items. Please empty your Pet Inventory.
+	 */
+	public static final SystemMessageId ITEMS_IN_PET_INVENTORY = new SystemMessageId(3079);
+	
+	/**
+	 * ID: 3080<br>
+	 * Message: You cannot reset the Skill Link because there is not enough Adena.
+	 */
+	public static final SystemMessageId CANNOT_RESET_SKILL_LINK_BECAUSE_NOT_ENOUGH_ADENA = new SystemMessageId(3080);
+	
+	/**
+	 * ID: 3081<br>
+	 * Message: You cannot receive it because you are under the condition that the opponent cannot acquire any Adena for payment.
+	 */
+	public static final SystemMessageId YOU_CANNOT_RECEIVE_CONDITION_OPPONENT_CANT_ACQUIRE_ADENA = new SystemMessageId(3081);
+	
+	/**
+	 * ID: 3082<br>
+	 * Message: You cannot send mails to any character that has blocked you.
+	 */
+	public static final SystemMessageId YOU_CANNOT_SEND_MAIL_TO_CHAR_BLOCK_YOU = new SystemMessageId(3082);
+	
+	/**
+	 * ID: 3094<br>
+	 * Message: A user currently participating in the Olympiad cannot send party and friend invitations.
+	 */
+	public static final SystemMessageId A_USER_CURRENTLY_PARTICIPATING_IN_THE_OLYMPIAD_CANNOT_SEND_PARTY_AND_FRIEND_INVITATIONS = new SystemMessageId(3094);
+	
+	/**
+	 * ID: 3108<br>
+	 * Message: You are no longer protected from aggressive monsters.
+	 */
+	public static final SystemMessageId YOU_ARE_NO_LONGER_PROTECTED_FROM_AGGRESSIVE_MONSTERS = new SystemMessageId(3108);
+	
+	/**
+	 * ID: 3119<br>
+	 * Message: The couple action was denied.
+	 */
+	public static final SystemMessageId COUPLE_ACTION_DENIED = new SystemMessageId(3119);
+	
+	/**
+	 * ID: 3120<br>
+	 * Message: The request cannot be completed because the target does not meet location requirements.
+	 */
+	public static final SystemMessageId TARGET_DO_NOT_MEET_LOC_REQUIREMENTS = new SystemMessageId(3120);
+	
+	/**
+	 * ID: 3121<br>
+	 * Message: The couple action was cancelled.
+	 */
+	public static final SystemMessageId COUPLE_ACTION_CANCELED = new SystemMessageId(3121);
+	
+	/**
+	 * ID: 3122<br>
+	 * Message: The size of the uploaded crest or insignia does not meet the standard requirements.
+	 */
+	public static final SystemMessageId WRONG_SIZE_UPLOADED_CREST = new SystemMessageId(3122);
+	
+	/**
+	 * ID: 3123<br>
+	 * Message: $c1 is in Private Shop mode or in a battle and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3123);
+	
+	/**
+	 * ID: 3124<br>
+	 * Message: $c1 is fishing and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_FISHING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3124);
+	
+	/**
+	 * ID: 3125<br>
+	 * Message: $c1 is in a battle and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3125);
+	
+	/**
+	 * ID: 3126<br>
+	 * Message: $c1 is already participating in a couple action and cannot be requested for another couple action.
+	 */
+	public static final SystemMessageId C1_IS_ALREADY_PARTICIPATING_IN_A_COUPLE_ACTION_AND_CANNOT_BE_REQUESTED_FOR_ANOTHER_COUPLE_ACTION = new SystemMessageId(3126);
+	
+	/**
+	 * ID: 3127<br>
+	 * Message: $c1 is in a chaotic state and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3127);
+	
+	/**
+	 * ID: 3128<br>
+	 * Message: $c1 is participating in the Olympiad and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3128);
+	
+	/**
+	 * ID: 3129<br>
+	 * Message: $c1 is participating in a hideout siege and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_PARTICIPATING_IN_A_HIDEOUT_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3129);
+	
+	/**
+	 * ID: 3130<br>
+	 * Message: $c1 is in a castle siege and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3130);
+	
+	/**
+	 * ID: 3131<br>
+	 * Message: $c1 is riding a ship, steed, or strider and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3131);
+	
+	/**
+	 * ID: 3132<br>
+	 * Message: $c1 is currently teleporting and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_CURRENTLY_TELEPORTING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3132);
+	
+	/**
+	 * ID: 3133<br>
+	 * Message: $c1 is currently transforming and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3133);
+	
+	/**
+	 * ID: 3135<br>
+	 * Message: Requesting approval for changing party loot to "$s1".
+	 */
+	public static final SystemMessageId REQUESTING_APPROVAL_CHANGE_PARTY_LOOT_S1 = new SystemMessageId(3135);
+	
+	/**
+	 * ID: 3137<br>
+	 * Message: Party loot change was cancelled.
+	 */
+	public static final SystemMessageId PARTY_LOOT_CHANGE_CANCELLED = new SystemMessageId(3137);
+	
+	/**
+	 * ID: 3138<br>
+	 * Message: Party loot was changed to "$s1".
+	 */
+	public static final SystemMessageId PARTY_LOOT_CHANGED_S1 = new SystemMessageId(3138);
+	
+	/**
+	 * ID: 3139<br>
+	 * Message: $c1 is currently dead and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION = new SystemMessageId(3139);
+	
+	/**
+	 * ID: 3140<br>
+	 * Message: The crest was successfully registered.
+	 */
+	public static final SystemMessageId CLAN_CREST_WAS_SUCCESSFULLY_REGISTRED = new SystemMessageId(3140);
+	
+	/**
+	 * ID: 3144<br>
+	 * Message: The $s2's attribute was successfully bestowed on $s1, and resistance to $s3 was increased.
+	 */
+	public static final SystemMessageId THE_S2_ATTRIBUTE_WAS_SUCCESSFULLY_BESTOWED_ON_S1_RES_TO_S3_INCREASED = new SystemMessageId(3144);
+	
+	/**
+	 * ID: 3147<br>
+	 * Message: If you are not resurrected within $s1 minutes, you will be expelled from the instant zone.
+	 */
+	public static final SystemMessageId YOU_WILL_BE_EXPELLED_IN_S1 = new SystemMessageId(3147);
+	
+	/**
+	 * ID: 3150<br>
+	 * Message: You have requested a couple action with $c1.
+	 */
+	public static final SystemMessageId YOU_HAVE_REQUESTED_COUPLE_ACTION_C1 = new SystemMessageId(3150);
+	
+	/**
+	 * ID: 3152<br>
+	 * Message: $s1's $s2 attribute was removed, and resistance to $s3 was decreased.
+	 */
+	public static final SystemMessageId S1_S2_ATTRIBUTE_REMOVED_RESISTANCE_S3_DECREASED = new SystemMessageId(3152);
+	
+	/**
+	 * ID: 3156<br>
+	 * Message: You do not have enough funds to cancel this attribute.
+	 */
+	public static final SystemMessageId YOU_DO_NOT_HAVE_ENOUGH_FUNDS_TO_CANCEL_ATTRIBUTE = new SystemMessageId(3156);
+	
+	/**
+	 * ID: 3160<br>
+	 * Message: +$s1$s2's $s3 attribute was removed, so resistance to $s4 was decreased.
+	 */
+	public static final SystemMessageId S1_S2_S3_ATTRIBUTE_REMOVED_RESISTANCE_TO_S4_DECREASED = new SystemMessageId(3160);
+	
+	/**
+	 * ID: 3163<br>
+	 * Message: The $s3's attribute was successfully bestowed on +$s1$s2, and resistance to $s4 was increased.
+	 */
+	public static final SystemMessageId THE_S3_ATTRIBUTE_BESTOWED_ON_S1_S2_RESISTANCE_TO_S4_INCREASED = new SystemMessageId(3163);
+	
+	/**
+	 * ID: 3164<br>
+	 * Message: $c1 is set to refuse couple actions and cannot be requested for a couple action.
+	 */
+	public static final SystemMessageId C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS = new SystemMessageId(3164);
+	
+	/**
+	 * ID: 3168<br>
+	 * Message: $c1 is set to refuse party requests and cannot receive a party request.
+	 */
+	public static final SystemMessageId C1_IS_SET_TO_REFUSE_PARTY_REQUEST = new SystemMessageId(3168);
+	
+	/**
+	 * ID: 3169<br>
+	 * Message: $c1 is set to refuse duel requests and cannot receive a duel request.
+	 */
+	public static final SystemMessageId C1_IS_SET_TO_REFUSE_DUEL_REQUEST = new SystemMessageId(3169);
+	
+	/**
+	 * ID: 3206<br>
+	 * Message: You are out of Recommendations. Try again later.
+	 */
+	public static final SystemMessageId YOU_CURRENTLY_DO_NOT_HAVE_ANY_RECOMMENDATIONS = new SystemMessageId(3206);
+	
+	/**
+	 * ID: 3207<br>
+	 * Message: You obtained $s1 Recommendation(s).
+	 */
+	public static final SystemMessageId YOU_OBTAINED_S1_RECOMMENDATIONS = new SystemMessageId(3207);
+	
+	/**
+	 * ID: 3212<br>
+	 * Message: When your pet's hunger gauge is at 0%, you cannot use your pet.
+	 */
+	public static final SystemMessageId WHEN_YOUR_PETS_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET = new SystemMessageId(3212);
+	
+	/**
+	 * ID: 3213<br>
+	 * Message: Your pet is starving and will not obey until it gets it's food. Feed your pet!
+	 */
+	public static final SystemMessageId YOUR_PET_IS_STARVING_AND_WILL_NOT_OBEY_UNTIL_IT_GETS_ITS_FOOD_FEED_YOUR_PET = new SystemMessageId(3213);
+	
+	/**
+	 * ID: 3214<br>
+	 * Message: $s1 was successfully added to your Contact List.
+	 */
+	public static final SystemMessageId S1_SUCCESSFULLY_ADDED_TO_CONTACT_LIST = new SystemMessageId(3214);
+	
+	/**
+	 * ID: 3215<br>
+	 * Message: The name $s1% doesn't exist. Please try another name.
+	 */
+	public static final SystemMessageId NAME_S1_NOT_EXIST_TRY_ANOTHER_NAME = new SystemMessageId(3215);
+	
+	/**
+	 * ID: 3216<br>
+	 * Message: The name already exists on the added list.
+	 */
+	public static final SystemMessageId NAME_ALREADY_EXIST_ON_CONTACT_LIST = new SystemMessageId(3216);
+	
+	/**
+	 * ID: 3217<br>
+	 * Message: The name is not currently registered.
+	 */
+	public static final SystemMessageId NAME_NOT_REGISTERED_ON_CONTACT_LIST = new SystemMessageId(3217);
+	
+	/**
+	 * ID: 3219<br>
+	 * Message: $s1 was successfully deleted from your Contact List.
+	 */
+	public static final SystemMessageId S1_SUCCESFULLY_DELETED_FROM_CONTACT_LIST = new SystemMessageId(3219);
+	
+	/**
+	 * ID: 3221<br>
+	 * Message: You cannot add your own name.
+	 */
+	public static final SystemMessageId CANNOT_ADD_YOUR_NAME_ON_CONTACT_LIST = new SystemMessageId(3221);
+	
+	/**
+	 * ID: 3222<br>
+	 * Message: The maximum number of names (100) has been reached. You cannot register any more.
+	 */
+	public static final SystemMessageId CONTACT_LIST_LIMIT_REACHED = new SystemMessageId(3222);
+	
+	/**
+	 * ID: 3224<br>
+	 * Message: The maximum matches you can participate in 1 week is 70.
+	 */
+	public static final SystemMessageId MAX_OLY_WEEKLY_MATCHES_REACHED = new SystemMessageId(3224);
+	
+	/**
+	 * ID: 3225<br>
+	 * Message: The total number of matches that can be entered in 1 week is 60 class irrelevant individual matches, 30 specific matches, and 10 team matches.
+	 */
+	public static final SystemMessageId MAX_OLY_WEEKLY_MATCHES_REACHED_60_NON_CLASSED_30_CLASSED_10_TEAM = new SystemMessageId(3225);
+	
+	/**
+	 * ID: 3226<br>
+	 * Message: You cannot move while speaking to an NPC. One moment please.
+	 */
+	public static final SystemMessageId CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC = new SystemMessageId(3226);
+	
+	/**
+	 * ID: 3255<br>
+	 * Message: Arcane Shield decreased your MP by $s1 instead of HP.
+	 */
+	public static final SystemMessageId ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP = new SystemMessageId(3255);
+	
+	/**
+	 * ID: 3256<br>
+	 * Message: MP became 0 and the Arcane Shield is disappearing.
+	 */
+	public static final SystemMessageId MP_BECAME_0_ARCANE_SHIELD_DISAPPEARING = new SystemMessageId(3256);
+	
+	/**
+	 * ID: 3259<br>
+	 * Message: You have acquired $s1 EXP (Bonus: $s2) and $s3 SP (Bonus: $s4).
+	 */
+	public static final SystemMessageId YOU_EARNED_S1_EXP_BONUS_S2_AND_S3_SP_BONUS_S4 = new SystemMessageId(3259);
+	
+	/**
+	 * ID: 3260<br>
+	 * Message: You cannot use the skill because the servitor has not been summoned.
+	 */
+	public static final SystemMessageId CANNOT_USE_SKILL_WITHOUT_SERVITOR = new SystemMessageId(3260);
+	
+	/**
+	 * ID: 3261<br>
+	 * Message: You have $s1 match(es) remaining that you can participate in this week ($s2 1 vs 1 Class matches, $s3 1 vs 1 matches, & $s4 3 vs 3 Team matches).
+	 */
+	public static final SystemMessageId YOU_HAVE_S1_MATCHES_REMAINING_THAT_YOU_CAN_PARTECIPATE_IN_THIS_WEEK_S2_CLASSED_S3_NON_CLASSED_S4_TEAM = new SystemMessageId(3261);
+	
+	/**
+	 * ID: 3262<br>
+	 * Message: You can proceed only when the inventory weight is below 80 percent and the quantity is below 90 percent.
+	 */
+	public static final SystemMessageId YOU_CAN_PROCEED_ONLY_WHEN_THE_INVENTORY_WEIGHT_IS_BELOW_80_PERCENT_AND_THE_QUANTITY_IS_BELOW_90_PERCENT = new SystemMessageId(3262);
+	
+	/**
+	 * ID: 3266<br>
+	 * Message: The angel Nevit has blessed you from above. You are imbued with full Vitality as well as a Vitality Replenishing effect. And should you die, you will not lose Exp!
+	 */
+	public static final SystemMessageId THE_ANGEL_NEVIT_HAS_BLESSED_YOU_FROM_ABOVE = new SystemMessageId(3266);
+	
+	/**
+	 * ID: 3267<br>
+	 * Message: You are starting to feel the effects of Nevit's Advent Blessing.
+	 */
+	public static final SystemMessageId YOU_ARE_STARTING_TO_FEEL_THE_EFFECTS_OF_NEVITS_ADVENT_BLESSING = new SystemMessageId(3267);
+	
+	/**
+	 * ID: 3268<br>
+	 * Message: You are further infused with the blessings of Nevit! Continue to battle evil wherever it may lurk.
+	 */
+	public static final SystemMessageId YOU_ARE_FURTHER_INFUSED_WITH_THE_BLESSINGS_OF_NEVIT = new SystemMessageId(3268);
+	
+	/**
+	 * ID: 3269<br>
+	 * Message: Nevit's Advent Blessing shines strongly from above. You can almost see his divine aura.
+	 */
+	public static final SystemMessageId NEVITS_ADVENT_BLESSING_SHINES_STRONGLY_FROM_ABOVE = new SystemMessageId(3269);
+	
+	/**
+	 * ID: 3275<br>
+	 * Message: Nevit's Advent Blessing has ended. Continue your journey and you will surely meet his favor again sometime soon.
+	 */
+	public static final SystemMessageId NEVITS_ADVENT_BLESSING_HAS_ENDED = new SystemMessageId(3275);
+	
+	/**
+	 * ID: 6004<br>
+	 * Message: Enchant failed. The enchant level for the corresponding item will be exactly retained.
+	 */
+	public static final SystemMessageId SAFE_ENCHANT_FAILED = new SystemMessageId(6004);
+	
+	/**
+	 * ID: 6050<br>
+	 * Message: If you have a Maestro's Key, you can use it to open the treasure chest.
+	 */
+	public static final SystemMessageId IF_YOU_HAVE_A_MAESTROS_KEY_YOU_CAN_USE_IT_TO_OPEN_THE_TREASURE_CHEST = new SystemMessageId(6050);
+	
+	/**
+	 * ID: 6501<br>
+	 * Message: You cannot bookmark this location because you do not have a My Teleport Flag.
+	 */
+	public static final SystemMessageId YOU_CANNOT_BOOKMARK_THIS_LOCATION_BECAUSE_YOU_DO_NOT_HAVE_A_MY_TELEPORT_FLAG = new SystemMessageId(6501);
+	
+	/**
+	 * ID: 6503<br>
+	 * Message: The evil Thomas D. Turkey has appeared. Please save Santa.
+	 */
+	public static final SystemMessageId THOMAS_D_TURKEY_APPEARED = new SystemMessageId(6503);
+	
+	/**
+	 * ID: 6504<br>
+	 * Message: You won the battle against Thomas D. Turkey. Santa has been rescued.
+	 */
+	public static final SystemMessageId THOMAS_D_TURKEY_DEFETED = new SystemMessageId(6504);
+	
+	/**
+	 * ID: 6505<br>
+	 * Message: You did not rescue Santa, and Thomas D. Turkey has disappeared.
+	 */
+	public static final SystemMessageId THOMAS_D_TURKEY_DISAPPEARED = new SystemMessageId(6505);
+	
+	static {
+		buildFastLookupTable();
+	}
+	
+	private static void buildFastLookupTable() {
+		final Field[] fields = SystemMessageId.class.getDeclaredFields();
+		
+		int mod;
+		SystemMessageId smId;
+		for (final Field field : fields) {
+			mod = field.getModifiers();
+			if (Modifier.isStatic(mod) && Modifier.isPublic(mod) && Modifier.isFinal(mod) && field.getType().equals(SystemMessageId.class)) {
+				try {
+					smId = (SystemMessageId) field.get(null);
+					smId.setName(field.getName());
+					smId.setParamCount(parseMessageParameters(field.getName()));
+					VALUES.put(smId.getId(), smId);
+				} catch (final Exception e) {
+					LOG.warn("Failed field access for '{}'", field.getName(), e);
+				}
+			}
+		}
+	}
+	
+	private static int parseMessageParameters(final String name) {
+		int paramCount = 0;
+		char c1, c2;
+		for (int i = 0; i < (name.length() - 1); i++) {
+			c1 = name.charAt(i);
+			if ((c1 == 'C') || (c1 == 'S')) {
+				c2 = name.charAt(i + 1);
+				if (Character.isDigit(c2)) {
+					paramCount = Math.max(paramCount, Character.getNumericValue(c2));
+					i++;
+				}
+			}
+		}
+		return paramCount;
+	}
+	
+	public static SystemMessageId getSystemMessageId(final int id) {
+		final SystemMessageId smi = getSystemMessageIdInternal(id);
+		return smi == null ? new SystemMessageId(id) : smi;
+	}
+	
+	private static SystemMessageId getSystemMessageIdInternal(final int id) {
+		return VALUES.get(id);
+	}
+	
+	public static SystemMessageId getSystemMessageId(final String name) {
+		try {
+			return (SystemMessageId) SystemMessageId.class.getField(name).get(null);
+		} catch (final Exception e) {
+			return null;
+		}
+	}
+	
+	public static void reloadLocalisations() {
+		for (var smId : VALUES.values()) {
+			if (smId != null) {
+				smId.removeAllLocalisations();
+			}
+		}
+		
+		final var factory = DocumentBuilderFactory.newInstance();
+		factory.setValidating(false);
+		factory.setIgnoringComments(true);
+		
+		for (var lang : customs().getMultiLangSystemMessageAllowed()) {
+			final var file = new File(server().getDatapackRoot(), "data/lang/" + lang + "/sm/SystemMessageLocalisation.xml");
+			if (!file.isFile()) {
+				continue;
+			}
+			
+			LOG.info("Loading localisation for '{}'", lang);
+			
+			try {
+				final var doc = factory.newDocumentBuilder().parse(file);
+				for (var na = doc.getFirstChild(); na != null; na = na.getNextSibling()) {
+					if ("list".equals(na.getNodeName())) {
+						for (var nb = na.getFirstChild(); nb != null; nb = nb.getNextSibling()) {
+							if ("sm".equals(nb.getNodeName())) {
+								final var nnmb = nb.getAttributes();
+								var node = nnmb.getNamedItem("id");
+								SystemMessageId smId;
+								if (node != null) {
+									smId = getSystemMessageId(Integer.parseInt(node.getNodeValue()));
+								} else {
+									node = nnmb.getNamedItem("name");
+									smId = getSystemMessageId(node.getNodeValue());
+									if (smId == null) {
+										LOG.warn("Unknown SMID '{}', lang '{}'.", node.getNodeValue(), lang);
+										continue;
+									}
+								}
+								
+								node = nnmb.getNamedItem("text");
+								if (node == null) {
+									LOG.warn("No text defined for SMID '{}', lang '{}'.", smId, lang);
+									continue;
+								}
+								
+								final var text = node.getNodeValue();
+								if (text.isEmpty() || (text.length() > 255)) {
+									LOG.warn("Invalid text defined for SMID '{}' (to long or empty), lang '{}'.", smId, lang);
+									continue;
+								}
+								
+								smId.attachLocalizedText(lang, text);
+							}
+						}
+					}
+				}
+			} catch (final Exception e) {
+				LOG.error("SystemMessageId: Failed loading '{}'", file, e);
+			}
+		}
+	}
+	
+	private final int _id;
+	private String _name;
+	private int _params;
+	private Map<String, Localization> _localisations;
+	private SystemMessage _staticSystemMessage;
+	
+	private SystemMessageId(int id) {
+		_id = id;
+		_localisations = null;
+	}
+	
+	public int getId() {
+		return _id;
+	}
+	
+	private void setName(final String name) {
+		_name = name;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int getParamCount() {
+		return _params;
+	}
+	
+	public void setParamCount(int params) {
+		if (params < 0) {
+			throw new IllegalArgumentException("Invalid negative param count: " + params);
+		}
+		
+		if (params > 10) {
+			throw new IllegalArgumentException("Maximum param count exceeded: " + params);
+		}
+		
+		if (params != 0) {
+			_staticSystemMessage = null;
+		}
+		
+		_params = params;
+	}
+	
+	public Localization getLocalisation(String lang) {
+		return (_localisations == null) ? null : _localisations.get(lang);
+	}
+	
+	public void attachLocalizedText(String lang, String text) {
+		if (_localisations == null) {
+			_localisations = new HashMap<>();
+		}
+		_localisations.put(lang, new Localization(lang, text));
+	}
+	
+	public void removeAllLocalisations() {
+		_localisations = null;
+	}
+	
+	public SystemMessage getStaticSystemMessage() {
+		return _staticSystemMessage;
+	}
+	
+	public void setStaticSystemMessage(SystemMessage sm) {
+		_staticSystemMessage = sm;
+	}
+	
+	@Override
+	public String toString() {
+		return "SM[" + getId() + ":" + getName() + "]";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java
new file mode 100644
index 00000000..fedaca86
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AbstractRefinePacket.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public abstract class AbstractRefinePacket extends L2GameClientPacket {
+	public static final int GRADE_NONE = 0;
+	public static final int GRADE_MID = 1;
+	public static final int GRADE_HIGH = 2;
+	public static final int GRADE_TOP = 3;
+	public static final int GRADE_ACC = 4; // Accessory LS
+	
+	protected static final int GEMSTONE_D = 2130;
+	protected static final int GEMSTONE_C = 2131;
+	protected static final int GEMSTONE_B = 2132;
+	
+	private static final Map<Integer, LifeStone> _lifeStones = new HashMap<>();
+	
+	protected static final class LifeStone {
+		// lifestone level to player level table
+		private static final int[] LEVELS = {
+			46,
+			49,
+			52,
+			55,
+			58,
+			61,
+			64,
+			67,
+			70,
+			76,
+			80,
+			82,
+			84,
+			85
+		};
+		private final int _grade;
+		private final int _level;
+		
+		public LifeStone(int grade, int level) {
+			_grade = grade;
+			_level = level;
+		}
+		
+		public int getLevel() {
+			return _level;
+		}
+		
+		public int getGrade() {
+			return _grade;
+		}
+		
+		public int getPlayerLevel() {
+			return LEVELS[_level];
+		}
+	}
+	
+	static {
+		// itemId, (LS grade, LS level)
+		_lifeStones.put(8723, new LifeStone(GRADE_NONE, 0));
+		_lifeStones.put(8724, new LifeStone(GRADE_NONE, 1));
+		_lifeStones.put(8725, new LifeStone(GRADE_NONE, 2));
+		_lifeStones.put(8726, new LifeStone(GRADE_NONE, 3));
+		_lifeStones.put(8727, new LifeStone(GRADE_NONE, 4));
+		_lifeStones.put(8728, new LifeStone(GRADE_NONE, 5));
+		_lifeStones.put(8729, new LifeStone(GRADE_NONE, 6));
+		_lifeStones.put(8730, new LifeStone(GRADE_NONE, 7));
+		_lifeStones.put(8731, new LifeStone(GRADE_NONE, 8));
+		_lifeStones.put(8732, new LifeStone(GRADE_NONE, 9));
+		
+		_lifeStones.put(8733, new LifeStone(GRADE_MID, 0));
+		_lifeStones.put(8734, new LifeStone(GRADE_MID, 1));
+		_lifeStones.put(8735, new LifeStone(GRADE_MID, 2));
+		_lifeStones.put(8736, new LifeStone(GRADE_MID, 3));
+		_lifeStones.put(8737, new LifeStone(GRADE_MID, 4));
+		_lifeStones.put(8738, new LifeStone(GRADE_MID, 5));
+		_lifeStones.put(8739, new LifeStone(GRADE_MID, 6));
+		_lifeStones.put(8740, new LifeStone(GRADE_MID, 7));
+		_lifeStones.put(8741, new LifeStone(GRADE_MID, 8));
+		_lifeStones.put(8742, new LifeStone(GRADE_MID, 9));
+		
+		_lifeStones.put(8743, new LifeStone(GRADE_HIGH, 0));
+		_lifeStones.put(8744, new LifeStone(GRADE_HIGH, 1));
+		_lifeStones.put(8745, new LifeStone(GRADE_HIGH, 2));
+		_lifeStones.put(8746, new LifeStone(GRADE_HIGH, 3));
+		_lifeStones.put(8747, new LifeStone(GRADE_HIGH, 4));
+		_lifeStones.put(8748, new LifeStone(GRADE_HIGH, 5));
+		_lifeStones.put(8749, new LifeStone(GRADE_HIGH, 6));
+		_lifeStones.put(8750, new LifeStone(GRADE_HIGH, 7));
+		_lifeStones.put(8751, new LifeStone(GRADE_HIGH, 8));
+		_lifeStones.put(8752, new LifeStone(GRADE_HIGH, 9));
+		
+		_lifeStones.put(8753, new LifeStone(GRADE_TOP, 0));
+		_lifeStones.put(8754, new LifeStone(GRADE_TOP, 1));
+		_lifeStones.put(8755, new LifeStone(GRADE_TOP, 2));
+		_lifeStones.put(8756, new LifeStone(GRADE_TOP, 3));
+		_lifeStones.put(8757, new LifeStone(GRADE_TOP, 4));
+		_lifeStones.put(8758, new LifeStone(GRADE_TOP, 5));
+		_lifeStones.put(8759, new LifeStone(GRADE_TOP, 6));
+		_lifeStones.put(8760, new LifeStone(GRADE_TOP, 7));
+		_lifeStones.put(8761, new LifeStone(GRADE_TOP, 8));
+		_lifeStones.put(8762, new LifeStone(GRADE_TOP, 9));
+		
+		_lifeStones.put(9573, new LifeStone(GRADE_NONE, 10));
+		_lifeStones.put(9574, new LifeStone(GRADE_MID, 10));
+		_lifeStones.put(9575, new LifeStone(GRADE_HIGH, 10));
+		_lifeStones.put(9576, new LifeStone(GRADE_TOP, 10));
+		
+		_lifeStones.put(10483, new LifeStone(GRADE_NONE, 11));
+		_lifeStones.put(10484, new LifeStone(GRADE_MID, 11));
+		_lifeStones.put(10485, new LifeStone(GRADE_HIGH, 11));
+		_lifeStones.put(10486, new LifeStone(GRADE_TOP, 11));
+		
+		_lifeStones.put(12754, new LifeStone(GRADE_ACC, 0));
+		_lifeStones.put(12755, new LifeStone(GRADE_ACC, 1));
+		_lifeStones.put(12756, new LifeStone(GRADE_ACC, 2));
+		_lifeStones.put(12757, new LifeStone(GRADE_ACC, 3));
+		_lifeStones.put(12758, new LifeStone(GRADE_ACC, 4));
+		_lifeStones.put(12759, new LifeStone(GRADE_ACC, 5));
+		_lifeStones.put(12760, new LifeStone(GRADE_ACC, 6));
+		_lifeStones.put(12761, new LifeStone(GRADE_ACC, 7));
+		_lifeStones.put(12762, new LifeStone(GRADE_ACC, 8));
+		_lifeStones.put(12763, new LifeStone(GRADE_ACC, 9));
+		
+		_lifeStones.put(12821, new LifeStone(GRADE_ACC, 10));
+		_lifeStones.put(12822, new LifeStone(GRADE_ACC, 11));
+		
+		_lifeStones.put(12840, new LifeStone(GRADE_ACC, 0));
+		_lifeStones.put(12841, new LifeStone(GRADE_ACC, 1));
+		_lifeStones.put(12842, new LifeStone(GRADE_ACC, 2));
+		_lifeStones.put(12843, new LifeStone(GRADE_ACC, 3));
+		_lifeStones.put(12844, new LifeStone(GRADE_ACC, 4));
+		_lifeStones.put(12845, new LifeStone(GRADE_ACC, 5));
+		_lifeStones.put(12846, new LifeStone(GRADE_ACC, 6));
+		_lifeStones.put(12847, new LifeStone(GRADE_ACC, 7));
+		_lifeStones.put(12848, new LifeStone(GRADE_ACC, 8));
+		_lifeStones.put(12849, new LifeStone(GRADE_ACC, 9));
+		_lifeStones.put(12850, new LifeStone(GRADE_ACC, 10));
+		_lifeStones.put(12851, new LifeStone(GRADE_ACC, 11));
+		
+		_lifeStones.put(14008, new LifeStone(GRADE_ACC, 12));
+		
+		_lifeStones.put(14166, new LifeStone(GRADE_NONE, 12));
+		_lifeStones.put(14167, new LifeStone(GRADE_MID, 12));
+		_lifeStones.put(14168, new LifeStone(GRADE_HIGH, 12));
+		_lifeStones.put(14169, new LifeStone(GRADE_TOP, 12));
+		
+		_lifeStones.put(16160, new LifeStone(GRADE_NONE, 13));
+		_lifeStones.put(16161, new LifeStone(GRADE_MID, 13));
+		_lifeStones.put(16162, new LifeStone(GRADE_HIGH, 13));
+		_lifeStones.put(16163, new LifeStone(GRADE_TOP, 13));
+		_lifeStones.put(16177, new LifeStone(GRADE_ACC, 13));
+		
+		_lifeStones.put(16164, new LifeStone(GRADE_NONE, 13));
+		_lifeStones.put(16165, new LifeStone(GRADE_MID, 13));
+		_lifeStones.put(16166, new LifeStone(GRADE_HIGH, 13));
+		_lifeStones.put(16167, new LifeStone(GRADE_TOP, 13));
+		_lifeStones.put(16178, new LifeStone(GRADE_ACC, 13));
+	}
+	
+	protected static LifeStone getLifeStone(int itemId) {
+		return _lifeStones.get(itemId);
+	}
+	
+	/**
+	 * Checks player, source item, lifestone and gemstone validity for augmentation process
+	 * @param player
+	 * @param item
+	 * @param refinerItem
+	 * @param gemStones
+	 * @return
+	 */
+	protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem, L2ItemInstance gemStones) {
+		if (!isValid(player, item, refinerItem)) {
+			return false;
+		}
+		
+		// GemStones must belong to owner
+		if (gemStones.getOwnerId() != player.getObjectId()) {
+			return false;
+		}
+		// .. and located in inventory
+		if (gemStones.getItemLocation() != ItemLocation.INVENTORY) {
+			return false;
+		}
+		
+		final CrystalType grade = item.getItem().getItemGrade();
+		final LifeStone ls = _lifeStones.get(refinerItem.getId());
+		
+		// Check for item id
+		if (getGemStoneId(grade) != gemStones.getId()) {
+			return false;
+		}
+		// Count must be greater or equal of required number
+		return getGemStoneCount(grade, ls.getGrade()) <= gemStones.getCount();
+	}
+	
+	/**
+	 * Checks player, source item and lifestone validity for augmentation process
+	 * @param player
+	 * @param item
+	 * @param refinerItem
+	 * @return
+	 */
+	protected static boolean isValid(L2PcInstance player, L2ItemInstance item, L2ItemInstance refinerItem) {
+		if (!isValid(player, item)) {
+			return false;
+		}
+		
+		// Item must belong to owner
+		if (refinerItem.getOwnerId() != player.getObjectId()) {
+			return false;
+		}
+		// Lifestone must be located in inventory
+		if (refinerItem.getItemLocation() != ItemLocation.INVENTORY) {
+			return false;
+		}
+		
+		final LifeStone ls = _lifeStones.get(refinerItem.getId());
+		if (ls == null) {
+			return false;
+		}
+		// weapons can't be augmented with accessory ls
+		if ((item.getItem() instanceof L2Weapon) && (ls.getGrade() == GRADE_ACC)) {
+			return false;
+		}
+		// and accessory can't be augmented with weapon ls
+		if ((item.getItem() instanceof L2Armor) && (ls.getGrade() != GRADE_ACC)) {
+			return false;
+		}
+		// check for level of the lifestone
+		return player.getLevel() >= ls.getPlayerLevel();
+	}
+	
+	/**
+	 * Check both player and source item conditions for augmentation process
+	 * @param player
+	 * @param item
+	 * @return
+	 */
+	protected static boolean isValid(L2PcInstance player, L2ItemInstance item) {
+		if (!isValid(player)) {
+			return false;
+		}
+		
+		// Item must belong to owner
+		if (item.getOwnerId() != player.getObjectId()) {
+			return false;
+		}
+		if (item.isAugmented()) {
+			return false;
+		}
+		if (item.isHeroItem()) {
+			return false;
+		}
+		if (item.isShadowItem()) {
+			return false;
+		}
+		if (item.isCommonItem()) {
+			return false;
+		}
+		if (item.isEtcItem()) {
+			return false;
+		}
+		if (item.isTimeLimitedItem()) {
+			return false;
+		}
+		if (item.isPvp() && !character().allowAugmentPvPItems()) {
+			return false;
+		}
+		if (item.getItem().getCrystalType().isLesser(CrystalType.C)) {
+			return false;
+		}
+		
+		// Source item can be equipped or in inventory
+		switch (item.getItemLocation()) {
+			case INVENTORY:
+			case PAPERDOLL:
+				break;
+			default:
+				return false;
+		}
+		
+		if (item.getItem() instanceof L2Weapon) {
+			switch (((L2Weapon) item.getItem()).getItemType()) {
+				case NONE:
+				case FISHINGROD:
+					return false;
+				default:
+					break;
+			}
+		} else if (item.getItem() instanceof L2Armor) {
+			// only accessories can be augmented
+			switch (item.getItem().getBodyPart()) {
+				case L2Item.SLOT_LR_FINGER:
+				case L2Item.SLOT_LR_EAR:
+				case L2Item.SLOT_NECK:
+					break;
+				default:
+					return false;
+			}
+		} else {
+			return false; // neither weapon nor armor ?
+		}
+		
+		// Blacklist check
+		return !character().getAugmentationBlacklist().contains(item.getId());
+	}
+	
+	/**
+	 * Check if player's conditions valid for augmentation process
+	 * @param player
+	 * @return
+	 */
+	protected static boolean isValid(L2PcInstance player) {
+		if (player.getPrivateStoreType() != PrivateStoreType.NONE) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AUGMENT_ITEMS_WHILE_A_PRIVATE_STORE_OR_PRIVATE_WORKSHOP_IS_IN_OPERATION);
+			return false;
+		}
+		if (player.getActiveTradeList() != null) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AUGMENT_ITEMS_WHILE_TRADING);
+			return false;
+		}
+		if (player.isDead()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AUGMENT_ITEMS_WHILE_DEAD);
+			return false;
+		}
+		if (player.isStunned()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AUGMENT_ITEMS_WHILE_PARALYZED);
+			return false;
+		}
+		if (player.isFishing()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AUGMENT_ITEMS_WHILE_FISHING);
+			return false;
+		}
+		if (player.isSitting()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_AUGMENT_ITEMS_WHILE_SITTING_DOWN);
+			return false;
+		}
+		if (player.isCursedWeaponEquipped()) {
+			return false;
+		}
+		return !player.isEnchanting() && !player.isProcessingTransaction();
+	}
+	
+	/**
+	 * @param itemGrade
+	 * @return GemStone itemId based on item grade
+	 */
+	protected static int getGemStoneId(CrystalType itemGrade) {
+		return switch (itemGrade) {
+			case C, B -> GEMSTONE_D;
+			case A, S -> GEMSTONE_C;
+			case S80, S84 -> GEMSTONE_B;
+			default -> 0;
+		};
+	}
+	
+	/**
+	 * Different for weapon and accessory augmentation.
+	 * @param itemGrade
+	 * @param lifeStoneGrade
+	 * @return GemStone count based on item grade and life stone grade
+	 */
+	protected static int getGemStoneCount(CrystalType itemGrade, int lifeStoneGrade) {
+		if (lifeStoneGrade == GRADE_ACC) {
+			return switch (itemGrade) {
+				case C -> 200;
+				case B -> 300;
+				case A -> 200;
+				case S -> 250;
+				case S80 -> 360;
+				case S84 -> 480;
+				default -> 0;
+			};
+		}
+		return switch (itemGrade) {
+			case C -> 20;
+			case B -> 30;
+			case A -> 20;
+			case S -> 25;
+			case S80, S84 -> 36;
+			default -> 0;
+		};
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/Action.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Action.java
new file mode 100644
index 00000000..cf646a1c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Action.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.DuelState;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class Action extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(Action.class);
+	
+	private static final String __C__1F_ACTION = "[C] 1F Action";
+	
+	private int _objectId;
+	private int _originX;
+	private int _originY;
+	private int _originZ;
+	private int _actionId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD(); // Target object Identifier
+		_originX = readD();
+		_originY = readD();
+		_originZ = readD();
+		_actionId = readC(); // Action identifier : 0-Simple click, 1-Shift click
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (general().debug()) {
+			LOG.info("{} Target object ID: {} originX: {} originY: {} originZ: {}", _actionId == 0 ? "Simple-click" : "Shift-click", _objectId, _originX, _originY, _originZ);
+		}
+		
+		// Get the current L2PcInstance of the player
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.inObserverMode()) {
+			activeChar.sendPacket(SystemMessageId.OBSERVERS_CANNOT_PARTICIPATE);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final BuffInfo info = activeChar.getEffectList().getBuffInfoByAbnormalType(AbnormalType.BOT_PENALTY);
+		if (info != null) {
+			for (AbstractEffect effect : info.getEffects()) {
+				if (!effect.checkCondition(-4)) {
+					activeChar.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_ACTIONS_NOT_ALLOWED);
+					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+		}
+		
+		final L2Object obj;
+		if (activeChar.getTargetId() == _objectId) {
+			obj = activeChar.getTarget();
+		} else if (activeChar.isInAirShip() && (activeChar.getAirShip().getHelmObjectId() == _objectId)) {
+			obj = activeChar.getAirShip();
+		} else {
+			obj = L2World.getInstance().findObject(_objectId);
+		}
+		
+		// If object requested does not exist, add warn msg into logs
+		if (obj == null) {
+			// pressing e.g. pickup many times quickly would get you here
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (obj.isPlayable() && (obj.getActingPlayer().getDuelState() == DuelState.DEAD)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			activeChar.getActingPlayer().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.OTHER_PARTY_IS_FROZEN));
+			return;
+		}
+		if (!obj.isTargetable() && !activeChar.canOverrideCond(PcCondOverride.TARGET_ALL)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Players can't interact with objects in the other instances, except from multiverse
+		if ((obj.getInstanceId() != activeChar.getInstanceId()) && (activeChar.getInstanceId() != -1)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Only GMs can directly interact with invisible characters
+		if (!obj.isVisibleFor(activeChar)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Check if the target is valid, if the player haven't a shop or isn't the requester of a transaction (ex : FriendInvite, JoinAlly, JoinParty...)
+		if (activeChar.getActiveRequester() != null) {
+			// Actions prohibited when in trade
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		switch (_actionId) {
+			case 0 -> obj.onAction(activeChar);
+			case 1 -> {
+				if (!activeChar.isGM() && !(obj.isNpc() && npc().viewNpc())) {
+					obj.onAction(activeChar, false);
+				} else {
+					obj.onActionShift(activeChar);
+				}
+			}
+			default -> {
+				// Invalid action detected (probably client cheating), log this
+				LOG.warn("Character: {} requested invalid action: {}", activeChar.getName(), _actionId);
+				sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return __C__1F_ACTION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AddTradeItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AddTradeItem.java
new file mode 100644
index 00000000..485c889e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AddTradeItem.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.TradeOtherAdd;
+import com.l2jserver.gameserver.network.serverpackets.TradeOwnAdd;
+
+/**
+ * @since 2005/03/27 15:29:29
+ */
+public final class AddTradeItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(AddTradeItem.class);
+	
+	private static final String _C__1B_ADDTRADEITEM = "[C] 1B AddTradeItem";
+	
+	private int _tradeId;
+	private int _objectId;
+	private long _count;
+	
+	@Override
+	protected void readImpl() {
+		_tradeId = readD();
+		_objectId = readD();
+		_count = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final TradeList trade = player.getActiveTradeList();
+		if (trade == null) {
+			LOG.warn("Character: {} requested item: {} add without active tradelist: {}", player.getName(), _objectId, _tradeId);
+			return;
+		}
+		
+		final L2PcInstance partner = trade.getPartner();
+		if ((partner == null) || (L2World.getInstance().getPlayer(partner.getObjectId()) == null) || (partner.getActiveTradeList() == null)) {
+			// Trade partner not found, cancel trade
+			if (partner != null) {
+				LOG.warn("Character: {} requested invalid trade object: {}", player.getName(), _objectId);
+			}
+			player.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+			player.cancelActiveTrade();
+			return;
+		}
+		
+		if (trade.isConfirmed() || partner.getActiveTradeList().isConfirmed()) {
+			player.sendPacket(SystemMessageId.CANNOT_ADJUST_ITEMS_AFTER_TRADE_CONFIRMED);
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendMessage("Transactions are disabled for your Access Level.");
+			player.cancelActiveTrade();
+			return;
+		}
+		
+		if (!player.validateItemManipulation(_objectId, "trade")) {
+			player.sendPacket(SystemMessageId.NOTHING_HAPPENED);
+			return;
+		}
+		
+		final TradeItem item = trade.addItem(_objectId, _count);
+		if (item != null) {
+			player.sendPacket(new TradeOwnAdd(item));
+			trade.getPartner().sendPacket(new TradeOtherAdd(item));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__1B_ADDTRADEITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
new file mode 100644
index 00000000..9a01a416
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AllyDismiss.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.model.L2Clan.PENALTY_TYPE_CLAN_DISMISSED;
+import static com.l2jserver.gameserver.model.L2Clan.PENALTY_TYPE_DISMISS_CLAN;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Ally Dismiss client packet.
+ * @author JV
+ * @author janiii
+ * @author MELERIX
+ * @author Zoey76
+ */
+public final class AllyDismiss extends L2GameClientPacket {
+	private static final String _C__8F_ALLYDISMISS = "[C] 8F AllyDismiss";
+	
+	private String _clanName;
+	
+	@Override
+	protected void readImpl() {
+		_clanName = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_clanName == null) {
+			return;
+		}
+		
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2Clan leaderClan = player.getClan();
+		if (leaderClan == null) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER);
+			return;
+		}
+		
+		if (leaderClan.getAllyId() == 0) {
+			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);
+			return;
+		}
+		
+		if (!player.isClanLeader() || (leaderClan.getId() != leaderClan.getAllyId())) {
+			player.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
+			return;
+		}
+		
+		L2Clan clan = ClanTable.getInstance().getClanByName(_clanName);
+		if (clan == null) {
+			player.sendPacket(SystemMessageId.CLAN_DOESNT_EXISTS);
+			return;
+		}
+		
+		if (clan.getId() == leaderClan.getId()) {
+			player.sendPacket(SystemMessageId.ALLIANCE_LEADER_CANT_WITHDRAW);
+			return;
+		}
+		
+		if (clan.getAllyId() != leaderClan.getAllyId()) {
+			player.sendPacket(SystemMessageId.DIFFERENT_ALLIANCE);
+			return;
+		}
+		
+		long currentTime = System.currentTimeMillis();
+		leaderClan.setAllyPenaltyExpiryTime(currentTime + character().getDaysBeforeAcceptNewClanWhenDismissed(), PENALTY_TYPE_DISMISS_CLAN);
+		leaderClan.updateClanInDB();
+		
+		clan.setAllyId(0);
+		clan.setAllyName(null);
+		clan.changeAllyCrest(0, true);
+		clan.setAllyPenaltyExpiryTime(currentTime + character().getDaysBeforeJoinAllyWhenDismissed(), PENALTY_TYPE_CLAN_DISMISSED);
+		clan.updateClanInDB();
+		player.sendPacket(SystemMessageId.YOU_HAVE_EXPELED_A_CLAN);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8F_ALLYDISMISS;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java
new file mode 100644
index 00000000..287937f1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AllyLeave.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.model.L2Clan.PENALTY_TYPE_CLAN_LEFT;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Ally Leave client packet.
+ * @author JIV
+ * @author janiii
+ * @author MELERIX
+ * @author Zoey76
+ * @author xban1x
+ * @author UnAfraid
+ */
+public final class AllyLeave extends L2GameClientPacket {
+	private static final String _C__8E_ALLYLEAVE = "[C] 8E AllyLeave";
+	
+	@Override
+	protected void readImpl() {
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2Clan clan = player.getClan();
+		if (clan == null) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER);
+			return;
+		}
+		
+		if (!player.isClanLeader()) {
+			player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_WITHDRAW_ALLY);
+			return;
+		}
+		
+		if (clan.getAllyId() == 0) {
+			player.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);
+			return;
+		}
+		
+		if (clan.getId() == clan.getAllyId()) {
+			player.sendPacket(SystemMessageId.ALLIANCE_LEADER_CANT_WITHDRAW);
+			return;
+		}
+		
+		clan.setAllyId(0);
+		clan.setAllyName(null);
+		clan.changeAllyCrest(0, true);
+		clan.setAllyPenaltyExpiryTime(System.currentTimeMillis() + character().getDaysBeforeJoiningAllianceAfterLeaving(), PENALTY_TYPE_CLAN_LEFT);
+		clan.updateClanInDB();
+		player.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_ALLIANCE);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8E_ALLYLEAVE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java
new file mode 100644
index 00000000..db92c5b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerCoupleAction.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExRotation;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author JIV
+ */
+public class AnswerCoupleAction extends L2GameClientPacket {
+	private static final String _C__D0_7A_ANSWERCOUPLEACTION = "[C] D0:7A AnswerCoupleAction";
+	
+	private int _charObjId;
+	private int _actionId;
+	private int _answer;
+	
+	@Override
+	protected void readImpl() {
+		_actionId = readD();
+		_answer = readD();
+		_charObjId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getActiveChar();
+		L2PcInstance target = L2World.getInstance().getPlayer(_charObjId);
+		if ((activeChar == null) || (target == null)) {
+			return;
+		}
+		if ((target.getMultiSocialTarget() != activeChar.getObjectId()) || (target.getMultiSociaAction() != _actionId)) {
+			return;
+		}
+		if (_answer == 0) // cancel
+		{
+			target.sendPacket(SystemMessageId.COUPLE_ACTION_DENIED);
+		} else if (_answer == 1) // approve
+		{
+			final int distance = (int) activeChar.calculateDistance(target, false, false);
+			if ((distance > 125) || (distance < 15) || (activeChar.getObjectId() == target.getObjectId())) {
+				sendPacket(SystemMessageId.TARGET_DO_NOT_MEET_LOC_REQUIREMENTS);
+				target.sendPacket(SystemMessageId.TARGET_DO_NOT_MEET_LOC_REQUIREMENTS);
+				return;
+			}
+			int heading = Util.calculateHeadingFrom(activeChar, target);
+			activeChar.broadcastPacket(new ExRotation(activeChar.getObjectId(), heading));
+			activeChar.setHeading(heading);
+			heading = Util.calculateHeadingFrom(target, activeChar);
+			target.setHeading(heading);
+			target.broadcastPacket(new ExRotation(target.getObjectId(), heading));
+			activeChar.broadcastPacket(new SocialAction(activeChar.getObjectId(), _actionId));
+			target.broadcastPacket(new SocialAction(_charObjId, _actionId));
+		} else if (_answer == -1) // refused
+		{
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_COUPLE_ACTIONS);
+			sm.addPcName(activeChar);
+			target.sendPacket(sm);
+		}
+		target.setMultiSocialAction(0, 0);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_7A_ANSWERCOUPLEACTION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
new file mode 100644
index 00000000..c10af191
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerJoinPartyRoom.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.PartyMatchDetail;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Format: (ch) d
+ * @author -Wooden-
+ * @author Tryskell
+ */
+public final class AnswerJoinPartyRoom extends L2GameClientPacket {
+	private static final String _C__D0_30_ANSWERJOINPARTYROOM = "[C] D0:30 AnswerJoinPartyRoom";
+	private int _answer; // 1 or 0
+	
+	@Override
+	protected void readImpl() {
+		_answer = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2PcInstance partner = player.getActiveRequester();
+		if (partner == null) {
+			// Partner hasn't been found, cancel the invitation
+			player.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+			player.setActiveRequester(null);
+			return;
+		} else if (L2World.getInstance().getPlayer(partner.getObjectId()) == null) {
+			// Partner hasn't been found, cancel the invitation
+			player.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+			player.setActiveRequester(null);
+			return;
+		}
+		
+		// If answer is positive, join the requester's PartyRoom.
+		if ((_answer == 1) && !partner.isRequestExpired()) {
+			PartyMatchRoom room = PartyMatchRoomList.getInstance().getRoom(partner.getPartyRoom());
+			if (room == null) {
+				return;
+			}
+			
+			if ((player.getLevel() >= room.getMinLvl()) && (player.getLevel() <= room.getMaxLvl())) {
+				// Remove from waiting list
+				PartyMatchWaitingList.getInstance().removePlayer(player);
+				
+				player.setPartyRoom(partner.getPartyRoom());
+				
+				player.sendPacket(new PartyMatchDetail(player, room));
+				player.sendPacket(new ExPartyRoomMember(player, room, 0));
+				
+				for (L2PcInstance member : room.getPartyMembers()) {
+					if (member == null) {
+						continue;
+					}
+					
+					member.sendPacket(new ExManagePartyRoomMember(player, room, 0));
+					member.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_ENTERED_PARTY_ROOM).addPcName(player));
+				}
+				room.addMember(player);
+				
+				// Info Broadcast
+				player.broadcastUserInfo();
+			} else {
+				player.sendPacket(SystemMessageId.CANT_ENTER_PARTY_ROOM);
+			}
+		} else {
+			partner.sendPacket(SystemMessageId.PARTY_MATCHING_REQUEST_NO_RESPONSE);
+		}
+		
+		// reset transaction timers
+		player.setActiveRequester(null);
+		partner.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_30_ANSWERJOINPARTYROOM;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java
new file mode 100644
index 00000000..caa74c63
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerPartyLootModification.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author JIV
+ */
+public class AnswerPartyLootModification extends L2GameClientPacket {
+	private static final String _C__D0_79_ANSWERPARTYLOOTMODIFICATION = "[C] D0:79 AnswerPartyLootModification";
+	
+	public int _answer;
+	
+	@Override
+	protected void readImpl() {
+		_answer = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		L2Party party = activeChar.getParty();
+		if (party != null) {
+			party.answerLootChangeRequest(activeChar, _answer == 1);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_79_ANSWERPARTYLOOTMODIFICATION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java
new file mode 100644
index 00000000..834ae467
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AnswerTradeRequest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.TradeDone;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class AnswerTradeRequest extends L2GameClientPacket {
+	private static final String _C__55_ANSWERTRADEREQUEST = "[C] 55 AnswerTradeRequest";
+	
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2PcInstance partner = player.getActiveRequester();
+		if (partner == null) {
+			// Trade partner not found, cancel trade
+			player.sendPacket(new TradeDone(0));
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME));
+			player.setActiveRequester(null);
+			return;
+		} else if (L2World.getInstance().getPlayer(partner.getObjectId()) == null) {
+			// Trade partner not found, cancel trade
+			player.sendPacket(new TradeDone(0));
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME));
+			player.setActiveRequester(null);
+			return;
+		}
+		
+		if ((_response == 1) && !partner.isRequestExpired()) {
+			player.startTrade(partner);
+		} else {
+			SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_DENIED_TRADE_REQUEST);
+			msg.addString(player.getName());
+			partner.sendPacket(msg);
+		}
+		
+		// Clears requesting status
+		player.setActiveRequester(null);
+		partner.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__55_ANSWERTRADEREQUEST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java
new file mode 100644
index 00000000..290fea54
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Appearing.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Appearing packet.
+ * @since 2005/03/29 23:15:33
+ */
+public final class Appearing extends L2GameClientPacket {
+	private static final String _C__3A_APPEARING = "[C] 3A Appearing";
+	
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.isTeleporting()) {
+			activeChar.onTeleported();
+		}
+		
+		sendPacket(new UserInfo(activeChar));
+		sendPacket(new ExBrExtraUserInfo(activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__3A_APPEARING;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/Attack.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Attack.java
new file mode 100644
index 00000000..2f3f74ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Attack.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+/**
+ * TODO: This class is a copy of AttackRequest, we should get proper structure for both.
+ */
+public final class Attack extends L2GameClientPacket {
+	private static final String _C__01_ATTACK = "[C] 01 Attack";
+	
+	// cddddc
+	private int _objectId;
+	@SuppressWarnings("unused")
+	private int _originX;
+	@SuppressWarnings("unused")
+	private int _originY;
+	@SuppressWarnings("unused")
+	private int _originZ;
+	@SuppressWarnings("unused")
+	private int _attackId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_originX = readD();
+		_originY = readD();
+		_originZ = readD();
+		_attackId = readC(); // 0 for simple click 1 for shift-click
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		// Avoid Attacks in Boat.
+		if (activeChar.isPlayable() && activeChar.isInBoat()) {
+			activeChar.sendPacket(SystemMessageId.NOT_ALLOWED_ON_BOAT);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final BuffInfo info = activeChar.getEffectList().getBuffInfoByAbnormalType(AbnormalType.BOT_PENALTY);
+		if (info != null) {
+			for (AbstractEffect effect : info.getEffects()) {
+				if (!effect.checkCondition(-1)) {
+					activeChar.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_ACTIONS_NOT_ALLOWED);
+					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+		}
+		
+		// avoid using expensive operations if not needed
+		final L2Object target;
+		if (activeChar.getTargetId() == _objectId) {
+			target = activeChar.getTarget();
+		} else {
+			target = L2World.getInstance().findObject(_objectId);
+		}
+		
+		if (target == null) {
+			return;
+		}
+		
+		if (!target.isTargetable() && !activeChar.canOverrideCond(PcCondOverride.TARGET_ALL)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Players can't attack objects in the other instances
+		// except from multiverse
+		else if ((target.getInstanceId() != activeChar.getInstanceId()) && (activeChar.getInstanceId() != -1)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Only GMs can directly attack invisible characters
+		else if (!target.isVisibleFor(activeChar)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.getTarget() != target) {
+			target.onAction(activeChar);
+		} else {
+			if ((target.getObjectId() != activeChar.getObjectId()) && (activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null)) {
+				target.onForcedAttack(activeChar);
+			} else {
+				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__01_ATTACK;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AttackRequest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AttackRequest.java
new file mode 100644
index 00000000..bf50e3f6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AttackRequest.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public final class AttackRequest extends L2GameClientPacket {
+	private static final String _C__32_ATTACKREQUEST = "[C] 32 AttackRequest";
+	
+	// cddddc
+	private int _objectId;
+	@SuppressWarnings("unused")
+	private int _originX;
+	@SuppressWarnings("unused")
+	private int _originY;
+	@SuppressWarnings("unused")
+	private int _originZ;
+	@SuppressWarnings("unused")
+	private int _attackId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_originX = readD();
+		_originY = readD();
+		_originZ = readD();
+		_attackId = readC(); // 0 for simple click 1 for shift-click
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final BuffInfo info = activeChar.getEffectList().getBuffInfoByAbnormalType(AbnormalType.BOT_PENALTY);
+		if (info != null) {
+			for (AbstractEffect effect : info.getEffects()) {
+				if (!effect.checkCondition(-1)) {
+					activeChar.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_ACTIONS_NOT_ALLOWED);
+					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+		}
+		
+		// avoid using expensive operations if not needed
+		final L2Object target;
+		if (activeChar.getTargetId() == _objectId) {
+			target = activeChar.getTarget();
+		} else {
+			target = L2World.getInstance().findObject(_objectId);
+		}
+		
+		if (target == null) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		else if (!target.isTargetable() && !activeChar.canOverrideCond(PcCondOverride.TARGET_ALL)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Players can't attack objects in the other instances
+		// except from multiverse
+		else if ((target.getInstanceId() != activeChar.getInstanceId()) && (activeChar.getInstanceId() != -1)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Only GMs can directly attack invisible characters
+		else if (!target.isVisibleFor(activeChar)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.getTarget() != target) {
+			target.onAction(activeChar);
+		} else {
+			if ((target.getObjectId() != activeChar.getObjectId()) && (activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null)) {
+				target.onForcedAttack(activeChar);
+			} else {
+				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__32_ATTACKREQUEST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java
new file mode 100644
index 00000000..b7dbcac6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/AuthLogin.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.LoginServerThread.SessionKey;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class AuthLogin extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(AuthLogin.class);
+	
+	private static final String _C__2B_AUTHLOGIN = "[C] 2B AuthLogin";
+	
+	// loginName + keys must match what the login server used.
+	private String _loginName;
+	/*
+	 * private final long _key1; private final long _key2; private final long _key3; private final long _key4;
+	 */
+	private int _playKey1;
+	private int _playKey2;
+	private int _loginKey1;
+	private int _loginKey2;
+	
+	@Override
+	protected void readImpl() {
+		_loginName = readS().toLowerCase();
+		_playKey2 = readD();
+		_playKey1 = readD();
+		_loginKey1 = readD();
+		_loginKey2 = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2GameClient client = getClient();
+		if (_loginName.isEmpty() || !client.isProtocolOk()) {
+			client.close((L2GameServerPacket) null);
+			return;
+		}
+		SessionKey key = new SessionKey(_loginKey1, _loginKey2, _playKey1, _playKey2);
+		if (general().debug()) {
+			LOG.info("User: {}", _loginName);
+			LOG.info("Key: {}", key);
+		}
+		
+		// avoid potential exploits
+		if (client.getAccountName() == null) {
+			// Preventing duplicate login in case client login server socket was disconnected or this packet was not sent yet
+			if (LoginServerThread.getInstance().addGameServerLogin(_loginName, client)) {
+				client.setAccountName(_loginName);
+				LoginServerThread.getInstance().addWaitingClientAndSendRequest(_loginName, client, key);
+			} else {
+				client.close((L2GameServerPacket) null);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__2B_AUTHLOGIN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java
new file mode 100644
index 00000000..52f19711
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/BrEventRankerList.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.ExBrLoadEventTopRankers;
+
+/**
+ * Halloween rank list client packet. Format: (ch)ddd
+ */
+public class BrEventRankerList extends L2GameClientPacket {
+	private static final String _C__D0_7B_BREVENTRANKERLIST = "[C] D0:7B BrEventRankerList";
+	
+	private int _eventId;
+	private int _day;
+	@SuppressWarnings("unused")
+	private int _ranking;
+	
+	@Override
+	protected void readImpl() {
+		_eventId = readD();
+		_day = readD(); // 0 - current, 1 - previous
+		_ranking = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// TODO count, bestScore, myScore
+		int count = 0;
+		int bestScore = 0;
+		int myScore = 0;
+		getClient().sendPacket(new ExBrLoadEventTopRankers(_eventId, _day, count, bestScore, myScore));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_7B_BREVENTRANKERLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java
new file mode 100644
index 00000000..e677f77c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/BypassUserCmd.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.handler.IUserCommandHandler;
+import com.l2jserver.gameserver.handler.UserCommandHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public class BypassUserCmd extends L2GameClientPacket {
+	private static final String _C__B3_BYPASSUSERCMD = "[C] B3 BypassUserCmd";
+	
+	private int _command;
+	
+	@Override
+	protected void readImpl() {
+		_command = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		IUserCommandHandler handler = UserCommandHandler.getInstance().getHandler(_command);
+		
+		if (handler == null) {
+			if (player.isGM()) {
+				player.sendMessage("User commandID " + _command + " not implemented yet.");
+			}
+		} else {
+			handler.useUserCommand(_command, getClient().getActiveChar());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B3_BYPASSUSERCMD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java
new file mode 100644
index 00000000..26f2e5ef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymore.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class CannotMoveAnymore extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(CannotMoveAnymore.class);
+	
+	private static final String _C__47_STOPMOVE = "[C] 47 CannotMoveAnymore";
+	
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _heading;
+	
+	@Override
+	protected void readImpl() {
+		_x = readD();
+		_y = readD();
+		_z = readD();
+		_heading = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (general().debug()) {
+			LOG.debug("Client: x:{} y:{} z:{} server x:{} y:{} z:{}", _x, _y, _z, player.getX(), player.getY(), player.getZ());
+		}
+		if (player.getAI() != null) {
+			player.getAI().notifyEvent(CtrlEvent.EVT_ARRIVED_BLOCKED, new Location(_x, _y, _z, _heading));
+		}
+		/*
+		 * if (player.getParty() != null) { player.getParty().broadcastToPartyMembers(player, new PartyMemberPosition(player)); }
+		 */
+		
+		// player.stopMove();
+		//
+		// if (general().debug())
+		// LOG.debug("client: x:"+_x+" y:"+_y+" z:"+_z+
+		// " server x:"+player.getX()+" y:"+player.getZ()+" z:"+player.getZ());
+		// StopMove smwl = new StopMove(player);
+		// getClient().getActiveChar().sendPacket(smwl);
+		// getClient().getActiveChar().broadcastPacket(smwl);
+		//
+		// StopRotation sr = new StopRotation(getClient().getActiveChar(),
+		// _heading);
+		// getClient().getActiveChar().sendPacket(sr);
+		// getClient().getActiveChar().broadcastPacket(sr);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__47_STOPMOVE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
new file mode 100644
index 00000000..8ba21b69
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CannotMoveAnymoreInVehicle.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
+
+/**
+ * @author Maktakien
+ */
+public final class CannotMoveAnymoreInVehicle extends L2GameClientPacket {
+	private static final String _C__76_CANNOTMOVEANYMOREINVEHICLE = "[C] 76 CannotMoveAnymoreInVehicle";
+	
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _heading;
+	private int _boatId;
+	
+	@Override
+	protected void readImpl() {
+		_boatId = readD();
+		_x = readD();
+		_y = readD();
+		_z = readD();
+		_heading = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		if (player.isInBoat()) {
+			if (player.getBoat().getObjectId() == _boatId) {
+				player.setInVehiclePosition(new Location(_x, _y, _z));
+				player.setHeading(_heading);
+				StopMoveInVehicle msg = new StopMoveInVehicle(player, _boatId);
+				player.broadcastPacket(msg);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__76_CANNOTMOVEANYMOREINVEHICLE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
new file mode 100644
index 00000000..1d2afbd5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterCreate.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.vitality;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.xml.impl.InitialEquipmentData;
+import com.l2jserver.gameserver.data.xml.impl.InitialShortcutData;
+import com.l2jserver.gameserver.data.xml.impl.PlayerCreationPointData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.appearance.PcAppearance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.stat.PcStat;
+import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.events.Containers;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerCreate;
+import com.l2jserver.gameserver.model.items.PcItemTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.CharCreateFail;
+import com.l2jserver.gameserver.network.serverpackets.CharCreateOk;
+import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
+
+@SuppressWarnings("unused")
+public final class CharacterCreate extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(CharacterCreate.class);
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	private static final String _C__0C_CHARACTERCREATE = "[C] 0C CharacterCreate";
+	
+	private static final int PLAYER_NAME_MAX_LENGHT = 16;
+	
+	// cSdddddddddddd
+	private String _name;
+	private int _race;
+	private byte _sex;
+	private int _classId;
+	private int _int;
+	private int _str;
+	private int _con;
+	private int _men;
+	private int _dex;
+	private int _wit;
+	private byte _hairStyle;
+	private byte _hairColor;
+	private byte _face;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+		_race = readD();
+		_sex = (byte) readD();
+		_classId = readD();
+		_int = readD();
+		_str = readD();
+		_con = readD();
+		_men = readD();
+		_dex = readD();
+		_wit = readD();
+		_hairStyle = (byte) readD();
+		_hairColor = (byte) readD();
+		_face = (byte) readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_name.isEmpty()) || (_name.length() > 16)) {
+			if (general().debug()) {
+				LOG.debug("Character Creation Failure: Character name {} is invalid.", _name);
+			}
+			
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS));
+			return;
+		}
+		
+		if (character().getForbiddenNames().contains(_name.toLowerCase())) {
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME));
+			return;
+		}
+		
+		if (!isValidName(_name)) {
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_INCORRECT_NAME));
+			return;
+		}
+		
+		if (_name.isEmpty() || (_name.length() > PLAYER_NAME_MAX_LENGHT)) {
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_16_ENG_CHARS));
+			return;
+		}
+		
+		if ((_face > 2) || (_face < 0)) {
+			LOG.warn("Character Creation Failure: Character face {} is invalid. Possible client hack. {}", _face, getClient());
+			
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
+			return;
+		}
+		
+		if ((_hairStyle < 0) || ((_sex == 0) && (_hairStyle > 4)) || ((_sex != 0) && (_hairStyle > 6))) {
+			LOG.warn("Character Creation Failure: Character hair style {} is invalid. Possible client hack. {}", _hairStyle, getClient());
+			
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
+			return;
+		}
+		
+		if ((_hairColor > 3) || (_hairColor < 0)) {
+			LOG.warn("Character Creation Failure: Character hair color {} is invalid. Possible client hack. {}", _hairColor, getClient());
+			
+			sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
+			return;
+		}
+		
+		L2PcInstance newChar;
+		
+		/*
+		 * DrHouse: Since checks for duplicate names are done using SQL, lock must be held until data is written to DB as well.
+		 */
+		synchronized (CharNameTable.getInstance()) {
+			if ((CharNameTable.getInstance().getAccountCharacterCount(getClient().getAccountName()) >= character().getCharMaxNumber()) && //
+				(character().getCharMaxNumber() != 0)) {
+				if (general().debug()) {
+					LOG.debug("Max number of characters reached. Creation failed.");
+				}
+				
+				sendPacket(new CharCreateFail(CharCreateFail.REASON_TOO_MANY_CHARACTERS));
+				return;
+			} else if (CharNameTable.getInstance().doesCharNameExist(_name)) {
+				if (general().debug()) {
+					LOG.debug("Character Creation Failure: Message generated: You cannot create another character. Please delete the existing character and try again.");
+				}
+				
+				sendPacket(new CharCreateFail(CharCreateFail.REASON_NAME_ALREADY_EXISTS));
+				return;
+			}
+			
+			if (ClassId.getClassId(_classId).level() > 0) {
+				LOG.warn("Character Creation Failure: {} classId: {}", _name, _classId);
+				
+				sendPacket(new CharCreateFail(CharCreateFail.REASON_CREATION_FAILED));
+				return;
+			}
+			final PcAppearance app = new PcAppearance(_face, _hairColor, _hairStyle, _sex != 0);
+			newChar = L2PcInstance.create(_classId, getClient().getAccountName(), _name, app);
+		}
+		
+		// HP and MP are at maximum and CP is zero by default.
+		newChar.setCurrentHp(newChar.getMaxHp());
+		newChar.setCurrentMp(newChar.getMaxMp());
+		// newChar.setMaxLoad(template.getBaseLoad());
+		
+		sendPacket(new CharCreateOk());
+		
+		initNewChar(getClient(), newChar);
+		
+		LOG_ACCOUNTING.info("Created new character {} {}.", newChar, getClient());
+	}
+	
+	private boolean isValidName(String text) {
+		return character().getPlayerNameTemplate().matcher(text).matches();
+	}
+	
+	private void initNewChar(L2GameClient client, L2PcInstance newChar) {
+		if (general().debug()) {
+			LOG.debug("Character init start");
+		}
+		
+		L2World.getInstance().storeObject(newChar);
+		
+		if (character().getStartingAdena() > 0) {
+			newChar.addAdena("Init", character().getStartingAdena(), null, false);
+		}
+		
+		final L2PcTemplate template = newChar.getTemplate();
+		Location createLoc = PlayerCreationPointData.getInstance().getCreationPoint(template.getClassId());
+		newChar.setXYZInvisible(createLoc.getX(), createLoc.getY(), createLoc.getZ());
+		newChar.setTitle("");
+		
+		if (vitality().enabled()) {
+			newChar.setVitalityPoints(Math.min(vitality().getStartingVitalityPoints(), PcStat.MAX_VITALITY_POINTS), true);
+		}
+		if (character().getStartingLevel() > 1) {
+			newChar.addLevel(character().getStartingLevel() - 1);
+		}
+		if (character().getStartingSP() > 0) {
+			newChar.addSp(character().getStartingSP());
+		}
+		
+		final List<PcItemTemplate> initialItems = InitialEquipmentData.getInstance().getEquipmentList(newChar.getClassId());
+		if (initialItems != null) {
+			for (PcItemTemplate ie : initialItems) {
+				final L2ItemInstance item = newChar.getInventory().addItem("Init", ie.getId(), ie.getCount(), newChar, null);
+				if (item == null) {
+					LOG.warn("Could not create item during char creation: itemId {}, amount {}.", ie.getId(), ie.getCount());
+					continue;
+				}
+				
+				if (item.isEquipable() && ie.isEquipped()) {
+					newChar.getInventory().equipItem(item);
+				}
+			}
+		}
+		
+		for (L2SkillLearn skill : SkillTreesData.getInstance().getAvailableSkills(newChar, newChar.getClassId(), false, true)) {
+			if (general().debug()) {
+				LOG.debug("Adding starter skill:{} / {}", skill.getSkillId(), skill.getSkillLevel());
+			}
+			
+			newChar.addSkill(SkillData.getInstance().getSkill(skill.getSkillId(), skill.getSkillLevel()), true);
+		}
+		
+		// Register all shortcuts for actions, skills and items for this new character.
+		InitialShortcutData.getInstance().registerAllShortcuts(newChar);
+		
+		EventDispatcher.getInstance().notifyEvent(new PlayerCreate(newChar, newChar.getObjectId(), newChar.getName(), client), Containers.Players());
+		
+		newChar.setOnlineStatus(true, false);
+		newChar.deleteMe();
+		
+		final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1);
+		client.setCharSelection(cl.getCharInfo());
+		
+		if (general().debug()) {
+			LOG.debug("Character init end");
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__0C_CHARACTERCREATE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
new file mode 100644
index 00000000..5763644e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterDelete.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.CharSelectInfoPackage;
+import com.l2jserver.gameserver.model.events.Containers;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerDelete;
+import com.l2jserver.gameserver.network.serverpackets.CharDeleteFail;
+import com.l2jserver.gameserver.network.serverpackets.CharDeleteSuccess;
+import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class CharacterDelete extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(CharacterDelete.class);
+	
+	private static final String _C__0C_CHARACTERDELETE = "[C] 0D CharacterDelete";
+	
+	private int _charSlot;
+	
+	@Override
+	protected void readImpl() {
+		_charSlot = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!getClient().getFloodProtectors().getCharacterSelect().tryPerformAction("CharacterDelete")) {
+			sendPacket(new CharDeleteFail(CharDeleteFail.REASON_DELETION_FAILED));
+			return;
+		}
+		
+		if (general().debug()) {
+			LOG.debug("Deleting slot: {}", _charSlot);
+		}
+		
+		try {
+			byte answer = getClient().markToDeleteChar(_charSlot);
+			
+			switch (answer) {
+				default:
+				case -1: // Error
+					break;
+				case 0: // Success!
+					sendPacket(new CharDeleteSuccess());
+					final CharSelectInfoPackage charInfo = getClient().getCharSelection(_charSlot);
+					EventDispatcher.getInstance().notifyEvent(new PlayerDelete(charInfo.getObjectId(), charInfo.getName(), getClient()), Containers.Players());
+					break;
+				case 1:
+					sendPacket(new CharDeleteFail(CharDeleteFail.REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER));
+					break;
+				case 2:
+					sendPacket(new CharDeleteFail(CharDeleteFail.REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED));
+					break;
+			}
+		} catch (Exception e) {
+			LOG.error("Error:", e);
+		}
+		
+		CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1, 0);
+		sendPacket(cl);
+		getClient().setCharSelection(cl.getCharInfo());
+	}
+	
+	@Override
+	public String getType() {
+		return _C__0C_CHARACTERDELETE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
new file mode 100644
index 00000000..4e055345
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterRestore.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.CharSelectInfoPackage;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerRestore;
+import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
+
+/**
+ * @since 2005/03/27 15:29:29
+ */
+public final class CharacterRestore extends L2GameClientPacket {
+	private static final String _C__7B_CHARACTERRESTORE = "[C] 7B CharacterRestore";
+	
+	private int _charSlot;
+	
+	@Override
+	protected void readImpl() {
+		_charSlot = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!getClient().getFloodProtectors().getCharacterSelect().tryPerformAction("CharacterRestore")) {
+			return;
+		}
+		
+		getClient().markRestoredChar(_charSlot);
+		CharSelectionInfo cl = new CharSelectionInfo(getClient().getAccountName(), getClient().getSessionId().playOkID1, 0);
+		sendPacket(cl);
+		getClient().setCharSelection(cl.getCharInfo());
+		final CharSelectInfoPackage charInfo = getClient().getCharSelection(_charSlot);
+		EventDispatcher.getInstance().notifyEvent(new PlayerRestore(charInfo.getObjectId(), charInfo.getName(), getClient()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__7B_CHARACTERRESTORE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
new file mode 100644
index 00000000..23ad6601
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/CharacterSelect.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.network.L2GameClient.GameClientState.JOINING;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.instancemanager.PunishmentManager;
+import com.l2jserver.gameserver.model.CharSelectInfoPackage;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.Containers;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSelect;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.punishment.PunishmentAffect;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.CharSelected;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.SSQInfo;
+import com.l2jserver.gameserver.network.serverpackets.ServerClose;
+
+public class CharacterSelect extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(CharacterSelect.class);
+	
+	private static final String _C__12_CHARACTERSELECT = "[C] 12 CharacterSelect";
+	
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	// cd
+	private int _charSlot;
+	
+	@SuppressWarnings("unused")
+	private int _unk1; // new in C4
+	@SuppressWarnings("unused")
+	private int _unk2; // new in C4
+	@SuppressWarnings("unused")
+	private int _unk3; // new in C4
+	@SuppressWarnings("unused")
+	private int _unk4; // new in C4
+	
+	@Override
+	protected void readImpl() {
+		_charSlot = readD();
+		_unk1 = readH();
+		_unk2 = readD();
+		_unk3 = readD();
+		_unk4 = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2GameClient client = getClient();
+		if (!client.getFloodProtectors().getCharacterSelect().tryPerformAction("CharacterSelect")) {
+			return;
+		}
+		
+		if (SecondaryAuthData.getInstance().isEnabled() && !client.getSecondaryAuth().isAuthed()) {
+			client.getSecondaryAuth().openDialog();
+			return;
+		}
+		
+		// We should always be able to acquire the lock
+		// But if we can't lock then nothing should be done (i.e. repeated packet)
+		if (client.getActiveCharLock().tryLock()) {
+			try {
+				// should always be null
+				// but if not then this is repeated packet and nothing should be done here
+				if (client.getActiveChar() == null) {
+					final CharSelectInfoPackage info = client.getCharSelection(_charSlot);
+					if (info == null) {
+						return;
+					}
+					
+					// Banned?
+					if (PunishmentManager.getInstance().hasPunishment(info.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.BAN) || PunishmentManager.getInstance().hasPunishment(client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN)
+						|| PunishmentManager.getInstance().hasPunishment(client.getConnectionAddress().getHostAddress(), PunishmentAffect.IP, PunishmentType.BAN)) {
+						client.close(ServerClose.STATIC_PACKET);
+						return;
+					}
+					
+					// Selected character is banned (compatibility with previous versions).
+					if (info.getAccessLevel() < 0) {
+						client.close(ServerClose.STATIC_PACKET);
+						return;
+					}
+					
+					if ((customs().getDualboxCheckMaxPlayersPerIP() > 0) && !AntiFeedManager.getInstance().tryAddClient(AntiFeedManager.GAME_ID, client, customs().getDualboxCheckMaxPlayersPerIP())) {
+						final NpcHtmlMessage msg = new NpcHtmlMessage();
+						msg.setFile(info.getHtmlPrefix(), "data/html/mods/IPRestriction.htm");
+						msg.replace("%max%", String.valueOf(AntiFeedManager.getInstance().getLimit(client, customs().getDualboxCheckMaxPlayersPerIP())));
+						client.sendPacket(msg);
+						return;
+					}
+					
+					// The L2PcInstance must be created here, so that it can be attached to the L2GameClient
+					if (general().debug()) {
+						LOG.debug("Selected slot: {}", _charSlot);
+					}
+					
+					// load up character from disk
+					final L2PcInstance cha = client.loadCharFromDisk(_charSlot);
+					if (cha == null) {
+						return; // handled in L2GameClient
+					}
+					L2World.getInstance().addPlayerToWorld(cha);
+					CharNameTable.getInstance().addName(cha);
+					
+					cha.setClient(client);
+					client.setActiveChar(cha);
+					cha.setOnlineStatus(true, true);
+					
+					final TerminateReturn terminate = EventDispatcher.getInstance().notifyEvent(new PlayerSelect(cha, cha.getObjectId(), cha.getName(), getClient()), Containers.Players(), TerminateReturn.class);
+					if ((terminate != null) && terminate.terminate()) {
+						cha.deleteMe();
+						return;
+					}
+					
+					client.setCharSelectionSlot(_charSlot);
+					cha.restoreStatusFromLoadedValues();
+					
+					sendPacket(new SSQInfo());
+					
+					client.setState(JOINING);
+					CharSelected cs = new CharSelected(cha, client.getSessionId().playOkID1);
+					sendPacket(cs);
+				}
+			} finally {
+				client.getActiveCharLock().unlock();
+			}
+			
+			LOG_ACCOUNTING.info("Client {} logged in.", client);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__12_CHARACTERSELECT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java
new file mode 100644
index 00000000..ee7eb632
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/DlgAnswer.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.enums.PlayerAction;
+import com.l2jserver.gameserver.handler.AdminCommandHandler;
+import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerDlgAnswer;
+import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
+import com.l2jserver.gameserver.model.holders.DoorRequestHolder;
+import com.l2jserver.gameserver.model.holders.SummonRequestHolder;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.GMAudit;
+
+/**
+ * @author Dezmond_snz
+ */
+public final class DlgAnswer extends L2GameClientPacket {
+	private static final String _C__C6_DLGANSWER = "[C] C6 DlgAnswer";
+	private int _messageId;
+	private int _answer;
+	private int _requesterId;
+	
+	@Override
+	protected void readImpl() {
+		_messageId = readD();
+		_answer = readD();
+		_requesterId = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final TerminateReturn term = EventDispatcher.getInstance().notifyEvent(new PlayerDlgAnswer(activeChar, _messageId, _answer, _requesterId), activeChar, TerminateReturn.class);
+		if ((term != null) && term.terminate()) {
+			return;
+		}
+		
+		if (_messageId == SystemMessageId.S1.getId()) {
+			if (activeChar.removeAction(PlayerAction.USER_ENGAGE)) {
+				if (customs().allowWedding()) {
+					activeChar.engageAnswer(_answer);
+				}
+			} else if (activeChar.removeAction(PlayerAction.ADMIN_COMMAND)) {
+				String cmd = activeChar.getAdminConfirmCmd();
+				activeChar.setAdminConfirmCmd(null);
+				if (_answer == 0) {
+					return;
+				}
+				String command = cmd.split(" ")[0];
+				IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
+				if (AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) {
+					if (general().gmAudit()) {
+						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", cmd, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
+					}
+					ach.useAdminCommand(cmd, activeChar);
+				}
+			}
+		} else if ((_messageId == SystemMessageId.RESURRECTION_REQUEST_BY_C1_FOR_S2_XP.getId()) || (_messageId == SystemMessageId.RESURRECT_USING_CHARM_OF_COURAGE.getId())) {
+			activeChar.reviveAnswer(_answer);
+		} else if (_messageId == SystemMessageId.C1_WISHES_TO_SUMMON_YOU_FROM_S2_DO_YOU_ACCEPT.getId()) {
+			final SummonRequestHolder holder = activeChar.removeScript(SummonRequestHolder.class);
+			if ((_answer == 1) && (holder != null) && holder.getRequester().canSummonTarget(activeChar) && (holder.getRequester().getObjectId() == _requesterId)) {
+				if ((holder.getItemId() != 0) && (holder.getItemCount() != 0)) {
+					if (activeChar.getInventory().getInventoryItemCount(holder.getItemId(), 0) < holder.getItemCount()) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_REQUIRED_FOR_SUMMONING);
+						sm.addItemName(holder.getItemId());
+						activeChar.sendPacket(sm);
+						return;
+					}
+					activeChar.getInventory().destroyItemByItemId("Consume", holder.getItemId(), holder.getItemCount(), activeChar, activeChar);
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+					sm.addItemName(holder.getItemId());
+					activeChar.sendPacket(sm);
+				}
+				activeChar.teleToLocation(holder.getRequester().getLocation(), true);
+			}
+		} else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_OPEN_THE_GATE.getId()) {
+			final DoorRequestHolder holder = activeChar.removeScript(DoorRequestHolder.class);
+			if ((holder != null) && (holder.getDoor() == activeChar.getTarget()) && (_answer == 1)) {
+				holder.getDoor().openMe();
+			}
+		} else if (_messageId == SystemMessageId.WOULD_YOU_LIKE_TO_CLOSE_THE_GATE.getId()) {
+			final DoorRequestHolder holder = activeChar.removeScript(DoorRequestHolder.class);
+			if ((holder != null) && (holder.getDoor() == activeChar.getTarget()) && (_answer == 1)) {
+				holder.getDoor().closeMe();
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C6_DLGANSWER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/DummyPacket.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/DummyPacket.java
new file mode 100644
index 00000000..d94069e2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/DummyPacket.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+/**
+ * @author zabbix
+ */
+public final class DummyPacket extends L2GameClientPacket {
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	public void runImpl() {
+		
+	}
+	
+	@Override
+	public String getType() {
+		return "DummyPacket";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java
new file mode 100644
index 00000000..93bfe195
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/EndScenePlayer.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author JIV
+ */
+public final class EndScenePlayer extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(EndScenePlayer.class);
+	
+	private static final String _C__D0_5B_ENDSCENEPLAYER = "[C] D0:5B EndScenePlayer";
+	
+	private int _movieId;
+	
+	@Override
+	protected void readImpl() {
+		_movieId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (_movieId == 0) {
+			return;
+		}
+		if (activeChar.getMovieId() != _movieId) {
+			LOG.warn("Player {} sent EndScenePlayer with wrong movie id: {}", getClient(), _movieId);
+			return;
+		}
+		activeChar.setMovieId(0);
+		activeChar.setIsTeleporting(true, false); // avoid to get player removed from L2World
+		activeChar.decayMe();
+		activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
+		activeChar.setIsTeleporting(false, false);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_5B_ENDSCENEPLAYER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
new file mode 100644
index 00000000..78f77f5b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
@@ -0,0 +1,581 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.SevenSigns.CABAL_NULL;
+import static com.l2jserver.gameserver.SevenSigns.SEAL_STRIFE;
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.vitality;
+import static com.l2jserver.gameserver.model.PcCondOverride.ZONE_CONDITIONS;
+import static com.l2jserver.gameserver.model.TeleportWhereType.TOWN;
+import static com.l2jserver.gameserver.model.skills.CommonSkill.THE_VANQUISHED_OF_WAR;
+import static com.l2jserver.gameserver.model.skills.CommonSkill.THE_VICTOR_OF_WAR;
+import static com.l2jserver.gameserver.model.zone.ZoneId.SIEGE;
+import static com.l2jserver.gameserver.network.L2GameClient.GameClientState.IN_GAME;
+import static com.l2jserver.gameserver.network.SystemMessageId.CLAN_MEMBERSHIP_TERMINATED;
+import static com.l2jserver.gameserver.network.SystemMessageId.CLAN_MEMBER_S1_LOGGED_IN;
+import static com.l2jserver.gameserver.network.SystemMessageId.FRIEND_S1_HAS_LOGGED_IN;
+import static com.l2jserver.gameserver.network.SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW;
+import static com.l2jserver.gameserver.network.SystemMessageId.THERE_ARE_S1_DAYS_UNTIL_YOUR_CHARACTERS_BIRTHDAY;
+import static com.l2jserver.gameserver.network.SystemMessageId.WELCOME_TO_LINEAGE;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOUR_APPRENTICE_S1_HAS_LOGGED_IN;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOUR_BIRTHDAY_GIFT_HAS_ARRIVED;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOUR_SPONSOR_C1_HAS_LOGGED_IN;
+
+import java.util.Base64;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.custom.AutoLootExtension;
+import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.CoupleManager;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.instancemanager.PetitionManager;
+import com.l2jserver.gameserver.instancemanager.SiegeManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Couple;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.FortSiege;
+import com.l2jserver.gameserver.model.entity.L2Event;
+import com.l2jserver.gameserver.model.entity.Siege;
+import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.Die;
+import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
+import com.l2jserver.gameserver.network.serverpackets.ExNoticePostArrived;
+import com.l2jserver.gameserver.network.serverpackets.ExNotifyPremiumItem;
+import com.l2jserver.gameserver.network.serverpackets.ExShowContactList;
+import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
+import com.l2jserver.gameserver.network.serverpackets.ExStorageMaxCount;
+import com.l2jserver.gameserver.network.serverpackets.ExUISetting;
+import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
+import com.l2jserver.gameserver.network.serverpackets.FriendList;
+import com.l2jserver.gameserver.network.serverpackets.HennaInfo;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListAll;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList;
+import com.l2jserver.gameserver.network.serverpackets.PledgeStatusChanged;
+import com.l2jserver.gameserver.network.serverpackets.QuestList;
+import com.l2jserver.gameserver.network.serverpackets.ShortCutInit;
+import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Enter World Packet Handler
+ * <p>
+ * <p>
+ * 0000: 03
+ * <p>
+ * packet format rev87 bddddbdcccccccccccccccccccc
+ * <p>
+ */
+public class EnterWorld extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(EnterWorld.class);
+	
+	private static final String _C__11_ENTERWORLD = "[C] 11 EnterWorld";
+	
+	private static final double MIN_HP = 0.5;
+	
+	private static final int COMBAT_FLAG = 9819;
+	
+	private final int[][] tracert = new int[5][4];
+	
+	@Override
+	protected void readImpl() {
+		readB(new byte[32]); // Unknown Byte Array
+		readD(); // Unknown Value
+		readD(); // Unknown Value
+		readD(); // Unknown Value
+		readD(); // Unknown Value
+		readB(new byte[32]); // Unknown Byte Array
+		readD(); // Unknown Value
+		for (int i = 0; i < 5; i++) {
+			for (int o = 0; o < 4; o++) {
+				tracert[i][o] = readC();
+			}
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			LOG.warn("EnterWorld failed! activeChar returned 'null'.");
+			getClient().closeNow();
+			return;
+		}
+		
+		final String[] address = new String[5];
+		for (int i = 0; i < 5; i++) {
+			address[i] = tracert[i][0] + "." + tracert[i][1] + "." + tracert[i][2] + "." + tracert[i][3];
+		}
+		
+		LoginServerThread.getInstance().sendClientTracert(activeChar.getAccountName(), address);
+		
+		getClient().setClientTracert(tracert);
+		
+		// Restore to instanced area if enabled
+		if (general().restorePlayerInstance()) {
+			activeChar.setInstanceId(InstanceManager.getInstance().getPlayerInstance(activeChar.getObjectId()));
+		} else {
+			int instanceId = InstanceManager.getInstance().getPlayerInstance(activeChar.getObjectId());
+			if (instanceId > 0) {
+				InstanceManager.getInstance().getInstance(instanceId).removePlayer(activeChar.getObjectId());
+			}
+		}
+		
+		if (general().debug()) {
+			if (L2World.getInstance().findObject(activeChar.getObjectId()) != null) {
+				LOG.warn("User already exists in Object ID map! User {} is a character clone.", activeChar.getName());
+			}
+		}
+		
+		getClient().setState(IN_GAME);
+		
+		// Apply special GM properties to the GM when entering
+		if (activeChar.isGM()) {
+			if (general().gmStartupInvulnerable() && AdminData.getInstance().hasAccess("admin_invul", activeChar.getAccessLevel())) {
+				activeChar.setIsInvul(true);
+			}
+			
+			if (general().gmStartupInvisible() && AdminData.getInstance().hasAccess("admin_invisible", activeChar.getAccessLevel())) {
+				activeChar.setInvisible(true);
+			}
+			
+			if (general().gmStartupSilence() && AdminData.getInstance().hasAccess("admin_silence", activeChar.getAccessLevel())) {
+				activeChar.setSilenceMode(true);
+			}
+			
+			if (general().gmStartupDietMode() && AdminData.getInstance().hasAccess("admin_diet", activeChar.getAccessLevel())) {
+				activeChar.setDietMode(true);
+				activeChar.refreshOverloaded();
+			}
+			
+			AdminData.getInstance().addGm(activeChar, !general().gmStartupAutoList() || !AdminData.getInstance().hasAccess("admin_gmliston", activeChar.getAccessLevel()));
+			
+			if (general().gmGiveSpecialSkills()) {
+				SkillTreesData.getInstance().addSkills(activeChar, false);
+			}
+			
+			if (general().gmGiveSpecialAuraSkills()) {
+				SkillTreesData.getInstance().addSkills(activeChar, true);
+			}
+		}
+		
+		// Set dead status if applies
+		if (activeChar.getCurrentHp() < MIN_HP) {
+			activeChar.setIsDead(true);
+		}
+		
+		boolean showClanNotice = false;
+		
+		// Clan related checks are here
+		final L2Clan clan = activeChar.getClan();
+		if (clan != null) {
+			activeChar.sendPacket(new PledgeSkillList(clan));
+			
+			notifyClanMembers(activeChar);
+			
+			notifySponsorOrApprentice(activeChar);
+			
+			final AuctionableHall clanHall = ClanHallManager.getInstance().getClanHallByOwner(clan);
+			if (clanHall != null) {
+				if (!clanHall.getPaid()) {
+					activeChar.sendPacket(PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
+				}
+			}
+			
+			for (Siege siege : SiegeManager.getInstance().getSieges()) {
+				if (!siege.isInProgress()) {
+					continue;
+				}
+				
+				if (siege.checkIsAttacker(clan)) {
+					activeChar.setSiegeState((byte) 1);
+					activeChar.setSiegeSide(siege.getCastle().getResidenceId());
+				} else if (siege.checkIsDefender(clan)) {
+					activeChar.setSiegeState((byte) 2);
+					activeChar.setSiegeSide(siege.getCastle().getResidenceId());
+				}
+			}
+			
+			for (FortSiege siege : FortSiegeManager.getInstance().getSieges()) {
+				if (!siege.isInProgress()) {
+					continue;
+				}
+				
+				if (siege.checkIsAttacker(clan)) {
+					activeChar.setSiegeState((byte) 1);
+					activeChar.setSiegeSide(siege.getFort().getResidenceId());
+				} else if (siege.checkIsDefender(clan)) {
+					activeChar.setSiegeState((byte) 2);
+					activeChar.setSiegeSide(siege.getFort().getResidenceId());
+				}
+			}
+			
+			for (SiegableHall hall : ClanHallSiegeManager.getInstance().getConquerableHalls().values()) {
+				if (!hall.isInSiege()) {
+					continue;
+				}
+				
+				if (hall.isRegistered(clan)) {
+					activeChar.setSiegeState((byte) 1);
+					activeChar.setSiegeSide(hall.getId());
+					activeChar.setIsInHideoutSiege(true);
+				}
+			}
+			
+			sendPacket(new PledgeShowMemberListAll(clan, activeChar));
+			sendPacket(new PledgeStatusChanged(clan));
+			
+			// Residential skills support
+			if (clan.getCastleId() > 0) {
+				CastleManager.getInstance().getCastleByOwner(clan).giveResidentialSkills(activeChar);
+			}
+			
+			if (clan.getFortId() > 0) {
+				FortManager.getInstance().getFortByOwner(clan).giveResidentialSkills(activeChar);
+			}
+			
+			showClanNotice = clan.isNoticeEnabled();
+		}
+		
+		if (TerritoryWarManager.getInstance().getRegisteredTerritoryId(activeChar) > 0) {
+			if (TerritoryWarManager.getInstance().isTWInProgress()) {
+				activeChar.setSiegeState((byte) 1);
+			}
+			activeChar.setSiegeSide(TerritoryWarManager.getInstance().getRegisteredTerritoryId(activeChar));
+		}
+		
+		// Updating Seal of Strife Buff/Debuff
+		if (SevenSigns.getInstance().isSealValidationPeriod() && (SevenSigns.getInstance().getSealOwner(SEAL_STRIFE) != CABAL_NULL)) {
+			final int cabal = SevenSigns.getInstance().getPlayerCabal(activeChar.getObjectId());
+			if (cabal != CABAL_NULL) {
+				if (cabal == SevenSigns.getInstance().getSealOwner(SEAL_STRIFE)) {
+					activeChar.addSkill(THE_VICTOR_OF_WAR.getSkill());
+				} else {
+					activeChar.addSkill(THE_VANQUISHED_OF_WAR.getSkill());
+				}
+			}
+		} else {
+			activeChar.removeSkill(THE_VICTOR_OF_WAR.getSkill());
+			activeChar.removeSkill(THE_VANQUISHED_OF_WAR.getSkill());
+		}
+		
+		if (vitality().enabled() && vitality().recoverVitalityOnReconnect()) {
+			float points = (vitality().getRateRecoveryOnReconnect() * (System.currentTimeMillis() - activeChar.getLastAccess())) / 60000;
+			if (points > 0) {
+				activeChar.updateVitalityPoints(points, false, true);
+			}
+		}
+		
+		activeChar.broadcastUserInfo();
+		
+		// Send keybinds
+		if (character().storeUISettings()) {
+			activeChar.sendPacket(new ExUISetting(activeChar));
+		}
+		
+		// Send Macro List
+		activeChar.getMacros().sendUpdate();
+		
+		// Send Item List
+		sendPacket(new ItemList(activeChar, false));
+		
+		// Send GG check
+		activeChar.queryGameGuard();
+		
+		// Send Teleport Bookmark List
+		sendPacket(new ExGetBookMarkInfoPacket(activeChar));
+		
+		// Send Shortcuts
+		sendPacket(new ShortCutInit(activeChar));
+		
+		// Send Action list
+		activeChar.sendPacket(ExBasicActionList.STATIC_PACKET);
+		
+		// Send Skill list
+		activeChar.sendSkillList();
+		
+		// Apply Dye
+		activeChar.recalcHennaStats();
+		
+		// Send Dye Information
+		activeChar.sendPacket(new HennaInfo(activeChar));
+		
+		Quest.playerEnter(activeChar);
+		
+		activeChar.sendPacket(new QuestList());
+		
+		if (character().getPlayerSpawnProtection() > 0) {
+			activeChar.setProtection(true);
+		}
+		
+		activeChar.spawnMe(activeChar.getX(), activeChar.getY(), activeChar.getZ());
+		
+		activeChar.getInventory().applyItemSkills();
+		
+		if (L2Event.isParticipant(activeChar)) {
+			L2Event.restorePlayerEventStatus(activeChar);
+		}
+		
+		// Wedding Checks
+		if (customs().allowWedding()) {
+			engage(activeChar);
+			notifyPartner(activeChar.getPartnerId());
+		}
+		
+		if (activeChar.isCursedWeaponEquipped()) {
+			CursedWeaponsManager.getInstance().getCursedWeapon(activeChar.getCursedWeaponEquippedId()).cursedOnLogin();
+		}
+		
+		activeChar.updateEffectIcons();
+		
+		activeChar.sendPacket(new EtcStatusUpdate(activeChar));
+		
+		// Expand Skill
+		activeChar.sendPacket(new ExStorageMaxCount(activeChar));
+		
+		sendPacket(new FriendList(activeChar));
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(FRIEND_S1_HAS_LOGGED_IN);
+		sm.addCharName(activeChar);
+		
+		if (activeChar.hasFriends()) {
+			for (int id : activeChar.getFriends()) {
+				final L2Object obj = L2World.getInstance().findObject(id);
+				if (obj != null) {
+					obj.sendPacket(sm);
+				}
+			}
+		}
+		
+		activeChar.sendPacket(WELCOME_TO_LINEAGE);
+		
+		activeChar.sendMessage(getText("VGhpcyBzZXJ2ZXIgdXNlcyBMMkosIGEgcHJvamVjdCBmb3VuZGVkIGJ5IEwyQ2hlZg"));
+		activeChar.sendMessage(getText("YW5kIGRldmVsb3BlZCBieSBMMkogVGVhbSBhdCB3d3cubDJqc2VydmVyLmNvbQ"));
+		activeChar.sendMessage(getText("Q29weXJpZ2h0IDIwMDQtMjAyNg"));
+		activeChar.sendMessage(getText("VGhhbmsgeW91IGZvciAyMiB5ZWFycyE"));
+		
+		SevenSigns.getInstance().sendCurrentPeriodMsg(activeChar);
+		AnnouncementsTable.getInstance().showAnnouncements(activeChar);
+		
+		if (showClanNotice) {
+			final NpcHtmlMessage notice = new NpcHtmlMessage();
+			notice.setFile(activeChar.getHtmlPrefix(), "data/html/clanNotice.htm");
+			notice.replace("%clan_name%", activeChar.getClan().getName());
+			notice.replace("%notice_text%", activeChar.getClan().getNotice());
+			notice.disableValidation();
+			sendPacket(notice);
+		} else if (general().showServerNews()) {
+			String serverNews = HtmCache.getInstance().getHtm(activeChar.getHtmlPrefix(), "data/html/servnews.htm");
+			if (serverNews != null) {
+				sendPacket(new NpcHtmlMessage(serverNews));
+			}
+		}
+		
+		if (character().petitioningAllowed()) {
+			PetitionManager.getInstance().checkPetitionMessages(activeChar);
+		}
+		
+		if (activeChar.isAlikeDead()) // dead or fake dead
+		{
+			// no broadcast needed since the player will already spawn dead to others
+			sendPacket(new Die(activeChar));
+		}
+		
+		activeChar.onPlayerEnter();
+		
+		sendPacket(new SkillCoolTime(activeChar));
+		sendPacket(new ExVoteSystemInfo(activeChar));
+		sendPacket(new ExShowContactList(activeChar));
+		
+		for (L2ItemInstance item : activeChar.getInventory().getItems()) {
+			if (item.isTimeLimitedItem()) {
+				item.scheduleLifeTimeTask();
+			}
+			if (item.isShadowItem() && item.isEquipped()) {
+				item.decreaseMana(false);
+			}
+		}
+		
+		for (L2ItemInstance whItem : activeChar.getWarehouse().getItems()) {
+			if (whItem.isTimeLimitedItem()) {
+				whItem.scheduleLifeTimeTask();
+			}
+		}
+		
+		if (DimensionalRiftManager.getInstance().checkIfInRiftZone(activeChar.getX(), activeChar.getY(), activeChar.getZ(), false)) {
+			DimensionalRiftManager.getInstance().teleportToWaitingRoom(activeChar);
+		}
+		
+		if (activeChar.getClanJoinExpiryTime() > System.currentTimeMillis()) {
+			activeChar.sendPacket(CLAN_MEMBERSHIP_TERMINATED);
+		}
+		
+		// remove combat flag before teleporting
+		final L2ItemInstance combatFlag = activeChar.getInventory().getItemByItemId(COMBAT_FLAG);
+		if (combatFlag != null) {
+			final Fort fort = FortManager.getInstance().getFort(activeChar);
+			if (fort != null) {
+				FortSiegeManager.getInstance().dropCombatFlag(activeChar, fort.getResidenceId());
+			} else {
+				final int slot = activeChar.getInventory().getSlotFromItem(combatFlag);
+				activeChar.getInventory().unEquipItemInBodySlot(slot);
+				activeChar.destroyItem("CombatFlag", combatFlag, null, true);
+			}
+		}
+		
+		// Attacker or spectator logging in to a siege zone.
+		// Actually should be checked for inside castle only?
+		if (!activeChar.canOverrideCond(ZONE_CONDITIONS) && activeChar.isInsideZone(SIEGE) && (!activeChar.isInSiege() || (activeChar.getSiegeState() < 2))) {
+			activeChar.teleToLocation(TOWN);
+		}
+		
+		if (general().allowMail()) {
+			if (MailManager.getInstance().hasUnreadPost(activeChar)) {
+				sendPacket(ExNoticePostArrived.valueOf(false));
+			}
+		}
+		
+		TvTEvent.onLogin(activeChar);
+		
+		// Auto Loot Extension.
+		AutoLootExtension.onLogin(activeChar);
+		
+		if (customs().screenWelcomeMessageEnable()) {
+			activeChar.sendPacket(new ExShowScreenMessage(customs().getScreenWelcomeMessageText(), (int) customs().getScreenWelcomeMessageTime()));
+		}
+		
+		final int birthday = activeChar.checkBirthDay();
+		if (birthday == 0) {
+			activeChar.sendPacket(YOUR_BIRTHDAY_GIFT_HAS_ARRIVED);
+			// activeChar.sendPacket(new ExBirthdayPopup()); Removed in H5?
+		} else if (birthday != -1) {
+			final SystemMessage sm1 = SystemMessage.getSystemMessage(THERE_ARE_S1_DAYS_UNTIL_YOUR_CHARACTERS_BIRTHDAY);
+			sm1.addInt(birthday);
+			activeChar.sendPacket(sm1);
+		}
+		
+		if (!activeChar.getPremiumItemList().isEmpty()) {
+			activeChar.sendPacket(ExNotifyPremiumItem.STATIC_PACKET);
+		}
+		
+		// Unstuck players that had client open when server crashed.
+		activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+	}
+	
+	private static void engage(L2PcInstance cha) {
+		final int chaId = cha.getObjectId();
+		for (Couple cl : CoupleManager.getInstance().getCouples()) {
+			if ((cl.getPlayer1Id() == chaId) || (cl.getPlayer2Id() == chaId)) {
+				if (cl.getMarried()) {
+					cha.setMarried(true);
+				}
+				
+				cha.setCoupleId(cl.getId());
+				
+				if (cl.getPlayer1Id() == chaId) {
+					cha.setPartnerId(cl.getPlayer2Id());
+				} else {
+					cha.setPartnerId(cl.getPlayer1Id());
+				}
+			}
+		}
+	}
+	
+	private static void notifyPartner(int partnerId) {
+		final L2PcInstance partner = L2World.getInstance().getPlayer(partnerId);
+		if (partner != null) {
+			partner.sendMessage("Your partner has logged in.");
+		}
+	}
+	
+	private static void notifyClanMembers(L2PcInstance activeChar) {
+		final L2Clan clan = activeChar.getClan();
+		if (clan != null) {
+			clan.getClanMember(activeChar.getObjectId()).setPlayerInstance(activeChar);
+			
+			final SystemMessage msg = SystemMessage.getSystemMessage(CLAN_MEMBER_S1_LOGGED_IN);
+			msg.addString(activeChar.getName());
+			clan.broadcastToOtherOnlineMembers(msg, activeChar);
+			clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListUpdate(activeChar), activeChar);
+		}
+	}
+	
+	private static void notifySponsorOrApprentice(L2PcInstance activeChar) {
+		if (activeChar.getSponsor() != 0) {
+			final L2PcInstance sponsor = L2World.getInstance().getPlayer(activeChar.getSponsor());
+			if (sponsor != null) {
+				final SystemMessage msg = SystemMessage.getSystemMessage(YOUR_APPRENTICE_S1_HAS_LOGGED_IN);
+				msg.addString(activeChar.getName());
+				sponsor.sendPacket(msg);
+			}
+		} else if (activeChar.getApprentice() != 0) {
+			final L2PcInstance apprentice = L2World.getInstance().getPlayer(activeChar.getApprentice());
+			if (apprentice != null) {
+				final SystemMessage msg = SystemMessage.getSystemMessage(YOUR_SPONSOR_C1_HAS_LOGGED_IN);
+				msg.addString(activeChar.getName());
+				apprentice.sendPacket(msg);
+			}
+		}
+	}
+	
+	private static String getText(String string) {
+		return new String(Base64.getDecoder().decode(string));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__11_ENTERWORLD;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/ExGetOnAirShip.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ExGetOnAirShip.java
new file mode 100644
index 00000000..e6612a98
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ExGetOnAirShip.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Format: (c) dddd d: dx d: dy d: dz d: AirShip id ??
+ * @author -Wooden-
+ */
+public class ExGetOnAirShip extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(ExGetOnAirShip.class);
+	
+	private static final String _C__D0_36_EXGETONAIRSHIP = "[C] D0:36 ExGetOnAirShip";
+	
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _shipId;
+	
+	@Override
+	protected void readImpl() {
+		_x = readD();
+		_y = readD();
+		_z = readD();
+		_shipId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		LOG.info("x: {}", _x);
+		LOG.info("y: {}", _y);
+		LOG.info("z: {}", _z);
+		LOG.info("ship ID: {}", _shipId);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_36_EXGETONAIRSHIP;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/FinishRotating.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/FinishRotating.java
new file mode 100644
index 00000000..5ca2aa52
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/FinishRotating.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.StopRotation;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class FinishRotating extends L2GameClientPacket {
+	private static final String _C__5C_FINISHROTATING = "[C] 5C FinishRotating";
+	
+	private int _degree;
+	@SuppressWarnings("unused")
+	private int _unknown;
+	
+	@Override
+	protected void readImpl() {
+		_degree = readD();
+		_unknown = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		StopRotation sr;
+		if (activeChar.isInAirShip() && activeChar.getAirShip().isCaptain(activeChar)) {
+			activeChar.getAirShip().setHeading(_degree);
+			sr = new StopRotation(activeChar.getAirShip().getObjectId(), _degree, 0);
+			activeChar.getAirShip().broadcastPacket(sr);
+		} else {
+			sr = new StopRotation(activeChar.getObjectId(), _degree, 0);
+			activeChar.broadcastPacket(sr);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__5C_FINISHROTATING;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java
new file mode 100644
index 00000000..a8aabd47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/GameGuardReply.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Format: c dddd
+ * @author KenM
+ */
+public class GameGuardReply extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(GameGuardReply.class);
+	
+	private static final String _C__CB_GAMEGUARDREPLY = "[C] CB GameGuardReply";
+	
+	private static final byte[] VALID = {
+		(byte) 0x88,
+		0x40,
+		0x1c,
+		(byte) 0xa7,
+		(byte) 0x83,
+		0x42,
+		(byte) 0xe9,
+		0x15,
+		(byte) 0xde,
+		(byte) 0xc3,
+		0x68,
+		(byte) 0xf6,
+		0x2d,
+		0x23,
+		(byte) 0xf1,
+		0x3f,
+		(byte) 0xee,
+		0x68,
+		0x5b,
+		(byte) 0xc5,
+	};
+	
+	private final byte[] _reply = new byte[8];
+	
+	@Override
+	protected void readImpl() {
+		readB(_reply, 0, 4);
+		readD();
+		readB(_reply, 4, 4);
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2GameClient client = getClient();
+		try {
+			MessageDigest md = MessageDigest.getInstance("SHA");
+			byte[] result = md.digest(_reply);
+			if (Arrays.equals(result, VALID)) {
+				client.setGameGuardOk(true);
+			}
+		} catch (NoSuchAlgorithmException e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__CB_GAMEGUARDREPLY;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java
new file mode 100644
index 00000000..5c53b705
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.nio.BufferUnderflowException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.mmocore.ReceivablePacket;
+
+/**
+ * Packets received by the game server from clients
+ * @author KenM
+ */
+public abstract class L2GameClientPacket extends ReceivablePacket<L2GameClient> {
+	private static final Logger LOG = LoggerFactory.getLogger(L2GameClientPacket.class);
+	
+	static final int MAX_ITEM_IN_PACKET = Math.max(character().getMaximumSlotsForNoDwarf(), //
+		Math.max(character().getMaximumSlotsForDwarf(), //
+			character().getMaximumSlotsForGMPlayer()));
+	
+	@Override
+	public boolean read() {
+		try {
+			readImpl();
+			return true;
+		} catch (Exception e) {
+			LOG.error("Client: {} - Failed reading: {} ; {}", getClient().toString(), getType(), e.getMessage(), e);
+			
+			if (e instanceof BufferUnderflowException) {
+				getClient().onBufferUnderflow();
+			}
+		}
+		return false;
+	}
+	
+	protected abstract void readImpl();
+	
+	@Override
+	public void run() {
+		try {
+			runImpl();
+			
+			/*
+			 * Removes onspawn protection - player has faster computer than average Since GE: True for all packets except RequestItemList and UseItem (in case the item is a Scroll of Escape (736)
+			 */
+			if (triggersOnActionRequest()) {
+				final L2PcInstance actor = getClient().getActiveChar();
+				if ((actor != null) && (actor.isSpawnProtected() || actor.isInvul())) {
+					actor.onActionRequest();
+					if (general().debug()) {
+						LOG.info("Spawn protection for player {} removed by packet: {}", actor.getName(), getType());
+					}
+				}
+			}
+		} catch (Throwable t) {
+			LOG.error("Client: {} - Failed running: {} ; {}", getClient().toString(), getType(), t.getMessage(), t);
+			// in case of EnterWorld error kick player from game
+			if (this instanceof EnterWorld) {
+				getClient().closeNow();
+			}
+		}
+	}
+	
+	protected abstract void runImpl();
+	
+	/**
+	 * Sends a game server packet to the client.
+	 * @param gsp the game server packet
+	 */
+	protected final void sendPacket(L2GameServerPacket gsp) {
+		getClient().sendPacket(gsp);
+	}
+	
+	/**
+	 * Sends a system message to the client.
+	 * @param id the system message id
+	 */
+	public void sendPacket(SystemMessageId id) {
+		sendPacket(SystemMessage.getSystemMessage(id));
+	}
+	
+	/**
+	 * @return A String with this packet name for debugging purposes
+	 */
+	public abstract String getType();
+	
+	/**
+	 * Overridden with true value on some packets that should disable spawn protection (RequestItemList and UseItem only)
+	 */
+	protected boolean triggersOnActionRequest() {
+		return true;
+	}
+	
+	/**
+	 * @return the active player if it exists, otherwise null.
+	 */
+	protected final L2PcInstance getActiveChar() {
+		return getClient().getActiveChar();
+	}
+	
+	protected final void sendActionFailed() {
+		if (getClient() != null) {
+			getClient().sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/Logout.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Logout.java
new file mode 100644
index 00000000..91796c8f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Logout.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.L2Event;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * Logout client packet.
+ * @since 2005/03/27 15:29:30
+ */
+public final class Logout extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(Logout.class);
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	private static final String _C__00_LOGOUT = "[C] 00 Logout";
+	
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if ((player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (player.getActiveEnchantAttrItemId() != L2PcInstance.ID_NONE)) {
+			if (general().debug()) {
+				LOG.debug("Player {} tried to logout while enchanting.", player.getName());
+			}
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isLocked()) {
+			LOG.warn("Player {} tried to logout during class change.", player.getName());
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Don't allow leaving if player is fighting
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player)) {
+			if (player.isGM() && general().gmRestartFighting()) {
+				return;
+			}
+			
+			if (general().debug()) {
+				LOG.debug("Player {} tried to logout while fighting.", player.getName());
+			}
+			
+			player.sendPacket(SystemMessageId.CANT_LOGOUT_WHILE_FIGHTING);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (L2Event.isParticipant(player)) {
+			player.sendMessage("A superior power doesn't allow you to leave the event.");
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Prevent player from logging out if they are a festival participant
+		// and it is in progress, otherwise notify party members that the player
+		// is not longer a participant.
+		if (player.isFestivalParticipant()) {
+			if (SevenSignsFestival.getInstance().isFestivalInitialized()) {
+				player.sendMessage("You cannot log out while you are a participant in a Festival.");
+				player.sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if (player.isInParty()) {
+				player.getParty().broadcastPacket(SystemMessage.sendString(player.getName() + " has been removed from the upcoming Festival."));
+			}
+		}
+		
+		// Remove player from Boss Zone
+		player.removeFromBossZone();
+		
+		LOG_ACCOUNTING.info("Client {} logged out.", getClient());
+		
+		player.logout();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__00_LOGOUT;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java
new file mode 100644
index 00000000..9849646b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveBackwardToLocation.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import java.nio.BufferUnderflowException;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.StopMove;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public class MoveBackwardToLocation extends L2GameClientPacket {
+	private static final String _C__0F_MOVEBACKWARDTOLOC = "[C] 0F MoveBackwardToLoc";
+	
+	// cdddddd
+	private int _targetX;
+	private int _targetY;
+	private int _targetZ;
+	private int _originX;
+	private int _originY;
+	private int _originZ;
+	
+	@SuppressWarnings("unused")
+	private int _moveMovement;
+	
+	@Override
+	protected void readImpl() {
+		_targetX = readD();
+		_targetY = readD();
+		_targetZ = readD();
+		_originX = readD();
+		_originY = readD();
+		_originZ = readD();
+		try {
+			_moveMovement = readD(); // is 0 if cursor keys are used 1 if mouse is used
+		} catch (BufferUnderflowException e) {
+			if (customs().l2WalkerProtection()) {
+				L2PcInstance activeChar = getClient().getActiveChar();
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is trying to use L2Walker and got kicked.");
+			}
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((character().getNpcTalkBlockingTime() > 0) && !activeChar.isGM() && (activeChar.getNotMoveUntil() > System.currentTimeMillis())) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if ((_targetX == _originX) && (_targetY == _originY) && (_targetZ == _originZ)) {
+			activeChar.sendPacket(new StopMove(activeChar));
+			return;
+		}
+		
+		// Correcting targetZ from floor level to head level (?)
+		// Client is giving floor level as targetZ but that floor level doesn't
+		// match our current geodata and teleport coords as good as head level!
+		// L2J uses floor, not head level as char coordinates. This is some
+		// sort of incompatibility fix.
+		// Validate position packets sends head level.
+		_targetZ += activeChar.getTemplate().getCollisionHeight();
+		
+		if (activeChar.getTeleMode() > 0) {
+			if (activeChar.getTeleMode() == 1) {
+				activeChar.setTeleMode(0);
+			}
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			activeChar.teleToLocation(new Location(_targetX, _targetY, _targetZ));
+			return;
+		}
+		
+		double dx = _targetX - activeChar.getX();
+		double dy = _targetY - activeChar.getY();
+		// Can't move if character is confused, or trying to move a huge distance
+		if (activeChar.isOutOfControl() || (((dx * dx) + (dy * dy)) > 98010000)) // 9900*9900
+		{
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_targetX, _targetY, _targetZ));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__0F_MOVEBACKWARDTOLOC;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationAirShip.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationAirShip.java
new file mode 100644
index 00000000..d6b8584f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationAirShip.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.instancemanager.AirShipManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.VehiclePathPoint;
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public class MoveToLocationAirShip extends L2GameClientPacket {
+	private static final String _C__D0_38_MOVETOLOCATIONAIRSHIP = "[C] D0:38 MoveToLocationAirShip";
+	
+	public static final int MIN_Z = -895;
+	public static final int MAX_Z = 6105;
+	public static final int STEP = 300;
+	
+	private int _command;
+	private int _param1;
+	private int _param2 = 0;
+	
+	@Override
+	protected void readImpl() {
+		_command = readD();
+		_param1 = readD();
+		if (_buf.remaining() > 0) {
+			_param2 = readD();
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!activeChar.isInAirShip()) {
+			return;
+		}
+		
+		final L2AirShipInstance ship = activeChar.getAirShip();
+		if (!ship.isCaptain(activeChar)) {
+			return;
+		}
+		
+		int z = ship.getZ();
+		switch (_command) {
+			case 0 -> {
+				if (!ship.canBeControlled()) {
+					return;
+				}
+				if (_param1 < L2World.GRACIA_MAX_X) {
+					ship.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(_param1, _param2, z));
+				}
+			}
+			case 1 -> {
+				if (!ship.canBeControlled()) {
+					return;
+				}
+				ship.getAI().setIntention(CtrlIntention.AI_INTENTION_ACTIVE);
+			}
+			case 2 -> {
+				if (!ship.canBeControlled()) {
+					return;
+				}
+				if (z < L2World.GRACIA_MAX_Z) {
+					z = Math.min(z + STEP, L2World.GRACIA_MAX_Z);
+					ship.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(ship.getX(), ship.getY(), z));
+				}
+			}
+			case 3 -> {
+				if (!ship.canBeControlled()) {
+					return;
+				}
+				if (z > L2World.GRACIA_MIN_Z) {
+					z = Math.max(z - STEP, L2World.GRACIA_MIN_Z);
+					ship.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(ship.getX(), ship.getY(), z));
+				}
+			}
+			case 4 -> {
+				if (!ship.isInDock() || ship.isMoving()) {
+					return;
+				}
+				final VehiclePathPoint[] dst = AirShipManager.getInstance().getTeleportDestination(ship.getDockId(), _param1);
+				if (dst == null) {
+					return;
+				}
+				// Consume fuel, if needed
+				final int fuelConsumption = AirShipManager.getInstance().getFuelConsumption(ship.getDockId(), _param1);
+				if (fuelConsumption > 0) {
+					if (fuelConsumption > ship.getFuel()) {
+						activeChar.sendPacket(SystemMessageId.THE_AIRSHIP_CANNOT_TELEPORT);
+						return;
+					}
+					ship.setFuel(ship.getFuel() - fuelConsumption);
+				}
+				ship.executePath(dst);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_38_MOVETOLOCATIONAIRSHIP;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationInAirShip.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationInAirShip.java
new file mode 100644
index 00000000..893ca3fd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveToLocationInAirShip.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExMoveToLocationInAirShip;
+import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
+
+/**
+ * format: ddddddd X:%d Y:%d Z:%d OriginX:%d OriginY:%d OriginZ:%d
+ * @author GodKratos
+ */
+public class MoveToLocationInAirShip extends L2GameClientPacket {
+	private static final String _C__D0_20_MOVETOLOCATIONINAIRSHIP = "[C] D0:20 MoveToLocationInAirShip";
+	
+	private int _shipId;
+	private int _targetX;
+	private int _targetY;
+	private int _targetZ;
+	private int _originX;
+	private int _originY;
+	private int _originZ;
+	
+	@Override
+	protected void readImpl() {
+		_shipId = readD();
+		_targetX = readD();
+		_targetY = readD();
+		_targetZ = readD();
+		_originX = readD();
+		_originY = readD();
+		_originZ = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_targetX == _originX) && (_targetY == _originY) && (_targetZ == _originZ)) {
+			activeChar.sendPacket(new StopMoveInVehicle(activeChar, _shipId));
+			return;
+		}
+		
+		if (activeChar.isAttackingNow() && (activeChar.getActiveWeaponItem() != null) && (activeChar.getActiveWeaponItem().getItemType() == WeaponType.BOW)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.isSitting() || activeChar.isMovementDisabled()) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!activeChar.isInAirShip()) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final L2AirShipInstance airShip = activeChar.getAirShip();
+		if (airShip.getObjectId() != _shipId) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		activeChar.setInVehiclePosition(new Location(_targetX, _targetY, _targetZ));
+		activeChar.broadcastPacket(new ExMoveToLocationInAirShip(activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_20_MOVETOLOCATIONINAIRSHIP;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveWithDelta.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveWithDelta.java
new file mode 100644
index 00000000..2f7216bb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MoveWithDelta.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+/**
+ * Format: (c) ddd d: dx d: dy d: dz
+ * @author -Wooden-
+ */
+public class MoveWithDelta extends L2GameClientPacket {
+	private static final String _C__52_MOVEWITHDELTA = "[C] 52 MoveWithDelta";
+	
+	@SuppressWarnings("unused")
+	private int _dx;
+	@SuppressWarnings("unused")
+	private int _dy;
+	@SuppressWarnings("unused")
+	private int _dz;
+	
+	@Override
+	protected void readImpl() {
+		_dx = readD();
+		_dy = readD();
+		_dz = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// TODO this
+	}
+	
+	@Override
+	public String getType() {
+		return _C__52_MOVEWITHDELTA;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java
new file mode 100644
index 00000000..c5eed1f2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java
@@ -0,0 +1,407 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.MultisellData;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.L2Augmentation;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.multisell.Entry;
+import com.l2jserver.gameserver.model.multisell.Ingredient;
+import com.l2jserver.gameserver.model.multisell.PreparedListContainer;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * The Class MultiSellChoose.
+ */
+public class MultiSellChoose extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(MultiSellChoose.class);
+	
+	private static final String _C__B0_MULTISELLCHOOSE = "[C] B0 MultiSellChoose";
+	
+	private int _listId;
+	private int _entryId;
+	private long _amount;
+	@SuppressWarnings("unused")
+	private int _unk1;
+	@SuppressWarnings("unused")
+	private int _unk2;
+	@SuppressWarnings("unused")
+	private int _unk3;
+	@SuppressWarnings("unused")
+	private int _unk4;
+	@SuppressWarnings("unused")
+	private int _unk5;
+	@SuppressWarnings("unused")
+	private int _unk6;
+	@SuppressWarnings("unused")
+	private int _unk7;
+	@SuppressWarnings("unused")
+	private int _unk8;
+	@SuppressWarnings("unused")
+	private int _unk9;
+	@SuppressWarnings("unused")
+	private int _unk10;
+	@SuppressWarnings("unused")
+	private int _unk11;
+	
+	@Override
+	protected void readImpl() {
+		_listId = readD();
+		_entryId = readD();
+		_amount = readQ();
+		_unk1 = readH();
+		_unk2 = readD();
+		_unk3 = readD();
+		_unk4 = readH(); // elemental attributes
+		_unk5 = readH(); // elemental attributes
+		_unk6 = readH(); // elemental attributes
+		_unk7 = readH(); // elemental attributes
+		_unk8 = readH(); // elemental attributes
+		_unk9 = readH(); // elemental attributes
+		_unk10 = readH(); // elemental attributes
+		_unk11 = readH(); // elemental attributes
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getMultiSell().tryPerformAction("multisell choose")) {
+			player.setMultiSell(null);
+			return;
+		}
+		
+		if ((_amount < 1) || (_amount > 5000)) {
+			player.setMultiSell(null);
+			return;
+		}
+		
+		PreparedListContainer list = player.getMultiSell();
+		if ((list == null) || (list.getListId() != _listId)) {
+			player.setMultiSell(null);
+			return;
+		}
+		
+		final L2Npc npc = player.getLastFolkNPC();
+		if (((npc != null) && !list.isNpcAllowed(npc.getId())) || ((npc == null) && list.isNpcOnly())) {
+			player.setMultiSell(null);
+			return;
+		}
+		
+		if (!player.isGM() && (npc != null)) {
+			if (!player.isInsideRadius(npc, INTERACTION_DISTANCE, true, false) || (player.getInstanceId() != npc.getInstanceId())) {
+				player.setMultiSell(null);
+				return;
+			}
+		}
+		
+		for (Entry entry : list.getEntries()) {
+			if (entry.getEntryId() == _entryId) {
+				if (!entry.isStackable() && (_amount > 1)) {
+					LOG.error("Character: {} is trying to set amount > 1 on non-stackable multisell, id:{}:{}", player.getName(), _listId, _entryId);
+					player.setMultiSell(null);
+					return;
+				}
+				
+				final PcInventory inv = player.getInventory();
+				
+				int slots = 0;
+				int weight = 0;
+				for (Ingredient e : entry.getProducts()) {
+					if (e.getItemId() < 0) {
+						continue;
+					}
+					
+					if (!e.isStackable()) {
+						slots += e.getItemCount() * _amount;
+					} else if (player.getInventory().getItemByItemId(e.getItemId()) == null) {
+						slots++;
+					}
+					weight += e.getItemCount() * _amount * e.getWeight();
+				}
+				
+				if (!inv.validateWeight(weight)) {
+					player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+					return;
+				}
+				
+				if (!inv.validateCapacity(slots)) {
+					player.sendPacket(SystemMessageId.SLOTS_FULL);
+					return;
+				}
+				
+				ArrayList<Ingredient> ingredientsList = new ArrayList<>(entry.getIngredients().size());
+				// Generate a list of distinct ingredients and counts in order to check if the correct item-counts
+				// are possessed by the player
+				boolean newIng;
+				for (Ingredient e : entry.getIngredients()) {
+					newIng = true;
+					// at this point, the template has already been modified so that enchantments are properly included
+					// whenever they need to be applied. Uniqueness of items is thus judged by item id AND enchantment level
+					for (int i = ingredientsList.size(); --i >= 0;) {
+						Ingredient ex = ingredientsList.get(i);
+						// if the item was already added in the list, merely increment the count
+						// this happens if 1 list entry has the same ingredient twice (example 2 swords = 1 dual)
+						if ((ex.getItemId() == e.getItemId()) && (ex.getEnchantLevel() == e.getEnchantLevel())) {
+							if ((ex.getItemCount() + e.getItemCount()) > Integer.MAX_VALUE) {
+								player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED);
+								return;
+							}
+							// two same ingredients, merge into one and replace old
+							final Ingredient ing = ex.getCopy();
+							ing.setItemCount(ex.getItemCount() + e.getItemCount());
+							ingredientsList.set(i, ing);
+							newIng = false;
+							break;
+						}
+					}
+					if (newIng) {
+						// if it's a new ingredient, just store its info directly (item id, count, enchantment)
+						ingredientsList.add(e);
+					}
+				}
+				
+				// now check if the player has sufficient items in the inventory to cover the ingredients' expences
+				for (Ingredient e : ingredientsList) {
+					if ((e.getItemCount() * _amount) > Integer.MAX_VALUE) {
+						player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED);
+						return;
+					}
+					if (e.getItemId() < 0) {
+						if (!MultisellData.hasSpecialIngredient(e.getItemId(), e.getItemCount() * _amount, player)) {
+							return;
+						}
+					} else {
+						// if this is not a list that maintains enchantment, check the count of all items that have the given id.
+						// otherwise, check only the count of items with exactly the needed enchantment level
+						final long required = ((character().blacksmithUseRecipes() || !e.getMaintainIngredient()) ? (e.getItemCount() * _amount) : e.getItemCount());
+						if (inv.getInventoryItemCount(e.getItemId(), list.getMaintainEnchantment() ? e.getEnchantLevel() : -1, false) < required) {
+							SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_UNIT_OF_THE_ITEM_S1_REQUIRED);
+							sm.addItemName(e.getTemplate());
+							sm.addLong(required);
+							player.sendPacket(sm);
+							return;
+						}
+					}
+				}
+				
+				List<L2Augmentation> augmentation = new ArrayList<>();
+				Elementals[] elemental = null;
+				// All ok, remove items and add final product
+				for (Ingredient e : entry.getIngredients()) {
+					if (e.getItemId() < 0) {
+						if (!MultisellData.takeSpecialIngredient(e.getItemId(), e.getItemCount() * _amount, player)) {
+							return;
+						}
+					} else {
+						L2ItemInstance itemToTake = inv.getItemByItemId(e.getItemId()); // initialize and initial guess for the item to take.
+						if (itemToTake == null) { // this is a cheat, transaction will be aborted and if any items already taken will not be returned back to inventory!
+							LOG.error("Character: {} is trying to cheat in multisell, id:{}:{}", player.getName(), _listId, _entryId);
+							player.setMultiSell(null);
+							return;
+						}
+						
+						// if (itemToTake.isEquipped())
+						// {
+						// this is a cheat, transaction will be aborted and if any items already taken will not be returned back to inventory!
+						// _log.severe("Character: " + player.getName() + " is trying to cheat in multisell, exchanging equipped item, merchatnt id:" + merchant.getNpcId());
+						// player.setMultiSell(null);
+						// return;
+						// }
+						
+						if (character().blacksmithUseRecipes() || !e.getMaintainIngredient()) {
+							// if it's a stackable item, just reduce the amount from the first (only) instance that is found in the inventory
+							if (itemToTake.isStackable()) {
+								if (!player.destroyItem("Multisell", itemToTake.getObjectId(), (e.getItemCount() * _amount), player.getTarget(), true)) {
+									player.setMultiSell(null);
+									return;
+								}
+							} else {
+								// for non-stackable items, one of two scenaria are possible:
+								// a) list maintains enchantment: get the instances that exactly match the requested enchantment level
+								// b) list does not maintain enchantment: get the instances with the LOWEST enchantment level
+								
+								// a) if enchantment is maintained, then get a list of items that exactly match this enchantment
+								if (list.getMaintainEnchantment()) {
+									// loop through this list and remove (one by one) each item until the required amount is taken.
+									L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), e.getEnchantLevel(), false);
+									for (int i = 0; i < (e.getItemCount() * _amount); i++) {
+										if (inventoryContents[i].isAugmented()) {
+											augmentation.add(inventoryContents[i].getAugmentation());
+										}
+										if (inventoryContents[i].getElementals() != null) {
+											elemental = inventoryContents[i].getElementals();
+										}
+										if (!player.destroyItem("Multisell", inventoryContents[i].getObjectId(), 1, player.getTarget(), true)) {
+											player.setMultiSell(null);
+											return;
+										}
+									}
+								} else
+								// b) enchantment is not maintained. Get the instances with the LOWEST enchantment level
+								{
+									// NOTE: There are 2 ways to achieve the above goal.
+									// 1) Get all items that have the correct itemId, loop through them until the lowest enchantment
+									// level is found. Repeat all this for the next item until proper count of items is reached.
+									// 2) Get all items that have the correct itemId, sort them once based on enchantment level,
+									// and get the range of items that is necessary.
+									// Method 1 is faster for a small number of items to be exchanged.
+									// Method 2 is faster for large amounts.
+									//
+									// EXPLANATION:
+									// Worst case scenario for algorithm 1 will make it run in a number of cycles given by:
+									// m*(2n-m+1)/2 where m is the number of items to be exchanged and n is the total
+									// number of inventory items that have a matching id.
+									// With algorithm 2 (sort), sorting takes n*log(n) time and the choice is done in a single cycle
+									// for case b (just grab the m first items) or in linear time for case a (find the beginning of items
+									// with correct enchantment, index x, and take all items from x to x+m).
+									// Basically, whenever m > log(n) we have: m*(2n-m+1)/2 = (2nm-m*m+m)/2 >
+									// (2nlogn-logn*logn+logn)/2 = nlog(n) - log(n*n) + log(n) = nlog(n) + log(n/n*n) =
+									// nlog(n) + log(1/n) = nlog(n) - log(n) = (n-1)log(n)
+									// So for m < log(n) then m*(2n-m+1)/2 > (n-1)log(n) and m*(2n-m+1)/2 > nlog(n)
+									//
+									// IDEALLY:
+									// In order to best optimize the performance, choose which algorithm to run, based on whether 2^m > n
+									// if ( (2<<(e.getItemCount()// _amount)) < inventoryContents.length )
+									// // do Algorithm 1, no sorting
+									// else
+									// // do Algorithm 2, sorting
+									//
+									// CURRENT IMPLEMENTATION:
+									// In general, it is going to be very rare for a person to do a massive exchange of non-stackable items
+									// For this reason, we assume that algorithm 1 will always suffice and we keep things simple.
+									// If, in the future, it becomes necessary that we optimize, the above discussion should make it clear
+									// what optimization exactly is necessary (based on the comments under "IDEALLY").
+									//
+									
+									// choice 1. Small number of items exchanged. No sorting.
+									for (int i = 1; i <= (e.getItemCount() * _amount); i++) {
+										L2ItemInstance[] inventoryContents = inv.getAllItemsByItemId(e.getItemId(), false);
+										
+										itemToTake = inventoryContents[0];
+										// get item with the LOWEST enchantment level from the inventory...
+										// +0 is lowest by default...
+										if (itemToTake.getEnchantLevel() > 0) {
+											for (L2ItemInstance item : inventoryContents) {
+												if (item.getEnchantLevel() < itemToTake.getEnchantLevel()) {
+													itemToTake = item;
+													// nothing will have enchantment less than 0. If a zero-enchanted
+													// item is found, just take it
+													if (itemToTake.getEnchantLevel() == 0) {
+														break;
+													}
+												}
+											}
+										}
+										if (!player.destroyItem("Multisell", itemToTake.getObjectId(), 1, player.getTarget(), true)) {
+											player.setMultiSell(null);
+											return;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+				
+				// Generate the appropriate items
+				for (Ingredient e : entry.getProducts()) {
+					if (e.getItemId() < 0) {
+						MultisellData.giveSpecialProduct(e.getItemId(), e.getItemCount() * _amount, player);
+					} else {
+						if (e.isStackable()) {
+							inv.addItem("Multisell", e.getItemId(), e.getItemCount() * _amount, player, player.getTarget());
+						} else {
+							L2ItemInstance product;
+							for (int i = 0; i < (e.getItemCount() * _amount); i++) {
+								product = inv.addItem("Multisell", e.getItemId(), 1, player, player.getTarget());
+								if ((product != null) && list.getMaintainEnchantment()) {
+									if (i < augmentation.size()) {
+										product.setAugmentation(new L2Augmentation(augmentation.get(i).getAugmentationId()));
+									}
+									if (elemental != null) {
+										for (Elementals elm : elemental) {
+											product.setElementAttr(elm.getElement(), elm.getValue());
+										}
+									}
+									product.setEnchantLevel(e.getEnchantLevel());
+									product.updateDatabase();
+								}
+							}
+						}
+						// msg part
+						SystemMessage sm;
+						
+						if ((e.getItemCount() * _amount) > 1) {
+							sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+							sm.addItemName(e.getItemId());
+							sm.addLong(e.getItemCount() * _amount);
+							player.sendPacket(sm);
+						} else {
+							if (list.getMaintainEnchantment() && (e.getEnchantLevel() > 0)) {
+								sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_S2);
+								sm.addLong(e.getEnchantLevel());
+								sm.addItemName(e.getItemId());
+							} else {
+								sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
+								sm.addItemName(e.getItemId());
+							}
+							player.sendPacket(sm);
+						}
+					}
+				}
+				player.sendPacket(new ItemList(player, false));
+				
+				StatusUpdate su = new StatusUpdate(player);
+				su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+				player.sendPacket(su);
+				
+				// finally, give the tax to the castle...
+				if ((npc != null) && (entry.getTaxAmount() > 0)) {
+					npc.getCastle().addToTreasury(entry.getTaxAmount() * _amount);
+				}
+				break;
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B0_MULTISELLCHOOSE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/NewCharacter.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/NewCharacter.java
new file mode 100644
index 00000000..8d48b56a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/NewCharacter.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.PlayerTemplateData;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.network.serverpackets.NewCharacterSuccess;
+
+/**
+ * @author Zoey76
+ */
+public final class NewCharacter extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(NewCharacter.class);
+	
+	private static final String _C__13_NEWCHARACTER = "[C] 13 NewCharacter";
+	
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (general().debug()) {
+			LOG.debug(_C__13_NEWCHARACTER);
+		}
+		
+		final NewCharacterSuccess ct = new NewCharacterSuccess();
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.fighter)); // Human Fighter
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.mage)); // Human Mystic
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.elvenFighter)); // Elven Fighter
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.elvenMage)); // Elven Mystic
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.darkFighter)); // Dark Fighter
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.darkMage)); // Dark Mystic
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.orcFighter)); // Orc Fighter
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.orcMage)); // Orc Mystic
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.dwarvenFighter)); // Dwarf Fighter
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.maleSoldier)); // Male Kamael Soldier
+		ct.addChar(PlayerTemplateData.getInstance().getTemplate(ClassId.femaleSoldier)); // Female Kamael Soldier
+		sendPacket(ct);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__13_NEWCHARACTER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java
new file mode 100644
index 00000000..20acafb1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ObserverReturn.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 18:46:19
+ */
+public final class ObserverReturn extends L2GameClientPacket {
+	private static final String __C__C1_OBSERVERRETURN = "[C] C1 ObserverReturn";
+	
+	@Override
+	protected void readImpl() {
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.inObserverMode()) {
+			activeChar.leaveObserverMode();
+			// activeChar.teleToLocation(activeChar.getObsX(), activeChar.getObsY(), activeChar.getObsZ());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return __C__C1_OBSERVERRETURN;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java
new file mode 100644
index 00000000..21ef2b8e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ProtocolVersion.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.network.serverpackets.KeyPacket;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+
+/**
+ * @since 2005/04/02 10:43:04
+ */
+public final class ProtocolVersion extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(ProtocolVersion.class);
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	private static final String _C__0E_PROTOCOLVERSION = "[C] 0E ProtocolVersion";
+	
+	private int _version;
+	
+	@Override
+	protected void readImpl() {
+		_version = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// this packet is never encrypted
+		if (_version == -2) {
+			if (general().debug()) {
+				LOG.info("Ping received");
+			}
+			// this is just a ping attempt from the new C2 client
+			getClient().close((L2GameServerPacket) null);
+		} else if (!server().getAllowedProtocolRevisions().contains(_version)) {
+			LOG_ACCOUNTING.warn("Wrong protocol, {}, {}", _version, getClient());
+			KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 0);
+			getClient().setProtocolOk(false);
+			getClient().close(pk);
+		} else {
+			if (general().debug()) {
+				LOG.debug("Client Protocol Revision is ok: {}", _version);
+			}
+			
+			KeyPacket pk = new KeyPacket(getClient().enableCrypt(), 1);
+			getClient().sendPacket(pk);
+			getClient().setProtocolOk(true);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__0E_PROTOCOLVERSION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
new file mode 100644
index 00000000..e715fd50
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java
@@ -0,0 +1,472 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.model.base.AcquireSkillType.SUBPLEDGE;
+import static com.l2jserver.gameserver.network.SystemMessageId.ACQUIRE_SKILL_FAILED_BAD_CLAN_REP_SCORE;
+import static com.l2jserver.gameserver.network.SystemMessageId.ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL;
+import static com.l2jserver.gameserver.network.SystemMessageId.LEARNED_SKILL_S1;
+import static com.l2jserver.gameserver.network.SystemMessageId.NOT_COMPLETED_QUEST_FOR_SKILL_ACQUISITION;
+import static com.l2jserver.gameserver.network.SystemMessageId.NOT_ENOUGH_SP_TO_LEARN_SKILL;
+import static com.l2jserver.gameserver.network.SystemMessageId.NO_MORE_SKILLS_TO_LEARN;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP;
+import static com.l2jserver.gameserver.network.SystemMessageId.S2_S1_DISAPPEARED;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_DONT_MEET_SKILL_LEVEL_REQUIREMENTS;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_MUST_LEARN_ONYX_BEAST_SKILL;
+import static com.l2jserver.gameserver.network.serverpackets.StatusUpdate.SP;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2VillageMasterInstance;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerSkillLearned;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AcquireSkillDone;
+import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
+import com.l2jserver.gameserver.network.serverpackets.ExStorageMaxCount;
+import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Request Acquire Skill client packet implementation.
+ * @author Zoey76
+ */
+public final class RequestAcquireSkill extends L2GameClientPacket {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RequestAcquireSkill.class);
+	
+	private static final String _C__7C_REQUESTACQUIRESKILL = "[C] 7C RequestAcquireSkill";
+	
+	private static final String[] QUEST_VAR_NAMES = {
+		"EmergentAbility65-",
+		"EmergentAbility70-",
+		"ClassAbility75-",
+		"ClassAbility80-"
+	};
+	
+	private int _id;
+	private int _level;
+	private AcquireSkillType _skillType;
+	private int _subType;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+		_level = readD();
+		_skillType = AcquireSkillType.getAcquireSkillType(readD());
+		if (_skillType == SUBPLEDGE) {
+			_subType = readD();
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final var activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_level < 1) || (_level > 1000) || (_id < 1) || (_id > 32000)) {
+			Util.handleIllegalPlayerAction(activeChar, "Wrong Packet Data in Acquired Skill");
+			LOG.warn("Received wrong packet data from player {} with skill id: {} and level: {}!" + _level, activeChar, _id, _level);
+			return;
+		}
+		
+		final var trainer = activeChar.getLastFolkNPC();
+		if (!(trainer instanceof L2NpcInstance)) {
+			return;
+		}
+		
+		if (!trainer.canInteract(activeChar) && !activeChar.isGM()) {
+			return;
+		}
+		
+		final var skill = SkillData.getInstance().getSkill(_id, _level);
+		if (skill == null) {
+			LOG.warn("Player {} is trying to learn an invalid skill Id: {} level: {}!", activeChar, _id, _level);
+			return;
+		}
+		
+		final var skillLearn = SkillTreesData.getInstance().getSkillLearn(_skillType, _id, _level, activeChar);
+		if (!canBeLearn(activeChar, skill, skillLearn)) {
+			return;
+		}
+		
+		switch (_skillType) {
+			case CLASS -> {
+				if (checkPlayerSkill(activeChar, trainer, skillLearn)) {
+					giveSkill(activeChar, trainer, skill);
+				}
+			}
+			case TRANSFORM -> {
+				// Hack check.
+				if (!canTransform(activeChar)) {
+					activeChar.sendPacket(NOT_COMPLETED_QUEST_FOR_SKILL_ACQUISITION);
+					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " without required quests!", IllegalActionPunishmentType.NONE);
+					return;
+				}
+				
+				if (checkPlayerSkill(activeChar, trainer, skillLearn)) {
+					giveSkill(activeChar, trainer, skill);
+				}
+			}
+			case FISHING -> {
+				if (checkPlayerSkill(activeChar, trainer, skillLearn)) {
+					giveSkill(activeChar, trainer, skill);
+				}
+			}
+			case PLEDGE -> {
+				if (!activeChar.isClanLeader()) {
+					return;
+				}
+				
+				final var clan = activeChar.getClan();
+				int repCost = skillLearn.getLevelUpSp();
+				if (clan.getReputationScore() >= repCost) {
+					if (character().lifeCrystalNeeded()) {
+						for (var item : skillLearn.getRequiredItems()) {
+							if (!activeChar.destroyItemByItemId("Consume", item.getId(), item.getCount(), trainer, false)) {
+								// Doesn't have required item.
+								activeChar.sendPacket(ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
+								L2VillageMasterInstance.showPledgeSkillList(activeChar);
+								return;
+							}
+							
+							final var sm = SystemMessage.getSystemMessage(S2_S1_DISAPPEARED);
+							sm.addItemName(item.getId());
+							sm.addLong(item.getCount());
+							activeChar.sendPacket(sm);
+						}
+					}
+					
+					clan.takeReputationScore(repCost, true);
+					
+					final var cr = SystemMessage.getSystemMessage(S1_DEDUCTED_FROM_CLAN_REP);
+					cr.addInt(repCost);
+					activeChar.sendPacket(cr);
+					
+					clan.addNewSkill(skill);
+					
+					clan.broadcastToOnlineMembers(new PledgeSkillList(clan));
+					
+					activeChar.sendPacket(new AcquireSkillDone());
+					
+					L2VillageMasterInstance.showPledgeSkillList(activeChar);
+				} else {
+					activeChar.sendPacket(ACQUIRE_SKILL_FAILED_BAD_CLAN_REP_SCORE);
+					L2VillageMasterInstance.showPledgeSkillList(activeChar);
+				}
+			}
+			case SUBPLEDGE -> {
+				final var clan = activeChar.getClan();
+				final int repCost = skillLearn.getLevelUpSp();
+				if (clan.getReputationScore() < repCost) {
+					activeChar.sendPacket(ACQUIRE_SKILL_FAILED_BAD_CLAN_REP_SCORE);
+					return;
+				}
+				
+				for (var item : skillLearn.getRequiredItems()) {
+					if (!activeChar.destroyItemByItemId("SubSkills", item.getId(), item.getCount(), trainer, false)) {
+						activeChar.sendPacket(ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
+						return;
+					}
+					
+					final var sm = SystemMessage.getSystemMessage(S2_S1_DISAPPEARED);
+					sm.addItemName(item.getId());
+					sm.addLong(item.getCount());
+					activeChar.sendPacket(sm);
+				}
+				
+				if (repCost > 0) {
+					clan.takeReputationScore(repCost, true);
+					final var cr = SystemMessage.getSystemMessage(S1_DEDUCTED_FROM_CLAN_REP);
+					cr.addInt(repCost);
+					activeChar.sendPacket(cr);
+				}
+				
+				clan.addNewSkill(skill, _subType);
+				clan.broadcastToOnlineMembers(new PledgeSkillList(clan));
+				activeChar.sendPacket(new AcquireSkillDone());
+				
+				showSubUnitSkillList(activeChar);
+			}
+			case TRANSFER -> {
+				if (checkPlayerSkill(activeChar, trainer, skillLearn)) {
+					giveSkill(activeChar, trainer, skill);
+				}
+			}
+			case SUBCLASS -> {
+				var st = activeChar.getQuestState("SubClassSkills");
+				if (st == null) {
+					final var subClassSkillsQuest = QuestManager.getInstance().getQuest("SubClassSkills");
+					if (subClassSkillsQuest != null) {
+						st = subClassSkillsQuest.newQuestState(activeChar);
+					} else {
+						LOG.warn("Player {} does not have sub-class quest for skill Id: {} level: {}!", activeChar, _id, _level);
+						return;
+					}
+				}
+				
+				for (var varName : QUEST_VAR_NAMES) {
+					for (int i = 1; i <= character().getMaxSubclass(); i++) {
+						final var itemOID = st.getGlobalQuestVar(varName + i);
+						if (!itemOID.isEmpty() && !itemOID.endsWith(";") && !itemOID.equals("0")) {
+							if (Util.isDigit(itemOID)) {
+								final int itemObjId = Integer.parseInt(itemOID);
+								final var item = activeChar.getInventory().getItemByObjectId(itemObjId);
+								if (item != null) {
+									for (var itemIdCount : skillLearn.getRequiredItems()) {
+										if (item.getId() == itemIdCount.getId()) {
+											if (checkPlayerSkill(activeChar, trainer, skillLearn)) {
+												giveSkill(activeChar, trainer, skill);
+												// Logging the given skill.
+												st.saveGlobalQuestVar(varName + i, skill.getId() + ";");
+											}
+											return;
+										}
+									}
+								} else {
+									LOG.warn("Nonexistent item for object Id " + itemObjId + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!");
+								}
+							} else {
+								LOG.warn("Invalid item object Id " + itemOID + ", for Sub-Class skill Id: " + _id + " level: " + _level + " for player " + activeChar.getName() + "!");
+							}
+						}
+					}
+				}
+				
+				// Player doesn't have required item.
+				activeChar.sendPacket(ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
+				// TODO: showSkillList(trainer, activeChar);
+			}
+			case COLLECT -> {
+				if (checkPlayerSkill(activeChar, trainer, skillLearn)) {
+					giveSkill(activeChar, trainer, skill);
+				}
+			}
+			default -> LOG.warn("Received wrong packet data in Acquired Skill, unknown skill type {}!", _skillType);
+		}
+	}
+	
+	/**
+	 * Check if player try to exploit by add extra levels on skill learn.
+	 * @param activeChar the player
+	 * @param skill the skill
+	 * @param skl the skill for learn
+	 * @return {@code true} if skill id and level is fine, otherwise {@code false}
+	 */
+	private boolean canBeLearn(L2PcInstance activeChar, Skill skill, L2SkillLearn skl) {
+		final int prevSkillLevel = activeChar.getSkillLevel(_id);
+		switch (_skillType) {
+			case SUBPLEDGE: {
+				final var clan = activeChar.getClan();
+				if (clan == null) {
+					return false;
+				}
+				
+				if (!activeChar.isClanLeader() || !activeChar.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME)) {
+					return false;
+				}
+				
+				if ((clan.getFortId() == 0) && (clan.getCastleId() == 0)) {
+					return false;
+				}
+				
+				if (!clan.isLearnableSubPledgeSkill(skill, _subType)) {
+					activeChar.sendPacket(SystemMessageId.SQUAD_SKILL_ALREADY_ACQUIRED);
+					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!");
+					return false;
+				}
+				break;
+			}
+			case TRANSFER: {
+				if (skl == null) {
+					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting transfer skill Id: " + _id + " level " + _level + " what is not included in transfer skills!");
+				}
+				break;
+			}
+			case SUBCLASS: {
+				if (activeChar.isSubClassActive()) {
+					activeChar.sendPacket(SystemMessageId.SKILL_NOT_FOR_SUBCLASS);
+					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " while Sub-Class is active!");
+					return false;
+				}
+			}
+			default: {
+				if (prevSkillLevel == _level) {
+					LOG.warn("Player {} is trying to learn a skill that already knows, Id: {} level: {}!", activeChar, _id, _level);
+					return false;
+				}
+				if ((_level != 1) && (prevSkillLevel != (_level - 1))) {
+					activeChar.sendPacket(SystemMessageId.PREVIOUS_LEVEL_SKILL_NOT_LEARNED);
+					Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " is requesting skill Id: " + _id + " level " + _level + " without knowing it's previous level!");
+					return false;
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	public static void showSubUnitSkillList(L2PcInstance activeChar) {
+		final var skills = SkillTreesData.getInstance().getAvailableSubPledgeSkills(activeChar.getClan());
+		if (skills.size() == 0) {
+			activeChar.sendPacket(NO_MORE_SKILLS_TO_LEARN);
+		} else {
+			activeChar.sendPacket(new AcquireSkillList(SUBPLEDGE, skills));
+		}
+	}
+	
+	/**
+	 * Perform a simple check for current player and skill.<br>
+	 * Takes the needed SP if the skill require it and all requirements are meet.<br>
+	 * Consume required items if the skill require it and all requirements are meet.<br>
+	 * @param player the skill learning player.
+	 * @param trainer the skills teaching Npc.
+	 * @param s the skill to be learn.
+	 * @return {@code true} if all requirements are meet, {@code false} otherwise.
+	 */
+	private boolean checkPlayerSkill(L2PcInstance player, L2Npc trainer, L2SkillLearn s) {
+		if (s != null) {
+			if ((s.getSkillId() == _id) && (s.getSkillLevel() == _level)) {
+				// Hack check.
+				if (s.getGetLevel() > player.getLevel()) {
+					player.sendPacket(YOU_DONT_MEET_SKILL_LEVEL_REQUIREMENTS);
+					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + s.getGetLevel() + "!", IllegalActionPunishmentType.NONE);
+					return false;
+				}
+				
+				// First it checks that the skill require SP and the player has enough SP to learn it.
+				final int levelUpSp = s.getCalculatedLevelUpSp(player.getClassId(), player.getLearningClass());
+				if ((levelUpSp > 0) && (levelUpSp > player.getSp())) {
+					player.sendPacket(NOT_ENOUGH_SP_TO_LEARN_SKILL);
+					// TODO: showSkillList(trainer, player);
+					return false;
+				}
+				
+				if (!character().divineInspirationSpBookNeeded() && (_id == CommonSkill.DIVINE_INSPIRATION.getId())) {
+					return true;
+				}
+				
+				// Check for required skills.
+				if (!s.getPreReqSkills().isEmpty()) {
+					for (var skill : s.getPreReqSkills()) {
+						if (player.getSkillLevel(skill.getSkillId()) != skill.getSkillLvl()) {
+							if (skill.getSkillId() == CommonSkill.ONYX_BEAST_TRANSFORMATION.getId()) {
+								player.sendPacket(YOU_MUST_LEARN_ONYX_BEAST_SKILL);
+							} else {
+								player.sendPacket(ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
+							}
+							return false;
+						}
+					}
+				}
+				
+				// Check for required items.
+				if (!s.getRequiredItems().isEmpty()) {
+					// Then checks that the player has all the items
+					for (var item : s.getRequiredItems()) {
+						final var reqItemCount = player.getInventory().getInventoryItemCount(item.getId(), -1);
+						if (reqItemCount < item.getCount()) {
+							// Player doesn't have required item.
+							player.sendPacket(ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
+							// TODO: showSkillList(trainer, player);
+							return false;
+						}
+					}
+					// If the player has all required items, they are consumed.
+					for (var itemIdCount : s.getRequiredItems()) {
+						if (!player.destroyItemByItemId("SkillLearn", itemIdCount.getId(), itemIdCount.getCount(), trainer, true)) {
+							Util.handleIllegalPlayerAction(player, "Somehow player " + player.getName() + ", level " + player.getLevel() + " lose required item Id: " + itemIdCount.getId() + " to learn skill while learning skill Id: " + _id + " level " + _level
+								+ "!", IllegalActionPunishmentType.NONE);
+						}
+					}
+				}
+				// If the player has SP and all required items then consume SP.
+				if (levelUpSp > 0) {
+					player.setSp(player.getSp() - levelUpSp);
+					final var su = new StatusUpdate(player);
+					su.addAttribute(SP, player.getSp());
+					player.sendPacket(su);
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * Add the skill to the player and makes proper updates.
+	 * @param player the player acquiring a skill.
+	 * @param trainer the Npc teaching a skill.
+	 * @param skill the skill to be learn.
+	 */
+	private void giveSkill(L2PcInstance player, L2Npc trainer, Skill skill) {
+		// Send message.
+		final var sm = SystemMessage.getSystemMessage(LEARNED_SKILL_S1);
+		sm.addSkillName(skill);
+		player.sendPacket(sm);
+		
+		player.sendPacket(new AcquireSkillDone());
+		player.addSkill(skill, true);
+		player.sendSkillList();
+		player.updateShortCuts(_id, _level);
+		
+		// If skill is expand type then sends packet:
+		if ((_id >= 1368) && (_id <= 1372)) {
+			player.sendPacket(new ExStorageMaxCount(player));
+		}
+		
+		// Notify scripts of the skill learn.
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerSkillLearned(trainer, player, skill, _skillType), trainer);
+	}
+	
+	/**
+	 * Verify if the player can transform.
+	 * @param player the player to verify
+	 * @return {@code true} if the player meets the required conditions to learn a transformation, {@code false} otherwise
+	 */
+	public static boolean canTransform(L2PcInstance player) {
+		if (character().transformationWithoutQuest()) {
+			return true;
+		}
+		return player.hasQuestCompleted("Q00136_MoreThanMeetsTheEye");
+	}
+	
+	@Override
+	public String getType() {
+		return _C__7C_REQUESTACQUIRESKILL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
new file mode 100644
index 00000000..8279ef30
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+import com.l2jserver.gameserver.network.serverpackets.AcquireSkillInfo;
+
+/**
+ * Request Acquire Skill Info client packet implementation.
+ * @author Zoey76
+ */
+public final class RequestAcquireSkillInfo extends L2GameClientPacket {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(RequestAcquireSkillInfo.class);
+	
+	private static final String _C__73_REQUESTACQUIRESKILLINFO = "[C] 73 RequestAcquireSkillInfo";
+	
+	private int _id;
+	private int _level;
+	private AcquireSkillType _skillType;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+		_level = readD();
+		_skillType = AcquireSkillType.getAcquireSkillType(readD());
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_id <= 0) || (_level <= 0)) {
+			LOG.warn("Invalid Id: {} or level: {}!", _id, _level);
+			return;
+		}
+		
+		final var activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final var trainer = activeChar.getLastFolkNPC();
+		if (!(trainer instanceof L2NpcInstance)) {
+			return;
+		}
+		
+		if (!trainer.canInteract(activeChar) && !activeChar.isGM()) {
+			return;
+		}
+		
+		final var skill = SkillData.getInstance().getSkill(_id, _level);
+		if (skill == null) {
+			LOG.warn("Skill Id: {} level: {} is undefined!", _id, _level);
+			return;
+		}
+		
+		// Hack check. Doesn't apply to all Skill Types
+		final int prevSkillLevel = activeChar.getSkillLevel(_id);
+		if ((prevSkillLevel > 0) && !((_skillType == AcquireSkillType.TRANSFER) || (_skillType == AcquireSkillType.SUBPLEDGE))) {
+			if (prevSkillLevel == _level) {
+				LOG.warn("Player {} is requesting info for a skill that already knows, Id: {} level: {}!", activeChar, _id, _level);
+			} else if (prevSkillLevel != (_level - 1)) {
+				LOG.warn("Player {} is requesting info for skill Id: {} level {} without knowing it's previous level!", activeChar, _id, _level);
+			}
+		}
+		
+		if ((_skillType == AcquireSkillType.PLEDGE) && !activeChar.isClanLeader()) {
+			return;
+		}
+		
+		if ((_skillType == AcquireSkillType.SUBPLEDGE) && (!activeChar.isClanLeader() || !activeChar.hasClanPrivilege(ClanPrivilege.CL_TROOPS_FAME))) {
+			return;
+		}
+		
+		final var skillLearn = SkillTreesData.getInstance().getSkillLearn(_skillType, _id, _level, activeChar);
+		if (skillLearn == null) {
+			return;
+		}
+		
+		sendPacket(new AcquireSkillInfo(activeChar, _skillType, skillLearn));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__73_REQUESTACQUIRESKILLINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
new file mode 100644
index 00000000..810832a4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestActionUse.java
@@ -0,0 +1,1127 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ai.CtrlEvent;
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.ai.L2SummonAI;
+import com.l2jserver.gameserver.ai.NextAction;
+import com.l2jserver.gameserver.data.sql.impl.SummonSkillsTable;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.datatables.BotReportTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.enums.MountType;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.AirShipManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ChairSit;
+import com.l2jserver.gameserver.network.serverpackets.ExAskCoupleAction;
+import com.l2jserver.gameserver.network.serverpackets.ExBasicActionList;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopManageList;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+/**
+ * Action use request packet.
+ * @author Zoey76
+ */
+public final class RequestActionUse extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestActionUse.class);
+	
+	private static final String _C__56_REQUESTACTIONUSE = "[C] 56 RequestActionUse";
+	
+	private static final int SIN_EATER_ID = 12564;
+	private static final int SWITCH_STANCE_ID = 6054;
+	private static final NpcStringId[] NPC_STRINGS = {
+		NpcStringId.USING_A_SPECIAL_SKILL_HERE_COULD_TRIGGER_A_BLOODBATH,
+		NpcStringId.HEY_WHAT_DO_YOU_EXPECT_OF_ME,
+		NpcStringId.UGGGGGH_PUSH_ITS_NOT_COMING_OUT,
+		NpcStringId.AH_I_MISSED_THE_MARK
+	};
+	
+	private int _actionId;
+	private boolean _ctrlPressed;
+	private boolean _shiftPressed;
+	
+	@Override
+	protected void readImpl() {
+		_actionId = readD();
+		_ctrlPressed = (readD() == 1);
+		_shiftPressed = (readC() == 1);
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (general().debug()) {
+			LOG.info("{}: {} requested action use ID: {} Ctrl pressed:{} Shift pressed:{}", getType(), activeChar, _actionId, _ctrlPressed, _shiftPressed);
+		}
+		
+		// Don't do anything if player is dead or confused
+		if ((activeChar.isFakeDeath() && (_actionId != 0)) || activeChar.isDead() || activeChar.isOutOfControl()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final BuffInfo info = activeChar.getEffectList().getBuffInfoByAbnormalType(AbnormalType.BOT_PENALTY);
+		if (info != null) {
+			for (AbstractEffect effect : info.getEffects()) {
+				if (!effect.checkCondition(_actionId)) {
+					activeChar.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_ACTIONS_NOT_ALLOWED);
+					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+		}
+		
+		// Don't allow to do some action if player is transformed
+		if (activeChar.isTransformed()) {
+			int[] allowedActions = activeChar.isTransformed() ? ExBasicActionList.ACTIONS_ON_TRANSFORM : ExBasicActionList.DEFAULT_ACTION_LIST;
+			if (!(Arrays.binarySearch(allowedActions, _actionId) >= 0)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				LOG.warn("Player {} used action which he does not have! Id = {} transform: {}", activeChar, _actionId, activeChar.getTransformation());
+				return;
+			}
+		}
+		
+		final L2Summon summon = activeChar.getSummon();
+		final L2Object target = activeChar.getTarget();
+		switch (_actionId) {
+			case 0: // Sit/Stand
+				if (activeChar.isSitting() || !activeChar.isMoving() || activeChar.isFakeDeath()) {
+					useSit(activeChar, target);
+				} else {
+					// Sit when arrive using next action.
+					// Creating next action class.
+					final NextAction nextAction = new NextAction(CtrlEvent.EVT_ARRIVED, CtrlIntention.AI_INTENTION_MOVE_TO, () -> useSit(activeChar, target));
+					
+					// Binding next action to AI.
+					activeChar.getAI().setNextAction(nextAction);
+				}
+				break;
+			case 1: // Walk/Run
+				if (activeChar.isRunning()) {
+					activeChar.setWalking();
+				} else {
+					activeChar.setRunning();
+				}
+				break;
+			case 10: // Private Store - Sell
+				activeChar.tryOpenPrivateSellStore(false);
+				break;
+			case 15: // Change Movement Mode (Pets)
+				if (validateSummon(summon, true)) {
+					((L2SummonAI) summon.getAI()).notifyFollowStatusChange();
+				}
+				break;
+			case 16: // Attack (Pets)
+				if (validateSummon(summon, true)) {
+					if (summon.canAttack(_ctrlPressed)) {
+						summon.doAttack();
+					}
+				}
+				break;
+			case 17: // Stop (Pets)
+				if (validateSummon(summon, true)) {
+					summon.cancelAction();
+				}
+				break;
+			case 19: // Unsummon Pet
+				
+				if (!validateSummon(summon, true)) {
+					break;
+				}
+				
+				if (summon.isDead()) {
+					sendPacket(SystemMessageId.DEAD_PET_CANNOT_BE_RETURNED);
+					break;
+				}
+				
+				if (summon.isAttackingNow() || summon.isInCombat() || summon.isMovementDisabled()) {
+					sendPacket(SystemMessageId.PET_CANNOT_SENT_BACK_DURING_BATTLE);
+					break;
+				}
+				
+				if (summon.isHungry()) {
+					if (summon.isPet() && !((L2PetInstance) summon).getPetData().getFood().isEmpty()) {
+						sendPacket(SystemMessageId.YOU_CANNOT_RESTORE_HUNGRY_PETS);
+					} else {
+						sendPacket(SystemMessageId.THE_HELPER_PET_CANNOT_BE_RETURNED);
+					}
+					break;
+				}
+				
+				summon.unSummon(activeChar);
+				break;
+			case 21: // Change Movement Mode (Servitors)
+				if (validateSummon(summon, false)) {
+					((L2SummonAI) summon.getAI()).notifyFollowStatusChange();
+				}
+				break;
+			case 22: // Attack (Servitors)
+				if (validateSummon(summon, false)) {
+					if (summon.canAttack(_ctrlPressed)) {
+						summon.doAttack();
+					}
+				}
+				break;
+			case 23: // Stop (Servitors)
+				if (validateSummon(summon, false)) {
+					summon.cancelAction();
+				}
+				break;
+			case 28: // Private Store - Buy
+				activeChar.tryOpenPrivateBuyStore();
+				break;
+			case 32: // Wild Hog Cannon - Wild Cannon
+				useSkill("DDMagic", false);
+				break;
+			case 36: // Soulless - Toxic Smoke
+				useSkill("RangeDebuff", false);
+				break;
+			case 37: // Dwarven Manufacture
+				if (activeChar.isAlikeDead()) {
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+				if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+					activeChar.setPrivateStoreType(PrivateStoreType.NONE);
+					activeChar.broadcastUserInfo();
+				}
+				if (activeChar.isSitting()) {
+					activeChar.standUp();
+				}
+				
+				sendPacket(new RecipeShopManageList(activeChar, true));
+				break;
+			case 38: // Mount/Dismount
+				activeChar.mountPlayer(summon);
+				break;
+			case 39: // Soulless - Parasite Burst
+				useSkill("RangeDD", false);
+				break;
+			case 41: // Wild Hog Cannon - Attack
+				if (validateSummon(summon, false)) {
+					if ((target != null) && (target.isDoor() || (target instanceof L2SiegeFlagInstance))) {
+						useSkill(4230, false);
+					} else {
+						sendPacket(SystemMessageId.INCORRECT_TARGET);
+					}
+				}
+				break;
+			case 42: // Kai the Cat - Self Damage Shield
+				useSkill("HealMagic", false);
+				break;
+			case 43: // Merrow the Unicorn - Hydro Screw
+				useSkill("DDMagic", false);
+				break;
+			case 44: // Big Boom - Boom Attack
+				useSkill("DDMagic", false);
+				break;
+			case 45: // Boxer the Unicorn - Master Recharge
+				useSkill("HealMagic", activeChar, false);
+				break;
+			case 46: // Mew the Cat - Mega Storm Strike
+				useSkill("DDMagic", false);
+				break;
+			case 47: // Silhouette - Steal Blood
+				useSkill("DDMagic", false);
+				break;
+			case 48: // Mechanic Golem - Mech. Cannon
+				useSkill("DDMagic", false);
+				break;
+			case 51: // General Manufacture
+				// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
+				if (activeChar.isAlikeDead()) {
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+				if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+					activeChar.setPrivateStoreType(PrivateStoreType.NONE);
+					activeChar.broadcastUserInfo();
+				}
+				if (activeChar.isSitting()) {
+					activeChar.standUp();
+				}
+				
+				sendPacket(new RecipeShopManageList(activeChar, false));
+				break;
+			case 52: // Unsummon Servitor
+				if (validateSummon(summon, false)) {
+					if (summon.isAttackingNow() || summon.isInCombat()) {
+						sendPacket(SystemMessageId.SERVITOR_NOT_RETURN_IN_BATTLE);
+						break;
+					}
+					summon.unSummon(activeChar);
+				}
+				break;
+			case 53: // Move to target (Servitors)
+				if (validateSummon(summon, false)) {
+					if ((target != null) && (summon != target) && !summon.isMovementDisabled()) {
+						summon.setFollowStatus(false);
+						summon.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					}
+				}
+				break;
+			case 54: // Move to target (Pets)
+				if (validateSummon(summon, true)) {
+					if ((target != null) && (summon != target) && !summon.isMovementDisabled()) {
+						summon.setFollowStatus(false);
+						summon.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, target.getLocation());
+					}
+				}
+				break;
+			case 61: // Private Store Package Sell
+				activeChar.tryOpenPrivateSellStore(true);
+				break;
+			case 65: // Bot Report Button
+				if (general().enableBotReportButton()) {
+					BotReportTable.getInstance().reportBot(activeChar);
+				} else {
+					activeChar.sendMessage("This feature is disabled.");
+				}
+				break;
+			case 67: // Steer
+				if (activeChar.isInAirShip()) {
+					if (activeChar.getAirShip().setCaptain(activeChar)) {
+						activeChar.broadcastUserInfo();
+					}
+				}
+				break;
+			case 68: // Cancel Control
+				if (activeChar.isInAirShip() && activeChar.getAirShip().isCaptain(activeChar)) {
+					if (activeChar.getAirShip().setCaptain(null)) {
+						activeChar.broadcastUserInfo();
+					}
+				}
+				break;
+			case 69: // Destination Map
+				AirShipManager.getInstance().sendAirShipTeleportList(activeChar);
+				break;
+			case 70: // Exit Airship
+				if (activeChar.isInAirShip()) {
+					if (activeChar.getAirShip().isCaptain(activeChar)) {
+						if (activeChar.getAirShip().setCaptain(null)) {
+							activeChar.broadcastUserInfo();
+						}
+					} else if (activeChar.getAirShip().isInDock()) {
+						activeChar.getAirShip().oustPlayer(activeChar);
+					}
+				}
+				break;
+			case 71:
+			case 72:
+			case 73:
+				useCoupleSocial(_actionId - 55);
+				break;
+			case 1000: // Siege Golem - Siege Hammer
+				if ((target != null) && target.isDoor()) {
+					useSkill(4079, false);
+				}
+				break;
+			case 1001: // Sin Eater - Ultimate Bombastic Buster
+				if (validateSummon(summon, true) && (summon.getId() == SIN_EATER_ID)) {
+					summon.broadcastPacket(new NpcSay(summon.getObjectId(), Say2.NPC_ALL, summon.getId(), NPC_STRINGS[Rnd.get(NPC_STRINGS.length)]));
+				}
+				break;
+			case 1003: // Wind Hatchling/Strider - Wild Stun
+				useSkill("PhysicalSpecial", true);
+				break;
+			case 1004: // Wind Hatchling/Strider - Wild Defense
+				useSkill("Buff", activeChar, true);
+				break;
+			case 1005: // Star Hatchling/Strider - Bright Burst
+				useSkill("DDMagic", true);
+				break;
+			case 1006: // Star Hatchling/Strider - Bright Heal
+				useSkill("Heal", activeChar, true);
+				break;
+			case 1007: // Feline Queen - Blessing of Queen
+				useSkill("Buff1", activeChar, false);
+				break;
+			case 1008: // Feline Queen - Gift of Queen
+				useSkill("Buff2", activeChar, false);
+				break;
+			case 1009: // Feline Queen - Cure of Queen
+				useSkill("DDMagic", false);
+				break;
+			case 1010: // Unicorn Seraphim - Blessing of Seraphim
+				useSkill("Buff1", activeChar, false);
+				break;
+			case 1011: // Unicorn Seraphim - Gift of Seraphim
+				useSkill("Buff2", activeChar, false);
+				break;
+			case 1012: // Unicorn Seraphim - Cure of Seraphim
+				useSkill("DDMagic", false);
+				break;
+			case 1013: // Nightshade - Curse of Shade
+				useSkill("DeBuff1", false);
+				break;
+			case 1014: // Nightshade - Mass Curse of Shade
+				useSkill("DeBuff2", false);
+				break;
+			case 1015: // Nightshade - Shade Sacrifice
+				useSkill("Heal", false);
+				break;
+			case 1016: // Cursed Man - Cursed Blow
+				useSkill("PhysicalSpecial1", false);
+				break;
+			case 1017: // Cursed Man - Cursed Strike
+				useSkill("PhysicalSpecial2", false);
+				break;
+			case 1031: // Feline King - Slash
+				useSkill("PhysicalSpecial1", false);
+				break;
+			case 1032: // Feline King - Spinning Slash
+				useSkill("PhysicalSpecial2", false);
+				break;
+			case 1033: // Feline King - Hold of King
+				useSkill("PhysicalSpecial3", false);
+				break;
+			case 1034: // Magnus the Unicorn - Whiplash
+				useSkill("PhysicalSpecial1", false);
+				break;
+			case 1035: // Magnus the Unicorn - Tridal Wave
+				useSkill("PhysicalSpecial2", false);
+				break;
+			case 1036: // Spectral Lord - Corpse Kaboom
+				useSkill("PhysicalSpecial1", false);
+				break;
+			case 1037: // Spectral Lord - Dicing Death
+				useSkill("PhysicalSpecial2", false);
+				break;
+			case 1038: // Spectral Lord - Dark Curse
+				useSkill("PhysicalSpecial3", false);
+				break;
+			case 1039: // Swoop Cannon - Cannon Fodder
+				useSkill(5110, false);
+				break;
+			case 1040: // Swoop Cannon - Big Bang
+				useSkill(5111, false);
+				break;
+			case 1041: // Great Wolf - Bite Attack
+				useSkill("Skill01", true);
+				break;
+			case 1042: // Great Wolf - Maul
+				useSkill("Skill03", true);
+				break;
+			case 1043: // Great Wolf - Cry of the Wolf
+				useSkill("Skill02", true);
+				break;
+			case 1044: // Great Wolf - Awakening
+				useSkill("Skill04", true);
+				break;
+			case 1045: // Great Wolf - Howl
+				useSkill(5584, true);
+				break;
+			case 1046: // Strider - Roar
+				useSkill(5585, true);
+				break;
+			case 1047: // Divine Beast - Bite
+				useSkill(5580, false);
+				break;
+			case 1048: // Divine Beast - Stun Attack
+				useSkill(5581, false);
+				break;
+			case 1049: // Divine Beast - Fire Breath
+				useSkill(5582, false);
+				break;
+			case 1050: // Divine Beast - Roar
+				useSkill(5583, false);
+				break;
+			case 1051: // Feline Queen - Bless The Body
+				useSkill("buff3", false);
+				break;
+			case 1052: // Feline Queen - Bless The Soul
+				useSkill("buff4", false);
+				break;
+			case 1053: // Feline Queen - Haste
+				useSkill("buff5", false);
+				break;
+			case 1054: // Unicorn Seraphim - Acumen
+				useSkill("buff3", false);
+				break;
+			case 1055: // Unicorn Seraphim - Clarity
+				useSkill("buff4", false);
+				break;
+			case 1056: // Unicorn Seraphim - Empower
+				useSkill("buff5", false);
+				break;
+			case 1057: // Unicorn Seraphim - Wild Magic
+				useSkill("buff6", false);
+				break;
+			case 1058: // Nightshade - Death Whisper
+				useSkill("buff3", false);
+				break;
+			case 1059: // Nightshade - Focus
+				useSkill("buff4", false);
+				break;
+			case 1060: // Nightshade - Guidance
+				useSkill("buff5", false);
+				break;
+			case 1061: // Wild Beast Fighter, White Weasel - Death blow
+				useSkill(5745, true);
+				break;
+			case 1062: // Wild Beast Fighter - Double attack
+				useSkill(5746, true);
+				break;
+			case 1063: // Wild Beast Fighter - Spin attack
+				useSkill(5747, true);
+				break;
+			case 1064: // Wild Beast Fighter - Meteor Shower
+				useSkill(5748, true);
+				break;
+			case 1065: // Fox Shaman, Wild Beast Fighter, White Weasel, Fairy Princess - Awakening
+				useSkill(5753, true);
+				break;
+			case 1066: // Fox Shaman, Spirit Shaman - Thunder Bolt
+				useSkill(5749, true);
+				break;
+			case 1067: // Fox Shaman, Spirit Shaman - Flash
+				useSkill(5750, true);
+				break;
+			case 1068: // Fox Shaman, Spirit Shaman - Lightning Wave
+				useSkill(5751, true);
+				break;
+			case 1069: // Fox Shaman, Fairy Princess - Flare
+				useSkill(5752, true);
+				break;
+			case 1070: // White Weasel, Fairy Princess, Improved Baby Buffalo, Improved Baby Kookaburra, Improved Baby Cougar, Spirit Shaman, Toy Knight, Turtle Ascetic - Buff control
+				useSkill(5771, true);
+				break;
+			case 1071: // Tigress - Power Strike
+				useSkill("DDMagic", true);
+				break;
+			case 1072: // Toy Knight - Piercing attack
+				useSkill(6046, true);
+				break;
+			case 1073: // Toy Knight - Whirlwind
+				useSkill(6047, true);
+				break;
+			case 1074: // Toy Knight - Lance Smash
+				useSkill(6048, true);
+				break;
+			case 1075: // Toy Knight - Battle Cry
+				useSkill(6049, true);
+				break;
+			case 1076: // Turtle Ascetic - Power Smash
+				useSkill(6050, true);
+				break;
+			case 1077: // Turtle Ascetic - Energy Burst
+				useSkill(6051, true);
+				break;
+			case 1078: // Turtle Ascetic - Shockwave
+				useSkill(6052, true);
+				break;
+			case 1079: // Turtle Ascetic - Howl
+				useSkill(6053, true);
+				break;
+			case 1080: // Phoenix Rush
+				useSkill(6041, false);
+				break;
+			case 1081: // Phoenix Cleanse
+				useSkill(6042, false);
+				break;
+			case 1082: // Phoenix Flame Feather
+				useSkill(6043, false);
+				break;
+			case 1083: // Phoenix Flame Beak
+				useSkill(6044, false);
+				break;
+			case 1084: // Switch State
+				useSkill(6054, true);
+				break;
+			case 1086: // Panther Cancel
+				useSkill(6094, false);
+				break;
+			case 1087: // Panther Dark Claw
+				useSkill(6095, false);
+				break;
+			case 1088: // Panther Fatal Claw
+				useSkill(6096, false);
+				break;
+			case 1089: // Deinonychus - Tail Strike
+				useSkill(6199, true);
+				break;
+			case 1090: // Guardian's Strider - Strider Bite
+				useSkill(6205, true);
+				break;
+			case 1091: // Guardian's Strider - Strider Fear
+				useSkill(6206, true);
+				break;
+			case 1092: // Guardian's Strider - Strider Dash
+				useSkill(6207, true);
+				break;
+			case 1093: // Maguen - Maguen Strike
+				useSkill(6618, true);
+				break;
+			case 1094: // Maguen - Maguen Wind Walk
+				useSkill(6681, true);
+				break;
+			case 1095: // Elite Maguen - Maguen Power Strike
+				useSkill(6619, true);
+				break;
+			case 1096: // Elite Maguen - Elite Maguen Wind Walk
+				useSkill(6682, true);
+				break;
+			case 1097: // Maguen - Maguen Return
+				useSkill(6683, true);
+				break;
+			case 1098: // Elite Maguen - Maguen Party Return
+				useSkill(6684, true);
+				break;
+			case 5000: // Baby Rudolph - Reindeer Scratch
+				useSkill(23155, true);
+				break;
+			case 5001: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Rosy Seduction
+				useSkill(23167, true);
+				break;
+			case 5002: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Critical Seduction
+				useSkill(23168, true);
+				break;
+			case 5003: // Hyum, Lapham, Hyum, Lapham - Thunder Bolt
+				useSkill(5749, true);
+				break;
+			case 5004: // Hyum, Lapham, Hyum, Lapham - Flash
+				useSkill(5750, true);
+				break;
+			case 5005: // Hyum, Lapham, Hyum, Lapham - Lightning Wave
+				useSkill(5751, true);
+				break;
+			case 5006: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Buff Control
+				useSkill(5771, true);
+				break;
+			case 5007: // Deseloph, Lilias, Deseloph, Lilias - Piercing Attack
+				useSkill(6046, true);
+				break;
+			case 5008: // Deseloph, Lilias, Deseloph, Lilias - Spin Attack
+				useSkill(6047, true);
+				break;
+			case 5009: // Deseloph, Lilias, Deseloph, Lilias - Smash
+				useSkill(6048, true);
+				break;
+			case 5010: // Deseloph, Lilias, Deseloph, Lilias - Ignite
+				useSkill(6049, true);
+				break;
+			case 5011: // Rekang, Mafum, Rekang, Mafum - Power Smash
+				useSkill(6050, true);
+				break;
+			case 5012: // Rekang, Mafum, Rekang, Mafum - Energy Burst
+				useSkill(6051, true);
+				break;
+			case 5013: // Rekang, Mafum, Rekang, Mafum - Shockwave
+				useSkill(6052, true);
+				break;
+			case 5014: // Rekang, Mafum, Rekang, Mafum - Ignite
+				useSkill(6053, true);
+				break;
+			case 5015: // Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum, Deseloph, Hyum, Rekang, Lilias, Lapham, Mafum - Switch Stance
+				useSkill(6054, true);
+				break;
+			// Social Packets
+			case 12: // Greeting
+				tryBroadcastSocial(2);
+				break;
+			case 13: // Victory
+				tryBroadcastSocial(3);
+				break;
+			case 14: // Advance
+				tryBroadcastSocial(4);
+				break;
+			case 24: // Yes
+				tryBroadcastSocial(6);
+				break;
+			case 25: // No
+				tryBroadcastSocial(5);
+				break;
+			case 26: // Bow
+				tryBroadcastSocial(7);
+				break;
+			case 29: // Unaware
+				tryBroadcastSocial(8);
+				break;
+			case 30: // Social Waiting
+				tryBroadcastSocial(9);
+				break;
+			case 31: // Laugh
+				tryBroadcastSocial(10);
+				break;
+			case 33: // Applaud
+				tryBroadcastSocial(11);
+				break;
+			case 34: // Dance
+				tryBroadcastSocial(12);
+				break;
+			case 35: // Sorrow
+				tryBroadcastSocial(13);
+				break;
+			case 62: // Charm
+				tryBroadcastSocial(14);
+				break;
+			case 66: // Shyness
+				tryBroadcastSocial(15);
+				break;
+			default:
+				LOG.warn("{}: unhandled action type {}", activeChar.getName(), _actionId);
+				break;
+		}
+	}
+	
+	/**
+	 * Use the sit action.
+	 * @param activeChar the player trying to sit
+	 * @param target the target to sit, throne, bench or chair
+	 * @return {@code true} if the player can sit, {@code false} otherwise
+	 */
+	protected boolean useSit(L2PcInstance activeChar, L2Object target) {
+		if (activeChar.getMountType() != MountType.NONE) {
+			return false;
+		}
+		
+		if (!activeChar.isSitting() && (target instanceof L2StaticObjectInstance) && (((L2StaticObjectInstance) target).getType() == 1) && activeChar.isInsideRadius(target, L2StaticObjectInstance.INTERACTION_DISTANCE, false, false)) {
+			final ChairSit cs = new ChairSit(activeChar, target.getId());
+			sendPacket(cs);
+			activeChar.sitDown();
+			activeChar.broadcastPacket(cs);
+			return true;
+		}
+		
+		if (activeChar.isFakeDeath()) {
+			activeChar.stopEffects(L2EffectType.FAKE_DEATH);
+		} else if (activeChar.isSitting()) {
+			activeChar.standUp();
+		} else {
+			activeChar.sitDown();
+		}
+		return true;
+	}
+	
+	/**
+	 * Cast a skill for active summon.<br>
+	 * Target is specified as a parameter but can be overwritten or ignored depending on skill type.
+	 * @param skillId the skill Id to be casted by the summon
+	 * @param target the target to cast the skill on, overwritten or ignored depending on skill type
+	 * @param pet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
+	 */
+	private void useSkill(int skillId, L2Object target, boolean pet) {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Summon summon = activeChar.getSummon();
+		if (!validateSummon(summon, pet)) {
+			return;
+		}
+		
+		if (!canControl(summon)) {
+			return;
+		}
+		
+		int lvl;
+		if (summon.isPet()) {
+			lvl = PetDataTable.getInstance().getPetData(summon.getId()).getAvailableLevel(summon, skillId);
+		} else {
+			lvl = SummonSkillsTable.getInstance().getAvailableLevel(summon, skillId);
+		}
+		
+		if (lvl > 0) {
+			summon.setTarget(target);
+			summon.useMagic(SkillData.getInstance().getSkill(skillId, lvl), _ctrlPressed, _shiftPressed);
+		}
+		
+		if (skillId == SWITCH_STANCE_ID) {
+			summon.switchMode();
+		}
+	}
+	
+	private void useSkill(String skillName, L2Object target, boolean pet) {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Summon summon = activeChar.getSummon();
+		if (!validateSummon(summon, pet)) {
+			return;
+		}
+		
+		if (!canControl(summon)) {
+			return;
+		}
+		
+		if (summon instanceof L2PetInstance) {
+			if (!((L2PetInstance) summon).isInSupportMode()) {
+				sendPacket(SystemMessageId.PET_AUXILIARY_MODE_CANNOT_USE_SKILLS);
+				return;
+			}
+		}
+		
+		final SkillHolder skillHolder = summon.getTemplate().getParameters().getSkillHolder(skillName);
+		if (skillHolder == null) {
+			LOG.warn("{} requested missing skill {}!", summon, skillName);
+			return;
+		}
+		
+		final Skill skill = skillHolder.getSkill();
+		if (skill == null) {
+			LOG.warn("{} requested missing skill {}!", summon, skillHolder);
+			return;
+		}
+		
+		summon.setTarget(target);
+		summon.useMagic(skill, _ctrlPressed, _shiftPressed);
+		
+		if (skill.getId() == SWITCH_STANCE_ID) {
+			summon.switchMode();
+		}
+	}
+	
+	private boolean canControl(L2Summon summon) {
+		if (summon instanceof L2PetInstance) {
+			if (!((L2PetInstance) summon).isInSupportMode()) {
+				sendPacket(SystemMessageId.PET_AUXILIARY_MODE_CANNOT_USE_SKILLS);
+				return false;
+			}
+		}
+		
+		if (summon.isPet()) {
+			if ((summon.getLevel() - getActiveChar().getLevel()) > 20) {
+				sendPacket(SystemMessageId.PET_TOO_HIGH_TO_CONTROL);
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Cast a skill for active summon.<br>
+	 * Target is retrieved from owner's target, then validated by overloaded method useSkill(int, L2Character).
+	 * @param skillId the skill Id to use
+	 * @param pet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
+	 */
+	private void useSkill(int skillId, boolean pet) {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		useSkill(skillId, activeChar.getTarget(), pet);
+	}
+	
+	/**
+	 * Cast a skill for active summon.<br>
+	 * Target is retrieved from owner's target, then validated by overloaded method useSkill(int, L2Character).
+	 * @param skillName the skill name to use
+	 * @param pet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
+	 */
+	private void useSkill(String skillName, boolean pet) {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		useSkill(skillName, activeChar.getTarget(), pet);
+	}
+	
+	/**
+	 * Validates the given summon and sends a system message to the master.
+	 * @param summon the summon to validate
+	 * @param checkPet if {@code true} it'll validate a pet, if {@code false} it will validate a servitor
+	 * @return {@code true} if the summon is not null and whether is a pet or a servitor depending on {@code checkPet} value, {@code false} otherwise
+	 */
+	private boolean validateSummon(L2Summon summon, boolean checkPet) {
+		if ((summon != null) && ((checkPet && summon.isPet()) || summon.isServitor())) {
+			if (summon.isPet() && ((L2PetInstance) summon).isUncontrollable()) {
+				sendPacket(SystemMessageId.WHEN_YOUR_PETS_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+				return false;
+			}
+			if (summon.isBetrayed()) {
+				sendPacket(SystemMessageId.PET_REFUSING_ORDER);
+				return false;
+			}
+			return true;
+		}
+		
+		if (checkPet) {
+			sendPacket(SystemMessageId.DONT_HAVE_PET);
+		} else {
+			sendPacket(SystemMessageId.DONT_HAVE_SERVITOR);
+		}
+		return false;
+	}
+	
+	/**
+	 * Try to broadcast SocialAction packet.
+	 * @param id the social action Id to broadcast
+	 */
+	private void tryBroadcastSocial(int id) {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.isFishing()) {
+			sendPacket(SystemMessageId.CANNOT_DO_WHILE_FISHING_3);
+			return;
+		}
+		
+		if (activeChar.canMakeSocialAction()) {
+			activeChar.broadcastPacket(new SocialAction(activeChar.getObjectId(), id));
+		}
+	}
+	
+	/**
+	 * Perform a couple social action.
+	 * @param id the couple social action Id
+	 */
+	private void useCoupleSocial(final int id) {
+		final L2PcInstance requester = getActiveChar();
+		if (requester == null) {
+			return;
+		}
+		
+		final L2Object target = requester.getTarget();
+		if ((target == null) || !target.isPlayer()) {
+			sendPacket(SystemMessageId.INCORRECT_TARGET);
+			return;
+		}
+		
+		final int distance = (int) requester.calculateDistance(target, false, false);
+		if ((distance > 125) || (distance < 15) || (requester.getObjectId() == target.getObjectId())) {
+			sendPacket(SystemMessageId.TARGET_DO_NOT_MEET_LOC_REQUIREMENTS);
+			return;
+		}
+		
+		SystemMessage sm;
+		if (requester.isInStoreMode() || requester.isInCraftMode()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isInCombat() || requester.isInDuel() || AttackStanceTaskManager.getInstance().hasAttackStanceTask(requester)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isFishing()) {
+			sendPacket(SystemMessageId.CANNOT_DO_WHILE_FISHING_3);
+			return;
+		}
+		
+		if (requester.getKarma() > 0) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isInOlympiadMode()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isInSiege()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isInHideoutSiege()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_HIDEOUT_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+		}
+		
+		if (requester.isMounted() || requester.isFlyingMounted() || requester.isInBoat() || requester.isInAirShip()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isTransformed()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isAlikeDead()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(requester);
+			sendPacket(sm);
+			return;
+		}
+		
+		// Checks for partner.
+		final L2PcInstance partner = target.getActingPlayer();
+		if (partner.isInStoreMode() || partner.isInCraftMode()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_PRIVATE_SHOP_MODE_OR_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isInCombat() || partner.isInDuel() || AttackStanceTaskManager.getInstance().hasAttackStanceTask(partner)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_BATTLE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.getMultiSociaAction() > 0) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_PARTICIPATING_IN_A_COUPLE_ACTION_AND_CANNOT_BE_REQUESTED_FOR_ANOTHER_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isFishing()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_FISHING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.getKarma() > 0) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CHAOTIC_STATE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isInOlympiadMode()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_THE_OLYMPIAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isInHideoutSiege()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_PARTICIPATING_IN_A_HIDEOUT_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isInSiege()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_IN_A_CASTLE_SIEGE_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isMounted() || partner.isFlyingMounted() || partner.isInBoat() || partner.isInAirShip()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_RIDING_A_SHIP_STEED_OR_STRIDER_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isTeleporting()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TELEPORTING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isTransformed()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_TRANSFORMING_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (partner.isAlikeDead()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_CURRENTLY_DEAD_AND_CANNOT_BE_REQUESTED_FOR_A_COUPLE_ACTION);
+			sm.addPcName(partner);
+			sendPacket(sm);
+			return;
+		}
+		
+		if (requester.isAllSkillsDisabled() || partner.isAllSkillsDisabled()) {
+			sendPacket(SystemMessageId.COUPLE_ACTION_CANCELED);
+			return;
+		}
+		
+		requester.setMultiSocialAction(id, partner.getObjectId());
+		sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_REQUESTED_COUPLE_ACTION_C1);
+		sm.addPcName(partner);
+		sendPacket(sm);
+		
+		if ((requester.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE) || (partner.getAI().getIntention() != CtrlIntention.AI_INTENTION_IDLE)) {
+			final NextAction nextAction = new NextAction(CtrlEvent.EVT_ARRIVED, CtrlIntention.AI_INTENTION_MOVE_TO, () -> partner.sendPacket(new ExAskCoupleAction(requester.getObjectId(), id)));
+			requester.getAI().setNextAction(nextAction);
+			return;
+		}
+		
+		if (requester.isCastingNow() || requester.isCastingSimultaneouslyNow()) {
+			final NextAction nextAction = new NextAction(CtrlEvent.EVT_FINISH_CASTING, CtrlIntention.AI_INTENTION_CAST, () -> partner.sendPacket(new ExAskCoupleAction(requester.getObjectId(), id)));
+			requester.getAI().setNextAction(nextAction);
+			return;
+		}
+		
+		partner.sendPacket(new ExAskCoupleAction(requester.getObjectId(), id));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__56_REQUESTACTIONUSE;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return (_actionId != 10) && (_actionId != 28);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllAgitInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllAgitInfo.java
new file mode 100644
index 00000000..388ea74b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllAgitInfo.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.ExShowAgitInfo;
+
+/**
+ * @author KenM
+ */
+public class RequestAllAgitInfo extends L2GameClientPacket {
+	private static final String _C__D0_3E_REQUESTALLAGITINFO = "[C] D0:3E RequestAllAgitInfo";
+	
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2GameClient client = getClient();
+		if (client != null) {
+			client.sendPacket(new ExShowAgitInfo());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_3E_REQUESTALLAGITINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java
new file mode 100644
index 00000000..6b317c91
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllCastleInfo.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.ExShowCastleInfo;
+
+/**
+ * @author KenM
+ */
+public class RequestAllCastleInfo extends L2GameClientPacket {
+	private static final String _C__D0_3C_REQUESTALLCASTLEINFO = "[C] D0:3C RequestAllCastleInfo";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2GameClient client = getClient();
+		if (client != null) {
+			client.sendPacket(new ExShowCastleInfo());
+		}
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_3C_REQUESTALLCASTLEINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java
new file mode 100644
index 00000000..d384b2a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllFortressInfo.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.ExShowFortressInfo;
+
+/**
+ * @author KenM
+ */
+public class RequestAllFortressInfo extends L2GameClientPacket {
+	private static final String _C__D0_3D_REQUESTALLFORTRESSINFO = "[C] D0:3D RequestAllFortressInfo";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2GameClient client = getClient();
+		if (client != null) {
+			client.sendPacket(ExShowFortressInfo.STATIC_PACKET);
+		}
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_3D_REQUESTALLFORTRESSINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java
new file mode 100644
index 00000000..3d9c41b5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyCrest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.AllyCrest;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestAllyCrest extends L2GameClientPacket {
+	private static final String _C__92_REQUESTALLYCREST = "[C] 92 RequestAllyCrest";
+	
+	private int _crestId;
+	
+	@Override
+	protected void readImpl() {
+		_crestId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		sendPacket(new AllyCrest(_crestId));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__92_REQUESTALLYCREST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java
new file mode 100644
index 00000000..9eb4a33c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.ClanInfo;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AllianceInfo;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/11/09 00:47:42
+ */
+public final class RequestAllyInfo extends L2GameClientPacket {
+	private static final String _C__2E_REQUESTALLYINFO = "[C] 2E RequestAllyInfo";
+	
+	@Override
+	public void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		SystemMessage sm;
+		final int allianceId = activeChar.getAllyId();
+		if (allianceId > 0) {
+			final AllianceInfo ai = new AllianceInfo(allianceId);
+			activeChar.sendPacket(ai);
+			
+			// send for player
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ALLIANCE_INFO_HEAD);
+			activeChar.sendPacket(sm);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ALLIANCE_NAME_S1);
+			sm.addString(ai.getName());
+			activeChar.sendPacket(sm);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ALLIANCE_LEADER_S2_OF_S1);
+			sm.addString(ai.getLeaderC());
+			sm.addString(ai.getLeaderP());
+			activeChar.sendPacket(sm);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CONNECTION_S1_TOTAL_S2);
+			sm.addInt(ai.getOnline());
+			sm.addInt(ai.getTotal());
+			activeChar.sendPacket(sm);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.ALLIANCE_CLAN_TOTAL_S1);
+			sm.addInt(ai.getAllies().length);
+			activeChar.sendPacket(sm);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_HEAD);
+			for (final ClanInfo aci : ai.getAllies()) {
+				activeChar.sendPacket(sm);
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_NAME_S1);
+				sm.addString(aci.getClan().getName());
+				activeChar.sendPacket(sm);
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEADER_S1);
+				sm.addString(aci.getClan().getLeaderName());
+				activeChar.sendPacket(sm);
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEVEL_S1);
+				sm.addInt(aci.getClan().getLevel());
+				activeChar.sendPacket(sm);
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.CONNECTION_S1_TOTAL_S2);
+				sm.addInt(aci.getOnline());
+				sm.addInt(aci.getTotal());
+				activeChar.sendPacket(sm);
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_SEPARATOR);
+			}
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_FOOT);
+			activeChar.sendPacket(sm);
+		} else {
+			activeChar.sendPacket(SystemMessageId.NO_CURRENT_ALLIANCES);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__2E_REQUESTALLYINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java
new file mode 100644
index 00000000..a9a38a36
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerFriendInvite.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.network.SystemMessageId.FAILED_TO_INVITE_A_FRIEND;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_ADDED_TO_FRIENDS;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_ALREADY_IN_FRIENDS_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_JOINED_AS_FRIEND;
+import static com.l2jserver.gameserver.network.SystemMessageId.THE_FRIENDS_LIST_OF_THE_PERSON_YOU_ARE_TRYING_TO_ADD_IS_FULL_SO_REGISTRATION_IS_NOT_POSSIBLE;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CAN_ONLY_ENTER_UP_128_NAMES_IN_YOUR_FRIENDS_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_SUCCEEDED_INVITING_FRIEND;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.FriendPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class RequestAnswerFriendInvite extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestAnswerFriendInvite.class);
+	
+	private static final String _C__78_REQUESTANSWERFRIENDINVITE = "[C] 78 RequestAnswerFriendInvite";
+	
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final L2PcInstance requestor = player.getActiveRequester();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (player.isFriend(requestor.getObjectId()) || requestor.isFriend(player.getObjectId())) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(S1_ALREADY_IN_FRIENDS_LIST);
+			sm.addCharName(player);
+			requestor.sendPacket(sm);
+			return;
+		}
+		
+		if (player.getFriends().size() >= character().getFriendListLimit()) {
+			player.sendPacket(YOU_CAN_ONLY_ENTER_UP_128_NAMES_IN_YOUR_FRIENDS_LIST);
+			return;
+		}
+		
+		if (requestor.getFriends().size() >= character().getFriendListLimit()) {
+			requestor.sendPacket(THE_FRIENDS_LIST_OF_THE_PERSON_YOU_ARE_TRYING_TO_ADD_IS_FULL_SO_REGISTRATION_IS_NOT_POSSIBLE);
+			return;
+		}
+		
+		if (_response == 1) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var statement = con.prepareStatement("INSERT INTO character_friends (charId, friendId) VALUES (?, ?), (?, ?)")) {
+				statement.setInt(1, requestor.getObjectId());
+				statement.setInt(2, player.getObjectId());
+				statement.setInt(3, player.getObjectId());
+				statement.setInt(4, requestor.getObjectId());
+				statement.execute();
+				requestor.sendPacket(YOU_HAVE_SUCCEEDED_INVITING_FRIEND);
+				
+				// Player added to your friend list
+				var msg = SystemMessage.getSystemMessage(S1_ADDED_TO_FRIENDS);
+				msg.addString(player.getName());
+				requestor.sendPacket(msg);
+				requestor.addFriend(player.getObjectId());
+				
+				// has joined as friend.
+				msg = SystemMessage.getSystemMessage(S1_JOINED_AS_FRIEND);
+				msg.addString(requestor.getName());
+				player.sendPacket(msg);
+				player.addFriend(requestor.getObjectId());
+				
+				// Send notifications for both player in order to show them online
+				player.sendPacket(new FriendPacket(true, requestor.getObjectId()));
+				requestor.sendPacket(new FriendPacket(true, player.getObjectId()));
+			} catch (Exception e) {
+				LOG.warn("Could not add friend objectid: {}", e.getMessage(), e);
+			}
+		} else {
+			requestor.sendPacket(FAILED_TO_INVITE_A_FRIEND);
+		}
+		
+		player.setActiveRequester(null);
+		requestor.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__78_REQUESTANSWERFRIENDINVITE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
new file mode 100644
index 00000000..79c47239
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinAlly.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public final class RequestAnswerJoinAlly extends L2GameClientPacket {
+	private static final String _C__8D_REQUESTANSWERJOINALLY = "[C] 8D RequestAnswerJoinAlly";
+	
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2PcInstance requestor = activeChar.getRequest().getPartner();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (_response == 0) {
+			activeChar.sendPacket(SystemMessageId.YOU_DID_NOT_RESPOND_TO_ALLY_INVITATION);
+			requestor.sendPacket(SystemMessageId.NO_RESPONSE_TO_ALLY_INVITATION);
+		} else {
+			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinAlly)) {
+				return; // hax
+			}
+			
+			L2Clan clan = requestor.getClan();
+			// we must double check this cause of hack
+			if (clan.checkAllyJoinCondition(requestor, activeChar)) {
+				// TODO: Need correct message id
+				requestor.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_INVITING_FRIEND);
+				activeChar.sendPacket(SystemMessageId.YOU_ACCEPTED_ALLIANCE);
+				
+				activeChar.getClan().setAllyId(clan.getAllyId());
+				activeChar.getClan().setAllyName(clan.getAllyName());
+				activeChar.getClan().setAllyPenaltyExpiryTime(0, 0);
+				activeChar.getClan().changeAllyCrest(clan.getAllyCrestId(), true);
+				activeChar.getClan().updateClanInDB();
+			}
+		}
+		
+		activeChar.getRequest().onRequestResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8D_REQUESTANSWERJOINALLY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java
new file mode 100644
index 00000000..4178af46
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinParty.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.JoinParty;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class RequestAnswerJoinParty extends L2GameClientPacket {
+	private static final String _C__43_REQUESTANSWERPARTY = "[C] 43 RequestAnswerJoinParty";
+	
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final L2PcInstance requestor = player.getActiveRequester();
+		if (requestor == null) {
+			return;
+		}
+		
+		requestor.sendPacket(new JoinParty(_response));
+		
+		switch (_response) {
+			// Party disable by player client config
+			case -1 -> {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_PARTY_REQUEST);
+				sm.addPcName(player);
+				requestor.sendPacket(sm);
+			}
+			// Party cancel by player
+			case 0 -> {
+				// requestor.sendPacket(SystemMessageId.PLAYER_DECLINED); FIXME: Done in client?
+			}
+			// Party accept by player
+			case 1 -> {
+				if (requestor.isInParty()) {
+					if (requestor.getParty().getMemberCount() >= 9) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PARTY_FULL);
+						player.sendPacket(sm);
+						requestor.sendPacket(sm);
+						return;
+					}
+					player.joinParty(requestor.getParty());
+				} else {
+					requestor.setParty(new L2Party(requestor, requestor.getPartyDistributionType()));
+					player.joinParty(requestor.getParty());
+				}
+				
+				if (requestor.isInPartyMatchRoom() && player.isInPartyMatchRoom()) {
+					final PartyMatchRoomList list = PartyMatchRoomList.getInstance();
+					if ((list != null) && (list.getPlayerRoomId(requestor) == list.getPlayerRoomId(player))) {
+						final PartyMatchRoom room = list.getPlayerRoom(requestor);
+						if (room != null) {
+							final ExManagePartyRoomMember packet = new ExManagePartyRoomMember(player, room, 1);
+							for (L2PcInstance member : room.getPartyMembers()) {
+								if (member != null) {
+									member.sendPacket(packet);
+								}
+							}
+						}
+					}
+				} else if (requestor.isInPartyMatchRoom() && !player.isInPartyMatchRoom()) {
+					final PartyMatchRoomList list = PartyMatchRoomList.getInstance();
+					if (list != null) {
+						final PartyMatchRoom room = list.getPlayerRoom(requestor);
+						if (room != null) {
+							room.addMember(player);
+							ExManagePartyRoomMember packet = new ExManagePartyRoomMember(player, room, 1);
+							for (L2PcInstance member : room.getPartyMembers()) {
+								if (member != null) {
+									member.sendPacket(packet);
+								}
+							}
+							player.setPartyRoom(room.getId());
+							// player.setPartyMatching(1);
+							player.broadcastUserInfo();
+						}
+					}
+				}
+			}
+		}
+		
+		if (requestor.isInParty()) {
+			requestor.getParty().setPendingInvitation(false); // if party is null, there is no need of decreasing
+		}
+		
+		player.setActiveRequester(null);
+		requestor.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__43_REQUESTANSWERPARTY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
new file mode 100644
index 00000000..494b5711
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAnswerJoinPledge.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.JoinPledge;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowInfoUpdate;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListAdd;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListAll;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestAnswerJoinPledge extends L2GameClientPacket {
+	private static final String _C__27_REQUESTANSWERJOINPLEDGE = "[C] 27 RequestAnswerJoinPledge";
+	
+	private int _answer;
+	
+	@Override
+	protected void readImpl() {
+		_answer = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2PcInstance requestor = activeChar.getRequest().getPartner();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (_answer == 0) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DID_NOT_RESPOND_TO_S1_CLAN_INVITATION);
+			sm.addString(requestor.getName());
+			activeChar.sendPacket(sm);
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DID_NOT_RESPOND_TO_CLAN_INVITATION);
+			sm.addString(activeChar.getName());
+			requestor.sendPacket(sm);
+		} else {
+			if (!(requestor.getRequest().getRequestPacket() instanceof RequestJoinPledge)) {
+				return; // hax
+			}
+			
+			RequestJoinPledge requestPacket = (RequestJoinPledge) requestor.getRequest().getRequestPacket();
+			L2Clan clan = requestor.getClan();
+			// we must double check this cause during response time conditions can be changed, i.e. another player could join clan
+			if (clan.checkClanJoinCondition(requestor, activeChar, requestPacket.getPledgeType())) {
+				activeChar.sendPacket(new JoinPledge(requestor.getClanId()));
+				
+				activeChar.setPledgeType(requestPacket.getPledgeType());
+				if (requestPacket.getPledgeType() == L2Clan.SUBUNIT_ACADEMY) {
+					activeChar.setPowerGrade(9); // Academy
+					activeChar.setLvlJoinedAcademy(activeChar.getLevel());
+				} else {
+					activeChar.setPowerGrade(5); // new member starts at 5, not confirmed
+				}
+				
+				clan.addClanMember(activeChar);
+				activeChar.setClanPrivileges(activeChar.getClan().getRankPrivs(activeChar.getPowerGrade()));
+				activeChar.sendPacket(SystemMessageId.ENTERED_THE_CLAN);
+				
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_JOINED_CLAN);
+				sm.addString(activeChar.getName());
+				clan.broadcastToOnlineMembers(sm);
+				
+				if (activeChar.getClan().getCastleId() > 0) {
+					CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).giveResidentialSkills(activeChar);
+				}
+				if (activeChar.getClan().getFortId() > 0) {
+					FortManager.getInstance().getFortByOwner(activeChar.getClan()).giveResidentialSkills(activeChar);
+				}
+				activeChar.sendSkillList();
+				
+				clan.broadcastToOtherOnlineMembers(new PledgeShowMemberListAdd(activeChar), activeChar);
+				clan.broadcastToOnlineMembers(new PledgeShowInfoUpdate(clan));
+				
+				// this activates the clan tab on the new member
+				activeChar.sendPacket(new PledgeShowMemberListAll(clan, activeChar));
+				activeChar.setClanJoinExpiryTime(0);
+				activeChar.broadcastUserInfo();
+			}
+		}
+		
+		activeChar.getRequest().onRequestResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__27_REQUESTANSWERJOINPLEDGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
new file mode 100644
index 00000000..41475eff
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAskJoinPartyRoom.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExAskJoinPartyRoom;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Format: (ch) S
+ * @author -Wooden-
+ * @author Tryskell
+ */
+public class RequestAskJoinPartyRoom extends L2GameClientPacket {
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		// Send PartyRoom invite request (with activeChar) name to the target
+		final L2PcInstance target = L2World.getInstance().getPlayer(_name);
+		if (target != null) {
+			if (!target.isProcessingRequest()) {
+				player.onTransactionRequest(target);
+				target.sendPacket(new ExAskJoinPartyRoom(player.getName()));
+			} else {
+				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER).addPcName(target));
+			}
+		} else {
+			player.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] D0:14 RequestAskJoinPartyRoom";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java
new file mode 100644
index 00000000..3cae3bea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestAutoSoulShot.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExAutoSoulShot;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/07/11 15:29:30
+ */
+public final class RequestAutoSoulShot extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestAutoSoulShot.class);
+	
+	private static final String _C__D0_0D_REQUESTAUTOSOULSHOT = "[C] D0:0D RequestAutoSoulShot";
+	
+	// format cd
+	private int _itemId;
+	private int _type; // 1 = on : 0 = off;
+	
+	@Override
+	protected void readImpl() {
+		_itemId = readD();
+		_type = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((activeChar.getPrivateStoreType() == PrivateStoreType.NONE) && (activeChar.getActiveRequester() == null) && !activeChar.isDead()) {
+			if (general().debug()) {
+				LOG.debug("AutoSoulShot: {}", _itemId);
+			}
+			
+			final L2ItemInstance item = activeChar.getInventory().getItemByItemId(_itemId);
+			if (item == null) {
+				return;
+			}
+			
+			if (_type == 1) {
+				if (!activeChar.getInventory().canManipulateWithItemId(item.getId())) {
+					activeChar.sendMessage("Cannot use this item.");
+					return;
+				}
+				
+				// Fishingshots are not automatic on retail
+				if ((_itemId < 6535) || (_itemId > 6540)) {
+					// Attempt to charge first shot on activation
+					if ((_itemId == 6645) || (_itemId == 6646) || (_itemId == 6647) || (_itemId == 20332) || (_itemId == 20333) || (_itemId == 20334)) {
+						if (activeChar.hasSummon()) {
+							if (item.getEtcItem().getHandlerName().equals("BeastSoulShot")) {
+								if (activeChar.getSummon().getSoulShotsPerHit() > item.getCount()) {
+									activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET);
+									return;
+								}
+							} else {
+								if (activeChar.getSummon().getSpiritShotsPerHit() > item.getCount()) {
+									activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_SOULSHOTS_FOR_PET);
+									return;
+								}
+							}
+							activeChar.addAutoSoulShot(_itemId);
+							activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
+							
+							// start the auto soulshot use
+							SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.USE_OF_S1_WILL_BE_AUTO);
+							sm.addItemName(item);
+							activeChar.sendPacket(sm);
+							
+							activeChar.rechargeShots(true, true);
+							activeChar.getSummon().rechargeShots(true, true);
+							
+						} else {
+							activeChar.sendPacket(SystemMessageId.NO_SERVITOR_CANNOT_AUTOMATE_USE);
+						}
+					} else {
+						if ((activeChar.getActiveWeaponItem() != activeChar.getFistsWeaponItem()) && (item.getItem().getCrystalType() == activeChar.getActiveWeaponItem().getItemGradeSPlus())) {
+							activeChar.addAutoSoulShot(_itemId);
+							activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
+						} else {
+							if (((_itemId >= 2509) && (_itemId <= 2514)) || ((_itemId >= 3947) && (_itemId <= 3952)) || (_itemId == 5790) || ((_itemId >= 22072) && (_itemId <= 22081))) {
+								activeChar.sendPacket(SystemMessageId.SPIRITSHOTS_GRADE_MISMATCH);
+							} else {
+								activeChar.sendPacket(SystemMessageId.SOULSHOTS_GRADE_MISMATCH);
+							}
+							
+							activeChar.addAutoSoulShot(_itemId);
+							activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
+						}
+						
+						// start the auto soulshot use
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.USE_OF_S1_WILL_BE_AUTO);
+						sm.addItemName(item);
+						activeChar.sendPacket(sm);
+						
+						activeChar.rechargeShots(true, true);
+					}
+				}
+			} else if (_type == 0) {
+				activeChar.removeAutoSoulShot(_itemId);
+				activeChar.sendPacket(new ExAutoSoulShot(_itemId, _type));
+				
+				// cancel the auto soulshot use
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AUTO_USE_OF_S1_CANCELLED);
+				sm.addItemName(item);
+				activeChar.sendPacket(sm);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_0D_REQUESTAUTOSOULSHOT;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBBSwrite.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBBSwrite.java
new file mode 100644
index 00000000..4c10f9ac
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBBSwrite.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.handler.CommunityBoardHandler;
+
+/**
+ * RequestBBSwrite client packet implementation.
+ * @author -Wooden-
+ * @author Zoey76
+ */
+public final class RequestBBSwrite extends L2GameClientPacket {
+	private static final String _C__24_REQUESTBBSWRITE = "[C] 24 RequestBBSwrite";
+	private String _url;
+	private String _arg1;
+	private String _arg2;
+	private String _arg3;
+	private String _arg4;
+	private String _arg5;
+	
+	@Override
+	protected void readImpl() {
+		_url = readS();
+		_arg1 = readS();
+		_arg2 = readS();
+		_arg3 = readS();
+		_arg4 = readS();
+		_arg5 = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		CommunityBoardHandler.getInstance().handleWriteCommand(getActiveChar(), _url, _arg1, _arg2, _arg3, _arg4, _arg5);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__24_REQUESTBBSWRITE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBidItemAuction.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBidItemAuction.java
new file mode 100644
index 00000000..998d1ca3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBidItemAuction.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.instancemanager.ItemAuctionManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemauction.ItemAuction;
+import com.l2jserver.gameserver.model.itemauction.ItemAuctionInstance;
+
+/**
+ * @author Forsaiken
+ */
+public final class RequestBidItemAuction extends L2GameClientPacket {
+	private static final String _C__D0_39_REQUESTBIDITEMAUCTION = "[C] D0:39 RequestBidItemAuction";
+	
+	private int _instanceId;
+	private long _bid;
+	
+	@Override
+	protected void readImpl() {
+		_instanceId = super.readD();
+		_bid = super.readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = super.getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		// can't use auction fp here
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("auction")) {
+			activeChar.sendMessage("You are bidding too fast.");
+			return;
+		}
+		
+		if ((_bid < 0) || (_bid > character().getMaxAdena())) {
+			return;
+		}
+		
+		final ItemAuctionInstance instance = ItemAuctionManager.getInstance().getManagerInstance(_instanceId);
+		if (instance != null) {
+			final ItemAuction auction = instance.getCurrentAuction();
+			if (auction != null) {
+				auction.registerBid(activeChar, _bid);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_39_REQUESTBIDITEMAUCTION;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java
new file mode 100644
index 00000000..e239b3f6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBlock.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.network.SystemMessageId.FAILED_TO_REGISTER_TO_IGNORE_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.MESSAGE_ACCEPTANCE_MODE;
+import static com.l2jserver.gameserver.network.SystemMessageId.MESSAGE_REFUSAL_MODE;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_EXCLUDE_YOURSELF;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_MAY_NOT_IMPOSE_A_BLOCK_ON_GM;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.BlockList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class RequestBlock extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestBlock.class);
+	
+	private static final String _C__A9_REQUESTBLOCK = "[C] A9 RequestBlock";
+	
+	private static final int BLOCK = 0;
+	private static final int UNBLOCK = 1;
+	private static final int BLOCKLIST = 2;
+	private static final int ALLBLOCK = 3;
+	private static final int ALLUNBLOCK = 4;
+	
+	private String _name;
+	private Integer _type;
+	
+	@Override
+	protected void readImpl() {
+		_type = readD(); // 0x00 - block, 0x01 - unblock, 0x03 - allblock, 0x04 - allunblock
+		
+		if ((_type == BLOCK) || (_type == UNBLOCK)) {
+			_name = readS();
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		final int targetId = CharNameTable.getInstance().getIdByName(_name);
+		final int targetAL = CharNameTable.getInstance().getAccessLevelById(targetId);
+		
+		if (activeChar == null) {
+			return;
+		}
+		
+		// can't use block/unblock for locating invisible characters
+		switch (_type) {
+			case BLOCK, UNBLOCK -> {
+				if (targetId <= 0) {
+					// Incorrect player name.
+					activeChar.sendPacket(FAILED_TO_REGISTER_TO_IGNORE_LIST);
+					return;
+				}
+				if (targetAL > 0) {
+					// Cannot block a GM character.
+					activeChar.sendPacket(YOU_MAY_NOT_IMPOSE_A_BLOCK_ON_GM);
+					return;
+				}
+				if (activeChar.getObjectId() == targetId) {
+					activeChar.sendPacket(YOU_CANNOT_EXCLUDE_YOURSELF);
+					return;
+				}
+				if (_type == BLOCK) {
+					BlockList.addToBlockList(activeChar, targetId);
+				} else {
+					BlockList.removeFromBlockList(activeChar, targetId);
+				}
+			}
+			case BLOCKLIST -> BlockList.sendListToOwner(activeChar);
+			case ALLBLOCK -> {
+				activeChar.sendPacket(MESSAGE_REFUSAL_MODE);
+				BlockList.setBlockAll(activeChar, true);
+			}
+			case ALLUNBLOCK -> {
+				activeChar.sendPacket(MESSAGE_ACCEPTANCE_MODE);
+				BlockList.setBlockAll(activeChar, false);
+			}
+			default -> LOG.info("Unknown 0xA9 block type: {}", _type);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__A9_REQUESTBLOCK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
new file mode 100644
index 00000000..04a956f9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBookMarkSlotInfo.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExGetBookMarkInfoPacket;
+
+/**
+ * @author ShanSoft
+ */
+public final class RequestBookMarkSlotInfo extends L2GameClientPacket {
+	private static final String _C__D0_51_00_REQUESTBOOKMARKSLOTINFO = "[C] D0:51:00 RequestBookMarkSlotInfo";
+	
+	@Override
+	protected void readImpl() {
+		// There is nothing to read.
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		player.sendPacket(new ExGetBookMarkInfoPacket(player));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_51_00_REQUESTBOOKMARKSLOTINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java
new file mode 100644
index 00000000..2e344d72
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.rates;
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.buylist.Product;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExBuySellList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+public final class RequestBuyItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestBuyItem.class);
+	
+	private static final String _C__40_REQUESTBUYITEM = "[C] 40 RequestBuyItem";
+	
+	private static final int BATCH_LENGTH = 12;
+	private int _listId;
+	private List<ItemHolder> _items = null;
+	
+	@Override
+	protected void readImpl() {
+		_listId = readD();
+		int size = readD();
+		if ((size <= 0) || (size > MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(size);
+		for (int i = 0; i < size; i++) {
+			int itemId = readD();
+			long count = readQ();
+			if ((itemId < 1) || (count < 1)) {
+				_items = null;
+				return;
+			}
+			_items.add(new ItemHolder(itemId, count));
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("buy")) {
+			player.sendMessage("You are buying too fast.");
+			return;
+		}
+		
+		if (_items == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Karma punishment
+		if (!character().karmaPlayerCanShop() && (player.getKarma() > 0)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2Character merchant = player.getLastFolkNPC();
+		if (!player.isGM()) {
+			if (!(merchant instanceof L2MerchantInstance) || (!player.isInsideRadius(merchant, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != merchant.getInstanceId())) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		}
+		
+		double castleTaxRate = 0;
+		double baseTaxRate = 0;
+		
+		if ((merchant == null) && !player.isGM()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final L2BuyList buyList = BuyListData.getInstance().getBuyList(_listId);
+		if (buyList == null) {
+			Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId);
+			return;
+		}
+		
+		if (merchant != null) {
+			if (!buyList.isNpcAllowed(merchant.getId()) && !player.isGM()) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if (merchant instanceof L2MerchantInstance) {
+				castleTaxRate = ((L2MerchantInstance) merchant).getCastle().getTaxRate();
+			}
+		}
+		
+		long subTotal = 0;
+		
+		// Check for buylist validity and calculates summary values
+		long slots = 0;
+		long weight = 0;
+		for (ItemHolder i : _items) {
+			long price;
+			
+			final Product product = buyList.getProductByItemId(i.getId());
+			if (product == null) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId + " and item_id " + i.getId());
+				return;
+			}
+			
+			if (!product.getItem().isStackable() && (i.getCount() > 1)) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase invalid quantity of items at the same time.");
+				sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED));
+				return;
+			}
+			
+			price = product.getPrice();
+			if ((product.getItemId() >= 3960) && (product.getItemId() <= 4026)) {
+				price *= rates().getRateSiegeGuardsPrice();
+			}
+			
+			if (price < 0) {
+				LOG.warn("ERROR, no price found .. wrong buylist ??");
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if ((price == 0) && !player.isGM() && general().onlyGMItemsFree()) {
+				player.sendMessage("Ohh... Cheat didn't work? You have a problem now!");
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried buy item for 0 adena.");
+				return;
+			}
+			
+			if (product.hasLimitedStock()) {
+				// trying to buy more then available
+				if (i.getCount() > product.getCount()) {
+					sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+			
+			if ((character().getMaxAdena() / i.getCount()) < price) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + character().getMaxAdena() + " adena worth of goods.");
+				return;
+			}
+			// first calculate price per item with tax, then multiply by count
+			baseTaxRate = product.getBaseTax();
+			price = (long) (price * (1 + (baseTaxRate + castleTaxRate)));
+			subTotal += i.getCount() * price;
+			
+			if (subTotal > character().getMaxAdena()) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + character().getMaxAdena() + " adena worth of goods.");
+				return;
+			}
+			
+			weight += i.getCount() * product.getItem().getWeight();
+			if (player.getInventory().getItemByItemId(product.getItemId()) == null) {
+				slots++;
+			}
+		}
+		
+		if (!player.isGM() && ((weight > Integer.MAX_VALUE) || (weight < 0) || !player.getInventory().validateWeight((int) weight))) {
+			player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!player.isGM() && ((slots > Integer.MAX_VALUE) || (slots < 0) || !player.getInventory().validateCapacity((int) slots))) {
+			player.sendPacket(SystemMessageId.SLOTS_FULL);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Charge buyer and add tax to castle treasury if not owned by npc clan
+		if ((subTotal < 0) || !player.reduceAdena("Buy", subTotal, player.getLastFolkNPC(), false)) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Proceed the purchase
+		for (ItemHolder i : _items) {
+			Product product = buyList.getProductByItemId(i.getId());
+			if (product == null) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId + " and item_id " + i.getId());
+				continue;
+			}
+			
+			if (product.hasLimitedStock()) {
+				if (product.decreaseCount(i.getCount())) {
+					player.getInventory().addItem("Buy", i.getId(), i.getCount(), player, merchant);
+				}
+			} else {
+				player.getInventory().addItem("Buy", i.getId(), i.getCount(), player, merchant);
+			}
+		}
+		
+		// add to castle treasury
+		if (merchant instanceof L2MerchantInstance) {
+			((L2MerchantInstance) merchant).getCastle().addToTreasury((long) (subTotal * castleTaxRate));
+		}
+		
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+		player.sendPacket(new ExBuySellList(player, true));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__40_REQUESTBUYITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java
new file mode 100644
index 00000000..8b8633c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.SeedProduction;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author l3x
+ */
+public class RequestBuySeed extends L2GameClientPacket {
+	private static final int BATCH_LENGTH = 12; // length of the one item
+	private int _manorId;
+	private List<ItemHolder> _items = null;
+	
+	@Override
+	protected final void readImpl() {
+		_manorId = readD();
+		final int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(count);
+		for (int i = 0; i < count; i++) {
+			final int itemId = readD();
+			final long cnt = readQ();
+			if ((cnt < 1) || (itemId < 1)) {
+				_items = null;
+				return;
+			}
+			_items.add(new ItemHolder(itemId, cnt));
+		}
+	}
+	
+	@Override
+	protected final void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		} else if (!getClient().getFloodProtectors().getManor().tryPerformAction("BuySeed")) {
+			player.sendMessage("You are buying seeds too fast!");
+			return;
+		} else if (_items == null) {
+			sendActionFailed();
+			return;
+		}
+		
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		if (manor.isUnderMaintenance()) {
+			sendActionFailed();
+			return;
+		}
+		
+		final Castle castle = CastleManager.getInstance().getCastleById(_manorId);
+		if (castle == null) {
+			sendActionFailed();
+			return;
+		}
+		
+		final L2Npc manager = player.getLastFolkNPC();
+		if (!(manager instanceof L2MerchantInstance) || !manager.canInteract(player) || (manager.getTemplate().getParameters().getInt("manor_id", -1) != _manorId)) {
+			sendActionFailed();
+			return;
+		}
+		
+		long totalPrice = 0;
+		int slots = 0;
+		int totalWeight = 0;
+		
+		final Map<Integer, SeedProduction> _productInfo = new HashMap<>();
+		for (ItemHolder ih : _items) {
+			final SeedProduction sp = manor.getSeedProduct(_manorId, ih.getId(), false);
+			if ((sp == null) || (sp.getPrice() <= 0) || (sp.getAmount() < ih.getCount()) || ((character().getMaxAdena() / ih.getCount()) < sp.getPrice())) {
+				sendActionFailed();
+				return;
+			}
+			
+			// Calculate price
+			totalPrice += (sp.getPrice() * ih.getCount());
+			if (totalPrice > character().getMaxAdena()) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + character().getMaxAdena() + " adena worth of goods.");
+				sendActionFailed();
+				return;
+			}
+			
+			// Calculate weight
+			final L2Item template = ItemTable.getInstance().getTemplate(ih.getId());
+			totalWeight += ih.getCount() * template.getWeight();
+			
+			// Calculate slots
+			if (!template.isStackable()) {
+				slots += ih.getCount();
+			} else if (player.getInventory().getItemByItemId(ih.getId()) == null) {
+				slots++;
+			}
+			_productInfo.put(ih.getId(), sp);
+		}
+		
+		if (!player.getInventory().validateWeight(totalWeight)) {
+			player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			return;
+		} else if (!player.getInventory().validateCapacity(slots)) {
+			player.sendPacket(SystemMessageId.SLOTS_FULL);
+			return;
+		} else if ((totalPrice < 0) || (player.getAdena() < totalPrice)) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			return;
+		}
+		
+		// Proceed the purchase
+		for (ItemHolder i : _items) {
+			final SeedProduction sp = _productInfo.get(i.getId());
+			final long price = sp.getPrice() * i.getCount();
+			
+			// Take Adena and decrease seed amount
+			if (!sp.decreaseAmount(i.getCount()) || !player.reduceAdena("Buy", price, player, false)) {
+				// failed buy, reduce total price
+				totalPrice -= price;
+				continue;
+			}
+			
+			// Add item to player's inventory
+			player.addItem("Buy", i.getId(), i.getCount(), manager, true);
+		}
+		
+		// Adding to treasury for Manor Castle
+		if (totalPrice > 0) {
+			castle.addToTreasuryNoTax(totalPrice);
+			
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED_ADENA);
+			sm.addLong(totalPrice);
+			player.sendPacket(sm);
+			
+			if (general().manorSaveAllActions()) {
+				manor.updateCurrentProduction(_manorId, _productInfo.values());
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] C5 RequestBuySeed";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySellUIClose.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySellUIClose.java
new file mode 100644
index 00000000..2189808c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySellUIClose.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+
+public class RequestBuySellUIClose extends L2GameClientPacket {
+	private static final String _C__D0_76_REQUESTBUYSELLUICLOSE = "[C] D0:76 RequestBuySellUIClose";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || activeChar.isInventoryDisabled()) {
+			return;
+		}
+		
+		activeChar.sendPacket(new ItemList(activeChar, true));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_76_REQUESTBUYSELLUICLOSE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
new file mode 100644
index 00000000..02d357fa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.StringTokenizer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.enums.InstanceType;
+import com.l2jserver.gameserver.enums.PlayerAction;
+import com.l2jserver.gameserver.handler.AdminCommandHandler;
+import com.l2jserver.gameserver.handler.BypassHandler;
+import com.l2jserver.gameserver.handler.CommunityBoardHandler;
+import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.handler.IBypassHandler;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerBypass;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ConfirmDlg;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.GMAudit;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * RequestBypassToServer client packet implementation.
+ * @author HorridoJoho
+ */
+public final class RequestBypassToServer extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestBypassToServer.class);
+	
+	private static final String _C__23_REQUESTBYPASSTOSERVER = "[C] 23 RequestBypassToServer";
+	// FIXME: This is for compatibility, will be changed when bypass functionality got an overhaul by NosBit
+	private static final String[] _possibleNonHtmlCommands = {
+		"_bbs",
+		"bbs",
+		"_mail",
+		"_friend",
+		"_match",
+		"_diary",
+		"_olympiad?command",
+	};
+	
+	// S
+	private String _command;
+	
+	@Override
+	protected void readImpl() {
+		_command = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (_command.isEmpty()) {
+			LOG.warn("Player {} sent empty bypass!", activeChar.getName());
+			activeChar.logout();
+			return;
+		}
+		
+		boolean requiresBypassValidation = true;
+		for (String possibleNonHtmlCommand : _possibleNonHtmlCommands) {
+			if (_command.startsWith(possibleNonHtmlCommand)) {
+				requiresBypassValidation = false;
+				break;
+			}
+		}
+		
+		int bypassOriginId = 0;
+		if (requiresBypassValidation) {
+			bypassOriginId = activeChar.validateHtmlAction(_command);
+			if (bypassOriginId == -1) {
+				LOG.warn("Player {} sent non cached bypass: '{}'", activeChar.getName(), _command);
+				return;
+			}
+			
+			if ((bypassOriginId > 0) && !Util.isInsideRangeOfObjectId(activeChar, bypassOriginId, L2Npc.INTERACTION_DISTANCE)) {
+				// No logging here, this could be a common case where the player has the html still open and run too far away and then clicks a html action
+				return;
+			}
+		}
+		
+		if (!getClient().getFloodProtectors().getServerBypass().tryPerformAction(_command)) {
+			return;
+		}
+		
+		try {
+			if (_command.startsWith("admin_")) {
+				String command = _command.split(" ")[0];
+				
+				IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
+				
+				if (ach == null) {
+					if (activeChar.isGM()) {
+						activeChar.sendMessage("The command " + command.substring(6) + " does not exist!");
+					}
+					LOG.warn("{} requested not registered admin command '{}'", activeChar, command);
+					return;
+				}
+				
+				if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) {
+					activeChar.sendMessage("You don't have the access rights to use this command!");
+					LOG.warn("Character {} tried to use admin command {}, without proper access level!", activeChar.getName(), command);
+					return;
+				}
+				
+				if (AdminData.getInstance().requireConfirm(command)) {
+					activeChar.setAdminConfirmCmd(_command);
+					ConfirmDlg dlg = new ConfirmDlg(SystemMessageId.S1);
+					dlg.addString("Are you sure you want execute command " + _command.substring(6) + " ?");
+					activeChar.addAction(PlayerAction.ADMIN_COMMAND);
+					activeChar.sendPacket(dlg);
+				} else {
+					if (general().gmAudit()) {
+						GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
+					}
+					
+					ach.useAdminCommand(_command, activeChar);
+				}
+			} else if (CommunityBoardHandler.getInstance().isCommunityBoardCommand(_command)) {
+				CommunityBoardHandler.getInstance().handleParseCommand(_command, activeChar);
+			} else if (_command.equals("come_here") && activeChar.isGM()) {
+				comeHere(activeChar);
+			} else if (_command.startsWith("npc_")) {
+				int endOfId = _command.indexOf('_', 5);
+				String id;
+				if (endOfId > 0) {
+					id = _command.substring(4, endOfId);
+				} else {
+					id = _command.substring(4);
+				}
+				if (Util.isDigit(id)) {
+					L2Object object = L2World.getInstance().findObject(Integer.parseInt(id));
+					
+					if ((object != null) && object.isNpc() && (endOfId > 0) && activeChar.isInsideRadius(object, L2Npc.INTERACTION_DISTANCE, false, false)) {
+						((L2Npc) object).onBypassFeedback(activeChar, _command.substring(endOfId + 1));
+					}
+				}
+				
+				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			} else if (_command.startsWith("item_")) {
+				int endOfId = _command.indexOf('_', 5);
+				String id;
+				if (endOfId > 0) {
+					id = _command.substring(5, endOfId);
+				} else {
+					id = _command.substring(5);
+				}
+				try {
+					final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(Integer.parseInt(id));
+					if ((item != null) && (endOfId > 0)) {
+						item.onBypassFeedback(activeChar, _command.substring(endOfId + 1));
+					}
+					
+					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+				} catch (NumberFormatException nfe) {
+					LOG.warn("NFE for command [{}]", _command, nfe);
+				}
+			} else if (_command.startsWith("_match")) {
+				String params = _command.substring(_command.indexOf("?") + 1);
+				StringTokenizer st = new StringTokenizer(params, "&");
+				int heroclass = Integer.parseInt(st.nextToken().split("=")[1]);
+				int heropage = Integer.parseInt(st.nextToken().split("=")[1]);
+				int heroid = Hero.getInstance().getHeroByClass(heroclass);
+				if (heroid > 0) {
+					Hero.getInstance().showHeroFights(activeChar, heroclass, heroid, heropage);
+				}
+			} else if (_command.startsWith("_diary")) {
+				String params = _command.substring(_command.indexOf("?") + 1);
+				StringTokenizer st = new StringTokenizer(params, "&");
+				int heroclass = Integer.parseInt(st.nextToken().split("=")[1]);
+				int heropage = Integer.parseInt(st.nextToken().split("=")[1]);
+				int heroid = Hero.getInstance().getHeroByClass(heroclass);
+				if (heroid > 0) {
+					Hero.getInstance().showHeroDiary(activeChar, heroclass, heroid, heropage);
+				}
+			} else if (_command.startsWith("_olympiad?command")) {
+				int arenaId = Integer.parseInt(_command.split("=")[2]);
+				final IBypassHandler handler = BypassHandler.getInstance().getHandler("arenachange");
+				if (handler != null) {
+					handler.useBypass("arenachange " + (arenaId - 1), activeChar, null);
+				}
+			} else {
+				final IBypassHandler handler = BypassHandler.getInstance().getHandler(_command);
+				if (handler != null) {
+					if (bypassOriginId > 0) {
+						L2Object bypassOrigin = activeChar.getKnownList().getKnownObjects().get(bypassOriginId);
+						if ((bypassOrigin != null) && bypassOrigin.isInstanceTypes(InstanceType.L2Character)) {
+							handler.useBypass(_command, activeChar, (L2Character) bypassOrigin);
+						} else {
+							handler.useBypass(_command, activeChar, null);
+						}
+					} else {
+						handler.useBypass(_command, activeChar, null);
+					}
+				} else {
+					LOG.warn("{} sent not handled RequestBypassToServer: [{}]", getClient(), _command);
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Exception processing bypass from player {}: {}", activeChar.getName(), _command, e);
+			
+			if (activeChar.isGM()) {
+				StringBuilder sb = new StringBuilder(200);
+				sb.append("<html><body>");
+				sb.append("Bypass error: ").append(e).append("<br1>");
+				sb.append("Bypass command: ").append(_command).append("<br1>");
+				sb.append("StackTrace:<br1>");
+				for (StackTraceElement ste : e.getStackTrace()) {
+					sb.append(ste.toString()).append("<br1>");
+				}
+				sb.append("</body></html>");
+				// item html
+				final NpcHtmlMessage msg = new NpcHtmlMessage(0, 1, sb.toString());
+				msg.disableValidation();
+				activeChar.sendPacket(msg);
+			}
+		}
+		
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerBypass(activeChar, _command), activeChar);
+	}
+	
+	private static void comeHere(L2PcInstance activeChar) {
+		L2Object obj = activeChar.getTarget();
+		if (obj == null) {
+			return;
+		}
+		if (obj instanceof L2Npc npc) {
+			npc.setTarget(activeChar);
+			npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, activeChar.getLocation());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__23_REQUESTBYPASSTOSERVER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java
new file mode 100644
index 00000000..141b1067
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java
@@ -0,0 +1,207 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Objects;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestCancelPostAttachment extends L2GameClientPacket {
+	private static final String _C__D0_6F_REQUESTCANCELPOSTATTACHMENT = "[C] D0:6F RequestCancelPostAttachment";
+	
+	private int _msgId;
+	
+	@Override
+	protected void readImpl() {
+		_msgId = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !general().allowMail() || !general().allowAttachments()) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("cancelpost")) {
+			return;
+		}
+		
+		Message msg = MailManager.getInstance().getMessage(_msgId);
+		if (msg == null) {
+			return;
+		}
+		if (msg.getSenderId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to cancel not own post!");
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE)) {
+			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_NOT_IN_PEACE_ZONE);
+			return;
+		}
+		
+		if (activeChar.getActiveTradeList() != null) {
+			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_DURING_EXCHANGE);
+			return;
+		}
+		
+		if (activeChar.isEnchanting()) {
+			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_DURING_ENCHANT);
+			return;
+		}
+		
+		if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_PRIVATE_STORE);
+			return;
+		}
+		
+		if (!msg.hasAttachments()) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANT_CANCEL_RECEIVED_MAIL);
+			return;
+		}
+		
+		final ItemContainer attachments = msg.getAttachments();
+		if ((attachments == null) || (attachments.getSize() == 0)) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANT_CANCEL_RECEIVED_MAIL);
+			return;
+		}
+		
+		int weight = 0;
+		int slots = 0;
+		
+		for (L2ItemInstance item : attachments.getItems()) {
+			if (item == null) {
+				continue;
+			}
+			
+			if (item.getOwnerId() != activeChar.getObjectId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get not own item from cancelled attachment!");
+				return;
+			}
+			
+			if (item.getItemLocation() != ItemLocation.MAIL) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get items not from mail !");
+				return;
+			}
+			
+			if (item.getLocationSlot() != msg.getId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get items from different attachment!");
+				return;
+			}
+			
+			weight += item.getCount() * item.getItem().getWeight();
+			if (!item.isStackable()) {
+				slots += item.getCount();
+			} else if (activeChar.getInventory().getItemByItemId(item.getId()) == null) {
+				slots++;
+			}
+		}
+		
+		if (!activeChar.getInventory().validateCapacity(slots)) {
+			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_INVENTORY_FULL);
+			return;
+		}
+		
+		if (!activeChar.getInventory().validateWeight(weight)) {
+			activeChar.sendPacket(SystemMessageId.CANT_CANCEL_INVENTORY_FULL);
+			return;
+		}
+		
+		// Proceed to the transfer
+		InventoryUpdate playerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+		for (L2ItemInstance item : attachments.getItems()) {
+			if (item == null) {
+				continue;
+			}
+			
+			long count = item.getCount();
+			final L2ItemInstance newItem = attachments.transferItem(attachments.getName(), item.getObjectId(), count, activeChar.getInventory(), activeChar, null);
+			if (newItem == null) {
+				return;
+			}
+			
+			if (playerIU != null) {
+				if (newItem.getCount() > count) {
+					playerIU.addModifiedItem(newItem);
+				} else {
+					playerIU.addNewItem(newItem);
+				}
+			}
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_ACQUIRED_S2_S1);
+			sm.addItemName(item.getId());
+			sm.addLong(count);
+			activeChar.sendPacket(sm);
+		}
+		
+		msg.removeAttachments();
+		
+		// Send updated item list to the player
+		activeChar.sendPacket(Objects.requireNonNullElseGet(playerIU, () -> new ItemList(activeChar, false)));
+		
+		// Update current load status on player
+		StatusUpdate su = new StatusUpdate(activeChar);
+		su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
+		activeChar.sendPacket(su);
+		
+		final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
+		if (receiver != null) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANCELLED_MAIL);
+			sm.addCharName(activeChar);
+			receiver.sendPacket(sm);
+			receiver.sendPacket(new ExChangePostState(true, _msgId, Message.DELETED));
+		}
+		
+		MailManager.getInstance().deleteMessageInDb(_msgId);
+		
+		activeChar.sendPacket(new ExChangePostState(false, _msgId, Message.DELETED));
+		activeChar.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_CANCELLED);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_6F_REQUESTCANCELPOSTATTACHMENT;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
new file mode 100644
index 00000000..f37e8675
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeBookMarkSlot.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+/**
+ * @author ShanSoft
+ */
+public final class RequestChangeBookMarkSlot extends L2GameClientPacket {
+	private static final String _C__D0_51_05_REQUESCHANGEBOOKMARKSLOT = "[C] D0:51:05 RequestChangeBookMarkSlot";
+	
+	@Override
+	protected void readImpl() {
+		// There is nothing to read.
+	}
+	
+	@Override
+	protected void runImpl() {
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_51_05_REQUESCHANGEBOOKMARKSLOT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java
new file mode 100644
index 00000000..adff7f0b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangeNicknameColor.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author KenM
+ * @author Gnacik
+ */
+public class RequestChangeNicknameColor extends L2GameClientPacket {
+	private static final String _C__D0_4F_REQUESTCHANGENICKNAMECOLOR = "[C] D0:4F RequestChangeNicknameColor";
+	
+	private static final int[] COLORS = {
+		0x9393FF, // Pink
+		0x7C49FC, // Rose Pink
+		0x97F8FC, // Lemon Yellow
+		0xFA9AEE, // Lilac
+		0xFF5D93, // Cobalt Violet
+		0x00FCA0, // Mint Green
+		0xA0A601, // Peacock Green
+		0x7898AF, // Yellow Ochre
+		0x486295, // Chocolate
+		0x999999 // Silver
+	};
+	
+	private int _colorNum, _itemObjectId;
+	private String _title;
+	
+	@Override
+	protected void readImpl() {
+		_colorNum = readD();
+		_title = readS();
+		_itemObjectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_colorNum < 0) || (_colorNum >= COLORS.length)) {
+			return;
+		}
+		
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_itemObjectId);
+		if ((item == null) || (item.getEtcItem() == null) || (item.getEtcItem().getHandlerName() == null) || !item.getEtcItem().getHandlerName().equalsIgnoreCase("NicknameColor")) {
+			return;
+		}
+		
+		if (activeChar.destroyItem("Consume", item, 1, null, true)) {
+			activeChar.setTitle(_title);
+			activeChar.getAppearance().setTitleColor(COLORS[_colorNum]);
+			activeChar.broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_4F_REQUESTCHANGENICKNAMECOLOR;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java
new file mode 100644
index 00000000..58e83514
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePartyLeader.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * This packet is received from client when a party leader requests to change the leadership to another player in his party.
+ */
+public final class RequestChangePartyLeader extends L2GameClientPacket {
+	private static final String _C__D0_0C_REQUESTCHANGEPARTYLEADER = "[C] D0:0C RequestChangePartyLeader";
+	
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2Party party = activeChar.getParty();
+		if ((party != null) && party.isLeader(activeChar)) {
+			party.changePartyLeader(_name);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_0C_REQUESTCHANGEPARTYLEADER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java
new file mode 100644
index 00000000..834da56e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestChangePetName.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.PetNameTable;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * @since 2005/04/06 16:13:48
+ */
+public final class RequestChangePetName extends L2GameClientPacket {
+	private static final String _C__93_REQUESTCHANGEPETNAME = "[C] 93 RequestChangePetName";
+	private static final int PET_NAME_MAX_LENGTH = 16;
+	
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Summon pet = activeChar.getSummon();
+		if (pet == null) {
+			return;
+		}
+		
+		if (!pet.isPet()) {
+			activeChar.sendPacket(SystemMessageId.DONT_HAVE_PET);
+			return;
+		}
+		
+		if (pet.getName() != null) {
+			activeChar.sendPacket(SystemMessageId.NAMING_YOU_CANNOT_SET_NAME_OF_THE_PET);
+			return;
+		}
+		
+		if (PetNameTable.getInstance().doesPetNameExist(_name)) {
+			activeChar.sendPacket(SystemMessageId.NAMING_ALREADY_IN_USE_BY_ANOTHER_PET);
+			return;
+		}
+		
+		if (_name.isEmpty() || (_name.length() > PET_NAME_MAX_LENGTH)) {
+			activeChar.sendPacket(SystemMessageId.NAMING_CHARNAME_UP_TO_16CHARS);
+			return;
+		}
+		
+		if (!PetNameTable.getInstance().isValidPetName(_name)) {
+			activeChar.sendPacket(SystemMessageId.NAMING_PETNAME_CONTAINS_INVALID_CHARS);
+			return;
+		}
+		
+		pet.setName(_name);
+		pet.updateAndBroadcastStatus(1);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__93_REQUESTCHANGEPETNAME;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java
new file mode 100644
index 00000000..76ff7a28
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmCancelItem.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPutItemResultForVariationCancel;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Format(ch) d
+ * @author -Wooden-
+ */
+public final class RequestConfirmCancelItem extends L2GameClientPacket {
+	private static final String _C__D0_42_REQUESTCONFIRMCANCELITEM = "[C] D0:42 RequestConfirmCancelItem";
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
+		if (item == null) {
+			return;
+		}
+		
+		if (item.getOwnerId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(getClient().getActiveChar(), "Warning!! Character " + getClient().getActiveChar().getName() + " of account " + getClient().getActiveChar().getAccountName() + " tryied to destroy augment on item that doesn't own.");
+			return;
+		}
+		
+		if (!item.isAugmented()) {
+			activeChar.sendPacket(SystemMessageId.AUGMENTATION_REMOVAL_CAN_ONLY_BE_DONE_ON_AN_AUGMENTED_ITEM);
+			return;
+		}
+		
+		if (item.isPvp() && !character().allowAugmentPvPItems()) {
+			activeChar.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
+			return;
+		}
+		
+		int price;
+		switch (item.getItem().getCrystalType()) {
+			case C:
+				if (item.getCrystalCount() < 1720) {
+					price = 95000;
+				} else if (item.getCrystalCount() < 2452) {
+					price = 150000;
+				} else {
+					price = 210000;
+				}
+				break;
+			case B:
+				if (item.getCrystalCount() < 1746) {
+					price = 240000;
+				} else {
+					price = 270000;
+				}
+				break;
+			case A:
+				if (item.getCrystalCount() < 2160) {
+					price = 330000;
+				} else if (item.getCrystalCount() < 2824) {
+					price = 390000;
+				} else {
+					price = 420000;
+				}
+				break;
+			case S:
+				price = 480000;
+				break;
+			case S80:
+			case S84:
+				price = 920000;
+				break;
+			// TODO: S84 TOP price 3.2M
+			// any other item type is not augmentable
+			default:
+				return;
+		}
+		
+		activeChar.sendPacket(new ExPutItemResultForVariationCancel(item, price));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_42_REQUESTCONFIRMCANCELITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java
new file mode 100644
index 00000000..251e7fef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmGemStone.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPutCommissionResultForVariationMake;
+
+/**
+ * Format:(ch) dddd
+ * @author -Wooden-
+ */
+public final class RequestConfirmGemStone extends AbstractRefinePacket {
+	private static final String _C__D0_28_REQUESTCONFIRMGEMSTONE = "[C] D0:28 RequestConfirmGemStone";
+	private int _targetItemObjId;
+	private int _refinerItemObjId;
+	private int _gemstoneItemObjId;
+	private long _gemStoneCount;
+	
+	@Override
+	protected void readImpl() {
+		_targetItemObjId = readD();
+		_refinerItemObjId = readD();
+		_gemstoneItemObjId = readD();
+		_gemStoneCount = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId);
+		if (targetItem == null) {
+			return;
+		}
+		L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId);
+		if (refinerItem == null) {
+			return;
+		}
+		L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemstoneItemObjId);
+		if (gemStoneItem == null) {
+			return;
+		}
+		
+		// Make sure the item is a gemstone
+		if (!isValid(activeChar, targetItem, refinerItem, gemStoneItem)) {
+			activeChar.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
+			return;
+		}
+		
+		// Check for gemstone count
+		final LifeStone ls = getLifeStone(refinerItem.getId());
+		if (ls == null) {
+			return;
+		}
+		
+		if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getItemGrade(), ls.getGrade())) {
+			activeChar.sendPacket(SystemMessageId.GEMSTONE_QUANTITY_IS_INCORRECT);
+			return;
+		}
+		
+		activeChar.sendPacket(new ExPutCommissionResultForVariationMake(_gemstoneItemObjId, _gemStoneCount, gemStoneItem.getId()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_28_REQUESTCONFIRMGEMSTONE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmRefinerItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
new file mode 100644
index 00000000..0e50476e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmRefinerItem.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPutIntensiveResultForVariationMake;
+
+/**
+ * Format(ch) dd
+ * @author -Wooden-
+ */
+public class RequestConfirmRefinerItem extends AbstractRefinePacket {
+	private static final String _C__D0_27_REQUESTCONFIRMREFINERITEM = "[C] D0:27 RequestConfirmRefinerItem";
+	
+	private int _targetItemObjId;
+	private int _refinerItemObjId;
+	
+	@Override
+	protected void readImpl() {
+		_targetItemObjId = readD();
+		_refinerItemObjId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId);
+		if (targetItem == null) {
+			return;
+		}
+		
+		final L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId);
+		if (refinerItem == null) {
+			return;
+		}
+		
+		if (!isValid(activeChar, targetItem, refinerItem)) {
+			activeChar.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
+			return;
+		}
+		
+		final int refinerItemId = refinerItem.getItem().getId();
+		final CrystalType grade = targetItem.getItem().getItemGrade();
+		final LifeStone ls = getLifeStone(refinerItemId);
+		final int gemStoneId = getGemStoneId(grade);
+		final int gemStoneCount = getGemStoneCount(grade, ls.getGrade());
+		
+		activeChar.sendPacket(new ExPutIntensiveResultForVariationMake(_refinerItemObjId, refinerItemId, gemStoneId, gemStoneCount));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_27_REQUESTCONFIRMREFINERITEM;
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
new file mode 100644
index 00000000..d8ee8c37
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmSiegeWaitingList.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.network.serverpackets.SiegeDefenderList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestConfirmSiegeWaitingList extends L2GameClientPacket {
+	private static final String _C__AE_RequestConfirmSiegeWaitingList = "[C] AE RequestConfirmSiegeWaitingList";
+	
+	private int _approved;
+	private int _castleId;
+	private int _clanId;
+	
+	@Override
+	protected void readImpl() {
+		_castleId = readD();
+		_clanId = readD();
+		_approved = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		// Check if the player has a clan
+		if (activeChar.getClan() == null) {
+			return;
+		}
+		
+		Castle castle = CastleManager.getInstance().getCastleById(_castleId);
+		if (castle == null) {
+			return;
+		}
+		
+		// Check if leader of the clan who owns the castle?
+		if ((castle.getOwnerId() != activeChar.getClanId()) || (!activeChar.isClanLeader())) {
+			return;
+		}
+		
+		L2Clan clan = ClanTable.getInstance().getClan(_clanId);
+		if (clan == null) {
+			return;
+		}
+		
+		if (!castle.getSiege().getIsRegistrationOver()) {
+			if (_approved == 1) {
+				if (castle.getSiege().checkIsDefenderWaiting(clan)) {
+					castle.getSiege().approveSiegeDefenderClan(_clanId);
+				} else {
+					return;
+				}
+			} else {
+				if ((castle.getSiege().checkIsDefenderWaiting(clan)) || (castle.getSiege().checkIsDefender(clan))) {
+					castle.getSiege().removeSiegeClan(_clanId);
+				}
+			}
+		}
+		
+		// Update the defender list
+		activeChar.sendPacket(new SiegeDefenderList(castle));
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__AE_RequestConfirmSiegeWaitingList;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmTargetItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmTargetItem.java
new file mode 100644
index 00000000..a8ba18df
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestConfirmTargetItem.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPutItemResultForVariationMake;
+
+/**
+ * Format:(ch) d
+ * @author -Wooden-
+ */
+public final class RequestConfirmTargetItem extends AbstractRefinePacket {
+	private static final String _C__D0_26_REQUESTCONFIRMTARGETITEM = "[C] D0:26 RequestConfirmTargetItem";
+	private int _itemObjId;
+	
+	@Override
+	protected void readImpl() {
+		_itemObjId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_itemObjId);
+		if (item == null) {
+			return;
+		}
+		
+		if (!isValid(activeChar, item)) {
+			// Different system message here
+			if (item.isAugmented()) {
+				activeChar.sendPacket(SystemMessageId.ONCE_AN_ITEM_IS_AUGMENTED_IT_CANNOT_BE_AUGMENTED_AGAIN);
+				return;
+			}
+			
+			activeChar.sendPacket(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM);
+			return;
+		}
+		
+		activeChar.sendPacket(new ExPutItemResultForVariationMake(_itemObjId, item.getId()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_26_REQUESTCONFIRMTARGETITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
new file mode 100644
index 00000000..0cc522c2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestCrystallizeItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestCrystallizeItem.class);
+	
+	private static final String _C__2F_REQUESTDCRYSTALLIZEITEM = "[C] 2F RequestCrystallizeItem";
+	
+	private int _objectId;
+	private long _count;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_count = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		
+		if (activeChar == null) {
+			LOG.debug("activeChar was null");
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("crystallize")) {
+			activeChar.sendMessage("You are crystallizing too fast.");
+			return;
+		}
+		
+		if (_count <= 0) {
+			Util.handleIllegalPlayerAction(activeChar, "[RequestCrystallizeItem] count <= 0! ban! oid: " + _objectId + " owner: " + activeChar.getName());
+			return;
+		}
+		
+		if ((activeChar.getPrivateStoreType() != PrivateStoreType.NONE) || activeChar.isInCrystallize()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE);
+			return;
+		}
+		
+		int skillLevel = activeChar.getSkillLevel(CommonSkill.CRYSTALLIZE.getId());
+		if (skillLevel <= 0) {
+			activeChar.sendPacket(SystemMessageId.CRYSTALLIZE_LEVEL_TOO_LOW);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			if ((activeChar.getRace() != Race.DWARF) && (activeChar.getClassId().ordinal() != 117) && (activeChar.getClassId().ordinal() != 55)) {
+				LOG.info("Player {} used crystalize with classid: {}", activeChar.getClient(), activeChar.getClassId().ordinal());
+			}
+			return;
+		}
+		
+		PcInventory inventory = activeChar.getInventory();
+		if (inventory != null) {
+			L2ItemInstance item = inventory.getItemByObjectId(_objectId);
+			if (item == null) {
+				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
+			if (item.isHeroItem()) {
+				return;
+			}
+			
+			if (_count > item.getCount()) {
+				_count = activeChar.getInventory().getItemByObjectId(_objectId).getCount();
+			}
+		}
+		
+		L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId);
+		if ((itemToRemove == null) || itemToRemove.isShadowItem() || itemToRemove.isTimeLimitedItem()) {
+			return;
+		}
+		
+		if (!itemToRemove.getItem().isCrystallizable() || (itemToRemove.getItem().getCrystalCount() <= 0) || (itemToRemove.getItem().getCrystalType() == CrystalType.NONE)) {
+			LOG.warn("{} ({}) tried to crystallize {}", activeChar.getName(), activeChar.getObjectId(), itemToRemove.getItem().getId());
+			return;
+		}
+		
+		if (!activeChar.getInventory().canManipulateWithItemId(itemToRemove.getId())) {
+			activeChar.sendMessage("You cannot use this item.");
+			return;
+		}
+		
+		// Check if the char can crystallize items and return if false;
+		boolean canCrystallize = true;
+		
+		switch (itemToRemove.getItem().getItemGradeSPlus()) {
+			case C -> {
+				if (skillLevel <= 1) {
+					canCrystallize = false;
+				}
+			}
+			case B -> {
+				if (skillLevel <= 2) {
+					canCrystallize = false;
+				}
+			}
+			case A -> {
+				if (skillLevel <= 3) {
+					canCrystallize = false;
+				}
+			}
+			case S -> {
+				if (skillLevel <= 4) {
+					canCrystallize = false;
+				}
+			}
+		}
+		
+		if (!canCrystallize) {
+			activeChar.sendPacket(SystemMessageId.CRYSTALLIZE_LEVEL_TOO_LOW);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		activeChar.setInCrystallize(true);
+		
+		// unequip if needed
+		SystemMessage sm;
+		if (itemToRemove.isEquipped()) {
+			L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot());
+			InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance item : unequiped) {
+				iu.addModifiedItem(item);
+			}
+			activeChar.sendPacket(iu);
+			
+			if (itemToRemove.getEnchantLevel() > 0) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+				sm.addInt(itemToRemove.getEnchantLevel());
+				sm.addItemName(itemToRemove);
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+				sm.addItemName(itemToRemove);
+			}
+			activeChar.sendPacket(sm);
+		}
+		
+		// remove from inventory
+		L2ItemInstance removedItem = activeChar.getInventory().destroyItem("Crystalize", _objectId, _count, activeChar, null);
+		
+		InventoryUpdate iu = new InventoryUpdate();
+		iu.addRemovedItem(removedItem);
+		activeChar.sendPacket(iu);
+		
+		// add crystals
+		int crystalId = itemToRemove.getItem().getCrystalItemId();
+		int crystalAmount = itemToRemove.getCrystalCount();
+		L2ItemInstance createditem = activeChar.getInventory().addItem("Crystalize", crystalId, crystalAmount, activeChar, activeChar);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CRYSTALLIZED);
+		sm.addItemName(removedItem);
+		activeChar.sendPacket(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+		sm.addItemName(createditem);
+		sm.addLong(crystalAmount);
+		activeChar.sendPacket(sm);
+		
+		activeChar.broadcastUserInfo();
+		
+		L2World world = L2World.getInstance();
+		world.removeObject(removedItem);
+		
+		activeChar.setInCrystallize(false);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__2F_REQUESTDCRYSTALLIZEITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java
new file mode 100644
index 00000000..f58ec89e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponList;
+
+/**
+ * Format: (ch)
+ * @author -Wooden-
+ */
+public class RequestCursedWeaponList extends L2GameClientPacket {
+	private static final String _C__D0_2A_REQUESTCURSEDWEAPONLIST = "[C] D0:2A RequestCursedWeaponList";
+	
+	@Override
+	protected void readImpl() {
+		// nothing to read it's just a trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		final var player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		player.sendPacket(new ExCursedWeaponList(CursedWeaponsManager.getInstance().getCursedWeaponsIds()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_2A_REQUESTCURSEDWEAPONLIST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
new file mode 100644
index 00000000..aec8c47a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.model.CursedWeapon;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponLocation;
+import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponLocation.CursedWeaponInfo;
+
+/**
+ * Format: (ch)
+ * @author -Wooden-
+ */
+public final class RequestCursedWeaponLocation extends L2GameClientPacket {
+	private static final String _C__D0_2B_REQUESTCURSEDWEAPONLOCATION = "[C] D0:2B RequestCursedWeaponLocation";
+	
+	@Override
+	protected void readImpl() {
+		// nothing to read it's just a trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2Character activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		List<CursedWeaponInfo> list = new ArrayList<>();
+		for (CursedWeapon cw : CursedWeaponsManager.getInstance().getCursedWeapons()) {
+			if (!cw.isActive()) {
+				continue;
+			}
+			
+			Location pos = cw.getWorldPosition();
+			if (pos != null) {
+				list.add(new CursedWeaponInfo(pos, cw.getItemId(), cw.isActivated() ? 1 : 0));
+			}
+		}
+		
+		// send the ExCursedWeaponLocation
+		if (!list.isEmpty()) {
+			activeChar.sendPacket(new ExCursedWeaponLocation(list));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_2B_REQUESTCURSEDWEAPONLOCATION;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
new file mode 100644
index 00000000..8ff2c446
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteBookMarkSlot.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author ShanSoft
+ * @structure: chdd
+ */
+public final class RequestDeleteBookMarkSlot extends L2GameClientPacket {
+	private static final String _C__D0_51_03_REQUESTDELETEBOOKMARKSLOT = "[C] D0:51:03 RequestDeleteBookMarkSlot";
+	
+	private int id;
+	
+	@Override
+	protected void readImpl() {
+		id = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.teleportBookmarkDelete(id);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_51_03_REQUESTDELETEBOOKMARKSLOT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteMacro.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteMacro.java
new file mode 100644
index 00000000..8c0c58d7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteMacro.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+public final class RequestDeleteMacro extends L2GameClientPacket {
+	private static final String _C__CE_REQUESTDELETEMACRO = "[C] CE RequestDeleteMacro";
+	
+	private int _id;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (getClient().getActiveChar() == null) {
+			return;
+		}
+		getClient().getActiveChar().deleteMacro(_id);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__CE_REQUESTDELETEMACRO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
new file mode 100644
index 00000000..244c9fe9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteReceivedPost.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestDeleteReceivedPost extends L2GameClientPacket {
+	private static final String _C__D0_68_REQUESTDELETERECEIVEDPOST = "[C] D0:68 RequestDeleteReceivedPost";
+	
+	private static final int BATCH_LENGTH = 4; // length of the one item
+	
+	int[] _msgIds = null;
+	
+	@Override
+	protected void readImpl() {
+		int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_msgIds = new int[count];
+		for (int i = 0; i < count; i++) {
+			_msgIds[i] = readD();
+		}
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || (_msgIds == null) || !general().allowMail()) {
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE)) {
+			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+			return;
+		}
+		
+		for (int msgId : _msgIds) {
+			Message msg = MailManager.getInstance().getMessage(msgId);
+			if (msg == null) {
+				continue;
+			}
+			if (msg.getReceiverId() != activeChar.getObjectId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to delete not own post!");
+				return;
+			}
+			
+			if (msg.hasAttachments() || msg.isDeletedByReceiver()) {
+				return;
+			}
+			
+			msg.setDeletedByReceiver();
+		}
+		activeChar.sendPacket(new ExChangePostState(true, _msgIds, Message.DELETED));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_68_REQUESTDELETERECEIVEDPOST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java
new file mode 100644
index 00000000..05f47beb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDeleteSentPost.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestDeleteSentPost extends L2GameClientPacket {
+	private static final String _C__D0_6D_REQUESTDELETESENTPOST = "[C] D0:6D RequestDeleteSentPost";
+	
+	private static final int BATCH_LENGTH = 4; // length of the one item
+	
+	int[] _msgIds = null;
+	
+	@Override
+	protected void readImpl() {
+		int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_msgIds = new int[count];
+		for (int i = 0; i < count; i++) {
+			_msgIds[i] = readD();
+		}
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || (_msgIds == null) || !general().allowMail()) {
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE)) {
+			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+			return;
+		}
+		
+		for (int msgId : _msgIds) {
+			Message msg = MailManager.getInstance().getMessage(msgId);
+			if (msg == null) {
+				continue;
+			}
+			if (msg.getSenderId() != activeChar.getObjectId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to delete not own post!");
+				return;
+			}
+			
+			if (msg.hasAttachments() || msg.isDeletedBySender()) {
+				return;
+			}
+			
+			msg.setDeletedBySender();
+		}
+		activeChar.sendPacket(new ExChangePostState(false, _msgIds, Message.DELETED));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_6D_REQUESTDELETESENTPOST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java
new file mode 100644
index 00000000..57697067
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestDestroyItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestDestroyItem.class);
+	
+	private static final String _C__60_REQUESTDESTROYITEM = "[C] 60 RequestDestroyItem";
+	
+	private int _objectId;
+	private long _count;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_count = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (_count <= 0) {
+			if (_count < 0) {
+				Util.handleIllegalPlayerAction(activeChar, "[RequestDestroyItem] Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " tried to destroy item with oid " + _objectId + " but has count < 0!");
+			}
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("destroy")) {
+			activeChar.sendMessage("You are destroying items too fast.");
+			return;
+		}
+		
+		long count = _count;
+		
+		if (activeChar.isProcessingTransaction() || (activeChar.getPrivateStoreType() != PrivateStoreType.NONE)) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE);
+			return;
+		}
+		
+		L2ItemInstance itemToRemove = activeChar.getInventory().getItemByObjectId(_objectId);
+		
+		// if we can't find the requested item, its actually a cheat
+		if (itemToRemove == null) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+			return;
+		}
+		
+		// Cannot discard item that the skill is consuming
+		if (activeChar.isCastingNow()) {
+			if ((activeChar.getCurrentSkill() != null) && (activeChar.getCurrentSkill().getSkill().getItemConsumeId() == itemToRemove.getId())) {
+				activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+				return;
+			}
+		}
+		// Cannot discard item that the skill is consuming
+		if (activeChar.isCastingSimultaneouslyNow()) {
+			if ((activeChar.getLastSimultaneousSkillCast() != null) && (activeChar.getLastSimultaneousSkillCast().getItemConsumeId() == itemToRemove.getId())) {
+				activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+				return;
+			}
+		}
+		
+		int itemId = itemToRemove.getId();
+		
+		if ((!activeChar.canOverrideCond(PcCondOverride.DESTROY_ALL_ITEMS) && !itemToRemove.isDestroyable()) || CursedWeaponsManager.getInstance().isCursed(itemId)) {
+			if (itemToRemove.isHeroItem()) {
+				activeChar.sendPacket(SystemMessageId.HERO_WEAPONS_CANT_DESTROYED);
+			} else {
+				activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+			}
+			return;
+		}
+		
+		if (!itemToRemove.isStackable() && (count > 1)) {
+			Util.handleIllegalPlayerAction(activeChar, "[RequestDestroyItem] Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " tried to destroy a non-stackable item with oid " + _objectId + " but has count > 1!");
+			return;
+		}
+		
+		if (!activeChar.getInventory().canManipulateWithItemId(itemToRemove.getId())) {
+			activeChar.sendMessage("You cannot use this item.");
+			return;
+		}
+		
+		if (_count > itemToRemove.getCount()) {
+			count = itemToRemove.getCount();
+		}
+		
+		if (itemToRemove.getItem().isPetItem()) {
+			if (activeChar.hasSummon() && (activeChar.getSummon().getControlObjectId() == _objectId)) {
+				activeChar.getSummon().unSummon(activeChar);
+			}
+			
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var statement = con.prepareStatement("DELETE FROM pets WHERE item_obj_id=?")) {
+				statement.setInt(1, _objectId);
+				statement.execute();
+			} catch (Exception e) {
+				LOG.warn("Could not delete pet objectid: ", e);
+			}
+		}
+		if (itemToRemove.isTimeLimitedItem()) {
+			itemToRemove.endOfLife();
+		}
+		
+		if (itemToRemove.isEquipped()) {
+			if (itemToRemove.getEnchantLevel() > 0) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+				sm.addInt(itemToRemove.getEnchantLevel());
+				sm.addItemName(itemToRemove);
+				activeChar.sendPacket(sm);
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+				sm.addItemName(itemToRemove);
+				activeChar.sendPacket(sm);
+			}
+			
+			L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(itemToRemove.getLocationSlot());
+			
+			InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance itm : unequiped) {
+				iu.addModifiedItem(itm);
+			}
+			activeChar.sendPacket(iu);
+		}
+		
+		L2ItemInstance removedItem = activeChar.getInventory().destroyItem("Destroy", itemToRemove, count, activeChar, null);
+		
+		if (removedItem == null) {
+			return;
+		}
+		
+		if (!general().forceInventoryUpdate()) {
+			InventoryUpdate iu = new InventoryUpdate();
+			if (removedItem.getCount() == 0) {
+				iu.addRemovedItem(removedItem);
+			} else {
+				iu.addModifiedItem(removedItem);
+			}
+			activeChar.sendPacket(iu);
+		} else {
+			sendPacket(new ItemList(activeChar, true));
+		}
+		
+		StatusUpdate su = new StatusUpdate(activeChar);
+		su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
+		activeChar.sendPacket(su);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__60_REQUESTDESTROYITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java
new file mode 100644
index 00000000..4502682d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissAlly.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestDismissAlly extends L2GameClientPacket {
+	private static final String _C__90_REQUESTDISMISSALLY = "[C] 90 RequestDismissAlly";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (!activeChar.isClanLeader()) {
+			activeChar.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
+			return;
+		}
+		activeChar.getClan().dissolveAlly(activeChar);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__90_REQUESTDISMISSALLY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java
new file mode 100644
index 00000000..9ed1a45e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public class RequestDismissPartyRoom extends L2GameClientPacket {
+	private static final String _C__D0_0A_REQUESTDISMISSPARTYROOM = "[C] D0:0A RequestDismissPartyRoom";
+	
+	private int _roomid;
+	@SuppressWarnings("unused")
+	private int _data2;
+	
+	@Override
+	protected void readImpl() {
+		_roomid = readD();
+		_data2 = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance _activeChar = getClient().getActiveChar();
+		
+		if (_activeChar == null) {
+			return;
+		}
+		
+		PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
+		
+		if (_room == null) {
+			return;
+		}
+		
+		PartyMatchRoomList.getInstance().deleteRoom(_roomid);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_0A_REQUESTDISMISSPARTYROOM;
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java
new file mode 100644
index 00000000..45b82289
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDispel.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author KenM
+ */
+public class RequestDispel extends L2GameClientPacket {
+	private static final String _C_D0_4B_REQUESTDISPEL = "[C] D0:4B RequestDispel";
+	
+	private int _objectId;
+	private int _skillId;
+	private int _skillLevel;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_skillId = readD();
+		_skillLevel = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLevel <= 0)) {
+			return;
+		}
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLevel);
+		if (skill == null) {
+			return;
+		}
+		if (skill.isIrreplaceableBuff() || skill.isStayAfterDeath() || skill.isDebuff()) {
+			return;
+		}
+		if (skill.getAbnormalType() == AbnormalType.TRANSFORM) {
+			return;
+		}
+		if (skill.isDance() && !character().danceCancelBuff()) {
+			return;
+		}
+		if (activeChar.getObjectId() == _objectId) {
+			activeChar.stopSkillEffects(true, _skillId);
+		} else {
+			if (activeChar.hasSummon() && (activeChar.getSummon().getObjectId() == _objectId)) {
+				activeChar.getSummon().stopSkillEffects(true, _skillId);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C_D0_4B_REQUESTDISPEL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDominionInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDominionInfo.java
new file mode 100644
index 00000000..0ea49e47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDominionInfo.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.ExReplyDominionInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExShowOwnthingPos;
+
+/**
+ * @author JIV
+ */
+public class RequestDominionInfo extends L2GameClientPacket {
+	private static final String _C__D0_58_REQUESTDOMINIONINFO = "[C] D0:58 RequestDominionInfo";
+	
+	@Override
+	protected void readImpl() {
+		// nothing
+	}
+	
+	@Override
+	protected void runImpl() {
+		sendPacket(ExReplyDominionInfo.STATIC_PACKET);
+		sendPacket(ExShowOwnthingPos.STATIC_PACKET);
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_58_REQUESTDOMINIONINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java
new file mode 100644
index 00000000..109950cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDropItem.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.util.GMAudit;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/04/02 21:25:21
+ */
+public final class RequestDropItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestDropItem.class);
+	
+	private static final String _C__17_REQUESTDROPITEM = "[C] 17 RequestDropItem";
+	
+	private int _objectId;
+	private long _count;
+	private int _x;
+	private int _y;
+	private int _z;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_count = readQ();
+		_x = readD();
+		_y = readD();
+		_z = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || activeChar.isDead()) {
+			return;
+		}
+		// Flood protect drop to avoid packet lag
+		if (!getClient().getFloodProtectors().getDropItem().tryPerformAction("drop item")) {
+			return;
+		}
+		
+		L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
+		
+		if ((item == null) || (_count == 0) || !activeChar.validateItemManipulation(_objectId, "drop") || (!general().allowDiscardItem() && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS))
+			|| (!item.isDroppable() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && general().gmTradeRestrictedItems())) || ((item.getItemType() == EtcItemType.PET_COLLAR) && activeChar.havePetInvItems()) || activeChar.isInsideZone(ZoneId.NO_ITEM_DROP)) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+			return;
+		}
+		if (item.isQuestItem() && !(activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS) && general().gmTradeRestrictedItems())) {
+			return;
+		}
+		
+		if (_count > item.getCount()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+			return;
+		}
+		
+		if ((character().getPlayerSpawnProtection() > 0) && activeChar.isInvul() && !activeChar.isGM()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+			return;
+		}
+		
+		if (_count < 0) {
+			Util.handleIllegalPlayerAction(activeChar, "[RequestDropItem] Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " tried to drop item with oid " + _objectId + " but has count < 0!");
+			return;
+		}
+		
+		if (!item.isStackable() && (_count > 1)) {
+			Util.handleIllegalPlayerAction(activeChar, "[RequestDropItem] Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " tried to drop non-stackable item with oid " + _objectId + " but has count > 1!");
+			return;
+		}
+		
+		if (general().jailDisableTransaction() && activeChar.isJailed()) {
+			activeChar.sendMessage("You cannot drop items in Jail.");
+			return;
+		}
+		
+		if (!activeChar.getAccessLevel().allowTransaction()) {
+			activeChar.sendMessage("Transactions are disabled for your Access Level.");
+			activeChar.sendPacket(SystemMessageId.NOTHING_HAPPENED);
+			return;
+		}
+		
+		if (activeChar.isProcessingTransaction() || (activeChar.getPrivateStoreType() != PrivateStoreType.NONE)) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE);
+			return;
+		}
+		if (activeChar.isFishing()) {
+			// You can't mount, dismount, break and drop items while fishing
+			activeChar.sendPacket(SystemMessageId.CANNOT_DO_WHILE_FISHING_2);
+			return;
+		}
+		if (activeChar.isFlying()) {
+			return;
+		}
+		
+		// Cannot discard item that the skill is consuming
+		if (activeChar.isCastingNow()) {
+			if ((activeChar.getCurrentSkill() != null) && (activeChar.getCurrentSkill().getSkill().getItemConsumeId() == item.getId())) {
+				activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+				return;
+			}
+		}
+		
+		// Cannot discard item that the skill is consuming
+		if (activeChar.isCastingSimultaneouslyNow()) {
+			if ((activeChar.getLastSimultaneousSkillCast() != null) && (activeChar.getLastSimultaneousSkillCast().getItemConsumeId() == item.getId())) {
+				activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_THIS_ITEM);
+				return;
+			}
+		}
+		
+		if ((ItemType2.QUEST == item.getItem().getType2()) && !activeChar.canOverrideCond(PcCondOverride.DROP_ALL_ITEMS)) {
+			if (general().debug()) {
+				LOG.trace("{}:player tried to drop quest item", activeChar.getObjectId());
+			}
+			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_EXCHANGE_ITEM);
+			return;
+		}
+		
+		if (!activeChar.isInsideRadius(_x, _y, 0, 150, false, false) || (Math.abs(_z - activeChar.getZ()) > 50)) {
+			if (general().debug()) {
+				LOG.trace("{}: trying to drop too far away", activeChar.getObjectId());
+			}
+			activeChar.sendPacket(SystemMessageId.CANNOT_DISCARD_DISTANCE_TOO_FAR);
+			return;
+		}
+		
+		if (!activeChar.getInventory().canManipulateWithItemId(item.getId())) {
+			activeChar.sendMessage("You cannot use this item.");
+			return;
+		}
+		
+		if (general().debug()) {
+			LOG.debug("requested drop item {}({}) at {}/{}/{}", _objectId, item.getCount(), _x, _y, _z);
+		}
+		
+		if (item.isEquipped()) {
+			L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
+			InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance itm : unequiped) {
+				itm.unChargeAllShots();
+				iu.addModifiedItem(itm);
+			}
+			activeChar.sendPacket(iu);
+			activeChar.broadcastUserInfo();
+			
+			ItemList il = new ItemList(activeChar, true);
+			activeChar.sendPacket(il);
+		}
+		
+		L2ItemInstance dropedItem = activeChar.dropItem("Drop", _objectId, _count, _x, _y, _z, null, false, false);
+		
+		if (general().debug()) {
+			LOG.debug("dropping {} item({}) at: {} {} {}", _objectId, _count, _x, _y, _z);
+		}
+		
+		// activeChar.broadcastUserInfo();
+		
+		if (activeChar.isGM()) {
+			String target = (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target");
+			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", "Drop", target, "(id: " + dropedItem.getId() + " name: " + dropedItem.getItemName() + " objId: " + dropedItem.getObjectId() + " x: " + activeChar.getX() + " y: " + activeChar.getY() + " z: "
+				+ activeChar.getZ() + ")");
+		}
+		
+		if ((dropedItem != null) && (dropedItem.getId() == Inventory.ADENA_ID) && (dropedItem.getCount() >= 1000000)) {
+			String msg = "Character (" + activeChar.getName() + ") has dropped (" + dropedItem.getCount() + ")adena at (" + _x + "," + _y + "," + _z + ")";
+			LOG.warn(msg);
+			AdminData.getInstance().broadcastMessageToGMs(msg);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__17_REQUESTDROPITEM;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java
new file mode 100644
index 00000000..c4fcbf92
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelAnswerStart.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Format:(ch) ddd
+ * @author -Wooden-
+ */
+public final class RequestDuelAnswerStart extends L2GameClientPacket {
+	private static final String _C__D0_1C_REQUESTDUELANSWERSTART = "[C] D0:1C RequestDuelAnswerStart";
+	private int _partyDuel;
+	@SuppressWarnings("unused")
+	private int _unk1;
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_partyDuel = readD();
+		_unk1 = readD();
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2PcInstance requestor = player.getActiveRequester();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (_response == 1) {
+			SystemMessage msg1, msg2;
+			if (requestor.isInDuel()) {
+				msg1 = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_DUEL_BECAUSE_C1_IS_ALREADY_ENGAGED_IN_A_DUEL);
+				msg1.addString(requestor.getName());
+				player.sendPacket(msg1);
+				return;
+			} else if (player.isInDuel()) {
+				player.sendPacket(SystemMessageId.YOU_ARE_UNABLE_TO_REQUEST_A_DUEL_AT_THIS_TIME);
+				return;
+			}
+			
+			if (_partyDuel == 1) {
+				msg1 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACCEPTED_C1_CHALLENGE_TO_A_PARTY_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
+				msg1.addString(requestor.getName());
+				
+				msg2 = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_DUEL_AGAINST_THEIR_PARTY_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
+				msg2.addString(player.getName());
+			} else {
+				msg1 = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_ACCEPTED_C1_CHALLENGE_TO_A_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
+				msg1.addString(requestor.getName());
+				
+				msg2 = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_ACCEPTED_YOUR_CHALLENGE_TO_A_DUEL_THE_DUEL_WILL_BEGIN_IN_A_FEW_MOMENTS);
+				msg2.addString(player.getName());
+			}
+			
+			player.sendPacket(msg1);
+			requestor.sendPacket(msg2);
+			
+			DuelManager.getInstance().addDuel(requestor, player, _partyDuel == 1);
+		} else if (_response == -1) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_SET_TO_REFUSE_DUEL_REQUEST);
+			sm.addPcName(player);
+			requestor.sendPacket(sm);
+		} else {
+			SystemMessage msg;
+			if (_partyDuel == 1) {
+				msg = SystemMessage.getSystemMessage(SystemMessageId.THE_OPPOSING_PARTY_HAS_DECLINED_YOUR_CHALLENGE_TO_A_DUEL);
+			} else {
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_DECLINED_YOUR_CHALLENGE_TO_A_DUEL);
+				msg.addPcName(player);
+			}
+			requestor.sendPacket(msg);
+		}
+		
+		player.setActiveRequester(null);
+		requestor.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_1C_REQUESTDUELANSWERSTART;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java
new file mode 100644
index 00000000..38771b7f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelStart.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExDuelAskStart;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Format:(ch) Sd
+ * @author -Wooden-
+ */
+public final class RequestDuelStart extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestDuelStart.class);
+	
+	private static final String _C__D0_1B_REQUESTDUELSTART = "[C] D0:1B RequestDuelStart";
+	
+	private String _player;
+	private int _partyDuel;
+	
+	@Override
+	protected void readImpl() {
+		_player = readS();
+		_partyDuel = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		L2PcInstance targetChar = L2World.getInstance().getPlayer(_player);
+		boolean isPartyDuel = _partyDuel == 1;
+		if ((activeChar == null) || (targetChar == null)) {
+			return;
+		}
+		if (activeChar == targetChar) {
+			if (isPartyDuel) {
+				activeChar.sendPacket(SystemMessageId.THERE_IS_NO_OPPONENT_TO_RECEIVE_YOUR_CHALLENGE_FOR_A_DUEL);
+			}
+			return;
+		}
+		if (!activeChar.isInsideRadius(targetChar, 250, false, false)) {
+			SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_CANNOT_RECEIVE_A_DUEL_CHALLENGE_BECAUSE_C1_IS_TOO_FAR_AWAY);
+			msg.addString(targetChar.getName());
+			activeChar.sendPacket(msg);
+			return;
+		}
+		// Check if duel is possible
+		if (!DuelManager.canDuel(activeChar, activeChar, isPartyDuel)) {
+			return;
+		}
+		if (!DuelManager.canDuel(activeChar, targetChar, isPartyDuel)) {
+			return;
+		}
+		
+		// Duel is a party duel
+		if (isPartyDuel) {
+			// Player must be in a party & the party leader
+			if (!activeChar.isInParty() || !activeChar.getParty().isLeader(activeChar) || !targetChar.isInParty() || activeChar.getParty().containsPlayer(targetChar)) {
+				activeChar.sendPacket(SystemMessageId.YOU_ARE_UNABLE_TO_REQUEST_A_DUEL_AT_THIS_TIME);
+				return;
+			}
+			
+			// Check if every player is ready for a duel
+			for (L2PcInstance temp : activeChar.getParty().getMembers()) {
+				if (!DuelManager.canDuel(activeChar, temp, isPartyDuel)) {
+					return;
+				}
+			}
+			L2PcInstance partyLeader = targetChar.getParty().getLeader(); // snatch party leader of targetChar's party
+			
+			for (L2PcInstance temp : targetChar.getParty().getMembers()) {
+				if (!DuelManager.canDuel(activeChar, temp, isPartyDuel)) {
+					return;
+				}
+			}
+			
+			// Send request to targetChar's party leader
+			if (partyLeader != null) {
+				if (!partyLeader.isProcessingRequest()) {
+					activeChar.onTransactionRequest(partyLeader);
+					partyLeader.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel));
+					
+					if (general().debug()) {
+						LOG.debug("{} requested a duel with {}", activeChar.getName(), partyLeader.getName());
+					}
+					
+					SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_HAS_BEEN_CHALLENGED_TO_A_DUEL);
+					msg.addString(partyLeader.getName());
+					activeChar.sendPacket(msg);
+					
+					msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_HAS_CHALLENGED_YOUR_PARTY_TO_A_DUEL);
+					msg.addString(activeChar.getName());
+					targetChar.sendPacket(msg);
+				} else {
+					SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
+					msg.addString(partyLeader.getName());
+					activeChar.sendPacket(msg);
+				}
+			}
+		} else
+		// 1vs1 duel
+		{
+			if (!targetChar.isProcessingRequest()) {
+				activeChar.onTransactionRequest(targetChar);
+				targetChar.sendPacket(new ExDuelAskStart(activeChar.getName(), _partyDuel));
+				
+				if (general().debug()) {
+					LOG.debug("{} requested a duel with {}", activeChar.getName(), targetChar.getName());
+				}
+				
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_BEEN_CHALLENGED_TO_A_DUEL);
+				msg.addString(targetChar.getName());
+				activeChar.sendPacket(msg);
+				
+				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_CHALLENGED_YOU_TO_A_DUEL);
+				msg.addString(activeChar.getName());
+				targetChar.sendPacket(msg);
+			} else {
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
+				msg.addString(targetChar.getName());
+				activeChar.sendPacket(msg);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_1B_REQUESTDUELSTART;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelSurrender.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelSurrender.java
new file mode 100644
index 00000000..9bed8a38
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestDuelSurrender.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.DuelManager;
+
+/**
+ * Format:(ch) just a trigger
+ * @author -Wooden-
+ */
+public final class RequestDuelSurrender extends L2GameClientPacket {
+	private static final String _C__D0_45_REQUESTDUELSURRENDER = "[C] D0:45 RequestDuelSurrender";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		DuelManager.getInstance().doSurrender(getClient().getActiveChar());
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_45_REQUESTDUELSURRENDER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
new file mode 100644
index 00000000..77adc376
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.enchant.EnchantResultType;
+import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
+import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.EnchantResult;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+public final class RequestEnchantItem extends L2GameClientPacket {
+	
+	private static final Logger LOG_ENCHANT_ITEM = LoggerFactory.getLogger("enchant_item");
+	
+	private static final String _C__5F_REQUESTENCHANTITEM = "[C] 5F RequestEnchantItem";
+	
+	private int _objectId;
+	
+	private int _supportId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_supportId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || (_objectId == 0)) {
+			return;
+		}
+		
+		if (!activeChar.isOnline() || getClient().isDetached()) {
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		if (activeChar.isProcessingTransaction() || activeChar.isInStoreMode()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_ENCHANT_WHILE_STORE);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
+		L2ItemInstance scroll = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantItemId());
+		L2ItemInstance support = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantSupportItemId());
+		
+		if ((item == null) || (scroll == null)) {
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		// template for scroll
+		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
+		
+		// scroll not found in list
+		if (scrollTemplate == null) {
+			return;
+		}
+		
+		// template for support item, if exist
+		EnchantSupportItem supportTemplate = null;
+		if (support != null) {
+			if (support.getObjectId() != _supportId) {
+				activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+				return;
+			}
+			supportTemplate = EnchantItemData.getInstance().getSupportItem(support);
+		}
+		
+		// first validation check
+		if (!scrollTemplate.isValid(item, supportTemplate)) {
+			activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			activeChar.sendPacket(new EnchantResult(2, 0, 0));
+			return;
+		}
+		
+		// fast auto-enchant cheat check
+		if ((activeChar.getActiveEnchantTimestamp() == 0) || ((System.currentTimeMillis() - activeChar.getActiveEnchantTimestamp()) < 2000)) {
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " use autoenchant program ");
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			activeChar.sendPacket(new EnchantResult(2, 0, 0));
+			return;
+		}
+		
+		// attempting to destroy scroll
+		scroll = activeChar.getInventory().destroyItem("Enchant", scroll.getObjectId(), 1, activeChar, item);
+		if (scroll == null) {
+			activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a scroll he doesn't have");
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			activeChar.sendPacket(new EnchantResult(2, 0, 0));
+			return;
+		}
+		
+		// attempting to destroy support if exist
+		if (support != null) {
+			support = activeChar.getInventory().destroyItem("Enchant", support.getObjectId(), 1, activeChar, item);
+			if (support == null) {
+				activeChar.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to enchant with a support item he doesn't have");
+				activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+				activeChar.sendPacket(new EnchantResult(2, 0, 0));
+				return;
+			}
+		}
+		
+		final InventoryUpdate iu = new InventoryUpdate();
+		synchronized (item) {
+			// last validation check
+			if ((item.getOwnerId() != activeChar.getObjectId()) || (item.isEnchantable() == 0)) {
+				activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
+				activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+				activeChar.sendPacket(new EnchantResult(2, 0, 0));
+				return;
+			}
+			
+			final EnchantResultType resultType = scrollTemplate.calculateSuccess(activeChar, item, supportTemplate);
+			switch (resultType) {
+				case ERROR -> {
+					activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
+					activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+					activeChar.sendPacket(new EnchantResult(2, 0, 0));
+				}
+				case SUCCESS -> {
+					L2Item it = item.getItem();
+					// Increase enchant level only if scroll's base template has chance, some armors can success over +20 but they shouldn't have increased.
+					if (scrollTemplate.getChance(activeChar, item) > 0) {
+						item.setEnchantLevel(item.getEnchantLevel() + 1);
+						item.updateDatabase();
+					}
+					activeChar.sendPacket(new EnchantResult(0, 0, 0));
+					
+					if (general().logItemEnchants()) {
+						LOG_ENCHANT_ITEM.info("ENCHANTED {} using {} and {} by {}.", item, scroll, support, activeChar);
+					}
+					
+					// announce the success
+					int minEnchantAnnounce = item.isArmor() ? 6 : 7;
+					int maxEnchantAnnounce = item.isArmor() ? 0 : 15;
+					if ((item.getEnchantLevel() == minEnchantAnnounce) || (item.getEnchantLevel() == maxEnchantAnnounce)) {
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_SUCCESSFULY_ENCHANTED_A_S2_S3);
+						sm.addCharName(activeChar);
+						sm.addInt(item.getEnchantLevel());
+						sm.addItemName(item);
+						activeChar.broadcastPacket(sm);
+						
+						Skill skill = CommonSkill.FIREWORK.getSkill();
+						if (skill != null) {
+							activeChar.broadcastPacket(new MagicSkillUse(activeChar, activeChar, skill.getId(), skill.getLevel(), skill.getHitTime(), skill.getReuseDelay()));
+						}
+					}
+					
+					if ((item.isArmor()) && (item.getEnchantLevel() == 4) && item.isEquipped()) {
+						Skill enchant4Skill = it.getEnchant4Skill();
+						if (enchant4Skill != null) {
+							// add skills bestowed from +4 armor
+							activeChar.addSkill(enchant4Skill, false);
+							activeChar.sendSkillList();
+						}
+					}
+				}
+				case FAILURE -> {
+					if (scrollTemplate.isSafe()) {
+						// safe enchant - remain old value
+						activeChar.sendPacket(SystemMessageId.SAFE_ENCHANT_FAILED);
+						activeChar.sendPacket(new EnchantResult(5, 0, 0));
+						
+						if (general().logItemEnchants()) {
+							LOG_ENCHANT_ITEM.info("FAILED_SAFE_ENCHANTING {} using {} and {} by {}.", item, scroll, support, activeChar);
+						}
+					} else {
+						// unequip item on enchant failure to avoid item skills stack
+						if (item.isEquipped()) {
+							if (item.getEnchantLevel() > 0) {
+								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+								sm.addInt(item.getEnchantLevel());
+								sm.addItemName(item);
+								activeChar.sendPacket(sm);
+							} else {
+								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+								sm.addItemName(item);
+								activeChar.sendPacket(sm);
+							}
+							
+							L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(item.getLocationSlot());
+							for (L2ItemInstance itm : unequiped) {
+								iu.addModifiedItem(itm);
+							}
+							
+							activeChar.sendPacket(iu);
+							activeChar.broadcastUserInfo();
+						}
+						
+						if (scrollTemplate.isBlessed()) {
+							// blessed enchant - clear enchant value
+							activeChar.sendPacket(SystemMessageId.BLESSED_ENCHANT_FAILED);
+							
+							item.setEnchantLevel(0);
+							item.updateDatabase();
+							activeChar.sendPacket(new EnchantResult(3, 0, 0));
+							
+							if (general().logItemEnchants()) {
+								LOG_ENCHANT_ITEM.info("FAILED_BLESSED_ENCHANTING {} using {} and {} by {}.", item, scroll, support, activeChar);
+							}
+						} else {
+							// enchant failed, destroy item
+							item = activeChar.getInventory().destroyItem("Enchant", item, activeChar, null);
+							if (item == null) {
+								// unable to destroy item, cheater ?
+								Util.handleIllegalPlayerAction(activeChar, "Unable to delete item on enchant failure from player " + activeChar.getName() + ", possible cheater !");
+								activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+								activeChar.sendPacket(new EnchantResult(2, 0, 0));
+								
+								if (general().logItemEnchants()) {
+									LOG_ENCHANT_ITEM.warn("CANNOT_DESTROY {} using {} and {} by {}.", item, scroll, support, activeChar);
+								}
+								return;
+							}
+							
+							L2World.getInstance().removeObject(item);
+							
+							final int crystalId = item.getItem().getCrystalItemId();
+							if ((crystalId != 0) && item.getItem().isCrystallizable()) {
+								int count = item.getCrystalCount() - ((item.getItem().getCrystalCount() + 1) / 2);
+								count = Math.max(count, 1);
+								activeChar.getInventory().addItem("Enchant", crystalId, count, activeChar, item);
+								
+								final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
+								sm.addItemName(crystalId);
+								sm.addLong(count);
+								activeChar.sendPacket(sm);
+								activeChar.sendPacket(new EnchantResult(1, crystalId, count));
+							} else {
+								activeChar.sendPacket(new EnchantResult(4, 0, 0));
+							}
+							
+							if (general().logItemEnchants()) {
+								LOG_ENCHANT_ITEM.warn("FAILED_ENCHANTING {} using {} and {} by {}.", item, scroll, support, activeChar);
+							}
+						}
+					}
+				}
+			}
+			
+			final StatusUpdate su = new StatusUpdate(activeChar);
+			su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
+			activeChar.sendPacket(su);
+			if (!general().forceInventoryUpdate()) {
+				if (scroll.getCount() == 0) {
+					iu.addRemovedItem(scroll);
+				} else {
+					iu.addModifiedItem(scroll);
+				}
+				
+				if (item.getCount() == 0) {
+					iu.addRemovedItem(item);
+				} else {
+					iu.addModifiedItem(item);
+				}
+				
+				if (support != null) {
+					if (support.getCount() == 0) {
+						iu.addRemovedItem(support);
+					} else {
+						iu.addModifiedItem(support);
+					}
+				}
+				
+				activeChar.sendPacket(iu);
+			} else {
+				activeChar.sendPacket(new ItemList(activeChar, true));
+			}
+			
+			activeChar.broadcastUserInfo();
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__5F_REQUESTENCHANTITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
new file mode 100644
index 00000000..24571620
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordCheck.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordCheck;
+
+/**
+ * Format: (ch)
+ * @author mrTJO
+ */
+public class RequestEx2ndPasswordCheck extends L2GameClientPacket {
+	private static final String _C__D0_AD_REQUESTEX2NDPASSWORDCHECK = "[C] D0:AD RequestEx2ndPasswordCheck";
+	
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!SecondaryAuthData.getInstance().isEnabled() || getClient().getSecondaryAuth().isAuthed()) {
+			sendPacket(new Ex2ndPasswordCheck(Ex2ndPasswordCheck.PASSWORD_OK));
+			return;
+		}
+		
+		getClient().getSecondaryAuth().openDialog();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_AD_REQUESTEX2NDPASSWORDCHECK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
new file mode 100644
index 00000000..b76cd12f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordReq.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordAck;
+import com.l2jserver.gameserver.security.SecondaryPasswordAuth;
+
+/**
+ * (ch)cS{S} c: change pass? S: current password S: new password
+ * @author mrTJO
+ */
+public class RequestEx2ndPasswordReq extends L2GameClientPacket {
+	private static final String _C__D0_AF_REQUESTEX2NDPASSWORDREQ = "[C] D0:AF RequestEx2ndPasswordReq";
+	
+	private int _changePass;
+	private String _password, _newPassword;
+	
+	@Override
+	protected void readImpl() {
+		_changePass = readC();
+		_password = readS();
+		if (_changePass == 2) {
+			_newPassword = readS();
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!SecondaryAuthData.getInstance().isEnabled()) {
+			return;
+		}
+		
+		SecondaryPasswordAuth spa = getClient().getSecondaryAuth();
+		boolean exVal = false;
+		
+		if ((_changePass == 0) && !spa.passwordExist()) {
+			exVal = spa.savePassword(_password);
+		} else if ((_changePass == 2) && spa.passwordExist()) {
+			exVal = spa.changePassword(_password, _newPassword);
+		}
+		
+		if (exVal) {
+			getClient().sendPacket(new Ex2ndPasswordAck(Ex2ndPasswordAck.SUCCESS));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_AF_REQUESTEX2NDPASSWORDREQ;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
new file mode 100644
index 00000000..4225dea1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestEx2ndPasswordVerify.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+
+/**
+ * Format: (ch)S S: numerical password
+ * @author mrTJO
+ */
+public class RequestEx2ndPasswordVerify extends L2GameClientPacket {
+	private static final String _C__D0_AE_REQUESTEX2NDPASSWORDVERIFY = "[C] D0:AE RequestEx2ndPasswordVerify";
+	
+	private String _password;
+	
+	@Override
+	protected void readImpl() {
+		_password = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!SecondaryAuthData.getInstance().isEnabled()) {
+			return;
+		}
+		
+		getClient().getSecondaryAuth().checkPassword(_password, false);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_AE_REQUESTEX2NDPASSWORDVERIFY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
new file mode 100644
index 00000000..4a8fa4a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAcceptJoinMPCC.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2CommandChannel;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * format: (ch) d
+ * @author -Wooden-
+ */
+public final class RequestExAcceptJoinMPCC extends L2GameClientPacket {
+	private static final String _C__D0_07_REQUESTEXASKJOINMPCC = "[C] D0:07 RequestExAcceptJoinMPCC";
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player != null) {
+			L2PcInstance requestor = player.getActiveRequester();
+			SystemMessage sm;
+			if (requestor == null) {
+				return;
+			}
+			
+			if (_response == 1) {
+				boolean newCc = false;
+				if (!requestor.getParty().isInCommandChannel()) {
+					new L2CommandChannel(requestor); // Create new CC
+					sm = SystemMessage.getSystemMessage(SystemMessageId.COMMAND_CHANNEL_FORMED);
+					requestor.sendPacket(sm);
+					newCc = true;
+				}
+				requestor.getParty().getCommandChannel().addParty(player.getParty());
+				if (!newCc) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.JOINED_COMMAND_CHANNEL);
+					player.sendPacket(sm);
+				}
+			} else {
+				requestor.sendMessage("The player declined to join your Command Channel.");
+			}
+			
+			player.setActiveRequester(null);
+			requestor.onTransactionResponse();
+		}
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_07_REQUESTEXASKJOINMPCC;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java
new file mode 100644
index 00000000..31dd4df5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAddContactToContactList.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExConfirmAddingContact;
+
+/**
+ * Format: (ch)S S: Character Name
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class RequestExAddContactToContactList extends L2GameClientPacket {
+	private static final String _C__D0_84_REQUESTEXADDCONTACTTOCONTACTLIST = "[C] D0:84 RequestExAddContactToContactList";
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!general().allowMail()) {
+			return;
+		}
+		
+		if (_name == null) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		boolean charAdded = activeChar.getContactList().add(_name);
+		activeChar.sendPacket(new ExConfirmAddingContact(_name, charAdded));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_84_REQUESTEXADDCONTACTTOCONTACTLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
new file mode 100644
index 00000000..7203af87
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExAskJoinMPCC.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExAskJoinMPCC;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Format: (ch) S<br>
+ * D0 0D 00 5A 00 77 00 65 00 72 00 67 00 00 00
+ * @author chris_00
+ */
+public final class RequestExAskJoinMPCC extends L2GameClientPacket {
+	private static final String _C__D0_06_REQUESTEXASKJOINMPCC = "[C] D0:06 RequestExAskJoinMPCC";
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2PcInstance player = L2World.getInstance().getPlayer(_name);
+		if (player == null) {
+			return;
+		}
+		// invite yourself? ;)
+		if (activeChar.isInParty() && player.isInParty() && activeChar.getParty().equals(player.getParty())) {
+			return;
+		}
+		
+		SystemMessage sm;
+		// activeChar is in a Party?
+		if (activeChar.isInParty()) {
+			L2Party activeParty = activeChar.getParty();
+			// activeChar is PartyLeader? && activeChars Party is already in a CommandChannel?
+			if (activeParty.getLeader().equals(activeChar)) {
+				// if activeChars Party is in CC, is activeChar CCLeader?
+				if (activeParty.isInCommandChannel() && activeParty.getCommandChannel().getLeader().equals(activeChar)) {
+					// in CC and the CCLeader
+					// target in a party?
+					if (player.isInParty()) {
+						// targets party already in a CChannel?
+						if (player.getParty().isInCommandChannel()) {
+							sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ALREADY_MEMBER_OF_COMMAND_CHANNEL);
+							sm.addString(player.getName());
+							activeChar.sendPacket(sm);
+						} else {
+							// ready to open a new CC
+							// send request to targets Party's PartyLeader
+							askJoinMPCC(activeChar, player);
+						}
+					} else {
+						activeChar.sendMessage(player.getName() + " doesn't have party and cannot be invited to Command Channel.");
+					}
+					
+				} else if (activeParty.isInCommandChannel() && !activeParty.getCommandChannel().getLeader().equals(activeChar)) {
+					// in CC, but not the CCLeader
+					sm = SystemMessage.getSystemMessage(SystemMessageId.CANNOT_INVITE_TO_COMMAND_CHANNEL);
+					activeChar.sendPacket(sm);
+				} else {
+					// target in a party?
+					if (player.isInParty()) {
+						// targets party already in a CChannel?
+						if (player.getParty().isInCommandChannel()) {
+							sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ALREADY_MEMBER_OF_COMMAND_CHANNEL);
+							sm.addString(player.getName());
+							activeChar.sendPacket(sm);
+						} else {
+							// ready to open a new CC
+							// send request to targets Party's PartyLeader
+							askJoinMPCC(activeChar, player);
+						}
+					} else {
+						activeChar.sendMessage(player.getName() + " doesn't have party and cannot be invited to Command Channel.");
+					}
+				}
+			} else {
+				activeChar.sendPacket(SystemMessageId.CANNOT_INVITE_TO_COMMAND_CHANNEL);
+			}
+		}
+	}
+	
+	private void askJoinMPCC(L2PcInstance requestor, L2PcInstance target) {
+		boolean hasRight = false;
+		if (requestor.isClanLeader() && (requestor.getClan().getLevel() >= 5)) {
+			// Clan leader of lvl5 Clan or higher.
+			hasRight = true;
+		} else if (requestor.getInventory().getItemByItemId(8871) != null) {
+			// 8871 Strategy Guide.
+			// TODO: Should destroyed after successful invite?
+			hasRight = true;
+		} else if ((requestor.getPledgeClass() >= 5) && (requestor.getKnownSkill(391) != null)) {
+			// At least Baron or higher and the skill Clan Imperium
+			hasRight = true;
+		}
+		
+		if (!hasRight) {
+			requestor.sendPacket(SystemMessageId.COMMAND_CHANNEL_ONLY_BY_LEVEL_5_CLAN_LEADER_PARTY_LEADER);
+			return;
+		}
+		
+		// Get the target's party leader, and do whole actions on him.
+		final L2PcInstance targetLeader = target.getParty().getLeader();
+		SystemMessage sm;
+		if (!targetLeader.isProcessingRequest()) {
+			requestor.onTransactionRequest(targetLeader);
+			sm = SystemMessage.getSystemMessage(SystemMessageId.COMMAND_CHANNEL_CONFIRM_FROM_C1);
+			sm.addString(requestor.getName());
+			targetLeader.sendPacket(sm);
+			targetLeader.sendPacket(new ExAskJoinMPCC(requestor.getName()));
+			
+			requestor.sendMessage("You invited " + targetLeader.getName() + " to your Command Channel.");
+		} else {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
+			sm.addString(targetLeader.getName());
+			requestor.sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_06_REQUESTEXASKJOINMPCC;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCancelEnchantItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
new file mode 100644
index 00000000..74fea61b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCancelEnchantItem.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.EnchantResult;
+
+/**
+ * @author KenM
+ */
+public class RequestExCancelEnchantItem extends L2GameClientPacket {
+	private static final String _C__D0_4E_REQUESTEXCANCELENCHANTITEM = "[C] D0:4E RequestExCancelEnchantItem";
+	
+	@Override
+	protected void readImpl() {
+		// nothing (trigger)
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar != null) {
+			activeChar.sendPacket(new EnchantResult(2, 0, 0));
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_4E_REQUESTEXCANCELENCHANTITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExChangeName.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExChangeName.java
new file mode 100644
index 00000000..8a44066d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExChangeName.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.network.serverpackets.ExNeedToChangeName;
+
+/**
+ * Reply for {@link ExNeedToChangeName}
+ * @author JIV
+ */
+public class RequestExChangeName extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExChangeName.class);
+	
+	private static final String _C__D0_3B_REQUESTEXCHANGENAME = "[C] D0:3B RequestExChangeName";
+	
+	private String _newName;
+	private int _type;
+	private int _charSlot;
+	
+	@Override
+	protected void readImpl() {
+		_type = readD();
+		_newName = readS();
+		_charSlot = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		LOG.info("Received {} name: {} type: {} CharSlot: {}", getType(), _newName, _type, _charSlot);
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_3B_REQUESTEXCHANGENAME;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCleftEnter.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCleftEnter.java
new file mode 100644
index 00000000..694b87e1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCleftEnter.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Format: (ch) chd
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public class RequestExCleftEnter extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExCleftEnter.class);
+	
+	private static final String _C__D0_59_REQUESTEXCLEFTENTER = "[C] D0:59 RequestExCleftEnter";
+	
+	private int _0;
+	private int _1;
+	private int _2;
+	
+	@Override
+	protected void readImpl() {
+		_0 = readC();
+		_1 = readH();
+		_2 = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		LOG.debug(_C__D0_59_REQUESTEXCLEFTENTER + " - c={}, h={}, d={}", _0, _1, _2);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_59_REQUESTEXCLEFTENTER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
new file mode 100644
index 00000000..e66afa0b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameChangeTeam.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Format: chdd d: Arena d: Team
+ * @author mrTJO
+ */
+public final class RequestExCubeGameChangeTeam extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExCubeGameChangeTeam.class);
+	
+	private static final String _C__D0_5A_REQUESTEXCUBEGAMECHANGETEAM = "[C] D0:5A RequestExCubeGameChangeTeam";
+	
+	private int _arena;
+	private int _team;
+	
+	@Override
+	protected void readImpl() {
+		// client sends -1,0,1,2 for arena parameter
+		_arena = readD() + 1;
+		_team = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		// do not remove players after start
+		if (HandysBlockCheckerManager.getInstance().arenaIsBeingUsed(_arena)) {
+			return;
+		}
+		L2PcInstance player = getClient().getActiveChar();
+		switch (_team) {
+			// Change Player Team
+			case 0, 1 -> HandysBlockCheckerManager.getInstance().changePlayerToTeam(player, _arena, _team);
+			// Remove Player (me)
+			case -1 -> {
+				int team = HandysBlockCheckerManager.getInstance().getHolder(_arena).getPlayerTeam(player);
+				// client sends two times this packet if click on exit
+				// client did not send this packet on restart
+				if (team > -1) {
+					HandysBlockCheckerManager.getInstance().removePlayer(player, _arena, team);
+				}
+			}
+			default -> LOG.warn("Wrong Cube Game Team ID: {}", _team);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_5A_REQUESTEXCUBEGAMECHANGETEAM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
new file mode 100644
index 00000000..c2f466e5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExCubeGameReadyAnswer.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.HandysBlockCheckerManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Format: chddd d: Arena d: Answer
+ * @author mrTJO
+ */
+public final class RequestExCubeGameReadyAnswer extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExCubeGameReadyAnswer.class);
+	
+	private static final String _C__D0_5C_REQUESTEXCUBEGAMEREADYANSWER = "[C] D0:5C RequestExCubeGameReadyAnswer";
+	
+	private int _arena;
+	private int _answer;
+	
+	@Override
+	protected void readImpl() {
+		// client sends -1,0,1,2 for arena parameter
+		_arena = readD() + 1;
+		// client sends 1 if clicked confirm on not clicked, 0 if clicked cancel
+		_answer = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		
+		if (player == null) {
+			return;
+		}
+		
+		switch (_answer) {
+			case 0:
+				// Cancel - Answer No
+				break;
+			case 1:
+				// OK or Time Over
+				HandysBlockCheckerManager.getInstance().increaseArenaVotes(_arena);
+				break;
+			default:
+				LOG.warn("Unknown Cube Game Answer ID: {}", _answer);
+				break;
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_5C_REQUESTEXCUBEGAMEREADYANSWER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
new file mode 100644
index 00000000..496b713f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExDeleteContactFromContactList.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Format: (ch)S S: Character Name
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class RequestExDeleteContactFromContactList extends L2GameClientPacket {
+	private static final String _C__D0_85_REQUESTEXDELETECONTACTFROMCONTACTLIST = "[C] D0:85 RequestExDeleteContactFromContactList";
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (!general().allowMail()) {
+			return;
+		}
+		
+		if (_name == null) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.getContactList().remove(_name);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_85_REQUESTEXDELETECONTACTFROMCONTACTLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
new file mode 100644
index 00000000..0381345d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExAttributeEnchantResult;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.Util;
+
+public class RequestExEnchantItemAttribute extends L2GameClientPacket {
+	private static final String _C__D0_35_REQUESTEXENCHANTITEMATTRIBUTE = "[C] D0:35 RequestExEnchantItemAttribute";
+	
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_objectId == 0xFFFFFFFF) {
+			// Player canceled enchant
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_CANCELED);
+			return;
+		}
+		
+		if (!player.isOnline()) {
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		if (player.getPrivateStoreType() != PrivateStoreType.NONE) {
+			player.sendPacket(SystemMessageId.CANNOT_ADD_ELEMENTAL_POWER_WHILE_OPERATING_PRIVATE_STORE_OR_WORKSHOP);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		// Restrict enchant during a trade (bug if enchant fails)
+		if (player.getActiveRequester() != null) {
+			// Cancel trade
+			player.cancelActiveTrade();
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			player.sendMessage("You cannot add elemental power while trading.");
+			return;
+		}
+		
+		final L2ItemInstance item = player.getInventory().getItemByObjectId(_objectId);
+		final L2ItemInstance stone = player.getInventory().getItemByObjectId(player.getActiveEnchantAttrItemId());
+		if ((item == null) || (stone == null)) {
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_CANCELED);
+			return;
+		}
+		
+		if (!item.isElementable()) {
+			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_REQUIREMENT_NOT_SUFFICIENT);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		switch (item.getItemLocation()) {
+			case INVENTORY, PAPERDOLL -> {
+				if (item.getOwnerId() != player.getObjectId()) {
+					player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+					return;
+				}
+			}
+			default -> {
+				player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+				Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!");
+				return;
+			}
+		}
+		
+		int stoneId = stone.getId();
+		byte elementToAdd = Elementals.getItemElement(stoneId);
+		// Armors have the opposite element
+		if (item.isArmor()) {
+			elementToAdd = Elementals.getOppositeElement(elementToAdd);
+		}
+		byte oppositeElement = Elementals.getOppositeElement(elementToAdd);
+		
+		Elementals oldElement = item.getElemental(elementToAdd);
+		int elementValue = oldElement == null ? 0 : oldElement.getValue();
+		int limit = getLimit(item, stoneId);
+		int powerToAdd = getPowerToAdd(stoneId, elementValue, item);
+		
+		if ((item.isWeapon() && (oldElement != null) && (oldElement.getElement() != elementToAdd) && (oldElement.getElement() != -2)) || (item.isArmor() && (item.getElemental(elementToAdd) == null) && (item.getElementals() != null) && (item.getElementals().length >= 3))) {
+			player.sendPacket(SystemMessageId.ANOTHER_ELEMENTAL_POWER_ALREADY_ADDED);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		if (item.isArmor() && (item.getElementals() != null)) {
+			// cant add opposite element
+			for (Elementals elm : item.getElementals()) {
+				if (elm.getElement() == oppositeElement) {
+					player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+					Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to add opposite attribute to item!");
+					return;
+				}
+			}
+		}
+		
+		int newPower = elementValue + powerToAdd;
+		if (newPower > limit) {
+			newPower = limit;
+			powerToAdd = limit - elementValue;
+		}
+		
+		if (powerToAdd <= 0) {
+			player.sendPacket(SystemMessageId.ELEMENTAL_ENHANCE_CANCELED);
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		
+		if (!player.destroyItem("AttrEnchant", stone, 1, player, true)) {
+			player.sendPacket(SystemMessageId.NOT_ENOUGH_ITEMS);
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to attribute enchant with a stone he doesn't have");
+			player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+			return;
+		}
+		boolean success = switch (Elementals.getItemElemental(stoneId)._type) {
+			case Stone, Roughore -> Rnd.get(100) < character().getEnchantChanceElementStone();
+			case Crystal -> Rnd.get(100) < character().getEnchantChanceElementCrystal();
+			case Jewel -> Rnd.get(100) < character().getEnchantChanceElementJewel();
+			case Energy -> Rnd.get(100) < character().getEnchantChanceElementEnergy();
+		};
+		if (success) {
+			byte realElement = item.isArmor() ? oppositeElement : elementToAdd;
+			
+			SystemMessage sm;
+			if (item.getEnchantLevel() == 0) {
+				if (item.isArmor()) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S2_ATTRIBUTE_WAS_SUCCESSFULLY_BESTOWED_ON_S1_RES_TO_S3_INCREASED);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S2_SUCCESSFULLY_ADDED_TO_S1);
+				}
+				sm.addItemName(item);
+				sm.addElemental(realElement);
+				if (item.isArmor()) {
+					sm.addElemental(Elementals.getOppositeElement(realElement));
+				}
+			} else {
+				if (item.isArmor()) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.THE_S3_ATTRIBUTE_BESTOWED_ON_S1_S2_RESISTANCE_TO_S4_INCREASED);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S3_SUCCESSFULLY_ADDED_TO_S1_S2);
+				}
+				sm.addInt(item.getEnchantLevel());
+				sm.addItemName(item);
+				sm.addElemental(realElement);
+				if (item.isArmor()) {
+					sm.addElemental(Elementals.getOppositeElement(realElement));
+				}
+			}
+			player.sendPacket(sm);
+			item.setElementAttr(elementToAdd, newPower);
+			if (item.isEquipped()) {
+				item.updateElementAttrBonus(player);
+			}
+			
+			// send packets
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addModifiedItem(item);
+			player.sendPacket(iu);
+		} else {
+			player.sendPacket(SystemMessageId.FAILED_ADDING_ELEMENTAL_POWER);
+		}
+		
+		player.sendPacket(new ExAttributeEnchantResult(powerToAdd));
+		player.sendPacket(new UserInfo(player));
+		player.sendPacket(new ExBrExtraUserInfo(player));
+		player.setActiveEnchantAttrItemId(L2PcInstance.ID_NONE);
+	}
+	
+	public int getLimit(L2ItemInstance item, int stoneId) {
+		Elementals.ElementalItems elementItem = Elementals.getItemElemental(stoneId);
+		if (elementItem == null) {
+			return 0;
+		}
+		
+		if (item.isWeapon()) {
+			return Elementals.WEAPON_VALUES[elementItem._type._maxLevel];
+		}
+		return Elementals.ARMOR_VALUES[elementItem._type._maxLevel];
+	}
+	
+	public int getPowerToAdd(int stoneId, int oldValue, L2ItemInstance item) {
+		if (Elementals.getItemElement(stoneId) != Elementals.NONE) {
+			if (item.isWeapon()) {
+				if (oldValue == 0) {
+					return Elementals.FIRST_WEAPON_BONUS;
+				}
+				return Elementals.NEXT_WEAPON_BONUS;
+			} else if (item.isArmor()) {
+				return Elementals.ARMOR_BONUS;
+			}
+		}
+		return 0;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_35_REQUESTEXENCHANTITEMATTRIBUTE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
new file mode 100644
index 00000000..17cb1690
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Format (ch) dd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill lvl
+ * @author -Wooden-
+ */
+public final class RequestExEnchantSkill extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExEnchantSkill.class);
+	private static final Logger LOG_ENCHANT_SKILL = LoggerFactory.getLogger("enchant_skill");
+	
+	private static final String _C__D0_0F_REQUESTEXENCHANTSKILL = "[C] D0:0F RequestExEnchantSkill";
+	
+	private int _skillId;
+	private int _skillLvl;
+	
+	@Override
+	protected void readImpl() {
+		_skillId = readD();
+		_skillLvl = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLvl <= 0)) {
+			return;
+		}
+		
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (player.getClassId().level() < 3) // requires to have 3rd class quest completed
+		{
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_IN_THIS_CLASS);
+			return;
+		}
+		
+		if (player.getLevel() < 76) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ON_THIS_LEVEL);
+			return;
+		}
+		
+		if (!player.isAllowedToEnchantSkills()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ATTACKING_TRANSFORMED_BOAT);
+			return;
+		}
+		
+		final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
+		if (skill == null) {
+			return;
+		}
+		
+		final L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		if (s == null) {
+			return;
+		}
+		final EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl);
+		final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId);
+		if (beforeEnchantSkillLevel != s.getMinSkillLevel(_skillLvl)) {
+			return;
+		}
+		
+		final int costMultiplier = general().getNormalEnchantCostMultipiler();
+		final int requiredSp = esd.getSpCost() * costMultiplier;
+		if (player.getSp() >= requiredSp) {
+			// only first lvl requires book
+			final boolean usesBook = (_skillLvl % 100) == 1; // 101, 201, 301 ...
+			final int reqItemId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK;
+			final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
+			
+			if (character().enchantSkillSpBookNeeded() && usesBook && (spb == null)) // Haven't spellbook
+			{
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			final int requiredAdena = (esd.getAdenaCost() * costMultiplier);
+			if (player.getInventory().getAdena() < requiredAdena) {
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			boolean check = player.removeSp(requiredSp);
+			if (character().enchantSkillSpBookNeeded() && usesBook) {
+				check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
+			}
+			
+			check &= player.destroyItemByItemId("Consume", Inventory.ADENA_ID, requiredAdena, player, true);
+			if (!check) {
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			// ok. Destroy ONE copy of the book
+			final int rate = esd.getRate(player);
+			if (Rnd.get(100) <= rate) {
+				if (general().logSkillEnchants()) {
+					LOG_ENCHANT_SKILL.info("ENCHANTED {} using {} with rate {} by {}.", skill, spb, rate, player);
+				}
+				
+				player.addSkill(skill, true);
+				player.sendPacket(ExEnchantSkillResult.valueOf(true));
+				
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
+				sm.addSkillName(_skillId);
+				player.sendPacket(sm);
+				
+				if (general().debug()) {
+					LOG.debug("Learned skill ID: {} Level: {} for {} SP, {} Adena.", _skillId, _skillLvl, requiredSp, requiredAdena);
+				}
+			} else {
+				player.addSkill(SkillData.getInstance().getSkill(_skillId, s.getBaseLevel()), true);
+				player.sendPacket(SystemMessageId.YOU_HAVE_FAILED_TO_ENCHANT_THE_SKILL_S1);
+				player.sendPacket(ExEnchantSkillResult.valueOf(false));
+				
+				if (general().logSkillEnchants()) {
+					LOG_ENCHANT_SKILL.info("FAILED_ENCHANTING {} using {} with rate {} by {}.", skill, spb, rate, player);
+				}
+			}
+			
+			player.sendPacket(new UserInfo(player));
+			player.sendPacket(new ExBrExtraUserInfo(player));
+			player.sendSkillList();
+			final int afterEnchantSkillLevel = player.getSkillLevel(_skillId);
+			player.sendPacket(new ExEnchantSkillInfo(_skillId, afterEnchantSkillLevel));
+			player.sendPacket(new ExEnchantSkillInfoDetail(0, _skillId, afterEnchantSkillLevel + 1, player));
+			player.updateShortCuts(_skillId, afterEnchantSkillLevel);
+		} else {
+			player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_0F_REQUESTEXENCHANTSKILL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
new file mode 100644
index 00000000..9c148179
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
+
+/**
+ * Format (ch) dd c: (id) 0xD0 h: (subid) 0x06 d: skill id d: skill lvl
+ * @author -Wooden-
+ */
+public final class RequestExEnchantSkillInfo extends L2GameClientPacket {
+	private static final String _C__D0_0E_REQUESTEXENCHANTSKILLINFO = "[C] D0:0E RequestExEnchantSkillInfo";
+	
+	private int _skillId;
+	private int _skillLvl;
+	
+	@Override
+	protected void readImpl() {
+		_skillId = readD();
+		_skillLvl = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLvl <= 0)) {
+			return;
+		}
+		
+		L2PcInstance activeChar = getClient().getActiveChar();
+		
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.getLevel() < 76) {
+			return;
+		}
+		
+		final Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
+		if ((skill == null) || (skill.getId() != _skillId)) {
+			return;
+		}
+		
+		if (EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId) == null) {
+			return;
+		}
+		
+		int playerSkillLvl = activeChar.getSkillLevel(_skillId);
+		if ((playerSkillLvl == -1) || (playerSkillLvl != _skillLvl)) {
+			return;
+		}
+		
+		activeChar.sendPacket(new ExEnchantSkillInfo(_skillId, _skillLvl));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_0E_REQUESTEXENCHANTSKILLINFO;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
new file mode 100644
index 00000000..39e5262f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillInfoDetail.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
+
+/**
+ * Format (ch) ddd c: (id) 0xD0 h: (subid) 0x31 d: type d: skill id d: skill lvl
+ * @author -Wooden-
+ */
+public final class RequestExEnchantSkillInfoDetail extends L2GameClientPacket {
+	private static final String _C_D0_46_REQUESTEXENCHANTSKILLINFO = "[C] D0:46 RequestExEnchantSkillInfoDetail";
+	
+	private int _type;
+	private int _skillId;
+	private int _skillLvl;
+	
+	@Override
+	protected void readImpl() {
+		_type = readD();
+		_skillId = readD();
+		_skillLvl = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLvl <= 0)) {
+			return;
+		}
+		
+		L2PcInstance activeChar = getClient().getActiveChar();
+		
+		if (activeChar == null) {
+			return;
+		}
+		
+		int reqSkillLvl = -2;
+		
+		if ((_type == 0) || (_type == 1)) {
+			reqSkillLvl = _skillLvl - 1; // enchant
+		} else if (_type == 2) {
+			reqSkillLvl = _skillLvl + 1; // untrain
+		} else if (_type == 3) {
+			reqSkillLvl = _skillLvl; // change route
+		}
+		
+		int playerSkillLvl = activeChar.getSkillLevel(_skillId);
+		
+		// dont have such skill
+		if (playerSkillLvl == -1) {
+			return;
+		}
+		
+		// if reqlvl is 100,200,.. check base skill lvl enchant
+		if ((reqSkillLvl % 100) == 0) {
+			L2EnchantSkillLearn esl = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+			if (esl != null) {
+				// if player dont have min level to enchant
+				if (playerSkillLvl != esl.getBaseLevel()) {
+					return;
+				}
+			}
+			// enchant data dont exist?
+			else {
+				return;
+			}
+		} else if (playerSkillLvl != reqSkillLvl) {
+			// change route is different skill lvl but same enchant
+			if ((_type == 3) && ((playerSkillLvl % 100) != (_skillLvl % 100))) {
+				return;
+			}
+		}
+		
+		// send skill enchantment detail
+		ExEnchantSkillInfoDetail esd = new ExEnchantSkillInfoDetail(_type, _skillId, _skillLvl, activeChar);
+		activeChar.sendPacket(esd);
+	}
+	
+	@Override
+	public String getType() {
+		return _C_D0_46_REQUESTEXENCHANTSKILLINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
new file mode 100644
index 00000000..6d155551
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Format (ch) dd c: (id) 0xD0 h: (subid) 0x34 d: skill id d: skill lvl
+ * @author -Wooden-
+ */
+public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExEnchantSkillRouteChange.class);
+	private static final Logger LOG_ENCHANT_SKILL = LoggerFactory.getLogger("enchant_skill");
+	
+	private static final String _C__D0_34_REQUESTEXENCHANTSKILLROUTECHANGE = "[C] D0:34 RequestExEnchantSkillRouteChange";
+	
+	private int _skillId;
+	
+	private int _skillLvl;
+	
+	@Override
+	protected void readImpl() {
+		_skillId = readD();
+		_skillLvl = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLvl <= 0)) {
+			return;
+		}
+		
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (player.getClassId().level() < 3) // requires to have 3rd class quest completed
+		{
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_IN_THIS_CLASS);
+			return;
+		}
+		
+		if (player.getLevel() < 76) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ON_THIS_LEVEL);
+			return;
+		}
+		
+		if (!player.isAllowedToEnchantSkills()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ATTACKING_TRANSFORMED_BOAT);
+			return;
+		}
+		
+		Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
+		if (skill == null) {
+			return;
+		}
+		
+		int reqItemId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK;
+		
+		L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		if (s == null) {
+			return;
+		}
+		
+		final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId);
+		// do u have this skill enchanted?
+		if (beforeEnchantSkillLevel <= 100) {
+			return;
+		}
+		
+		int currentEnchantLevel = beforeEnchantSkillLevel % 100;
+		// is the requested level valid?
+		if (currentEnchantLevel != (_skillLvl % 100)) {
+			return;
+		}
+		EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl);
+		
+		int requiredSp = esd.getSpCost();
+		int requireditems = esd.getAdenaCost();
+		
+		if (player.getSp() >= requiredSp) {
+			// only first lvl requires book
+			L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
+			if (character().enchantSkillSpBookNeeded()) {
+				if (spb == null)// Haven't spellbook
+				{
+					player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_ITENS_NEEDED_TO_CHANGE_SKILL_ENCHANT_ROUTE);
+					return;
+				}
+			}
+			
+			if (player.getInventory().getAdena() < requireditems) {
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			boolean check;
+			check = player.removeSp(requiredSp);
+			if (character().enchantSkillSpBookNeeded()) {
+				check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
+			}
+			
+			check &= player.destroyItemByItemId("Consume", Inventory.ADENA_ID, requireditems, player, true);
+			
+			if (!check) {
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			int levelPenalty = Rnd.get(Math.min(4, currentEnchantLevel));
+			_skillLvl -= levelPenalty;
+			if ((_skillLvl % 100) == 0) {
+				_skillLvl = s.getBaseLevel();
+			}
+			
+			skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
+			
+			if (skill != null) {
+				if (general().logSkillEnchants()) {
+					LOG_ENCHANT_SKILL.info("ROUTE_CHANGED {} using {} by {}.", skill, spb, player);
+				}
+				
+				player.addSkill(skill, true);
+				player.sendPacket(ExEnchantSkillResult.valueOf(true));
+			}
+			
+			if (general().debug()) {
+				LOG.debug("Learned skill ID: {} Level: {} for {} SP, {} Adena.", _skillId, _skillLvl, requiredSp, requireditems);
+			}
+			
+			player.sendPacket(new UserInfo(player));
+			player.sendPacket(new ExBrExtraUserInfo(player));
+			
+			if (levelPenalty == 0) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_CHANGE_SUCCESSFUL_S1_LEVEL_WILL_REMAIN);
+				sm.addSkillName(_skillId);
+				player.sendPacket(sm);
+			} else {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_CHANGE_SUCCESSFUL_S1_LEVEL_WAS_DECREASED_BY_S2);
+				sm.addSkillName(_skillId);
+				sm.addInt(levelPenalty);
+				player.sendPacket(sm);
+			}
+			player.sendSkillList();
+			final int afterEnchantSkillLevel = player.getSkillLevel(_skillId);
+			player.sendPacket(new ExEnchantSkillInfo(_skillId, afterEnchantSkillLevel));
+			player.sendPacket(new ExEnchantSkillInfoDetail(3, _skillId, afterEnchantSkillLevel, player));
+			player.updateShortCuts(_skillId, afterEnchantSkillLevel);
+		} else {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
+			player.sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_34_REQUESTEXENCHANTSKILLROUTECHANGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
new file mode 100644
index 00000000..d794a996
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Format (ch) dd c: (id) 0xD0 h: (subid) 0x32 d: skill id d: skill lvl
+ * @author -Wooden-
+ */
+public final class RequestExEnchantSkillSafe extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExEnchantSkillSafe.class);
+	private static final Logger LOG_ENCHANT_SKILL = LoggerFactory.getLogger("enchant_skill");
+	
+	private static final String _C__D0_32_REQUESTEXENCHANTSKILLSAFE = "[C] D0:32 RequestExEnchantSkillSafe";
+	
+	private int _skillId;
+	
+	private int _skillLvl;
+	
+	@Override
+	protected void readImpl() {
+		_skillId = readD();
+		_skillLvl = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLvl <= 0)) {
+			return;
+		}
+		
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (player.getClassId().level() < 3) // requires to have 3rd class quest completed
+		{
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_IN_THIS_CLASS);
+			return;
+		}
+		
+		if (player.getLevel() < 76) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ON_THIS_LEVEL);
+			return;
+		}
+		
+		if (!player.isAllowedToEnchantSkills()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ATTACKING_TRANSFORMED_BOAT);
+			return;
+		}
+		
+		Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
+		if (skill == null) {
+			return;
+		}
+		
+		int costMultiplier = general().getSafeEnchantCostMultipiler();
+		int reqItemId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK;
+		
+		L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		if (s == null) {
+			return;
+		}
+		final EnchantSkillHolder esd = s.getEnchantSkillHolder(_skillLvl);
+		final int beforeEnchantSkillLevel = player.getSkillLevel(_skillId);
+		if (beforeEnchantSkillLevel != s.getMinSkillLevel(_skillLvl)) {
+			return;
+		}
+		
+		int requiredSp = esd.getSpCost() * costMultiplier;
+		int requireditems = esd.getAdenaCost() * costMultiplier;
+		int rate = esd.getRate(player);
+		
+		if (player.getSp() >= requiredSp) {
+			// No config option for safe enchant book consume
+			L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
+			if (spb == null)// Haven't spellbook
+			{
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			if (player.getInventory().getAdena() < requireditems) {
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			boolean check = player.removeSp(requiredSp);
+			check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
+			
+			check &= player.destroyItemByItemId("Consume", Inventory.ADENA_ID, requireditems, player, true);
+			
+			if (!check) {
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+			
+			// ok. Destroy ONE copy of the book
+			if (Rnd.get(100) <= rate) {
+				if (general().logSkillEnchants()) {
+					LOG_ENCHANT_SKILL.info("SAFE_ENCHANTED {} using {} with rate {} by {}.", skill, spb, rate, player);
+				}
+				
+				player.addSkill(skill, true);
+				
+				if (general().debug()) {
+					LOG.debug("Learned skill ID: {} Level: {} for {} SP, {} Adena.", _skillId, _skillLvl, requiredSp, requireditems);
+				}
+				
+				player.sendPacket(ExEnchantSkillResult.valueOf(true));
+				
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
+				sm.addSkillName(_skillId);
+				player.sendPacket(sm);
+			} else {
+				if (general().logSkillEnchants()) {
+					LOG_ENCHANT_SKILL.info("FAILED_SAFE_ENCHANTING {} using {} with rate {} by {}.", skill, spb, rate, player);
+				}
+				
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_S1_LEVEL_WILL_REMAIN);
+				sm.addSkillName(_skillId);
+				player.sendPacket(sm);
+				player.sendPacket(ExEnchantSkillResult.valueOf(false));
+			}
+			
+			player.sendPacket(new UserInfo(player));
+			player.sendPacket(new ExBrExtraUserInfo(player));
+			player.sendSkillList();
+			final int afterEnchantSkillLevel = player.getSkillLevel(_skillId);
+			player.sendPacket(new ExEnchantSkillInfo(_skillId, afterEnchantSkillLevel));
+			player.sendPacket(new ExEnchantSkillInfoDetail(1, _skillId, afterEnchantSkillLevel + 1, player));
+			player.updateShortCuts(_skillId, afterEnchantSkillLevel);
+		} else {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
+			player.sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_32_REQUESTEXENCHANTSKILLSAFE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
new file mode 100644
index 00000000..199aaa5f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillInfoDetail;
+import com.l2jserver.gameserver.network.serverpackets.ExEnchantSkillResult;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+/**
+ * Format (ch) dd c: (id) 0xD0 h: (subid) 0x33 d: skill id d: skill lvl
+ * @author -Wooden-
+ */
+public final class RequestExEnchantSkillUntrain extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExEnchantSkillUntrain.class);
+	private static final Logger LOG_ENCHANT_SKILL = LoggerFactory.getLogger("enchant_skill");
+	
+	private static final String _C__D0_33_REQUESTEXENCHANTSKILLUNTRAIN = "[C] D0:33 RequestExEnchantSkillUntrain";
+	
+	private int _skillId;
+	
+	private int _skillLvl;
+	
+	@Override
+	protected void readImpl() {
+		_skillId = readD();
+		_skillLvl = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((_skillId <= 0) || (_skillLvl <= 0)) {
+			return;
+		}
+		
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (player.getClassId().level() < 3) // requires to have 3rd class quest completed
+		{
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_IN_THIS_CLASS);
+			return;
+		}
+		
+		if (player.getLevel() < 76) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ON_THIS_LEVEL);
+			return;
+		}
+		
+		if (!player.isAllowedToEnchantSkills()) {
+			player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SKILL_ENCHANT_ATTACKING_TRANSFORMED_BOAT);
+			return;
+		}
+		
+		L2EnchantSkillLearn s = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_skillId);
+		if (s == null) {
+			return;
+		}
+		
+		if ((_skillLvl % 100) == 0) {
+			_skillLvl = s.getBaseLevel();
+		}
+		
+		Skill skill = SkillData.getInstance().getSkill(_skillId, _skillLvl);
+		if (skill == null) {
+			return;
+		}
+		
+		int reqItemId = EnchantSkillGroupsData.UNTRAIN_ENCHANT_BOOK;
+		
+		final int beforeUntrainSkillLevel = player.getSkillLevel(_skillId);
+		if (((beforeUntrainSkillLevel - 1) != _skillLvl) && (((beforeUntrainSkillLevel % 100) != 1) || (_skillLvl != s.getBaseLevel()))) {
+			return;
+		}
+		
+		EnchantSkillHolder esd = s.getEnchantSkillHolder(beforeUntrainSkillLevel);
+		
+		int requiredSp = esd.getSpCost();
+		int requireditems = esd.getAdenaCost();
+		
+		L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
+		if (character().enchantSkillSpBookNeeded()) {
+			if (spb == null) // Haven't spellbook
+			{
+				player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+				return;
+			}
+		}
+		
+		if (player.getInventory().getAdena() < requireditems) {
+			player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+			return;
+		}
+		
+		boolean check = true;
+		if (character().enchantSkillSpBookNeeded()) {
+			check = player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
+		}
+		
+		check &= player.destroyItemByItemId("Consume", Inventory.ADENA_ID, requireditems, player, true);
+		
+		if (!check) {
+			player.sendPacket(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL);
+			return;
+		}
+		
+		player.addSp((int) (requiredSp * 0.8));
+		
+		if (general().logSkillEnchants()) {
+			LOG_ENCHANT_SKILL.info("UNTRAINED {} using {} by {}.", skill, spb, player);
+		}
+		
+		player.addSkill(skill, true);
+		player.sendPacket(ExEnchantSkillResult.valueOf(true));
+		
+		if (general().debug()) {
+			LOG.debug("Learned skill ID: {} Level: {} for {} SP, {} Adena.", _skillId, _skillLvl, requiredSp, requireditems);
+		}
+		
+		player.sendPacket(new UserInfo(player));
+		player.sendPacket(new ExBrExtraUserInfo(player));
+		
+		if (_skillLvl > 100) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_DECREASED_BY_ONE);
+			sm.addSkillName(_skillId);
+			player.sendPacket(sm);
+		} else {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.UNTRAIN_SUCCESSFUL_SKILL_S1_ENCHANT_LEVEL_RESETED);
+			sm.addSkillName(_skillId);
+			player.sendPacket(sm);
+		}
+		player.sendSkillList();
+		final int afterUntrainSkillLevel = player.getSkillLevel(_skillId);
+		player.sendPacket(new ExEnchantSkillInfo(_skillId, afterUntrainSkillLevel));
+		player.sendPacket(new ExEnchantSkillInfoDetail(2, _skillId, afterUntrainSkillLevel - 1, player));
+		player.updateShortCuts(_skillId, afterUntrainSkillLevel);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_33_REQUESTEXENCHANTSKILLUNTRAIN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExFishRanking.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExFishRanking.java
new file mode 100644
index 00000000..f4de6aa7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExFishRanking.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Format: (ch) just a trigger
+ * @author -Wooden-
+ */
+public final class RequestExFishRanking extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExFishRanking.class);
+	
+	private static final String _C__D0_18_REQUESTEXFISHRANKING = "[C] D0:18 RequestExFishRanking";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		LOG.info(_C__D0_18_REQUESTEXFISHRANKING);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_18_REQUESTEXFISHRANKING;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExFriendListExtended.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExFriendListExtended.java
new file mode 100644
index 00000000..02ca1eb7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExFriendListExtended.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.FriendListExtended;
+
+/**
+ * @author mrTJO
+ * @author UnAfraid
+ */
+public final class RequestExFriendListExtended extends L2GameClientPacket {
+	private static final String _C__D0_87_REQUESTEXFRIENDLISTEXTENDED = "[C] D0:87 RequestExFriendListExtended";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	public void runImpl() {
+		if (!general().allowMail()) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.sendPacket(new FriendListExtended(activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_87_REQUESTEXFRIENDLISTEXTENDED;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
new file mode 100644
index 00000000..8f1af60a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExMPCCShowPartyMembersInfo.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExMPCCShowPartyMemberInfo;
+
+/**
+ * Format:(ch) d
+ * @author chris_00
+ */
+public final class RequestExMPCCShowPartyMembersInfo extends L2GameClientPacket {
+	private static final String _C__D0_2D_REQUESTMPCCSHOWPARTYMEMBERINFO = "[C] D0:2D RequestExMPCCShowPartyMembersInfo";
+	private int _partyLeaderId;
+	
+	@Override
+	protected void readImpl() {
+		_partyLeaderId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		final L2PcInstance player = L2World.getInstance().getPlayer(_partyLeaderId);
+		if ((player != null) && (player.getParty() != null)) {
+			activeChar.sendPacket(new ExMPCCShowPartyMemberInfo(player.getParty()));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_2D_REQUESTMPCCSHOWPARTYMEMBERINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
new file mode 100644
index 00000000..2e74da98
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
+import com.l2jserver.gameserver.util.Broadcast;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Fromat:(ch) dddddc
+ * @author -Wooden-
+ */
+public final class RequestExMagicSkillUseGround extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExMagicSkillUseGround.class);
+	
+	private static final String _C__D0_44_REQUESTEXMAGICSKILLUSEGROUND = "[C] D0:44 RequestExMagicSkillUseGround";
+	
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _skillId;
+	private boolean _ctrlPressed;
+	private boolean _shiftPressed;
+	
+	@Override
+	protected void readImpl() {
+		_x = readD();
+		_y = readD();
+		_z = readD();
+		_skillId = readD();
+		_ctrlPressed = readD() != 0;
+		_shiftPressed = readC() != 0;
+	}
+	
+	@Override
+	protected void runImpl() {
+		// Get the current L2PcInstance of the player
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		// Get the level of the used skill
+		int level = activeChar.getSkillLevel(_skillId);
+		if (level <= 0) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Get the L2Skill template corresponding to the skillID received from the client
+		Skill skill = SkillData.getInstance().getSkill(_skillId, level);
+		
+		// Check the validity of the skill
+		if (skill != null) {
+			activeChar.setCurrentSkillWorldPosition(new Location(_x, _y, _z));
+			
+			// normally magicskilluse packet turns char client side but for these skills, it doesn't (even with correct target)
+			activeChar.setHeading(Util.calculateHeadingFrom(activeChar.getX(), activeChar.getY(), _x, _y));
+			Broadcast.toKnownPlayers(activeChar, new ValidateLocation(activeChar));
+			
+			activeChar.useMagic(skill, _ctrlPressed, _shiftPressed);
+		} else {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			LOG.warn("No skill found with id {} and level {} !!", _skillId, level);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_44_REQUESTEXMAGICSKILLUSEGROUND;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
new file mode 100644
index 00000000..d50f9c78
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExOlympiadMatchListRefresh.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExOlympiadMatchList;
+
+/**
+ * Format: (ch)d d: unknown (always 0?)
+ * @author mrTJO
+ */
+public class RequestExOlympiadMatchListRefresh extends L2GameClientPacket {
+	private static final String _C__D0_88_REQUESTEXOLYMPIADMATCHLISTREFRESH = "[C] D0:88 RequestExOlympiadMatchListRefresh";
+	
+	@Override
+	protected void readImpl() {
+		// readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.sendPacket(new ExOlympiadMatchList());
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_88_REQUESTEXOLYMPIADMATCHLISTREFRESH;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java
new file mode 100644
index 00000000..8d8cae51
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExOustFromMPCC.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * D0 0F 00 5A 00 77 00 65 00 72 00 67 00 00 00
+ * @author -Wooden-
+ */
+public final class RequestExOustFromMPCC extends L2GameClientPacket {
+	private static final String _C__D0_08_REQUESTEXOUSTFROMMPCC = "[C] D0:08 RequestExOustFromMPCC";
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance target = L2World.getInstance().getPlayer(_name);
+		L2PcInstance activeChar = getClient().getActiveChar();
+		
+		if ((target != null) && target.isInParty() && activeChar.isInParty() && activeChar.getParty().isInCommandChannel() && //
+			target.getParty().isInCommandChannel() && activeChar.getParty().getCommandChannel().getLeader().equals(activeChar) && //
+			activeChar.getParty().getCommandChannel().equals(target.getParty().getCommandChannel())) {
+			if (activeChar.equals(target)) {
+				return;
+			}
+			
+			target.getParty().getCommandChannel().removeParty(target.getParty());
+			
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DISMISSED_FROM_COMMAND_CHANNEL);
+			target.getParty().broadcastPacket(sm);
+			
+			// check if CC has not been canceled
+			if (activeChar.getParty().isInCommandChannel()) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_PARTY_DISMISSED_FROM_COMMAND_CHANNEL);
+				sm.addString(target.getParty().getLeader().getName());
+				activeChar.getParty().getCommandChannel().broadcastPacket(sm);
+			}
+		} else {
+			activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_08_REQUESTEXOUSTFROMMPCC;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
new file mode 100644
index 00000000..6391abf2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExPledgeCrestLarge.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.ExPledgeCrestLarge;
+
+/**
+ * Format : chd c: (id) 0xD0 h: (subid) 0x10 d: the crest id This is a trigger
+ * @author -Wooden-
+ */
+public final class RequestExPledgeCrestLarge extends L2GameClientPacket {
+	private static final String _C__D0_10_REQUESTEXPLEDGECRESTLARGE = "[C] D0:10 RequestExPledgeCrestLarge";
+	
+	private int _crestId;
+	
+	@Override
+	protected void readImpl() {
+		_crestId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		sendPacket(new ExPledgeCrestLarge(_crestId));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_10_REQUESTEXPLEDGECRESTLARGE;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
new file mode 100644
index 00000000..c5c2e728
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBaseAttributeCancelResult;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+public class RequestExRemoveItemAttribute extends L2GameClientPacket {
+	private static final String _C__D0_23_REQUESTEXREMOVEITEMATTRIBUTE = "[C] D0:23 RequestExRemoveItemAttribute";
+	
+	private int _objectId;
+	private long _price;
+	private byte _element;
+	
+	public RequestExRemoveItemAttribute() {
+	}
+	
+	@Override
+	public void readImpl() {
+		_objectId = readD();
+		_element = (byte) readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_objectId);
+		
+		if (targetItem == null) {
+			return;
+		}
+		
+		if ((targetItem.getElementals() == null) || (targetItem.getElemental(_element) == null)) {
+			return;
+		}
+		
+		if (activeChar.reduceAdena("RemoveElement", getPrice(targetItem), activeChar, true)) {
+			if (targetItem.isEquipped()) {
+				targetItem.getElemental(_element).removeBonus(activeChar);
+			}
+			targetItem.clearElementAttr(_element);
+			activeChar.sendPacket(new UserInfo(activeChar));
+			
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addModifiedItem(targetItem);
+			activeChar.sendPacket(iu);
+			SystemMessage sm;
+			byte realElement = targetItem.isArmor() ? Elementals.getOppositeElement(_element) : _element;
+			if (targetItem.getEnchantLevel() > 0) {
+				if (targetItem.isArmor()) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_S3_ATTRIBUTE_REMOVED_RESISTANCE_TO_S4_DECREASED);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_ELEMENTAL_POWER_REMOVED);
+				}
+				sm.addInt(targetItem.getEnchantLevel());
+				sm.addItemName(targetItem);
+				if (targetItem.isArmor()) {
+					sm.addElemental(realElement);
+					sm.addElemental(Elementals.getOppositeElement(realElement));
+				}
+			} else {
+				if (targetItem.isArmor()) {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_ATTRIBUTE_REMOVED_RESISTANCE_S3_DECREASED);
+				} else {
+					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ELEMENTAL_POWER_REMOVED);
+				}
+				sm.addItemName(targetItem);
+				if (targetItem.isArmor()) {
+					sm.addElemental(realElement);
+					sm.addElemental(Elementals.getOppositeElement(realElement));
+				}
+			}
+			activeChar.sendPacket(sm);
+			activeChar.sendPacket(new ExBaseAttributeCancelResult(targetItem.getObjectId(), _element));
+		} else {
+			activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_FUNDS_TO_CANCEL_ATTRIBUTE);
+		}
+	}
+	
+	private long getPrice(L2ItemInstance item) {
+		switch (item.getItem().getCrystalType()) {
+			case S:
+				if (item.getItem() instanceof L2Weapon) {
+					_price = 50000;
+				} else {
+					_price = 40000;
+				}
+				break;
+			case S80:
+				if (item.getItem() instanceof L2Weapon) {
+					_price = 100000;
+				} else {
+					_price = 80000;
+				}
+				break;
+			case S84:
+				if (item.getItem() instanceof L2Weapon) {
+					_price = 200000;
+				} else {
+					_price = 160000;
+				}
+				break;
+		}
+		
+		return _price;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_23_REQUESTEXREMOVEITEMATTRIBUTE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java
new file mode 100644
index 00000000..91def447
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExRpItemLink;
+
+/**
+ * @author KenM
+ */
+public class RequestExRqItemLink extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExRqItemLink.class);
+	
+	private static final String _C__D0_1E_REQUESTEXRQITEMLINK = "[C] D0:1E RequestExRqItemLink";
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final var client = getClient();
+		if (client == null) {
+			return;
+		}
+		
+		final var object = L2World.getInstance().findObject(_objectId);
+		if (!(object instanceof L2ItemInstance item)) {
+			return;
+		}
+		
+		if (item.isPublished()) {
+			client.sendPacket(new ExRpItemLink(item));
+		} else if (general().debug()) {
+			LOG.info("{} requested item link for item which wasn't published! ID: {}", getClient(), _objectId);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_1E_REQUESTEXRQITEMLINK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
new file mode 100644
index 00000000..d2b0a602
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExSetPledgeCrestLarge.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Crest;
+import com.l2jserver.gameserver.model.L2Crest.CrestType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Format : chdb c (id) 0xD0 h (subid) 0x11 d data size b raw data (picture i think ;) )
+ * @author -Wooden-
+ */
+public final class RequestExSetPledgeCrestLarge extends L2GameClientPacket {
+	private static final String _C__D0_11_REQUESTEXSETPLEDGECRESTLARGE = "[C] D0:11 RequestExSetPledgeCrestLarge";
+	
+	private int _length;
+	private byte[] _data = null;
+	
+	@Override
+	protected void readImpl() {
+		_length = readD();
+		if (_length > 2176) {
+			return;
+		}
+		
+		_data = new byte[_length];
+		readB(_data);
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		if ((_length < 0) || (_length > 2176)) {
+			activeChar.sendPacket(SystemMessageId.WRONG_SIZE_UPLOADED_CREST);
+			return;
+		}
+		
+		if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_SET_CREST_WHILE_DISSOLUTION_IN_PROGRESS);
+			return;
+		}
+		
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		if (_length == 0) {
+			if (clan.getCrestLargeId() != 0) {
+				clan.changeLargeCrest(0);
+				activeChar.sendPacket(SystemMessageId.CLAN_CREST_HAS_BEEN_DELETED);
+			}
+		} else {
+			if (clan.getLevel() < 3) {
+				activeChar.sendPacket(SystemMessageId.CLAN_LVL_3_NEEDED_TO_SET_CREST);
+				return;
+			}
+			
+			final L2Crest crest = CrestTable.getInstance().createCrest(_data, CrestType.PLEDGE_LARGE);
+			if (crest != null) {
+				clan.changeLargeCrest(crest.getId());
+				activeChar.sendPacket(SystemMessageId.CLAN_EMBLEM_WAS_SUCCESSFULLY_REGISTERED);
+			}
+		}
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_11_REQUESTEXSETPLEDGECRESTLARGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExShowContactList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExShowContactList.java
new file mode 100644
index 00000000..3526a7c8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExShowContactList.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExShowContactList;
+
+/**
+ * Format: (ch)
+ * @author mrTJO
+ * @author UnAfraid
+ */
+public final class RequestExShowContactList extends L2GameClientPacket {
+	private static final String _C__D0_86_REQUESTEXSHOWCONTACTLIST = "[C] D0:86 RequestExShowContactList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	public void runImpl() {
+		if (!general().allowMail()) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.sendPacket(new ExShowContactList(activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_86_REQUESTEXSHOWCONTACTLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
new file mode 100644
index 00000000..6cd7dea4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantSupportItem.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
+import com.l2jserver.gameserver.model.items.enchant.EnchantSupportItem;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantSupportItemResult;
+
+/**
+ * @author KenM
+ */
+public class RequestExTryToPutEnchantSupportItem extends L2GameClientPacket {
+	private static final String _C__D0_4D_REQUESTEXTRYTOPUTENCHANTSUPPORTITEM = "[C] D0:4D RequestExTryToPutEnchantSupportItem";
+	
+	private int _supportObjectId;
+	private int _enchantObjectId;
+	
+	@Override
+	protected void readImpl() {
+		_supportObjectId = readD();
+		_enchantObjectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.isEnchanting()) {
+			final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_enchantObjectId);
+			final L2ItemInstance scroll = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantItemId());
+			final L2ItemInstance support = activeChar.getInventory().getItemByObjectId(_supportObjectId);
+			
+			if ((item == null) || (scroll == null) || (support == null)) {
+				// message may be custom
+				activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
+				activeChar.setActiveEnchantSupportItemId(L2PcInstance.ID_NONE);
+				return;
+			}
+			
+			final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
+			final EnchantSupportItem supportTemplate = EnchantItemData.getInstance().getSupportItem(support);
+			
+			if ((scrollTemplate == null) || (supportTemplate == null) || !scrollTemplate.isValid(item, supportTemplate)) {
+				// message may be custom
+				activeChar.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION);
+				activeChar.setActiveEnchantSupportItemId(L2PcInstance.ID_NONE);
+				activeChar.sendPacket(new ExPutEnchantSupportItemResult(0));
+				return;
+			}
+			activeChar.setActiveEnchantSupportItemId(support.getObjectId());
+			activeChar.sendPacket(new ExPutEnchantSupportItemResult(_supportObjectId));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_4D_REQUESTEXTRYTOPUTENCHANTSUPPORTITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
new file mode 100644
index 00000000..d8f8ea8e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExTryToPutEnchantTargetItem.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantItemData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.enchant.EnchantScroll;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPutEnchantTargetItemResult;
+
+/**
+ * @author KenM
+ */
+public class RequestExTryToPutEnchantTargetItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestExTryToPutEnchantTargetItem.class);
+	
+	private static final String _C__D0_4C_REQUESTEXTRYTOPUTENCHANTTARGETITEM = "[C] D0:4C RequestExTryToPutEnchantTargetItem";
+	
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((_objectId == 0) || (activeChar == null)) {
+			return;
+		}
+		
+		if (activeChar.isEnchanting()) {
+			return;
+		}
+		
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
+		final L2ItemInstance scroll = activeChar.getInventory().getItemByObjectId(activeChar.getActiveEnchantItemId());
+		if ((item == null) || (scroll == null)) {
+			return;
+		}
+		
+		final EnchantScroll scrollTemplate = EnchantItemData.getInstance().getEnchantScroll(scroll);
+		if ((scrollTemplate == null) || !scrollTemplate.isValid(item, null)) {
+			activeChar.sendPacket(SystemMessageId.DOES_NOT_FIT_SCROLL_CONDITIONS);
+			activeChar.setActiveEnchantItemId(L2PcInstance.ID_NONE);
+			activeChar.sendPacket(new ExPutEnchantTargetItemResult(0));
+			if (scrollTemplate == null) {
+				LOG.warn("Undefined scroll have been used id: {}", scroll.getId());
+			}
+			return;
+		}
+		activeChar.setIsEnchanting(true);
+		activeChar.setActiveEnchantTimestamp(System.currentTimeMillis());
+		activeChar.sendPacket(new ExPutEnchantTargetItemResult(_objectId));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_4C_REQUESTEXTRYTOPUTENCHANTTARGETITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
new file mode 100644
index 00000000..159eb34d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacket {
+	private static final String _C__D0_25_REQUESTEXITPARTYMATCHINGWAITINGROOM = "[C] D0:25 RequestExitPartyMatchingWaitingRoom";
+	
+	@Override
+	protected void readImpl() {
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance _activeChar = getClient().getActiveChar();
+		
+		if (_activeChar == null) {
+			return;
+		}
+		
+		PartyMatchWaitingList.getInstance().removePlayer(_activeChar);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_25_REQUESTEXITPARTYMATCHINGWAITINGROOM;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java
new file mode 100644
index 00000000..41dfde29
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressMapInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExShowFortressMapInfo;
+
+/**
+ * @author KenM
+ */
+public class RequestFortressMapInfo extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestFortressMapInfo.class);
+	
+	private static final String _C_D0_48_REQUESTFORTRESSMAPINFO = "[C] D0:48 RequestFortressMapInfo";
+	private int _fortressId;
+	
+	@Override
+	protected void readImpl() {
+		_fortressId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		Fort fort = FortManager.getInstance().getFortById(_fortressId);
+		
+		if (fort == null) {
+			LOG.warn("Fort is not found with id ({}) in all forts with size of ({}) called by player ({})", _fortressId, FortManager.getInstance().getForts().size(), getActiveChar());
+			
+			if (getActiveChar() == null) {
+				return;
+			}
+			
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		sendPacket(new ExShowFortressMapInfo(fort));
+	}
+	
+	@Override
+	public String getType() {
+		return _C_D0_48_REQUESTFORTRESSMAPINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
new file mode 100644
index 00000000..156b977d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFortressSiegeInfo.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.ExShowFortressSiegeInfo;
+
+/**
+ * @author KenM
+ */
+public class RequestFortressSiegeInfo extends L2GameClientPacket {
+	private static final String _C__D0_3F_REQUESTFORTRESSSIEGEINFO = "[C] D0:3F RequestFortressSiegeInfo";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2GameClient client = getClient();
+		if (client != null) {
+			for (Fort fort : FortManager.getInstance().getForts()) {
+				if ((fort != null) && fort.getSiege().isInProgress()) {
+					client.sendPacket(new ExShowFortressSiegeInfo(fort));
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_3F_REQUESTFORTRESSSIEGEINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendDel.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendDel.java
new file mode 100644
index 00000000..bd2d4a10
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendDel.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.FriendPacket;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestFriendDel extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestFriendDel.class);
+	
+	private static final String _C__7A_REQUESTFRIENDDEL = "[C] 7A RequestFriendDel";
+	
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		SystemMessage sm;
+		
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		int id = CharNameTable.getInstance().getIdByName(_name);
+		
+		if (id == -1) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_NOT_ON_YOUR_FRIENDS_LIST);
+			sm.addString(_name);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		if (!activeChar.isFriend(id)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_NOT_ON_YOUR_FRIENDS_LIST);
+			sm.addString(_name);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM character_friends WHERE (charId=? AND friendId=?) OR (charId=? AND friendId=?)")) {
+			ps.setInt(1, activeChar.getObjectId());
+			ps.setInt(2, id);
+			ps.setInt(3, id);
+			ps.setInt(4, activeChar.getObjectId());
+			ps.execute();
+			
+			// Player deleted from your friend list
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_DELETED_FROM_YOUR_FRIENDS_LIST);
+			sm.addString(_name);
+			activeChar.sendPacket(sm);
+			
+			activeChar.removeFriend(id);
+			activeChar.sendPacket(new FriendPacket(false, id));
+			
+			final L2PcInstance friend = L2World.getInstance().getPlayer(_name);
+			if (friend != null) {
+				friend.removeFriend(activeChar.getObjectId());
+				friend.sendPacket(new FriendPacket(false, activeChar.getObjectId()));
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not del friend objectid: ", e);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__7A_REQUESTFRIENDDEL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendInvite.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendInvite.java
new file mode 100644
index 00000000..a77a866b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendInvite.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.network.SystemMessageId.A_USER_CURRENTLY_PARTICIPATING_IN_THE_OLYMPIAD_CANNOT_SEND_PARTY_AND_FRIEND_INVITATIONS;
+import static com.l2jserver.gameserver.network.SystemMessageId.BLOCKED_C1;
+import static com.l2jserver.gameserver.network.SystemMessageId.C1_IS_BUSY_TRY_LATER;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_ALREADY_IN_FRIENDS_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.THE_FRIENDS_LIST_OF_THE_PERSON_YOU_ARE_TRYING_TO_ADD_IS_FULL_SO_REGISTRATION_IS_NOT_POSSIBLE;
+import static com.l2jserver.gameserver.network.SystemMessageId.THE_USER_YOU_REQUESTED_IS_NOT_IN_GAME;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CANNOT_ADD_YOURSELF_TO_OWN_FRIEND_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_CAN_ONLY_ENTER_UP_128_NAMES_IN_YOUR_FRIENDS_LIST;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_REQUESTED_C1_TO_BE_FRIEND;
+
+import com.l2jserver.gameserver.model.BlockList;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.FriendAddRequest;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class RequestFriendInvite extends L2GameClientPacket {
+	private static final String _C__77_REQUESTFRIENDINVITE = "[C] 77 RequestFriendInvite";
+	
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2PcInstance friend = L2World.getInstance().getPlayer(_name);
+		
+		// Target is not found in the game.
+		if ((friend == null) || !friend.isOnline() || friend.isInvisible()) {
+			activeChar.sendPacket(THE_USER_YOU_REQUESTED_IS_NOT_IN_GAME);
+			return;
+		}
+		
+		// You cannot add yourself to your own friend list.
+		if (friend == activeChar) {
+			activeChar.sendPacket(YOU_CANNOT_ADD_YOURSELF_TO_OWN_FRIEND_LIST);
+			return;
+		}
+		
+		if (activeChar.getFriends().size() >= character().getFriendListLimit()) {
+			activeChar.sendPacket(YOU_CAN_ONLY_ENTER_UP_128_NAMES_IN_YOUR_FRIENDS_LIST);
+			return;
+		}
+		
+		if (friend.getFriends().size() >= character().getFriendListLimit()) {
+			activeChar.sendPacket(THE_FRIENDS_LIST_OF_THE_PERSON_YOU_ARE_TRYING_TO_ADD_IS_FULL_SO_REGISTRATION_IS_NOT_POSSIBLE);
+			return;
+		}
+		
+		// Target is in olympiad.
+		if (activeChar.isInOlympiadMode() || friend.isInOlympiadMode()) {
+			activeChar.sendPacket(A_USER_CURRENTLY_PARTICIPATING_IN_THE_OLYMPIAD_CANNOT_SEND_PARTY_AND_FRIEND_INVITATIONS);
+			return;
+		}
+		
+		// Target blocked active player.
+		if (BlockList.isBlocked(friend, activeChar)) {
+			activeChar.sendMessage("You are in target's block list.");
+			return;
+		}
+		
+		// Target is blocked.
+		if (BlockList.isBlocked(activeChar, friend)) {
+			final var sm = SystemMessage.getSystemMessage(BLOCKED_C1);
+			sm.addCharName(friend);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		// Target already in friend list.
+		if (activeChar.isFriend(friend.getObjectId())) {
+			final var sm = SystemMessage.getSystemMessage(S1_ALREADY_IN_FRIENDS_LIST);
+			sm.addString(_name);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		// Target is busy.
+		if (friend.isProcessingRequest()) {
+			final var sm = SystemMessage.getSystemMessage(C1_IS_BUSY_TRY_LATER);
+			sm.addString(_name);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		// Friend request sent.
+		activeChar.onTransactionRequest(friend);
+		friend.sendPacket(new FriendAddRequest(activeChar.getName()));
+		final var sm = SystemMessage.getSystemMessage(YOU_REQUESTED_C1_TO_BE_FRIEND);
+		sm.addString(_name);
+		activeChar.sendPacket(sm);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__77_REQUESTFRIENDINVITE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendList.java
new file mode 100644
index 00000000..fffd2a3c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestFriendList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/03/27
+ */
+public final class RequestFriendList extends L2GameClientPacket {
+	private static final String _C__79_REQUESTFRIENDLIST = "[C] 79 RequestFriendList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		// ======<Friend List>======
+		activeChar.sendPacket(SystemMessageId.FRIEND_LIST_HEADER);
+		if (activeChar.hasFriends()) {
+			for (int id : activeChar.getFriends()) {
+				final String friendName = CharNameTable.getInstance().getNameById(id);
+				if (friendName == null) {
+					continue;
+				}
+				
+				final L2PcInstance friend = L2World.getInstance().getPlayer(friendName);
+				final SystemMessage sm = SystemMessage.getSystemMessage((friend == null) || !friend.isOnline() ? SystemMessageId.S1_OFFLINE : SystemMessageId.S1_ONLINE);
+				sm.addString(friendName);
+				activeChar.sendPacket(sm);
+			}
+		}
+		// =========================
+		activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__79_REQUESTFRIENDLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java
new file mode 100644
index 00000000..605ebaae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGMCommand.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.GMHennaInfo;
+import com.l2jserver.gameserver.network.serverpackets.GMViewCharacterInfo;
+import com.l2jserver.gameserver.network.serverpackets.GMViewItemList;
+import com.l2jserver.gameserver.network.serverpackets.GMViewPledgeInfo;
+import com.l2jserver.gameserver.network.serverpackets.GMViewSkillInfo;
+import com.l2jserver.gameserver.network.serverpackets.GMViewWarehouseWithdrawList;
+import com.l2jserver.gameserver.network.serverpackets.GmViewQuestInfo;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestGMCommand extends L2GameClientPacket {
+	private static final String _C__7E_REQUESTGMCOMMAND = "[C] 7E RequestGMCommand";
+	
+	private String _targetName;
+	private int _command;
+	
+	@Override
+	protected void readImpl() {
+		_targetName = readS();
+		_command = readD();
+		// _unknown = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// prevent non gm or low level GMs from viewing player stuff
+		if (!getClient().getActiveChar().isGM() || !getClient().getActiveChar().getAccessLevel().allowAltG()) {
+			return;
+		}
+		
+		L2PcInstance player = L2World.getInstance().getPlayer(_targetName);
+		
+		L2Clan clan = ClanTable.getInstance().getClanByName(_targetName);
+		
+		// player name was incorrect?
+		if ((player == null) && ((clan == null) || (_command != 6))) {
+			return;
+		}
+		
+		switch (_command) {
+			// player status
+			case 1 -> {
+				sendPacket(new GMViewCharacterInfo(player));
+				sendPacket(new GMHennaInfo(player));
+			}
+			// player clan
+			case 2 -> {
+				if (player.getClan() != null) {
+					sendPacket(new GMViewPledgeInfo(player.getClan(), player));
+				}
+			}
+			// player skills
+			case 3 -> sendPacket(new GMViewSkillInfo(player));
+			// player quests
+			case 4 -> sendPacket(new GmViewQuestInfo(player));
+			// player inventory
+			case 5 -> {
+				sendPacket(new GMViewItemList(player));
+				sendPacket(new GMHennaInfo(player));
+			}
+			// player warehouse
+			case 6 -> {
+				// gm warehouse view to be implemented
+				if (player != null) {
+					sendPacket(new GMViewWarehouseWithdrawList(player));
+					// clan warehouse
+				} else {
+					sendPacket(new GMViewWarehouseWithdrawList(clan));
+				}
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__7E_REQUESTGMCOMMAND;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetBossRecord.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetBossRecord.java
new file mode 100644
index 00000000..eb3701b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetBossRecord.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExGetBossRecord;
+
+/**
+ * Format: (ch) d
+ * @author -Wooden-
+ */
+public class RequestGetBossRecord extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestGetBossRecord.class);
+	
+	private static final String _C__D0_40_REQUESTGETBOSSRECORD = "[C] D0:40 RequestGetBossRecord";
+	private int _bossId;
+	
+	@Override
+	protected void readImpl() {
+		_bossId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (_bossId != 0) {
+			LOG.info("C5: RequestGetBossRecord: d: {} ActiveChar: {}", _bossId, activeChar); // should be always 0, log it if isn't 0 for future research
+		}
+		
+		int points = RaidBossPointsManager.getInstance().getPointsByOwnerId(activeChar.getObjectId());
+		int ranking = RaidBossPointsManager.getInstance().calculateRanking(activeChar.getObjectId());
+		
+		Map<Integer, Integer> list = RaidBossPointsManager.getInstance().getList(activeChar);
+		
+		// trigger packet
+		activeChar.sendPacket(new ExGetBossRecord(ranking, points, list));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_40_REQUESTGETBOSSRECORD;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetItemFromPet.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetItemFromPet.java
new file mode 100644
index 00000000..05621aa3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetItemFromPet.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/29 23:15:33
+ */
+public final class RequestGetItemFromPet extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestGetItemFromPet.class);
+	
+	private static final String _C__2C_REQUESTGETITEMFROMPET = "[C] 2C RequestGetItemFromPet";
+	
+	private int _objectId;
+	private long _amount;
+	@SuppressWarnings("unused")
+	private int _unknown;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_amount = readQ();
+		_unknown = readD();// = 0 for most trades
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if ((_amount <= 0) || (player == null) || !player.hasPet()) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("getfrompet")) {
+			player.sendMessage("You get items from pet too fast.");
+			return;
+		}
+		
+		final L2PetInstance pet = (L2PetInstance) player.getSummon();
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) {
+			return;
+		}
+		
+		final L2ItemInstance item = pet.getInventory().getItemByObjectId(_objectId);
+		if (item == null) {
+			return;
+		}
+		
+		if (_amount > item.getCount()) {
+			Util.handleIllegalPlayerAction(player, getClass().getSimpleName() + ": Character " + player.getName() + " of account " + player.getAccountName() + " tried to get item with oid " + _objectId + " from pet but has invalid count " + _amount + " item count: " + item.getCount());
+			return;
+		}
+		
+		if (pet.transferItem("Transfer", _objectId, _amount, player.getInventory(), player, pet) == null) {
+			LOG.warn("Invalid item transfer request: {}(pet) --> {}", pet.getName(), player.getName());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__2C_REQUESTGETITEMFROMPET;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOffVehicle.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOffVehicle.java
new file mode 100644
index 00000000..57a2a16b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOffVehicle.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.GetOffVehicle;
+import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
+
+/**
+ * @author Maktakien
+ */
+public final class RequestGetOffVehicle extends L2GameClientPacket {
+	private static final String _C__54_GETOFFVEHICLE = "[S] 54 GetOffVehicle";
+	
+	private int _boatId, _x, _y, _z;
+	
+	@Override
+	protected void readImpl() {
+		_boatId = readD();
+		_x = readD();
+		_y = readD();
+		_z = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (!activeChar.isInBoat() || (activeChar.getBoat().getObjectId() != _boatId) || activeChar.getBoat().isMoving() || !activeChar.isInsideRadius(_x, _y, _z, 1000, true, false)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		activeChar.broadcastPacket(new StopMoveInVehicle(activeChar, _boatId));
+		activeChar.setVehicle(null);
+		activeChar.setInVehiclePosition(null);
+		sendPacket(ActionFailed.STATIC_PACKET);
+		activeChar.broadcastPacket(new GetOffVehicle(activeChar.getObjectId(), _boatId, _x, _y, _z));
+		activeChar.setXYZ(_x, _y, _z);
+		activeChar.setInsideZone(ZoneId.PEACE, false);
+		activeChar.revalidateZone(true);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__54_GETOFFVEHICLE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOnVehicle.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOnVehicle.java
new file mode 100644
index 00000000..9bec0ec3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOnVehicle.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.BoatManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.GetOnVehicle;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestGetOnVehicle extends L2GameClientPacket {
+	private static final String _C__53_GETONVEHICLE = "[C] 53 GetOnVehicle";
+	
+	private int _boatId;
+	private Location _pos;
+	
+	@Override
+	protected void readImpl() {
+		int x, y, z;
+		_boatId = readD();
+		x = readD();
+		y = readD();
+		z = readD();
+		_pos = new Location(x, y, z);
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2BoatInstance boat;
+		if (activeChar.isInBoat()) {
+			boat = activeChar.getBoat();
+			if (boat.getObjectId() != _boatId) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		} else {
+			boat = BoatManager.getInstance().getBoat(_boatId);
+			if ((boat == null) || boat.isMoving() || !activeChar.isInsideRadius(boat, 1000, true, false)) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		}
+		
+		activeChar.setInVehiclePosition(_pos);
+		activeChar.setVehicle(boat);
+		activeChar.broadcastPacket(new GetOnVehicle(activeChar.getObjectId(), boat.getObjectId(), _pos));
+		
+		activeChar.setXYZ(boat.getX(), boat.getY(), boat.getZ());
+		activeChar.setInsideZone(ZoneId.PEACE, true);
+		activeChar.revalidateZone(true);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__53_GETONVEHICLE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java
new file mode 100644
index 00000000..b6f70510
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveItemToPet.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/29 23:15:33
+ */
+public final class RequestGiveItemToPet extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestGiveItemToPet.class);
+	
+	private static final String _C__95_REQUESTCIVEITEMTOPET = "[C] 95 RequestGiveItemToPet";
+	
+	private int _objectId;
+	private long _amount;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_amount = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if ((_amount <= 0) || (player == null) || !player.hasPet()) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("giveitemtopet")) {
+			player.sendMessage("You are giving items to pet too fast.");
+			return;
+		}
+		
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) {
+			return;
+		}
+		
+		// Karma punishment
+		if (!character().karmaPlayerCanTrade() && (player.getKarma() > 0)) {
+			return;
+		}
+		
+		if (player.getPrivateStoreType() != PrivateStoreType.NONE) {
+			player.sendMessage("You cannot exchange items while trading.");
+			return;
+		}
+		
+		final L2ItemInstance item = player.getInventory().getItemByObjectId(_objectId);
+		if (item == null) {
+			return;
+		}
+		
+		if (_amount > item.getCount()) {
+			Util.handleIllegalPlayerAction(player, getClass().getSimpleName() + ": Character " + player.getName() + " of account " + player.getAccountName() + //
+				" tried to get item with oid " + _objectId + " from pet but has invalid count " + _amount + " item count: " + item.getCount());
+			return;
+		}
+		
+		if (item.isAugmented()) {
+			return;
+		}
+		
+		if (item.isHeroItem() || !item.isDroppable() || !item.isDestroyable() || !item.isTradeable()) {
+			player.sendPacket(SystemMessageId.ITEM_NOT_FOR_PETS);
+			return;
+		}
+		
+		final L2PetInstance pet = (L2PetInstance) player.getSummon();
+		if (pet.isDead()) {
+			player.sendPacket(SystemMessageId.CANNOT_GIVE_ITEMS_TO_DEAD_PET);
+			return;
+		}
+		
+		if (!pet.getInventory().validateCapacity(item)) {
+			player.sendPacket(SystemMessageId.YOUR_PET_CANNOT_CARRY_ANY_MORE_ITEMS);
+			return;
+		}
+		
+		if (!pet.getInventory().validateWeight(item, _amount)) {
+			player.sendPacket(SystemMessageId.UNABLE_TO_PLACE_ITEM_YOUR_PET_IS_TOO_ENCUMBERED);
+			return;
+		}
+		
+		if (player.transferItem("Transfer", _objectId, _amount, pet.getInventory(), pet) == null) {
+			LOG.warn("Invalid item transfer request: {}(pet) --> {}", pet.getName(), player.getName());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__95_REQUESTCIVEITEMTOPET;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java
new file mode 100644
index 00000000..219a46f2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGiveNickName.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public class RequestGiveNickName extends L2GameClientPacket {
+	private static final String _C__0B_REQUESTGIVENICKNAME = "[C] 0B RequestGiveNickName";
+	
+	private String _target;
+	private String _title;
+	
+	@Override
+	protected void readImpl() {
+		_target = readS();
+		_title = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		// Noblesse can bestow a title to themselves
+		if (activeChar.isNoble() && _target.equalsIgnoreCase(activeChar.getName())) {
+			activeChar.setTitle(_title);
+			activeChar.sendPacket(SystemMessageId.TITLE_CHANGED);
+			activeChar.broadcastTitleInfo();
+		} else {
+			// Can the player change/give a title?
+			if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_GIVE_TITLE)) {
+				activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+				return;
+			}
+			
+			if (activeChar.getClan().getLevel() < 3) {
+				activeChar.sendPacket(SystemMessageId.CLAN_LVL_3_NEEDED_TO_ENDOWE_TITLE);
+				return;
+			}
+			
+			L2ClanMember member1 = activeChar.getClan().getClanMember(_target);
+			if (member1 != null) {
+				L2PcInstance member = member1.getPlayerInstance();
+				if (member != null) {
+					// is target from the same clan?
+					member.setTitle(_title);
+					member.sendPacket(SystemMessageId.TITLE_CHANGED);
+					member.broadcastTitleInfo();
+				} else {
+					activeChar.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+				}
+			} else {
+				activeChar.sendPacket(SystemMessageId.TARGET_MUST_BE_IN_CLAN);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__0B_REQUESTGIVENICKNAME;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGmList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGmList.java
new file mode 100644
index 00000000..998a4500
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGmList.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+
+/**
+ * RequestGmList packet triggered by /gmlist command.
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestGmList extends L2GameClientPacket {
+	private static final String _C__8B_REQUESTGMLIST = "[C] 8B RequestGmList";
+	
+	@Override
+	protected void readImpl() {
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (getClient().getActiveChar() == null) {
+			return;
+		}
+		AdminData.getInstance().sendListToPlayer(getClient().getActiveChar());
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8B_REQUESTGMLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java
new file mode 100644
index 00000000..febdb4cf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestGotoLobby.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
+
+/**
+ * (ch)
+ * @author KenM
+ */
+public class RequestGotoLobby extends L2GameClientPacket {
+	private static final String _C__D0_38_REQUESTGOTOLOBBY = "[C] D0:38 RequestGotoLobby";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2GameClient client = getClient();
+		client.sendPacket(new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_38_REQUESTGOTOLOBBY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaEquip.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaEquip.java
new file mode 100644
index 00000000..0238992f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaEquip.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.HennaData;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Zoey76
+ */
+public final class RequestHennaEquip extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestHennaEquip.class);
+	
+	private static final String _C__6F_REQUESTHENNAEQUIP = "[C] 6F RequestHennaEquip";
+	private int _symbolId;
+	
+	@Override
+	protected void readImpl() {
+		_symbolId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("HennaEquip")) {
+			return;
+		}
+		
+		if (activeChar.getHennaEmptySlots() == 0) {
+			activeChar.sendPacket(SystemMessageId.SYMBOLS_FULL);
+			sendActionFailed();
+			return;
+		}
+		
+		final L2Henna henna = HennaData.getInstance().getHenna(_symbolId);
+		if (henna == null) {
+			LOG.warn("Invalid Henna Id: {} from player {}", _symbolId, activeChar);
+			sendActionFailed();
+			return;
+		}
+		
+		final long _count = activeChar.getInventory().getInventoryItemCount(henna.getDyeItemId(), -1);
+		if (henna.isAllowedClass(activeChar.getClassId()) && (_count >= henna.getWearCount()) && (activeChar.getAdena() >= henna.getWearFee()) && activeChar.addHenna(henna)) {
+			activeChar.destroyItemByItemId("Henna", henna.getDyeItemId(), henna.getWearCount(), activeChar, true);
+			activeChar.getInventory().reduceAdena("Henna", henna.getWearFee(), activeChar, activeChar.getLastFolkNPC());
+			final InventoryUpdate iu = new InventoryUpdate();
+			iu.addModifiedItem(activeChar.getInventory().getAdenaInstance());
+			activeChar.sendPacket(iu);
+			activeChar.sendPacket(SystemMessageId.SYMBOL_ADDED);
+		} else {
+			activeChar.sendPacket(SystemMessageId.CANT_DRAW_SYMBOL);
+			if (!activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && !henna.isAllowedClass(activeChar.getClassId())) {
+				Util.handleIllegalPlayerAction(activeChar, "Exploit attempt: Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " tried to add a forbidden henna.");
+			}
+			sendActionFailed();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__6F_REQUESTHENNAEQUIP;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemInfo.java
new file mode 100644
index 00000000..2746a1b8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemInfo.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.HennaData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.network.serverpackets.HennaItemDrawInfo;
+
+/**
+ * @author Zoey76
+ */
+public final class RequestHennaItemInfo extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestHennaItemInfo.class);
+	
+	private static final String _C__C4_REQUESTHENNAITEMINFO = "[C] C4 RequestHennaItemInfo";
+	
+	private int _symbolId;
+	
+	@Override
+	protected void readImpl() {
+		_symbolId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Henna henna = HennaData.getInstance().getHenna(_symbolId);
+		if (henna == null) {
+			if (_symbolId != 0) {
+				LOG.warn("Invalid Henna Id: {} from player {}", _symbolId, activeChar);
+			}
+			sendActionFailed();
+			return;
+		}
+		activeChar.sendPacket(new HennaItemDrawInfo(henna, activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C4_REQUESTHENNAITEMINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemList.java
new file mode 100644
index 00000000..5d1a8aac
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemList.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.HennaEquipList;
+
+/**
+ * @author Tempy
+ * @author Zoey76
+ */
+public final class RequestHennaItemList extends L2GameClientPacket {
+	private static final String _C__C3_REQUESTHENNAITEMLIST = "[C] C3 RequestHennaItemList";
+	
+	@SuppressWarnings("unused")
+	private int _unknown;
+	
+	@Override
+	protected void readImpl() {
+		_unknown = readD(); // TODO: Identify.
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar != null) {
+			activeChar.sendPacket(new HennaEquipList(activeChar));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C3_REQUESTHENNAITEMLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
new file mode 100644
index 00000000..8b72565f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaItemRemoveInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.HennaData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.network.serverpackets.HennaItemRemoveInfo;
+
+/**
+ * @author Zoey76
+ */
+public final class RequestHennaItemRemoveInfo extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestHennaItemRemoveInfo.class);
+	
+	private static final String _C__71_REQUESTHENNAITEMREMOVEINFO = "[C] 71 RequestHennaItemRemoveInfo";
+	
+	private int _symbolId;
+	
+	@Override
+	protected void readImpl() {
+		_symbolId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || (_symbolId == 0)) {
+			return;
+		}
+		
+		final L2Henna henna = HennaData.getInstance().getHenna(_symbolId);
+		if (henna == null) {
+			LOG.warn("Invalid Henna Id: {} from player {}", _symbolId, activeChar);
+			sendActionFailed();
+			return;
+		}
+		activeChar.sendPacket(new HennaItemRemoveInfo(henna, activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__71_REQUESTHENNAITEMREMOVEINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemove.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemove.java
new file mode 100644
index 00000000..67e15f76
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemove.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * @author Zoey76
+ */
+public final class RequestHennaRemove extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestHennaRemove.class);
+	
+	private static final String _C__72_REQUESTHENNAREMOVE = "[C] 72 RequestHennaRemove";
+	private int _symbolId;
+	
+	@Override
+	protected void readImpl() {
+		_symbolId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("HennaRemove")) {
+			sendActionFailed();
+			return;
+		}
+		
+		L2Henna henna;
+		boolean found = false;
+		for (int i = 1; i <= 3; i++) {
+			henna = activeChar.getHenna(i);
+			if ((henna != null) && (henna.getDyeId() == _symbolId)) {
+				if (activeChar.getAdena() >= henna.getCancelFee()) {
+					activeChar.removeHenna(i);
+				} else {
+					activeChar.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+					sendActionFailed();
+				}
+				found = true;
+				break;
+			}
+		}
+		// TODO: Test.
+		if (!found) {
+			LOG.warn("Player {} requested Henna Draw remove without any henna.", activeChar);
+			sendActionFailed();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__72_REQUESTHENNAREMOVE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemoveList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemoveList.java
new file mode 100644
index 00000000..f6d8324d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemoveList.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.HennaRemoveList;
+
+public final class RequestHennaRemoveList extends L2GameClientPacket {
+	private static final String _C__70_REQUESTHENNAREMOVELIST = "[C] 70 RequestHennaRemoveList";
+	
+	@SuppressWarnings("unused")
+	private int _unknown;
+	
+	@Override
+	protected void readImpl() {
+		_unknown = readD(); // TODO: Identify.
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		activeChar.sendPacket(new HennaRemoveList(activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__70_REQUESTHENNAREMOVELIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestInfoItemAuction.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestInfoItemAuction.java
new file mode 100644
index 00000000..d17cd2f3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestInfoItemAuction.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.ItemAuctionManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemauction.ItemAuction;
+import com.l2jserver.gameserver.model.itemauction.ItemAuctionInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExItemAuctionInfoPacket;
+
+/**
+ * @author Forsaiken
+ */
+public final class RequestInfoItemAuction extends L2GameClientPacket {
+	private static final String _C__D0_3A_REQUESTINFOITEMAUCTION = "[C] D0:3A RequestInfoItemAuction";
+	
+	private int _instanceId;
+	
+	@Override
+	protected void readImpl() {
+		_instanceId = super.readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = super.getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getItemAuction().tryPerformAction("RequestInfoItemAuction")) {
+			return;
+		}
+		
+		final ItemAuctionInstance instance = ItemAuctionManager.getInstance().getManagerInstance(_instanceId);
+		if (instance == null) {
+			return;
+		}
+		
+		final ItemAuction auction = instance.getCurrentAuction();
+		if (auction == null) {
+			return;
+		}
+		
+		activeChar.updateLastItemAuctionRequest();
+		activeChar.sendPacket(new ExItemAuctionInfoPacket(true, auction, instance.getNextAuction()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_3A_REQUESTINFOITEMAUCTION;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java
new file mode 100644
index 00000000..293224d1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestItemList.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestItemList extends L2GameClientPacket {
+	private static final String _C__14_REQUESTITEMLIST = "[C] 14 RequestItemList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((getClient() != null) && (getClient().getActiveChar() != null) && !getClient().getActiveChar().isInventoryDisabled()) {
+			ItemList il = new ItemList(getClient().getActiveChar(), true);
+			sendPacket(il);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__14_REQUESTITEMLIST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java
new file mode 100644
index 00000000..f3ffd2d0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinAlly.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.network.SystemMessageId.S2_ALLIANCE_LEADER_OF_S1_REQUESTED_ALLIANCE;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER;
+import static com.l2jserver.gameserver.network.SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.network.serverpackets.AskJoinAlly;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestJoinAlly extends L2GameClientPacket {
+	private static final String _C__8C_REQUESTJOINALLY = "[C] 8C RequestJoinAlly";
+	
+	private int _id;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final var player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final var targetPlayer = L2World.getInstance().getPlayer(_id);
+		if (targetPlayer == null) {
+			player.sendPacket(YOU_HAVE_INVITED_THE_WRONG_TARGET);
+			return;
+		}
+		
+		final var clan = player.getClan();
+		if (clan == null) {
+			player.sendPacket(YOU_ARE_NOT_A_CLAN_MEMBER);
+			return;
+		}
+		
+		if (!clan.checkAllyJoinCondition(player, targetPlayer)) {
+			return;
+		}
+		
+		if (!player.getRequest().setRequest(targetPlayer, this)) {
+			return;
+		}
+		
+		final var sm = SystemMessage.getSystemMessage(S2_ALLIANCE_LEADER_OF_S1_REQUESTED_ALLIANCE);
+		sm.addString(player.getClan().getAllyName());
+		sm.addString(player.getName());
+		targetPlayer.sendPacket(sm);
+		targetPlayer.sendPacket(new AskJoinAlly(player.getObjectId(), player.getClan().getAllyName()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8C_REQUESTJOINALLY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinDominionWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinDominionWar.java
new file mode 100644
index 00000000..30f185c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinDominionWar.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExShowDominionRegistry;
+
+/**
+ * @author Gigiikun
+ */
+public final class RequestJoinDominionWar extends L2GameClientPacket {
+	private static final String _C__D0_57_REQUESTJOINDOMINIONWAR = "[C] D0:57 RequestJoinDominionWar";
+	
+	private int _territoryId;
+	private int _isClan;
+	private int _isJoining;
+	
+	@Override
+	protected void readImpl() {
+		_territoryId = readD();
+		_isClan = readD();
+		_isJoining = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		L2Clan clan = activeChar.getClan();
+		int castleId = _territoryId - 80;
+		
+		if (TerritoryWarManager.getInstance().getIsRegistrationOver()) {
+			activeChar.sendPacket(SystemMessageId.NOT_TERRITORY_REGISTRATION_PERIOD);
+			return;
+		} else if ((clan != null) && (TerritoryWarManager.getInstance().getTerritory(castleId).getOwnerClan() == clan)) {
+			activeChar.sendPacket(SystemMessageId.THE_TERRITORY_OWNER_CLAN_CANNOT_PARTICIPATE_AS_MERCENARIES);
+			return;
+		}
+		
+		if (_isClan == 0x01) {
+			if (!activeChar.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) {
+				activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+				return;
+			}
+			
+			if (clan == null) {
+				return;
+			}
+			
+			if (_isJoining == 1) {
+				if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) {
+					activeChar.sendPacket(SystemMessageId.CANT_PARTICIPATE_IN_SIEGE_WHILE_DISSOLUTION_IN_PROGRESS);
+					return;
+				} else if (TerritoryWarManager.getInstance().checkIsRegistered(-1, clan)) {
+					activeChar.sendPacket(SystemMessageId.YOU_ALREADY_REQUESTED_TW_REGISTRATION);
+					return;
+				}
+				TerritoryWarManager.getInstance().registerClan(castleId, clan);
+			} else {
+				TerritoryWarManager.getInstance().removeClan(castleId, clan);
+			}
+		} else {
+			if ((activeChar.getLevel() < 40) || (activeChar.getClassId().level() < 2)) {
+				// TODO: punish player
+				return;
+			}
+			if (_isJoining == 1) {
+				if (TerritoryWarManager.getInstance().checkIsRegistered(-1, activeChar.getObjectId())) {
+					activeChar.sendPacket(SystemMessageId.YOU_ALREADY_REQUESTED_TW_REGISTRATION);
+					return;
+				} else if (TerritoryWarManager.getInstance().checkIsRegistered(-1, clan)) {
+					activeChar.sendPacket(SystemMessageId.YOU_ALREADY_REQUESTED_TW_REGISTRATION);
+					return;
+				}
+				TerritoryWarManager.getInstance().registerMerc(castleId, activeChar);
+			} else {
+				TerritoryWarManager.getInstance().removeMerc(castleId, activeChar);
+			}
+		}
+		activeChar.sendPacket(new ExShowDominionRegistry(castleId, activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_57_REQUESTJOINDOMINIONWAR;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java
new file mode 100644
index 00000000..b60f64b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinParty.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+import com.l2jserver.gameserver.model.BlockList;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.AskJoinParty;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestJoinParty extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestJoinParty.class);
+	
+	private static final String _C__42_REQUESTJOINPARTY = "[C] 42 RequestJoinParty";
+	
+	private String _name;
+	private int _partyDistributionTypeId;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+		_partyDistributionTypeId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance requestor = getClient().getActiveChar();
+		L2PcInstance target = L2World.getInstance().getPlayer(_name);
+		
+		if (requestor == null) {
+			return;
+		}
+		
+		if (target == null) {
+			requestor.sendPacket(SystemMessageId.FIRST_SELECT_USER_TO_INVITE_TO_PARTY);
+			return;
+		}
+		
+		if ((target.getClient() == null) || target.getClient().isDetached()) {
+			requestor.sendMessage("Player is in offline mode.");
+			return;
+		}
+		
+		if (requestor.isPartyBanned()) {
+			requestor.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_PARTY_NOT_ALLOWED);
+			requestor.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (target.isPartyBanned()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_REPORTED_AND_CANNOT_PARTY);
+			sm.addCharName(target);
+			requestor.sendPacket(sm);
+			return;
+		}
+		
+		if (!target.isVisibleFor(requestor)) {
+			requestor.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+			return;
+		}
+		
+		SystemMessage sm;
+		if (target.isInParty()) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_ALREADY_IN_PARTY);
+			sm.addString(target.getName());
+			requestor.sendPacket(sm);
+			return;
+		}
+		
+		if (BlockList.isBlocked(target, requestor)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ADDED_YOU_TO_IGNORE_LIST);
+			sm.addCharName(target);
+			requestor.sendPacket(sm);
+			return;
+		}
+		
+		if (target == requestor) {
+			requestor.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
+			return;
+		}
+		
+		if (target.isCursedWeaponEquipped() || requestor.isCursedWeaponEquipped()) {
+			requestor.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			return;
+		}
+		
+		if (target.isJailed() || requestor.isJailed()) {
+			requestor.sendMessage("You cannot invite a player while is in Jail.");
+			return;
+		}
+		
+		if (target.isInOlympiadMode() || requestor.isInOlympiadMode()) {
+			if ((target.isInOlympiadMode() != requestor.isInOlympiadMode()) || (target.getOlympiadGameId() != requestor.getOlympiadGameId()) || (target.getOlympiadSide() != requestor.getOlympiadSide())) {
+				requestor.sendPacket(SystemMessageId.A_USER_CURRENTLY_PARTICIPATING_IN_THE_OLYMPIAD_CANNOT_SEND_PARTY_AND_FRIEND_INVITATIONS);
+				return;
+			}
+		}
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.C1_INVITED_TO_PARTY);
+		sm.addCharName(target);
+		requestor.sendPacket(sm);
+		
+		if (!requestor.isInParty()) {
+			createNewParty(target, requestor);
+		} else {
+			if (requestor.getParty().isInDimensionalRift()) {
+				requestor.sendMessage("You cannot invite a player when you are in the Dimensional Rift.");
+			} else {
+				addTargetToParty(target, requestor);
+			}
+		}
+	}
+	
+	private void addTargetToParty(L2PcInstance target, L2PcInstance requestor) {
+		final L2Party party = requestor.getParty();
+		// summary of ppl already in party and ppl that get invitation
+		if (!party.isLeader(requestor)) {
+			requestor.sendPacket(SystemMessageId.ONLY_LEADER_CAN_INVITE);
+			return;
+		}
+		if (party.getMemberCount() >= 9) {
+			requestor.sendPacket(SystemMessageId.PARTY_FULL);
+			return;
+		}
+		if (party.getPendingInvitation() && !party.isInvitationRequestExpired()) {
+			requestor.sendPacket(SystemMessageId.WAITING_FOR_ANOTHER_REPLY);
+			return;
+		}
+		
+		if (!target.isProcessingRequest()) {
+			requestor.onTransactionRequest(target);
+			// in case a leader change has happened, use party's mode
+			target.sendPacket(new AskJoinParty(requestor.getName(), party.getDistributionType()));
+			party.setPendingInvitation(true);
+			
+			if (general().debug()) {
+				LOG.debug("Sent out a party invitation to: {}", target.getName());
+			}
+			
+		} else {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
+			sm.addString(target.getName());
+			requestor.sendPacket(sm);
+			
+			if (general().debug()) {
+				LOG.warn("{} already received a party invitation", requestor.getName());
+			}
+		}
+	}
+	
+	private void createNewParty(L2PcInstance target, L2PcInstance requestor) {
+		PartyDistributionType partyDistributionType = PartyDistributionType.findById(_partyDistributionTypeId);
+		if (partyDistributionType == null) {
+			return;
+		}
+		
+		if (!target.isProcessingRequest()) {
+			target.sendPacket(new AskJoinParty(requestor.getName(), partyDistributionType));
+			target.setActiveRequester(requestor);
+			requestor.onTransactionRequest(target);
+			requestor.setPartyDistributionType(partyDistributionType);
+			
+			if (general().debug()) {
+				LOG.debug("Sent out a party invitation to: {}", target.getName());
+			}
+			
+		} else {
+			requestor.sendPacket(SystemMessageId.WAITING_FOR_ANOTHER_REPLY);
+			
+			if (general().debug()) {
+				LOG.warn("{} already received a party invitation", requestor.getName());
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__42_REQUESTJOINPARTY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java
new file mode 100644
index 00000000..78fca55f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AskJoinPledge;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestJoinPledge extends L2GameClientPacket {
+	private static final String _C__26_REQUESTJOINPLEDGE = "[C] 26 RequestJoinPledge";
+	
+	private int _target;
+	private int _pledgeType;
+	
+	@Override
+	protected void readImpl() {
+		_target = readD();
+		_pledgeType = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		final L2PcInstance target = L2World.getInstance().getPlayer(_target);
+		if (target == null) {
+			activeChar.sendPacket(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET);
+			return;
+		}
+		
+		if (!clan.checkClanJoinCondition(activeChar, target, _pledgeType)) {
+			return;
+		}
+		
+		if (!activeChar.getRequest().setRequest(target, this)) {
+			return;
+		}
+		
+		final String pledgeName = activeChar.getClan().getName();
+		final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
+		target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName));
+	}
+	
+	public int getPledgeType() {
+		return _pledgeType;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__26_REQUESTJOINPLEDGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java
new file mode 100644
index 00000000..4ee237fc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinSiege.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SiegeInfo;
+
+/**
+ * @author KenM
+ */
+public final class RequestJoinSiege extends L2GameClientPacket {
+	private static final String _C__AD_RequestJoinSiege = "[C] AD RequestJoinSiege";
+	
+	private int _castleId;
+	private int _isAttacker;
+	private int _isJoining;
+	
+	@Override
+	protected void readImpl() {
+		_castleId = readD();
+		_isAttacker = readD();
+		_isJoining = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CS_MANAGE_SIEGE)) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		Castle castle = CastleManager.getInstance().getCastleById(_castleId);
+		if (castle != null) {
+			if (_isJoining == 1) {
+				if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) {
+					activeChar.sendPacket(SystemMessageId.CANT_PARTICIPATE_IN_SIEGE_WHILE_DISSOLUTION_IN_PROGRESS);
+					return;
+				}
+				if (_isAttacker == 1) {
+					castle.getSiege().registerAttacker(activeChar);
+				} else {
+					castle.getSiege().registerDefender(activeChar);
+				}
+			} else {
+				castle.getSiege().removeSiegeClan(activeChar);
+			}
+			castle.getSiege().listRegisterClan(activeChar);
+		}
+		
+		SiegableHall hall = ClanHallSiegeManager.getInstance().getSiegableHall(_castleId);
+		if (hall != null) {
+			if (_isJoining == 1) {
+				if (System.currentTimeMillis() < clan.getDissolvingExpiryTime()) {
+					activeChar.sendPacket(SystemMessageId.CANT_PARTICIPATE_IN_SIEGE_WHILE_DISSOLUTION_IN_PROGRESS);
+					return;
+				}
+				ClanHallSiegeManager.getInstance().registerClan(clan, hall, activeChar);
+			} else {
+				ClanHallSiegeManager.getInstance().unRegisterClan(clan, hall);
+			}
+			activeChar.sendPacket(new SiegeInfo(hall));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__AD_RequestJoinSiege;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java
new file mode 100644
index 00000000..ca7abe40
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestKeyMapping.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExUISetting;
+
+/**
+ * @author KenM
+ * @auhtor mrTJO
+ */
+public class RequestKeyMapping extends L2GameClientPacket {
+	private static final String _C__D0_21_REQUESTKEYMAPPING = "[C] D0:21 RequestKeyMapping";
+	
+	@Override
+	protected void readImpl() {
+		// trigger (no data)
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (character().storeUISettings()) {
+			activeChar.sendPacket(new ExUISetting(activeChar));
+		}
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_21_REQUESTKEYMAPPING;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java
new file mode 100644
index 00000000..d91d6ddf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestLinkHtml.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * RequestLinkHtml client packet implementation.
+ * @author zabbix
+ * @author HorridoJoho
+ */
+public final class RequestLinkHtml extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestLinkHtml.class);
+	
+	private static final String _C__22_REQUESTLINKHTML = "[C] 22 RequestLinkHtml";
+	private String _link;
+	
+	@Override
+	protected void readImpl() {
+		_link = readS();
+	}
+	
+	@Override
+	public void runImpl() {
+		final var actor = getClient().getActiveChar();
+		if (actor == null) {
+			return;
+		}
+		
+		if (_link.isEmpty()) {
+			LOG.warn("Player {} sent empty html link!", actor.getName());
+			return;
+		}
+		
+		if (_link.contains("..")) {
+			LOG.warn("Player {} sent invalid html link: link {}", actor.getName(), _link);
+			return;
+		}
+		
+		int htmlObjectId = actor.validateHtmlAction("link " + _link);
+		if (htmlObjectId == -1) {
+			LOG.warn("Player {} sent non cached  html link: link {}", actor.getName(), _link);
+			return;
+		}
+		
+		if ((htmlObjectId > 0) && !Util.isInsideRangeOfObjectId(actor, htmlObjectId, INTERACTION_DISTANCE)) {
+			// No logging here, this could be a common case
+			return;
+		}
+		
+		final var filename = "data/html/" + _link;
+		final var msg = new NpcHtmlMessage(htmlObjectId);
+		msg.setFile(actor.getHtmlPrefix(), filename);
+		msg.replace("%objectId%", String.valueOf(htmlObjectId));
+		sendPacket(msg);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__22_REQUESTLINKHTML;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
new file mode 100644
index 00000000..52a4b7aa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import com.l2jserver.gameserver.network.serverpackets.ExListPartyMatchingWaitingRoom;
+
+/**
+ * RequestListPartyMatchingWaitingRoom client packet.
+ * @author Zoey76
+ */
+public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket {
+	
+	private static final String _C__D0_31_REQUESTLISTPARTYMATCHINGWAITINGROOM = "[C] D0:31 RequestListPartyMatchingWaitingRoom";
+	
+	private int page;
+	
+	private int minLevel;
+	
+	private int maxLevel;
+	
+	private Set<Integer> classes;
+	
+	private String filter;
+	
+	@Override
+	protected void readImpl() {
+		page = readD();
+		minLevel = readD();
+		maxLevel = readD();
+		final var size = readD();
+		classes = new HashSet<>(size);
+		for (int i = 0; i < size; i++) {
+			classes.add(readD());
+		}
+		filter = hasRemaining() ? readS() : "";
+	}
+	
+	@Override
+	protected void runImpl() {
+		final var player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		player.sendPacket(new ExListPartyMatchingWaitingRoom(page, minLevel, maxLevel, classes, filter));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_31_REQUESTLISTPARTYMATCHINGWAITINGROOM;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java
new file mode 100644
index 00000000..7b5beafb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public final class RequestMagicSkillUse extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestMagicSkillUse.class);
+	
+	private static final String _C__39_REQUESTMAGICSKILLUSE = "[C] 39 RequestMagicSkillUse";
+	
+	private int _magicId;
+	private boolean _ctrlPressed;
+	private boolean _shiftPressed;
+	
+	@Override
+	protected void readImpl() {
+		_magicId = readD(); // Identifier of the used skill
+		_ctrlPressed = readD() != 0; // True if it's a ForceAttack : Ctrl pressed
+		_shiftPressed = readC() != 0; // True if Shift pressed
+	}
+	
+	@Override
+	protected void runImpl() {
+		// Get the current L2PcInstance of the player
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.isDead()) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.isFakeDeath()) {
+			activeChar.sendPacket(SystemMessageId.CANT_MOVE_SITTING);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Get the level of the used skill
+		Skill skill = activeChar.getKnownSkill(_magicId);
+		if (skill == null) {
+			// Player doesn't know this skill, maybe it's the display Id.
+			skill = activeChar.getCustomSkill(_magicId);
+			if (skill == null) {
+				skill = activeChar.getTransformSkill(_magicId);
+				if (skill == null) {
+					activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+					LOG.warn("Skill Id {} not found in player : {}", _magicId, activeChar);
+					return;
+				}
+			}
+		}
+		
+		// Avoid Use of Skills in AirShip.
+		if (activeChar.isPlayable() && activeChar.isInAirShip()) {
+			activeChar.sendPacket(SystemMessageId.ACTION_PROHIBITED_WHILE_MOUNTED_OR_ON_AN_AIRSHIP);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if ((activeChar.isTransformed() || activeChar.isInStance()) && !activeChar.hasTransformSkill(skill.getId())) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// If Alternate rule Karma punishment is set to true, forbid skill Return to player with Karma
+		if (!character().karmaPlayerCanTeleport() && (activeChar.getKarma() > 0) && skill.hasEffectType(L2EffectType.TELEPORT)) {
+			return;
+		}
+		
+		// players mounted on pets cannot use any toggle skills
+		if (skill.isToggle() && activeChar.isMounted()) {
+			return;
+		}
+		
+		// Stop if use self-buff (except if on AirShip or Boat).
+		if ((skill.isContinuous() && !skill.isDebuff() && (skill.getTargetType() == TargetType.SELF)) && (!activeChar.isInAirShip() || !activeChar.isInBoat())) {
+			activeChar.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, activeChar.getLocation());
+		}
+		
+		activeChar.useMagic(skill, _ctrlPressed, _shiftPressed);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__39_REQUESTMAGICSKILLUSE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java
new file mode 100644
index 00000000..bfa7452c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMakeMacro.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.MacroType;
+import com.l2jserver.gameserver.model.Macro;
+import com.l2jserver.gameserver.model.MacroCmd;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public final class RequestMakeMacro extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestMakeMacro.class);
+	
+	private static final String _C__CD_REQUESTMAKEMACRO = "[C] CD RequestMakeMacro";
+	
+	private Macro _macro;
+	private int _commandsLength = 0;
+	
+	private static final int MAX_MACRO_LENGTH = 12;
+	
+	@Override
+	protected void readImpl() {
+		int _id = readD();
+		String _name = readS();
+		String _desc = readS();
+		String _acronym = readS();
+		int _icon = readC();
+		int _count = readC();
+		if (_count > MAX_MACRO_LENGTH) {
+			_count = MAX_MACRO_LENGTH;
+		}
+		
+		if (general().debug()) {
+			LOG.info("Make macro id: {}\tname: {}\tdesc: {}\tacronym: {}\ticon: {}\tcount: {}", _id, _name, _desc, _acronym, _icon, _count);
+		}
+		
+		final List<MacroCmd> commands = new ArrayList<>(_count);
+		for (int i = 0; i < _count; i++) {
+			int entry = readC();
+			int type = readC(); // 1 = skill, 3 = action, 4 = shortcut
+			int d1 = readD(); // skill or page number for shortcuts
+			int d2 = readC();
+			String command = readS();
+			_commandsLength += command.length();
+			commands.add(new MacroCmd(entry, MacroType.values()[(type < 1) || (type > 6) ? 0 : type], d1, d2, command));
+		}
+		_macro = new Macro(_id, _icon, _name, _desc, _acronym, commands);
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		if (_commandsLength > 255) {
+			// Invalid macro. Refer to the Help file for instructions.
+			player.sendPacket(SystemMessageId.INVALID_MACRO);
+			return;
+		}
+		if (player.getMacros().getAllMacros().size() > 48) {
+			// You may create up to 48 macros.
+			player.sendPacket(SystemMessageId.YOU_MAY_CREATE_UP_TO_48_MACROS);
+			return;
+		}
+		if (_macro.getName().isEmpty()) {
+			// Enter the name of the macro.
+			player.sendPacket(SystemMessageId.ENTER_THE_MACRO_NAME);
+			return;
+		}
+		if (_macro.getDescr().length() > 32) {
+			// Macro descriptions may contain up to 32 characters.
+			player.sendPacket(SystemMessageId.MACRO_DESCRIPTION_MAX_32_CHARS);
+			return;
+		}
+		player.registerMacro(_macro);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__CD_REQUESTMAKEMACRO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java
new file mode 100644
index 00000000..6541489a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestManorList.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.ExSendManorList;
+
+/**
+ * @author l3x
+ */
+public class RequestManorList extends L2GameClientPacket {
+	@Override
+	protected void readImpl() {
+	}
+	
+	@Override
+	protected void runImpl() {
+		sendPacket(new ExSendManorList());
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] D0:01 RequestManorList";
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
new file mode 100644
index 00000000..aac59412
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestModifyBookMarkSlot.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author ShanSoft
+ * @structure chddSdS
+ */
+public final class RequestModifyBookMarkSlot extends L2GameClientPacket {
+	private static final String _C__D0_51_02_REQUESTMODIFYBOOKMARKSLOT = "[C] D0:51:02 RequestModifyBookMarkSlot";
+	
+	private int id, icon;
+	private String name, tag;
+	
+	@Override
+	protected void readImpl() {
+		id = readD();
+		name = readS();
+		icon = readD();
+		tag = readS();
+		
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		activeChar.teleportBookmarkModify(id, icon, tag, name);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_51_02_REQUESTMODIFYBOOKMARKSLOT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
new file mode 100644
index 00000000..ffc4734b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestMoveToLocationInVehicle.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.instancemanager.BoatManager;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.MoveToLocationInVehicle;
+import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
+
+public final class RequestMoveToLocationInVehicle extends L2GameClientPacket {
+	private static final String _C__75_MOVETOLOCATIONINVEHICLE = "[C] 75 RequestMoveToLocationInVehicle";
+	
+	private int _boatId;
+	private int _targetX;
+	private int _targetY;
+	private int _targetZ;
+	private int _originX;
+	private int _originY;
+	private int _originZ;
+	
+	@Override
+	protected void readImpl() {
+		_boatId = readD(); // objectId of boat
+		_targetX = readD();
+		_targetY = readD();
+		_targetZ = readD();
+		_originX = readD();
+		_originY = readD();
+		_originZ = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((character().getNpcTalkBlockingTime() > 0) && !activeChar.isGM() && (activeChar.getNotMoveUntil() > System.currentTimeMillis())) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_MOVE_WHILE_SPEAKING_TO_AN_NPC);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if ((_targetX == _originX) && (_targetY == _originY) && (_targetZ == _originZ)) {
+			activeChar.sendPacket(new StopMoveInVehicle(activeChar, _boatId));
+			return;
+		}
+		
+		if (activeChar.isAttackingNow() && (activeChar.getActiveWeaponItem() != null) && (activeChar.getActiveWeaponItem().getItemType() == WeaponType.BOW)) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.isSitting() || activeChar.isMovementDisabled()) {
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.hasSummon()) {
+			activeChar.sendPacket(SystemMessageId.RELEASE_PET_ON_BOAT);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (activeChar.isTransformed()) {
+			activeChar.sendPacket(SystemMessageId.CANT_POLYMORPH_ON_BOAT);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final L2BoatInstance boat;
+		if (activeChar.isInBoat()) {
+			boat = activeChar.getBoat();
+			if (boat.getObjectId() != _boatId) {
+				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		} else {
+			boat = BoatManager.getInstance().getBoat(_boatId);
+			if ((boat == null) || !boat.isInsideRadius(activeChar, 300, true, false)) {
+				activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			activeChar.setVehicle(boat);
+		}
+		
+		final Location pos = new Location(_targetX, _targetY, _targetZ);
+		final Location originPos = new Location(_originX, _originY, _originZ);
+		activeChar.setInVehiclePosition(pos);
+		activeChar.broadcastPacket(new MoveToLocationInVehicle(activeChar, pos, originPos));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__75_MOVETOLOCATIONINVEHICLE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java
new file mode 100644
index 00000000..7751f5ff
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadMatchList.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.handler.BypassHandler;
+import com.l2jserver.gameserver.handler.IBypassHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * format ch c: (id) 0xD0 h: (subid) 0x13
+ * @author -Wooden-
+ */
+public final class RequestOlympiadMatchList extends L2GameClientPacket {
+	private static final String _C__D0_2E_REQUESTOLYMPIADMATCHLIST = "[C] D0:2E RequestOlympiadMatchList";
+	private static final String COMMAND = "arenalist";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !activeChar.inObserverMode()) {
+			return;
+		}
+		
+		IBypassHandler handler = BypassHandler.getInstance().getHandler(COMMAND);
+		if (handler != null) {
+			handler.useBypass(COMMAND, activeChar, null);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_2E_REQUESTOLYMPIADMATCHLIST;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
new file mode 100644
index 00000000..1eea2ef1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOlympiadObserverEnd.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * format ch c: (id) 0xD0 h: (subid) 0x12
+ * @author -Wooden-
+ */
+public final class RequestOlympiadObserverEnd extends L2GameClientPacket {
+	private static final String _C__D0_29_REQUESTOLYMPIADOBSERVEREND = "[C] D0:29 RequestOlympiadObserverEnd";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.inObserverMode()) {
+			activeChar.leaveOlympiadObserverMode();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_29_REQUESTOLYMPIADOBSERVEREND;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
new file mode 100644
index 00000000..68d33970
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExClosePartyRoom;
+import com.l2jserver.gameserver.network.serverpackets.ListPartyWaiting;
+
+/**
+ * format (ch) d
+ * @author -Wooden-
+ */
+public final class RequestOustFromPartyRoom extends L2GameClientPacket {
+	private static final String _C__D0_09_REQUESTOUSTFROMPARTYROOM = "[C] D0:09 RequestOustFromPartyRoom";
+	
+	private int _charid;
+	
+	@Override
+	protected void readImpl() {
+		_charid = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2PcInstance member = L2World.getInstance().getPlayer(_charid);
+		if (member == null) {
+			return;
+		}
+		
+		PartyMatchRoom room = PartyMatchRoomList.getInstance().getPlayerRoom(member);
+		if ((room == null) || (room.getOwner() != player)) {
+			return;
+		}
+		
+		if (player.isInParty() && member.isInParty() && (player.getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())) {
+			player.sendPacket(SystemMessageId.CANNOT_DISMISS_PARTY_MEMBER);
+		} else {
+			// Remove member from party room
+			room.deleteMember(member);
+			member.setPartyRoom(0);
+			
+			// Close the PartyRoom window
+			member.sendPacket(new ExClosePartyRoom());
+			
+			// Add player back on waiting list
+			PartyMatchWaitingList.getInstance().addPlayer(member);
+			
+			// Send Room list
+			int loc = 0; // TODO: Closes town
+			member.sendPacket(new ListPartyWaiting(member, 0, loc, member.getLevel()));
+			
+			// Clean player's LFP title
+			member.broadcastUserInfo();
+			member.sendPacket(SystemMessageId.OUSTED_FROM_PARTY_ROOM);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_09_REQUESTOUSTFROMPARTYROOM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java
new file mode 100644
index 00000000..0a371391
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPartyMember.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Party.messageType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestOustPartyMember extends L2GameClientPacket {
+	private static final String _C__45_REQUESTOUSTPARTYMEMBER = "[C] 45 RequestOustPartyMember";
+	
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.isInParty() && activeChar.getParty().isLeader(activeChar)) {
+			activeChar.getParty().removePartyMember(_name, messageType.Expelled);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__45_REQUESTOUSTPARTYMEMBER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java
new file mode 100644
index 00000000..57d6d300
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestOustPledgeMember.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListDelete;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Request Oust Pledge Member client packet.
+ * @author JIV
+ * @author MELERIX
+ * @author Zoey76
+ * @author UnAfraid
+ * @author Kita
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestOustPledgeMember extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestOustPledgeMember.class);
+	
+	private static final String _C__29_REQUESTOUSTPLEDGEMEMBER = "[C] 29 RequestOustPledgeMember";
+	
+	private String _target;
+	
+	@Override
+	protected void readImpl() {
+		_target = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.getClan() == null) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER);
+			return;
+		}
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_DISMISS)) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		if (activeChar.getName().equalsIgnoreCase(_target)) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_DISMISS_YOURSELF);
+			return;
+		}
+		
+		L2Clan clan = activeChar.getClan();
+		
+		L2ClanMember member = clan.getClanMember(_target);
+		if (member == null) {
+			LOG.warn("Target ({}) is not member of the clan", _target);
+			return;
+		}
+		if (member.isOnline() && member.getPlayerInstance().isInCombat()) {
+			activeChar.sendPacket(SystemMessageId.CLAN_MEMBER_CANNOT_BE_DISMISSED_DURING_COMBAT);
+			return;
+		}
+		
+		// this also updates the database
+		clan.removeClanMember(member.getObjectId(), System.currentTimeMillis() + character().getDaysBeforeJoinAClan());
+		clan.setCharPenaltyExpiryTime(System.currentTimeMillis() + character().getDaysBeforeJoinAClan());
+		clan.updateClanInDB();
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_S1_EXPELLED);
+		sm.addString(member.getName());
+		clan.broadcastToOnlineMembers(sm);
+		activeChar.sendPacket(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_EXPELLING_CLAN_MEMBER);
+		activeChar.sendPacket(SystemMessageId.YOU_MUST_WAIT_BEFORE_ACCEPTING_A_NEW_MEMBER);
+		
+		// Remove the Player From the Member list
+		clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(_target));
+		
+		if (member.isOnline()) {
+			L2PcInstance player = member.getPlayerInstance();
+			player.sendPacket(SystemMessageId.CLAN_MEMBERSHIP_TERMINATED);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__29_REQUESTOUSTPLEDGEMEMBER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPCCafeCouponUse.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
new file mode 100644
index 00000000..8e05ab06
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Format: (ch) S
+ * @author -Wooden-
+ */
+public final class RequestPCCafeCouponUse extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPCCafeCouponUse.class);
+	
+	private static final String _C__D0_19_REQUESTPCCAFECOUPONUSE = "[C] D0:19 RequestPCCafeCouponUse";
+	private String _str;
+	
+	// TODO: GodKratos: This packet is wrong in Gracia Final!
+	
+	@Override
+	protected void readImpl() {
+		_str = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		LOG.info("C5: RequestPCCafeCouponUse: S: {}", _str);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_19_REQUESTPCCAFECOUPONUSE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPVPMatchRecord.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPVPMatchRecord.java
new file mode 100644
index 00000000..8b7c7c31
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPVPMatchRecord.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+/**
+ * @author KenM
+ */
+public class RequestPVPMatchRecord extends L2GameClientPacket {
+	private static final String _C__D0_49_REQUESTPVPMATCHRECORD = "[C] D0:49 RequestPVPMatchRecord";
+	
+	@Override
+	protected void readImpl() {
+		// trigger, no data
+	}
+	
+	@Override
+	protected void runImpl() {
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_49_REQUESTPVPMATCHRECORD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java
new file mode 100644
index 00000000..5cfffcfe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSend.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.itemcontainer.PcFreight;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author -Wooden-
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class RequestPackageSend extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPackageSend.class);
+	
+	private static final String _C_A8_REQUESTPACKAGESEND = "[C] A8 RequestPackageSend";
+	private static final int BATCH_LENGTH = 12; // length of the one item
+	
+	private ItemHolder[] _items = null;
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		
+		int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ItemHolder[count];
+		for (int i = 0; i < count; i++) {
+			int objId = readD();
+			long cnt = readQ();
+			if ((objId < 1) || (cnt < 0)) {
+				_items = null;
+				return;
+			}
+			
+			_items[i] = new ItemHolder(objId, cnt);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if ((_items == null) || (player == null) || !player.getAccountChars().containsKey(_objectId)) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("deposit")) {
+			player.sendMessage("You depositing items too fast.");
+			return;
+		}
+		
+		final L2Npc manager = player.getLastFolkNPC();
+		if (((manager == null) || !player.isInsideRadius(manager, L2Npc.INTERACTION_DISTANCE, false, false))) {
+			return;
+		}
+		
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!");
+			return;
+		}
+		
+		// get current tradelist if any
+		if (player.getActiveTradeList() != null) {
+			return;
+		}
+		
+		// Karma punishment
+		if (!character().karmaPlayerCanUseWareHouse() && (player.getKarma() > 0)) {
+			return;
+		}
+		
+		// Freight price from config per item slot.
+		final int fee = _items.length * character().getFreightPrice();
+		long currentAdena = player.getAdena();
+		int slots = 0;
+		
+		final ItemContainer warehouse = new PcFreight(_objectId);
+		for (ItemHolder i : _items) {
+			// Check validity of requested item
+			final L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "freight");
+			if (item == null) {
+				LOG.warn("Error depositing a warehouse object for char {} (validity check)", player.getName());
+				warehouse.deleteMe();
+				return;
+			} else if (!item.isFreightable()) {
+				warehouse.deleteMe();
+				return;
+			}
+			
+			// Calculate needed adena and slots
+			if (item.getId() == Inventory.ADENA_ID) {
+				currentAdena -= i.getCount();
+			} else if (!item.isStackable()) {
+				slots += i.getCount();
+			} else if (warehouse.getItemByItemId(item.getId()) == null) {
+				slots++;
+			}
+		}
+		
+		// Item Max Limit Check
+		if (!warehouse.validateCapacity(slots)) {
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED);
+			warehouse.deleteMe();
+			return;
+		}
+		
+		// Check if enough adena and charge the fee
+		if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false)) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			warehouse.deleteMe();
+			return;
+		}
+		
+		// Proceed to the transfer
+		final InventoryUpdate playerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+		for (ItemHolder i : _items) {
+			// Check validity of requested item
+			final L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			if (oldItem == null) {
+				LOG.warn("Error depositing a warehouse object for char {} (olditem == null)", player.getName());
+				warehouse.deleteMe();
+				return;
+			}
+			
+			final L2ItemInstance newItem = player.getInventory().transferItem("Trade", i.getId(), i.getCount(), warehouse, player, null);
+			if (newItem == null) {
+				LOG.warn("Error depositing a warehouse object for char {} (newitem == null)", player.getName());
+				continue;
+			}
+			
+			if (playerIU != null) {
+				if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+					playerIU.addModifiedItem(oldItem);
+				} else {
+					playerIU.addRemovedItem(oldItem);
+				}
+			}
+		}
+		
+		warehouse.deleteMe();
+		
+		// Send updated item list to the player
+		sendPacket(playerIU != null ? playerIU : new ItemList(player, false));
+		
+		// Update current load status on player
+		final StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		sendPacket(su);
+	}
+	
+	@Override
+	public String getType() {
+		return _C_A8_REQUESTPACKAGESEND;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java
new file mode 100644
index 00000000..f43921b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPackageSendableItemList.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.PackageSendableList;
+
+/**
+ * @author -Wooden-
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class RequestPackageSendableItemList extends L2GameClientPacket {
+	
+	private static final String _C_A7_REQUESTPACKAGESENDABLEITEMLIST = "[C] A7 RequestPackageSendableItemList";
+	private int _objectID;
+	
+	@Override
+	protected void readImpl() {
+		_objectID = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		L2ItemInstance[] items = getClient().getActiveChar().getInventory().getAvailableItems(true, true, true);
+		sendPacket(new PackageSendableList(items, _objectID));
+	}
+	
+	@Override
+	public String getType() {
+		return _C_A7_REQUESTPACKAGESENDABLEITEMLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyLootModification.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyLootModification.java
new file mode 100644
index 00000000..68bc1d16
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyLootModification.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author JIV
+ */
+public class RequestPartyLootModification extends L2GameClientPacket {
+	private static final String _C__D0_78_REQUESTPARTYLOOTMODIFICATION = "[C] D0:78 RequestPartyLootModification";
+	
+	private int _partyDistributionTypeId;
+	
+	@Override
+	protected void readImpl() {
+		_partyDistributionTypeId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final PartyDistributionType partyDistributionType = PartyDistributionType.findById(_partyDistributionTypeId);
+		if (partyDistributionType == null) {
+			return;
+		}
+		
+		final L2Party party = activeChar.getParty();
+		if ((party == null) || !party.isLeader(activeChar) || (partyDistributionType == party.getDistributionType())) {
+			return;
+		}
+		party.requestLootChange(partyDistributionType);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_78_REQUESTPARTYLOOTMODIFICATION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java
new file mode 100644
index 00000000..bde073ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchConfig.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.ListPartyWaiting;
+import com.l2jserver.gameserver.network.serverpackets.PartyMatchDetail;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPartyMatchConfig extends L2GameClientPacket {
+	private static final String _C__7F_REQUESTPARTYMATCHCONFIG = "[C] 7F RequestPartyMatchConfig";
+	
+	private int _auto, _loc, _lvl;
+	
+	@Override
+	protected void readImpl() {
+		_auto = readD(); //
+		_loc = readD(); // Location
+		_lvl = readD(); // my level
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance _activeChar = getClient().getActiveChar();
+		
+		if (_activeChar == null) {
+			return;
+		}
+		
+		if (!_activeChar.isInPartyMatchRoom() && (_activeChar.getParty() != null) && (_activeChar.getParty().getLeader() != _activeChar)) {
+			_activeChar.sendPacket(SystemMessageId.CANT_VIEW_PARTY_ROOMS);
+			_activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (_activeChar.isInPartyMatchRoom()) {
+			// If Player is in Room show him room, not list
+			PartyMatchRoomList _list = PartyMatchRoomList.getInstance();
+			if (_list == null) {
+				return;
+			}
+			
+			PartyMatchRoom _room = _list.getPlayerRoom(_activeChar);
+			if (_room == null) {
+				return;
+			}
+			
+			_activeChar.sendPacket(new PartyMatchDetail(_activeChar, _room));
+			_activeChar.sendPacket(new ExPartyRoomMember(_activeChar, _room, 2));
+			
+			_activeChar.setPartyRoom(_room.getId());
+			// _activeChar.setPartyMatching(1);
+			_activeChar.broadcastUserInfo();
+		} else {
+			// Add to waiting list
+			PartyMatchWaitingList.getInstance().addPlayer(_activeChar);
+			
+			// Send Room list
+			_activeChar.sendPacket(new ListPartyWaiting(_activeChar, _auto, _loc, _lvl));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__7F_REQUESTPARTYMATCHCONFIG;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java
new file mode 100644
index 00000000..5553805a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchDetail.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExManagePartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.PartyMatchDetail;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Gnacik
+ */
+public final class RequestPartyMatchDetail extends L2GameClientPacket {
+	private static final String _C__81_REQUESTPARTYMATCHDETAIL = "[C] 81 RequestPartyMatchDetail";
+	
+	private int _roomid;
+	@SuppressWarnings("unused")
+	private int _unk1;
+	@SuppressWarnings("unused")
+	private int _unk2;
+	@SuppressWarnings("unused")
+	private int _unk3;
+	
+	@Override
+	protected void readImpl() {
+		_roomid = readD();
+		// If player click on Room all unk are 0
+		// If player click AutoJoin values are -1 1 1
+		_unk1 = readD();
+		_unk2 = readD();
+		_unk3 = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance _activeChar = getClient().getActiveChar();
+		if (_activeChar == null) {
+			return;
+		}
+		
+		PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
+		if (_room == null) {
+			return;
+		}
+		
+		if ((_activeChar.getLevel() >= _room.getMinLvl()) && (_activeChar.getLevel() <= _room.getMaxLvl())) {
+			// Remove from waiting list
+			PartyMatchWaitingList.getInstance().removePlayer(_activeChar);
+			
+			_activeChar.setPartyRoom(_roomid);
+			
+			_activeChar.sendPacket(new PartyMatchDetail(_activeChar, _room));
+			_activeChar.sendPacket(new ExPartyRoomMember(_activeChar, _room, 0));
+			
+			for (L2PcInstance _member : _room.getPartyMembers()) {
+				if (_member == null) {
+					continue;
+				}
+				
+				_member.sendPacket(new ExManagePartyRoomMember(_activeChar, _room, 0));
+				
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_ENTERED_PARTY_ROOM);
+				sm.addCharName(_activeChar);
+				_member.sendPacket(sm);
+			}
+			_room.addMember(_activeChar);
+			
+			// Info Broadcast
+			_activeChar.broadcastUserInfo();
+		} else {
+			_activeChar.sendPacket(SystemMessageId.CANT_ENTER_PARTY_ROOM);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__81_REQUESTPARTYMATCHDETAIL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java
new file mode 100644
index 00000000..0bf759c0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPartyMatchList.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.PartyMatchDetail;
+
+/**
+ * @author Gnacik
+ */
+public class RequestPartyMatchList extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPartyMatchList.class);
+	
+	private static final String _C__80_REQUESTPARTYMATCHLIST = "[C] 80 RequestPartyMatchList";
+	
+	private int _roomid;
+	private int _membersmax;
+	private int _lvlmin;
+	private int _lvlmax;
+	private int _loot;
+	private String _roomtitle;
+	
+	@Override
+	protected void readImpl() {
+		_roomid = readD();
+		_membersmax = readD();
+		_lvlmin = readD();
+		_lvlmax = readD();
+		_loot = readD();
+		_roomtitle = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance _activeChar = getClient().getActiveChar();
+		
+		if (_activeChar == null) {
+			return;
+		}
+		
+		if (_roomid > 0) {
+			PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
+			if (_room != null) {
+				LOG.info("PartyMatchRoom #{} changed by {}", _room.getId(), _activeChar.getName());
+				_room.setMaxMembers(_membersmax);
+				_room.setMinLvl(_lvlmin);
+				_room.setMaxLvl(_lvlmax);
+				_room.setLootType(_loot);
+				_room.setTitle(_roomtitle);
+				
+				for (L2PcInstance _member : _room.getPartyMembers()) {
+					if (_member == null) {
+						continue;
+					}
+					
+					_member.sendPacket(new PartyMatchDetail(_activeChar, _room));
+					_member.sendPacket(SystemMessageId.PARTY_ROOM_REVISED);
+				}
+			}
+		} else {
+			int _maxid = PartyMatchRoomList.getInstance().getMaxId();
+			
+			PartyMatchRoom _room = new PartyMatchRoom(_maxid, _roomtitle, _loot, _lvlmin, _lvlmax, _membersmax, _activeChar);
+			
+			LOG.info("PartyMatchRoom #{} created by {}", _maxid, _activeChar.getName());
+			// Remove from waiting list
+			PartyMatchWaitingList.getInstance().removePlayer(_activeChar);
+			
+			PartyMatchRoomList.getInstance().addPartyMatchRoom(_maxid, _room);
+			
+			if (_activeChar.isInParty()) {
+				for (L2PcInstance ptmember : _activeChar.getParty().getMembers()) {
+					if (ptmember == null) {
+						continue;
+					}
+					if (ptmember == _activeChar) {
+						continue;
+					}
+					
+					ptmember.setPartyRoom(_maxid);
+					// ptmember.setPartyMatching(1);
+					
+					_room.addMember(ptmember);
+				}
+			}
+			_activeChar.sendPacket(new PartyMatchDetail(_activeChar, _room));
+			_activeChar.sendPacket(new ExPartyRoomMember(_activeChar, _room, 1));
+			
+			_activeChar.sendPacket(SystemMessageId.PARTY_ROOM_CREATED);
+			
+			_activeChar.setPartyRoom(_maxid);
+			// _activeChar.setPartyMatching(1);
+			_activeChar.broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__80_REQUESTPARTYMATCHLIST;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java
new file mode 100644
index 00000000..4745e226
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetGetItem.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.instancemanager.MercTicketManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+public final class RequestPetGetItem extends L2GameClientPacket {
+	private static final String _C__98_REQUESTPETGETITEM = "[C] 98 RequestPetGetItem";
+	
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2World world = L2World.getInstance();
+		L2ItemInstance item = (L2ItemInstance) world.findObject(_objectId);
+		if ((item == null) || (getActiveChar() == null) || !getActiveChar().hasPet()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final int castleId = MercTicketManager.getInstance().getTicketCastleId(item.getId());
+		if (castleId > 0) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (FortSiegeManager.getInstance().isCombat(item.getId())) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final L2PetInstance pet = (L2PetInstance) getClient().getActiveChar().getSummon();
+		if (pet.isDead() || pet.isOutOfControl()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (pet.isUncontrollable()) {
+			sendPacket(SystemMessageId.WHEN_YOUR_PETS_HUNGER_GAUGE_IS_AT_0_YOU_CANNOT_USE_YOUR_PET);
+			return;
+		}
+		
+		pet.getAI().setIntention(CtrlIntention.AI_INTENTION_PICK_UP, item);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__98_REQUESTPETGETITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java
new file mode 100644
index 00000000..68712546
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.PetItemList;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class RequestPetUseItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPetUseItem.class);
+	
+	private static final String _C__8A_REQUESTPETUSEITEM = "[C] 8A RequestPetUseItem";
+	
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		// TODO: implement me properly
+		// readQ();
+		// readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !activeChar.hasPet()) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getUseItem().tryPerformAction("pet use item")) {
+			return;
+		}
+		
+		final L2PetInstance pet = (L2PetInstance) activeChar.getSummon();
+		final L2ItemInstance item = pet.getInventory().getItemByObjectId(_objectId);
+		if (item == null) {
+			return;
+		}
+		
+		if (!item.getItem().isForNpc()) {
+			activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
+			return;
+		}
+		
+		if (activeChar.isAlikeDead() || pet.isDead()) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+			sm.addItemName(item);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		// If the item has reuse time and it has not passed.
+		// Message from reuse delay must come from item.
+		final int reuseDelay = item.getReuseDelay();
+		if (reuseDelay > 0) {
+			final long reuse = pet.getItemRemainingReuseTime(item.getObjectId());
+			if (reuse > 0) {
+				return;
+			}
+		}
+		
+		if (!item.isEquipped() && !item.getItem().checkCondition(pet, pet, true)) {
+			return;
+		}
+		
+		useItem(pet, item, activeChar);
+	}
+	
+	private void useItem(L2PetInstance pet, L2ItemInstance item, L2PcInstance activeChar) {
+		if (item.isEquipable()) {
+			if (!item.getItem().isConditionAttached()) {
+				activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
+				return;
+			}
+			
+			if (item.isEquipped()) {
+				pet.getInventory().unEquipItemInSlot(item.getLocationSlot());
+			} else {
+				pet.getInventory().equipItem(item);
+			}
+			
+			activeChar.sendPacket(new PetItemList(pet.getInventory().getItems()));
+			pet.updateAndBroadcastStatus(1);
+		} else {
+			final IItemHandler handler = ItemHandler.getInstance().getHandler(item.getEtcItem());
+			if (handler != null) {
+				if (handler.useItem(pet, item, false)) {
+					final int reuseDelay = item.getReuseDelay();
+					if (reuseDelay > 0) {
+						activeChar.addTimeStampItem(item, reuseDelay);
+					}
+					pet.updateAndBroadcastStatus(1);
+				}
+			} else {
+				activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
+				LOG.warn("No item handler registered for itemId: {}", item.getId());
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8A_REQUESTPETUSEITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java
new file mode 100644
index 00000000..469e5d0d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.instancemanager.PetitionManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author -Wooden-
+ * @author TempyIncursion
+ */
+public final class RequestPetition extends L2GameClientPacket {
+	private static final String _C__89_RequestPetition = "[C] 89 RequestPetition";
+	
+	private String _content;
+	private int _type; // 1 = on : 0 = off;
+	
+	@Override
+	protected void readImpl() {
+		_content = readS();
+		_type = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!AdminData.getInstance().isGmOnline(false)) {
+			activeChar.sendPacket(SystemMessageId.NO_GM_PROVIDING_SERVICE_NOW);
+			return;
+		}
+		
+		if (!PetitionManager.getInstance().isPetitioningAllowed()) {
+			activeChar.sendPacket(SystemMessageId.GAME_CLIENT_UNABLE_TO_CONNECT_TO_PETITION_SERVER);
+			return;
+		}
+		
+		if (PetitionManager.getInstance().isPlayerPetitionPending(activeChar)) {
+			activeChar.sendPacket(SystemMessageId.ONLY_ONE_ACTIVE_PETITION_AT_TIME);
+			return;
+		}
+		
+		if (PetitionManager.getInstance().getPendingPetitionCount() == character().getMaxPetitionsPending()) {
+			activeChar.sendPacket(SystemMessageId.PETITION_SYSTEM_CURRENT_UNAVAILABLE);
+			return;
+		}
+		
+		int totalPetitions = PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar) + 1;
+		
+		if (totalPetitions > character().getMaxPetitionsPerPlayer()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_TODAY);
+			sm.addInt(totalPetitions);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		if (_content.length() > 255) {
+			activeChar.sendPacket(SystemMessageId.PETITION_MAX_CHARS_255);
+			return;
+		}
+		
+		int petitionId = PetitionManager.getInstance().submitPetition(activeChar, _content, _type);
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_ACCEPTED_RECENT_NO_S1);
+		sm.addInt(petitionId);
+		activeChar.sendPacket(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.SUBMITTED_YOU_S1_TH_PETITION_S2_LEFT);
+		sm.addInt(totalPetitions);
+		sm.addInt(character().getMaxPetitionsPerPlayer() - totalPetitions);
+		activeChar.sendPacket(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.S1_PETITION_ON_WAITING_LIST);
+		sm.addInt(PetitionManager.getInstance().getPendingPetitionCount());
+		activeChar.sendPacket(sm);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__89_RequestPetition;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java
new file mode 100644
index 00000000..7969c895
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionCancel.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.instancemanager.PetitionManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author -Wooden-
+ * @author TempyIncursion
+ */
+public final class RequestPetitionCancel extends L2GameClientPacket {
+	private static final String _C__8A_REQUEST_PETITIONCANCEL = "[C] 8A RequestPetitionCancel";
+	
+	// private int _unknown;
+	
+	@Override
+	protected void readImpl() {
+		// _unknown = readD(); This is pretty much a trigger packet.
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (PetitionManager.getInstance().isPlayerInConsultation(activeChar)) {
+			if (activeChar.isGM()) {
+				PetitionManager.getInstance().endActivePetition(activeChar);
+			} else {
+				activeChar.sendPacket(SystemMessageId.PETITION_UNDER_PROCESS);
+			}
+		} else {
+			if (PetitionManager.getInstance().isPlayerPetitionPending(activeChar)) {
+				if (PetitionManager.getInstance().cancelActivePetition(activeChar)) {
+					int numRemaining = character().getMaxPetitionsPerPlayer() - PetitionManager.getInstance().getPlayerTotalPetitionCount(activeChar);
+					
+					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_CANCELED_SUBMIT_S1_MORE_TODAY);
+					sm.addString(String.valueOf(numRemaining));
+					activeChar.sendPacket(sm);
+					
+					// Notify all GMs that the player's pending petition has been cancelled.
+					String msgContent = activeChar.getName() + " has canceled a pending petition.";
+					AdminData.getInstance().broadcastToGMs(new CreatureSay(activeChar.getObjectId(), Say2.HERO_VOICE, "Petition System", msgContent));
+				} else {
+					activeChar.sendPacket(SystemMessageId.FAILED_CANCEL_PETITION_TRY_LATER);
+				}
+			} else {
+				activeChar.sendPacket(SystemMessageId.PETITION_NOT_SUBMITTED);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__8A_REQUEST_PETITIONCANCEL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java
new file mode 100644
index 00000000..8ea5a7a4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPetitionFeedback.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Plim
+ */
+public class RequestPetitionFeedback extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPetitionFeedback.class);
+	
+	private static final String _C__C9_REQUESTPETITIONFEEDBACK = "[C] C9 RequestPetitionFeedback";
+	
+	private static final String INSERT_FEEDBACK = "INSERT INTO petition_feedback VALUES (?,?,?,?,?)";
+	
+	// cdds
+	// private int _unknown;
+	private int _rate; // 4=VeryGood, 3=Good, 2=Fair, 1=Poor, 0=VeryPoor
+	private String _message;
+	
+	@Override
+	protected void readImpl() {
+		// _unknown =
+		readD(); // unknown
+		_rate = readD();
+		_message = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		
+		if ((player == null) || (player.getLastPetitionGmName() == null)) {
+			return;
+		}
+		
+		if ((_rate > 4) || (_rate < 0)) {
+			return;
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement(INSERT_FEEDBACK)) {
+			statement.setString(1, player.getName());
+			statement.setString(2, player.getLastPetitionGmName());
+			statement.setInt(3, _rate);
+			statement.setString(4, _message);
+			statement.setLong(5, System.currentTimeMillis());
+			statement.execute();
+		} catch (Exception e) {
+			LOG.error("Error while saving petition feedback");
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C9_REQUESTPETITIONFEEDBACK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
new file mode 100644
index 00000000..cd497453
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.PledgeCrest;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPledgeCrest extends L2GameClientPacket {
+	private static final String _C__68_REQUESTPLEDGECREST = "[C] 68 RequestPledgeCrest";
+	
+	private int _crestId;
+	
+	@Override
+	protected void readImpl() {
+		_crestId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		sendPacket(new PledgeCrest(_crestId));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__68_REQUESTPLEDGECREST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
new file mode 100644
index 00000000..ca5a1b05
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeExtendedInfo.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+/**
+ * Format: (c) S S: pledge name?
+ * @author -Wooden-
+ */
+public class RequestPledgeExtendedInfo extends L2GameClientPacket {
+	private static final String _C__67_REQUESTPLEDGECREST = "[C] 67 RequestPledgeExtendedInfo";
+	
+	@SuppressWarnings("unused")
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// TODO: Implement
+	}
+	
+	@Override
+	public String getType() {
+		return _C__67_REQUESTPLEDGECREST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeInfo.java
new file mode 100644
index 00000000..523b80e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeInfo.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PledgeInfo;
+
+public final class RequestPledgeInfo extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPledgeInfo.class);
+	
+	private static final String _C__65_REQUESTPLEDGEINFO = "[C] 65 RequestPledgeInfo";
+	
+	private int _clanId;
+	
+	@Override
+	protected void readImpl() {
+		_clanId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (general().debug()) {
+			LOG.debug("Info for clan {} requested", _clanId);
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Clan clan = ClanTable.getInstance().getClan(_clanId);
+		if (clan == null) {
+			if (general().debug()) {
+				LOG.warn("Clan data for clanId {} is missing for player {}", _clanId, activeChar);
+			}
+			return; // we have no clan data ?!? should not happen
+		}
+		
+		activeChar.sendPacket(new PledgeInfo(clan));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__65_REQUESTPLEDGEINFO;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
new file mode 100644
index 00000000..0acbd17b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberInfo.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PledgeReceiveMemberInfo;
+
+/**
+ * Format: (ch) dS
+ * @author -Wooden-
+ */
+public final class RequestPledgeMemberInfo extends L2GameClientPacket {
+	private static final String _C__D0_16_REQUESTPLEDGEMEMBERINFO = "[C] D0:16 RequestPledgeMemberInfo";
+	@SuppressWarnings("unused")
+	private int _unk1;
+	private String _player;
+	
+	@Override
+	protected void readImpl() {
+		_unk1 = readD();
+		_player = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// LOG.info("C5: RequestPledgeMemberInfo d:"+_unk1);
+		// LOG.info("C5: RequestPledgeMemberInfo S:"+_player);
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		// do we need powers to do that??
+		L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		L2ClanMember member = clan.getClanMember(_player);
+		if (member == null) {
+			return;
+		}
+		activeChar.sendPacket(new PledgeReceiveMemberInfo(member));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_16_REQUESTPLEDGEMEMBERINFO;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java
new file mode 100644
index 00000000..f62b3ab8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberList.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListAll;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPledgeMemberList extends L2GameClientPacket {
+	private static final String _C__4D_REQUESTPLEDGEMEMBERLIST = "[C] 4D RequestPledgeMemberList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2Clan clan = activeChar.getClan();
+		if (clan != null) {
+			PledgeShowMemberListAll pm = new PledgeShowMemberListAll(clan, activeChar);
+			activeChar.sendPacket(pm);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__4D_REQUESTPLEDGEMEMBERLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
new file mode 100644
index 00000000..7676bda4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeMemberPowerInfo.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PledgeReceivePowerInfo;
+
+/**
+ * Format: (ch) dS
+ * @author -Wooden-
+ */
+public final class RequestPledgeMemberPowerInfo extends L2GameClientPacket {
+	private static final String _C__D0_14_REQUESTPLEDGEMEMBERPOWERINFO = "[C] D0:14 RequestPledgeMemberPowerInfo";
+	
+	@SuppressWarnings("unused")
+	private int _unk1;
+	private String _player;
+	
+	@Override
+	protected void readImpl() {
+		_unk1 = readD();
+		_player = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// LOG.info("C5: RequestPledgeMemberPowerInfo d:"+_unk1);
+		// LOG.info("C5: RequestPledgeMemberPowerInfo S:"+_player);
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		// do we need powers to do that??
+		L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		L2ClanMember member = clan.getClanMember(_player);
+		if (member == null) {
+			return;
+		}
+		activeChar.sendPacket(new PledgeReceivePowerInfo(member));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_14_REQUESTPLEDGEMEMBERPOWERINFO;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePower.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePower.java
new file mode 100644
index 00000000..081d708f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePower.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ManagePledgePower;
+
+public final class RequestPledgePower extends L2GameClientPacket {
+	private static final String _C__CC_REQUESTPLEDGEPOWER = "[C] CC RequestPledgePower";
+	
+	private int _rank;
+	private int _action;
+	private int _privs;
+	
+	@Override
+	protected void readImpl() {
+		_rank = readD();
+		_action = readD();
+		if (_action == 2) {
+			_privs = readD();
+		} else {
+			_privs = 0;
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_action == 2) {
+			if (player.isClanLeader()) {
+				if (_rank == 9) {
+					// The rights below cannot be bestowed upon Academy members:
+					// Join a clan or be dismissed
+					// Title management, crest management, master management, level management,
+					// bulletin board administration
+					// Clan war, right to dismiss, set functions
+					// Auction, manage taxes, attack/defend registration, mercenary management
+					// => Leaves only CP_CL_VIEW_WAREHOUSE, CP_CH_OPEN_DOOR, CP_CS_OPEN_DOOR?
+					_privs &= ClanPrivilege.CL_VIEW_WAREHOUSE.getBitmask() | ClanPrivilege.CH_OPEN_DOOR.getBitmask() | ClanPrivilege.CS_OPEN_DOOR.getBitmask();
+				}
+				player.getClan().setRankPrivs(_rank, _privs);
+			}
+		} else {
+			player.sendPacket(new ManagePledgePower(getClient().getActiveChar().getClan(), _action, _rank));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__CC_REQUESTPLEDGEPOWER;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePowerGradeList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
new file mode 100644
index 00000000..6f2d8039
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Clan.RankPrivs;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PledgePowerGradeList;
+
+/**
+ * Format: (ch)
+ * @author -Wooden-
+ */
+public final class RequestPledgePowerGradeList extends L2GameClientPacket {
+	private static final String _C__D0_13_REQUESTPLEDGEPOWERGRADELIST = "[C] D0:13 RequestPledgePowerGradeList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		L2Clan clan = player.getClan();
+		if (clan != null) {
+			RankPrivs[] privs = clan.getAllRankPrivs();
+			player.sendPacket(new PledgePowerGradeList(privs));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_13_REQUESTPLEDGEPOWERGRADELIST;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
new file mode 100644
index 00000000..da1e5cd4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Format: (ch) dSdS
+ * @author -Wooden-
+ */
+public final class RequestPledgeReorganizeMember extends L2GameClientPacket {
+	private static final String _C__D0_2C_REQUESTPLEDGEREORGANIZEMEMBER = "[C] D0:2C RequestPledgeReorganizeMember";
+	
+	private int _isMemberSelected;
+	private String _memberName;
+	private int _newPledgeType;
+	private String _selectedMember;
+	
+	@Override
+	protected void readImpl() {
+		_isMemberSelected = readD();
+		_memberName = readS();
+		_newPledgeType = readD();
+		_selectedMember = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_isMemberSelected == 0) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_MANAGE_RANKS)) {
+			return;
+		}
+		
+		final L2ClanMember member1 = clan.getClanMember(_memberName);
+		if ((member1 == null) || (member1.getObjectId() == clan.getLeaderId())) {
+			return;
+		}
+		
+		final L2ClanMember member2 = clan.getClanMember(_selectedMember);
+		if ((member2 == null) || (member2.getObjectId() == clan.getLeaderId())) {
+			return;
+		}
+		
+		final int oldPledgeType = member1.getPledgeType();
+		if (oldPledgeType == _newPledgeType) {
+			return;
+		}
+		
+		member1.setPledgeType(_newPledgeType);
+		member2.setPledgeType(oldPledgeType);
+		clan.broadcastClanStatus();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_2C_REQUESTPLEDGEREORGANIZEMEMBER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
new file mode 100644
index 00000000..c8a79095
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetAcademyMaster.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * Format: (ch) dSS
+ * @author -Wooden-
+ */
+public final class RequestPledgeSetAcademyMaster extends L2GameClientPacket {
+	private static final String _C__D0_12_REQUESTSETPLEADGEACADEMYMASTER = "[C] D0:12 RequestPledgeSetAcademyMaster";
+	
+	private String _currPlayerName;
+	private int _set; // 1 set, 0 delete
+	private String _targetPlayerName;
+	
+	@Override
+	protected void readImpl() {
+		_set = readD();
+		_currPlayerName = readS();
+		_targetPlayerName = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_APPRENTICE)) {
+			activeChar.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_THE_RIGHT_TO_DISMISS_AN_APPRENTICE);
+			return;
+		}
+		
+		L2ClanMember currentMember = clan.getClanMember(_currPlayerName);
+		L2ClanMember targetMember = clan.getClanMember(_targetPlayerName);
+		if ((currentMember == null) || (targetMember == null)) {
+			return;
+		}
+		
+		L2ClanMember apprenticeMember, sponsorMember;
+		if (currentMember.getPledgeType() == L2Clan.SUBUNIT_ACADEMY) {
+			apprenticeMember = currentMember;
+			sponsorMember = targetMember;
+		} else {
+			apprenticeMember = targetMember;
+			sponsorMember = currentMember;
+		}
+		
+		L2PcInstance apprentice = apprenticeMember.getPlayerInstance();
+		L2PcInstance sponsor = sponsorMember.getPlayerInstance();
+		
+		SystemMessage sm;
+		if (_set == 0) {
+			// test: do we get the current sponsor & apprentice from this packet or no?
+			if (apprentice != null) {
+				apprentice.setSponsor(0);
+			} else {
+				apprenticeMember.setApprenticeAndSponsor(0, 0);
+			}
+			
+			if (sponsor != null) {
+				sponsor.setApprentice(0);
+			} else {
+				sponsorMember.setApprenticeAndSponsor(0, 0);
+			}
+			
+			apprenticeMember.saveApprenticeAndSponsor(0, 0);
+			sponsorMember.saveApprenticeAndSponsor(0, 0);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CLAN_MEMBER_C1_APPRENTICE_HAS_BEEN_REMOVED);
+		} else {
+			if ((apprenticeMember.getSponsor() != 0) || (sponsorMember.getApprentice() != 0) || (apprenticeMember.getApprentice() != 0) || (sponsorMember.getSponsor() != 0)) {
+				// TODO retail message
+				activeChar.sendMessage("Remove previous connections first.");
+				return;
+			}
+			if (apprentice != null) {
+				apprentice.setSponsor(sponsorMember.getObjectId());
+			} else {
+				apprenticeMember.setApprenticeAndSponsor(0, sponsorMember.getObjectId());
+			}
+			
+			if (sponsor != null) {
+				sponsor.setApprentice(apprenticeMember.getObjectId());
+			} else {
+				sponsorMember.setApprenticeAndSponsor(apprenticeMember.getObjectId(), 0);
+			}
+			
+			// saving to database even if online, since both must match
+			apprenticeMember.saveApprenticeAndSponsor(0, sponsorMember.getObjectId());
+			sponsorMember.saveApprenticeAndSponsor(apprenticeMember.getObjectId(), 0);
+			
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HAS_BEEN_DESIGNATED_AS_APPRENTICE_OF_CLAN_MEMBER_S1);
+		}
+		sm.addString(sponsorMember.getName());
+		sm.addString(apprenticeMember.getName());
+		if ((sponsor != activeChar) && (sponsor != apprentice)) {
+			activeChar.sendPacket(sm);
+		}
+		if (sponsor != null) {
+			sponsor.sendPacket(sm);
+		}
+		if (apprentice != null) {
+			apprentice.sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_12_REQUESTSETPLEADGEACADEMYMASTER;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
new file mode 100644
index 00000000..ed21d2fe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeSetMemberPowerGrade.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Format: (ch) Sd
+ * @author -Wooden-
+ */
+public final class RequestPledgeSetMemberPowerGrade extends L2GameClientPacket {
+	private static final String _C__D0_15_REQUESTPLEDGESETMEMBERPOWERGRADE = "[C] D0:15 RequestPledgeSetMemberPowerGrade";
+	private String _member;
+	private int _powerGrade;
+	
+	@Override
+	protected void readImpl() {
+		_member = readS();
+		_powerGrade = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_MANAGE_RANKS)) {
+			return;
+		}
+		
+		final L2ClanMember member = clan.getClanMember(_member);
+		if (member == null) {
+			return;
+		}
+		
+		if (member.getObjectId() == clan.getLeaderId()) {
+			return;
+		}
+		
+		if (member.getPledgeType() == L2Clan.SUBUNIT_ACADEMY) {
+			// also checked from client side
+			activeChar.sendMessage("You cannot change academy member grade");
+			return;
+		}
+		
+		member.setPowerGrade(_powerGrade);
+		clan.broadcastClanStatus();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_15_REQUESTPLEDGESETMEMBERPOWERGRADE;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java
new file mode 100644
index 00000000..29e3e6a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeWarList.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PledgeReceiveWarList;
+
+/**
+ * Format: (ch) dd
+ * @author -Wooden-
+ */
+public final class RequestPledgeWarList extends L2GameClientPacket {
+	private static final String _C__D0_17_REQUESTPLEDGEWARLIST = "[C] D0:17 RequestPledgeWarList";
+	@SuppressWarnings("unused")
+	private int _unk1;
+	private int _tab;
+	
+	@Override
+	protected void readImpl() {
+		_unk1 = readD();
+		_tab = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		// LOG.info("C5: RequestPledgeWarList d:"+_unk1);
+		// LOG.info("C5: RequestPledgeWarList d:"+_tab);
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.getClan() == null) {
+			return;
+		}
+		
+		// do we need powers to do that??
+		activeChar.sendPacket(new PledgeReceiveWarList(activeChar.getClan(), _tab));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_17_REQUESTPLEDGEWARLIST;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java
new file mode 100644
index 00000000..254dbfbd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+
+import java.util.Objects;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestPostAttachment extends L2GameClientPacket {
+	private static final String _C__D0_6A_REQUESTPOSTATTACHMENT = "[C] D0:6A RequestPostAttachment";
+	
+	private int _msgId;
+	
+	@Override
+	protected void readImpl() {
+		_msgId = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		if (!general().allowMail() || !general().allowAttachments()) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("getattach")) {
+			return;
+		}
+		
+		if (!activeChar.getAccessLevel().allowTransaction()) {
+			activeChar.sendMessage("Transactions are disabled for your Access Level");
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE)) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_NOT_IN_PEACE_ZONE);
+			return;
+		}
+		
+		if (activeChar.getActiveTradeList() != null) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_DURING_EXCHANGE);
+			return;
+		}
+		
+		if (activeChar.isEnchanting()) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_DURING_ENCHANT);
+			return;
+		}
+		
+		if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_PRIVATE_STORE);
+			return;
+		}
+		
+		final Message msg = MailManager.getInstance().getMessage(_msgId);
+		if (msg == null) {
+			return;
+		}
+		
+		if (msg.getReceiverId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get not own attachment!");
+			return;
+		}
+		
+		if (!msg.hasAttachments()) {
+			return;
+		}
+		
+		final ItemContainer attachments = msg.getAttachments();
+		if (attachments == null) {
+			return;
+		}
+		
+		int weight = 0;
+		int slots = 0;
+		
+		for (L2ItemInstance item : attachments.getItems()) {
+			if (item == null) {
+				continue;
+			}
+			
+			// Calculate needed slots
+			if (item.getOwnerId() != msg.getSenderId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get wrong item (ownerId != senderId) from attachment!");
+				return;
+			}
+			
+			if (item.getItemLocation() != ItemLocation.MAIL) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get wrong item (Location != MAIL) from attachment!");
+				return;
+			}
+			
+			if (item.getLocationSlot() != msg.getId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get items from different attachment!");
+				return;
+			}
+			
+			weight += item.getCount() * item.getItem().getWeight();
+			if (!item.isStackable()) {
+				slots += item.getCount();
+			} else if (activeChar.getInventory().getItemByItemId(item.getId()) == null) {
+				slots++;
+			}
+		}
+		
+		// Item Max Limit Check
+		if (!activeChar.getInventory().validateCapacity(slots)) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_INVENTORY_FULL);
+			return;
+		}
+		
+		// Weight limit Check
+		if (!activeChar.getInventory().validateWeight(weight)) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_INVENTORY_FULL);
+			return;
+		}
+		
+		long adena = msg.getReqAdena();
+		if ((adena > 0) && !activeChar.reduceAdena("PayMail", adena, null, true)) {
+			activeChar.sendPacket(SystemMessageId.CANT_RECEIVE_NO_ADENA);
+			return;
+		}
+		
+		// Proceed to the transfer
+		InventoryUpdate playerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+		for (L2ItemInstance item : attachments.getItems()) {
+			if (item == null) {
+				continue;
+			}
+			
+			if (item.getOwnerId() != msg.getSenderId()) {
+				Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to get items with owner != sender !");
+				return;
+			}
+			
+			long count = item.getCount();
+			final L2ItemInstance newItem = attachments.transferItem(attachments.getName(), item.getObjectId(), item.getCount(), activeChar.getInventory(), activeChar, null);
+			if (newItem == null) {
+				return;
+			}
+			
+			if (playerIU != null) {
+				if (newItem.getCount() > count) {
+					playerIU.addModifiedItem(newItem);
+				} else {
+					playerIU.addNewItem(newItem);
+				}
+			}
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_ACQUIRED_S2_S1);
+			sm.addItemName(item.getId());
+			sm.addLong(count);
+			activeChar.sendPacket(sm);
+		}
+		
+		// Send updated item list to the player
+		activeChar.sendPacket(Objects.requireNonNullElseGet(playerIU, () -> new ItemList(activeChar, false)));
+		
+		msg.removeAttachments();
+		
+		// Update current load status on player
+		StatusUpdate su = new StatusUpdate(activeChar);
+		su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
+		activeChar.sendPacket(su);
+		
+		SystemMessage sm;
+		final L2PcInstance sender = L2World.getInstance().getPlayer(msg.getSenderId());
+		if (adena > 0) {
+			if (sender != null) {
+				sender.addAdena("PayMail", adena, activeChar, false);
+				sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_OF_S1_ADENA_COMPLETED_BY_S2);
+				sm.addLong(adena);
+				sm.addCharName(activeChar);
+				sender.sendPacket(sm);
+			} else {
+				L2ItemInstance paidAdena = ItemTable.getInstance().createItem("PayMail", ADENA_ID, adena, activeChar, null);
+				paidAdena.setOwnerId(msg.getSenderId());
+				paidAdena.setItemLocation(ItemLocation.INVENTORY);
+				paidAdena.updateDatabase(true);
+				L2World.getInstance().removeObject(paidAdena);
+			}
+		} else if (sender != null) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ACQUIRED_ATTACHED_ITEM);
+			sm.addCharName(activeChar);
+			sender.sendPacket(sm);
+		}
+		
+		activeChar.sendPacket(new ExChangePostState(true, _msgId, Message.READED));
+		activeChar.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_RECEIVED);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_6A_REQUESTPOSTATTACHMENT;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPostItemList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPostItemList.java
new file mode 100644
index 00000000..d1206c7b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPostItemList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExReplyPostItemList;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestPostItemList extends L2GameClientPacket {
+	private static final String _C__D0_65_REQUESTPOSTITEMLIST = "[C] D0:65 RequestPostItemList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	public void runImpl() {
+		if (!general().allowMail() || !general().allowAttachments()) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE)) {
+			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+			return;
+		}
+		
+		activeChar.sendPacket(new ExReplyPostItemList(activeChar));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_65_REQUESTPOSTITEMLIST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java
new file mode 100644
index 00000000..56c6f115
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.buylist.Product;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.L2Armor;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.type.ArmorType;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ShopPreviewInfo;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ ** @author Gnacik
+ */
+public final class RequestPreviewItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPreviewItem.class);
+	
+	private static final String _C__C7_REQUESTPREVIEWITEM = "[C] C7 RequestPreviewItem";
+	
+	@SuppressWarnings("unused")
+	private int _unk;
+	private int _listId;
+	private int _count;
+	private int[] _items;
+	
+	private static class RemoveWearItemsTask implements Runnable {
+		private final L2PcInstance activeChar;
+		
+		protected RemoveWearItemsTask(L2PcInstance player) {
+			activeChar = player;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				activeChar.sendPacket(SystemMessageId.NO_LONGER_TRYING_ON);
+				activeChar.sendPacket(new UserInfo(activeChar));
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+	}
+	
+	@Override
+	protected void readImpl() {
+		_unk = readD();
+		_listId = readD();
+		_count = readD();
+		
+		if (_count < 0) {
+			_count = 0;
+		}
+		if (_count > 100) {
+			return; // prevent too long lists
+		}
+		
+		// Create _items table that will contain all ItemID to Wear
+		_items = new int[_count];
+		
+		// Fill _items table with all ItemID to Wear
+		for (int i = 0; i < _count; i++) {
+			_items[i] = readD();
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_items == null) {
+			return;
+		}
+		
+		// Get the current player and return if null
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("buy")) {
+			activeChar.sendMessage("You are buying too fast.");
+			return;
+		}
+		
+		// If Alternate rule Karma punishment is set to true, forbid Wear to player with Karma
+		if (!character().karmaPlayerCanShop() && (activeChar.getKarma() > 0)) {
+			return;
+		}
+		
+		// Check current target of the player and the INTERACTION_DISTANCE
+		final L2Object target = activeChar.getTarget();
+		if (!activeChar.isGM() && (!(target instanceof L2MerchantInstance) || //
+			!activeChar.isInsideRadius(target, L2Npc.INTERACTION_DISTANCE, false, false))) {
+			return;
+		}
+		
+		if ((_count < 1) || (_listId >= 4000000)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Get the current merchant targeted by the player
+		final L2MerchantInstance merchant = (target instanceof L2MerchantInstance) ? (L2MerchantInstance) target : null;
+		if (merchant == null) {
+			LOG.warn("Null merchant!");
+			return;
+		}
+		
+		final L2BuyList buyList = BuyListData.getInstance().getBuyList(_listId);
+		if (buyList == null) {
+			Util.handleIllegalPlayerAction(activeChar, "Warning!! Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " sent a false BuyList list_id " + _listId);
+			return;
+		}
+		
+		long totalPrice = 0;
+		Map<Integer, Integer> itemList = new HashMap<>();
+		
+		for (int i = 0; i < _count; i++) {
+			int itemId = _items[i];
+			
+			final Product product = buyList.getProductByItemId(itemId);
+			if (product == null) {
+				Util.handleIllegalPlayerAction(activeChar, "Warning!! Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " sent a false BuyList list_id " + _listId + " and item_id " + itemId);
+				return;
+			}
+			
+			L2Item template = product.getItem();
+			if (template == null) {
+				continue;
+			}
+			
+			int slot = Inventory.getPaperdollIndex(template.getBodyPart());
+			if (slot < 0) {
+				continue;
+			}
+			
+			if (template instanceof L2Weapon) {
+				if (activeChar.getRace().ordinal() == 5) {
+					if (template.getItemType() == WeaponType.NONE) {
+						continue;
+					} else if ((template.getItemType() == WeaponType.RAPIER) || (template.getItemType() == WeaponType.CROSSBOW) || (template.getItemType() == WeaponType.ANCIENTSWORD)) {
+						continue;
+					}
+				}
+			} else if (template instanceof L2Armor) {
+				if (activeChar.getRace().ordinal() == 5) {
+					if ((template.getItemType() == ArmorType.HEAVY) || (template.getItemType() == ArmorType.MAGIC)) {
+						continue;
+					}
+				}
+			}
+			
+			if (itemList.containsKey(slot)) {
+				activeChar.sendPacket(SystemMessageId.YOU_CAN_NOT_TRY_THOSE_ITEMS_ON_AT_THE_SAME_TIME);
+				return;
+			}
+			
+			itemList.put(slot, itemId);
+			totalPrice += general().getWearPrice();
+			if (totalPrice > character().getMaxAdena()) {
+				Util.handleIllegalPlayerAction(activeChar, "Warning!! Character " + activeChar.getName() + " of account " + activeChar.getAccountName() + " tried to purchase over " + character().getMaxAdena() + " adena worth of goods.");
+				return;
+			}
+		}
+		
+		// Charge buyer and add tax to castle treasury if not owned by npc clan because a Try On is not Free
+		if ((totalPrice < 0) || !activeChar.reduceAdena("Wear", totalPrice, activeChar.getLastFolkNPC(), true)) {
+			activeChar.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			return;
+		}
+		
+		if (!itemList.isEmpty()) {
+			activeChar.sendPacket(new ShopPreviewInfo(itemList));
+			// Schedule task
+			ThreadPoolManager.getInstance().scheduleGeneral(new RemoveWearItemsTask(activeChar), general().getWearDelay());
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C7_REQUESTPREVIEWITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
new file mode 100644
index 00000000..ef2ce6f3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.ItemRequest;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.util.Util;
+
+public final class RequestPrivateStoreBuy extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPrivateStoreBuy.class);
+	
+	private static final String _C__83_REQUESTPRIVATESTOREBUY = "[C] 83 RequestPrivateStoreBuy";
+	
+	private static final int BATCH_LENGTH = 20; // length of the one item
+	
+	private int _storePlayerId;
+	private Set<ItemRequest> _items = null;
+	
+	@Override
+	protected void readImpl() {
+		_storePlayerId = readD();
+		int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		_items = new HashSet<>();
+		
+		for (int i = 0; i < count; i++) {
+			int objectId = readD();
+			long cnt = readQ();
+			long price = readQ();
+			
+			if ((objectId < 1) || (cnt < 1) || (price < 0)) {
+				_items = null;
+				return;
+			}
+			
+			_items.add(new ItemRequest(objectId, cnt, price));
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_items == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("privatestorebuy")) {
+			player.sendMessage("You are buying items too fast.");
+			return;
+		}
+		
+		L2PcInstance storePlayer = L2World.getInstance().getPlayer(_storePlayerId);
+		if (storePlayer == null) {
+			return;
+		}
+		
+		if (player.isCursedWeaponEquipped()) {
+			return;
+		}
+		
+		if (!player.isInsideRadius(storePlayer, INTERACTION_DISTANCE, true, false)) {
+			return;
+		}
+		
+		if ((player.getInstanceId() != storePlayer.getInstanceId()) && (player.getInstanceId() != -1)) {
+			return;
+		}
+		
+		if (!((storePlayer.getPrivateStoreType() == PrivateStoreType.SELL) || (storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL))) {
+			return;
+		}
+		
+		TradeList storeList = storePlayer.getSellList();
+		if (storeList == null) {
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendMessage("Transactions are disabled for your Access Level.");
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (storePlayer.getPrivateStoreType() == PrivateStoreType.PACKAGE_SELL) {
+			if (storeList.getItemCount() > _items.size()) {
+				String msgErr = "[RequestPrivateStoreBuy] player " + getClient().getActiveChar().getName() + " tried to buy less items than sold by package-sell, ban this player for bot usage!";
+				Util.handleIllegalPlayerAction(getClient().getActiveChar(), msgErr);
+				return;
+			}
+		}
+		
+		int result = storeList.privateStoreBuy(player, _items);
+		if (result > 0) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			if (result > 1) {
+				LOG.warn("PrivateStore buy has failed due to invalid list or request. Player: {}, Private store of: {}", player.getName(), storePlayer.getName());
+			}
+			return;
+		}
+		
+		if (storeList.getItemCount() == 0) {
+			storePlayer.setPrivateStoreType(PrivateStoreType.NONE);
+			storePlayer.broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__83_REQUESTPRIVATESTOREBUY;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
new file mode 100644
index 00000000..338a8f1f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageBuy.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPrivateStoreManageBuy extends L2GameClientPacket {
+	private static final String _C__99_REQUESTPRIVATESTOREMANAGEBUY = "[C] 99 RequestPrivateStoreManageBuy";
+	
+	@Override
+	protected void readImpl() {
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player != null) {
+			player.tryOpenPrivateBuyStore();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__99_REQUESTPRIVATESTOREMANAGEBUY;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
new file mode 100644
index 00000000..03f0e070
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreManageSell.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPrivateStoreManageSell extends L2GameClientPacket {
+	private static final String _C__30_REQUESTPRIVATESTOREMANAGESELL = "[C] 30 RequestPrivateStoreManageSell";
+	
+	@Override
+	protected void readImpl() {
+		// TODO: implement me properly
+		// readD();
+		// readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
+		if (player.isAlikeDead() || player.isInOlympiadMode()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__30_REQUESTPRIVATESTOREMANAGESELL;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
new file mode 100644
index 00000000..dcc88820
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitBuy.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public class RequestPrivateStoreQuitBuy extends L2GameClientPacket {
+	private static final String _C__9C_REQUESTPRIVATESTOREQUITBUY = "[C] 9C RequestPrivateStoreQuitBuy";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		player.setPrivateStoreType(PrivateStoreType.NONE);
+		player.standUp();
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__9C_REQUESTPRIVATESTOREQUITBUY;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
new file mode 100644
index 00000000..2967d55d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreQuitSell.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPrivateStoreQuitSell extends L2GameClientPacket {
+	private static final String _C__96_REQUESTPRIVATESTOREQUITSELL = "[C] 96 RequestPrivateStoreQuitSell";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		player.setPrivateStoreType(PrivateStoreType.NONE);
+		player.standUp();
+		player.broadcastUserInfo();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__96_REQUESTPRIVATESTOREQUITSELL;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java
new file mode 100644
index 00000000..3ae94349
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreSell.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.ItemRequest;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestPrivateStoreSell extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestPrivateStoreSell.class);
+	
+	private static final String _C__9F_REQUESTPRIVATESTORESELL = "[C] 9F RequestPrivateStoreSell";
+	
+	private static final int BATCH_LENGTH = 28; // length of the one item
+	
+	private int _storePlayerId;
+	private ItemRequest[] _items = null;
+	
+	@Override
+	protected void readImpl() {
+		_storePlayerId = readD();
+		int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		_items = new ItemRequest[count];
+		
+		for (int i = 0; i < count; i++) {
+			int objectId = readD();
+			int itemId = readD();
+			readH(); // TODO analyse this
+			readH(); // TODO analyse this
+			long cnt = readQ();
+			long price = readQ();
+			
+			if ((objectId < 1) || (itemId < 1) || (cnt < 1) || (price < 0)) {
+				_items = null;
+				return;
+			}
+			_items[i] = new ItemRequest(objectId, itemId, cnt, price);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_items == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("privatestoresell")) {
+			player.sendMessage("You are selling items too fast.");
+			return;
+		}
+		
+		L2PcInstance storePlayer = L2World.getInstance().getPlayer(_storePlayerId);
+		if (storePlayer == null) {
+			return;
+		}
+		
+		if (!player.isInsideRadius(storePlayer, INTERACTION_DISTANCE, true, false)) {
+			return;
+		}
+		
+		if ((player.getInstanceId() != storePlayer.getInstanceId()) && (player.getInstanceId() != -1)) {
+			return;
+		}
+		
+		if (storePlayer.getPrivateStoreType() != PrivateStoreType.BUY) {
+			return;
+		}
+		
+		if (player.isCursedWeaponEquipped()) {
+			return;
+		}
+		
+		TradeList storeList = storePlayer.getBuyList();
+		if (storeList == null) {
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendMessage("Transactions are disabled for your Access Level.");
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!storeList.privateStoreSell(player, _items)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			LOG.warn("PrivateStore sell has failed due to invalid list or request. Player: {}, Private store of: {}", player.getName(), storePlayer.getName());
+			return;
+		}
+		
+		if (storeList.getItemCount() == 0) {
+			storePlayer.setPrivateStoreType(PrivateStoreType.NONE);
+			storePlayer.broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__9F_REQUESTPRIVATESTORESELL;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java
new file mode 100644
index 00000000..22410be1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.UniqueItemHolder;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author l3x
+ */
+public class RequestProcureCropList extends L2GameClientPacket {
+	private static final int BATCH_LENGTH = 20; // length of the one item
+	
+	private List<CropHolder> _items = null;
+	
+	@Override
+	protected final void readImpl() {
+		final int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(count);
+		for (int i = 0; i < count; i++) {
+			final int objId = readD();
+			final int itemId = readD();
+			final int manorId = readD();
+			final long cnt = readQ();
+			if ((objId < 1) || (itemId < 1) || (manorId < 0) || (cnt < 0)) {
+				_items = null;
+				return;
+			}
+			_items.add(new CropHolder(objId, itemId, cnt, manorId));
+		}
+	}
+	
+	@Override
+	protected final void runImpl() {
+		if (_items == null) {
+			return;
+		}
+		
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		if (manor.isUnderMaintenance()) {
+			sendActionFailed();
+			return;
+		}
+		
+		final L2Npc manager = player.getLastFolkNPC();
+		if (!(manager instanceof L2MerchantInstance) || !manager.canInteract(player)) {
+			sendActionFailed();
+			return;
+		}
+		
+		final int castleId = manager.getCastle().getResidenceId();
+		if (manager.getTemplate().getParameters().getInt("manor_id", -1) != castleId) {
+			sendActionFailed();
+			return;
+		}
+		
+		int slots = 0, weight = 0;
+		for (CropHolder i : _items) {
+			final L2ItemInstance item = player.getInventory().getItemByObjectId(i.getObjectId());
+			if ((item == null) || (item.getCount() < i.getCount()) || (item.getId() != i.getId())) {
+				sendActionFailed();
+				return;
+			}
+			
+			final CropProcure cp = i.getCropProcure();
+			if ((cp == null) || (cp.getAmount() < i.getCount())) {
+				sendActionFailed();
+				return;
+			}
+			
+			final L2Item template = ItemTable.getInstance().getTemplate(i.getRewardId());
+			weight += (i.getCount() * template.getWeight());
+			
+			if (!template.isStackable()) {
+				slots += i.getCount();
+			} else if (player.getInventory().getItemByItemId(i.getRewardId()) == null) {
+				slots++;
+			}
+		}
+		
+		if (!player.getInventory().validateWeight(weight)) {
+			player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			return;
+		} else if (!player.getInventory().validateCapacity(slots)) {
+			player.sendPacket(SystemMessageId.SLOTS_FULL);
+			return;
+		}
+		
+		// Used when Config.ALT_MANOR_SAVE_ALL_ACTIONS == true
+		final int updateListSize = general().manorSaveAllActions() ? _items.size() : 0;
+		final List<CropProcure> updateList = new ArrayList<>(updateListSize);
+		
+		// Proceed the purchase
+		for (CropHolder i : _items) {
+			final long rewardPrice = ItemTable.getInstance().getTemplate(i.getRewardId()).getReferencePrice();
+			if (rewardPrice == 0) {
+				continue;
+			}
+			
+			final long rewardItemCount = i.getPrice() / rewardPrice;
+			if (rewardItemCount < 1) {
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_IN_TRADING_S2_OF_CROP_S1);
+				sm.addItemName(i.getId());
+				sm.addLong(i.getCount());
+				player.sendPacket(sm);
+				continue;
+			}
+			
+			// Fee for selling to other manors
+			final long fee = (castleId == i.getManorId()) ? 0 : ((long) (i.getPrice() * 0.05));
+			if ((fee != 0) && (player.getAdena() < fee)) {
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_IN_TRADING_S2_OF_CROP_S1);
+				sm.addItemName(i.getId());
+				sm.addLong(i.getCount());
+				player.sendPacket(sm);
+				
+				sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+				player.sendPacket(sm);
+				continue;
+			}
+			
+			final CropProcure cp = i.getCropProcure();
+			if (!cp.decreaseAmount(i.getCount()) || ((fee > 0) && !player.reduceAdena("Manor", fee, manager, true)) || !player.destroyItem("Manor", i.getObjectId(), i.getCount(), manager, true)) {
+				continue;
+			}
+			player.addItem("Manor", i.getRewardId(), rewardItemCount, manager, true);
+			
+			if (general().manorSaveAllActions()) {
+				updateList.add(cp);
+			}
+		}
+		
+		if (general().manorSaveAllActions()) {
+			manor.updateCurrentProcure(castleId, updateList);
+		}
+	}
+	
+	private static final class CropHolder extends UniqueItemHolder {
+		private final int _manorId;
+		private CropProcure _cp;
+		private int _rewardId = 0;
+		
+		public CropHolder(int objectId, int id, long count, int manorId) {
+			super(id, objectId, count);
+			_manorId = manorId;
+		}
+		
+		public int getManorId() {
+			return _manorId;
+		}
+		
+		public long getPrice() {
+			return getCount() * _cp.getPrice();
+		}
+		
+		public CropProcure getCropProcure() {
+			if (_cp == null) {
+				_cp = CastleManorManager.getInstance().getCropProcure(_manorId, getId(), false);
+			}
+			return _cp;
+		}
+		
+		public int getRewardId() {
+			if (_rewardId == 0) {
+				_rewardId = CastleManorManager.getInstance().getSeedByCrop(_cp.getId()).getReward(_cp.getReward());
+			}
+			return _rewardId;
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] D0:02 RequestProcureCropList";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java
new file mode 100644
index 00000000..20137c28
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestAbort.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.network.serverpackets.QuestList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestQuestAbort extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestQuestAbort.class);
+	
+	private static final String _C__63_REQUESTQUESTABORT = "[C] 63 RequestQuestAbort";
+	
+	private int _questId;
+	
+	@Override
+	protected void readImpl() {
+		_questId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		Quest qe = QuestManager.getInstance().getQuest(_questId);
+		if (qe != null) {
+			QuestState qs = activeChar.getQuestState(qe.getName());
+			if (qs != null) {
+				qs.exitQuest(true);
+				activeChar.sendPacket(new QuestList());
+			} else {
+				if (general().debug()) {
+					LOG.info("Player '{}' try to abort quest {} but he didn't have it started.", activeChar.getName(), qe.getName());
+				}
+			}
+		} else {
+			if (general().debug()) {
+				LOG.warn("Quest (id='{}') not found.", _questId);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__63_REQUESTQUESTABORT;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java
new file mode 100644
index 00000000..d6b906e6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestQuestList.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.network.serverpackets.QuestList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestQuestList extends L2GameClientPacket {
+	private static final String _C__62_REQUESTQUESTLIST = "[C] 62 RequestQuestList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		QuestList ql = new QuestList();
+		sendPacket(ql);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__62_REQUESTQUESTLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPost.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPost.java
new file mode 100644
index 00000000..77b2f03d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPost.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
+import com.l2jserver.gameserver.network.serverpackets.ExReplyReceivedPost;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestReceivedPost extends L2GameClientPacket {
+	private static final String _C__D0_69_REQUESTRECEIVEDPOST = "[C] D0:69 RequestReceivedPost";
+	
+	private int _msgId;
+	
+	@Override
+	protected void readImpl() {
+		_msgId = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !general().allowMail()) {
+			return;
+		}
+		
+		final Message msg = MailManager.getInstance().getMessage(_msgId);
+		if (msg == null) {
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE) && msg.hasAttachments()) {
+			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+			return;
+		}
+		
+		if (msg.getReceiverId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to receive not own post!");
+			return;
+		}
+		
+		if (msg.isDeletedByReceiver()) {
+			return;
+		}
+		
+		activeChar.sendPacket(new ExReplyReceivedPost(msg));
+		activeChar.sendPacket(new ExChangePostState(true, _msgId, Message.READED));
+		msg.markAsRead();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_69_REQUESTRECEIVEDPOST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPostList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPostList.java
new file mode 100644
index 00000000..4b7d1fab
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReceivedPostList.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExShowReceivedPostList;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestReceivedPostList extends L2GameClientPacket {
+	private static final String _C__D0_67_REQUESTRECEIVEDPOSTLIST = "[C] D0:67 RequestReceivedPostList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !general().allowMail()) {
+			return;
+		}
+		
+		// if (!activeChar.isInsideZone(ZoneId.PEACE))
+		// {
+		// activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+		// return;
+		// }
+		
+		activeChar.sendPacket(new ExShowReceivedPostList(activeChar.getObjectId()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_67_REQUESTRECEIVEDPOSTLIST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
new file mode 100644
index 00000000..1b5ce050
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookDestroy.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.RecipeBookItemList;
+
+public final class RequestRecipeBookDestroy extends L2GameClientPacket {
+	private static final String _C__B6_REQUESTRECIPEBOOKDESTROY = "[C] B6 RequestRecipeBookDestroy";
+	
+	private int _recipeID;
+	
+	/**
+	 * Unknown Packet:ad 0000: ad 02 00 00 00
+	 */
+	@Override
+	protected void readImpl() {
+		_recipeID = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("RecipeDestroy")) {
+			return;
+		}
+		
+		final L2RecipeList rp = RecipeData.getInstance().getRecipeList(_recipeID);
+		if (rp == null) {
+			return;
+		}
+		activeChar.unregisterRecipeList(_recipeID);
+		
+		RecipeBookItemList response = new RecipeBookItemList(rp.isDwarvenRecipe(), activeChar.getMaxMp());
+		if (rp.isDwarvenRecipe()) {
+			response.addRecipes(activeChar.getDwarvenRecipeBook());
+		} else {
+			response.addRecipes(activeChar.getCommonRecipeBook());
+		}
+		
+		activeChar.sendPacket(response);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B6_REQUESTRECIPEBOOKDESTROY;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookOpen.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookOpen.java
new file mode 100644
index 00000000..6948b40b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeBookOpen.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.RecipeController;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public final class RequestRecipeBookOpen extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestRecipeBookOpen.class);
+	
+	private static final String _C__B5_REQUESTRECIPEBOOKOPEN = "[C] B5 RequestRecipeBookOpen";
+	
+	private boolean _isDwarvenCraft;
+	
+	@Override
+	protected void readImpl() {
+		_isDwarvenCraft = (readD() == 0);
+		if (general().debug()) {
+			LOG.info("RequestRecipeBookOpen : {}", _isDwarvenCraft ? "dwarvenCraft" : "commonCraft");
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.isCastingNow() || activeChar.isCastingSimultaneouslyNow()) {
+			activeChar.sendPacket(SystemMessageId.NO_RECIPE_BOOK_WHILE_CASTING);
+			return;
+		}
+		
+		if (activeChar.getActiveRequester() != null) {
+			activeChar.sendMessage("You may not alter your recipe book while trading.");
+			return;
+		}
+		
+		RecipeController.getInstance().requestBookOpen(activeChar, _isDwarvenCraft);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B5_REQUESTRECIPEBOOKOPEN;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
new file mode 100644
index 00000000..74916af7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeInfo.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.RecipeItemMakeInfo;
+
+public final class RequestRecipeItemMakeInfo extends L2GameClientPacket {
+	private static final String _C__B7_REQUESTRECIPEITEMMAKEINFO = "[C] B7 RequestRecipeItemMakeInfo";
+	
+	private int _id;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		RecipeItemMakeInfo response = new RecipeItemMakeInfo(_id, player);
+		sendPacket(response);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B7_REQUESTRECIPEITEMMAKEINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
new file mode 100644
index 00000000..84c0cf72
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.RecipeController;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class RequestRecipeItemMakeSelf extends L2GameClientPacket {
+	private static final String _C__B8_REQUESTRECIPEITEMMAKESELF = "[C] B8 RequestRecipeItemMakeSelf";
+	
+	private int _id;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getManufacture().tryPerformAction("RecipeMakeSelf")) {
+			return;
+		}
+		
+		if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+			activeChar.sendMessage("You cannot create items while trading.");
+			return;
+		}
+		
+		if (activeChar.isInCraftMode()) {
+			activeChar.sendMessage("You are currently in Craft Mode.");
+			return;
+		}
+		
+		RecipeController.getInstance().requestMakeItem(activeChar, _id);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B8_REQUESTRECIPEITEMMAKESELF;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java
new file mode 100644
index 00000000..33fbbdcd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopListSet.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopMsg;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+import com.l2jserver.gameserver.util.Broadcast;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * RequestRecipeShopListSet client packet class.
+ */
+public final class RequestRecipeShopListSet extends L2GameClientPacket {
+	private static final String _C__BB_RequestRecipeShopListSet = "[C] BB RequestRecipeShopListSet";
+	
+	private static final int BATCH_LENGTH = 12;
+	
+	private L2ManufactureItem[] _items = null;
+	
+	@Override
+	protected void readImpl() {
+		int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new L2ManufactureItem[count];
+		for (int i = 0; i < count; i++) {
+			int id = readD();
+			long cost = readQ();
+			if (cost < 0) {
+				_items = null;
+				return;
+			}
+			_items[i] = new L2ManufactureItem(id, cost);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_items == null) {
+			player.setPrivateStoreType(PrivateStoreType.NONE);
+			player.broadcastUserInfo();
+			return;
+		}
+		
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) || player.isInDuel()) {
+			player.sendPacket(SystemMessageId.CANT_OPERATE_PRIVATE_STORE_DURING_COMBAT);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isInsideZone(ZoneId.NO_STORE)) {
+			player.sendPacket(SystemMessageId.NO_PRIVATE_WORKSHOP_HERE);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		List<L2RecipeList> dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook());
+		List<L2RecipeList> commonRecipes = Arrays.asList(player.getCommonRecipeBook());
+		
+		player.getManufactureItems().clear();
+		
+		for (L2ManufactureItem i : _items) {
+			final L2RecipeList list = RecipeData.getInstance().getRecipeList(i.getRecipeId());
+			if (!dwarfRecipes.contains(list) && !commonRecipes.contains(list)) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.");
+				return;
+			}
+			
+			if (i.getCost() > character().getMaxAdena()) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + character().getMaxAdena() + " adena in Private Manufacture.");
+				return;
+			}
+			
+			player.getManufactureItems().put(i.getRecipeId(), i);
+		}
+		
+		player.setStoreName(!player.hasManufactureShop() ? "" : player.getStoreName());
+		player.setPrivateStoreType(PrivateStoreType.MANUFACTURE);
+		player.sitDown();
+		player.broadcastUserInfo();
+		Broadcast.toSelfAndKnownPlayers(player, new RecipeShopMsg(player));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__BB_RequestRecipeShopListSet;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
new file mode 100644
index 00000000..2c766267
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeInfo.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopItemInfo;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestRecipeShopMakeInfo extends L2GameClientPacket {
+	private static final String _C__B5_RequestRecipeShopMakeInfo = "[C] B5 RequestRecipeShopMakeInfo";
+	
+	private int _playerObjectId;
+	private int _recipeId;
+	
+	@Override
+	protected void readImpl() {
+		_playerObjectId = readD();
+		_recipeId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final L2PcInstance shop = L2World.getInstance().getPlayer(_playerObjectId);
+		if ((shop == null) || (shop.getPrivateStoreType() != PrivateStoreType.MANUFACTURE)) {
+			return;
+		}
+		
+		player.sendPacket(new RecipeShopItemInfo(shop, _recipeId));
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B5_RequestRecipeShopMakeInfo;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
new file mode 100644
index 00000000..286aa5c2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.RecipeController;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.Util;
+
+public final class RequestRecipeShopMakeItem extends L2GameClientPacket {
+	private static final String _C__BF_REQUESTRECIPESHOPMAKEITEM = "[C] BF RequestRecipeShopMakeItem";
+	
+	private int _id;
+	private int _recipeId;
+	@SuppressWarnings("unused")
+	private long _unknown;
+	
+	@Override
+	protected void readImpl() {
+		_id = readD();
+		_recipeId = readD();
+		_unknown = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getManufacture().tryPerformAction("RecipeShopMake")) {
+			return;
+		}
+		
+		L2PcInstance manufacturer = L2World.getInstance().getPlayer(_id);
+		if (manufacturer == null) {
+			return;
+		}
+		
+		if ((manufacturer.getInstanceId() != activeChar.getInstanceId()) && (activeChar.getInstanceId() != -1)) {
+			return;
+		}
+		
+		if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+			activeChar.sendMessage("You cannot create items while trading.");
+			return;
+		}
+		if (manufacturer.getPrivateStoreType() != PrivateStoreType.MANUFACTURE) {
+			// activeChar.sendMessage("You cannot create items while trading.");
+			return;
+		}
+		
+		if (activeChar.isInCraftMode() || manufacturer.isInCraftMode()) {
+			activeChar.sendMessage("You are currently in Craft Mode.");
+			return;
+		}
+		if (Util.checkIfInRange(150, activeChar, manufacturer, true)) {
+			RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, activeChar);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__BF_REQUESTRECIPESHOPMAKEITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java
new file mode 100644
index 00000000..f0896de3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageList.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopManageList;
+
+public final class RequestRecipeShopManageList extends L2GameClientPacket {
+	private static final String _C__B9_RequestRecipeShopManageList = "[C] B9 RequestRecipeShopManageList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		// Player shouldn't be able to set stores if he/she is alike dead (dead or fake death)
+		if (player.isAlikeDead()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		if (player.getPrivateStoreType() != PrivateStoreType.NONE) {
+			player.setPrivateStoreType(PrivateStoreType.NONE);
+			player.broadcastUserInfo();
+			if (player.isSitting()) {
+				player.standUp();
+			}
+		}
+		
+		player.sendPacket(new RecipeShopManageList(player, true));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B9_RequestRecipeShopManageList;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
new file mode 100644
index 00000000..92984ccd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManagePrev.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.RecipeShopSellList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestRecipeShopManagePrev extends L2GameClientPacket {
+	private static final String _C__C0_RequestRecipeShopPrev = "[C] C0 RequestRecipeShopPrev";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if ((player == null)) {
+			return;
+		} else if (player.isAlikeDead() || (player.getTarget() == null) || !player.getTarget().isPlayer()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		player.sendPacket(new RecipeShopSellList(player, player.getTarget().getActingPlayer()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C0_RequestRecipeShopPrev;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
new file mode 100644
index 00000000..ce8f7bc2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopManageQuit.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestRecipeShopManageQuit extends L2GameClientPacket {
+	private static final String _C__BC_RequestRecipeShopManageQuit = "[C] BC2 RequestRecipeShopManageQuit";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		player.setPrivateStoreType(PrivateStoreType.NONE);
+		player.broadcastUserInfo();
+		player.standUp();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__BC_RequestRecipeShopManageQuit;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
new file mode 100644
index 00000000..e7ef796e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMessageSet.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public class RequestRecipeShopMessageSet extends L2GameClientPacket {
+	private static final String _C__BA_RequestRecipeShopMessageSet = "[C] BA RequestRecipeShopMessageSet";
+	
+	private static final int MAX_MSG_LENGTH = 29;
+	
+	private String _name;
+	
+	@Override
+	protected void readImpl() {
+		_name = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if ((_name != null) && (_name.length() > MAX_MSG_LENGTH)) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow recipe shop message");
+			return;
+		}
+		
+		if (player.hasManufactureShop()) {
+			player.setStoreName(_name);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__BA_RequestRecipeShopMessageSet;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java
new file mode 100644
index 00000000..6fbe87a2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRecordInfo.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.SpawnItem;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+public class RequestRecordInfo extends L2GameClientPacket {
+	private static final String _C__6E_REQUEST_RECORD_INFO = "[C] 6E RequestRecordInfo";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.sendPacket(new UserInfo(activeChar));
+		activeChar.sendPacket(new ExBrExtraUserInfo(activeChar));
+		
+		for (L2Object object : activeChar.getKnownList().getKnownObjects().values()) {
+			if (object.getPoly().isMorphed() && object.getPoly().getPolyType().equals("item")) {
+				activeChar.sendPacket(new SpawnItem(object));
+			} else {
+				if (!object.isVisibleFor(activeChar)) {
+					object.sendInfo(activeChar);
+					
+					if (object instanceof L2Character creature) {
+						// Update the state of the L2Character object client side by sending Server->Client packet
+						// MoveToPawn/CharMoveToLocation and AutoAttackStart to the L2PcInstance
+						creature.getAI().describeStateToPlayer(activeChar);
+					}
+				}
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__6E_REQUEST_RECORD_INFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java
new file mode 100644
index 00000000..e8954891
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefine.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.datatables.AugmentationData;
+import com.l2jserver.gameserver.model.L2Augmentation;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExVariationResult;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+
+/**
+ * Format:(ch) dddd
+ * @author -Wooden-
+ */
+public final class RequestRefine extends AbstractRefinePacket {
+	private static final String _C__D0_41_REQUESTREFINE = "[C] D0:41 RequestRefine";
+	private int _targetItemObjId;
+	private int _refinerItemObjId;
+	private int _gemStoneItemObjId;
+	private long _gemStoneCount;
+	
+	@Override
+	protected void readImpl() {
+		_targetItemObjId = readD();
+		_refinerItemObjId = readD();
+		_gemStoneItemObjId = readD();
+		_gemStoneCount = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId);
+		if (targetItem == null) {
+			return;
+		}
+		L2ItemInstance refinerItem = activeChar.getInventory().getItemByObjectId(_refinerItemObjId);
+		if (refinerItem == null) {
+			return;
+		}
+		L2ItemInstance gemStoneItem = activeChar.getInventory().getItemByObjectId(_gemStoneItemObjId);
+		if (gemStoneItem == null) {
+			return;
+		}
+		
+		if (!isValid(activeChar, targetItem, refinerItem, gemStoneItem)) {
+			activeChar.sendPacket(new ExVariationResult(0, 0, 0));
+			activeChar.sendPacket(SystemMessageId.AUGMENTATION_FAILED_DUE_TO_INAPPROPRIATE_CONDITIONS);
+			return;
+		}
+		
+		final LifeStone ls = getLifeStone(refinerItem.getId());
+		if (ls == null) {
+			return;
+		}
+		
+		final int lifeStoneLevel = ls.getLevel();
+		final int lifeStoneGrade = ls.getGrade();
+		if (_gemStoneCount != getGemStoneCount(targetItem.getItem().getItemGrade(), lifeStoneGrade)) {
+			activeChar.sendPacket(new ExVariationResult(0, 0, 0));
+			activeChar.sendPacket(SystemMessageId.AUGMENTATION_FAILED_DUE_TO_INAPPROPRIATE_CONDITIONS);
+			return;
+		}
+		
+		// unequip item
+		if (targetItem.isEquipped()) {
+			L2ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInSlotAndRecord(targetItem.getLocationSlot());
+			InventoryUpdate iu = new InventoryUpdate();
+			for (L2ItemInstance itm : unequiped) {
+				iu.addModifiedItem(itm);
+			}
+			activeChar.sendPacket(iu);
+			activeChar.broadcastUserInfo();
+		}
+		
+		// consume the life stone
+		if (!activeChar.destroyItem("RequestRefine", refinerItem, 1, null, false)) {
+			return;
+		}
+		
+		// consume the gemstones
+		if (!activeChar.destroyItem("RequestRefine", gemStoneItem, _gemStoneCount, null, false)) {
+			return;
+		}
+		
+		final L2Augmentation aug = AugmentationData.getInstance().generateRandomAugmentation(lifeStoneLevel, lifeStoneGrade, targetItem.getItem().getBodyPart(), refinerItem.getId(), targetItem);
+		targetItem.setAugmentation(aug);
+		
+		final int stat12 = 0x0000FFFF & aug.getAugmentationId();
+		final int stat34 = aug.getAugmentationId() >> 16;
+		activeChar.sendPacket(new ExVariationResult(stat12, stat34, 1));
+		
+		InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(targetItem);
+		activeChar.sendPacket(iu);
+		
+		StatusUpdate su = new StatusUpdate(activeChar);
+		su.addAttribute(StatusUpdate.CUR_LOAD, activeChar.getCurrentLoad());
+		activeChar.sendPacket(su);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_41_REQUESTREFINE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java
new file mode 100644
index 00000000..0224e301
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefineCancel.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExVariationCancelResult;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Format(ch) d
+ * @author -Wooden-
+ */
+public final class RequestRefineCancel extends L2GameClientPacket {
+	private static final String _C__D0_43_REQUESTREFINECANCEL = "[C] D0:43 RequestRefineCancel";
+	private int _targetItemObjId;
+	
+	@Override
+	protected void readImpl() {
+		_targetItemObjId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2ItemInstance targetItem = activeChar.getInventory().getItemByObjectId(_targetItemObjId);
+		if (targetItem == null) {
+			activeChar.sendPacket(new ExVariationCancelResult(0));
+			return;
+		}
+		if (targetItem.getOwnerId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(getClient().getActiveChar(), "Warning!! Character " + getClient().getActiveChar().getName() + " of account " + getClient().getActiveChar().getAccountName() + " tryied to augment item that doesn't own.");
+			return;
+		}
+		// cannot remove augmentation from a not augmented item
+		if (!targetItem.isAugmented()) {
+			activeChar.sendPacket(SystemMessageId.AUGMENTATION_REMOVAL_CAN_ONLY_BE_DONE_ON_AN_AUGMENTED_ITEM);
+			activeChar.sendPacket(new ExVariationCancelResult(0));
+			return;
+		}
+		
+		// get the price
+		int price;
+		switch (targetItem.getItem().getCrystalType()) {
+			case C:
+				if (targetItem.getCrystalCount() < 1720) {
+					price = 95000;
+				} else if (targetItem.getCrystalCount() < 2452) {
+					price = 150000;
+				} else {
+					price = 210000;
+				}
+				break;
+			case B:
+				if (targetItem.getCrystalCount() < 1746) {
+					price = 240000;
+				} else {
+					price = 270000;
+				}
+				break;
+			case A:
+				if (targetItem.getCrystalCount() < 2160) {
+					price = 330000;
+				} else if (targetItem.getCrystalCount() < 2824) {
+					price = 390000;
+				} else {
+					price = 420000;
+				}
+				break;
+			case S:
+				price = 480000;
+				break;
+			case S80:
+			case S84:
+				price = 920000;
+				break;
+			// any other item type is not augmentable
+			default:
+				activeChar.sendPacket(new ExVariationCancelResult(0));
+				return;
+		}
+		
+		// try to reduce the players adena
+		if (!activeChar.reduceAdena("RequestRefineCancel", price, null, true)) {
+			activeChar.sendPacket(new ExVariationCancelResult(0));
+			activeChar.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			return;
+		}
+		
+		// unequip item
+		if (targetItem.isEquipped()) {
+			activeChar.disarmWeapons();
+		}
+		
+		// remove the augmentation
+		targetItem.removeAugmentation();
+		
+		// send ExVariationCancelResult
+		activeChar.sendPacket(new ExVariationCancelResult(1));
+		
+		// send inventory update
+		InventoryUpdate iu = new InventoryUpdate();
+		iu.addModifiedItem(targetItem);
+		activeChar.sendPacket(iu);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_43_REQUESTREFINECANCEL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java
new file mode 100644
index 00000000..39b4bd1d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExBuySellList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * RequestRefundItem client packet class.
+ */
+public final class RequestRefundItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestRefundItem.class);
+	
+	private static final String _C__D0_75_REQUESTREFUNDITEM = "[C] D0:75 RequestRefundItem";
+	
+	private static final int BATCH_LENGTH = 4; // length of the one item
+	
+	private int _listId;
+	private int[] _items = null;
+	
+	@Override
+	protected void readImpl() {
+		_listId = readD();
+		final int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new int[count];
+		for (int i = 0; i < count; i++) {
+			_items[i] = readD();
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("refund")) {
+			player.sendMessage("You are using refund too fast.");
+			return;
+		}
+		
+		if (_items == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!player.hasRefund()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2Object target = player.getTarget();
+		if (!player.isGM() && (!(target instanceof L2MerchantInstance) || (player.getInstanceId() != target.getInstanceId()) || !player.isInsideRadius(target, INTERACTION_DISTANCE, true, false))) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2Character merchant = null;
+		if (target instanceof L2MerchantInstance) {
+			merchant = (L2Character) target;
+		} else if (!player.isGM()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (merchant == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final L2BuyList buyList = BuyListData.getInstance().getBuyList(_listId);
+		if (buyList == null) {
+			Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId);
+			return;
+		}
+		
+		if (!buyList.isNpcAllowed(merchant.getId())) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		long weight = 0;
+		long adena = 0;
+		long slots = 0;
+		
+		L2ItemInstance[] refund = player.getRefund().getItems();
+		int[] objectIds = new int[_items.length];
+		
+		for (int i = 0; i < _items.length; i++) {
+			int idx = _items[i];
+			if ((idx < 0) || (idx >= refund.length)) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent invalid refund index");
+				return;
+			}
+			
+			// check for duplicates - indexes
+			for (int j = i + 1; j < _items.length; j++) {
+				if (idx == _items[j]) {
+					Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent duplicate refund index");
+					return;
+				}
+			}
+			
+			final L2ItemInstance item = refund[idx];
+			final L2Item template = item.getItem();
+			objectIds[i] = item.getObjectId();
+			
+			// second check for duplicates - object ids
+			for (int j = 0; j < i; j++) {
+				if (objectIds[i] == objectIds[j]) {
+					Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " has duplicate items in refund list");
+					return;
+				}
+			}
+			
+			long count = item.getCount();
+			weight += count * template.getWeight();
+			adena += (count * template.getReferencePrice()) / 2;
+			if (!template.isStackable()) {
+				slots += count;
+			} else if (player.getInventory().getItemByItemId(template.getId()) == null) {
+				slots++;
+			}
+		}
+		
+		if ((weight > Integer.MAX_VALUE) || (weight < 0) || !player.getInventory().validateWeight((int) weight)) {
+			player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if ((slots > Integer.MAX_VALUE) || (slots < 0) || !player.getInventory().validateCapacity((int) slots)) {
+			player.sendPacket(SystemMessageId.SLOTS_FULL);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if ((adena < 0) || !player.reduceAdena("Refund", adena, player.getLastFolkNPC(), false)) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		for (int i = 0; i < _items.length; i++) {
+			L2ItemInstance item = player.getRefund().transferItem("Refund", objectIds[i], Long.MAX_VALUE, player.getInventory(), player, player.getLastFolkNPC());
+			if (item == null) {
+				LOG.warn("Error refunding object for char {} (newitem == null)", player.getName());
+			}
+		}
+		
+		// Update current load status on player
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+		player.sendPacket(new ExBuySellList(player, true));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_75_REQUESTREFUNDITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java
new file mode 100644
index 00000000..6371456e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRejectPostAttachment.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExChangePostState;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestRejectPostAttachment extends L2GameClientPacket {
+	private static final String _C__D0_6B_REQUESTREJECTPOSTATTACHMENT = "[C] D0:6B RequestRejectPostAttachment";
+	
+	private int _msgId;
+	
+	@Override
+	protected void readImpl() {
+		_msgId = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		if (!general().allowMail() || !general().allowAttachments()) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("rejectattach")) {
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE)) {
+			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+			return;
+		}
+		
+		Message msg = MailManager.getInstance().getMessage(_msgId);
+		if (msg == null) {
+			return;
+		}
+		
+		if (msg.getReceiverId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to reject not own attachment!");
+			return;
+		}
+		
+		if (!msg.hasAttachments() || (msg.getSendBySystem() != 0)) {
+			return;
+		}
+		
+		MailManager.getInstance().sendMessage(new Message(msg));
+		
+		activeChar.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_RETURNED);
+		activeChar.sendPacket(new ExChangePostState(true, _msgId, Message.REJECTED));
+		
+		final L2PcInstance sender = L2World.getInstance().getPlayer(msg.getSenderId());
+		if (sender != null) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_RETURNED_MAIL);
+			sm.addCharName(activeChar);
+			sender.sendPacket(sm);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_6B_REQUESTREJECTPOSTATTACHMENT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
new file mode 100644
index 00000000..f98bc8e3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStartPledgeWar.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestReplyStartPledgeWar extends L2GameClientPacket {
+	private static final String _C__04_REQUESTREPLYSTARTPLEDGEWAR = "[C] 04 RequestReplyStartPledgeWar";
+	
+	private int _answer;
+	
+	@Override
+	protected void readImpl() {
+		readS();
+		_answer = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		L2PcInstance requestor = activeChar.getActiveRequester();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (_answer == 1) {
+			ClanTable.getInstance().storeclanswars(requestor.getClanId(), activeChar.getClanId());
+		} else {
+			requestor.sendPacket(SystemMessageId.WAR_PROCLAMATION_HAS_BEEN_REFUSED);
+		}
+		activeChar.setActiveRequester(null);
+		requestor.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__04_REQUESTREPLYSTARTPLEDGEWAR;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
new file mode 100644
index 00000000..abb7944e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplyStopPledgeWar.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestReplyStopPledgeWar extends L2GameClientPacket {
+	private static final String _C__06_REQUESTREPLYSTOPPLEDGEWAR = "[C] 06 RequestReplyStopPledgeWar";
+	
+	private int _answer;
+	
+	@Override
+	protected void readImpl() {
+		readS();
+		_answer = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		L2PcInstance requestor = activeChar.getActiveRequester();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (_answer == 1) {
+			ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
+		} else {
+			requestor.sendPacket(SystemMessageId.REQUEST_TO_END_WAR_HAS_BEEN_DENIED);
+		}
+		
+		activeChar.setActiveRequester(null);
+		requestor.onTransactionResponse();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__06_REQUESTREPLYSTOPPLEDGEWAR;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
new file mode 100644
index 00000000..0ac3740b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestReplySurrenderPledgeWar.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class RequestReplySurrenderPledgeWar extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestReplySurrenderPledgeWar.class);
+	
+	private static final String _C__08_REQUESTREPLYSURRENDERPLEDGEWAR = "[C] 08 RequestReplySurrenderPledgeWar";
+	
+	private String _reqName;
+	private int _answer;
+	
+	@Override
+	protected void readImpl() {
+		_reqName = readS();
+		_answer = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		final L2PcInstance requestor = activeChar.getActiveRequester();
+		if (requestor == null) {
+			return;
+		}
+		
+		if (_answer == 1) {
+			ClanTable.getInstance().deleteclanswars(requestor.getClanId(), activeChar.getClanId());
+		} else {
+			LOG.info("Missing implementation for answer: {} and name: {}!", _answer, _reqName);
+		}
+		activeChar.onTransactionRequest(requestor);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__08_REQUESTREPLYSURRENDERPLEDGEWAR;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestResetNickname.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestResetNickname.java
new file mode 100644
index 00000000..712fc5a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestResetNickname.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author KenM
+ */
+public class RequestResetNickname extends L2GameClientPacket {
+	private static final String _C__D0_50_REQUESTRESETNICKNAME = "[C] D0:50 RequestResetNickname";
+	
+	@Override
+	protected void readImpl() {
+		// nothing (trigger)
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		activeChar.getAppearance().setTitleColor(0xFFFF77);
+		activeChar.setTitle("");
+		activeChar.broadcastTitleInfo();
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_50_REQUESTRESETNICKNAME;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java
new file mode 100644
index 00000000..cfa67e07
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.AntiFeedManager;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
+import com.l2jserver.gameserver.network.serverpackets.RestartResponse;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+public final class RequestRestart extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestRestart.class);
+	private static final Logger LOG_ACCOUNTING = LoggerFactory.getLogger("accounting");
+	
+	private static final String _C__57_REQUESTRESTART = "[C] 57 RequestRestart";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		
+		if (player == null) {
+			return;
+		}
+		
+		if ((player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (player.getActiveEnchantAttrItemId() != L2PcInstance.ID_NONE)) {
+			sendPacket(RestartResponse.valueOf(false));
+			return;
+		}
+		
+		if (player.isLocked()) {
+			LOG.warn("Player {} tried to restart during class change.", player.getName());
+			sendPacket(RestartResponse.valueOf(false));
+			return;
+		}
+		
+		if (player.getPrivateStoreType() != PrivateStoreType.NONE) {
+			player.sendMessage("Cannot restart while trading");
+			sendPacket(RestartResponse.valueOf(false));
+			return;
+		}
+		
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) && !(player.isGM() && general().gmRestartFighting())) {
+			if (general().debug()) {
+				LOG.debug("Player {} tried to logout while fighting.", player.getName());
+			}
+			
+			player.sendPacket(SystemMessageId.CANT_RESTART_WHILE_FIGHTING);
+			sendPacket(RestartResponse.valueOf(false));
+			return;
+		}
+		
+		// Prevent player from restarting if they are a festival participant
+		// and it is in progress, otherwise notify party members that the player
+		// is not longer a participant.
+		if (player.isFestivalParticipant()) {
+			if (SevenSignsFestival.getInstance().isFestivalInitialized()) {
+				player.sendMessage("You cannot restart while you are a participant in a festival.");
+				sendPacket(RestartResponse.valueOf(false));
+				return;
+			}
+			
+			final L2Party playerParty = player.getParty();
+			
+			if (playerParty != null) {
+				player.getParty().broadcastString(player.getName() + " has been removed from the upcoming festival.");
+			}
+		}
+		
+		if (player.isBlockedFromExit()) {
+			sendPacket(RestartResponse.valueOf(false));
+			return;
+		}
+		
+		// Remove player from Boss Zone
+		player.removeFromBossZone();
+		
+		final L2GameClient client = getClient();
+		
+		LOG_ACCOUNTING.info("Client {} restarted.", client);
+		
+		// detach the client from the char so that the connection isn't closed in the deleteMe
+		player.setClient(null);
+		
+		player.deleteMe();
+		
+		client.setActiveChar(null);
+		AntiFeedManager.getInstance().onDisconnect(client);
+		
+		// return the client to the authed status
+		client.setState(GameClientState.AUTHED);
+		
+		sendPacket(RestartResponse.valueOf(true));
+		
+		// send char list
+		final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1);
+		sendPacket(cl);
+		client.setCharSelection(cl.getCharInfo());
+	}
+	
+	@Override
+	public String getType() {
+		return _C__57_REQUESTRESTART;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java
new file mode 100644
index 00000000..79e88131
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.TeleportWhereType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2SiegeFlagInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestRestartPoint extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestRestartPoint.class);
+	
+	private static final String _C__7D_REQUESTRESTARTPOINT = "[C] 7D RequestRestartPoint";
+	
+	private int _requestedPointType;
+	
+	@Override
+	protected void readImpl() {
+		_requestedPointType = readD();
+	}
+	
+	class DeathTask implements Runnable {
+		final L2PcInstance activeChar;
+		
+		DeathTask(L2PcInstance _activeChar) {
+			activeChar = _activeChar;
+		}
+		
+		@Override
+		public void run() {
+			portPlayer(activeChar);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!activeChar.canRevive()) {
+			return;
+		}
+		
+		if (activeChar.isFakeDeath()) {
+			activeChar.stopFakeDeath(true);
+			return;
+		} else if (!activeChar.isDead()) {
+			LOG.warn("Living player [{}] called RestartPointPacket! Ban this player!", activeChar.getName());
+			return;
+		}
+		
+		Castle castle = CastleManager.getInstance().getCastle(activeChar.getX(), activeChar.getY(), activeChar.getZ());
+		if ((castle != null) && castle.getSiege().isInProgress()) {
+			if ((activeChar.getClan() != null) && castle.getSiege().checkIsAttacker(activeChar.getClan())) {
+				// Schedule respawn delay for attacker
+				ThreadPoolManager.getInstance().scheduleGeneral(new DeathTask(activeChar), castle.getSiege().getAttackerRespawnDelay());
+				if (castle.getSiege().getAttackerRespawnDelay() > 0) {
+					activeChar.sendMessage("You will be re-spawned in " + (castle.getSiege().getAttackerRespawnDelay() / 1000) + " seconds");
+				}
+				return;
+			}
+		}
+		
+		portPlayer(activeChar);
+	}
+	
+	private void portPlayer(final L2PcInstance activeChar) {
+		Location loc = null;
+		Castle castle = null;
+		Fort fort = null;
+		SiegableHall hall = null;
+		boolean isInDefense = false;
+		int instanceId = 0;
+		
+		// force jail
+		if (activeChar.isJailed()) {
+			_requestedPointType = 27;
+		} else if (activeChar.isFestivalParticipant()) {
+			_requestedPointType = 5;
+		}
+		if (activeChar.isInParty()) {
+			if (activeChar.getParty().isInDimensionalRift()) {
+				activeChar.getParty().getDimensionalRift().getWaitingRoomPlayers().add(activeChar);
+			}
+		}
+		switch (_requestedPointType) {
+			case 1: // to clanhall
+			{
+				if ((activeChar.getClan() == null) || (activeChar.getClan().getHideoutId() == 0)) {
+					LOG.warn("Player [{}] called RestartPointPacket - To Clanhall and he doesn't have Clanhall!", activeChar.getName());
+					return;
+				}
+				loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CLANHALL);
+				
+				if ((ClanHallManager.getInstance().getAbstractHallByOwner(activeChar.getClan()) != null) && (ClanHallManager.getInstance().getAbstractHallByOwner(activeChar.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP) != null)) {
+					activeChar.restoreExp(ClanHallManager.getInstance().getAbstractHallByOwner(activeChar.getClan()).getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl());
+				}
+				break;
+			}
+			case 2: // to castle
+			{
+				castle = CastleManager.getInstance().getCastle(activeChar);
+				
+				if ((castle != null) && castle.getSiege().isInProgress()) {
+					// Siege in progress
+					if (castle.getSiege().checkIsDefender(activeChar.getClan())) {
+						loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CASTLE);
+					} else if (castle.getSiege().checkIsAttacker(activeChar.getClan())) {
+						loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.TOWN);
+					} else {
+						LOG.warn("Player [{}] called RestartPointPacket - To Castle and he doesn't have Castle!", activeChar.getName());
+						return;
+					}
+				} else {
+					if ((activeChar.getClan() == null) || (activeChar.getClan().getCastleId() == 0)) {
+						return;
+					}
+					loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.CASTLE);
+				}
+				if ((CastleManager.getInstance().getCastleByOwner(activeChar.getClan()) != null) && (CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).getFunction(Castle.FUNC_RESTORE_EXP) != null)) {
+					activeChar.restoreExp(CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).getFunction(Castle.FUNC_RESTORE_EXP).getLvl());
+				}
+				break;
+			}
+			case 3: // to fortress
+			{
+				if (((activeChar.getClan() == null) || (activeChar.getClan().getFortId() == 0)) && !isInDefense) {
+					LOG.warn("Player [{}] called RestartPointPacket - To Fortress and he doesn't have Fortress!", activeChar.getName());
+					return;
+				}
+				loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.FORTRESS);
+				if ((FortManager.getInstance().getFortByOwner(activeChar.getClan()) != null) && (FortManager.getInstance().getFortByOwner(activeChar.getClan()).getFunction(Fort.FUNC_RESTORE_EXP) != null)) {
+					activeChar.restoreExp(FortManager.getInstance().getFortByOwner(activeChar.getClan()).getFunction(Fort.FUNC_RESTORE_EXP).getLvl());
+				}
+				break;
+			}
+			case 4: // to siege HQ
+			{
+				L2SiegeClan siegeClan = null;
+				castle = CastleManager.getInstance().getCastle(activeChar);
+				fort = FortManager.getInstance().getFort(activeChar);
+				hall = ClanHallSiegeManager.getInstance().getNearbyClanHall(activeChar);
+				L2SiegeFlagInstance flag = TerritoryWarManager.getInstance().getHQForClan(activeChar.getClan());
+				
+				if ((castle != null) && castle.getSiege().isInProgress()) {
+					siegeClan = castle.getSiege().getAttackerClan(activeChar.getClan());
+				} else if ((fort != null) && fort.getSiege().isInProgress()) {
+					siegeClan = fort.getSiege().getAttackerClan(activeChar.getClan());
+				} else if ((hall != null) && hall.isInSiege()) {
+					siegeClan = hall.getSiege().getAttackerClan(activeChar.getClan());
+				}
+				if (((siegeClan == null) || siegeClan.getFlag().isEmpty()) && (flag == null)) {
+					// Check if clan hall has inner spawns loc
+					if (hall != null) {
+						loc = hall.getSiege().getInnerSpawnLoc(activeChar);
+						
+						if (loc != null) {
+							break;
+						}
+					}
+					
+					LOG.warn("Player [{}] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!", activeChar.getName());
+					return;
+				}
+				loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.SIEGEFLAG);
+				break;
+			}
+			case 5: // Fixed or Player is a festival participant
+			{
+				if (!activeChar.isGM() && !activeChar.isFestivalParticipant() && !activeChar.getInventory().haveItemForSelfResurrection()) {
+					LOG.warn("Player [{}] called RestartPointPacket - Fixed and he isn't festival participant!", activeChar.getName());
+					return;
+				}
+				if (activeChar.isGM() || activeChar.destroyItemByItemId("Feather", 10649, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13300, 1, activeChar, false) || activeChar.destroyItemByItemId("Feather", 13128, 1, activeChar, false)) {
+					activeChar.doRevive(100.00);
+				} else
+				// Festival Participant
+				{
+					instanceId = activeChar.getInstanceId();
+					loc = new Location(activeChar);
+				}
+				break;
+			}
+			case 6: // TODO: agathion ress
+			{
+				break;
+			}
+			case 27: // to jail
+			{
+				if (!activeChar.isJailed()) {
+					return;
+				}
+				loc = new Location(-114356, -249645, -2984);
+				break;
+			}
+			default: {
+				loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, TeleportWhereType.TOWN);
+				break;
+			}
+		}
+		
+		// Teleport and revive
+		if (loc != null) {
+			activeChar.setInstanceId(instanceId);
+			activeChar.setIsIn7sDungeon(false);
+			activeChar.setIsPendingRevive(true);
+			activeChar.teleToLocation(loc, true);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__7D_REQUESTRESTARTPOINT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSSQStatus.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSSQStatus.java
new file mode 100644
index 00000000..e4605d3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSSQStatus.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.SSQStatus;
+
+/**
+ * Seven Signs Record Update Request packet type id 0xc7 format: cc
+ * @author Tempy
+ */
+public final class RequestSSQStatus extends L2GameClientPacket {
+	private static final String _C__C8_RequestSSQStatus = "[C] C8 RequestSSQStatus";
+	
+	private int _page;
+	
+	@Override
+	protected void readImpl() {
+		_page = readC();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((SevenSigns.getInstance().isSealValidationPeriod() || SevenSigns.getInstance().isCompResultsPeriod()) && (_page == 4)) {
+			return;
+		}
+		
+		SSQStatus ssqs = new SSQStatus(activeChar.getObjectId(), _page);
+		activeChar.sendPacket(ssqs);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__C8_RequestSSQStatus;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
new file mode 100644
index 00000000..b5990e22
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveBookMarkSlot.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author ShanSoft
+ * @structure chdSdS
+ */
+public final class RequestSaveBookMarkSlot extends L2GameClientPacket {
+	private static final String _C__D0_51_01_REQUESTSAVEBOOKMARKSLOT = "[C] D0:51:01 RequestSaveBookMarkSlot";
+	
+	private int icon;
+	private String name, tag;
+	
+	@Override
+	protected void readImpl() {
+		name = readS();
+		icon = readD();
+		tag = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		activeChar.teleportBookmarkAdd(activeChar.getX(), activeChar.getY(), activeChar.getZ(), icon, tag, name);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_51_01_REQUESTSAVEBOOKMARKSLOT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
new file mode 100644
index 00000000..afef399b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveInventoryOrder.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.enums.ItemLocation;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Format:(ch) d[dd]
+ * @author -Wooden-
+ */
+public final class RequestSaveInventoryOrder extends L2GameClientPacket {
+	private static final String _C__D0_24_REQUESTSAVEINVENTORYORDER = "[C] D0:24 RequestSaveInventoryOrder";
+	
+	private List<InventoryOrder> _order;
+	
+	/** client limit */
+	private static final int LIMIT = 125;
+	
+	@Override
+	protected void readImpl() {
+		int sz = readD();
+		sz = Math.min(sz, LIMIT);
+		_order = new ArrayList<>(sz);
+		for (int i = 0; i < sz; i++) {
+			int objectId = readD();
+			int order = readD();
+			_order.add(new InventoryOrder(objectId, order));
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player != null) {
+			Inventory inventory = player.getInventory();
+			for (InventoryOrder order : _order) {
+				L2ItemInstance item = inventory.getItemByObjectId(order.objectID);
+				if ((item != null) && (item.getItemLocation() == ItemLocation.INVENTORY)) {
+					item.setItemLocation(ItemLocation.INVENTORY, order.order);
+				}
+			}
+		}
+	}
+	
+	private static class InventoryOrder {
+		int order;
+		
+		int objectID;
+		
+		public InventoryOrder(int id, int ord) {
+			objectID = id;
+			order = ord;
+		}
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_24_REQUESTSAVEINVENTORYORDER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java
new file mode 100644
index 00000000..6688e3c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSaveKeyMapping.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.data.xml.impl.UIData;
+import com.l2jserver.gameserver.model.ActionKey;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
+
+/**
+ * Request Save Key Mapping client packet.
+ * @author mrTJO
+ * @author Zoey76
+ */
+public class RequestSaveKeyMapping extends L2GameClientPacket {
+	private static final String _C__D0_22_REQUESTSAVEKEYMAPPING = "[C] D0:22 RequestSaveKeyMapping";
+	
+	private final Map<Integer, List<ActionKey>> _keyMap = new HashMap<>();
+	private final Map<Integer, List<Integer>> _catMap = new HashMap<>();
+	
+	@Override
+	protected void readImpl() {
+		int category = 0;
+		
+		readD(); // Unknown
+		readD(); // Unknown
+		final int _tabNum = readD();
+		for (int i = 0; i < _tabNum; i++) {
+			int cmd1Size = readC();
+			for (int j = 0; j < cmd1Size; j++) {
+				UIData.addCategory(_catMap, category, readC());
+			}
+			category++;
+			
+			int cmd2Size = readC();
+			for (int j = 0; j < cmd2Size; j++) {
+				UIData.addCategory(_catMap, category, readC());
+			}
+			category++;
+			
+			int cmdSize = readD();
+			for (int j = 0; j < cmdSize; j++) {
+				int cmd = readD();
+				int key = readD();
+				int tgKey1 = readD();
+				int tgKey2 = readD();
+				int show = readD();
+				UIData.addKey(_keyMap, i, new ActionKey(i, cmd, key, tgKey1, tgKey2, show));
+			}
+		}
+		readD();
+		readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (!character().storeUISettings() || (player == null) || (getClient().getState() != GameClientState.IN_GAME)) {
+			return;
+		}
+		player.getUISettings().storeAll(_catMap, _keyMap);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_22_REQUESTSAVEKEYMAPPING;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java
new file mode 100644
index 00000000..f04477be
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSeedPhase.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExShowSeedMapInfo;
+
+/**
+ * RequestSeedPhase client packet
+ */
+public class RequestSeedPhase extends L2GameClientPacket {
+	private static final String _C__D0_63_REQUESTSEEDPHASE = "[C] D0:63 RequestSeedPhase";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		activeChar.sendPacket(ExShowSeedMapInfo.STATIC_PACKET);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_63_REQUESTSEEDPHASE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java
new file mode 100644
index 00000000..c18efcc5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.data.xml.impl.BuyListData;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.holders.UniqueItemHolder;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExBuySellList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * RequestSellItem client packet class.
+ */
+public final class RequestSellItem extends L2GameClientPacket {
+	private static final String _C__37_REQUESTSELLITEM = "[C] 37 RequestSellItem";
+	
+	private static final int BATCH_LENGTH = 16;
+	
+	private int _listId;
+	private List<UniqueItemHolder> _items = null;
+	
+	@Override
+	protected void readImpl() {
+		_listId = readD();
+		int size = readD();
+		if ((size <= 0) || (size > MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(size);
+		for (int i = 0; i < size; i++) {
+			int objectId = readD();
+			int itemId = readD();
+			long count = readQ();
+			if ((objectId < 1) || (itemId < 1) || (count < 1)) {
+				_items = null;
+				return;
+			}
+			_items.add(new UniqueItemHolder(itemId, objectId, count));
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		processSell();
+	}
+	
+	protected void processSell() {
+		L2PcInstance player = getClient().getActiveChar();
+		
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("buy")) {
+			player.sendMessage("You are buying too fast.");
+			return;
+		}
+		
+		if (_items == null) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Alt game - Karma punishment
+		if (!character().karmaPlayerCanShop() && (player.getKarma() > 0)) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2Object target = player.getTarget();
+		L2Character merchant = null;
+		if (!player.isGM()) {
+			if ((target == null) || (!player.isInsideRadius(target, INTERACTION_DISTANCE, true, false)) || (player.getInstanceId() != target.getInstanceId())) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			if (target instanceof L2MerchantInstance) {
+				merchant = (L2Character) target;
+			} else {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		}
+		
+		if ((merchant == null) && !player.isGM()) {
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final L2BuyList buyList = BuyListData.getInstance().getBuyList(_listId);
+		if (buyList == null) {
+			Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false BuyList list_id " + _listId);
+			return;
+		}
+		
+		if (merchant != null) {
+			if (!buyList.isNpcAllowed(merchant.getId())) {
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+		}
+		
+		long totalPrice = 0;
+		// Proceed the sell
+		for (UniqueItemHolder i : _items) {
+			L2ItemInstance item = player.checkItemManipulation(i.getObjectId(), i.getCount(), "sell");
+			if ((item == null) || (!item.isSellable())) {
+				continue;
+			}
+			
+			long price = item.getReferencePrice() / 2;
+			totalPrice += price * i.getCount();
+			if (((character().getMaxAdena() / i.getCount()) < price) || (totalPrice > character().getMaxAdena())) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to purchase over " + character().getMaxAdena() + " adena worth of goods.");
+				return;
+			}
+			
+			if (general().allowRefund()) {
+				item = player.getInventory().transferItem("Sell", i.getObjectId(), i.getCount(), player.getRefund(), player, merchant);
+			} else {
+				item = player.getInventory().destroyItem("Sell", i.getObjectId(), i.getCount(), player, merchant);
+			}
+		}
+		player.addAdena("Sell", totalPrice, merchant, false);
+		
+		// Update current load as well
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+		player.sendPacket(new ExBuySellList(player, true));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__37_REQUESTSELLITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSendFriendMsg.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSendFriendMsg.java
new file mode 100644
index 00000000..375fc966
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSendFriendMsg.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.L2FriendSay;
+
+/**
+ * Recieve Private (Friend) Message - 0xCC Format: c SS S: Message S: Receiving Player
+ * @author Tempy
+ */
+public final class RequestSendFriendMsg extends L2GameClientPacket {
+	
+	private static final String _C__6B_REQUESTSENDMSG = "[C] 6B RequestSendFriendMsg";
+	
+	private static final Logger LOG_CHAT = LoggerFactory.getLogger("chat");
+	
+	private String _message;
+	private String _receiver;
+	
+	@Override
+	protected void readImpl() {
+		_message = readS();
+		_receiver = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_message == null) || _message.isEmpty() || (_message.length() > 300)) {
+			return;
+		}
+		
+		final L2PcInstance targetPlayer = L2World.getInstance().getPlayer(_receiver);
+		if ((targetPlayer == null) || !targetPlayer.isFriend(activeChar.getObjectId())) {
+			activeChar.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+			return;
+		}
+		
+		if (general().logChat()) {
+			LOG_CHAT.info("PRIV_MSG {} says [{}] to {}.", activeChar.getName(), _message, _receiver);
+		}
+		
+		targetPlayer.sendPacket(new L2FriendSay(activeChar.getName(), _receiver, _message));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__6B_REQUESTSENDMSG;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java
new file mode 100644
index 00000000..a36d226a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.BlockList;
+import com.l2jserver.gameserver.model.L2AccessLevel;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.itemcontainer.Mail;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExNoticePostSent;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestSendPost extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestSendPost.class);
+	
+	private static final String _C__D0_66_REQUESTSENDPOST = "[C] D0:66 RequestSendPost";
+	
+	private static final int BATCH_LENGTH = 12; // length of the one item
+	
+	private static final int MAX_RECV_LENGTH = 16;
+	private static final int MAX_SUBJ_LENGTH = 128;
+	private static final int MAX_TEXT_LENGTH = 512;
+	private static final int MAX_ATTACHMENTS = 8;
+	private static final int INBOX_SIZE = 240;
+	private static final int OUTBOX_SIZE = 240;
+	
+	private static final int MESSAGE_FEE = 100;
+	private static final int MESSAGE_FEE_PER_SLOT = 1000; // 100 adena message fee + 1000 per each item slot
+	
+	private String _receiver;
+	private boolean _isCod;
+	private String _subject;
+	private String _text;
+	private AttachmentItem[] _items = null;
+	private long _reqAdena;
+	
+	public RequestSendPost() {
+	}
+	
+	@Override
+	protected void readImpl() {
+		_receiver = readS();
+		_isCod = readD() != 0;
+		_subject = readS();
+		_text = readS();
+		
+		int attachCount = readD();
+		if ((attachCount < 0) || (attachCount > MAX_ITEM_IN_PACKET) || (((attachCount * BATCH_LENGTH) + 8) != _buf.remaining())) {
+			return;
+		}
+		
+		if (attachCount > 0) {
+			_items = new AttachmentItem[attachCount];
+			for (int i = 0; i < attachCount; i++) {
+				int objectId = readD();
+				long count = readQ();
+				if ((objectId < 1) || (count < 0)) {
+					_items = null;
+					return;
+				}
+				_items[i] = new AttachmentItem(objectId, count);
+			}
+		}
+		
+		_reqAdena = readQ();
+	}
+	
+	@Override
+	public void runImpl() {
+		if (!general().allowMail()) {
+			return;
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (!general().allowAttachments()) {
+			_items = null;
+			_isCod = false;
+			_reqAdena = 0;
+		}
+		
+		if (!activeChar.getAccessLevel().allowTransaction()) {
+			activeChar.sendMessage("Transactions are disabled for your Access Level.");
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE) && (_items != null)) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_NOT_IN_PEACE_ZONE);
+			return;
+		}
+		
+		if (activeChar.getActiveTradeList() != null) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_DURING_EXCHANGE);
+			return;
+		}
+		
+		if (activeChar.isEnchanting()) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_DURING_ENCHANT);
+			return;
+		}
+		
+		if (activeChar.getPrivateStoreType() != PrivateStoreType.NONE) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_PRIVATE_STORE);
+			return;
+		}
+		
+		if (_receiver.length() > MAX_RECV_LENGTH) {
+			activeChar.sendPacket(SystemMessageId.ALLOWED_LENGTH_FOR_RECIPIENT_EXCEEDED);
+			return;
+		}
+		
+		if (_subject.length() > MAX_SUBJ_LENGTH) {
+			activeChar.sendPacket(SystemMessageId.ALLOWED_LENGTH_FOR_TITLE_EXCEEDED);
+			return;
+		}
+		
+		if (_text.length() > MAX_TEXT_LENGTH) {
+			// not found message for this
+			activeChar.sendPacket(SystemMessageId.ALLOWED_LENGTH_FOR_TITLE_EXCEEDED);
+			return;
+		}
+		
+		if ((_items != null) && (_items.length > MAX_ATTACHMENTS)) {
+			activeChar.sendPacket(SystemMessageId.ITEM_SELECTION_POSSIBLE_UP_TO_8);
+			return;
+		}
+		
+		if ((_reqAdena < 0) || (_reqAdena > character().getMaxAdena())) {
+			return;
+		}
+		
+		if (_isCod) {
+			if (_reqAdena == 0) {
+				activeChar.sendPacket(SystemMessageId.PAYMENT_AMOUNT_NOT_ENTERED);
+				return;
+			}
+			if ((_items == null) || (_items.length == 0)) {
+				activeChar.sendPacket(SystemMessageId.PAYMENT_REQUEST_NO_ITEM);
+				return;
+			}
+		}
+		
+		final int receiverId = CharNameTable.getInstance().getIdByName(_receiver);
+		if (receiverId <= 0) {
+			activeChar.sendPacket(SystemMessageId.RECIPIENT_NOT_EXIST);
+			return;
+		}
+		
+		if (receiverId == activeChar.getObjectId()) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANT_SEND_MAIL_TO_YOURSELF);
+			return;
+		}
+		
+		final int level = CharNameTable.getInstance().getAccessLevelById(receiverId);
+		final L2AccessLevel accessLevel = AdminData.getInstance().getAccessLevel(level);
+		
+		if (accessLevel.isGm() && !activeChar.getAccessLevel().isGm()) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CANNOT_MAIL_GM_C1);
+			sm.addString(_receiver);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		if (activeChar.isJailed() && ((general().jailDisableTransaction() && (_items != null)) || general().jailDisableChat())) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_NOT_IN_PEACE_ZONE);
+			return;
+		}
+		
+		if (BlockList.isInBlockList(receiverId, activeChar.getObjectId())) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_BLOCKED_YOU_CANNOT_MAIL);
+			sm.addString(_receiver);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		if (MailManager.getInstance().getOutboxSize(activeChar.getObjectId()) >= OUTBOX_SIZE) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_MAIL_LIMIT_EXCEEDED);
+			return;
+		}
+		
+		if (MailManager.getInstance().getInboxSize(receiverId) >= INBOX_SIZE) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_MAIL_LIMIT_EXCEEDED);
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getSendMail().tryPerformAction("sendmail")) {
+			activeChar.sendPacket(SystemMessageId.CANT_FORWARD_LESS_THAN_MINUTE);
+			return;
+		}
+		
+		Message msg = new Message(activeChar.getObjectId(), receiverId, _isCod, _subject, _text, _reqAdena);
+		if (removeItems(activeChar, msg)) {
+			MailManager.getInstance().sendMessage(msg);
+			activeChar.sendPacket(ExNoticePostSent.valueOf(true));
+			activeChar.sendPacket(SystemMessageId.MAIL_SUCCESSFULLY_SENT);
+		}
+	}
+	
+	private boolean removeItems(L2PcInstance player, Message msg) {
+		long currentAdena = player.getAdena();
+		long fee = MESSAGE_FEE;
+		
+		if (_items != null) {
+			for (AttachmentItem i : _items) {
+				// Check validity of requested item
+				L2ItemInstance item = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach");
+				if ((item == null) || !item.isTradeable() || item.isEquipped()) {
+					player.sendPacket(SystemMessageId.CANT_FORWARD_BAD_ITEM);
+					return false;
+				}
+				
+				fee += MESSAGE_FEE_PER_SLOT;
+				
+				if (item.getId() == ADENA_ID) {
+					currentAdena -= i.getCount();
+				}
+			}
+		}
+		
+		// Check if enough adena and charge the fee
+		if ((currentAdena < fee) || !player.reduceAdena("MailFee", fee, null, false)) {
+			player.sendPacket(SystemMessageId.CANT_FORWARD_NO_ADENA);
+			return false;
+		}
+		
+		if (_items == null) {
+			return true;
+		}
+		
+		Mail attachments = msg.createAttachments();
+		
+		// message already has attachments ? oO
+		if (attachments == null) {
+			return false;
+		}
+		
+		final StringBuilder recv = new StringBuilder(32);
+		StringUtil.append(recv, msg.getReceiverName(), "[", String.valueOf(msg.getReceiverId()), "]");
+		final String receiver = recv.toString();
+		
+		// Proceed to the transfer
+		InventoryUpdate playerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+		for (AttachmentItem i : _items) {
+			// Check validity of requested item
+			L2ItemInstance oldItem = player.checkItemManipulation(i.getObjectId(), i.getCount(), "attach");
+			if ((oldItem == null) || !oldItem.isTradeable() || oldItem.isEquipped()) {
+				LOG.warn("Error adding attachment for char {} (olditem == null)", player.getName());
+				return false;
+			}
+			
+			final L2ItemInstance newItem = player.getInventory().transferItem("SendMail", i.getObjectId(), i.getCount(), attachments, player, receiver);
+			if (newItem == null) {
+				LOG.warn("Error adding attachment for char {} (newitem == null)", player.getName());
+				continue;
+			}
+			newItem.setItemLocation(newItem.getItemLocation(), msg.getId());
+			
+			if (playerIU != null) {
+				if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+					playerIU.addModifiedItem(oldItem);
+				} else {
+					playerIU.addRemovedItem(oldItem);
+				}
+			}
+		}
+		
+		// Send updated item list to the player
+		player.sendPacket(Objects.requireNonNullElseGet(playerIU, () -> new ItemList(player, false)));
+		
+		// Update current load status on player
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+		
+		return true;
+	}
+	
+	private static class AttachmentItem {
+		private final int _objectId;
+		private final long _count;
+		
+		public AttachmentItem(int id, long num) {
+			_objectId = id;
+			_count = num;
+		}
+		
+		public int getObjectId() {
+			return _objectId;
+		}
+		
+		public long getCount() {
+			return _count;
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_66_REQUESTSENDPOST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java
new file mode 100644
index 00000000..5f7a43ea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPost.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExReplySentPost;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestSentPost extends L2GameClientPacket {
+	private static final String _C__D0_6E_REQUESTSENTPOST = "[C] D0:6E RequestSentPost";
+	
+	private int _msgId;
+	
+	@Override
+	protected void readImpl() {
+		_msgId = readD();
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !general().allowMail()) {
+			return;
+		}
+		
+		Message msg = MailManager.getInstance().getMessage(_msgId);
+		if (msg == null) {
+			return;
+		}
+		
+		if (!activeChar.isInsideZone(ZoneId.PEACE) && msg.hasAttachments()) {
+			activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+			return;
+		}
+		
+		if (msg.getSenderId() != activeChar.getObjectId()) {
+			Util.handleIllegalPlayerAction(activeChar, "Player " + activeChar.getName() + " tried to read not own post!");
+			return;
+		}
+		
+		if (msg.isDeletedBySender()) {
+			return;
+		}
+		
+		activeChar.sendPacket(new ExReplySentPost(msg));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_6E_REQUESTSENTPOST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPostList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPostList.java
new file mode 100644
index 00000000..989fa4ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSentPostList.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExShowSentPostList;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public final class RequestSentPostList extends L2GameClientPacket {
+	private static final String _C__D0_6C_REQUESTSENTPOSTLIST = "[C] D0:6C RequestSentPostList";
+	
+	@Override
+	protected void readImpl() {
+		// trigger packet
+	}
+	
+	@Override
+	public void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || !general().allowMail()) {
+			return;
+		}
+		
+		// if (!activeChar.isInsideZone(ZoneId.PEACE))
+		// {
+		// activeChar.sendPacket(SystemMessageId.CANT_USE_MAIL_OUTSIDE_PEACE_ZONE);
+		// return;
+		// }
+		
+		activeChar.sendPacket(new ExShowSentPostList(activeChar.getObjectId()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_6C_REQUESTSENTPOSTLIST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetAllyCrest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetAllyCrest.java
new file mode 100644
index 00000000..c059cd5c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetAllyCrest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Crest;
+import com.l2jserver.gameserver.model.L2Crest.CrestType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Client packet for setting ally crest.
+ */
+public final class RequestSetAllyCrest extends L2GameClientPacket {
+	private static final String _C__91_REQUESTSETALLYCREST = "[C] 91 RequestSetAllyCrest";
+	
+	private int _length;
+	private byte[] _data = null;
+	
+	@Override
+	protected void readImpl() {
+		_length = readD();
+		if (_length > 192) {
+			return;
+		}
+		
+		_data = new byte[_length];
+		readB(_data);
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (_length < 0) {
+			activeChar.sendMessage("File transfer error.");
+			return;
+		}
+		
+		if (_length > 192) {
+			activeChar.sendPacket(SystemMessageId.ADJUST_IMAGE_8_12);
+			return;
+		}
+		
+		if (activeChar.getAllyId() == 0) {
+			activeChar.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
+			return;
+		}
+		
+		final L2Clan leaderClan = ClanTable.getInstance().getClan(activeChar.getAllyId());
+		
+		if ((activeChar.getClanId() != leaderClan.getId()) || !activeChar.isClanLeader()) {
+			activeChar.sendPacket(SystemMessageId.FEATURE_ONLY_FOR_ALLIANCE_LEADER);
+			return;
+		}
+		
+		if (_length == 0) {
+			if (leaderClan.getAllyCrestId() != 0) {
+				leaderClan.changeAllyCrest(0, false);
+			}
+		} else {
+			final L2Crest crest = CrestTable.getInstance().createCrest(_data, CrestType.ALLY);
+			if (crest != null) {
+				leaderClan.changeAllyCrest(crest.getId(), false);
+				activeChar.sendPacket(SystemMessageId.CLAN_CREST_WAS_SUCCESSFULLY_REGISTRED);
+			}
+		}
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__91_REQUESTSETALLYCREST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
new file mode 100644
index 00000000..d159cdf3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCastleSiegeTime.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.castle;
+
+import java.util.Calendar;
+import java.util.Date;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.SiegeInfo;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.util.Broadcast;
+
+/**
+ * @author UnAfraid
+ */
+public class RequestSetCastleSiegeTime extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestSetCastleSiegeTime.class);
+	
+	private int _castleId;
+	private long _time;
+	
+	@Override
+	protected void readImpl() {
+		_castleId = readD();
+		_time = readD();
+		_time *= 1000;
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		final Castle castle = CastleManager.getInstance().getCastleById(_castleId);
+		if ((activeChar == null) || (castle == null)) {
+			LOG.warn("activeChar: {} castle: {} castleId: {}", activeChar, castle, _castleId);
+			return;
+		}
+		if ((castle.getOwnerId() > 0) && (castle.getOwnerId() != activeChar.getClanId())) {
+			LOG.warn("activeChar: {} castle: {} castleId: {} is trying to change siege date of not his own castle!", activeChar, castle, _castleId);
+			return;
+		}
+		
+		if (!activeChar.isClanLeader()) {
+			LOG.warn("activeChar: {} castle: {} castleId: {} is trying to change siege date but is not clan leader!", activeChar, castle, _castleId);
+			return;
+		}
+		
+		if (!castle.getIsTimeRegistrationOver()) {
+			if (isSiegeTimeValid(castle.getSiegeDate().getTimeInMillis(), _time)) {
+				castle.getSiegeDate().setTimeInMillis(_time);
+				castle.setIsTimeRegistrationOver(true);
+				castle.getSiege().saveSiegeDate();
+				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S1_ANNOUNCED_SIEGE_TIME);
+				msg.addCastleId(_castleId);
+				Broadcast.toAllOnlinePlayers(msg);
+				activeChar.sendPacket(new SiegeInfo(castle));
+			} else {
+				LOG.warn("activeChar: {} castle: {} castleId: {} is trying to an invalid time ({} !", activeChar, castle, _castleId, new Date(_time));
+			}
+		} else {
+			LOG.warn("activeChar: {} castle: {} castleId: {} is trying to change siege date but currently not possible!", activeChar, castle, _castleId);
+		}
+	}
+	
+	private static boolean isSiegeTimeValid(long siegeDate, long chosenDate) {
+		Calendar cal1 = Calendar.getInstance();
+		cal1.setTimeInMillis(siegeDate);
+		cal1.set(Calendar.MINUTE, 0);
+		cal1.set(Calendar.SECOND, 0);
+		
+		Calendar cal2 = Calendar.getInstance();
+		cal2.setTimeInMillis(chosenDate);
+		
+		for (int hour : castle().getSiegeHourList()) {
+			cal1.set(Calendar.HOUR_OF_DAY, hour);
+			if (isEqual(cal1, cal2, Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH, Calendar.HOUR, Calendar.MINUTE, Calendar.SECOND)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	private static boolean isEqual(Calendar cal1, Calendar cal2, int... fields) {
+		for (int field : fields) {
+			if (cal1.get(field) != cal2.get(field)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	@Override
+	public String getType() {
+		return getClass().getSimpleName();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCrop.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCrop.java
new file mode 100644
index 00000000..662cd5dc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetCrop.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author l3x
+ */
+public final class RequestSetCrop extends L2GameClientPacket {
+	private static final int BATCH_LENGTH = 21; // length of the one item
+	
+	private int _manorId;
+	private List<CropProcure> _items;
+	
+	@Override
+	protected void readImpl() {
+		_manorId = readD();
+		final int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(count);
+		for (int i = 0; i < count; i++) {
+			final int itemId = readD();
+			final long sales = readQ();
+			final long price = readQ();
+			final int type = readC();
+			if ((itemId < 1) || (sales < 0) || (price < 0)) {
+				_items.clear();
+				return;
+			}
+			
+			if (sales > 0) {
+				_items.add(new CropProcure(itemId, sales, type, sales, price));
+			}
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_items.isEmpty()) {
+			return;
+		}
+		
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		if (!manor.isModifiablePeriod()) {
+			sendActionFailed();
+			return;
+		}
+		
+		// Check player privileges
+		final L2PcInstance player = getActiveChar();
+		if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player)) {
+			sendActionFailed();
+			return;
+		}
+		
+		// Filter crops with start amount lower than 0 and incorrect price
+		final List<CropProcure> list = new ArrayList<>(_items.size());
+		for (CropProcure cp : _items) {
+			final L2Seed s = manor.getSeedByCrop(cp.getId(), _manorId);
+			if ((s != null) && (cp.getStartAmount() <= s.getCropLimit()) && (cp.getPrice() >= s.getCropMinPrice()) && (cp.getPrice() <= s.getCropMaxPrice())) {
+				list.add(cp);
+			}
+		}
+		
+		// Save crop list
+		manor.setNextCropProcure(list, _manorId);
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] D0:04 RequestSetCrop";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetPledgeCrest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetPledgeCrest.java
new file mode 100644
index 00000000..5ad36514
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetPledgeCrest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Crest;
+import com.l2jserver.gameserver.model.L2Crest.CrestType;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Client packet for setting/deleting clan crest.
+ */
+public final class RequestSetPledgeCrest extends L2GameClientPacket {
+	private static final String _C__09_REQUESTSETPLEDGECREST = "[C] 09 RequestSetPledgeCrest";
+	
+	private int _length;
+	private byte[] _data = null;
+	
+	@Override
+	protected void readImpl() {
+		_length = readD();
+		if (_length > 256) {
+			return;
+		}
+		
+		_data = new byte[_length];
+		readB(_data);
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_length < 0)) {
+			activeChar.sendPacket(SystemMessageId.WRONG_SIZE_UPLOADED_CREST);
+			return;
+		}
+		
+		if (_length > 256) {
+			activeChar.sendPacket(SystemMessageId.THE_SIZE_OF_THE_IMAGE_FILE_IS_INAPPROPRIATE);
+			return;
+		}
+		
+		final L2Clan clan = activeChar.getClan();
+		if (clan == null) {
+			return;
+		}
+		
+		if (clan.getDissolvingExpiryTime() > System.currentTimeMillis()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_SET_CREST_WHILE_DISSOLUTION_IN_PROGRESS);
+			return;
+		}
+		
+		if (!activeChar.hasClanPrivilege(ClanPrivilege.CL_REGISTER_CREST)) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		if (_length == 0) {
+			if (clan.getCrestId() != 0) {
+				clan.changeClanCrest(0);
+				activeChar.sendPacket(SystemMessageId.CLAN_CREST_HAS_BEEN_DELETED);
+			}
+		} else {
+			if (clan.getLevel() < 3) {
+				activeChar.sendPacket(SystemMessageId.CLAN_LVL_3_NEEDED_TO_SET_CREST);
+				return;
+			}
+			
+			final L2Crest crest = CrestTable.getInstance().createCrest(_data, CrestType.PLEDGE);
+			if (crest != null) {
+				clan.changeClanCrest(crest.getId());
+				activeChar.sendPacket(SystemMessageId.CLAN_CREST_WAS_SUCCESSFULLY_REGISTRED);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__09_REQUESTSETPLEDGECREST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetSeed.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetSeed.java
new file mode 100644
index 00000000..36725624
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSetSeed.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.SeedProduction;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author l3x
+ */
+public class RequestSetSeed extends L2GameClientPacket {
+	private static final int BATCH_LENGTH = 20; // length of the one item
+	
+	private int _manorId;
+	private List<SeedProduction> _items;
+	
+	@Override
+	protected void readImpl() {
+		_manorId = readD();
+		final int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(count);
+		for (int i = 0; i < count; i++) {
+			final int itemId = readD();
+			final long sales = readQ();
+			final long price = readQ();
+			if ((itemId < 1) || (sales < 0) || (price < 0)) {
+				_items.clear();
+				return;
+			}
+			
+			if (sales > 0) {
+				_items.add(new SeedProduction(itemId, sales, price, sales));
+			}
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_items.isEmpty()) {
+			return;
+		}
+		
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		if (!manor.isModifiablePeriod()) {
+			sendActionFailed();
+			return;
+		}
+		
+		// Check player privileges
+		final L2PcInstance player = getActiveChar();
+		if ((player == null) || (player.getClan() == null) || (player.getClan().getCastleId() != _manorId) || !player.hasClanPrivilege(ClanPrivilege.CS_MANOR_ADMIN) || !player.getLastFolkNPC().canInteract(player)) {
+			sendActionFailed();
+			return;
+		}
+		
+		// Filter seeds with start amount lower than 0 and incorrect price
+		final List<SeedProduction> list = new ArrayList<>(_items.size());
+		for (SeedProduction sp : _items) {
+			final L2Seed s = manor.getSeed(sp.getId());
+			if ((s != null) && (sp.getStartAmount() <= s.getSeedLimit()) && (sp.getPrice() >= s.getSeedMinPrice()) && (sp.getPrice() <= s.getSeedMaxPrice())) {
+				list.add(sp);
+			}
+		}
+		
+		// Save new list
+		manor.setNextSeedProduction(list, _manorId);
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] D0:03 RequestSetSeed";
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java
new file mode 100644
index 00000000..7c3f3248
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutDel.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestShortCutDel extends L2GameClientPacket {
+	private static final String _C__3F_REQUESTSHORTCUTDEL = "[C] 3F RequestShortCutDel";
+	
+	private int _slot;
+	private int _page;
+	
+	@Override
+	protected void readImpl() {
+		int id = readD();
+		_slot = id % 12;
+		_page = id / 12;
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_page > 10) || (_page < 0)) {
+			return;
+		}
+		
+		activeChar.deleteShortCut(_slot, _page);
+		// client needs no confirmation. this packet is just to inform the server
+	}
+	
+	@Override
+	public String getType() {
+		return _C__3F_REQUESTSHORTCUTDEL;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java
new file mode 100644
index 00000000..5b39f4f7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShortCutReg.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.enums.ShortcutType;
+import com.l2jserver.gameserver.model.Shortcut;
+import com.l2jserver.gameserver.network.serverpackets.ShortCutRegister;
+
+public final class RequestShortCutReg extends L2GameClientPacket {
+	private static final String _C__3D_REQUESTSHORTCUTREG = "[C] 3D RequestShortCutReg";
+	
+	private ShortcutType _type;
+	private int _id;
+	private int _slot;
+	private int _page;
+	private int _lvl;
+	private int _characterType; // 1 - player, 2 - pet
+	
+	@Override
+	protected void readImpl() {
+		final int typeId = readD();
+		_type = ShortcutType.values()[(typeId < 1) || (typeId > 6) ? 0 : typeId];
+		final int slot = readD();
+		_slot = slot % 12;
+		_page = slot / 12;
+		_id = readD();
+		_lvl = readD();
+		_characterType = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if ((getActiveChar() == null) || (_page > 10) || (_page < 0)) {
+			return;
+		}
+		
+		final Shortcut sc = new Shortcut(_slot, _page, _type, _id, _lvl, _characterType);
+		getActiveChar().registerShortCut(sc);
+		sendPacket(new ShortCutRegister(sc));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__3D_REQUESTSHORTCUTREG;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShowBoard.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShowBoard.java
new file mode 100644
index 00000000..91fa37c6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShowBoard.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.handler.CommunityBoardHandler;
+
+/**
+ * RequestShowBoard client packet implementation.
+ * @author Zoey76
+ */
+public final class RequestShowBoard extends L2GameClientPacket {
+	private static final String _C__5E_REQUESTSHOWBOARD = "[C] 5E RequestShowBoard";
+	
+	@SuppressWarnings("unused")
+	private int _unknown;
+	
+	@Override
+	protected void readImpl() {
+		_unknown = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		CommunityBoardHandler.getInstance().handleParseCommand(general().getBBSDefault(), getActiveChar());
+	}
+	
+	@Override
+	public String getType() {
+		return _C__5E_REQUESTSHOWBOARD;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java
new file mode 100644
index 00000000..4ad1cb6f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestShowMiniMap.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ShowMiniMap;
+
+/**
+ * @since 2005/04/10 00:17:44
+ */
+public final class RequestShowMiniMap extends L2GameClientPacket {
+	private static final String _C__6C_REQUESTSHOWMINIMAP = "[C] 6C RequestShowMiniMap";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		activeChar.sendPacket(new ShowMiniMap(1665));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__6C_REQUESTSHOWMINIMAP;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java
new file mode 100644
index 00000000..64499c7d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeAttackerList.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.network.serverpackets.SiegeAttackerList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestSiegeAttackerList extends L2GameClientPacket {
+	private static final String _C__AB_RequestSiegeAttackerList = "[C] AB RequestSiegeAttackerList";
+	
+	private int _castleId;
+	
+	@Override
+	protected void readImpl() {
+		_castleId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		Castle castle = CastleManager.getInstance().getCastleById(_castleId);
+		if (castle != null) {
+			SiegeAttackerList sal = new SiegeAttackerList(castle);
+			sendPacket(sal);
+		} else {
+			SiegableHall hall = ClanHallSiegeManager.getInstance().getSiegableHall(_castleId);
+			if (hall != null) {
+				SiegeAttackerList sal = new SiegeAttackerList(hall);
+				sendPacket(sal);
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__AB_RequestSiegeAttackerList;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java
new file mode 100644
index 00000000..f85219f4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeDefenderList.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.network.serverpackets.SiegeDefenderList;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestSiegeDefenderList extends L2GameClientPacket {
+	private static final String _C__AC_REQUESTSIEGEDEFENDERLIST = "[C] AC RequestSiegeDefenderList";
+	
+	private int _castleId;
+	
+	@Override
+	protected void readImpl() {
+		_castleId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		Castle castle = CastleManager.getInstance().getCastleById(_castleId);
+		if (castle == null) {
+			return;
+		}
+		SiegeDefenderList sdl = new SiegeDefenderList(castle);
+		sendPacket(sdl);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__AC_REQUESTSIEGEDEFENDERLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeInfo.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeInfo.java
new file mode 100644
index 00000000..81db0f7a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSiegeInfo.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+/**
+ * Format: (c) (no data, trigger)
+ * @author -Wooden-
+ */
+public class RequestSiegeInfo extends L2GameClientPacket {
+	private static final String _C__58_REQUESTSIEGEINFO = "[C] 58 RequestSiegeInfo";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		// TODO this
+	}
+	
+	@Override
+	public String getType() {
+		return _C__58_REQUESTSIEGEINFO;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSkillList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSkillList.java
new file mode 100644
index 00000000..7cd73652
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSkillList.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @version 1.4
+ */
+public final class RequestSkillList extends L2GameClientPacket {
+	private static final String _C__50_REQUESTSKILLLIST = "[C] 50 RequestSkillList";
+	
+	@Override
+	protected void readImpl() {
+		// Trigger skill.
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance cha = getClient().getActiveChar();
+		
+		if (cha != null) {
+			cha.sendSkillList();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__50_REQUESTSKILLLIST;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java
new file mode 100644
index 00000000..9be16a42
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestStartPledgeWar.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class RequestStartPledgeWar extends L2GameClientPacket {
+	private static final String _C__03_REQUESTSTARTPLEDGEWAR = "[C] 03 RequestStartPledgewar";
+	
+	private String _pledgeName;
+	
+	@Override
+	protected void readImpl() {
+		_pledgeName = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2Clan _clan = getClient().getActiveChar().getClan();
+		if (_clan == null) {
+			return;
+		}
+		
+		if ((_clan.getLevel() < 3) || (_clan.getMembersCount() < character().getClanMembersForWar())) {
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_WAR_DECLARED_IF_CLAN_LVL3_OR_15_MEMBER));
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		} else if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName);
+		if (clan == null) {
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_WAR_CANNOT_DECLARED_CLAN_NOT_EXIST));
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		} else if ((_clan.getAllyId() == clan.getAllyId()) && (_clan.getAllyId() != 0)) {
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_WAR_AGAINST_A_ALLIED_CLAN_NOT_WORK));
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		} else if ((clan.getLevel() < 3) || (clan.getMembersCount() < character().getClanMembersForWar())) {
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_WAR_DECLARED_IF_CLAN_LVL3_OR_15_MEMBER));
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		} else if (_clan.isAtWarWith(clan.getId())) {
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ALREADY_AT_WAR_WITH_S1_WAIT_5_DAYS);
+			sm.addString(clan.getName());
+			player.sendPacket(sm);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		ClanTable.getInstance().storeclanswars(player.getClanId(), clan.getId());
+		
+		for (L2PcInstance member : _clan.getOnlineMembers(0)) {
+			member.broadcastUserInfo();
+		}
+		
+		for (L2PcInstance member : clan.getOnlineMembers(0)) {
+			member.broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__03_REQUESTSTARTPLEDGEWAR;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java
new file mode 100644
index 00000000..8b91998a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestStopPledgeWar.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+
+public final class RequestStopPledgeWar extends L2GameClientPacket {
+	private static final String _C__05_REQUESTSTOPPLEDGEWAR = "[C] 05 RequestStopPledgeWar";
+	
+	private String _pledgeName;
+	
+	@Override
+	protected void readImpl() {
+		_pledgeName = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		L2Clan playerClan = player.getClan();
+		if (playerClan == null) {
+			return;
+		}
+		
+		L2Clan clan = ClanTable.getInstance().getClanByName(_pledgeName);
+		
+		if (clan == null) {
+			player.sendMessage("No such clan.");
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (!playerClan.isAtWarWith(clan.getId())) {
+			player.sendMessage("You aren't at war with this clan.");
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Check if player who does the request has the correct rights to do it
+		if (!player.hasClanPrivilege(ClanPrivilege.CL_PLEDGE_WAR)) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		// LOG.info("RequestStopPledgeWar: By leader or authorized player: " + playerClan.getLeaderName() + " of clan: "
+		// + playerClan.getName() + " to clan: " + _pledgeName);
+		
+		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
+		// if(leader != null && leader.isOnline() == 0)
+		// {
+		// player.sendMessage("Clan leader isn't online.");
+		// player.sendPacket(ActionFailed.STATIC_PACKET);
+		// return;
+		// }
+		
+		// if (leader.isProcessingRequest())
+		// {
+		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.S1_IS_BUSY_TRY_LATER);
+		// sm.addString(leader.getName());
+		// player.sendPacket(sm);
+		// return;
+		// }
+		
+		for (L2ClanMember member : playerClan.getMembers()) {
+			if ((member == null) || (member.getPlayerInstance() == null)) {
+				continue;
+			}
+			if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(member.getPlayerInstance())) {
+				player.sendPacket(SystemMessageId.CANT_STOP_CLAN_WAR_WHILE_IN_COMBAT);
+				return;
+			}
+		}
+		
+		ClanTable.getInstance().deleteclanswars(playerClan.getId(), clan.getId());
+		
+		for (L2PcInstance member : playerClan.getOnlineMembers(0)) {
+			member.broadcastUserInfo();
+		}
+		
+		for (L2PcInstance member : clan.getOnlineMembers(0)) {
+			member.broadcastUserInfo();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__05_REQUESTSTOPPLEDGEWAR;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
new file mode 100644
index 00000000..e01de5cf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestSurrenderPledgeWar.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class RequestSurrenderPledgeWar extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestSurrenderPledgeWar.class);
+	
+	private static final String _C__07_REQUESTSURRENDERPLEDGEWAR = "[C] 07 RequestSurrenderPledgeWar";
+	
+	private String _pledgeName;
+	
+	@Override
+	protected void readImpl() {
+		_pledgeName = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final var player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		final var _clan = player.getClan();
+		if (_clan == null) {
+			return;
+		}
+		
+		final var clan = ClanTable.getInstance().getClanByName(_pledgeName);
+		if (clan == null) {
+			player.sendMessage("No such clan.");
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		LOG.info("RequestSurrenderPledgeWar by {} with {}", _clan.getName(), _pledgeName);
+		
+		if (!_clan.isAtWarWith(clan.getId())) {
+			player.sendMessage("You aren't at war with this clan.");
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		final var msg = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SURRENDERED_TO_THE_S1_CLAN);
+		msg.addString(_pledgeName);
+		player.sendPacket(msg);
+		ClanTable.getInstance().deleteclanswars(_clan.getId(), clan.getId());
+		// Zoey76: TODO: Implement or cleanup.
+		// L2PcInstance leader = L2World.getInstance().getPlayer(clan.getLeaderName());
+		// if ((leader != null) && (leader.isOnline() == 0))
+		// {
+		// player.sendMessage("Clan leader isn't online.");
+		// player.sendPacket(ActionFailed.STATIC_PACKET);
+		// return;
+		// }
+		//
+		// if (leader.isTransactionInProgress())
+		// {
+		// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_IS_BUSY_TRY_LATER);
+		// sm.addString(leader.getName());
+		// player.sendPacket(sm);
+		// return;
+		// }
+		//
+		// leader.setTransactionRequester(player);
+		// player.setTransactionRequester(leader);
+		// leader.sendPacket(new SurrenderPledgeWar(_clan.getName(), player.getName()));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__07_REQUESTSURRENDERPLEDGEWAR;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTargetCanceld.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTargetCanceld.java
new file mode 100644
index 00000000..c1a50ff7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTargetCanceld.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.TargetUnselected;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestTargetCanceld extends L2GameClientPacket {
+	private static final String _C__48_REQUESTTARGETCANCELD = "[C] 48 RequestTargetCanceld";
+	
+	private int _unselect;
+	
+	@Override
+	protected void readImpl() {
+		_unselect = readH();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (activeChar.isLockedTarget()) {
+			activeChar.sendPacket(SystemMessageId.FAILED_DISABLE_TARGET);
+			return;
+		}
+		
+		if (_unselect == 0) {
+			if (activeChar.isCastingNow() && activeChar.canAbortCast()) {
+				activeChar.abortCast();
+			} else if (activeChar.getTarget() != null) {
+				activeChar.setTarget(null);
+			}
+		} else if (activeChar.getTarget() != null) {
+			activeChar.setTarget(null);
+		} else if (activeChar.isInAirShip()) {
+			activeChar.broadcastPacket(new TargetUnselected(activeChar));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__48_REQUESTTARGETCANCELD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java
new file mode 100644
index 00000000..cf3f2dad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTeleportBookMark.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author ShanSoft
+ */
+public final class RequestTeleportBookMark extends L2GameClientPacket {
+	private static final String _C__D0_51_04_REQUESTTELEPORTBOOKMARK = "[C] D0:51:04 RequestTeleportBookMark";
+	
+	private int id;
+	
+	@Override
+	protected void readImpl() {
+		id = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		activeChar.teleportBookmarkGo(id);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_51_04_REQUESTTELEPORTBOOKMARK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java
new file mode 100644
index 00000000..589b55ca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialClientEvent.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialClientEvent;
+
+public class RequestTutorialClientEvent extends L2GameClientPacket {
+	private static final String _C__88_REQUESTTUTORIALCLIENTEVENT = "[C] 88 RequestTutorialClientEvent";
+	
+	int eventId = 0;
+	
+	@Override
+	protected void readImpl() {
+		eventId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerTutorialClientEvent(player, eventId), player);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__88_REQUESTTUTORIALCLIENTEVENT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialLinkHtml.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
new file mode 100644
index 00000000..6bebd499
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialLinkHtml.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorial;
+
+public class RequestTutorialLinkHtml extends L2GameClientPacket {
+	private static final String _C__85_REQUESTTUTORIALLINKHTML = "[C] 85 RequestTutorialLinkHtml";
+	
+	private String _bypass;
+	
+	@Override
+	protected void readImpl() {
+		_bypass = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerTutorial(player, _bypass), player);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__85_REQUESTTUTORIALLINKHTML;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
new file mode 100644
index 00000000..dd66c6bb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialPassCmdToServer.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialCmd;
+
+public class RequestTutorialPassCmdToServer extends L2GameClientPacket {
+	private static final String _C__86_REQUESTTUTORIALPASSCMDTOSERVER = "[C] 86 RequestTutorialPassCmdToServer";
+	
+	private String _bypass = null;
+	
+	@Override
+	protected void readImpl() {
+		_bypass = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerTutorialCmd(player, _bypass), player);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__86_REQUESTTUTORIALPASSCMDTOSERVER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
new file mode 100644
index 00000000..d06cc3c9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestTutorialQuestionMark.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerTutorialQuestionMark;
+
+public class RequestTutorialQuestionMark extends L2GameClientPacket {
+	private static final String _C__87_REQUESTTUTORIALQUESTIONMARK = "[C] 87 RequestTutorialQuestionMark";
+	
+	private int _number = 0;
+	
+	@Override
+	protected void readImpl() {
+		_number = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		EventDispatcher.getInstance().notifyEventAsync(new PlayerTutorialQuestionMark(player, _number), player);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__87_REQUESTTUTORIALQUESTIONMARK;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java
new file mode 100644
index 00000000..db52c735
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * @author Zoey76
+ */
+public class RequestUnEquipItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RequestUnEquipItem.class);
+	
+	private static final String _C__16_REQUESTUNEQUIPITEM = "[C] 16 RequestUnequipItem";
+	
+	private int _slot;
+	
+	/**
+	 * Packet type id 0x16 format: cd
+	 */
+	@Override
+	protected void readImpl() {
+		_slot = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (general().debug()) {
+			LOG.debug("Request unequip slot {}", _slot);
+		}
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final L2ItemInstance item = activeChar.getInventory().getPaperdollItemByL2ItemId(_slot);
+		// Wear-items are not to be unequipped.
+		if (item == null) {
+			return;
+		}
+		
+		// The English system message say weapon, but it's applied to any equipped item.
+		if (activeChar.isAttackingNow() || activeChar.isCastingNow() || activeChar.isCastingSimultaneouslyNow()) {
+			activeChar.sendPacket(SystemMessageId.CANNOT_CHANGE_WEAPON_DURING_AN_ATTACK);
+			return;
+		}
+		
+		// Arrows and bolts.
+		if ((_slot == L2Item.SLOT_L_HAND) && (item.getItem() instanceof L2EtcItem)) {
+			return;
+		}
+		
+		// Prevent of unequipping a cursed weapon.
+		if ((_slot == L2Item.SLOT_LR_HAND) && (activeChar.isCursedWeaponEquipped() || activeChar.isCombatFlagEquipped())) {
+			return;
+		}
+		
+		// Prevent player from unequipping items in special conditions.
+		if (activeChar.isStunned() || activeChar.isSleeping() || activeChar.isAlikeDead()) {
+			return;
+		}
+		
+		if (!activeChar.getInventory().canManipulateWithItemId(item.getId())) {
+			activeChar.sendPacket(SystemMessageId.ITEM_CANNOT_BE_TAKEN_OFF);
+			return;
+		}
+		
+		if (item.isWeapon() && item.getWeaponItem().isForceEquip() && !activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS)) {
+			activeChar.sendPacket(SystemMessageId.ITEM_CANNOT_BE_TAKEN_OFF);
+			return;
+		}
+		
+		final L2ItemInstance[] unequipped = activeChar.getInventory().unEquipItemInBodySlotAndRecord(_slot);
+		activeChar.broadcastUserInfo();
+		
+		// This can be 0 if the user pressed the right mouse button twice very fast.
+		if (unequipped.length > 0) {
+			SystemMessage sm;
+			if (unequipped[0].getEnchantLevel() > 0) {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
+				sm.addInt(unequipped[0].getEnchantLevel());
+			} else {
+				sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISARMED);
+			}
+			sm.addItemName(unequipped[0]);
+			activeChar.sendPacket(sm);
+			
+			InventoryUpdate iu = new InventoryUpdate();
+			iu.addItems(Arrays.asList(unequipped));
+			activeChar.sendPacket(iu);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__16_REQUESTUNEQUIPITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java
new file mode 100644
index 00000000..1450f99d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+
+public final class RequestVoteNew extends L2GameClientPacket {
+	private static final String _C__D0_7E_REQUESTVOTENEW = "[C] D0:7E RequestVoteNew";
+	
+	private int _targetId;
+	
+	@Override
+	protected void readImpl() {
+		_targetId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		L2Object object = activeChar.getTarget();
+		if (!(object instanceof L2PcInstance target)) {
+			if (object == null) {
+				activeChar.sendPacket(SystemMessageId.SELECT_TARGET);
+			} else {
+				activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+			}
+			return;
+		}
+		
+		if (target.getObjectId() != _targetId) {
+			return;
+		}
+		
+		if (target == activeChar) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECOMMEND_YOURSELF);
+			return;
+		}
+		
+		if (activeChar.getRecSystem().getLeft() <= 0) {
+			activeChar.sendPacket(SystemMessageId.YOU_CURRENTLY_DO_NOT_HAVE_ANY_RECOMMENDATIONS);
+			return;
+		}
+		
+		if (target.getRecSystem().getHave() >= 255) {
+			activeChar.sendPacket(SystemMessageId.YOUR_TARGET_NO_LONGER_RECEIVE_A_RECOMMENDATION);
+			return;
+		}
+		
+		activeChar.getRecSystem().give(target);
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
+		sm.addPcName(target);
+		sm.addInt(activeChar.getRecSystem().getLeft());
+		activeChar.sendPacket(sm);
+		
+		sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);
+		sm.addPcName(activeChar);
+		target.sendPacket(sm);
+		
+		activeChar.sendPacket(new UserInfo(activeChar));
+		sendPacket(new ExBrExtraUserInfo(activeChar));
+		target.broadcastUserInfo();
+		
+		activeChar.sendPacket(new ExVoteSystemInfo(activeChar));
+		target.sendPacket(new ExVoteSystemInfo(target));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_7E_REQUESTVOTENEW;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
new file mode 100644
index 00000000..c3353704
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawPremiumItem.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.dao.factory.impl.DAOFactory;
+import com.l2jserver.gameserver.model.L2PremiumItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExGetPremiumItemList;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author Gnacik
+ */
+public final class RequestWithDrawPremiumItem extends L2GameClientPacket {
+	private static final String _C__D0_52_REQUESTWITHDRAWPREMIUMITEM = "[C] D0:52 RequestWithDrawPremiumItem";
+	
+	private int _itemNum;
+	private int _charId;
+	private long _itemCount;
+	
+	@Override
+	protected void readImpl() {
+		_itemNum = readD();
+		_charId = readD();
+		_itemCount = readQ();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		
+		if (activeChar == null) {
+			return;
+		} else if (_itemCount <= 0) {
+			return;
+		} else if (activeChar.getObjectId() != _charId) {
+			Util.handleIllegalPlayerAction(activeChar, "[RequestWithDrawPremiumItem] Incorrect owner, Player: " + activeChar.getName());
+			return;
+		} else if (activeChar.getPremiumItemList().isEmpty()) {
+			Util.handleIllegalPlayerAction(activeChar, "[RequestWithDrawPremiumItem] Player: " + activeChar.getName() + " try to get item with empty list!");
+			return;
+		} else if ((activeChar.getWeightPenalty() >= 3) || !activeChar.isInventoryUnder90(false)) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_THE_VITAMIN_ITEM);
+			return;
+		} else if (activeChar.isProcessingTransaction()) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_RECEIVE_A_VITAMIN_ITEM_DURING_AN_EXCHANGE);
+			return;
+		}
+		
+		L2PremiumItem _item = activeChar.getPremiumItemList().get(_itemNum);
+		if (_item == null) {
+			return;
+		} else if (_item.getCount() < _itemCount) {
+			return;
+		}
+		
+		long itemsLeft = (_item.getCount() - _itemCount);
+		
+		activeChar.addItem("PremiumItem", _item.getItemId(), _itemCount, activeChar.getTarget(), true);
+		
+		if (itemsLeft > 0) {
+			_item.updateCount(itemsLeft);
+			DAOFactory.getInstance().getPremiumItemDAO().update(activeChar, _itemNum, itemsLeft);
+		} else {
+			activeChar.getPremiumItemList().remove(_itemNum);
+			DAOFactory.getInstance().getPremiumItemDAO().delete(activeChar, _itemNum);
+		}
+		
+		if (activeChar.getPremiumItemList().isEmpty()) {
+			activeChar.sendPacket(SystemMessageId.THERE_ARE_NO_MORE_VITAMIN_ITEMS_TO_BE_FOUND);
+		} else {
+			activeChar.sendPacket(new ExGetPremiumItemList(activeChar));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_52_REQUESTWITHDRAWPREMIUMITEM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java
new file mode 100644
index 00000000..b7b0f6c8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithDrawalParty.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2Party.messageType;
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExClosePartyRoom;
+import com.l2jserver.gameserver.network.serverpackets.ExPartyRoomMember;
+import com.l2jserver.gameserver.network.serverpackets.PartyMatchDetail;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestWithDrawalParty extends L2GameClientPacket {
+	private static final String _C__44_REQUESTWITHDRAWALPARTY = "[C] 44 RequestWithDrawalParty";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		L2Party party = player.getParty();
+		
+		if (party != null) {
+			party.removePartyMember(player, messageType.Left);
+			
+			if (player.isInPartyMatchRoom()) {
+				PartyMatchRoom _room = PartyMatchRoomList.getInstance().getPlayerRoom(player);
+				if (_room != null) {
+					player.sendPacket(new PartyMatchDetail(player, _room));
+					player.sendPacket(new ExPartyRoomMember(player, _room, 0));
+					player.sendPacket(new ExClosePartyRoom());
+					
+					_room.deleteMember(player);
+				}
+				
+				player.setPartyRoom(0);
+				player.broadcastUserInfo();
+			}
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__44_REQUESTWITHDRAWALPARTY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
new file mode 100644
index 00000000..35d71701
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ExClosePartyRoom;
+
+/**
+ * @author Gnacik
+ */
+public final class RequestWithdrawPartyRoom extends L2GameClientPacket {
+	private static final String _C__D0_0B_REQUESTWITHDRAWPARTYROOM = "[C] D0:0B RequestWithdrawPartyRoom";
+	
+	private int _roomid;
+	@SuppressWarnings("unused")
+	private int _unk1;
+	
+	@Override
+	protected void readImpl() {
+		_roomid = readD();
+		_unk1 = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance _activeChar = getClient().getActiveChar();
+		
+		if (_activeChar == null) {
+			return;
+		}
+		
+		PartyMatchRoom _room = PartyMatchRoomList.getInstance().getRoom(_roomid);
+		if (_room == null) {
+			return;
+		}
+		
+		if ((_activeChar.isInParty() && _room.getOwner().isInParty()) && (_activeChar.getParty().getLeaderObjectId() == _room.getOwner().getParty().getLeaderObjectId())) {
+			// If user is in party with Room Owner
+			// is not removed from Room
+			
+			// _activeChar.setPartyMatching(0);
+			_activeChar.broadcastUserInfo();
+		} else {
+			_room.deleteMember(_activeChar);
+			
+			_activeChar.setPartyRoom(0);
+			// _activeChar.setPartyMatching(0);
+			
+			_activeChar.sendPacket(new ExClosePartyRoom());
+			_activeChar.sendPacket(SystemMessageId.PARTY_ROOM_EXITED);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_0B_REQUESTWITHDRAWPARTYROOM;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java
new file mode 100644
index 00000000..b61437b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawalPledge.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.PledgeShowMemberListDelete;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * RequestWithdrawalPledge client packet.
+ * @author JIV
+ * @author MELERIX
+ * @author Zoey76
+ * @author UnAfraid
+ * @since 2005/03/27 15:29:30
+ */
+public final class RequestWithdrawalPledge extends L2GameClientPacket {
+	private static final String _C__28_REQUESTWITHDRAWALPLEDGE = "[C] 28 RequestWithdrawalPledge";
+	
+	@Override
+	protected void readImpl() {
+		// trigger
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		if (activeChar.getClan() == null) {
+			activeChar.sendPacket(SystemMessageId.YOU_ARE_NOT_A_CLAN_MEMBER);
+			return;
+		}
+		if (activeChar.isClanLeader()) {
+			activeChar.sendPacket(SystemMessageId.CLAN_LEADER_CANNOT_WITHDRAW);
+			return;
+		}
+		if (activeChar.isInCombat()) {
+			activeChar.sendPacket(SystemMessageId.YOU_CANNOT_LEAVE_DURING_COMBAT);
+			return;
+		}
+		
+		L2Clan clan = activeChar.getClan();
+		clan.removeClanMember(activeChar.getObjectId(), System.currentTimeMillis() + character().getDaysBeforeJoinAClan());
+		
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_WITHDRAWN_FROM_THE_CLAN);
+		sm.addString(activeChar.getName());
+		clan.broadcastToOnlineMembers(sm);
+		
+		// Remove the Player From the Member list
+		clan.broadcastToOnlineMembers(new PledgeShowMemberListDelete(activeChar.getName()));
+		
+		activeChar.sendPacket(SystemMessageId.YOU_HAVE_WITHDRAWN_FROM_CLAN);
+		activeChar.sendPacket(SystemMessageId.YOU_MUST_WAIT_BEFORE_JOINING_ANOTHER_CLAN);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__28_REQUESTWITHDRAWALPLEDGE;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWriteHeroWords.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWriteHeroWords.java
new file mode 100644
index 00000000..e96f090d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/RequestWriteHeroWords.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Hero;
+
+/**
+ * Format chS c (id) 0xD0 h (subid) 0x0C S the hero's words :)
+ * @author -Wooden-
+ */
+public final class RequestWriteHeroWords extends L2GameClientPacket {
+	private static final String _C__D0_05_REQUESTWRITEHEROWORDS = "[C] D0:05 RequestWriteHeroWords";
+	
+	private String _heroWords;
+	
+	@Override
+	protected void readImpl() {
+		_heroWords = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if ((player == null) || !player.isHero()) {
+			return;
+		}
+		
+		if ((_heroWords == null) || (_heroWords.length() > 300)) {
+			return;
+		}
+		
+		Hero.getInstance().setHeroMessage(player, _heroWords);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__D0_05_REQUESTWRITEHEROWORDS;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/Say2.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Say2.java
new file mode 100644
index 00000000..6aa522f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/Say2.java
@@ -0,0 +1,304 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.handler.ChatHandler;
+import com.l2jserver.gameserver.handler.IChatHandler;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+import com.l2jserver.gameserver.model.events.impl.character.player.PlayerChat;
+import com.l2jserver.gameserver.model.events.returns.ChatFilterReturn;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.util.Util;
+
+public final class Say2 extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(Say2.class);
+	
+	private static final String _C__49_SAY2 = "[C] 49 Say2";
+	
+	private static final Logger LOG_CHAT = LoggerFactory.getLogger("chat");
+	
+	public static final int ALL = 0;
+	public static final int SHOUT = 1; // !
+	public static final int TELL = 2;
+	public static final int PARTY = 3; // #
+	public static final int CLAN = 4; // @
+	public static final int GM = 5;
+	public static final int PETITION_PLAYER = 6; // used for petition
+	public static final int PETITION_GM = 7; // * used for petition
+	public static final int TRADE = 8; // +
+	public static final int ALLIANCE = 9; // $
+	public static final int ANNOUNCEMENT = 10;
+	public static final int BOAT = 11;
+	public static final int L2FRIEND = 12;
+	public static final int MSNCHAT = 13;
+	public static final int PARTYMATCH_ROOM = 14;
+	public static final int PARTYROOM_COMMANDER = 15; // (Yellow)
+	public static final int PARTYROOM_ALL = 16; // (Red)
+	public static final int HERO_VOICE = 17;
+	public static final int CRITICAL_ANNOUNCE = 18;
+	public static final int SCREEN_ANNOUNCE = 19;
+	public static final int BATTLEFIELD = 20;
+	public static final int MPCC_ROOM = 21;
+	public static final int NPC_ALL = 22;
+	public static final int NPC_SHOUT = 23;
+	
+	private static final String[] CHAT_NAMES = {
+		"ALL",
+		"SHOUT",
+		"TELL",
+		"PARTY",
+		"CLAN",
+		"GM",
+		"PETITION_PLAYER",
+		"PETITION_GM",
+		"TRADE",
+		"ALLIANCE",
+		"ANNOUNCEMENT", // 10
+		"BOAT",
+		"L2FRIEND",
+		"MSNCHAT",
+		"PARTYMATCH_ROOM",
+		"PARTYROOM_COMMANDER",
+		"PARTYROOM_ALL",
+		"HERO_VOICE",
+		"CRITICAL_ANNOUNCE",
+		"SCREEN_ANNOUNCE",
+		"BATTLEFIELD",
+		"MPCC_ROOM"
+	};
+	
+	private static final String[] WALKER_COMMAND_LIST = {
+		"USESKILL",
+		"USEITEM",
+		"BUYITEM",
+		"SELLITEM",
+		"SAVEITEM",
+		"LOADITEM",
+		"MSG",
+		"DELAY",
+		"LABEL",
+		"JMP",
+		"CALL",
+		"RETURN",
+		"MOVETO",
+		"NPCSEL",
+		"NPCDLG",
+		"DLGSEL",
+		"CHARSTATUS",
+		"POSOUTRANGE",
+		"POSINRANGE",
+		"GOHOME",
+		"SAY",
+		"EXIT",
+		"PAUSE",
+		"STRINDLG",
+		"STRNOTINDLG",
+		"CHANGEWAITTYPE",
+		"FORCEATTACK",
+		"ISMEMBER",
+		"REQUESTJOINPARTY",
+		"REQUESTOUTPARTY",
+		"QUITPARTY",
+		"MEMBERSTATUS",
+		"CHARBUFFS",
+		"ITEMCOUNT",
+		"FOLLOWTELEPORT"
+	};
+	
+	private String _text;
+	private int _type;
+	private String _target;
+	
+	@Override
+	protected void readImpl() {
+		_text = readS();
+		_type = readD();
+		_target = (_type == TELL) ? readS() : null;
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (general().debug()) {
+			LOG.info("Msg Type = '{}' Text = '{}'.", _type, _text);
+		}
+		
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if ((_type < 0) || (_type >= CHAT_NAMES.length)) {
+			LOG.warn("Invalid type: {} Player : {} text: {}", _type, activeChar.getName(), _text);
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			activeChar.logout();
+			return;
+		}
+		
+		if (_text.isEmpty()) {
+			LOG.warn("{}: sending empty text. Possible packet hack!", activeChar.getName());
+			activeChar.sendPacket(ActionFailed.STATIC_PACKET);
+			activeChar.logout();
+			return;
+		}
+		
+		// Even though the client can handle more characters than it's current limit allows, an overflow (critical error) happens if you pass a huge (1000+) message.
+		// July 11, 2011 - Verified on High Five 4 official client as 105.
+		// Allow higher limit if player shift some item (text is longer then).
+		if (!activeChar.isGM() && (((_text.indexOf(8) >= 0) && (_text.length() > 500)) || ((_text.indexOf(8) < 0) && (_text.length() > 105)))) {
+			activeChar.sendPacket(SystemMessageId.DONT_SPAM);
+			return;
+		}
+		
+		if (customs().l2WalkerProtection() && (_type == TELL) && checkBot(_text)) {
+			Util.handleIllegalPlayerAction(activeChar, "Client Emulator Detect: Player " + activeChar.getName() + " using l2walker.");
+			return;
+		}
+		
+		if (activeChar.isCursedWeaponEquipped() && ((_type == TRADE) || (_type == SHOUT))) {
+			activeChar.sendPacket(SystemMessageId.SHOUT_AND_TRADE_CHAT_CANNOT_BE_USED_WHILE_POSSESSING_CURSED_WEAPON);
+			return;
+		}
+		
+		if (activeChar.isChatBanned() && (_text.charAt(0) != '.')) {
+			if (activeChar.getEffectList().getFirstEffect(L2EffectType.CHAT_BLOCK) != null) {
+				activeChar.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_CHATTING_NOT_ALLOWED);
+			} else {
+				if (general().getBanChatChannels().contains(_type)) {
+					activeChar.sendPacket(SystemMessageId.CHATTING_IS_CURRENTLY_PROHIBITED);
+				}
+			}
+			return;
+		}
+		
+		if (activeChar.isJailed() && general().jailDisableChat()) {
+			if ((_type == TELL) || (_type == SHOUT) || (_type == TRADE) || (_type == HERO_VOICE)) {
+				activeChar.sendMessage("You can not chat with players outside of the jail.");
+				return;
+			}
+		}
+		
+		if ((_type == PETITION_PLAYER) && activeChar.isGM()) {
+			_type = PETITION_GM;
+		}
+		
+		if (general().logChat()) {
+			if (_type == TELL) {
+				LOG_CHAT.info("{} {} says [{}] to {}.", CHAT_NAMES[_type], activeChar.getName(), _text, _target);
+			} else {
+				LOG_CHAT.info("{} {} says [{}].", CHAT_NAMES[_type], activeChar.getName(), _text);
+			}
+		}
+		
+		if (_text.indexOf(8) >= 0) {
+			if (!parseAndPublishItem(activeChar)) {
+				return;
+			}
+		}
+		
+		final ChatFilterReturn filter = EventDispatcher.getInstance().notifyEvent(new PlayerChat(activeChar, L2World.getInstance().getPlayer(_target), _text, _type), ChatFilterReturn.class);
+		if (filter != null) {
+			_text = filter.getFilteredText();
+		}
+		
+		// Say Filter implementation
+		if (general().useChatFilter()) {
+			checkText();
+		}
+		
+		final IChatHandler handler = ChatHandler.getInstance().getHandler(_type);
+		if (handler != null) {
+			handler.handleChat(_type, activeChar, _target, _text);
+		} else {
+			LOG.info("No handler registered for ChatType: {} Player: {}", _type, getClient());
+		}
+	}
+	
+	private boolean checkBot(String text) {
+		for (String botCommand : WALKER_COMMAND_LIST) {
+			if (text.startsWith(botCommand)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	private void checkText() {
+		String filteredText = _text;
+		for (String pattern : general().getChatFilter()) {
+			filteredText = filteredText.replaceAll("(?i)" + pattern, general().getChatFilterChars());
+		}
+		_text = filteredText;
+	}
+	
+	private boolean parseAndPublishItem(L2PcInstance owner) {
+		int pos1 = -1;
+		while ((pos1 = _text.indexOf(8, pos1)) > -1) {
+			int pos = _text.indexOf("ID=", pos1);
+			if (pos == -1) {
+				return false;
+			}
+			StringBuilder result = new StringBuilder(9);
+			pos += 3;
+			while (Character.isDigit(_text.charAt(pos))) {
+				result.append(_text.charAt(pos++));
+			}
+			int id = Integer.parseInt(result.toString());
+			L2Object item = L2World.getInstance().findObject(id);
+			if (item instanceof L2ItemInstance) {
+				if (owner.getInventory().getItemByObjectId(id) == null) {
+					LOG.info("{} trying publish item which doesnt own! ID:{}", getClient(), id);
+					return false;
+				}
+				((L2ItemInstance) item).publish();
+			} else {
+				LOG.info("{} trying publish object which is not item! Object:{}", getClient(), item);
+				return false;
+			}
+			pos1 = _text.indexOf(8, pos) + 1;
+			// missing ending tag
+			if (pos1 == 0) {
+				LOG.info("{} sent invalid publish item msg! ID:{}", getClient(), id);
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	@Override
+	public String getType() {
+		return _C__49_SAY2;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java
new file mode 100644
index 00000000..9e1fb2c3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendBypassBuildCmd.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.handler.AdminCommandHandler;
+import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.GMAudit;
+
+/**
+ * All GM commands triggered by //command
+ * @since 2005/03/27 15:29:29
+ */
+public final class SendBypassBuildCmd extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(SendBypassBuildCmd.class);
+	
+	private static final String _C__74_SENDBYPASSBUILDCMD = "[C] 74 SendBypassBuildCmd";
+	
+	public static final int GM_MESSAGE = 9;
+	
+	public static final int ANNOUNCEMENT = 10;
+	
+	private String _command;
+	
+	@Override
+	protected void readImpl() {
+		_command = readS().trim();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		String command = "admin_" + _command.split(" ")[0];
+		
+		IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(command);
+		
+		if (ach == null) {
+			if (activeChar.isGM()) {
+				activeChar.sendMessage("The command " + command.substring(6) + " does not exists!");
+			}
+			
+			LOG.warn("No handler registered for admin command '{}'", command);
+			return;
+		}
+		
+		if (!AdminData.getInstance().hasAccess(command, activeChar.getAccessLevel())) {
+			activeChar.sendMessage("You don't have the access right to use this command!");
+			LOG.warn("Character {} tried to use admin command {}, but have no access to it!", activeChar.getName(), command);
+			return;
+		}
+		
+		if (general().gmAudit()) {
+			GMAudit.auditGMAction(activeChar.getName() + " [" + activeChar.getObjectId() + "]", _command, (activeChar.getTarget() != null ? activeChar.getTarget().getName() : "no-target"));
+		}
+		
+		ach.useAdminCommand("admin_" + _command, activeChar);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__74_SENDBYPASSBUILDCMD;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java
new file mode 100644
index 00000000..85fb58e6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseDepositList.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.ADENA_ID;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * SendWareHouseDepositList client packet class.
+ */
+public final class SendWareHouseDepositList extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(SendWareHouseDepositList.class);
+	
+	private static final String _C__3B_SENDWAREHOUSEDEPOSITLIST = "[C] 3B SendWareHouseDepositList";
+	
+	private static final int BATCH_LENGTH = 12;
+	
+	private List<ItemHolder> _items = null;
+	
+	@Override
+	protected void readImpl() {
+		final int size = readD();
+		if ((size <= 0) || (size > MAX_ITEM_IN_PACKET) || ((size * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ArrayList<>(size);
+		for (int i = 0; i < size; i++) {
+			int objId = readD();
+			long count = readQ();
+			if ((objId < 1) || (count < 0)) {
+				_items = null;
+				return;
+			}
+			_items.add(new ItemHolder(objId, count));
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_items == null) {
+			return;
+		}
+		
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("deposit")) {
+			player.sendMessage("You are depositing items too fast.");
+			return;
+		}
+		
+		final ItemContainer warehouse = player.getActiveWarehouse();
+		if (warehouse == null) {
+			return;
+		}
+		final boolean isPrivate = warehouse instanceof PcWarehouse;
+		
+		final L2Npc manager = player.getLastFolkNPC();
+		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM()) {
+			return;
+		}
+		
+		if (!isPrivate && !player.getAccessLevel().allowTransaction()) {
+			player.sendMessage("Transactions are disabled for your Access Level.");
+			return;
+		}
+		
+		if (player.getActiveEnchantItemId() != L2PcInstance.ID_NONE) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use enchant Exploit!");
+			return;
+		}
+		
+		// Karma punishment
+		if (!character().karmaPlayerCanUseWareHouse() && (player.getKarma() > 0)) {
+			return;
+		}
+		
+		// Freight price from config or normal price per item slot (30)
+		final long fee = _items.size() * 30L;
+		long currentAdena = player.getAdena();
+		int slots = 0;
+		
+		for (ItemHolder i : _items) {
+			L2ItemInstance item = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			if (item == null) {
+				LOG.warn("Error depositing a warehouse object for char {} (validity check)", player.getName());
+				return;
+			}
+			
+			// Calculate needed adena and slots
+			if (item.getId() == ADENA_ID) {
+				currentAdena -= i.getCount();
+			}
+			if (!item.isStackable()) {
+				slots += i.getCount();
+			} else if (warehouse.getItemByItemId(item.getId()) == null) {
+				slots++;
+			}
+		}
+		
+		// Item Max Limit Check
+		if (!warehouse.validateCapacity(slots)) {
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED);
+			return;
+		}
+		
+		// Check if enough adena and charge the fee
+		if ((currentAdena < fee) || !player.reduceAdena(warehouse.getName(), fee, manager, false)) {
+			player.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+			return;
+		}
+		
+		// get current tradelist if any
+		if (player.getActiveTradeList() != null) {
+			return;
+		}
+		
+		// Proceed to the transfer
+		InventoryUpdate playerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+		for (ItemHolder i : _items) {
+			// Check validity of requested item
+			L2ItemInstance oldItem = player.checkItemManipulation(i.getId(), i.getCount(), "deposit");
+			if (oldItem == null) {
+				LOG.warn("Error depositing a warehouse object for char {} (olditem == null)", player.getName());
+				return;
+			}
+			
+			if (!oldItem.isDepositable(isPrivate) || !oldItem.isAvailable(player, true, isPrivate)) {
+				continue;
+			}
+			
+			final L2ItemInstance newItem = player.getInventory().transferItem(warehouse.getName(), i.getId(), i.getCount(), warehouse, player, manager);
+			if (newItem == null) {
+				LOG.warn("Error depositing a warehouse object for char {} (newitem == null)", player.getName());
+				continue;
+			}
+			
+			if (playerIU != null) {
+				if ((oldItem.getCount() > 0) && (oldItem != newItem)) {
+					playerIU.addModifiedItem(oldItem);
+				} else {
+					playerIU.addRemovedItem(oldItem);
+				}
+			}
+		}
+		
+		// Send updated item list to the player
+		player.sendPacket(Objects.requireNonNullElseGet(playerIU, () -> new ItemList(player, false)));
+		
+		// Update current load status on player
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__3B_SENDWAREHOUSEDEPOSITLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
new file mode 100644
index 00000000..8ebad34c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SendWareHouseWithDrawList.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Objects;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.ClanPrivilege;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.itemcontainer.ClanWarehouse;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.itemcontainer.PcWarehouse;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/29 23:15:16
+ */
+public final class SendWareHouseWithDrawList extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(SendWareHouseWithDrawList.class);
+	
+	private static final String _C__32_SENDWAREHOUSEWITHDRAWLIST = "[C] 3C SendWareHouseWithDrawList";
+	
+	private static final int BATCH_LENGTH = 12; // length of the one item
+	
+	private ItemHolder[] _items = null;
+	
+	@Override
+	protected void readImpl() {
+		final int count = readD();
+		if ((count <= 0) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new ItemHolder[count];
+		for (int i = 0; i < count; i++) {
+			int objId = readD();
+			long cnt = readQ();
+			if ((objId < 1) || (cnt < 0)) {
+				_items = null;
+				return;
+			}
+			_items[i] = new ItemHolder(objId, cnt);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		if (_items == null) {
+			return;
+		}
+		
+		final L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("withdraw")) {
+			player.sendMessage("You are withdrawing items too fast.");
+			return;
+		}
+		
+		final ItemContainer warehouse = player.getActiveWarehouse();
+		if (warehouse == null) {
+			return;
+		}
+		
+		final L2Npc manager = player.getLastFolkNPC();
+		if (((manager == null) || !manager.isWarehouse() || !manager.canInteract(player)) && !player.isGM()) {
+			return;
+		}
+		
+		if (!(warehouse instanceof PcWarehouse) && !player.getAccessLevel().allowTransaction()) {
+			player.sendMessage("Transactions are disabled for your Access Level.");
+			return;
+		}
+		
+		// Karma punishment
+		if (!character().karmaPlayerCanUseWareHouse() && (player.getKarma() > 0)) {
+			return;
+		}
+		
+		if (character().membersCanWithdrawFromClanWH()) {
+			if ((warehouse instanceof ClanWarehouse) && !player.hasClanPrivilege(ClanPrivilege.CL_VIEW_WAREHOUSE)) {
+				return;
+			}
+		} else {
+			if ((warehouse instanceof ClanWarehouse) && !player.isClanLeader()) {
+				player.sendPacket(SystemMessageId.ONLY_CLAN_LEADER_CAN_RETRIEVE_ITEMS_FROM_CLAN_WAREHOUSE);
+				return;
+			}
+		}
+		
+		int weight = 0;
+		int slots = 0;
+		
+		for (ItemHolder i : _items) {
+			// Calculate needed slots
+			L2ItemInstance item = warehouse.getItemByObjectId(i.getId());
+			if ((item == null) || (item.getCount() < i.getCount())) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to withdraw non-existent item from warehouse.");
+				return;
+			}
+			
+			weight += i.getCount() * item.getItem().getWeight();
+			if (!item.isStackable()) {
+				slots += i.getCount();
+			} else if (player.getInventory().getItemByItemId(item.getId()) == null) {
+				slots++;
+			}
+		}
+		
+		// Item Max Limit Check
+		if (!player.getInventory().validateCapacity(slots)) {
+			player.sendPacket(SystemMessageId.SLOTS_FULL);
+			return;
+		}
+		
+		// Weight limit Check
+		if (!player.getInventory().validateWeight(weight)) {
+			player.sendPacket(SystemMessageId.WEIGHT_LIMIT_EXCEEDED);
+			return;
+		}
+		
+		// Proceed to the transfer
+		InventoryUpdate playerIU = general().forceInventoryUpdate() ? null : new InventoryUpdate();
+		for (ItemHolder i : _items) {
+			L2ItemInstance oldItem = warehouse.getItemByObjectId(i.getId());
+			if ((oldItem == null) || (oldItem.getCount() < i.getCount())) {
+				LOG.warn("Error withdrawing a warehouse object for char {} (olditem == null)", player.getName());
+				return;
+			}
+			final L2ItemInstance newItem = warehouse.transferItem(warehouse.getName(), i.getId(), i.getCount(), player.getInventory(), player, manager);
+			if (newItem == null) {
+				LOG.warn("Error withdrawing a warehouse object for char {} (newitem == null)", player.getName());
+				return;
+			}
+			
+			if (playerIU != null) {
+				if (newItem.getCount() > i.getCount()) {
+					playerIU.addModifiedItem(newItem);
+				} else {
+					playerIU.addNewItem(newItem);
+				}
+			}
+		}
+		
+		// Send updated item list to the player
+		player.sendPacket(Objects.requireNonNullElseGet(playerIU, () -> new ItemList(player, false)));
+		
+		// Update current load status on player
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__32_SENDWAREHOUSEWITHDRAWLIST;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
new file mode 100644
index 00000000..f8900516
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListBuy.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreManageListBuy;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreMsgBuy;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Packets: ddhhQQ cddb
+ * @since 2005/03/27 15:29:30
+ */
+public final class SetPrivateStoreListBuy extends L2GameClientPacket {
+	private static final String _C__9A_SETPRIVATESTORELISTBUY = "[C] 9A SetPrivateStoreListBuy";
+	
+	private static final int BATCH_LENGTH = 40; // length of the one item
+	
+	private Item[] _items = null;
+	
+	@Override
+	protected void readImpl() {
+		int count = readD();
+		if ((count < 1) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new Item[count];
+		for (int i = 0; i < count; i++) {
+			int itemId = readD();
+			
+			readD(); // TODO analyse this
+			
+			long cnt = readQ();
+			long price = readQ();
+			
+			if ((itemId < 1) || (cnt < 1) || (price < 0)) {
+				_items = null;
+				return;
+			}
+			readD(); // Unk
+			readD(); // Unk
+			readD(); // Unk
+			readD(); // Unk
+			
+			_items[i] = new Item(itemId, cnt, price);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_items == null) {
+			player.setPrivateStoreType(PrivateStoreType.NONE);
+			player.broadcastUserInfo();
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) || player.isInDuel()) {
+			player.sendPacket(SystemMessageId.CANT_OPERATE_PRIVATE_STORE_DURING_COMBAT);
+			player.sendPacket(new PrivateStoreManageListBuy(player));
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isInsideZone(ZoneId.NO_STORE)) {
+			player.sendPacket(new PrivateStoreManageListBuy(player));
+			player.sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		TradeList tradeList = player.getBuyList();
+		tradeList.clear();
+		
+		// Check maximum number of allowed slots for pvt shops
+		if (_items.length > player.getPrivateBuyStoreLimit()) {
+			player.sendPacket(new PrivateStoreManageListBuy(player));
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED);
+			return;
+		}
+		
+		long totalCost = 0;
+		for (Item i : _items) {
+			if (!i.addToTradeList(tradeList)) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + character().getMaxAdena() + " adena in Private Store - Buy.");
+				return;
+			}
+			
+			totalCost += i.getCost();
+			if (totalCost > character().getMaxAdena()) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set total price more than " + character().getMaxAdena() + " adena in Private Store - Buy.");
+				return;
+			}
+		}
+		
+		// Check for available funds
+		if (totalCost > player.getAdena()) {
+			player.sendPacket(new PrivateStoreManageListBuy(player));
+			player.sendPacket(SystemMessageId.THE_PURCHASE_PRICE_IS_HIGHER_THAN_MONEY);
+			return;
+		}
+		
+		player.sitDown();
+		player.setPrivateStoreType(PrivateStoreType.BUY);
+		player.broadcastUserInfo();
+		player.broadcastPacket(new PrivateStoreMsgBuy(player));
+	}
+	
+	private static class Item {
+		private final int _itemId;
+		private final long _count;
+		private final long _price;
+		
+		public Item(int id, long num, long pri) {
+			_itemId = id;
+			_count = num;
+			_price = pri;
+		}
+		
+		public boolean addToTradeList(TradeList list) {
+			if ((character().getMaxAdena() / _count) < _price) {
+				return false;
+			}
+			
+			list.addItemByItemId(_itemId, _count, _price);
+			return true;
+		}
+		
+		public long getCost() {
+			return _count * _price;
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__9A_SETPRIVATESTORELISTBUY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java
new file mode 100644
index 00000000..68e159ac
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreListSell.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreManageListSell;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreMsgSell;
+import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public class SetPrivateStoreListSell extends L2GameClientPacket {
+	private static final String _C__31_SETPRIVATESTORELISTSELL = "[C] 31 SetPrivateStoreListSell";
+	
+	private static final int BATCH_LENGTH = 20; // length of the one item
+	
+	private boolean _packageSale;
+	private Item[] _items = null;
+	
+	@Override
+	protected void readImpl() {
+		_packageSale = (readD() == 1);
+		int count = readD();
+		if ((count < 1) || (count > MAX_ITEM_IN_PACKET) || ((count * BATCH_LENGTH) != _buf.remaining())) {
+			return;
+		}
+		
+		_items = new Item[count];
+		for (int i = 0; i < count; i++) {
+			int itemId = readD();
+			long cnt = readQ();
+			long price = readQ();
+			
+			if ((itemId < 1) || (cnt < 1) || (price < 0)) {
+				_items = null;
+				return;
+			}
+			_items[i] = new Item(itemId, cnt, price);
+		}
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (_items == null) {
+			player.sendPacket(SystemMessageId.INCORRECT_ITEM_COUNT);
+			player.setPrivateStoreType(PrivateStoreType.NONE);
+			player.broadcastUserInfo();
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+			return;
+		}
+		
+		if (AttackStanceTaskManager.getInstance().hasAttackStanceTask(player) || player.isInDuel()) {
+			player.sendPacket(SystemMessageId.CANT_OPERATE_PRIVATE_STORE_DURING_COMBAT);
+			player.sendPacket(new PrivateStoreManageListSell(player, _packageSale));
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		if (player.isInsideZone(ZoneId.NO_STORE)) {
+			player.sendPacket(new PrivateStoreManageListSell(player, _packageSale));
+			player.sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);
+			player.sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		// Check maximum number of allowed slots for pvt shops
+		if (_items.length > player.getPrivateSellStoreLimit()) {
+			player.sendPacket(new PrivateStoreManageListSell(player, _packageSale));
+			player.sendPacket(SystemMessageId.YOU_HAVE_EXCEEDED_QUANTITY_THAT_CAN_BE_INPUTTED);
+			return;
+		}
+		
+		TradeList tradeList = player.getSellList();
+		tradeList.clear();
+		tradeList.setPackaged(_packageSale);
+		
+		long totalCost = player.getAdena();
+		for (Item i : _items) {
+			if (!i.addToTradeList(tradeList)) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set price more than " + character().getMaxAdena() + " adena in Private Store - Sell.");
+				return;
+			}
+			
+			totalCost += i.getPrice();
+			if (totalCost > character().getMaxAdena()) {
+				Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " tried to set total price more than " + character().getMaxAdena() + " adena in Private Store - Sell.");
+				return;
+			}
+		}
+		
+		player.sitDown();
+		if (_packageSale) {
+			player.setPrivateStoreType(PrivateStoreType.PACKAGE_SELL);
+		} else {
+			player.setPrivateStoreType(PrivateStoreType.SELL);
+		}
+		
+		player.broadcastUserInfo();
+		
+		if (_packageSale) {
+			player.broadcastPacket(new ExPrivateStoreSetWholeMsg(player));
+		} else {
+			player.broadcastPacket(new PrivateStoreMsgSell(player));
+		}
+	}
+	
+	private static class Item {
+		private final int _itemId;
+		private final long _count;
+		private final long _price;
+		
+		public Item(int id, long num, long pri) {
+			_itemId = id;
+			_count = num;
+			_price = pri;
+		}
+		
+		public boolean addToTradeList(TradeList list) {
+			if ((character().getMaxAdena() / _count) < _price) {
+				return false;
+			}
+			
+			list.addItem(_itemId, _count, _price);
+			return true;
+		}
+		
+		public long getPrice() {
+			return _count * _price;
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__31_SETPRIVATESTORELISTSELL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
new file mode 100644
index 00000000..5154f428
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgBuy.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreMsgBuy;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class SetPrivateStoreMsgBuy extends L2GameClientPacket {
+	private static final String _C__9D_SETPRIVATESTOREMSGBUY = "[C] 9D SetPrivateStoreMsgBuy";
+	
+	private static final int MAX_MSG_LENGTH = 29;
+	
+	private String _storeMsg;
+	
+	@Override
+	protected void readImpl() {
+		_storeMsg = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if ((player == null) || (player.getBuyList() == null)) {
+			return;
+		}
+		
+		if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store buy message");
+			return;
+		}
+		
+		player.getBuyList().setTitle(_storeMsg);
+		player.sendPacket(new PrivateStoreMsgBuy(player));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__9D_SETPRIVATESTOREMSGBUY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
new file mode 100644
index 00000000..49791230
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreMsgSell.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.PrivateStoreMsgSell;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public class SetPrivateStoreMsgSell extends L2GameClientPacket {
+	private static final String _C__97_SETPRIVATESTOREMSGSELL = "[C] 97 SetPrivateStoreMsgSell";
+	
+	private static final int MAX_MSG_LENGTH = 29;
+	
+	private String _storeMsg;
+	
+	@Override
+	protected void readImpl() {
+		_storeMsg = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if ((player == null) || (player.getSellList() == null)) {
+			return;
+		}
+		
+		if ((_storeMsg != null) && (_storeMsg.length() > MAX_MSG_LENGTH)) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store sell message");
+			return;
+		}
+		
+		player.getSellList().setTitle(_storeMsg);
+		sendPacket(new PrivateStoreMsgSell(player));
+	}
+	
+	@Override
+	public String getType() {
+		return _C__97_SETPRIVATESTOREMSGSELL;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
new file mode 100644
index 00000000..92a85620
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SetPrivateStoreWholeMsg.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExPrivateStoreSetWholeMsg;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author KenM
+ */
+public class SetPrivateStoreWholeMsg extends L2GameClientPacket {
+	private static final String _C_D0_4A_SETPRIVATESTOREWHOLEMSG = "[C] D0:4A SetPrivateStoreWholeMsg";
+	private static final int MAX_MSG_LENGTH = 29;
+	
+	private String _msg;
+	
+	@Override
+	protected void readImpl() {
+		_msg = readS();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getClient().getActiveChar();
+		if ((player == null) || (player.getSellList() == null)) {
+			return;
+		}
+		
+		if ((_msg != null) && (_msg.length() > MAX_MSG_LENGTH)) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to overflow private store whole message");
+			return;
+		}
+		
+		player.getSellList().setTitle(_msg);
+		sendPacket(new ExPrivateStoreSetWholeMsg(player));
+	}
+	
+	@Override
+	public String getType() {
+		return _C_D0_4A_SETPRIVATESTOREWHOLEMSG;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java
new file mode 100644
index 00000000..73c976b0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/SnoopQuit.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author -Wooden-
+ */
+public final class SnoopQuit extends L2GameClientPacket {
+	private static final String _C__B4_SNOOPQUIT = "[C] B4 SnoopQuit";
+	
+	private int _snoopID;
+	
+	@Override
+	protected void readImpl() {
+		_snoopID = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = L2World.getInstance().getPlayer(_snoopID);
+		if (player == null) {
+			return;
+		}
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		player.removeSnooper(activeChar);
+		activeChar.removeSnooped(player);
+		
+	}
+	
+	@Override
+	public String getType() {
+		return _C__B4_SNOOPQUIT;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/StartRotating.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/StartRotating.java
new file mode 100644
index 00000000..920fd175
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/StartRotating.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.StartRotation;
+
+/**
+ * @since 2005/03/27 15:29:30
+ */
+public final class StartRotating extends L2GameClientPacket {
+	private static final String _C__5B_STARTROTATING = "[C] 5B StartRotating";
+	
+	private int _degree;
+	private int _side;
+	
+	@Override
+	protected void readImpl() {
+		_degree = readD();
+		_side = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final StartRotation br;
+		if (activeChar.isInAirShip() && activeChar.getAirShip().isCaptain(activeChar)) {
+			br = new StartRotation(activeChar.getAirShip().getObjectId(), _degree, _side, 0);
+			activeChar.getAirShip().broadcastPacket(br);
+		} else {
+			br = new StartRotation(activeChar.getObjectId(), _degree, _side, 0);
+			activeChar.broadcastPacket(br);
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__5B_STARTROTATING;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/TradeDone.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/TradeDone.java
new file mode 100644
index 00000000..c9923107
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/TradeDone.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.TradeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * This packet manages the trade response.
+ */
+public final class TradeDone extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(TradeDone.class);
+	
+	private int _response;
+	
+	@Override
+	protected void readImpl() {
+		_response = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!getClient().getFloodProtectors().getTransaction().tryPerformAction("trade")) {
+			player.sendMessage("You are trading too fast.");
+			return;
+		}
+		
+		final TradeList trade = player.getActiveTradeList();
+		if (trade == null) {
+			if (general().debug()) {
+				LOG.warn("player.getTradeList == null in {} for player {}", getType(), player.getName());
+			}
+			return;
+		}
+		
+		if (trade.isLocked()) {
+			return;
+		}
+		
+		if (_response == 1) {
+			if ((trade.getPartner() == null) || (L2World.getInstance().getPlayer(trade.getPartner().getObjectId()) == null)) {
+				// Trade partner not found, cancel trade
+				player.cancelActiveTrade();
+				player.sendPacket(SystemMessageId.TARGET_IS_NOT_FOUND_IN_THE_GAME);
+				return;
+			}
+			
+			if ((trade.getOwner().getActiveEnchantItemId() != L2PcInstance.ID_NONE) || (trade.getPartner().getActiveEnchantItemId() != L2PcInstance.ID_NONE)) {
+				return;
+			}
+			
+			if (!player.getAccessLevel().allowTransaction()) {
+				player.cancelActiveTrade();
+				player.sendPacket(SystemMessageId.YOU_ARE_NOT_AUTHORIZED_TO_DO_THAT);
+				return;
+			}
+			
+			if ((player.getInstanceId() != trade.getPartner().getInstanceId()) && (player.getInstanceId() != -1)) {
+				player.cancelActiveTrade();
+				return;
+			}
+			
+			if (player.calculateDistance(trade.getPartner(), true, false) > 150) {
+				player.cancelActiveTrade();
+				return;
+			}
+			trade.confirm();
+		} else {
+			player.cancelActiveTrade();
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] 1C TradeDone";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java
new file mode 100644
index 00000000..a0fe7c27
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/TradeRequest.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.datatables.BotReportTable;
+import com.l2jserver.gameserver.enums.PrivateStoreType;
+import com.l2jserver.gameserver.model.BlockList;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
+import com.l2jserver.gameserver.network.serverpackets.SendTradeRequest;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * This packet manages the trade request.
+ */
+public final class TradeRequest extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(TradeRequest.class);
+	
+	private int _objectId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		L2PcInstance player = getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		if (!player.getAccessLevel().allowTransaction()) {
+			player.sendMessage("Transactions are disabled for your current Access Level.");
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
+		}
+		
+		BuffInfo info = player.getEffectList().getBuffInfoByAbnormalType(AbnormalType.BOT_PENALTY);
+		if (info != null) {
+			for (AbstractEffect effect : info.getEffects()) {
+				if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) {
+					player.sendPacket(SystemMessageId.YOU_HAVE_BEEN_REPORTED_SO_ACTIONS_NOT_ALLOWED);
+					player.sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+		}
+		
+		final L2Object target = L2World.getInstance().findObject(_objectId);
+		// If there is no target, target is far away or
+		// they are in different instances (except multiverse)
+		// trade request is ignored and there is no system message.
+		if ((target == null) || !player.getKnownList().knowsObject(target) || ((target.getInstanceId() != player.getInstanceId()) && (player.getInstanceId() != -1))) {
+			return;
+		}
+		
+		// If target and acting player are the same, trade request is ignored
+		// and the following system message is sent to acting player.
+		if (target.getObjectId() == player.getObjectId()) {
+			player.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
+			return;
+		}
+		
+		if (!target.isPlayer()) {
+			player.sendPacket(SystemMessageId.INCORRECT_TARGET);
+			return;
+		}
+		
+		final L2PcInstance partner = target.getActingPlayer();
+		if (partner.isInOlympiadMode() || player.isInOlympiadMode()) {
+			player.sendMessage("A user currently participating in the Olympiad cannot accept or request a trade.");
+			return;
+		}
+		
+		info = partner.getEffectList().getBuffInfoByAbnormalType(AbnormalType.BOT_PENALTY);
+		if (info != null) {
+			for (AbstractEffect effect : info.getEffects()) {
+				if (!effect.checkCondition(BotReportTable.TRADE_ACTION_BLOCK_ID)) {
+					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_REPORTED_AND_IS_BEING_INVESTIGATED);
+					sm.addCharName(partner);
+					player.sendPacket(sm);
+					player.sendPacket(ActionFailed.STATIC_PACKET);
+					return;
+				}
+			}
+		}
+		
+		if (!character().karmaPlayerCanTrade() && (player.getKarma() > 0)) {
+			player.sendMessage("You cannot trade while you are in a chaotic state.");
+			return;
+		}
+		
+		if (!character().karmaPlayerCanTrade() && (partner.getKarma() > 0)) {
+			player.sendMessage("You cannot request a trade while your target is in a chaotic state.");
+			return;
+		}
+		
+		if (general().jailDisableTransaction() && (player.isJailed() || partner.isJailed())) {
+			player.sendMessage("You cannot trade while you are in in Jail.");
+			return;
+		}
+		
+		if ((player.getPrivateStoreType() != PrivateStoreType.NONE) || (partner.getPrivateStoreType() != PrivateStoreType.NONE)) {
+			player.sendPacket(SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE);
+			return;
+		}
+		
+		if (player.isProcessingTransaction()) {
+			if (general().debug()) {
+				LOG.debug("Already trading with someone else.");
+			}
+			player.sendPacket(SystemMessageId.ALREADY_TRADING);
+			return;
+		}
+		
+		SystemMessage sm;
+		if (partner.isProcessingRequest() || partner.isProcessingTransaction()) {
+			if (general().debug()) {
+				LOG.info("Transaction already in progress.");
+			}
+			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_BUSY_TRY_LATER);
+			sm.addString(partner.getName());
+			player.sendPacket(sm);
+			return;
+		}
+		
+		if (partner.getTradeRefusal()) {
+			player.sendMessage("That person is in trade refusal mode.");
+			return;
+		}
+		
+		if (BlockList.isBlocked(partner, player)) {
+			sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_ADDED_YOU_TO_IGNORE_LIST);
+			sm.addCharName(partner);
+			player.sendPacket(sm);
+			return;
+		}
+		
+		if (player.calculateDistance(partner, true, false) > 150) {
+			player.sendPacket(SystemMessageId.TARGET_TOO_FAR);
+			return;
+		}
+		
+		player.onTransactionRequest(partner);
+		partner.sendPacket(new SendTradeRequest(player.getObjectId()));
+		sm = SystemMessage.getSystemMessage(SystemMessageId.REQUEST_C1_FOR_TRADE);
+		sm.addString(partner.getName());
+		player.sendPacket(sm);
+	}
+	
+	@Override
+	public String getType() {
+		return "[C] 1A TradeRequest";
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java
new file mode 100644
index 00000000..9c4d5b90
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.ai.CtrlEvent.EVT_FINISH_CASTING;
+import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_CAST;
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.enums.PrivateStoreType.NONE;
+import static com.l2jserver.gameserver.enums.Race.KAMAEL;
+import static com.l2jserver.gameserver.model.PcCondOverride.ITEM_CONDITIONS;
+import static com.l2jserver.gameserver.model.effects.L2EffectType.TELEPORT;
+import static com.l2jserver.gameserver.model.itemcontainer.Inventory.PAPERDOLL_LHAND;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_BACK;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_CHEST;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_DECO;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_FEET;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_FULL_ARMOR;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_GLOVES;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_HEAD;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_LEGS;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_LR_HAND;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_L_HAND;
+import static com.l2jserver.gameserver.model.items.L2Item.SLOT_R_HAND;
+import static com.l2jserver.gameserver.model.items.type.ArmorType.HEAVY;
+import static com.l2jserver.gameserver.model.items.type.ArmorType.MAGIC;
+import static com.l2jserver.gameserver.model.items.type.ItemType2.QUEST;
+import static com.l2jserver.gameserver.model.items.type.WeaponType.FISHINGROD;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_DO_WHILE_FISHING_3;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE;
+import static com.l2jserver.gameserver.network.SystemMessageId.CANNOT_USE_QUEST_ITEMS;
+import static com.l2jserver.gameserver.network.SystemMessageId.S1_CANNOT_BE_USED;
+import static com.l2jserver.gameserver.network.SystemMessageId.S2_HOURS_S3_MINUTES_S4_SECONDS_REMAINING_FOR_REUSE_S1;
+import static com.l2jserver.gameserver.network.SystemMessageId.S2_MINUTES_S3_SECONDS_REMAINING_FOR_REUSE_S1;
+import static com.l2jserver.gameserver.network.SystemMessageId.S2_SECONDS_REMAINING_FOR_REUSE_S1;
+import static com.l2jserver.gameserver.network.serverpackets.ActionFailed.STATIC_PACKET;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.ai.NextAction;
+import com.l2jserver.gameserver.handler.IItemHandler;
+import com.l2jserver.gameserver.handler.ItemHandler;
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.items.L2EtcItem;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.WeaponType;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.network.serverpackets.ExUseSharedGroupItem;
+import com.l2jserver.gameserver.network.serverpackets.ItemList;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+public final class UseItem extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(UseItem.class);
+	
+	private static final String _C__19_USEITEM = "[C] 19 UseItem";
+	
+	private static final int FORMAL_WEAR_ID = 6408;
+	
+	private int _objectId;
+	
+	private boolean _ctrlPressed;
+	
+	private int _itemId;
+	
+	@Override
+	protected void readImpl() {
+		_objectId = readD();
+		_ctrlPressed = readD() != 0;
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		if (general().debug()) {
+			LOG.debug("{} uses item with object Id {}.", activeChar, _objectId);
+		}
+		
+		// Flood protect UseItem
+		if (!getClient().getFloodProtectors().getUseItem().tryPerformAction("use item")) {
+			return;
+		}
+		
+		if (activeChar.getActiveTradeList() != null) {
+			activeChar.cancelActiveTrade();
+		}
+		
+		if (activeChar.getPrivateStoreType() != NONE) {
+			activeChar.sendPacket(CANNOT_TRADE_DISCARD_DROP_ITEM_WHILE_IN_SHOPMODE);
+			activeChar.sendPacket(STATIC_PACKET);
+			return;
+		}
+		
+		final L2ItemInstance item = activeChar.getInventory().getItemByObjectId(_objectId);
+		if (item == null) {
+			return;
+		}
+		
+		if (item.getItem().getType2() == QUEST) {
+			activeChar.sendPacket(CANNOT_USE_QUEST_ITEMS);
+			return;
+		}
+		
+		// No UseItem is allowed while the player is in special conditions
+		if (activeChar.isStunned() || activeChar.isSleeping() || activeChar.isAfraid() || activeChar.isAlikeDead()) {
+			return;
+		}
+		
+		_itemId = item.getId();
+		
+		// Char cannot use item when dead
+		if (activeChar.isDead() || !activeChar.getInventory().canManipulateWithItemId(_itemId)) {
+			final SystemMessage sm = SystemMessage.getSystemMessage(S1_CANNOT_BE_USED);
+			sm.addItemName(item);
+			activeChar.sendPacket(sm);
+			return;
+		}
+		
+		if (!item.isEquipped() && !item.getItem().checkCondition(activeChar, activeChar, true)) {
+			return;
+		}
+		
+		if (activeChar.isFishing() && ((_itemId < 6535) || (_itemId > 6540))) {
+			// You cannot do anything else while fishing
+			activeChar.sendPacket(CANNOT_DO_WHILE_FISHING_3);
+			return;
+		}
+		
+		if (!character().karmaPlayerCanTeleport() && (activeChar.getKarma() > 0)) {
+			SkillHolder[] skills = item.getItem().getSkills();
+			if (skills != null) {
+				for (SkillHolder sHolder : skills) {
+					Skill skill = sHolder.getSkill();
+					if ((skill != null) && skill.hasEffectType(TELEPORT)) {
+						return;
+					}
+				}
+			}
+		}
+		
+		// If the item has reuse time and it has not passed.
+		// Message from reuse delay must come from item.
+		final int reuseDelay = item.getReuseDelay();
+		final int sharedReuseGroup = item.getSharedReuseGroup();
+		if (reuseDelay > 0) {
+			final long reuse = activeChar.getItemRemainingReuseTime(item.getObjectId());
+			if (reuse > 0) {
+				reuseData(activeChar, item, reuse);
+				sendSharedGroupUpdate(activeChar, sharedReuseGroup, reuse, reuseDelay);
+				return;
+			}
+			
+			final long reuseOnGroup = activeChar.getReuseDelayOnGroup(sharedReuseGroup);
+			if (reuseOnGroup > 0) {
+				reuseData(activeChar, item, reuseOnGroup);
+				sendSharedGroupUpdate(activeChar, sharedReuseGroup, reuseOnGroup, reuseDelay);
+				return;
+			}
+		}
+		
+		if (item.isEquipable()) {
+			// Don't allow to put formal wear while a cursed weapon is equipped.
+			if (activeChar.isCursedWeaponEquipped() && (_itemId == FORMAL_WEAR_ID)) {
+				return;
+			}
+			
+			// Equip or unEquip
+			if (FortSiegeManager.getInstance().isCombat(_itemId)) {
+				return; // no message
+			}
+			
+			if (activeChar.isCombatFlagEquipped()) {
+				return;
+			}
+			
+			switch (item.getItem().getBodyPart()) {
+				case SLOT_LR_HAND, SLOT_L_HAND, SLOT_R_HAND -> {
+					// Prevent players to equip weapon while wearing combat flag
+					if ((activeChar.getActiveWeaponItem() != null) && (activeChar.getActiveWeaponItem().getId() == 9819)) {
+						activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+						return;
+					}
+					
+					if (activeChar.isMounted()) {
+						activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+						return;
+					}
+					if (activeChar.isDisarmed()) {
+						activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+						return;
+					}
+					
+					// Don't allow weapon/shield equipment if a cursed weapon is equipped.
+					if (activeChar.isCursedWeaponEquipped()) {
+						return;
+					}
+					
+					// Don't allow other Race to Wear Kamael exclusive Weapons.
+					if (!item.isEquipped() && item.isWeapon() && !activeChar.canOverrideCond(ITEM_CONDITIONS)) {
+						L2Weapon wpn = (L2Weapon) item.getItem();
+						
+						switch (activeChar.getRace()) {
+							case KAMAEL -> {
+								if (wpn.getItemType() == WeaponType.NONE) {
+									activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+									return;
+								}
+							}
+							case HUMAN, DWARF, ELF, DARK_ELF, ORC -> {
+								switch (wpn.getItemType()) {
+									case RAPIER, CROSSBOW, ANCIENTSWORD -> {
+										activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+										return;
+									}
+								}
+							}
+						}
+					}
+				}
+				case SLOT_CHEST, SLOT_BACK, SLOT_GLOVES, SLOT_FEET, SLOT_HEAD, SLOT_FULL_ARMOR, SLOT_LEGS -> {
+					if ((activeChar.getRace() == KAMAEL) && ((item.getItem().getItemType() == HEAVY) || (item.getItem().getItemType() == MAGIC))) {
+						activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+						return;
+					}
+				}
+				case SLOT_DECO -> {
+					if (!item.isEquipped() && (activeChar.getInventory().getTalismanSlots() == 0)) {
+						activeChar.sendPacket(CANNOT_EQUIP_ITEM_DUE_TO_BAD_CONDITION);
+						return;
+					}
+				}
+			}
+			
+			if (activeChar.isCastingNow() || activeChar.isCastingSimultaneouslyNow()) {
+				// Creating next action class.
+				final NextAction nextAction = new NextAction(EVT_FINISH_CASTING, AI_INTENTION_CAST, () -> activeChar.useEquippableItem(_objectId, true));
+				
+				// Binding next action to AI.
+				activeChar.getAI().setNextAction(nextAction);
+			} else if (activeChar.isAttackingNow()) {
+				ThreadPoolManager.getInstance().scheduleGeneral(() -> activeChar.useEquippableItem(_objectId, false), MILLISECONDS.convert(activeChar.getAttackEndTime() - System.nanoTime(), NANOSECONDS));
+			} else {
+				activeChar.useEquippableItem(_objectId, true);
+			}
+		} else {
+			final L2Weapon weaponItem = activeChar.getActiveWeaponItem();
+			if (((weaponItem != null) && (weaponItem.getItemType() == FISHINGROD))
+				&& (((_itemId >= 6519) && (_itemId <= 6527)) || ((_itemId >= 7610) && (_itemId <= 7613)) || ((_itemId >= 7807) && (_itemId <= 7809)) || ((_itemId >= 8484) && (_itemId <= 8486)) || ((_itemId >= 8505) && (_itemId <= 8513)))) {
+				activeChar.getInventory().setPaperdollItem(PAPERDOLL_LHAND, item);
+				activeChar.broadcastUserInfo();
+				// Send a Server->Client packet ItemList to this L2PcInstance to update left hand equipment.
+				sendPacket(new ItemList(activeChar, false));
+				return;
+			}
+			
+			final L2EtcItem etcItem = item.getEtcItem();
+			final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
+			if (handler == null) {
+				if ((etcItem != null) && (etcItem.getHandlerName() != null)) {
+					LOG.warn("Unmanaged Item handler: {} for Item Id: {}!", etcItem.getHandlerName(), _itemId);
+				} else if (general().debug()) {
+					LOG.warn("No Item handler registered for Item Id: {}!", _itemId);
+				}
+				return;
+			}
+			
+			// Item reuse time should be added if the item is successfully used.
+			// Skill reuse delay is done at handlers.itemhandlers.ItemSkillsTemplate;
+			if (handler.useItem(activeChar, item, _ctrlPressed)) {
+				if (reuseDelay > 0) {
+					activeChar.addTimeStampItem(item, reuseDelay);
+					sendSharedGroupUpdate(activeChar, sharedReuseGroup, reuseDelay, reuseDelay);
+				}
+			}
+		}
+	}
+	
+	private void reuseData(L2PcInstance activeChar, L2ItemInstance item, long remainingTime) {
+		final int hours = (int) (remainingTime / 3600000L);
+		final int minutes = (int) (remainingTime % 3600000L) / 60000;
+		final int seconds = (int) ((remainingTime / 1000) % 60);
+		final SystemMessage sm;
+		if (hours > 0) {
+			sm = SystemMessage.getSystemMessage(S2_HOURS_S3_MINUTES_S4_SECONDS_REMAINING_FOR_REUSE_S1);
+			sm.addItemName(item);
+			sm.addInt(hours);
+			sm.addInt(minutes);
+		} else if (minutes > 0) {
+			sm = SystemMessage.getSystemMessage(S2_MINUTES_S3_SECONDS_REMAINING_FOR_REUSE_S1);
+			sm.addItemName(item);
+			sm.addInt(minutes);
+		} else {
+			sm = SystemMessage.getSystemMessage(S2_SECONDS_REMAINING_FOR_REUSE_S1);
+			sm.addItemName(item);
+		}
+		sm.addInt(seconds);
+		activeChar.sendPacket(sm);
+	}
+	
+	private void sendSharedGroupUpdate(L2PcInstance activeChar, int group, long remaining, int reuse) {
+		if (group > 0) {
+			activeChar.sendPacket(new ExUseSharedGroupItem(_itemId, group, remaining, reuse));
+		}
+	}
+	
+	@Override
+	public String getType() {
+		return _C__19_USEITEM;
+	}
+	
+	@Override
+	protected boolean triggersOnActionRequest() {
+		return !character().getPlayerSpawnProtectionAllowedItems().contains(_itemId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/clientpackets/ValidatePosition.java b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ValidatePosition.java
new file mode 100644
index 00000000..ea53b95f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/clientpackets/ValidatePosition.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.clientpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+import com.l2jserver.gameserver.network.serverpackets.GetOnVehicle;
+import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
+
+/**
+ * @version 2005/03/27 15:29:30
+ */
+public class ValidatePosition extends L2GameClientPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(ValidatePosition.class);
+	
+	private static final String _C__59_VALIDATEPOSITION = "[C] 59 ValidatePosition";
+	
+	private int _x;
+	private int _y;
+	private int _z;
+	private int _heading;
+	private int _data; // vehicle id
+	
+	@Override
+	protected void readImpl() {
+		_x = readD();
+		_y = readD();
+		_z = readD();
+		_heading = readD();
+		_data = readD();
+	}
+	
+	@Override
+	protected void runImpl() {
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if ((activeChar == null) || activeChar.isTeleporting() || activeChar.inObserverMode()) {
+			return;
+		}
+		
+		final int realX = activeChar.getX();
+		final int realY = activeChar.getY();
+		int realZ = activeChar.getZ();
+		
+		if (general().developer()) {
+			LOG.debug("Client pos: {} {} {} head {}", _x, _y, _z, _heading);
+			LOG.debug("Server pos: {} {} {} head {}", realX, realY, realZ, activeChar.getHeading());
+		}
+		
+		if ((_x == 0) && (_y == 0)) {
+			if (realX != 0) {
+				return;
+			}
+		}
+		
+		int dx, dy, dz;
+		double diffSq;
+		
+		if (activeChar.isInBoat()) {
+			if (geodata().getCoordSynchronize() == 2) {
+				dx = _x - activeChar.getInVehiclePosition().getX();
+				dy = _y - activeChar.getInVehiclePosition().getY();
+				// dz = _z - activeChar.getInVehiclePosition().getZ();
+				diffSq = ((dx * dx) + (dy * dy));
+				if (diffSq > 250000) {
+					sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInVehiclePosition()));
+				}
+			}
+			return;
+		}
+		if (activeChar.isInAirShip()) {
+			// Zoey76: TODO: Implement or cleanup.
+			// if (Config.COORD_SYNCHRONIZE == 2)
+			// {
+			// dx = _x - activeChar.getInVehiclePosition().getX();
+			// dy = _y - activeChar.getInVehiclePosition().getY();
+			// dz = _z - activeChar.getInVehiclePosition().getZ();
+			// diffSq = ((dx * dx) + (dy * dy));
+			// if (diffSq > 250000)
+			// {
+			// sendPacket(new GetOnVehicle(activeChar.getObjectId(), _data, activeChar.getInBoatPosition()));
+			// }
+			// }
+			return;
+		}
+		
+		if (activeChar.isFalling(_z)) {
+			return; // disable validations during fall to avoid "jumping"
+		}
+		
+		dx = _x - realX;
+		dy = _y - realY;
+		dz = _z - realZ;
+		diffSq = ((dx * dx) + (dy * dy));
+		
+		// Zoey76: TODO: Implement or cleanup.
+		// L2Party party = activeChar.getParty();
+		// if ((party != null) && (activeChar.getLastPartyPositionDistance(_x, _y, _z) > 150))
+		// {
+		// activeChar.setLastPartyPosition(_x, _y, _z);
+		// party.broadcastToPartyMembers(activeChar, new PartyMemberPosition(activeChar));
+		// }
+		
+		// Don't allow flying transformations outside gracia area!
+		if (activeChar.isFlyingMounted() && (_x > L2World.GRACIA_MAX_X)) {
+			activeChar.untransform();
+		}
+		
+		if (activeChar.isFlying() || activeChar.isInsideZone(ZoneId.WATER)) {
+			activeChar.setXYZ(realX, realY, _z);
+			if (diffSq > 90000) {
+				activeChar.sendPacket(new ValidateLocation(activeChar));
+			}
+		} else if (diffSq < 360000) // if too large, messes observation
+		{
+			// Only Z coordinate synched to server,
+			// mainly used when no geodata but can be used also with geodata
+			if (geodata().getCoordSynchronize() == -1) {
+				activeChar.setXYZ(realX, realY, _z);
+				return;
+			}
+			// Trusting also client x,y coordinates (should not be used with geodata)
+			if (geodata().getCoordSynchronize() == 1) {
+				// Heading changed on client = possible obstacle
+				if (!activeChar.isMoving() || !activeChar.validateMovementHeading(_heading)) {
+					// character is not moving, take coordinates from client
+					if (diffSq < 2500) {
+						activeChar.setXYZ(realX, realY, _z);
+					} else {
+						activeChar.setXYZ(_x, _y, _z);
+					}
+				} else {
+					activeChar.setXYZ(realX, realY, _z);
+				}
+				
+				activeChar.setHeading(_heading);
+				return;
+			}
+			// Sync 2 (or other),
+			// intended for geodata. Sends a validation packet to client
+			// when too far from server calculated true coordinate.
+			// Due to geodata/zone errors, some Z axis checks are made. (maybe a temporary solution)
+			// Important: this code part must work together with L2Character.updatePosition
+			if ((diffSq > 250000) || (Math.abs(dz) > 200)) {
+				// if ((_z - activeChar.getClientZ()) < 200 && Math.abs(activeChar.getLastServerPosition().getZ()-realZ) > 70)
+				
+				if ((Math.abs(dz) > 200) && (Math.abs(dz) < 1500) && (Math.abs(_z - activeChar.getClientZ()) < 800)) {
+					activeChar.setXYZ(realX, realY, _z);
+					realZ = _z;
+				} else {
+					if (general().developer()) {
+						LOG.info("{}: Synchronizing position Server --> Client", activeChar.getName());
+					}
+					
+					activeChar.sendPacket(new ValidateLocation(activeChar));
+				}
+			}
+		}
+		
+		activeChar.setClientX(_x);
+		activeChar.setClientY(_y);
+		activeChar.setClientZ(_z);
+		activeChar.setClientHeading(_heading); // No real need to validate heading.
+		activeChar.setLastServerPosition(realX, realY, realZ);
+	}
+	
+	@Override
+	public String getType() {
+		return _C__59_VALIDATEPOSITION;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/AuthRequest.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/AuthRequest.java
new file mode 100644
index 00000000..0679c54a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/AuthRequest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import java.util.List;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * Auth Request packet.
+ * 
+ * <pre>
+ * Format: CCCCHDDBD[S]
+ * C protocol
+ * C desired Id
+ * C accept alternative Id
+ * C reserve Host
+ * H port
+ * D max players
+ * D hex Id size
+ * B hex Id
+ * D subnet size
+ * [S] subnets
+ * </pre>
+ * 
+ * @author Zoey76
+ */
+public class AuthRequest extends BaseSendablePacket {
+	
+	private static final int VERSION = 14;
+	
+	public AuthRequest(int id, boolean acceptAlternate, byte[] hexid, int port, boolean reserveHost, int maxplayer, List<String> subnets, List<String> hosts) {
+		writeC(0x01);
+		writeC(VERSION);
+		writeC(id);
+		writeC(acceptAlternate ? 0x01 : 0x00);
+		writeC(reserveHost ? 0x01 : 0x00);
+		writeH(port);
+		writeD(maxplayer);
+		writeD(hexid.length);
+		writeB(hexid);
+		writeD(subnets.size());
+		for (int i = 0; i < subnets.size(); i++) {
+			writeS(subnets.get(i));
+			writeS(hosts.get(i));
+		}
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java
new file mode 100644
index 00000000..265dbf93
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/BlowFishKey.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import java.security.interfaces.RSAPublicKey;
+
+import javax.crypto.Cipher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class BlowFishKey extends BaseSendablePacket {
+	private static final Logger LOG = LoggerFactory.getLogger(BlowFishKey.class);
+	
+	public BlowFishKey(byte[] blowfishKey, RSAPublicKey publicKey) {
+		writeC(0x00);
+		try {
+			final Cipher rsaCipher = Cipher.getInstance("RSA/ECB/nopadding");
+			rsaCipher.init(Cipher.ENCRYPT_MODE, publicKey);
+			byte[] encrypted = rsaCipher.doFinal(blowfishKey);
+			writeD(encrypted.length);
+			writeB(encrypted);
+		} catch (Exception e) {
+			LOG.error("Error While encrypting blowfish key for transmision (Crypt error): {}", e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ChangeAccessLevel.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ChangeAccessLevel.java
new file mode 100644
index 00000000..38a87b15
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ChangeAccessLevel.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class ChangeAccessLevel extends BaseSendablePacket {
+	public ChangeAccessLevel(String player, int access) {
+		writeC(0x04);
+		writeD(access);
+		writeS(player);
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ChangePassword.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ChangePassword.java
new file mode 100644
index 00000000..bfcad3d4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ChangePassword.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author UnAfraid
+ */
+public class ChangePassword extends BaseSendablePacket {
+	public ChangePassword(String accountName, String characterName, String oldPass, String newPass) {
+		writeC(0x0B);
+		writeS(accountName);
+		writeS(characterName);
+		writeS(oldPass);
+		writeS(newPass);
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerAuthRequest.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerAuthRequest.java
new file mode 100644
index 00000000..08c184b0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerAuthRequest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+import com.l2jserver.gameserver.LoginServerThread.SessionKey;
+
+/**
+ * @author -Wooden-
+ */
+public class PlayerAuthRequest extends BaseSendablePacket {
+	public PlayerAuthRequest(String account, SessionKey key) {
+		writeC(0x05);
+		writeS(account);
+		writeD(key.playOkID1);
+		writeD(key.playOkID2);
+		writeD(key.loginOkID1);
+		writeD(key.loginOkID2);
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerInGame.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerInGame.java
new file mode 100644
index 00000000..2bbc492e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerInGame.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import java.util.List;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class PlayerInGame extends BaseSendablePacket {
+	public PlayerInGame(String player) {
+		writeC(0x02);
+		writeH(1);
+		writeS(player);
+	}
+	
+	public PlayerInGame(List<String> players) {
+		writeC(0x02);
+		writeH(players.size());
+		for (String pc : players) {
+			writeS(pc);
+		}
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerLogout.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerLogout.java
new file mode 100644
index 00000000..bda2ad11
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerLogout.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class PlayerLogout extends BaseSendablePacket {
+	public PlayerLogout(String player) {
+		writeC(0x03);
+		writeS(player);
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerTracert.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerTracert.java
new file mode 100644
index 00000000..486b2e6b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/PlayerTracert.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author mrTJO
+ */
+public class PlayerTracert extends BaseSendablePacket {
+	public PlayerTracert(String account, String pcIp, String hop1, String hop2, String hop3, String hop4) {
+		writeC(0x07);
+		writeS(account);
+		writeS(pcIp);
+		writeS(hop1);
+		writeS(hop2);
+		writeS(hop3);
+		writeS(hop4);
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java
new file mode 100644
index 00000000..7061dd37
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import java.util.List;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author mrTJO
+ * @author mochitto
+ */
+public class ReplyCharacters extends BaseSendablePacket {
+	
+	public ReplyCharacters(String account, int chars, List<Long> timeToDel) {
+		writeC(0x08);
+		writeS(account);
+		writeC(chars);
+		writeC(timeToDel.size());
+		for (long time : timeToDel) {
+			writeQ(time);
+		}
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/SendMail.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/SendMail.java
new file mode 100644
index 00000000..6dc909dd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/SendMail.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author mrTJO
+ */
+public class SendMail extends BaseSendablePacket {
+	public SendMail(String accountName, String mailId, String... args) {
+		writeC(0x09);
+		writeS(accountName);
+		writeS(mailId);
+		writeC(args.length);
+		for (String arg : args) {
+			writeS(arg);
+		}
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ServerStatus.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ServerStatus.java
new file mode 100644
index 00000000..c977333d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/ServerStatus.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import java.util.ArrayList;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class ServerStatus extends BaseSendablePacket {
+	private final ArrayList<Attribute> _attributes;
+	
+	public static final String[] STATUS_STRING = {
+		"Auto",
+		"Good",
+		"Normal",
+		"Full",
+		"Down",
+		"Gm Only"
+	};
+	
+	public static final int SERVER_LIST_STATUS = 0x01;
+	public static final int SERVER_TYPE = 0x02;
+	public static final int SERVER_LIST_SQUARE_BRACKET = 0x03;
+	public static final int MAX_PLAYERS = 0x04;
+	public static final int SERVER_AGE = 0x05;
+	
+	// Server Status
+	public static final int STATUS_AUTO = 0x00;
+	public static final int STATUS_GOOD = 0x01;
+	public static final int STATUS_NORMAL = 0x02;
+	public static final int STATUS_FULL = 0x03;
+	public static final int STATUS_DOWN = 0x04;
+	public static final int STATUS_GM_ONLY = 0x05;
+	
+	// Server Types
+	public static final int SERVER_NORMAL = 0x01;
+	public static final int SERVER_RELAX = 0x02;
+	public static final int SERVER_TEST = 0x04;
+	public static final int SERVER_NOLABEL = 0x08;
+	public static final int SERVER_CREATION_RESTRICTED = 0x10;
+	public static final int SERVER_EVENT = 0x20;
+	public static final int SERVER_FREE = 0x40;
+	
+	// Server Ages
+	public static final int SERVER_AGE_ALL = 0x00;
+	public static final int SERVER_AGE_15 = 0x0F;
+	public static final int SERVER_AGE_18 = 0x12;
+	
+	public static final int ON = 0x01;
+	public static final int OFF = 0x00;
+	
+	static class Attribute {
+		public int id;
+		public int value;
+		
+		Attribute(int pId, int pValue) {
+			id = pId;
+			value = pValue;
+		}
+	}
+	
+	public ServerStatus() {
+		_attributes = new ArrayList<>();
+	}
+	
+	public void addAttribute(int id, int value) {
+		_attributes.add(new Attribute(id, value));
+	}
+	
+	@Override
+	public byte[] getContent() {
+		writeC(0x06);
+		writeD(_attributes.size());
+		for (Attribute temp : _attributes) {
+			writeD(temp.id);
+			writeD(temp.value);
+		}
+		
+		return getBytes();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/TempBan.java b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/TempBan.java
new file mode 100644
index 00000000..c8e5b192
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/gameserverpackets/TempBan.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.gameserverpackets;
+
+import com.l2jserver.commons.network.BaseSendablePacket;
+
+/**
+ * @author mrTJO
+ */
+public class TempBan extends BaseSendablePacket {
+	public TempBan(String accountName, String ip, long time, String reason) {
+		writeC(0x0A);
+		writeS(accountName);
+		writeS(ip);
+		writeQ(System.currentTimeMillis() + (time * 60000));
+		if (reason != null) {
+			writeC(0x01);
+			writeS(reason);
+		} else {
+			writeC(0x00);
+		}
+	}
+	
+	public TempBan(String accountName, String ip, long time) {
+		this(accountName, ip, time, null);
+	}
+	
+	@Override
+	public byte[] getContent() {
+		return getBytes();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/AuthResponse.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/AuthResponse.java
new file mode 100644
index 00000000..dea2cbe0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/AuthResponse.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class AuthResponse extends BaseRecievePacket {
+	
+	private final int _serverId;
+	private final String _serverName;
+	
+	/**
+	 * @param decrypt
+	 */
+	public AuthResponse(byte[] decrypt) {
+		super(decrypt);
+		_serverId = readC();
+		_serverName = readS();
+	}
+	
+	/**
+	 * @return Returns the serverId.
+	 */
+	public int getServerId() {
+		return _serverId;
+	}
+	
+	/**
+	 * @return Returns the serverName.
+	 */
+	public String getServerName() {
+		return _serverName;
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java
new file mode 100644
index 00000000..a116f8e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/ChangePasswordResponse.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class ChangePasswordResponse extends BaseRecievePacket {
+	
+	public ChangePasswordResponse(byte[] decrypt) {
+		super(decrypt);
+		// boolean isSuccessful = readC() > 0;
+		String character = readS();
+		String msgToSend = readS();
+		
+		L2PcInstance player = L2World.getInstance().getPlayer(character);
+		
+		if (player != null) {
+			player.sendMessage(msgToSend);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java
new file mode 100644
index 00000000..418d8bc4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/InitLS.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+
+/**
+ * InitLS response packet.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class InitLS extends BaseRecievePacket {
+	
+	private final byte[] _key;
+	
+	public byte[] getRSAKey() {
+		return _key;
+	}
+	
+	public InitLS(byte[] decrypt) {
+		super(decrypt);
+		int size = readD();
+		_key = readB(size);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/KickPlayer.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/KickPlayer.java
new file mode 100644
index 00000000..0746a4d7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/KickPlayer.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+
+public class KickPlayer extends BaseRecievePacket {
+	
+	private final String _account;
+	
+	public KickPlayer(byte[] decrypt) {
+		super(decrypt);
+		_account = readS();
+	}
+	
+	public String getAccount() {
+		return _account;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/LoginServerFail.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/LoginServerFail.java
new file mode 100644
index 00000000..a94da5be
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/LoginServerFail.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+
+public class LoginServerFail extends BaseRecievePacket {
+	
+	private static final String[] REASONS = {
+		"None",
+		"Reason: ip banned",
+		"Reason: ip reserved",
+		"Reason: wrong hexid",
+		"Reason: id reserved",
+		"Reason: no free ID",
+		"Not authed",
+		"Reason: already logged in"
+	};
+	private final int _reason;
+	
+	public LoginServerFail(byte[] decrypt) {
+		super(decrypt);
+		_reason = readC();
+	}
+	
+	public String getReasonString() {
+		return REASONS[_reason];
+	}
+	
+	public int getReason() {
+		return _reason;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/PlayerAuthResponse.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/PlayerAuthResponse.java
new file mode 100644
index 00000000..bc9e4a34
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/PlayerAuthResponse.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+
+/**
+ * @author -Wooden-
+ */
+public class PlayerAuthResponse extends BaseRecievePacket {
+	
+	private final String _account;
+	private final boolean _authed;
+	
+	public PlayerAuthResponse(byte[] decrypt) {
+		super(decrypt);
+		
+		_account = readS();
+		_authed = (readC() != 0);
+	}
+	
+	public String getAccount() {
+		return _account;
+	}
+	
+	public boolean isAuthed() {
+		return _authed;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/RequestCharacters.java b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/RequestCharacters.java
new file mode 100644
index 00000000..001f0a47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/loginserverpackets/RequestCharacters.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.loginserverpackets;
+
+import com.l2jserver.commons.network.BaseRecievePacket;
+
+/**
+ * @author mrTJO
+ * @author mochitto
+ */
+public class RequestCharacters extends BaseRecievePacket {
+	private final String _account;
+	
+	public RequestCharacters(byte[] decrypt) {
+		super(decrypt);
+		_account = readS();
+	}
+	
+	public String getAccount() {
+		return _account;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java
new file mode 100644
index 00000000..fdc59ef1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbnormalStatusUpdate.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+public class AbnormalStatusUpdate extends L2GameServerPacket {
+	private final List<BuffInfo> _effects = new ArrayList<>();
+	
+	public void addSkill(BuffInfo info) {
+		if (!info.getSkill().isHealingPotionSkill()) {
+			_effects.add(info);
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x85);
+		writeH(_effects.size());
+		for (BuffInfo info : _effects) {
+			if ((info != null) && info.isInUse()) {
+				writeD(info.getSkill().getDisplayId());
+				writeH(info.getSkill().getDisplayLevel());
+				writeD(info.getTime());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractExCleftPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractExCleftPacket.java
new file mode 100644
index 00000000..e7bad4b5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractExCleftPacket.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Objects;
+
+import com.l2jserver.gameserver.model.cleft.CleftTeam;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public abstract class AbstractExCleftPacket extends L2GameServerPacket {
+	protected AbstractExCleftPacket() {
+	}
+	
+	protected final void writeTeamId(CleftTeam team) {
+		Objects.requireNonNull(team);
+		
+		writeD(team.getTeam().ordinal() - 1);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java
new file mode 100644
index 00000000..dd3c0ba3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractHtmlPacket.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author HorridoJoho
+ */
+public abstract class AbstractHtmlPacket extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractHtmlPacket.class);
+	
+	public static final char VAR_PARAM_START_CHAR = '$';
+	
+	private final int _npcObjId;
+	private String _html = null;
+	private boolean _disabledValidation = false;
+	
+	protected AbstractHtmlPacket() {
+		_npcObjId = 0;
+	}
+	
+	protected AbstractHtmlPacket(int npcObjId) {
+		if (npcObjId < 0) {
+			throw new IllegalArgumentException();
+		}
+		
+		_npcObjId = npcObjId;
+	}
+	
+	protected AbstractHtmlPacket(String html) {
+		_npcObjId = 0;
+		setHtml(html);
+	}
+	
+	protected AbstractHtmlPacket(int npcObjId, String html) {
+		if (npcObjId < 0) {
+			throw new IllegalArgumentException();
+		}
+		
+		_npcObjId = npcObjId;
+		setHtml(html);
+	}
+	
+	public final void disableValidation() {
+		_disabledValidation = true;
+	}
+	
+	public final void setHtml(String html) {
+		if (html.length() > 17200) {
+			LOG.warn("Html is too long! this will crash the client!", new Throwable());
+			_html = html.substring(0, 17200);
+		}
+		
+		if (!html.contains("<html")) {
+			html = "<html><body>" + html + "</body></html>";
+		}
+		
+		_html = html;
+	}
+	
+	public final boolean setFile(String prefix, String path) {
+		String content = HtmCache.getInstance().getHtm(prefix, path);
+		if (content == null) {
+			setHtml("<html><body>My Text is missing:<br>" + path + "</body></html>");
+			LOG.warn("Missing html page {}", path);
+			return false;
+		}
+		
+		setHtml(content);
+		return true;
+	}
+	
+	public final void replace(String pattern, String value) {
+		_html = _html.replaceAll(pattern, value.replace("$", "\\$"));
+	}
+	
+	public final void replace(String pattern, boolean val) {
+		replace(pattern, String.valueOf(val));
+	}
+	
+	public final void replace(String pattern, int val) {
+		replace(pattern, String.valueOf(val));
+	}
+	
+	public final void replace(String pattern, long val) {
+		replace(pattern, String.valueOf(val));
+	}
+	
+	public final void replace(String pattern, double val) {
+		replace(pattern, String.valueOf(val));
+	}
+	
+	@Override
+	public final void runImpl() {
+		L2PcInstance player = getClient().getActiveChar();
+		if (player == null) {
+			return;
+		}
+		
+		player.clearHtmlActions(getScope());
+		
+		if (_disabledValidation) {
+			return;
+		}
+		
+		Util.buildHtmlActionCache(player, getScope(), _npcObjId, _html);
+	}
+	
+	public final int getNpcObjId() {
+		return _npcObjId;
+	}
+	
+	public final String getHtml() {
+		return _html;
+	}
+	
+	public abstract HtmlActionScope getScope();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractInventoryUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractInventoryUpdate.java
new file mode 100644
index 00000000..d8815afe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractInventoryUpdate.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author UnAfraid
+ */
+public abstract class AbstractInventoryUpdate extends AbstractItemPacket {
+	private final Map<Integer, ItemInfo> _items = new ConcurrentSkipListMap<>();
+	
+	public AbstractInventoryUpdate() {
+	}
+	
+	public AbstractInventoryUpdate(L2ItemInstance item) {
+		addItem(item);
+	}
+	
+	public AbstractInventoryUpdate(List<ItemInfo> items) {
+		for (ItemInfo item : items) {
+			_items.put(item.getObjectId(), item);
+		}
+	}
+	
+	public final void addItem(L2ItemInstance item) {
+		_items.put(item.getObjectId(), new ItemInfo(item));
+	}
+	
+	public final void addNewItem(L2ItemInstance item) {
+		_items.put(item.getObjectId(), new ItemInfo(item, 1));
+	}
+	
+	public final void addModifiedItem(L2ItemInstance item) {
+		_items.put(item.getObjectId(), new ItemInfo(item, 2));
+	}
+	
+	public final void addRemovedItem(L2ItemInstance item) {
+		_items.put(item.getObjectId(), new ItemInfo(item, 3));
+	}
+	
+	public final void addItems(List<L2ItemInstance> items) {
+		for (L2ItemInstance item : items) {
+			_items.put(item.getObjectId(), new ItemInfo(item));
+		}
+	}
+	
+	public final Collection<ItemInfo> getItems() {
+		return _items.values();
+	}
+	
+	protected final void writeItems() {
+		writeH(_items.size());
+		for (ItemInfo item : _items.values()) {
+			writeH(item.getChange()); // Update type : 01-add, 02-modify, 03-remove
+			writeItem(item);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java
new file mode 100644
index 00000000..d55200a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractItemPacket.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author UnAfraid
+ */
+public abstract class AbstractItemPacket extends L2GameServerPacket {
+	protected void writeItem(TradeItem item) {
+		writeItem(new ItemInfo(item));
+	}
+	
+	protected void writeItem(L2ItemInstance item) {
+		writeItem(new ItemInfo(item));
+	}
+	
+	protected void writeItem(ItemInfo item) {
+		writeD(item.getObjectId()); // ObjectId
+		writeD(item.getItem().getDisplayId()); // ItemId
+		writeD(item.getLocation()); // T1
+		writeQ(item.getCount()); // Quantity
+		writeH(item.getItem().getType2().getId()); // Item Type 2 : 00-weapon, 01-shield/armor, 02-ring/earring/necklace, 03-questitem, 04-adena, 05-item
+		writeH(item.getCustomType1()); // Filler (always 0)
+		writeH(item.getEquipped()); // Equipped : 00-No, 01-yes
+		writeD(item.getItem().getBodyPart()); // Slot : 0006-lr.ear, 0008-neck, 0030-lr.finger, 0040-head, 0100-l.hand, 0200-gloves, 0400-chest, 0800-pants, 1000-feet, 4000-r.hand, 8000-r.hand
+		writeH(item.getEnchant()); // Enchant level (pet level shown in control item)
+		writeH(item.getCustomType2()); // Pet name exists or not shown in control item
+		writeD(item.getAugmentationBonus());
+		writeD(item.getMana());
+		writeD(item.getTime());
+		writeItemElementalAndEnchant(item);
+	}
+	
+	protected void writeItemElementalAndEnchant(ItemInfo item) {
+		writeH(item.getAttackElementType());
+		writeH(item.getAttackElementPower());
+		for (byte i = 0; i < 6; i++) {
+			writeH(item.getElementDefAttr(i));
+		}
+		// Enchant Effects
+		for (int op : item.getEnchantOptions()) {
+			writeH(op);
+		}
+	}
+	
+	protected void writeInventoryBlock(PcInventory inventory) {
+		if (inventory.hasInventoryBlock()) {
+			writeH(inventory.getBlockItems().length);
+			writeC(inventory.getBlockMode());
+			for (int i : inventory.getBlockItems()) {
+				writeD(i);
+			}
+		} else {
+			writeH(0x00);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java
new file mode 100644
index 00000000..558e94a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractMessagePacket.java
@@ -0,0 +1,444 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import java.io.PrintStream;
+import java.util.Arrays;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.DoorData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Abstract Message Packet.
+ * @author UnAfraid
+ * @author Zoey76
+ * @param <T> message packet type (SystemMessage or ConfirmDlg)
+ */
+@SuppressWarnings("unchecked")
+public abstract class AbstractMessagePacket<T extends AbstractMessagePacket<?>> extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractMessagePacket.class);
+	
+	private static final SMParam[] EMPTY_PARAM_ARRAY = new SMParam[0];
+	
+	private static final int SINGLE_PARAM = 1;
+	
+	private static final class SMParam {
+		private final byte _type;
+		private final Object _value;
+		
+		public SMParam(final byte type, final Object value) {
+			_type = type;
+			_value = value;
+		}
+		
+		public byte getType() {
+			return _type;
+		}
+		
+		public Object getValue() {
+			return _value;
+		}
+		
+		public String getStringValue() {
+			return (String) _value;
+		}
+		
+		public int getIntValue() {
+			return (Integer) _value;
+		}
+		
+		public long getLongValue() {
+			return (Long) _value;
+		}
+		
+		public int[] getIntArrayValue() {
+			return (int[]) _value;
+		}
+	}
+	
+	// TODO: UnAfraid: Check/Implement id's: 14,15.
+	// 15 exists in goddess of destruction but also may works in h5 needs to be verified!
+	// private static final byte TYPE_CLASS_ID = 15;
+	// id 14 unknown
+	private static final byte TYPE_SYSTEM_STRING = 13;
+	private static final byte TYPE_PLAYER_NAME = 12;
+	private static final byte TYPE_DOOR_NAME = 11;
+	private static final byte TYPE_INSTANCE_NAME = 10;
+	private static final byte TYPE_ELEMENT_NAME = 9;
+	// id 8 - same as 3
+	private static final byte TYPE_ZONE_NAME = 7;
+	private static final byte TYPE_LONG_NUMBER = 6;
+	private static final byte TYPE_CASTLE_NAME = 5;
+	private static final byte TYPE_SKILL_NAME = 4;
+	private static final byte TYPE_ITEM_NAME = 3;
+	private static final byte TYPE_NPC_NAME = 2;
+	private static final byte TYPE_INT_NUMBER = 1;
+	private static final byte TYPE_TEXT = 0;
+	
+	private SMParam[] _params;
+	private final SystemMessageId _smId;
+	private int _paramIndex;
+	
+	public AbstractMessagePacket(SystemMessageId smId) {
+		if (smId == null) {
+			throw new NullPointerException("SystemMessageId cannot be null!");
+		}
+		_smId = smId;
+		_params = smId.getParamCount() > 0 ? new SMParam[smId.getParamCount()] : EMPTY_PARAM_ARRAY;
+	}
+	
+	public final int getId() {
+		return _smId.getId();
+	}
+	
+	public final SystemMessageId getSystemMessageId() {
+		return _smId;
+	}
+	
+	private void append(SMParam param) {
+		if (_paramIndex >= _params.length) {
+			_params = Arrays.copyOf(_params, _paramIndex + 1);
+			_smId.setParamCount(_paramIndex + 1);
+			LOG.info("Wrong parameter count '{}' for SystemMessageId: {}", _paramIndex + 1, _smId);
+		}
+		
+		_params[_paramIndex++] = param;
+	}
+	
+	public final T addString(final String text) {
+		append(new SMParam(TYPE_TEXT, text));
+		return (T) this;
+	}
+	
+	/**
+	 * Appends a Castle name parameter type, the name will be read from CastleName-e.dat.<br>
+	 * <ul>
+	 * <li>1-9 Castle names</li>
+	 * <li>21 Fortress of Resistance</li>
+	 * <li>22-33 Clan Hall names</li>
+	 * <li>34 Devastated Castle</li>
+	 * <li>35 Bandit Stronghold</li>
+	 * <li>36-61 Clan Hall names</li>
+	 * <li>62 Rainbow Springs</li>
+	 * <li>63 Wild Beast Reserve</li>
+	 * <li>64 Fortress of the Dead</li>
+	 * <li>81-89 Territory names</li>
+	 * <li>90-100 null</li>
+	 * <li>101-121 Fortress names</li>
+	 * </ul>
+	 * @param number the conquerable entity
+	 * @return the system message with the proper parameter
+	 */
+	public final T addCastleId(final int number) {
+		append(new SMParam(TYPE_CASTLE_NAME, number));
+		return (T) this;
+	}
+	
+	public final T addInt(final int number) {
+		append(new SMParam(TYPE_INT_NUMBER, number));
+		return (T) this;
+	}
+	
+	public final T addLong(final long number) {
+		append(new SMParam(TYPE_LONG_NUMBER, number));
+		return (T) this;
+	}
+	
+	public final T addCharName(final L2Character cha) {
+		if (cha.isNpc()) {
+			final L2Npc npc = (L2Npc) cha;
+			if (npc.getTemplate().isUsingServerSideName()) {
+				return addString(npc.getTemplate().getName());
+			}
+			return addNpcName(npc);
+		} else if (cha.isPlayer()) {
+			return addPcName(cha.getActingPlayer());
+		} else if (cha.isSummon()) {
+			final L2Summon summon = (L2Summon) cha;
+			if (summon.getTemplate().isUsingServerSideName()) {
+				return addString(summon.getTemplate().getName());
+			}
+			return addNpcName(summon);
+		} else if (cha.isDoor()) {
+			final L2DoorInstance door = (L2DoorInstance) cha;
+			return addDoorName(door.getId());
+		}
+		return addString(cha.getName());
+	}
+	
+	public final T addPcName(final L2PcInstance pc) {
+		append(new SMParam(TYPE_PLAYER_NAME, pc.getAppearance().getVisibleName()));
+		return (T) this;
+	}
+	
+	/**
+	 * ID from doorData.xml
+	 * @param doorId
+	 * @return
+	 */
+	public final T addDoorName(int doorId) {
+		append(new SMParam(TYPE_DOOR_NAME, doorId));
+		return (T) this;
+	}
+	
+	public final T addNpcName(L2Npc npc) {
+		return addNpcName(npc.getTemplate());
+	}
+	
+	public final T addNpcName(final L2Summon npc) {
+		return addNpcName(npc.getId());
+	}
+	
+	public final T addNpcName(final L2NpcTemplate template) {
+		if (template.isUsingServerSideName()) {
+			return addString(template.getName());
+		}
+		return addNpcName(template.getId());
+	}
+	
+	public final T addNpcName(final int id) {
+		append(new SMParam(TYPE_NPC_NAME, 1000000 + id));
+		return (T) this;
+	}
+	
+	public T addItemName(final L2ItemInstance item) {
+		return addItemName(item.getId());
+	}
+	
+	public T addItemName(final L2Item item) {
+		return addItemName(item.getId());
+	}
+	
+	public final T addItemName(final int id) {
+		final L2Item item = ItemTable.getInstance().getTemplate(id);
+		if (item.getDisplayId() != id) {
+			return addString(item.getName());
+		}
+		
+		append(new SMParam(TYPE_ITEM_NAME, id));
+		return (T) this;
+	}
+	
+	public final T addZoneName(final int x, final int y, final int z) {
+		append(new SMParam(TYPE_ZONE_NAME, new int[] {
+			x,
+			y,
+			z
+		}));
+		return (T) this;
+	}
+	
+	public final T addSkillName(final Skill skill) {
+		if (skill.getId() != skill.getDisplayId()) {
+			return addString(skill.getName());
+		}
+		return addSkillName(skill.getId(), skill.getLevel());
+	}
+	
+	public final T addSkillName(final int id) {
+		return addSkillName(id, 1);
+	}
+	
+	public final T addSkillName(final int id, final int lvl) {
+		append(new SMParam(TYPE_SKILL_NAME, new int[] {
+			id,
+			lvl
+		}));
+		return (T) this;
+	}
+	
+	/**
+	 * Elemental name - 0(Fire) ...
+	 * @param type
+	 * @return
+	 */
+	public final T addElemental(final int type) {
+		append(new SMParam(TYPE_ELEMENT_NAME, type));
+		return (T) this;
+	}
+	
+	/**
+	 * ID from sysstring-e.dat
+	 * @param type
+	 * @return
+	 */
+	public final T addSystemString(final int type) {
+		append(new SMParam(TYPE_SYSTEM_STRING, type));
+		return (T) this;
+	}
+	
+	/**
+	 * Instance name from instantzonedata-e.dat
+	 * @param type id of instance
+	 * @return
+	 */
+	public final T addInstanceName(final int type) {
+		append(new SMParam(TYPE_INSTANCE_NAME, type));
+		return (T) this;
+	}
+	
+	protected final void writeMe() {
+		// The way System Message translation works, is by checking and getting
+		// the translation from the XML for the player's language, and
+		// sending it back to the client as a text with all the parameters hardcoded,
+		// and preventing the original System Message from being delivered.
+		
+		// TODO(Zoey76): Emulate on-screen messages such as THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECONDS.
+		// TODO(Zoey76): Find a way to translate dialogs, such as YOU_HAVE_BEEN_DISCONNECTED.
+		if (customs().multiLangEnable() && customs().multiLangSystemMessageEnable()) {
+			final var lang = getClient().getActiveChar().getLang();
+			if (customs().getMultiLangSystemMessageAllowed().contains(lang)) {
+				final var sml = getLocalizedMessage(lang);
+				if (sml != null) {
+					writeD(SystemMessageId.S1.getId());
+					writeD(SINGLE_PARAM);
+					writeD(TYPE_TEXT);
+					writeS(sml);
+					return;
+				}
+			}
+		}
+		
+		writeD(getId());
+		writeD(_params.length);
+		for (int i = 0; i < _paramIndex; i++) {
+			final var param = _params[i];
+			writeD(param.getType());
+			switch (param.getType()) {
+				case TYPE_TEXT, TYPE_PLAYER_NAME -> writeS(param.getStringValue());
+				case TYPE_LONG_NUMBER -> writeQ(param.getLongValue());
+				case TYPE_ITEM_NAME, TYPE_CASTLE_NAME, TYPE_INT_NUMBER, TYPE_NPC_NAME, TYPE_ELEMENT_NAME, TYPE_SYSTEM_STRING, TYPE_INSTANCE_NAME, TYPE_DOOR_NAME -> writeD(param.getIntValue());
+				case TYPE_SKILL_NAME -> {
+					final int[] array = param.getIntArrayValue();
+					writeD(array[0]); // SkillId
+					writeD(array[1]); // SkillLevel
+				}
+				case TYPE_ZONE_NAME -> {
+					final int[] array = param.getIntArrayValue();
+					writeD(array[0]); // x
+					writeD(array[1]); // y
+					writeD(array[2]); // z
+				}
+			}
+		}
+	}
+	
+	public final void printMe(PrintStream out) {
+		out.println(0x62);
+		out.println(getId());
+		out.println(_params.length);
+		
+		for (var param : _params) {
+			switch (param.getType()) {
+				case TYPE_TEXT, TYPE_PLAYER_NAME -> out.println(param.getStringValue());
+				case TYPE_LONG_NUMBER -> out.println(param.getLongValue());
+				case TYPE_ITEM_NAME, TYPE_CASTLE_NAME, TYPE_INT_NUMBER, TYPE_NPC_NAME, TYPE_ELEMENT_NAME, TYPE_SYSTEM_STRING, TYPE_INSTANCE_NAME, TYPE_DOOR_NAME -> out.println(param.getIntValue());
+				case TYPE_SKILL_NAME -> {
+					final int[] array = param.getIntArrayValue();
+					out.println(array[0]); // SkillId
+					out.println(array[1]); // SkillLevel
+				}
+				case TYPE_ZONE_NAME -> {
+					final int[] array = param.getIntArrayValue();
+					out.println(array[0]); // x
+					out.println(array[1]); // y
+					out.println(array[2]); // z
+				}
+			}
+		}
+	}
+	
+	public final String getLocalizedMessage(String lang) {
+		if (!customs().multiLangSystemMessageEnable() || (getSystemMessageId() == SystemMessageId.S1)) {
+			return null;
+		}
+		
+		final var sml = getSystemMessageId().getLocalisation(lang);
+		if (sml == null) {
+			return null;
+		}
+		
+		final Object[] params = new Object[_paramIndex];
+		for (int i = 0; i < _paramIndex; i++) {
+			final var param = _params[i];
+			switch (param.getType()) {
+				case TYPE_TEXT, TYPE_PLAYER_NAME -> params[i] = param.getValue();
+				case TYPE_LONG_NUMBER -> params[i] = param.getValue();
+				case TYPE_ITEM_NAME -> {
+					final var item = ItemTable.getInstance().getTemplate(param.getIntValue());
+					params[i] = item == null ? "Unknown" : item.getName();
+				}
+				case TYPE_CASTLE_NAME -> {
+					final var castle = CastleManager.getInstance().getCastleById(param.getIntValue());
+					params[i] = castle == null ? "Unknown" : castle.getName();
+				}
+				case TYPE_INT_NUMBER -> params[i] = param.getValue();
+				case TYPE_NPC_NAME -> {
+					final var template = NpcData.getInstance().getTemplate(param.getIntValue());
+					params[i] = template == null ? "Unknown" : template.getName();
+				}
+				case TYPE_ELEMENT_NAME -> params[i] = Elementals.getElementName((byte) param.getIntValue());
+				case TYPE_SYSTEM_STRING -> params[i] = "SYS-S-" + param.getIntValue(); // writeD(param.getIntValue());
+				case TYPE_INSTANCE_NAME -> {
+					final var instanceName = InstanceManager.getInstance().getInstanceIdName(param.getIntValue());
+					params[i] = instanceName == null ? "Unknown" : instanceName;
+				}
+				case TYPE_DOOR_NAME -> {
+					final var door = DoorData.getInstance().getDoor(param.getIntValue());
+					params[i] = door == null ? "Unknown" : door.getName();
+				}
+				case TYPE_SKILL_NAME -> {
+					final var array = param.getIntArrayValue();
+					final var skill = SkillData.getInstance().getSkill(array[0], array[1]);
+					params[i] = skill == null ? "Unknown" : skill.getName();
+				}
+				case TYPE_ZONE_NAME -> {
+					final var array = param.getIntArrayValue();
+					final var zone = ZoneManager.getInstance().getZone(array[0], array[1], array[2], L2ZoneType.class);
+					params[i] = zone == null ? "Unknown ZONE-N-" + Arrays.toString(array) : zone.getName();
+				}
+			}
+			i++;
+		}
+		
+		return sml.build(params);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java
new file mode 100644
index 00000000..f8fc99cd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AbstractNpcInfo.java
@@ -0,0 +1,372 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.TownManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+public abstract class AbstractNpcInfo extends L2GameServerPacket {
+	protected int _x, _y, _z, _heading;
+	protected int _idTemplate;
+	protected boolean _isAttackable, _isSummoned;
+	protected int _mAtkSpd, _pAtkSpd;
+	protected final int _runSpd, _walkSpd;
+	protected final int _swimRunSpd, _swimWalkSpd;
+	protected final int _flyRunSpd, _flyWalkSpd;
+	protected double _moveMultiplier;
+	
+	protected int _rhand, _lhand, _chest, _enchantEffect;
+	protected double _collisionHeight, _collisionRadius;
+	protected String _name = "";
+	protected String _title = "";
+	
+	public AbstractNpcInfo(L2Character cha) {
+		_isSummoned = cha.isShowSummonAnimation();
+		_x = cha.getX();
+		_y = cha.getY();
+		_z = cha.getZ();
+		_heading = cha.getHeading();
+		_mAtkSpd = cha.getMAtkSpd();
+		_pAtkSpd = (int) cha.getPAtkSpd();
+		_moveMultiplier = cha.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(cha.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(cha.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(cha.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(cha.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = cha.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = cha.isFlying() ? _walkSpd : 0;
+	}
+	
+	/**
+	 * Packet for Npcs
+	 */
+	public static class NpcInfo extends AbstractNpcInfo {
+		private final L2Npc _npc;
+		private int _clanCrest = 0;
+		private int _allyCrest = 0;
+		private int _allyId = 0;
+		private int _clanId = 0;
+		private final int _displayEffect;
+		
+		public NpcInfo(L2Npc cha, L2Character attacker) {
+			super(cha);
+			_npc = cha;
+			_idTemplate = cha.getTemplate().getDisplayId(); // On every subclass
+			_rhand = cha.getRightHandItem(); // On every subclass
+			_lhand = cha.getLeftHandItem(); // On every subclass
+			_enchantEffect = cha.getEnchantEffect();
+			_collisionHeight = cha.getCollisionHeight();// On every subclass
+			_collisionRadius = cha.getCollisionRadius();// On every subclass
+			_isAttackable = cha.isAutoAttackable(attacker);
+			if (cha.getTemplate().isUsingServerSideName()) {
+				_name = cha.getName();// On every subclass
+			}
+			
+			if (_npc.isInvisible()) {
+				_title = "Invisible";
+			} else if (customs().championEnable() && cha.isChampion()) {
+				_title = customs().getChampionTitle(); // On every subclass
+			} else if (cha.getTemplate().isUsingServerSideTitle()) {
+				_title = cha.getTemplate().getTitle(); // On every subclass
+			} else {
+				_title = cha.getTitle(); // On every subclass
+			}
+			
+			if (npc().showNpcLevel() && (_npc instanceof L2MonsterInstance)) {
+				StringBuilder t = new StringBuilder("Lv ").append(cha.getLevel()).append(cha.isAggressive() ? "*" : "");
+				if (_title != null) {
+					t.append(" ").append(_title);
+				}
+				
+				_title = t.toString();
+			}
+			
+			// npc crest of owning clan/ally of castle
+			if ((cha instanceof L2NpcInstance) && cha.isInsideZone(ZoneId.TOWN) && (npc().showCrestWithoutQuest() || cha.getCastle().getShowNpcCrest()) && (cha.getCastle().getOwnerId() != 0)) {
+				int townId = TownManager.getTown(_x, _y, _z).getTownId();
+				if ((townId != 33) && (townId != 22)) {
+					L2Clan clan = ClanTable.getInstance().getClan(cha.getCastle().getOwnerId());
+					_clanCrest = clan.getCrestId();
+					_clanId = clan.getId();
+					_allyCrest = clan.getAllyCrestId();
+					_allyId = clan.getAllyId();
+				}
+			}
+			
+			_displayEffect = cha.getDisplayEffect();
+		}
+		
+		@Override
+		protected void writeImpl() {
+			writeC(0x0c);
+			writeD(_npc.getObjectId());
+			writeD(_idTemplate + 1000000); // npctype id
+			writeD(_isAttackable ? 1 : 0);
+			writeD(_x);
+			writeD(_y);
+			writeD(_z);
+			writeD(_heading);
+			writeD(0x00);
+			writeD(_mAtkSpd);
+			writeD(_pAtkSpd);
+			writeD(_runSpd);
+			writeD(_walkSpd);
+			writeD(_swimRunSpd);
+			writeD(_swimWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeF(_moveMultiplier);
+			writeF(_npc.getAttackSpeedMultiplier());
+			writeF(_collisionRadius);
+			writeF(_collisionHeight);
+			writeD(_rhand); // right hand weapon
+			writeD(_chest);
+			writeD(_lhand); // left hand weapon
+			writeC(1); // name above char 1=true ... ??
+			writeC(_npc.isRunning() ? 1 : 0);
+			writeC(_npc.isInCombat() ? 1 : 0);
+			writeC(_npc.isAlikeDead() ? 1 : 0);
+			writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+			writeD(-1); // High Five NPCString ID
+			writeS(_name);
+			writeD(-1); // High Five NPCString ID
+			writeS(_title);
+			writeD(0x00); // Title color 0=client default
+			writeD(0x00); // pvp flag
+			writeD(0x00); // karma
+			
+			writeD(_npc.isInvisible() ? _npc.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _npc.getAbnormalVisualEffects());
+			writeD(_clanId); // clan id
+			writeD(_clanCrest); // crest id
+			writeD(_allyId); // ally id
+			writeD(_allyCrest); // all crest
+			
+			writeC(_npc.isInsideZone(ZoneId.WATER) ? 1 : _npc.isFlying() ? 2 : 0); // C2
+			writeC(_npc.getTeam().getId());
+			
+			writeF(_collisionRadius);
+			writeF(_collisionHeight);
+			writeD(_enchantEffect); // C4
+			writeD(_npc.isFlying() ? 1 : 0); // C6
+			writeD(0x00);
+			writeD(_npc.getColorEffect()); // CT1.5 Pet form and skills, Color effect
+			writeC(_npc.isTargetable() ? 0x01 : 0x00);
+			writeC(_npc.isShowName() ? 0x01 : 0x00);
+			writeD(_npc.getAbnormalVisualEffectSpecial());
+			writeD(_displayEffect);
+		}
+	}
+	
+	public static class TrapInfo extends AbstractNpcInfo {
+		private final L2TrapInstance _trap;
+		
+		public TrapInfo(L2TrapInstance cha, L2Character attacker) {
+			super(cha);
+			
+			_trap = cha;
+			_idTemplate = cha.getTemplate().getDisplayId();
+			_isAttackable = cha.isAutoAttackable(attacker);
+			_rhand = 0;
+			_lhand = 0;
+			_collisionHeight = _trap.getTemplate().getfCollisionHeight();
+			_collisionRadius = _trap.getTemplate().getfCollisionRadius();
+			if (cha.getTemplate().isUsingServerSideName()) {
+				_name = cha.getName();
+			}
+			_title = cha.getOwner() != null ? cha.getOwner().getName() : "";
+		}
+		
+		@Override
+		protected void writeImpl() {
+			writeC(0x0c);
+			writeD(_trap.getObjectId());
+			writeD(_idTemplate + 1000000); // npctype id
+			writeD(_isAttackable ? 1 : 0);
+			writeD(_x);
+			writeD(_y);
+			writeD(_z);
+			writeD(_heading);
+			writeD(0x00);
+			writeD(_mAtkSpd);
+			writeD(_pAtkSpd);
+			writeD(_runSpd);
+			writeD(_walkSpd);
+			writeD(_swimRunSpd);
+			writeD(_swimWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeF(_moveMultiplier);
+			writeF(_trap.getAttackSpeedMultiplier());
+			writeF(_collisionRadius);
+			writeF(_collisionHeight);
+			writeD(_rhand); // right hand weapon
+			writeD(_chest);
+			writeD(_lhand); // left hand weapon
+			writeC(1); // name above char 1=true ... ??
+			writeC(1);
+			writeC(_trap.isInCombat() ? 1 : 0);
+			writeC(_trap.isAlikeDead() ? 1 : 0);
+			writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+			writeD(-1); // High Five NPCString ID
+			writeS(_name);
+			writeD(-1); // High Five NPCString ID
+			writeS(_title);
+			writeD(0x00); // title color 0 = client default
+			
+			writeD(_trap.getPvpFlag());
+			writeD(_trap.getKarma());
+			
+			writeD(_trap.isInvisible() ? _trap.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _trap.getAbnormalVisualEffects());
+			writeD(0x00); // clan id
+			writeD(0x00); // crest id
+			writeD(0x00); // C2
+			writeD(0x00); // C2
+			writeC(0x00); // C2
+			
+			writeC(_trap.getTeam().getId());
+			
+			writeF(_collisionRadius);
+			writeF(_collisionHeight);
+			writeD(0x00); // C4
+			writeD(0x00); // C6
+			writeD(0x00);
+			writeD(0x00);// CT1.5 Pet form and skills
+			writeC(0x01);
+			writeC(0x01);
+			writeD(0x00);
+		}
+	}
+	
+	/**
+	 * Packet for summons.
+	 */
+	public static class SummonInfo extends AbstractNpcInfo {
+		private final L2Summon _summon;
+		private final int _form;
+		private final int _val;
+		
+		public SummonInfo(L2Summon cha, L2Character attacker, int val) {
+			super(cha);
+			_summon = cha;
+			_val = val;
+			_form = cha.getFormId();
+			
+			_isAttackable = cha.isAutoAttackable(attacker);
+			_rhand = cha.getWeapon();
+			_lhand = 0;
+			_chest = cha.getArmor();
+			_enchantEffect = cha.getTemplate().getWeaponEnchant();
+			_name = cha.getName();
+			_title = (cha.getOwner() != null) && cha.getOwner().isOnline() ? cha.getOwner().getName() : "";
+			_idTemplate = cha.getTemplate().getDisplayId();
+			_collisionHeight = cha.getTemplate().getfCollisionHeight();
+			_collisionRadius = cha.getTemplate().getfCollisionRadius();
+			setInvisible(cha.isInvisible());
+		}
+		
+		@Override
+		protected void writeImpl() {
+			boolean gmSeeInvis = false;
+			if (isInvisible()) {
+				final L2PcInstance activeChar = getClient().getActiveChar();
+				if ((activeChar != null) && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS)) {
+					gmSeeInvis = true;
+				}
+			}
+			
+			writeC(0x0c);
+			writeD(_summon.getObjectId());
+			writeD(_idTemplate + 1000000); // npctype id
+			writeD(_isAttackable ? 1 : 0);
+			writeD(_x);
+			writeD(_y);
+			writeD(_z);
+			writeD(_heading);
+			writeD(0x00);
+			writeD(_mAtkSpd);
+			writeD(_pAtkSpd);
+			writeD(_runSpd);
+			writeD(_walkSpd);
+			writeD(_swimRunSpd);
+			writeD(_swimWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeF(_moveMultiplier);
+			writeF(_summon.getAttackSpeedMultiplier());
+			writeF(_collisionRadius);
+			writeF(_collisionHeight);
+			writeD(_rhand); // right hand weapon
+			writeD(_chest);
+			writeD(_lhand); // left hand weapon
+			writeC(0x01); // name above char 1=true ... ??
+			writeC(0x01); // always running 1=running 0=walking
+			writeC(_summon.isInCombat() ? 1 : 0);
+			writeC(_summon.isAlikeDead() ? 1 : 0);
+			writeC(_val); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+			writeD(-1); // High Five NPCString ID
+			writeS(_name);
+			writeD(-1); // High Five NPCString ID
+			writeS(_title);
+			writeD(0x01);// Title color 0=client default
+			
+			writeD(_summon.getPvpFlag());
+			writeD(_summon.getKarma());
+			
+			writeD(gmSeeInvis ? _summon.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _summon.getAbnormalVisualEffects());
+			
+			writeD(0x00); // clan id
+			writeD(0x00); // crest id
+			writeD(0x00); // C2
+			writeD(0x00); // C2
+			writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // C2
+			
+			writeC(_summon.getTeam().getId());
+			
+			writeF(_collisionRadius);
+			writeF(_collisionHeight);
+			writeD(_enchantEffect); // C4
+			writeD(0x00); // C6
+			writeD(0x00);
+			writeD(_form); // CT1.5 Pet form and skills
+			writeC(0x01);
+			writeC(0x01);
+			writeD(_summon.getAbnormalVisualEffectSpecial());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillDone.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillDone.java
new file mode 100644
index 00000000..5bf14ca3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillDone.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Kerberos
+ */
+public class AcquireSkillDone extends L2GameServerPacket {
+	public AcquireSkillDone() {
+		//
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x94);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java
new file mode 100644
index 00000000..8782a1a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillInfo.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
+
+/**
+ * Acquire Skill Info server packet implementation.
+ * @author Zoey76
+ */
+public class AcquireSkillInfo extends L2GameServerPacket {
+	private final AcquireSkillType type;
+	private final int id;
+	private final int level;
+	private final int cost;
+	private final List<Requirements> requirements;
+	
+	private record Requirements(int type, int id, long count, int unk) {
+	}
+	
+	/**
+	 * Constructor for the acquire skill info object.
+	 * @param player the player
+	 * @param skillType the skill learning type
+	 * @param skillLearn the skill to learn
+	 */
+	public AcquireSkillInfo(L2PcInstance player, AcquireSkillType skillType, L2SkillLearn skillLearn) {
+		id = skillLearn.getSkillId();
+		level = skillLearn.getSkillLevel();
+		cost = skillLearn.getCalculatedLevelUpSp(player.getClassId(), player.getLearningClass());
+		type = skillType;
+		requirements = new LinkedList<>();
+		
+		if ((skillType != AcquireSkillType.PLEDGE) || character().lifeCrystalNeeded()) {
+			for (var item : skillLearn.getRequiredItems()) {
+				if (!character().divineInspirationSpBookNeeded() && (id == CommonSkill.DIVINE_INSPIRATION.getId())) {
+					continue;
+				}
+				requirements.add(new Requirements(99, item.getId(), item.getCount(), 50));
+			}
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x91);
+		writeD(id);
+		writeD(level);
+		writeD(cost);
+		writeD(type.ordinal());
+		writeD(requirements.size());
+		for (var requirement : requirements) {
+			writeD(requirement.type);
+			writeD(requirement.id);
+			writeQ(requirement.count);
+			writeD(requirement.unk);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java
new file mode 100644
index 00000000..60d8612c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AcquireSkillList.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.model.base.AcquireSkillType.SUBPLEDGE;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+
+/**
+ * Acquire Skill List server packet implementation.
+ * @author Zoey76
+ */
+public final class AcquireSkillList extends L2GameServerPacket {
+	private final List<L2SkillLearn> skills;
+	private final AcquireSkillType skillType;
+	
+	public AcquireSkillList(AcquireSkillType type, List<L2SkillLearn> skills) {
+		this.skillType = type;
+		this.skills = skills;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		if (skills.isEmpty()) {
+			return;
+		}
+		writeC(0x90);
+		writeD(skillType.ordinal());
+		writeD(skills.size());
+		for (var skill : skills) {
+			writeD(skill.getSkillId());
+			writeD(skill.getSkillLevel());
+			writeD(skill.getSkillLevel());
+			writeD(skill.getLevelUpSp());
+			writeD(skill.getRequiredItems().isEmpty() ? 0x00 : 0x01);
+			if (skillType == SUBPLEDGE) {
+				writeD(0); // TODO: ?
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ActionFailed.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ActionFailed.java
new file mode 100644
index 00000000..9618e6e8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ActionFailed.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class ActionFailed extends L2GameServerPacket {
+	public static final ActionFailed STATIC_PACKET = new ActionFailed();
+	
+	private ActionFailed() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x1f);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AdminForgePacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AdminForgePacket.java
new file mode 100644
index 00000000..27f7a518
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AdminForgePacket.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class is made to create packets with any format
+ * @author Maktakien
+ */
+public class AdminForgePacket extends L2GameServerPacket {
+	private final List<Part> _parts = new ArrayList<>();
+	
+	private static class Part {
+		public byte b;
+		public String str;
+		
+		public Part(byte bb, String string) {
+			b = bb;
+			str = string;
+		}
+	}
+	
+	public AdminForgePacket() {
+		
+	}
+	
+	@Override
+	protected void writeImpl() {
+		for (Part p : _parts) {
+			generate(p.b, p.str);
+		}
+		
+	}
+	
+	/**
+	 * @param b
+	 * @param string
+	 * @return
+	 */
+	public boolean generate(byte b, String string) {
+		if ((b == 'C') || (b == 'c')) {
+			writeC(Integer.decode(string));
+			return true;
+		} else if ((b == 'D') || (b == 'd')) {
+			writeD(Integer.decode(string));
+			return true;
+		} else if ((b == 'H') || (b == 'h')) {
+			writeH(Integer.decode(string));
+			return true;
+		} else if ((b == 'F') || (b == 'f')) {
+			writeF(Double.parseDouble(string));
+			return true;
+		} else if ((b == 'S') || (b == 's')) {
+			writeS(string);
+			return true;
+		} else if ((b == 'B') || (b == 'b') || (b == 'X') || (b == 'x')) {
+			writeB(new BigInteger(string).toByteArray());
+			return true;
+		} else if ((b == 'Q') || (b == 'q')) {
+			writeQ(Long.decode(string));
+			return true;
+		}
+		return false;
+	}
+	
+	public void addPart(byte b, String string) {
+		_parts.add(new Part(b, string));
+	}
+	
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AgitDecoInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AgitDecoInfo.java
new file mode 100644
index 00000000..39820c44
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AgitDecoInfo.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.entity.ClanHall;
+import com.l2jserver.gameserver.model.entity.ClanHall.ClanHallFunction;
+import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
+
+/**
+ * @author Steuf
+ */
+public class AgitDecoInfo extends L2GameServerPacket {
+	private final AuctionableHall _clanHall;
+	
+	public AgitDecoInfo(AuctionableHall ClanHall) {
+		_clanHall = ClanHall;
+	}
+	
+	//@formatter:off
+	/*
+	 * Packet send, must be confirmed
+	 	writeC(0xf7);
+		writeD(0); // clanhall id
+		writeC(0); // FUNC_RESTORE_HP (Fireplace)
+		writeC(0); // FUNC_RESTORE_MP (Carpet)
+		writeC(0); // FUNC_RESTORE_MP (Statue)
+		writeC(0); // FUNC_RESTORE_EXP (Chandelier)
+		writeC(0); // FUNC_TELEPORT (Mirror)
+		writeC(0); // Crytal
+		writeC(0); // Curtain
+		writeC(0); // FUNC_ITEM_CREATE (Magic Curtain)
+		writeC(0); // FUNC_SUPPORT
+		writeC(0); // FUNC_SUPPORT (Flag)
+		writeC(0); // Front Platform
+		writeC(0); // FUNC_ITEM_CREATE
+		writeD(0);
+		writeD(0);
+	 */
+	//@formatter:on
+	@Override
+	protected final void writeImpl() {
+		writeC(0xfd);
+		writeD(_clanHall.getId()); // clanhall id
+		// FUNC_RESTORE_HP
+		ClanHallFunction function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_HP);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 220)) || ((_clanHall.getGrade() == 1) && (function.getLvl() < 160)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 260)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 300))) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		// FUNC_RESTORE_MP
+		function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_MP);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+			writeC(0);
+		} else if ((((_clanHall.getGrade() == 0) || (_clanHall.getGrade() == 1)) && (function.getLvl() < 25)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 30)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 40))) {
+			writeC(1);
+			writeC(1);
+		} else {
+			writeC(2);
+			writeC(2);
+		}
+		// FUNC_RESTORE_EXP
+		function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_EXP);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 25)) || ((_clanHall.getGrade() == 1) && (function.getLvl() < 30)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 40)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 50))) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		// FUNC_TELEPORT
+		function = _clanHall.getFunction(ClanHall.FUNC_TELEPORT);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (function.getLvl() < 2) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		writeC(0);
+		// CURTAINS
+		function = _clanHall.getFunction(ClanHall.FUNC_DECO_CURTAINS);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (function.getLvl() <= 1) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		// FUNC_ITEM_CREATE
+		function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 2)) || (function.getLvl() < 3)) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		// FUNC_SUPPORT
+		function = _clanHall.getFunction(ClanHall.FUNC_SUPPORT);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+			writeC(0);
+		} else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 2)) || ((_clanHall.getGrade() == 1) && (function.getLvl() < 4)) || ((_clanHall.getGrade() == 2) && (function.getLvl() < 5)) || ((_clanHall.getGrade() == 3) && (function.getLvl() < 8))) {
+			writeC(1);
+			writeC(1);
+		} else {
+			writeC(2);
+			writeC(2);
+		}
+		// Front Plateform
+		function = _clanHall.getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (function.getLvl() <= 1) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		// FUNC_ITEM_CREATE
+		function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
+		if ((function == null) || (function.getLvl() == 0)) {
+			writeC(0);
+		} else if (((_clanHall.getGrade() == 0) && (function.getLvl() < 2)) || (function.getLvl() < 3)) {
+			writeC(1);
+		} else {
+			writeC(2);
+		}
+		writeD(0);
+		writeD(0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java
new file mode 100644
index 00000000..629ca297
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AllianceInfo.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.ClanInfo;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.network.clientpackets.RequestAllyInfo;
+
+/**
+ * Sent in response to {@link RequestAllyInfo}, if applicable.<BR>
+ * @author afk5min
+ */
+public class AllianceInfo extends L2GameServerPacket {
+	private final String _name;
+	private final int _total;
+	private final int _online;
+	private final String _leaderC;
+	private final String _leaderP;
+	private final ClanInfo[] _allies;
+	
+	public AllianceInfo(int allianceId) {
+		final L2Clan leader = ClanTable.getInstance().getClan(allianceId);
+		_name = leader.getAllyName();
+		_leaderC = leader.getName();
+		_leaderP = leader.getLeaderName();
+		
+		final Collection<L2Clan> allies = ClanTable.getInstance().getClanAllies(allianceId);
+		_allies = new ClanInfo[allies.size()];
+		int idx = 0, total = 0, online = 0;
+		for (final L2Clan clan : allies) {
+			final ClanInfo ci = new ClanInfo(clan);
+			_allies[idx++] = ci;
+			total += ci.getTotal();
+			online += ci.getOnline();
+		}
+		
+		_total = total;
+		_online = online;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xB5);
+		
+		writeS(_name);
+		writeD(_total);
+		writeD(_online);
+		writeS(_leaderC);
+		writeS(_leaderP);
+		
+		writeD(_allies.length);
+		for (final ClanInfo aci : _allies) {
+			writeS(aci.getClan().getName());
+			writeD(0x00);
+			writeD(aci.getClan().getLevel());
+			writeS(aci.getClan().getLeaderName());
+			writeD(aci.getTotal());
+			writeD(aci.getOnline());
+		}
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	public int getTotal() {
+		return _total;
+	}
+	
+	public int getOnline() {
+		return _online;
+	}
+	
+	public String getLeaderC() {
+		return _leaderC;
+	}
+	
+	public String getLeaderP() {
+		return _leaderP;
+	}
+	
+	public ClanInfo[] getAllies() {
+		return _allies;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java
new file mode 100644
index 00000000..83038be5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.model.L2Crest;
+
+public class AllyCrest extends L2GameServerPacket {
+	private final int _crestId;
+	private final byte[] _data;
+	
+	public AllyCrest(int crestId) {
+		_crestId = crestId;
+		final L2Crest crest = CrestTable.getInstance().getCrest(crestId);
+		_data = crest != null ? crest.getData() : null;
+	}
+	
+	public AllyCrest(int crestId, byte[] data) {
+		_crestId = crestId;
+		_data = data;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xAF);
+		writeD(_crestId);
+		if (_data != null) {
+			writeD(_data.length);
+			writeB(_data);
+		} else {
+			writeD(0);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java
new file mode 100644
index 00000000..c9465500
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinAlly.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class AskJoinAlly extends L2GameServerPacket {
+	private final String _requesterName;
+	private final int _requesterObjId;
+	
+	public AskJoinAlly(int requesterObjId, String requesterName) {
+		_requesterName = requesterName;
+		_requesterObjId = requesterObjId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xbb);
+		writeD(_requesterObjId);
+		writeS(_requesterName);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinParty.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinParty.java
new file mode 100644
index 00000000..591239a2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinParty.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+
+public class AskJoinParty extends L2GameServerPacket {
+	private final String _requesterName;
+	private final PartyDistributionType _partyDistributionType;
+	
+	/**
+	 * @param requesterName
+	 * @param partyDistributionType
+	 */
+	public AskJoinParty(String requesterName, PartyDistributionType partyDistributionType) {
+		_requesterName = requesterName;
+		_partyDistributionType = partyDistributionType;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x39);
+		writeS(_requesterName);
+		writeD(_partyDistributionType.getId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java
new file mode 100644
index 00000000..6ec33147
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AskJoinPledge.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class AskJoinPledge extends L2GameServerPacket {
+	private final int _requesterObjId;
+	private final String _subPledgeName;
+	private final int _pledgeType;
+	private final String _pledgeName;
+	
+	public AskJoinPledge(int requesterObjId, String subPledgeName, int pledgeType, String pledgeName) {
+		_requesterObjId = requesterObjId;
+		_subPledgeName = subPledgeName;
+		_pledgeType = pledgeType;
+		_pledgeName = pledgeName;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x2c);
+		writeD(_requesterObjId);
+		if (_subPledgeName != null) {
+			writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);
+		}
+		if (_pledgeType != 0) {
+			writeD(_pledgeType);
+		}
+		writeS(_pledgeName);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Attack.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Attack.java
new file mode 100644
index 00000000..ddfc3a95
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Attack.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.Hit;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class Attack extends L2GameServerPacket {
+	private final int _attackerObjId;
+	private final boolean _soulshot;
+	private final int _ssGrade;
+	private final Location _attackerLoc;
+	private final Location _targetLoc;
+	private final List<Hit> _hits = new ArrayList<>();
+	
+	/**
+	 * @param attacker
+	 * @param target
+	 * @param useShots
+	 * @param ssGrade
+	 */
+	public Attack(L2Character attacker, L2Character target, boolean useShots, int ssGrade) {
+		_attackerObjId = attacker.getObjectId();
+		_soulshot = useShots;
+		_ssGrade = ssGrade;
+		_attackerLoc = new Location(attacker);
+		_targetLoc = new Location(target);
+	}
+	
+	/**
+	 * Adds hit to the attack (Attacks such as dual dagger/sword/fist has two hits)
+	 * @param target
+	 * @param damage
+	 * @param miss
+	 * @param crit
+	 * @param shld
+	 */
+	public void addHit(L2Character target, int damage, boolean miss, boolean crit, byte shld) {
+		_hits.add(new Hit(target, damage, miss, crit, shld, _soulshot, _ssGrade));
+	}
+	
+	/**
+	 * @return {@code true} if current attack contains at least 1 hit.
+	 */
+	public boolean hasHits() {
+		return !_hits.isEmpty();
+	}
+	
+	/**
+	 * @return {@code true} if attack has soul shot charged.
+	 */
+	public boolean hasSoulshot() {
+		return _soulshot;
+	}
+	
+	/**
+	 * Writes current hit
+	 * @param hit
+	 */
+	private void writeHit(Hit hit) {
+		writeD(hit.getTargetId());
+		writeD(hit.getDamage());
+		writeC(hit.getFlags());
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		final Iterator<Hit> it = _hits.iterator();
+		writeC(0x33);
+		
+		writeD(_attackerObjId);
+		writeHit(it.next());
+		writeLoc(_attackerLoc);
+		
+		writeH(_hits.size() - 1);
+		while (it.hasNext()) {
+			writeHit(it.next());
+		}
+		
+		writeLoc(_targetLoc);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AutoAttackStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AutoAttackStart.java
new file mode 100644
index 00000000..18eb6436
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AutoAttackStart.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class AutoAttackStart extends L2GameServerPacket {
+	private final int _targetObjId;
+	
+	public AutoAttackStart(int targetId) {
+		_targetObjId = targetId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x25);
+		writeD(_targetObjId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/AutoAttackStop.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AutoAttackStop.java
new file mode 100644
index 00000000..08e9d1af
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/AutoAttackStop.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class AutoAttackStop extends L2GameServerPacket {
+	private final int _targetObjId;
+	
+	public AutoAttackStop(int targetObjId) {
+		_targetObjId = targetObjId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x26);
+		writeD(_targetObjId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/BuyList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/BuyList.java
new file mode 100644
index 00000000..ed63b5d6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/BuyList.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.rates;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.buylist.Product;
+
+public final class BuyList extends L2GameServerPacket {
+	private final int _listId;
+	private final Collection<Product> _list;
+	private final long _money;
+	private final double _taxRate;
+	
+	public BuyList(L2BuyList list, long currentMoney, double taxRate) {
+		_listId = list.getListId();
+		_list = list.getProducts();
+		_money = currentMoney;
+		_taxRate = taxRate;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xB7);
+		writeD(0x00);
+		writeQ(_money); // current money
+		writeD(_listId);
+		
+		writeH(_list.size());
+		
+		for (Product product : _list) {
+			if ((product.getCount() > 0) || !product.hasLimitedStock()) {
+				writeD(product.getItemId());
+				writeD(product.getItemId());
+				writeD(0);
+				writeQ(product.getCount() < 0 ? 0 : product.getCount());
+				writeH(product.getItem().getType2().getId());
+				writeH(product.getItem().getType1().getId()); // Custom Type 1
+				writeH(0x00); // isEquipped
+				writeD(product.getItem().getBodyPart()); // Body Part
+				writeH(product.getItem().getDefaultEnchantLevel()); // Enchant
+				writeH(0x00); // Custom Type
+				writeD(0x00); // Augment
+				writeD(-1); // Mana
+				writeD(-9999); // Time
+				writeH(0x00); // Element Type
+				writeH(0x00); // Element Power
+				for (byte i = 0; i < 6; i++) {
+					writeH(0x00);
+				}
+				// Enchant Effects
+				writeH(0x00);
+				writeH(0x00);
+				writeH(0x00);
+				
+				if ((product.getItemId() >= 3960) && (product.getItemId() <= 4026)) {
+					writeQ((long) (product.getPrice() * rates().getRateSiegeGuardsPrice() * (1 + (product.getBaseTax() + _taxRate))));
+				} else {
+					writeQ((long) (product.getPrice() * (1 + (product.getBaseTax() + _taxRate))));
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java
new file mode 100644
index 00000000..8f13c5d8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/BuyListSeed.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.SeedProduction;
+
+/**
+ * @author l3x
+ */
+public final class BuyListSeed extends L2GameServerPacket {
+	private final int _manorId;
+	private final long _money;
+	private final List<SeedProduction> _list = new ArrayList<>();
+	
+	public BuyListSeed(long currentMoney, int castleId) {
+		_money = currentMoney;
+		_manorId = castleId;
+		
+		for (SeedProduction s : CastleManorManager.getInstance().getSeedProduction(castleId, false)) {
+			if ((s.getAmount() > 0) && (s.getPrice() > 0)) {
+				_list.add(s);
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xe9);
+		
+		writeQ(_money); // current money
+		writeD(_manorId); // manor id
+		
+		if (!_list.isEmpty()) {
+			writeH(_list.size()); // list length
+			for (SeedProduction s : _list) {
+				writeD(s.getId());
+				writeD(s.getId());
+				writeD(0x00);
+				writeQ(s.getAmount()); // item count
+				writeH(0x05); // Custom Type 2
+				writeH(0x00); // Custom Type 1
+				writeH(0x00); // Equipped
+				writeD(0x00); // Body Part
+				writeH(0x00); // Enchant
+				writeH(0x00); // Custom Type
+				writeD(0x00); // Augment
+				writeD(-1); // Mana
+				writeD(-9999); // Time
+				writeH(0x00); // Element Type
+				writeH(0x00); // Element Power
+				for (byte i = 0; i < 6; i++) {
+					writeH(0x00);
+				}
+				// Enchant Effects
+				writeH(0x00);
+				writeH(0x00);
+				writeH(0x00);
+				writeQ(s.getPrice()); // price
+			}
+			_list.clear();
+		} else {
+			writeH(0x00);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CSShowComBoard.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CSShowComBoard.java
new file mode 100644
index 00000000..11032aa2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CSShowComBoard.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class CSShowComBoard extends L2GameServerPacket {
+	private final byte[] _html;
+	
+	public CSShowComBoard(final byte[] html) {
+		_html = html;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x7b);
+		writeC(0x01); // c4 1 to show community 00 to hide
+		writeB(_html);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CameraMode.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CameraMode.java
new file mode 100644
index 00000000..1163af85
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CameraMode.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class CameraMode extends L2GameServerPacket {
+	private final int _mode;
+	
+	/**
+	 * Forces client camera mode change
+	 * @param mode 0 - third person cam 1 - first person cam
+	 */
+	public CameraMode(int mode) {
+		_mode = mode;
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xf7);
+		writeD(_mode);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChairSit.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChairSit.java
new file mode 100644
index 00000000..5e662fe8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChairSit.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class ChairSit extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final int _staticObjectId;
+	
+	public ChairSit(L2PcInstance player, int staticObjectId) {
+		_activeChar = player;
+		_staticObjectId = staticObjectId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xed);
+		writeD(_activeChar.getObjectId());
+		writeD(_staticObjectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChangeMoveType.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChangeMoveType.java
new file mode 100644
index 00000000..aa97dfae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChangeMoveType.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class ChangeMoveType extends L2GameServerPacket {
+	public static final int WALK = 0;
+	public static final int RUN = 1;
+	
+	private final int _charObjId;
+	private final boolean _running;
+	
+	public ChangeMoveType(L2Character character) {
+		_charObjId = character.getObjectId();
+		_running = character.isRunning();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x28);
+		writeD(_charObjId);
+		writeD(_running ? RUN : WALK);
+		writeD(0); // c2
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChangeWaitType.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChangeWaitType.java
new file mode 100644
index 00000000..879c8603
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChangeWaitType.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class ChangeWaitType extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _moveType;
+	private final int _x, _y, _z;
+	
+	public static final int WT_SITTING = 0;
+	public static final int WT_STANDING = 1;
+	public static final int WT_START_FAKE_DEATH = 2;
+	public static final int WT_STOP_FAKE_DEATH = 3;
+	
+	public ChangeWaitType(L2Character character, int newMoveType) {
+		_charObjId = character.getObjectId();
+		_moveType = newMoveType;
+		
+		_x = character.getX();
+		_y = character.getY();
+		_z = character.getZ();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x29);
+		writeD(_charObjId);
+		writeD(_moveType);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharCreateFail.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharCreateFail.java
new file mode 100644
index 00000000..25a9d6e9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharCreateFail.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class CharCreateFail extends L2GameServerPacket {
+	/** Your character creation has failed. */
+	public static final int REASON_CREATION_FAILED = 0x00;
+	/** You cannot create another character. Please delete the existing character and try again." Removes all settings that were selected (race, class, etc). */
+	public static final int REASON_TOO_MANY_CHARACTERS = 0x01;
+	/** This name already exists. */
+	public static final int REASON_NAME_ALREADY_EXISTS = 0x02;
+	/** Your title cannot exceed 16 characters in length. Please try again. */
+	public static final int REASON_16_ENG_CHARS = 0x03;
+	/** Incorrect name. Please try again. */
+	public static final int REASON_INCORRECT_NAME = 0x04;
+	/** Characters cannot be created from this server. */
+	public static final int REASON_CREATE_NOT_ALLOWED = 0x05;
+	/**
+	 * Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please choose another server.
+	 */
+	public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06;
+	
+	private final int _error;
+	
+	public CharCreateFail(int errorCode) {
+		_error = errorCode;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x10);
+		writeD(_error);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharCreateOk.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharCreateOk.java
new file mode 100644
index 00000000..7bfbd928
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharCreateOk.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class CharCreateOk extends L2GameServerPacket {
+	@Override
+	protected final void writeImpl() {
+		writeC(0x0f);
+		writeD(0x01);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharDeleteFail.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharDeleteFail.java
new file mode 100644
index 00000000..d2b95b63
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharDeleteFail.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class CharDeleteFail extends L2GameServerPacket {
+	public static final int REASON_DELETION_FAILED = 0x01;
+	public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 0x02;
+	public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 0x03;
+	
+	private final int _error;
+	
+	public CharDeleteFail(int errorCode) {
+		_error = errorCode;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x1e);
+		writeD(_error);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharDeleteSuccess.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharDeleteSuccess.java
new file mode 100644
index 00000000..ed0ae6cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharDeleteSuccess.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class CharDeleteSuccess extends L2GameServerPacket {
+	@Override
+	protected final void writeImpl() {
+		writeC(0x1d);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java
new file mode 100644
index 00000000..ef1787a0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharInfo.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.L2Decoy;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+public class CharInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private int _objId;
+	private int _x, _y, _z, _heading;
+	private final int _mAtkSpd, _pAtkSpd;
+	
+	private final int _runSpd, _walkSpd;
+	private final int _swimRunSpd;
+	private final int _swimWalkSpd;
+	private final int _flyRunSpd;
+	private final int _flyWalkSpd;
+	private final double _moveMultiplier;
+	private final float _attackSpeedMultiplier;
+	
+	private int _vehicleId = 0;
+	
+	private static final int[] PAPERDOLL_ORDER = new int[] {
+		Inventory.PAPERDOLL_UNDER,
+		Inventory.PAPERDOLL_HEAD,
+		Inventory.PAPERDOLL_RHAND,
+		Inventory.PAPERDOLL_LHAND,
+		Inventory.PAPERDOLL_GLOVES,
+		Inventory.PAPERDOLL_CHEST,
+		Inventory.PAPERDOLL_LEGS,
+		Inventory.PAPERDOLL_FEET,
+		Inventory.PAPERDOLL_CLOAK,
+		Inventory.PAPERDOLL_RHAND,
+		Inventory.PAPERDOLL_HAIR,
+		Inventory.PAPERDOLL_HAIR2,
+		Inventory.PAPERDOLL_RBRACELET,
+		Inventory.PAPERDOLL_LBRACELET,
+		Inventory.PAPERDOLL_DECO1,
+		Inventory.PAPERDOLL_DECO2,
+		Inventory.PAPERDOLL_DECO3,
+		Inventory.PAPERDOLL_DECO4,
+		Inventory.PAPERDOLL_DECO5,
+		Inventory.PAPERDOLL_DECO6,
+		Inventory.PAPERDOLL_BELT
+	};
+	
+	public CharInfo(L2PcInstance cha) {
+		_activeChar = cha;
+		_objId = cha.getObjectId();
+		if ((_activeChar.getVehicle() != null) && (_activeChar.getInVehiclePosition() != null)) {
+			_x = _activeChar.getInVehiclePosition().getX();
+			_y = _activeChar.getInVehiclePosition().getY();
+			_z = _activeChar.getInVehiclePosition().getZ();
+			_vehicleId = _activeChar.getVehicle().getObjectId();
+		} else {
+			_x = _activeChar.getX();
+			_y = _activeChar.getY();
+			_z = _activeChar.getZ();
+		}
+		_heading = _activeChar.getHeading();
+		_mAtkSpd = _activeChar.getMAtkSpd();
+		_pAtkSpd = (int) _activeChar.getPAtkSpd();
+		_attackSpeedMultiplier = _activeChar.getAttackSpeedMultiplier();
+		setInvisible(cha.isInvisible());
+		
+		_moveMultiplier = cha.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(cha.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(cha.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(cha.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(cha.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = cha.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = cha.isFlying() ? _walkSpd : 0;
+	}
+	
+	public CharInfo(L2Decoy decoy) {
+		this(decoy.getActingPlayer()); // init
+		_objId = decoy.getObjectId();
+		_x = decoy.getX();
+		_y = decoy.getY();
+		_z = decoy.getZ();
+		_heading = decoy.getHeading();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		boolean gmSeeInvis = false;
+		
+		if (isInvisible()) {
+			final L2PcInstance activeChar = getClient().getActiveChar();
+			if ((activeChar != null) && activeChar.canOverrideCond(PcCondOverride.SEE_ALL_PLAYERS)) {
+				gmSeeInvis = true;
+			}
+		}
+		
+		final L2NpcTemplate template = _activeChar.getPoly().isMorphed() ? NpcData.getInstance().getTemplate(_activeChar.getPoly().getPolyId()) : null;
+		if (template != null) {
+			writeC(0x0C);
+			writeD(_objId);
+			writeD(template.getId() + 1000000); // npctype id
+			writeD(_activeChar.getKarma() > 0 ? 1 : 0);
+			writeD(_x);
+			writeD(_y);
+			writeD(_z);
+			writeD(_heading);
+			writeD(0x00);
+			writeD(_mAtkSpd);
+			writeD(_pAtkSpd);
+			writeD(_runSpd);
+			writeD(_walkSpd);
+			writeD(_swimRunSpd);
+			writeD(_swimWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeF(_moveMultiplier);
+			writeF(_attackSpeedMultiplier);
+			writeF(template.getfCollisionRadius());
+			writeF(template.getfCollisionHeight());
+			writeD(template.getRHandId()); // right hand weapon
+			writeD(template.getChestId()); // chest
+			writeD(template.getLHandId()); // left hand weapon
+			writeC(1); // name above char 1=true ... ??
+			writeC(_activeChar.isRunning() ? 1 : 0);
+			writeC(_activeChar.isInCombat() ? 1 : 0);
+			writeC(_activeChar.isAlikeDead() ? 1 : 0);
+			writeC(!gmSeeInvis && isInvisible() ? 1 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
+			
+			writeD(-1); // High Five NPCString ID
+			writeS(_activeChar.getAppearance().getVisibleName());
+			writeD(-1); // High Five NPCString ID
+			writeS(gmSeeInvis ? "Invisible" : _activeChar.getAppearance().getVisibleTitle());
+			
+			writeD(_activeChar.getAppearance().getTitleColor()); // Title color 0=client default
+			writeD(_activeChar.getPvpFlag()); // pvp flag
+			writeD(_activeChar.getKarma()); // karma ??
+			
+			writeD(gmSeeInvis ? (_activeChar.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _activeChar.getAbnormalVisualEffects()); // C2
+			
+			writeD(_activeChar.getClanId()); // clan id
+			writeD(_activeChar.getClanCrestId()); // crest id
+			writeD(_activeChar.getAllyId()); // ally id
+			writeD(_activeChar.getAllyCrestId()); // all crest
+			
+			writeC(_activeChar.isFlying() ? 2 : 0); // is Flying
+			writeC(_activeChar.getTeam().getId());
+			
+			writeF(template.getfCollisionRadius());
+			writeF(template.getfCollisionHeight());
+			
+			writeD(0x00); // enchant effect
+			writeD(_activeChar.isFlying() ? 2 : 0); // is Flying again?
+			
+			writeD(0x00);
+			
+			writeD(0x00); // CT1.5 Pet form and skills, Color effect
+			writeC(template.isTargetable() ? 1 : 0); // targetable
+			writeC(template.isShowName() ? 1 : 0); // show name
+			writeC(_activeChar.getAbnormalVisualEffectSpecial());
+			writeD(0x00);
+		} else {
+			writeC(0x31);
+			writeD(_x);
+			writeD(_y);
+			writeD(_z);
+			writeD(_vehicleId);
+			writeD(_objId);
+			writeS(_activeChar.getAppearance().getVisibleName());
+			writeD(_activeChar.getRace().ordinal());
+			writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
+			writeD(_activeChar.getBaseClass());
+			
+			for (int slot : getPaperdollOrder()) {
+				writeD(_activeChar.getInventory().getPaperdollItemDisplayId(slot));
+			}
+			
+			for (int slot : getPaperdollOrder()) {
+				writeD(_activeChar.getInventory().getPaperdollAugmentationId(slot));
+			}
+			
+			writeD(_activeChar.getInventory().getTalismanSlots());
+			writeD(_activeChar.getInventory().canEquipCloak() ? 1 : 0);
+			
+			writeD(_activeChar.getPvpFlag());
+			writeD(_activeChar.getKarma());
+			
+			writeD(_mAtkSpd);
+			writeD(_pAtkSpd);
+			
+			writeD(0x00); // ?
+			
+			writeD(_runSpd);
+			writeD(_walkSpd);
+			writeD(_swimRunSpd);
+			writeD(_swimWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeD(_flyRunSpd);
+			writeD(_flyWalkSpd);
+			writeF(_moveMultiplier);
+			writeF(_activeChar.getAttackSpeedMultiplier());
+			
+			writeF(_activeChar.getCollisionRadius());
+			writeF(_activeChar.getCollisionHeight());
+			
+			writeD(_activeChar.getAppearance().getHairStyle());
+			writeD(_activeChar.getAppearance().getHairColor());
+			writeD(_activeChar.getAppearance().getFace());
+			
+			writeS(gmSeeInvis ? "Invisible" : _activeChar.getAppearance().getVisibleTitle());
+			
+			if (!_activeChar.isCursedWeaponEquipped()) {
+				writeD(_activeChar.getClanId());
+				writeD(_activeChar.getClanCrestId());
+				writeD(_activeChar.getAllyId());
+				writeD(_activeChar.getAllyCrestId());
+			} else {
+				writeD(0x00);
+				writeD(0x00);
+				writeD(0x00);
+				writeD(0x00);
+			}
+			
+			writeC(_activeChar.isSitting() ? 0 : 1); // standing = 1 sitting = 0
+			writeC(_activeChar.isRunning() ? 1 : 0); // running = 1 walking = 0
+			writeC(_activeChar.isInCombat() ? 1 : 0);
+			
+			writeC(!_activeChar.isInOlympiadMode() && _activeChar.isAlikeDead() ? 1 : 0);
+			
+			writeC(!gmSeeInvis && isInvisible() ? 1 : 0); // invisible = 1 visible =0
+			
+			writeC(_activeChar.getMountType().ordinal()); // 1-on Strider, 2-on Wyvern, 3-on Great Wolf, 0-no mount
+			writeC(_activeChar.getPrivateStoreType().getId());
+			
+			writeH(_activeChar.getCubics().size());
+			for (int cubicId : _activeChar.getCubics().keySet()) {
+				writeH(cubicId);
+			}
+			
+			writeC(_activeChar.isInPartyMatchRoom() ? 1 : 0);
+			
+			writeD(gmSeeInvis ? (_activeChar.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask()) : _activeChar.getAbnormalVisualEffects());
+			
+			writeC(_activeChar.isInsideZone(ZoneId.WATER) ? 1 : _activeChar.isFlyingMounted() ? 2 : 0);
+			
+			writeH(_activeChar.getRecSystem().getHave()); // Blue value for name (0 = white, 255 = pure blue)
+			writeD(_activeChar.getMountNpcId() + 1000000);
+			writeD(_activeChar.getClassId().getId());
+			writeD(0x00); // ?
+			writeC(_activeChar.isMounted() ? 0 : _activeChar.getEnchantEffect());
+			
+			writeC(_activeChar.getTeam().getId());
+			
+			writeD(_activeChar.getClanCrestLargeId());
+			writeC(_activeChar.isNoble() ? 1 : 0); // Symbol on char menu ctrl+I
+			writeC(_activeChar.isHero() || (_activeChar.isGM() && general().gmHeroAura()) ? 1 : 0); // Hero Aura
+			
+			writeC(_activeChar.isFishing() ? 1 : 0); // 0x01: Fishing Mode (Cant be undone by setting back to 0)
+			writeD(_activeChar.getFishx());
+			writeD(_activeChar.getFishy());
+			writeD(_activeChar.getFishz());
+			
+			writeD(_activeChar.getAppearance().getNameColor());
+			
+			writeD(_heading);
+			
+			writeD(_activeChar.getPledgeClass());
+			writeD(_activeChar.getPledgeType());
+			
+			writeD(_activeChar.getAppearance().getTitleColor());
+			
+			writeD(_activeChar.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_activeChar.getCursedWeaponEquippedId()) : 0);
+			
+			writeD(_activeChar.getClanId() > 0 ? _activeChar.getClan().getReputationScore() : 0);
+			
+			// T1
+			writeD(_activeChar.getTransformationDisplayId());
+			writeD(_activeChar.getAgathionId());
+			
+			// T2
+			writeD(0x01);
+			
+			// T2.3
+			writeD(_activeChar.getAbnormalVisualEffectSpecial());
+		}
+	}
+	
+	@Override
+	protected int[] getPaperdollOrder() {
+		return PAPERDOLL_ORDER;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharSelected.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharSelected.java
new file mode 100644
index 00000000..7522001a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharSelected.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class CharSelected extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final int _sessionId;
+	
+	public CharSelected(L2PcInstance cha, int sessionId) {
+		_activeChar = cha;
+		_sessionId = sessionId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x0b);
+		
+		writeS(_activeChar.getName());
+		writeD(_activeChar.getObjectId());
+		writeS(_activeChar.getTitle());
+		writeD(_sessionId);
+		writeD(_activeChar.getClanId());
+		writeD(0x00); // ??
+		writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
+		writeD(_activeChar.getRace().ordinal());
+		writeD(_activeChar.getClassId().getId());
+		writeD(0x01); // active ??
+		writeD(_activeChar.getX());
+		writeD(_activeChar.getY());
+		writeD(_activeChar.getZ());
+		
+		writeF(_activeChar.getCurrentHp());
+		writeF(_activeChar.getCurrentMp());
+		writeD(_activeChar.getSp());
+		writeQ(_activeChar.getExp());
+		writeD(_activeChar.getLevel());
+		writeD(_activeChar.getKarma()); // thx evill33t
+		writeD(_activeChar.getPkKills());
+		writeD(_activeChar.getINT());
+		writeD(_activeChar.getSTR());
+		writeD(_activeChar.getCON());
+		writeD(_activeChar.getMEN());
+		writeD(_activeChar.getDEX());
+		writeD(_activeChar.getWIT());
+		
+		writeD(GameTimeController.getInstance().getGameTime() % (24 * 60)); // "reset" on 24th hour
+		writeD(0x00);
+		
+		writeD(_activeChar.getClassId().getId());
+		
+		writeD(0x00);
+		writeD(0x00);
+		writeD(0x00);
+		writeD(0x00);
+		
+		writeB(new byte[64]);
+		writeD(0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
new file mode 100644
index 00000000..0cc37934
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
@@ -0,0 +1,299 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.CharSelectInfoPackage;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+public class CharSelectionInfo extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(CharSelectionInfo.class);
+	
+	private final String _loginName;
+	
+	private final int _sessionId;
+	
+	private int _activeId;
+	
+	private final List<CharSelectInfoPackage> _characterPackages;
+	
+	public CharSelectionInfo(String loginName, int sessionId) {
+		_sessionId = sessionId;
+		_loginName = loginName;
+		_characterPackages = loadCharacterSelectInfo(_loginName);
+		_activeId = -1;
+	}
+	
+	public CharSelectionInfo(String loginName, int sessionId, int activeId) {
+		_sessionId = sessionId;
+		_loginName = loginName;
+		_characterPackages = loadCharacterSelectInfo(_loginName);
+		_activeId = activeId;
+	}
+	
+	public List<CharSelectInfoPackage> getCharInfo() {
+		return _characterPackages;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x09);
+		int size = (_characterPackages.size());
+		writeD(size);
+		
+		// Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) )
+		writeD(character().getCharMaxNumber());
+		writeC(0x00);
+		
+		long lastAccess = 0L;
+		
+		if (_activeId == -1) {
+			for (int i = 0; i < size; i++) {
+				final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i);
+				if (lastAccess < charInfoPackage.getLastAccess()) {
+					lastAccess = charInfoPackage.getLastAccess();
+					_activeId = i;
+				}
+			}
+		}
+		
+		for (int i = 0; i < size; i++) {
+			final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i);
+			
+			writeS(charInfoPackage.getName());
+			writeD(charInfoPackage.getObjectId());
+			writeS(_loginName);
+			writeD(_sessionId);
+			writeD(charInfoPackage.getClanId());
+			writeD(0x00); // Builder Level
+			
+			writeD(charInfoPackage.getSex());
+			writeD(charInfoPackage.getRace());
+			writeD(charInfoPackage.getBaseClassId());
+			
+			writeD(0x01); // active ??
+			
+			writeD(charInfoPackage.getX());
+			writeD(charInfoPackage.getY());
+			writeD(charInfoPackage.getZ());
+			
+			writeF(charInfoPackage.getCurrentHp());
+			writeF(charInfoPackage.getCurrentMp());
+			
+			writeD(charInfoPackage.getSp());
+			writeQ(charInfoPackage.getExp());
+			writeF(ExperienceData.getInstance().getPercentFromCurrentLevel(charInfoPackage.getExp(), charInfoPackage.getLevel()));
+			
+			writeD(charInfoPackage.getLevel());
+			
+			writeD(charInfoPackage.getKarma());
+			writeD(charInfoPackage.getPkKills());
+			writeD(charInfoPackage.getPvPKills());
+			
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			
+			for (int slot : getPaperdollOrder()) {
+				writeD(charInfoPackage.getPaperdollItemId(slot));
+			}
+			
+			writeD(charInfoPackage.getHairStyle());
+			writeD(charInfoPackage.getHairColor());
+			writeD(charInfoPackage.getFace());
+			
+			writeF(charInfoPackage.getMaxHp()); // hp max
+			writeF(charInfoPackage.getMaxMp()); // mp max
+			
+			writeD(charInfoPackage.getDeleteTimer() > 0 ? (int) ((charInfoPackage.getDeleteTimer() - System.currentTimeMillis()) / 1000) : 0); // days left before
+			// delete .. if != 0
+			// then char is inactive
+			writeD(charInfoPackage.getClassId());
+			writeD(i == _activeId ? 0x01 : 0x00); // c3 auto-select char
+			
+			writeC(Math.min(charInfoPackage.getEnchantEffect(), 127));
+			writeD(charInfoPackage.getAugmentationId());
+			
+			writeD(0x00); // Currently on retail when you are on character select you don't see your transformation.
+			
+			// Implementing it will be waster of resources.
+			writeD(0x00); // Pet ID
+			writeD(0x00); // Pet Level
+			writeD(0x00); // Pet Max Food
+			writeD(0x00); // Pet Current Food
+			writeF(0x00); // Pet Max HP
+			writeF(0x00); // Pet Max MP
+			
+			// High Five by Vistall:
+			writeD(charInfoPackage.getVitalityPoints()); // H5 Vitality
+		}
+	}
+	
+	private static List<CharSelectInfoPackage> loadCharacterSelectInfo(String loginName) {
+		final List<CharSelectInfoPackage> characterList = new ArrayList<>();
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate")) {
+			statement.setString(1, loginName);
+			try (var charList = statement.executeQuery()) {
+				while (charList.next())// fills the package
+				{
+					CharSelectInfoPackage charInfopackage = restoreChar(charList);
+					if (charInfopackage != null) {
+						characterList.add(charInfopackage);
+					}
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not restore char info: {}", e.getMessage(), e);
+		}
+		return characterList;
+	}
+	
+	private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int ObjectId, int activeClassId) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement("SELECT exp, sp, level FROM character_subclasses WHERE charId=? && class_id=? ORDER BY charId")) {
+			statement.setInt(1, ObjectId);
+			statement.setInt(2, activeClassId);
+			try (var charList = statement.executeQuery()) {
+				if (charList.next()) {
+					charInfopackage.setExp(charList.getLong("exp"));
+					charInfopackage.setSp(charList.getInt("sp"));
+					charInfopackage.setLevel(charList.getInt("level"));
+				}
+			}
+		} catch (Exception e) {
+			LOG.warn("Could not restore char subclass info: {}", e.getMessage(), e);
+		}
+	}
+	
+	private static CharSelectInfoPackage restoreChar(ResultSet chardata) throws Exception {
+		int objectId = chardata.getInt("charId");
+		String name = chardata.getString("char_name");
+		
+		// See if the char must be deleted
+		long deletetime = chardata.getLong("deletetime");
+		if (deletetime > 0) {
+			if (System.currentTimeMillis() > deletetime) {
+				L2Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid"));
+				if (clan != null) {
+					clan.removeClanMember(objectId, 0);
+				}
+				
+				L2GameClient.deleteCharByObjId(objectId);
+				return null;
+			}
+		}
+		
+		CharSelectInfoPackage charInfopackage = new CharSelectInfoPackage(objectId, name);
+		charInfopackage.setAccessLevel(chardata.getInt("accesslevel"));
+		charInfopackage.setLevel(chardata.getInt("level"));
+		charInfopackage.setMaxCp(chardata.getInt("maxCp"));
+		charInfopackage.setCurrentCp(chardata.getInt("curCp"));
+		charInfopackage.setMaxHp(chardata.getInt("maxhp"));
+		charInfopackage.setCurrentHp(chardata.getDouble("curhp"));
+		charInfopackage.setMaxMp(chardata.getInt("maxmp"));
+		charInfopackage.setCurrentMp(chardata.getDouble("curmp"));
+		charInfopackage.setKarma(chardata.getInt("karma"));
+		charInfopackage.setPkKills(chardata.getInt("pkkills"));
+		charInfopackage.setPvPKills(chardata.getInt("pvpkills"));
+		charInfopackage.setFace(chardata.getInt("face"));
+		charInfopackage.setHairStyle(chardata.getInt("hairstyle"));
+		charInfopackage.setHairColor(chardata.getInt("haircolor"));
+		charInfopackage.setSex(chardata.getInt("sex"));
+		
+		charInfopackage.setExp(chardata.getLong("exp"));
+		charInfopackage.setSp(chardata.getInt("sp"));
+		charInfopackage.setVitalityPoints(chardata.getInt("vitality_points"));
+		charInfopackage.setClanId(chardata.getInt("clanid"));
+		
+		charInfopackage.setRace(chardata.getInt("race"));
+		
+		final int baseClassId = chardata.getInt("base_class");
+		final int activeClassId = chardata.getInt("classid");
+		
+		charInfopackage.setX(chardata.getInt("x"));
+		charInfopackage.setY(chardata.getInt("y"));
+		charInfopackage.setZ(chardata.getInt("z"));
+		
+		if (customs().multiLangEnable()) {
+			String lang = chardata.getString("language");
+			if (!customs().getMultiLangAllowed().contains(lang)) {
+				lang = customs().getMultiLangDefault();
+			}
+			charInfopackage.setHtmlPrefix("data/lang/" + lang + "/");
+		}
+		
+		// if is in subclass, load subclass exp, sp, lvl info
+		if (baseClassId != activeClassId) {
+			loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId);
+		}
+		
+		charInfopackage.setClassId(activeClassId);
+		
+		// Get the augmentation id for equipped weapon
+		int weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND);
+		if (weaponObjId < 1) {
+			weaponObjId = charInfopackage.getPaperdollObjectId(Inventory.PAPERDOLL_RHAND);
+		}
+		
+		if (weaponObjId > 0) {
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var statement = con.prepareStatement("SELECT augAttributes FROM item_attributes WHERE itemId=?")) {
+				statement.setInt(1, weaponObjId);
+				try (var result = statement.executeQuery()) {
+					if (result.next()) {
+						int augment = result.getInt("augAttributes");
+						charInfopackage.setAugmentationId(augment == -1 ? 0 : augment);
+					}
+				}
+			} catch (Exception e) {
+				LOG.warn("Could not restore augmentation info: {}", e.getMessage(), e);
+			}
+		}
+		
+		// Check if the base class is set to zero and also doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly.
+		if ((baseClassId == 0) && (activeClassId > 0)) {
+			charInfopackage.setBaseClassId(activeClassId);
+		} else {
+			charInfopackage.setBaseClassId(baseClassId);
+		}
+		
+		charInfopackage.setDeleteTimer(deletetime);
+		charInfopackage.setLastAccess(chardata.getLong("lastAccess"));
+		return charInfopackage;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChooseInventoryItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChooseInventoryItem.java
new file mode 100644
index 00000000..b2dfc30d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ChooseInventoryItem.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class ChooseInventoryItem extends L2GameServerPacket {
+	private final int _itemId;
+	
+	public ChooseInventoryItem(int itemId) {
+		_itemId = itemId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x7c);
+		writeD(_itemId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ClientSetTime.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ClientSetTime.java
new file mode 100644
index 00000000..acb24670
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ClientSetTime.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.GameTimeController;
+
+public class ClientSetTime extends L2GameServerPacket {
+	public static final ClientSetTime STATIC_PACKET = new ClientSetTime();
+	
+	private ClientSetTime() {
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xf2);
+		writeD(GameTimeController.getInstance().getGameTime()); // time in client minutes
+		writeD(6); // constant to match the server time( this determines the speed of the client clock)
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java
new file mode 100644
index 00000000..ad675502
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ConfirmDlg.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * ConfirmDlg server packet implementation.
+ * @author kombat
+ * @author UnAfraid
+ */
+public class ConfirmDlg extends AbstractMessagePacket<ConfirmDlg> {
+	private int _time;
+	private int _requesterId;
+	
+	public ConfirmDlg(SystemMessageId smId) {
+		super(smId);
+	}
+	
+	public ConfirmDlg(int id) {
+		this(SystemMessageId.getSystemMessageId(id));
+	}
+	
+	public ConfirmDlg(String text) {
+		this(SystemMessageId.S1);
+		addString(text);
+	}
+	
+	public ConfirmDlg addTime(int time) {
+		_time = time;
+		return this;
+	}
+	
+	public ConfirmDlg addRequesterId(int id) {
+		_requesterId = id;
+		return this;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xF3);
+		writeMe();
+		writeD(_time);
+		writeD(_requesterId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/CreatureSay.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CreatureSay.java
new file mode 100644
index 00000000..75f78c5b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/CreatureSay.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+public final class CreatureSay extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _textType;
+	private String _charName = null;
+	private int _charId = 0;
+	private String _text = null;
+	private int _npcString = -1;
+	private List<String> _parameters;
+	
+	public CreatureSay(int objectId, int messageType, String charName, String text) {
+		_objectId = objectId;
+		_textType = messageType;
+		_charName = charName;
+		_text = text;
+	}
+	
+	public CreatureSay(int objectId, int messageType, int charId, NpcStringId npcString) {
+		_objectId = objectId;
+		_textType = messageType;
+		_charId = charId;
+		_npcString = npcString.getId();
+	}
+	
+	public CreatureSay(int objectId, int messageType, String charName, NpcStringId npcString) {
+		_objectId = objectId;
+		_textType = messageType;
+		_charName = charName;
+		_npcString = npcString.getId();
+	}
+	
+	public CreatureSay(int objectId, int messageType, int charId, SystemMessageId sysString) {
+		_objectId = objectId;
+		_textType = messageType;
+		_charId = charId;
+		_npcString = sysString.getId();
+	}
+	
+	/**
+	 * String parameter for argument S1,S2,.. in npcstring-e.dat
+	 * @param text
+	 */
+	public void addStringParameter(String text) {
+		if (_parameters == null) {
+			_parameters = new ArrayList<>();
+		}
+		_parameters.add(text);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x4a);
+		writeD(_objectId);
+		writeD(_textType);
+		if (_charName != null) {
+			writeS(_charName);
+		} else {
+			writeD(_charId);
+		}
+		writeD(_npcString); // High Five NPCString ID
+		if (_text != null) {
+			writeS(_text);
+		} else if (_parameters != null) {
+			for (String s : _parameters) {
+				writeS(s);
+			}
+		}
+	}
+	
+	@Override
+	public void runImpl() {
+		L2PcInstance _pci = getClient().getActiveChar();
+		if (_pci != null) {
+			_pci.broadcastSnoop(_textType, _charName, _text);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/DeleteObject.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DeleteObject.java
new file mode 100644
index 00000000..29b61260
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DeleteObject.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+public final class DeleteObject extends L2GameServerPacket {
+	private final int _objectId;
+	
+	public DeleteObject(L2Object obj) {
+		_objectId = obj.getObjectId();
+	}
+	
+	public DeleteObject(int objectId) {
+		_objectId = objectId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x08);
+		writeD(_objectId);
+		writeD(0x00); // c2
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Dice.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Dice.java
new file mode 100644
index 00000000..9af4cd16
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Dice.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class Dice extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _itemId;
+	private final int _number;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	
+	public Dice(int charObjId, int itemId, int number, int x, int y, int z) {
+		_charObjId = charObjId;
+		_itemId = itemId;
+		_number = number;
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xda);
+		writeD(_charObjId); // object id of player
+		writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628
+		writeD(_number); // number rolled
+		writeD(_x); // x
+		writeD(_y); // y
+		writeD(_z); // z
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Die.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Die.java
new file mode 100644
index 00000000..9d362716
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Die.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.xml.impl.AdminData;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.L2AccessLevel;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.Fort;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+import com.l2jserver.gameserver.model.olympiad.OlympiadManager;
+
+public class Die extends L2GameServerPacket {
+	private final int _charObjId;
+	private final boolean _canTeleport;
+	private final boolean _sweepable;
+	private L2AccessLevel _access = AdminData.getInstance().getAccessLevel(0);
+	private L2Clan _clan;
+	private final L2Character _activeChar;
+	private boolean _isJailed;
+	private boolean _staticRes = false;
+	
+	public Die(L2Character cha) {
+		_charObjId = cha.getObjectId();
+		_activeChar = cha;
+		if (cha.isPlayer()) {
+			final L2PcInstance player = cha.getActingPlayer();
+			_access = player.getAccessLevel();
+			_clan = player.getClan();
+			_isJailed = player.isJailed();
+		}
+		_canTeleport = cha.canRevive() && !cha.isPendingRevive();
+		_sweepable = cha.isSweepActive();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x00);
+		writeD(_charObjId);
+		writeD(_canTeleport ? 0x01 : 0x00);
+		
+		if (_activeChar.isPlayer()) {
+			if (!OlympiadManager.getInstance().isRegistered(_activeChar.getActingPlayer()) && !_activeChar.isOnEvent()) {
+				_staticRes = _activeChar.getInventory().haveItemForSelfResurrection();
+			}
+			
+			// Verify if player can use fixed resurrection without Feather
+			if (_access.allowFixedRes()) {
+				_staticRes = true;
+			}
+		}
+		
+		if (_canTeleport && (_clan != null) && !_isJailed) {
+			boolean isInCastleDefense = false;
+			boolean isInFortDefense = false;
+			
+			L2SiegeClan siegeClan = null;
+			Castle castle = CastleManager.getInstance().getCastle(_activeChar);
+			Fort fort = FortManager.getInstance().getFort(_activeChar);
+			SiegableHall hall = ClanHallSiegeManager.getInstance().getNearbyClanHall(_activeChar);
+			if ((castle != null) && castle.getSiege().isInProgress()) {
+				// siege in progress
+				siegeClan = castle.getSiege().getAttackerClan(_clan);
+				if ((siegeClan == null) && castle.getSiege().checkIsDefender(_clan)) {
+					isInCastleDefense = true;
+				}
+			} else if ((fort != null) && fort.getSiege().isInProgress()) {
+				// siege in progress
+				siegeClan = fort.getSiege().getAttackerClan(_clan);
+				if ((siegeClan == null) && fort.getSiege().checkIsDefender(_clan)) {
+					isInFortDefense = true;
+				}
+			}
+			
+			writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away
+			writeD((_clan.getCastleId() > 0) || isInCastleDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle
+			writeD((TerritoryWarManager.getInstance().getHQForClan(_clan) != null) || ((siegeClan != null) && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || ((hall != null) && hall.getSiege().checkIsAttacker(_clan)) ? 0x01 : 0x00); // 6d 03 00 00 00 - to siege HQ
+			writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow)
+			writeD(_staticRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED
+			writeD((_clan.getFortId() > 0) || isInFortDefense ? 0x01 : 0x00); // 6d 05 00 00 00 - to fortress
+		} else {
+			writeD(0x00); // 6d 01 00 00 00 - to hide away
+			writeD(0x00); // 6d 02 00 00 00 - to castle
+			writeD(0x00); // 6d 03 00 00 00 - to siege HQ
+			writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow)
+			writeD(_staticRes ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED
+			writeD(0x00); // 6d 05 00 00 00 - to fortress
+		}
+		// TODO: protocol 152
+		// writeC(0); // show die animation
+		// writeD(0); // agathion ress button
+		// writeD(0); // additional free space
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/DoorInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DoorInfo.java
new file mode 100644
index 00000000..2daf6664
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DoorInfo.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+public final class DoorInfo extends L2GameServerPacket {
+	private final L2DoorInstance _door;
+	
+	public DoorInfo(L2DoorInstance door) {
+		_door = door;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x4c);
+		writeD(_door.getObjectId());
+		writeD(_door.getId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/DoorStatusUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DoorStatusUpdate.java
new file mode 100644
index 00000000..ad962586
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DoorStatusUpdate.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+public final class DoorStatusUpdate extends L2GameServerPacket {
+	private final L2DoorInstance _door;
+	
+	public DoorStatusUpdate(L2DoorInstance door) {
+		_door = door;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x4d);
+		writeD(_door.getObjectId());
+		writeD(_door.getOpen() ? 0 : 1);
+		writeD(_door.getDamage());
+		writeD(_door.isEnemy() ? 1 : 0);
+		writeD(_door.getId());
+		writeD((int) _door.getCurrentHp());
+		writeD(_door.getMaxHp());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/DropItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DropItem.java
new file mode 100644
index 00000000..ad9b32ad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/DropItem.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class DropItem extends L2GameServerPacket {
+	private final L2ItemInstance _item;
+	private final int _charObjId;
+	
+	public DropItem(L2ItemInstance item, int playerObjId) {
+		_item = item;
+		_charObjId = playerObjId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x16);
+		writeD(_charObjId);
+		writeD(_item.getObjectId());
+		writeD(_item.getDisplayId());
+		
+		writeD(_item.getX());
+		writeD(_item.getY());
+		writeD(_item.getZ());
+		// only show item count if it is a stackable item
+		writeD(_item.isStackable() ? 0x01 : 0x00);
+		writeQ(_item.getCount());
+		
+		writeD(0x01); // unknown
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Earthquake.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Earthquake.java
new file mode 100644
index 00000000..0f5c617a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Earthquake.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class Earthquake extends L2GameServerPacket {
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	private final int _intensity;
+	private final int _duration;
+	
+	public Earthquake(int x, int y, int z, int intensity, int duration) {
+		_x = x;
+		_y = y;
+		_z = z;
+		_intensity = intensity;
+		_duration = duration;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xD3);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_intensity);
+		writeD(_duration);
+		writeD(0x00); // Unknown
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java
new file mode 100644
index 00000000..6dc4ce05
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/EnchantResult.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class EnchantResult extends L2GameServerPacket {
+	private final int _result;
+	private final int _crystal;
+	private final int _count;
+	
+	public EnchantResult(int result, int crystal, int count) {
+		_result = result;
+		_crystal = crystal;
+		_count = count;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x87);
+		writeD(_result);
+		writeD(_crystal);
+		writeQ(_count);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/EquipUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/EquipUpdate.java
new file mode 100644
index 00000000..ae829242
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/EquipUpdate.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class EquipUpdate extends L2GameServerPacket {
+	private final L2ItemInstance _item;
+	private final int _change;
+	
+	public EquipUpdate(L2ItemInstance item, int change) {
+		_item = item;
+		_change = change;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		int bodyPart = 0;
+		writeC(0x4b);
+		writeD(_change);
+		writeD(_item.getObjectId());
+		switch (_item.getItem().getBodyPart()) {
+			case L2Item.SLOT_L_EAR -> bodyPart = 0x01;
+			case L2Item.SLOT_R_EAR -> bodyPart = 0x02;
+			case L2Item.SLOT_NECK -> bodyPart = 0x03;
+			case L2Item.SLOT_R_FINGER -> bodyPart = 0x04;
+			case L2Item.SLOT_L_FINGER -> bodyPart = 0x05;
+			case L2Item.SLOT_HEAD -> bodyPart = 0x06;
+			case L2Item.SLOT_R_HAND -> bodyPart = 0x07;
+			case L2Item.SLOT_L_HAND -> bodyPart = 0x08;
+			case L2Item.SLOT_GLOVES -> bodyPart = 0x09;
+			case L2Item.SLOT_CHEST -> bodyPart = 0x0a;
+			case L2Item.SLOT_LEGS -> bodyPart = 0x0b;
+			case L2Item.SLOT_FEET -> bodyPart = 0x0c;
+			case L2Item.SLOT_BACK -> bodyPart = 0x0d;
+			case L2Item.SLOT_LR_HAND -> bodyPart = 0x0e;
+			case L2Item.SLOT_HAIR -> bodyPart = 0x0f;
+			case L2Item.SLOT_BELT -> bodyPart = 0x10;
+		}
+		writeD(bodyPart);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/EtcStatusUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/EtcStatusUpdate.java
new file mode 100644
index 00000000..b3d52c7f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/EtcStatusUpdate.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+/**
+ * @author Luca Baldi
+ */
+public class EtcStatusUpdate extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	
+	public EtcStatusUpdate(L2PcInstance activeChar) {
+		_activeChar = activeChar;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xf9); // several icons to a separate line (0 = disabled)
+		writeD(_activeChar.getCharges()); // 1-7 increase force, lvl
+		writeD(_activeChar.getWeightPenalty()); // 1-4 weight penalty, lvl (1=50%, 2=66.6%, 3=80%, 4=100%)
+		writeD((_activeChar.getMessageRefusal() || _activeChar.isChatBanned() || _activeChar.isSilenceMode()) ? 1 : 0); // 1 = block all chat
+		writeD(_activeChar.isInsideZone(ZoneId.DANGER_AREA) ? 1 : 0); // 1 = danger area
+		writeD(_activeChar.getExpertiseWeaponPenalty()); // Weapon Grade Penalty [1-4]
+		writeD(_activeChar.getExpertiseArmorPenalty()); // Armor Grade Penalty [1-4]
+		writeD(_activeChar.hasCharmOfCourage() ? 1 : 0); // 1 = charm of courage (allows resurrection on the same spot upon death on the siege battlefield)
+		writeD(_activeChar.getDeathPenaltyBuffLevel()); // 1-15 death penalty, lvl (combat ability decreased due to death)
+		writeD(_activeChar.getChargedSouls());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordAck.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordAck.java
new file mode 100644
index 00000000..a4f469eb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordAck.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Ex2ndPasswordAck server packet.
+ * @author mrTJO
+ */
+public class Ex2ndPasswordAck extends L2GameServerPacket {
+	int _response;
+	
+	public static final int SUCCESS = 0x00;
+	public static final int WRONG_PATTERN = 0x01;
+	
+	public Ex2ndPasswordAck(int response) {
+		_response = response;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		// writeH(0x109); GOD
+		writeH(0xE7);
+		writeC(0x00);
+		writeD(_response == WRONG_PATTERN ? 0x01 : 0x00);
+		writeD(0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordCheck.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
new file mode 100644
index 00000000..280ebd74
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordCheck.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mrTJO
+ */
+public class Ex2ndPasswordCheck extends L2GameServerPacket {
+	public static final int PASSWORD_NEW = 0x00;
+	public static final int PASSWORD_PROMPT = 0x01;
+	public static final int PASSWORD_OK = 0x02;
+	
+	private final int _windowType;
+	
+	public Ex2ndPasswordCheck(int windowType) {
+		_windowType = windowType;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		// writeH(0x109); GOD
+		writeH(0xe5);
+		writeD(_windowType);
+		writeD(0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordVerify.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
new file mode 100644
index 00000000..2706adf7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ex2ndPasswordVerify.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mrTJO
+ */
+public class Ex2ndPasswordVerify extends L2GameServerPacket {
+	public static final int PASSWORD_OK = 0x00;
+	public static final int PASSWORD_WRONG = 0x01;
+	public static final int PASSWORD_BAN = 0x02;
+	
+	private final int _wrongTentatives, _mode;
+	
+	public Ex2ndPasswordVerify(int mode, int wrongTentatives) {
+		_mode = mode;
+		_wrongTentatives = wrongTentatives;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		// writeH(0x109); GOD
+		writeH(0xe6);
+		writeD(_mode);
+		writeD(_wrongTentatives);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipInfo.java
new file mode 100644
index 00000000..18fb9835
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipInfo.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+
+public class ExAirShipInfo extends L2GameServerPacket {
+	// store some parameters, because they can be changed during broadcast
+	private final L2AirShipInstance _ship;
+	private final int _x, _y, _z, _heading, _moveSpeed, _rotationSpeed, _captain, _helm;
+	
+	public ExAirShipInfo(L2AirShipInstance ship) {
+		_ship = ship;
+		_x = ship.getX();
+		_y = ship.getY();
+		_z = ship.getZ();
+		_heading = ship.getHeading();
+		_moveSpeed = (int) ship.getStat().getMoveSpeed();
+		_rotationSpeed = (int) ship.getStat().getRotationSpeed();
+		_captain = ship.getCaptainId();
+		_helm = ship.getHelmObjectId();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x60);
+		
+		writeD(_ship.getObjectId());
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_heading);
+		
+		writeD(_captain);
+		writeD(_moveSpeed);
+		writeD(_rotationSpeed);
+		writeD(_helm);
+		if (_helm != 0) {
+			// TODO: unhardcode these!
+			writeD(0x16e); // Controller X
+			writeD(0x00); // Controller Y
+			writeD(0x6b); // Controller Z
+			writeD(0x15c); // Captain X
+			writeD(0x00); // Captain Y
+			writeD(0x69); // Captain Z
+		} else {
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+		}
+		
+		writeD(_ship.getFuel());
+		writeD(_ship.getMaxFuel());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipStopMove.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipStopMove.java
new file mode 100644
index 00000000..1f662cee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipStopMove.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class ExAirShipStopMove extends L2GameServerPacket {
+	private final int _playerId, _airShipId, _x, _y, _z;
+	
+	public ExAirShipStopMove(L2PcInstance player, L2AirShipInstance ship, int x, int y, int z) {
+		_playerId = player.getObjectId();
+		_airShipId = ship.getObjectId();
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x66);
+		
+		writeD(_airShipId);
+		writeD(_playerId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipTeleportList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipTeleportList.java
new file mode 100644
index 00000000..8c685e6d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAirShipTeleportList.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.VehiclePathPoint;
+
+public class ExAirShipTeleportList extends L2GameServerPacket {
+	private final int _dockId;
+	private final VehiclePathPoint[][] _teleports;
+	private final int[] _fuelConsumption;
+	
+	public ExAirShipTeleportList(int dockId, VehiclePathPoint[][] teleports, int[] fuelConsumption) {
+		_dockId = dockId;
+		_teleports = teleports;
+		_fuelConsumption = fuelConsumption;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x9a);
+		
+		writeD(_dockId);
+		if (_teleports != null) {
+			writeD(_teleports.length);
+			
+			VehiclePathPoint[] path;
+			VehiclePathPoint dst;
+			for (int i = 0; i < _teleports.length; i++) {
+				writeD(i - 1);
+				writeD(_fuelConsumption[i]);
+				path = _teleports[i];
+				dst = path[path.length - 1];
+				writeD(dst.getX());
+				writeD(dst.getY());
+				writeD(dst.getZ());
+			}
+		} else {
+			writeD(0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskCoupleAction.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskCoupleAction.java
new file mode 100644
index 00000000..f41dfd96
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskCoupleAction.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author JIV
+ */
+public class ExAskCoupleAction extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _actionId;
+	
+	public ExAskCoupleAction(int charObjId, int social) {
+		_charObjId = charObjId;
+		_actionId = social;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xBB);
+		writeD(_actionId);
+		writeD(_charObjId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskJoinMPCC.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskJoinMPCC.java
new file mode 100644
index 00000000..390efbe6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskJoinMPCC.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Asks the player to join a CC
+ * @author chris_00
+ */
+public class ExAskJoinMPCC extends L2GameServerPacket {
+	private final String _requesterName;
+	
+	public ExAskJoinMPCC(String requesterName) {
+		_requesterName = requesterName;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x1a);
+		writeS(_requesterName); // name of CCLeader
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskJoinPartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
new file mode 100644
index 00000000..10b9fb3e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskJoinPartyRoom.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExAskJoinPartyRoom extends L2GameServerPacket {
+	private final String _charName;
+	
+	public ExAskJoinPartyRoom(String charName) {
+		_charName = charName;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x35);
+		writeS(_charName);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskModifyPartyLooting.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
new file mode 100644
index 00000000..f0247dda
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAskModifyPartyLooting.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+
+/**
+ * @author JIV
+ */
+public class ExAskModifyPartyLooting extends L2GameServerPacket {
+	private final String _requester;
+	private final PartyDistributionType _partyDistributionType;
+	
+	public ExAskModifyPartyLooting(String name, PartyDistributionType partyDistributionType) {
+		_requester = name;
+		_partyDistributionType = partyDistributionType;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xBF);
+		writeS(_requester);
+		writeD(_partyDistributionType.getId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAttributeEnchantResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAttributeEnchantResult.java
new file mode 100644
index 00000000..4b54f188
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAttributeEnchantResult.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExAttributeEnchantResult extends L2GameServerPacket {
+	private final int _result;
+	
+	public ExAttributeEnchantResult(int result) {
+		_result = result;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xfe);
+		writeH(0x61);
+		writeD(_result);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAutoSoulShot.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAutoSoulShot.java
new file mode 100644
index 00000000..38decde6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExAutoSoulShot.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExAutoSoulShot extends L2GameServerPacket {
+	private final int _itemId;
+	private final int _type;
+	
+	public ExAutoSoulShot(int itemId, int type) {
+		_itemId = itemId;
+		_type = type;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x0c); // sub id
+		writeD(_itemId);
+		writeD(_type);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBR_AgathionEnergyInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBR_AgathionEnergyInfo.java
new file mode 100644
index 00000000..d5e3f5bf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBR_AgathionEnergyInfo.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.agathion.repository.AgathionRepository;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Agathion Energy Info packet.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public class ExBR_AgathionEnergyInfo extends L2GameServerPacket {
+	
+	private final List<L2ItemInstance> agathions;
+	
+	public ExBR_AgathionEnergyInfo(List<L2ItemInstance> agathions) {
+		this.agathions = agathions;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0xDE);
+		writeD(agathions.size());
+		for (var agathion : agathions) {
+			writeD(agathion.getObjectId());
+			writeD(agathion.getId());
+			writeD(0x200000);
+			writeD(agathion.getAgathionRemainingEnergy());
+			writeD(AgathionRepository.getInstance().getByItemId(agathion.getId()).energy());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
new file mode 100644
index 00000000..06d4ae35
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBaseAttributeCancelResult.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author JIV
+ */
+public class ExBaseAttributeCancelResult extends L2GameServerPacket {
+	private final int _objId;
+	private final byte _attribute;
+	
+	public ExBaseAttributeCancelResult(int objId, byte attribute) {
+		_objId = objId;
+		_attribute = attribute;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x75);
+		writeD(0x01); // result
+		writeD(_objId);
+		writeD(_attribute);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java
new file mode 100644
index 00000000..73716975
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBasicActionList.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public final class ExBasicActionList extends L2GameServerPacket {
+	//@formatter:off
+	public static final int[] ACTIONS_ON_TRANSFORM =
+	{
+		1, 2, 3, 4,
+		5, 6, 7, 8,
+		9, 11, 15, 16,
+		17, 18, 19, 21,
+		22, 23, 32, 36,
+		39, 40, 41, 42,
+		43, 44, 45, 46,
+		47, 48, 50, 52,
+		53, 54, 55, 56,
+		57, 63, 64, 65,
+		70, 1000, 1001, 1003,
+		1004, 1005, 1006, 1007,
+		1008, 1009, 1010, 1011,
+		1012, 1013, 1014, 1015,
+		1016, 1017, 1018, 1019,
+		1020, 1021, 1022, 1023,
+		1024, 1025, 1026, 1027,
+		1028, 1029, 1030, 1031,
+		1032, 1033, 1034, 1035,
+		1036, 1037, 1038, 1039,
+		1040, 1041, 1042, 1043,
+		1044, 1045, 1046, 1047,
+		1048, 1049, 1050, 1051,
+		1052, 1053, 1054, 1055,
+		1056, 1057, 1058, 1059,
+		1060, 1061, 1062, 1063,
+		1064, 1065, 1066, 1067,
+		1068, 1069, 1070, 1071,
+		1072, 1073, 1074, 1075,
+		1076, 1077, 1078, 1079,
+		1080, 1081, 1082, 1083,
+		1084, 1089, 1090, 1091,
+		1092, 1093, 1094, 1095,
+		1096, 1097, 1098 
+	};
+	//@formatter:on
+	public static final int[] DEFAULT_ACTION_LIST;
+	
+	static {
+		int count1 = 74; // 0 <-> (count1 - 1)
+		int count2 = 99; // 1000 <-> (1000 + count2 - 1)
+		int count3 = 16; // 5000 <-> (5000 + count3 - 1)
+		DEFAULT_ACTION_LIST = new int[count1 + count2 + count3];
+		int i;
+		
+		for (i = count1; i-- > 0;) {
+			DEFAULT_ACTION_LIST[i] = i;
+		}
+		
+		for (i = count2; i-- > 0;) {
+			DEFAULT_ACTION_LIST[count1 + i] = 1000 + i;
+		}
+		
+		for (i = count3; i-- > 0;) {
+			DEFAULT_ACTION_LIST[count1 + count2 + i] = 5000 + i;
+		}
+	}
+	
+	public static final ExBasicActionList STATIC_PACKET = new ExBasicActionList(DEFAULT_ACTION_LIST);
+	
+	private final int[] _actionIds;
+	
+	public ExBasicActionList(final int[] actionIds) {
+		_actionIds = actionIds;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x5f);
+		writeD(_actionIds.length);
+		for (int _actionId : _actionIds) {
+			writeD(_actionId);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java
new file mode 100644
index 00000000..f74886a8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBirthdayPopup.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Gnat
+ */
+public class ExBirthdayPopup extends L2GameServerPacket {
+	public ExBirthdayPopup() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x8f);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrBroadcastEventState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrBroadcastEventState.java
new file mode 100644
index 00000000..2aeb53a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrBroadcastEventState.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Special event info packet.
+ * @author Kerberos
+ * @author mrTJO
+ */
+public class ExBrBroadcastEventState extends L2GameServerPacket {
+	private final int _eventId;
+	private final int _eventState;
+	private int _param0;
+	private int _param1;
+	private int _param2;
+	private int _param3;
+	private int _param4;
+	private String _param5;
+	private String _param6;
+	
+	public static final int APRIL_FOOLS = 20090401;
+	public static final int EVAS_INFERNO = 20090801; // event state (0 - hide, 1 - show), day (1-14), percent (0-100)
+	public static final int HALLOWEEN_EVENT = 20091031; // event state (0 - hide, 1 - show)
+	public static final int RAISING_RUDOLPH = 20091225; // event state (0 - hide, 1 - show)
+	public static final int LOVERS_JUBILEE = 20100214; // event state (0 - hide, 1 - show)
+	
+	public ExBrBroadcastEventState(int eventId, int eventState) {
+		_eventId = eventId;
+		_eventState = eventState;
+	}
+	
+	public ExBrBroadcastEventState(int eventId, int eventState, int param0, int param1, int param2, int param3, int param4, String param5, String param6) {
+		_eventId = eventId;
+		_eventState = eventState;
+		_param0 = param0;
+		_param1 = param1;
+		_param2 = param2;
+		_param3 = param3;
+		_param4 = param4;
+		_param5 = param5;
+		_param6 = param6;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0xBC);
+		writeD(_eventId);
+		writeD(_eventState);
+		writeD(_param0);
+		writeD(_param1);
+		writeD(_param2);
+		writeD(_param3);
+		writeD(_param4);
+		writeS(_param5);
+		writeS(_param6);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrBuffEventState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrBuffEventState.java
new file mode 100644
index 00000000..23027761
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrBuffEventState.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Eva's Inferno event packet. info params: <br>
+ * type (1 - %, 2 - npcId), <br>
+ * value (depending on type: for type 1 - % value; for type 2 - 20573-20575), <br>
+ * state (0-1), endtime (only when type 2)
+ */
+public class ExBrBuffEventState extends L2GameServerPacket {
+	private final int _type; // 1 - %, 2 - npcId
+	private final int _value; // depending on type: for type 1 - % value; for type 2 - 20573-20575
+	private final int _state; // 0-1
+	private final int _endtime; // only when type 2 as unix time in seconds from 1970
+	
+	public ExBrBuffEventState(int type, int value, int state, int endtime) {
+		_type = type;
+		_value = value;
+		_state = state;
+		_endtime = endtime;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xDB);
+		writeD(_type);
+		writeD(_value);
+		writeD(_state);
+		writeD(_endtime);
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrExtraUserInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrExtraUserInfo.java
new file mode 100644
index 00000000..3a5ac2ad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrExtraUserInfo.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * ExBrExtraUserInfo server packet implementation.
+ * @author Kerberos
+ * @author Zoey76
+ */
+public class ExBrExtraUserInfo extends L2GameServerPacket {
+	/** Player object ID. */
+	private final int _charObjId;
+	/** Event abnormal visual effects map. */
+	private final int _abnormalVisualEffectsEvent;
+	/** Lecture mark. */
+	private final int _lectureMark;
+	
+	public ExBrExtraUserInfo(L2PcInstance player) {
+		_charObjId = player.getObjectId();
+		_abnormalVisualEffectsEvent = player.getAbnormalVisualEffectEvent();
+		_lectureMark = 0; // TODO: Implement.
+		setInvisible(player.isInvisible());
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0xDA);
+		writeD(_charObjId);
+		writeD(_abnormalVisualEffectsEvent);
+		writeC(_lectureMark);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
new file mode 100644
index 00000000..7065e3cb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrLoadEventTopRankers.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Halloween rank list server packet.
+ */
+public class ExBrLoadEventTopRankers extends L2GameServerPacket {
+	private final int _eventId;
+	private final int _day;
+	private final int _count;
+	private final int _bestScore;
+	private final int _myScore;
+	
+	public ExBrLoadEventTopRankers(int eventId, int day, int count, int bestScore, int myScore) {
+		_eventId = eventId;
+		_day = day;
+		_count = count;
+		_bestScore = bestScore;
+		_myScore = myScore;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0xBD);
+		writeD(_eventId);
+		writeD(_day);
+		writeD(_count);
+		writeD(_bestScore);
+		writeD(_myScore);
+		
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrPremiumState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrPremiumState.java
new file mode 100644
index 00000000..ccf48102
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBrPremiumState.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author GodKratos
+ */
+public class ExBrPremiumState extends L2GameServerPacket {
+	private final int _objId;
+	private final int _state;
+	
+	public ExBrPremiumState(int id, int state) {
+		_objId = id;
+		_state = state;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xD9);
+		writeD(_objId);
+		writeC(_state);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java
new file mode 100644
index 00000000..0d258f6b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExBuySellList.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author ShanSoft
+ */
+public class ExBuySellList extends AbstractItemPacket {
+	private L2ItemInstance[] _sellList = null;
+	private L2ItemInstance[] _refundList = null;
+	private final boolean _done;
+	
+	public ExBuySellList(L2PcInstance player, boolean done) {
+		_sellList = player.getInventory().getAvailableItems(false, false, false);
+		if (player.hasRefund()) {
+			_refundList = player.getRefund().getItems();
+		}
+		_done = done;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0xB7);
+		writeD(0x01);
+		
+		if ((_sellList != null)) {
+			writeH(_sellList.length);
+			for (L2ItemInstance item : _sellList) {
+				writeItem(item);
+				writeQ(item.getItem().getReferencePrice() / 2);
+			}
+		} else {
+			writeH(0x00);
+		}
+		
+		if ((_refundList != null) && (_refundList.length > 0)) {
+			writeH(_refundList.length);
+			int i = 0;
+			for (L2ItemInstance item : _refundList) {
+				writeItem(item);
+				writeD(i++);
+				writeQ((item.getItem().getReferencePrice() / 2) * item.getCount());
+			}
+		} else {
+			writeH(0x00);
+		}
+		
+		writeC(_done ? 0x01 : 0x00);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCaptureOrc.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCaptureOrc.java
new file mode 100644
index 00000000..51d16fbe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCaptureOrc.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExCaptureOrc extends L2GameServerPacket {
+	private static final byte[] _test;
+	static {
+		// TODO: Verify the data
+		//@formatter:off
+		_test = new byte[]
+		{
+			(byte) 0xE4 ,(byte) 0xAB ,(byte) 0x8E ,(byte) 0xC5 ,(byte) 0xE9 ,(byte) 0xF9 ,(byte) 0x86 ,(byte) 0x7B,
+			(byte) 0x9E ,(byte) 0x5D ,(byte) 0x83 ,(byte) 0x14 ,(byte) 0x05 ,(byte) 0xD4 ,(byte) 0x48 ,(byte) 0x01,
+			(byte) 0xCD ,(byte) 0xA2 ,(byte) 0x8D ,(byte) 0x90 ,(byte) 0x62 ,(byte) 0x8C ,(byte) 0xDA ,(byte) 0x32,
+			(byte) 0x7B ,(byte) 0x1B ,(byte) 0x87 ,(byte) 0x6D ,(byte) 0x08 ,(byte) 0xC4 ,(byte) 0xE1 ,(byte) 0x56,
+			(byte) 0x9B ,(byte) 0x3B ,(byte) 0xC3 ,(byte) 0x40 ,(byte) 0xDF ,(byte) 0xE8 ,(byte) 0xD7 ,(byte) 0xE1,
+			(byte) 0x98 ,(byte) 0x38 ,(byte) 0x1C ,(byte) 0xA5 ,(byte) 0x8E ,(byte) 0x45 ,(byte) 0x3F ,(byte) 0xF2,
+			(byte) 0x5E ,(byte) 0x1C ,(byte) 0x59 ,(byte) 0x8E ,(byte) 0x74 ,(byte) 0x01 ,(byte) 0x9E ,(byte) 0xC2,
+			(byte) 0x00 ,(byte) 0x95 ,(byte) 0xB0 ,(byte) 0x1D ,(byte) 0x87 ,(byte) 0xED ,(byte) 0x9C ,(byte) 0x8A
+		};
+		//@formatter:on
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x45);
+		writeB(_test);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangeClientEffectInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
new file mode 100644
index 00000000..609843a8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangeClientEffectInfo.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author UnAfraid
+ */
+public class ExChangeClientEffectInfo extends L2GameServerPacket {
+	public static final ExChangeClientEffectInfo STATIC_FREYA_DEFAULT = new ExChangeClientEffectInfo(0, 0, 1);
+	public static final ExChangeClientEffectInfo STATIC_FREYA_DESTROYED = new ExChangeClientEffectInfo(0, 0, 2);
+	
+	private final int _type, _key, _value;
+	
+	/**
+	 * @param type
+	 *            <ul>
+	 *            <li>0 - ChangeZoneState</li>
+	 *            <li>1 - SetL2Fog</li>
+	 *            <li>2 - postEffectData</li>
+	 *            </ul>
+	 * @param key
+	 * @param value
+	 */
+	public ExChangeClientEffectInfo(int type, int key, int value) {
+		_type = type;
+		_key = key;
+		_value = value;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xC2);
+		writeD(_type);
+		writeD(_key);
+		writeD(_value);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangeNpcState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangeNpcState.java
new file mode 100644
index 00000000..4398a941
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangeNpcState.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author JIV
+ */
+public class ExChangeNpcState extends L2GameServerPacket {
+	private final int _objId;
+	private final int _state;
+	
+	public ExChangeNpcState(int objId, int state) {
+		_objId = objId;
+		_state = state;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xBE);
+		writeD(_objId);
+		writeD(_state);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangePostState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangePostState.java
new file mode 100644
index 00000000..9a40ea8e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChangePostState.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Migi
+ */
+public class ExChangePostState extends L2GameServerPacket {
+	private final boolean _receivedBoard;
+	private final int[] _changedMsgIds;
+	private final int _changeId;
+	
+	public ExChangePostState(boolean receivedBoard, int[] changedMsgIds, int changeId) {
+		_receivedBoard = receivedBoard;
+		_changedMsgIds = changedMsgIds;
+		_changeId = changeId;
+	}
+	
+	public ExChangePostState(boolean receivedBoard, int changedMsgId, int changeId) {
+		_receivedBoard = receivedBoard;
+		_changedMsgIds = new int[] {
+			changedMsgId
+		};
+		_changeId = changeId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0xb3);
+		writeD(_receivedBoard ? 1 : 0);
+		writeD(_changedMsgIds.length);
+		for (int postId : _changedMsgIds) {
+			writeD(postId); // postId
+			writeD(_changeId); // state
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
new file mode 100644
index 00000000..4e16ee58
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExChooseInventoryAttributeItem.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Kerberos
+ */
+public class ExChooseInventoryAttributeItem extends L2GameServerPacket {
+	private final int _itemId;
+	private final byte _attribute;
+	private final int _level;
+	
+	public ExChooseInventoryAttributeItem(L2ItemInstance item) {
+		_itemId = item.getDisplayId();
+		_attribute = Elementals.getItemElement(_itemId);
+		if (_attribute == Elementals.NONE) {
+			throw new IllegalArgumentException("Undefined attribute item: " + item);
+		}
+		_level = Elementals.getMaxElementLevel(_itemId);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x62);
+		writeD(_itemId);
+		// Structure for now
+		// Must be 0x01 for stone/crystal attribute type
+		writeD(_attribute == Elementals.FIRE ? 1 : 0); // Fire
+		writeD(_attribute == Elementals.WATER ? 1 : 0); // Water
+		writeD(_attribute == Elementals.WIND ? 1 : 0); // Wind
+		writeD(_attribute == Elementals.EARTH ? 1 : 0); // Earth
+		writeD(_attribute == Elementals.HOLY ? 1 : 0); // Holy
+		writeD(_attribute == Elementals.DARK ? 1 : 0); // Unholy
+		writeD(_level); // Item max attribute level
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCleftList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCleftList.java
new file mode 100644
index 00000000..eb8954eb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCleftList.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+import java.util.Objects;
+
+import com.l2jserver.gameserver.model.cleft.CleftMatch;
+import com.l2jserver.gameserver.model.cleft.CleftParticipant;
+import com.l2jserver.gameserver.model.cleft.CleftTeam;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public abstract class ExCleftList extends AbstractExCleftPacket {
+	private enum ListAction {
+		CLOSE,
+		TOTAL,
+		ADD,
+		REMOVE,
+		CHANGE_TEAM
+	}
+	
+	public static final class Close extends ExCleftList {
+		public Close() {
+			super(ListAction.CLOSE);
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+		}
+	}
+	
+	public static final class Total extends ExCleftList {
+		private final CleftMatch _match;
+		
+		public Total(CleftMatch match) {
+			super(ListAction.TOTAL);
+			
+			Objects.requireNonNull(match);
+			
+			_match = match;
+		}
+		
+		private void writeTeamParticipants(CleftTeam team) {
+			Map<Integer, CleftParticipant> participants = team.getParticipants();
+			writeD(participants.size());
+			for (CleftParticipant participant : participants.values()) {
+				writeParticipant(participant, true);
+			}
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeD(_match.getMinTeamMembers());
+			writeD(_match.isBalanced() ? 1 : 0);
+			
+			writeTeamParticipants(_match.getBlueTeam());
+			writeTeamParticipants(_match.getRedTeam());
+		}
+	}
+	
+	public static final class Add extends ExCleftList {
+		private final CleftTeam _team;
+		private final CleftParticipant _player;
+		
+		public Add(CleftTeam team, CleftParticipant player) {
+			super(ListAction.ADD);
+			
+			Objects.requireNonNull(team);
+			Objects.requireNonNull(player);
+			
+			_team = team;
+			_player = player;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeTeamId(_team);
+			writeParticipant(_player, true);
+		}
+	}
+	
+	public static final class Remove extends ExCleftList {
+		private final CleftTeam _team;
+		private final CleftParticipant _player;
+		
+		public Remove(CleftTeam team, CleftParticipant player) {
+			super(ListAction.REMOVE);
+			
+			Objects.requireNonNull(team);
+			Objects.requireNonNull(player);
+			
+			_team = team;
+			_player = player;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeTeamId(_team);
+			writeParticipant(_player, false);
+		}
+	}
+	
+	public static final class ChangeTeam extends ExCleftList {
+		private final CleftTeam _oldTeam;
+		private final CleftTeam _newTeam;
+		private final CleftParticipant _player;
+		
+		public ChangeTeam(CleftTeam oldTeam, CleftTeam newTeam, CleftParticipant player) {
+			super(ListAction.CHANGE_TEAM);
+			
+			Objects.requireNonNull(oldTeam);
+			Objects.requireNonNull(newTeam);
+			Objects.requireNonNull(player);
+			
+			_oldTeam = oldTeam;
+			_newTeam = newTeam;
+			_player = player;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeParticipant(_player, false);
+			writeTeamId(_oldTeam);
+			writeTeamId(_newTeam);
+		}
+	}
+	
+	private final ListAction _action;
+	
+	protected ExCleftList(ListAction action) {
+		Objects.requireNonNull(action);
+		
+		_action = action;
+	}
+	
+	protected void writeParticipant(CleftParticipant participant, boolean writeName) {
+		writeD(participant.getPlayer().getObjectId());
+		if (writeName) {
+			writeS(participant.getPlayer().getName());
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x94);
+		
+		writeD(_action.ordinal() - 1);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCleftState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCleftState.java
new file mode 100644
index 00000000..b3ba7954
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCleftState.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+import java.util.Objects;
+
+import com.l2jserver.gameserver.model.cleft.CleftMatch;
+import com.l2jserver.gameserver.model.cleft.CleftParticipant;
+import com.l2jserver.gameserver.model.cleft.CleftTeam;
+import com.l2jserver.gameserver.model.cleft.CleftTowerType;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public abstract class ExCleftState extends AbstractExCleftPacket {
+	private enum CleftStateUpdate {
+		TOTAL,
+		TOWER_DESTROY,
+		COMBAT_AERIAL_TARGET_UPDATE,
+		RESULT,
+		PVP_KILL
+	}
+	
+	public static final class Total extends ExCleftState {
+		private final CleftMatch _match;
+		
+		public Total(CleftMatch match) {
+			super(CleftStateUpdate.TOTAL);
+			
+			Objects.requireNonNull(match);
+			
+			_match = match;
+		}
+		
+		private void writeTeam(CleftTeam team) {
+			Map<Integer, CleftParticipant> participants = team.getParticipants();
+			writeD(participants.size());
+			for (Map.Entry<Integer, CleftParticipant> participant : participants.entrySet()) {
+				writeParticipantPerformance(participant.getValue());
+			}
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeRemainingAndTeamPoints(_match);
+			
+			writeD(_match.getBlueTeam().getCombatAerialTarget().getId());
+			writeD(_match.getRedTeam().getCombatAerialTarget().getId());
+			writeS(_match.getBlueTeam().getCombatAerialTarget().getName());
+			writeS(_match.getRedTeam().getCombatAerialTarget().getName());
+			
+			writeTeam(_match.getBlueTeam());
+			writeTeam(_match.getRedTeam());
+		}
+	}
+	
+	public static final class TowerDestroy extends ExCleftState {
+		private final CleftMatch _match;
+		private final CleftParticipant _destroyer;
+		private final CleftTowerType _towerType;
+		
+		public TowerDestroy(CleftMatch match, CleftParticipant destroyer, CleftTowerType towerType) {
+			super(CleftStateUpdate.TOWER_DESTROY);
+			
+			Objects.requireNonNull(match);
+			Objects.requireNonNull(destroyer);
+			Objects.requireNonNull(towerType);
+			
+			_match = match;
+			_destroyer = destroyer;
+			_towerType = towerType;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeRemainingAndTeamPoints(_match);
+			writeTeamId(_destroyer.getTeam());
+			writeD(_towerType.ordinal());
+			writeParticipantPerformance(_destroyer);
+		}
+	}
+	
+	public static final class CombatAerialTargetUpdate extends ExCleftState {
+		private final CleftMatch _match;
+		private final CleftTeam _team;
+		
+		public CombatAerialTargetUpdate(CleftMatch match, CleftTeam team) {
+			super(CleftStateUpdate.COMBAT_AERIAL_TARGET_UPDATE);
+			
+			Objects.requireNonNull(match);
+			Objects.requireNonNull(team);
+			
+			_match = match;
+			_team = team;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeRemaining(_match);
+			writeTeamId(_team);
+			writeD(_team.getCombatAerialTarget().getId());
+			writeS(_team.getCombatAerialTarget().getName());
+		}
+	}
+	
+	public static final class Result extends ExCleftState {
+		private final CleftTeam _winTeam;
+		private final CleftTeam _loseTeam;
+		
+		public Result(CleftTeam winTeam, CleftTeam loseTeam) {
+			super(CleftStateUpdate.RESULT);
+			
+			Objects.requireNonNull(winTeam);
+			Objects.requireNonNull(loseTeam);
+			
+			_winTeam = winTeam;
+			_loseTeam = loseTeam;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeTeamId(_winTeam);
+			writeTeamId(_loseTeam);
+		}
+	}
+	
+	public static final class PvpKill extends ExCleftState {
+		private final CleftMatch _match;
+		private final CleftParticipant _killer;
+		private final CleftParticipant _killed;
+		
+		public PvpKill(CleftMatch match, CleftParticipant killer, CleftParticipant killed) {
+			super(CleftStateUpdate.RESULT);
+			
+			Objects.requireNonNull(match);
+			Objects.requireNonNull(killer);
+			Objects.requireNonNull(killed);
+			
+			_match = match;
+			_killer = killer;
+			_killed = killed;
+		}
+		
+		@Override
+		protected void writeImpl() {
+			super.writeImpl();
+			
+			writeRemainingAndTeamPoints(_match);
+			
+			writeTeamId(_killer.getTeam());
+			writeParticipantPerformance(_killer);
+			
+			writeTeamId(_killed.getTeam());
+			writeParticipantPerformance(_killed);
+		}
+	}
+	
+	private final CleftStateUpdate _state;
+	
+	private ExCleftState(CleftStateUpdate state) {
+		Objects.requireNonNull(state);
+		
+		_state = state;
+	}
+	
+	protected void writeRemaining(CleftMatch match) {
+		writeD(match.getRemainingSeconds());
+	}
+	
+	protected void writeTeamPoints(CleftMatch match) {
+		writeD(match.getBlueTeam().getPoints());
+		writeD(match.getRedTeam().getPoints());
+	}
+	
+	protected void writeRemainingAndTeamPoints(CleftMatch match) {
+		writeRemaining(match);
+		writeTeamPoints(match);
+	}
+	
+	protected void writeParticipantPerformance(CleftParticipant participant) {
+		Objects.requireNonNull(participant);
+		
+		writeD(participant.getPlayer().getObjectId());
+		writeD(participant.getKills());
+		writeD(participant.getDeaths());
+		writeD(participant.getTowers());
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x95);
+		
+		writeD(_state.ordinal());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCloseMPCC.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCloseMPCC.java
new file mode 100644
index 00000000..83209289
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCloseMPCC.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Close the CommandChannel Information window
+ * @author chris_00
+ */
+public class ExCloseMPCC extends L2GameServerPacket {
+	public ExCloseMPCC() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x13);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExClosePartyRoom.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExClosePartyRoom.java
new file mode 100644
index 00000000..571f56c3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExClosePartyRoom.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Gnacik
+ */
+public class ExClosePartyRoom extends L2GameServerPacket {
+	public ExClosePartyRoom() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x09);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExColosseumFenceInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExColosseumFenceInfo.java
new file mode 100644
index 00000000..7933b143
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExColosseumFenceInfo.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2ColosseumFence;
+
+/**
+ * OP: 0xFE<br>
+ * OP2: 0x0003<br>
+ * Format: ddddddd<br>
+ * - d: object id<br>
+ * - d: state(0=hidden, 1=unconnected corners, 2=connected corners)<br>
+ * - d: x<br>
+ * - d: y<br>
+ * - d: z<br>
+ * - d: a side length<br>
+ * - d: b side length<br>
+ * @author HorridoJoho
+ */
+public class ExColosseumFenceInfo extends L2GameServerPacket {
+	private final L2ColosseumFence _fence;
+	
+	public ExColosseumFenceInfo(L2ColosseumFence fence) {
+		_fence = fence;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x0003);
+		
+		writeD(_fence.getObjectId());
+		writeD(_fence.getFenceState().ordinal());
+		writeD(_fence.getX());
+		writeD(_fence.getY());
+		writeD(_fence.getZ());
+		writeD(_fence.getFenceWidth());
+		writeD(_fence.getFenceHeight());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java
new file mode 100644
index 00000000..25d9e762
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExConfirmAddingContact.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mrTJO
+ * @author UnAfraid
+ */
+public class ExConfirmAddingContact extends L2GameServerPacket {
+	private final String _charName;
+	private final boolean _added;
+	
+	public ExConfirmAddingContact(String charName, boolean added) {
+		_charName = charName;
+		_added = added;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xD2);
+		writeS(_charName);
+		writeD(_added ? 0x01 : 0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameAddPlayer.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
new file mode 100644
index 00000000..be8216db
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameAddPlayer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameAddPlayer extends L2GameServerPacket {
+	L2PcInstance _player;
+	boolean _isRedTeam;
+	
+	public ExCubeGameAddPlayer(L2PcInstance player, boolean isRedTeam) {
+		_player = player;
+		_isRedTeam = isRedTeam;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0x01);
+		writeD(0xffffffff);
+		writeD(_isRedTeam ? 0x01 : 0x00);
+		writeD(_player.getObjectId());
+		writeS(_player.getName());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangePoints.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangePoints.java
new file mode 100644
index 00000000..9972680d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangePoints.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameChangePoints extends L2GameServerPacket {
+	int _timeLeft;
+	int _bluePoints;
+	int _redPoints;
+	
+	/**
+	 * Change Client Point Counter
+	 * @param timeLeft Time Left before Minigame's End
+	 * @param bluePoints Current Blue Team Points
+	 * @param redPoints Current Red Team Points
+	 */
+	public ExCubeGameChangePoints(int timeLeft, int bluePoints, int redPoints) {
+		_timeLeft = timeLeft;
+		_bluePoints = bluePoints;
+		_redPoints = redPoints;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x98);
+		writeD(0x02);
+		
+		writeD(_timeLeft);
+		writeD(_bluePoints);
+		writeD(_redPoints);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangeTeam.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
new file mode 100644
index 00000000..a0ca0b1c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangeTeam.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameChangeTeam extends L2GameServerPacket {
+	L2PcInstance _player;
+	boolean _fromRedTeam;
+	
+	/**
+	 * Move Player from Team x to Team y
+	 * @param player Player Instance
+	 * @param fromRedTeam Is Player from Red Team?
+	 */
+	public ExCubeGameChangeTeam(L2PcInstance player, boolean fromRedTeam) {
+		_player = player;
+		_fromRedTeam = fromRedTeam;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0x05);
+		
+		writeD(_player.getObjectId());
+		writeD(_fromRedTeam ? 0x01 : 0x00);
+		writeD(_fromRedTeam ? 0x00 : 0x01);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
new file mode 100644
index 00000000..990f68e2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameChangeTimeToStart.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameChangeTimeToStart extends L2GameServerPacket {
+	int _seconds;
+	
+	/**
+	 * Update Minigame Waiting List Time to Start
+	 * @param seconds
+	 */
+	public ExCubeGameChangeTimeToStart(int seconds) {
+		_seconds = seconds;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0x03);
+		
+		writeD(_seconds);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameCloseUI.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameCloseUI.java
new file mode 100644
index 00000000..4880a481
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameCloseUI.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameCloseUI extends L2GameServerPacket {
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0xffffffff);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameEnd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameEnd.java
new file mode 100644
index 00000000..f5595f23
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameEnd.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * *
+ * @author mrTJO
+ */
+public class ExCubeGameEnd extends L2GameServerPacket {
+	boolean _isRedTeamWin;
+	
+	/**
+	 * Show Minigame Results
+	 * @param isRedTeamWin Is Red Team Winner?
+	 */
+	public ExCubeGameEnd(boolean isRedTeamWin) {
+		_isRedTeamWin = isRedTeamWin;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x98);
+		writeD(0x01);
+		
+		writeD(_isRedTeamWin ? 0x01 : 0x00);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
new file mode 100644
index 00000000..a8f06d49
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameExtendedChangePoints.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameExtendedChangePoints extends L2GameServerPacket {
+	int _timeLeft;
+	int _bluePoints;
+	int _redPoints;
+	boolean _isRedTeam;
+	L2PcInstance _player;
+	int _playerPoints;
+	
+	/**
+	 * Update a Secret Point Counter (used by client when receive ExCubeGameEnd)
+	 * @param timeLeft Time Left before Minigame's End
+	 * @param bluePoints Current Blue Team Points
+	 * @param redPoints Current Blue Team points
+	 * @param isRedTeam Is Player from Red Team?
+	 * @param player Player Instance
+	 * @param playerPoints Current Player Points
+	 */
+	public ExCubeGameExtendedChangePoints(int timeLeft, int bluePoints, int redPoints, boolean isRedTeam, L2PcInstance player, int playerPoints) {
+		_timeLeft = timeLeft;
+		_bluePoints = bluePoints;
+		_redPoints = redPoints;
+		_isRedTeam = isRedTeam;
+		_player = player;
+		_playerPoints = playerPoints;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x98);
+		writeD(0x00);
+		
+		writeD(_timeLeft);
+		writeD(_bluePoints);
+		writeD(_redPoints);
+		
+		writeD(_isRedTeam ? 0x01 : 0x00);
+		writeD(_player.getObjectId());
+		writeD(_playerPoints);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
new file mode 100644
index 00000000..e8fdefdd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameRemovePlayer.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameRemovePlayer extends L2GameServerPacket {
+	L2PcInstance _player;
+	boolean _isRedTeam;
+	
+	/**
+	 * Remove Player from Minigame Waiting List
+	 * @param player Player to Remove
+	 * @param isRedTeam Is Player from Red Team?
+	 */
+	public ExCubeGameRemovePlayer(L2PcInstance player, boolean isRedTeam) {
+		_player = player;
+		_isRedTeam = isRedTeam;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0x02);
+		
+		writeD(0xffffffff);
+		
+		writeD(_isRedTeam ? 0x01 : 0x00);
+		writeD(_player.getObjectId());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameRequestReady.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameRequestReady.java
new file mode 100644
index 00000000..1bf6a181
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameRequestReady.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Format: (chd)
+ * @author mrTJO
+ */
+public class ExCubeGameRequestReady extends L2GameServerPacket {
+	/**
+	 * Show Confirm Dialog for 10 seconds
+	 */
+	public ExCubeGameRequestReady() {
+		
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0x04);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameTeamList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameTeamList.java
new file mode 100644
index 00000000..7c019fc0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCubeGameTeamList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author mrTJO
+ */
+public class ExCubeGameTeamList extends L2GameServerPacket {
+	// Players Lists
+	List<L2PcInstance> _bluePlayers;
+	List<L2PcInstance> _redPlayers;
+	
+	// Common Values
+	int _roomNumber;
+	
+	/**
+	 * Show Minigame Waiting List to Player
+	 * @param redPlayers Red Players List
+	 * @param bluePlayers Blue Players List
+	 * @param roomNumber Arena/Room ID
+	 */
+	public ExCubeGameTeamList(List<L2PcInstance> redPlayers, List<L2PcInstance> bluePlayers, int roomNumber) {
+		_redPlayers = redPlayers;
+		_bluePlayers = bluePlayers;
+		_roomNumber = roomNumber - 1;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x97);
+		writeD(0x00);
+		
+		writeD(_roomNumber);
+		writeD(0xffffffff);
+		
+		writeD(_bluePlayers.size());
+		for (L2PcInstance player : _bluePlayers) {
+			writeD(player.getObjectId());
+			writeS(player.getName());
+		}
+		writeD(_redPlayers.size());
+		for (L2PcInstance player : _redPlayers) {
+			writeD(player.getObjectId());
+			writeS(player.getName());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponList.java
new file mode 100644
index 00000000..099ae954
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponList.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Set;
+
+/**
+ * @author -Wooden-
+ */
+public class ExCursedWeaponList extends L2GameServerPacket {
+	
+	private final Set<Integer> cursedWeaponIds;
+	
+	public ExCursedWeaponList(Set<Integer> cursedWeaponIds) {
+		this.cursedWeaponIds = cursedWeaponIds;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x46);
+		writeD(cursedWeaponIds.size());
+		for (int id : cursedWeaponIds) {
+			writeD(id);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponLocation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponLocation.java
new file mode 100644
index 00000000..47d1eae5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExCursedWeaponLocation.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * Format: (ch) d[ddddd]
+ * @author -Wooden-
+ */
+public class ExCursedWeaponLocation extends L2GameServerPacket {
+	private final List<CursedWeaponInfo> _cursedWeaponInfo;
+	
+	public ExCursedWeaponLocation(List<CursedWeaponInfo> cursedWeaponInfo) {
+		_cursedWeaponInfo = cursedWeaponInfo;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x47);
+		
+		if (!_cursedWeaponInfo.isEmpty()) {
+			writeD(_cursedWeaponInfo.size());
+			for (CursedWeaponInfo w : _cursedWeaponInfo) {
+				writeD(w.id);
+				writeD(w.activated);
+				
+				writeD(w.pos.getX());
+				writeD(w.pos.getY());
+				writeD(w.pos.getZ());
+			}
+		} else {
+			writeD(0);
+			writeD(0);
+		}
+	}
+	
+	public static class CursedWeaponInfo {
+		public Location pos;
+		public int id;
+		public int activated; // 0 - not activated ? 1 - activated
+		
+		public CursedWeaponInfo(Location p, int ID, int status) {
+			pos = p;
+			id = ID;
+			activated = status;
+		}
+		
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDominionWarEnd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDominionWarEnd.java
new file mode 100644
index 00000000..9d69c47d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDominionWarEnd.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Possibly trigger packet only, need to be verified.
+ * @author JIV
+ */
+public class ExDominionWarEnd extends L2GameServerPacket {
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xA4);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDominionWarStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDominionWarStart.java
new file mode 100644
index 00000000..5ec1e703
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDominionWarStart.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author JIV
+ */
+public class ExDominionWarStart extends L2GameServerPacket {
+	private final int _objId;
+	private final int _terId;
+	private final boolean _isDisguised;
+	
+	public ExDominionWarStart(L2PcInstance player) {
+		_objId = player.getObjectId();
+		_terId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(player);
+		_isDisguised = TerritoryWarManager.getInstance().isDisguised(_objId);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xA3);
+		writeD(_objId);
+		writeD(0x01); // ??
+		writeD(_terId);
+		writeD(_isDisguised ? 1 : 0);
+		writeD(_isDisguised ? _terId : 0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelAskStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelAskStart.java
new file mode 100644
index 00000000..c0788bbb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelAskStart.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExDuelAskStart extends L2GameServerPacket {
+	private final String _requesterName;
+	private final int _partyDuel;
+	
+	public ExDuelAskStart(String requester, int partyDuel) {
+		_requesterName = requester;
+		_partyDuel = partyDuel;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x4c);
+		
+		writeS(_requesterName);
+		writeD(_partyDuel);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelEnd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelEnd.java
new file mode 100644
index 00000000..770e90a8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelEnd.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Duel End packet implementation.
+ * @author KenM
+ * @author Zoey76
+ */
+public class ExDuelEnd extends L2GameServerPacket {
+	public static final ExDuelEnd PLAYER_DUEL = new ExDuelEnd(false);
+	public static final ExDuelEnd PARTY_DUEL = new ExDuelEnd(true);
+	
+	private final int _partyDuel;
+	
+	private ExDuelEnd(boolean isPartyDuel) {
+		_partyDuel = isPartyDuel ? 1 : 0;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x4f);
+		writeD(_partyDuel);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelReady.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelReady.java
new file mode 100644
index 00000000..94cebff0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelReady.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Duel Ready packet implementation.
+ * @author KenM
+ * @author Zoey76
+ */
+public class ExDuelReady extends L2GameServerPacket {
+	public static final ExDuelReady PLAYER_DUEL = new ExDuelReady(false);
+	public static final ExDuelReady PARTY_DUEL = new ExDuelReady(true);
+	
+	private final boolean _partyDuel;
+	
+	public ExDuelReady(boolean partyDuel) {
+		_partyDuel = partyDuel;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x4D);
+		
+		writeD(_partyDuel ? 1 : 0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelStart.java
new file mode 100644
index 00000000..d639417b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelStart.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Duel Start packet implementation.
+ * @author KenM
+ * @author Zoey76
+ */
+public class ExDuelStart extends L2GameServerPacket {
+	public static final ExDuelStart PLAYER_DUEL = new ExDuelStart(false);
+	public static final ExDuelStart PARTY_DUEL = new ExDuelStart(true);
+	
+	private final boolean _partyDuel;
+	
+	public ExDuelStart(boolean partyDuel) {
+		_partyDuel = partyDuel;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x4e);
+		
+		writeD(_partyDuel ? 1 : 0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
new file mode 100644
index 00000000..cf66c761
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExDuelUpdateUserInfo.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author KenM
+ */
+public class ExDuelUpdateUserInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	
+	public ExDuelUpdateUserInfo(L2PcInstance cha) {
+		_activeChar = cha;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x50);
+		writeS(_activeChar.getName());
+		writeD(_activeChar.getObjectId());
+		writeD(_activeChar.getClassId().getId());
+		writeD(_activeChar.getLevel());
+		writeD((int) _activeChar.getCurrentHp());
+		writeD(_activeChar.getMaxHp());
+		writeD((int) _activeChar.getCurrentMp());
+		writeD(_activeChar.getMaxMp());
+		writeD((int) _activeChar.getCurrentCp());
+		writeD(_activeChar.getMaxCp());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
new file mode 100644
index 00000000..779bf3d2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+
+public final class ExEnchantSkillInfo extends L2GameServerPacket {
+	private final List<Integer> _routes = new ArrayList<>(); // skill lvls for each route
+	
+	private final int _id;
+	private final int _lvl;
+	private boolean _maxEnchanted = false;
+	
+	public ExEnchantSkillInfo(int id, int lvl) {
+		_id = id;
+		_lvl = lvl;
+		
+		L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(_id);
+		// do we have this skill?
+		if (enchantLearn != null) {
+			// skill already enchanted?
+			if (_lvl > 100) {
+				_maxEnchanted = enchantLearn.isMaxEnchant(_lvl);
+				
+				// get detail for next level
+				EnchantSkillHolder esd = enchantLearn.getEnchantSkillHolder(_lvl);
+				
+				// if it exists add it
+				if (esd != null) {
+					_routes.add(_lvl); // current enchant add firts
+				}
+				
+				int skillLvL = (_lvl % 100);
+				
+				for (int route : enchantLearn.getAllRoutes()) {
+					if (((route * 100) + skillLvL) == _lvl) {
+						continue;
+					}
+					// add other levels of all routes - same lvl as enchanted
+					// lvl
+					_routes.add((route * 100) + skillLvL);
+				}
+				
+			} else
+			// not already enchanted
+			{
+				for (int route : enchantLearn.getAllRoutes()) {
+					// add first level (+1) of all routes
+					_routes.add((route * 100) + 1);
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x2a);
+		writeD(_id);
+		writeD(_lvl);
+		writeD(_maxEnchanted ? 0 : 1);
+		writeD(_lvl > 100 ? 1 : 0); // enchanted?
+		writeD(_routes.size());
+		
+		for (int level : _routes) {
+			writeD(level);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
new file mode 100644
index 00000000..869feb46
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfoDetail.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
+import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
+import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+
+/**
+ * @author KenM
+ */
+public class ExEnchantSkillInfoDetail extends L2GameServerPacket {
+	private static final int TYPE_NORMAL_ENCHANT = 0;
+	private static final int TYPE_SAFE_ENCHANT = 1;
+	private static final int TYPE_UNTRAIN_ENCHANT = 2;
+	private static final int TYPE_CHANGE_ENCHANT = 3;
+	
+	private int bookId = 0;
+	private int reqCount = 0;
+	private int multi = 1;
+	private final int _type;
+	private final int _skillid;
+	private final int _skilllvl;
+	private final int _chance;
+	private int _sp;
+	private final int _adenacount;
+	
+	public ExEnchantSkillInfoDetail(int type, int skillid, int skilllvl, L2PcInstance ply) {
+		
+		L2EnchantSkillLearn enchantLearn = EnchantSkillGroupsData.getInstance().getSkillEnchantmentBySkillId(skillid);
+		EnchantSkillHolder esd = null;
+		// do we have this skill?
+		if (enchantLearn != null) {
+			if (skilllvl > 100) {
+				esd = enchantLearn.getEnchantSkillHolder(skilllvl);
+			} else {
+				esd = enchantLearn.getFirstRouteGroup().getEnchantGroupDetails().get(0);
+			}
+		}
+		
+		if (esd == null) {
+			throw new IllegalArgumentException("Skill " + skillid + " dont have enchant data for level " + skilllvl);
+		}
+		
+		if (type == 0) {
+			multi = general().getNormalEnchantCostMultipiler();
+		} else if (type == 1) {
+			multi = general().getSafeEnchantCostMultipiler();
+		}
+		_chance = esd.getRate(ply);
+		_sp = esd.getSpCost();
+		if (type == TYPE_UNTRAIN_ENCHANT) {
+			_sp = (int) (0.8 * _sp);
+		}
+		_adenacount = esd.getAdenaCost() * multi;
+		_type = type;
+		_skillid = skillid;
+		_skilllvl = skilllvl;
+		
+		switch (type) {
+			case TYPE_NORMAL_ENCHANT:
+				bookId = EnchantSkillGroupsData.NORMAL_ENCHANT_BOOK;
+				reqCount = (((_skilllvl % 100) > 1) ? 0 : 1);
+				break;
+			case TYPE_SAFE_ENCHANT:
+				bookId = EnchantSkillGroupsData.SAFE_ENCHANT_BOOK;
+				reqCount = 1;
+				break;
+			case TYPE_UNTRAIN_ENCHANT:
+				bookId = EnchantSkillGroupsData.UNTRAIN_ENCHANT_BOOK;
+				reqCount = 1;
+				break;
+			case TYPE_CHANGE_ENCHANT:
+				bookId = EnchantSkillGroupsData.CHANGE_ENCHANT_BOOK;
+				reqCount = 1;
+				break;
+			default:
+				return;
+		}
+		
+		if ((type != TYPE_SAFE_ENCHANT) && !character().enchantSkillSpBookNeeded()) {
+			reqCount = 0;
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x5E);
+		
+		writeD(_type);
+		writeD(_skillid);
+		writeD(_skilllvl);
+		writeD(_sp * multi); // sp
+		writeD(_chance); // exp
+		writeD(0x02); // items count?
+		writeD(Inventory.ADENA_ID); // Adena
+		writeD(_adenacount); // Adena count
+		writeD(bookId); // ItemId Required
+		writeD(reqCount);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java
new file mode 100644
index 00000000..d068738e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExEnchantSkillList extends L2GameServerPacket {
+	public enum EnchantSkillType {
+		NORMAL,
+		SAFE,
+		UNTRAIN,
+		CHANGE_ROUTE,
+	}
+	
+	private final EnchantSkillType _type;
+	private final List<Skill> _skills;
+	
+	static class Skill {
+		public int id;
+		public int nextLevel;
+		
+		Skill(int pId, int pNextLevel) {
+			id = pId;
+			nextLevel = pNextLevel;
+		}
+	}
+	
+	public void addSkill(int id, int level) {
+		_skills.add(new Skill(id, level));
+	}
+	
+	public ExEnchantSkillList(EnchantSkillType type) {
+		_type = type;
+		_skills = new ArrayList<>();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x29);
+		
+		writeD(_type.ordinal());
+		writeD(_skills.size());
+		for (Skill sk : _skills) {
+			writeD(sk.id);
+			writeD(sk.nextLevel);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillResult.java
new file mode 100644
index 00000000..a01e9b80
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillResult.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author JIV
+ */
+public class ExEnchantSkillResult extends L2GameServerPacket {
+	private static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true);
+	private static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false);
+	
+	public static ExEnchantSkillResult valueOf(boolean result) {
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
+	private final boolean _enchanted;
+	
+	public ExEnchantSkillResult(boolean enchanted) {
+		_enchanted = enchanted;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xA7);
+		writeD(_enchanted ? 1 : 0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchFirecracker.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchFirecracker.java
new file mode 100644
index 00000000..95c622db
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchFirecracker.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public class ExEventMatchFirecracker extends L2GameServerPacket {
+	private final int _objectId;
+	
+	public ExEventMatchFirecracker(int objectId) {
+		_objectId = objectId;
+	}
+	
+	public ExEventMatchFirecracker(L2Object object) {
+		this(object.getObjectId());
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x05);
+		
+		writeD(_objectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchGMTest.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchGMTest.java
new file mode 100644
index 00000000..da8062b9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchGMTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public class ExEventMatchGMTest extends L2GameServerPacket {
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x07);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchMessage.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchMessage.java
new file mode 100644
index 00000000..2f037136
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExEventMatchMessage.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author janiii
+ * @author HorridoJoho
+ * @since 2.6.3.0
+ */
+public class ExEventMatchMessage extends L2GameServerPacket {
+	enum MessageType {
+		STRING,
+		STATIC_FINISH,
+		STATIC_START,
+		STATIC_GAME_OVER,
+		STATIC_1,
+		STATIC_2,
+		STATIC_3,
+		STATIC_4,
+		STATIC_5
+	}
+	
+	public static final ExEventMatchMessage STATIC_FINISH_PACKET = new ExEventMatchMessage(MessageType.STATIC_FINISH);
+	public static final ExEventMatchMessage STATIC_START_PACKET = new ExEventMatchMessage(MessageType.STATIC_START);
+	public static final ExEventMatchMessage STATIC_GAME_OVER_PACKET = new ExEventMatchMessage(MessageType.STATIC_GAME_OVER);
+	public static final ExEventMatchMessage STATIC_1_PACKET = new ExEventMatchMessage(MessageType.STATIC_1);
+	public static final ExEventMatchMessage STATIC_2_PACKET = new ExEventMatchMessage(MessageType.STATIC_2);
+	public static final ExEventMatchMessage STATIC_3_PACKET = new ExEventMatchMessage(MessageType.STATIC_3);
+	public static final ExEventMatchMessage STATIC_4_PACKET = new ExEventMatchMessage(MessageType.STATIC_4);
+	public static final ExEventMatchMessage STATIC_5_PACKET = new ExEventMatchMessage(MessageType.STATIC_5);
+	
+	private final MessageType _type;
+	private final String _message;
+	
+	/**
+	 * @param message Text to display.
+	 */
+	public ExEventMatchMessage(String message) {
+		_type = MessageType.STRING;
+		_message = message;
+	}
+	
+	private ExEventMatchMessage(MessageType type) {
+		_type = type;
+		_message = null;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x0F);
+		
+		writeC(_type.ordinal());
+		if (_type == MessageType.STRING) {
+			writeS(_message);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingEnd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingEnd.java
new file mode 100644
index 00000000..19ac6645
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingEnd.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author -Wooden-
+ */
+public class ExFishingEnd extends L2GameServerPacket {
+	private final boolean _win;
+	private final L2Character _activeChar;
+	
+	public ExFishingEnd(boolean win, L2PcInstance character) {
+		_win = win;
+		_activeChar = character;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x1F);
+		writeD(_activeChar.getObjectId());
+		writeC(_win ? 1 : 0);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingHpRegen.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingHpRegen.java
new file mode 100644
index 00000000..02509dbe
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingHpRegen.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author -Wooden-
+ */
+public class ExFishingHpRegen extends L2GameServerPacket {
+	private final L2Character _activeChar;
+	private final int _time, _fishHP, _hpMode, _anim, _goodUse, _penalty, _hpBarColor;
+	
+	public ExFishingHpRegen(L2Character character, int time, int fishHP, int HPmode, int GoodUse, int anim, int penalty, int hpBarColor) {
+		_activeChar = character;
+		_time = time;
+		_fishHP = fishHP;
+		_hpMode = HPmode;
+		_goodUse = GoodUse;
+		_anim = anim;
+		_penalty = penalty;
+		_hpBarColor = hpBarColor;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x28);
+		
+		writeD(_activeChar.getObjectId());
+		writeD(_time);
+		writeD(_fishHP);
+		writeC(_hpMode); // 0 = HP stop, 1 = HP raise
+		writeC(_goodUse); // 0 = none, 1 = success, 2 = failed
+		writeC(_anim); // Anim: 0 = none, 1 = reeling, 2 = pumping
+		writeD(_penalty); // Penalty
+		writeC(_hpBarColor); // 0 = normal hp bar, 1 = purple hp bar
+		
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStart.java
new file mode 100644
index 00000000..2525570e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStart.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author -Wooden-
+ */
+public class ExFishingStart extends L2GameServerPacket {
+	private final L2Character _activeChar;
+	private final int _x, _y, _z, _fishType;
+	private final boolean _isNightLure;
+	
+	public ExFishingStart(L2Character character, int fishType, int x, int y, int z, boolean isNightLure) {
+		_activeChar = character;
+		_fishType = fishType;
+		_x = x;
+		_y = y;
+		_z = z;
+		_isNightLure = isNightLure;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x1E);
+		writeD(_activeChar.getObjectId());
+		writeD(_fishType); // fish type
+		writeD(_x); // x position
+		writeD(_y); // y position
+		writeD(_z); // z position
+		writeC(_isNightLure ? 0x01 : 0x00); // night lure
+		writeC(0x00); // show fish rank result button
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStartCombat.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStartCombat.java
new file mode 100644
index 00000000..fb0e1c6e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExFishingStartCombat.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author -Wooden-
+ */
+public class ExFishingStartCombat extends L2GameServerPacket {
+	private final L2Character _activeChar;
+	private final int _time, _hp;
+	private final int _lureType, _deceptiveMode, _mode;
+	
+	public ExFishingStartCombat(L2Character character, int time, int hp, int mode, int lureType, int deceptiveMode) {
+		_activeChar = character;
+		_time = time;
+		_hp = hp;
+		_mode = mode;
+		_lureType = lureType;
+		_deceptiveMode = deceptiveMode;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x27);
+		
+		writeD(_activeChar.getObjectId());
+		writeD(_time);
+		writeD(_hp);
+		writeC(_mode); // mode: 0 = resting, 1 = fighting
+		writeC(_lureType); // 0 = newbie lure, 1 = normal lure, 2 = night lure
+		writeC(_deceptiveMode); // Fish Deceptive Mode: 0 = no, 1 = yes
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
new file mode 100644
index 00000000..3b029c75
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetBookMarkInfoPacket.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.TeleportBookmark;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author ShanSoft
+ */
+public class ExGetBookMarkInfoPacket extends L2GameServerPacket {
+	private final L2PcInstance player;
+	
+	public ExGetBookMarkInfoPacket(L2PcInstance cha) {
+		player = cha;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x84);
+		writeD(0x00); // Dummy
+		writeD(player.getBookmarkslot());
+		writeD(player.getTeleportBookmarks().size());
+		
+		for (TeleportBookmark tpbm : player.getTeleportBookmarks()) {
+			writeD(tpbm.getId());
+			writeD(tpbm.getX());
+			writeD(tpbm.getY());
+			writeD(tpbm.getZ());
+			writeS(tpbm.getName());
+			writeD(tpbm.getIcon());
+			writeS(tpbm.getTag());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetBossRecord.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetBossRecord.java
new file mode 100644
index 00000000..0b556de0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetBossRecord.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+
+/**
+ * @author KenM
+ */
+public class ExGetBossRecord extends L2GameServerPacket {
+	private final Map<Integer, Integer> _bossRecordInfo;
+	private final int _ranking;
+	private final int _totalPoints;
+	
+	public ExGetBossRecord(int ranking, int totalScore, Map<Integer, Integer> list) {
+		_ranking = ranking;
+		_totalPoints = totalScore;
+		_bossRecordInfo = list;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x34);
+		writeD(_ranking);
+		writeD(_totalPoints);
+		if (_bossRecordInfo == null) {
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+			writeD(0x00);
+		} else {
+			writeD(_bossRecordInfo.size()); // list size
+			for (int bossId : _bossRecordInfo.keySet()) {
+				writeD(bossId);
+				writeD(_bossRecordInfo.get(bossId));
+				writeD(0x00); // ??
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetOffAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetOffAirShip.java
new file mode 100644
index 00000000..98cc161e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetOffAirShip.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class ExGetOffAirShip extends L2GameServerPacket {
+	private final int _playerId, _airShipId, _x, _y, _z;
+	
+	public ExGetOffAirShip(L2Character player, L2Character ship, int x, int y, int z) {
+		_playerId = player.getObjectId();
+		_airShipId = ship.getObjectId();
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x64);
+		
+		writeD(_playerId);
+		writeD(_airShipId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetOnAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetOnAirShip.java
new file mode 100644
index 00000000..c78c6d3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetOnAirShip.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class ExGetOnAirShip extends L2GameServerPacket {
+	private final int _playerId, _airShipId;
+	private final Location _pos;
+	
+	public ExGetOnAirShip(L2PcInstance player, L2Character ship) {
+		_playerId = player.getObjectId();
+		_airShipId = ship.getObjectId();
+		_pos = player.getInVehiclePosition();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x63);
+		
+		writeD(_playerId);
+		writeD(_airShipId);
+		writeD(_pos.getX());
+		writeD(_pos.getY());
+		writeD(_pos.getZ());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java
new file mode 100644
index 00000000..1b012d13
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExGetPremiumItemList.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map.Entry;
+
+import com.l2jserver.gameserver.model.L2PremiumItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public class ExGetPremiumItemList extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	
+	public ExGetPremiumItemList(L2PcInstance activeChar) {
+		_activeChar = activeChar;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x86);
+		writeD(_activeChar.getPremiumItemList().size());
+		for (Entry<Integer, L2PremiumItem> entry : _activeChar.getPremiumItemList().entrySet()) {
+			L2PremiumItem item = entry.getValue();
+			writeD(entry.getKey());
+			writeD(_activeChar.getObjectId());
+			writeD(item.getItemId());
+			writeQ(item.getCount());
+			writeD(0x00); // ?
+			writeS(item.getSender());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java
new file mode 100644
index 00000000..d420cbef
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExHeroList.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.entity.Hero;
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+
+/**
+ * @author -Wooden-
+ * @author KenM
+ * @author godson
+ */
+public class ExHeroList extends L2GameServerPacket {
+	private final Map<Integer, StatsSet> _heroList;
+	
+	public ExHeroList() {
+		_heroList = Hero.getInstance().getHeroes();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x79);
+		writeD(_heroList.size());
+		
+		for (Integer heroId : _heroList.keySet()) {
+			StatsSet hero = _heroList.get(heroId);
+			writeS(hero.getString(Olympiad.CHAR_NAME));
+			writeD(hero.getInt(Olympiad.CLASS_ID));
+			writeS(hero.getString(Hero.CLAN_NAME, ""));
+			writeD(hero.getInt(Hero.CLAN_CREST, 0));
+			writeS(hero.getString(Hero.ALLY_NAME, ""));
+			writeD(hero.getInt(Hero.ALLY_CREST, 0));
+			writeD(hero.getInt(Hero.COUNT));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
new file mode 100644
index 00000000..8257e50a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExItemAuctionInfoPacket.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.itemauction.ItemAuction;
+import com.l2jserver.gameserver.model.itemauction.ItemAuctionBid;
+import com.l2jserver.gameserver.model.itemauction.ItemAuctionState;
+
+/**
+ * @author Forsaiken
+ */
+public final class ExItemAuctionInfoPacket extends AbstractItemPacket {
+	private final boolean _refresh;
+	private final int _timeRemaining;
+	private final ItemAuction _currentAuction;
+	private final ItemAuction _nextAuction;
+	
+	public ExItemAuctionInfoPacket(final boolean refresh, final ItemAuction currentAuction, final ItemAuction nextAuction) {
+		if (currentAuction == null) {
+			throw new NullPointerException();
+		}
+		
+		if (currentAuction.getAuctionState() != ItemAuctionState.STARTED) {
+			_timeRemaining = 0;
+		} else {
+			_timeRemaining = (int) (currentAuction.getFinishingTimeRemaining() / 1000); // in seconds
+		}
+		
+		_refresh = refresh;
+		_currentAuction = currentAuction;
+		_nextAuction = nextAuction;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x68);
+		writeC(_refresh ? 0x00 : 0x01);
+		writeD(_currentAuction.getInstanceId());
+		
+		final ItemAuctionBid highestBid = _currentAuction.getHighestBid();
+		writeQ(highestBid != null ? highestBid.getLastBid() : _currentAuction.getAuctionInitBid());
+		
+		writeD(_timeRemaining);
+		writeItem(_currentAuction.getItemInfo());
+		
+		if (_nextAuction != null) {
+			writeQ(_nextAuction.getAuctionInitBid());
+			writeD((int) (_nextAuction.getStartingTime() / 1000)); // unix time in seconds
+			writeItem(_nextAuction.getItemInfo());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
new file mode 100644
index 00000000..ae38739d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExListPartyMatchingWaitingRoom.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.MapRegionManager;
+import com.l2jserver.gameserver.model.PartyMatchWaitingList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * ExListPartyMatchingWaitingRoom server packet.
+ * @author Zoey76
+ */
+public class ExListPartyMatchingWaitingRoom extends L2GameServerPacket {
+	
+	// Maximum size supported by client 500.
+	private static final int TOTAL = 64;
+	
+	private final int totalMatchingPlayers;
+	
+	private final List<L2PcInstance> players;
+	
+	public ExListPartyMatchingWaitingRoom(int page, int minLevel, int maxLevel, Set<Integer> classes, String filter) {
+		final var matchingPlayers = PartyMatchWaitingList.getInstance().findPlayers(minLevel, maxLevel, classes, filter);
+		totalMatchingPlayers = matchingPlayers.size();
+		players = matchingPlayers.stream() //
+			.skip((page - 1) * TOTAL) //
+			.limit(page * TOTAL) //
+			.collect(Collectors.toList());
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x36);
+		writeD(totalMatchingPlayers);
+		writeD(players.size());
+		for (L2PcInstance player : players) {
+			writeS(player.getName());
+			writeD(player.getActiveClass());
+			writeD(player.getLevel());
+			writeD(MapRegionManager.getInstance().getMapRegion(player).getBbs());
+			final var instances = InstanceManager.getInstance().getAllInstanceTimes(player.getObjectId());
+			writeD(instances.size());
+			for (var id : instances.keySet()) {
+				writeD(id);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
new file mode 100644
index 00000000..a1c0cb07
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCPartyInfoUpdate.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+
+/**
+ * @author chris_00
+ */
+public class ExMPCCPartyInfoUpdate extends L2GameServerPacket {
+	private final int _mode, _LeaderOID, _memberCount;
+	private final String _name;
+	
+	/**
+	 * @param party
+	 * @param mode 0 = Remove, 1 = Add
+	 */
+	public ExMPCCPartyInfoUpdate(L2Party party, int mode) {
+		_name = party.getLeader().getName();
+		_LeaderOID = party.getLeaderObjectId();
+		_memberCount = party.getMemberCount();
+		_mode = mode;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x5B);
+		writeS(_name);
+		writeD(_LeaderOID);
+		writeD(_memberCount);
+		writeD(_mode); // mode 0 = Remove Party, 1 = AddParty, maybe more...
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
new file mode 100644
index 00000000..82cc7ef6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMPCCShowPartyMemberInfo.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author chris_00
+ */
+public class ExMPCCShowPartyMemberInfo extends L2GameServerPacket {
+	private final L2Party _party;
+	
+	public ExMPCCShowPartyMemberInfo(L2Party party) {
+		_party = party;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x4B);
+		writeD(_party.getMemberCount());
+		for (L2PcInstance pc : _party.getMembers()) {
+			writeS(pc.getName());
+			writeD(pc.getObjectId());
+			writeD(pc.getClassId().getId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMailArrived.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMailArrived.java
new file mode 100644
index 00000000..b63c86b4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMailArrived.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * (just a trigger)
+ * @author -Wooden-
+ */
+public class ExMailArrived extends L2GameServerPacket {
+	public static final ExMailArrived STATIC_PACKET = new ExMailArrived();
+	
+	private ExMailArrived() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x2E);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java
new file mode 100644
index 00000000..8d9ad5fa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExManagePartyRoomMember.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Mode:
+ * <ul>
+ * <li>0 - add</li>
+ * <li>1 - modify</li>
+ * <li>2 - quit</li>
+ * </ul>
+ * @author Gnacik
+ */
+public class ExManagePartyRoomMember extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final PartyMatchRoom _room;
+	private final int _mode;
+	
+	public ExManagePartyRoomMember(L2PcInstance player, PartyMatchRoom room, int mode) {
+		_activeChar = player;
+		_room = room;
+		_mode = mode;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x0A);
+		writeD(_mode);
+		writeD(_activeChar.getObjectId());
+		writeS(_activeChar.getName());
+		writeD(_activeChar.getActiveClass());
+		writeD(_activeChar.getLevel());
+		writeD(_room.getLocation());
+		if (_room.getOwner().equals(_activeChar)) {
+			writeD(1);
+		} else {
+			if ((_room.getOwner().isInParty() && _activeChar.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == _activeChar.getParty().getLeaderObjectId())) {
+				writeD(0x02);
+			} else {
+				writeD(0x00);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMoveToLocationAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
new file mode 100644
index 00000000..821d0ad6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMoveToLocationAirShip.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class ExMoveToLocationAirShip extends L2GameServerPacket {
+	private final int _objId, _tx, _ty, _tz, _x, _y, _z;
+	
+	public ExMoveToLocationAirShip(L2Character cha) {
+		_objId = cha.getObjectId();
+		_tx = cha.getXdestination();
+		_ty = cha.getYdestination();
+		_tz = cha.getZdestination();
+		_x = cha.getX();
+		_y = cha.getY();
+		_z = cha.getZ();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x65);
+		
+		writeD(_objId);
+		writeD(_tx);
+		writeD(_ty);
+		writeD(_tz);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
new file mode 100644
index 00000000..3de15052
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMoveToLocationInAirShip.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class ExMoveToLocationInAirShip extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _airShipId;
+	private final Location _destination;
+	private final int _heading;
+	
+	public ExMoveToLocationInAirShip(L2PcInstance player) {
+		_charObjId = player.getObjectId();
+		_airShipId = player.getAirShip().getObjectId();
+		_destination = player.getInVehiclePosition();
+		_heading = player.getHeading();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x6D);
+		writeD(_charObjId);
+		writeD(_airShipId);
+		writeD(_destination.getX());
+		writeD(_destination.getY());
+		writeD(_destination.getZ());
+		writeD(_heading);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
new file mode 100644
index 00000000..36a99d61
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExMultiPartyCommandChannelInfo.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2CommandChannel;
+import com.l2jserver.gameserver.model.L2Party;
+
+/**
+ * @author chris_00
+ */
+public class ExMultiPartyCommandChannelInfo extends L2GameServerPacket {
+	private final L2CommandChannel _channel;
+	
+	public ExMultiPartyCommandChannelInfo(L2CommandChannel channel) {
+		_channel = channel;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		if (_channel == null) {
+			return;
+		}
+		
+		writeC(0xFE);
+		writeH(0x31);
+		
+		writeS(_channel.getLeader().getName());
+		writeD(0x00); // Channel loot 0 or 1
+		writeD(_channel.getMemberCount());
+		
+		writeD(_channel.getParties().size());
+		for (L2Party p : _channel.getParties()) {
+			writeS(p.getLeader().getName());
+			writeD(p.getLeaderObjectId());
+			writeD(p.getMemberCount());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNeedToChangeName.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNeedToChangeName.java
new file mode 100644
index 00000000..8e3a620e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNeedToChangeName.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Dialog with input field<br>
+ * type 0 = char name (Selection screen)<br>
+ * type 1 = clan name
+ * @author JIV
+ */
+public class ExNeedToChangeName extends L2GameServerPacket {
+	private final int _type, _subType;
+	private final String _name;
+	
+	public ExNeedToChangeName(int type, int subType, String name) {
+		_type = type;
+		_subType = subType;
+		_name = name;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x69);
+		writeD(_type);
+		writeD(_subType);
+		writeS(_name);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java
new file mode 100644
index 00000000..691961f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventEffect.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mochitto
+ */
+public class ExNevitAdventEffect extends L2GameServerPacket {
+	private final int _timeLeft;
+	
+	public ExNevitAdventEffect(int timeLeft) {
+		_timeLeft = timeLeft;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xE0);
+		writeD(_timeLeft);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
new file mode 100644
index 00000000..492f8d36
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventPointInfoPacket.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author mochitto
+ */
+public class ExNevitAdventPointInfoPacket extends L2GameServerPacket {
+	private final int _points;
+	
+	public ExNevitAdventPointInfoPacket(int points) {
+		_points = points;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xDF);
+		writeD(_points); // 72 = 1%, max 7200 = 100%
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
new file mode 100644
index 00000000..f9d3de76
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNevitAdventTimeChange.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.hunting;
+
+/**
+ * @author mochitto
+ */
+public class ExNevitAdventTimeChange extends L2GameServerPacket {
+	private final boolean _paused;
+	private final int _time;
+	
+	public ExNevitAdventTimeChange(int time, boolean paused) {
+		_time = Math.min(time, hunting().getHuntingBonusMaxTime());
+		_paused = paused;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xE1);
+		if (_paused && (_time == hunting().getHuntingBonusMaxTime())) {
+			writeD(0x02); // Quit
+		} else {
+			writeC(_paused ? 0x00 : 0x01); // 0=Paused - 1=Started
+		}
+		writeD(_time); // if state get max time is automatically changed to quit
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostArrived.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostArrived.java
new file mode 100644
index 00000000..d459afd0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostArrived.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Migi
+ */
+public class ExNoticePostArrived extends L2GameServerPacket {
+	private static final ExNoticePostArrived STATIC_PACKET_TRUE = new ExNoticePostArrived(true);
+	private static final ExNoticePostArrived STATIC_PACKET_FALSE = new ExNoticePostArrived(false);
+	
+	public static ExNoticePostArrived valueOf(boolean result) {
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
+	private final boolean _showAnim;
+	
+	public ExNoticePostArrived(boolean showAnimation) {
+		_showAnim = showAnimation;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xA9);
+		writeD(_showAnim ? 0x01 : 0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostSent.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostSent.java
new file mode 100644
index 00000000..da6e5590
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostSent.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Migi
+ */
+public class ExNoticePostSent extends L2GameServerPacket {
+	private static final ExNoticePostSent STATIC_PACKET_TRUE = new ExNoticePostSent(true);
+	private static final ExNoticePostSent STATIC_PACKET_FALSE = new ExNoticePostSent(false);
+	
+	public static ExNoticePostSent valueOf(boolean result) {
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
+	private final boolean _showAnim;
+	
+	public ExNoticePostSent(boolean showAnimation) {
+		_showAnim = showAnimation;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0xb4);
+		writeD(_showAnim ? 0x01 : 0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNotifyPremiumItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNotifyPremiumItem.java
new file mode 100644
index 00000000..7a716886
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExNotifyPremiumItem.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Gnacik
+ */
+public class ExNotifyPremiumItem extends L2GameServerPacket {
+	public static final ExNotifyPremiumItem STATIC_PACKET = new ExNotifyPremiumItem();
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x85);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchEnd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
new file mode 100644
index 00000000..63a363f1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchEnd.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author GodKratos
+ */
+public class ExOlympiadMatchEnd extends L2GameServerPacket {
+	public static final ExOlympiadMatchEnd STATIC_PACKET = new ExOlympiadMatchEnd();
+	
+	private ExOlympiadMatchEnd() {
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x2D);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java
new file mode 100644
index 00000000..3728ba91
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchList.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.olympiad.AbstractOlympiadGame;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameClassed;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameManager;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameNonClassed;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameTask;
+import com.l2jserver.gameserver.model.olympiad.OlympiadGameTeams;
+
+/**
+ * @author mrTJO
+ */
+public class ExOlympiadMatchList extends L2GameServerPacket {
+	private final List<OlympiadGameTask> _games = new ArrayList<>();
+	
+	public ExOlympiadMatchList() {
+		OlympiadGameTask task;
+		for (int i = 0; i < OlympiadGameManager.getInstance().getNumberOfStadiums(); i++) {
+			task = OlympiadGameManager.getInstance().getOlympiadTask(i);
+			if (task != null) {
+				if (!task.isGameStarted() || task.isBattleFinished()) {
+					continue; // initial or finished state not shown
+				}
+				_games.add(task);
+			}
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0xD4);
+		writeD(0x00); // Type 0 = Match List, 1 = Match Result
+		
+		writeD(_games.size());
+		writeD(0x00);
+		
+		for (OlympiadGameTask curGame : _games) {
+			AbstractOlympiadGame game = curGame.getGame();
+			if (game != null) {
+				writeD(game.getStadiumId()); // Stadium Id (Arena 1 = 0)
+				
+				if (game instanceof OlympiadGameNonClassed) {
+					writeD(1);
+				} else if (game instanceof OlympiadGameClassed) {
+					writeD(2);
+				} else if (game instanceof OlympiadGameTeams) {
+					writeD(-1);
+				} else {
+					writeD(0);
+				}
+				
+				writeD(curGame.isRunning() ? 0x02 : 0x01); // (1 = Standby, 2 = Playing)
+				writeS(game.getPlayerNames()[0]); // Player 1 Name
+				writeS(game.getPlayerNames()[1]); // Player 2 Name
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchResult.java
new file mode 100644
index 00000000..7f0c74cf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMatchResult.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.olympiad.OlympiadInfo;
+
+/**
+ * @author JIV
+ */
+public class ExOlympiadMatchResult extends L2GameServerPacket {
+	private final boolean _tie;
+	private int _winTeam; // 1,2
+	private int _loseTeam = 2;
+	private final List<OlympiadInfo> _winnerList;
+	private final List<OlympiadInfo> _loserList;
+	
+	public ExOlympiadMatchResult(boolean tie, int winTeam, List<OlympiadInfo> winnerList, List<OlympiadInfo> loserList) {
+		_tie = tie;
+		_winTeam = winTeam;
+		_winnerList = winnerList;
+		_loserList = loserList;
+		
+		if (_winTeam == 2) {
+			_loseTeam = 1;
+		} else if (_winTeam == 0) {
+			_winTeam = 1;
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xD4);
+		writeD(0x01); // Type 0 = Match List, 1 = Match Result
+		
+		writeD(_tie ? 1 : 0); // 0 - win, 1 - tie
+		writeS(_winnerList.get(0).getName());
+		writeD(_winTeam);
+		writeD(_winnerList.size());
+		for (OlympiadInfo info : _winnerList) {
+			writeS(info.getName());
+			writeS(info.getClanName());
+			writeD(info.getClanId());
+			writeD(info.getClassId());
+			writeD(info.getDamage());
+			writeD(info.getCurrentPoints());
+			writeD(info.getDiffPoints());
+		}
+		
+		writeD(_loseTeam);
+		writeD(_loserList.size());
+		for (OlympiadInfo info : _loserList) {
+			writeS(info.getName());
+			writeS(info.getClanName());
+			writeD(info.getClanId());
+			writeD(info.getClassId());
+			writeD(info.getDamage());
+			writeD(info.getCurrentPoints());
+			writeD(info.getDiffPoints());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMode.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMode.java
new file mode 100644
index 00000000..682a45dd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadMode.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author godson
+ */
+public class ExOlympiadMode extends L2GameServerPacket {
+	private final int _mode;
+	
+	/**
+	 * @param mode (0 = return, 3 = spectate)
+	 */
+	public ExOlympiadMode(int mode) {
+		_mode = mode;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x7C);
+		writeC(_mode);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
new file mode 100644
index 00000000..25586a81
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadSpelledInfo.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+/**
+ * @author godson
+ */
+public class ExOlympiadSpelledInfo extends L2GameServerPacket {
+	private final int _playerId;
+	private final List<BuffInfo> _effects = new ArrayList<>();
+	
+	public ExOlympiadSpelledInfo(L2PcInstance player) {
+		_playerId = player.getObjectId();
+	}
+	
+	public void addSkill(BuffInfo info) {
+		_effects.add(info);
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x7B);
+		writeD(_playerId);
+		writeD(_effects.size());
+		for (BuffInfo info : _effects) {
+			if ((info != null) && info.isInUse()) {
+				writeD(info.getSkill().getDisplayId());
+				writeH(info.getSkill().getDisplayLevel());
+				writeD(info.getTime());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java
new file mode 100644
index 00000000..a7d69402
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOlympiadUserInfo.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.olympiad.Participant;
+
+/**
+ * @author godson
+ */
+public class ExOlympiadUserInfo extends L2GameServerPacket {
+	private final L2PcInstance _player;
+	private Participant _par = null;
+	private final int _curHp;
+	private final int _maxHp;
+	private final int _curCp;
+	private final int _maxCp;
+	
+	public ExOlympiadUserInfo(L2PcInstance player) {
+		_player = player;
+		if (_player != null) {
+			_curHp = (int) _player.getCurrentHp();
+			_maxHp = _player.getMaxHp();
+			_curCp = (int) _player.getCurrentCp();
+			_maxCp = _player.getMaxCp();
+		} else {
+			_curHp = 0;
+			_maxHp = 100;
+			_curCp = 0;
+			_maxCp = 100;
+		}
+	}
+	
+	public ExOlympiadUserInfo(Participant par) {
+		_par = par;
+		_player = par.getPlayer();
+		if (_player != null) {
+			_curHp = (int) _player.getCurrentHp();
+			_maxHp = _player.getMaxHp();
+			_curCp = (int) _player.getCurrentCp();
+			_maxCp = _player.getMaxCp();
+		} else {
+			_curHp = 0;
+			_maxHp = 100;
+			_curCp = 0;
+			_maxCp = 100;
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x7A);
+		if (_player != null) {
+			writeC(_player.getOlympiadSide());
+			writeD(_player.getObjectId());
+			writeS(_player.getName());
+			writeD(_player.getClassId().getId());
+		} else {
+			writeC(_par.getSide());
+			writeD(_par.getObjectId());
+			writeS(_par.getName());
+			writeD(_par.getBaseClass());
+		}
+		
+		writeD(_curHp);
+		writeD(_maxHp);
+		writeD(_curCp);
+		writeD(_maxCp);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOpenMPCC.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOpenMPCC.java
new file mode 100644
index 00000000..87ab40c4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExOpenMPCC.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Opens the Command Channel Information window.
+ * @author chris_00
+ */
+public class ExOpenMPCC extends L2GameServerPacket {
+	public static final ExOpenMPCC STATIC_PACKET = new ExOpenMPCC();
+	
+	private ExOpenMPCC() {
+		// Do nothing.
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x12);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPCCafePointInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPCCafePointInfo.java
new file mode 100644
index 00000000..3bb7b5df
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPCCafePointInfo.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ * @author UnAfraid
+ */
+public class ExPCCafePointInfo extends L2GameServerPacket {
+	private final int _points;
+	private final int _mAddPoint;
+	private final int _mPeriodType;
+	private final int _remainTime;
+	private final int _pointType;
+	private final int _time;
+	
+	public ExPCCafePointInfo() {
+		_points = 0;
+		_mAddPoint = 0;
+		_remainTime = 0;
+		_mPeriodType = 0;
+		_pointType = 0;
+		_time = 0;
+	}
+	
+	public ExPCCafePointInfo(int points, int pointsToAdd, int time) {
+		_points = points;
+		_mAddPoint = pointsToAdd;
+		_mPeriodType = 1;
+		_remainTime = 42; // No idea why but retail sends 42..
+		_pointType = pointsToAdd < 0 ? 3 : 0; // When using points is 3
+		_time = time;
+		
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x32);
+		writeD(_points); // num points
+		writeD(_mAddPoint); // points inc display
+		writeC(_mPeriodType); // period(0=don't show window,1=acquisition,2=use points)
+		writeD(_remainTime); // period hours left
+		writeC(_pointType); // points inc display color(0=yellow, 1=cyan-blue, 2=red, all other black)
+		writeD(_time * 3); // value is in seconds * 3
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
new file mode 100644
index 00000000..88d5700c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowAdd.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+/**
+ * @author KenM
+ */
+public final class ExPartyPetWindowAdd extends L2GameServerPacket {
+	private final L2Summon _summon;
+	
+	public ExPartyPetWindowAdd(L2Summon summon) {
+		_summon = summon;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x18);
+		writeD(_summon.getObjectId());
+		writeD(_summon.getTemplate().getDisplayId() + 1000000);
+		writeD(_summon.getSummonType());
+		writeD(_summon.getOwner().getObjectId());
+		writeS(_summon.getName());
+		writeD((int) _summon.getCurrentHp());
+		writeD(_summon.getMaxHp());
+		writeD((int) _summon.getCurrentMp());
+		writeD(_summon.getMaxMp());
+		writeD(_summon.getLevel());
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowDelete.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
new file mode 100644
index 00000000..8dfcbfa3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowDelete.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+/**
+ * @author KenM
+ */
+public class ExPartyPetWindowDelete extends L2GameServerPacket {
+	private final L2Summon _summon;
+	
+	public ExPartyPetWindowDelete(L2Summon summon) {
+		_summon = summon;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x6A);
+		writeD(_summon.getObjectId());
+		writeD(_summon.getOwner().getObjectId());
+		writeS(_summon.getName());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
new file mode 100644
index 00000000..a8f1f1d3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyPetWindowUpdate.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+/**
+ * @author KenM
+ */
+public class ExPartyPetWindowUpdate extends L2GameServerPacket {
+	private final L2Summon _summon;
+	
+	public ExPartyPetWindowUpdate(L2Summon summon) {
+		_summon = summon;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x19);
+		writeD(_summon.getObjectId());
+		writeD(_summon.getTemplate().getDisplayId() + 1000000);
+		writeD(_summon.getSummonType());
+		writeD(_summon.getOwner().getObjectId());
+		writeS(_summon.getName());
+		writeD((int) _summon.getCurrentHp());
+		writeD(_summon.getMaxHp());
+		writeD((int) _summon.getCurrentMp());
+		writeD(_summon.getMaxMp());
+		writeD(_summon.getLevel());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java
new file mode 100644
index 00000000..3d4eabfb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPartyRoomMember.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public class ExPartyRoomMember extends L2GameServerPacket {
+	private final PartyMatchRoom _room;
+	private final int _mode;
+	
+	public ExPartyRoomMember(L2PcInstance player, PartyMatchRoom room, int mode) {
+		_room = room;
+		_mode = mode;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x08);
+		writeD(_mode);
+		writeD(_room.getMembers());
+		for (L2PcInstance member : _room.getPartyMembers()) {
+			writeD(member.getObjectId());
+			writeS(member.getName());
+			writeD(member.getActiveClass());
+			writeD(member.getLevel());
+			writeD(_room.getLocation());
+			if (_room.getOwner().equals(member)) {
+				writeD(0x01);
+			} else {
+				if ((_room.getOwner().isInParty() && member.isInParty()) && (_room.getOwner().getParty().getLeaderObjectId() == member.getParty().getLeaderObjectId())) {
+					writeD(0x02);
+				} else {
+					writeD(0x00);
+				}
+			}
+			writeD(0x00); // TODO: Instance datas there is more if that is not 0!
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java
new file mode 100644
index 00000000..14eba39f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPlayScene.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author devScarlet
+ * @author mrTJO
+ */
+public class ExPlayScene extends L2GameServerPacket {
+	public static final ExPlayScene STATIC_PACKET = new ExPlayScene();
+	
+	private ExPlayScene() {
+		// Do nothing.
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x5C);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPledgeCrestLarge.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPledgeCrestLarge.java
new file mode 100644
index 00000000..28ef8f2a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPledgeCrestLarge.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.model.L2Crest;
+
+/**
+ * @author -Wooden-
+ */
+public class ExPledgeCrestLarge extends L2GameServerPacket {
+	private final int _crestId;
+	private final byte[] _data;
+	
+	public ExPledgeCrestLarge(int crestId) {
+		_crestId = crestId;
+		final L2Crest crest = CrestTable.getInstance().getCrest(crestId);
+		_data = crest != null ? crest.getData() : null;
+	}
+	
+	public ExPledgeCrestLarge(int crestId, byte[] data) {
+		_crestId = crestId;
+		_data = data;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x1B);
+		writeD(0x00);
+		writeD(_crestId);
+		if (_data != null) {
+			writeD(_data.length);
+			writeB(_data);
+		} else {
+			writeD(0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
new file mode 100644
index 00000000..648b85a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPrivateStoreSetWholeMsg.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author KenM
+ */
+public class ExPrivateStoreSetWholeMsg extends L2GameServerPacket {
+	private final int _objectId;
+	private final String _msg;
+	
+	public ExPrivateStoreSetWholeMsg(L2PcInstance player, String msg) {
+		_objectId = player.getObjectId();
+		_msg = msg;
+	}
+	
+	public ExPrivateStoreSetWholeMsg(L2PcInstance player) {
+		this(player, player.getSellList().getTitle());
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x80);
+		writeD(_objectId);
+		writeS(_msg);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
new file mode 100644
index 00000000..ba45104e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutCommissionResultForVariationMake.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExPutCommissionResultForVariationMake extends L2GameServerPacket {
+	private final int _gemstoneObjId;
+	private final int _itemId;
+	private final long _gemstoneCount;
+	private final int _unk1;
+	private final int _unk2;
+	private final int _unk3;
+	
+	public ExPutCommissionResultForVariationMake(int gemstoneObjId, long count, int itemId) {
+		_gemstoneObjId = gemstoneObjId;
+		_itemId = itemId;
+		_gemstoneCount = count;
+		_unk1 = 0;
+		_unk2 = 0;
+		_unk3 = 1;
+		
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x55);
+		writeD(_gemstoneObjId);
+		writeD(_itemId);
+		writeQ(_gemstoneCount);
+		writeD(_unk1);
+		writeD(_unk2);
+		writeD(_unk3);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
new file mode 100644
index 00000000..78fa032a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutEnchantSupportItemResult.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author nBd
+ */
+public class ExPutEnchantSupportItemResult extends L2GameServerPacket {
+	private final int _result;
+	
+	public ExPutEnchantSupportItemResult(int result) {
+		_result = result;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x82);
+		writeD(_result);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
new file mode 100644
index 00000000..a7d99da3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutEnchantTargetItemResult.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author nBd
+ */
+public class ExPutEnchantTargetItemResult extends L2GameServerPacket {
+	private final int _result;
+	
+	public ExPutEnchantTargetItemResult(int result) {
+		_result = result;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x81);
+		writeD(_result);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
new file mode 100644
index 00000000..146b3714
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutIntensiveResultForVariationMake.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExPutIntensiveResultForVariationMake extends L2GameServerPacket {
+	private final int _refinerItemObjId;
+	private final int _lifestoneItemId;
+	private final int _gemstoneItemId;
+	private final int _gemstoneCount;
+	private final int _unk2;
+	
+	public ExPutIntensiveResultForVariationMake(int refinerItemObjId, int lifeStoneId, int gemstoneItemId, int gemstoneCount) {
+		_refinerItemObjId = refinerItemObjId;
+		_lifestoneItemId = lifeStoneId;
+		_gemstoneItemId = gemstoneItemId;
+		_gemstoneCount = gemstoneCount;
+		_unk2 = 1;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x54);
+		writeD(_refinerItemObjId);
+		writeD(_lifestoneItemId);
+		writeD(_gemstoneItemId);
+		writeQ(_gemstoneCount);
+		writeD(_unk2);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
new file mode 100644
index 00000000..62ccc9c2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationCancel.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class ExPutItemResultForVariationCancel extends L2GameServerPacket {
+	private final int _itemObjId;
+	private final int _itemId;
+	private final int _itemAug1;
+	private final int _itemAug2;
+	private final int _price;
+	
+	public ExPutItemResultForVariationCancel(L2ItemInstance item, int price) {
+		_itemObjId = item.getObjectId();
+		_itemId = item.getDisplayId();
+		_price = price;
+		_itemAug1 = ((short) item.getAugmentation().getAugmentationId());
+		_itemAug2 = item.getAugmentation().getAugmentationId() >> 16;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x57);
+		writeD(_itemObjId);
+		writeD(_itemId);
+		writeD(_itemAug1);
+		writeD(_itemAug2);
+		writeQ(_price);
+		writeD(0x01);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
new file mode 100644
index 00000000..302a83da
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExPutItemResultForVariationMake.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExPutItemResultForVariationMake extends L2GameServerPacket {
+	private final int _itemObjId;
+	private final int _itemId;
+	
+	public ExPutItemResultForVariationMake(int itemObjId, int itemId) {
+		_itemObjId = itemObjId;
+		_itemId = itemId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x53);
+		writeD(_itemObjId);
+		writeD(_itemId);
+		writeD(0x01);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExQuestItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExQuestItemList.java
new file mode 100644
index 00000000..67d8ef77
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExQuestItemList.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author JIV
+ */
+public class ExQuestItemList extends AbstractItemPacket {
+	private final L2PcInstance _activeChar;
+	private final List<L2ItemInstance> _items = new ArrayList<>();
+	
+	public ExQuestItemList(L2PcInstance activeChar) {
+		_activeChar = activeChar;
+		for (L2ItemInstance item : activeChar.getInventory().getItems()) {
+			if (item.isQuestItem()) {
+				_items.add(item);
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xC6);
+		writeH(_items.size());
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+		}
+		writeInventoryBlock(_activeChar.getInventory());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
new file mode 100644
index 00000000..abd8c3f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author UnAfraid
+ */
+public class ExQuestNpcLogList extends L2GameServerPacket {
+	private final int _questId;
+	private final List<NpcHolder> _npcs = new ArrayList<>();
+	
+	public ExQuestNpcLogList(int questId) {
+		_questId = questId;
+	}
+	
+	public void addNpc(int npcId, int count) {
+		_npcs.add(new NpcHolder(npcId, 0, count));
+	}
+	
+	public void addNpc(int npcId, int unknown, int count) {
+		_npcs.add(new NpcHolder(npcId, unknown, count));
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xC5);
+		writeD(_questId);
+		writeC(_npcs.size());
+		for (NpcHolder holder : _npcs) {
+			writeD((holder.getNpcId() + 1000000));
+			writeC(holder.getUnknown());
+			writeD(holder.getCount());
+		}
+	}
+	
+	private static class NpcHolder {
+		private final int _npcId;
+		private final int _unknown;
+		private final int _count;
+		
+		public NpcHolder(int npcId, int unknown, int count) {
+			_npcId = npcId;
+			_unknown = unknown;
+			_count = count;
+		}
+		
+		public int getNpcId() {
+			return _npcId;
+		}
+		
+		public int getUnknown() {
+			return _unknown;
+		}
+		
+		public int getCount() {
+			return _count;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRedSky.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRedSky.java
new file mode 100644
index 00000000..56fd5240
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRedSky.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExRedSky extends L2GameServerPacket {
+	private final int _duration;
+	
+	public ExRedSky(int duration) {
+		_duration = duration;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x41);
+		writeD(_duration);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRegenMax.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRegenMax.java
new file mode 100644
index 00000000..23ee8014
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRegenMax.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExRegenMax extends L2GameServerPacket {
+	private final int _time;
+	private final int _tickInterval;
+	private final double _amountPerTick;
+	
+	public ExRegenMax(int time, int tickInterval, double amountPerTick) {
+		_time = time;
+		_tickInterval = tickInterval;
+		_amountPerTick = amountPerTick;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x01);
+		writeD(1);
+		writeD(_time);
+		writeD(_tickInterval);
+		writeF(_amountPerTick);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyDominionInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyDominionInfo.java
new file mode 100644
index 00000000..4849a92a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyDominionInfo.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
+
+/**
+ * @author JIV
+ */
+public class ExReplyDominionInfo extends L2GameServerPacket {
+	public static final ExReplyDominionInfo STATIC_PACKET = new ExReplyDominionInfo();
+	
+	private ExReplyDominionInfo() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x92);
+		List<Territory> territoryList = TerritoryWarManager.getInstance().getAllTerritories();
+		writeD(territoryList.size()); // Territory Count
+		for (Territory t : territoryList) {
+			writeD(t.getTerritoryId()); // Territory Id
+			writeS(CastleManager.getInstance().getCastleById(t.getCastleId()).getName().toLowerCase() + "_dominion"); // territory name
+			writeS(t.getOwnerClan().getName());
+			writeD(t.getOwnedWardIds().size()); // Emblem Count
+			for (int i : t.getOwnedWardIds()) {
+				writeD(i); // Emblem ID - should be in for loop for emblem count
+			}
+			writeD((int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000));
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyPostItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyPostItemList.java
new file mode 100644
index 00000000..3326bab9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyPostItemList.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+
+public class ExReplyPostItemList extends AbstractItemPacket {
+	L2PcInstance _activeChar;
+	private final L2ItemInstance[] _itemList;
+	
+	public ExReplyPostItemList(L2PcInstance activeChar) {
+		_activeChar = activeChar;
+		_itemList = _activeChar.getInventory().getAvailableItems(true, false, false);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xB2);
+		writeD(_itemList.length);
+		for (L2ItemInstance item : _itemList) {
+			writeItem(item);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyReceivedPost.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyReceivedPost.java
new file mode 100644
index 00000000..8fd776b7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplyReceivedPost.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public class ExReplyReceivedPost extends AbstractItemPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(ExReplyReceivedPost.class);
+	
+	private final Message _msg;
+	private L2ItemInstance[] _items = null;
+	
+	public ExReplyReceivedPost(Message msg) {
+		_msg = msg;
+		if (msg.hasAttachments()) {
+			final ItemContainer attachments = msg.getAttachments();
+			if ((attachments != null) && (attachments.getSize() > 0)) {
+				_items = attachments.getItems();
+			} else {
+				LOG.warn("Message {} has attachments but itemcontainer is empty.", msg.getId());
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xab);
+		writeD(_msg.getId());
+		writeD(_msg.isLocked() ? 1 : 0);
+		writeD(0x00); // Unknown
+		writeS(_msg.getSenderName());
+		writeS(_msg.getSubject());
+		writeS(_msg.getContent());
+		
+		if ((_items != null) && (_items.length > 0)) {
+			writeD(_items.length);
+			for (L2ItemInstance item : _items) {
+				writeItem(item);
+				writeD(item.getObjectId());
+			}
+		} else {
+			writeD(0x00);
+		}
+		
+		writeQ(_msg.getReqAdena());
+		writeD(_msg.hasAttachments() ? 1 : 0);
+		writeD(_msg.getSendBySystem());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java
new file mode 100644
index 00000000..062f0f0e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExReplySentPost.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.model.itemcontainer.ItemContainer;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * ExReplySentPost packet implementation.
+ * @author Migi
+ * @author DS
+ */
+public class ExReplySentPost extends AbstractItemPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(ExReplySentPost.class);
+	
+	private final Message _msg;
+	private L2ItemInstance[] _items = null;
+	
+	public ExReplySentPost(Message msg) {
+		_msg = msg;
+		if (msg.hasAttachments()) {
+			final ItemContainer attachments = msg.getAttachments();
+			if ((attachments != null) && (attachments.getSize() > 0)) {
+				_items = attachments.getItems();
+			} else {
+				LOG.warn("Message {} has attachments but itemcontainer is empty.", msg.getId());
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xAD);
+		writeD(_msg.getId());
+		writeD(_msg.isLocked() ? 1 : 0);
+		writeS(_msg.getReceiverName());
+		writeS(_msg.getSubject());
+		writeS(_msg.getContent());
+		
+		if ((_items != null) && (_items.length > 0)) {
+			writeD(_items.length);
+			for (L2ItemInstance item : _items) {
+				writeItem(item);
+				writeD(item.getObjectId());
+			}
+			writeQ(_msg.getReqAdena());
+			writeD(_msg.getSendBySystem());
+		} else {
+			writeD(0x00);
+			writeQ(_msg.getReqAdena());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
new file mode 100644
index 00000000..5b0c85b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRequestChangeNicknameColor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Gnacik
+ */
+public class ExRequestChangeNicknameColor extends L2GameServerPacket {
+	private final int _itemObjectId;
+	
+	public ExRequestChangeNicknameColor(int itemObjectId) {
+		_itemObjectId = itemObjectId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xfe);
+		writeH(0x83);
+		writeD(_itemObjectId);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRequestHackShield.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRequestHackShield.java
new file mode 100644
index 00000000..374e4d5d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRequestHackShield.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Trigger packet
+ * @author KenM
+ */
+public class ExRequestHackShield extends L2GameServerPacket {
+	public static final ExRequestHackShield STATIC_PACKET = new ExRequestHackShield();
+	
+	private ExRequestHackShield() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x49);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRestartClient.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRestartClient.java
new file mode 100644
index 00000000..aac564ee
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRestartClient.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author -Wooden-
+ */
+public class ExRestartClient extends L2GameServerPacket {
+	public static final ExRestartClient STATIC_PACKET = new ExRestartClient();
+	
+	private ExRestartClient() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x48);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRotation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRotation.java
new file mode 100644
index 00000000..387dfb73
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRotation.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author JIV
+ */
+public class ExRotation extends L2GameServerPacket {
+	private final int _charId, _heading;
+	
+	public ExRotation(int charId, int heading) {
+		_charId = charId;
+		_heading = heading;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xC1);
+		writeD(_charId);
+		writeD(_heading);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRpItemLink.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRpItemLink.java
new file mode 100644
index 00000000..27d4ae8b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExRpItemLink.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author KenM
+ */
+public final class ExRpItemLink extends L2GameServerPacket {
+	private final L2ItemInstance _item;
+	
+	public ExRpItemLink(L2ItemInstance item) {
+		_item = item;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x6C);
+		writeD(_item.getObjectId());
+		writeD(_item.getDisplayId());
+		writeD(_item.getLocationSlot());
+		writeQ(_item.getCount());
+		writeH(_item.getItem().getType2().getId());
+		writeH(_item.getCustomType1());
+		writeH(_item.isEquipped() ? 0x01 : 0x00);
+		writeD(_item.getItem().getBodyPart());
+		writeH(_item.getEnchantLevel());
+		writeH(_item.getCustomType2());
+		if (_item.isAugmented()) {
+			writeD(_item.getAugmentation().getAugmentationId());
+		} else {
+			writeD(0x00);
+		}
+		writeD(_item.getMana());
+		writeD(_item.isTimeLimitedItem() ? (int) (_item.getRemainingTime() / 1000) : -9999);
+		writeH(_item.getAttackElementType());
+		writeH(_item.getAttackElementPower());
+		for (byte i = 0; i < 6; i++) {
+			writeH(_item.getElementDefAttr(i));
+		}
+		// Enchant Effects
+		for (int op : _item.getEnchantOptions()) {
+			writeH(op);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSearchOrc.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSearchOrc.java
new file mode 100644
index 00000000..786c079f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSearchOrc.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author -Wooden-
+ */
+public class ExSearchOrc extends L2GameServerPacket {
+	public static final ExSearchOrc STATIC_PACKET = new ExSearchOrc();
+	
+	private ExSearchOrc() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x45);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSendManorList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSendManorList.java
new file mode 100644
index 00000000..42a788c7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSendManorList.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Comparator;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.entity.Castle;
+
+/**
+ * @author l3x
+ */
+public final class ExSendManorList extends L2GameServerPacket {
+	@Override
+	protected void writeImpl() {
+		final List<Castle> castles = CastleManager.getInstance().getCastles();
+		castles.sort(Comparator.comparing(Castle::getResidenceId));
+		
+		writeC(0xFE);
+		writeH(0x22);
+		writeD(castles.size());
+		for (Castle castle : castles) {
+			writeD(castle.getResidenceId());
+			writeS(castle.getName().toLowerCase());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSendUIEvent.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSendUIEvent.java
new file mode 100644
index 00000000..123bf8f8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSendUIEvent.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.NpcStringId;
+
+public class ExSendUIEvent extends L2GameServerPacket {
+	private final int _objectId;
+	private final boolean _type;
+	private final boolean _countUp;
+	private final int _startTime;
+	private final int _endTime;
+	private final int _npcstringId;
+	private final List<String> _params;
+	
+	public ExSendUIEvent(L2PcInstance player, boolean hide, boolean countUp, int startTime, int endTime, String text) {
+		this(player, hide, countUp, startTime, endTime, -1, text);
+	}
+	
+	public ExSendUIEvent(L2PcInstance player, boolean hide, boolean countUp, int startTime, int endTime, NpcStringId npcString, String... params) {
+		this(player, hide, countUp, startTime, endTime, npcString.getId(), params);
+	}
+	
+	public ExSendUIEvent(L2PcInstance player, boolean hide, boolean countUp, int startTime, int endTime, int npcstringId, String... params) {
+		_objectId = player.getObjectId();
+		_type = hide;
+		_countUp = countUp;
+		_startTime = startTime;
+		_endTime = endTime;
+		_npcstringId = npcstringId;
+		_params = Arrays.asList(params);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x8E);
+		writeD(_objectId);
+		writeD(_type ? 1 : 0); // 0 = show, 1 = hide (there is 2 = pause and 3 = resume also but they don't work well you can only pause count down and you cannot resume it because resume hides the counter).
+		writeD(0);// unknown
+		writeD(0);// unknown
+		writeS(_countUp ? "1" : "0"); // 0 = count down, 1 = count up
+		// timer always disappears 10 seconds before end
+		writeS(String.valueOf(_startTime / 60));
+		writeS(String.valueOf(_startTime % 60));
+		writeS(String.valueOf(_endTime / 60));
+		writeS(String.valueOf(_endTime % 60));
+		writeD(_npcstringId);
+		if (_params != null) {
+			for (String param : _params) {
+				writeS(param);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java
new file mode 100644
index 00000000..be8aada5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExServerPrimitive.java
@@ -0,0 +1,466 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+
+/**
+ * A packet used to draw points and lines on client.<br/>
+ * <b>Note:</b> Names in points and lines are bugged they will appear even when not looking at them.
+ * @author NosBit
+ */
+public class ExServerPrimitive extends L2GameServerPacket {
+	private final String _name;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	private final List<Point> _points = new ArrayList<>();
+	private final List<Line> _lines = new ArrayList<>();
+	
+	/**
+	 * @param name A unique name this will be used to replace lines if second packet is sent
+	 * @param x the x coordinate usually middle of drawing area
+	 * @param y the y coordinate usually middle of drawing area
+	 * @param z the z coordinate usually middle of drawing area
+	 */
+	public ExServerPrimitive(String name, int x, int y, int z) {
+		_name = name;
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	/**
+	 * @param name A unique name this will be used to replace lines if second packet is sent
+	 * @param locational the ILocational to take coordinates usually middle of drawing area
+	 */
+	public ExServerPrimitive(String name, ILocational locational) {
+		this(name, locational.getX(), locational.getY(), locational.getZ());
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param name the name that will be displayed over the point
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param x the x coordinate for this point
+	 * @param y the y coordinate for this point
+	 * @param z the z coordinate for this point
+	 */
+	public void addPoint(String name, int color, boolean isNameColored, int x, int y, int z) {
+		_points.add(new Point(name, color, isNameColored, x, y, z));
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param name the name that will be displayed over the point
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param locational the ILocational to take coordinates for this point
+	 */
+	public void addPoint(String name, int color, boolean isNameColored, ILocational locational) {
+		addPoint(name, color, isNameColored, locational.getX(), locational.getY(), locational.getZ());
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param color the color
+	 * @param x the x coordinate for this point
+	 * @param y the y coordinate for this point
+	 * @param z the z coordinate for this point
+	 */
+	public void addPoint(int color, int x, int y, int z) {
+		addPoint("", color, false, x, y, z);
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param color the color
+	 * @param locational the ILocational to take coordinates for this point
+	 */
+	public void addPoint(int color, ILocational locational) {
+		addPoint("", color, false, locational);
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param name the name that will be displayed over the point
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param x the x coordinate for this point
+	 * @param y the y coordinate for this point
+	 * @param z the z coordinate for this point
+	 */
+	public void addPoint(String name, Color color, boolean isNameColored, int x, int y, int z) {
+		addPoint(name, color.getRGB(), isNameColored, x, y, z);
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param name the name that will be displayed over the point
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param locational the ILocational to take coordinates for this point
+	 */
+	public void addPoint(String name, Color color, boolean isNameColored, ILocational locational) {
+		addPoint(name, color.getRGB(), isNameColored, locational);
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param color the color
+	 * @param x the x coordinate for this point
+	 * @param y the y coordinate for this point
+	 * @param z the z coordinate for this point
+	 */
+	public void addPoint(Color color, int x, int y, int z) {
+		addPoint("", color, false, x, y, z);
+	}
+	
+	/**
+	 * Adds a point to be displayed on client.
+	 * @param color the color
+	 * @param locational the ILocational to take coordinates for this point
+	 */
+	public void addPoint(Color color, ILocational locational) {
+		addPoint("", color, false, locational);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(String name, int color, boolean isNameColored, int x, int y, int z, int x2, int y2, int z2) {
+		_lines.add(new Line(name, color, isNameColored, x, y, z, x2, y2, z2));
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(String name, int color, boolean isNameColored, ILocational locational, int x2, int y2, int z2) {
+		addLine(name, color, isNameColored, locational.getX(), locational.getY(), locational.getZ(), x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(String name, int color, boolean isNameColored, int x, int y, int z, ILocational locational2) {
+		addLine(name, color, isNameColored, x, y, z, locational2.getX(), locational2.getY(), locational2.getZ());
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(String name, int color, boolean isNameColored, ILocational locational, ILocational locational2) {
+		addLine(name, color, isNameColored, locational, locational2.getX(), locational2.getY(), locational2.getZ());
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(int color, int x, int y, int z, int x2, int y2, int z2) {
+		addLine("", color, false, x, y, z, x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(int color, ILocational locational, int x2, int y2, int z2) {
+		addLine("", color, false, locational, x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(int color, int x, int y, int z, ILocational locational2) {
+		addLine("", color, false, x, y, z, locational2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(int color, ILocational locational, ILocational locational2) {
+		addLine("", color, false, locational, locational2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(String name, Color color, boolean isNameColored, int x, int y, int z, int x2, int y2, int z2) {
+		addLine(name, color.getRGB(), isNameColored, x, y, z, x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(String name, Color color, boolean isNameColored, ILocational locational, int x2, int y2, int z2) {
+		addLine(name, color.getRGB(), isNameColored, locational, x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(String name, Color color, boolean isNameColored, int x, int y, int z, ILocational locational2) {
+		addLine(name, color.getRGB(), isNameColored, x, y, z, locational2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param name the name that will be displayed over the middle of line
+	 * @param color the color
+	 * @param isNameColored if {@code true} name will be colored as well.
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(String name, Color color, boolean isNameColored, ILocational locational, ILocational locational2) {
+		addLine(name, color.getRGB(), isNameColored, locational, locational2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(Color color, int x, int y, int z, int x2, int y2, int z2) {
+		addLine("", color, false, x, y, z, x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param x2 the x coordinate for this line end point
+	 * @param y2 the y coordinate for this line end point
+	 * @param z2 the z coordinate for this line end point
+	 */
+	public void addLine(Color color, ILocational locational, int x2, int y2, int z2) {
+		addLine("", color, false, locational, x2, y2, z2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param x the x coordinate for this line start point
+	 * @param y the y coordinate for this line start point
+	 * @param z the z coordinate for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(Color color, int x, int y, int z, ILocational locational2) {
+		addLine("", color, false, x, y, z, locational2);
+	}
+	
+	/**
+	 * Adds a line to be displayed on client
+	 * @param color the color
+	 * @param locational the ILocational to take coordinates for this line start point
+	 * @param locational2 the ILocational to take coordinates for this line end point
+	 */
+	public void addLine(Color color, ILocational locational, ILocational locational2) {
+		addLine("", color, false, locational, locational2);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x11);
+		writeS(_name);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(65535); // has to do something with display range and angle
+		writeD(65535); // has to do something with display range and angle
+		
+		writeD(_points.size() + _lines.size());
+		
+		for (Point point : _points) {
+			writeC(1); // Its the type in this case Point
+			writeS(point.getName());
+			int color = point.getColor();
+			writeD((color >> 16) & 0xFF); // R
+			writeD((color >> 8) & 0xFF); // G
+			writeD(color & 0xFF); // B
+			writeD(point.isNameColored() ? 1 : 0);
+			writeD(point.getX());
+			writeD(point.getY());
+			writeD(point.getZ());
+		}
+		
+		for (Line line : _lines) {
+			writeC(2); // Its the type in this case Line
+			writeS(line.getName());
+			int color = line.getColor();
+			writeD((color >> 16) & 0xFF); // R
+			writeD((color >> 8) & 0xFF); // G
+			writeD(color & 0xFF); // B
+			writeD(line.isNameColored() ? 1 : 0);
+			writeD(line.getX());
+			writeD(line.getY());
+			writeD(line.getZ());
+			writeD(line.getX2());
+			writeD(line.getY2());
+			writeD(line.getZ2());
+		}
+	}
+	
+	private static class Point {
+		private final String _name;
+		private final int _color;
+		private final boolean _isNameColored;
+		private final int _x;
+		private final int _y;
+		private final int _z;
+		
+		public Point(String name, int color, boolean isNameColored, int x, int y, int z) {
+			_name = name;
+			_color = color;
+			_isNameColored = isNameColored;
+			_x = x;
+			_y = y;
+			_z = z;
+		}
+		
+		public String getName() {
+			return _name;
+		}
+		
+		public int getColor() {
+			return _color;
+		}
+		
+		public boolean isNameColored() {
+			return _isNameColored;
+		}
+		
+		public int getX() {
+			return _x;
+		}
+		
+		public int getY() {
+			return _y;
+		}
+		
+		public int getZ() {
+			return _z;
+		}
+	}
+	
+	private static class Line extends Point {
+		private final int _x2;
+		private final int _y2;
+		private final int _z2;
+		
+		public Line(String name, int color, boolean isNameColored, int x, int y, int z, int x2, int y2, int z2) {
+			super(name, color, isNameColored, x, y, z);
+			_x2 = x2;
+			_y2 = y2;
+			_z2 = z2;
+		}
+		
+		public int getX2() {
+			return _x2;
+		}
+		
+		public int getY2() {
+			return _y2;
+		}
+		
+		public int getZ2() {
+			return _z2;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSetCompassZoneCode.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSetCompassZoneCode.java
new file mode 100644
index 00000000..ea9c3095
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSetCompassZoneCode.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExSetCompassZoneCode extends L2GameServerPacket {
+	
+	public static final int ALTERED_ZONE = 0x08;
+	public static final int SIEGE_WAR_ZONE_1 = 0x0A;
+	public static final int SIEGE_WAR_ZONE_2 = 0x0B;
+	public static final int PEACE_ZONE = 0x0C;
+	public static final int SEVEN_SIGNS_ZONE = 0x0D;
+	public static final int PVP_ZONE = 0x0E;
+	public static final int GENERAL_ZONE = 0x0F;
+	
+	private final int _zoneType;
+	
+	public ExSetCompassZoneCode(int val) {
+		_zoneType = val;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x33);
+		writeD(_zoneType);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSetPartyLooting.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSetPartyLooting.java
new file mode 100644
index 00000000..32ac2013
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSetPartyLooting.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.PartyDistributionType;
+
+/**
+ * @author JIV
+ */
+public class ExSetPartyLooting extends L2GameServerPacket {
+	private final int _result;
+	private final PartyDistributionType _partyDistributionType;
+	
+	public ExSetPartyLooting(int result, PartyDistributionType partyDistributionType) {
+		_result = result;
+		_partyDistributionType = partyDistributionType;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xC0);
+		writeD(_result);
+		writeD(_partyDistributionType.getId());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
new file mode 100644
index 00000000..a7495433
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowAdventurerGuideBook.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExShowAdventurerGuideBook extends L2GameServerPacket {
+	public static final ExShowAdventurerGuideBook STATIC_PACKET = new ExShowAdventurerGuideBook();
+	
+	private ExShowAdventurerGuideBook() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x38);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java
new file mode 100644
index 00000000..265b5b83
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowAgitInfo.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
+
+/**
+ * @author KenM
+ */
+public class ExShowAgitInfo extends L2GameServerPacket {
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x16);
+		Map<Integer, AuctionableHall> clannhalls = ClanHallManager.getInstance().getAllAuctionableClanHalls();
+		writeD(clannhalls.size());
+		for (AuctionableHall ch : clannhalls.values()) {
+			writeD(ch.getId());
+			writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getName()); // owner clan name
+			writeS(ch.getOwnerId() <= 0 ? "" : ClanTable.getInstance().getClan(ch.getOwnerId()).getLeaderName()); // leader name
+			writeD(ch.getGrade() > 0 ? 0x00 : 0x01); // 0 - auction 1 - war clanhall 2 - ETC (rainbow spring clanhall)
+		}
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
new file mode 100644
index 00000000..c7e0ee34
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowBaseAttributeCancelWindow.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class ExShowBaseAttributeCancelWindow extends L2GameServerPacket {
+	private final L2ItemInstance[] _items;
+	private long _price;
+	
+	public ExShowBaseAttributeCancelWindow(L2PcInstance player) {
+		_items = player.getInventory().getElementItems();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x74);
+		writeD(_items.length);
+		for (L2ItemInstance item : _items) {
+			writeD(item.getObjectId());
+			writeQ(getPrice(item));
+		}
+	}
+	
+	/**
+	 * TODO: Update prices for Top/Mid/Low S80/S84
+	 * @param item
+	 * @return
+	 */
+	private long getPrice(L2ItemInstance item) {
+		switch (item.getItem().getCrystalType()) {
+			case S:
+				if (item.getItem() instanceof L2Weapon) {
+					_price = 50000;
+				} else {
+					_price = 40000;
+				}
+				break;
+			case S80:
+				if (item.getItem() instanceof L2Weapon) {
+					_price = 100000;
+				} else {
+					_price = 80000;
+				}
+				break;
+			case S84:
+				if (item.getItem() instanceof L2Weapon) {
+					_price = 200000;
+				} else {
+					_price = 160000;
+				}
+				break;
+		}
+		
+		return _price;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java
new file mode 100644
index 00000000..9ec40934
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCastleInfo.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.model.entity.Castle;
+
+/**
+ * @author KenM
+ */
+public class ExShowCastleInfo extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(ExShowCastleInfo.class);
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x14);
+		List<Castle> castles = CastleManager.getInstance().getCastles();
+		writeD(castles.size());
+		for (Castle castle : castles) {
+			writeD(castle.getResidenceId());
+			if (castle.getOwnerId() > 0) {
+				if (ClanTable.getInstance().getClan(castle.getOwnerId()) != null) {
+					writeS(ClanTable.getInstance().getClan(castle.getOwnerId()).getName());
+				} else {
+					LOG.warn("Castle owner with no name! Castle: {} has an OwnerId = {} who does not have a  name!", castle.getName(), castle.getOwnerId());
+					writeS("");
+				}
+			} else {
+				writeS("");
+			}
+			writeD(castle.getTaxPercent());
+			writeD((int) (castle.getSiege().getSiegeDate().getTimeInMillis() / 1000));
+		}
+	}
+	
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java
new file mode 100644
index 00000000..f613afe3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowContactList.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class ExShowContactList extends L2GameServerPacket {
+	private final List<String> _contacts;
+	
+	public ExShowContactList(L2PcInstance player) {
+		_contacts = player.getContactList().getAllContacts();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xD3);
+		writeD(_contacts.size());
+		for (String name : _contacts) {
+			writeS(name);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCropInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCropInfo.java
new file mode 100644
index 00000000..a74048eb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCropInfo.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.L2Seed;
+
+/**
+ * @author l3x
+ */
+public class ExShowCropInfo extends L2GameServerPacket {
+	private final List<CropProcure> _crops;
+	private final int _manorId;
+	private final boolean _hideButtons;
+	
+	public ExShowCropInfo(int manorId, boolean nextPeriod, boolean hideButtons) {
+		_manorId = manorId;
+		_hideButtons = hideButtons;
+		
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		_crops = (nextPeriod && !manor.isManorApproved()) ? null : manor.getCropProcure(manorId, nextPeriod);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE); // Id
+		writeH(0x24); // SubId
+		writeC(_hideButtons ? 0x01 : 0x00); // Hide "Crop Sales" button
+		writeD(_manorId); // Manor ID
+		writeD(0x00);
+		if (_crops == null) {
+			writeD(0);
+			return;
+		}
+		writeD(_crops.size());
+		for (CropProcure crop : _crops) {
+			writeD(crop.getId()); // Crop id
+			writeQ(crop.getAmount()); // Buy residual
+			writeQ(crop.getStartAmount()); // Buy
+			writeQ(crop.getPrice()); // Buy price
+			writeC(crop.getReward()); // Reward
+			final L2Seed seed = CastleManorManager.getInstance().getSeedByCrop(crop.getId());
+			if (seed == null) {
+				writeD(0); // Seed level
+				writeC(0x01); // Reward 1
+				writeD(0); // Reward 1 - item id
+				writeC(0x01); // Reward 2
+				writeD(0); // Reward 2 - item id
+			} else {
+				writeD(seed.getLevel()); // Seed level
+				writeC(0x01); // Reward 1
+				writeD(seed.getReward(1)); // Reward 1 - item id
+				writeC(0x01); // Reward 2
+				writeD(seed.getReward(2)); // Reward 2 - item id
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCropSetting.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCropSetting.java
new file mode 100644
index 00000000..c5b91a35
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowCropSetting.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.L2Seed;
+
+/**
+ * @author l3x
+ */
+public class ExShowCropSetting extends L2GameServerPacket {
+	private final int _manorId;
+	private final Set<L2Seed> _seeds;
+	private final Map<Integer, CropProcure> _current = new HashMap<>();
+	private final Map<Integer, CropProcure> _next = new HashMap<>();
+	
+	public ExShowCropSetting(int manorId) {
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		_manorId = manorId;
+		_seeds = manor.getSeedsForCastle(_manorId);
+		for (L2Seed s : _seeds) {
+			// Current period
+			CropProcure cp = manor.getCropProcure(manorId, s.getCropId(), false);
+			if (cp != null) {
+				_current.put(s.getCropId(), cp);
+			}
+			// Next period
+			cp = manor.getCropProcure(manorId, s.getCropId(), true);
+			if (cp != null) {
+				_next.put(s.getCropId(), cp);
+			}
+		}
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xFE); // Id
+		writeH(0x2b); // SubId
+		
+		writeD(_manorId); // manor id
+		writeD(_seeds.size()); // size
+		
+		CropProcure cp;
+		for (L2Seed s : _seeds) {
+			writeD(s.getCropId()); // crop id
+			writeD(s.getLevel()); // seed level
+			writeC(1);
+			writeD(s.getReward(1)); // reward 1 id
+			writeC(1);
+			writeD(s.getReward(2)); // reward 2 id
+			writeD(s.getCropLimit()); // next sale limit
+			writeD(0); // ???
+			writeD(s.getCropMinPrice()); // min crop price
+			writeD(s.getCropMaxPrice()); // max crop price
+			// Current period
+			if (_current.containsKey(s.getCropId())) {
+				cp = _current.get(s.getCropId());
+				writeQ(cp.getStartAmount()); // buy
+				writeQ(cp.getPrice()); // price
+				writeC(cp.getReward()); // reward
+			} else {
+				writeQ(0);
+				writeQ(0);
+				writeC(0);
+			}
+			// Next period
+			if (_next.containsKey(s.getCropId())) {
+				cp = _next.get(s.getCropId());
+				writeQ(cp.getStartAmount()); // buy
+				writeQ(cp.getPrice()); // price
+				writeC(cp.getReward()); // reward
+			} else {
+				writeQ(0);
+				writeQ(0);
+				writeC(0);
+			}
+		}
+		_next.clear();
+		_current.clear();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowDominionRegistry.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowDominionRegistry.java
new file mode 100644
index 00000000..2b8ed763
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowDominionRegistry.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Calendar;
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author GodKratos
+ */
+public class ExShowDominionRegistry extends L2GameServerPacket {
+	private static final int MINID = 80;
+	private final int _castleId;
+	private int _clanReq = 0x00;
+	private int _mercReq = 0x00;
+	private int _isMercRegistered = 0x00;
+	private int _isClanRegistered = 0x00;
+	private final int _warTime;
+	private final int _currentTime = (int) (Calendar.getInstance().getTimeInMillis() / 1000);
+	
+	public ExShowDominionRegistry(int castleId, L2PcInstance player) {
+		_castleId = castleId;
+		if (TerritoryWarManager.getInstance().getRegisteredClans(castleId) != null) {
+			_clanReq = TerritoryWarManager.getInstance().getRegisteredClans(castleId).size();
+			if (player.getClan() != null) {
+				_isClanRegistered = (TerritoryWarManager.getInstance().getRegisteredClans(castleId).contains(player.getClan()) ? 0x01 : 0x00);
+			}
+		}
+		if (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId) != null) {
+			_mercReq = TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).size();
+			_isMercRegistered = (TerritoryWarManager.getInstance().getRegisteredMercenaries(castleId).contains(player.getObjectId()) ? 0x01 : 0x00);
+		}
+		_warTime = (int) (TerritoryWarManager.getInstance().getTWStartTimeInMillis() / 1000);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x90);
+		writeD(MINID + _castleId); // Current Territory Id
+		if (TerritoryWarManager.getInstance().getTerritory(_castleId) == null) {
+			// something is wrong
+			writeS("No Owner"); // Owners Clan
+			writeS("No Owner"); // Owner Clan Leader
+			writeS("No Ally"); // Owner Alliance
+		} else {
+			L2Clan clan = TerritoryWarManager.getInstance().getTerritory(_castleId).getOwnerClan();
+			if (clan == null) {
+				// something is wrong
+				writeS("No Owner"); // Owners Clan
+				writeS("No Owner"); // Owner Clan Leader
+				writeS("No Ally"); // Owner Alliance
+			} else {
+				writeS(clan.getName()); // Owners Clan
+				writeS(clan.getLeaderName()); // Owner Clan Leader
+				writeS(clan.getAllyName()); // Owner Alliance
+			}
+		}
+		writeD(_clanReq); // Clan Request
+		writeD(_mercReq); // Merc Request
+		writeD(_warTime); // War Time
+		writeD(_currentTime); // Current Time
+		writeD(_isClanRegistered); // is Cancel clan registration
+		writeD(_isMercRegistered); // is Cancel mercenaries registration
+		writeD(0x01); // unknown
+		List<Territory> territoryList = TerritoryWarManager.getInstance().getAllTerritories();
+		writeD(territoryList.size()); // Territory Count
+		for (Territory t : territoryList) {
+			writeD(t.getTerritoryId()); // Territory Id
+			writeD(t.getOwnedWardIds().size()); // Emblem Count
+			for (int i : t.getOwnedWardIds()) {
+				writeD(i); // Emblem ID - should be in for loop for emblem count
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java
new file mode 100644
index 00000000..6da1d953
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressInfo.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.FortManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.entity.Fort;
+
+/**
+ * @author KenM
+ */
+public class ExShowFortressInfo extends L2GameServerPacket {
+	public static final ExShowFortressInfo STATIC_PACKET = new ExShowFortressInfo();
+	
+	private ExShowFortressInfo() {
+		
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x15);
+		List<Fort> forts = FortManager.getInstance().getForts();
+		writeD(forts.size());
+		for (Fort fort : forts) {
+			L2Clan clan = fort.getOwnerClan();
+			writeD(fort.getResidenceId());
+			writeS(clan != null ? clan.getName() : "");
+			writeD(fort.getSiege().isInProgress() ? 0x01 : 0x00);
+			// Time of possession
+			writeD(fort.getOwnedTime());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java
new file mode 100644
index 00000000..73e720c2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.model.FortSiegeSpawn;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.entity.Fort;
+
+/**
+ * @author KenM
+ */
+public class ExShowFortressMapInfo extends L2GameServerPacket {
+	private final Fort _fortress;
+	
+	public ExShowFortressMapInfo(Fort fortress) {
+		_fortress = fortress;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x7D);
+		
+		writeD(_fortress.getResidenceId());
+		writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status
+		writeD(_fortress.getFortSize()); // barracks count
+		
+		List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
+		if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().isInProgress()) {
+			switch (commanders.size()) {
+				case 3 -> {
+					for (FortSiegeSpawn spawn : commanders) {
+						if (isSpawned(spawn.getId())) {
+							writeD(0);
+						} else {
+							writeD(1);
+						}
+					}
+				}
+				// TODO: change 4 to 5 once control room supported
+				case 4 -> {
+					int count = 0;
+					for (FortSiegeSpawn spawn : commanders) {
+						count++;
+						if (count == 4) {
+							writeD(1); // TODO: control room emulated
+						}
+						if (isSpawned(spawn.getId())) {
+							writeD(0);
+						} else {
+							writeD(1);
+						}
+					}
+				}
+			}
+		} else {
+			for (int i = 0; i < _fortress.getFortSize(); i++) {
+				writeD(0);
+			}
+		}
+	}
+	
+	private boolean isSpawned(int npcId) {
+		boolean ret = false;
+		for (L2Spawn spawn : _fortress.getSiege().getCommanders()) {
+			if (spawn.getId() == npcId) {
+				ret = true;
+				break;
+			}
+		}
+		return ret;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
new file mode 100644
index 00000000..062e423d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
+import com.l2jserver.gameserver.model.FortSiegeSpawn;
+import com.l2jserver.gameserver.model.entity.Fort;
+
+/**
+ * @author KenM
+ */
+public class ExShowFortressSiegeInfo extends L2GameServerPacket {
+	private final int _fortId;
+	private final int _size;
+	private final int _csize;
+	private final int _csize2;
+	
+	public ExShowFortressSiegeInfo(Fort fort) {
+		_fortId = fort.getResidenceId();
+		_size = fort.getFortSize();
+		List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
+		_csize = ((commanders == null) ? 0 : commanders.size());
+		_csize2 = fort.getSiege().getCommanders().size();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x17);
+		
+		writeD(_fortId); // Fortress Id
+		writeD(_size); // Total Barracks Count
+		if (_csize > 0) {
+			switch (_csize) {
+				case 3:
+					switch (_csize2) {
+						case 0 -> writeD(0x03);
+						case 1 -> writeD(0x02);
+						case 2 -> writeD(0x01);
+						case 3 -> writeD(0x00);
+					}
+					break;
+				case 4:
+					// TODO: change 4 to 5 once control room supported
+					// TODO: once control room supported, update writeD(0x0x) to support 5th room
+					switch (_csize2) {
+						case 0 -> writeD(0x05);
+						case 1 -> writeD(0x04);
+						case 2 -> writeD(0x03);
+						case 3 -> writeD(0x02);
+						case 4 -> writeD(0x01);
+					}
+					break;
+			}
+		} else {
+			for (int i = 0; i < _size; i++) {
+				writeD(0x00);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowManorDefaultInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
new file mode 100644
index 00000000..af2192f3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowManorDefaultInfo.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.L2Seed;
+
+/**
+ * @author l3x
+ */
+public final class ExShowManorDefaultInfo extends L2GameServerPacket {
+	private final List<L2Seed> _crops;
+	private final boolean _hideButtons;
+	
+	public ExShowManorDefaultInfo(boolean hideButtons) {
+		_crops = CastleManorManager.getInstance().getCrops();
+		_hideButtons = hideButtons;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x25);
+		writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" and "Crop Sales" buttons
+		writeD(_crops.size());
+		for (L2Seed crop : _crops) {
+			writeD(crop.getCropId()); // crop Id
+			writeD(crop.getLevel()); // level
+			writeD(crop.getSeedReferencePrice()); // seed price
+			writeD(crop.getCropReferencePrice()); // crop price
+			writeC(1); // Reward 1 type
+			writeD(crop.getReward(1)); // Reward 1 itemId
+			writeC(1); // Reward 2 type
+			writeD(crop.getReward(2)); // Reward 2 itemId
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowOwnthingPos.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowOwnthingPos.java
new file mode 100644
index 00000000..369f201b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowOwnthingPos.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.TerritoryWard;
+
+/**
+ * @author -Gigiikun-
+ */
+public class ExShowOwnthingPos extends L2GameServerPacket {
+	public static final ExShowOwnthingPos STATIC_PACKET = new ExShowOwnthingPos();
+	
+	private ExShowOwnthingPos() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x93);
+		
+		if (TerritoryWarManager.getInstance().isTWInProgress()) {
+			List<TerritoryWard> territoryWardList = TerritoryWarManager.getInstance().getAllTerritoryWards();
+			writeD(territoryWardList.size());
+			for (TerritoryWard ward : territoryWardList) {
+				writeD(ward.getTerritoryId());
+				
+				if (ward.getNpc() != null) {
+					writeD(ward.getNpc().getX());
+					writeD(ward.getNpc().getY());
+					writeD(ward.getNpc().getZ());
+				} else if (ward.getPlayer() != null) {
+					writeD(ward.getPlayer().getX());
+					writeD(ward.getPlayer().getY());
+					writeD(ward.getPlayer().getZ());
+				} else {
+					writeD(0x00);
+					writeD(0x00);
+					writeD(0x00);
+				}
+			}
+		} else {
+			writeD(0x00);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowProcureCropDetail.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowProcureCropDetail.java
new file mode 100644
index 00000000..ab8e9ff7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowProcureCropDetail.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.entity.Castle;
+
+/**
+ * @author l3x
+ */
+public class ExShowProcureCropDetail extends L2GameServerPacket {
+	private final int _cropId;
+	private final Map<Integer, CropProcure> _castleCrops = new HashMap<>();
+	
+	public ExShowProcureCropDetail(int cropId) {
+		_cropId = cropId;
+		
+		for (Castle c : CastleManager.getInstance().getCastles()) {
+			final CropProcure cropItem = CastleManorManager.getInstance().getCropProcure(c.getResidenceId(), cropId, false);
+			if ((cropItem != null) && (cropItem.getAmount() > 0)) {
+				_castleCrops.put(c.getResidenceId(), cropItem);
+			}
+		}
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xFE);
+		writeH(0x78);
+		
+		writeD(_cropId); // crop id
+		writeD(_castleCrops.size()); // size
+		
+		for (Map.Entry<Integer, CropProcure> entry : _castleCrops.entrySet()) {
+			final CropProcure crop = entry.getValue();
+			writeD(entry.getKey()); // manor name
+			writeQ(crop.getAmount()); // buy residual
+			writeQ(crop.getPrice()); // buy price
+			writeC(crop.getReward()); // reward type
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowQuestInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowQuestInfo.java
new file mode 100644
index 00000000..f1a0bf11
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowQuestInfo.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Luca Baldi
+ */
+public class ExShowQuestInfo extends L2GameServerPacket {
+	public static final ExShowQuestInfo STATIC_PACKET = new ExShowQuestInfo();
+	
+	private ExShowQuestInfo() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x20);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowQuestMark.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowQuestMark.java
new file mode 100644
index 00000000..66752669
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowQuestMark.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Luca Baldi
+ */
+public class ExShowQuestMark extends L2GameServerPacket {
+	private final int _questId;
+	
+	public ExShowQuestMark(int questId) {
+		_questId = questId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x21);
+		writeD(_questId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowReceivedPostList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowReceivedPostList.java
new file mode 100644
index 00000000..9e8383ea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowReceivedPostList.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.entity.Message;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public class ExShowReceivedPostList extends L2GameServerPacket {
+	private final List<Message> _inbox;
+	
+	public ExShowReceivedPostList(int objectId) {
+		_inbox = MailManager.getInstance().getInbox(objectId);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xAA);
+		writeD((int) (System.currentTimeMillis() / 1000));
+		if ((_inbox != null) && (_inbox.size() > 0)) {
+			writeD(_inbox.size());
+			for (Message msg : _inbox) {
+				writeD(msg.getId());
+				writeS(msg.getSubject());
+				writeS(msg.getSenderName());
+				writeD(msg.isLocked() ? 0x01 : 0x00);
+				writeD(msg.getExpirationSeconds());
+				writeD(msg.isUnread() ? 0x01 : 0x00);
+				writeD(0x01);
+				writeD(msg.hasAttachments() ? 0x01 : 0x00);
+				writeD(msg.isReturned() ? 0x01 : 0x00);
+				writeD(msg.getSendBySystem());
+				writeD(0x00);
+			}
+		} else {
+			writeD(0x00);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java
new file mode 100644
index 00000000..a07db483
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowScreenMessage.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * ExShowScreenMessage server packet implementation.
+ * @author Kerberos
+ * @author Zoey76
+ */
+public class ExShowScreenMessage extends L2GameServerPacket {
+	private final int _type;
+	private final int _sysMessageId;
+	private final int _unk1;
+	private final int _unk2;
+	private final int _unk3;
+	private final boolean _fade;
+	private final int _size;
+	private final int _position;
+	private final boolean _effect;
+	private final String _text;
+	private final int _time;
+	private final int _npcString;
+	private List<String> _parameters = null;
+	// Positions
+	public static final byte TOP_LEFT = 0x01;
+	public static final byte TOP_CENTER = 0x02;
+	public static final byte TOP_RIGHT = 0x03;
+	public static final byte MIDDLE_LEFT = 0x04;
+	public static final byte MIDDLE_CENTER = 0x05;
+	public static final byte MIDDLE_RIGHT = 0x06;
+	public static final byte BOTTOM_CENTER = 0x07;
+	public static final byte BOTTOM_RIGHT = 0x08;
+	// Sizes
+	public static final byte NORMAL_SIZE = 0x00;
+	public static final byte SMALL_SIZE = 0x01;
+	
+	/**
+	 * Display a String on the screen for a given time.
+	 * @param text the text to display
+	 * @param time the display time
+	 */
+	public ExShowScreenMessage(String text, int time) {
+		_type = 2;
+		_sysMessageId = -1;
+		_unk1 = 0;
+		_unk2 = 0;
+		_unk3 = 0;
+		_fade = false;
+		_position = TOP_CENTER;
+		_text = text;
+		_time = time;
+		_size = 0;
+		_effect = false;
+		_npcString = -1;
+	}
+	
+	/**
+	 * Display a NPC String on the screen for a given position and time.
+	 * @param npcString the NPC String Id
+	 * @param position the position on the screen
+	 * @param time the display time
+	 * @param params the String parameters
+	 */
+	public ExShowScreenMessage(NpcStringId npcString, int position, int time, String... params) {
+		_type = 2;
+		_sysMessageId = -1;
+		_unk1 = 0x00;
+		_unk2 = 0x00;
+		_unk3 = 0x00;
+		_fade = false;
+		_position = position;
+		_text = null;
+		_time = time;
+		_size = 0x00;
+		_effect = false;
+		_npcString = npcString.getId();
+		if (params != null) {
+			addStringParameter(params);
+		}
+	}
+	
+	/**
+	 * Display a System Message on the screen for a given position and time.
+	 * @param systemMsg the System Message Id
+	 * @param position the position on the screen
+	 * @param time the display time
+	 * @param params the String parameters
+	 */
+	public ExShowScreenMessage(SystemMessageId systemMsg, int position, int time, String... params) {
+		_type = 2;
+		_sysMessageId = systemMsg.getId();
+		_unk1 = 0x00;
+		_unk2 = 0x00;
+		_unk3 = 0x00;
+		_fade = false;
+		_position = position;
+		_text = null;
+		_time = time;
+		_size = 0x00;
+		_effect = false;
+		_npcString = -1;
+		if (params != null) {
+			addStringParameter(params);
+		}
+	}
+	
+	/**
+	 * Display a Text, System Message or a NPC String on the screen for the given parameters.
+	 * @param type 0 - System Message, 1 - Text, 2 - NPC String
+	 * @param messageId the System Message Id
+	 * @param position the position on the screen
+	 * @param unk1
+	 * @param size the font size 0 - normal, 1 - small
+	 * @param unk2
+	 * @param unk3
+	 * @param showEffect upper effect (0 - disabled, 1 enabled) - _position must be 2 (center) otherwise no effect
+	 * @param time the display time
+	 * @param fade the fade effect (0 - disabled, 1 enabled)
+	 * @param text the text to display
+	 * @param npcString
+	 * @param params the String parameters
+	 */
+	public ExShowScreenMessage(int type, int messageId, int position, int unk1, int size, int unk2, int unk3, boolean showEffect, int time, boolean fade, String text, NpcStringId npcString, String... params) {
+		_type = type;
+		_sysMessageId = messageId;
+		_unk1 = unk1;
+		_unk2 = unk2;
+		_unk3 = unk3;
+		_fade = fade;
+		_position = position;
+		_text = text;
+		_time = time;
+		_size = size;
+		_effect = showEffect;
+		_npcString = npcString.getId();
+		
+		if (params != null) {
+			addStringParameter(params);
+		}
+	}
+	
+	/**
+	 * String parameter for argument S1,S2,.. in npcstring-e.dat
+	 * @param params the parameter
+	 */
+	public void addStringParameter(String... params) {
+		if (_parameters == null) {
+			_parameters = new ArrayList<>();
+		}
+		Collections.addAll(_parameters, params);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x39);
+		writeD(_type);
+		writeD(_sysMessageId);
+		writeD(_position);
+		writeD(_unk1);
+		writeD(_size);
+		writeD(_unk2);
+		writeD(_unk3);
+		writeD(_effect ? 0x01 : 0x00);
+		writeD(_time);
+		writeD(_fade ? 0x01 : 0x00);
+		writeD(_npcString);
+		if (_npcString == -1) {
+			writeS(_text);
+		} else {
+			if (_parameters != null) {
+				for (String s : _parameters) {
+					writeS(s);
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedInfo.java
new file mode 100644
index 00000000..af272e3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedInfo.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.SeedProduction;
+
+/**
+ * @author l3x
+ */
+public class ExShowSeedInfo extends L2GameServerPacket {
+	private final List<SeedProduction> _seeds;
+	private final int _manorId;
+	private final boolean _hideButtons;
+	
+	public ExShowSeedInfo(int manorId, boolean nextPeriod, boolean hideButtons) {
+		_manorId = manorId;
+		_hideButtons = hideButtons;
+		
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		_seeds = (nextPeriod && !manor.isManorApproved()) ? null : manor.getSeedProduction(manorId, nextPeriod);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE); // Id
+		writeH(0x23); // SubId
+		writeC(_hideButtons ? 0x01 : 0x00); // Hide "Seed Purchase" button
+		writeD(_manorId); // Manor ID
+		writeD(0x00); // Unknown
+		if (_seeds == null) {
+			writeD(0);
+			return;
+		}
+		writeD(_seeds.size());
+		for (SeedProduction seed : _seeds) {
+			writeD(seed.getId()); // Seed id
+			writeQ(seed.getAmount()); // Left to buy
+			writeQ(seed.getStartAmount()); // Started amount
+			writeQ(seed.getPrice()); // Sell Price
+			final L2Seed s = CastleManorManager.getInstance().getSeed(seed.getId());
+			if (s == null) {
+				writeD(0); // Seed level
+				writeC(0x01); // Reward 1
+				writeD(0); // Reward 1 - item id
+				writeC(0x01); // Reward 2
+				writeD(0); // Reward 2 - item id
+			} else {
+				writeD(s.getLevel()); // Seed level
+				writeC(0x01); // Reward 1
+				writeD(s.getReward(1)); // Reward 1 - item id
+				writeC(0x01); // Reward 2
+				writeD(s.getReward(2)); // Reward 2 - item id
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java
new file mode 100644
index 00000000..9a768cae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedMapInfo.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
+
+public class ExShowSeedMapInfo extends L2GameServerPacket {
+	public static final ExShowSeedMapInfo STATIC_PACKET = new ExShowSeedMapInfo();
+	
+	private ExShowSeedMapInfo() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE); // Id
+		writeH(0xA1); // SubId
+		
+		writeD(2); // seed count
+		
+		// Seed of Destruction
+		writeD(-246857); // x coord
+		writeD(251960); // y coord
+		writeD(4331); // z coord
+		writeD(2770 + Math.min(GraciaSeedsManager.getInstance().getSoDState(), 3)); // sys msg id
+		
+		// Seed of Infinity
+		writeD(-213770); // x coord
+		writeD(210760); // y coord
+		writeD(4400); // z coord
+		// Manager not implemented yet
+		writeD(2766); // sys msg id
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedSetting.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedSetting.java
new file mode 100644
index 00000000..a7b208e6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSeedSetting.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.SeedProduction;
+
+/**
+ * @author l3x
+ */
+public class ExShowSeedSetting extends L2GameServerPacket {
+	private final int _manorId;
+	private final Set<L2Seed> _seeds;
+	private final Map<Integer, SeedProduction> _current = new HashMap<>();
+	private final Map<Integer, SeedProduction> _next = new HashMap<>();
+	
+	public ExShowSeedSetting(int manorId) {
+		final CastleManorManager manor = CastleManorManager.getInstance();
+		_manorId = manorId;
+		_seeds = manor.getSeedsForCastle(_manorId);
+		for (L2Seed s : _seeds) {
+			// Current period
+			SeedProduction sp = manor.getSeedProduct(manorId, s.getSeedId(), false);
+			if (sp != null) {
+				_current.put(s.getSeedId(), sp);
+			}
+			// Next period
+			sp = manor.getSeedProduct(manorId, s.getSeedId(), true);
+			if (sp != null) {
+				_next.put(s.getSeedId(), sp);
+			}
+		}
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xFE); // Id
+		writeH(0x26); // SubId
+		
+		writeD(_manorId); // manor id
+		writeD(_seeds.size()); // size
+		
+		SeedProduction sp;
+		for (L2Seed s : _seeds) {
+			writeD(s.getSeedId()); // seed id
+			writeD(s.getLevel()); // level
+			writeC(1);
+			writeD(s.getReward(1)); // reward 1 id
+			writeC(1);
+			writeD(s.getReward(2)); // reward 2 id
+			writeD(s.getSeedLimit()); // next sale limit
+			writeD(s.getSeedReferencePrice()); // price for castle to produce 1
+			writeD(s.getSeedMinPrice()); // min seed price
+			writeD(s.getSeedMaxPrice()); // max seed price
+			// Current period
+			if (_current.containsKey(s.getSeedId())) {
+				sp = _current.get(s.getSeedId());
+				writeQ(sp.getStartAmount()); // sales
+				writeQ(sp.getPrice()); // price
+			} else {
+				writeQ(0);
+				writeQ(0);
+			}
+			// Next period
+			if (_next.containsKey(s.getSeedId())) {
+				sp = _next.get(s.getSeedId());
+				writeQ(sp.getStartAmount()); // sales
+				writeQ(sp.getPrice()); // price
+			} else {
+				writeQ(0);
+				writeQ(0);
+			}
+		}
+		_current.clear();
+		_next.clear();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java
new file mode 100644
index 00000000..60c8cbe6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSellCropList.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.L2Seed;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author l3x
+ */
+public final class ExShowSellCropList extends L2GameServerPacket {
+	private final int _manorId;
+	private final Map<Integer, L2ItemInstance> _cropsItems = new HashMap<>();
+	private final Map<Integer, CropProcure> _castleCrops = new HashMap<>();
+	
+	public ExShowSellCropList(PcInventory inventory, int manorId) {
+		_manorId = manorId;
+		for (int cropId : CastleManorManager.getInstance().getCropIds()) {
+			final L2ItemInstance item = inventory.getItemByItemId(cropId);
+			if (item != null) {
+				_cropsItems.put(cropId, item);
+			}
+		}
+		
+		for (CropProcure crop : CastleManorManager.getInstance().getCropProcure(_manorId, false)) {
+			if (_cropsItems.containsKey(crop.getId()) && (crop.getAmount() > 0)) {
+				_castleCrops.put(crop.getId(), crop);
+			}
+		}
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xFE);
+		writeH(0x2C);
+		
+		writeD(_manorId); // manor id
+		writeD(_cropsItems.size()); // size
+		for (L2ItemInstance item : _cropsItems.values()) {
+			final L2Seed seed = CastleManorManager.getInstance().getSeedByCrop(item.getId());
+			writeD(item.getObjectId()); // Object id
+			writeD(item.getId()); // crop id
+			writeD(seed.getLevel()); // seed level
+			writeC(0x01);
+			writeD(seed.getReward(1)); // reward 1 id
+			writeC(0x01);
+			writeD(seed.getReward(2)); // reward 2 id
+			if (_castleCrops.containsKey(item.getId())) {
+				final CropProcure crop = _castleCrops.get(item.getId());
+				writeD(_manorId); // manor
+				writeQ(crop.getAmount()); // buy residual
+				writeQ(crop.getPrice()); // buy price
+				writeC(crop.getReward()); // reward
+			} else {
+				writeD(0xFFFFFFFF); // manor
+				writeQ(0x00); // buy residual
+				writeQ(0x00); // buy price
+				writeC(0x00); // reward
+			}
+			writeQ(item.getCount()); // my crops
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSentPostList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSentPostList.java
new file mode 100644
index 00000000..abe6e3ad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowSentPostList.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.entity.Message;
+
+/**
+ * @author Migi
+ * @author DS
+ */
+public class ExShowSentPostList extends L2GameServerPacket {
+	private final List<Message> _outbox;
+	
+	public ExShowSentPostList(int objectId) {
+		_outbox = MailManager.getInstance().getOutbox(objectId);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xAC);
+		writeD((int) (System.currentTimeMillis() / 1000));
+		if ((_outbox != null) && (_outbox.size() > 0)) {
+			writeD(_outbox.size());
+			for (Message msg : _outbox) {
+				writeD(msg.getId());
+				writeS(msg.getSubject());
+				writeS(msg.getReceiverName());
+				writeD(msg.isLocked() ? 0x01 : 0x00);
+				writeD(msg.getExpirationSeconds());
+				writeD(msg.isUnread() ? 0x01 : 0x00);
+				writeD(0x01);
+				writeD(msg.hasAttachments() ? 0x01 : 0x00);
+			}
+		} else {
+			writeD(0x00);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowTrace.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowTrace.java
new file mode 100644
index 00000000..5eb553a6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowTrace.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+
+/**
+ * This packet shows the mouse click particle for 30 seconds on every location.
+ * @author NosBit
+ */
+public final class ExShowTrace extends L2GameServerPacket {
+	private final List<Location> _locations = new ArrayList<>();
+	
+	public void addLocation(int x, int y, int z) {
+		_locations.add(new Location(x, y, z));
+	}
+	
+	public void addLocation(ILocational loc) {
+		addLocation(loc.getX(), loc.getY(), loc.getZ());
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x67);
+		
+		writeH(0); // type broken in H5
+		writeD(0); // time broken in H5
+		writeH(_locations.size());
+		for (Location loc : _locations) {
+			writeD(loc.getX());
+			writeD(loc.getY());
+			writeD(loc.getZ());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationCancelWindow.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
new file mode 100644
index 00000000..bde86e13
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationCancelWindow.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExShowVariationCancelWindow extends L2GameServerPacket {
+	public static final ExShowVariationCancelWindow STATIC_PACKET = new ExShowVariationCancelWindow();
+	
+	private ExShowVariationCancelWindow() {
+		
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x52);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationMakeWindow.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
new file mode 100644
index 00000000..13f0946a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExShowVariationMakeWindow.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Trigger packet
+ * @author KenM
+ */
+public class ExShowVariationMakeWindow extends L2GameServerPacket {
+	public static final ExShowVariationMakeWindow STATIC_PACKET = new ExShowVariationMakeWindow();
+	
+	private ExShowVariationMakeWindow() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x51);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSpawnEmitter.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSpawnEmitter.java
new file mode 100644
index 00000000..f94cdbcf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSpawnEmitter.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author KenM
+ */
+public class ExSpawnEmitter extends L2GameServerPacket {
+	private final int _playerObjectId;
+	private final int _npcObjectId;
+	
+	public ExSpawnEmitter(int playerObjectId, int npcObjectId) {
+		_playerObjectId = playerObjectId;
+		_npcObjectId = npcObjectId;
+	}
+	
+	public ExSpawnEmitter(L2PcInstance player, L2Npc npc) {
+		this(player.getObjectId(), npc.getObjectId());
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x5D);
+		
+		writeD(_npcObjectId);
+		writeD(_playerObjectId);
+		writeD(0x00); // ?
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStartScenePlayer.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStartScenePlayer.java
new file mode 100644
index 00000000..80581778
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStartScenePlayer.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author JIV
+ */
+public class ExStartScenePlayer extends L2GameServerPacket {
+	private final int _movieId;
+	
+	public ExStartScenePlayer(int id) {
+		_movieId = id;
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xFE);
+		writeH(0x99);
+		writeD(_movieId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStopMoveAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStopMoveAirShip.java
new file mode 100644
index 00000000..694d8cb0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStopMoveAirShip.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author kerberos
+ */
+public class ExStopMoveAirShip extends L2GameServerPacket {
+	private final int _objectId, _x, _y, _z, _heading;
+	
+	public ExStopMoveAirShip(L2Character ship) {
+		_objectId = ship.getObjectId();
+		_x = ship.getX();
+		_y = ship.getY();
+		_z = ship.getZ();
+		_heading = ship.getHeading();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x66);
+		writeD(_objectId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_heading);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStopMoveInAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStopMoveInAirShip.java
new file mode 100644
index 00000000..23a93ea2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStopMoveInAirShip.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author kerberos
+ * @author JIV
+ * @since 08/27/2010
+ */
+public class ExStopMoveInAirShip extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final int _shipObjId;
+	private final int x, y, z, h;
+	
+	public ExStopMoveInAirShip(L2PcInstance player, int shipObjId) {
+		_activeChar = player;
+		_shipObjId = shipObjId;
+		x = player.getInVehiclePosition().getX();
+		y = player.getInVehiclePosition().getY();
+		z = player.getInVehiclePosition().getZ();
+		h = player.getHeading();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xfe);
+		writeH(0x6e);
+		writeD(_activeChar.getObjectId());
+		writeD(_shipObjId);
+		writeD(x);
+		writeD(y);
+		writeD(z);
+		writeD(h);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java
new file mode 100644
index 00000000..d200c8e5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExStorageMaxCount.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * @author -Wooden-
+ * @author KenM
+ */
+public class ExStorageMaxCount extends L2GameServerPacket {
+	private final int _inventory;
+	private final int _warehouse;
+	private final int _clan;
+	private final int _privateSell;
+	private final int _privateBuy;
+	private final int _recipeD;
+	private final int _recipe;
+	private final int _inventoryExtraSlots;
+	private final int _inventoryQuestItems;
+	
+	public ExStorageMaxCount(L2PcInstance activeChar) {
+		_inventory = activeChar.getInventoryLimit();
+		_warehouse = activeChar.getWareHouseLimit();
+		_privateSell = activeChar.getPrivateSellStoreLimit();
+		_privateBuy = activeChar.getPrivateBuyStoreLimit();
+		_clan = character().getMaximumWarehouseSlotsForClan();
+		_recipeD = activeChar.getDwarfRecipeLimit();
+		_recipe = activeChar.getCommonRecipeLimit();
+		_inventoryExtraSlots = (int) activeChar.getStat().calcStat(Stats.INV_LIM, 0, null, null);
+		_inventoryQuestItems = character().getMaximumSlotsForQuestItems();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x2F);
+		
+		writeD(_inventory);
+		writeD(_warehouse);
+		writeD(_clan);
+		writeD(_privateSell);
+		writeD(_privateBuy);
+		writeD(_recipeD);
+		writeD(_recipe);
+		writeD(_inventoryExtraSlots); // Belt inventory slots increase count
+		writeD(_inventoryQuestItems);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
new file mode 100644
index 00000000..3da29b35
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExSubPledgeSkillAdd.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author VISTALL
+ */
+public class ExSubPledgeSkillAdd extends L2GameServerPacket {
+	private final int _type;
+	private final int _skillId;
+	private final int _skillLevel;
+	
+	public ExSubPledgeSkillAdd(int type, int skillId, int skillLevel) {
+		_type = type;
+		_skillId = skillId;
+		_skillLevel = skillLevel;
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xFE);
+		writeH(0x76);
+		writeD(_type);
+		writeD(_skillId);
+		writeD(_skillLevel);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java
new file mode 100644
index 00000000..1c2d5100
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExUISetting.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.ActionKey;
+import com.l2jserver.gameserver.model.UIKeysSettings;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author mrTJO
+ */
+public class ExUISetting extends L2GameServerPacket {
+	private final UIKeysSettings _uiSettings;
+	private int buffsize, categories;
+	
+	public ExUISetting(L2PcInstance player) {
+		_uiSettings = player.getUISettings();
+		calcSize();
+	}
+	
+	private void calcSize() {
+		int size = 16; // initial header and footer
+		int category = 0;
+		int numKeyCt = _uiSettings.getKeys().size();
+		for (int i = 0; i < numKeyCt; i++) {
+			size++;
+			if (_uiSettings.getCategories().containsKey(category)) {
+				List<Integer> catElList1 = _uiSettings.getCategories().get(category);
+				size = size + catElList1.size();
+			}
+			category++;
+			size++;
+			if (_uiSettings.getCategories().containsKey(category)) {
+				List<Integer> catElList2 = _uiSettings.getCategories().get(category);
+				size = size + catElList2.size();
+			}
+			category++;
+			size = size + 4;
+			if (_uiSettings.getKeys().containsKey(i)) {
+				List<ActionKey> keyElList = _uiSettings.getKeys().get(i);
+				size = size + (keyElList.size() * 20);
+			}
+		}
+		buffsize = size;
+		categories = category;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x70);
+		
+		writeD(buffsize);
+		writeD(categories);
+		
+		int category = 0;
+		
+		int numKeyCt = _uiSettings.getKeys().size();
+		writeD(numKeyCt);
+		for (int i = 0; i < numKeyCt; i++) {
+			if (_uiSettings.getCategories().containsKey(category)) {
+				List<Integer> catElList1 = _uiSettings.getCategories().get(category);
+				writeC(catElList1.size());
+				for (int cmd : catElList1) {
+					writeC(cmd);
+				}
+			} else {
+				writeC(0x00);
+			}
+			category++;
+			
+			if (_uiSettings.getCategories().containsKey(category)) {
+				List<Integer> catElList2 = _uiSettings.getCategories().get(category);
+				writeC(catElList2.size());
+				for (int cmd : catElList2) {
+					writeC(cmd);
+				}
+			} else {
+				writeC(0x00);
+			}
+			category++;
+			
+			if (_uiSettings.getKeys().containsKey(i)) {
+				List<ActionKey> keyElList = _uiSettings.getKeys().get(i);
+				writeD(keyElList.size());
+				for (ActionKey akey : keyElList) {
+					writeD(akey.getCommandId());
+					writeD(akey.getKeyId());
+					writeD(akey.getToggleKey1());
+					writeD(akey.getToggleKey2());
+					writeD(akey.getShowStatus());
+				}
+			} else {
+				writeD(0x00);
+			}
+		}
+		writeD(0x11);
+		writeD(0x10);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExUseSharedGroupItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExUseSharedGroupItem.java
new file mode 100644
index 00000000..0f8a684d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExUseSharedGroupItem.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author KenM
+ */
+public class ExUseSharedGroupItem extends L2GameServerPacket {
+	private final int _itemId;
+	private final int _grpId;
+	private final int _remainingTime;
+	private final int _totalTime;
+	
+	public ExUseSharedGroupItem(int itemId, int grpId, long remainingTime, int totalTime) {
+		_itemId = itemId;
+		_grpId = grpId;
+		_remainingTime = (int) (remainingTime / 1000);
+		_totalTime = totalTime / 1000;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x4A);
+		
+		writeD(_itemId);
+		writeD(_grpId);
+		writeD(_remainingTime);
+		writeD(_totalTime);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExValidateLocationInAirShip.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
new file mode 100644
index 00000000..33ff8093
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExValidateLocationInAirShip.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * update 27.8.10
+ * @author kerberos
+ * @author JIV
+ */
+public class ExValidateLocationInAirShip extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final int shipId, x, y, z, h;
+	
+	public ExValidateLocationInAirShip(L2PcInstance player) {
+		_activeChar = player;
+		shipId = _activeChar.getAirShip().getObjectId();
+		x = player.getInVehiclePosition().getX();
+		y = player.getInVehiclePosition().getY();
+		z = player.getInVehiclePosition().getZ();
+		h = player.getHeading();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xfe);
+		writeH(0x6F);
+		writeD(_activeChar.getObjectId());
+		writeD(shipId);
+		writeD(x);
+		writeD(y);
+		writeD(z);
+		writeD(h);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVariationCancelResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVariationCancelResult.java
new file mode 100644
index 00000000..a22af4f4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVariationCancelResult.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ExVariationCancelResult extends L2GameServerPacket {
+	private final int _result;
+	
+	public ExVariationCancelResult(int result) {
+		_result = result;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x58);
+		writeD(_result);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVariationResult.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVariationResult.java
new file mode 100644
index 00000000..61153387
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVariationResult.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Format: (ch)ddd
+ */
+public class ExVariationResult extends L2GameServerPacket {
+	private final int _stat12;
+	private final int _stat34;
+	private final int _unk3;
+	
+	public ExVariationResult(int unk1, int unk2, int unk3) {
+		_stat12 = unk1;
+		_stat34 = unk2;
+		_unk3 = unk3;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x56);
+		writeD(_stat12);
+		writeD(_stat34);
+		writeD(_unk3);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVitalityPointInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVitalityPointInfo.java
new file mode 100644
index 00000000..0b34acb0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVitalityPointInfo.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author GodKratos
+ */
+public class ExVitalityPointInfo extends L2GameServerPacket {
+	private final int _vitalityPoints;
+	
+	public ExVitalityPointInfo(int vitPoints) {
+		_vitalityPoints = vitPoints;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xA0);
+		writeD(_vitalityPoints);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVoteSystemInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVoteSystemInfo.java
new file mode 100644
index 00000000..7132b726
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ExVoteSystemInfo.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Objects;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * ExVoteSystemInfo packet implementation.
+ * @author Gnacik
+ */
+public class ExVoteSystemInfo extends L2GameServerPacket {
+	private final L2PcInstance _player;
+	
+	public ExVoteSystemInfo(L2PcInstance player) {
+		Objects.requireNonNull(player);
+		_player = player;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xC9);
+		writeD(_player.getRecSystem().getLeft());
+		writeD(_player.getRecSystem().getHave());
+		writeD(_player.getRecSystem().getBonusTime());
+		writeD(_player.getRecSystem().getBonus());
+		writeD(_player.getRecSystem().isBonusPaused() ? 0x01 : 0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/FlyToLocation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FlyToLocation.java
new file mode 100644
index 00000000..14a23486
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FlyToLocation.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+
+/**
+ * @author KenM
+ */
+public final class FlyToLocation extends L2GameServerPacket {
+	private final int _destX, _destY, _destZ;
+	private final int _chaObjId, _chaX, _chaY, _chaZ;
+	private final FlyType _type;
+	
+	public enum FlyType {
+		THROW_UP,
+		THROW_HORIZONTAL,
+		DUMMY, // no effect
+		CHARGE;
+	}
+	
+	public FlyToLocation(L2Character cha, int destX, int destY, int destZ, FlyType type) {
+		_chaObjId = cha.getObjectId();
+		_chaX = cha.getX();
+		_chaY = cha.getY();
+		_chaZ = cha.getZ();
+		_destX = destX;
+		_destY = destY;
+		_destZ = destZ;
+		_type = type;
+	}
+	
+	public FlyToLocation(L2Character cha, ILocational dest, FlyType type) {
+		this(cha, dest.getX(), dest.getY(), dest.getZ(), type);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xD4);
+		writeD(_chaObjId);
+		writeD(_destX);
+		writeD(_destY);
+		writeD(_destZ);
+		writeD(_chaX);
+		writeD(_chaY);
+		writeD(_chaZ);
+		writeD(_type.ordinal());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java
new file mode 100644
index 00000000..71a53af7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendAddRequest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class FriendAddRequest extends L2GameServerPacket {
+	private final String _requesterName;
+	
+	public FriendAddRequest(String requesterName) {
+		_requesterName = requesterName;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x83);
+		writeS(_requesterName);
+		writeD(0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendList.java
new file mode 100644
index 00000000..fee9edf6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendList.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Support for "Chat with Friends" dialog. <br />
+ * This packet is sent only at login.
+ * @author Tempy
+ */
+public class FriendList extends L2GameServerPacket {
+	private final List<FriendInfo> _info;
+	
+	private static class FriendInfo {
+		int _objId;
+		String _name;
+		boolean _online;
+		
+		public FriendInfo(int objId, String name, boolean online) {
+			_objId = objId;
+			_name = name;
+			_online = online;
+		}
+	}
+	
+	public FriendList(L2PcInstance player) {
+		if (!player.hasFriends()) {
+			_info = Collections.emptyList();
+			return;
+		}
+		
+		_info = new ArrayList<>(player.getFriends().size());
+		for (int objId : player.getFriends()) {
+			final String name = CharNameTable.getInstance().getNameById(objId);
+			final L2PcInstance friend = L2World.getInstance().getPlayer(objId);
+			final boolean online = (friend != null) && friend.isOnline();
+			_info.add(new FriendInfo(objId, name, online));
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x75);
+		writeD(_info.size());
+		for (FriendInfo info : _info) {
+			writeD(info._objId); // character id
+			writeS(info._name);
+			writeD(info._online ? 0x01 : 0x00); // online
+			writeD(info._online ? info._objId : 0x00); // object id if online
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendListExtended.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendListExtended.java
new file mode 100644
index 00000000..3b13acc9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendListExtended.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Support for "Chat with Friends" dialog. <br />
+ * This packet is sent only at login.
+ * @author mrTJO
+ * @author UnAfraid
+ */
+public class FriendListExtended extends L2GameServerPacket {
+	
+	private final List<FriendInfo> _info;
+	
+	private static class FriendInfo {
+		int _objId;
+		String _name;
+		boolean _online;
+		int _classid;
+		int _level;
+		
+		FriendInfo(int objId, String name, boolean online, int classid, int level) {
+			_objId = objId;
+			_name = name;
+			_online = online;
+			_classid = classid;
+			_level = level;
+		}
+	}
+	
+	public FriendListExtended(L2PcInstance player) {
+		if (!player.hasFriends()) {
+			_info = Collections.emptyList();
+			return;
+		}
+		
+		_info = new ArrayList<>(player.getFriends().size());
+		for (int objId : player.getFriends()) {
+			String name = CharNameTable.getInstance().getNameById(objId);
+			final L2PcInstance friend = L2World.getInstance().getPlayer(objId);
+			if (friend == null) {
+				try (var con = ConnectionFactory.getInstance().getConnection();
+					var statement = con.prepareStatement("SELECT char_name, online, classid, level FROM characters WHERE charId = ?")) {
+					statement.setInt(1, objId);
+					try (var rs = statement.executeQuery()) {
+						if (rs.next()) {
+							_info.add(new FriendInfo(objId, rs.getString(1), rs.getInt(2) == 1, rs.getInt(3), rs.getInt(4)));
+						}
+					}
+				} catch (Exception e) {
+					// Who cares?
+				}
+				continue;
+			}
+			_info.add(new FriendInfo(objId, name, friend.isOnline(), friend.getClassId().getId(), friend.getLevel()));
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x58);
+		writeD(_info.size());
+		for (FriendInfo info : _info) {
+			writeD(info._objId); // character id
+			writeS(info._name);
+			writeD(info._online ? 0x01 : 0x00); // online
+			writeD(info._online ? info._objId : 0x00); // object id if online
+			writeD(info._classid);
+			writeD(info._level);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendPacket.java
new file mode 100644
index 00000000..6ae298bc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendPacket.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.L2World;
+
+/**
+ * Support for "Chat with Friends" dialog. <br />
+ * Add new friend or delete.
+ * @author JIV
+ */
+public class FriendPacket extends L2GameServerPacket {
+	private final boolean _action, _online;
+	private final int _objid;
+	private final String _name;
+	
+	/**
+	 * @param action - true for adding, false for remove
+	 * @param objId
+	 */
+	public FriendPacket(boolean action, int objId) {
+		_action = action;
+		_objid = objId;
+		_name = CharNameTable.getInstance().getNameById(objId);
+		_online = L2World.getInstance().getPlayer(objId) != null;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x76);
+		writeD(_action ? 1 : 3); // 1-add 3-remove
+		writeD(_objid);
+		writeS(_name);
+		writeD(_online ? 1 : 0);
+		writeD(_online ? _objid : 0);
+		
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendStatusPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendStatusPacket.java
new file mode 100644
index 00000000..e8eff96a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/FriendStatusPacket.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
+import com.l2jserver.gameserver.model.L2World;
+
+/**
+ * Support for "Chat with Friends" dialog. <br />
+ * Inform player about friend online status change
+ * @author JIV
+ */
+public class FriendStatusPacket extends L2GameServerPacket {
+	private final boolean _online;
+	private final int _objid;
+	private final String _name;
+	
+	public FriendStatusPacket(int objId) {
+		_objid = objId;
+		_name = CharNameTable.getInstance().getNameById(objId);
+		_online = L2World.getInstance().getPlayer(objId) != null;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x77);
+		writeD(_online ? 1 : 0);
+		writeS(_name);
+		writeD(_objid);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java
new file mode 100644
index 00000000..9200d05d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMHennaInfo.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * This server packet sends the player's henna information using the Game Master's UI.
+ * @author KenM
+ * @author Zoey76
+ */
+public final class GMHennaInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final List<L2Henna> _hennas = new ArrayList<>();
+	
+	public GMHennaInfo(L2PcInstance player) {
+		_activeChar = player;
+		for (L2Henna henna : _activeChar.getHennaList()) {
+			if (henna != null) {
+				_hennas.add(henna);
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xF0);
+		writeC(_activeChar.getHennaStatINT()); // equip INT
+		writeC(_activeChar.getHennaStatSTR()); // equip STR
+		writeC(_activeChar.getHennaStatCON()); // equip CON
+		writeC(_activeChar.getHennaStatMEN()); // equip MEN
+		writeC(_activeChar.getHennaStatDEX()); // equip DEX
+		writeC(_activeChar.getHennaStatWIT()); // equip WIT
+		writeD(3); // Slots
+		writeD(_hennas.size()); // Size
+		for (L2Henna henna : _hennas) {
+			writeD(henna.getDyeId());
+			writeD(0x01);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMHide.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMHide.java
new file mode 100644
index 00000000..0422a55e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMHide.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Kerberos
+ */
+@Deprecated
+public class GMHide extends L2GameServerPacket {
+	private final int _mode;
+	
+	/**
+	 * @param mode (0 = display windows, 1 = hide windows)
+	 */
+	public GMHide(int mode) {
+		_mode = mode;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x93);
+		writeD(_mode);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java
new file mode 100644
index 00000000..415a7d3f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewCharacterInfo.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class GMViewCharacterInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final int _runSpd, _walkSpd;
+	private final int _swimRunSpd, _swimWalkSpd;
+	private final int _flyRunSpd, _flyWalkSpd;
+	private final double _moveMultiplier;
+	
+	public GMViewCharacterInfo(L2PcInstance cha) {
+		_activeChar = cha;
+		_moveMultiplier = cha.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(cha.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(cha.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(cha.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(cha.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = cha.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = cha.isFlying() ? _walkSpd : 0;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x95);
+		
+		writeD(_activeChar.getX());
+		writeD(_activeChar.getY());
+		writeD(_activeChar.getZ());
+		writeD(_activeChar.getHeading());
+		writeD(_activeChar.getObjectId());
+		writeS(_activeChar.getName());
+		writeD(_activeChar.getRace().ordinal());
+		writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
+		writeD(_activeChar.getClassId().getId());
+		writeD(_activeChar.getLevel());
+		writeQ(_activeChar.getExp());
+		writeF(ExperienceData.getInstance().getPercentFromCurrentLevel(_activeChar.getExp(), _activeChar.getLevel()));
+		writeD(_activeChar.getSTR());
+		writeD(_activeChar.getDEX());
+		writeD(_activeChar.getCON());
+		writeD(_activeChar.getINT());
+		writeD(_activeChar.getWIT());
+		writeD(_activeChar.getMEN());
+		writeD(_activeChar.getMaxHp());
+		writeD((int) _activeChar.getCurrentHp());
+		writeD(_activeChar.getMaxMp());
+		writeD((int) _activeChar.getCurrentMp());
+		writeD(_activeChar.getSp());
+		writeD(_activeChar.getCurrentLoad());
+		writeD(_activeChar.getMaxLoad());
+		writeD(_activeChar.getPkKills());
+		
+		for (int slot : getPaperdollOrder()) {
+			writeD(_activeChar.getInventory().getPaperdollObjectId(slot));
+		}
+		
+		for (int slot : getPaperdollOrder()) {
+			writeD(_activeChar.getInventory().getPaperdollItemDisplayId(slot));
+		}
+		
+		for (int slot : getPaperdollOrder()) {
+			writeD(_activeChar.getInventory().getPaperdollAugmentationId(slot));
+		}
+		
+		writeD(_activeChar.getInventory().getTalismanSlots()); // CT2.3
+		writeD(_activeChar.getInventory().canEquipCloak() ? 1 : 0); // CT2.3
+		writeD((int) _activeChar.getPAtk(null));
+		writeD((int) _activeChar.getPAtkSpd());
+		writeD((int) _activeChar.getPDef(null));
+		writeD(_activeChar.getEvasionRate(null));
+		writeD(_activeChar.getAccuracy());
+		writeD(_activeChar.getCriticalHit(null, null));
+		writeD((int) _activeChar.getMAtk(null, null));
+		
+		writeD(_activeChar.getMAtkSpd());
+		writeD((int) _activeChar.getPAtkSpd());
+		
+		writeD((int) _activeChar.getMDef(null, null));
+		
+		writeD(_activeChar.getPvpFlag()); // 0-non-pvp 1-pvp = violet name
+		writeD(_activeChar.getKarma());
+		
+		writeD(_runSpd);
+		writeD(_walkSpd);
+		writeD(_swimRunSpd);
+		writeD(_swimWalkSpd);
+		writeD(_flyRunSpd);
+		writeD(_flyWalkSpd);
+		writeD(_flyRunSpd);
+		writeD(_flyWalkSpd);
+		writeF(_moveMultiplier);
+		writeF(_activeChar.getAttackSpeedMultiplier()); // 2.9);//
+		writeF(_activeChar.getCollisionRadius()); // scale
+		writeF(_activeChar.getCollisionHeight()); // y offset ??!? fem dwarf 4033
+		writeD(_activeChar.getAppearance().getHairStyle());
+		writeD(_activeChar.getAppearance().getHairColor());
+		writeD(_activeChar.getAppearance().getFace());
+		writeD(_activeChar.isGM() ? 0x01 : 0x00); // builder level
+		
+		writeS(_activeChar.getTitle());
+		writeD(_activeChar.getClanId()); // pledge id
+		writeD(_activeChar.getClanCrestId()); // pledge crest id
+		writeD(_activeChar.getAllyId()); // ally id
+		writeC(_activeChar.getMountType().ordinal()); // mount type
+		writeC(_activeChar.getPrivateStoreType().getId());
+		writeC(_activeChar.hasDwarvenCraft() ? 1 : 0);
+		writeD(_activeChar.getPkKills());
+		writeD(_activeChar.getPvpKills());
+		
+		writeH(_activeChar.getRecSystem().getLeft());
+		writeH(_activeChar.getRecSystem().getHave()); // Blue value for name (0 = white, 255 = pure blue)
+		writeD(_activeChar.getClassId().getId());
+		writeD(0x00); // special effects? circles around player...
+		writeD(_activeChar.getMaxCp());
+		writeD((int) _activeChar.getCurrentCp());
+		
+		writeC(_activeChar.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window
+		
+		writeC(321);
+		
+		writeD(_activeChar.getPledgeClass()); // changes the text above CP on Status Window
+		
+		writeC(_activeChar.isNoble() ? 0x01 : 0x00);
+		writeC(_activeChar.isHero() ? 0x01 : 0x00);
+		
+		writeD(_activeChar.getAppearance().getNameColor());
+		writeD(_activeChar.getAppearance().getTitleColor());
+		
+		byte attackAttribute = _activeChar.getAttackElement();
+		writeH(attackAttribute);
+		writeH(_activeChar.getAttackElementValue(attackAttribute));
+		for (byte i = 0; i < 6; i++) {
+			writeH(_activeChar.getDefenseElementValue(i));
+		}
+		writeD(_activeChar.getFame());
+		writeD(_activeChar.getVitalityPoints());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewItemList.java
new file mode 100644
index 00000000..b23b935d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewItemList.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class GMViewItemList extends AbstractItemPacket {
+	private final List<L2ItemInstance> _items = new ArrayList<>();
+	private final int _limit;
+	private final String _playerName;
+	
+	public GMViewItemList(L2PcInstance cha) {
+		_playerName = cha.getName();
+		_limit = cha.getInventoryLimit();
+		Collections.addAll(_items, cha.getInventory().getItems());
+	}
+	
+	public GMViewItemList(L2PetInstance cha) {
+		_playerName = cha.getName();
+		_limit = cha.getInventoryLimit();
+		_items.addAll(Arrays.asList(cha.getInventory().getItems()));
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x9a);
+		writeS(_playerName);
+		writeD(_limit); // inventory limit
+		writeH(0x01); // show window ??
+		writeH(_items.size());
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java
new file mode 100644
index 00000000..5723d181
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewPledgeInfo.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class GMViewPledgeInfo extends L2GameServerPacket {
+	private final L2Clan _clan;
+	private final L2PcInstance _activeChar;
+	
+	public GMViewPledgeInfo(L2Clan clan, L2PcInstance activeChar) {
+		_clan = clan;
+		_activeChar = activeChar;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x96);
+		writeS(_activeChar.getName());
+		writeD(_clan.getId());
+		writeD(0x00);
+		writeS(_clan.getName());
+		writeS(_clan.getLeaderName());
+		writeD(_clan.getCrestId()); // -> no, it's no longer used (nuocnam) fix by game
+		writeD(_clan.getLevel());
+		writeD(_clan.getCastleId());
+		writeD(_clan.getHideoutId());
+		writeD(_clan.getFortId());
+		writeD(_clan.getRank());
+		writeD(_clan.getReputationScore());
+		writeD(0x00);
+		writeD(0x00);
+		
+		writeD(_clan.getAllyId()); // c2
+		writeS(_clan.getAllyName()); // c2
+		writeD(_clan.getAllyCrestId()); // c2
+		writeD(_clan.isAtWar() ? 1 : 0); // c3
+		writeD(0x00); // T3 Unknown
+		writeD(_clan.getMembers().length);
+		
+		for (L2ClanMember member : _clan.getMembers()) {
+			if (member != null) {
+				writeS(member.getName());
+				writeD(member.getLevel());
+				writeD(member.getClassId());
+				writeD(member.getSex() ? 1 : 0);
+				writeD(member.getRaceOrdinal());
+				writeD(member.isOnline() ? member.getObjectId() : 0);
+				writeD(member.getSponsor() != 0 ? 1 : 0);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java
new file mode 100644
index 00000000..93e9ffd3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewSkillInfo.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+public class GMViewSkillInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final Collection<Skill> _skills;
+	
+	public GMViewSkillInfo(L2PcInstance cha) {
+		_activeChar = cha;
+		_skills = _activeChar.getAllSkills();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x97);
+		writeS(_activeChar.getName());
+		writeD(_skills.size());
+		
+		boolean isDisabled = (_activeChar.getClan() != null) && (_activeChar.getClan().getReputationScore() < 0);
+		
+		for (Skill skill : _skills) {
+			writeD(skill.isPassive() ? 1 : 0);
+			writeD(skill.getDisplayLevel());
+			writeD(skill.getDisplayId());
+			writeC(isDisabled && skill.isClanSkill() ? 1 : 0);
+			writeC(SkillData.getInstance().isEnchantable(skill.getDisplayId()) ? 1 : 0);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
new file mode 100644
index 00000000..85467be4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GMViewWarehouseWithdrawList.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class GMViewWarehouseWithdrawList extends AbstractItemPacket {
+	private final L2ItemInstance[] _items;
+	private final String _playerName;
+	private final long _money;
+	
+	public GMViewWarehouseWithdrawList(L2PcInstance cha) {
+		_items = cha.getWarehouse().getItems();
+		_playerName = cha.getName();
+		_money = cha.getWarehouse().getAdena();
+	}
+	
+	public GMViewWarehouseWithdrawList(L2Clan clan) {
+		_playerName = clan.getLeaderName();
+		_items = clan.getWarehouse().getItems();
+		_money = clan.getWarehouse().getAdena();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x9b);
+		writeS(_playerName);
+		writeQ(_money);
+		writeH(_items.length);
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+			writeD(item.getObjectId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java
new file mode 100644
index 00000000..5c96af54
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GameGuardQuery.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Lets drink to code!
+ * @author zabbix
+ */
+public class GameGuardQuery extends L2GameServerPacket {
+	public static final GameGuardQuery STATIC_PACKET = new GameGuardQuery();
+	
+	private GameGuardQuery() {
+		
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0x74);
+		writeD(0x27533DD9);
+		writeD(0x2E72A51D);
+		writeD(0x2017038B);
+		writeD(0xC35B1EA3);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetItem.java
new file mode 100644
index 00000000..444c2c42
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetItem.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class GetItem extends L2GameServerPacket {
+	private final L2ItemInstance _item;
+	private final int _playerId;
+	
+	public GetItem(L2ItemInstance item, int playerId) {
+		_item = item;
+		_playerId = playerId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x17);
+		writeD(_playerId);
+		writeD(_item.getObjectId());
+		
+		writeD(_item.getX());
+		writeD(_item.getY());
+		writeD(_item.getZ());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetOffVehicle.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetOffVehicle.java
new file mode 100644
index 00000000..1acde271
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetOffVehicle.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Maktakien
+ */
+public class GetOffVehicle extends L2GameServerPacket {
+	private final int _charObjId, _boatObjId, _x, _y, _z;
+	
+	public GetOffVehicle(int charObjId, int boatObjId, int x, int y, int z) {
+		_charObjId = charObjId;
+		_boatObjId = boatObjId;
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x6f);
+		writeD(_charObjId);
+		writeD(_boatObjId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetOnVehicle.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetOnVehicle.java
new file mode 100644
index 00000000..02e53836
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GetOnVehicle.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * @author Maktakien
+ */
+public class GetOnVehicle extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _boatObjId;
+	private final Location _pos;
+	
+	public GetOnVehicle(int charObjId, int boatObjId, Location pos) {
+		_charObjId = charObjId;
+		_boatObjId = boatObjId;
+		_pos = pos;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x6e);
+		writeD(_charObjId);
+		writeD(_boatObjId);
+		writeD(_pos.getX());
+		writeD(_pos.getY());
+		writeD(_pos.getZ());
+		
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java
new file mode 100644
index 00000000..f2a0dbe9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/GmViewQuestInfo.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+
+/**
+ * @author Tempy
+ */
+public class GmViewQuestInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	
+	public GmViewQuestInfo(L2PcInstance cha) {
+		_activeChar = cha;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x99);
+		writeS(_activeChar.getName());
+		
+		final List<Quest> questList = _activeChar.getAllActiveQuests();
+		
+		if (questList.size() == 0) {
+			writeC(0);
+			writeH(0);
+			writeH(0);
+			return;
+		}
+		
+		writeH(questList.size()); // quest count
+		
+		for (Quest q : questList) {
+			writeD(q.getId());
+			
+			QuestState qs = _activeChar.getQuestState(q.getName());
+			
+			if (qs == null) {
+				writeD(0);
+				continue;
+			}
+			
+			writeD(qs.getInt("cond")); // stage of quest progress
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java
new file mode 100644
index 00000000..459c9b44
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaEquipList.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.data.xml.impl.HennaData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * @author Zoey76
+ */
+public class HennaEquipList extends L2GameServerPacket {
+	private final L2PcInstance _player;
+	private final List<L2Henna> _hennaEquipList;
+	
+	public HennaEquipList(L2PcInstance player) {
+		_player = player;
+		_hennaEquipList = HennaData.getInstance().getHennaList(player.getClassId());
+	}
+	
+	public HennaEquipList(L2PcInstance player, List<L2Henna> list) {
+		_player = player;
+		_hennaEquipList = list;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xEE);
+		writeQ(_player.getAdena()); // activeChar current amount of Adena
+		writeD(3); // available equip slot
+		writeD(_hennaEquipList.size());
+		
+		for (L2Henna henna : _hennaEquipList) {
+			// Player must have at least one dye in inventory
+			// to be able to see the Henna that can be applied with it.
+			if ((_player.getInventory().getItemByItemId(henna.getDyeItemId())) != null) {
+				writeD(henna.getDyeId()); // dye Id
+				writeD(henna.getDyeItemId()); // item Id of the dye
+				writeQ(henna.getWearCount()); // amount of dyes required
+				writeQ(henna.getWearFee()); // amount of Adena required
+				writeD(henna.isAllowedClass(_player.getClassId()) ? 0x01 : 0x00); // meet the requirement or not
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java
new file mode 100644
index 00000000..a96e16b2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaInfo.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * This server packet sends the player's henna information.
+ * @author Zoey76
+ */
+public final class HennaInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final List<L2Henna> _hennas = new ArrayList<>();
+	
+	public HennaInfo(L2PcInstance player) {
+		_activeChar = player;
+		for (L2Henna henna : _activeChar.getHennaList()) {
+			if (henna != null) {
+				_hennas.add(henna);
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xE5);
+		writeC(_activeChar.getHennaStatINT()); // equip INT
+		writeC(_activeChar.getHennaStatSTR()); // equip STR
+		writeC(_activeChar.getHennaStatCON()); // equip CON
+		writeC(_activeChar.getHennaStatMEN()); // equip MEN
+		writeC(_activeChar.getHennaStatDEX()); // equip DEX
+		writeC(_activeChar.getHennaStatWIT()); // equip WIT
+		writeD(3); // Slots
+		writeD(_hennas.size()); // Size
+		for (L2Henna henna : _hennas) {
+			writeD(henna.getDyeId());
+			writeD(0x01);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java
new file mode 100644
index 00000000..ba3cf8bc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaItemDrawInfo.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * @author Zoey76
+ */
+public class HennaItemDrawInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final L2Henna _henna;
+	
+	public HennaItemDrawInfo(L2Henna henna, L2PcInstance player) {
+		_henna = henna;
+		_activeChar = player;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xE4);
+		writeD(_henna.getDyeId()); // symbol Id
+		writeD(_henna.getDyeItemId()); // item id of dye
+		writeQ(_henna.getWearCount()); // total amount of dye require
+		writeQ(_henna.getWearFee()); // total amount of Adena require to draw symbol
+		writeD(_henna.isAllowedClass(_activeChar.getClassId()) ? 0x01 : 0x00); // able to draw or not 0 is false and 1 is true
+		writeQ(_activeChar.getAdena());
+		writeD(_activeChar.getINT()); // current INT
+		writeC(_activeChar.getINT() + _henna.getStatINT()); // equip INT
+		writeD(_activeChar.getSTR()); // current STR
+		writeC(_activeChar.getSTR() + _henna.getStatSTR()); // equip STR
+		writeD(_activeChar.getCON()); // current CON
+		writeC(_activeChar.getCON() + _henna.getStatCON()); // equip CON
+		writeD(_activeChar.getMEN()); // current MEN
+		writeC(_activeChar.getMEN() + _henna.getStatMEN()); // equip MEN
+		writeD(_activeChar.getDEX()); // current DEX
+		writeC(_activeChar.getDEX() + _henna.getStatDEX()); // equip DEX
+		writeD(_activeChar.getWIT()); // current WIT
+		writeC(_activeChar.getWIT() + _henna.getStatWIT()); // equip WIT
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java
new file mode 100644
index 00000000..c2a7573a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaItemRemoveInfo.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * @author Zoey76
+ */
+public final class HennaItemRemoveInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final L2Henna _henna;
+	
+	public HennaItemRemoveInfo(L2Henna henna, L2PcInstance player) {
+		_henna = henna;
+		_activeChar = player;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xE7);
+		writeD(_henna.getDyeId()); // symbol Id
+		writeD(_henna.getDyeItemId()); // item id of dye
+		writeQ(_henna.getCancelCount()); // total amount of dye require
+		writeQ(_henna.getCancelFee()); // total amount of Adena require to remove symbol
+		writeD(_henna.isAllowedClass(_activeChar.getClassId()) ? 0x01 : 0x00); // able to remove or not
+		writeQ(_activeChar.getAdena());
+		writeD(_activeChar.getINT()); // current INT
+		writeC(_activeChar.getINT() - _henna.getStatINT()); // equip INT
+		writeD(_activeChar.getSTR()); // current STR
+		writeC(_activeChar.getSTR() - _henna.getStatSTR()); // equip STR
+		writeD(_activeChar.getCON()); // current CON
+		writeC(_activeChar.getCON() - _henna.getStatCON()); // equip CON
+		writeD(_activeChar.getMEN()); // current MEN
+		writeC(_activeChar.getMEN() - _henna.getStatMEN()); // equip MEN
+		writeD(_activeChar.getDEX()); // current DEX
+		writeC(_activeChar.getDEX() - _henna.getStatDEX()); // equip DEX
+		writeD(_activeChar.getWIT()); // current WIT
+		writeC(_activeChar.getWIT() - _henna.getStatWIT()); // equip WIT
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java
new file mode 100644
index 00000000..96a547ce
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/HennaRemoveList.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2Henna;
+
+/**
+ * @author Zoey76
+ */
+public class HennaRemoveList extends L2GameServerPacket {
+	private final L2PcInstance _player;
+	
+	public HennaRemoveList(L2PcInstance player) {
+		_player = player;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xE6);
+		writeQ(_player.getAdena());
+		writeD(0x00);
+		writeD(3 - _player.getHennaEmptySlots());
+		
+		for (L2Henna henna : _player.getHennaList()) {
+			if (henna != null) {
+				writeD(henna.getDyeId());
+				writeD(henna.getDyeItemId());
+				writeD(henna.getCancelCount());
+				writeD(0x00);
+				writeD(henna.getCancelFee());
+				writeD(0x00);
+				writeD(0x01);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/InventoryUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/InventoryUpdate.java
new file mode 100644
index 00000000..69e51c3a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/InventoryUpdate.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Advi
+ * @author UnAfraid
+ */
+public class InventoryUpdate extends AbstractInventoryUpdate {
+	public InventoryUpdate() {
+	}
+	
+	public InventoryUpdate(L2ItemInstance item) {
+		super(item);
+	}
+	
+	public InventoryUpdate(List<ItemInfo> items) {
+		super(items);
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x21);
+		writeItems();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ItemList.java
new file mode 100644
index 00000000..28129f47
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ItemList.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.l2jserver.gameserver.agathion.repository.AgathionRepository;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * Item List server packet.
+ * @author Zoey76
+ * @version 2.6.2.0
+ */
+public final class ItemList extends AbstractItemPacket {
+	
+	private final L2PcInstance player;
+	
+	private final List<L2ItemInstance> items = new LinkedList<>();
+	
+	private final List<L2ItemInstance> agathions = new LinkedList<>();
+	
+	private final boolean showWindow;
+	
+	public ItemList(L2PcInstance player, boolean showWindow) {
+		this.player = player;
+		this.showWindow = showWindow;
+		
+		for (var item : player.getInventory().getItems()) {
+			if (!item.isQuestItem()) {
+				items.add(item);
+			}
+			
+			final var agathion = AgathionRepository.getInstance().getByItemId(item.getId());
+			if ((agathion != null) && (agathion.maxEnergy() > 0)) {
+				agathions.add(item);
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x11);
+		writeH(showWindow ? 0x01 : 0x00);
+		writeH(items.size());
+		items.forEach(this::writeItem);
+		writeInventoryBlock(player.getInventory());
+		if (!agathions.isEmpty()) {
+			player.sendPacket(new ExBR_AgathionEnergyInfo(agathions));
+		}
+	}
+	
+	@Override
+	public void runImpl() {
+		getClient().sendPacket(new ExQuestItemList(player));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/JoinParty.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/JoinParty.java
new file mode 100644
index 00000000..59f0ce8f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/JoinParty.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class JoinParty extends L2GameServerPacket {
+	private final int _response;
+	
+	public JoinParty(int response) {
+		_response = response;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x3a);
+		writeD(_response);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/JoinPledge.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/JoinPledge.java
new file mode 100644
index 00000000..0bd3c863
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/JoinPledge.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class JoinPledge extends L2GameServerPacket {
+	private final int _pledgeId;
+	
+	public JoinPledge(int pledgeId) {
+		_pledgeId = pledgeId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x2D);
+		writeD(_pledgeId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/KeyPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/KeyPacket.java
new file mode 100644
index 00000000..728c9bd9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/KeyPacket.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class KeyPacket extends L2GameServerPacket {
+	private final byte[] _key;
+	private final int _id;
+	
+	public KeyPacket(byte[] key, int id) {
+		_key = key;
+		_id = id;
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0x2e);
+		writeC(_id); // 0 - wrong protocol, 1 - protocol ok
+		for (int i = 0; i < 8; i++) {
+			writeC(_key[i]); // key
+		}
+		writeD(0x01);
+		writeD(0x01); // server id
+		writeC(0x01);
+		writeD(0x00); // obfuscation key
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/L2FriendSay.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/L2FriendSay.java
new file mode 100644
index 00000000..5280d64a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/L2FriendSay.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Send Private (Friend) Message
+ * @author Tempy
+ */
+public class L2FriendSay extends L2GameServerPacket {
+	private final String _sender, _receiver, _message;
+	
+	public L2FriendSay(String sender, String receiver, String message) {
+		_sender = sender;
+		_receiver = receiver;
+		_message = message;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x78);
+		
+		writeD(0); // ??
+		writeS(_receiver);
+		writeS(_sender);
+		writeS(_message);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java
new file mode 100644
index 00000000..788c2b25
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.interfaces.IPositionable;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.mmocore.SendablePacket;
+
+/**
+ * @author KenM
+ */
+public abstract class L2GameServerPacket extends SendablePacket<L2GameClient> {
+	private static final Logger LOG = LoggerFactory.getLogger(L2GameServerPacket.class);
+	
+	private boolean _invisible = false;
+	
+	private static final int[] PAPERDOLL_ORDER = new int[] {
+		Inventory.PAPERDOLL_UNDER,
+		Inventory.PAPERDOLL_REAR,
+		Inventory.PAPERDOLL_LEAR,
+		Inventory.PAPERDOLL_NECK,
+		Inventory.PAPERDOLL_RFINGER,
+		Inventory.PAPERDOLL_LFINGER,
+		Inventory.PAPERDOLL_HEAD,
+		Inventory.PAPERDOLL_RHAND,
+		Inventory.PAPERDOLL_LHAND,
+		Inventory.PAPERDOLL_GLOVES,
+		Inventory.PAPERDOLL_CHEST,
+		Inventory.PAPERDOLL_LEGS,
+		Inventory.PAPERDOLL_FEET,
+		Inventory.PAPERDOLL_CLOAK,
+		Inventory.PAPERDOLL_RHAND,
+		Inventory.PAPERDOLL_HAIR,
+		Inventory.PAPERDOLL_HAIR2,
+		Inventory.PAPERDOLL_RBRACELET,
+		Inventory.PAPERDOLL_LBRACELET,
+		Inventory.PAPERDOLL_DECO1,
+		Inventory.PAPERDOLL_DECO2,
+		Inventory.PAPERDOLL_DECO3,
+		Inventory.PAPERDOLL_DECO4,
+		Inventory.PAPERDOLL_DECO5,
+		Inventory.PAPERDOLL_DECO6,
+		Inventory.PAPERDOLL_BELT
+	};
+	
+	/**
+	 * @return True if packet originated from invisible character.
+	 */
+	public boolean isInvisible() {
+		return _invisible;
+	}
+	
+	/**
+	 * Set "invisible" boolean flag in the packet.<br>
+	 * Packets from invisible characters will not be broadcasted to players.
+	 * @param b
+	 */
+	public void setInvisible(boolean b) {
+		_invisible = b;
+	}
+	
+	/**
+	 * Writes 3 D (int32) with current location x, y, z
+	 * @param loc
+	 */
+	protected void writeLoc(IPositionable loc) {
+		writeD(loc.getX());
+		writeD(loc.getY());
+		writeD(loc.getZ());
+	}
+	
+	protected int[] getPaperdollOrder() {
+		return PAPERDOLL_ORDER;
+	}
+	
+	@Override
+	protected void write() {
+		try {
+			writeImpl();
+		} catch (Exception e) {
+			LOG.error("Client: {} - Failed writing: {} ; {}", getClient().toString(), getClass().getSimpleName(), e.getMessage(), e);
+		}
+	}
+	
+	public void runImpl() {
+		
+	}
+	
+	protected abstract void writeImpl();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/LeaveWorld.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/LeaveWorld.java
new file mode 100644
index 00000000..94b8cac1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/LeaveWorld.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class LeaveWorld extends L2GameServerPacket {
+	public static final LeaveWorld STATIC_PACKET = new LeaveWorld();
+	
+	private LeaveWorld() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x84);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWaiting.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWaiting.java
new file mode 100644
index 00000000..bcae39a0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ListPartyWaiting.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.PartyMatchRoomList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public class ListPartyWaiting extends L2GameServerPacket {
+	private final L2PcInstance _cha;
+	private final int _loc;
+	private final int _lim;
+	private final List<PartyMatchRoom> _rooms;
+	
+	public ListPartyWaiting(L2PcInstance player, int auto, int location, int limit) {
+		_cha = player;
+		_loc = location;
+		_lim = limit;
+		_rooms = new ArrayList<>();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		for (PartyMatchRoom room : PartyMatchRoomList.getInstance().getRooms()) {
+			if ((room.getMembers() < 1) || (room.getOwner() == null) || !room.getOwner().isOnline() || (room.getOwner().getPartyRoom() != room.getId())) {
+				PartyMatchRoomList.getInstance().deleteRoom(room.getId());
+				continue;
+			}
+			if ((_loc > 0) && (_loc != room.getLocation())) {
+				continue;
+			}
+			if ((_lim == 0) && ((_cha.getLevel() < room.getMinLvl()) || (_cha.getLevel() > room.getMaxLvl()))) {
+				continue;
+			}
+			_rooms.add(room);
+		}
+		int size = _rooms.size();
+		
+		writeC(0x9c);
+		if (size > 0) {
+			writeD(0x01);
+		} else {
+			writeD(0x00);
+		}
+		
+		writeD(_rooms.size());
+		for (PartyMatchRoom room : _rooms) {
+			writeD(room.getId());
+			writeS(room.getTitle());
+			writeD(room.getLocation());
+			writeD(room.getMinLvl());
+			writeD(room.getMaxLvl());
+			writeD(room.getMaxMembers());
+			writeS(room.getOwner().getName());
+			writeD(room.getMembers());
+			for (L2PcInstance member : room.getPartyMembers()) {
+				if (member != null) {
+					writeD(member.getClassId().getId());
+					writeS(member.getName());
+				} else {
+					writeD(0x00);
+					writeS("Not Found");
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/LoginFail.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/LoginFail.java
new file mode 100644
index 00000000..bd96badb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/LoginFail.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class LoginFail extends L2GameServerPacket {
+	public static final int NO_TEXT = 0;
+	public static final int SYSTEM_ERROR_LOGIN_LATER = 1;
+	public static final int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT = 2;
+	public static final int PASSWORD_DOES_NOT_MATCH_THIS_ACCOUNT2 = 3;
+	public static final int ACCESS_FAILED_TRY_LATER = 4;
+	public static final int INCORRECT_ACCOUNT_INFO_CONTACT_CUSTOMER_SUPPORT = 5;
+	public static final int ACCESS_FAILED_TRY_LATER2 = 6;
+	public static final int ACOUNT_ALREADY_IN_USE = 7;
+	public static final int ACCESS_FAILED_TRY_LATER3 = 8;
+	public static final int ACCESS_FAILED_TRY_LATER4 = 9;
+	public static final int ACCESS_FAILED_TRY_LATER5 = 10;
+	
+	private final int _reason;
+	
+	public LoginFail(int reason) {
+		_reason = reason;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x0A);
+		writeD(_reason);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillCanceled.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillCanceled.java
new file mode 100644
index 00000000..25dbf35e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillCanceled.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class MagicSkillCanceled extends L2GameServerPacket {
+	private final int _objectId;
+	
+	public MagicSkillCanceled(int objectId) {
+		_objectId = objectId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x49);
+		writeD(_objectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java
new file mode 100644
index 00000000..e9fdb917
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillLaunched.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * MagicSkillLaunched server packet implementation.
+ * @author UnAfraid
+ */
+public class MagicSkillLaunched extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _skillId;
+	private final int _skillLevel;
+	private final List<L2Object> _targets;
+	
+	public MagicSkillLaunched(L2Character cha, int skillId, int skillLevel) {
+		this(cha, skillId, skillLevel, List.of(cha));
+	}
+	
+	public MagicSkillLaunched(L2Character cha, int skillId, int skillLevel, L2Object target) {
+		this(cha, skillId, skillLevel, List.of(target));
+	}
+	
+	public MagicSkillLaunched(L2Character cha, int skillId, int skillLevel, List<L2Object> targets) {
+		_charObjId = cha.getObjectId();
+		_skillId = skillId;
+		_skillLevel = skillLevel;
+		_targets = targets;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x54);
+		writeD(_charObjId);
+		writeD(_skillId);
+		writeD(_skillLevel);
+		writeD(_targets.size());
+		for (L2Object target : _targets) {
+			writeD(target.getObjectId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java
new file mode 100644
index 00000000..1d1062e1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MagicSkillUse.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.interfaces.IPositionable;
+
+/**
+ * MagicSkillUse server packet implementation.
+ * @author UnAfraid
+ * @author NosBit
+ */
+public final class MagicSkillUse extends L2GameServerPacket {
+	private final int _skillId;
+	private final int _skillLevel;
+	private final int _hitTime;
+	private final int _reuseDelay;
+	private final L2Character _activeChar;
+	private final L2Character _target;
+	private final List<Integer> _unknown = Collections.emptyList();
+	private final List<Location> _groundLocations;
+	
+	public MagicSkillUse(L2Character cha, L2Character target, int skillId, int skillLevel, int hitTime, int reuseDelay) {
+		_activeChar = cha;
+		_target = target;
+		_skillId = skillId;
+		_skillLevel = skillLevel;
+		_hitTime = hitTime;
+		_reuseDelay = reuseDelay;
+		_groundLocations = cha.isPlayer() && (cha.getActingPlayer().getCurrentSkillWorldPosition() != null) ? Collections.singletonList(cha.getActingPlayer().getCurrentSkillWorldPosition()) : Collections.emptyList();
+	}
+	
+	public MagicSkillUse(L2Character cha, int skillId, int skillLevel, int hitTime, int reuseDelay) {
+		this(cha, cha, skillId, skillLevel, hitTime, reuseDelay);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x48);
+		writeD(_activeChar.getObjectId());
+		writeD(_target.getObjectId());
+		writeD(_skillId);
+		writeD(_skillLevel);
+		writeD(_hitTime);
+		writeD(_reuseDelay);
+		writeLoc(_activeChar);
+		writeH(_unknown.size()); // TODO: Implement me!
+		for (int unknown : _unknown) {
+			writeH(unknown);
+		}
+		writeH(_groundLocations.size());
+		for (IPositionable target : _groundLocations) {
+			writeLoc(target);
+		}
+		writeLoc(_target);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ManagePledgePower.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ManagePledgePower.java
new file mode 100644
index 00000000..32315250
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ManagePledgePower.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+
+public class ManagePledgePower extends L2GameServerPacket {
+	
+	private final int _action;
+	private final L2Clan _clan;
+	private final int _rank;
+	
+	public ManagePledgePower(L2Clan clan, int action, int rank) {
+		_clan = clan;
+		_action = action;
+		_rank = rank;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		if (_action == 1) {
+			writeC(0x2a);
+			writeD(0);
+			writeD(0);
+			writeD(_clan.getRankPrivs(_rank).getBitmask());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MonRaceInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MonRaceInfo.java
new file mode 100644
index 00000000..19a0639e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MonRaceInfo.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+public class MonRaceInfo extends L2GameServerPacket {
+	private final int _unknown1;
+	private final int _unknown2;
+	private final L2Npc[] _monsters;
+	private final int[][] _speeds;
+	
+	public MonRaceInfo(int unknown1, int unknown2, L2Npc[] monsters, int[][] speeds) {
+		/*
+		 * -1 0 to initial the race 0 15322 to start race 13765 -1 in middle of race -1 0 to end the race
+		 */
+		_unknown1 = unknown1;
+		_unknown2 = unknown2;
+		_monsters = monsters;
+		_speeds = speeds;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xe3);
+		
+		writeD(_unknown1);
+		writeD(_unknown2);
+		writeD(0x08);
+		
+		for (int i = 0; i < 8; i++) {
+			writeD(_monsters[i].getObjectId()); // npcObjectID
+			writeD(_monsters[i].getTemplate().getId() + 1000000); // npcID
+			writeD(14107); // origin X
+			writeD(181875 + (58 * (7 - i))); // origin Y
+			writeD(-3566); // origin Z
+			writeD(12080); // end X
+			writeD(181875 + (58 * (7 - i))); // end Y
+			writeD(-3566); // end Z
+			writeF(_monsters[i].getTemplate().getfCollisionHeight()); // coll. height
+			writeF(_monsters[i].getTemplate().getfCollisionRadius()); // coll. radius
+			writeD(120); // ?? unknown
+			for (int j = 0; j < 20; j++) {
+				if (_unknown1 == 0) {
+					writeC(_speeds[i][j]);
+				} else {
+					writeC(0x00);
+				}
+			}
+			writeD(0x00);
+			writeD(0x00); // CT2.3 special effect
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToLocation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToLocation.java
new file mode 100644
index 00000000..22a4655f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToLocation.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public final class MoveToLocation extends L2GameServerPacket {
+	private final int _charObjId, _x, _y, _z, _xDst, _yDst, _zDst;
+	
+	public MoveToLocation(L2Character cha) {
+		_charObjId = cha.getObjectId();
+		_x = cha.getX();
+		_y = cha.getY();
+		_z = cha.getZ();
+		_xDst = cha.getXdestination();
+		_yDst = cha.getYdestination();
+		_zDst = cha.getZdestination();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x2f);
+		
+		writeD(_charObjId);
+		
+		writeD(_xDst);
+		writeD(_yDst);
+		writeD(_zDst);
+		
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToLocationInVehicle.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToLocationInVehicle.java
new file mode 100644
index 00000000..a1c85dfd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToLocationInVehicle.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Maktakien
+ */
+public class MoveToLocationInVehicle extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _boatId;
+	private final Location _destination;
+	private final Location _origin;
+	
+	public MoveToLocationInVehicle(L2PcInstance player, Location destination, Location origin) {
+		_charObjId = player.getObjectId();
+		_boatId = player.getBoat().getObjectId();
+		_destination = destination;
+		_origin = origin;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x7e);
+		writeD(_charObjId);
+		writeD(_boatId);
+		writeD(_destination.getX());
+		writeD(_destination.getY());
+		writeD(_destination.getZ());
+		writeD(_origin.getX());
+		writeD(_origin.getY());
+		writeD(_origin.getZ());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToPawn.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToPawn.java
new file mode 100644
index 00000000..13b88617
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MoveToPawn.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class MoveToPawn extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _targetId;
+	private final int _distance;
+	private final int _x, _y, _z, _tx, _ty, _tz;
+	
+	public MoveToPawn(L2Character cha, L2Character target, int distance) {
+		_charObjId = cha.getObjectId();
+		_targetId = target.getObjectId();
+		_distance = distance;
+		_x = cha.getX();
+		_y = cha.getY();
+		_z = cha.getZ();
+		_tx = target.getX();
+		_ty = target.getY();
+		_tz = target.getZ();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x72);
+		
+		writeD(_charObjId);
+		writeD(_targetId);
+		writeD(_distance);
+		
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_tx);
+		writeD(_ty);
+		writeD(_tz);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MultiSellList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MultiSellList.java
new file mode 100644
index 00000000..cb6cc8a6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MultiSellList.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.data.xml.impl.MultisellData.PAGE_SIZE;
+
+import com.l2jserver.gameserver.model.multisell.Entry;
+import com.l2jserver.gameserver.model.multisell.Ingredient;
+import com.l2jserver.gameserver.model.multisell.ListContainer;
+
+public final class MultiSellList extends L2GameServerPacket {
+	private int _size, _index;
+	private final ListContainer _list;
+	private final boolean _finished;
+	
+	public MultiSellList(ListContainer list, int index) {
+		_list = list;
+		_index = index;
+		_size = list.getEntries().size() - index;
+		if (_size > PAGE_SIZE) {
+			_finished = false;
+			_size = PAGE_SIZE;
+		} else {
+			_finished = true;
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xd0);
+		writeD(_list.getListId()); // list id
+		writeD(1 + (_index / PAGE_SIZE)); // page started from 1
+		writeD(_finished ? 1 : 0); // finished
+		writeD(PAGE_SIZE); // size of pages
+		writeD(_size); // list length
+		
+		Entry ent;
+		while (_size-- > 0) {
+			ent = _list.getEntries().get(_index++);
+			writeD(ent.getEntryId());
+			writeC(ent.isStackable() ? 1 : 0);
+			writeH(0x00); // C6
+			writeD(0x00); // C6
+			writeD(0x00); // T1
+			writeH(65534); // T1
+			writeH(0x00); // T1
+			writeH(0x00); // T1
+			writeH(0x00); // T1
+			writeH(0x00); // T1
+			writeH(0x00); // T1
+			writeH(0x00); // T1
+			writeH(0x00); // T1
+			
+			writeH(ent.getProducts().size());
+			writeH(ent.getIngredients().size());
+			
+			for (Ingredient ing : ent.getProducts()) {
+				writeD(ing.getItemId());
+				if (ing.getTemplate() != null) {
+					writeD(ing.getTemplate().getBodyPart());
+					writeH(ing.getTemplate().getType2().getId());
+				} else {
+					writeD(0);
+					writeH(65535);
+				}
+				writeQ(ing.getItemCount());
+				if (ing.getItemInfo() != null) {
+					writeH(ing.getItemInfo().getEnchantLevel()); // enchant level
+					writeD(ing.getItemInfo().getAugmentId()); // augment id
+					writeD(0x00); // mana
+					writeH(ing.getItemInfo().getElementId()); // attack element
+					writeH(ing.getItemInfo().getElementPower()); // element power
+					writeH(ing.getItemInfo().getElementals()[0]); // fire
+					writeH(ing.getItemInfo().getElementals()[1]); // water
+					writeH(ing.getItemInfo().getElementals()[2]); // wind
+					writeH(ing.getItemInfo().getElementals()[3]); // earth
+					writeH(ing.getItemInfo().getElementals()[4]); // holy
+					writeH(ing.getItemInfo().getElementals()[5]); // dark
+				} else {
+					writeH(0x00); // enchant level
+					writeD(0x00); // augment id
+					writeD(0x00); // mana
+					writeH(0x00); // attack element
+					writeH(0x00); // element power
+					writeH(0x00); // fire
+					writeH(0x00); // water
+					writeH(0x00); // wind
+					writeH(0x00); // earth
+					writeH(0x00); // holy
+					writeH(0x00); // dark
+				}
+			}
+			
+			for (Ingredient ing : ent.getIngredients()) {
+				writeD(ing.getItemId());
+				writeH(ing.getTemplate() != null ? ing.getTemplate().getType2().getId() : 65535);
+				writeQ(ing.getItemCount());
+				if (ing.getItemInfo() != null) {
+					writeH(ing.getItemInfo().getEnchantLevel()); // enchant level
+					writeD(ing.getItemInfo().getAugmentId()); // augment id
+					writeD(0x00); // mana
+					writeH(ing.getItemInfo().getElementId()); // attack element
+					writeH(ing.getItemInfo().getElementPower()); // element power
+					writeH(ing.getItemInfo().getElementals()[0]); // fire
+					writeH(ing.getItemInfo().getElementals()[1]); // water
+					writeH(ing.getItemInfo().getElementals()[2]); // wind
+					writeH(ing.getItemInfo().getElementals()[3]); // earth
+					writeH(ing.getItemInfo().getElementals()[4]); // holy
+					writeH(ing.getItemInfo().getElementals()[5]); // dark
+				} else {
+					writeH(0x00); // enchant level
+					writeD(0x00); // augment id
+					writeD(0x00); // mana
+					writeH(0x00); // attack element
+					writeH(0x00); // element power
+					writeH(0x00); // fire
+					writeH(0x00); // water
+					writeH(0x00); // wind
+					writeH(0x00); // earth
+					writeH(0x00); // holy
+					writeH(0x00); // dark
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/MyTargetSelected.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MyTargetSelected.java
new file mode 100644
index 00000000..c1c57594
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/MyTargetSelected.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2ControllableAirShipInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * MyTargetSelected server packet implementation.
+ * @author UnAfraid
+ */
+public class MyTargetSelected extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _color;
+	
+	public MyTargetSelected(L2PcInstance player, L2Character target) {
+		_objectId = (target instanceof L2ControllableAirShipInstance) ? ((L2ControllableAirShipInstance) target).getHelmObjectId() : target.getObjectId();
+		_color = target.isAutoAttackable(player) ? (player.getLevel() - target.getLevel()) : 0;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xB9);
+		writeD(_objectId);
+		writeH(_color);
+		writeD(0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java
new file mode 100644
index 00000000..2243c8ea
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NewCharacterSuccess.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.templates.L2PcTemplate;
+
+public final class NewCharacterSuccess extends L2GameServerPacket {
+	private final List<L2PcTemplate> _chars = new ArrayList<>();
+	
+	public void addChar(L2PcTemplate template) {
+		_chars.add(template);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x0D);
+		writeD(_chars.size());
+		
+		for (L2PcTemplate chr : _chars) {
+			if (chr == null) {
+				continue;
+			}
+			
+			// TODO: Unhardcode these
+			writeD(chr.getRace().ordinal());
+			writeD(chr.getClassId().getId());
+			writeD(0x46);
+			writeD(chr.getBaseSTR());
+			writeD(0x0A);
+			writeD(0x46);
+			writeD(chr.getBaseDEX());
+			writeD(0x0A);
+			writeD(0x46);
+			writeD(chr.getBaseCON());
+			writeD(0x0A);
+			writeD(0x46);
+			writeD(chr.getBaseINT());
+			writeD(0x0A);
+			writeD(0x46);
+			writeD(chr.getBaseWIT());
+			writeD(0x0A);
+			writeD(0x46);
+			writeD(chr.getBaseMEN());
+			writeD(0x0A);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/NicknameChanged.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NicknameChanged.java
new file mode 100644
index 00000000..e4dd5906
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NicknameChanged.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author devScarlet
+ */
+public class NicknameChanged extends L2GameServerPacket {
+	private final String _title;
+	private final int _objectId;
+	
+	public NicknameChanged(L2Character cha) {
+		_objectId = cha.getObjectId();
+		_title = cha.getTitle();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xcc);
+		writeD(_objectId);
+		writeS(_title);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/NormalCamera.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NormalCamera.java
new file mode 100644
index 00000000..117e4ca5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NormalCamera.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class NormalCamera extends L2GameServerPacket {
+	public static final NormalCamera STATIC_PACKET = new NormalCamera();
+	
+	private NormalCamera() {
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xd7);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcHtmlMessage.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcHtmlMessage.java
new file mode 100644
index 00000000..62741f00
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcHtmlMessage.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+
+/**
+ * NpcHtmlMessage server packet implementation.
+ * @author HorridoJoho
+ */
+public final class NpcHtmlMessage extends AbstractHtmlPacket {
+	private final int _itemId;
+	
+	public NpcHtmlMessage() {
+		_itemId = 0;
+	}
+	
+	public NpcHtmlMessage(int npcObjId) {
+		super(npcObjId);
+		_itemId = 0;
+	}
+	
+	public NpcHtmlMessage(String html) {
+		super(html);
+		_itemId = 0;
+	}
+	
+	public NpcHtmlMessage(int npcObjId, String html) {
+		super(npcObjId, html);
+		_itemId = 0;
+	}
+	
+	public NpcHtmlMessage(int npcObjId, int itemId) {
+		super(npcObjId);
+		
+		if (itemId < 0) {
+			throw new IllegalArgumentException();
+		}
+		
+		_itemId = itemId;
+	}
+	
+	public NpcHtmlMessage(int npcObjId, int itemId, String html) {
+		super(npcObjId, html);
+		
+		if (itemId < 0) {
+			throw new IllegalArgumentException();
+		}
+		
+		_itemId = itemId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x19);
+		
+		writeD(getNpcObjId());
+		writeS(getHtml());
+		writeD(_itemId);
+	}
+	
+	@Override
+	public HtmlActionScope getScope() {
+		return _itemId == 0 ? HtmlActionScope.NPC_HTML : HtmlActionScope.NPC_ITEM_HTML;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcQuestHtmlMessage.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
new file mode 100644
index 00000000..ea3a66d5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcQuestHtmlMessage.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+
+/**
+ * NpcQuestHtmlMessage server packet implementation.
+ * @author HorridoJoho
+ */
+public final class NpcQuestHtmlMessage extends AbstractHtmlPacket {
+	private final int _questId;
+	
+	public NpcQuestHtmlMessage(int npcObjId, int questId, String html) {
+		super(npcObjId, html);
+		_questId = questId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x8D);
+		writeD(getNpcObjId());
+		writeS(getHtml());
+		writeD(_questId);
+	}
+	
+	@Override
+	public HtmlActionScope getScope() {
+		return HtmlActionScope.NPC_QUEST_HTML;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java
new file mode 100644
index 00000000..a44e57e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/NpcSay.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.customs;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.network.NpcStringId;
+
+/**
+ * NpcSay server packet implementation.
+ * @author Kerberos
+ * @author Zoey76
+ */
+public final class NpcSay extends L2GameServerPacket {
+	
+	private static final int NO_NPC_STRING_ID = -1;
+	private static final String[] NO_PARAMETERS = new String[] {};
+	
+	private final int _objectId;
+	private final int _textType;
+	private final int _npcId;
+	private String _text;
+	private final int _npcString;
+	private List<String> _parameters;
+	
+	public NpcSay(int objectId, int messageType, int npcId, String text) {
+		_objectId = objectId;
+		_textType = messageType;
+		_npcId = 1000000 + npcId;
+		_npcString = NO_NPC_STRING_ID;
+		_text = text;
+	}
+	
+	public NpcSay(L2Npc npc, int messageType, String text) {
+		_objectId = npc.getObjectId();
+		_textType = messageType;
+		_npcId = 1000000 + npc.getId();
+		_npcString = NO_NPC_STRING_ID;
+		_text = text;
+	}
+	
+	public NpcSay(int objectId, int messageType, int npcId, NpcStringId npcString) {
+		_objectId = objectId;
+		_textType = messageType;
+		_npcId = 1000000 + npcId;
+		_npcString = npcString.getId();
+	}
+	
+	public NpcSay(L2Npc npc, int messageType, NpcStringId npcString) {
+		_objectId = npc.getObjectId();
+		_textType = messageType;
+		_npcId = 1000000 + npc.getId();
+		_npcString = npcString.getId();
+	}
+	
+	/**
+	 * @param text the text to add as a parameter for this packet's message (replaces S1, S2 etc.)
+	 * @return this NpcSay packet object
+	 */
+	public NpcSay addStringParameter(String text) {
+		if (_parameters == null) {
+			_parameters = new ArrayList<>();
+		}
+		_parameters.add(text);
+		return this;
+	}
+	
+	/**
+	 * @param params a list of strings to add as parameters for this packet's message (replaces S1, S2 etc.)
+	 * @return this NpcSay packet object
+	 */
+	public NpcSay addStringParameters(String... params) {
+		if ((params != null) && (params.length > 0)) {
+			if (_parameters == null) {
+				_parameters = new ArrayList<>();
+			}
+			
+			for (String item : params) {
+				if ((item != null) && (item.length() > 0)) {
+					_parameters.add(item);
+				}
+			}
+		}
+		return this;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x30);
+		writeD(_objectId);
+		writeD(_textType);
+		writeD(_npcId);
+		
+		// The way Npc String translation works, is by checking and getting
+		// the translation from the XML for the player's language, and
+		// sending it back to the client as a text with all the parameters hardcoded,
+		// and preventing the original Npc String from being delivered.
+		if (customs().multiLangEnable() && customs().multiLangNpcStringEnable()) {
+			final var lang = getClient().getActiveChar().getLang();
+			if (customs().getMultiLangNpcStringAllowed().contains(lang)) {
+				final var ns = NpcStringId.getNpcStringId(_npcString).getLocalisation(lang);
+				if (ns != null) {
+					writeD(NO_NPC_STRING_ID);
+					writeS(ns.build(_parameters == null ? NO_PARAMETERS : _parameters.toArray()));
+					return;
+				}
+			}
+		}
+		
+		writeD(_npcString);
+		if (_npcString == NO_NPC_STRING_ID) {
+			writeS(_text);
+		} else if (_parameters != null) {
+			for (String s : _parameters) {
+				writeS(s);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ObservationMode.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ObservationMode.java
new file mode 100644
index 00000000..81414f6a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ObservationMode.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+
+public class ObservationMode extends L2GameServerPacket {
+	private final Location _loc;
+	
+	public ObservationMode(Location loc) {
+		_loc = loc;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xEB);
+		writeD(_loc.getX());
+		writeD(_loc.getY());
+		writeD(_loc.getZ());
+		writeC(0x00); // ?
+		writeC(0xc0); // ?
+		writeC(0x00); // ?
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ObservationReturn.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ObservationReturn.java
new file mode 100644
index 00000000..5fd64770
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ObservationReturn.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+
+public class ObservationReturn extends L2GameServerPacket {
+	private final Location _loc;
+	
+	public ObservationReturn(Location loc) {
+		_loc = loc;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xEC);
+		writeD(_loc.getX());
+		writeD(_loc.getY());
+		writeD(_loc.getZ());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java
new file mode 100644
index 00000000..0f0f3773
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/OnEventTrigger.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+
+/**
+ * @author Gnacik
+ * @author UnAfraid
+ */
+public class OnEventTrigger extends L2GameServerPacket {
+	private final int _emitterId;
+	private final int _enabled;
+	
+	public OnEventTrigger(L2DoorInstance door, boolean enabled) {
+		_emitterId = door.getEmitter();
+		_enabled = enabled ? 1 : 0;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xCF);
+		writeD(_emitterId);
+		writeC(_enabled);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PackageSendableList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PackageSendableList.java
new file mode 100644
index 00000000..920fa1e4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PackageSendableList.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author -Wooden-
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class PackageSendableList extends AbstractItemPacket {
+	private final L2ItemInstance[] _items;
+	private final int _playerObjId;
+	
+	public PackageSendableList(L2ItemInstance[] items, int playerObjId) {
+		_items = items;
+		_playerObjId = playerObjId;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xD2);
+		writeD(_playerObjId);
+		writeQ(getClient().getActiveChar().getAdena());
+		writeD(_items.length);
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+			writeD(item.getObjectId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PackageToList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PackageToList.java
new file mode 100644
index 00000000..63d2f273
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PackageToList.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @author -Wooden-
+ * @author UnAfraid
+ * @author mrTJO
+ */
+public class PackageToList extends L2GameServerPacket {
+	private final Map<Integer, String> _players;
+	
+	public PackageToList(Map<Integer, String> chars) {
+		_players = chars;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xC8);
+		writeD(_players.size());
+		for (Entry<Integer, String> entry : _players.entrySet()) {
+			writeD(entry.getKey());
+			writeS(entry.getValue());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java
new file mode 100644
index 00000000..e3d35395
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartyMatchDetail.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.PartyMatchRoom;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Gnacik
+ */
+public class PartyMatchDetail extends L2GameServerPacket {
+	private final PartyMatchRoom _room;
+	
+	public PartyMatchDetail(L2PcInstance player, PartyMatchRoom room) {
+		_room = room;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x9d);
+		writeD(_room.getId());
+		writeD(_room.getMaxMembers());
+		writeD(_room.getMinLvl());
+		writeD(_room.getMaxLvl());
+		writeD(_room.getLootType());
+		writeD(_room.getLocation());
+		writeS(_room.getTitle());
+		writeH(59064);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java
new file mode 100644
index 00000000..d96b7aa9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartyMemberPosition.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author zabbix
+ */
+public class PartyMemberPosition extends L2GameServerPacket {
+	private final Map<Integer, Location> locations = new HashMap<>();
+	
+	public PartyMemberPosition(L2Party party) {
+		reuse(party);
+	}
+	
+	public void reuse(L2Party party) {
+		locations.clear();
+		for (L2PcInstance member : party.getMembers()) {
+			if (member == null) {
+				continue;
+			}
+			locations.put(member.getObjectId(), member.getLocation());
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xba);
+		writeD(locations.size());
+		for (Map.Entry<Integer, Location> entry : locations.entrySet()) {
+			Location loc = entry.getValue();
+			writeD(entry.getKey());
+			writeD(loc.getX());
+			writeD(loc.getY());
+			writeD(loc.getZ());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAdd.java
new file mode 100644
index 00000000..df6de38a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAdd.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class PartySmallWindowAdd extends L2GameServerPacket {
+	private final L2PcInstance _member;
+	private final L2Party _party;
+	
+	public PartySmallWindowAdd(L2PcInstance member, L2Party party) {
+		_member = member;
+		_party = party;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x4F);
+		writeD(_party.getLeaderObjectId()); // c3
+		writeD(_party.getDistributionType().getId());// writeD(0x04); ?? //c3
+		writeD(_member.getObjectId());
+		writeS(_member.getName());
+		writeD((int) _member.getCurrentCp()); // c4
+		writeD(_member.getMaxCp()); // c4
+		writeD((int) _member.getCurrentHp());
+		writeD(_member.getMaxHp());
+		writeD((int) _member.getCurrentMp());
+		writeD(_member.getMaxMp());
+		writeD(_member.getLevel());
+		writeD(_member.getClassId().getId());
+		writeD(0x00); // ?
+		writeD(0x00); // ?
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAll.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAll.java
new file mode 100644
index 00000000..71beb5ed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowAll.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class PartySmallWindowAll extends L2GameServerPacket {
+	private final L2Party _party;
+	private final L2PcInstance _exclude;
+	
+	public PartySmallWindowAll(L2PcInstance exclude, L2Party party) {
+		_exclude = exclude;
+		_party = party;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x4e);
+		writeD(_party.getLeaderObjectId());
+		writeD(_party.getDistributionType().getId());
+		writeD(_party.getMemberCount() - 1);
+		
+		for (L2PcInstance member : _party.getMembers()) {
+			if ((member != null) && (member != _exclude)) {
+				writeD(member.getObjectId());
+				writeS(member.getName());
+				
+				writeD((int) member.getCurrentCp()); // c4
+				writeD(member.getMaxCp()); // c4
+				
+				writeD((int) member.getCurrentHp());
+				writeD(member.getMaxHp());
+				writeD((int) member.getCurrentMp());
+				writeD(member.getMaxMp());
+				writeD(member.getLevel());
+				writeD(member.getClassId().getId());
+				writeD(0x00);// writeD(0x01); ??
+				writeD(member.getRace().ordinal());
+				writeD(0x00); // T2.3
+				writeD(0x00); // T2.3
+				if (member.hasSummon()) {
+					writeD(member.getSummon().getObjectId());
+					writeD(member.getSummon().getId() + 1000000);
+					writeD(member.getSummon().getSummonType());
+					writeS(member.getSummon().getName());
+					writeD((int) member.getSummon().getCurrentHp());
+					writeD(member.getSummon().getMaxHp());
+					writeD((int) member.getSummon().getCurrentMp());
+					writeD(member.getSummon().getMaxMp());
+					writeD(member.getSummon().getLevel());
+				} else {
+					writeD(0x00);
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowDelete.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowDelete.java
new file mode 100644
index 00000000..eb5994a3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowDelete.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class PartySmallWindowDelete extends L2GameServerPacket {
+	private final L2PcInstance _member;
+	
+	public PartySmallWindowDelete(L2PcInstance member) {
+		_member = member;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x51);
+		writeD(_member.getObjectId());
+		writeS(_member.getName());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
new file mode 100644
index 00000000..254da9bf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowDeleteAll.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class PartySmallWindowDeleteAll extends L2GameServerPacket {
+	public static final PartySmallWindowDeleteAll STATIC_PACKET = new PartySmallWindowDeleteAll();
+	
+	private PartySmallWindowDeleteAll() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x50);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowUpdate.java
new file mode 100644
index 00000000..2906520f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySmallWindowUpdate.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class PartySmallWindowUpdate extends L2GameServerPacket {
+	private final L2PcInstance _member;
+	
+	public PartySmallWindowUpdate(L2PcInstance member) {
+		_member = member;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x52);
+		writeD(_member.getObjectId());
+		writeS(_member.getName());
+		
+		writeD((int) _member.getCurrentCp()); // c4
+		writeD(_member.getMaxCp()); // c4
+		
+		writeD((int) _member.getCurrentHp());
+		writeD(_member.getMaxHp());
+		writeD((int) _member.getCurrentMp());
+		writeD(_member.getMaxMp());
+		writeD(_member.getLevel());
+		writeD(_member.getClassId().getId());
+		
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java
new file mode 100644
index 00000000..8051ad3e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PartySpelled.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+public class PartySpelled extends L2GameServerPacket {
+	private final List<BuffInfo> _effects = new ArrayList<>();
+	private final L2Character _activeChar;
+	
+	public PartySpelled(L2Character cha) {
+		_activeChar = cha;
+	}
+	
+	public void addSkill(BuffInfo info) {
+		_effects.add(info);
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xF4);
+		writeD(_activeChar.isServitor() ? 2 : _activeChar.isPet() ? 1 : 0);
+		writeD(_activeChar.getObjectId());
+		writeD(_effects.size());
+		for (BuffInfo info : _effects) {
+			if ((info != null) && info.isInUse()) {
+				writeD(info.getSkill().getDisplayId());
+				writeH(info.getSkill().getDisplayLevel());
+				writeD(info.getTime());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetDelete.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetDelete.java
new file mode 100644
index 00000000..265fc327
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetDelete.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class PetDelete extends L2GameServerPacket {
+	private final int _petType;
+	private final int _petObjId;
+	
+	public PetDelete(int petType, int petObjId) {
+		_petType = petType; // Summon Type
+		_petObjId = petObjId; // objectId
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xB7);
+		writeD(_petType);
+		writeD(_petObjId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetInfo.java
new file mode 100644
index 00000000..0e773be3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetInfo.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+public class PetInfo extends L2GameServerPacket {
+	private final L2Summon _summon;
+	private final int _x, _y, _z, _heading;
+	private final boolean _isSummoned;
+	private final int _val;
+	private final int _mAtkSpd, _pAtkSpd;
+	private final int _runSpd, _walkSpd;
+	private final int _swimRunSpd, _swimWalkSpd;
+	private final int _flyRunSpd, _flyWalkSpd;
+	private final double _moveMultiplier;
+	private final int _maxHp, _maxMp;
+	private int _maxFed, _curFed;
+	
+	public PetInfo(L2Summon summon, int val) {
+		_summon = summon;
+		_isSummoned = summon.isShowSummonAnimation();
+		_x = summon.getX();
+		_y = summon.getY();
+		_z = summon.getZ();
+		_heading = summon.getHeading();
+		_mAtkSpd = summon.getMAtkSpd();
+		_pAtkSpd = (int) summon.getPAtkSpd();
+		_moveMultiplier = summon.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(summon.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(summon.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(summon.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(summon.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = summon.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = summon.isFlying() ? _walkSpd : 0;
+		_maxHp = summon.getMaxHp();
+		_maxMp = summon.getMaxMp();
+		_val = val;
+		if (summon.isPet()) {
+			final L2PetInstance pet = (L2PetInstance) _summon;
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		} else if (summon.isServitor()) {
+			final L2ServitorInstance sum = (L2ServitorInstance) _summon;
+			_curFed = sum.getLifeTimeRemaining();
+			_maxFed = sum.getLifeTime();
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xb2);
+		writeD(_summon.getSummonType());
+		writeD(_summon.getObjectId());
+		writeD(_summon.getTemplate().getDisplayId() + 1000000);
+		writeD(0); // 1=attackable
+		
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_heading);
+		writeD(0);
+		writeD(_mAtkSpd);
+		writeD(_pAtkSpd);
+		writeD(_runSpd);
+		writeD(_walkSpd);
+		writeD(_swimRunSpd);
+		writeD(_swimWalkSpd);
+		writeD(_flyRunSpd);
+		writeD(_flyWalkSpd);
+		writeD(_flyRunSpd);
+		writeD(_flyWalkSpd);
+		writeF(_moveMultiplier);
+		writeF(_summon.getAttackSpeedMultiplier()); // attack speed multiplier
+		writeF(_summon.getTemplate().getfCollisionRadius());
+		writeF(_summon.getTemplate().getfCollisionHeight());
+		writeD(_summon.getWeapon()); // right hand weapon
+		writeD(_summon.getArmor()); // body armor
+		writeD(0x00); // left hand weapon
+		writeC(_summon.getOwner() != null ? 1 : 0); // when pet is dead and player exit game, pet doesn't show master name
+		writeC(_summon.isRunning() ? 1 : 0); // running=1 (it is always 1, walking mode is calculated from multiplier)
+		writeC(_summon.isInCombat() ? 1 : 0); // attacking 1=true
+		writeC(_summon.isAlikeDead() ? 1 : 0); // dead 1=true
+		writeC(_isSummoned ? 2 : _val); // 0=teleported 1=default 2=summoned
+		writeD(-1); // High Five NPCString ID
+		if (_summon.isPet()) {
+			writeS(_summon.getName()); // Pet name.
+		} else {
+			writeS(_summon.getTemplate().isUsingServerSideName() ? _summon.getName() : ""); // Summon name.
+		}
+		writeD(-1); // High Five NPCString ID
+		writeS(_summon.getTitle()); // owner name
+		writeD(1);
+		writeD(_summon.getPvpFlag()); // 0 = white, 2 = purple blink, if its greater then karma = purple
+		writeD(_summon.getKarma()); // karma
+		writeD(_curFed); // how fed it is
+		writeD(_maxFed); // max fed it can be
+		writeD((int) _summon.getCurrentHp());// current hp
+		writeD(_maxHp);// max hp
+		writeD((int) _summon.getCurrentMp());// current mp
+		writeD(_maxMp);// max mp
+		writeD(_summon.getSp()); // sp
+		writeD(_summon.getLevel());// lvl
+		writeQ(_summon.getExp());
+		
+		// 0% absolute value
+		writeQ(Math.min(_summon.getExpForThisLevel(), _summon.getExp())); // 0% absolute value
+		
+		writeQ(_summon.getExpForNextLevel());// 100% absolute value
+		writeD(_summon.isPet() ? _summon.getInventory().getTotalWeight() : 0);// weight
+		writeD(_summon.getMaxLoad());// max weight it can carry
+		writeD((int) _summon.getPAtk(null));// patk
+		writeD((int) _summon.getPDef(null));// pdef
+		writeD((int) _summon.getMAtk(null, null));// matk
+		writeD((int) _summon.getMDef(null, null));// mdef
+		writeD(_summon.getAccuracy());// accuracy
+		writeD(_summon.getEvasionRate(null));// evasion
+		writeD(_summon.getCriticalHit(null, null));// critical
+		writeD((int) _summon.getMoveSpeed());// speed
+		writeD((int) _summon.getPAtkSpd());// atkspeed
+		writeD(_summon.getMAtkSpd());// casting speed
+		
+		writeD(_summon.getAbnormalVisualEffects());// c2 abnormal visual effect... bleed=1; poison=2; poison & bleed=3; flame=4;
+		writeH(_summon.isMountable() ? 1 : 0);// c2 ride button
+		
+		writeC(_summon.isInsideZone(ZoneId.WATER) ? 1 : _summon.isFlying() ? 2 : 0); // c2
+		
+		// Following all added in C4.
+		writeH(0); // ??
+		writeC(_summon.getTeam().getId());
+		writeD(_summon.getSoulShotsPerHit()); // How many soulshots this servitor uses per hit
+		writeD(_summon.getSpiritShotsPerHit()); // How many spiritshots this servitor uses per hit
+		writeD(_summon.getFormId());// CT1.5 Pet form and skills
+		writeD(_summon.getAbnormalVisualEffectSpecial());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetInventoryUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetInventoryUpdate.java
new file mode 100644
index 00000000..517875a9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetInventoryUpdate.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+/**
+ * @author Yme
+ * @author Advi
+ * @author UnAfraid
+ */
+public class PetInventoryUpdate extends AbstractInventoryUpdate {
+	public PetInventoryUpdate() {
+	}
+	
+	public PetInventoryUpdate(L2ItemInstance item) {
+		super(item);
+	}
+	
+	public PetInventoryUpdate(List<ItemInfo> items) {
+		super(items);
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xB4);
+		writeItems();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetItemList.java
new file mode 100644
index 00000000..71cecc86
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetItemList.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class PetItemList extends AbstractItemPacket {
+	private final L2ItemInstance[] _items;
+	
+	public PetItemList(L2ItemInstance[] items) {
+		_items = items;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xB3);
+		writeH(_items.length);
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetStatusShow.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetStatusShow.java
new file mode 100644
index 00000000..d437028b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetStatusShow.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+
+/**
+ * @author Yme
+ */
+public class PetStatusShow extends L2GameServerPacket {
+	private final int _summonType;
+	
+	public PetStatusShow(L2Summon summon) {
+		_summonType = summon.getSummonType();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xb1);
+		writeD(_summonType);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java
new file mode 100644
index 00000000..0c7b8747
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetStatusUpdate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+
+/**
+ * @since 2005/03/29 23:15:10
+ */
+public class PetStatusUpdate extends L2GameServerPacket {
+	private final L2Summon _summon;
+	private int _maxFed, _curFed;
+	
+	public PetStatusUpdate(L2Summon summon) {
+		_summon = summon;
+		if (_summon instanceof L2PetInstance pet) {
+			_curFed = pet.getCurrentFed(); // how fed it is
+			_maxFed = pet.getMaxFed(); // max fed it can be
+		} else if (_summon instanceof L2ServitorInstance servitor) {
+			_curFed = servitor.getLifeTimeRemaining();
+			_maxFed = servitor.getLifeTime();
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xB6);
+		writeD(_summon.getSummonType());
+		writeD(_summon.getObjectId());
+		writeD(_summon.getX());
+		writeD(_summon.getY());
+		writeD(_summon.getZ());
+		writeS(_summon.getTitle());
+		writeD(_curFed);
+		writeD(_maxFed);
+		writeD((int) _summon.getCurrentHp());
+		writeD(_summon.getMaxHp());
+		writeD((int) _summon.getCurrentMp());
+		writeD(_summon.getMaxMp());
+		writeD(_summon.getLevel());
+		writeQ(_summon.getExp());
+		writeQ(_summon.getExpForThisLevel()); // 0% absolute value
+		writeQ(_summon.getExpForNextLevel() - 1); // 100% absolute value
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetitionVotePacket.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetitionVotePacket.java
new file mode 100644
index 00000000..ac01d552
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PetitionVotePacket.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author Plim
+ */
+public class PetitionVotePacket extends L2GameServerPacket {
+	public static final PetitionVotePacket STATIC_PACKET = new PetitionVotePacket();
+	
+	private PetitionVotePacket() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFC);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PlaySound.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PlaySound.java
new file mode 100644
index 00000000..6a3e9335
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PlaySound.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+/**
+ * @author Zealar
+ */
+public class PlaySound extends L2GameServerPacket {
+	private final int _type;
+	// 0 Sound, 1 Music, 2 Voice
+	private final String _soundFile;
+	private final int _bindToObject;
+	private final int _objectId; // used for ships
+	private final int _locX;
+	private final int _locY;
+	private final int _locZ;
+	// Only for Music and Voice
+	private final int _delay;
+	
+	public static PlaySound createSound(String soundName) {
+		return new PlaySound(soundName);
+	}
+	
+	public static PlaySound createSound(String soundName, L2Object obj) {
+		return new PlaySound(soundName, obj);
+	}
+	
+	public static PlaySound createMusic(String soundName) {
+		return createMusic(soundName, 0);
+	}
+	
+	public static PlaySound createMusic(String soundName, int delay) {
+		return new PlaySound(1, soundName, delay);
+	}
+	
+	public static PlaySound createVoice(String soundName) {
+		return createVoice(soundName, 0);
+	}
+	
+	public static PlaySound createVoice(String soundName, int delay) {
+		return new PlaySound(2, soundName, delay);
+	}
+	
+	private PlaySound(String soundFile) {
+		_type = 0;
+		_soundFile = soundFile;
+		_bindToObject = 0;
+		_objectId = 0;
+		_locX = 0;
+		_locY = 0;
+		_locZ = 0;
+		_delay = 0;
+	}
+	
+	private PlaySound(String soundFile, L2Object obj) {
+		_type = 0;
+		_soundFile = soundFile;
+		if (obj != null) {
+			_bindToObject = 1;
+			_objectId = obj.getObjectId();
+			_locX = obj.getX();
+			_locY = obj.getY();
+			_locZ = obj.getZ();
+		} else {
+			_bindToObject = 0;
+			_objectId = 0;
+			_locX = 0;
+			_locY = 0;
+			_locZ = 0;
+		}
+		_delay = 0;
+	}
+	
+	private PlaySound(int type, String soundFile, int radius) {
+		_type = type;
+		_soundFile = soundFile;
+		_bindToObject = 0;
+		_objectId = 0;
+		_locX = 0;
+		_locY = 0;
+		_locZ = 0;
+		_delay = radius;
+	}
+	
+	public String getSoundName() {
+		return _soundFile;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x9e);
+		writeD(_type);
+		writeS(_soundFile);
+		writeD(_bindToObject);
+		writeD(_objectId);
+		writeD(_locX);
+		writeD(_locY);
+		writeD(_locZ);
+		writeD(_delay);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java
new file mode 100644
index 00000000..570deca7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.CrestTable;
+import com.l2jserver.gameserver.model.L2Crest;
+
+public final class PledgeCrest extends L2GameServerPacket {
+	private final int _crestId;
+	private final byte[] _data;
+	
+	public PledgeCrest(int crestId) {
+		_crestId = crestId;
+		final L2Crest crest = CrestTable.getInstance().getCrest(crestId);
+		_data = crest != null ? crest.getData() : null;
+	}
+	
+	public PledgeCrest(int crestId, byte[] data) {
+		_crestId = crestId;
+		_data = data;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x6A);
+		writeD(_crestId);
+		if (_data != null) {
+			writeD(_data.length);
+			writeB(_data);
+		} else {
+			writeD(0);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeInfo.java
new file mode 100644
index 00000000..621d612c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeInfo.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+
+public class PledgeInfo extends L2GameServerPacket {
+	private final L2Clan _clan;
+	
+	public PledgeInfo(L2Clan clan) {
+		_clan = clan;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x89);
+		writeD(_clan.getId());
+		writeS(_clan.getName());
+		writeS(_clan.getAllyName());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgePowerGradeList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgePowerGradeList.java
new file mode 100644
index 00000000..e6b501f7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgePowerGradeList.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan.RankPrivs;
+
+public class PledgePowerGradeList extends L2GameServerPacket {
+	private final RankPrivs[] _privs;
+	
+	public PledgePowerGradeList(RankPrivs[] privs) {
+		_privs = privs;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xFE);
+		writeH(0x3c);
+		writeD(_privs.length);
+		for (RankPrivs temp : _privs) {
+			writeD(temp.getRank());
+			writeD(temp.getParty());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
new file mode 100644
index 00000000..29c3c368
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2ClanMember;
+
+/**
+ * @author -Wooden-
+ */
+public class PledgeReceiveMemberInfo extends L2GameServerPacket {
+	private final L2ClanMember _member;
+	
+	public PledgeReceiveMemberInfo(L2ClanMember member) {
+		_member = member;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x3e);
+		
+		writeD(_member.getPledgeType());
+		writeS(_member.getName());
+		writeS(_member.getTitle()); // title
+		writeD(_member.getPowerGrade()); // power
+		
+		// clan or subpledge name
+		if (_member.getPledgeType() != 0) {
+			writeS((_member.getClan().getSubPledge(_member.getPledgeType())).getName());
+		} else {
+			writeS(_member.getClan().getName());
+		}
+		
+		writeS(_member.getApprenticeOrSponsorName()); // name of this member's apprentice/sponsor
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceivePowerInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
new file mode 100644
index 00000000..9bba5389
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2ClanMember;
+
+/**
+ * @author -Wooden-
+ */
+public class PledgeReceivePowerInfo extends L2GameServerPacket {
+	private final L2ClanMember _member;
+	
+	public PledgeReceivePowerInfo(L2ClanMember member) {
+		_member = member;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x3d);
+		
+		writeD(_member.getPowerGrade()); // power grade
+		writeS(_member.getName());
+		writeD(_member.getClan().getRankPrivs(_member.getPowerGrade()).getBitmask()); // privileges
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
new file mode 100644
index 00000000..017b958d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Clan.SubPledge;
+
+/**
+ * @author -Wooden-
+ */
+public class PledgeReceiveSubPledgeCreated extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(PledgeReceiveSubPledgeCreated.class);
+	
+	private final SubPledge _subPledge;
+	private final L2Clan _clan;
+	
+	public PledgeReceiveSubPledgeCreated(SubPledge subPledge, L2Clan clan) {
+		_subPledge = subPledge;
+		_clan = clan;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x40);
+		
+		writeD(0x01);
+		writeD(_subPledge.getId());
+		writeS(_subPledge.getName());
+		writeS(getLeaderName());
+	}
+	
+	private String getLeaderName() {
+		int LeaderId = _subPledge.getLeaderId();
+		if ((_subPledge.getId() == L2Clan.SUBUNIT_ACADEMY) || (LeaderId == 0)) {
+			return "";
+		} else if (_clan.getClanMember(LeaderId) == null) {
+			LOG.warn("SubPledgeLeader: {} is missing from clan: {}[{}]", LeaderId, _clan.getName(), _clan.getId());
+			return "";
+		} else {
+			return _clan.getClanMember(LeaderId).getName();
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java
new file mode 100644
index 00000000..41b1d83a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeReceiveWarList.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+
+/**
+ * @author -Wooden-
+ */
+public class PledgeReceiveWarList extends L2GameServerPacket {
+	private final L2Clan _clan;
+	private final int _tab;
+	
+	public PledgeReceiveWarList(L2Clan clan, int tab) {
+		_clan = clan;
+		_tab = tab;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x3f);
+		
+		writeD(_tab); // type : 0 = Declared, 1 = Under Attack
+		writeD(0x00); // page
+		writeD(_tab == 0 ? _clan.getWarList().size() : _clan.getAttackerList().size());
+		for (Integer i : _tab == 0 ? _clan.getWarList() : _clan.getAttackerList()) {
+			L2Clan clan = ClanTable.getInstance().getClan(i);
+			if (clan == null) {
+				continue;
+			}
+			
+			writeS(clan.getName());
+			writeD(_tab); // ??
+			writeD(_tab); // ??
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
new file mode 100644
index 00000000..6407d03a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+
+public class PledgeShowInfoUpdate extends L2GameServerPacket {
+	private final L2Clan _clan;
+	
+	public PledgeShowInfoUpdate(L2Clan clan) {
+		_clan = clan;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x8E);
+		// sending empty data so client will ask all the info in response ;)
+		writeD(_clan.getId());
+		writeD(_clan.getCrestId());
+		writeD(_clan.getLevel()); // clan level
+		writeD(_clan.getCastleId());
+		writeD(_clan.getHideoutId());
+		writeD(_clan.getFortId());
+		writeD(_clan.getRank());
+		writeD(_clan.getReputationScore()); // clan reputation score
+		writeD(0x00); // ?
+		writeD(0x00); // ?
+		writeD(_clan.getAllyId());
+		writeS(_clan.getAllyName()); // c5
+		writeD(_clan.getAllyCrestId()); // c5
+		writeD(_clan.isAtWar() ? 1 : 0); // c5
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
new file mode 100644
index 00000000..e55ea669
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class PledgeShowMemberListAdd extends L2GameServerPacket {
+	private final String _name;
+	private final int _lvl;
+	private final int _classId;
+	private final int _isOnline;
+	private final int _pledgeType;
+	
+	public PledgeShowMemberListAdd(L2PcInstance player) {
+		_name = player.getName();
+		_lvl = player.getLevel();
+		_classId = player.getClassId().getId();
+		_isOnline = (player.isOnline() ? player.getObjectId() : 0);
+		_pledgeType = player.getPledgeType();
+	}
+	
+	public PledgeShowMemberListAdd(L2ClanMember cm) {
+		_name = cm.getName();
+		_lvl = cm.getLevel();
+		_classId = cm.getClassId();
+		_isOnline = (cm.isOnline() ? cm.getObjectId() : 0);
+		_pledgeType = cm.getPledgeType();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x5c);
+		writeS(_name);
+		writeD(_lvl);
+		writeD(_classId);
+		writeD(0x00);
+		writeD(0x01);
+		writeD(_isOnline); // 1 = online 0 = offline
+		writeD(_pledgeType);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java
new file mode 100644
index 00000000..f505fbf8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListAll.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2Clan.SubPledge;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PledgeShowMemberListAll extends L2GameServerPacket {
+	private final L2Clan _clan;
+	private final L2PcInstance _activeChar;
+	private final L2ClanMember[] _members;
+	private int _pledgeType;
+	
+	public PledgeShowMemberListAll(L2Clan clan, L2PcInstance activeChar) {
+		_clan = clan;
+		_activeChar = activeChar;
+		_members = _clan.getMembers();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		_pledgeType = 0;
+		// FIXME: That's wrong on retail sends this whole packet few times (depending how much sub pledges it has)
+		writePledge(0);
+		
+		for (SubPledge subPledge : _clan.getAllSubPledges()) {
+			_activeChar.sendPacket(new PledgeReceiveSubPledgeCreated(subPledge, _clan));
+		}
+		
+		for (L2ClanMember m : _members) {
+			if (m.getPledgeType() == 0) {
+				continue;
+			}
+			_activeChar.sendPacket(new PledgeShowMemberListAdd(m));
+		}
+		
+		// unless this is sent sometimes, the client doesn't recognise the player as the leader
+		_activeChar.sendPacket(new UserInfo(_activeChar));
+		_activeChar.sendPacket(new ExBrExtraUserInfo(_activeChar));
+		
+	}
+	
+	private void writePledge(int mainOrSubpledge) {
+		writeC(0x5a);
+		
+		writeD(mainOrSubpledge);
+		writeD(_clan.getId());
+		writeD(_pledgeType);
+		writeS(_clan.getName());
+		writeS(_clan.getLeaderName());
+		
+		writeD(_clan.getCrestId()); // crest id .. is used again
+		writeD(_clan.getLevel());
+		writeD(_clan.getCastleId());
+		writeD(_clan.getHideoutId());
+		writeD(_clan.getFortId());
+		writeD(_clan.getRank());
+		writeD(_clan.getReputationScore());
+		writeD(0x00); // 0
+		writeD(0x00); // 0
+		writeD(_clan.getAllyId());
+		writeS(_clan.getAllyName());
+		writeD(_clan.getAllyCrestId());
+		writeD(_clan.isAtWar() ? 1 : 0);// new c3
+		writeD(0x00); // Territory castle ID
+		writeD(_clan.getSubPledgeMembersCount(_pledgeType));
+		
+		for (L2ClanMember m : _members) {
+			if (m.getPledgeType() != _pledgeType) {
+				continue;
+			}
+			writeS(m.getName());
+			writeD(m.getLevel());
+			writeD(m.getClassId());
+			L2PcInstance player = m.getPlayerInstance();
+			if (player != null) {
+				writeD(player.getAppearance().getSex() ? 1 : 0); // no visible effect
+				writeD(player.getRace().ordinal());// writeD(1);
+			} else {
+				writeD(0x01); // no visible effect
+				writeD(0x01); // writeD(1);
+			}
+			writeD(m.isOnline() ? m.getObjectId() : 0); // objectId = online 0 = offline
+			writeD(m.getSponsor() != 0 ? 1 : 0);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListDelete.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
new file mode 100644
index 00000000..62f575df
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class PledgeShowMemberListDelete extends L2GameServerPacket {
+	private final String _player;
+	
+	public PledgeShowMemberListDelete(String playerName) {
+		_player = playerName;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x5d);
+		writeS(_player);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
new file mode 100644
index 00000000..dd8bb078
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class PledgeShowMemberListDeleteAll extends L2GameServerPacket {
+	public static final PledgeShowMemberListDeleteAll STATIC_PACKET = new PledgeShowMemberListDeleteAll();
+	
+	private PledgeShowMemberListDeleteAll() {
+		
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x88);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
new file mode 100644
index 00000000..51564835
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author -Wooden-
+ */
+public final class PledgeShowMemberListUpdate extends L2GameServerPacket {
+	private final int _pledgeType;
+	private final int _hasSponsor;
+	private final String _name;
+	private final int _level;
+	private final int _classId;
+	private final int _objectId;
+	private final boolean _isOnline;
+	private final int _race;
+	private final int _sex;
+	
+	public PledgeShowMemberListUpdate(L2PcInstance player) {
+		_pledgeType = player.getPledgeType();
+		if (_pledgeType == L2Clan.SUBUNIT_ACADEMY) {
+			_hasSponsor = player.getSponsor() != 0 ? 1 : 0;
+		} else {
+			_hasSponsor = 0;
+		}
+		_name = player.getName();
+		_level = player.getLevel();
+		_classId = player.getClassId().getId();
+		_race = player.getRace().ordinal();
+		_sex = player.getAppearance().getSex() ? 1 : 0;
+		_objectId = player.getObjectId();
+		_isOnline = player.isOnline();
+	}
+	
+	public PledgeShowMemberListUpdate(L2ClanMember member) {
+		_name = member.getName();
+		_level = member.getLevel();
+		_classId = member.getClassId();
+		_objectId = member.getObjectId();
+		_isOnline = member.isOnline();
+		_pledgeType = member.getPledgeType();
+		_race = member.getRaceOrdinal();
+		_sex = member.getSex() ? 1 : 0;
+		if (_pledgeType == L2Clan.SUBUNIT_ACADEMY) {
+			_hasSponsor = member.getSponsor() != 0 ? 1 : 0;
+		} else {
+			_hasSponsor = 0;
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x5b);
+		writeS(_name);
+		writeD(_level);
+		writeD(_classId);
+		writeD(_sex);
+		writeD(_race);
+		if (_isOnline) {
+			writeD(_objectId);
+			writeD(_pledgeType);
+		} else {
+			// when going offline send as 0
+			writeD(0);
+			writeD(0);
+		}
+		writeD(_hasSponsor);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillList.java
new file mode 100644
index 00000000..42f55630
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillList.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * @author -Wooden-
+ */
+public class PledgeSkillList extends L2GameServerPacket {
+	private final Skill[] _skills;
+	private final List<SubPledgeSkill> _subSkills;
+	
+	public static class SubPledgeSkill {
+		int _subType;
+		int _skillId;
+		int _skillLvl;
+		
+		public SubPledgeSkill(int subType, int skillId, int skillLvl) {
+			_subType = subType;
+			_skillId = skillId;
+			_skillLvl = skillLvl;
+		}
+	}
+	
+	public PledgeSkillList(L2Clan clan) {
+		_skills = clan.getAllSkills();
+		_subSkills = clan.getAllSubSkills();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfE);
+		writeH(0x3A);
+		writeD(_skills.length);
+		writeD(_subSkills.size()); // Squad skill length
+		for (Skill sk : _skills) {
+			writeD(sk.getDisplayId());
+			writeD(sk.getDisplayLevel());
+		}
+		for (SubPledgeSkill sk : _subSkills) {
+			writeD(sk._subType); // Clan Sub-unit types
+			writeD(sk._skillId);
+			writeD(sk._skillLvl);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillListAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillListAdd.java
new file mode 100644
index 00000000..97be7977
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeSkillListAdd.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author -Wooden-
+ */
+public class PledgeSkillListAdd extends L2GameServerPacket {
+	private final int _id;
+	private final int _lvl;
+	
+	public PledgeSkillListAdd(int id, int lvl) {
+		_id = id;
+		_lvl = lvl;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x3B);
+		
+		writeD(_id);
+		writeD(_lvl);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java
new file mode 100644
index 00000000..f3fed120
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PledgeStatusChanged.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Clan;
+
+public final class PledgeStatusChanged extends L2GameServerPacket {
+	private final L2Clan _clan;
+	
+	public PledgeStatusChanged(L2Clan clan) {
+		_clan = clan;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xCD);
+		writeD(_clan.getLeaderId());
+		writeD(_clan.getId());
+		writeD(_clan.getCrestId());
+		writeD(_clan.getAllyId());
+		writeD(_clan.getAllyCrestId());
+		writeD(0x00);
+		writeD(0x00);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PremiumState.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PremiumState.java
new file mode 100644
index 00000000..1047a3dd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PremiumState.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author GodKratos
+ */
+public class PremiumState extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _state;
+	
+	public PremiumState(int objectId, int state) {
+		_objectId = objectId;
+		_state = state;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0xAA);
+		writeD(_objectId);
+		writeC(_state);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListBuy.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListBuy.java
new file mode 100644
index 00000000..d4a3a53d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListBuy.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PrivateStoreListBuy extends AbstractItemPacket {
+	private final int _objId;
+	private final long _playerAdena;
+	private final List<TradeItem> _items;
+	
+	public PrivateStoreListBuy(L2PcInstance player, L2PcInstance storePlayer) {
+		_objId = storePlayer.getObjectId();
+		_playerAdena = player.getAdena();
+		storePlayer.getSellList().updateItems(); // Update SellList for case inventory content has changed
+		_items = storePlayer.getBuyList().getAvailableItems(player.getInventory());
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xbe);
+		writeD(_objId);
+		writeQ(_playerAdena);
+		
+		writeD(_items.size());
+		
+		for (TradeItem item : _items) {
+			writeItem(item);
+			writeD(item.getObjectId());
+			writeQ(item.getPrice());
+			writeQ(item.getItem().getReferencePrice() * 2);
+			writeQ(item.getStoreCount());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListSell.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListSell.java
new file mode 100644
index 00000000..ae27de95
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreListSell.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PrivateStoreListSell extends AbstractItemPacket {
+	private final int _objId;
+	private final long _playerAdena;
+	private final boolean _packageSale;
+	private final TradeItem[] _items;
+	
+	public PrivateStoreListSell(L2PcInstance player, L2PcInstance storePlayer) {
+		_objId = storePlayer.getObjectId();
+		_playerAdena = player.getAdena();
+		_items = storePlayer.getSellList().getItems();
+		_packageSale = storePlayer.getSellList().isPackaged();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xA1);
+		writeD(_objId);
+		writeD(_packageSale ? 1 : 0);
+		writeQ(_playerAdena);
+		writeD(_items.length);
+		for (TradeItem item : _items) {
+			writeItem(item);
+			writeQ(item.getPrice());
+			writeQ(item.getItem().getReferencePrice() * 2);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListBuy.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
new file mode 100644
index 00000000..212d7d00
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class PrivateStoreManageListBuy extends AbstractItemPacket {
+	private final int _objId;
+	private final long _playerAdena;
+	private final L2ItemInstance[] _itemList;
+	private final TradeItem[] _buyList;
+	
+	public PrivateStoreManageListBuy(L2PcInstance player) {
+		_objId = player.getObjectId();
+		_playerAdena = player.getAdena();
+		_itemList = player.getInventory().getUniqueItems(false, true);
+		_buyList = player.getBuyList().getItems();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xbd);
+		// section 1
+		writeD(_objId);
+		writeQ(_playerAdena);
+		
+		// section2
+		writeD(_itemList.length); // inventory items for potential buy
+		for (L2ItemInstance item : _itemList) {
+			writeItem(item);
+			writeQ(item.getItem().getReferencePrice() * 2);
+		}
+		
+		// section 3
+		writeD(_buyList.length); // count for all items already added for buy
+		for (TradeItem item : _buyList) {
+			writeItem(item);
+			writeQ(item.getPrice());
+			writeQ(item.getItem().getReferencePrice() * 2);
+			writeQ(item.getCount());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListSell.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListSell.java
new file mode 100644
index 00000000..a4101e0c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreManageListSell.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.TradeItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PrivateStoreManageListSell extends AbstractItemPacket {
+	private final int _objId;
+	private final long _playerAdena;
+	private final boolean _packageSale;
+	private final TradeItem[] _itemList;
+	private final TradeItem[] _sellList;
+	
+	public PrivateStoreManageListSell(L2PcInstance player, boolean isPackageSale) {
+		_objId = player.getObjectId();
+		_playerAdena = player.getAdena();
+		player.getSellList().updateItems();
+		_packageSale = isPackageSale;
+		_itemList = player.getInventory().getAvailableItems(player.getSellList());
+		_sellList = player.getSellList().getItems();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xA0);
+		// section 1
+		writeD(_objId);
+		writeD(_packageSale ? 1 : 0); // Package sell
+		writeQ(_playerAdena);
+		
+		// section2
+		writeD(_itemList.length); // for potential sells
+		for (TradeItem item : _itemList) {
+			writeItem(item);
+			writeQ(item.getItem().getReferencePrice() * 2);
+		}
+		// section 3
+		writeD(_sellList.length); // count for any items already added for sell
+		for (TradeItem item : _sellList) {
+			writeItem(item);
+			writeQ(item.getPrice());
+			writeQ(item.getItem().getReferencePrice() * 2);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgBuy.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
new file mode 100644
index 00000000..3fb297ae
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgBuy.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PrivateStoreMsgBuy extends L2GameServerPacket {
+	private final int _objId;
+	private String _storeMsg;
+	
+	public PrivateStoreMsgBuy(L2PcInstance player) {
+		_objId = player.getObjectId();
+		if (player.getBuyList() != null) {
+			_storeMsg = player.getBuyList().getTitle();
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xBF);
+		writeD(_objId);
+		writeS(_storeMsg);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgSell.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgSell.java
new file mode 100644
index 00000000..e27dcc3e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/PrivateStoreMsgSell.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class PrivateStoreMsgSell extends L2GameServerPacket {
+	private final int _objId;
+	private String _storeMsg;
+	
+	public PrivateStoreMsgSell(L2PcInstance player) {
+		_objId = player.getObjectId();
+		if (player.getSellList() != null) {
+			_storeMsg = player.getSellList().getTitle();
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xA2);
+		writeD(_objId);
+		writeS(_storeMsg);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java
new file mode 100644
index 00000000..653cc546
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/QuestList.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+
+public class QuestList extends L2GameServerPacket {
+	@Override
+	protected final void writeImpl() {
+		/**
+		 * <pre>
+		 * This text was wrote by XaKa
+		 * QuestList packet structure:
+		 * {
+		 * 		1 byte - 0x80
+		 * 		2 byte - Number of Quests
+		 * 		for Quest in AvailableQuests
+		 * 		{
+		 * 			4 byte - Quest ID
+		 * 			4 byte - Quest Status
+		 * 		}
+		 * }
+		 * 
+		 * NOTE: The following special constructs are true for the 4-byte Quest Status:
+		 * If the most significant bit is 0, this means that no progress-step got skipped.
+		 * In this case, merely passing the rank of the latest step gets the client to mark
+		 * it as current and mark all previous steps as complete.
+		 * If the most significant bit is 1, it means that some steps may have been skipped.
+		 * In that case, each bit represents a quest step (max 30) with 0 indicating that it was
+		 * skipped and 1 indicating that it either got completed or is currently active (the client
+		 * will automatically assume the largest step as active and all smaller ones as completed).
+		 * For example, the following bit sequences will yield the same results:
+		 * 1000 0000 0000 0000 0000 0011 1111 1111: Indicates some steps may be skipped but each of
+		 * the first 10 steps did not get skipped and current step is the 10th.
+		 * 0000 0000 0000 0000 0000 0000 0000 1010: Indicates that no steps were skipped and current is the 10th.
+		 * It is speculated that the latter will be processed faster by the client, so it is preferred when no
+		 * steps have been skipped.
+		 * However, the sequence "1000 0000 0000 0000 0000 0010 1101 1111" indicates that the current step is
+		 * the 10th but the 6th and 9th are not to be shown at all (not completed, either).
+		 * </pre>
+		 */
+		
+		final L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		final List<Quest> quests = activeChar.getAllActiveQuests();
+		
+		writeC(0x86);
+		writeH(quests.size());
+		for (Quest q : quests) {
+			writeD(q.getId());
+			QuestState qs = activeChar.getQuestState(q.getName());
+			if (qs == null) {
+				writeD(0);
+				continue;
+			}
+			
+			int states = qs.getInt("__compltdStateFlags");
+			if (states > 0) {
+				writeD(states);
+			} else {
+				writeD(qs.getInt("cond"));
+			}
+		}
+		writeB(new byte[128]);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RadarControl.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RadarControl.java
new file mode 100644
index 00000000..5311d0b6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RadarControl.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * Radar Control server packet implementation.
+ * @author JIV
+ * @author MELERIX
+ * @author UnAfraid
+ * @author Nos
+ * @author Zoey76
+ */
+public class RadarControl extends L2GameServerPacket {
+	private final RadarAction action;
+	private final RadarType type;
+	private final int x;
+	private final int y;
+	private final int z;
+	
+	public RadarControl(RadarAction action, RadarType type, int x, int y, int z) {
+		this.action = action;
+		this.type = type;
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xF1);
+		writeD(action.ordinal());
+		writeD(type.ordinal() + 1);
+		writeD(x);
+		writeD(y);
+		writeD(z);
+	}
+	
+	public static enum RadarAction {
+		ADD,
+		DELETE,
+		DELETE_ALL
+	}
+	
+	public static enum RadarType {
+		FLAG_1,
+		FLAG_2
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeBookItemList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeBookItemList.java
new file mode 100644
index 00000000..3e57ddfa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeBookItemList.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2RecipeList;
+
+public class RecipeBookItemList extends L2GameServerPacket {
+	private L2RecipeList[] _recipes;
+	private final boolean _isDwarvenCraft;
+	private final int _maxMp;
+	
+	public RecipeBookItemList(boolean isDwarvenCraft, int maxMp) {
+		_isDwarvenCraft = isDwarvenCraft;
+		_maxMp = maxMp;
+	}
+	
+	public void addRecipes(L2RecipeList[] recipeBook) {
+		_recipes = recipeBook;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xdc);
+		writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common
+		writeD(_maxMp);
+		
+		if (_recipes == null) {
+			writeD(0);
+		} else {
+			writeD(_recipes.length); // number of items in recipe book
+			for (int i = 0; i < _recipes.length; i++) {
+				writeD(_recipes[i].getId());
+				writeD(i + 1);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java
new file mode 100644
index 00000000..1276ee62
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeItemMakeInfo.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class RecipeItemMakeInfo extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(RecipeItemMakeInfo.class);
+	
+	private final int _id;
+	private final L2PcInstance _activeChar;
+	private final boolean _success;
+	
+	public RecipeItemMakeInfo(int id, L2PcInstance player, boolean success) {
+		_id = id;
+		_activeChar = player;
+		_success = success;
+	}
+	
+	public RecipeItemMakeInfo(int id, L2PcInstance player) {
+		_id = id;
+		_activeChar = player;
+		_success = true;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		final L2RecipeList recipe = RecipeData.getInstance().getRecipeList(_id);
+		if (recipe != null) {
+			writeC(0xDD);
+			writeD(_id);
+			writeD(recipe.isDwarvenRecipe() ? 0 : 1); // 0 = Dwarven - 1 = Common
+			writeD((int) _activeChar.getCurrentMp());
+			writeD(_activeChar.getMaxMp());
+			writeD(_success ? 1 : 0); // item creation success/failed
+		} else {
+			LOG.info("Character: {}: Requested unexisting recipe with id = {}", getClient().getActiveChar(), _id);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java
new file mode 100644
index 00000000..19278d56
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopItemInfo.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class RecipeShopItemInfo extends L2GameServerPacket {
+	private final L2PcInstance _player;
+	private final int _recipeId;
+	
+	public RecipeShopItemInfo(L2PcInstance player, int recipeId) {
+		_player = player;
+		_recipeId = recipeId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xE0);
+		writeD(_player.getObjectId());
+		writeD(_recipeId);
+		writeD((int) _player.getCurrentMp());
+		writeD(_player.getMaxMp());
+		writeD(0xffffffff);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java
new file mode 100644
index 00000000..c1762d26
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopManageList.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Iterator;
+
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class RecipeShopManageList extends L2GameServerPacket {
+	private final L2PcInstance _seller;
+	private final boolean _isDwarven;
+	private final L2RecipeList[] _recipes;
+	
+	public RecipeShopManageList(L2PcInstance seller, boolean isDwarven) {
+		_seller = seller;
+		_isDwarven = isDwarven;
+		
+		if (_isDwarven && _seller.hasDwarvenCraft()) {
+			_recipes = _seller.getDwarvenRecipeBook();
+		} else {
+			_recipes = _seller.getCommonRecipeBook();
+		}
+		
+		if (_seller.hasManufactureShop()) {
+			final Iterator<L2ManufactureItem> it = _seller.getManufactureItems().values().iterator();
+			L2ManufactureItem item;
+			while (it.hasNext()) {
+				item = it.next();
+				if ((item.isDwarven() != _isDwarven) || !seller.hasRecipeList(item.getRecipeId())) {
+					it.remove();
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xDE);
+		writeD(_seller.getObjectId());
+		writeD((int) _seller.getAdena());
+		writeD(_isDwarven ? 0x00 : 0x01);
+		
+		if (_recipes == null) {
+			writeD(0);
+		} else {
+			writeD(_recipes.length);// number of items in recipe book
+			
+			for (int i = 0; i < _recipes.length; i++) {
+				L2RecipeList temp = _recipes[i];
+				writeD(temp.getId());
+				writeD(i + 1);
+			}
+		}
+		
+		if (!_seller.hasManufactureShop()) {
+			writeD(0x00);
+		} else {
+			writeD(_seller.getManufactureItems().size());
+			for (L2ManufactureItem item : _seller.getManufactureItems().values()) {
+				writeD(item.getRecipeId());
+				writeD(0x00);
+				writeQ(item.getCost());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopMsg.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopMsg.java
new file mode 100644
index 00000000..a2eff468
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopMsg.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class RecipeShopMsg extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	
+	public RecipeShopMsg(L2PcInstance player) {
+		_activeChar = player;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xE1);
+		writeD(_activeChar.getObjectId());
+		writeS(_activeChar.getStoreName());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopSellList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopSellList.java
new file mode 100644
index 00000000..7eef4ac5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RecipeShopSellList.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2ManufactureItem;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class RecipeShopSellList extends L2GameServerPacket {
+	private final L2PcInstance _buyer, _manufacturer;
+	
+	public RecipeShopSellList(L2PcInstance buyer, L2PcInstance manufacturer) {
+		_buyer = buyer;
+		_manufacturer = manufacturer;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xDF);
+		writeD(_manufacturer.getObjectId());
+		writeD((int) _manufacturer.getCurrentMp());// Creator's MP
+		writeD(_manufacturer.getMaxMp());// Creator's MP
+		writeQ(_buyer.getAdena());// Buyer Adena
+		if (!_manufacturer.hasManufactureShop()) {
+			writeD(0x00);
+		} else {
+			writeD(_manufacturer.getManufactureItems().size());
+			for (L2ManufactureItem temp : _manufacturer.getManufactureItems().values()) {
+				writeD(temp.getRecipeId());
+				writeD(0x00); // unknown
+				writeQ(temp.getCost());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java
new file mode 100644
index 00000000..6b67276c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.L2Playable;
+
+/**
+ * @author Luca Baldi
+ */
+public final class RelationChanged extends L2GameServerPacket {
+	public static final int RELATION_PARTY1 = 0x00001; // party member
+	public static final int RELATION_PARTY2 = 0x00002; // party member
+	public static final int RELATION_PARTY3 = 0x00004; // party member
+	public static final int RELATION_PARTY4 = 0x00008; // party member (for information, see L2PcInstance.getRelation())
+	public static final int RELATION_PARTYLEADER = 0x00010; // true if is party leader
+	public static final int RELATION_HAS_PARTY = 0x00020; // true if is in party
+	public static final int RELATION_CLAN_MEMBER = 0x00040; // true if is in clan
+	public static final int RELATION_LEADER = 0x00080; // true if is clan leader
+	public static final int RELATION_CLAN_MATE = 0x00100; // true if is in same clan
+	public static final int RELATION_INSIEGE = 0x00200; // true if in siege
+	public static final int RELATION_ATTACKER = 0x00400; // true when attacker
+	public static final int RELATION_ALLY = 0x00800; // blue siege icon, cannot have if red
+	public static final int RELATION_ENEMY = 0x01000; // true when red icon, doesn't matter with blue
+	public static final int RELATION_MUTUAL_WAR = 0x04000; // double fist
+	public static final int RELATION_1SIDED_WAR = 0x08000; // single fist
+	public static final int RELATION_ALLY_MEMBER = 0x10000; // clan is in alliance
+	public static final int RELATION_TERRITORY_WAR = 0x80000; // show Territory War icon
+	
+	protected static class Relation {
+		int _objId, _relation, _autoAttackable, _karma, _pvpFlag;
+	}
+	
+	private Relation _singled;
+	private List<Relation> _multi;
+	
+	public RelationChanged(L2Playable activeChar, int relation, boolean autoAttackable) {
+		_singled = new Relation();
+		_singled._objId = activeChar.getObjectId();
+		_singled._relation = relation;
+		_singled._autoAttackable = autoAttackable ? 1 : 0;
+		_singled._karma = activeChar.getKarma();
+		_singled._pvpFlag = activeChar.getPvpFlag();
+		setInvisible(activeChar.isInvisible());
+	}
+	
+	public RelationChanged() {
+		_multi = new ArrayList<>();
+	}
+	
+	public void addRelation(L2Playable activeChar, int relation, boolean autoAttackable) {
+		if (activeChar.isInvisible()) {
+			throw new IllegalArgumentException("Cannot add invisible character to multi relation packet");
+		}
+		Relation r = new Relation();
+		r._objId = activeChar.getObjectId();
+		r._relation = relation;
+		r._autoAttackable = autoAttackable ? 1 : 0;
+		r._karma = activeChar.getKarma();
+		r._pvpFlag = activeChar.getPvpFlag();
+		_multi.add(r);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xce);
+		if (_multi == null) {
+			writeD(1);
+			writeRelation(_singled);
+		} else {
+			writeD(_multi.size());
+			for (Relation r : _multi) {
+				writeRelation(r);
+			}
+		}
+	}
+	
+	private void writeRelation(Relation relation) {
+		writeD(relation._objId);
+		writeD(relation._relation);
+		writeD(relation._autoAttackable);
+		writeD(relation._karma);
+		writeD(relation._pvpFlag);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RequestEnchant.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RequestEnchant.java
new file mode 100644
index 00000000..e42d95ff
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RequestEnchant.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author nBd
+ */
+public class RequestEnchant extends L2GameServerPacket {
+	private final int _unk;
+	
+	public RequestEnchant(int value) {
+		_unk = value;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xFE);
+		writeH(0x81);
+		writeD(_unk);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/RestartResponse.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RestartResponse.java
new file mode 100644
index 00000000..ba4f8430
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/RestartResponse.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class RestartResponse extends L2GameServerPacket {
+	private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true);
+	private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false);
+	
+	public static RestartResponse valueOf(boolean result) {
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
+	private final boolean _result;
+	
+	public RestartResponse(boolean result) {
+		_result = result;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x71);
+		writeD(_result ? 1 : 0);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Revive.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Revive.java
new file mode 100644
index 00000000..82525156
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Revive.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+public final class Revive extends L2GameServerPacket {
+	private final int _objectId;
+	
+	public Revive(L2Object obj) {
+		_objectId = obj.getObjectId();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x01);
+		writeD(_objectId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ride.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ride.java
new file mode 100644
index 00000000..6c5e9b77
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Ride.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class Ride extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _mounted;
+	private final int _rideType;
+	private final int _rideNpcId;
+	private final Location _loc;
+	
+	public Ride(L2PcInstance player) {
+		_objectId = player.getObjectId();
+		_mounted = player.isMounted() ? 1 : 0;
+		_rideType = player.getMountType().ordinal();
+		_rideNpcId = player.getMountNpcId() + 1000000;
+		_loc = player.getLocation();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x8C);
+		writeD(_objectId);
+		writeD(_mounted);
+		writeD(_rideType);
+		writeD(_rideNpcId);
+		writeD(_loc.getX());
+		writeD(_loc.getY());
+		writeD(_loc.getZ());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SSQInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SSQInfo.java
new file mode 100644
index 00000000..2477aef4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SSQInfo.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.SevenSigns;
+
+/**
+ * Changes the sky color depending on the outcome of the Seven Signs competition.
+ * @author Tempy
+ */
+public class SSQInfo extends L2GameServerPacket {
+	private int _state = 0;
+	
+	public SSQInfo() {
+		int compWinner = SevenSigns.getInstance().getCabalHighestScore();
+		
+		if (SevenSigns.getInstance().isSealValidationPeriod()) {
+			if (compWinner == SevenSigns.CABAL_DAWN) {
+				_state = 2;
+			} else if (compWinner == SevenSigns.CABAL_DUSK) {
+				_state = 1;
+			}
+		}
+	}
+	
+	public SSQInfo(int state) {
+		_state = state;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x73);
+		writeH(256 + _state);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SSQStatus.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SSQStatus.java
new file mode 100644
index 00000000..e4615a68
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SSQStatus.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * Seven Signs Record Update
+ * @author Tempy
+ * @author shansoft
+ */
+public class SSQStatus extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(SSQStatus.class);
+	
+	private final int _objectId;
+	private final int _page;
+	
+	public SSQStatus(int objectId, int recordPage) {
+		_objectId = objectId;
+		_page = recordPage;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		int winningCabal = SevenSigns.getInstance().getCabalHighestScore();
+		int totalDawnMembers = SevenSigns.getInstance().getTotalMembers(SevenSigns.CABAL_DAWN);
+		int totalDuskMembers = SevenSigns.getInstance().getTotalMembers(SevenSigns.CABAL_DUSK);
+		
+		writeC(0xfb);
+		
+		writeC(_page);
+		writeC(SevenSigns.getInstance().getCurrentPeriod()); // current period?
+		
+		int dawnPercent = 0;
+		int duskPercent = 0;
+		
+		switch (_page) {
+			case 1:
+				// [ddd cc dd ddd c ddd c]
+				
+				writeD(SevenSigns.getInstance().getCurrentCycle());
+				
+				int currentPeriod = SevenSigns.getInstance().getCurrentPeriod();
+				
+				switch (currentPeriod) {
+					case SevenSigns.PERIOD_COMP_RECRUITING -> writeD(SystemMessageId.INITIAL_PERIOD.getId());
+					case SevenSigns.PERIOD_COMPETITION -> writeD(SystemMessageId.SSQ_COMPETITION_UNDERWAY.getId());
+					case SevenSigns.PERIOD_COMP_RESULTS -> writeD(SystemMessageId.RESULTS_PERIOD.getId());
+					case SevenSigns.PERIOD_SEAL_VALIDATION -> writeD(SystemMessageId.VALIDATION_PERIOD.getId());
+				}
+				
+				switch (currentPeriod) {
+					case SevenSigns.PERIOD_COMP_RECRUITING, SevenSigns.PERIOD_COMP_RESULTS -> writeD(SystemMessageId.UNTIL_TODAY_6PM.getId());
+					case SevenSigns.PERIOD_COMPETITION, SevenSigns.PERIOD_SEAL_VALIDATION -> writeD(SystemMessageId.UNTIL_MONDAY_6PM.getId());
+				}
+				
+				writeC(SevenSigns.getInstance().getPlayerCabal(_objectId));
+				writeC(SevenSigns.getInstance().getPlayerSeal(_objectId));
+				
+				writeQ(SevenSigns.getInstance().getPlayerStoneContrib(_objectId)); // Seal Stones Turned-In
+				writeQ(SevenSigns.getInstance().getPlayerAdenaCollect(_objectId)); // Ancient Adena to Collect
+				
+				double dawnStoneScore = SevenSigns.getInstance().getCurrentStoneScore(SevenSigns.CABAL_DAWN);
+				int dawnFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DAWN);
+				
+				double duskStoneScore = SevenSigns.getInstance().getCurrentStoneScore(SevenSigns.CABAL_DUSK);
+				int duskFestivalScore = SevenSigns.getInstance().getCurrentFestivalScore(SevenSigns.CABAL_DUSK);
+				
+				double totalStoneScore = duskStoneScore + dawnStoneScore;
+				
+				/*
+				 * Scoring seems to be proportionate to a set base value, so base this on the maximum obtainable score from festivals, which is 500.
+				 */
+				int duskStoneScoreProp = 0;
+				int dawnStoneScoreProp = 0;
+				
+				if (totalStoneScore != 0) {
+					duskStoneScoreProp = Math.round(((float) duskStoneScore / (float) totalStoneScore) * 500);
+					dawnStoneScoreProp = Math.round(((float) dawnStoneScore / (float) totalStoneScore) * 500);
+				}
+				
+				int duskTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DUSK);
+				int dawnTotalScore = SevenSigns.getInstance().getCurrentScore(SevenSigns.CABAL_DAWN);
+				
+				int totalOverallScore = duskTotalScore + dawnTotalScore;
+				
+				if (totalOverallScore != 0) {
+					dawnPercent = Math.round(((float) dawnTotalScore / (float) totalOverallScore) * 100);
+					duskPercent = Math.round(((float) duskTotalScore / (float) totalOverallScore) * 100);
+				}
+				
+				if (general().debug()) {
+					LOG.info("Dusk Stone Score: {} - Dawn Stone Score: {}", duskStoneScore, dawnStoneScore);
+					LOG.info("Dusk Festival Score: {} - Dawn Festival Score: {}", duskFestivalScore, dawnFestivalScore);
+					LOG.info("Dusk Score: {} - Dawn Score: {}", duskTotalScore, dawnTotalScore);
+					LOG.info("Overall Score: {}", totalOverallScore);
+					LOG.info("");
+					if (totalStoneScore == 0) {
+						LOG.info("Dusk Prop: 0 - Dawn Prop: 0");
+					} else {
+						LOG.info("Dusk Prop: {} - Dawn Prop: {}", (duskStoneScore / totalStoneScore) * 500, (dawnStoneScore / totalStoneScore) * 500);
+					}
+					LOG.info("Dusk %: {} - Dawn %: {}", duskPercent, dawnPercent);
+				}
+				
+				/* DUSK */
+				writeQ(duskStoneScoreProp); // Seal Stone Score
+				writeQ(duskFestivalScore); // Festival Score
+				writeQ(duskTotalScore); // Total Score
+				
+				writeC(duskPercent); // Dusk %
+				
+				/* DAWN */
+				writeQ(dawnStoneScoreProp); // Seal Stone Score
+				writeQ(dawnFestivalScore); // Festival Score
+				writeQ(dawnTotalScore); // Total Score
+				
+				writeC(dawnPercent); // Dawn %
+				break;
+			case 2:
+				// c cc hc [cd (dc (S))]
+				writeH(1);
+				
+				writeC(5); // Total number of festivals
+				
+				for (int i = 0; i < 5; i++) {
+					writeC(i + 1); // Current client-side festival ID
+					writeD(SevenSignsFestival.FESTIVAL_LEVEL_SCORES[i]);
+					
+					int duskScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DUSK, i);
+					int dawnScore = SevenSignsFestival.getInstance().getHighestScore(SevenSigns.CABAL_DAWN, i);
+					
+					// Dusk Score \\
+					writeQ(duskScore);
+					
+					StatsSet highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DUSK, i);
+					String[] partyMembers = highScoreData.getString("members").split(",");
+					
+					writeC(partyMembers.length);
+					
+					for (String partyMember : partyMembers) {
+						writeS(partyMember);
+					}
+					
+					// Dawn Score \\
+					writeQ(dawnScore);
+					
+					highScoreData = SevenSignsFestival.getInstance().getHighestScoreData(SevenSigns.CABAL_DAWN, i);
+					partyMembers = highScoreData.getString("members").split(",");
+					
+					writeC(partyMembers.length);
+					
+					for (String partyMember : partyMembers) {
+						writeS(partyMember);
+					}
+				}
+				break;
+			case 3:
+				// c cc [ccc (cccc)]
+				writeC(10); // Minimum limit for winning cabal to retain their seal
+				writeC(35); // Minimum limit for winning cabal to claim a seal
+				writeC(3); // Total number of seals
+				
+				for (int i = 1; i < 4; i++) {
+					int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN);
+					int duskProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DUSK);
+					
+					if (general().debug()) {
+						LOG.info("{} = Dawn Prop: {}({}%), Dusk Prop: {}({}%)", SevenSigns.getSealName(i, true), dawnProportion, (dawnProportion / totalDawnMembers) * 100, duskProportion, (duskProportion / totalDuskMembers) * 100);
+					}
+					
+					writeC(i);
+					writeC(SevenSigns.getInstance().getSealOwner(i));
+					
+					if (totalDuskMembers == 0) {
+						if (totalDawnMembers == 0) {
+							writeC(0);
+							writeC(0);
+						} else {
+							writeC(0);
+							writeC(Math.round(((float) dawnProportion / (float) totalDawnMembers) * 100));
+						}
+					} else {
+						if (totalDawnMembers == 0) {
+							writeC(Math.round(((float) duskProportion / (float) totalDuskMembers) * 100));
+							writeC(0);
+						} else {
+							writeC(Math.round(((float) duskProportion / (float) totalDuskMembers) * 100));
+							writeC(Math.round(((float) dawnProportion / (float) totalDawnMembers) * 100));
+						}
+					}
+				}
+				break;
+			case 4:
+				// c cc [cc (ccD)] CT 2.3 update
+				writeC(winningCabal); // Overall predicted winner
+				writeC(3); // Total number of seals
+				
+				for (int i = 1; i < 4; i++) {
+					int dawnProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DAWN);
+					int duskProportion = SevenSigns.getInstance().getSealProportion(i, SevenSigns.CABAL_DUSK);
+					dawnPercent = Math.round((dawnProportion / (totalDawnMembers == 0 ? 1 : (float) totalDawnMembers)) * 100);
+					duskPercent = Math.round((duskProportion / (totalDuskMembers == 0 ? 1 : (float) totalDuskMembers)) * 100);
+					int sealOwner = SevenSigns.getInstance().getSealOwner(i);
+					
+					writeC(i);
+					
+					switch (sealOwner) {
+						case SevenSigns.CABAL_NULL:
+							switch (winningCabal) {
+								case SevenSigns.CABAL_NULL:
+									writeC(SevenSigns.CABAL_NULL);
+									writeD(SystemMessageId.COMPETITION_TIE_SEAL_NOT_AWARDED.getId());
+									break;
+								case SevenSigns.CABAL_DAWN:
+									if (dawnPercent >= 35) {
+										writeC(SevenSigns.CABAL_DAWN);
+										writeD(SystemMessageId.SEAL_NOT_OWNED_35_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.SEAL_NOT_OWNED_35_LESS_VOTED.getId());
+									}
+									break;
+								case SevenSigns.CABAL_DUSK:
+									if (duskPercent >= 35) {
+										writeC(SevenSigns.CABAL_DUSK);
+										writeD(SystemMessageId.SEAL_NOT_OWNED_35_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.SEAL_NOT_OWNED_35_LESS_VOTED.getId());
+									}
+									break;
+							}
+							break;
+						case SevenSigns.CABAL_DAWN:
+							switch (winningCabal) {
+								case SevenSigns.CABAL_NULL:
+									if (dawnPercent >= 10) {
+										writeC(SevenSigns.CABAL_DAWN);
+										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.COMPETITION_TIE_SEAL_NOT_AWARDED.getId());
+									}
+									break;
+								case SevenSigns.CABAL_DAWN:
+									if (dawnPercent >= 10) {
+										writeC(sealOwner);
+										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.SEAL_OWNED_10_LESS_VOTED.getId());
+									}
+									break;
+								case SevenSigns.CABAL_DUSK:
+									if (duskPercent >= 35) {
+										writeC(SevenSigns.CABAL_DUSK);
+										writeD(SystemMessageId.SEAL_NOT_OWNED_35_MORE_VOTED.getId());
+									} else if (dawnPercent >= 10) {
+										writeC(SevenSigns.CABAL_DAWN);
+										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.SEAL_OWNED_10_LESS_VOTED.getId());
+									}
+									break;
+							}
+							break;
+						case SevenSigns.CABAL_DUSK:
+							switch (winningCabal) {
+								case SevenSigns.CABAL_NULL:
+									if (duskPercent >= 10) {
+										writeC(SevenSigns.CABAL_DUSK);
+										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.COMPETITION_TIE_SEAL_NOT_AWARDED.getId());
+									}
+									break;
+								case SevenSigns.CABAL_DAWN:
+									if (dawnPercent >= 35) {
+										writeC(SevenSigns.CABAL_DAWN);
+										writeD(SystemMessageId.SEAL_NOT_OWNED_35_MORE_VOTED.getId());
+									} else if (duskPercent >= 10) {
+										writeC(sealOwner);
+										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.SEAL_OWNED_10_LESS_VOTED.getId());
+									}
+									break;
+								case SevenSigns.CABAL_DUSK:
+									if (duskPercent >= 10) {
+										writeC(sealOwner);
+										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
+									} else {
+										writeC(SevenSigns.CABAL_NULL);
+										writeD(SystemMessageId.SEAL_OWNED_10_LESS_VOTED.getId());
+									}
+									break;
+							}
+							break;
+					}
+				}
+				break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SellList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SellList.java
new file mode 100644
index 00000000..f521ecd7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SellList.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class SellList extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private final L2MerchantInstance _lease;
+	private final long _money;
+	private final List<L2ItemInstance> _selllist = new ArrayList<>();
+	
+	public SellList(L2PcInstance player) {
+		_activeChar = player;
+		_lease = null;
+		_money = _activeChar.getAdena();
+		doLease();
+	}
+	
+	public SellList(L2PcInstance player, L2MerchantInstance lease) {
+		_activeChar = player;
+		_lease = lease;
+		_money = _activeChar.getAdena();
+		doLease();
+	}
+	
+	private void doLease() {
+		if (_lease == null) {
+			for (L2ItemInstance item : _activeChar.getInventory().getItems()) {
+				if (!item.isEquipped() && item.isSellable() && (!_activeChar.hasSummon() || (item.getObjectId() != _activeChar.getSummon().getControlObjectId()))) // Pet is summoned and not the item that summoned the pet
+				{
+					_selllist.add(item);
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x06);
+		writeQ(_money);
+		writeD(_lease == null ? 0x00 : 1000000 + _lease.getTemplate().getId());
+		writeH(_selllist.size());
+		
+		for (L2ItemInstance item : _selllist) {
+			writeH(item.getItem().getType1().getId());
+			writeD(item.getObjectId());
+			writeD(item.getDisplayId());
+			writeQ(item.getCount());
+			writeH(item.getItem().getType2().getId());
+			writeH(item.isEquipped() ? 0x01 : 0x00);
+			writeD(item.getItem().getBodyPart());
+			writeH(item.getEnchantLevel());
+			writeH(0x00); // TODO: Verify me
+			writeH(item.getCustomType2());
+			writeQ(item.getItem().getReferencePrice() / 2);
+			// T1
+			writeH(item.getAttackElementType());
+			writeH(item.getAttackElementPower());
+			for (byte i = 0; i < 6; i++) {
+				writeH(item.getElementDefAttr(i));
+			}
+			// Enchant Effects
+			for (int op : item.getEnchantOptions()) {
+				writeH(op);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java
new file mode 100644
index 00000000..12052452
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SellListProcure.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.instancemanager.CastleManorManager;
+import com.l2jserver.gameserver.model.CropProcure;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public class SellListProcure extends L2GameServerPacket {
+	private final long _money;
+	private final Map<L2ItemInstance, Long> _sellList = new HashMap<>();
+	
+	public SellListProcure(L2PcInstance player, int castleId) {
+		_money = player.getAdena();
+		for (CropProcure c : CastleManorManager.getInstance().getCropProcure(castleId, false)) {
+			final L2ItemInstance item = player.getInventory().getItemByItemId(c.getId());
+			if ((item != null) && (c.getAmount() > 0)) {
+				_sellList.put(item, c.getAmount());
+			}
+		}
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xEF);
+		writeQ(_money); // money
+		writeD(0x00); // lease ?
+		writeH(_sellList.size()); // list size
+		
+		for (L2ItemInstance item : _sellList.keySet()) {
+			writeH(item.getItem().getType1().getId());
+			writeD(item.getObjectId());
+			writeD(item.getDisplayId());
+			writeQ(_sellList.get(item)); // count
+			writeH(item.getItem().getType2().getId());
+			writeH(0); // unknown
+			writeQ(0); // price, you shouldn't get any adena for crops, only raw materials
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SendMacroList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SendMacroList.java
new file mode 100644
index 00000000..ef66106d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SendMacroList.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Macro;
+import com.l2jserver.gameserver.model.MacroCmd;
+
+public class SendMacroList extends L2GameServerPacket {
+	private final int _rev;
+	private final int _count;
+	private final Macro _macro;
+	
+	public SendMacroList(int rev, int count, Macro macro) {
+		_rev = rev;
+		_count = count;
+		_macro = macro;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xE8);
+		
+		writeD(_rev); // macro change revision (changes after each macro edition)
+		writeC(0x00); // unknown
+		writeC(_count); // count of Macros
+		writeC(_macro != null ? 1 : 0); // unknown
+		
+		if (_macro != null) {
+			writeD(_macro.getId()); // Macro ID
+			writeS(_macro.getName()); // Macro Name
+			writeS(_macro.getDescr()); // Desc
+			writeS(_macro.getAcronym()); // acronym
+			writeC(_macro.getIcon()); // icon
+			
+			writeC(_macro.getCommands().size()); // count
+			
+			int i = 1;
+			for (MacroCmd cmd : _macro.getCommands()) {
+				writeC(i++); // command count
+				writeC(cmd.getType().ordinal()); // type 1 = skill, 3 = action, 4 = shortcut
+				writeD(cmd.getD1()); // skill id
+				writeC(cmd.getD2()); // shortcut id
+				writeS(cmd.getCmd()); // command name
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SendTradeRequest.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SendTradeRequest.java
new file mode 100644
index 00000000..c05dfddf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SendTradeRequest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class SendTradeRequest extends L2GameServerPacket {
+	private final int _senderID;
+	
+	public SendTradeRequest(int senderID) {
+		_senderID = senderID;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x70);
+		writeD(_senderID);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ServerClose.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ServerClose.java
new file mode 100644
index 00000000..b160b7f5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ServerClose.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author devScarlet
+ * @author mrTJO
+ */
+public class ServerClose extends L2GameServerPacket {
+	public static final ServerClose STATIC_PACKET = new ServerClose();
+	
+	private ServerClose() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x20);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ServerObjectInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ServerObjectInfo.java
new file mode 100644
index 00000000..2ec41644
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ServerObjectInfo.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * @author devScarlet
+ * @author mrTJO
+ */
+public final class ServerObjectInfo extends L2GameServerPacket {
+	private final L2Npc _activeChar;
+	private final int _x, _y, _z, _heading;
+	private final int _idTemplate;
+	private final boolean _isAttackable;
+	private final double _collisionHeight, _collisionRadius;
+	private final String _name;
+	
+	public ServerObjectInfo(L2Npc activeChar, L2Character actor) {
+		_activeChar = activeChar;
+		_idTemplate = _activeChar.getTemplate().getDisplayId();
+		_isAttackable = _activeChar.isAutoAttackable(actor);
+		_collisionHeight = _activeChar.getCollisionHeight();
+		_collisionRadius = _activeChar.getCollisionRadius();
+		_x = _activeChar.getX();
+		_y = _activeChar.getY();
+		_z = _activeChar.getZ();
+		_heading = _activeChar.getHeading();
+		_name = _activeChar.getTemplate().isUsingServerSideName() ? _activeChar.getTemplate().getName() : "";
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x92);
+		writeD(_activeChar.getObjectId());
+		writeD(_idTemplate + 1000000);
+		writeS(_name); // name
+		writeD(_isAttackable ? 1 : 0);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_heading);
+		writeF(1.0); // movement multiplier
+		writeF(1.0); // attack speed multiplier
+		writeF(_collisionRadius);
+		writeF(_collisionHeight);
+		writeD((int) (_isAttackable ? _activeChar.getCurrentHp() : 0));
+		writeD(_isAttackable ? _activeChar.getMaxHp() : 0);
+		writeD(0x01); // object type
+		writeD(0x00); // special effects
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SetSummonRemainTime.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SetSummonRemainTime.java
new file mode 100644
index 00000000..bf72180a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SetSummonRemainTime.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class SetSummonRemainTime extends L2GameServerPacket {
+	private final int _maxTime;
+	private final int _remainingTime;
+	
+	public SetSummonRemainTime(int maxTime, int remainingTime) {
+		_remainingTime = remainingTime;
+		_maxTime = maxTime;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xd1);
+		writeD(_maxTime);
+		writeD(_remainingTime);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java
new file mode 100644
index 00000000..fd0348e1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SetupGauge.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class SetupGauge extends L2GameServerPacket {
+	public static final int BLUE = 0;
+	public static final int RED = 1;
+	public static final int CYAN = 2;
+	
+	private final int _dat1;
+	private final int _time;
+	private final int _time2;
+	private int _charObjId;
+	
+	public SetupGauge(int dat1, int time) {
+		_dat1 = dat1;// color 0-blue 1-red 2-cyan 3-green
+		_time = time;
+		_time2 = time;
+	}
+	
+	public SetupGauge(int color, int currentTime, int maxTime) {
+		_dat1 = color;// color 0-blue 1-red 2-cyan 3-green
+		_time = currentTime;
+		_time2 = maxTime;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x6b);
+		writeD(_charObjId);
+		writeD(_dat1);
+		writeD(_time);
+		writeD(_time2);
+	}
+	
+	@Override
+	public void runImpl() {
+		_charObjId = getClient().getActiveChar().getObjectId();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java
new file mode 100644
index 00000000..44264eac
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewInfo.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+
+/**
+ ** @author Gnacik
+ */
+public class ShopPreviewInfo extends L2GameServerPacket {
+	private final Map<Integer, Integer> _itemlist;
+	
+	public ShopPreviewInfo(Map<Integer, Integer> itemlist) {
+		_itemlist = itemlist;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xF6);
+		writeD(Inventory.PAPERDOLL_TOTALSLOTS);
+		// Slots
+		writeD(getFromList(Inventory.PAPERDOLL_UNDER));
+		writeD(getFromList(Inventory.PAPERDOLL_REAR));
+		writeD(getFromList(Inventory.PAPERDOLL_LEAR));
+		writeD(getFromList(Inventory.PAPERDOLL_NECK));
+		writeD(getFromList(Inventory.PAPERDOLL_RFINGER));
+		writeD(getFromList(Inventory.PAPERDOLL_LFINGER));
+		writeD(getFromList(Inventory.PAPERDOLL_HEAD));
+		writeD(getFromList(Inventory.PAPERDOLL_RHAND));
+		writeD(getFromList(Inventory.PAPERDOLL_LHAND));
+		writeD(getFromList(Inventory.PAPERDOLL_GLOVES));
+		writeD(getFromList(Inventory.PAPERDOLL_CHEST));
+		writeD(getFromList(Inventory.PAPERDOLL_LEGS));
+		writeD(getFromList(Inventory.PAPERDOLL_FEET));
+		writeD(getFromList(Inventory.PAPERDOLL_CLOAK));
+		writeD(getFromList(Inventory.PAPERDOLL_RHAND));
+		writeD(getFromList(Inventory.PAPERDOLL_HAIR));
+		writeD(getFromList(Inventory.PAPERDOLL_HAIR2));
+		writeD(getFromList(Inventory.PAPERDOLL_RBRACELET));
+		writeD(getFromList(Inventory.PAPERDOLL_LBRACELET));
+	}
+	
+	private int getFromList(int key) {
+		return _itemlist.getOrDefault(key, 0);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java
new file mode 100644
index 00000000..03f6e81c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShopPreviewList.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.model.buylist.L2BuyList;
+import com.l2jserver.gameserver.model.buylist.Product;
+import com.l2jserver.gameserver.model.items.type.ItemType1;
+
+public class ShopPreviewList extends L2GameServerPacket {
+	private final int _listId;
+	private final Collection<Product> _list;
+	private final long _money;
+	private int _expertise;
+	
+	public ShopPreviewList(L2BuyList list, long currentMoney, int expertiseIndex) {
+		_listId = list.getListId();
+		_list = list.getProducts();
+		_money = currentMoney;
+		_expertise = expertiseIndex;
+	}
+	
+	public ShopPreviewList(Collection<Product> lst, int listId, long currentMoney) {
+		_listId = listId;
+		_list = lst;
+		_money = currentMoney;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xF5);
+		writeC(0xC0); // ?
+		writeC(0x13); // ?
+		writeC(0x00); // ?
+		writeC(0x00); // ?
+		writeQ(_money); // current money
+		writeD(_listId);
+		
+		int newLength = 0;
+		for (Product product : _list) {
+			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable()) {
+				newLength++;
+			}
+		}
+		writeH(newLength);
+		
+		for (Product product : _list) {
+			if ((product.getItem().getCrystalType().getId() <= _expertise) && product.getItem().isEquipable()) {
+				writeD(product.getItemId());
+				writeH(product.getItem().getType2().getId()); // item type2
+				
+				if (product.getItem().getType1() != ItemType1.ITEM_QUESTITEM_ADENA) {
+					writeH(product.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
+				} else {
+					writeH(0x00); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
+				}
+				
+				writeQ(general().getWearPrice());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortBuffStatusUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
new file mode 100644
index 00000000..dcfd881c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortBuffStatusUpdate.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ShortBuffStatusUpdate extends L2GameServerPacket {
+	public static final ShortBuffStatusUpdate RESET_SHORT_BUFF = new ShortBuffStatusUpdate(0, 0, 0);
+	
+	private final int _skillId;
+	private final int _skillLvl;
+	private final int _duration;
+	
+	public ShortBuffStatusUpdate(int skillId, int skillLvl, int duration) {
+		_skillId = skillId;
+		_skillLvl = skillLvl;
+		_duration = duration;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xfa);
+		writeD(_skillId);
+		writeD(_skillLvl);
+		writeD(_duration);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java
new file mode 100644
index 00000000..9195ec27
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortCutInit.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Shortcut;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public final class ShortCutInit extends L2GameServerPacket {
+	private Shortcut[] _shortCuts;
+	
+	public ShortCutInit(L2PcInstance activeChar) {
+		if (activeChar == null) {
+			return;
+		}
+		
+		_shortCuts = activeChar.getAllShortCuts();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x45);
+		writeD(_shortCuts.length);
+		for (Shortcut sc : _shortCuts) {
+			writeD(sc.getType().ordinal());
+			writeD(sc.getSlot() + (sc.getPage() * 12));
+			
+			switch (sc.getType()) {
+				case ITEM -> {
+					writeD(sc.getId());
+					writeD(0x01);
+					writeD(sc.getSharedReuseGroup());
+					writeD(0x00);
+					writeD(0x00);
+					writeH(0x00);
+					writeH(0x00);
+				}
+				case SKILL -> {
+					writeD(sc.getId());
+					writeD(sc.getLevel());
+					writeC(0x00); // C5
+					writeD(0x01); // C6
+				}
+				case ACTION, MACRO, RECIPE, BOOKMARK -> {
+					writeD(sc.getId());
+					writeD(0x01); // C6
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java
new file mode 100644
index 00000000..6dbed3d0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShortCutRegister.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Shortcut;
+
+public final class ShortCutRegister extends L2GameServerPacket {
+	private final Shortcut _shortcut;
+	
+	public ShortCutRegister(Shortcut shortcut) {
+		_shortcut = shortcut;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x44);
+		writeD(_shortcut.getType().ordinal());
+		writeD(_shortcut.getSlot() + (_shortcut.getPage() * 12)); // C4 Client
+		switch (_shortcut.getType()) {
+			case ITEM -> {
+				writeD(_shortcut.getId());
+				writeD(_shortcut.getCharacterType());
+				writeD(_shortcut.getSharedReuseGroup());
+				writeD(0x00); // unknown
+				writeD(0x00); // unknown
+				writeD(0x00); // item augment id
+			}
+			case SKILL -> {
+				writeD(_shortcut.getId());
+				writeD(_shortcut.getLevel());
+				writeC(0x00); // C5
+				writeD(_shortcut.getCharacterType());
+			}
+			case ACTION, MACRO, RECIPE, BOOKMARK -> {
+				writeD(_shortcut.getId());
+				writeD(_shortcut.getCharacterType());
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java
new file mode 100644
index 00000000..e12de106
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowBoard.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.util.StringUtil;
+
+public class ShowBoard extends L2GameServerPacket {
+	
+	private final String _content;
+	
+	public ShowBoard(String htmlCode, String id) {
+		_content = id + "\u0008" + htmlCode;
+	}
+	
+	public ShowBoard(List<String> arg) {
+		StringBuilder builder = new StringBuilder(5 + StringUtil.getLength(arg) + arg.size()).append("1002\u0008");
+		for (String str : arg) {
+			builder.append(str).append("\u0008");
+		}
+		_content = builder.toString();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x7B);
+		writeC(0x01); // c4 1 to show community 00 to hide
+		writeS("bypass _bbshome"); // top
+		writeS("bypass _bbsgetfav"); // favorite
+		writeS("bypass _bbsloc"); // region
+		writeS("bypass _bbsclan"); // clan
+		writeS("bypass _bbsmemo"); // memo
+		writeS("bypass _bbsmail"); // mail
+		writeS("bypass _bbsfriends"); // friends
+		writeS("bypass bbs_add_fav"); // add fav.
+		writeS(_content);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowCalculator.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowCalculator.java
new file mode 100644
index 00000000..9435ded7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowCalculator.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ShowCalculator extends L2GameServerPacket {
+	private final int _calculatorId;
+	
+	public ShowCalculator(int calculatorId) {
+		_calculatorId = calculatorId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xe2);
+		writeD(_calculatorId);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowMiniMap.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowMiniMap.java
new file mode 100644
index 00000000..da57fd2b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowMiniMap.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.SevenSigns;
+
+public class ShowMiniMap extends L2GameServerPacket {
+	private final int _mapId;
+	
+	public ShowMiniMap(int mapId) {
+		_mapId = mapId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xa3);
+		writeD(_mapId);
+		writeC(SevenSigns.getInstance().getCurrentPeriod());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
new file mode 100644
index 00000000..00e2bace
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowPCCafeCouponShowUI.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author -Wooden-
+ */
+public class ShowPCCafeCouponShowUI extends L2GameServerPacket {
+	public static final ShowPCCafeCouponShowUI STATIC_PACKET = new ShowPCCafeCouponShowUI();
+	
+	private ShowPCCafeCouponShowUI() {
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xfe);
+		writeH(0x44);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowTownMap.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowTownMap.java
new file mode 100644
index 00000000..c6961ae6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowTownMap.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class ShowTownMap extends L2GameServerPacket {
+	private final String _texture;
+	private final int _x;
+	private final int _y;
+	
+	public ShowTownMap(String texture, int x, int y) {
+		_texture = texture;
+		_x = x;
+		_y = y;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0xea);
+		writeS(_texture);
+		writeD(_x);
+		writeD(_y);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowXMasSeal.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowXMasSeal.java
new file mode 100644
index 00000000..1b760797
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ShowXMasSeal.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+/**
+ * @author devScarlet
+ * @author mrTJO
+ */
+public class ShowXMasSeal extends L2GameServerPacket {
+	private final int _item;
+	
+	public ShowXMasSeal(int item) {
+		_item = item;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xF8);
+		writeD(_item);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java
new file mode 100644
index 00000000..93557536
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeAttackerList.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.Collection;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
+
+/**
+ * Populates the Siege Attacker List in the SiegeInfo Window<BR>
+ * <BR>
+ * c = ca<BR>
+ * d = CastleID<BR>
+ * d = unknown (0x00)<BR>
+ * d = unknown (0x01)<BR>
+ * d = unknown (0x00)<BR>
+ * d = Number of Attackers Clans?<BR>
+ * d = Number of Attackers Clans<BR>
+ * { //repeats<BR>
+ * d = ClanID<BR>
+ * S = ClanName<BR>
+ * S = ClanLeaderName<BR>
+ * d = ClanCrestID<BR>
+ * d = signed time (seconds)<BR>
+ * d = AllyID<BR>
+ * S = AllyName<BR>
+ * S = AllyLeaderName<BR>
+ * d = AllyCrestID<BR>
+ * @author KenM
+ */
+public final class SiegeAttackerList extends L2GameServerPacket {
+	private Castle _castle;
+	private SiegableHall _hall;
+	
+	public SiegeAttackerList(Castle castle) {
+		_castle = castle;
+	}
+	
+	public SiegeAttackerList(SiegableHall hall) {
+		_hall = hall;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xca);
+		
+		if (_castle != null) {
+			writeD(_castle.getResidenceId());
+			writeD(0x00); // 0
+			writeD(0x01); // 1
+			writeD(0x00); // 0
+			int size = _castle.getSiege().getAttackerClans().size();
+			if (size > 0) {
+				L2Clan clan;
+				
+				writeD(size);
+				writeD(size);
+				for (L2SiegeClan siegeClan : _castle.getSiege().getAttackerClans()) {
+					clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+					if (clan == null) {
+						continue;
+					}
+					
+					writeD(clan.getId());
+					writeS(clan.getName());
+					writeS(clan.getLeaderName());
+					writeD(clan.getCrestId());
+					writeD(0x00); // signed time (seconds) (not stored by L2J)
+					writeD(clan.getAllyId());
+					writeS(clan.getAllyName());
+					writeS(""); // AllyLeaderName
+					writeD(clan.getAllyCrestId());
+				}
+			} else {
+				writeD(0x00);
+				writeD(0x00);
+			}
+		} else {
+			writeD(_hall.getId());
+			writeD(0x00); // 0
+			writeD(0x01); // 1
+			writeD(0x00); // 0
+			final Collection<L2SiegeClan> attackers = _hall.getSiege().getAttackerClans();
+			final int size = attackers.size();
+			if (size > 0) {
+				writeD(size);
+				writeD(size);
+				for (L2SiegeClan sClan : attackers) {
+					final L2Clan clan = ClanTable.getInstance().getClan(sClan.getClanId());
+					if (clan == null) {
+						continue;
+					}
+					
+					writeD(clan.getId());
+					writeS(clan.getName());
+					writeS(clan.getLeaderName());
+					writeD(clan.getCrestId());
+					writeD(0x00); // signed time (seconds) (not stored by L2J)
+					writeD(clan.getAllyId());
+					writeS(clan.getAllyName());
+					writeS(""); // AllyLeaderName
+					writeD(clan.getAllyCrestId());
+				}
+			} else {
+				writeD(0x00);
+				writeD(0x00);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeDefenderList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeDefenderList.java
new file mode 100644
index 00000000..6b7e2db7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeDefenderList.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2SiegeClan;
+import com.l2jserver.gameserver.model.entity.Castle;
+
+/**
+ * Populates the Siege Defender List in the SiegeInfo Window<BR>
+ * <BR>
+ * c = 0xcb<BR>
+ * d = CastleID<BR>
+ * d = unknown (0x00)<BR>
+ * d = unknown (0x01)<BR>
+ * d = unknown (0x00)<BR>
+ * d = Number of Defending Clans?<BR>
+ * d = Number of Defending Clans<BR>
+ * { //repeats<BR>
+ * d = ClanID<BR>
+ * S = ClanName<BR>
+ * S = ClanLeaderName<BR>
+ * d = ClanCrestID<BR>
+ * d = signed time (seconds)<BR>
+ * d = Type -> Owner = 0x01 || Waiting = 0x02 || Accepted = 0x03<BR>
+ * d = AllyID<BR>
+ * S = AllyName<BR>
+ * S = AllyLeaderName<BR>
+ * d = AllyCrestID<BR>
+ * @author KenM
+ */
+public final class SiegeDefenderList extends L2GameServerPacket {
+	private final Castle _castle;
+	
+	public SiegeDefenderList(Castle castle) {
+		_castle = castle;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xcb);
+		writeD(_castle.getResidenceId());
+		writeD(0x00); // 0
+		writeD(0x01); // 1
+		writeD(0x00); // 0
+		int size = _castle.getSiege().getDefenderClans().size() + _castle.getSiege().getDefenderWaitingClans().size();
+		if (size > 0) {
+			L2Clan clan;
+			
+			writeD(size);
+			writeD(size);
+			// Listing the Lord and the approved clans
+			for (L2SiegeClan siegeClan : _castle.getSiege().getDefenderClans()) {
+				clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+				if (clan == null) {
+					continue;
+				}
+				
+				writeD(clan.getId());
+				writeS(clan.getName());
+				writeS(clan.getLeaderName());
+				writeD(clan.getCrestId());
+				writeD(0x00); // signed time (seconds) (not stored by L2J)
+				switch (siegeClan.getType()) {
+					case OWNER -> writeD(0x01); // owner
+					case DEFENDER_PENDING -> writeD(0x02); // approved
+					case DEFENDER -> writeD(0x03); // waiting approved
+					default -> writeD(0x00);
+				}
+				writeD(clan.getAllyId());
+				writeS(clan.getAllyName());
+				writeS(""); // AllyLeaderName
+				writeD(clan.getAllyCrestId());
+			}
+			for (L2SiegeClan siegeClan : _castle.getSiege().getDefenderWaitingClans()) {
+				clan = ClanTable.getInstance().getClan(siegeClan.getClanId());
+				writeD(clan.getId());
+				writeS(clan.getName());
+				writeS(clan.getLeaderName());
+				writeD(clan.getCrestId());
+				writeD(0x00); // signed time (seconds) (not stored by L2J)
+				writeD(0x02); // waiting approval
+				writeD(clan.getAllyId());
+				writeS(clan.getAllyName());
+				writeS(""); // AllyLeaderName
+				writeD(clan.getAllyCrestId());
+			}
+		} else {
+			writeD(0x00);
+			writeD(0x00);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java
new file mode 100644
index 00000000..e1dab4d4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SiegeInfo.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.castle;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.entity.Castle;
+import com.l2jserver.gameserver.model.entity.ClanHall;
+
+/**
+ * Shows the Siege Info<BR>
+ * <BR>
+ * c = c9<BR>
+ * d = CastleID<BR>
+ * d = Show Owner Controls (0x00 default || >=0x02(mask?) owner)<BR>
+ * d = Owner ClanID<BR>
+ * S = Owner ClanName<BR>
+ * S = Owner Clan LeaderName<BR>
+ * d = Owner AllyID<BR>
+ * S = Owner AllyName<BR>
+ * d = current time (seconds)<BR>
+ * d = Siege time (seconds) (0 for selectable)<BR>
+ * d = (UNKNOWN) Siege Time Select Related?
+ * @author KenM
+ */
+public class SiegeInfo extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(SiegeInfo.class);
+	
+	private Castle _castle;
+	private ClanHall _hall;
+	
+	public SiegeInfo(Castle castle) {
+		_castle = castle;
+	}
+	
+	public SiegeInfo(ClanHall hall) {
+		_hall = hall;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		L2PcInstance activeChar = getClient().getActiveChar();
+		if (activeChar == null) {
+			return;
+		}
+		
+		writeC(0xc9);
+		if (_castle != null) {
+			writeD(_castle.getResidenceId());
+			
+			final int ownerId = _castle.getOwnerId();
+			
+			writeD(((ownerId == activeChar.getClanId()) && (activeChar.isClanLeader())) ? 0x01 : 0x00);
+			writeD(ownerId);
+			if (ownerId > 0) {
+				L2Clan owner = ClanTable.getInstance().getClan(ownerId);
+				if (owner != null) {
+					writeS(owner.getName()); // Clan Name
+					writeS(owner.getLeaderName()); // Clan Leader Name
+					writeD(owner.getAllyId()); // Ally ID
+					writeS(owner.getAllyName()); // Ally Name
+				} else {
+					LOG.warn("Null owner for castle: {}", _castle.getName());
+				}
+			} else {
+				writeS(""); // Clan Name
+				writeS(""); // Clan Leader Name
+				writeD(0); // Ally ID
+				writeS(""); // Ally Name
+			}
+			
+			writeD((int) (System.currentTimeMillis() / 1000));
+			if (!_castle.getIsTimeRegistrationOver() && activeChar.isClanLeader() && (activeChar.getClanId() == _castle.getOwnerId())) {
+				Calendar cal = Calendar.getInstance();
+				cal.setTimeInMillis(_castle.getSiegeDate().getTimeInMillis());
+				cal.set(Calendar.MINUTE, 0);
+				cal.set(Calendar.SECOND, 0);
+				
+				writeD(0x00);
+				writeD(castle().getSiegeHourList().size());
+				for (int hour : castle().getSiegeHourList()) {
+					cal.set(Calendar.HOUR_OF_DAY, hour);
+					writeD((int) (cal.getTimeInMillis() / 1000));
+				}
+			} else {
+				writeD((int) (_castle.getSiegeDate().getTimeInMillis() / 1000));
+				writeD(0x00);
+			}
+		} else {
+			writeD(_hall.getId());
+			
+			final int ownerId = _hall.getOwnerId();
+			
+			writeD(((ownerId == activeChar.getClanId()) && (activeChar.isClanLeader())) ? 0x01 : 0x00);
+			writeD(ownerId);
+			if (ownerId > 0) {
+				L2Clan owner = ClanTable.getInstance().getClan(ownerId);
+				if (owner != null) {
+					writeS(owner.getName()); // Clan Name
+					writeS(owner.getLeaderName()); // Clan Leader Name
+					writeD(owner.getAllyId()); // Ally ID
+					writeS(owner.getAllyName()); // Ally Name
+				} else {
+					LOG.warn("Null owner for siegable hall: {}", _hall.getName());
+				}
+			} else {
+				writeS(""); // Clan Name
+				writeS(""); // Clan Leader Name
+				writeD(0); // Ally ID
+				writeS(""); // Ally Name
+			}
+			
+			writeD((int) (Calendar.getInstance().getTimeInMillis() / 1000));
+			writeD((int) ((ClanHallSiegeManager.getInstance().getSiegableHall(_hall.getId()).getNextSiegeTime()) / 1000));
+			writeD(0x00); // number of choices?
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SkillCoolTime.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SkillCoolTime.java
new file mode 100644
index 00000000..1d2ffbca
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SkillCoolTime.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.TimeStamp;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Skill Cool Time server packet implementation.
+ * @author KenM
+ * @author Zoey76
+ */
+public class SkillCoolTime extends L2GameServerPacket {
+	private final List<TimeStamp> _skillReuseTimeStamps = new ArrayList<>();
+	
+	public SkillCoolTime(L2PcInstance player) {
+		final Map<Integer, TimeStamp> skillReuseTimeStamps = player.getSkillReuseTimeStamps();
+		if (skillReuseTimeStamps != null) {
+			for (TimeStamp ts : skillReuseTimeStamps.values()) {
+				if (ts.hasNotPassed()) {
+					_skillReuseTimeStamps.add(ts);
+				}
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xC7);
+		writeD(_skillReuseTimeStamps.size());
+		for (TimeStamp ts : _skillReuseTimeStamps) {
+			writeD(ts.getSkillId());
+			writeD(ts.getSkillLvl());
+			writeD((int) ts.getReuse() / 1000);
+			writeD((int) ts.getRemaining() / 1000);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java
new file mode 100644
index 00000000..646ee0e9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SkillList.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class SkillList extends L2GameServerPacket {
+	private final List<Skill> _skills = new ArrayList<>();
+	
+	static class Skill {
+		public int id;
+		public int level;
+		public boolean passive;
+		public boolean disabled;
+		public boolean enchanted;
+		
+		Skill(int pId, int pLevel, boolean pPassive, boolean pDisabled, boolean pEnchanted) {
+			id = pId;
+			level = pLevel;
+			passive = pPassive;
+			disabled = pDisabled;
+			enchanted = pEnchanted;
+		}
+	}
+	
+	public void addSkill(int id, int level, boolean passive, boolean disabled, boolean enchanted) {
+		_skills.add(new Skill(id, level, passive, disabled, enchanted));
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x5F);
+		writeD(_skills.size());
+		
+		for (Skill temp : _skills) {
+			writeD(temp.passive ? 1 : 0);
+			writeD(temp.level);
+			writeD(temp.id);
+			writeC(temp.disabled ? 1 : 0);
+			writeC(temp.enchanted ? 1 : 0);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/Snoop.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Snoop.java
new file mode 100644
index 00000000..7700733c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/Snoop.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class Snoop extends L2GameServerPacket {
+	private final int _convoId;
+	private final String _name;
+	private final int _type;
+	private final String _speaker;
+	private final String _msg;
+	
+	public Snoop(int id, String name, int type, String speaker, String msg) {
+		_convoId = id;
+		_name = name;
+		_type = type;
+		_speaker = speaker;
+		_msg = msg;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xdb);
+		
+		writeD(_convoId);
+		writeS(_name);
+		writeD(0x00); // ??
+		writeD(_type);
+		writeS(_speaker);
+		writeS(_msg);
+		
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SocialAction.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SocialAction.java
new file mode 100644
index 00000000..d788dc2f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SocialAction.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class SocialAction extends L2GameServerPacket {
+	public static final int LEVEL_UP = 2122;
+	
+	private final int _charObjId;
+	private final int _actionId;
+	
+	public SocialAction(int objectId, int actionId) {
+		_charObjId = objectId;
+		_actionId = actionId;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x27);
+		writeD(_charObjId);
+		writeD(_actionId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
new file mode 100644
index 00000000..22a84c67
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
@@ -0,0 +1,613 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.xml.impl.RecipeData;
+import com.l2jserver.gameserver.model.L2RecipeList;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.L2WarehouseItem;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+import com.l2jserver.gameserver.model.items.type.MaterialType;
+
+public class SortedWareHouseWithdrawalList extends L2GameServerPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(SortedWareHouseWithdrawalList.class);
+	
+	public static final int PRIVATE = 1;
+	public static final int CLAN = 2;
+	public static final int CASTLE = 3; // not sure
+	public static final int FREIGHT = 4; // not sure
+	
+	private final long _playerAdena;
+	private List<L2WarehouseItem> _objects = new ArrayList<>();
+	private final int _whType;
+	
+	public enum WarehouseListType {
+		WEAPON,
+		ARMOR,
+		ETCITEM,
+		MATERIAL,
+		RECIPE,
+		AMULETT,
+		SPELLBOOK,
+		SHOT,
+		SCROLL,
+		CONSUMABLE,
+		SEED,
+		POTION,
+		QUEST,
+		PET,
+		OTHER,
+		ALL
+	}
+	
+	/** sort order A..Z */
+	public static final byte A2Z = 1;
+	/** sort order Z..A */
+	public static final byte Z2A = -1;
+	/** sort order Grade non..S */
+	public static final byte GRADE = 2;
+	/** sort order Recipe Level 1..9 */
+	public static final byte LEVEL = 3;
+	/** sort order type */
+	public static final byte TYPE = 4;
+	/** sort order body part (wearing) */
+	public static final byte WEAR = 5;
+	/** Maximum Items to put into list */
+	public static final int MAX_SORT_LIST_ITEMS = 300;
+	
+	/**
+	 * This will instantiate the Warehouselist the Player asked for
+	 * @param player who calls for the itemlist
+	 * @param type is the Warehouse Type
+	 * @param itemtype is the Itemtype to sort for
+	 * @param sortorder is the integer Sortorder like 1 for A..Z (use public constant)
+	 */
+	public SortedWareHouseWithdrawalList(L2PcInstance player, int type, WarehouseListType itemtype, byte sortorder) {
+		_whType = type;
+		
+		_playerAdena = player.getAdena();
+		if (player.getActiveWarehouse() == null) {
+			// Something went wrong!
+			LOG.warn("Error while sending withdraw request to: {}", player.getName());
+			return;
+		}
+		
+		switch (itemtype) {
+			case WEAPON -> _objects = createWeaponList(player.getActiveWarehouse().getItems());
+			case ARMOR -> _objects = createArmorList(player.getActiveWarehouse().getItems());
+			case ETCITEM -> _objects = createEtcItemList(player.getActiveWarehouse().getItems());
+			case MATERIAL -> _objects = createMatList(player.getActiveWarehouse().getItems());
+			case RECIPE -> _objects = createRecipeList(player.getActiveWarehouse().getItems());
+			case AMULETT -> _objects = createAmuletList(player.getActiveWarehouse().getItems());
+			case SPELLBOOK -> _objects = createSpellbookList(player.getActiveWarehouse().getItems());
+			case CONSUMABLE -> _objects = createConsumableList(player.getActiveWarehouse().getItems());
+			case SHOT -> _objects = createShotList(player.getActiveWarehouse().getItems());
+			case SCROLL -> _objects = createScrollList(player.getActiveWarehouse().getItems());
+			case SEED -> _objects = createSeedList(player.getActiveWarehouse().getItems());
+			case OTHER -> _objects = createOtherList(player.getActiveWarehouse().getItems());
+			default -> _objects = createAllList(player.getActiveWarehouse().getItems());
+		}
+		
+		try {
+			switch (sortorder) {
+				case A2Z:
+				case Z2A:
+					_objects.sort(new WarehouseItemNameComparator(sortorder));
+					break;
+				case GRADE:
+					if ((itemtype == WarehouseListType.ARMOR) || (itemtype == WarehouseListType.WEAPON)) {
+						_objects.sort(new WarehouseItemNameComparator(A2Z));
+						_objects.sort(new WarehouseItemGradeComparator(A2Z));
+					}
+					break;
+				case LEVEL:
+					if (itemtype == WarehouseListType.RECIPE) {
+						_objects.sort(new WarehouseItemNameComparator(A2Z));
+						_objects.sort(new WarehouseItemRecipeComparator(A2Z));
+					}
+					break;
+				case TYPE:
+					if (itemtype == WarehouseListType.MATERIAL) {
+						_objects.sort(new WarehouseItemNameComparator(A2Z));
+						_objects.sort(new WarehouseItemTypeComparator(A2Z));
+					}
+					break;
+				case WEAR:
+					if (itemtype == WarehouseListType.ARMOR) {
+						_objects.sort(new WarehouseItemNameComparator(A2Z));
+						_objects.sort(new WarehouseItemBodypartComparator(A2Z));
+					}
+					break;
+			}
+		} catch (Exception ex) {
+		}
+	}
+	
+	/**
+	 * This public method return the integer of the Sortorder by its name. If you want to have another, add the Comparator and the Constant.
+	 * @param order
+	 * @return the integer of the sortorder or 1 as default value
+	 */
+	public static byte getOrder(String order) {
+		if (order == null) {
+			return A2Z;
+		} else if (order.startsWith("A2Z")) {
+			return A2Z;
+		} else if (order.startsWith("Z2A")) {
+			return Z2A;
+		} else if (order.startsWith("GRADE")) {
+			return GRADE;
+		} else if (order.startsWith("TYPE")) {
+			return TYPE;
+		} else if (order.startsWith("WEAR")) {
+			return WEAR;
+		} else {
+			try {
+				return Byte.parseByte(order);
+			} catch (NumberFormatException ex) {
+				return A2Z;
+			}
+		}
+	}
+	
+	/**
+	 * This is the common Comparator to sort the items by Name
+	 */
+	private static class WarehouseItemNameComparator implements Comparator<L2WarehouseItem> {
+		private final byte order;
+		
+		protected WarehouseItemNameComparator(byte sortOrder) {
+			order = sortOrder;
+		}
+		
+		@Override
+		public int compare(L2WarehouseItem o1, L2WarehouseItem o2) {
+			if ((o1.getType2() == ItemType2.MONEY) && (o2.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? Z2A : A2Z);
+			}
+			if ((o2.getType2() == ItemType2.MONEY) && (o1.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? A2Z : Z2A);
+			}
+			String s1 = o1.getItemName();
+			String s2 = o2.getItemName();
+			return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1));
+		}
+	}
+	
+	/**
+	 * This Comparator is used to sort by Recipe Level
+	 */
+	private static class WarehouseItemRecipeComparator implements Comparator<L2WarehouseItem> {
+		private final int order;
+		
+		private final RecipeData rd;
+		
+		protected WarehouseItemRecipeComparator(int sortOrder) {
+			order = sortOrder;
+			rd = RecipeData.getInstance();
+		}
+		
+		@Override
+		public int compare(L2WarehouseItem o1, L2WarehouseItem o2) {
+			if ((o1.getType2() == ItemType2.MONEY) && (o2.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? Z2A : A2Z);
+			}
+			if ((o2.getType2() == ItemType2.MONEY) && (o1.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? A2Z : Z2A);
+			}
+			if ((o1.isEtcItem() && (o1.getItemType() == EtcItemType.RECIPE)) && (o2.isEtcItem() && (o2.getItemType() == EtcItemType.RECIPE))) {
+				try {
+					L2RecipeList rp1 = rd.getRecipeByItemId(o1.getItemId());
+					L2RecipeList rp2 = rd.getRecipeByItemId(o2.getItemId());
+					
+					if (rp1 == null) {
+						return (order == A2Z ? A2Z : Z2A);
+					}
+					if (rp2 == null) {
+						return (order == A2Z ? Z2A : A2Z);
+					}
+					
+					Integer i1 = rp1.getLevel();
+					Integer i2 = rp2.getLevel();
+					
+					return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1));
+				} catch (Exception e) {
+					return 0;
+				}
+			}
+			
+			String s1 = o1.getItemName();
+			String s2 = o2.getItemName();
+			return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1));
+		}
+	}
+	
+	/**
+	 * This Comparator is used to sort the Items by BodyPart
+	 */
+	private static class WarehouseItemBodypartComparator implements Comparator<L2WarehouseItem> {
+		private final byte order;
+		
+		protected WarehouseItemBodypartComparator(byte sortOrder) {
+			order = sortOrder;
+		}
+		
+		@Override
+		public int compare(L2WarehouseItem o1, L2WarehouseItem o2) {
+			if ((o1.getType2() == ItemType2.MONEY) && (o2.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? Z2A : A2Z);
+			}
+			if ((o2.getType2() == ItemType2.MONEY) && (o1.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? A2Z : Z2A);
+			}
+			Integer i1 = o1.getBodyPart();
+			Integer i2 = o2.getBodyPart();
+			return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1));
+		}
+	}
+	
+	/**
+	 * This Comparator is used to sort by the Item Grade (e.g. Non..S-Grade)
+	 */
+	private static class WarehouseItemGradeComparator implements Comparator<L2WarehouseItem> {
+		private final byte order;
+		
+		protected WarehouseItemGradeComparator(byte sortOrder) {
+			order = sortOrder;
+		}
+		
+		@Override
+		public int compare(L2WarehouseItem o1, L2WarehouseItem o2) {
+			if ((o1.getType2() == ItemType2.MONEY) && (o2.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? Z2A : A2Z);
+			}
+			if ((o2.getType2() == ItemType2.MONEY) && (o1.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? A2Z : Z2A);
+			}
+			CrystalType i1 = o1.getItemGrade();
+			CrystalType i2 = o2.getItemGrade();
+			return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1));
+		}
+	}
+	
+	/**
+	 * This Comparator will sort by Item Type. Unfortunately this will only have a good result if the Database Table for the ETCITEM.TYPE column is fixed!
+	 */
+	private static class WarehouseItemTypeComparator implements Comparator<L2WarehouseItem> {
+		private final byte order;
+		
+		protected WarehouseItemTypeComparator(byte sortOrder) {
+			order = sortOrder;
+		}
+		
+		@Override
+		public int compare(L2WarehouseItem o1, L2WarehouseItem o2) {
+			if ((o1.getType2() == ItemType2.MONEY) && (o2.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? Z2A : A2Z);
+			}
+			if ((o2.getType2() == ItemType2.MONEY) && (o1.getType2() != ItemType2.MONEY)) {
+				return (order == A2Z ? A2Z : Z2A);
+			}
+			try {
+				MaterialType i1 = o1.getItem().getMaterialType();
+				MaterialType i2 = o2.getItem().getMaterialType();
+				return (order == A2Z ? i1.compareTo(i2) : i2.compareTo(i1));
+			} catch (Exception e) {
+				return 0;
+			}
+		}
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Weapon</li>
+	 * <li>Arrow</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createWeaponList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if (item.isWeapon() || (item.getItem().getType2() == ItemType2.WEAPON) || (item.isEtcItem() && (item.getItemType() == EtcItemType.ARROW)) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Armor</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createArmorList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if (item.isArmor() || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Everything which is no Weapon/Armor</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createEtcItemList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if (item.isEtcItem() || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Materials</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createMatList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.MATERIAL)) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Recipes</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createRecipeList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.RECIPE)) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Amulet</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createAmuletList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Spellbook & Dwarven Drafts</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createSpellbookList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Consumables (Potions, Shots, ...)</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createConsumableList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && ((item.getEtcItem().getItemType() == EtcItemType.SCROLL) || (item.getEtcItem().getItemType() == EtcItemType.SHOT))) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Shots</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createShotList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SHOT)) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Scrolls/Potions</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createScrollList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SCROLL)) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Seeds</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createSeedList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SEED)) || (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>Everything which is no Weapon/Armor, Material, Recipe, Spellbook, Scroll or Shot</li>
+	 * <li>Money</li>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createOtherList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if ((item.isEtcItem() && ((item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT)))
+				|| (item.getItem().getType2() == ItemType2.MONEY)) {
+				if (list.size() < MAX_SORT_LIST_ITEMS) {
+					list.add(new L2WarehouseItem(item));
+				}
+			}
+		}
+		return list;
+	}
+	
+	/**
+	 * This method is used to limit the given Warehouse List to:
+	 * <li>no limit</li> This may sound strange but we return the given Array as a List<L2WarehouseItem>
+	 * @param _items complete Warehouse List
+	 * @return limited Item List
+	 */
+	private List<L2WarehouseItem> createAllList(L2ItemInstance[] _items) {
+		List<L2WarehouseItem> list = new ArrayList<>();
+		for (L2ItemInstance item : _items) {
+			if (list.size() < MAX_SORT_LIST_ITEMS) {
+				list.add(new L2WarehouseItem(item));
+			}
+		}
+		return list;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x42);
+		/*
+		 * 0x01-Private Warehouse 0x02-Clan Warehouse 0x03-Castle Warehouse 0x04-Warehouse
+		 */
+		writeH(_whType);
+		writeQ(_playerAdena);
+		writeH(_objects.size());
+		
+		for (L2WarehouseItem item : _objects) {
+			writeD(item.getObjectId());
+			writeD(item.getItem().getDisplayId());
+			writeD(item.getLocationSlot());
+			writeQ(item.getCount());
+			writeH(item.getItem().getType2().getId());
+			writeH(item.getCustomType1());
+			writeH(0x00); // Can't be equipped in WH
+			writeD(item.getItem().getBodyPart());
+			writeH(item.getEnchantLevel());
+			writeH(item.getCustomType2());
+			if (item.isAugmented()) {
+				writeD(item.getAugmentationId());
+			} else {
+				writeD(0x00);
+			}
+			writeD(item.getMana());
+			writeD(item.getTime());
+			writeH(item.getAttackElementType());
+			writeH(item.getAttackElementPower());
+			for (byte i = 0; i < 6; i++) {
+				writeH(item.getElementDefAttr(i));
+			}
+			// Enchant Effects
+			for (int op : item.getEnchantOptions()) {
+				writeH(op);
+			}
+			writeD(item.getObjectId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java
new file mode 100644
index 00000000..5e9de692
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SpawnItem.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class SpawnItem extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _itemId;
+	private final int _x, _y, _z;
+	private final int _stackable;
+	private final long _count;
+	
+	public SpawnItem(L2Object obj) {
+		_objectId = obj.getObjectId();
+		_x = obj.getX();
+		_y = obj.getY();
+		_z = obj.getZ();
+		
+		if (obj instanceof L2ItemInstance item) {
+			_itemId = item.getDisplayId();
+			_stackable = item.isStackable() ? 0x01 : 0x00;
+			_count = item.getCount();
+		} else {
+			_itemId = obj.getPoly().getPolyId();
+			_stackable = 0;
+			_count = 1;
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x05);
+		writeD(_objectId);
+		writeD(_itemId);
+		
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		// only show item count if it is a stackable item
+		writeD(_stackable);
+		writeQ(_count);
+		writeD(0x00); // c2
+		writeD(0x00); // freya unk
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SpecialCamera.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SpecialCamera.java
new file mode 100644
index 00000000..9ab6d828
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SpecialCamera.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Special Camera server packet implementation.
+ * @author Zoey76
+ */
+public class SpecialCamera extends L2GameServerPacket {
+	private final int _id;
+	private final int _force;
+	private final int _angle1;
+	private final int _angle2;
+	private final int _time;
+	private final int _duration;
+	private final int _relYaw;
+	private final int _relPitch;
+	private final int _isWide;
+	private final int _relAngle;
+	private final int _unk;
+	
+	/**
+	 * Special Camera packet constructor.
+	 * @param creature the creature
+	 * @param force
+	 * @param angle1
+	 * @param angle2
+	 * @param time
+	 * @param range
+	 * @param duration
+	 * @param relYaw
+	 * @param relPitch
+	 * @param isWide
+	 * @param relAngle
+	 */
+	public SpecialCamera(L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle) {
+		this(creature, force, angle1, angle2, time, duration, range, relYaw, relPitch, isWide, relAngle, 0);
+	}
+	
+	/**
+	 * Special Camera Ex packet constructor.
+	 * @param creature the creature
+	 * @param talker
+	 * @param force
+	 * @param angle1
+	 * @param angle2
+	 * @param time
+	 * @param duration
+	 * @param relYaw
+	 * @param relPitch
+	 * @param isWide
+	 * @param relAngle
+	 */
+	public SpecialCamera(L2Character creature, L2Character talker, int force, int angle1, int angle2, int time, int duration, int relYaw, int relPitch, int isWide, int relAngle) {
+		this(creature, force, angle1, angle2, time, duration, 0, relYaw, relPitch, isWide, relAngle, 0);
+	}
+	
+	/**
+	 * Special Camera 3 packet constructor.
+	 * @param creature the creature
+	 * @param force
+	 * @param angle1
+	 * @param angle2
+	 * @param time
+	 * @param range
+	 * @param duration
+	 * @param relYaw
+	 * @param relPitch
+	 * @param isWide
+	 * @param relAngle
+	 * @param unk unknown post-C4 parameter
+	 */
+	public SpecialCamera(L2Character creature, int force, int angle1, int angle2, int time, int range, int duration, int relYaw, int relPitch, int isWide, int relAngle, int unk) {
+		_id = creature.getObjectId();
+		_force = force;
+		_angle1 = angle1;
+		_angle2 = angle2;
+		_time = time;
+		_duration = duration;
+		_relYaw = relYaw;
+		_relPitch = relPitch;
+		_isWide = isWide;
+		_relAngle = relAngle;
+		_unk = unk;
+	}
+	
+	@Override
+	public void writeImpl() {
+		writeC(0xD6);
+		writeD(_id);
+		writeD(_force);
+		writeD(_angle1);
+		writeD(_angle2);
+		writeD(_time);
+		writeD(_duration);
+		writeD(_relYaw);
+		writeD(_relPitch);
+		writeD(_isWide);
+		writeD(_relAngle);
+		writeD(_unk);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StartPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StartPledgeWar.java
new file mode 100644
index 00000000..93e7f23f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StartPledgeWar.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class StartPledgeWar extends L2GameServerPacket {
+	private final String _pledgeName;
+	private final String _playerName;
+	
+	public StartPledgeWar(String pledge, String charName) {
+		_pledgeName = pledge;
+		_playerName = charName;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x63);
+		writeS(_playerName);
+		writeS(_pledgeName);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StartRotation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StartRotation.java
new file mode 100644
index 00000000..54cc28f2
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StartRotation.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class StartRotation extends L2GameServerPacket {
+	private final int _charObjId, _degree, _side, _speed;
+	
+	public StartRotation(int objectId, int degree, int side, int speed) {
+		_charObjId = objectId;
+		_degree = degree;
+		_side = side;
+		_speed = speed;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x7a);
+		writeD(_charObjId);
+		writeD(_degree);
+		writeD(_side);
+		writeD(_speed);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StaticObject.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StaticObject.java
new file mode 100644
index 00000000..412f1522
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StaticObject.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+
+/**
+ * @author KenM
+ */
+public class StaticObject extends L2GameServerPacket {
+	private final int _staticObjectId;
+	private final int _objectId;
+	private final int _type;
+	private final boolean _isTargetable;
+	private final int _meshIndex;
+	private final boolean _isClosed;
+	private final boolean _isEnemy;
+	private final int _maxHp;
+	private final int _currentHp;
+	private final boolean _showHp;
+	private final int _damageGrade;
+	
+	public StaticObject(L2StaticObjectInstance staticObject) {
+		_staticObjectId = staticObject.getId();
+		_objectId = staticObject.getObjectId();
+		_type = 0;
+		_isTargetable = true;
+		_meshIndex = staticObject.getMeshIndex();
+		_isClosed = false;
+		_isEnemy = false;
+		_maxHp = 0;
+		_currentHp = 0;
+		_showHp = false;
+		_damageGrade = 0;
+	}
+	
+	public StaticObject(L2DoorInstance door, boolean targetable) {
+		_staticObjectId = door.getId();
+		_objectId = door.getObjectId();
+		_type = 1;
+		_isTargetable = door.isTargetable() || targetable;
+		_meshIndex = door.getMeshIndex();
+		_isClosed = !door.getOpen();
+		_isEnemy = door.isEnemy();
+		_maxHp = door.getMaxHp();
+		_currentHp = (int) door.getCurrentHp();
+		_showHp = door.getIsShowHp();
+		_damageGrade = door.getDamage();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x9f);
+		writeD(_staticObjectId);
+		writeD(_objectId);
+		writeD(_type);
+		writeD(_isTargetable ? 1 : 0);
+		writeD(_meshIndex);
+		writeD(_isClosed ? 1 : 0);
+		writeD(_isEnemy ? 1 : 0);
+		writeD(_currentHp);
+		writeD(_maxHp);
+		writeD(_showHp ? 1 : 0);
+		writeD(_damageGrade);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java
new file mode 100644
index 00000000..45ac98d7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StatusUpdate.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+public final class StatusUpdate extends L2GameServerPacket {
+	public static final int LEVEL = 0x01;
+	public static final int EXP = 0x02;
+	public static final int STR = 0x03;
+	public static final int DEX = 0x04;
+	public static final int CON = 0x05;
+	public static final int INT = 0x06;
+	public static final int WIT = 0x07;
+	public static final int MEN = 0x08;
+	
+	public static final int CUR_HP = 0x09;
+	public static final int MAX_HP = 0x0a;
+	public static final int CUR_MP = 0x0b;
+	public static final int MAX_MP = 0x0c;
+	
+	public static final int SP = 0x0d;
+	public static final int CUR_LOAD = 0x0e;
+	public static final int MAX_LOAD = 0x0f;
+	
+	public static final int P_ATK = 0x11;
+	public static final int ATK_SPD = 0x12;
+	public static final int P_DEF = 0x13;
+	public static final int EVASION = 0x14;
+	public static final int ACCURACY = 0x15;
+	public static final int CRITICAL = 0x16;
+	public static final int M_ATK = 0x17;
+	public static final int CAST_SPD = 0x18;
+	public static final int M_DEF = 0x19;
+	public static final int PVP_FLAG = 0x1a;
+	public static final int KARMA = 0x1b;
+	
+	public static final int CUR_CP = 0x21;
+	public static final int MAX_CP = 0x22;
+	
+	private final int _objectId;
+	private final ArrayList<Attribute> _attributes = new ArrayList<>();
+	
+	static class Attribute {
+		/**
+		 * id values 09 - current health 0a - max health 0b - current mana 0c - max mana
+		 */
+		public int id;
+		public int value;
+		
+		Attribute(int pId, int pValue) {
+			id = pId;
+			value = pValue;
+		}
+	}
+	
+	/**
+	 * If you have access to object itself use {@link StatusUpdate#StatusUpdate(L2Object)}.
+	 * @param objectId
+	 */
+	public StatusUpdate(int objectId) {
+		_objectId = objectId;
+	}
+	
+	/**
+	 * Create {@link StatusUpdate} packet for given {@link L2Object}.
+	 * @param object
+	 */
+	public StatusUpdate(L2Object object) {
+		_objectId = object.getObjectId();
+	}
+	
+	public void addAttribute(int id, int level) {
+		_attributes.add(new Attribute(id, level));
+	}
+	
+	public boolean hasAttributes() {
+		return !_attributes.isEmpty();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x18);
+		writeD(_objectId);
+		writeD(_attributes.size());
+		
+		for (Attribute temp : _attributes) {
+			writeD(temp.id);
+			writeD(temp.value);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopMove.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopMove.java
new file mode 100644
index 00000000..a9bed440
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopMove.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public final class StopMove extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	private final int _heading;
+	
+	public StopMove(L2Character cha) {
+		this(cha.getObjectId(), cha.getX(), cha.getY(), cha.getZ(), cha.getHeading());
+	}
+	
+	public StopMove(int objectId, int x, int y, int z, int heading) {
+		_objectId = objectId;
+		_x = x;
+		_y = y;
+		_z = z;
+		_heading = heading;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x47);
+		writeD(_objectId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_heading);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopMoveInVehicle.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopMoveInVehicle.java
new file mode 100644
index 00000000..992c941e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopMoveInVehicle.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Maktakien
+ */
+public class StopMoveInVehicle extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _boatId;
+	private final Location _pos;
+	private final int _heading;
+	
+	public StopMoveInVehicle(L2PcInstance player, int boatId) {
+		_charObjId = player.getObjectId();
+		_boatId = boatId;
+		_pos = player.getInVehiclePosition();
+		_heading = player.getHeading();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x7f);
+		writeD(_charObjId);
+		writeD(_boatId);
+		writeD(_pos.getX());
+		writeD(_pos.getY());
+		writeD(_pos.getZ());
+		writeD(_heading);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopPledgeWar.java
new file mode 100644
index 00000000..55580b94
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopPledgeWar.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class StopPledgeWar extends L2GameServerPacket {
+	private final String _pledgeName;
+	private final String _playerName;
+	
+	public StopPledgeWar(String pledge, String charName) {
+		_pledgeName = pledge;
+		_playerName = charName;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x65);
+		writeS(_pledgeName);
+		writeS(_playerName);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java
new file mode 100644
index 00000000..4e94e35e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/StopRotation.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class StopRotation extends L2GameServerPacket {
+	private final int _charObjId, _degree, _speed;
+	
+	public StopRotation(int objectId, int degree, int speed) {
+		_charObjId = objectId;
+		_degree = degree;
+		_speed = speed;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x61);
+		writeD(_charObjId);
+		writeD(_degree);
+		writeD(_speed);
+		writeD(0); // ? bluff effect related ?
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SunRise.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SunRise.java
new file mode 100644
index 00000000..6518c031
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SunRise.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class SunRise extends L2GameServerPacket {
+	public static final SunRise STATIC_PACKET = new SunRise();
+	
+	private SunRise() {
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x12);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SunSet.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SunSet.java
new file mode 100644
index 00000000..af4532cc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SunSet.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class SunSet extends L2GameServerPacket {
+	public static final SunSet STATIC_PACKET = new SunSet();
+	
+	private SunSet() {
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x13);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SurrenderPledgeWar.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SurrenderPledgeWar.java
new file mode 100644
index 00000000..28529928
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SurrenderPledgeWar.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class SurrenderPledgeWar extends L2GameServerPacket {
+	private final String _pledgeName;
+	private final String _playerName;
+	
+	public SurrenderPledgeWar(String pledge, String charName) {
+		_pledgeName = pledge;
+		_playerName = charName;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x67);
+		writeS(_pledgeName);
+		writeS(_playerName);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java
new file mode 100644
index 00000000..16b8aadb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.network.SystemMessageId;
+
+/**
+ * @author Forsaiken
+ * @author UnAfraid
+ */
+public final class SystemMessage extends AbstractMessagePacket<SystemMessage> {
+	private SystemMessage(final SystemMessageId smId) {
+		super(smId);
+	}
+	
+	public static SystemMessage sendString(final String text) {
+		if (text == null) {
+			throw new NullPointerException();
+		}
+		
+		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1);
+		sm.addString(text);
+		return sm;
+	}
+	
+	public static SystemMessage getSystemMessage(final SystemMessageId smId) {
+		SystemMessage sm = smId.getStaticSystemMessage();
+		if (sm != null) {
+			return sm;
+		}
+		
+		sm = new SystemMessage(smId);
+		if (smId.getParamCount() == 0) {
+			smId.setStaticSystemMessage(sm);
+		}
+		
+		return sm;
+	}
+	
+	/**
+	 * Use {@link #getSystemMessage(SystemMessageId)} where possible instead
+	 * @param id
+	 * @return the system message associated to the given Id.
+	 */
+	public static SystemMessage getSystemMessage(int id) {
+		return getSystemMessage(SystemMessageId.getSystemMessageId(id));
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x62);
+		writeMe();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TargetSelected.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TargetSelected.java
new file mode 100644
index 00000000..f68fb1ba
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TargetSelected.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class TargetSelected extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _targetObjId;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	
+	public TargetSelected(int objectId, int targetId, int x, int y, int z) {
+		_objectId = objectId;
+		_targetObjId = targetId;
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x23);
+		writeD(_objectId);
+		writeD(_targetObjId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(0x00); // ?
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TargetUnselected.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TargetUnselected.java
new file mode 100644
index 00000000..e68b9df8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TargetUnselected.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+public class TargetUnselected extends L2GameServerPacket {
+	private final int _targetObjId;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	
+	public TargetUnselected(L2Character character) {
+		_targetObjId = character.getObjectId();
+		_x = character.getX();
+		_y = character.getY();
+		_z = character.getZ();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x24);
+		writeD(_targetObjId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(0x00); // ??
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TeleportToLocation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TeleportToLocation.java
new file mode 100644
index 00000000..e0dfbf46
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TeleportToLocation.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+
+public final class TeleportToLocation extends L2GameServerPacket {
+	private final int _targetObjId;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	private final int _heading;
+	
+	public TeleportToLocation(L2Object obj, int x, int y, int z, int heading) {
+		_targetObjId = obj.getObjectId();
+		_x = x;
+		_y = y;
+		_z = z;
+		_heading = heading;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x22);
+		writeD(_targetObjId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(0x00); // isValidation ??
+		writeD(_heading); // nYaw
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeDone.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeDone.java
new file mode 100644
index 00000000..f1b9b243
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeDone.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class TradeDone extends L2GameServerPacket {
+	private final int _num;
+	
+	public TradeDone(int num) {
+		_num = num;
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x1c);
+		writeD(_num);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherAdd.java
new file mode 100644
index 00000000..9e9b97cd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherAdd.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.TradeItem;
+
+/**
+ * @author Yme
+ */
+public final class TradeOtherAdd extends AbstractItemPacket {
+	private final TradeItem _item;
+	
+	public TradeOtherAdd(TradeItem item) {
+		_item = item;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x1B);
+		
+		writeH(1); // item count
+		writeH(0);
+		writeD(_item.getObjectId());
+		writeD(_item.getItem().getDisplayId());
+		writeQ(_item.getCount());
+		writeH(_item.getItem().getType2().getId()); // item type2
+		writeH(_item.getCustomType1());
+		
+		writeD(_item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
+		writeH(_item.getEnchant()); // enchant level
+		writeH(0x00);
+		writeH(_item.getCustomType2());
+		
+		// T1
+		writeItemElementalAndEnchant(new ItemInfo(_item));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherDone.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherDone.java
new file mode 100644
index 00000000..d7cfb3c1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOtherDone.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class TradeOtherDone extends L2GameServerPacket {
+	public static final TradeOtherDone STATIC_PACKET = new TradeOtherDone();
+	
+	private TradeOtherDone() {
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x82);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOwnAdd.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOwnAdd.java
new file mode 100644
index 00000000..5eaddc34
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeOwnAdd.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.ItemInfo;
+import com.l2jserver.gameserver.model.TradeItem;
+
+/**
+ * @author Yme
+ */
+public final class TradeOwnAdd extends AbstractItemPacket {
+	private final TradeItem _item;
+	
+	public TradeOwnAdd(TradeItem item) {
+		_item = item;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x1A);
+		
+		writeH(1); // items added count
+		writeH(0);
+		writeD(_item.getObjectId());
+		writeD(_item.getItem().getDisplayId());
+		writeQ(_item.getCount());
+		writeH(_item.getItem().getType2().getId()); // item type2
+		writeH(_item.getCustomType1());
+		
+		writeD(_item.getItem().getBodyPart()); // rev 415 slot 0006-lr.ear 0008-neck 0030-lr.finger 0040-head 0080-?? 0100-l.hand 0200-gloves 0400-chest 0800-pants 1000-feet 2000-?? 4000-r.hand 8000-r.hand
+		writeH(_item.getEnchant()); // enchant level
+		writeH(0x00);
+		writeH(_item.getCustomType2());
+		
+		// T1
+		writeItemElementalAndEnchant(new ItemInfo(_item));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeStart.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeStart.java
new file mode 100644
index 00000000..74cee0a1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TradeStart.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class TradeStart extends AbstractItemPacket {
+	private final L2PcInstance _activeChar;
+	private final L2ItemInstance[] _itemList;
+	
+	public TradeStart(L2PcInstance player) {
+		_activeChar = player;
+		_itemList = _activeChar.getInventory().getAvailableItems(true, (_activeChar.canOverrideCond(PcCondOverride.ITEM_CONDITIONS) && general().gmTradeRestrictedItems()), false);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		if ((_activeChar.getActiveTradeList() == null) || (_activeChar.getActiveTradeList().getPartner() == null)) {
+			return;
+		}
+		
+		writeC(0x14);
+		writeD(_activeChar.getActiveTradeList().getPartner().getObjectId());
+		writeH(_itemList.length);
+		for (L2ItemInstance item : _itemList) {
+			writeItem(item);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialCloseHtml.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialCloseHtml.java
new file mode 100644
index 00000000..44f7bb1e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialCloseHtml.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+
+/**
+ * TutorialCloseHtml server packet implementation.
+ * @author HorridoJoho
+ */
+public class TutorialCloseHtml extends L2GameServerPacket {
+	public static final TutorialCloseHtml STATIC_PACKET = new TutorialCloseHtml();
+	
+	private TutorialCloseHtml() {
+	}
+	
+	@Override
+	public void runImpl() {
+		getClient().getActiveChar().clearHtmlActions(HtmlActionScope.TUTORIAL_HTML);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xa9);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialEnableClientEvent.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialEnableClientEvent.java
new file mode 100644
index 00000000..114c6d03
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialEnableClientEvent.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public class TutorialEnableClientEvent extends L2GameServerPacket {
+	private final int _eventId;
+	
+	public TutorialEnableClientEvent(int event) {
+		_eventId = event;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xA8);
+		writeD(_eventId);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialShowHtml.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialShowHtml.java
new file mode 100644
index 00000000..f2b9f3e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialShowHtml.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+
+/**
+ * TutorialShowHtml server packet implementation.
+ * @author HorridoJoho
+ */
+public final class TutorialShowHtml extends AbstractHtmlPacket {
+	public TutorialShowHtml(String html) {
+		super(html);
+	}
+	
+	/**
+	 * This constructor is just here to be able to show a tutorial html<br>
+	 * window bound to an npc.
+	 * @param npcObjId
+	 * @param html
+	 */
+	public TutorialShowHtml(int npcObjId, String html) {
+		super(npcObjId, html);
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xA6);
+		writeS(getHtml());
+	}
+	
+	@Override
+	public HtmlActionScope getScope() {
+		return HtmlActionScope.TUTORIAL_HTML;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialShowQuestionMark.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialShowQuestionMark.java
new file mode 100644
index 00000000..b60620eb
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/TutorialShowQuestionMark.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+public final class TutorialShowQuestionMark extends L2GameServerPacket {
+	private final int _markId;
+	
+	public TutorialShowQuestionMark(int blink) {
+		_markId = blink;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xA7);
+		writeD(_markId);
+		
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
new file mode 100644
index 00000000..98e25423
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/UserInfo.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import com.l2jserver.gameserver.data.json.ExperienceData;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
+import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
+import com.l2jserver.gameserver.model.Elementals;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.AbnormalVisualEffect;
+import com.l2jserver.gameserver.model.zone.ZoneId;
+
+public final class UserInfo extends L2GameServerPacket {
+	private final L2PcInstance _activeChar;
+	private int _relation;
+	private final int _airShipHelm;
+	
+	private final int _runSpd, _walkSpd;
+	private final int _swimRunSpd, _swimWalkSpd;
+	private final int _flyRunSpd, _flyWalkSpd;
+	private final double _moveMultiplier;
+	
+	public UserInfo(L2PcInstance cha) {
+		_activeChar = cha;
+		
+		int _territoryId = TerritoryWarManager.getInstance().getRegisteredTerritoryId(cha);
+		_relation = _activeChar.isClanLeader() ? 0x40 : 0;
+		if (_activeChar.getSiegeState() == 1) {
+			if (_territoryId == 0) {
+				_relation |= 0x180;
+			} else {
+				_relation |= 0x1000;
+			}
+		}
+		if (_activeChar.getSiegeState() == 2) {
+			_relation |= 0x80;
+		}
+		// _isDisguised = TerritoryWarManager.getInstance().isDisguised(character.getObjectId());
+		if (_activeChar.isInAirShip() && _activeChar.getAirShip().isCaptain(_activeChar)) {
+			_airShipHelm = _activeChar.getAirShip().getHelmItemId();
+		} else {
+			_airShipHelm = 0;
+		}
+		
+		_moveMultiplier = cha.getMovementSpeedMultiplier();
+		_runSpd = (int) Math.round(cha.getRunSpeed() / _moveMultiplier);
+		_walkSpd = (int) Math.round(cha.getWalkSpeed() / _moveMultiplier);
+		_swimRunSpd = (int) Math.round(cha.getSwimRunSpeed() / _moveMultiplier);
+		_swimWalkSpd = (int) Math.round(cha.getSwimWalkSpeed() / _moveMultiplier);
+		_flyRunSpd = cha.isFlying() ? _runSpd : 0;
+		_flyWalkSpd = cha.isFlying() ? _walkSpd : 0;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x32);
+		
+		writeD(_activeChar.getX());
+		writeD(_activeChar.getY());
+		writeD(_activeChar.getZ());
+		writeD(_activeChar.getVehicle() != null ? _activeChar.getVehicle().getObjectId() : 0);
+		
+		writeD(_activeChar.getObjectId());
+		writeS(_activeChar.getAppearance().getVisibleName());
+		writeD(_activeChar.getRace().ordinal());
+		writeD(_activeChar.getAppearance().getSex() ? 1 : 0);
+		
+		writeD(_activeChar.getBaseClass());
+		
+		writeD(_activeChar.getLevel());
+		writeQ(_activeChar.getExp());
+		writeF(ExperienceData.getInstance().getPercentFromCurrentLevel(_activeChar.getExp(), _activeChar.getLevel()));
+		writeD(_activeChar.getSTR());
+		writeD(_activeChar.getDEX());
+		writeD(_activeChar.getCON());
+		writeD(_activeChar.getINT());
+		writeD(_activeChar.getWIT());
+		writeD(_activeChar.getMEN());
+		writeD(_activeChar.getMaxHp());
+		writeD((int) Math.round(_activeChar.getCurrentHp()));
+		writeD(_activeChar.getMaxMp());
+		writeD((int) Math.round(_activeChar.getCurrentMp()));
+		writeD(_activeChar.getSp());
+		writeD(_activeChar.getCurrentLoad());
+		writeD(_activeChar.getMaxLoad());
+		
+		writeD(_activeChar.getActiveWeaponItem() != null ? 40 : 20); // 20 no weapon, 40 weapon equipped
+		
+		for (int slot : getPaperdollOrder()) {
+			writeD(_activeChar.getInventory().getPaperdollObjectId(slot));
+		}
+		
+		for (int slot : getPaperdollOrder()) {
+			writeD(_activeChar.getInventory().getPaperdollItemDisplayId(slot));
+		}
+		
+		for (int slot : getPaperdollOrder()) {
+			writeD(_activeChar.getInventory().getPaperdollAugmentationId(slot));
+		}
+		
+		writeD(_activeChar.getInventory().getTalismanSlots());
+		writeD(_activeChar.getInventory().canEquipCloak() ? 1 : 0);
+		writeD((int) _activeChar.getPAtk(null));
+		writeD((int) _activeChar.getPAtkSpd());
+		writeD((int) _activeChar.getPDef(null));
+		writeD(_activeChar.getEvasionRate(null));
+		writeD(_activeChar.getAccuracy());
+		writeD(_activeChar.getCriticalHit(null, null));
+		writeD((int) _activeChar.getMAtk(null, null));
+		
+		writeD(_activeChar.getMAtkSpd());
+		writeD((int) _activeChar.getPAtkSpd());
+		
+		writeD((int) _activeChar.getMDef(null, null));
+		
+		writeD(_activeChar.getPvpFlag());
+		writeD(_activeChar.getKarma());
+		
+		writeD(_runSpd);
+		writeD(_walkSpd);
+		writeD(_swimRunSpd);
+		writeD(_swimWalkSpd);
+		writeD(_flyRunSpd);
+		writeD(_flyWalkSpd);
+		writeD(_flyRunSpd);
+		writeD(_flyWalkSpd);
+		writeF(_moveMultiplier);
+		writeF(_activeChar.getAttackSpeedMultiplier());
+		
+		writeF(_activeChar.getCollisionRadius());
+		writeF(_activeChar.getCollisionHeight());
+		
+		writeD(_activeChar.getAppearance().getHairStyle());
+		writeD(_activeChar.getAppearance().getHairColor());
+		writeD(_activeChar.getAppearance().getFace());
+		writeD(_activeChar.isGM() ? 1 : 0); // builder level
+		
+		String title = _activeChar.getTitle();
+		if (_activeChar.isGM() && _activeChar.isInvisible()) {
+			title = "Invisible";
+		}
+		if (_activeChar.getPoly().isMorphed()) {
+			final L2NpcTemplate polyObj = NpcData.getInstance().getTemplate(_activeChar.getPoly().getPolyId());
+			if (polyObj != null) {
+				title += " - " + polyObj.getName();
+			}
+		}
+		writeS(title);
+		
+		writeD(_activeChar.getClanId());
+		writeD(_activeChar.getClanCrestId());
+		writeD(_activeChar.getAllyId());
+		writeD(_activeChar.getAllyCrestId()); // ally crest id
+		// 0x40 leader rights
+		// siege flags: attacker - 0x180 sword over name, defender - 0x80 shield, 0xC0 crown (|leader), 0x1C0 flag (|leader)
+		writeD(_relation);
+		writeC(_activeChar.getMountType().ordinal()); // mount type
+		writeC(_activeChar.getPrivateStoreType().getId());
+		writeC(_activeChar.canCrystallize() ? 1 : 0); // This drives the Crystallize button appearing in the inventory
+		writeD(_activeChar.getPkKills());
+		writeD(_activeChar.getPvpKills());
+		
+		writeH(_activeChar.getCubics().size());
+		for (int cubicId : _activeChar.getCubics().keySet()) {
+			writeH(cubicId);
+		}
+		
+		writeC(_activeChar.isInPartyMatchRoom() ? 1 : 0);
+		
+		writeD(_activeChar.isInvisible() ? _activeChar.getAbnormalVisualEffects() | AbnormalVisualEffect.STEALTH.getMask() : _activeChar.getAbnormalVisualEffects());
+		writeC(_activeChar.isInsideZone(ZoneId.WATER) ? 1 : _activeChar.isFlyingMounted() ? 2 : 0);
+		
+		writeD(_activeChar.getClanPrivileges().getBitmask());
+		
+		writeH(_activeChar.getRecSystem().getLeft()); // c2 recommendations remaining
+		writeH(_activeChar.getRecSystem().getHave()); // c2 recommendations received
+		writeD(_activeChar.getMountNpcId() > 0 ? _activeChar.getMountNpcId() + 1000000 : 0);
+		writeH(_activeChar.getInventoryLimit());
+		
+		writeD(_activeChar.getClassId().getId());
+		writeD(0x00); // special effects? circles around player...
+		writeD(_activeChar.getMaxCp());
+		writeD((int) _activeChar.getCurrentCp());
+		writeC(_activeChar.isMounted() || (_airShipHelm != 0) ? 0 : _activeChar.getEnchantEffect());
+		
+		writeC(_activeChar.getTeam().getId());
+		
+		writeD(_activeChar.getClanCrestLargeId());
+		writeC(_activeChar.isNoble() ? 1 : 0); // 0x01: symbol on char menu ctrl+I
+		writeC(_activeChar.isHero() || (_activeChar.isGM() && general().gmHeroAura()) ? 1 : 0); // 0x01: Hero Aura
+		
+		writeC(_activeChar.isFishing() ? 1 : 0); // Fishing Mode
+		writeD(_activeChar.getFishx()); // fishing x
+		writeD(_activeChar.getFishy()); // fishing y
+		writeD(_activeChar.getFishz()); // fishing z
+		writeD(_activeChar.getAppearance().getNameColor());
+		
+		// new c5
+		writeC(_activeChar.isRunning() ? 0x01 : 0x00); // changes the Speed display on Status Window
+		
+		writeD(_activeChar.getPledgeClass()); // changes the text above CP on Status Window
+		writeD(_activeChar.getPledgeType());
+		
+		writeD(_activeChar.getAppearance().getTitleColor());
+		
+		writeD(_activeChar.isCursedWeaponEquipped() ? CursedWeaponsManager.getInstance().getLevel(_activeChar.getCursedWeaponEquippedId()) : 0);
+		
+		// T1 Starts
+		writeD(_activeChar.getTransformationDisplayId());
+		
+		byte attackAttribute = _activeChar.getAttackElement();
+		writeH(attackAttribute);
+		writeH(_activeChar.getAttackElementValue(attackAttribute));
+		writeH(_activeChar.getDefenseElementValue(Elementals.FIRE));
+		writeH(_activeChar.getDefenseElementValue(Elementals.WATER));
+		writeH(_activeChar.getDefenseElementValue(Elementals.WIND));
+		writeH(_activeChar.getDefenseElementValue(Elementals.EARTH));
+		writeH(_activeChar.getDefenseElementValue(Elementals.HOLY));
+		writeH(_activeChar.getDefenseElementValue(Elementals.DARK));
+		
+		writeD(_activeChar.getAgathionId());
+		
+		// T2 Starts
+		writeD(_activeChar.getFame()); // Fame
+		writeD(_activeChar.isMinimapAllowed() ? 1 : 0); // Minimap on Hellbound
+		writeD(_activeChar.getVitalityPoints()); // Vitality Points
+		writeD(_activeChar.getAbnormalVisualEffectSpecial());
+		// writeD(_territoryId); // CT2.3
+		// writeD((_isDisguised ? 0x01: 0x00)); // CT2.3
+		// writeD(_territoryId); // CT2.3
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ValidateLocation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ValidateLocation.java
new file mode 100644
index 00000000..62c6a1ad
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ValidateLocation.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.Location;
+
+public class ValidateLocation extends L2GameServerPacket {
+	private final int _charObjId;
+	private final Location _loc;
+	
+	public ValidateLocation(L2Object obj) {
+		_charObjId = obj.getObjectId();
+		_loc = obj.getLocation();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x79);
+		writeD(_charObjId);
+		writeLoc(_loc);
+		writeD(_loc.getHeading());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/ValidateLocationInVehicle.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ValidateLocationInVehicle.java
new file mode 100644
index 00000000..7067ca51
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/ValidateLocationInVehicle.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+public class ValidateLocationInVehicle extends L2GameServerPacket {
+	private final int _charObjId;
+	private final int _boatObjId;
+	private final int _heading;
+	private final Location _pos;
+	
+	public ValidateLocationInVehicle(L2PcInstance player) {
+		_charObjId = player.getObjectId();
+		_boatObjId = player.getBoat().getObjectId();
+		_heading = player.getHeading();
+		_pos = player.getInVehiclePosition();
+	}
+	
+	@Override
+	protected final void writeImpl() {
+		writeC(0x80);
+		writeD(_charObjId);
+		writeD(_boatObjId);
+		writeD(_pos.getX());
+		writeD(_pos.getY());
+		writeD(_pos.getZ());
+		writeD(_heading);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleCheckLocation.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleCheckLocation.java
new file mode 100644
index 00000000..563a214e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleCheckLocation.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author Maktakien
+ */
+public class VehicleCheckLocation extends L2GameServerPacket {
+	private final L2Character _boat;
+	
+	public VehicleCheckLocation(L2Character boat) {
+		_boat = boat;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x6d);
+		writeD(_boat.getObjectId());
+		writeD(_boat.getX());
+		writeD(_boat.getY());
+		writeD(_boat.getZ());
+		writeD(_boat.getHeading());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleDeparture.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleDeparture.java
new file mode 100644
index 00000000..b185d957
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleDeparture.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
+
+/**
+ * @author Maktakien
+ */
+public class VehicleDeparture extends L2GameServerPacket {
+	private final int _objId, _x, _y, _z, _moveSpeed, _rotationSpeed;
+	
+	public VehicleDeparture(L2BoatInstance boat) {
+		_objId = boat.getObjectId();
+		_x = boat.getXdestination();
+		_y = boat.getYdestination();
+		_z = boat.getZdestination();
+		_moveSpeed = (int) boat.getMoveSpeed();
+		_rotationSpeed = (int) boat.getStat().getRotationSpeed();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x6C);
+		writeD(_objId);
+		writeD(_moveSpeed);
+		writeD(_rotationSpeed);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleInfo.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleInfo.java
new file mode 100644
index 00000000..e19f7540
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleInfo.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
+
+/**
+ * @author Maktakien
+ */
+public class VehicleInfo extends L2GameServerPacket {
+	private final int _objId, _x, _y, _z, _heading;
+	
+	public VehicleInfo(L2BoatInstance boat) {
+		_objId = boat.getObjectId();
+		_x = boat.getX();
+		_y = boat.getY();
+		_z = boat.getZ();
+		_heading = boat.getHeading();
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x60);
+		writeD(_objId);
+		writeD(_x);
+		writeD(_y);
+		writeD(_z);
+		writeD(_heading);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleStarted.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleStarted.java
new file mode 100644
index 00000000..e57c233a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/VehicleStarted.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * @author Kerberos
+ */
+public class VehicleStarted extends L2GameServerPacket {
+	private final int _objectId;
+	private final int _state;
+	
+	public VehicleStarted(L2Character boat, int state) {
+		_objectId = boat.getObjectId();
+		_state = state;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0xC0);
+		writeD(_objectId);
+		writeD(_state);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/WareHouseDepositList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/WareHouseDepositList.java
new file mode 100644
index 00000000..26adba31
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/WareHouseDepositList.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class WareHouseDepositList extends AbstractItemPacket {
+	public static final int PRIVATE = 1;
+	public static final int CLAN = 4;
+	public static final int CASTLE = 3; // not sure
+	public static final int FREIGHT = 1;
+	private final long _playerAdena;
+	private final List<L2ItemInstance> _items = new ArrayList<>();
+	/**
+	 * <ul>
+	 * <li>0x01-Private Warehouse</li>
+	 * <li>0x02-Clan Warehouse</li>
+	 * <li>0x03-Castle Warehouse</li>
+	 * <li>0x04-Warehouse</li>
+	 * </ul>
+	 */
+	private final int _whType;
+	
+	public WareHouseDepositList(L2PcInstance player, int type) {
+		_whType = type;
+		_playerAdena = player.getAdena();
+		
+		final boolean isPrivate = _whType == PRIVATE;
+		for (L2ItemInstance temp : player.getInventory().getAvailableItems(true, isPrivate, false)) {
+			if ((temp != null) && temp.isDepositable(isPrivate)) {
+				_items.add(temp);
+			}
+		}
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x41);
+		writeH(_whType);
+		writeQ(_playerAdena);
+		writeH(_items.size());
+		
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+			writeD(item.getObjectId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/network/serverpackets/WareHouseWithdrawalList.java b/src/main/java/com/l2jserver/gameserver/network/serverpackets/WareHouseWithdrawalList.java
new file mode 100644
index 00000000..615246e9
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/network/serverpackets/WareHouseWithdrawalList.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.network.serverpackets;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+
+public final class WareHouseWithdrawalList extends AbstractItemPacket {
+	private static final Logger LOG = LoggerFactory.getLogger(WareHouseWithdrawalList.class);
+	
+	public static final int PRIVATE = 1;
+	public static final int CLAN = 4;
+	public static final int CASTLE = 3; // not sure
+	public static final int FREIGHT = 1;
+	private long _playerAdena;
+	private L2ItemInstance[] _items;
+	/**
+	 * <ul>
+	 * <li>0x01-Private Warehouse</li>
+	 * <li>0x02-Clan Warehouse</li>
+	 * <li>0x03-Castle Warehouse</li>
+	 * <li>0x04-Warehouse</li>
+	 * </ul>
+	 */
+	private int _whType;
+	
+	public WareHouseWithdrawalList(L2PcInstance player, int type) {
+		if (player.getActiveWarehouse() == null) {
+			LOG.warn("Error while sending withdraw request to: {}", player.getName());
+			return;
+		}
+		
+		_playerAdena = player.getAdena();
+		_items = player.getActiveWarehouse().getItems();
+		_whType = type;
+	}
+	
+	@Override
+	protected void writeImpl() {
+		writeC(0x42);
+		writeH(_whType);
+		writeQ(_playerAdena);
+		writeH(_items.length);
+		
+		for (L2ItemInstance item : _items) {
+			writeItem(item);
+			writeD(item.getObjectId());
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/AbstractNode.java b/src/main/java/com/l2jserver/gameserver/pathfinding/AbstractNode.java
new file mode 100644
index 00000000..6c46665d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/AbstractNode.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding;
+
+public abstract class AbstractNode<Loc extends AbstractNodeLoc> {
+	private Loc _loc;
+	private AbstractNode<Loc> _parent;
+	
+	public AbstractNode(Loc loc) {
+		_loc = loc;
+	}
+	
+	public void setParent(AbstractNode<Loc> p) {
+		_parent = p;
+	}
+	
+	public AbstractNode<Loc> getParent() {
+		return _parent;
+	}
+	
+	public Loc getLoc() {
+		return _loc;
+	}
+	
+	public void setLoc(Loc l) {
+		_loc = l;
+	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = (prime * result) + ((_loc == null) ? 0 : _loc.hashCode());
+		return result;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof AbstractNode)) {
+			return false;
+		}
+		final AbstractNode<?> other = (AbstractNode<?>) obj;
+		if (_loc == null) {
+			return other._loc == null;
+		}
+		return _loc.equals(other._loc);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/AbstractNodeLoc.java b/src/main/java/com/l2jserver/gameserver/pathfinding/AbstractNodeLoc.java
new file mode 100644
index 00000000..e2920b99
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/AbstractNodeLoc.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding;
+
+/**
+ * @author -Nemesiss-
+ */
+public abstract class AbstractNodeLoc {
+	public abstract int getX();
+	
+	public abstract int getY();
+	
+	public abstract int getZ();
+	
+	public abstract void setZ(short z);
+	
+	public abstract int getNodeX();
+	
+	public abstract int getNodeY();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/PathFinding.java b/src/main/java/com/l2jserver/gameserver/pathfinding/PathFinding.java
new file mode 100644
index 00000000..ffd86056
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/PathFinding.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding;
+
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.pathfinding.cellnodes.CellPathFinding;
+import com.l2jserver.gameserver.pathfinding.geonodes.GeoPathFinding;
+
+/**
+ * @author -Nemesiss-
+ */
+public abstract class PathFinding {
+	public static PathFinding getInstance() {
+		if (geodata().getPathFinding() == 1) {
+			// Higher Memory Usage, Smaller Cpu Usage
+			return GeoPathFinding.getInstance();
+		}
+		// Cell pathfinding, calculated directly from geodata files
+		return CellPathFinding.getInstance();
+	}
+	
+	public abstract boolean pathNodesExist(short regionoffset);
+	
+	public abstract List<AbstractNodeLoc> findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable);
+	
+	// @formatter:off
+	/*
+	public List<AbstractNodeLoc> search(AbstractNode start, AbstractNode end, int instanceId)
+	{
+		// The simplest grid-based pathfinding.
+		// Drawback is not having higher cost for diagonal movement (means funny routes)
+		// Could be optimized e.g. not to calculate backwards as far as forwards.
+		
+		// List of Visited Nodes
+		LinkedList<AbstractNode> visited = new LinkedList<AbstractNode>();
+		
+		// List of Nodes to Visit
+		LinkedList<AbstractNode> to_visit = new LinkedList<AbstractNode>();
+		to_visit.add(start);
+		
+		int i = 0;
+		while (i < 800)
+		{
+			AbstractNode node;
+			try
+			{
+				node = to_visit.removeFirst();
+			}
+			catch (Exception e)
+			{
+				// No Path found
+				return null;
+			}
+			if (node.equals(end)) //path found!
+				return constructPath(node, instanceId);
+			else
+			{
+				i++;
+				visited.add(node);
+				node.attachNeighbors();
+				Node[] neighbors = node.getNeighbors();
+				if (neighbors == null)
+					continue;
+				for (Node n : neighbors)
+				{
+					if (!visited.contains(n) && !to_visit.contains(n))
+					{
+						n.setParent(node);
+						to_visit.add(n);
+					}
+				}
+			}
+		}
+		//No Path found
+		return null;
+	}
+	 */
+	/*
+	public List<AbstractNodeLoc> searchAStar(Node start, Node end, int instanceId)
+	{
+		// Not operational yet?
+		int start_x = start.getLoc().getX();
+		int start_y = start.getLoc().getY();
+		int end_x = end.getLoc().getX();
+		int end_y = end.getLoc().getY();
+		//List of Visited Nodes
+		FastNodeList visited = new FastNodeList(800);//TODO! Add limit to cfg
+		
+		// List of Nodes to Visit
+		BinaryNodeHeap to_visit = new BinaryNodeHeap(800);
+		to_visit.add(start);
+		
+		int i = 0;
+		while (i < 800)//TODO! Add limit to cfg
+		{
+			AbstractNode node;
+			try
+			{
+				node = to_visit.removeFirst();
+			}
+			catch (Exception e)
+			{
+				// No Path found
+				return null;
+			}
+			if (node.equals(end)) //path found!
+				return constructPath(node, instanceId);
+			else
+			{
+				visited.add(node);
+				node.attachNeighbors();
+				for (Node n : node.getNeighbors())
+				{
+					if (!visited.contains(n) && !to_visit.contains(n))
+					{
+						i++;
+						n.setParent(node);
+						n.setCost(Math.abs(start_x - n.getLoc().getNodeX()) + Math.abs(start_y - n.getLoc().getNodeY())
+								+ Math.abs(end_x - n.getLoc().getNodeX()) + Math.abs(end_y - n.getLoc().getNodeY()));
+						to_visit.add(n);
+					}
+				}
+			}
+		}
+		//No Path found
+		return null;
+	}
+	 */
+	// @formatter:on
+	
+	/**
+	 * Convert geodata position to pathnode position
+	 * @param geo_pos
+	 * @return pathnode position
+	 */
+	public short getNodePos(int geo_pos) {
+		return (short) (geo_pos >> 3); // OK?
+	}
+	
+	/**
+	 * Convert node position to pathnode block position
+	 * @param node_pos
+	 * @return pathnode block position (0...255)
+	 */
+	public short getNodeBlock(int node_pos) {
+		return (short) (node_pos % 256);
+	}
+	
+	public byte getRegionX(int node_pos) {
+		return (byte) ((node_pos >> 8) + L2World.TILE_X_MIN);
+	}
+	
+	public byte getRegionY(int node_pos) {
+		return (byte) ((node_pos >> 8) + L2World.TILE_Y_MIN);
+	}
+	
+	public short getRegionOffset(byte rx, byte ry) {
+		return (short) ((rx << 5) + ry);
+	}
+	
+	/**
+	 * Convert pathnode x to World x position
+	 * @param node_x rx
+	 * @return
+	 */
+	public int calculateWorldX(short node_x) {
+		return L2World.MAP_MIN_X + (node_x * 128) + 48;
+	}
+	
+	/**
+	 * Convert pathnode y to World y position
+	 * @param node_y
+	 * @return
+	 */
+	public int calculateWorldY(short node_y) {
+		return L2World.MAP_MIN_Y + (node_y * 128) + 48;
+	}
+	
+	public String[] getStat() {
+		return null;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNode.java b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNode.java
new file mode 100644
index 00000000..dbcde835
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNode.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.cellnodes;
+
+import com.l2jserver.gameserver.pathfinding.AbstractNode;
+
+public class CellNode extends AbstractNode<NodeLoc> {
+	private CellNode _next = null;
+	private boolean _isInUse = true;
+	private float _cost = -1000;
+	
+	public CellNode(NodeLoc loc) {
+		super(loc);
+	}
+	
+	public boolean isInUse() {
+		return _isInUse;
+	}
+	
+	public void setInUse() {
+		_isInUse = true;
+	}
+	
+	public CellNode getNext() {
+		return _next;
+	}
+	
+	public void setNext(CellNode next) {
+		_next = next;
+	}
+	
+	public float getCost() {
+		return _cost;
+	}
+	
+	public void setCost(double cost) {
+		_cost = (float) cost;
+	}
+	
+	public void free() {
+		setParent(null);
+		_cost = -1000;
+		_isInUse = false;
+		_next = null;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java
new file mode 100644
index 00000000..43d8fa40
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.cellnodes;
+
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * @author Diamond
+ * @author DS
+ */
+public class CellNodeBuffer {
+	private static final int MAX_ITERATIONS = 3500;
+	
+	private final ReentrantLock _lock = new ReentrantLock();
+	private final int _mapSize;
+	private final CellNode[][] _buffer;
+	
+	private int _baseX = 0;
+	private int _baseY = 0;
+	
+	private int _targetX = 0;
+	private int _targetY = 0;
+	private int _targetZ = 0;
+	
+	private long _timeStamp = 0;
+	private long _lastElapsedTime = 0;
+	
+	private CellNode _current = null;
+	
+	public CellNodeBuffer(int size) {
+		_mapSize = size;
+		_buffer = new CellNode[_mapSize][_mapSize];
+	}
+	
+	public final boolean lock() {
+		return _lock.tryLock();
+	}
+	
+	public final CellNode findPath(int x, int y, int z, int tx, int ty, int tz) {
+		_timeStamp = System.currentTimeMillis();
+		_baseX = x + ((tx - x - _mapSize) / 2); // middle of the line (x,y) - (tx,ty)
+		_baseY = y + ((ty - y - _mapSize) / 2); // will be in the center of the buffer
+		_targetX = tx;
+		_targetY = ty;
+		_targetZ = tz;
+		_current = getNode(x, y, z);
+		_current.setCost(getCost(x, y, z, geodata().getHighWeight()));
+		
+		for (int count = 0; count < MAX_ITERATIONS; count++) {
+			if ((_current.getLoc().getNodeX() == _targetX) && (_current.getLoc().getNodeY() == _targetY) && (Math.abs(_current.getLoc().getZ() - _targetZ) < 64)) {
+				return _current; // found
+			}
+			
+			getNeighbors();
+			if (_current.getNext() == null) {
+				return null; // no more ways
+			}
+			
+			_current = _current.getNext();
+		}
+		return null;
+	}
+	
+	public final void free() {
+		_current = null;
+		
+		CellNode node;
+		for (int i = 0; i < _mapSize; i++) {
+			for (int j = 0; j < _mapSize; j++) {
+				node = _buffer[i][j];
+				if (node != null) {
+					node.free();
+				}
+			}
+		}
+		
+		_lock.unlock();
+		_lastElapsedTime = System.currentTimeMillis() - _timeStamp;
+	}
+	
+	public final long getElapsedTime() {
+		return _lastElapsedTime;
+	}
+	
+	public final List<CellNode> debugPath() {
+		final List<CellNode> result = new LinkedList<>();
+		for (CellNode n = _current; n.getParent() != null; n = (CellNode) n.getParent()) {
+			result.add(n);
+			n.setCost(-n.getCost());
+		}
+		
+		for (int i = 0; i < _mapSize; i++) {
+			for (int j = 0; j < _mapSize; j++) {
+				CellNode n = _buffer[i][j];
+				if ((n == null) || !n.isInUse() || (n.getCost() <= 0)) {
+					continue;
+				}
+				
+				result.add(n);
+			}
+		}
+		return result;
+	}
+	
+	private void getNeighbors() {
+		if (_current.getLoc().canGoNone()) {
+			return;
+		}
+		
+		final int x = _current.getLoc().getNodeX();
+		final int y = _current.getLoc().getNodeY();
+		final int z = _current.getLoc().getZ();
+		
+		CellNode nodeE = null;
+		CellNode nodeS = null;
+		CellNode nodeW = null;
+		CellNode nodeN = null;
+		
+		// East
+		if (_current.getLoc().canGoEast()) {
+			nodeE = addNode(x + 1, y, z, false);
+		}
+		
+		// South
+		if (_current.getLoc().canGoSouth()) {
+			nodeS = addNode(x, y + 1, z, false);
+		}
+		
+		// West
+		if (_current.getLoc().canGoWest()) {
+			nodeW = addNode(x - 1, y, z, false);
+		}
+		
+		// North
+		if (_current.getLoc().canGoNorth()) {
+			nodeN = addNode(x, y - 1, z, false);
+		}
+		
+		if (geodata().advancedDiagonalStrategy()) {
+			// SouthEast
+			if ((nodeE != null) && (nodeS != null)) {
+				if (nodeE.getLoc().canGoSouth() && nodeS.getLoc().canGoEast()) {
+					addNode(x + 1, y + 1, z, true);
+				}
+			}
+			
+			// SouthWest
+			if ((nodeS != null) && (nodeW != null)) {
+				if (nodeW.getLoc().canGoSouth() && nodeS.getLoc().canGoWest()) {
+					addNode(x - 1, y + 1, z, true);
+				}
+			}
+			
+			// NorthEast
+			if ((nodeN != null) && (nodeE != null)) {
+				if (nodeE.getLoc().canGoNorth() && nodeN.getLoc().canGoEast()) {
+					addNode(x + 1, y - 1, z, true);
+				}
+			}
+			
+			// NorthWest
+			if ((nodeN != null) && (nodeW != null)) {
+				if (nodeW.getLoc().canGoNorth() && nodeN.getLoc().canGoWest()) {
+					addNode(x - 1, y - 1, z, true);
+				}
+			}
+		}
+	}
+	
+	private CellNode getNode(int x, int y, int z) {
+		final int aX = x - _baseX;
+		if ((aX < 0) || (aX >= _mapSize)) {
+			return null;
+		}
+		
+		final int aY = y - _baseY;
+		if ((aY < 0) || (aY >= _mapSize)) {
+			return null;
+		}
+		
+		CellNode result = _buffer[aX][aY];
+		if (result == null) {
+			result = new CellNode(new NodeLoc(x, y, z));
+			_buffer[aX][aY] = result;
+		} else if (!result.isInUse()) {
+			result.setInUse();
+			// reinit node if needed
+			if (result.getLoc() != null) {
+				result.getLoc().set(x, y, z);
+			} else {
+				result.setLoc(new NodeLoc(x, y, z));
+			}
+		}
+		
+		return result;
+	}
+	
+	private CellNode addNode(int x, int y, int z, boolean diagonal) {
+		CellNode newNode = getNode(x, y, z);
+		if (newNode == null) {
+			return null;
+		}
+		if (newNode.getCost() >= 0) {
+			return newNode;
+		}
+		
+		final int geoZ = newNode.getLoc().getZ();
+		
+		final int stepZ = Math.abs(geoZ - _current.getLoc().getZ());
+		float weight = diagonal ? geodata().getDiagonalWeight() : geodata().getLowWeight();
+		
+		if (!newNode.getLoc().canGoAll() || (stepZ > 16)) {
+			weight = geodata().getHighWeight();
+		} else {
+			if (isHighWeight(x + 1, y, geoZ)) {
+				weight = geodata().getMediumWeight();
+			} else if (isHighWeight(x - 1, y, geoZ)) {
+				weight = geodata().getMediumWeight();
+			} else if (isHighWeight(x, y + 1, geoZ)) {
+				weight = geodata().getMediumWeight();
+			} else if (isHighWeight(x, y - 1, geoZ)) {
+				weight = geodata().getMediumWeight();
+			}
+		}
+		
+		newNode.setParent(_current);
+		newNode.setCost(getCost(x, y, geoZ, weight));
+		
+		CellNode node = _current;
+		int count = 0;
+		while ((node.getNext() != null) && (count < (MAX_ITERATIONS * 4))) {
+			count++;
+			if (node.getNext().getCost() > newNode.getCost()) {
+				// insert node into a chain
+				newNode.setNext(node.getNext());
+				break;
+			}
+			node = node.getNext();
+		}
+		if (count == (MAX_ITERATIONS * 4)) {
+			System.err.println("Pathfinding: too long loop detected, cost:" + newNode.getCost());
+		}
+		
+		node.setNext(newNode); // add last
+		
+		return newNode;
+	}
+	
+	private boolean isHighWeight(int x, int y, int z) {
+		final CellNode result = getNode(x, y, z);
+		if (result == null) {
+			return true;
+		}
+		
+		if (!result.getLoc().canGoAll()) {
+			return true;
+		}
+		return Math.abs(result.getLoc().getZ() - z) > 16;
+	}
+	
+	private double getCost(int x, int y, int z, float weight) {
+		final int dX = x - _targetX;
+		final int dY = y - _targetY;
+		final int dZ = z - _targetZ;
+		// Math.abs(dx) + Math.abs(dy) + Math.abs(dz) / 16
+		double result = Math.sqrt((dX * dX) + (dY * dY) + ((dZ * dZ) / 256.0));
+		if (result > weight) {
+			result += weight;
+		}
+		
+		if (result > Float.MAX_VALUE) {
+			result = Float.MAX_VALUE;
+		}
+		
+		return result;
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java
new file mode 100644
index 00000000..89ecaa23
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.cellnodes;
+
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.itemcontainer.Inventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.pathfinding.AbstractNode;
+import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+import com.l2jserver.gameserver.pathfinding.PathFinding;
+import com.l2jserver.gameserver.util.StringUtil;
+
+/**
+ * @author Sami
+ * @author Diamond
+ * @author DS
+ */
+public class CellPathFinding extends PathFinding {
+	private static final Logger LOG = LoggerFactory.getLogger(CellPathFinding.class);
+	
+	private final BufferInfo[] _allBuffers;
+	private int _findSuccess = 0;
+	private int _findFails = 0;
+	private int _postFilterUses = 0;
+	private int _postFilterPlayableUses = 0;
+	private int _postFilterPasses = 0;
+	private long _postFilterElapsed = 0;
+	
+	private List<L2ItemInstance> _debugItems = null;
+	
+	public static CellPathFinding getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private CellPathFinding() {
+		try {
+			String[] array = geodata().getPathFindBuffers().split(";");
+			
+			_allBuffers = new BufferInfo[array.length];
+			
+			String buf;
+			String[] args;
+			for (int i = 0; i < array.length; i++) {
+				buf = array[i];
+				args = buf.split("x");
+				if (args.length != 2) {
+					throw new Exception("Invalid buffer definition: " + buf);
+				}
+				
+				_allBuffers[i] = new BufferInfo(Integer.parseInt(args[0]), Integer.parseInt(args[1]));
+			}
+		} catch (Exception e) {
+			LOG.warn("Problem during buffer init: {}", e.getMessage(), e);
+			throw new Error("CellPathFinding: load aborted");
+		}
+	}
+	
+	@Override
+	public boolean pathNodesExist(short regionoffset) {
+		return false;
+	}
+	
+	@Override
+	public List<AbstractNodeLoc> findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable) {
+		int gx = GeoData.getInstance().getGeoX(x);
+		int gy = GeoData.getInstance().getGeoY(y);
+		if (!GeoData.getInstance().hasGeo(x, y)) {
+			return null;
+		}
+		int gz = GeoData.getInstance().getHeight(x, y, z);
+		int gtx = GeoData.getInstance().getGeoX(tx);
+		int gty = GeoData.getInstance().getGeoY(ty);
+		if (!GeoData.getInstance().hasGeo(tx, ty)) {
+			return null;
+		}
+		int gtz = GeoData.getInstance().getHeight(tx, ty, tz);
+		CellNodeBuffer buffer = alloc(64 + (2 * Math.max(Math.abs(gx - gtx), Math.abs(gy - gty))), playable);
+		if (buffer == null) {
+			return null;
+		}
+		
+		boolean debug = playable && geodata().debugPath();
+		
+		if (debug) {
+			if (_debugItems == null) {
+				_debugItems = new CopyOnWriteArrayList<>();
+			} else {
+				for (L2ItemInstance item : _debugItems) {
+					item.decayMe();
+				}
+				
+				_debugItems.clear();
+			}
+		}
+		
+		List<AbstractNodeLoc> path;
+		try {
+			CellNode result = buffer.findPath(gx, gy, gz, gtx, gty, gtz);
+			
+			if (debug) {
+				for (CellNode n : buffer.debugPath()) {
+					if (n.getCost() < 0) {
+						dropDebugItem(1831, (int) (-n.getCost() * 10), n.getLoc());
+					} else {
+						// known nodes
+						dropDebugItem(Inventory.ADENA_ID, (int) (n.getCost() * 10), n.getLoc());
+					}
+				}
+			}
+			
+			if (result == null) {
+				_findFails++;
+				return null;
+			}
+			
+			path = constructPath(result);
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+			return null;
+		} finally {
+			buffer.free();
+		}
+		
+		if ((path.size() < 3) || (geodata().getMaxPostfilterPasses() <= 0)) {
+			_findSuccess++;
+			return path;
+		}
+		
+		long timeStamp = System.currentTimeMillis();
+		_postFilterUses++;
+		if (playable) {
+			_postFilterPlayableUses++;
+		}
+		
+		boolean remove;
+		int pass = 0;
+		do {
+			pass++;
+			_postFilterPasses++;
+			
+			remove = false;
+			final Iterator<AbstractNodeLoc> endPoint = path.iterator();
+			endPoint.next();
+			int currentX = x;
+			int currentY = y;
+			int currentZ = z;
+			
+			int midPoint = 0;
+			while (endPoint.hasNext()) {
+				AbstractNodeLoc locMiddle = path.get(midPoint);
+				AbstractNodeLoc locEnd = endPoint.next();
+				if (GeoData.getInstance().canMove(currentX, currentY, currentZ, locEnd.getX(), locEnd.getY(), locEnd.getZ(), instanceId)) {
+					path.remove(midPoint);
+					remove = true;
+					if (debug) {
+						dropDebugItem(735, 1, locMiddle);
+					}
+				} else {
+					currentX = locMiddle.getX();
+					currentY = locMiddle.getY();
+					currentZ = locMiddle.getZ();
+					midPoint++;
+				}
+			}
+		}
+		// only one postfilter pass for AI
+		while (playable && remove && (path.size() > 2) && (pass < geodata().getMaxPostfilterPasses()));
+		
+		if (debug) {
+			path.forEach(n -> dropDebugItem(65, 1, n));
+		}
+		
+		_findSuccess++;
+		_postFilterElapsed += System.currentTimeMillis() - timeStamp;
+		return path;
+	}
+	
+	private List<AbstractNodeLoc> constructPath(AbstractNode<NodeLoc> node) {
+		final List<AbstractNodeLoc> path = new CopyOnWriteArrayList<>();
+		int previousDirectionX = Integer.MIN_VALUE;
+		int previousDirectionY = Integer.MIN_VALUE;
+		int directionX, directionY;
+		
+		while (node.getParent() != null) {
+			if (!geodata().advancedDiagonalStrategy() && (node.getParent().getParent() != null)) {
+				int tmpX = node.getLoc().getNodeX() - node.getParent().getParent().getLoc().getNodeX();
+				int tmpY = node.getLoc().getNodeY() - node.getParent().getParent().getLoc().getNodeY();
+				if (Math.abs(tmpX) == Math.abs(tmpY)) {
+					directionX = tmpX;
+					directionY = tmpY;
+				} else {
+					directionX = node.getLoc().getNodeX() - node.getParent().getLoc().getNodeX();
+					directionY = node.getLoc().getNodeY() - node.getParent().getLoc().getNodeY();
+				}
+			} else {
+				directionX = node.getLoc().getNodeX() - node.getParent().getLoc().getNodeX();
+				directionY = node.getLoc().getNodeY() - node.getParent().getLoc().getNodeY();
+			}
+			
+			// only add a new route point if moving direction changes
+			if ((directionX != previousDirectionX) || (directionY != previousDirectionY)) {
+				previousDirectionX = directionX;
+				previousDirectionY = directionY;
+				
+				path.addFirst(node.getLoc());
+				node.setLoc(null);
+			}
+			
+			node = node.getParent();
+		}
+		return path;
+	}
+	
+	private CellNodeBuffer alloc(int size, boolean playable) {
+		CellNodeBuffer current = null;
+		for (BufferInfo i : _allBuffers) {
+			if (i.mapSize >= size) {
+				for (CellNodeBuffer buf : i.bufs) {
+					if (buf.lock()) {
+						i.uses++;
+						if (playable) {
+							i.playableUses++;
+						}
+						i.elapsed += buf.getElapsedTime();
+						current = buf;
+						break;
+					}
+				}
+				if (current != null) {
+					break;
+				}
+				
+				// not found, allocate temporary buffer
+				current = new CellNodeBuffer(i.mapSize);
+				current.lock();
+				if (i.bufs.size() < i.count) {
+					i.bufs.add(current);
+					i.uses++;
+					if (playable) {
+						i.playableUses++;
+					}
+					break;
+				}
+				
+				i.overflows++;
+				if (playable) {
+					i.playableOverflows++;
+					// System.err.println("Overflow, size requested: " + size + " playable:"+playable);
+				}
+			}
+		}
+		
+		return current;
+	}
+	
+	private void dropDebugItem(int itemId, int num, AbstractNodeLoc loc) {
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var item = new L2ItemInstance(objectId, itemId);
+		item.setCount(num);
+		item.spawnMe(loc.getX(), loc.getY(), loc.getZ());
+		_debugItems.add(item);
+	}
+	
+	private static final class BufferInfo {
+		final int mapSize;
+		final int count;
+		List<CellNodeBuffer> bufs;
+		int uses = 0;
+		int playableUses = 0;
+		int overflows = 0;
+		int playableOverflows = 0;
+		long elapsed = 0;
+		
+		public BufferInfo(int size, int cnt) {
+			mapSize = size;
+			count = cnt;
+			bufs = new ArrayList<>(count);
+		}
+		
+		@Override
+		public String toString() {
+			final StringBuilder stat = new StringBuilder(100);
+			StringUtil.append(stat, String.valueOf(mapSize), "x", String.valueOf(mapSize), " num:", String.valueOf(bufs.size()), "/", String.valueOf(count), " uses:", String.valueOf(uses), "/", String.valueOf(playableUses));
+			if (uses > 0) {
+				StringUtil.append(stat, " total/avg(ms):", String.valueOf(elapsed), "/", String.format("%1.2f", (double) elapsed / uses));
+			}
+			
+			StringUtil.append(stat, " ovf:", String.valueOf(overflows), "/", String.valueOf(playableOverflows));
+			
+			return stat.toString();
+		}
+	}
+	
+	@Override
+	public String[] getStat() {
+		final String[] result = new String[_allBuffers.length + 1];
+		for (int i = 0; i < _allBuffers.length; i++) {
+			result[i] = _allBuffers[i].toString();
+		}
+		
+		final StringBuilder stat = new StringBuilder(100);
+		StringUtil.append(stat, "LOS postfilter uses:", String.valueOf(_postFilterUses), "/", String.valueOf(_postFilterPlayableUses));
+		if (_postFilterUses > 0) {
+			StringUtil.append(stat, " total/avg(ms):", String.valueOf(_postFilterElapsed), "/", String.format("%1.2f", (double) _postFilterElapsed / _postFilterUses), //
+				" passes total/avg:", String.valueOf(_postFilterPasses), "/", String.format("%1.1f", (double) _postFilterPasses / _postFilterUses), Configuration.EOL);
+		}
+		StringUtil.append(stat, "Pathfind success/fail:", String.valueOf(_findSuccess), "/", String.valueOf(_findFails));
+		result[result.length - 1] = stat.toString();
+		
+		return result;
+	}
+	
+	private static class SingletonHolder {
+		protected static final CellPathFinding _instance = new CellPathFinding();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java
new file mode 100644
index 00000000..ea65865c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.cellnodes;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+import com.l2jserver.geodriver.Cell;
+
+/**
+ * @author -Nemesiss-
+ * @author HorridoJoho
+ */
+public class NodeLoc extends AbstractNodeLoc {
+	private int _x;
+	private int _y;
+	private boolean _goNorth;
+	private boolean _goEast;
+	private boolean _goSouth;
+	private boolean _goWest;
+	private int _geoHeight;
+	
+	public NodeLoc(int x, int y, int z) {
+		set(x, y, z);
+	}
+	
+	public void set(int x, int y, int z) {
+		_x = x;
+		_y = y;
+		_goNorth = GeoData.getInstance().checkNearestNswe(x, y, z, Cell.NSWE_NORTH);
+		_goEast = GeoData.getInstance().checkNearestNswe(x, y, z, Cell.NSWE_EAST);
+		_goSouth = GeoData.getInstance().checkNearestNswe(x, y, z, Cell.NSWE_SOUTH);
+		_goWest = GeoData.getInstance().checkNearestNswe(x, y, z, Cell.NSWE_WEST);
+		_geoHeight = GeoData.getInstance().getNearestZ(x, y, z);
+	}
+	
+	public boolean canGoNorth() {
+		return _goNorth;
+	}
+	
+	public boolean canGoEast() {
+		return _goEast;
+	}
+	
+	public boolean canGoSouth() {
+		return _goSouth;
+	}
+	
+	public boolean canGoWest() {
+		return _goWest;
+	}
+	
+	public boolean canGoNone() {
+		return !canGoNorth() && !canGoEast() && !canGoSouth() && !canGoWest();
+	}
+	
+	public boolean canGoAll() {
+		return canGoNorth() && canGoEast() && canGoSouth() && canGoWest();
+	}
+	
+	@Override
+	public int getX() {
+		return GeoData.getInstance().getWorldX(_x);
+	}
+	
+	@Override
+	public int getY() {
+		return GeoData.getInstance().getWorldY(_y);
+	}
+	
+	@Override
+	public int getZ() {
+		return _geoHeight;
+	}
+	
+	@Override
+	public void setZ(short z) {
+		//
+	}
+	
+	@Override
+	public int getNodeX() {
+		return _x;
+	}
+	
+	@Override
+	public int getNodeY() {
+		return _y;
+	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = (prime * result) + _x;
+		result = (prime * result) + _y;
+		
+		int nswe = 0;
+		if (canGoNorth()) {
+			nswe |= Cell.NSWE_NORTH;
+		}
+		if (canGoEast()) {
+			nswe |= Cell.NSWE_EAST;
+		}
+		if (canGoSouth()) {
+			nswe |= Cell.NSWE_SOUTH;
+		}
+		if (canGoWest()) {
+			nswe |= Cell.NSWE_WEST;
+		}
+		
+		result = (prime * result) + (((_geoHeight & 0xFFFF) << 1) | nswe);
+		return result;
+		// return super.hashCode();
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof NodeLoc other)) {
+			return false;
+		}
+		if (_x != other._x) {
+			return false;
+		}
+		if (_y != other._y) {
+			return false;
+		}
+		if (_goNorth != other._goNorth) {
+			return false;
+		}
+		if (_goEast != other._goEast) {
+			return false;
+		}
+		if (_goSouth != other._goSouth) {
+			return false;
+		}
+		if (_goWest != other._goWest) {
+			return false;
+		}
+		return _geoHeight == other._geoHeight;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoNode.java b/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoNode.java
new file mode 100644
index 00000000..a8001651
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoNode.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.geonodes;
+
+import com.l2jserver.gameserver.pathfinding.AbstractNode;
+
+/**
+ * @author -Nemesiss-
+ */
+public class GeoNode extends AbstractNode<GeoNodeLoc> {
+	private final int _neighborsIdx;
+	private short _cost;
+	private GeoNode[] _neighbors;
+	
+	public GeoNode(GeoNodeLoc Loc, int Neighbors_idx) {
+		super(Loc);
+		_neighborsIdx = Neighbors_idx;
+	}
+	
+	public short getCost() {
+		return _cost;
+	}
+	
+	public void setCost(int cost) {
+		_cost = (short) cost;
+	}
+	
+	public GeoNode[] getNeighbors() {
+		return _neighbors;
+	}
+	
+	public void attachNeighbors(GeoNode[] neighbors) {
+		_neighbors = neighbors;
+	}
+	
+	public int getNeighborsIdx() {
+		return _neighborsIdx;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoNodeLoc.java b/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoNodeLoc.java
new file mode 100644
index 00000000..158873da
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoNodeLoc.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.geonodes;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+
+/**
+ * @author -Nemesiss-
+ */
+public class GeoNodeLoc extends AbstractNodeLoc {
+	private final short _x;
+	private final short _y;
+	private final short _z;
+	
+	public GeoNodeLoc(short x, short y, short z) {
+		_x = x;
+		_y = y;
+		_z = z;
+	}
+	
+	@Override
+	public int getX() {
+		return L2World.MAP_MIN_X + (_x * 128) + 48;
+	}
+	
+	@Override
+	public int getY() {
+		return L2World.MAP_MIN_Y + (_y * 128) + 48;
+	}
+	
+	@Override
+	public int getZ() {
+		return _z;
+	}
+	
+	@Override
+	public void setZ(short z) {
+		//
+	}
+	
+	@Override
+	public int getNodeX() {
+		return _x;
+	}
+	
+	@Override
+	public int getNodeY() {
+		return _y;
+	}
+	
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = (prime * result) + _x;
+		result = (prime * result) + _y;
+		result = (prime * result) + _z;
+		return result;
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof GeoNodeLoc other)) {
+			return false;
+		}
+		if (_x != other._x) {
+			return false;
+		}
+		if (_y != other._y) {
+			return false;
+		}
+		return _z == other._z;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java b/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java
new file mode 100644
index 00000000..14168c83
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java
@@ -0,0 +1,415 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.geonodes;
+
+import static com.l2jserver.gameserver.config.Configuration.geodata;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.IntBuffer;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.pathfinding.AbstractNode;
+import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
+import com.l2jserver.gameserver.pathfinding.PathFinding;
+import com.l2jserver.gameserver.pathfinding.utils.FastNodeList;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * @author -Nemesiss-
+ */
+public class GeoPathFinding extends PathFinding {
+	private static final Logger LOG = LoggerFactory.getLogger(GeoPathFinding.class);
+	
+	private static final Map<Short, ByteBuffer> _pathNodes = new HashMap<>();
+	private static final Map<Short, IntBuffer> _pathNodesIndex = new HashMap<>();
+	
+	public static GeoPathFinding getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	@Override
+	public boolean pathNodesExist(short regionoffset) {
+		return _pathNodesIndex.containsKey(regionoffset);
+	}
+	
+	@Override
+	public List<AbstractNodeLoc> findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable) {
+		int gx = (x - L2World.MAP_MIN_X) >> 4;
+		int gy = (y - L2World.MAP_MIN_Y) >> 4;
+		short gz = (short) z;
+		int gtx = (tx - L2World.MAP_MIN_X) >> 4;
+		int gty = (ty - L2World.MAP_MIN_Y) >> 4;
+		short gtz = (short) tz;
+		
+		GeoNode start = readNode(gx, gy, gz);
+		GeoNode end = readNode(gtx, gty, gtz);
+		if ((start == null) || (end == null)) {
+			return null;
+		}
+		if (Math.abs(start.getLoc().getZ() - z) > 55) {
+			return null; // not correct layer
+		}
+		if (Math.abs(end.getLoc().getZ() - tz) > 55) {
+			return null; // not correct layer
+		}
+		if (start == end) {
+			return null;
+		}
+		
+		// TODO: Find closest path node we CAN access. Now only checks if we can not reach the closest
+		Location temp = GeoData.getInstance().moveCheck(x, y, z, start.getLoc().getX(), start.getLoc().getY(), start.getLoc().getZ(), instanceId);
+		if ((temp.getX() != start.getLoc().getX()) || (temp.getY() != start.getLoc().getY())) {
+			return null; // cannot reach closest...
+		}
+		
+		// TODO: Find closest path node around target, now only checks if final location can be reached
+		temp = GeoData.getInstance().moveCheck(tx, ty, tz, end.getLoc().getX(), end.getLoc().getY(), end.getLoc().getZ(), instanceId);
+		if ((temp.getX() != end.getLoc().getX()) || (temp.getY() != end.getLoc().getY())) {
+			return null; // cannot reach closest...
+		}
+		
+		// return searchAStar(start, end);
+		return searchByClosest2(start, end);
+	}
+	
+	private List<AbstractNodeLoc> searchByClosest2(GeoNode start, GeoNode end) {
+		// Always continues checking from the closest to target non-blocked
+		// node from to_visit list. There's extra length in path if needed
+		// to go backwards/sideways but when moving generally forwards, this is extra fast
+		// and accurate. And can reach insane distances (try it with 800 nodes..).
+		// Minimum required node count would be around 300-400.
+		// Generally returns a bit (only a bit) more intelligent looking routes than
+		// the basic version. Not a true distance image (which would increase CPU
+		// load) level of intelligence though.
+		
+		// List of Visited Nodes
+		FastNodeList visited = new FastNodeList(550);
+		
+		// List of Nodes to Visit
+		LinkedList<GeoNode> to_visit = new LinkedList<>();
+		to_visit.add(start);
+		int targetX = end.getLoc().getNodeX();
+		int targetY = end.getLoc().getNodeY();
+		
+		int dx, dy;
+		boolean added;
+		int i = 0;
+		while (i < 550) {
+			GeoNode node;
+			try {
+				node = to_visit.removeFirst();
+			} catch (Exception e) {
+				// No Path found
+				return null;
+			}
+			if (node.equals(end)) {
+				return constructPath2(node);
+			}
+			
+			i++;
+			visited.add(node);
+			node.attachNeighbors(readNeighbors(node));
+			GeoNode[] neighbors = node.getNeighbors();
+			if (neighbors == null) {
+				continue;
+			}
+			for (GeoNode n : neighbors) {
+				if (!visited.containsRev(n) && !to_visit.contains(n)) {
+					added = false;
+					n.setParent(node);
+					dx = targetX - n.getLoc().getNodeX();
+					dy = targetY - n.getLoc().getNodeY();
+					n.setCost((dx * dx) + (dy * dy));
+					for (int index = 0; index < to_visit.size(); index++) {
+						// supposed to find it quite early..
+						if (to_visit.get(index).getCost() > n.getCost()) {
+							to_visit.add(index, n);
+							added = true;
+							break;
+						}
+					}
+					if (!added) {
+						to_visit.addLast(n);
+					}
+				}
+			}
+		}
+		// No Path found
+		return null;
+	}
+	
+	private List<AbstractNodeLoc> constructPath2(AbstractNode<GeoNodeLoc> node) {
+		LinkedList<AbstractNodeLoc> path = new LinkedList<>();
+		int previousDirectionX = -1000;
+		int previousDirectionY = -1000;
+		int directionX;
+		int directionY;
+		
+		while (node.getParent() != null) {
+			// only add a new route point if moving direction changes
+			directionX = node.getLoc().getNodeX() - node.getParent().getLoc().getNodeX();
+			directionY = node.getLoc().getNodeY() - node.getParent().getLoc().getNodeY();
+			
+			if ((directionX != previousDirectionX) || (directionY != previousDirectionY)) {
+				previousDirectionX = directionX;
+				previousDirectionY = directionY;
+				path.addFirst(node.getLoc());
+			}
+			node = node.getParent();
+		}
+		return path;
+	}
+	
+	private GeoNode[] readNeighbors(GeoNode n) {
+		if (n.getLoc() == null) {
+			return null;
+		}
+		
+		int idx = n.getNeighborsIdx();
+		
+		int node_x = n.getLoc().getNodeX();
+		int node_y = n.getLoc().getNodeY();
+		// short node_z = n.getLoc().getZ();
+		
+		short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
+		ByteBuffer pn = _pathNodes.get(regoffset);
+		
+		List<AbstractNode<GeoNodeLoc>> neighbors = new ArrayList<>(8);
+		GeoNode newNode;
+		short new_node_x, new_node_y;
+		
+		// Region for sure will change, we must read from correct file
+		byte neighbor = pn.get(idx++); // N
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) node_x;
+			new_node_y = (short) (node_y - 1);
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // NE
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) (node_x + 1);
+			new_node_y = (short) (node_y - 1);
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // E
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) (node_x + 1);
+			new_node_y = (short) node_y;
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // SE
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) (node_x + 1);
+			new_node_y = (short) (node_y + 1);
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // S
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) node_x;
+			new_node_y = (short) (node_y + 1);
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // SW
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) (node_x - 1);
+			new_node_y = (short) (node_y + 1);
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // W
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) (node_x - 1);
+			new_node_y = (short) node_y;
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		neighbor = pn.get(idx++); // NW
+		if (neighbor > 0) {
+			neighbor--;
+			new_node_x = (short) (node_x - 1);
+			new_node_y = (short) (node_y - 1);
+			newNode = readNode(new_node_x, new_node_y, neighbor);
+			if (newNode != null) {
+				neighbors.add(newNode);
+			}
+		}
+		GeoNode[] result = new GeoNode[neighbors.size()];
+		return neighbors.toArray(result);
+	}
+	
+	// Private
+	
+	private GeoNode readNode(short node_x, short node_y, byte layer) {
+		short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
+		if (!pathNodesExist(regoffset)) {
+			return null;
+		}
+		short nbx = getNodeBlock(node_x);
+		short nby = getNodeBlock(node_y);
+		int idx = _pathNodesIndex.get(regoffset).get((nby << 8) + nbx);
+		ByteBuffer pn = _pathNodes.get(regoffset);
+		// reading
+		byte nodes = pn.get(idx);
+		idx += (layer * 10) + 1;// byte + layer*10byte
+		if (nodes < layer) {
+			LOG.warn("SmthWrong!");
+		}
+		short node_z = pn.getShort(idx);
+		idx += 2;
+		return new GeoNode(new GeoNodeLoc(node_x, node_y, node_z), idx);
+	}
+	
+	private GeoNode readNode(int gx, int gy, short z) {
+		short node_x = getNodePos(gx);
+		short node_y = getNodePos(gy);
+		short regoffset = getRegionOffset(getRegionX(node_x), getRegionY(node_y));
+		if (!pathNodesExist(regoffset)) {
+			return null;
+		}
+		short nbx = getNodeBlock(node_x);
+		short nby = getNodeBlock(node_y);
+		int idx = _pathNodesIndex.get(regoffset).get((nby << 8) + nbx);
+		ByteBuffer pn = _pathNodes.get(regoffset);
+		// reading
+		byte nodes = pn.get(idx++);
+		int idx2 = 0; // create index to nearlest node by z
+		short last_z = Short.MIN_VALUE;
+		while (nodes > 0) {
+			short node_z = pn.getShort(idx);
+			if (Math.abs(last_z - z) > Math.abs(node_z - z)) {
+				last_z = node_z;
+				idx2 = idx + 2;
+			}
+			idx += 10; // short + 8 byte
+			nodes--;
+		}
+		return new GeoNode(new GeoNodeLoc(node_x, node_y, last_z), idx2);
+	}
+	
+	private GeoPathFinding() {
+		try (var fileLines = Files.lines(Paths.get(geodata().getPathnodePath().getPath(), "pn_index.txt"), UTF_8)) {
+			LOG.info("Path Engine: - Loading Path Nodes...");
+			fileLines.map(String::trim)
+				.filter(l -> !l.isEmpty())
+				.forEach(line -> {
+					final String[] parts = line.split("_");
+					
+					if ((parts.length < 2)
+						|| !Util.isDigit(parts[0])
+						|| !Util.isDigit(parts[1])) {
+						LOG.warn("Invalid pathnode entry: '{}', must be in format 'XX_YY', where X and Y - integers", line);
+						return;
+					}
+					
+					byte rx = Byte.parseByte(parts[0]);
+					byte ry = Byte.parseByte(parts[1]);
+					loadPathNodeFile(rx, ry);
+				});
+		} catch (IOException e) {
+			LOG.warn(e.getMessage(), e);
+			throw new Error("Failed to read pn_index file.");
+		}
+	}
+	
+	private void loadPathNodeFile(byte rx, byte ry) {
+		if ((rx < L2World.TILE_X_MIN) || (rx > L2World.TILE_X_MAX) || (ry < L2World.TILE_Y_MIN) || (ry > L2World.TILE_Y_MAX)) {
+			LOG.warn("Failed to Load PathNode File: invalid region {},{}{}", rx, ry, Configuration.EOL);
+			return;
+		}
+		short regionoffset = getRegionOffset(rx, ry);
+		File file = new File(geodata().getPathnodePath(), rx + "_" + ry + ".pn");
+		LOG.info("Path Engine: - Loading: {} -> region offset: {} X: {} Y: {}", file.getName(), regionoffset, rx, ry);
+		int node = 0, size, index = 0;
+		
+		// Create a read-only memory-mapped file
+		try (RandomAccessFile raf = new RandomAccessFile(file, "r");
+			FileChannel roChannel = raf.getChannel()) {
+			size = (int) roChannel.size();
+			MappedByteBuffer nodes;
+			if (geodata().forceGeoData()) {
+				// it is not guarantee, because the underlying operating system may have paged out some of the buffer's data
+				nodes = roChannel.map(FileChannel.MapMode.READ_ONLY, 0, size).load();
+			} else {
+				nodes = roChannel.map(FileChannel.MapMode.READ_ONLY, 0, size);
+			}
+			
+			// Indexing pathnode files, so we will know where each block starts
+			IntBuffer indexs = IntBuffer.allocate(65536);
+			
+			while (node < 65536) {
+				byte layer = nodes.get(index);
+				indexs.put(node++, index);
+				index += (layer * 10) + 1;
+			}
+			_pathNodesIndex.put(regionoffset, indexs);
+			_pathNodes.put(regionoffset, nodes);
+		} catch (Exception e) {
+			LOG.warn("Failed to Load PathNode File: {} : {}", file.getAbsolutePath(), e.getMessage(), e);
+		}
+	}
+	
+	private static class SingletonHolder {
+		protected static final GeoPathFinding _instance = new GeoPathFinding();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java b/src/main/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java
new file mode 100644
index 00000000..5aa8025e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/utils/BinaryNodeHeap.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.utils;
+
+import com.l2jserver.gameserver.pathfinding.geonodes.GeoNode;
+
+/**
+ * @author -Nemesiss-
+ */
+public class BinaryNodeHeap {
+	private final GeoNode[] _list;
+	private int _size;
+	
+	public BinaryNodeHeap(int size) {
+		_list = new GeoNode[size + 1];
+		_size = 0;
+	}
+	
+	public void add(GeoNode n) {
+		_size++;
+		int pos = _size;
+		_list[pos] = n;
+		while (pos != 1) {
+			int p2 = pos / 2;
+			if (_list[pos].getCost() <= _list[p2].getCost()) {
+				GeoNode temp = _list[p2];
+				_list[p2] = _list[pos];
+				_list[pos] = temp;
+				pos = p2;
+			} else {
+				break;
+			}
+		}
+	}
+	
+	public GeoNode removeFirst() {
+		GeoNode first = _list[1];
+		_list[1] = _list[_size];
+		_list[_size] = null;
+		_size--;
+		int pos = 1;
+		int cpos;
+		int dblcpos;
+		GeoNode temp;
+		while (true) {
+			cpos = pos;
+			dblcpos = cpos * 2;
+			if ((dblcpos + 1) <= _size) {
+				if (_list[cpos].getCost() >= _list[dblcpos].getCost()) {
+					pos = dblcpos;
+				}
+				if (_list[pos].getCost() >= _list[dblcpos + 1].getCost()) {
+					pos = dblcpos + 1;
+				}
+			} else if (dblcpos <= _size) {
+				if (_list[cpos].getCost() >= _list[dblcpos].getCost()) {
+					pos = dblcpos;
+				}
+			}
+			
+			if (cpos != pos) {
+				temp = _list[cpos];
+				_list[cpos] = _list[pos];
+				_list[pos] = temp;
+			} else {
+				break;
+			}
+		}
+		return first;
+	}
+	
+	public boolean contains(GeoNode n) {
+		if (_size == 0) {
+			return false;
+		}
+		for (int i = 1; i <= _size; i++) {
+			if (_list[i].equals(n)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public boolean isEmpty() {
+		return _size == 0;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/pathfinding/utils/FastNodeList.java b/src/main/java/com/l2jserver/gameserver/pathfinding/utils/FastNodeList.java
new file mode 100644
index 00000000..8fbd8a75
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/pathfinding/utils/FastNodeList.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.pathfinding.utils;
+
+import java.util.ArrayList;
+
+import com.l2jserver.gameserver.pathfinding.AbstractNode;
+
+/**
+ * @author -Nemesiss-
+ */
+public class FastNodeList {
+	private final ArrayList<AbstractNode<?>> _list;
+	
+	public FastNodeList(int size) {
+		_list = new ArrayList<>(size);
+	}
+	
+	public void add(AbstractNode<?> n) {
+		_list.add(n);
+	}
+	
+	public boolean contains(AbstractNode<?> n) {
+		return _list.contains(n);
+	}
+	
+	public boolean containsRev(AbstractNode<?> n) {
+		return _list.lastIndexOf(n) != -1;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/DateRange.java b/src/main/java/com/l2jserver/gameserver/script/DateRange.java
new file mode 100644
index 00000000..005ea5b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/DateRange.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Date;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Luis Arias
+ */
+public class DateRange {
+	private static final Logger LOG = LoggerFactory.getLogger(DateRange.class);
+	
+	private final Date _startDate, _endDate;
+	
+	private DateRange(Date from, Date to) {
+		_startDate = from;
+		_endDate = to;
+	}
+	
+	public static DateRange parse(String dateRange, DateFormat format) {
+		String[] date = dateRange.split("-");
+		if (date.length == 2) {
+			try {
+				Date start = format.parse(date[0]);
+				Date end = format.parse(date[1]);
+				
+				return new DateRange(start, end);
+			} catch (ParseException e) {
+				LOG.warn("Invalid Date Format.", e);
+			}
+		}
+		return new DateRange(null, null);
+	}
+	
+	public boolean isValid() {
+		return (_startDate != null) && (_endDate != null) && _startDate.before(_endDate);
+	}
+	
+	public boolean isWithinRange(Date date) {
+		return (date.equals(_startDate) || date.after(_startDate)) //
+			&& (date.equals(_endDate) || date.before(_endDate));
+	}
+	
+	public Date getEndDate() {
+		return _endDate;
+	}
+	
+	public Date getStartDate() {
+		return _startDate;
+	}
+	
+	@Override
+	public String toString() {
+		return "DateRange: From: " + getStartDate() + " To: " + getEndDate();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/EngineInterface.java b/src/main/java/com/l2jserver/gameserver/script/EngineInterface.java
new file mode 100644
index 00000000..8c3084ab
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/EngineInterface.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+/**
+ * @author Luis Arias
+ */
+public interface EngineInterface {
+	void addEventDrop(int[] items, int[] count, double chance, DateRange range);
+	
+	void onPlayerLogin(String message, DateRange range);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/EventDrop.java b/src/main/java/com/l2jserver/gameserver/script/EventDrop.java
new file mode 100644
index 00000000..b8271244
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/EventDrop.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+/**
+ * @author Zoey76
+ */
+public class EventDrop {
+	private final int[] _itemIdList;
+	private final long _minCount;
+	private final long _maxCount;
+	private final int _dropChance;
+	
+	public EventDrop(int[] itemIdList, long min, long max, int dropChance) {
+		_itemIdList = itemIdList;
+		_minCount = min;
+		_maxCount = max;
+		_dropChance = dropChance;
+	}
+	
+	public EventDrop(int itemId, long minCount, long maxCount, int dropChance) {
+		_itemIdList = new int[] {
+			itemId
+		};
+		_minCount = minCount;
+		_maxCount = maxCount;
+		_dropChance = dropChance;
+	}
+	
+	/**
+	 * @return the _itemId
+	 */
+	public int[] getItemIdList() {
+		return _itemIdList;
+	}
+	
+	/**
+	 * @return the _minCount
+	 */
+	public long getMinCount() {
+		return _minCount;
+	}
+	
+	/**
+	 * @return the _maxCount
+	 */
+	public long getMaxCount() {
+		return _maxCount;
+	}
+	
+	/**
+	 * @return the _dropChance
+	 */
+	public int getDropChance() {
+		return _dropChance;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/IntList.java b/src/main/java/com/l2jserver/gameserver/script/IntList.java
new file mode 100644
index 00000000..e1f31c5f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/IntList.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+/**
+ * @author Luis Arias
+ */
+public class IntList {
+	public static int[] parse(String range) {
+		if (range.contains("-")) {
+			return getIntegerRange(range.split("-"));
+		} else if (range.contains(",")) {
+			return getIntegerList(range.split(","));
+		}
+		
+		return new int[] {
+			getInt(range)
+		};
+	}
+	
+	private static int getInt(String number) {
+		return Integer.parseInt(number);
+	}
+	
+	private static int[] getIntegerList(String[] numbers) {
+		int[] list = new int[numbers.length];
+		for (int i = 0; i < list.length; i++) {
+			list[i] = getInt(numbers[i]);
+		}
+		return list;
+	}
+	
+	private static int[] getIntegerRange(String[] numbers) {
+		int min = getInt(numbers[0]);
+		int max = getInt(numbers[1]);
+		int[] list = new int[(max - min) + 1];
+		for (int i = 0; i < list.length; i++) {
+			list[i] = min + i;
+		}
+		return list;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/Parser.java b/src/main/java/com/l2jserver/gameserver/script/Parser.java
new file mode 100644
index 00000000..46721ca1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/Parser.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+import javax.script.ScriptContext;
+
+import org.w3c.dom.Node;
+
+/**
+ * @author Luis Arias
+ */
+public abstract class Parser {
+	public abstract void parseScript(Node node, ScriptContext context);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/ParserFactory.java b/src/main/java/com/l2jserver/gameserver/script/ParserFactory.java
new file mode 100644
index 00000000..6c744d14
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/ParserFactory.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+public abstract class ParserFactory {
+	public abstract Parser create();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/ParserNotCreatedException.java b/src/main/java/com/l2jserver/gameserver/script/ParserNotCreatedException.java
new file mode 100644
index 00000000..9f679bbd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/ParserNotCreatedException.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+public class ParserNotCreatedException extends Exception {
+	private static final long serialVersionUID = 1L;
+	
+	public ParserNotCreatedException() {
+		super("Parser could not be created!");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/ScriptDocument.java b/src/main/java/com/l2jserver/gameserver/script/ScriptDocument.java
new file mode 100644
index 00000000..110d290b
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/ScriptDocument.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+public class ScriptDocument {
+	private static final Logger LOG = LoggerFactory.getLogger(ScriptDocument.class);
+	
+	private Document _document;
+	private final String _name;
+	
+	public ScriptDocument(String name, InputStream input) {
+		_name = name;
+		
+		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		try {
+			DocumentBuilder builder = factory.newDocumentBuilder();
+			_document = builder.parse(input);
+			
+		} catch (SAXException sxe) {
+			// Error generated during parsing)
+			Exception x = sxe;
+			if (sxe.getException() != null) {
+				x = sxe.getException();
+			}
+			LOG.warn(x.getMessage(), x);
+		} catch (ParserConfigurationException | IOException pce) {
+			// Parser with specified options can't be built
+			LOG.warn(pce.getMessage(), pce);
+		}
+	}
+	
+	public Document getDocument() {
+		return _document;
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	@Override
+	public String toString() {
+		return _name;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/ScriptEngine.java b/src/main/java/com/l2jserver/gameserver/script/ScriptEngine.java
new file mode 100644
index 00000000..64ecc589
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/ScriptEngine.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+import java.util.Hashtable;
+
+import com.l2jserver.gameserver.script.faenor.FaenorInterface;
+
+/**
+ * @author Luis Arias
+ */
+public class ScriptEngine {
+	protected EngineInterface _utils = FaenorInterface.getInstance();
+	public static final Hashtable<String, ParserFactory> parserFactories = new Hashtable<>();
+	
+	protected static Parser createParser(String name) throws ParserNotCreatedException {
+		ParserFactory s = parserFactories.get(name);
+		if (s == null) // shape not found
+		{
+			try {
+				Class.forName("com.l2jserver.gameserver.script." + name);
+				// By now the static block with no function would
+				// have been executed if the shape was found.
+				// the shape is expected to have put its factory
+				// in the hashtable.
+				
+				s = parserFactories.get(name);
+				if (s == null) // if the shape factory is not there even now
+				{
+					throw (new ParserNotCreatedException());
+				}
+			} catch (ClassNotFoundException e) {
+				// We'll throw an exception to indicate that
+				// the shape could not be created
+				throw (new ParserNotCreatedException());
+			}
+		}
+		return (s.create());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/ScriptPackage.java b/src/main/java/com/l2jserver/gameserver/script/ScriptPackage.java
new file mode 100644
index 00000000..dba0a87e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/ScriptPackage.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.config.Configuration;
+
+/**
+ * @author Luis Arias
+ */
+public class ScriptPackage {
+	private static final Logger LOG = LoggerFactory.getLogger(ScriptPackage.class);
+	
+	private final List<ScriptDocument> _scriptFiles = new ArrayList<>();
+	private final List<String> _otherFiles = new ArrayList<>();
+	private final String _name;
+	
+	public ScriptPackage(ZipFile pack) {
+		_name = pack.getName();
+		addFiles(pack);
+	}
+	
+	public List<String> getOtherFiles() {
+		return _otherFiles;
+	}
+	
+	public List<ScriptDocument> getScriptFiles() {
+		return _scriptFiles;
+	}
+	
+	private void addFiles(ZipFile pack) {
+		for (Enumeration<? extends ZipEntry> e = pack.entries(); e.hasMoreElements();) {
+			ZipEntry entry = e.nextElement();
+			if (entry.getName().endsWith(".xml")) {
+				try {
+					_scriptFiles.add(new ScriptDocument(entry.getName(), pack.getInputStream(entry)));
+				} catch (IOException io) {
+					LOG.warn(io.getMessage(), io);
+				}
+			} else if (!entry.isDirectory()) {
+				_otherFiles.add(entry.getName());
+			}
+		}
+	}
+	
+	public String getName() {
+		return _name;
+	}
+	
+	@Override
+	public String toString() {
+		if (getScriptFiles().isEmpty() && getOtherFiles().isEmpty()) {
+			return "Empty Package.";
+		}
+		
+		StringBuilder out = new StringBuilder();
+		out.append("package Name: ");
+		out.append(getName());
+		out.append(Configuration.EOL);
+		
+		if (!getScriptFiles().isEmpty()) {
+			out.append("Xml Script Files...").append(Configuration.EOL);
+			for (ScriptDocument script : getScriptFiles()) {
+				out.append(script.getName());
+				out.append(Configuration.EOL);
+			}
+		}
+		
+		if (!getOtherFiles().isEmpty()) {
+			out.append("Other Files...").append(Configuration.EOL);
+			for (String fileName : getOtherFiles()) {
+				out.append(fileName);
+				out.append(Configuration.EOL);
+			}
+		}
+		return out.toString();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/ShortList.java b/src/main/java/com/l2jserver/gameserver/script/ShortList.java
new file mode 100644
index 00000000..b5ccdb8c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/ShortList.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script;
+
+/**
+ * @author -Nemesiss-
+ */
+public class ShortList {
+	public static short[] parse(String range) {
+		if (range.contains("-")) {
+			return getShortList(range.split("-"));
+		} else if (range.contains(",")) {
+			return getShortList(range.split(","));
+		}
+		
+		return new short[] {
+			getShort(range)
+		};
+	}
+	
+	private static short getShort(String number) {
+		return Short.parseShort(number);
+	}
+	
+	private static short[] getShortList(String[] numbers) {
+		short[] list = new short[numbers.length];
+		for (int i = 0; i < list.length; i++) {
+			list[i] = getShort(numbers[i]);
+		}
+		return list;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java
new file mode 100644
index 00000000..dee58ed3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorEventParser.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script.faenor;
+
+import java.util.Date;
+
+import javax.script.ScriptContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.script.DateRange;
+import com.l2jserver.gameserver.script.IntList;
+import com.l2jserver.gameserver.script.Parser;
+import com.l2jserver.gameserver.script.ParserFactory;
+import com.l2jserver.gameserver.script.ScriptEngine;
+
+/**
+ * @author Luis Arias
+ */
+public class FaenorEventParser extends FaenorParser {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FaenorEventParser.class);
+	
+	private DateRange _eventDates = null;
+	
+	@Override
+	public void parseScript(final Node eventNode, ScriptContext context) {
+		String id = attribute(eventNode, "ID");
+		_eventDates = DateRange.parse(attribute(eventNode, "Active"), DATE_FORMAT);
+		
+		Date currentDate = new Date();
+		if (_eventDates.getEndDate().before(currentDate)) {
+			LOG.info("Event Id {} has passed... Ignored.", id);
+			return;
+		}
+		
+		if (_eventDates.getStartDate().after(currentDate)) {
+			LOG.info("Event Id {} is not active yet... Ignored.", id);
+			ThreadPoolManager.getInstance().scheduleGeneral(() -> parseEventDropAndMessage(eventNode), _eventDates.getStartDate().getTime() - currentDate.getTime());
+			return;
+		}
+		
+		parseEventDropAndMessage(eventNode);
+	}
+	
+	protected void parseEventDropAndMessage(Node eventNode) {
+		for (Node node = eventNode.getFirstChild(); node != null; node = node.getNextSibling()) {
+			if (isNodeName(node, "DropList")) {
+				parseEventDropList(node);
+			} else if (isNodeName(node, "Message")) {
+				parseEventMessage(node);
+			}
+		}
+	}
+	
+	private void parseEventMessage(Node sysMsg) {
+		try {
+			String type = attribute(sysMsg, "Type");
+			String message = attribute(sysMsg, "Msg");
+			
+			if (type.equalsIgnoreCase("OnJoin")) {
+				_bridge.onPlayerLogin(message, _eventDates);
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error in event parser!", ex);
+		}
+	}
+	
+	private void parseEventDropList(Node dropList) {
+		for (Node node = dropList.getFirstChild(); node != null; node = node.getNextSibling()) {
+			if (isNodeName(node, "AllDrop")) {
+				parseEventDrop(node);
+			}
+		}
+	}
+	
+	private void parseEventDrop(Node drop) {
+		try {
+			int[] items = IntList.parse(attribute(drop, "Items"));
+			int[] count = IntList.parse(attribute(drop, "Count"));
+			double chance = getPercent(attribute(drop, "Chance"));
+			
+			_bridge.addEventDrop(items, count, chance, _eventDates);
+		} catch (Exception ex) {
+			LOG.warn("There has been an error parsing drops!", ex);
+		}
+	}
+	
+	static class FaenorEventParserFactory extends ParserFactory {
+		@Override
+		public Parser create() {
+			return (new FaenorEventParser());
+		}
+	}
+	
+	static {
+		ScriptEngine.parserFactories.put(getParserName("Event"), new FaenorEventParserFactory());
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorInterface.java b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorInterface.java
new file mode 100644
index 00000000..8fe5181d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorInterface.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script.faenor;
+
+import java.util.List;
+
+import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
+import com.l2jserver.gameserver.datatables.EventDroplist;
+import com.l2jserver.gameserver.model.announce.EventAnnouncement;
+import com.l2jserver.gameserver.script.DateRange;
+import com.l2jserver.gameserver.script.EngineInterface;
+
+/**
+ * @author Luis Arias
+ */
+public class FaenorInterface implements EngineInterface {
+	public static FaenorInterface getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	public List<?> getAllPlayers() {
+		return null;
+	}
+	
+	@Override
+	public void addEventDrop(int[] items, int[] count, double chance, DateRange range) {
+		EventDroplist.getInstance().addGlobalDrop(items, count, (int) (chance * 1000000), range);
+	}
+	
+	@Override
+	public void onPlayerLogin(String message, DateRange validDateRange) {
+		AnnouncementsTable.getInstance().addAnnouncement(new EventAnnouncement(validDateRange, message));
+	}
+	
+	private static class SingletonHolder {
+		protected static final FaenorInterface _instance = new FaenorInterface();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java
new file mode 100644
index 00000000..29a78b2e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorParser.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script.faenor;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+import javax.script.ScriptContext;
+
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import com.l2jserver.gameserver.script.Parser;
+
+/**
+ * @author Luis Arias
+ */
+public abstract class FaenorParser extends Parser {
+	protected static FaenorInterface _bridge = FaenorInterface.getInstance();
+	protected final DateFormat DATE_FORMAT = new SimpleDateFormat("dd MMM yyyy", Locale.US);
+	
+	/*
+	 * UTILITY FUNCTIONS
+	 */
+	public static String attribute(Node node, String attributeName) {
+		return attribute(node, attributeName, null);
+	}
+	
+	public static String element(Node node, String elementName) {
+		return element(node, elementName, null);
+	}
+	
+	public static String attribute(Node node, String attributeName, String defaultValue) {
+		try {
+			return node.getAttributes().getNamedItem(attributeName).getNodeValue();
+		} catch (Exception e) {
+			if (defaultValue != null) {
+				return defaultValue;
+			}
+			throw new NullPointerException(e.getMessage());
+		}
+	}
+	
+	public static String element(Node parentNode, String elementName, String defaultValue) {
+		try {
+			NodeList list = parentNode.getChildNodes();
+			for (int i = 0; i < list.getLength(); i++) {
+				Node node = list.item(i);
+				if (node.getNodeName().equalsIgnoreCase(elementName)) {
+					return node.getTextContent();
+				}
+			}
+		} catch (Exception e) {
+		}
+		if (defaultValue != null) {
+			return defaultValue;
+		}
+		throw new NullPointerException();
+	}
+	
+	public static boolean isNodeName(Node node, String name) {
+		return node.getNodeName().equalsIgnoreCase(name);
+	}
+	
+	public Date getDate(String date) throws ParseException {
+		return DATE_FORMAT.parse(date);
+	}
+	
+	public static double getPercent(String percent) {
+		return (Double.parseDouble(percent.split("%")[0]) / 100.0);
+	}
+	
+	protected static int getInt(String number) {
+		return Integer.parseInt(number);
+	}
+	
+	protected static double getDouble(String number) {
+		return Double.parseDouble(number);
+	}
+	
+	protected static float getFloat(String number) {
+		return Float.parseFloat(number);
+	}
+	
+	protected static String getParserName(String name) {
+		return "faenor.Faenor" + name + "Parser";
+	}
+	
+	/**
+	 * @param node
+	 * @param context
+	 */
+	@Override
+	public abstract void parseScript(Node node, ScriptContext context);
+}
diff --git a/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java
new file mode 100644
index 00000000..1b74fa17
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/script/faenor/FaenorScriptEngine.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.script.faenor;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.script.ScriptContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Node;
+
+import com.l2jserver.gameserver.script.Parser;
+import com.l2jserver.gameserver.script.ParserNotCreatedException;
+import com.l2jserver.gameserver.script.ScriptDocument;
+import com.l2jserver.gameserver.script.ScriptEngine;
+import com.l2jserver.gameserver.util.file.filter.XMLFilter;
+
+/**
+ * @author Luis Arias
+ */
+public class FaenorScriptEngine extends ScriptEngine {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(FaenorScriptEngine.class);
+	
+	public static final String PACKAGE_DIRECTORY = "data/faenor/";
+	
+	protected FaenorScriptEngine() {
+		final File packDirectory = new File(server().getDatapackRoot(), PACKAGE_DIRECTORY);
+		final File[] files = packDirectory.listFiles(new XMLFilter());
+		if (files != null) {
+			for (File file : files) {
+				try (InputStream in = new FileInputStream(file)) {
+					parseScript(new ScriptDocument(file.getName(), in), null);
+				} catch (IOException ex) {
+					LOG.warn("There has been an error parsing Faenor XMLs!", ex);
+				}
+			}
+		}
+	}
+	
+	public void parseScript(ScriptDocument script, ScriptContext context) {
+		Node node = script.getDocument().getFirstChild();
+		String parserClass = "faenor.Faenor" + node.getNodeName() + "Parser";
+		
+		Parser parser = null;
+		try {
+			parser = createParser(parserClass);
+		} catch (ParserNotCreatedException ex) {
+			LOG.warn("No parser registered for script {}!", parserClass, ex);
+		}
+		
+		if (parser == null) {
+			LOG.warn("Unknown script type {}!", script.getName());
+			return;
+		}
+		
+		try {
+			parser.parseScript(node, context);
+			LOG.info("Loaded {} successfully.", script.getName());
+		} catch (Exception ex) {
+			LOG.warn("Script parsing failed!", ex);
+		}
+	}
+	
+	public static FaenorScriptEngine getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final FaenorScriptEngine INSTANCE = new FaenorScriptEngine();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/scripting/ScriptEngineManager.java b/src/main/java/com/l2jserver/gameserver/scripting/ScriptEngineManager.java
new file mode 100644
index 00000000..6ee693b7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/scripting/ScriptEngineManager.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.scripting;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.Reader;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+
+import javax.script.ScriptException;
+
+import org.mdkt.compiler.InMemoryJavaCompiler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Script engine manager.
+ * @author KenM
+ * @author Zoey76
+ */
+public final class ScriptEngineManager {
+	private static final Logger LOG = LoggerFactory.getLogger(ScriptEngineManager.class);
+	
+	private static final String CLASS_PATH = server().getScriptRoot().getAbsolutePath() + System.getProperty("path.separator") + System.getProperty("java.class.path");
+	
+	private static final String MAIN = "main";
+	
+	private static final Object[] MAIN_METHOD_ARGS = new Object[] {
+		new String[0]
+	};
+	
+	private static final Class<?>[] ARG_MAIN = new Class[] {
+		String[].class
+	};
+	
+	private InMemoryJavaCompiler compiler() {
+		return InMemoryJavaCompiler.newInstance() //
+			.useOptions("-classpath", CLASS_PATH, "-g") //
+			.ignoreWarnings();
+	}
+	
+	public void executeScriptList(File list) throws Exception {
+		if (general().noQuests()) {
+			return;
+		}
+		
+		if (!list.isFile()) {
+			throw new IllegalArgumentException("Argument must be an file containing a list of scripts to be loaded");
+		}
+		
+		final var compiler = compiler();
+		try (var fis = new FileInputStream(list);
+			var isr = new InputStreamReader(fis);
+			var lnr = new LineNumberReader(isr)) {
+			String line;
+			while ((line = lnr.readLine()) != null) {
+				final var parts = line.trim().split("#");
+				if ((parts.length <= 0) || parts[0].trim().isEmpty() || (parts[0].charAt(0) == '#')) {
+					continue;
+				}
+				
+				line = parts[0].trim();
+				if (line.endsWith("/**")) {
+					line = line.substring(0, line.length() - 3);
+				} else if (line.endsWith("/*")) {
+					line = line.substring(0, line.length() - 2);
+				}
+				
+				final var file = new File(server().getScriptRoot(), line);
+				if (file.isDirectory() && parts[0].endsWith("/**")) {
+					executeAllScriptsInDirectory(compiler, file, true);
+				} else if (file.isDirectory() && parts[0].endsWith("/*")) {
+					executeAllScriptsInDirectory(compiler, file, false);
+				} else if (file.isFile()) {
+					addSource(compiler, file);
+				} else {
+					LOG.warn("Failed loading: ({}) @ {}:{} - Reason: doesnt exists or is not a file.", file.getCanonicalPath(), list.getName(), lnr.getLineNumber());
+				}
+			}
+		}
+		
+		compiler.compileAll().forEach((_, v) -> runMain(v));
+	}
+	
+	private void executeAllScriptsInDirectory(InMemoryJavaCompiler compiler, File dir, boolean recurseDown) {
+		if (!dir.isDirectory()) {
+			throw new IllegalArgumentException("The argument directory either doesnt exists or is not an directory.");
+		}
+		
+		final var files = dir.listFiles();
+		if (files == null) {
+			return;
+		}
+		
+		for (var file : files) {
+			if (file.isDirectory() && recurseDown) {
+				if (general().debug()) {
+					LOG.info("Entering folder: {}", file.getName());
+				}
+				executeAllScriptsInDirectory(compiler, file, recurseDown);
+			} else if (file.isFile()) {
+				addSource(compiler, file);
+			}
+		}
+	}
+	
+	public Class<?> compileScript(File file) {
+		try (var fis = new FileInputStream(file);
+			var isr = new InputStreamReader(fis);
+			var reader = new BufferedReader(isr)) {
+			return compiler().compile(getClassForFile(file), readerToString(reader));
+		} catch (Exception ex) {
+			LOG.warn("Error executing script!", ex);
+		}
+		return null;
+	}
+	
+	public void executeScript(File file) {
+		final var clazz = compileScript(file);
+		runMain(clazz);
+	}
+	
+	public void executeScript(String file) {
+		executeScript(new File(server().getScriptRoot(), file));
+	}
+	
+	public void addSource(InMemoryJavaCompiler compiler, File file) {
+		if (general().debug()) {
+			LOG.info("Loading Script: {}", file.getAbsolutePath());
+		}
+		
+		try (var fis = new FileInputStream(file);
+			var isr = new InputStreamReader(fis);
+			var reader = new BufferedReader(isr)) {
+			compiler.addSource(getClassForFile(file), readerToString(reader));
+		} catch (Exception ex) {
+			LOG.warn("Error executing script!", ex);
+		}
+	}
+	
+	private static String getClassForFile(File script) {
+		final var path = script.getAbsolutePath();
+		final var scpPath = server().getScriptRoot().getAbsolutePath();
+		if (path.startsWith(scpPath)) {
+			final int idx = path.lastIndexOf('.');
+			return path.substring(scpPath.length() + 1, idx).replace('/', '.').replace('\\', '.');
+		}
+		return null;
+	}
+	
+	private static void runMain(Class<?> clazz) {
+		final var mainMethod = findMethod(clazz, MAIN, ARG_MAIN);
+		if (mainMethod == null) {
+			LOG.warn("Unable to find main method in class {}!", clazz);
+			return;
+		}
+		
+		try {
+			mainMethod.invoke(null, MAIN_METHOD_ARGS);
+		} catch (Exception ex) {
+			LOG.error("Error loading script {}!", clazz);
+		}
+	}
+	
+	private static String readerToString(Reader reader) throws ScriptException {
+		try (var in = new BufferedReader(reader)) {
+			final var result = new StringBuilder();
+			String line;
+			while ((line = in.readLine()) != null) {
+				result.append(line).append(System.lineSeparator());
+			}
+			return result.toString();
+		} catch (IOException ex) {
+			throw new ScriptException(ex);
+		}
+	}
+	
+	private static Method findMethod(Class<?> clazz, String methodName, Class<?>[] args) {
+		try {
+			final var mainMethod = clazz.getMethod(methodName, args);
+			final int modifiers = mainMethod.getModifiers();
+			if (Modifier.isPublic(modifiers) && Modifier.isStatic(modifiers)) {
+				return mainMethod;
+			}
+		} catch (NoSuchMethodException ignored) {
+		}
+		return null;
+	}
+	
+	public static ScriptEngineManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final ScriptEngineManager INSTANCE = new ScriptEngineManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/scripting/ScriptManager.java b/src/main/java/com/l2jserver/gameserver/scripting/ScriptManager.java
new file mode 100644
index 00000000..ceab8da7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/scripting/ScriptManager.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.scripting;
+
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.events.AbstractScript;
+
+/**
+ * @author KenM
+ * @param <S>
+ */
+public abstract class ScriptManager<S extends AbstractScript> {
+	public abstract Map<String, S> getScripts();
+	
+	public boolean reload(S ms) {
+		return ms.reload();
+	}
+	
+	public boolean unload(S ms) {
+		return ms.unload();
+	}
+	
+	public void setActive(S ms, boolean status) {
+		ms.setActive(status);
+	}
+	
+	public abstract String getScriptManagerName();
+}
diff --git a/src/main/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java b/src/main/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java
new file mode 100644
index 00000000..6b5e7abf
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.security;
+
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.data.xml.impl.SecondaryAuthData;
+import com.l2jserver.gameserver.network.L2GameClient;
+import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordAck;
+import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordCheck;
+import com.l2jserver.gameserver.network.serverpackets.Ex2ndPasswordVerify;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Secondary Password Auth.
+ * @author mrTJO
+ */
+public class SecondaryPasswordAuth {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(SecondaryPasswordAuth.class);
+	
+	private final L2GameClient _activeClient;
+	
+	private String _password;
+	private int _wrongAttempts;
+	private boolean _authed;
+	
+	private static final String VAR_PWD = "secauth_pwd";
+	private static final String VAR_WTE = "secauth_wte";
+	
+	private static final String SELECT_PASSWORD = "SELECT var, value FROM account_gsdata WHERE account_name=? AND var LIKE 'secauth_%'";
+	private static final String INSERT_PASSWORD = "INSERT INTO account_gsdata VALUES (?, ?, ?)";
+	private static final String UPDATE_PASSWORD = "UPDATE account_gsdata SET value=? WHERE account_name=? AND var=?";
+	
+	private static final String INSERT_ATTEMPT = "INSERT INTO account_gsdata VALUES (?, ?, ?) ON DUPLICATE KEY UPDATE value=?";
+	
+	public SecondaryPasswordAuth(L2GameClient activeClient) {
+		_activeClient = activeClient;
+		_password = null;
+		_wrongAttempts = 0;
+		_authed = false;
+		loadPassword();
+	}
+	
+	private void loadPassword() {
+		String var, value;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement(SELECT_PASSWORD)) {
+			statement.setString(1, _activeClient.getAccountName());
+			try (var rs = statement.executeQuery()) {
+				while (rs.next()) {
+					var = rs.getString("var");
+					value = rs.getString("value");
+					
+					if (var.equals(VAR_PWD)) {
+						_password = value;
+					} else if (var.equals(VAR_WTE)) {
+						_wrongAttempts = Integer.parseInt(value);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.error("Error while reading password.", ex);
+		}
+	}
+	
+	public boolean savePassword(String password) {
+		if (passwordExist()) {
+			LOG.warn(_activeClient.getAccountName() + " forced save password!");
+			_activeClient.closeNow();
+			return false;
+		}
+		
+		if (!validatePassword(password)) {
+			_activeClient.sendPacket(new Ex2ndPasswordAck(Ex2ndPasswordAck.WRONG_PATTERN));
+			return false;
+		}
+		
+		password = cryptPassword(password);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_PASSWORD)) {
+			ps.setString(1, _activeClient.getAccountName());
+			ps.setString(2, VAR_PWD);
+			ps.setString(3, password);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Error while writing password!", ex);
+			return false;
+		}
+		_password = password;
+		return true;
+	}
+	
+	public boolean insertWrongAttempt(int attempts) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(INSERT_ATTEMPT)) {
+			ps.setString(1, _activeClient.getAccountName());
+			ps.setString(2, VAR_WTE);
+			ps.setString(3, Integer.toString(attempts));
+			ps.setString(4, Integer.toString(attempts));
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Error while writing wrong attempts!", ex);
+			return false;
+		}
+		return true;
+	}
+	
+	public boolean changePassword(String oldPassword, String newPassword) {
+		if (!passwordExist()) {
+			LOG.warn(_activeClient.getAccountName() + " forced change password");
+			_activeClient.closeNow();
+			return false;
+		}
+		
+		if (!checkPassword(oldPassword, true)) {
+			return false;
+		}
+		
+		if (!validatePassword(newPassword)) {
+			_activeClient.sendPacket(new Ex2ndPasswordAck(Ex2ndPasswordAck.WRONG_PATTERN));
+			return false;
+		}
+		
+		newPassword = cryptPassword(newPassword);
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_PASSWORD)) {
+			ps.setString(1, newPassword);
+			ps.setString(2, _activeClient.getAccountName());
+			ps.setString(3, VAR_PWD);
+			ps.execute();
+		} catch (Exception ex) {
+			LOG.error("Error while reading password!", ex);
+			return false;
+		}
+		
+		_password = newPassword;
+		_authed = false;
+		return true;
+	}
+	
+	public boolean checkPassword(String password, boolean skipAuth) {
+		password = cryptPassword(password);
+		
+		if (!password.equals(_password)) {
+			_wrongAttempts++;
+			if (_wrongAttempts < SecondaryAuthData.getInstance().getMaxAttempts()) {
+				_activeClient.sendPacket(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_WRONG, _wrongAttempts));
+				insertWrongAttempt(_wrongAttempts);
+			} else {
+				final var accountName = _activeClient.getAccountName();
+				final var hostAddress = _activeClient.getConnectionAddress().getHostAddress();
+				final var banTime = SecondaryAuthData.getInstance().getBanTime();
+				LoginServerThread.getInstance().sendTempBan(accountName, hostAddress, banTime);
+				final var recoveryLink = SecondaryAuthData.getInstance().getRecoveryLink();
+				LoginServerThread.getInstance().sendMail(accountName, "SATempBan", hostAddress, Integer.toString(_wrongAttempts), Long.toString(banTime), recoveryLink);
+				LOG.warn(_activeClient.getAccountName() + " - ({}) has inputted the wrong password {} times in row.", hostAddress, _wrongAttempts);
+				insertWrongAttempt(0);
+				_activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, SecondaryAuthData.getInstance().getMaxAttempts()));
+			}
+			return false;
+		}
+		if (!skipAuth) {
+			_authed = true;
+			_activeClient.sendPacket(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_OK, _wrongAttempts));
+		}
+		insertWrongAttempt(0);
+		return true;
+	}
+	
+	public boolean passwordExist() {
+		return _password != null;
+	}
+	
+	public void openDialog() {
+		if (passwordExist()) {
+			_activeClient.sendPacket(new Ex2ndPasswordCheck(Ex2ndPasswordCheck.PASSWORD_PROMPT));
+		} else {
+			_activeClient.sendPacket(new Ex2ndPasswordCheck(Ex2ndPasswordCheck.PASSWORD_NEW));
+		}
+	}
+	
+	public boolean isAuthed() {
+		return _authed;
+	}
+	
+	private String cryptPassword(String password) {
+		try {
+			final var md = MessageDigest.getInstance("SHA");
+			byte[] raw = password.getBytes(StandardCharsets.UTF_8);
+			byte[] hash = md.digest(raw);
+			return Base64.getEncoder().encodeToString(hash);
+		} catch (NoSuchAlgorithmException ex) {
+			LOG.error("Unsupported Algorithm!", ex);
+		}
+		return null;
+	}
+	
+	private boolean validatePassword(String password) {
+		if (!Util.isDigit(password)) {
+			return false;
+		}
+		
+		if ((password.length() < 6) || (password.length() > 8)) {
+			return false;
+		}
+		return !SecondaryAuthData.getInstance().isForbiddenPassword(password);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/status/GameStatusThread.java b/src/main/java/com/l2jserver/gameserver/status/GameStatusThread.java
new file mode 100644
index 00000000..7261dbaa
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/status/GameStatusThread.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.status;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.telnet;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.handler.ITelnetHandler;
+import com.l2jserver.gameserver.handler.TelnetHandler;
+
+public final class GameStatusThread extends Thread {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(GameStatusThread.class);
+	
+	private final Socket _cSocket;
+	
+	private final PrintWriter _print;
+	
+	private final BufferedReader _read;
+	
+	private final int _uptime;
+	
+	private void telnetOutput(int type, String text) {
+		if (general().developer()) {
+			if (type == 1) {
+				System.out.println("TELNET | " + text);
+			} else if (type == 2) {
+				System.out.print("TELNET | " + text);
+			} else if (type == 3) {
+				System.out.print(text);
+			} else if (type == 4) {
+				System.out.println(text);
+			} else {
+				System.out.println("TELNET | " + text);
+			}
+		} else {
+			// only print output if the message is rejected
+			if (type == 5) {
+				System.out.println("TELNET | " + text);
+			}
+		}
+	}
+	
+	private boolean isValidIP(Socket client) {
+		boolean result = false;
+		InetAddress ClientIP = client.getInetAddress();
+		
+		// convert IP to String, and compare with list
+		String clientStringIP = ClientIP.getHostAddress();
+		
+		telnetOutput(1, "Connection from: " + clientStringIP);
+		
+		// read and loop thru list of IPs, compare with newIP
+		if (general().developer()) {
+			telnetOutput(2, "");
+		}
+		
+		for (String host : telnet().getHosts()) {
+			try {
+				String ipToCompare = InetAddress.getByName(host).getHostAddress();
+				if (clientStringIP.equals(ipToCompare)) {
+					result = true;
+				}
+				
+				if (general().debug()) {
+					telnetOutput(3, clientStringIP + " = " + ipToCompare + "(" + host + ") = " + result);
+				}
+			} catch (Exception ex) {
+				LOG.warn("There has been an error parsing host {}!", host, ex);
+			}
+		}
+		
+		if (general().developer()) {
+			telnetOutput(4, "Allow IP: " + result);
+		}
+		return result;
+	}
+	
+	public GameStatusThread(Socket client, int uptime, String StatusPW) throws IOException {
+		setPriority(Thread.MAX_PRIORITY);
+		_cSocket = client;
+		_uptime = uptime;
+		
+		_print = new PrintWriter(_cSocket.getOutputStream());
+		_read = new BufferedReader(new InputStreamReader(_cSocket.getInputStream()));
+		
+		if (isValidIP(client)) {
+			telnetOutput(1, client.getInetAddress().getHostAddress() + " accepted.");
+			_print.println("Welcome To The L2J Telnet Session.");
+			_print.println("Please Insert Your Password!");
+			_print.print("Password: ");
+			_print.flush();
+			String tmpLine = _read.readLine();
+			if (tmpLine == null) {
+				_print.println("Error.");
+				_print.println("Disconnected...");
+				_print.flush();
+				_cSocket.close();
+			} else {
+				if (!tmpLine.equals(StatusPW)) {
+					_print.println("Incorrect Password!");
+					_print.println("Disconnected...");
+					_print.flush();
+					_cSocket.close();
+				} else {
+					_print.println("Password Correct!");
+					_print.println("[L2J Game Server]");
+					_print.print("");
+					_print.flush();
+					start();
+				}
+			}
+		} else {
+			telnetOutput(5, "Connection attempt from " + client.getInetAddress().getHostAddress() + " rejected.");
+			_cSocket.close();
+		}
+	}
+	
+	@Override
+	public void run() {
+		String _usrCommand = "";
+		try {
+			while ((_usrCommand.compareTo("quit") != 0) && (_usrCommand.compareTo("exit") != 0)) {
+				_usrCommand = _read.readLine();
+				if (_usrCommand == null) {
+					_cSocket.close();
+					break;
+				}
+				
+				final ITelnetHandler handler = TelnetHandler.getInstance().getHandler(_usrCommand);
+				if (handler != null) {
+					handler.useCommand(_usrCommand, _print, _cSocket, _uptime);
+				} else if (_usrCommand.equalsIgnoreCase("quit") || _usrCommand.equalsIgnoreCase("exit") || _usrCommand.isEmpty()) {
+					/* Do Nothing :p - Just here to save us from the "Command Not Understood" Text */
+				} else {
+					_print.print("Command: " + _usrCommand + " was not found!");
+				}
+				
+				_print.print("");
+				_print.flush();
+			}
+			if (!_cSocket.isClosed()) {
+				_print.println("Bye Bye!");
+				_print.flush();
+				_cSocket.close();
+			}
+			telnetOutput(1, "Connection from " + _cSocket.getInetAddress().getHostAddress() + " was closed by client.");
+		} catch (Exception ex) {
+			LOG.warn("There has been an error executing game status task!", ex);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/status/Status.java b/src/main/java/com/l2jserver/gameserver/status/Status.java
new file mode 100644
index 00000000..c50af0ba
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/status/Status.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.status;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Util;
+
+public class Status extends Thread {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Status.class);
+	
+	private final ServerSocket statusServerSocket;
+	
+	private final int _uptime;
+	
+	private String _statusPw;
+	
+	public Status(int statusPort, String statusPw) throws IOException {
+		super("Status");
+		_statusPw = statusPw;
+		
+		if (_statusPw == null) {
+			_statusPw = Util.randomPassword(10);
+			LOG.info("Server's Telnet function has no password defined!");
+			LOG.info("A password has been automatically created!");
+			LOG.info("Password has been set to: {}", _statusPw);
+		}
+		
+		statusServerSocket = new ServerSocket(statusPort);
+		_uptime = (int) System.currentTimeMillis();
+		LOG.info("Telnet server started successfully, listening on port {}.", statusPort);
+	}
+	
+	@Override
+	public void run() {
+		setPriority(Thread.MAX_PRIORITY);
+		
+		while (!isInterrupted()) {
+			try {
+				Socket connection = statusServerSocket.accept();
+				new GameStatusThread(connection, _uptime, _statusPw);
+				
+				if (isInterrupted()) {
+					try {
+						statusServerSocket.close();
+					} catch (Exception ex) {
+						LOG.warn("There has been an error closing status server socket!", ex);
+					}
+					break;
+				}
+			} catch (Exception ex1) {
+				if (isInterrupted()) {
+					try {
+						statusServerSocket.close();
+					} catch (Exception ex2) {
+						LOG.warn("There has been an error closing status server socket!", ex2);
+					}
+					break;
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java b/src/main/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java
new file mode 100644
index 00000000..c42a3d6a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.AutoAttackStop;
+
+/**
+ * Attack stance task manager.
+ * @author Luca Baldi
+ * @author Zoey76
+ */
+public class AttackStanceTaskManager {
+	private static final Logger LOG = LoggerFactory.getLogger(AttackStanceTaskManager.class);
+	
+	private static final Map<L2Character, Long> _attackStanceTasks = new ConcurrentHashMap<>();
+	
+	protected AttackStanceTaskManager() {
+		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new FightModeScheduler(), 0, 1000);
+	}
+	
+	public void addAttackStanceTask(L2Character actor) {
+		if (actor != null) {
+			if (actor.isPlayable()) {
+				final L2PcInstance player = actor.getActingPlayer();
+				for (L2CubicInstance cubic : player.getCubics().values()) {
+					if (cubic.getId() != L2CubicInstance.LIFE_CUBIC) {
+						cubic.doAction();
+					}
+				}
+			}
+			_attackStanceTasks.put(actor, System.currentTimeMillis());
+		}
+	}
+	
+	public void removeAttackStanceTask(L2Character actor) {
+		if (actor != null) {
+			if (actor.isSummon()) {
+				actor = actor.getActingPlayer();
+			}
+			_attackStanceTasks.remove(actor);
+		}
+	}
+	
+	/**
+	 * Checks for attack stance task.<br>
+	 * @param actor the actor
+	 * @return {@code true} if the character has an attack stance task, {@code false} otherwise
+	 */
+	public boolean hasAttackStanceTask(L2Character actor) {
+		if (actor != null) {
+			if (actor.isSummon()) {
+				actor = actor.getActingPlayer();
+			}
+			return _attackStanceTasks.containsKey(actor);
+		}
+		return false;
+	}
+	
+	protected static class FightModeScheduler implements Runnable {
+		@Override
+		public void run() {
+			long current = System.currentTimeMillis();
+			try {
+				final Iterator<Entry<L2Character, Long>> iter = _attackStanceTasks.entrySet().iterator();
+				Entry<L2Character, Long> e;
+				L2Character actor;
+				while (iter.hasNext()) {
+					e = iter.next();
+					if ((current - e.getValue()) > 15000) {
+						actor = e.getKey();
+						if (actor != null) {
+							actor.broadcastPacket(new AutoAttackStop(actor.getObjectId()));
+							actor.getAI().setAutoAttacking(false);
+							if (actor.isPlayer() && actor.hasSummon()) {
+								actor.getSummon().broadcastPacket(new AutoAttackStop(actor.getSummon().getObjectId()));
+							}
+						}
+						iter.remove();
+					}
+				}
+			} catch (Exception e) {
+				// Unless caught here, players remain in attack positions.
+				LOG.warn("Error in FightModeScheduler: {}", e.getMessage(), e);
+			}
+		}
+	}
+	
+	public static AttackStanceTaskManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final AttackStanceTaskManager _instance = new AttackStanceTaskManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java b/src/main/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java
new file mode 100644
index 00000000..a52f2a0d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager;
+
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+
+/**
+ * @author NosBit
+ */
+public final class DecayTaskManager {
+	private final ScheduledExecutorService _decayExecutor = Executors.newSingleThreadScheduledExecutor();
+	
+	protected final Map<L2Character, ScheduledFuture<?>> _decayTasks = new ConcurrentHashMap<>();
+	
+	/**
+	 * Adds a decay task for the specified character.<br>
+	 * If the decay task already exists it cancels it and re-adds it.
+	 * @param character the character
+	 */
+	public void add(L2Character character) {
+		if (character == null) {
+			return;
+		}
+		
+		long delay;
+		if (character.getTemplate() instanceof L2NpcTemplate) {
+			delay = ((L2NpcTemplate) character.getTemplate()).getCorpseTime();
+		} else {
+			delay = npc().getDefaultCorpseTime();
+		}
+		
+		if ((character instanceof L2Attackable) && (((L2Attackable) character).isSpoiled() || ((L2Attackable) character).isSeeded())) {
+			delay += npc().getSpoiledCorpseExtendTime();
+		}
+		
+		add(character, delay, TimeUnit.SECONDS);
+	}
+	
+	/**
+	 * Adds a decay task for the specified character.<br>
+	 * <br>
+	 * If the decay task already exists it cancels it and re-adds it.
+	 * @param character the character
+	 * @param delay the delay
+	 * @param timeUnit the time unit of the delay parameter
+	 */
+	public void add(L2Character character, long delay, TimeUnit timeUnit) {
+		ScheduledFuture<?> decayTask = _decayExecutor.schedule(new DecayTask(character), delay, TimeUnit.SECONDS);
+		
+		decayTask = _decayTasks.put(character, decayTask);
+		// if decay task already existed cancel it so we use the new time
+		if (decayTask != null) {
+			if (!decayTask.cancel(false)) {
+				// old decay task was completed while canceling it remove and cancel the new one
+				decayTask = _decayTasks.remove(character);
+				if (decayTask != null) {
+					decayTask.cancel(false);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Cancels the decay task of the specified character.
+	 * @param character the character
+	 */
+	public void cancel(L2Character character) {
+		final ScheduledFuture<?> decayTask = _decayTasks.remove(character);
+		if (decayTask != null) {
+			decayTask.cancel(false);
+		}
+	}
+	
+	/**
+	 * Gets the remaining time of the specified character's decay task.
+	 * @param character the character
+	 * @return if a decay task exists the remaining time, {@code Long.MAX_VALUE} otherwise
+	 */
+	public long getRemainingTime(L2Character character) {
+		final ScheduledFuture<?> decayTask = _decayTasks.get(character);
+		if (decayTask != null) {
+			return decayTask.getDelay(TimeUnit.MILLISECONDS);
+		}
+		
+		return Long.MAX_VALUE;
+	}
+	
+	private class DecayTask implements Runnable {
+		private final L2Character _character;
+		
+		protected DecayTask(L2Character character) {
+			_character = character;
+		}
+		
+		@Override
+		public void run() {
+			_decayTasks.remove(_character);
+			_character.onDecay();
+		}
+	}
+	
+	@Override
+	public String toString() {
+		StringBuilder ret = new StringBuilder();
+		ret.append("============= DecayTask Manager Report ============");
+		ret.append(Configuration.EOL);
+		ret.append("Tasks count: ");
+		ret.append(_decayTasks.size());
+		ret.append(Configuration.EOL);
+		ret.append("Tasks dump:");
+		ret.append(Configuration.EOL);
+		
+		for (Entry<L2Character, ScheduledFuture<?>> entry : _decayTasks.entrySet()) {
+			ret.append("Class/Name: ");
+			ret.append(entry.getKey().getClass().getSimpleName());
+			ret.append('/');
+			ret.append(entry.getKey().getName());
+			ret.append(" decay timer: ");
+			ret.append(entry.getValue().getDelay(TimeUnit.MILLISECONDS));
+			ret.append(Configuration.EOL);
+		}
+		
+		return ret.toString();
+	}
+	
+	public static DecayTaskManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final DecayTaskManager _instance = new DecayTaskManager();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java b/src/main/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java
new file mode 100644
index 00000000..c1e4651d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/KnownListUpdateTaskManager.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.L2WorldRegion;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+import com.l2jserver.gameserver.model.actor.instance.L2GuardInstance;
+
+public class KnownListUpdateTaskManager {
+	private static final Logger LOG = LoggerFactory.getLogger(KnownListUpdateTaskManager.class);
+	
+	private static final int FULL_UPDATE_TIMER = 1;
+	private static boolean updatePass = true;
+	
+	private static int _fullUpdateTimer = FULL_UPDATE_TIMER;
+	
+	private static final Set<L2WorldRegion> FAILED_REGIONS = ConcurrentHashMap.newKeySet(1);
+	
+	private KnownListUpdateTaskManager() {
+		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new KnownListUpdate(), 1000, general().getKnownListUpdateInterval());
+	}
+	
+	private class KnownListUpdate implements Runnable {
+		public KnownListUpdate() {
+		}
+		
+		@Override
+		public void run() {
+			try {
+				boolean failed;
+				for (L2WorldRegion[] regions : L2World.getInstance().getWorldRegions()) {
+					for (L2WorldRegion r : regions) // go through all world regions
+					{
+						// avoid stopping update if something went wrong in updateRegion()
+						try {
+							failed = FAILED_REGIONS.contains(r); // failed on last pass
+							if (r.isActive()) // and check only if the region is active
+							{
+								updateRegion(r, ((_fullUpdateTimer == FULL_UPDATE_TIMER) || failed), updatePass);
+							}
+							if (failed) {
+								FAILED_REGIONS.remove(r); // if all ok, remove
+							}
+						} catch (Exception e) {
+							LOG.warn("updateRegion({},{}) failed for region {}. Full update scheduled. {}", _fullUpdateTimer, updatePass, r.getName(), e.getMessage(), e);
+							FAILED_REGIONS.add(r);
+						}
+					}
+				}
+				updatePass = !updatePass;
+				
+				if (_fullUpdateTimer > 0) {
+					_fullUpdateTimer--;
+				} else {
+					_fullUpdateTimer = FULL_UPDATE_TIMER;
+				}
+			} catch (Exception e) {
+				LOG.warn(e.getMessage(), e);
+			}
+		}
+	}
+	
+	private void updateRegion(L2WorldRegion region, boolean fullUpdate, boolean forgetObjects) {
+		Collection<L2Object> vObj = region.getVisibleObjects().values();
+		for (L2Object object : vObj) // and for all members in region
+		{
+			if ((object == null) || !object.isVisible()) {
+				continue; // skip dying objects
+			}
+			
+			// Some mobs need faster knownlist update
+			final boolean aggro = (npc().guardAttackAggroMob() && (object instanceof L2GuardInstance));
+			
+			if (forgetObjects) {
+				object.getKnownList().forgetObjects(aggro || fullUpdate);
+				continue;
+			}
+			for (L2WorldRegion worldRegion : region.getSurroundingRegions()) {
+				if ((object instanceof L2Playable) || (aggro && worldRegion.isActive()) || fullUpdate) {
+					Collection<L2Object> inrObj = worldRegion.getVisibleObjects().values();
+					for (L2Object obj : inrObj) {
+						if (obj != object) {
+							object.getKnownList().addKnownObject(obj);
+						}
+					}
+				} else if (object instanceof L2Character) {
+					if (worldRegion.isActive()) {
+						Collection<L2Playable> inrPls = worldRegion.getVisiblePlayable().values();
+						
+						for (L2Object obj : inrPls) {
+							if (obj != object) {
+								object.getKnownList().addKnownObject(obj);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	public static KnownListUpdateTaskManager getInstance() {
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder {
+		protected static final KnownListUpdateTaskManager _instance = new KnownListUpdateTaskManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/Task.java b/src/main/java/com/l2jserver/gameserver/taskmanager/Task.java
new file mode 100644
index 00000000..98e3de80
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/Task.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager;
+
+import java.util.concurrent.ScheduledFuture;
+
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * Abstract task.
+ * @author Layane
+ */
+public abstract class Task {
+	
+	public void initializate() {
+	}
+	
+	public ScheduledFuture<?> launchSpecial(ExecutedTask instance) {
+		return null;
+	}
+	
+	public abstract String getName();
+	
+	public abstract void onTimeElapsed(ExecutedTask task);
+	
+	public void onDestroy() {
+		
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/TaskManager.java b/src/main/java/com/l2jserver/gameserver/taskmanager/TaskManager.java
new file mode 100644
index 00000000..5bc2b9bc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/TaskManager.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager;
+
+import static com.l2jserver.gameserver.taskmanager.TaskTypes.TYPE_NONE;
+import static com.l2jserver.gameserver.taskmanager.TaskTypes.TYPE_SHEDULED;
+import static com.l2jserver.gameserver.taskmanager.TaskTypes.TYPE_TIME;
+import static java.util.concurrent.TimeUnit.DAYS;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskBirthday;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskCastleTaxUpdate;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskClanLeaderApply;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskCleanUp;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskDailySkillReuseClean;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskGlobalVariablesSave;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskHuntingSystem;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskOlympiadSave;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskRaidPointsReset;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskRecom;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskRestart;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskScript;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskSevenSignsUpdate;
+import com.l2jserver.gameserver.taskmanager.tasks.TaskShutdown;
+
+/**
+ * Task Manager.
+ * @author Layane
+ */
+public final class TaskManager {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskManager.class);
+	
+	private final Map<Integer, Task> _tasks = new ConcurrentHashMap<>();
+	
+	protected final List<ExecutedTask> _currentTasks = new CopyOnWriteArrayList<>();
+	
+	protected static final String[] SQL_STATEMENTS = {
+		"SELECT id,task,type,last_activation,param1,param2,param3 FROM global_tasks",
+		"UPDATE global_tasks SET last_activation=? WHERE id=?",
+		"SELECT id FROM global_tasks WHERE task=?",
+		"INSERT INTO global_tasks (task,type,last_activation,param1,param2,param3) VALUES(?,?,?,?,?,?)"
+	};
+	
+	protected TaskManager() {
+		initializate();
+		startAllTasks();
+		LOG.info("Loaded {} tasks.", _tasks.size());
+	}
+	
+	public class ExecutedTask implements Runnable {
+		int id;
+		long lastActivation;
+		Task task;
+		TaskTypes type;
+		String[] params;
+		ScheduledFuture<?> scheduled;
+		
+		public ExecutedTask(Task ptask, TaskTypes ptype, ResultSet rset) throws SQLException {
+			task = ptask;
+			type = ptype;
+			id = rset.getInt("id");
+			lastActivation = rset.getLong("last_activation");
+			params = new String[] {
+				rset.getString("param1"),
+				rset.getString("param2"),
+				rset.getString("param3")
+			};
+		}
+		
+		@Override
+		public void run() {
+			task.onTimeElapsed(this);
+			lastActivation = System.currentTimeMillis();
+			try (var con = ConnectionFactory.getInstance().getConnection();
+				var statement = con.prepareStatement(SQL_STATEMENTS[1])) {
+				statement.setLong(1, lastActivation);
+				statement.setInt(2, id);
+				statement.executeUpdate();
+			} catch (SQLException ex) {
+				LOG.warn("Cannot updated global task Id {}!", id, ex);
+			}
+			
+			if ((type == TYPE_SHEDULED) || (type == TYPE_TIME)) {
+				stopTask();
+			}
+		}
+		
+		@Override
+		public boolean equals(Object object) {
+			if (this == object) {
+				return true;
+			}
+			if (!(object instanceof ExecutedTask)) {
+				return false;
+			}
+			return id == ((ExecutedTask) object).id;
+		}
+		
+		@Override
+		public int hashCode() {
+			return id;
+		}
+		
+		public Task getTask() {
+			return task;
+		}
+		
+		public TaskTypes getType() {
+			return type;
+		}
+		
+		public int getId() {
+			return id;
+		}
+		
+		public String[] getParams() {
+			return params;
+		}
+		
+		public long getLastActivation() {
+			return lastActivation;
+		}
+		
+		public void stopTask() {
+			task.onDestroy();
+			
+			if (scheduled != null) {
+				scheduled.cancel(true);
+			}
+			
+			_currentTasks.remove(this);
+		}
+	}
+	
+	private void initializate() {
+		registerTask(new TaskBirthday());
+		registerTask(new TaskCastleTaxUpdate());
+		registerTask(new TaskClanLeaderApply());
+		registerTask(new TaskCleanUp());
+		registerTask(new TaskDailySkillReuseClean());
+		registerTask(new TaskGlobalVariablesSave());
+		registerTask(new TaskHuntingSystem());
+		registerTask(new TaskOlympiadSave());
+		registerTask(new TaskRaidPointsReset());
+		registerTask(new TaskRecom());
+		registerTask(new TaskRestart());
+		registerTask(new TaskScript());
+		registerTask(new TaskSevenSignsUpdate());
+		registerTask(new TaskShutdown());
+	}
+	
+	public void registerTask(Task task) {
+		int key = task.getName().hashCode();
+		_tasks.computeIfAbsent(key, _ -> {
+			task.initializate();
+			return task;
+		});
+	}
+	
+	private void startAllTasks() {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement(SQL_STATEMENTS[0]);
+			var rs = statement.executeQuery()) {
+			while (rs.next()) {
+				Task task = _tasks.get(rs.getString("task").trim().toLowerCase().hashCode());
+				if (task == null) {
+					continue;
+				}
+				
+				final TaskTypes type = TaskTypes.valueOf(rs.getString("type"));
+				if (type != TYPE_NONE) {
+					ExecutedTask current = new ExecutedTask(task, type, rs);
+					if (launchTask(current)) {
+						_currentTasks.add(current);
+					}
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error while loading global task table!", ex);
+		}
+	}
+	
+	private boolean launchTask(ExecutedTask task) {
+		final ThreadPoolManager scheduler = ThreadPoolManager.getInstance();
+		final TaskTypes type = task.getType();
+		long delay, interval;
+		switch (type) {
+			case TYPE_STARTUP:
+				task.run();
+				return false;
+			case TYPE_SHEDULED:
+				delay = Long.parseLong(task.getParams()[0]);
+				task.scheduled = scheduler.scheduleGeneral(task, delay);
+				return true;
+			case TYPE_FIXED_SHEDULED:
+				delay = Long.parseLong(task.getParams()[0]);
+				interval = Long.parseLong(task.getParams()[1]);
+				task.scheduled = scheduler.scheduleGeneralAtFixedRate(task, delay, interval);
+				return true;
+			case TYPE_TIME:
+				try {
+					Date desired = DateFormat.getInstance().parse(task.getParams()[0]);
+					long diff = desired.getTime() - System.currentTimeMillis();
+					if (diff >= 0) {
+						task.scheduled = scheduler.scheduleGeneral(task, diff);
+						return true;
+					}
+					LOG.info("Task {} is due.", task.getId());
+				} catch (Exception e) {
+				}
+				break;
+			case TYPE_SPECIAL:
+				ScheduledFuture<?> result = task.getTask().launchSpecial(task);
+				if (result != null) {
+					task.scheduled = result;
+					return true;
+				}
+				break;
+			case TYPE_GLOBAL_TASK:
+				interval = DAYS.toMillis(Long.parseLong(task.getParams()[0]));
+				String[] hour = task.getParams()[1].split(":");
+				
+				if (hour.length != 3) {
+					LOG.warn("Task {} has incorrect parameters!", task.getId());
+					return false;
+				}
+				
+				Calendar check = Calendar.getInstance();
+				check.setTimeInMillis(task.getLastActivation() + interval);
+				
+				Calendar min = Calendar.getInstance();
+				try {
+					min.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
+					min.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
+					min.set(Calendar.SECOND, Integer.parseInt(hour[2]));
+				} catch (Exception ex) {
+					LOG.warn("Bad parameter on task Id {}!", task.getId(), ex);
+					return false;
+				}
+				
+				delay = min.getTimeInMillis() - System.currentTimeMillis();
+				
+				if (check.after(min) || (delay < 0)) {
+					delay += interval;
+				}
+				task.scheduled = scheduler.scheduleGeneralAtFixedRate(task, delay, interval);
+				return true;
+			default:
+				return false;
+		}
+		return false;
+	}
+	
+	public static boolean addUniqueTask(String task, TaskTypes type, String param1, String param2, String param3) {
+		return addUniqueTask(task, type, param1, param2, param3, 0);
+	}
+	
+	public static boolean addUniqueTask(String task, TaskTypes type, String param1, String param2, String param3, long lastActivation) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps1 = con.prepareStatement(SQL_STATEMENTS[2])) {
+			ps1.setString(1, task);
+			try (var rs = ps1.executeQuery()) {
+				if (!rs.next()) {
+					try (var ps2 = con.prepareStatement(SQL_STATEMENTS[3])) {
+						ps2.setString(1, task);
+						ps2.setString(2, type.toString());
+						ps2.setLong(3, lastActivation);
+						ps2.setString(4, param1);
+						ps2.setString(5, param2);
+						ps2.setString(6, param3);
+						ps2.execute();
+					}
+				}
+			}
+			return true;
+		} catch (SQLException ex) {
+			LOG.warn("Cannot add the unique task!", ex);
+		}
+		return false;
+	}
+	
+	public static boolean addTask(String task, TaskTypes type, String param1, String param2, String param3) {
+		return addTask(task, type, param1, param2, param3, 0);
+	}
+	
+	public static boolean addTask(String task, TaskTypes type, String param1, String param2, String param3, long lastActivation) {
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var statement = con.prepareStatement(SQL_STATEMENTS[3])) {
+			statement.setString(1, task);
+			statement.setString(2, type.toString());
+			statement.setLong(3, lastActivation);
+			statement.setString(4, param1);
+			statement.setString(5, param2);
+			statement.setString(6, param3);
+			statement.execute();
+			return true;
+		} catch (SQLException ex) {
+			LOG.warn("Cannot add the task {}!", task, ex);
+		}
+		return false;
+	}
+	
+	public static TaskManager getInstance() {
+		return SingletonHolder.INSTANCE;
+	}
+	
+	private static class SingletonHolder {
+		protected static final TaskManager INSTANCE = new TaskManager();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/TaskTypes.java b/src/main/java/com/l2jserver/gameserver/taskmanager/TaskTypes.java
new file mode 100644
index 00000000..ff17c0d0
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/TaskTypes.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager;
+
+/**
+ * @author Layane
+ */
+public enum TaskTypes {
+	TYPE_NONE,
+	TYPE_TIME,
+	TYPE_SHEDULED,
+	TYPE_FIXED_SHEDULED,
+	TYPE_GLOBAL_TASK,
+	TYPE_STARTUP,
+	TYPE_SPECIAL
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskBirthday.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskBirthday.java
new file mode 100644
index 00000000..b5e8823a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskBirthday.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.instancemanager.MailManager;
+import com.l2jserver.gameserver.model.entity.Message;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+/**
+ * Birthday Gift task.
+ * @author Zoey76
+ */
+public class TaskBirthday extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskBirthday.class);
+	
+	private static final String NAME = "birthday";
+	
+	/** Get all players that have had a birthday since last check. */
+	private static final String SELECT_PENDING_BIRTHDAY_GIFTS = "SELECT charId, char_name, createDate, (YEAR(NOW()) - YEAR(createDate)) AS age FROM characters WHERE (YEAR(NOW()) - YEAR(createDate) > 0) AND ((DATE_ADD(createDate, INTERVAL (YEAR(NOW()) - YEAR(createDate)) YEAR)) BETWEEN FROM_UNIXTIME(?) AND NOW())";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		// TODO(Zoey76): Fix first run.
+		final int birthdayGiftCount = giveBirthdayGifts(task.getLastActivation());
+		
+		LOG.info("{} gifts sent.", birthdayGiftCount);
+	}
+	
+	private int giveBirthdayGifts(long lastActivation) {
+		int birthdayGiftCount = 0;
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(SELECT_PENDING_BIRTHDAY_GIFTS)) {
+			ps.setLong(1, TimeUnit.SECONDS.convert(lastActivation, TimeUnit.MILLISECONDS));
+			try (var rs = ps.executeQuery()) {
+				while (rs.next()) {
+					String text = general().getBirthdayMailText();
+					text = text.replaceAll("$c1", rs.getString("char_name"));
+					text = text.replaceAll("$s1", Integer.toString(rs.getInt("age")));
+					
+					final Message msg = new Message(rs.getInt("charId"), general().getBirthdayMailSubject(), text, Message.SendBySystem.ALEGRIA);
+					msg.createAttachments().addItem("Birthday", general().getBirthdayGift(), 1, null, null);
+					MailManager.getInstance().sendMessage(msg);
+					birthdayGiftCount++;
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("There has been an error sending gifts!", ex);
+		}
+		return birthdayGiftCount;
+	}
+	
+	@Override
+	public void initializate() {
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCastleTaxUpdate.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCastleTaxUpdate.java
new file mode 100644
index 00000000..b8ffc9fd
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCastleTaxUpdate.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+public class TaskCastleTaxUpdate extends Task {
+	private static final Logger LOG = LoggerFactory.getLogger(TaskCastleTaxUpdate.class);
+	
+	private static final String NAME = "castle_tax_update";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		final var castles = CastleManager.getInstance().getCastles();
+		for (var castle : castles) {
+			if (castle.getNextTaxPercent() != castle.getTaxPercent()) {
+				castle.setTaxPercent(castle.getNextTaxPercent());
+				
+				LOG.info("Scheduled tax update for castleId: {}, new tax at {}%", castle.getResidenceId(), castle.getNextTaxPercent());
+			}
+		}
+		
+		resetNextTax();
+	}
+	
+	private void resetNextTax() {
+		final var cal = Calendar.getInstance();
+		cal.set(Calendar.HOUR_OF_DAY, 24);
+		cal.set(Calendar.MINUTE, 00);
+		cal.set(Calendar.SECOND, 00);
+		final var time = cal.getTimeInMillis();
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("UPDATE castle SET next_tax_time = ? WHERE id > 0")) {
+			ps.setLong(1, time);
+			ps.execute();
+		} catch (Exception e) {
+			LOG.warn(e.getMessage(), e);
+		}
+	}
+	
+	@Override
+	public void initializate() {
+		var reset = false;
+		
+		final var castles = CastleManager.getInstance().getCastles();
+		for (var castle : castles) {
+			if (castle.getNextTaxTime() < System.currentTimeMillis()) {
+				reset = true;
+				if (castle.getNextTaxPercent() != castle.getTaxPercent()) {
+					castle.setTaxPercent(castle.getNextTaxPercent());
+					
+					LOG.info("Force tax update after server offline for castleId: {}, new tax at {}%", castle.getResidenceId(), castle.getNextTaxPercent());
+				}
+			}
+		}
+		
+		if (reset) {
+			resetNextTax();
+		}
+		
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "00:00:00", "");
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java
new file mode 100644
index 00000000..7a6c5be3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskClanLeaderApply.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.character;
+import static com.l2jserver.gameserver.taskmanager.TaskTypes.TYPE_GLOBAL_TASK;
+import static java.util.Calendar.DAY_OF_WEEK;
+
+import java.util.Calendar;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * @author UnAfraid
+ */
+public class TaskClanLeaderApply extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskClanLeaderApply.class);
+	
+	private static final String NAME = "clanleaderapply";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		Calendar cal = Calendar.getInstance();
+		if (cal.get(DAY_OF_WEEK) == character().getClanLeaderDateChange()) {
+			for (L2Clan clan : ClanTable.getInstance().getClans()) {
+				if (clan.getNewLeaderId() != 0) {
+					final L2ClanMember member = clan.getClanMember(clan.getNewLeaderId());
+					if (member == null) {
+						continue;
+					}
+					
+					clan.setNewLeader(member);
+				}
+			}
+			LOG.info("Task launched.");
+		}
+	}
+	
+	@Override
+	public void initializate() {
+		TaskManager.addUniqueTask(NAME, TYPE_GLOBAL_TASK, "1", character().getClanLeaderHourChange(), "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCleanUp.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCleanUp.java
new file mode 100644
index 00000000..0a5cf69d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskCleanUp.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * @author Tempy
+ */
+public final class TaskCleanUp extends Task {
+	
+	public static final String NAME = "clean_up";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		System.gc();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskDailySkillReuseClean.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskDailySkillReuseClean.java
new file mode 100644
index 00000000..4daf5343
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskDailySkillReuseClean.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import java.sql.PreparedStatement;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+public class TaskDailySkillReuseClean extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskDailySkillReuseClean.class);
+	
+	private static final String NAME = "daily_skill_clean";
+	
+	private static final int[] DAILY_SKILLS = {
+		2510,
+		22180
+	};
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		try (var con = ConnectionFactory.getInstance().getConnection()) {
+			for (int skill_id : DAILY_SKILLS) {
+				try (PreparedStatement ps = con.prepareStatement("DELETE FROM character_skills_save WHERE skill_id=?")) {
+					ps.setInt(1, skill_id);
+					ps.execute();
+				}
+			}
+		} catch (Exception ex) {
+			LOG.warn("Could not reset daily skill reuse!", ex);
+		}
+		LOG.info("Daily skill reuse cleaned.");
+	}
+	
+	@Override
+	public void initializate() {
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java
new file mode 100644
index 00000000..99c5deed
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+/**
+ * @author Gigiikun
+ */
+public class TaskGlobalVariablesSave extends Task {
+	public static final String NAME = "global_varibales_save";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		GlobalVariablesManager.getInstance().storeMe();
+	}
+	
+	@Override
+	public void initializate() {
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "500000", "1800000", "");
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskHuntingSystem.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskHuntingSystem.java
new file mode 100644
index 00000000..663fcc3a
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskHuntingSystem.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExNevitAdventTimeChange;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+/**
+ * @author Maneco2
+ * @since 2.6.3.0
+ */
+public class TaskHuntingSystem extends Task {
+	protected static final Logger LOG = LoggerFactory.getLogger(TaskHuntingSystem.class);
+	
+	private static final String NAME = "hunting_system";
+	
+	private static final int RESET_HUNTING_BONUS = 0;
+	private static final String UPDATE_CHARACTERS_HUNTING = "UPDATE characters SET hunting_bonus=?";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			player.getHuntingSystem().setHuntingBonusTime(RESET_HUNTING_BONUS);
+			if (player.isOnline()) {
+				if (player.getHuntingSystem().isHuntingBonusTaskActive()) {
+					player.sendPacket(new ExNevitAdventTimeChange(player.getHuntingSystem().getHuntingBonusTime(), false));
+				}
+			}
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_CHARACTERS_HUNTING)) {
+			ps.setInt(1, RESET_HUNTING_BONUS);
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("{}: Failed to execute SQL-Query for the reset of the Hunting-System!", getClass().getSimpleName(), e);
+		}
+		
+		LOG.info("Hunting System reseted.");
+	}
+	
+	@Override
+	public void initializate() {
+		super.initializate();
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskOlympiadSave.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskOlympiadSave.java
new file mode 100644
index 00000000..432ddfe5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskOlympiadSave.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.olympiad.Olympiad;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+/**
+ * Updates all data of Olympiad nobles in db
+ * @author godson
+ */
+public class TaskOlympiadSave extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskOlympiadSave.class);
+	
+	public static final String NAME = "olympiad_save";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		if (Olympiad.getInstance().inCompPeriod()) {
+			Olympiad.getInstance().saveOlympiadStatus();
+			LOG.info("Data updated.");
+		}
+	}
+	
+	@Override
+	public void initializate() {
+		super.initializate();
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "900000", "1800000", "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRaidPointsReset.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
new file mode 100644
index 00000000..6d3b8c67
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRaidPointsReset.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.clan;
+
+import java.util.Calendar;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.data.sql.impl.ClanTable;
+import com.l2jserver.gameserver.instancemanager.RaidBossPointsManager;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+public class TaskRaidPointsReset extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskRaidPointsReset.class);
+	
+	public static final String NAME = "raid_points_reset";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		Calendar cal = Calendar.getInstance();
+		if (cal.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
+			// reward clan reputation points
+			Map<Integer, Integer> rankList = RaidBossPointsManager.getInstance().getRankList();
+			for (L2Clan c : ClanTable.getInstance().getClans()) {
+				for (Entry<Integer, Integer> entry : rankList.entrySet()) {
+					if ((entry.getValue() <= 100) && c.isMember(entry.getKey())) {
+						int reputation = switch (entry.getValue()) {
+							case 1 -> clan().get1stRaidRankingPoints();
+							case 2 -> clan().get2ndRaidRankingPoints();
+							case 3 -> clan().get3rdRaidRankingPoints();
+							case 4 -> clan().get4thRaidRankingPoints();
+							case 5 -> clan().get5thRaidRankingPoints();
+							case 6 -> clan().get6thRaidRankingPoints();
+							case 7 -> clan().get7thRaidRankingPoints();
+							case 8 -> clan().get8thRaidRankingPoints();
+							case 9 -> clan().get9thRaidRankingPoints();
+							case 10 -> clan().get10thRaidRankingPoints();
+							default -> entry.getValue() <= 50 ? clan().getUpTo50thRaidRankingPoints() : clan().getUpTo100thRaidRankingPoints();
+						};
+						c.addReputationScore(reputation, true);
+					}
+				}
+			}
+			
+			RaidBossPointsManager.getInstance().cleanUp();
+			LOG.info("Raid points reset global task launched.");
+		}
+	}
+	
+	@Override
+	public void initializate() {
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "00:10:00", "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRecom.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRecom.java
new file mode 100644
index 00000000..163e5a9e
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRecom.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExBrExtraUserInfo;
+import com.l2jserver.gameserver.network.serverpackets.ExVoteSystemInfo;
+import com.l2jserver.gameserver.network.serverpackets.UserInfo;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+/**
+ * @author Layane
+ * @author Maneco2
+ */
+public class TaskRecom extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskRecom.class);
+	
+	private static final String NAME = "recommendations";
+	
+	private static final int RESET_REC_LEFT = 20;
+	private static final int RESET_REC_BONUS_TIME = 3600;
+	private static final String UPDATE_CHARACTERS_RECO = "UPDATE character_reco_bonus SET rec_have=rec_have-LEAST(rec_have,20), rec_left=?, time_left=?";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			player.getRecSystem().setHave(player.getRecSystem().getHave() - 20);
+			player.getRecSystem().setLeft(RESET_REC_LEFT);
+			player.getRecSystem().setBonusTime(RESET_REC_BONUS_TIME);
+			if (player.isOnline()) {
+				player.sendPacket(new UserInfo(player));
+				player.sendPacket(new ExBrExtraUserInfo(player));
+				player.sendPacket(new ExVoteSystemInfo(player));
+			}
+		}
+		
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement(UPDATE_CHARACTERS_RECO)) {
+			ps.setInt(1, RESET_REC_LEFT);
+			ps.setInt(2, RESET_REC_BONUS_TIME);
+			ps.executeUpdate();
+		} catch (Exception e) {
+			LOG.warn("{}: Failed to execute SQL-Query for the reset of the Recommendations System!", getClass().getSimpleName(), e);
+		}
+		
+		LOG.info("Recommendations System reseted.");
+	}
+	
+	@Override
+	public void initializate() {
+		super.initializate();
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_GLOBAL_TASK, "1", "06:30:00", "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java
new file mode 100644
index 00000000..d4ba25f4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskRestart.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import com.l2jserver.gameserver.Shutdown;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * @author Layane
+ */
+public final class TaskRestart extends Task {
+	
+	public static final String NAME = "restart";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), true);
+		handler.start();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskScript.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskScript.java
new file mode 100644
index 00000000..5cce145d
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskScript.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.scripting.ScriptEngineManager;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * @author janiii
+ */
+public class TaskScript extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskScript.class);
+	
+	private static final String NAME = "script";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		final File file = new File(server().getScriptRoot(), "com/l2jserver/datapack/cron/" + task.getParams()[2]);
+		if (!file.isFile()) {
+			LOG.warn("File not found {}!", task.getParams()[2]);
+			return;
+		}
+		
+		try {
+			ScriptEngineManager.getInstance().compileScript(file);
+		} catch (Exception ex) {
+			LOG.warn("Failed loading {}!", task.getParams()[2]);
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java
new file mode 100644
index 00000000..5e3afa78
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskSevenSignsUpdate.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+import com.l2jserver.gameserver.taskmanager.TaskTypes;
+
+/**
+ * Updates all data for the Seven Signs and Festival of Darkness engines, when time is elapsed.
+ * @author Tempy
+ */
+public class TaskSevenSignsUpdate extends Task {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(TaskSevenSignsUpdate.class);
+	
+	private static final String NAME = "seven_signs_update";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		try {
+			SevenSigns.getInstance().saveSevenSignsStatus();
+			if (!SevenSigns.getInstance().isSealValidationPeriod()) {
+				SevenSignsFestival.getInstance().saveFestivalData(false);
+			}
+			LOG.info("Data updated successfully.");
+		} catch (Exception ex) {
+			LOG.warn("Failed to save Seven Signs configuration!", ex);
+		}
+	}
+	
+	@Override
+	public void initializate() {
+		TaskManager.addUniqueTask(NAME, TaskTypes.TYPE_FIXED_SHEDULED, "1800000", "1800000", "");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java
new file mode 100644
index 00000000..5ea74a08
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/taskmanager/tasks/TaskShutdown.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.taskmanager.tasks;
+
+import com.l2jserver.gameserver.Shutdown;
+import com.l2jserver.gameserver.taskmanager.Task;
+import com.l2jserver.gameserver.taskmanager.TaskManager.ExecutedTask;
+
+/**
+ * @author Layane
+ */
+public class TaskShutdown extends Task {
+	
+	public static final String NAME = "shutdown";
+	
+	@Override
+	public String getName() {
+		return NAME;
+	}
+	
+	@Override
+	public void onTimeElapsed(ExecutedTask task) {
+		Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), false);
+		handler.start();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/Broadcast.java b/src/main/java/com/l2jserver/gameserver/util/Broadcast.java
new file mode 100644
index 00000000..cdbe08e6
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/Broadcast.java
@@ -0,0 +1,181 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.CharInfo;
+import com.l2jserver.gameserver.network.serverpackets.CreatureSay;
+import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
+import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
+import com.l2jserver.gameserver.network.serverpackets.RelationChanged;
+
+/**
+ * @since 2004/06/27 08:12:59
+ */
+public final class Broadcast {
+	private static final Logger LOG = LoggerFactory.getLogger(Broadcast.class);
+	
+	/**
+	 * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character that have the Character targeted.<BR>
+	 * <B><U> Concept</U> :</B><BR>
+	 * L2PcInstance in the detection area of the L2Character are identified in <B>_knownPlayers</B>.<BR>
+	 * In order to inform other players of state modification on the L2Character, server just need to go through _knownPlayers to send Server->Client Packet<BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND Server->Client packet to this L2Character (to do this use method toSelfAndKnownPlayers)</B></FONT><BR>
+	 * @param character
+	 * @param mov
+	 */
+	public static void toPlayersTargettingMyself(L2Character character, L2GameServerPacket mov) {
+		for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) {
+			if (player.getTarget() != character) {
+				continue;
+			}
+			
+			player.sendPacket(mov);
+		}
+	}
+	
+	/**
+	 * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character.<BR>
+	 * <B><U> Concept</U> :</B><BR>
+	 * L2PcInstance in the detection area of the L2Character are identified in <B>_knownPlayers</B>.<BR>
+	 * In order to inform other players of state modification on the L2Character, server just need to go through _knownPlayers to send Server->Client Packet<BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND Server->Client packet to this L2Character (to do this use method toSelfAndKnownPlayers)</B></FONT><BR>
+	 * @param character
+	 * @param mov
+	 */
+	public static void toKnownPlayers(L2Character character, L2GameServerPacket mov) {
+		for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) {
+			if (player == null) {
+				continue;
+			}
+			try {
+				player.sendPacket(mov);
+				if ((mov instanceof CharInfo) && (character instanceof L2PcInstance)) {
+					int relation = ((L2PcInstance) character).getRelation(player);
+					Integer oldrelation = character.getKnownList().getKnownRelations().get(player.getObjectId());
+					if ((oldrelation != null) && (oldrelation != relation)) {
+						player.sendPacket(new RelationChanged((L2PcInstance) character, relation, character.isAutoAttackable(player)));
+						if (character.hasSummon()) {
+							player.sendPacket(new RelationChanged(character.getSummon(), relation, character.isAutoAttackable(player)));
+						}
+					}
+				}
+			} catch (NullPointerException e) {
+				LOG.warn(e.getMessage(), e);
+			}
+		}
+		
+	}
+	
+	/**
+	 * Send a packet to all L2PcInstance in the _KnownPlayers (in the specified radius) of the L2Character.<BR>
+	 * <B><U> Concept</U> :</B><BR>
+	 * L2PcInstance in the detection area of the L2Character are identified in <B>_knownPlayers</B>.<BR>
+	 * In order to inform other players of state modification on the L2Character, server just needs to go through _knownPlayers to send Server->Client Packet and check the distance between the targets.<BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND Server->Client packet to this L2Character (to do this use method toSelfAndKnownPlayers)</B></FONT><BR>
+	 * @param character
+	 * @param mov
+	 * @param radius
+	 */
+	public static void toKnownPlayersInRadius(L2Character character, L2GameServerPacket mov, int radius) {
+		if (radius < 0) {
+			radius = 1500;
+		}
+		
+		for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) {
+			if (character.isInsideRadius(player, radius, false, false)) {
+				player.sendPacket(mov);
+			}
+		}
+	}
+	
+	/**
+	 * Send a packet to all L2PcInstance in the _KnownPlayers of the L2Character and to the specified character.<BR>
+	 * <B><U> Concept</U> :</B><BR>
+	 * L2PcInstance in the detection area of the L2Character are identified in <B>_knownPlayers</B>.<BR>
+	 * In order to inform other players of state modification on the L2Character, server just need to go through _knownPlayers to send Server->Client Packet<BR>
+	 * @param character
+	 * @param mov
+	 */
+	public static void toSelfAndKnownPlayers(L2Character character, L2GameServerPacket mov) {
+		if (character instanceof L2PcInstance) {
+			character.sendPacket(mov);
+		}
+		
+		toKnownPlayers(character, mov);
+	}
+	
+	// To improve performance we are comparing values of radius^2 instead of calculating sqrt all the time
+	public static void toSelfAndKnownPlayersInRadius(L2Character character, L2GameServerPacket mov, int radius) {
+		if (radius < 0) {
+			radius = 600;
+		}
+		
+		if (character instanceof L2PcInstance) {
+			character.sendPacket(mov);
+		}
+		
+		for (L2PcInstance player : character.getKnownList().getKnownPlayers().values()) {
+			if ((player != null) && Util.checkIfInRange(radius, character, player, false)) {
+				player.sendPacket(mov);
+			}
+		}
+	}
+	
+	/**
+	 * Send a packet to all L2PcInstance present in the world.<BR>
+	 * <B><U> Concept</U> :</B><BR>
+	 * In order to inform other players of state modification on the L2Character, server just need to go through _allPlayers to send Server->Client Packet<BR>
+	 * <FONT COLOR=#FF0000><B> <U>Caution</U> : This method DOESN'T SEND Server->Client packet to this L2Character (to do this use method toSelfAndKnownPlayers)</B></FONT><BR>
+	 * @param packet
+	 */
+	public static void toAllOnlinePlayers(L2GameServerPacket packet) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			if (player.isOnline()) {
+				player.sendPacket(packet);
+			}
+		}
+	}
+	
+	public static void toAllOnlinePlayers(String text) {
+		toAllOnlinePlayers(text, false);
+	}
+	
+	public static void toAllOnlinePlayers(String text, boolean isCritical) {
+		toAllOnlinePlayers(new CreatureSay(0, isCritical ? Say2.CRITICAL_ANNOUNCE : Say2.ANNOUNCEMENT, "", text));
+	}
+	
+	public static void toPlayersInInstance(L2GameServerPacket packet, int instanceId) {
+		for (L2PcInstance player : L2World.getInstance().getPlayers()) {
+			if (player.isOnline() && (player.getInstanceId() == instanceId)) {
+				player.sendPacket(packet);
+			}
+		}
+	}
+	
+	public static void toAllOnlinePlayersOnScreen(String text) {
+		toAllOnlinePlayers(new ExShowScreenMessage(text, 10000));
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/DeadLockDetector.java b/src/main/java/com/l2jserver/gameserver/util/DeadLockDetector.java
new file mode 100644
index 00000000..a6d65cf3
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/DeadLockDetector.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+
+import java.lang.management.LockInfo;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MonitorInfo;
+import java.lang.management.ThreadInfo;
+import java.lang.management.ThreadMXBean;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.Shutdown;
+import com.l2jserver.gameserver.config.Configuration;
+
+/**
+ * Thread to check for deadlocked threads.
+ * @author -Nemesiss-
+ */
+public class DeadLockDetector extends Thread {
+	private static final Logger LOG = LoggerFactory.getLogger(DeadLockDetector.class);
+	
+	private final ThreadMXBean tmx;
+	
+	public DeadLockDetector() {
+		super("DeadLockDetector");
+		tmx = ManagementFactory.getThreadMXBean();
+	}
+	
+	@Override
+	public final void run() {
+		boolean deadlock = false;
+		while (!deadlock) {
+			try {
+				long[] ids = tmx.findDeadlockedThreads();
+				
+				if (ids != null) {
+					deadlock = true;
+					ThreadInfo[] tis = tmx.getThreadInfo(ids, true, true);
+					StringBuilder info = new StringBuilder();
+					info.append("DeadLock Found!");
+					info.append(Configuration.EOL);
+					for (ThreadInfo ti : tis) {
+						info.append(ti.toString());
+					}
+					
+					for (ThreadInfo ti : tis) {
+						LockInfo[] locks = ti.getLockedSynchronizers();
+						MonitorInfo[] monitors = ti.getLockedMonitors();
+						if ((locks.length == 0) && (monitors.length == 0)) {
+							continue;
+						}
+						
+						ThreadInfo dl = ti;
+						info.append("Java-level deadlock:");
+						info.append(Configuration.EOL);
+						info.append('\t');
+						info.append(dl.getThreadName());
+						info.append(" is waiting to lock ");
+						info.append(dl.getLockInfo().toString());
+						info.append(" which is held by ");
+						info.append(dl.getLockOwnerName());
+						info.append(Configuration.EOL);
+						while ((dl = tmx.getThreadInfo(new long[] {
+							dl.getLockOwnerId()
+						}, true, true)[0]).getThreadId() != ti.getThreadId()) {
+							info.append('\t');
+							info.append(dl.getThreadName());
+							info.append(" is waiting to lock ");
+							info.append(dl.getLockInfo().toString());
+							info.append(" which is held by ");
+							info.append(dl.getLockOwnerName());
+							info.append(Configuration.EOL);
+						}
+					}
+					LOG.warn(info.toString());
+					
+					if (general().restartOnDeadlock()) {
+						Broadcast.toAllOnlinePlayers("Server has stability issues - restarting now.");
+						Shutdown.getInstance().startTelnetShutdown("DeadLockDetector - Auto Restart", 60, true);
+					}
+					
+				}
+				Thread.sleep(general().getDeadLockCheckInterval());
+			} catch (Exception e) {
+				LOG.warn(e.getMessage(), e);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/EmptyQueue.java b/src/main/java/com/l2jserver/gameserver/util/EmptyQueue.java
new file mode 100644
index 00000000..cd49007c
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/EmptyQueue.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Queue;
+
+/**
+ * @author UnAfraid
+ * @param <E>
+ */
+public final class EmptyQueue<E> implements Queue<E> {
+	private static final Queue<Object> EMPTY_QUEUE = new EmptyQueue<>();
+	
+	@SuppressWarnings("unchecked")
+	public static <E> Queue<E> emptyQueue() {
+		return (Queue<E>) EMPTY_QUEUE;
+	}
+	
+	@Override
+	public int size() {
+		return 0;
+	}
+	
+	@Override
+	public boolean isEmpty() {
+		return true;
+	}
+	
+	@Override
+	public boolean contains(Object o) {
+		return false;
+	}
+	
+	@Override
+	public Iterator<E> iterator() {
+		return Collections.emptyIterator();
+	}
+	
+	@Override
+	public Object[] toArray() {
+		return new Object[0];
+	}
+	
+	@Override
+	public <T> T[] toArray(T[] a) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean remove(Object o) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean containsAll(Collection<?> c) {
+		return false;
+	}
+	
+	@Override
+	public boolean addAll(Collection<? extends E> c) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean removeAll(Collection<?> c) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean retainAll(Collection<?> c) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public void clear() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean add(E e) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public boolean offer(E e) {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public E remove() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public E poll() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public E element() {
+		throw new UnsupportedOperationException();
+	}
+	
+	@Override
+	public E peek() {
+		throw new UnsupportedOperationException();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/EnumIntBitmask.java b/src/main/java/com/l2jserver/gameserver/util/EnumIntBitmask.java
new file mode 100644
index 00000000..ddf88dbc
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/EnumIntBitmask.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+/**
+ * @author HorridoJoho
+ * @param <E> The enum type
+ */
+public final class EnumIntBitmask<E extends Enum<E>> implements Cloneable {
+	public static <E extends Enum<E>> int getAllBitmask(Class<E> enumClass) {
+		int allBitmask = 0;
+		E[] values = enumClass.getEnumConstants();
+		if (values.length > 32) {
+			throw new IllegalArgumentException("Enum too big for an integer bitmask.");
+		}
+		for (E value : values) {
+			allBitmask |= 1 << value.ordinal();
+		}
+		return allBitmask;
+	}
+	
+	private final Class<E> _enumClass;
+	private int _bitmask;
+	
+	public EnumIntBitmask(Class<E> enumClass, boolean all) {
+		_enumClass = enumClass;
+		
+		E[] values = _enumClass.getEnumConstants();
+		if (values.length > 32) {
+			throw new IllegalArgumentException("Enum too big for an integer bitmask.");
+		}
+		
+		if (all) {
+			setAll();
+		} else {
+			clear();
+		}
+	}
+	
+	public EnumIntBitmask(Class<E> enumClass, int bitmask) {
+		_enumClass = enumClass;
+		_bitmask = bitmask;
+	}
+	
+	public void setAll() {
+		set(_enumClass.getEnumConstants());
+	}
+	
+	public void clear() {
+		_bitmask = 0;
+	}
+	
+	@SafeVarargs
+	public final void set(E... many) {
+		clear();
+		for (E one : many) {
+			_bitmask |= 1 << one.ordinal();
+		}
+	}
+	
+	@SafeVarargs
+	public final void set(E first, E... more) {
+		clear();
+		add(first, more);
+	}
+	
+	public void setBitmask(int bitmask) {
+		_bitmask = bitmask;
+	}
+	
+	@SafeVarargs
+	public final void add(E first, E... more) {
+		_bitmask |= 1 << first.ordinal();
+		if (more != null) {
+			for (E one : more) {
+				_bitmask |= 1 << one.ordinal();
+			}
+		}
+	}
+	
+	@SafeVarargs
+	public final void remove(E first, E... more) {
+		_bitmask &= ~(1 << first.ordinal());
+		if (more != null) {
+			for (E one : more) {
+				_bitmask &= ~(1 << one.ordinal());
+			}
+		}
+	}
+	
+	@SafeVarargs
+	public final boolean has(E first, E... more) {
+		if ((_bitmask & (1 << first.ordinal())) == 0) {
+			return false;
+		}
+		
+		for (E one : more) {
+			if ((_bitmask & (1 << one.ordinal())) == 0) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	@Override
+	public EnumIntBitmask<E> clone() {
+		return new EnumIntBitmask<>(_enumClass, _bitmask);
+	}
+	
+	public int getBitmask() {
+		return _bitmask;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/Evolve.java b/src/main/java/com/l2jserver/gameserver/util/Evolve.java
new file mode 100644
index 00000000..f09aa241
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/Evolve.java
@@ -0,0 +1,286 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.database.ConnectionFactory;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.data.xml.impl.PetDataTable;
+import com.l2jserver.gameserver.model.L2PetData;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.InventoryUpdate;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
+import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+/**
+ * UnAfraid: TODO: MOVE IT TO DP AI
+ */
+public final class Evolve {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Evolve.class);
+	
+	public static boolean doEvolve(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) {
+		if ((itemIdtake == 0) || (itemIdgive == 0) || (petminlvl == 0)) {
+			return false;
+		}
+		
+		if (!player.hasPet()) {
+			return false;
+		}
+		
+		final L2PetInstance currentPet = (L2PetInstance) player.getSummon();
+		if (currentPet.isAlikeDead()) {
+			Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " tried to use death pet exploit!");
+			return false;
+		}
+		
+		long petexp = currentPet.getExp();
+		String oldname = currentPet.getName();
+		int oldX = currentPet.getX();
+		int oldY = currentPet.getY();
+		int oldZ = currentPet.getZ();
+		
+		L2PetData oldData = PetDataTable.getInstance().getPetDataByItemId(itemIdtake);
+		
+		if (oldData == null) {
+			return false;
+		}
+		
+		int oldnpcID = oldData.getNpcId();
+		
+		if ((currentPet.getStat().getLevel() < petminlvl) || (currentPet.getId() != oldnpcID)) {
+			return false;
+		}
+		
+		L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(itemIdgive);
+		
+		if (petData == null) {
+			return false;
+		}
+		
+		int npcID = petData.getNpcId();
+		
+		if (npcID == 0) {
+			return false;
+		}
+		
+		L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcID);
+		
+		currentPet.unSummon(player);
+		
+		// deleting old pet item
+		currentPet.destroyControlItem(player, true);
+		
+		final var item = player.getInventory().addItem("Evolve", itemIdgive, 1, player, npc);
+		
+		// Summoning new pet
+		L2PetInstance petSummon = L2PetInstance.spawnPet(npcTemplate, player, item);
+		
+		if (petSummon == null) {
+			return false;
+		}
+		
+		// Fix for non-linear baby pet exp
+		long _minimumexp = petSummon.getStat().getExpForLevel(petminlvl);
+		if (petexp < _minimumexp) {
+			petexp = _minimumexp;
+		}
+		
+		petSummon.addExp(petexp);
+		petSummon.setCurrentHp(petSummon.getMaxHp());
+		petSummon.setCurrentMp(petSummon.getMaxMp());
+		petSummon.setCurrentFed(petSummon.getMaxFed());
+		petSummon.setTitle(player.getName());
+		petSummon.setName(oldname);
+		petSummon.setRunning();
+		petSummon.storeMe();
+		
+		player.setPet(petSummon);
+		
+		player.sendPacket(new MagicSkillUse(npc, 2046, 1, 1000, 600000));
+		player.sendPacket(SystemMessageId.SUMMON_A_PET);
+		// L2World.getInstance().storeObject(petSummon);
+		petSummon.spawnMe(oldX, oldY, oldZ);
+		petSummon.startFeed();
+		item.setEnchantLevel(petSummon.getLevel());
+		
+		ThreadPoolManager.getInstance().scheduleGeneral(new EvolveFinalizer(player, petSummon), 900);
+		
+		if (petSummon.getCurrentFed() <= 0) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new EvolveFeedWait(player, petSummon), 60000);
+		} else {
+			petSummon.startFeed();
+		}
+		
+		return true;
+	}
+	
+	public static boolean doRestore(L2PcInstance player, L2Npc npc, int itemIdtake, int itemIdgive, int petminlvl) {
+		if ((itemIdtake == 0) || (itemIdgive == 0) || (petminlvl == 0)) {
+			return false;
+		}
+		
+		L2ItemInstance item = player.getInventory().getItemByItemId(itemIdtake);
+		if (item == null) {
+			return false;
+		}
+		
+		int oldpetlvl = item.getEnchantLevel();
+		if (oldpetlvl < petminlvl) {
+			oldpetlvl = petminlvl;
+		}
+		
+		L2PetData oldData = PetDataTable.getInstance().getPetDataByItemId(itemIdtake);
+		if (oldData == null) {
+			return false;
+		}
+		
+		L2PetData petData = PetDataTable.getInstance().getPetDataByItemId(itemIdgive);
+		if (petData == null) {
+			return false;
+		}
+		
+		int npcId = petData.getNpcId();
+		if (npcId == 0) {
+			return false;
+		}
+		
+		L2NpcTemplate npcTemplate = NpcData.getInstance().getTemplate(npcId);
+		
+		// deleting old pet item
+		L2ItemInstance removedItem = player.getInventory().destroyItem("PetRestore", item, player, npc);
+		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
+		sm.addItemName(removedItem);
+		player.sendPacket(sm);
+		
+		// Give new pet item
+		L2ItemInstance addedItem = player.getInventory().addItem("PetRestore", itemIdgive, 1, player, npc);
+		
+		// Summoning new pet
+		L2PetInstance petSummon = L2PetInstance.spawnPet(npcTemplate, player, addedItem);
+		if (petSummon == null) {
+			return false;
+		}
+		
+		long _maxexp = petSummon.getExpForLevel(oldpetlvl);
+		
+		petSummon.addExp(_maxexp);
+		petSummon.setCurrentHp(petSummon.getMaxHp());
+		petSummon.setCurrentMp(petSummon.getMaxMp());
+		petSummon.setCurrentFed(petSummon.getMaxFed());
+		petSummon.setTitle(player.getName());
+		petSummon.setRunning();
+		petSummon.storeMe();
+		
+		player.setPet(petSummon);
+		
+		player.sendPacket(new MagicSkillUse(npc, 2046, 1, 1000, 600000));
+		player.sendPacket(SystemMessageId.SUMMON_A_PET);
+		// L2World.getInstance().storeObject(petSummon);
+		petSummon.spawnMe(player.getX(), player.getY(), player.getZ());
+		petSummon.startFeed();
+		addedItem.setEnchantLevel(petSummon.getLevel());
+		
+		// Inventory update
+		InventoryUpdate iu = new InventoryUpdate();
+		iu.addRemovedItem(removedItem);
+		player.sendPacket(iu);
+		
+		StatusUpdate su = new StatusUpdate(player);
+		su.addAttribute(StatusUpdate.CUR_LOAD, player.getCurrentLoad());
+		player.sendPacket(su);
+		
+		player.broadcastUserInfo();
+		
+		L2World world = L2World.getInstance();
+		world.removeObject(removedItem);
+		
+		ThreadPoolManager.getInstance().scheduleGeneral(new EvolveFinalizer(player, petSummon), 900);
+		
+		if (petSummon.getCurrentFed() <= 0) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new EvolveFeedWait(player, petSummon), 60000);
+		} else {
+			petSummon.startFeed();
+		}
+		
+		// pet control item no longer exists, delete the pet from the db
+		try (var con = ConnectionFactory.getInstance().getConnection();
+			var ps = con.prepareStatement("DELETE FROM pets WHERE item_obj_id=?")) {
+			ps.setInt(1, removedItem.getObjectId());
+			ps.execute();
+		} catch (Exception e) {
+		}
+		return true;
+	}
+	
+	static final class EvolveFeedWait implements Runnable {
+		private final L2PcInstance _activeChar;
+		private final L2PetInstance _petSummon;
+		
+		EvolveFeedWait(L2PcInstance activeChar, L2PetInstance petSummon) {
+			_activeChar = activeChar;
+			_petSummon = petSummon;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				if (_petSummon.getCurrentFed() <= 0) {
+					_petSummon.unSummon(_activeChar);
+				} else {
+					_petSummon.startFeed();
+				}
+			} catch (Exception e) {
+				LOG.warn(e.getMessage(), e);
+			}
+		}
+	}
+	
+	static final class EvolveFinalizer implements Runnable {
+		private final L2PcInstance _activeChar;
+		private final L2PetInstance _petSummon;
+		
+		EvolveFinalizer(L2PcInstance activeChar, L2PetInstance petSummon) {
+			_activeChar = activeChar;
+			_petSummon = petSummon;
+		}
+		
+		@Override
+		public void run() {
+			try {
+				_activeChar.sendPacket(new MagicSkillLaunched(_activeChar, 2046, 1));
+				_petSummon.setFollowStatus(true);
+				_petSummon.setShowSummonAnimation(false);
+			} catch (Throwable e) {
+				LOG.warn(e.getMessage(), e);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/FloodProtectorAction.java b/src/main/java/com/l2jserver/gameserver/util/FloodProtectorAction.java
new file mode 100644
index 00000000..958bfce7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/FloodProtectorAction.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import static com.l2jserver.gameserver.config.Configuration.floodProtector;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.instancemanager.PunishmentManager;
+import com.l2jserver.gameserver.model.PcCondOverride;
+import com.l2jserver.gameserver.model.punishment.PunishmentAffect;
+import com.l2jserver.gameserver.model.punishment.PunishmentTask;
+import com.l2jserver.gameserver.model.punishment.PunishmentType;
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Flood protector action implementation.
+ * @author fordfrog
+ * @author Zoey76
+ */
+public final class FloodProtectorAction {
+	private static final Logger LOG = LoggerFactory.getLogger(FloodProtectorAction.class);
+	
+	private final L2GameClient client;
+	
+	private final String type;
+	
+	private final int interval;
+	
+	private final boolean logFlooding;
+	
+	private final int punishmentLimit;
+	
+	private final String punishmentType;
+	
+	private final int punishmentTime;
+	
+	/** Next game tick when new request is allowed. */
+	private volatile int nextGameTick = GameTimeController.getInstance().getGameTicks();
+	
+	/** Request counter. */
+	private final AtomicInteger count = new AtomicInteger(0);
+	
+	/** Flag determining whether exceeding request has been logged. */
+	private boolean logged;
+	
+	/** Flag determining whether punishment application is in progress so that we do not apply punishment multiple times (flooding). */
+	private volatile boolean punishmentInProgress;
+	
+	/**
+	 * Creates new instance of FloodProtectorAction.
+	 * @param client the game client for which flood protection is being created
+	 * @param configName flood protector configuration
+	 */
+	public FloodProtectorAction(L2GameClient client, String configName) {
+		this.client = client;
+		type = configName;
+		interval = Integer.parseInt(floodProtector().getProperty(configName + "Interval"));
+		logFlooding = Boolean.parseBoolean(floodProtector().getProperty(configName + "LogFlooding"));
+		punishmentLimit = Integer.parseInt(floodProtector().getProperty(configName + "PunishmentLimit"));
+		punishmentType = floodProtector().getProperty(configName + "PunishmentType");
+		punishmentTime = Integer.parseInt(floodProtector().getProperty(configName + "PunishmentTime")) * 60_000;
+	}
+	
+	/**
+	 * Checks whether the request is flood protected or not.
+	 * @param command command issued or short command description
+	 * @return true if action is allowed, otherwise false
+	 */
+	public boolean tryPerformAction(final String command) {
+		final int curTick = GameTimeController.getInstance().getGameTicks();
+		
+		if ((client.getActiveChar() != null) && client.getActiveChar().canOverrideCond(PcCondOverride.FLOOD_CONDITIONS)) {
+			return true;
+		}
+		
+		if ((curTick < nextGameTick) || punishmentInProgress) {
+			if (logFlooding && !logged && LOG.isWarnEnabled()) {
+				log(" called command ", command, " ~", String.valueOf((interval - (nextGameTick - curTick)) * GameTimeController.MILLIS_IN_TICK), " ms after previous command");
+				logged = true;
+			}
+			
+			count.incrementAndGet();
+			
+			if (!punishmentInProgress && (punishmentLimit > 0) && (count.get() >= punishmentLimit) && (punishmentType != null)) {
+				punishmentInProgress = true;
+				
+				switch (punishmentType) {
+					case "kick" -> kickPlayer();
+					case "ban" -> banAccount();
+					case "jail" -> jailChar();
+				}
+				punishmentInProgress = false;
+			}
+			return false;
+		}
+		
+		if (count.get() > 0) {
+			if (logFlooding && LOG.isWarnEnabled()) {
+				log(" issued ", String.valueOf(count), " extra requests within ~", String.valueOf(interval * GameTimeController.MILLIS_IN_TICK), " ms");
+			}
+		}
+		
+		nextGameTick = curTick + interval;
+		logged = false;
+		count.set(0);
+		return true;
+	}
+	
+	/**
+	 * Kick player from game (close network connection).
+	 */
+	private void kickPlayer() {
+		if (client.getActiveChar() != null) {
+			client.getActiveChar().logout(false);
+		} else {
+			client.closeNow();
+		}
+		
+		if (LOG.isWarnEnabled()) {
+			log("kicked for flooding");
+		}
+	}
+	
+	/**
+	 * Bans char account and logs out the char.
+	 */
+	private void banAccount() {
+		PunishmentManager.getInstance().startPunishment(new PunishmentTask(client.getAccountName(), PunishmentAffect.ACCOUNT, PunishmentType.BAN, System.currentTimeMillis() + punishmentTime, "", getClass().getSimpleName()));
+		if (LOG.isWarnEnabled()) {
+			log(" banned for flooding ", punishmentTime <= 0 ? "forever" : "for " + (punishmentTime / 60000) + " mins");
+		}
+	}
+	
+	/**
+	 * Jails char.
+	 */
+	private void jailChar() {
+		if (client.getActiveChar() != null) {
+			int charId = client.getActiveChar().getObjectId();
+			if (charId > 0) {
+				PunishmentManager.getInstance().startPunishment(new PunishmentTask(charId, PunishmentAffect.CHARACTER, PunishmentType.JAIL, System.currentTimeMillis() + punishmentTime, "", getClass().getSimpleName()));
+			}
+			
+			if (LOG.isWarnEnabled()) {
+				log(" jailed for flooding ", punishmentTime <= 0 ? "forever" : "for " + (punishmentTime / 60000) + " mins");
+			}
+		}
+	}
+	
+	private void log(String... lines) {
+		final StringBuilder output = StringUtil.startAppend(100, type, ": ");
+		String address = null;
+		try {
+			if (!client.isDetached()) {
+				address = client.getConnection().getInetAddress().getHostAddress();
+			}
+		} catch (Exception e) {
+		}
+		
+		switch (client.getState()) {
+			case JOINING, IN_GAME -> {
+				if (client.getActiveChar() != null) {
+					StringUtil.append(output, client.getActiveChar().getName());
+					StringUtil.append(output, "(", String.valueOf(client.getActiveChar().getObjectId()), ") ");
+				}
+			}
+			case AUTHED -> {
+				if (client.getAccountName() != null) {
+					StringUtil.append(output, client.getAccountName(), " ");
+				}
+			}
+			case CONNECTED -> {
+				if (address != null) {
+					StringUtil.append(output, address);
+				}
+			}
+			default -> throw new IllegalStateException("Missing state on switch");
+		}
+		
+		StringUtil.append(output, lines);
+		LOG.warn(output.toString());
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/FloodProtectors.java b/src/main/java/com/l2jserver/gameserver/util/FloodProtectors.java
new file mode 100644
index 00000000..92028823
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/FloodProtectors.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import com.l2jserver.gameserver.network.L2GameClient;
+
+/**
+ * Collection of flood protectors for single player.
+ * @author fordfrog
+ */
+public final class FloodProtectors {
+	
+	private final FloodProtectorAction _useItem;
+	
+	private final FloodProtectorAction _rollDice;
+	
+	private final FloodProtectorAction _firework;
+	
+	private final FloodProtectorAction _itemPetSummon;
+	private final FloodProtectorAction _heroVoice;
+	
+	private final FloodProtectorAction _globalChat;
+	
+	private final FloodProtectorAction _subclass;
+	
+	private final FloodProtectorAction _dropItem;
+	
+	private final FloodProtectorAction _serverBypass;
+	
+	private final FloodProtectorAction _multiSell;
+	
+	private final FloodProtectorAction _transaction;
+	
+	private final FloodProtectorAction _manufacture;
+	
+	private final FloodProtectorAction _manor;
+	
+	private final FloodProtectorAction _sendMail;
+	
+	private final FloodProtectorAction _characterSelect;
+	
+	private final FloodProtectorAction _itemAuction;
+	
+	/**
+	 * Creates new instance of FloodProtectors.
+	 * @param client game client for which the collection of flood protectors is being created.
+	 */
+	public FloodProtectors(final L2GameClient client) {
+		_useItem = new FloodProtectorAction(client, "UseItem");
+		_rollDice = new FloodProtectorAction(client, "RollDice");
+		_firework = new FloodProtectorAction(client, "Firework");
+		_itemPetSummon = new FloodProtectorAction(client, "ItemPetSummon");
+		_heroVoice = new FloodProtectorAction(client, "HeroVoice");
+		_globalChat = new FloodProtectorAction(client, "GlobalChat");
+		_subclass = new FloodProtectorAction(client, "Subclass");
+		_dropItem = new FloodProtectorAction(client, "DropItem");
+		_serverBypass = new FloodProtectorAction(client, "ServerBypass");
+		_multiSell = new FloodProtectorAction(client, "MultiSell");
+		_transaction = new FloodProtectorAction(client, "Transaction");
+		_manufacture = new FloodProtectorAction(client, "Manufacture");
+		_manor = new FloodProtectorAction(client, "Manor");
+		_sendMail = new FloodProtectorAction(client, "SendMail");
+		_characterSelect = new FloodProtectorAction(client, "CharacterSelect");
+		_itemAuction = new FloodProtectorAction(client, "ItemAuction");
+	}
+	
+	public FloodProtectorAction getUseItem() {
+		return _useItem;
+	}
+	
+	public FloodProtectorAction getRollDice() {
+		return _rollDice;
+	}
+	
+	public FloodProtectorAction getFirework() {
+		return _firework;
+	}
+	
+	public FloodProtectorAction getItemPetSummon() {
+		return _itemPetSummon;
+	}
+	
+	public FloodProtectorAction getHeroVoice() {
+		return _heroVoice;
+	}
+	
+	public FloodProtectorAction getGlobalChat() {
+		return _globalChat;
+	}
+	
+	public FloodProtectorAction getSubclass() {
+		return _subclass;
+	}
+	
+	public FloodProtectorAction getDropItem() {
+		return _dropItem;
+	}
+	
+	public FloodProtectorAction getServerBypass() {
+		return _serverBypass;
+	}
+	
+	public FloodProtectorAction getMultiSell() {
+		return _multiSell;
+	}
+	
+	public FloodProtectorAction getTransaction() {
+		return _transaction;
+	}
+	
+	public FloodProtectorAction getManufacture() {
+		return _manufacture;
+	}
+	
+	public FloodProtectorAction getManor() {
+		return _manor;
+	}
+	
+	public FloodProtectorAction getSendMail() {
+		return _sendMail;
+	}
+	
+	public FloodProtectorAction getCharacterSelect() {
+		return _characterSelect;
+	}
+	
+	public FloodProtectorAction getItemAuction() {
+		return _itemAuction;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/GMAudit.java b/src/main/java/com/l2jserver/gameserver/util/GMAudit.java
new file mode 100644
index 00000000..a8c338f7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/GMAudit.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.config.Configuration;
+
+/**
+ * Audits Game Master's actions.
+ */
+public class GMAudit {
+	private static final Logger LOG = LoggerFactory.getLogger(GMAudit.class);
+	
+	static {
+		new File("log/GMAudit").mkdirs();
+	}
+	
+	/**
+	 * Logs a Game Master's action into a file.
+	 * @param gmName the Game Master's name
+	 * @param action the performed action
+	 * @param target the target's name
+	 * @param params the parameters
+	 */
+	public static void auditGMAction(String gmName, String action, String target, String params) {
+		final SimpleDateFormat _formatter = new SimpleDateFormat("dd/MM/yyyy H:mm:ss");
+		final String date = _formatter.format(new Date());
+		String name = com.l2jserver.commons.util.Util.replaceIllegalCharacters(gmName);
+		if (!com.l2jserver.commons.util.Util.isValidFileName(name)) {
+			name = "INVALID_GM_NAME_" + date;
+		}
+		
+		final File file = new File("log/GMAudit/" + name + ".txt");
+		try (FileWriter save = new FileWriter(file, true)) {
+			save.write(date + ">" + gmName + ">" + action + ">" + target + ">" + params + Configuration.EOL);
+		} catch (IOException e) {
+			LOG.error("GMAudit for GM {} could not be saved: ", gmName, e);
+		}
+	}
+	
+	/**
+	 * Wrapper method.
+	 * @param gmName the Game Master's name
+	 * @param action the performed action
+	 * @param target the target's name
+	 */
+	public static void auditGMAction(String gmName, String action, String target) {
+		auditGMAction(gmName, action, target, "");
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/GeoUtils.java b/src/main/java/com/l2jserver/gameserver/util/GeoUtils.java
new file mode 100644
index 00000000..9a6e6dc4
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/GeoUtils.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import java.awt.Color;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.network.serverpackets.ExServerPrimitive;
+import com.l2jserver.geodriver.Cell;
+
+/**
+ * @author HorridoJoho
+ */
+public final class GeoUtils {
+	public static void debug2DLine(L2PcInstance player, int x, int y, int tx, int ty, int z) {
+		int gx = GeoData.getInstance().getGeoX(x);
+		int gy = GeoData.getInstance().getGeoY(y);
+		
+		int tgx = GeoData.getInstance().getGeoX(tx);
+		int tgy = GeoData.getInstance().getGeoY(ty);
+		
+		ExServerPrimitive prim = new ExServerPrimitive("Debug2DLine", x, y, z);
+		prim.addLine(Color.BLUE, GeoData.getInstance().getWorldX(gx), GeoData.getInstance().getWorldY(gy), z, GeoData.getInstance().getWorldX(tgx), GeoData.getInstance().getWorldY(tgy), z);
+		
+		LinePointIterator iter = new LinePointIterator(gx, gy, tgx, tgy);
+		
+		while (iter.next()) {
+			int wx = GeoData.getInstance().getWorldX(iter.x());
+			int wy = GeoData.getInstance().getWorldY(iter.y());
+			
+			prim.addPoint(Color.RED, wx, wy, z);
+		}
+		player.sendPacket(prim);
+	}
+	
+	public static void debug3DLine(L2PcInstance player, int x, int y, int z, int tx, int ty, int tz) {
+		int gx = GeoData.getInstance().getGeoX(x);
+		int gy = GeoData.getInstance().getGeoY(y);
+		
+		int tgx = GeoData.getInstance().getGeoX(tx);
+		int tgy = GeoData.getInstance().getGeoY(ty);
+		
+		ExServerPrimitive prim = new ExServerPrimitive("Debug3DLine", x, y, z);
+		prim.addLine(Color.BLUE, GeoData.getInstance().getWorldX(gx), GeoData.getInstance().getWorldY(gy), z, GeoData.getInstance().getWorldX(tgx), GeoData.getInstance().getWorldY(tgy), tz);
+		
+		LinePointIterator3D iter = new LinePointIterator3D(gx, gy, z, tgx, tgy, tz);
+		iter.next();
+		int prevX = iter.x();
+		int prevY = iter.y();
+		int wx = GeoData.getInstance().getWorldX(prevX);
+		int wy = GeoData.getInstance().getWorldY(prevY);
+		int wz = iter.z();
+		prim.addPoint(Color.RED, wx, wy, wz);
+		
+		while (iter.next()) {
+			int curX = iter.x();
+			int curY = iter.y();
+			
+			if ((curX != prevX) || (curY != prevY)) {
+				wx = GeoData.getInstance().getWorldX(curX);
+				wy = GeoData.getInstance().getWorldY(curY);
+				wz = iter.z();
+				
+				prim.addPoint(Color.RED, wx, wy, wz);
+				
+				prevX = curX;
+				prevY = curY;
+			}
+		}
+		player.sendPacket(prim);
+	}
+	
+	private static Color getDirectionColor(int x, int y, int z, int nswe) {
+		if (GeoData.getInstance().checkNearestNswe(x, y, z, nswe)) {
+			return Color.GREEN;
+		}
+		return Color.RED;
+	}
+	
+	public static void debugGrid(L2PcInstance player) {
+		int geoRadius = 10;
+		int blocksPerPacket = 49;
+		
+		int iBlock = blocksPerPacket;
+		int iPacket = 0;
+		
+		ExServerPrimitive exsp = null;
+		GeoData gd = GeoData.getInstance();
+		int playerGx = gd.getGeoX(player.getX());
+		int playerGy = gd.getGeoY(player.getY());
+		for (int dx = -geoRadius; dx <= geoRadius; ++dx) {
+			for (int dy = -geoRadius; dy <= geoRadius; ++dy) {
+				if (iBlock >= blocksPerPacket) {
+					iBlock = 0;
+					if (exsp != null) {
+						++iPacket;
+						player.sendPacket(exsp);
+					}
+					exsp = new ExServerPrimitive("DebugGrid_" + iPacket, player.getX(), player.getY(), -16000);
+				}
+				
+				int gx = playerGx + dx;
+				int gy = playerGy + dy;
+				
+				int x = gd.getWorldX(gx);
+				int y = gd.getWorldY(gy);
+				int z = gd.getNearestZ(gx, gy, player.getZ());
+				
+				// north arrow
+				Color col = getDirectionColor(gx, gy, z, Cell.NSWE_NORTH);
+				exsp.addLine(col, x - 1, y - 7, z, x + 1, y - 7, z);
+				exsp.addLine(col, x - 2, y - 6, z, x + 2, y - 6, z);
+				exsp.addLine(col, x - 3, y - 5, z, x + 3, y - 5, z);
+				exsp.addLine(col, x - 4, y - 4, z, x + 4, y - 4, z);
+				
+				// east arrow
+				col = getDirectionColor(gx, gy, z, Cell.NSWE_EAST);
+				exsp.addLine(col, x + 7, y - 1, z, x + 7, y + 1, z);
+				exsp.addLine(col, x + 6, y - 2, z, x + 6, y + 2, z);
+				exsp.addLine(col, x + 5, y - 3, z, x + 5, y + 3, z);
+				exsp.addLine(col, x + 4, y - 4, z, x + 4, y + 4, z);
+				
+				// south arrow
+				col = getDirectionColor(gx, gy, z, Cell.NSWE_SOUTH);
+				exsp.addLine(col, x - 1, y + 7, z, x + 1, y + 7, z);
+				exsp.addLine(col, x - 2, y + 6, z, x + 2, y + 6, z);
+				exsp.addLine(col, x - 3, y + 5, z, x + 3, y + 5, z);
+				exsp.addLine(col, x - 4, y + 4, z, x + 4, y + 4, z);
+				
+				col = getDirectionColor(gx, gy, z, Cell.NSWE_WEST);
+				exsp.addLine(col, x - 7, y - 1, z, x - 7, y + 1, z);
+				exsp.addLine(col, x - 6, y - 2, z, x - 6, y + 2, z);
+				exsp.addLine(col, x - 5, y - 3, z, x - 5, y + 3, z);
+				exsp.addLine(col, x - 4, y - 4, z, x - 4, y + 4, z);
+				
+				++iBlock;
+			}
+		}
+		
+		player.sendPacket(exsp);
+	}
+	
+	/**
+	 * difference between x values: never above 1<br>
+	 * difference between y values: never above 1
+	 * @param lastX
+	 * @param lastY
+	 * @param x
+	 * @param y
+	 * @return
+	 */
+	public static int computeNswe(int lastX, int lastY, int x, int y) {
+		if (x > lastX) // east
+		{
+			if (y > lastY) {
+				return Cell.NSWE_SOUTH_EAST;// Direction.SOUTH_EAST;
+			} else if (y < lastY) {
+				return Cell.NSWE_NORTH_EAST;// Direction.NORTH_EAST;
+			} else {
+				return Cell.NSWE_EAST;// Direction.EAST;
+			}
+		} else if (x < lastX) // west
+		{
+			if (y > lastY) {
+				return Cell.NSWE_SOUTH_WEST;// Direction.SOUTH_WEST;
+			} else if (y < lastY) {
+				return Cell.NSWE_NORTH_WEST;// Direction.NORTH_WEST;
+			} else {
+				return Cell.NSWE_WEST;// Direction.WEST;
+			}
+		} else
+		// unchanged x
+		{
+			if (y > lastY) {
+				return Cell.NSWE_SOUTH;// Direction.SOUTH;
+			} else if (y < lastY) {
+				return Cell.NSWE_NORTH;// Direction.NORTH;
+			} else {
+				throw new RuntimeException();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/HtmlUtil.java b/src/main/java/com/l2jserver/gameserver/util/HtmlUtil.java
new file mode 100644
index 00000000..c8565e85
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/HtmlUtil.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.function.Function;
+
+import com.l2jserver.gameserver.model.PageResult;
+
+/**
+ * A class containing useful methods for constructing HTML
+ * @author NosBit
+ */
+public class HtmlUtil {
+	/**
+	 * Gets the HTML representation of CP gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getCpGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_CP_bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_CP_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of HP gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getHpGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_HP_bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_HP_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of HP Warn gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getHpWarnGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_HPWarn_bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_HPWarn_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of HP Fill gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getHpFillGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_HPFill_bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_HPFill_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of MP Warn gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getMpGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_MP_bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_MP_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of EXP Warn gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getExpGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_EXP_bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_EXP_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of Food gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getFoodGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_Food_Bg_Center", "L2UI_CT1.Gauges.Gauge_DF_Large_Food_Center", 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of Weight gauge automatically changing level depending on current/max.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @return the HTML
+	 */
+	public static String getWeightGauge(int width, long current, long max, boolean displayAsPercentage) {
+		return getWeightGauge(width, current, max, displayAsPercentage, Util.map(current, 0, max, 1, 5));
+	}
+	
+	/**
+	 * Gets the HTML representation of Weight gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @param level a number from 1 to 5 for the 5 different colors of weight gauge
+	 * @return the HTML
+	 */
+	public static String getWeightGauge(int width, long current, long max, boolean displayAsPercentage, long level) {
+		return getGauge(width, current, max, displayAsPercentage, "L2UI_CT1.Gauges.Gauge_DF_Large_Weight_bg_Center" + level, "L2UI_CT1.Gauges.Gauge_DF_Large_Weight_Center" + level, 17, -13);
+	}
+	
+	/**
+	 * Gets the HTML representation of a gauge.
+	 * @param width the width
+	 * @param current the current value
+	 * @param max the max value
+	 * @param displayAsPercentage if {@code true} the text in middle will be displayed as percent else it will be displayed as "current / max"
+	 * @param backgroundImage the background image
+	 * @param image the foreground image
+	 * @param imageHeight the image height
+	 * @param top the top adjustment
+	 * @return the HTML
+	 */
+	private static String getGauge(int width, long current, long max, boolean displayAsPercentage, String backgroundImage, String image, long imageHeight, long top) {
+		current = Math.min(current, max);
+		final StringBuilder sb = new StringBuilder();
+		StringUtil.append(sb, "<table width=", String.valueOf(width), " cellpadding=0 cellspacing=0><tr><td background=\"" + backgroundImage + "\">");
+		StringUtil.append(sb, "<img src=\"" + image + "\" width=", String.valueOf((long) (((double) current / max) * width)), " height=", String.valueOf(imageHeight), ">");
+		StringUtil.append(sb, "</td></tr><tr><td align=center><table cellpadding=0 cellspacing=", String.valueOf(top), "><tr><td>");
+		if (displayAsPercentage) {
+			StringUtil.append(sb, "<table cellpadding=0 cellspacing=2><tr><td>", String.format("%.2f%%", ((double) current / max) * 100), "</td></tr></table>");
+		} else {
+			final String tdWidth = String.valueOf((width - 10) / 2);
+			StringUtil.append(sb, "<table cellpadding=0 cellspacing=0><tr><td width=" + tdWidth + " align=right>", String.valueOf(current), "</td>");
+			StringUtil.append(sb, "<td width=10 align=center>/</td><td width=" + tdWidth + ">", String.valueOf(max), "</td></tr></table>");
+		}
+		StringUtil.append(sb, "</td></tr></table></td></tr></table>");
+		return sb.toString();
+	}
+	
+	public static <T> PageResult createPage(Collection<T> elements, int page, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction) {
+		return createPage(elements, elements.size(), page, elementsPerPage, pagerFunction, bodyFunction);
+	}
+	
+	public static <T> PageResult createPage(T[] elements, int page, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction) {
+		return createPage(Arrays.asList(elements), elements.length, page, elementsPerPage, pagerFunction, bodyFunction);
+	}
+	
+	public static <T> PageResult createPage(Iterable<T> elements, int size, int page, int elementsPerPage, Function<Integer, String> pagerFunction, Function<T, String> bodyFunction) {
+		int pages = size / elementsPerPage;
+		if ((elementsPerPage * pages) < size) {
+			pages++;
+		}
+		
+		final StringBuilder pagerTemplate = new StringBuilder();
+		if (pages > 1) {
+			int breakit = 0;
+			for (int i = 0; i < pages; i++) {
+				pagerTemplate.append(pagerFunction.apply(i));
+				breakit++;
+				
+				if (breakit > 5) {
+					pagerTemplate.append("</tr><tr>");
+					breakit = 0;
+				}
+			}
+		}
+		
+		if (page >= pages) {
+			page = pages - 1;
+		}
+		
+		int start = 0;
+		if (page > 0) {
+			start = elementsPerPage * page;
+		}
+		
+		final StringBuilder sb = new StringBuilder();
+		int i = 0;
+		for (T element : elements) {
+			if (i++ < start) {
+				continue;
+			}
+			
+			sb.append(bodyFunction.apply(element));
+			
+			if (i >= (elementsPerPage + start)) {
+				break;
+			}
+		}
+		return new PageResult(pages, pagerTemplate, sb);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/IXmlReader.java b/src/main/java/com/l2jserver/gameserver/util/IXmlReader.java
new file mode 100644
index 00000000..e365d528
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/IXmlReader.java
@@ -0,0 +1,573 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.io.FileFilter;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.SAXParseException;
+
+import com.l2jserver.gameserver.util.file.filter.XMLFilter;
+
+/**
+ * Interface for XML parsers.
+ * @author Zoey76
+ */
+public interface IXmlReader {
+	
+	Logger LOG = LoggerFactory.getLogger(IXmlReader.class);
+	
+	String JAXP_SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage";
+	
+	String W3C_XML_SCHEMA = "http://www.w3.org/2001/XMLSchema";
+	
+	/** The default file filter, ".xml" files only. */
+	XMLFilter XML_FILTER = new XMLFilter();
+	
+	/**
+	 * This method can be used to load/reload the data.<br>
+	 * It's highly recommended to clear the data storage, either the list or map.
+	 */
+	void load();
+	
+	/**
+	 * Wrapper for {@link #parseFile(File)} method.
+	 * @param path the relative path to the datapack root of the XML file to parse.
+	 */
+	default void parseDatapackFile(String path) {
+		parseFile(new File(server().getDatapackRoot(), path));
+	}
+	
+	/**
+	 * Parses a single XML file.<br>
+	 * If the file was successfully parsed, call {@link #parseDocument(Document, File)} for the parsed document.<br>
+	 * <b>Validation is enforced.</b>
+	 * @param f the XML file to parse.
+	 */
+	default void parseFile(File f) {
+		if (!getCurrentFileFilter().accept(f)) {
+			LOG.warn("{}: Could not parse {} is not a file or it doesn't exist!", getClass().getSimpleName(), f.getName());
+			return;
+		}
+		
+		final var dbf = DocumentBuilderFactory.newInstance();
+		dbf.setNamespaceAware(true);
+		dbf.setValidating(true);
+		dbf.setIgnoringComments(true);
+		try {
+			dbf.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
+			final var db = dbf.newDocumentBuilder();
+			db.setErrorHandler(new XMLErrorHandler());
+			parseDocument(db.parse(f), f);
+		} catch (SAXParseException e) {
+			LOG.warn("{}: Could not parse file {} at line {}, column {}", getClass().getSimpleName(), f.getName(), e.getLineNumber(), e.getColumnNumber(), e);
+		} catch (Exception e) {
+			LOG.warn("{}: Could not parse file {}", getClass().getSimpleName(), f.getName(), e);
+		}
+	}
+	
+	/**
+	 * Loads all XML files from {@code path} and calls {@link #parseFile(File)} for each one of them.
+	 * @param dir the directory object to scan.
+	 * @param recursive parses all sub folders if there is.
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise.
+	 */
+	default boolean parseDirectory(File dir, boolean recursive) {
+		if (!dir.exists()) {
+			LOG.warn("{}: Folder {} doesn't exist!", getClass().getSimpleName(), dir.getAbsolutePath());
+			return false;
+		}
+		
+		final var files = dir.listFiles();
+		if (files != null) {
+			for (var file : files) {
+				if (recursive && file.isDirectory()) {
+					parseDirectory(file, recursive);
+				} else if (getCurrentFileFilter().accept(file)) {
+					parseFile(file);
+				}
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Wrapper for {@link #parseDirectory(File, boolean)}.
+	 * @param path the path to the directory where the XML files are
+	 * @param recursive parses all sub folders if there is
+	 * @return {@code false} if it fails to find the directory, {@code true} otherwise
+	 */
+	default boolean parseDatapackDirectory(String path, boolean recursive) {
+		return parseDirectory(new File(server().getDatapackRoot(), path), recursive);
+	}
+	
+	/**
+	 * Abstract method that when implemented will parse the current document.<br>
+	 * Is expected to be call from {@link #parseFile(File)}.
+	 * @param doc the current document to parse
+	 * @param f the current file
+	 */
+	default void parseDocument(Document doc, File f) {
+		parseDocument(doc);
+	}
+	
+	/**
+	 * Abstract method that when implemented will parse the current document.<br>
+	 * Is expected to be call from {@link #parseFile(File)}.
+	 * @param doc the current document to parse
+	 */
+	default void parseDocument(Document doc) {
+		LOG.error("{}: Parser not implemented!", getClass().getSimpleName());
+	}
+	
+	/**
+	 * Parses a boolean value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Boolean parseBoolean(Node node, Boolean defaultValue) {
+		return node != null ? Boolean.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses a boolean value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Boolean parseBoolean(Node node) {
+		return parseBoolean(node, null);
+	}
+	
+	/**
+	 * Parses a boolean value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Boolean parseBoolean(NamedNodeMap attrs, String name) {
+		return parseBoolean(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a boolean value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Boolean parseBoolean(NamedNodeMap attrs, String name, Boolean defaultValue) {
+		return parseBoolean(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses a byte value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Byte parseByte(Node node, Byte defaultValue) {
+		return node != null ? Byte.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses a byte value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Byte parseByte(Node node) {
+		return parseByte(node, null);
+	}
+	
+	/**
+	 * Parses a byte value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Byte parseByte(NamedNodeMap attrs, String name) {
+		return parseByte(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a byte value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Byte parseByte(NamedNodeMap attrs, String name, Byte defaultValue) {
+		return parseByte(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses a short value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Short parseShort(Node node, Short defaultValue) {
+		return node != null ? Short.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses a short value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Short parseShort(Node node) {
+		return parseShort(node, null);
+	}
+	
+	/**
+	 * Parses a short value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Short parseShort(NamedNodeMap attrs, String name) {
+		return parseShort(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a short value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Short parseShort(NamedNodeMap attrs, String name, Short defaultValue) {
+		return parseShort(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses an int value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default int parseInt(Node node, Integer defaultValue) {
+		return node != null ? Integer.parseInt(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses an int value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default int parseInt(Node node) {
+		return parseInt(node, -1);
+	}
+	
+	/**
+	 * Parses an integer value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Integer parseInteger(Node node, Integer defaultValue) {
+		return node != null ? Integer.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses an integer value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Integer parseInteger(Node node) {
+		return parseInteger(node, null);
+	}
+	
+	/**
+	 * Parses an integer value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Integer parseInteger(NamedNodeMap attrs, String name) {
+		return parseInteger(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses an integer value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Integer parseInteger(NamedNodeMap attrs, String name, Integer defaultValue) {
+		return parseInteger(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses a long value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Long parseLong(Node node, Long defaultValue) {
+		return node != null ? Long.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses a long value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Long parseLong(Node node) {
+		return parseLong(node, null);
+	}
+	
+	/**
+	 * Parses a long value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Long parseLong(NamedNodeMap attrs, String name) {
+		return parseLong(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a long value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Long parseLong(NamedNodeMap attrs, String name, Long defaultValue) {
+		return parseLong(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses a float value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Float parseFloat(Node node, Float defaultValue) {
+		return node != null ? Float.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses a float value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Float parseFloat(Node node) {
+		return parseFloat(node, null);
+	}
+	
+	/**
+	 * Parses a float value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Float parseFloat(NamedNodeMap attrs, String name) {
+		return parseFloat(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a float value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Float parseFloat(NamedNodeMap attrs, String name, Float defaultValue) {
+		return parseFloat(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses a double value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Double parseDouble(Node node, Double defaultValue) {
+		return node != null ? Double.valueOf(node.getNodeValue()) : defaultValue;
+	}
+	
+	/**
+	 * Parses a double value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Double parseDouble(Node node) {
+		return parseDouble(node, null);
+	}
+	
+	/**
+	 * Parses a double value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default Double parseDouble(NamedNodeMap attrs, String name) {
+		return parseDouble(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a double value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default Double parseDouble(NamedNodeMap attrs, String name, Double defaultValue) {
+		return parseDouble(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses a string value.
+	 * @param node the node to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default String parseString(Node node, String defaultValue) {
+		return node != null ? node.getNodeValue() : defaultValue;
+	}
+	
+	/**
+	 * Parses a string value.
+	 * @param node the node to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default String parseString(Node node) {
+		return parseString(node, null);
+	}
+	
+	/**
+	 * Parses a string value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null, the value of the parsed node, otherwise null
+	 */
+	default String parseString(NamedNodeMap attrs, String name) {
+		return parseString(attrs.getNamedItem(name));
+	}
+	
+	/**
+	 * Parses a string value.
+	 * @param attrs the attributes
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null, the value of the parsed node, otherwise the default value
+	 */
+	default String parseString(NamedNodeMap attrs, String name, String defaultValue) {
+		return parseString(attrs.getNamedItem(name), defaultValue);
+	}
+	
+	/**
+	 * Parses an enumerated value.
+	 * @param <T> the enumerated type
+	 * @param node the node to parse
+	 * @param clazz the class of the enumerated
+	 * @param defaultValue the default value
+	 * @return if the node is not null and the node value is valid the parsed value, otherwise the default value
+	 */
+	default <T extends Enum<T>> T parseEnum(Node node, Class<T> clazz, T defaultValue) {
+		if (node == null) {
+			return defaultValue;
+		}
+		
+		try {
+			return Enum.valueOf(clazz, node.getNodeValue());
+		} catch (IllegalArgumentException e) {
+			LOG.warn("Invalid value specified for node: {} specified value: {} should be enum value of \"{}\" using default value: {}", node.getNodeName(), node.getNodeValue(), clazz.getSimpleName(), defaultValue);
+			return defaultValue;
+		}
+	}
+	
+	/**
+	 * Parses an enumerated value.
+	 * @param <T> the enumerated type
+	 * @param node the node to parse
+	 * @param clazz the class of the enumerated
+	 * @return if the node is not null and the node value is valid the parsed value, otherwise null
+	 */
+	default <T extends Enum<T>> T parseEnum(Node node, Class<T> clazz) {
+		return parseEnum(node, clazz, null);
+	}
+	
+	/**
+	 * Parses an enumerated value.
+	 * @param <T> the enumerated type
+	 * @param attrs the attributes
+	 * @param clazz the class of the enumerated
+	 * @param name the name of the attribute to parse
+	 * @return if the node is not null and the node value is valid the parsed value, otherwise null
+	 */
+	default <T extends Enum<T>> T parseEnum(NamedNodeMap attrs, Class<T> clazz, String name) {
+		return parseEnum(attrs.getNamedItem(name), clazz);
+	}
+	
+	/**
+	 * Parses an enumerated value.
+	 * @param <T> the enumerated type
+	 * @param attrs the attributes
+	 * @param clazz the class of the enumerated
+	 * @param name the name of the attribute to parse
+	 * @param defaultValue the default value
+	 * @return if the node is not null and the node value is valid the parsed value, otherwise the default value
+	 */
+	default <T extends Enum<T>> T parseEnum(NamedNodeMap attrs, Class<T> clazz, String name, T defaultValue) {
+		return parseEnum(attrs.getNamedItem(name), clazz, defaultValue);
+	}
+	
+	/**
+	 * Gets the current file filter.
+	 * @return the current file filter
+	 */
+	default FileFilter getCurrentFileFilter() {
+		return XML_FILTER;
+	}
+	
+	/**
+	 * Simple XML error handler.
+	 * @author Zoey76
+	 */
+	class XMLErrorHandler implements ErrorHandler {
+		@Override
+		public void warning(SAXParseException e) throws SAXParseException {
+			throw e;
+		}
+		
+		@Override
+		public void error(SAXParseException e) throws SAXParseException {
+			throw e;
+		}
+		
+		@Override
+		public void fatalError(SAXParseException e) throws SAXParseException {
+			throw e;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/LinePointIterator.java b/src/main/java/com/l2jserver/gameserver/util/LinePointIterator.java
new file mode 100644
index 00000000..94e75691
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/LinePointIterator.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+/**
+ * @author HorridoJoho
+ */
+public final class LinePointIterator {
+	// src is moved towards dst in next()
+	private int _srcX;
+	private int _srcY;
+	private final int _dstX;
+	private final int _dstY;
+	
+	private final long _dx;
+	private final long _dy;
+	private final long _sx;
+	private final long _sy;
+	private long _error;
+	
+	private boolean _first;
+	
+	public LinePointIterator(int srcX, int srcY, int dstX, int dstY) {
+		_srcX = srcX;
+		_srcY = srcY;
+		_dstX = dstX;
+		_dstY = dstY;
+		_dx = Math.abs((long) dstX - srcX);
+		_dy = Math.abs((long) dstY - srcY);
+		_sx = srcX < dstX ? 1 : -1;
+		_sy = srcY < dstY ? 1 : -1;
+		
+		if (_dx >= _dy) {
+			_error = _dx / 2;
+		} else {
+			_error = _dy / 2;
+		}
+		
+		_first = true;
+	}
+	
+	public boolean next() {
+		if (_first) {
+			_first = false;
+			return true;
+		} else if (_dx >= _dy) {
+			if (_srcX != _dstX) {
+				_srcX += _sx;
+				
+				_error += _dy;
+				if (_error >= _dx) {
+					_srcY += _sy;
+					_error -= _dx;
+				}
+				
+				return true;
+			}
+		} else {
+			if (_srcY != _dstY) {
+				_srcY += _sy;
+				
+				_error += _dx;
+				if (_error >= _dy) {
+					_srcX += _sx;
+					_error -= _dy;
+				}
+				
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public int x() {
+		return _srcX;
+	}
+	
+	public int y() {
+		return _srcY;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/LinePointIterator3D.java b/src/main/java/com/l2jserver/gameserver/util/LinePointIterator3D.java
new file mode 100644
index 00000000..7f46c3b1
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/LinePointIterator3D.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+/**
+ * @author HorridoJoho
+ */
+public final class LinePointIterator3D {
+	private int _srcX;
+	private int _srcY;
+	private int _srcZ;
+	private final int _dstX;
+	private final int _dstY;
+	private final int _dstZ;
+	private final long _dx;
+	private final long _dy;
+	private final long _dz;
+	private final long _sx;
+	private final long _sy;
+	private final long _sz;
+	private long _error;
+	private long _error2;
+	private boolean _first;
+	
+	public LinePointIterator3D(int srcX, int srcY, int srcZ, int dstX, int dstY, int dstZ) {
+		_srcX = srcX;
+		_srcY = srcY;
+		_srcZ = srcZ;
+		_dstX = dstX;
+		_dstY = dstY;
+		_dstZ = dstZ;
+		_dx = Math.abs((long) dstX - srcX);
+		_dy = Math.abs((long) dstY - srcY);
+		_dz = Math.abs((long) dstZ - srcZ);
+		_sx = srcX < dstX ? 1 : -1;
+		_sy = srcY < dstY ? 1 : -1;
+		_sz = srcZ < dstZ ? 1 : -1;
+		
+		if ((_dx >= _dy) && (_dx >= _dz)) {
+			_error = _error2 = _dx / 2;
+		} else if ((_dy >= _dx) && (_dy >= _dz)) {
+			_error = _error2 = _dy / 2;
+		} else {
+			_error = _error2 = _dz / 2;
+		}
+		
+		_first = true;
+	}
+	
+	public boolean next() {
+		if (_first) {
+			_first = false;
+			return true;
+		} else if ((_dx >= _dy) && (_dx >= _dz)) {
+			if (_srcX != _dstX) {
+				_srcX += _sx;
+				
+				_error += _dy;
+				if (_error >= _dx) {
+					_srcY += _sy;
+					_error -= _dx;
+				}
+				
+				_error2 += _dz;
+				if (_error2 >= _dx) {
+					_srcZ += _sz;
+					_error2 -= _dx;
+				}
+				
+				return true;
+			}
+		} else if ((_dy >= _dx) && (_dy >= _dz)) {
+			if (_srcY != _dstY) {
+				_srcY += _sy;
+				
+				_error += _dx;
+				if (_error >= _dy) {
+					_srcX += _sx;
+					_error -= _dy;
+				}
+				
+				_error2 += _dz;
+				if (_error2 >= _dy) {
+					_srcZ += _sz;
+					_error2 -= _dy;
+				}
+				
+				return true;
+			}
+		} else {
+			if (_srcZ != _dstZ) {
+				_srcZ += _sz;
+				
+				_error += _dx;
+				if (_error >= _dz) {
+					_srcX += _sx;
+					_error -= _dz;
+				}
+				
+				_error2 += _dy;
+				if (_error2 >= _dz) {
+					_srcY += _sy;
+					_error2 -= _dz;
+				}
+				
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	public int x() {
+		return _srcX;
+	}
+	
+	public int y() {
+		return _srcY;
+	}
+	
+	public int z() {
+		return _srcZ;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/MinionList.java b/src/main/java/com/l2jserver/gameserver/util/MinionList.java
new file mode 100644
index 00000000..f176bdf8
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/MinionList.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.npc;
+
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.impl.NpcData;
+import com.l2jserver.gameserver.idfactory.IdFactory;
+import com.l2jserver.gameserver.model.Location;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.holders.MinionHolder;
+import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
+
+/**
+ * Minion List.
+ * @author luisantonioa
+ * @author DS
+ */
+public class MinionList {
+	private static final Logger LOG = LoggerFactory.getLogger(MinionList.class);
+	
+	protected final L2MonsterInstance _master;
+	/** List containing the current spawned minions */
+	private final List<L2MonsterInstance> _minionReferences = new CopyOnWriteArrayList<>();
+	/** List containing the cached deleted minions for reuse */
+	protected List<L2MonsterInstance> _reusedMinionReferences = null;
+	
+	public MinionList(L2MonsterInstance pMaster) {
+		if (pMaster == null) {
+			throw new NullPointerException("MinionList: master is null");
+		}
+		_master = pMaster;
+	}
+	
+	/**
+	 * @return list of the spawned (alive) minions.
+	 */
+	public List<L2MonsterInstance> getSpawnedMinions() {
+		return _minionReferences;
+	}
+	
+	/**
+	 * Manage the spawn of Minions.<BR>
+	 * <BR>
+	 * <B><U> Actions</U> :</B><BR>
+	 * <BR>
+	 * <li>Get the Minion data of all Minions that must be spawn</li>
+	 * <li>For each Minion type, spawn the amount of Minion needed</li><BR>
+	 * <BR>
+	 * @param minions
+	 */
+	public final void spawnMinions(final List<MinionHolder> minions) {
+		if (_master.isAlikeDead()) {
+			return;
+		}
+		
+		// List<MinionHolder> minions = _master.getTemplate().getParameters().getMinionList("Privates");
+		if (minions == null) {
+			return;
+		}
+		
+		int minionCount, minionId;
+		long minionsToSpawn;
+		for (MinionHolder minion : minions) {
+			minionCount = minion.getCount();
+			minionId = minion.getId();
+			
+			minionsToSpawn = minionCount - countSpawnedMinionsById(minionId);
+			if (minionsToSpawn > 0) {
+				for (int i = 0; i < minionsToSpawn; i++) {
+					spawnMinion(minionId);
+				}
+			}
+		}
+		// remove non-needed minions
+		deleteReusedMinions();
+	}
+	
+	/**
+	 * Delete all spawned minions and try to reuse them.
+	 */
+	public void deleteSpawnedMinions() {
+		if (!_minionReferences.isEmpty()) {
+			for (L2MonsterInstance minion : _minionReferences) {
+				if (minion != null) {
+					minion.setLeader(null);
+					DecayTaskManager.getInstance().add(minion);
+					if (_reusedMinionReferences != null) {
+						_reusedMinionReferences.add(minion);
+					}
+				}
+			}
+			_minionReferences.clear();
+		}
+	}
+	
+	/**
+	 * Delete all reused minions to prevent memory leaks.
+	 */
+	public void deleteReusedMinions() {
+		if (_reusedMinionReferences != null) {
+			_reusedMinionReferences.clear();
+		}
+	}
+	
+	/**
+	 * Called on the master spawn Old minions (from previous spawn) are deleted. If master can respawn - enabled reuse of the killed minions.
+	 */
+	public void onMasterSpawn() {
+		deleteSpawnedMinions();
+		
+		// if master has spawn and can respawn - try to reuse minions
+		if ((_reusedMinionReferences == null) && (_master.getTemplate().getParameters().getSet().get("SummonPrivateRate") == null) && !_master.getTemplate().getParameters().getMinionList("Privates").isEmpty() && (_master.getSpawn() != null) && _master.getSpawn().isRespawnEnabled()) {
+			_reusedMinionReferences = new CopyOnWriteArrayList<>();
+		}
+	}
+	
+	/**
+	 * Called on the minion spawn and added them in the list of the spawned minions.
+	 * @param minion
+	 */
+	public void onMinionSpawn(L2MonsterInstance minion) {
+		_minionReferences.add(minion);
+	}
+	
+	/**
+	 * Called on the master death/delete.
+	 * @param force if true - force delete of the spawned minions By default minions deleted only for raidbosses
+	 */
+	public void onMasterDie(boolean force) {
+		if (_master.isRaid() || force) {
+			deleteSpawnedMinions();
+		}
+	}
+	
+	/**
+	 * Called on the minion death/delete. Removed minion from the list of the spawned minions and reuse if possible.
+	 * @param minion
+	 * @param respawnTime (ms) enable respawning of this minion while master is alive. -1 - use default value: 0 (disable) for mobs and config value for raids.
+	 */
+	public void onMinionDie(L2MonsterInstance minion, int respawnTime) {
+		minion.setLeader(null); // prevent memory leaks
+		_minionReferences.remove(minion);
+		if (_reusedMinionReferences != null) {
+			_reusedMinionReferences.add(minion);
+		}
+		
+		final long time = respawnTime < 0 ? _master.isRaid() ? npc().getRaidMinionRespawnTime() : 0 : respawnTime;
+		if ((time > 0) && !_master.isAlikeDead()) {
+			ThreadPoolManager.getInstance().scheduleGeneral(new MinionRespawnTask(minion), time);
+		}
+	}
+	
+	/**
+	 * Called if master/minion was attacked. Master and all free minions receive aggro against attacker.
+	 * @param caller
+	 * @param attacker
+	 */
+	public void onAssist(L2Character caller, L2Character attacker) {
+		if (attacker == null) {
+			return;
+		}
+		
+		if (!_master.isAlikeDead() && !_master.isInCombat()) {
+			_master.addDamageHate(attacker, 0, 1);
+		}
+		
+		final boolean callerIsMaster = caller == _master;
+		int aggro = callerIsMaster ? 10 : 1;
+		if (_master.isRaid()) {
+			aggro *= 10;
+		}
+		
+		for (L2MonsterInstance minion : _minionReferences) {
+			if ((minion != null) && !minion.isDead() && (callerIsMaster || !minion.isInCombat())) {
+				minion.addDamageHate(attacker, 0, aggro);
+			}
+		}
+	}
+	
+	/**
+	 * Called from onTeleported() of the master Alive and able to move minions teleported to master.
+	 */
+	public void onMasterTeleported() {
+		final int offset = 200;
+		final int minRadius = (int) _master.getCollisionRadius() + 30;
+		
+		for (L2MonsterInstance minion : _minionReferences) {
+			if ((minion != null) && !minion.isDead() && !minion.isMovementDisabled()) {
+				int newX = Rnd.get(minRadius * 2, offset * 2); // x
+				int newY = Rnd.get(newX, offset * 2); // distance
+				newY = (int) Math.sqrt((newY * newY) - (newX * newX)); // y
+				if (newX > (offset + minRadius)) {
+					newX = (_master.getX() + newX) - offset;
+				} else {
+					newX = (_master.getX() - newX) + minRadius;
+				}
+				if (newY > (offset + minRadius)) {
+					newY = (_master.getY() + newY) - offset;
+				} else {
+					newY = (_master.getY() - newY) + minRadius;
+				}
+				
+				minion.teleToLocation(new Location(newX, newY, _master.getZ()));
+			}
+		}
+	}
+	
+	private void spawnMinion(int minionId) {
+		if (minionId == 0) {
+			return;
+		}
+		// searching in reused minions
+		if (_reusedMinionReferences != null) {
+			final L2MonsterInstance minion = _reusedMinionReferences.stream().filter(m -> (m.getId() == minionId)).findFirst().orElse(null);
+			if (minion != null) {
+				_reusedMinionReferences.remove(minion);
+				minion.refreshID();
+				initializeNpcInstance(_master, minion);
+				return;
+			}
+		}
+		// not found in cache
+		spawnMinion(_master, minionId);
+	}
+	
+	private final class MinionRespawnTask implements Runnable {
+		private final L2MonsterInstance _minion;
+		
+		public MinionRespawnTask(L2MonsterInstance minion) {
+			_minion = minion;
+		}
+		
+		@Override
+		public void run() {
+			if (!_master.isAlikeDead() && _master.isVisible()) {
+				// minion can be already spawned or deleted
+				if (!_minion.isVisible()) {
+					if (_reusedMinionReferences != null) {
+						_reusedMinionReferences.remove(_minion);
+					}
+					
+					_minion.refreshID();
+					initializeNpcInstance(_master, _minion);
+				}
+			}
+		}
+	}
+	
+	/**
+	 * Init a Minion and add it in the world as a visible object.<BR>
+	 * <BR>
+	 * <B><U> Actions</U> :</B><BR>
+	 * <BR>
+	 * <li>Get the template of the Minion to spawn</li>
+	 * <li>Create and Init the Minion and generate its Identifier</li>
+	 * <li>Set the Minion HP, MP and Heading</li>
+	 * <li>Set the Minion leader to this RaidBoss</li>
+	 * <li>Init the position of the Minion and add it in the world as a visible object</li><BR>
+	 * <BR>
+	 * @param master L2MonsterInstance used as master for this minion
+	 * @param minionId The L2NpcTemplate Identifier of the Minion to spawn
+	 * @return
+	 */
+	public static L2MonsterInstance spawnMinion(L2MonsterInstance master, int minionId) {
+		final var objectId = IdFactory.getInstance().getNextId();
+		final var template = NpcData.getInstance().getTemplate(minionId);
+		return initializeNpcInstance(master, new L2MonsterInstance(objectId, template));
+	}
+	
+	protected static L2MonsterInstance initializeNpcInstance(L2MonsterInstance master, L2MonsterInstance minion) {
+		minion.stopAllEffects();
+		minion.setIsDead(false);
+		minion.setDecayed(false);
+		
+		// Set the Minion HP, MP and Heading
+		minion.setCurrentHpMp(minion.getMaxHp(), minion.getMaxMp());
+		minion.setHeading(master.getHeading());
+		
+		// Set the Minion leader to this RaidBoss
+		minion.setLeader(master);
+		
+		// move monster to masters instance
+		minion.setInstanceId(master.getInstanceId());
+		
+		// Init the position of the Minion and add it in the world as a visible object
+		final int offset = 200;
+		final int minRadius = (int) master.getCollisionRadius() + 30;
+		
+		int newX = Rnd.get(minRadius * 2, offset * 2); // x
+		int newY = Rnd.get(newX, offset * 2); // distance
+		newY = (int) Math.sqrt((newY * newY) - (newX * newX)); // y
+		if (newX > (offset + minRadius)) {
+			newX = (master.getX() + newX) - offset;
+		} else {
+			newX = (master.getX() - newX) + minRadius;
+		}
+		if (newY > (offset + minRadius)) {
+			newY = (master.getY() + newY) - offset;
+		} else {
+			newY = (master.getY() - newY) + minRadius;
+		}
+		
+		minion.spawnMe(newX, newY, master.getZ());
+		
+		if (general().debug()) {
+			LOG.info("Spawned minion template {} with object Id: {} to boss object Id {}, at: {} x, {} y, {} z", //
+				minion.getId(), minion.getObjectId(), master.getObjectId(), minion.getX(), minion.getY(), minion.getZ());
+		}
+		
+		return minion;
+	}
+	
+	private long countSpawnedMinionsById(int minionId) {
+		return _minionReferences.stream().filter(npc -> npc.getId() == minionId).count();
+	}
+	
+	public final int countSpawnedMinions() {
+		return _minionReferences.size();
+	}
+	
+	public final long lazyCountSpawnedMinionsGroups() {
+		return _minionReferences.stream().map(L2MonsterInstance::getId).distinct().count();
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/StringUtil.java b/src/main/java/com/l2jserver/gameserver/util/StringUtil.java
new file mode 100644
index 00000000..62937e82
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/StringUtil.java
@@ -0,0 +1,259 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+/**
+ * String utilities optimized for the best performance.<br>
+ * <h1>How to Use It</h1>
+ * <h2>concat() or append()</h2><br>
+ * If concatenating strings in single call, use StringUtil.concat(), otherwise use StringUtil.append() and its variants.<br>
+ * <br>
+ * <h2>Minimum Calls</h2><br>
+ * Bad:
+ * 
+ * <pre>
+ * final StringBuilder sbString = new StringBuilder();
+ * StringUtil.append(sbString, &quot;text 1&quot;, String.valueOf(npcId));
+ * StringUtil.append(&quot;text 2&quot;);
+ * </pre>
+ * 
+ * Good:
+ * 
+ * <pre>
+ * final StringBuilder sbString = new StringBuilder();
+ * StringUtil.append(sbString, &quot;text 1&quot;, String.valueOf(npcId), &quot;text 2&quot;);
+ * </pre>
+ * 
+ * Why?<br/>
+ * Because the less calls you do, the less memory re-allocations have to be done<br>
+ * so the whole text fits into the memory and less array copy tasks has to be<br>
+ * performed. So if using less calls, less memory is used and string concatenation is faster.<br>
+ * <br>
+ * <h2>Size Hints for Loops</h2><br>
+ * Bad:
+ * 
+ * <pre>
+ * final StringBuilder sbString = new StringBuilder();
+ * StringUtil.append(sbString, &quot;header start&quot;, someText, &quot;header end&quot;);
+ * for (int i = 0; i &lt; 50; i++) {
+ * 	StringUtil.append(sbString, &quot;text 1&quot;, stringArray[i], &quot;text 2&quot;);
+ * }
+ * </pre>
+ * 
+ * Good:
+ * 
+ * <pre>
+ * final StringBuilder sbString = StringUtil.startAppend(1300, &quot;header start&quot;, someText, &quot;header end&quot;);
+ * for (int i = 0; i &lt; 50; i++) {
+ * 	StringUtil.append(sbString, &quot;text 1&quot;, stringArray[i], &quot;text 2&quot;);
+ * }
+ * </pre>
+ * 
+ * Why?<br/>
+ * When using StringUtil.append(), memory is only allocated to fit in the strings in method argument. So on each loop new memory for the string has to be allocated and old string has to be copied to the new string. With size hint, even if the size hint is above the needed memory, memory is saved
+ * because new memory has not to be allocated on each cycle. Also it is much faster if no string copy tasks has to be performed. So if concatenating strings in a loop, count approximately the size and set it as the hint for the string builder size. It's better to make the size hint little bit larger
+ * rather than smaller.<br/>
+ * In case there is no text appended before the cycle, just use <code>new
+ * StringBuilder(1300)</code>.<br>
+ * <br>
+ * <h2>Concatenation and Constants</h2><br>
+ * Bad:
+ * 
+ * <pre>
+ * StringUtil.concat(&quot;text 1 &quot;, &quot;text 2&quot;, String.valueOf(npcId));
+ * </pre>
+ * 
+ * Good:
+ * 
+ * <pre>
+ * StringUtil.concat(&quot;text 1 &quot; + &quot;text 2&quot;, String.valueOf(npcId));
+ * </pre>
+ * 
+ * or
+ * 
+ * <pre>
+ * StringUtil.concat(&quot;text 1 text 2&quot;, String.valueOf(npcId));
+ * </pre>
+ * 
+ * Why?<br/>
+ * It saves some cycles when determining size of memory that needs to be allocated because less strings are passed to concat() method. But do not use + for concatenation of non-constant strings, that degrades performance and makes extra memory allocations needed.<br>
+ * <h2>Concatenation and Constant Variables</h2> Bad:
+ * 
+ * <pre>
+ * String glue = &quot;some glue&quot;;
+ * StringUtil.concat(&quot;text 1&quot;, glue, &quot;text 2&quot;, glue, String.valueOf(npcId));
+ * </pre>
+ * 
+ * Good:
+ * 
+ * <pre>
+ * final String glue = &quot;some glue&quot;;
+ * StringUtil.concat(&quot;text 1&quot; + glue + &quot;text2&quot; + glue, String.valueOf(npcId));
+ * </pre>
+ * 
+ * Why? Because when using <code>final</code> keyword, the <code>glue</code> is marked as constant string and compiler treats it as a constant string so it is able to create string "text1some gluetext2some glue" during the compilation. But this only works in case the value is known at compilation
+ * time, so this cannot be used for cases like <code>final String objectIdString =
+ * String.valueOf(getObjectId)</code>.<br>
+ * <br>
+ * <h2>StringBuilder Reuse</h2><br>
+ * Bad:
+ * 
+ * <pre>
+ * final StringBuilder sbString1 = new StringBuilder();
+ * StringUtil.append(sbString1, &quot;text 1&quot;, String.valueOf(npcId), &quot;text 2&quot;);
+ * ... // output of sbString1, it is no more needed
+ * final StringBuilder sbString2 = new StringBuilder();
+ * StringUtil.append(sbString2, &quot;text 3&quot;, String.valueOf(npcId), &quot;text 4&quot;);
+ * </pre>
+ * 
+ * Good:
+ * 
+ * <pre>
+ * final StringBuilder sbString = new StringBuilder();
+ * StringUtil.append(sbString, &quot;text 1&quot;, String.valueOf(npcId), &quot;text 2&quot;);
+ * ... // output of sbString, it is no more needed
+ * sbString.setLength(0);
+ * StringUtil.append(sbString, &quot;text 3&quot;, String.valueOf(npcId), &quot;text 4&quot;);
+ * </pre>
+ * 
+ * Why?</br>
+ * In first case, new memory has to be allocated for the second string. In second case already allocated memory is reused, but only in case the new string is not longer than the previously allocated string. Anyway, the second way is better because the string either fits in the memory and some memory
+ * is saved, or it does not fit in the memory, and in that case it works as in the first case.
+ * <h2>Primitives to Strings</h2> To convert primitives to string, use String.valueOf().<br>
+ * <br>
+ * <h2>How much faster is it?</h2><br>
+ * Here are some results of my tests. Count is number of strings concatenated. Don't take the numbers as 100% true as the numbers are affected by other programs running on my computer at the same time. Anyway, from the results it is obvious that using StringBuilder with predefined size is the
+ * fastest (and also most memory efficient) solution. It is about 5 times faster when concatenating 7 strings, compared to TextBuilder. Also, with more strings concatenated, the difference between StringBuilder and TextBuilder gets larger. In code, there are many cases, where there are concatenated
+ * 50+ strings so the time saving is even greater.<br>
+ * 
+ * <pre>
+ * Count: 2
+ * TextBuilder: 1893
+ * TextBuilder with size: 1703
+ * String: 1033
+ * StringBuilder: 993
+ * StringBuilder with size: 1024
+ * Count: 3
+ * TextBuilder: 1973
+ * TextBuilder with size: 1872
+ * String: 2583
+ * StringBuilder: 1633
+ * StringBuilder with size: 1156
+ * Count: 4
+ * TextBuilder: 2188
+ * TextBuilder with size: 2229
+ * String: 4207
+ * StringBuilder: 1816
+ * StringBuilder with size: 1444
+ * Count: 5
+ * TextBuilder: 9185
+ * TextBuilder with size: 9464
+ * String: 6937
+ * StringBuilder: 2745
+ * StringBuilder with size: 1882
+ * Count: 6
+ * TextBuilder: 9785
+ * TextBuilder with size: 10082
+ * String: 9471
+ * StringBuilder: 2889
+ * StringBuilder with size: 1857
+ * Count: 7
+ * TextBuilder: 10169
+ * TextBuilder with size: 10528
+ * String: 12746
+ * StringBuilder: 3081
+ * StringBuilder with size: 2139
+ * </pre>
+ * 
+ * @author fordfrog
+ */
+public final class StringUtil {
+	private StringUtil() {
+	}
+	
+	/**
+	 * Concatenates strings.
+	 * @param strings strings to be concatenated
+	 * @return concatenated string
+	 */
+	public static String concat(final String... strings) {
+		final StringBuilder sbString = new StringBuilder();
+		for (final String string : strings) {
+			sbString.append(string);
+		}
+		return sbString.toString();
+	}
+	
+	/**
+	 * Creates new string builder with size initialized to <code>sizeHint</code>, unless total length of strings is greater than <code>sizeHint</code>.
+	 * @param sizeHint hint for string builder size allocation
+	 * @param strings strings to be appended
+	 * @return created string builder
+	 */
+	public static StringBuilder startAppend(final int sizeHint, final String... strings) {
+		final int length = getLength(strings);
+		final StringBuilder sbString = new StringBuilder(Math.max(sizeHint, length));
+		for (final String string : strings) {
+			sbString.append(string);
+		}
+		return sbString;
+	}
+	
+	/**
+	 * Appends strings to existing string builder.
+	 * @param sbString string builder
+	 * @param strings strings to be appended
+	 */
+	public static void append(final StringBuilder sbString, final String... strings) {
+		sbString.ensureCapacity(sbString.length() + getLength(strings));
+		
+		for (final String string : strings) {
+			sbString.append(string);
+		}
+	}
+	
+	public static int getLength(final Iterable<String> strings) {
+		int length = 0;
+		for (final String string : strings) {
+			length += (string == null) ? 4 : string.length();
+		}
+		return length;
+	}
+	
+	/**
+	 * Counts total length of all the strings.
+	 * @param strings array of strings
+	 * @return total length of all the strings
+	 */
+	public static int getLength(final String[] strings) {
+		int length = 0;
+		for (final String string : strings) {
+			length += (string == null) ? 4 : string.length();
+		}
+		return length;
+	}
+	
+	public static String getTraceString(StackTraceElement[] trace) {
+		final StringBuilder sbString = new StringBuilder();
+		for (final StackTraceElement element : trace) {
+			sbString.append(element.toString()).append(System.lineSeparator());
+		}
+		return sbString.toString();
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/Util.java b/src/main/java/com/l2jserver/gameserver/util/Util.java
new file mode 100644
index 00000000..88e11f71
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/Util.java
@@ -0,0 +1,851 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util;
+
+import static com.l2jserver.gameserver.config.Configuration.general;
+import static com.l2jserver.gameserver.config.Configuration.server;
+
+import java.io.File;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Locale;
+import java.util.StringJoiner;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.enums.HtmlActionScope;
+import com.l2jserver.gameserver.enums.IllegalActionPunishmentType;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.tasks.player.IllegalPlayerActionTask;
+import com.l2jserver.gameserver.model.interfaces.ILocational;
+import com.l2jserver.gameserver.network.serverpackets.AbstractHtmlPacket;
+import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.network.serverpackets.ShowBoard;
+import com.l2jserver.gameserver.util.file.filter.ExtFilter;
+
+/**
+ * General Utility functions related to game server.
+ */
+public final class Util {
+	
+	private static final Logger LOG = LoggerFactory.getLogger(Util.class);
+	
+	private static final NumberFormat ADENA_FORMATTER = NumberFormat.getIntegerInstance(Locale.ENGLISH);
+	
+	public static void handleIllegalPlayerAction(L2PcInstance actor, String message) {
+		handleIllegalPlayerAction(actor, message, general().getDefaultPunish());
+	}
+	
+	public static void handleIllegalPlayerAction(L2PcInstance actor, String message, IllegalActionPunishmentType punishment) {
+		ThreadPoolManager.getInstance().scheduleGeneral(new IllegalPlayerActionTask(actor, message, punishment), 5000);
+	}
+	
+	/**
+	 * @param from
+	 * @param to
+	 * @return degree value of object 2 to the horizontal line with object 1 being the origin.
+	 */
+	public static double calculateAngleFrom(ILocational from, ILocational to) {
+		return calculateAngleFrom(from.getX(), from.getY(), to.getX(), to.getY());
+	}
+	
+	/**
+	 * @param fromX
+	 * @param fromY
+	 * @param toX
+	 * @param toY
+	 * @return degree value of object 2 to the horizontal line with object 1 being the origin
+	 */
+	public static double calculateAngleFrom(int fromX, int fromY, int toX, int toY) {
+		double angleTarget = Math.toDegrees(Math.atan2(toY - fromY, toX - fromX));
+		if (angleTarget < 0) {
+			angleTarget = 360 + angleTarget;
+		}
+		return angleTarget;
+	}
+	
+	public static double convertHeadingToDegree(int clientHeading) {
+		return clientHeading / 182.044444444;
+	}
+	
+	public static int convertDegreeToClientHeading(double degree) {
+		if (degree < 0) {
+			degree = 360 + degree;
+		}
+		return (int) (degree * 182.044444444);
+	}
+	
+	public static int calculateHeadingFrom(ILocational from, ILocational to) {
+		return calculateHeadingFrom(from.getX(), from.getY(), to.getX(), to.getY());
+	}
+	
+	public static int calculateHeadingFrom(int fromX, int fromY, int toX, int toY) {
+		double angleTarget = Math.toDegrees(Math.atan2(toY - fromY, toX - fromX));
+		if (angleTarget < 0) {
+			angleTarget = 360 + angleTarget;
+		}
+		return (int) (angleTarget * 182.044444444);
+	}
+	
+	public static int calculateHeadingFrom(double dx, double dy) {
+		double angleTarget = Math.toDegrees(Math.atan2(dy, dx));
+		if (angleTarget < 0) {
+			angleTarget = 360 + angleTarget;
+		}
+		return (int) (angleTarget * 182.044444444);
+	}
+	
+	/**
+	 * Calculates distance between one set of x, y, z and another set of x, y, z.
+	 * @param x1 - X coordinate of first point.
+	 * @param y1 - Y coordinate of first point.
+	 * @param z1 - Z coordinate of first point.
+	 * @param x2 - X coordinate of second point.
+	 * @param y2 - Y coordinate of second point.
+	 * @param z2 - Z coordinate of second point.
+	 * @param includeZAxis - If set to true, Z coordinates will be included.
+	 * @param squared - If set to true, distance returned will be squared.
+	 * @return {@code double} - Distance between object and given x, y , z.
+	 */
+	public static double calculateDistance(double x1, double y1, double z1, double x2, double y2, double z2, boolean includeZAxis, boolean squared) {
+		final double distance = Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2) + (includeZAxis ? Math.pow(z1 - z2, 2) : 0);
+		return (squared) ? distance : Math.sqrt(distance);
+	}
+	
+	/**
+	 * Calculates distance between 2 locations.
+	 * @param loc1 - First location.
+	 * @param loc2 - Second location.
+	 * @param includeZAxis - If set to true, Z coordinates will be included.
+	 * @param squared - If set to true, distance returned will be squared.
+	 * @return {@code double} - Distance between object and given location.
+	 */
+	public static double calculateDistance(ILocational loc1, ILocational loc2, boolean includeZAxis, boolean squared) {
+		return calculateDistance(loc1.getX(), loc1.getY(), loc1.getZ(), loc2.getX(), loc2.getY(), loc2.getZ(), includeZAxis, squared);
+	}
+	
+	/**
+	 * @param str - the string whose first letter to capitalize
+	 * @return a string with the first letter of the {@code str} capitalized
+	 */
+	public static String capitalizeFirst(String str) {
+		if ((str == null) || str.isEmpty()) {
+			return str;
+		}
+		final char[] arr = str.toCharArray();
+		final char c = arr[0];
+		
+		if (Character.isLetter(c)) {
+			arr[0] = Character.toUpperCase(c);
+		}
+		return new String(arr);
+	}
+	
+	/**
+	 * (Based on ucwords() function of PHP)<br>
+	 * DrHouse: still functional but must be rewritten to avoid += to concat strings
+	 * @param str - the string to capitalize
+	 * @return a string with the first letter of every word in {@code str} capitalized
+	 */
+	@Deprecated
+	public static String capitalizeWords(String str) {
+		if ((str == null) || str.isEmpty()) {
+			return str;
+		}
+		
+		char[] charArray = str.toCharArray();
+		StringBuilder result = new StringBuilder();
+		
+		// Capitalize the first letter in the given string!
+		charArray[0] = Character.toUpperCase(charArray[0]);
+		
+		for (int i = 0; i < charArray.length; i++) {
+			if (Character.isWhitespace(charArray[i])) {
+				charArray[i + 1] = Character.toUpperCase(charArray[i + 1]);
+			}
+			
+			result.append(charArray[i]);
+		}
+		
+		return result.toString();
+	}
+	
+	/**
+	 * @param range
+	 * @param obj1
+	 * @param obj2
+	 * @param includeZAxis
+	 * @return {@code true} if the two objects are within specified range between each other, {@code false} otherwise
+	 */
+	public static boolean checkIfInRange(int range, L2Object obj1, L2Object obj2, boolean includeZAxis) {
+		if ((obj1 == null) || (obj2 == null)) {
+			return false;
+		}
+		if (obj1.getInstanceId() != obj2.getInstanceId()) {
+			return false;
+		}
+		if (range == -1) {
+			return true; // not limited
+		}
+		
+		int rad = 0;
+		if (obj1 instanceof L2Character) {
+			rad += ((L2Character) obj1).getTemplate().getCollisionRadius();
+		}
+		if (obj2 instanceof L2Character) {
+			rad += ((L2Character) obj2).getTemplate().getCollisionRadius();
+		}
+		
+		double d = Math.hypot(obj1.getX() - obj2.getX(), obj1.getY() - obj2.getY());
+		if (includeZAxis) {
+			d = Math.hypot(d, obj1.getZ() - obj2.getZ());
+		}
+		return (d - (rad / 2.0)) <= range;
+	}
+	
+	/**
+	 * Checks if object is within short (sqrt(int.max_value)) radius, not using collisionRadius. Faster calculation than checkIfInRange if distance is short and collisionRadius isn't needed. Not for long distance checks (potential teleports, far away castles etc).
+	 * @param radius
+	 * @param obj1
+	 * @param obj2
+	 * @param includeZAxis if true, check also Z axis (3-dimensional check), otherwise only 2D
+	 * @return {@code true} if objects are within specified range between each other, {@code false} otherwise
+	 */
+	public static boolean checkIfInShortRadius(int radius, L2Object obj1, L2Object obj2, boolean includeZAxis) {
+		if ((obj1 == null) || (obj2 == null)) {
+			return false;
+		}
+		if (radius == -1) {
+			return true; // not limited
+		}
+		
+		double d = Math.hypot(obj1.getX() - obj2.getX(), obj1.getY() - obj2.getY());
+		if (includeZAxis) {
+			return Math.hypot(d, obj1.getZ() - obj2.getZ()) <= radius;
+		}
+		return d <= radius;
+	}
+	
+	/**
+	 * @param str - the String to count
+	 * @return the number of "words" in a given string.
+	 */
+	public static int countWords(String str) {
+		return str.trim().split("\\s+").length;
+	}
+	
+	/**
+	 * (Based on implode() in PHP)
+	 * @param strings an array of strings to concatenate
+	 * @param delimiter the delimiter to put between the strings
+	 * @return a delimited string for a given array of string elements.
+	 */
+	public static String implodeString(Iterable<String> strings, String delimiter) {
+		final StringJoiner sj = new StringJoiner(delimiter);
+		strings.forEach(sj::add);
+		return sj.toString();
+	}
+	
+	/**
+	 * Based on implode() in PHP
+	 * @param <T>
+	 * @param array
+	 * @param delimiter
+	 * @return a delimited string for a given array of string elements.
+	 */
+	public static <T> String implode(T[] array, String delimiter) {
+		StringBuilder result = new StringBuilder();
+		for (T val : array) {
+			result.append(val.toString()).append(delimiter);
+		}
+		if (result.length() > 0) {
+			result = new StringBuilder(result.substring(0, result.length() - 1));
+		}
+		return result.toString();
+	}
+	
+	/**
+	 * (Based on round() in PHP)
+	 * @param number - the number to round
+	 * @param numPlaces - how many digits after decimal point to leave intact
+	 * @return the value of {@code number} rounded to specified number of digits after the decimal point.
+	 */
+	public static float roundTo(float number, int numPlaces) {
+		if (numPlaces <= 1) {
+			return Math.round(number);
+		}
+		
+		float exponent = (float) Math.pow(10, numPlaces);
+		return Math.round(number * exponent) / exponent;
+	}
+	
+	/**
+	 * @param text - the text to check
+	 * @return {@code true} if {@code text} contains only numbers, {@code false} otherwise
+	 */
+	public static boolean isDigit(String text) {
+		if ((text == null) || text.isEmpty()) {
+			return false;
+		}
+		for (char c : text.toCharArray()) {
+			if (!Character.isDigit(c)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * @param text - the text to check
+	 * @return {@code true} if {@code text} contains only letters and/or numbers, {@code false} otherwise
+	 */
+	public static boolean isAlphaNumeric(String text) {
+		if ((text == null) || text.isEmpty()) {
+			return false;
+		}
+		for (char c : text.toCharArray()) {
+			if (!Character.isLetterOrDigit(c)) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	/**
+	 * Format the specified digit using the digit grouping symbol "," (comma).<br>
+	 * For example, 123456789 becomes 123,456,789.
+	 * @param amount - the amount of adena
+	 * @return the formatted adena amount
+	 */
+	public static String formatAdena(long amount) {
+		synchronized (ADENA_FORMATTER) {
+			return ADENA_FORMATTER.format(amount);
+		}
+	}
+	
+	/**
+	 * @param val
+	 * @param format
+	 * @return formatted double value by specified format.
+	 */
+	public static String formatDouble(double val, String format) {
+		final DecimalFormat formatter = new DecimalFormat(format, new DecimalFormatSymbols(Locale.ENGLISH));
+		return formatter.format(val);
+	}
+	
+	/**
+	 * Format the given date on the given format
+	 * @param date : the date to format.
+	 * @param format : the format to correct by.
+	 * @return a string representation of the formatted date.
+	 */
+	public static String formatDate(Date date, String format) {
+		if (date == null) {
+			return null;
+		}
+		final DateFormat dateFormat = new SimpleDateFormat(format);
+		return dateFormat.format(date);
+	}
+	
+	/**
+	 * @param <T>
+	 * @param array - the array to look into
+	 * @param obj - the object to search for
+	 * @return {@code true} if the {@code array} contains the {@code obj}, {@code false} otherwise.
+	 */
+	public static <T> boolean contains(T[] array, T obj) {
+		for (T element : array) {
+			if (element == obj) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @param array - the array to look into
+	 * @param obj - the integer to search for
+	 * @return {@code true} if the {@code array} contains the {@code obj}, {@code false} otherwise
+	 */
+	public static boolean contains(int[] array, int obj) {
+		for (int element : array) {
+			if (element == obj) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	public static File[] getDatapackFiles(String dirname, String extension) {
+		File dir = new File(server().getDatapackRoot(), "data/" + dirname);
+		if (!dir.exists()) {
+			return null;
+		}
+		return dir.listFiles(new ExtFilter(extension));
+	}
+	
+	public static String getDateString(Date date) {
+		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+		return dateFormat.format(date.getTime());
+	}
+	
+	private static void buildHtmlBypassCache(L2PcInstance player, HtmlActionScope scope, String html) {
+		String htmlLower = html.toLowerCase(Locale.ENGLISH);
+		int bypassEnd = 0;
+		int bypassStart = htmlLower.indexOf("=\"bypass ", bypassEnd);
+		int bypassStartEnd;
+		while (bypassStart != -1) {
+			bypassStartEnd = bypassStart + 9;
+			bypassEnd = htmlLower.indexOf("\"", bypassStartEnd);
+			if (bypassEnd == -1) {
+				break;
+			}
+			
+			int hParamPos = htmlLower.indexOf("-h ", bypassStartEnd);
+			String bypass;
+			if ((hParamPos != -1) && (hParamPos < bypassEnd)) {
+				bypass = html.substring(hParamPos + 3, bypassEnd).trim();
+			} else {
+				bypass = html.substring(bypassStartEnd, bypassEnd).trim();
+			}
+			
+			int firstParameterStart = bypass.indexOf(AbstractHtmlPacket.VAR_PARAM_START_CHAR);
+			if (firstParameterStart != -1) {
+				bypass = bypass.substring(0, firstParameterStart + 1);
+			}
+			
+			if (general().htmlActionCacheDebug()) {
+				LOG.info("Cached html bypass({}): '{}'", scope.toString(), bypass);
+			}
+			player.addHtmlAction(scope, bypass);
+			bypassStart = htmlLower.indexOf("=\"bypass ", bypassEnd);
+		}
+	}
+	
+	private static void buildHtmlLinkCache(L2PcInstance player, HtmlActionScope scope, String html) {
+		String htmlLower = html.toLowerCase(Locale.ENGLISH);
+		int linkEnd = 0;
+		int linkStart = htmlLower.indexOf("=\"link ", linkEnd);
+		int linkStartEnd;
+		while (linkStart != -1) {
+			linkStartEnd = linkStart + 7;
+			linkEnd = htmlLower.indexOf("\"", linkStartEnd);
+			if (linkEnd == -1) {
+				break;
+			}
+			
+			String htmlLink = html.substring(linkStartEnd, linkEnd).trim();
+			if (htmlLink.isEmpty()) {
+				LOG.warn("Html link path is empty!");
+				continue;
+			}
+			
+			if (htmlLink.contains("..")) {
+				LOG.warn("Html link path is invalid {}!", htmlLink);
+				continue;
+			}
+			
+			if (general().htmlActionCacheDebug()) {
+				LOG.info("Cached html link({}): '{}'", scope.toString(), htmlLink);
+			}
+			// let's keep an action cache with "link " lowercase literal kept
+			player.addHtmlAction(scope, "link " + htmlLink);
+			linkStart = htmlLower.indexOf("=\"link ", linkEnd);
+		}
+	}
+	
+	/**
+	 * Builds the html action cache for the specified scope.<br>
+	 * An {@code npcObjId} of 0 means, the cached actions can be clicked<br>
+	 * without being near an npc which is spawned in the world.
+	 * @param player the player to build the html action cache for
+	 * @param scope the scope to build the html action cache for
+	 * @param npcObjId the npc object id the html actions are cached for
+	 * @param html the html code to parse
+	 */
+	public static void buildHtmlActionCache(L2PcInstance player, HtmlActionScope scope, int npcObjId, String html) {
+		if ((player == null) || (scope == null) || (npcObjId < 0) || (html == null)) {
+			throw new IllegalArgumentException();
+		}
+		
+		if (general().htmlActionCacheDebug()) {
+			LOG.info("Set html action npc({}): {}", scope.toString(), npcObjId);
+		}
+		player.setHtmlActionOriginObjectId(scope, npcObjId);
+		buildHtmlBypassCache(player, scope, html);
+		buildHtmlLinkCache(player, scope, html);
+	}
+	
+	/**
+	 * Helper method to send a NpcHtmlMessage to the specified player.
+	 * @param activeChar the player to send the html content to
+	 * @param html the html content
+	 */
+	public static void sendHtml(L2PcInstance activeChar, String html) {
+		final NpcHtmlMessage npcHtml = new NpcHtmlMessage();
+		npcHtml.setHtml(html);
+		activeChar.sendPacket(npcHtml);
+	}
+	
+	/**
+	 * Helper method to send a community board html to the specified player.<br>
+	 * HtmlActionCache will be build with npc origin 0 which means the<br>
+	 * links on the html are not bound to a specific npc.
+	 * @param activeChar the player
+	 * @param html the html content
+	 */
+	public static void sendCBHtml(L2PcInstance activeChar, String html) {
+		sendCBHtml(activeChar, html, 0);
+	}
+	
+	/**
+	 * Helper method to send a community board html to the specified player.<br>
+	 * When {@code npcObjId} is greater -1 the HtmlActionCache will be build<br>
+	 * with the npcObjId as origin. An origin of 0 means the cached bypasses<br>
+	 * are not bound to a specific npc.
+	 * @param activeChar the player to send the html content to
+	 * @param html the html content
+	 * @param npcObjId bypass origin to use
+	 */
+	public static void sendCBHtml(L2PcInstance activeChar, String html, int npcObjId) {
+		sendCBHtml(activeChar, html, null, npcObjId);
+	}
+	
+	/**
+	 * Helper method to send a community board html to the specified player.<br>
+	 * HtmlActionCache will be build with npc origin 0 which means the<br>
+	 * links on the html are not bound to a specific npc. It also fills a<br>
+	 * multiedit field in the send html if fillMultiEdit is not null.
+	 * @param activeChar the player
+	 * @param html the html content
+	 * @param fillMultiEdit text to fill the multiedit field with(may be null)
+	 */
+	public static void sendCBHtml(L2PcInstance activeChar, String html, String fillMultiEdit) {
+		sendCBHtml(activeChar, html, fillMultiEdit, 0);
+	}
+	
+	/**
+	 * Helper method to send a community board html to the specified player.<br>
+	 * It fills a multiedit field in the send html if {@code fillMultiEdit}<br>
+	 * is not null. When {@code npcObjId} is greater -1 the HtmlActionCache will be build<br>
+	 * with the npcObjId as origin. An origin of 0 means the cached bypasses<br>
+	 * are not bound to a specific npc.
+	 * @param activeChar the player
+	 * @param html the html content
+	 * @param fillMultiEdit text to fill the multiedit field with(may be null)
+	 * @param npcObjId bypass origin to use
+	 */
+	public static void sendCBHtml(L2PcInstance activeChar, String html, String fillMultiEdit, int npcObjId) {
+		if ((activeChar == null) || (html == null)) {
+			return;
+		}
+		
+		activeChar.clearHtmlActions(HtmlActionScope.COMM_BOARD_HTML);
+		
+		if (npcObjId > -1) {
+			buildHtmlActionCache(activeChar, HtmlActionScope.COMM_BOARD_HTML, npcObjId, html);
+		}
+		
+		if (fillMultiEdit != null) {
+			activeChar.sendPacket(new ShowBoard(html, "1001"));
+			fillMultiEditContent(activeChar, fillMultiEdit);
+		} else {
+			if (html.length() < 16250) {
+				activeChar.sendPacket(new ShowBoard(html, "101"));
+				activeChar.sendPacket(new ShowBoard(null, "102"));
+				activeChar.sendPacket(new ShowBoard(null, "103"));
+			} else if (html.length() < (16250 * 2)) {
+				activeChar.sendPacket(new ShowBoard(html.substring(0, 16250), "101"));
+				activeChar.sendPacket(new ShowBoard(html.substring(16250), "102"));
+				activeChar.sendPacket(new ShowBoard(null, "103"));
+			} else if (html.length() < (16250 * 3)) {
+				activeChar.sendPacket(new ShowBoard(html.substring(0, 16250), "101"));
+				activeChar.sendPacket(new ShowBoard(html.substring(16250, 16250 * 2), "102"));
+				activeChar.sendPacket(new ShowBoard(html.substring(16250 * 2), "103"));
+			} else {
+				activeChar.sendPacket(new ShowBoard("<html><body><br><center>Error: HTML was too long!</center></body></html>", "101"));
+				activeChar.sendPacket(new ShowBoard(null, "102"));
+				activeChar.sendPacket(new ShowBoard(null, "103"));
+			}
+		}
+	}
+	
+	/**
+	 * Fills the community board's multiedit window with text. Must send after sendCBHtml
+	 * @param activeChar
+	 * @param text
+	 */
+	public static void fillMultiEditContent(L2PcInstance activeChar, String text) {
+		activeChar.sendPacket(new ShowBoard(Arrays.asList("0", "0", "0", "0", "0", "0", activeChar.getName(), Integer.toString(activeChar.getObjectId()), activeChar.getAccountName(), "9", " ", " ", text.replaceAll("<br>", Configuration.EOL), "0", "0", "0", "0")));
+	}
+	
+	/**
+	 * Return the number of playable characters in a defined radius around the specified object.
+	 * @param range : the radius in which to look for players
+	 * @param npc : the object whose knownlist to check
+	 * @param playable : if {@code true}, count summons and pets as well
+	 * @param invisible : if {@code true}, count invisible characters as well
+	 * @return the number of targets found
+	 */
+	public static int getPlayersCountInRadius(int range, L2Object npc, boolean playable, boolean invisible) {
+		int count = 0;
+		final Collection<L2Object> objs = npc.getKnownList().getKnownObjects().values();
+		for (L2Object obj : objs) {
+			if ((obj != null) && (playable && (obj.isPlayable() || obj.isPet()))) {
+				if (!invisible && obj.isInvisible()) {
+					continue;
+				}
+				
+				final L2Character cha = (L2Character) obj;
+				if (((cha.getZ() < (npc.getZ() - 100)) && (cha.getZ() > (npc.getZ() + 100))) || !(GeoData.getInstance().canSeeTarget(cha.getX(), cha.getY(), cha.getZ(), npc.getX(), npc.getY(), npc.getZ()))) {
+					continue;
+				}
+				
+				if (Util.checkIfInRange(range, npc, obj, true) && !cha.isDead()) {
+					count++;
+				}
+			}
+		}
+		return count;
+	}
+	
+	public static boolean isInsideRangeOfObjectId(L2Object obj, int targetObjId, int radius) {
+		L2Object target = obj.getKnownList().getKnownObjects().get(targetObjId);
+		if (target == null) {
+			return false;
+		}
+		return !(obj.calculateDistance(target, false, false) > radius);
+	}
+	
+	public static int min(int value1, int value2, int... values) {
+		int min = Math.min(value1, value2);
+		for (int value : values) {
+			if (min > value) {
+				min = value;
+			}
+		}
+		return min;
+	}
+	
+	public static int max(int value1, int value2, int... values) {
+		int max = Math.max(value1, value2);
+		for (int value : values) {
+			if (max < value) {
+				max = value;
+			}
+		}
+		return max;
+	}
+	
+	public static long min(long value1, long value2, long... values) {
+		long min = Math.min(value1, value2);
+		for (long value : values) {
+			if (min > value) {
+				min = value;
+			}
+		}
+		return min;
+	}
+	
+	public static long max(long value1, long value2, long... values) {
+		long max = Math.max(value1, value2);
+		for (long value : values) {
+			if (max < value) {
+				max = value;
+			}
+		}
+		return max;
+	}
+	
+	public static float min(float value1, float value2, float... values) {
+		float min = Math.min(value1, value2);
+		for (float value : values) {
+			if (min > value) {
+				min = value;
+			}
+		}
+		return min;
+	}
+	
+	public static float max(float value1, float value2, float... values) {
+		float max = Math.max(value1, value2);
+		for (float value : values) {
+			if (max < value) {
+				max = value;
+			}
+		}
+		return max;
+	}
+	
+	public static double min(double value1, double value2, double... values) {
+		double min = Math.min(value1, value2);
+		for (double value : values) {
+			if (min > value) {
+				min = value;
+			}
+		}
+		return min;
+	}
+	
+	public static double max(double value1, double value2, double... values) {
+		double max = Math.max(value1, value2);
+		for (double value : values) {
+			if (max < value) {
+				max = value;
+			}
+		}
+		return max;
+	}
+	
+	public static int getIndexOfMaxValue(int... array) {
+		int index = 0;
+		for (int i = 1; i < array.length; i++) {
+			if (array[i] > array[index]) {
+				index = i;
+			}
+		}
+		return index;
+	}
+	
+	public static int getIndexOfMinValue(int... array) {
+		int index = 0;
+		for (int i = 1; i < array.length; i++) {
+			if (array[i] < array[index]) {
+				index = i;
+			}
+		}
+		return index;
+	}
+	
+	/**
+	 * Re-Maps a value from one range to another.
+	 * @param input
+	 * @param inputMin
+	 * @param inputMax
+	 * @param outputMin
+	 * @param outputMax
+	 * @return The mapped value
+	 */
+	public static int map(int input, int inputMin, int inputMax, int outputMin, int outputMax) {
+		input = constrain(input, inputMin, inputMax);
+		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+	}
+	
+	/**
+	 * Re-Maps a value from one range to another.
+	 * @param input
+	 * @param inputMin
+	 * @param inputMax
+	 * @param outputMin
+	 * @param outputMax
+	 * @return The mapped value
+	 */
+	public static long map(long input, long inputMin, long inputMax, long outputMin, long outputMax) {
+		input = constrain(input, inputMin, inputMax);
+		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+	}
+	
+	/**
+	 * Re-Maps a value from one range to another.
+	 * @param input
+	 * @param inputMin
+	 * @param inputMax
+	 * @param outputMin
+	 * @param outputMax
+	 * @return The mapped value
+	 */
+	public static double map(double input, double inputMin, double inputMax, double outputMin, double outputMax) {
+		input = constrain(input, inputMin, inputMax);
+		return (((input - inputMin) * (outputMax - outputMin)) / (inputMax - inputMin)) + outputMin;
+	}
+	
+	/**
+	 * Constrains a number to be within a range.
+	 * @param input the number to constrain, all data types
+	 * @param min the lower end of the range, all data types
+	 * @param max the upper end of the range, all data types
+	 * @return input: if input is between min and max, min: if input is less than min, max: if input is greater than max
+	 */
+	public static int constrain(int input, int min, int max) {
+		return (input < min) ? min : Math.min(input, max);
+	}
+	
+	/**
+	 * Constrains a number to be within a range.
+	 * @param input the number to constrain, all data types
+	 * @param min the lower end of the range, all data types
+	 * @param max the upper end of the range, all data types
+	 * @return input: if input is between min and max, min: if input is less than min, max: if input is greater than max
+	 */
+	public static long constrain(long input, long min, long max) {
+		return (input < min) ? min : Math.min(input, max);
+	}
+	
+	/**
+	 * Constrains a number to be within a range.
+	 * @param input the number to constrain, all data types
+	 * @param min the lower end of the range, all data types
+	 * @param max the upper end of the range, all data types
+	 * @return input: if input is between min and max, min: if input is less than min, max: if input is greater than max
+	 */
+	public static double constrain(double input, double min, double max) {
+		return (input < min) ? min : Math.min(input, max);
+	}
+	
+	/**
+	 * @param array - the array to look into
+	 * @param obj - the object to search for
+	 * @return {@code true} if the {@code array} contains the {@code obj}, {@code false} otherwise.
+	 */
+	public static boolean startsWith(String[] array, String obj) {
+		for (String element : array) {
+			if (element.startsWith(obj)) {
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @param array - the array to look into
+	 * @param obj - the object to search for
+	 * @param ignoreCase
+	 * @return {@code true} if the {@code array} contains the {@code obj}, {@code false} otherwise.
+	 */
+	public static boolean contains(String[] array, String obj, boolean ignoreCase) {
+		for (String element : array) {
+			if (element.equals(obj) || (ignoreCase && element.equalsIgnoreCase(obj))) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/file/filter/ExtFilter.java b/src/main/java/com/l2jserver/gameserver/util/file/filter/ExtFilter.java
new file mode 100644
index 00000000..59d855e7
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/file/filter/ExtFilter.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util.file.filter;
+
+import java.io.File;
+import java.io.FileFilter;
+
+/**
+ * Extension Filter.
+ * @author lasarus
+ */
+public class ExtFilter implements FileFilter {
+	private final String _ext;
+	
+	public ExtFilter(String ext) {
+		_ext = ext;
+	}
+	
+	@Override
+	public boolean accept(File f) {
+		return f.getName().toLowerCase().endsWith(_ext);
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/file/filter/HTMLFilter.java b/src/main/java/com/l2jserver/gameserver/util/file/filter/HTMLFilter.java
new file mode 100644
index 00000000..eead15e5
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/file/filter/HTMLFilter.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util.file.filter;
+
+import java.io.File;
+import java.io.FileFilter;
+
+/**
+ * Specialized {@link FileFilter} class.<br>
+ * Accepts <b>files</b> ending with ".htm" and ".html" only.
+ * @author Zoey76
+ */
+public class HTMLFilter implements FileFilter {
+	@Override
+	public boolean accept(File f) {
+		if ((f == null) || !f.isFile()) {
+			return false;
+		}
+		final String name = f.getName().toLowerCase();
+		return name.endsWith(".htm") || name.endsWith(".html");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/file/filter/NumericNameFilter.java b/src/main/java/com/l2jserver/gameserver/util/file/filter/NumericNameFilter.java
new file mode 100644
index 00000000..325aa31f
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/file/filter/NumericNameFilter.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util.file.filter;
+
+import java.io.File;
+import java.io.FileFilter;
+
+/**
+ * Specialized {@link FileFilter} class.<br>
+ * Accepts <b>files</b> matching "numbers".xml only.
+ * @author UnAfraid
+ */
+public class NumericNameFilter extends XMLFilter {
+	@Override
+	public boolean accept(File f) {
+		return super.accept(f) && f.getName().matches("\\d+\\.xml");
+	}
+}
diff --git a/src/main/java/com/l2jserver/gameserver/util/file/filter/PrimeFinder.java b/src/main/java/com/l2jserver/gameserver/util/file/filter/PrimeFinder.java
new file mode 100644
index 00000000..c4078877
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/file/filter/PrimeFinder.java
@@ -0,0 +1,350 @@
+/*
+ * Copyright (c) 1999 CERN - European Organization for Nuclear Research.
+ * 
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear in
+ * supporting documentation. CERN makes no representations about the
+ * suitability of this software for any purpose. It is provided "as is"
+ * without expressed or implied warranty.
+ */
+package com.l2jserver.gameserver.util.file.filter;
+
+import java.util.Arrays;
+
+/**
+ * <b>Modified for Trove to use the java.util.Arrays sort/search<br>
+ * algorithms instead of those provided with colt.</b><br>
+ * Used to keep hash table capacities prime numbers.<br>
+ * Not of interest for users; only for implementors of hashtables.<br>
+ * <p>
+ * Choosing prime numbers as hash table capacities is a good idea<br>
+ * to keep them working fast, particularly under hash table expansions.<br>
+ * <p>
+ * However, JDK 1.2, JGL 3.1 and many other toolkits do nothing to keep capacities prime.<br>
+ * This class provides efficient means to choose prime capacities.
+ * <p>
+ * Choosing a prime is <tt>O(log 300)</tt> (binary search in a list of 300 ints).<br>
+ * Memory requirements: 1 KB static memory.<br>
+ * @author wolfgang.hoschek@cern.ch
+ * @version 1.0, 09/24/99
+ */
+public final class PrimeFinder {
+	/**
+	 * The largest prime this class can generate; currently equal to <tt>Integer.MAX_VALUE</tt>.
+	 */
+	public static final int LARGEST_PRIME = Integer.MAX_VALUE; // yes, it is prime.
+	
+	/**
+	 * The prime number list consists of 11 chunks.<br>
+	 * Each chunk contains prime numbers.<br>
+	 * A chunk starts with a prime P1.<br>
+	 * The next element is a prime P2.<br>
+	 * P2 is the smallest prime for which holds: P2 >= 2*P1.<br>
+	 * The next element is P3, for which the same holds with respect to P2, and so on. Chunks are chosen such that for any desired capacity >= 1000<br>
+	 * the list includes a prime number <= desired capacity * 1.11.<br>
+	 * Therefore, primes can be retrieved which are quite close to any<br>
+	 * desired capacity, which in turn avoids wasting memory.<br>
+	 * For example, the list includes<br>
+	 * 1039,1117,1201,1277,1361,1439,1523,1597,1759,1907,2081.<br>
+	 * So if you need a prime >= 1040, you will find a prime &lt;= 1040*1.11=1154.<br>
+	 * Chunks are chosen such that they are optimized for a hashtable growthfactor of 2.0;<br>
+	 * If your hashtable has such a growthfactor then, after initially<br>
+	 * "rounding to a prime" upon hashtable construction, it will<br>
+	 * later expand to prime capacities such that there exist no better primes.<br>
+	 * In total these are about 32*10=320 numbers -> 1 KB of static memory needed.<br>
+	 * If you are stingy, then delete every second or fourth chunk.
+	 */
+	
+	private static final int[] PRIME_CAPACITIES = {
+		// chunk #0
+		LARGEST_PRIME,
+		
+		// chunk #1
+		5,
+		11,
+		23,
+		47,
+		97,
+		197,
+		397,
+		797,
+		1597,
+		3203,
+		6421,
+		12853,
+		25717,
+		51437,
+		102877,
+		205759,
+		411527,
+		823117,
+		1646237,
+		3292489,
+		6584983,
+		13169977,
+		26339969,
+		52679969,
+		105359939,
+		210719881,
+		421439783,
+		842879579,
+		1685759167,
+		
+		// chunk #2
+		433,
+		877,
+		1759,
+		3527,
+		7057,
+		14143,
+		28289,
+		56591,
+		113189,
+		226379,
+		452759,
+		905551,
+		1811107,
+		3622219,
+		7244441,
+		14488931,
+		28977863,
+		57955739,
+		115911563,
+		231823147,
+		463646329,
+		927292699,
+		1854585413,
+		
+		// chunk #3
+		953,
+		1907,
+		3821,
+		7643,
+		15287,
+		30577,
+		61169,
+		122347,
+		244703,
+		489407,
+		978821,
+		1957651,
+		3915341,
+		7830701,
+		15661423,
+		31322867,
+		62645741,
+		125291483,
+		250582987,
+		501165979,
+		1002331963,
+		2004663929,
+		
+		// chunk #4
+		1039,
+		2081,
+		4177,
+		8363,
+		16729,
+		33461,
+		66923,
+		133853,
+		267713,
+		535481,
+		1070981,
+		2141977,
+		4283963,
+		8567929,
+		17135863,
+		34271747,
+		68543509,
+		137087021,
+		274174111,
+		548348231,
+		1096696463,
+		
+		// chunk #5
+		31,
+		67,
+		137,
+		277,
+		557,
+		1117,
+		2237,
+		4481,
+		8963,
+		17929,
+		35863,
+		71741,
+		143483,
+		286973,
+		573953,
+		1147921,
+		2295859,
+		4591721,
+		9183457,
+		18366923,
+		36733847,
+		73467739,
+		146935499,
+		293871013,
+		587742049,
+		1175484103,
+		
+		// chunk #6
+		599,
+		1201,
+		2411,
+		4831,
+		9677,
+		19373,
+		38747,
+		77509,
+		155027,
+		310081,
+		620171,
+		1240361,
+		2480729,
+		4961459,
+		9922933,
+		19845871,
+		39691759,
+		79383533,
+		158767069,
+		317534141,
+		635068283,
+		1270136683,
+		
+		// chunk #7
+		311,
+		631,
+		1277,
+		2557,
+		5119,
+		10243,
+		20507,
+		41017,
+		82037,
+		164089,
+		328213,
+		656429,
+		1312867,
+		2625761,
+		5251529,
+		10503061,
+		21006137,
+		42012281,
+		84024581,
+		168049163,
+		336098327,
+		672196673,
+		1344393353,
+		
+		// chunk #8
+		3,
+		7,
+		17,
+		37,
+		79,
+		163,
+		331,
+		673,
+		1361,
+		2729,
+		5471,
+		10949,
+		21911,
+		43853,
+		87719,
+		175447,
+		350899,
+		701819,
+		1403641,
+		2807303,
+		5614657,
+		11229331,
+		22458671,
+		44917381,
+		89834777,
+		179669557,
+		359339171,
+		718678369,
+		1437356741,
+		
+		// chunk #9
+		43,
+		89,
+		179,
+		359,
+		719,
+		1439,
+		2879,
+		5779,
+		11579,
+		23159,
+		46327,
+		92657,
+		185323,
+		370661,
+		741337,
+		1482707,
+		2965421,
+		5930887,
+		11861791,
+		23723597,
+		47447201,
+		94894427,
+		189788857,
+		379577741,
+		759155483,
+		1518310967,
+		
+		// chunk #10
+		379,
+		761,
+		1523,
+		3049,
+		6101,
+		12203,
+		24407,
+		48817,
+		97649,
+		195311,
+		390647,
+		781301,
+		1562611,
+		3125257,
+		6250537,
+		12501169,
+		25002389,
+		50004791,
+		100009607,
+		200019221,
+		400038451,
+		800076929,
+		1600153859
+	};
+	
+	static { // initializer
+				// The above prime numbers are formatted for human readability.
+				// To find numbers fast, we sort them once and for all.
+		
+		Arrays.sort(PRIME_CAPACITIES);
+	}
+	
+	/**
+	 * Returns a prime number which is <code>&gt;= desiredCapacity</code> and very close to <code>desiredCapacity</code> (within 11% if <code>desiredCapacity &gt;= 1000</code>).
+	 * @param desiredCapacity the capacity desired by the user.
+	 * @return the capacity which should be used for a hashtable.
+	 */
+	public static int nextPrime(int desiredCapacity) {
+		int i = Arrays.binarySearch(PRIME_CAPACITIES, desiredCapacity);
+		if (i < 0) {
+			// desired capacity not found, choose next prime greater
+			// than desired capacity
+			i = -i - 1; // remember the semantics of binarySearch...
+		}
+		return PRIME_CAPACITIES[i];
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/l2jserver/gameserver/util/file/filter/XMLFilter.java b/src/main/java/com/l2jserver/gameserver/util/file/filter/XMLFilter.java
new file mode 100644
index 00000000..0051cf48
--- /dev/null
+++ b/src/main/java/com/l2jserver/gameserver/util/file/filter/XMLFilter.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.util.file.filter;
+
+import java.io.File;
+import java.io.FileFilter;
+
+/**
+ * Specialized {@link FileFilter} class.<br>
+ * Accepts files ending with ".xml" only.
+ * @author mrTJO
+ */
+public class XMLFilter implements FileFilter {
+	@Override
+	public boolean accept(File f) {
+		if ((f == null) || !f.isFile()) {
+			return false;
+		}
+		return f.getName().toLowerCase().endsWith(".xml");
+	}
+}
diff --git a/src/main/resources/GameServer_loop.sh b/src/main/resources/GameServer_loop.sh
new file mode 100644
index 00000000..a844fdab
--- /dev/null
+++ b/src/main/resources/GameServer_loop.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# exit codes of GameServer:
+#  0 normal shutdown
+#  2 reboot attempt
+
+while :; do
+	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
+	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
+	java -Xms512m -Xmx2g -jar l2jserver.jar > log/stdout.log 2>&1
+	[ $? -ne 2 ] && break
+	sleep 10
+done
diff --git a/src/main/resources/config/SecondaryAuth.xml b/src/main/resources/config/SecondaryAuth.xml
new file mode 100644
index 00000000..f8c06cbd
--- /dev/null
+++ b/src/main/resources/config/SecondaryAuth.xml
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SecondaryAuth.xsd">
+	<enabled>false</enabled> <!-- Enable Secondary Authentication on Character Select -->
+	<maxAttempts>5</maxAttempts> <!-- Max Attempts for Second Auth Password (0 to disable) -->
+	<banTime>480</banTime> <!-- Ban time if the user reaches maxAttempts (in minutes) -->
+	<recoveryLink>https://www.example.com/l2j/charPassRec.php</recoveryLink> <!-- Password Recovery Link -->
+	<forbiddenPasswords> <!-- List of forbidden passwords -->
+		<!-- Client checks for the entries below, so you should not remove or edit any of these just add more -->
+		<password>000000</password>
+		<password>111111</password>
+		<password>222222</password>
+		<password>333333</password>
+		<password>444444</password>
+		<password>555555</password>
+		<password>666666</password>
+		<password>777777</password>
+		<password>888888</password>
+		<password>999999</password>
+		<password>123456</password>
+		<password>234567</password>
+		<password>345678</password>
+		<password>456789</password>
+		<password>567890</password>
+		<password>012345</password>
+		<password>098765</password>
+		<password>987654</password>
+		<password>876543</password>
+		<password>765432</password>
+		<password>543210</password>
+		<password>010101</password>
+		<password>020202</password>
+		<password>030303</password>
+		<password>040404</password>
+		<password>050505</password>
+		<password>060606</password>
+		<password>070707</password>
+		<password>080808</password>
+		<password>090909</password>
+		<password>121212</password>
+		<password>131313</password>
+		<password>141414</password>
+		<password>151515</password>
+		<password>161616</password>
+		<password>171717</password>
+		<password>181818</password>
+		<password>191919</password>
+		<password>101010</password>
+		<password>212121</password>
+		<password>232323</password>
+		<password>242424</password>
+		<password>252525</password>
+		<password>262626</password>
+		<password>272727</password>
+		<password>282828</password>
+		<password>292929</password>
+		<password>202020</password>
+		<password>313131</password>
+		<password>323232</password>
+		<password>343434</password>
+		<password>353535</password>
+		<password>363636</password>
+		<password>373737</password>
+		<password>383838</password>
+		<password>393939</password>
+		<password>303030</password>
+		<password>404040</password>
+		<password>414141</password>
+		<password>424242</password>
+		<password>434343</password>
+		<password>454545</password>
+		<password>464646</password>
+		<password>474747</password>
+		<password>484848</password>
+		<password>494949</password>
+		<password>505050</password>
+		<password>515151</password>
+		<password>525252</password>
+		<password>535353</password>
+		<password>545454</password>
+		<password>565656</password>
+		<password>575757</password>
+		<password>585858</password>
+		<password>595959</password>
+		<password>606060</password>
+		<password>616161</password>
+		<password>626262</password>
+		<password>636363</password>
+		<password>646464</password>
+		<password>656565</password>
+		<password>676767</password>
+		<password>686868</password>
+		<password>696969</password>
+		<password>707070</password>
+		<password>717171</password>
+		<password>727272</password>
+		<password>737373</password>
+		<password>747474</password>
+		<password>757575</password>
+		<password>767676</password>
+		<password>787878</password>
+		<password>797979</password>
+		<password>808080</password>
+		<password>818181</password>
+		<password>828282</password>
+		<password>838383</password>
+		<password>848484</password>
+		<password>858585</password>
+		<password>868686</password>
+		<password>878787</password>
+		<password>898989</password>
+		<password>909090</password>
+		<password>919191</password>
+		<password>929292</password>
+		<password>939393</password>
+		<password>949494</password>
+		<password>959595</password>
+		<password>969696</password>
+		<password>979797</password>
+		<password>989898</password>
+		<password>0000000</password>
+		<password>1111111</password>
+		<password>2222222</password>
+		<password>3333333</password>
+		<password>4444444</password>
+		<password>5555555</password>
+		<password>6666666</password>
+		<password>7777777</password>
+		<password>8888888</password>
+		<password>9999999</password>
+		<password>0123456</password>
+		<password>1234567</password>
+		<password>2345678</password>
+		<password>3456789</password>
+		<password>4567890</password>
+		<password>0987654</password>
+		<password>9876543</password>
+		<password>8765432</password>
+		<password>7654321</password>
+		<password>6543210</password>
+		<password>0101010</password>
+		<password>0202020</password>
+		<password>0303030</password>
+		<password>0404040</password>
+		<password>0505050</password>
+		<password>0606060</password>
+		<password>0707070</password>
+		<password>0808080</password>
+		<password>0909090</password>
+		<password>1212121</password>
+		<password>1313131</password>
+		<password>1414141</password>
+		<password>1515151</password>
+		<password>1616161</password>
+		<password>1717171</password>
+		<password>1818181</password>
+		<password>1919191</password>
+		<password>1010101</password>
+		<password>2020202</password>
+		<password>2121212</password>
+		<password>2323232</password>
+		<password>2424242</password>
+		<password>2525252</password>
+		<password>2626262</password>
+		<password>2727272</password>
+		<password>2828282</password>
+		<password>2929292</password>
+		<password>3030303</password>
+		<password>3131313</password>
+		<password>3232323</password>
+		<password>3434343</password>
+		<password>3535353</password>
+		<password>3636363</password>
+		<password>3737373</password>
+		<password>3838383</password>
+		<password>3939393</password>
+		<password>4040404</password>
+		<password>4141414</password>
+		<password>4242424</password>
+		<password>4343434</password>
+		<password>4545454</password>
+		<password>4646464</password>
+		<password>4747474</password>
+		<password>4848484</password>
+		<password>4949494</password>
+		<password>5050505</password>
+		<password>5151515</password>
+		<password>5252525</password>
+		<password>5353535</password>
+		<password>5454545</password>
+		<password>5656565</password>
+		<password>5757575</password>
+		<password>5858585</password>
+		<password>5959595</password>
+		<password>6060606</password>
+		<password>6161616</password>
+		<password>6262626</password>
+		<password>6363636</password>
+		<password>6464646</password>
+		<password>6565656</password>
+		<password>6767676</password>
+		<password>6868686</password>
+		<password>6969696</password>
+		<password>7070707</password>
+		<password>7171717</password>
+		<password>7272727</password>
+		<password>7373737</password>
+		<password>7474747</password>
+		<password>7575757</password>
+		<password>7676767</password>
+		<password>7878787</password>
+		<password>7979797</password>
+		<password>8080808</password>
+		<password>8181818</password>
+		<password>8282828</password>
+		<password>8383838</password>
+		<password>8484848</password>
+		<password>8585858</password>
+		<password>8686868</password>
+		<password>8787878</password>
+		<password>8989898</password>
+		<password>9090909</password>
+		<password>9191919</password>
+		<password>9292929</password>
+		<password>9393939</password>
+		<password>9494949</password>
+		<password>9595959</password>
+		<password>9696969</password>
+		<password>9797979</password>
+		<password>9898989</password>
+		<password>00000000</password>
+		<password>11111111</password>
+		<password>22222222</password>
+		<password>33333333</password>
+		<password>44444444</password>
+		<password>55555555</password>
+		<password>66666666</password>
+		<password>77777777</password>
+		<password>88888888</password>
+		<password>99999999</password>
+		<password>12345678</password>
+		<password>23456789</password>
+		<password>34567890</password>
+		<password>01234567</password>
+		<password>98765432</password>
+		<password>87654321</password>
+		<password>76543210</password>
+		<password>01010101</password>
+		<password>02020202</password>
+		<password>03030303</password>
+		<password>04040404</password>
+		<password>05050505</password>
+		<password>06060606</password>
+		<password>07070707</password>
+		<password>08080808</password>
+		<password>09090909</password>
+		<password>10101010</password>
+		<password>12121212</password>
+		<password>13131313</password>
+		<password>14141414</password>
+		<password>15151515</password>
+		<password>16161616</password>
+		<password>17171717</password>
+		<password>18181818</password>
+		<password>19191919</password>
+		<password>20202020</password>
+		<password>21212121</password>
+		<password>23232323</password>
+		<password>24242424</password>
+		<password>25252525</password>
+		<password>26262626</password>
+		<password>27272727</password>
+		<password>28282828</password>
+		<password>29292929</password>
+		<password>30303030</password>
+		<password>31313131</password>
+		<password>32323232</password>
+		<password>34343434</password>
+		<password>35353535</password>
+		<password>36363636</password>
+		<password>37373737</password>
+		<password>38383838</password>
+		<password>39393939</password>
+		<password>40404040</password>
+		<password>41414141</password>
+		<password>42424242</password>
+		<password>43434343</password>
+		<password>45454545</password>
+		<password>46464646</password>
+		<password>47474747</password>
+		<password>48484848</password>
+		<password>49494949</password>
+		<password>50505050</password>
+		<password>51515151</password>
+		<password>52525252</password>
+		<password>53535353</password>
+		<password>54545454</password>
+		<password>56565656</password>
+		<password>57575757</password>
+		<password>58585858</password>
+		<password>59595959</password>
+		<password>60606060</password>
+		<password>61616161</password>
+		<password>62626262</password>
+		<password>63636363</password>
+		<password>64646464</password>
+		<password>65656565</password>
+		<password>67676767</password>
+		<password>68686868</password>
+		<password>69696969</password>
+		<password>70707070</password>
+		<password>71717171</password>
+		<password>72727272</password>
+		<password>73737373</password>
+		<password>74747474</password>
+		<password>75757575</password>
+		<password>76767676</password>
+		<password>78787878</password>
+		<password>79797979</password>
+		<password>80808080</password>
+		<password>81818181</password>
+		<password>82828282</password>
+		<password>83838383</password>
+		<password>84848484</password>
+		<password>85858585</password>
+		<password>86868686</password>
+		<password>87878787</password>
+		<password>89898989</password>
+		<password>90909090</password>
+		<password>91919191</password>
+		<password>92929292</password>
+		<password>93939393</password>
+		<password>94949494</password>
+		<password>95959595</password>
+		<password>96969696</password>
+		<password>97979797</password>
+		<password>98989898</password>
+	</forbiddenPasswords>
+</list>
\ No newline at end of file
diff --git a/src/main/resources/config/SecondaryAuth.xsd b/src/main/resources/config/SecondaryAuth.xsd
new file mode 100644
index 00000000..4bdee585
--- /dev/null
+++ b/src/main/resources/config/SecondaryAuth.xsd
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="enabled" type="xs:boolean" />
+				<xs:element name="maxAttempts" type="xs:nonNegativeInteger" />
+				<xs:element name="banTime" type="xs:nonNegativeInteger" />
+				<xs:element name="recoveryLink" type="xs:string" />
+				<xs:element name="forbiddenPasswords" minOccurs="0">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="password" type="xs:string" maxOccurs="unbounded" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/config/SiegeSchedule.xml b/src/main/resources/config/SiegeSchedule.xml
new file mode 100644
index 00000000..238fdcb7
--- /dev/null
+++ b/src/main/resources/config/SiegeSchedule.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SiegeSchedule.xsd">
+	<schedule day="SUNDAY" hour="16" maxConcurrent="5" />
+	<schedule day="SUNDAY" hour="20" maxConcurrent="5" />
+</list>
\ No newline at end of file
diff --git a/src/main/resources/config/SiegeSchedule.xsd b/src/main/resources/config/SiegeSchedule.xsd
new file mode 100644
index 00000000..8cbb391f
--- /dev/null
+++ b/src/main/resources/config/SiegeSchedule.xsd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="list">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="schedule" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute type="xs:string" name="day" />
+						<xs:attribute type="xs:byte" name="hour" />
+						<xs:attribute type="xs:byte" name="maxConcurrent" />
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/config/botreport_punishments.xml b/src/main/resources/config/botreport_punishments.xml
new file mode 100644
index 00000000..cae5e017
--- /dev/null
+++ b/src/main/resources/config/botreport_punishments.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="botreport_punishments.xsd">
+	<!-- To add a range punishments (E.G., a debuff which apply if you have 150 reports or more, use negative neededReportCount -->
+	<punishment neededReportCount="25" skillId="6038" skillLevel="1" sysMessageId="2473" />
+	<punishment neededReportCount="75" skillId="6039" skillLevel="1" sysMessageId="2474" />
+	<punishment neededReportCount="100" skillId="6055" skillLevel="1" sysMessageId="2477" />
+	<punishment neededReportCount="125" skillId="6056" skillLevel="1" sysMessageId="2478" />
+	<punishment neededReportCount="150" skillId="6057" skillLevel="1" sysMessageId="2480" />
+	<punishment neededReportCount="175" skillId="6057" skillLevel="1" sysMessageId="2480" />
+	<!-- Range punishment -->
+	<punishment neededReportCount="-150" skillId="6040" skillLevel="1" />
+</list>
\ No newline at end of file
diff --git a/src/main/resources/config/botreport_punishments.xsd b/src/main/resources/config/botreport_punishments.xsd
new file mode 100644
index 00000000..16cb0878
--- /dev/null
+++ b/src/main/resources/config/botreport_punishments.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="list">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="punishment" maxOccurs="unbounded" minOccurs="0">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute type="xs:short" name="neededReportCount" use="required"/>
+                <xs:attribute type="xs:short" name="skillId" use="required"/>
+                <xs:attribute type="xs:byte" name="skillLevel" />
+                <xs:attribute type="xs:short" name="sysMessageId" />
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/config/bufferservice.properties b/src/main/resources/config/bufferservice.properties
new file mode 100644
index 00000000..94c66cb3
--- /dev/null
+++ b/src/main/resources/config/bufferservice.properties
@@ -0,0 +1,73 @@
+# ---------------------------------------------------------------------------
+# BufferService Mod
+# - Additional configuration can be found in: data/service/buffer/json
+# - HTML can be modified in data/service/buffer/html
+# - The default npc is 60001, use //spawn 60001 to spawn it
+# ---------------------------------------------------------------------------
+
+# WARNING: this mod requires custom NPC table support turned on!
+# CustomNpcTable = True in General.properties
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
+# General Buffer Config
+# ---------------------------------------------------------------------------
+# Enable/Disable BufferService
+# Default: False
+Enable=False
+
+# How long players have to wait to heal again (in seconds)
+# Default: 60
+HealCooldown=60
+
+# How many schemes players can have
+# Default: 5
+MaxUniqueLists=5
+
+# Enable/Disable debug messages
+# Default: False
+Debug=False
+
+# Forbid the buffer in the specified zone types
+# Default: PVP,SIEGE,WATER,JAIL,DANGER_AREA
+ForbidInZones=PVP,SIEGE,WATER,JAIL,DANGER_AREA
+
+# Forbid the buffer in events (event, block checker, olympiad, tvt)
+# Default: true
+ForbidInEvents=true
+
+# Forbid the buffer in a duel
+# Default: true
+ForbidInDuel=true
+
+# Forbid the buffer in a fight
+# Default: true
+ForbidInFight=true
+
+# Forbid the buffer in PVP (purple name)
+# Default: true
+ForbidInPvp=true
+
+# Forbid the buffer for chaotic players (red name)
+# Default: false
+ForbidForChaoticPlayers=false
+
+# ---------------------------------------------------------------------------
+# Voiced Buffer Config
+# ---------------------------------------------------------------------------
+# Enable/Disable voiced buffer
+# Default: False
+VoicedEnable=False
+
+# The voiced command for the voiced buffer
+# Default: bufferservice
+VoicedCommand=bufferservice
+
+# The name of the voiced buffer
+# Default: Voiced
+VoicedName=Voiced
+
+# Item id required to be in the inventory to be able to use the voiced buffer
+# 0 = no item required
+# Default: 0
+VoicedRequiredItem=0
\ No newline at end of file
diff --git a/src/main/resources/config/castle.properties b/src/main/resources/config/castle.properties
new file mode 100644
index 00000000..0ae882d1
--- /dev/null
+++ b/src/main/resources/config/castle.properties
@@ -0,0 +1,65 @@
+# ---------------------------------------------------------------------------
+# Castle
+# ---------------------------------------------------------------------------
+
+# Siege Time rules
+# Which hours can change Castle Lords
+# Default: 16,20
+SiegeHourList = 16,20
+
+# Functions fee days
+FunctionFeeDay7 = 604800000
+
+# Teleport Function price.
+TeleportFunctionFeeLvl11 = 1000
+TeleportFunctionFeeLvl12 = 10000
+
+# Support magic buff price.
+SupportFeeLvl15 = 49000
+SupportFeeLvl18 = 120000
+
+# MP Regeneration price.
+MpRegenerationFeeLvl18 = 45000
+MpRegenerationFeeLvl20 = 65000
+
+# Hp Regeneration price.
+HpRegenerationFeeLvl25 = 12000
+HpRegenerationFeeLvl30 = 20000
+
+# Exp Regeneration price.
+ExpRegenerationFeeLvl19 = 63000
+ExpRegenerationFeeLvl20 = 70000
+
+# Outer Door upgrade price
+OuterDoorUpgradePriceLvl2 = 3000000
+OuterDoorUpgradePriceLvl3 = 4000000
+OuterDoorUpgradePriceLvl5 = 5000000
+
+# Inner Door upgrade price
+InnerDoorUpgradePriceLvl2 = 750000
+InnerDoorUpgradePriceLvl3 = 900000
+InnerDoorUpgradePriceLvl5 = 1000000
+
+# Wall upgrade price
+WallUpgradePriceLvl2 = 1600000
+WallUpgradePriceLvl3 = 1800000
+WallUpgradePriceLvl5 = 2000000
+
+# Trap upgrade price
+TrapUpgradePriceLvl1 = 3000000
+TrapUpgradePriceLvl2 = 4000000
+TrapUpgradePriceLvl3 = 5000000
+TrapUpgradePriceLvl4 = 6000000
+
+# Allow riding wyvern ignoring 7 Signs status
+# This will allow Castle Lords to ride wyvern even when Dusk has won Seal of Strife
+# Default: False
+AllowRideWyvernAlways = False
+
+# Allow riding wyvern during Castle/Fort Siege
+# Default: True
+AllowRideWyvernDuringSiege = True
+
+# If true, Castle buff cost 0 mp.
+# Default: False
+MpBuffFree = False
\ No newline at end of file
diff --git a/src/main/resources/config/character.properties b/src/main/resources/config/character.properties
new file mode 100644
index 00000000..ec6ca776
--- /dev/null
+++ b/src/main/resources/config/character.properties
@@ -0,0 +1,848 @@
+# ---------------------------------------------------------------------------
+# Alternative Character Settings
+# ---------------------------------------------------------------------------
+# This properties file is solely for Character modifications that directly influence them.
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Statistics
+# ---------------------------------------------------------------------------
+
+# This option, if enabled, will force a character to de-level if the characters' experience is below their level after losing experience on death.
+# If this is set to False, the character will not de-level even if their Experience is below their level after death.
+# Default: True
+Delevel = True
+
+# This option enables check for all player skills for skill level.
+# If player level is lower than skill to learn level - 9, skill level is decreased to the next possible level.
+# If there is no possible level, skill is removed from player.
+DecreaseSkillOnDelevel = True
+
+# Weight limit multiplier. Example: Setting this to 5 will give players 5x the normal weight limit.
+# Default: 1
+WeightLimit = 1
+
+# Run speed modifier. Example: Setting this to 5 will give players +5 to their running speed.
+# Default: 0
+RunSpeedBoost = 0
+
+# Chance of receiving the Death Penalty debuff when killed by a mob.
+# Default: 20
+DeathPenaltyChance = 20
+
+# Percent of HP, MP, and CP which is restored on character revival.
+# Use 0.00 to disable restore
+# Default: 0.00, 0.65, 0.00
+RespawnRestoreCP = 0.00
+RespawnRestoreHP = 0.65
+RespawnRestoreMP = 0.00
+
+# Percent of HP, MP, and CP regeneration for players.
+# Example: Setting HP to 0.10 will cause player HP to regenerate 90% slower than normal.
+# Default: 1.00, 1.00, 1.00
+HpRegenMultiplier = 1.00
+MpRegenMultiplier = 1.00
+CpRegenMultiplier = 1.00
+
+# ---------------------------------------------------------------------------
+# Skills & Effects
+# ---------------------------------------------------------------------------
+
+# When this is enabled, it will use the "SkillDuration" configuration.
+# Overrides the abnormalTime in the skill definition.
+# Default: False
+ModifySkillDuration = False
+# Skill duration list
+# Format: skillid,newtime;skillid2,newtime2...
+# Example: 
+#	This enable 1h(3600) duration for songs.
+#	SkillDuration = 264,3600;265,3600;266,3600;267,3600;268,3600;269,3600;270,3600;304,3600;305,1200;306,3600;308,3600;349,3600;363,3600;364,3600
+SkillDuration = 
+
+# When this is enabled, it will use the "SkillReuseList" configuration.
+ModifySkillReuse = False
+# Format: skillid,newDelayTime;skillid,newDelayTime2
+SkillReuse = 
+
+# If it's true, all class skills will be delivered upon level up and login.
+# Default: False
+AutoLearnSkills = False
+
+# If it's true skills from forgotten scrolls will be delivered upon level up and login, require AutoLearnSkills.
+# Default: False
+AutoLearnForgottenScrollSkills = False
+
+# Default: False
+AutoLootHerbs = False
+
+# Maximum number of buffs and songs/dances.
+# Remember that Divine Inspiration will give players 4 additional buff slots on top of the number specified here.
+# Default: 20, 12, 12
+MaxBuffAmount = 20
+MaxTriggeredBuffAmount = 12
+MaxDanceAmount = 12
+
+# Allow players to cancel dances/songs via Alt+click on buff icon 
+# Default: False 
+DanceCancelBuff = False
+
+# This option enables/disables additional MP consume for dances and songs.
+# Default: True
+DanceConsumeAdditionalMP = True
+
+# Allow players to have all dances/songs stored when logout.
+# Default: False
+StoreDances = False
+
+# This option allows a player to automatically learn Divine Inspiration.
+# This is not included in AutoLearnSkills above.
+# Default: False
+AutoLearnDivineInspiration = False
+
+# This is to allow a character to be canceled during bow use, skill use, or both.
+# Available Options: bow, cast, all
+# Default: cast
+CancelByHit = cast
+
+# This option, if enabled, will allow magic to fail,
+# and if disabled, magic damage will always succeed with a 100% chance.
+# Default: True
+MagicFailures = True
+
+# Protection from aggressive mobs after getting up from fake death.
+# The value is specified in seconds.
+# Default: 0
+PlayerFakeDeathUpProtection = 0
+
+# This option is to enable or disable the storage of buffs/debuffs among other effects.
+# Default: True
+StoreSkillCooltime = True
+
+# This option is to enable or disable the storage of buffs/debuffs among other effects during
+# a subclass change
+# Default: False
+SubclassStoreSkillCooltime = False
+
+# These are alternative rules for shields.
+# If True and they block:
+#	The damage is powerAtk-shieldDef,
+# If False and they block:
+#	The damage is powerAtk / (shieldDef + powerDef)
+# Default: False
+ShieldBlocks = False
+
+# This is the percentage for perfect shield block rate.
+# Default: 10
+PerfectShieldBlockRate = 10
+
+# This is the value ticks are multiplied with to result in an interval per tick in milliseconds.
+# Note: Editing this will not affect how much the over-time effects heals since heal scales with that value too.
+# Default: 666
+EffectTickRatio = 666
+
+# ---------------------------------------------------------------------------
+# Class, Sub-class and skill learning options
+# ---------------------------------------------------------------------------
+
+# Allow use of Event Managers for changing occupation without any quests.
+# Default: False
+AllowClassMasters = False
+
+# ConfigClassMaster=1;[57(100000)];[];2;[57(1000000)];[];3;[57(10000000)],[5575(1000000)];[6622(1)] 
+# 1st occupation change for 100.000 Adena (item id 57) 
+# 2nd occupation change for 1.000.0000 Adena (item id 57) 
+# 3rd occupation change for 10.000.0000 Adena (item id 57) and 1.000.000 Ancient Adena (item id 5575) 
+# on 3rd occupation change player will be rewarded with 1 Book of Giants (item id 6622) 
+# ConfigClassMaster=1;[];[];2;[];[];3;[];[] 
+# 1st, 2nd, 3rd occupation change for free, without rewards.
+# ConfigClassMaster=1;[];[];2;[];[]
+# Allow only first and second change.
+ConfigClassMaster = 1;[];[];2;[];[];3;[];[]
+
+# Class Masters will allow changing to any occupation on any level inside the class tree.
+# For example, Dwarven Fighter will be able to advance to:
+# Artisan, Scavenger, Warsmith, Bounty Hunter, Maestro, Fortune Seeker.
+# But Warsmith will be able to change only to Maestro. 
+# Default = False
+AllowEntireTree = False
+
+# When character reach levels 20,40,76 he will receive a tutorial page
+# with a list of the all possible variants, and can select and immediately
+# change to the new occupation, or decide to choose later (on next login).
+# Can be used with or without classic Class Masters.
+# Default = False 
+AlternateClassMaster = False
+
+# Require life crystal needed to learn clan skills.
+# Default: True
+LifeCrystalNeeded = True
+
+# Require a book needed to enchant skills.
+# Default: True
+EnchantSkillSpBookNeeded = True
+
+# Require a spell book needed to learn Divine Inspiration.
+# Default: True
+DivineInspirationSpBookNeeded = True
+
+# When enabled, the following will be true:
+#	All classes can learn all skills.
+#	Skills of another class costs x2 SP to learn.
+#	Skills of another race costs x2 SP to learn.
+#	Skills of fighters/mages costs x3 SP to learn.
+# Default: False
+SkillLearn = False
+
+# Allow player to sub-class without checking for unique quest items.
+# Default: False
+SubclassWithoutQuests = False
+
+# Allow player to add/change subclass at all village master
+# Default: False
+SubclassEverywhere = False
+
+# Allow player to learn transformations without quest.
+# Default: False
+TransformationWithoutQuest = False
+
+# Fee to remove Transfer skills.
+# Default: 10000000
+FeeDeleteTransferSkills = 10000000
+
+# Fee to remove Sub-Class skills.
+# Default: 10000000
+FeeDeleteSubClassSkills = 10000000
+
+# ---------------------------------------------------------------------------
+# Summons
+# ---------------------------------------------------------------------------
+
+# This option is to enable or disable the storage of buffs/debuffs among other effects on pets/invocations
+# Default: True
+SummonStoreSkillCooltime = True
+
+# Servitor summons on login if player had it summoned before logout
+# Default: True
+RestoreServitorOnReconnect = True
+
+# Pet summons on login if player had it summoned before logout
+# Default: True
+RestorePetOnReconnect = True
+
+# ---------------------------------------------------------------------------
+# Limits
+# ---------------------------------------------------------------------------
+
+# Maximum Exp Bonus.
+# from vitality + nevit's hunting bonus, and etc..
+# Default: 3.5
+MaxExpBonus = 3.5
+
+# Maximum Sp Bonus.
+# from vitality + nevit's hunting bonus, and etc..
+# Default: 3.5
+MaxSpBonus = 3.5
+
+# Maximum character running speed.
+# Default: 250
+MaxRunSpeed = 250
+
+# Maximum character Physical Critical Rate. (10 = 1%)
+# Default: 500
+MaxPCritRate = 500
+
+# Maximum character Magic Critical Rate. (10 = 1%)
+# Default: 200
+MaxMCritRate = 200
+
+# Maximum character Attack Speed.
+# Default: 1500
+MaxPAtkSpeed = 1500
+
+# Maximum character Cast Speed.
+# Default: 1999
+MaxMAtkSpeed = 1999
+
+# Maximum character Evasion.
+# Default: 250
+MaxEvasion = 250
+
+# Minimum and Maximum Abnormal State Success Rate.
+# This affects all skills/effects chances, except in skills where minChance or maxChance parameters are defined.
+# Default: H5 minimum of 10% and maximum of 90%.
+MinAbnormalStateSuccessRate = 10
+MaxAbnormalStateSuccessRate = 90
+
+# It's possible to customize the maximum level
+# Above the default requires extra data
+
+# Maximum player level
+# Default: 85
+MaxPlayerLevel = 85
+
+# Maximum pet level
+# Default: 86
+MaxPetLevel = 86
+
+# Maximum number of allowed subclasses for every player.
+# Default: 3
+MaxSubclass = 3
+
+# Starting level for subclasses.
+# Default: 40
+BaseSubclassLevel = 40
+
+# Maximum subclass level.
+# Default: 80
+MaxSubclassLevel = 80
+
+# Maximum number of allowed slots for Private Stores Sell.
+# Other means all the other races aside from Dwarf.
+# Default: 4, 3
+MaxPvtStoreSellSlotsDwarf = 4
+MaxPvtStoreSellSlotsOther = 3
+
+# Maximum number of allowed slots for Private Stores Buy.
+# Other means all the other races aside from Dwarf.
+# Default: 5, 4
+MaxPvtStoreBuySlotsDwarf = 5
+MaxPvtStoreBuySlotsOther = 4
+
+# This will control the inventory space limit (NOT WEIGHT LIMIT).
+# Default: 80, 100, 250
+MaximumSlotsForNoDwarf = 80
+MaximumSlotsForDwarf = 100
+MaximumSlotsForGMPlayer = 250
+MaximumSlotsForQuestItems = 100
+
+# This will control a character's warehouse capacity.
+# Notes: This must be LESS than 300 or the client will crash.
+# Default: 120, 100, 200, 20
+MaximumWarehouseSlotsForDwarf = 120
+MaximumWarehouseSlotsForNoDwarf = 100
+MaximumWarehouseSlotsForClan = 200
+
+# Freight
+# Maximum items that can be placed in Freight
+# Default: 200
+MaximumFreightSlots = 200
+# The price for each item that's deposited
+# Default: 1000
+FreightPrice = 1000
+
+# Npc talk blockage. When a player talks to a NPC, he must wait some secs
+# before being able to walk again. In seconds
+# Default: 3
+# Set to 0 to disable it
+NpcTalkBlockingTime = 3
+
+# Friend List limit size.
+# Default: 128
+FriendListLimit = 128
+
+# Blocklist limit size.
+# Default: 128
+BlockListLimit = 128
+
+# ---------------------------------------------------------------------------
+# Enchanting
+# ---------------------------------------------------------------------------
+# This controls the chance an item has to break if it is enchanted.
+# This chance is in %, so if you set this to 100%, enchants will always succeed.
+EnchantChanceElementStone = 50
+EnchantChanceElementCrystal = 30
+EnchantChanceElementJewel = 20
+EnchantChanceElementEnergy = 10
+
+# List of non-enchantable items.
+# Currently, apprentice, traveler weapons and Pailaka items
+# Default: 7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,13293,13294,13296
+EnchantBlacklist = 7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,13293,13294,13296
+
+# ---------------------------------------------------------------------------
+# Augmenting
+# ---------------------------------------------------------------------------
+# These control the chance to get a skill in the augmentation process.
+# Default: 15, 30, 45, 60
+AugmentationNGSkillChance = 15
+AugmentationMidSkillChance = 30
+AugmentationHighSkillChance = 45
+AugmentationTopSkillChance = 60
+# Accessory augmentation skills currently disabled
+AugmentationAccSkillChance = 0
+
+# This controls the chance to get a base stat modifier in the augmentation process.
+# Notes: This has no dependency on the grade of Life Stone.
+# Default: 1
+AugmentationBaseStatChance = 1
+
+# These control the chance to get a glow effect in the augmentation process.
+# Notes: No/Mid-Grade Life Stone cannot have a glow effect if you do not get a skill or base stat modifier.
+# Default: 0, 40, 70, 100
+AugmentationNGGlowChance = 0
+AugmentationMidGlowChance = 40
+AugmentationHighGlowChance = 70
+AugmentationTopGlowChance = 100
+
+# This will enable retail like weapon augmentation, but then you can't change 
+# weapon glow, base stat chance, because it wouldn't be retail like again.
+RetailLikeAugmentation = True
+
+# This will have effect ONLY when RetailLikeAugmentation is True. The sum of 4 numbers must be 100!
+# You can change probability (in %) of augment color chances - in order yellow, blue, purple, red
+# Purple and Red always give skill. Default is 55%,35%,7%,3% for all lifestone grades (i.e., 7+3=10%
+# for skill, not counting blue ones, that are very rare and not useful anyway). 
+RetailLikeAugmentationNoGradeChance = 55,35,7,3
+RetailLikeAugmentationMidGradeChance = 55,35,7,3
+RetailLikeAugmentationHighGradeChance = 55,35,7,3
+RetailLikeAugmentationTopGradeChance = 55,35,7,3
+
+# This will enable retail like accessory augmentation, but then you cant change skill chances for accessory augments
+RetailLikeAugmentationAccessory = True
+
+# The list of non-augmentable items, currently contains only Grand Boss jewels
+# Shadow, common, time-limited, hero, pvp, wear items are hardcoded, as well as all etcitems.
+# Rods can't be augmented too.
+# Default: 6656,6657,6658,6659,6660,6661,6662,8191,10170,10314
+AugmentationBlacklist = 6656,6657,6658,6659,6660,6661,6662,8191,10170,10314,13740,13741,13742,13743,13744,13745,13746,13747,13748,14592,14593,14594,14595,14596,14597,14598,14599,14600,14664,14665,14666,14667,14668,14669,14670,14671,14672,14801,14802,14803,14804,14805,14806,14807,14808,14809,15282,15283,15284,15285,15286,15287,15288,15289,15290,15291,15292,15293,15294,15295,15296,15297,15298,15299,16025,16026,21712,22173,22174,22175
+
+# Allows alternative augmentation of PvP items.
+# Default: False
+AllowAugmentPvPItems = false
+
+# ---------------------------------------------------------------------------
+# Karma
+# ---------------------------------------------------------------------------
+
+# Karma player can be killed in Peace zone.
+# Default: False
+KarmaPlayerCanBeKilledInPeaceZone = False
+
+# Karma player can use GateKeeper.
+# Default: False
+KarmaPlayerCanUseGK = False
+
+# Karma player can use escape and recall skills.
+# Default: True
+KarmaPlayerCanTeleport = True
+
+# Karma player can shop.
+# Default: True
+KarmaPlayerCanShop = True
+
+# Karma player can trade.
+# Default: True
+KarmaPlayerCanTrade = True
+
+# Karma player can use warehouse.
+# Default: True
+KarmaPlayerCanUseWareHouse = True
+
+
+# ---------------------------------------------------------------------------
+# Fame
+# ---------------------------------------------------------------------------
+
+# The maximum number of Fame points a player can have
+# Default: 100000
+MaxPersonalFamePoints = 100000
+
+# How frequently the player gets Fame points while in a Fortress Siege zone
+# Default: 300s (5 min)
+FortressZoneFameTaskFrequency = 300
+
+# How much Fame acquired while in a Fortress Siege Zone
+# Default: 31
+FortressZoneFameAcquirePoints = 31
+
+# How frequently the player gets Fame points while in a Castle Siege zone
+# Default: 300s (5 min)
+CastleZoneFameTaskFrequency = 300
+
+# How much Fame acquired while in a Castle Siege Zone
+# Default: 125
+CastleZoneFameAcquirePoints = 125
+
+# Dead players can receive fame.
+# Default: True
+FameForDeadPlayers = True
+
+# ---------------------------------------------------------------------------
+# Crafting
+# ---------------------------------------------------------------------------
+
+# Option to enable or disable crafting.
+# Default: True
+Crafting = True
+
+# Enable/Disable crafting of Masterwork items (If set to true, masterwork items can be created when crafting).
+# Default: True
+CraftMasterwork = True
+
+# Limits for recipes
+# Default: 50, 50
+DwarfRecipeLimit = 50
+CommonRecipeLimit = 50
+
+# Alternative crafting rules. If enabled, the following will be true:
+#	Crafting takes time.
+#	Players get EXP/SP for crafting.
+# Default: False
+AlternativeCrafting = False
+
+# Crafting Time multiplier.
+# The higher the number, the more time the crafting process takes. XP/SP reward increases with time.
+# Default: 1 
+CraftingSpeed = 1
+
+# Additional crafting XP rate multiplier.
+# Default: 1
+CraftingXpRate = 1
+
+# Additional crafting SP rate multiplier.
+# Default: 1
+CraftingSpRate = 1
+
+# Additional XP rate multiplier when creating rare item.
+# Default: 2
+CraftingRareXpRate = 2
+
+# Additional SP rate multiplier when creating rare item.
+# Default: 2
+CraftingRareSpRate = 2
+
+# If set to False, blacksmiths don't take recipes from player's inventory when crafting.
+# Default: True
+BlacksmithUseRecipes = True
+
+# Store/Restore Dwarven Manufacture list
+# Keep manufacture shop list after relogin.
+# Default: False
+StoreRecipeShopList = False
+
+# ---------------------------------------------------------------------------
+# Clan
+# ---------------------------------------------------------------------------
+
+# Day, on which all pending clan leader requests will be applied:
+# Possible values:
+# 1 - Sunday
+# 2 - Monday
+# 3 - Tuesday
+# 4 - Wednesday
+# 5 - Thursday
+# 6 - Friday
+# 7 - Saturday
+# Default: 3
+ClanLeaderDateChange = 3
+
+# Hour on which all pending data requests will be applied:
+# Format: Hour:Minute:Second
+# Default: 00:00:00
+ClanLeaderHourChange = 00:00:00
+
+# When enabled, all clan leader requests will be performed instantly.
+# Default: False
+ClanLeaderInstantActivation = False
+
+# Number of days you have to wait before joining another clan.
+# Default: 1
+DaysBeforeJoinAClan = 1
+
+# Number of days you have to wait before creating a new clan.
+# Default: 10
+DaysBeforeCreateAClan = 10
+
+# Number of days it takes to dissolve a clan.
+# Default: 7
+DaysToPassToDissolveAClan = 7
+
+# Number of days before joining a new alliance when a clan voluntarily leaves an alliance.
+# Default: 1
+DaysBeforeJoiningAllianceAfterLeaving = 1
+
+# Number of days before joining a new alliance when a clan was dismissed from an alliance.
+# Default: 1
+DaysBeforeJoinAllyWhenDismissed = 1
+
+# Number of days before accepting a new clan for alliance when clan was dismissed from an alliance.
+# Default: 1
+DaysBeforeAcceptNewClanWhenDismissed = 1
+
+# Number of days before creating a new alliance after dissolving an old alliance.
+# Default: 1
+DaysBeforeCreateNewAllyWhenDissolved = 1
+
+# Maximum number of clans in alliance.
+# Default: 3
+MaxNumOfClansInAlly = 3
+
+# Allow clan members to withdraw from the clan warehouse.
+# Default: False
+MembersCanWithdrawFromClanWH = False
+
+# Remove castle circlets after a clan loses their castle or a player leaves a clan.
+# Default: True
+RemoveCastleCirclets = True
+
+# Number of members needed to request a clan war.
+# Default: 15
+ClanMembersForWar = 15
+
+
+# ---------------------------------------------------------------------------
+# Party
+# ---------------------------------------------------------------------------
+
+# CONFUSING (nothing to do with a party) -> When you made damage to a mob
+# and are inside this range, you will be considered as player to reward.
+# Checks for party range to mob to calculate rewards(exp, items).
+# Default: 1600
+PartyRange = 1600
+
+# 1. Used for items which are evenly distributed in party
+# 2. Used to handle random and by turn party loot
+# Default: 1400
+PartyRange2 = 1400
+
+# Specifies whether stackable items will be split up
+# to be evenly distributed to all party members in range of the looter.
+# Item amounts which cannot be evenly split up are distributed randomly to party members in the range of the looter.
+# Default: False
+PartyEvenlyDistributeAllStackableItems=False
+
+# Specifies whether non-stackable items will be split up to be evenly
+# distributed to all party members in the range of the looter.
+# That means if you have a high-rate server and get multiple full drops of the same item,
+# it is evenly distributed to all party members in the range of the looter.
+# Item amounts which cannot be evenly split up are distributed randomly to party members in the range of the looter.
+# Default: False
+PartyEvenlyDistributeAllOtherItems=False
+
+# List of items which get split up to be evenly distributed to party members. By
+# default, only adena is split. Item ids are separated by comma. Item amounts
+# which cannot be evenly split up are distributed randomly to party members in
+# the range of the looter.
+# Default: 57
+PartyEvenlyDistributeItems=57
+
+# If true, when party leader leaves party, next member in party will be the leader.
+# If false, the party will dispersed.
+# Default: False
+LeavePartyLeader = False
+
+
+# ---------------------------------------------------------------------------
+# Initial Settings:
+# ---------------------------------------------------------------------------
+
+#Initial Equipment Events is to enable a special settings for the items that a new character starts with.
+#Default: False
+InitialEquipmentEvent = False
+
+# This is the amount of Adena that a new character starts their character with.
+# Default: 0
+StartingAdena = 0
+
+# This is the starting level of the new character.
+# Default: 1
+StartingLevel = 1
+
+# This is the amount of SP that a new character starts their character with.
+# Default: 0
+StartingSP = 0
+
+# ---------------------------------------------------------------------------
+# Other Settings:
+# ---------------------------------------------------------------------------
+
+# This is the maximum amount of Adena that character can have in his inventory or warehouse.
+# The maximum input amount is 9,223,372,036,854,775,807 (nine quintillions two hundred
+# twenty-three quadrillion three hundred seventy-two-trillion thirty-six billion
+# eight hundred fifty-four-million-seven-hundred seventy-five thousand eight hundred seven)
+# Setting negative values (-1 or others) will result in the maximum amount available.
+# Big values do not cause critical errors, although only 16 digits are visible in the inventory
+# (example: 3,372,036,854,775,807 is visible out of 9,223,372,036,854,775,807)
+# Default: 99900000000 (99 billion and 900 million)
+MaxAdena = 99900000000
+
+# This option, when set to True, will enable automatically picking up items.
+# If set False, it will force the player to pick up dropped items from mobs.
+# This excludes herbs mentioned above and items from Raid/GrandBosses with minions.
+# Default: False
+AutoLoot = False
+
+# This option, when set to True, will enable automatically picking up items from Raid/GrandBosses with minions.
+# If set False, it will force the player to pick up dropped items from bosses.
+# This excludes herbs mentioned above and items from mobs.
+# Default: False
+AutoLootRaids = False
+
+# Delay for raid drop items loot privilege
+# Require Command Channel, check next option
+# Value is in seconds
+# Default: 900 (15min)
+RaidLootRightsInterval = 900
+
+# Minimal size of Command Channel for apply raid loot privilege
+# Default: 45
+RaidLootRightsCCSize = 45
+
+# This is the time in seconds that it will take for the player command "/unstuck" to activate.
+# Default: 300
+UnstuckInterval = 300
+
+# Teleport Watchdog Timeout (seconds)
+# Player forced to appear if remain in teleported state longer than timeout
+# Does not set too low, recommended value 60s.
+# This time is in seconds, leave it at 0 if you want this feature disabled.
+# Default: 0
+TeleportWatchdogTimeout = 0
+
+# After a player teleported, this is the time the player is protected.
+# This time is in seconds, leave it at 0 if you want this feature disabled.
+# Retail (Since GE): 600 (10 minutes)
+# Default: 600
+PlayerSpawnProtection = 600
+
+# Spawn protection should disappear with any action except the item usage from items in this list.
+# Format: itemId,itemId,itemId,....
+# Default: 0
+PlayerSpawnProtectionAllowedItems =
+
+# Teleport spawn protection time. It will protect the player in the
+# teleport spawn for the given time. 0 to disable feature
+PlayerTeleportProtection = 0
+
+# If enabled, players respawn in town on different locations defined in zone.xml for given town.
+# If disabled, the first spawn location from zone.xml is used.
+# Default: True
+RandomRespawnInTown = True
+
+# This will allow a random offset from the base teleport location coordinates based on a maximum offset.
+# Default: True
+OffsetOnTeleport = True
+
+# Maximum offset for base teleport location when OffsetOnTeleportEnabled is enabled .
+# Default: 50
+MaxOffsetOnTeleport = 50
+
+# This option is to enable or disable the use of in game petitions.
+# The MaxPetitionsPerPlayer is the amount of petitions a player can make.
+# The MaximumPendingPetitions is the total number of petitions in the server.
+# Note: Logically, MaximumPendingPetitions must be higher than MaxPetitionsPerPlayer.
+# Default: True, 5, 25
+PetitioningAllowed = True
+MaxPetitionsPerPlayer = 5
+MaxPetitionsPending = 25
+
+# Free teleporting around the world.
+# Default: False
+FreeTeleporting = False
+
+# Allow character deletion after days set below. To disallow character deletion, set this equal to 0.
+# Default: 7
+DeleteCharAfterDays = 7
+
+# Alternative Xp/Sp rewards, if not 0, then calculated as 2^((mob.level-player.level) / coef). Coef are the 2 numbers set below.
+# A few examples for "ExponentXp = 5." and "ExponentSp = 3.":
+#	diff = 0 (player and mob have the same level), XP bonus rate = 1, SP bonus rate = 1
+#	diff = 3 (mob is 3 levels above), XP bonus rate = 1.52, SP bonus rate = 2
+#	diff = 5 (mob is 5 levels above), XP bonus rate = 2, SP bonus rate = 3.17
+#	diff = -8 (mob is 8 levels below), XP bonus rate = 0.4, SP bonus rate = 0.16
+# Default: 0, 0
+ExponentXp = 0
+ExponentSp = 0
+
+
+# PARTY XP DISTRIBUTION
+# With "auto method" member is cut from Exp/SP distribution when their share is
+# lower than party bonus acquired for him (30% for 2-member party).
+# In that case, they will not receive any Exp/SP from a party and is not counted for party bonus.
+# If you don't want to have a cutoff point for party members' XP distribution, set the first option to "none".
+# Available Options: highfive, auto, level, percentage, none
+# Default: highfive
+PartyXpCutoffMethod = highfive
+
+# This option takes effect when "percentage" method is chosen. Don't use high values for this!
+# Default: 3.0
+PartyXpCutoffPercent = 3.0
+
+# This option takes effect when "level" method is chosen. Don't use low values for this!
+# Default: 20
+PartyXpCutoffLevel = 20
+
+# This option takes effect when "highfive" method is chosen.
+# Each pair of numbers represents a level range.
+# If the gap is between the first pair, there is no penalty.
+# If the gap is between the second pair, the lowest party member will gain only 30% of the XP that others receive.
+# If the gap is between the last pair, the lowest party member will not receive any XP.
+# Default: 0,9;10,14;15,99
+PartyXpCutoffGaps = 0,9;10,14;15,99
+
+# This option takes effect when "highfive" method is chosen.
+# Each number represents the XP percent gain at that level gap.
+# For the first gap, the lowest party member will gain 100% XP as there is no penalty.
+# For the second gap, the lowest party member will gain only 30% of the XP that others receive.
+# For the last gap, the lowest party member will not receive any XP.
+# Default: 100,30,0
+PartyXpCutoffGapPercent = 100,30,0
+
+# Tutorial for new player enter into Game
+# Please remember it's sometimes important to novice players
+# Default: True
+Tutorial = True
+
+# Expertise penalty
+# If disabled, player will not receive a penalty for equip higher grade items
+# Default: True
+ExpertisePenalty = True
+
+# The player can define their own key mappings, and save them server side.
+# Default: True
+StoreUISettings = True
+
+# If enabled, when character in silence (block PMs) mode sends a PM to a character, silence mode no longer blocks this character, 
+# allowing both characters to send each other PMs even with enabled silence mode.
+# The excluded list is cleared each time the character goes into silence mode.
+SilenceModeExclude = False
+
+# Enables alternative validation of triggering skills.
+# When enabled pvp skills will not be casted on non flagged player.
+# Sadly its non-retail
+# Default: False
+ValidateTriggerSkills = False
+
+# ---------------------------------------------------------------------------
+# Misc Player Settings
+# ---------------------------------------------------------------------------
+
+# Player name template.
+# Examples:
+# PlayerNameTemplate = [A-Z][a-z]{3,3}[A-Za-z0-9]*
+# The above setting will allow names with first capital letter, next three small letters,
+# and any letter (case-insensitive) or number, like OmfgWTF1
+# PlayerNameTemplate = [A-Z][a-z]*
+# The above setting will allow names only of letters with first one capital, like Omfgwtf
+# The default forces start with a letter and continues either with letters or numbers.
+# Default: [a-zA-Z0-9]*
+PlayerNameTemplate = [a-zA-Z0-9]*
+
+# This setting restricts names players can give to their pets.
+# See CnameTemplate for details
+# Default: [a-zA-Z0-9]*
+PetNameTemplate = [a-zA-Z0-9]*
+
+# Character name restriction
+# Disallow characters to have a name which contains the words.
+# Split them with ",". Use lowercase. Example: announcements,announce...
+# Default: annou,ammou,amnou,anmou,anou,amou,announcements,announce
+ForbiddenNames = annou,ammou,amnou,anmou,anou,amou,announcements,announce
+
+# Maximum number of characters per account.
+# Default: 7 (client limit)
+CharMaxNumber = 7
diff --git a/src/main/resources/config/clan.properties b/src/main/resources/config/clan.properties
new file mode 100644
index 00000000..ac4cd23a
--- /dev/null
+++ b/src/main/resources/config/clan.properties
@@ -0,0 +1,92 @@
+# ---------------------------------------------------------------------------
+# Clan Settings
+# ---------------------------------------------------------------------------
+
+# Restricts clan/subpledge names players can set.
+# Default: [a-zA-Z0-9]*
+ClanNameTemplate = [a-zA-Z0-9]*
+
+# ---------------------------------------------------------------------------
+# Clan Reputation Points
+# ---------------------------------------------------------------------------
+
+# Reputation score gained by taking Fortress.
+TakeFortPoints = 200
+
+# Reputation score gained by taking Castle.
+TakeCastlePoints = 1500
+
+# Reputation score gained by defended Castle.
+CastleDefendedPoints = 750
+
+# Reputation score gained per clan members of a festival winning party.
+FestivalOfDarknessWin = 200
+
+# Reputation score gained for per hero clan members.
+HeroPoints = 1000
+
+# Minimum Reputation score gained after completing 2nd class transfer under the Academy.
+CompleteAcademyMinPoints = 190
+
+# Maximum Reputation score gained after completing 2nd class transfer under the Academy.
+CompleteAcademyMaxPoints = 650
+
+# Reputation score gained per killed ballista.
+KillBallistaPoints = 30
+
+# Reputation score gained for one Blood Alliance.
+BloodAlliancePoints = 500
+
+# Reputation score gained for 10 Blood Oaths.
+BloodOathPoints = 200
+
+# Reputation score gained for 100 Knight's Epaulettes.
+KnightsEpaulettePoints = 20
+
+# Reputation score gained per clan member listed as top raid killers.
+1stRaidRankingPoints = 1250
+2ndRaidRankingPoints = 900
+3rdRaidRankingPoints = 700
+4thRaidRankingPoints = 600
+5thRaidRankingPoints = 450
+6thRaidRankingPoints = 350
+7thRaidRankingPoints = 300
+8thRaidRankingPoints = 200
+9thRaidRankingPoints = 150
+10thRaidRankingPoints = 100
+UpTo50thRaidRankingPoints = 25
+UpTo100thRaidRankingPoints = 12
+
+# Reputation score gained/reduced per kill during a clan war or siege war.
+ReputationScorePerKill = 1
+
+# Reputation score reduced by losing Fortress in battle.
+LoseFortPoints = 0
+
+# Reputation score reduced by losing Castle in battle.
+LoseCastlePoints = 3000
+
+# Reputation score reduced by creating a Royal Guard.
+CreateRoyalGuardCost = 5000
+
+# Reputation score reduced by creating Knight Unit.
+CreateKnightUnitCost = 10000
+
+# Reputation score reduced by reinforcing Knight Unit (if clan level is 9 or more).
+ReinforceKnightUnitCost = 5000
+
+# Reputation score reduced by increasing clan level.
+ClanLevel6Cost = 5000
+ClanLevel7Cost = 10000
+ClanLevel8Cost = 20000
+ClanLevel9Cost = 40000
+ClanLevel10Cost = 40000
+ClanLevel11Cost = 75000
+
+# The number of clan members needed to increase clan level.
+ClanLevel6Requirement = 30
+ClanLevel7Requirement = 50
+ClanLevel8Requirement = 80
+ClanLevel9Requirement = 120
+ClanLevel10Requirement = 140
+ClanLevel11Requirement = 170
\ No newline at end of file
diff --git a/src/main/resources/config/clanhall.properties b/src/main/resources/config/clanhall.properties
new file mode 100644
index 00000000..f5a6b240
--- /dev/null
+++ b/src/main/resources/config/clanhall.properties
@@ -0,0 +1,110 @@
+# ---------------------------------------------------------------------------
+# Clan Hall
+# ---------------------------------------------------------------------------
+
+# Functions fee days
+FunctionFeeDay1 = 86400000
+FunctionFeeDay2 = 172800000
+FunctionFeeDay3 = 259200000
+FunctionFeeDay7 = 604800000
+
+# Teleport Function price.
+TeleportFunctionFeeLvl1 = 7000
+TeleportFunctionFeeLvl2 = 6000
+TeleportFunctionFeeLvl11 = 1000
+TeleportFunctionFeeLvl12 = 10000
+
+# Support magic buff price.
+SupportFeeLvl1 = 2500
+SupportFeeLvl2 = 5000
+SupportFeeLvl3 = 5000
+SupportFeeLvl4 = 11000
+SupportFeeLvl5 = 21000
+SupportFeeLvl7 = 37000
+SupportFeeLvl8 = 52000
+SupportFeeLvl15 = 49000
+SupportFeeLvl18 = 120000
+
+# MP Regeneration price.
+MpRegenerationFeeLvl1 = 2000
+MpRegenerationFeeLvl2 = 3750
+MpRegenerationFeeLvl3 = 6500
+MpRegenerationFeeLvl4 = 13750
+MpRegenerationFeeLvl5 = 12000
+MpRegenerationFeeLvl6 = 27500
+MpRegenerationFeeLvl8 = 40000
+MpRegenerationFeeLvl18 = 45000
+MpRegenerationFeeLvl20 = 65000
+
+# Hp Regeneration price.
+HpRegenerationFeeLvl2 = 800
+HpRegenerationFeeLvl4 = 1000
+HpRegenerationFeeLvl5 = 3500
+HpRegenerationFeeLvl6 = 1500
+HpRegenerationFeeLvl7 = 1750
+HpRegenerationFeeLvl8 = 2000
+HpRegenerationFeeLvl9 = 2250
+HpRegenerationFeeLvl10 = 7500
+HpRegenerationFeeLvl12 = 3750
+HpRegenerationFeeLvl13 = 4250
+HpRegenerationFeeLvl15 = 15500
+HpRegenerationFeeLvl25 = 12000
+HpRegenerationFeeLvl30 = 20000
+
+# Exp Regeneration price.
+ExpRegenerationFeeLvl1 = 3000
+ExpRegenerationFeeLvl3 = 9000
+ExpRegenerationFeeLvl5 = 15000
+ExpRegenerationFeeLvl6 = 18000
+ExpRegenerationFeeLvl7 = 21000
+ExpRegenerationFeeLvl8 = 70000
+ExpRegenerationFeeLvl10 = 30000
+ExpRegenerationFeeLvl19 = 63000
+ExpRegenerationFeeLvl20 = 70000
+
+# Creation item function.
+ItemCreationFunctionFeeLvl1 = 30000
+ItemCreationFunctionFeeLvl2 = 70000
+ItemCreationFunctionFeeLvl3 = 140000
+ItemCreationFunctionFeeLvl11 = 70000
+ItemCreationFunctionFeeLvl12 = 160000
+ItemCreationFunctionFeeLvl13 = 320000
+
+# Curtains Decoration.
+CurtainFunctionFeeLvl1 = 2000
+CurtainFunctionFeeLvl2 = 2500
+
+# Fixtures Decoration.
+FrontPlatformFunctionFeeLvl1 = 1300
+FrontPlatformFunctionFeeLvl2 = 4000
+
+# BroadCast // confirm retail values
+BroadCastFunctionFeeLvl1 = 2000
+BroadCastFunctionFeeLvl2 = 2500
+
+# If true, Clan Hall buff cost 0 mp.
+# Default: False
+MpBuffFree = False
+
+# --------------------------------------------------
+# Contestable halls general configuration
+# --------------------------------------------------
+
+# Min level that each clan needs to register
+# for the siege
+MinClanLevel = 4
+
+# The maximum number of clans allowed for registering in the battle.
+MaxAttackers = 500
+
+# The maximum numbers of flags that each clan is allowed to place.
+MaxFlagsPerClan = 1
+
+# Enable the fame reward
+EnableFame = false
+
+# Fame amount
+FameAmount = 0
+
+# Fame Frequency
+FameFrequency = 0
diff --git a/src/main/resources/config/customs.properties b/src/main/resources/config/customs.properties
new file mode 100644
index 00000000..9f25f3fc
--- /dev/null
+++ b/src/main/resources/config/customs.properties
@@ -0,0 +1,435 @@
+# ---------------------------------------------------------------------------
+# L2JMODS - non-retail-like systems that have been integrated into the L2J project.
+# Be warned that there may be no support for these mods beyond the original author's assistance.
+
+# ---------------------------------------------------------------------------
+# Champion mobs - Turn random mobs into Champions
+# ---------------------------------------------------------------------------
+
+# Enable/Disable Champion Mob System.
+ChampionEnable = False
+
+# Force Champion mobs to be passive?
+# To leave champion mobs to default/Aggressive, set to False.
+# To set all champion mobs to Passive, set True.
+ChampionPassive = False
+
+# % chance for a mob to became champion (-1 to disable).
+ChampionFrequency = -1
+
+# Title of all Champion Mobs.
+ChampionTitle = Champion
+
+# Min and max levels allowed for a mob to be a Champion mob.
+ChampionMinLevel = 20
+ChampionMaxLevel = 78
+
+# Hp multiplier for Champion mobs.
+ChampionHp = 8
+
+# Hp Regen Multiplier for Champion mobs.
+ChampionHpRegen = 1.0
+
+# Exp/Sp rewards multiplier for Champion mobs.
+ChampionRewardsExpSp = 8.0
+
+# Standard rewards chance multiplier for Champion mobs.
+ChampionRewardsChance = 8.0
+
+# Standard rewards amount multiplier for Champion mobs.
+ChampionRewardsAmount = 1.0
+
+# Adena & Seal Stone rewards chance multiplier for Champion mobs.
+ChampionAdenasRewardsChance = 1.0
+
+# Adena & Seal Stone rewards amount multiplier for Champion mobs.
+ChampionAdenasRewardsAmount = 1.0
+
+# P. Attack and M. Attack bonus for Champion mobs.
+ChampionAtk = 1.0
+
+# Physical/Magical Attack Speed bonus for Champion mobs.
+ChampionSpdAtk = 1.0
+
+# Specified reward item ID
+ChampionRewardItemID = 6393
+
+# The amount of the specified reward a player will receive if they are awarded the item.
+ChampionRewardItemQty = 1
+
+# % Chance to obtain a specified reward item from a higher level Champion mob.
+# Default: 0
+ChampionRewardLowerLvlItemChance = 0
+
+# % Chance to obtain a specified reward item from a lower level Champion mob.
+# Default: 0
+ChampionRewardHigherLvlItemChance = 0
+
+# Do you want to enable the vitality calculation when killing champion mobs?
+# Be aware that it can lead to huge unbalance on your server, your rate for that mob would
+# then be "mobXP x serverRate x vitalityRate x championXpRate
+# Notes:
+#	Works only if EnableVitality = True
+# Default: False
+ChampionEnableVitality = False
+
+# Enable spawning of the champions in instances
+# Default = False
+ChampionEnableInInstances = False
+
+# ---------------------------------------------------------------------------
+# Wedding System (by evill33t)
+# ---------------------------------------------------------------------------
+# WARNING: this mod require custom NPC table support turned on!
+# CustomNpcTable = True in General.properties
+# ---------------------------------------------------------------------------
+# Wedding Manager ID: 50007
+# 
+# First part - "Engagement" 
+# 1) Target the player that you want to make a couple with.
+# 2) Use the voice command ".engage nameofyourpartner" then press enter.
+# 3) If the target player has you on listed as a friend (ie. you are in each other's friends list) a popup will appear with an engagement request along with a system message that you want to be engaged with him/her.
+# 4) If the target player accepts the engagement invitation, you will be engaged.
+# 
+# Second part - "Marriage" 
+# 1) Once two players are engaged, they can speak to Andromeda, the Wedding Priest in the Hot Springs Guild House (Goddard Area).
+#    (You may need Formal Wear and Adena to pay wedding fees!)
+# 2) Each player needs to speak to the NPC and make the request to be married.
+# 3) Once done, fireworks will display and the two players will be married.
+# 
+# Afterward you can use the voice command ".gotolove nameofyourpartner" to teleport to your partner if you're married (there may also be a fee which can be specified below)
+# 
+# If you want to cancel your Engagement/Marriage, use the voice command ".divorce nameofyourpartner".
+# 
+# If you're married, you have to pay a specified % of your adena to your partner.
+# 
+# If a player attempts to become engaged to another player while married, they may suffer a penalty if it's enabled below.
+# ---------------------------------------------------------------------------
+# Enable/Disable Wedding System
+AllowWedding = False
+
+# The amount of Adena required to get married.
+WeddingPrice = 250000000
+
+# Enable/Disable punishing of players who attempt to be engaged to other players while married.
+WeddingPunishInfidelity = True
+
+# Enable/Disable teleport function for married couples.
+WeddingTeleport = True
+
+# Amount of Adena required to teleport to spouse.
+WeddingTeleportPrice = 50000
+
+# Time before character is teleported after using the skill.
+WeddingTeleportDuration = 60
+
+# Enable/Disable same sex marriages.
+WeddingAllowSameSex = False
+
+# Require players to wear formal wear to be married?
+WeddingFormalWear = True
+
+# Amount of Adena (%) a player must pay to the other to get divorced.
+WeddingDivorceCosts = 20
+
+# ---------------------------------------------------------------------------
+# L2J Banking System
+# ---------------------------------------------------------------------------
+
+# Enable/Disable Banking System
+BankingEnabled = False
+
+# Amount of Goldbars a player gets when they use the ".deposit" command.
+# Also, the same amount they will lose with ".withdraw".
+BankingGoldbarCount = 1
+
+# Amount of Adena a player gets when they use the ".withdraw" command.
+# Also, the same amount they will lose with ".deposit".
+BankingAdenaCount = 500000000
+
+# ---------------------------------------------------------------------------
+# Warehouse Sorting
+# Shows Withdraw Window sorted by ItemType (Armor/Weapon/Spellbook....)
+# ---------------------------------------------------------------------------
+
+EnableWarehouseSortingClan = False
+EnableWarehouseSortingPrivate = False
+
+# ---------------------------------------------------------------------------
+# Auto Loot Extension voiced command
+# ---------------------------------------------------------------------------
+
+# Adena Loot also earn Seal Stone(s)
+# Default: False
+AutoLootVoiceEnable = False
+
+# Restore Auto Loot(s) after restart/shutdown.
+# Default: False
+AutoLootVoiceRestore = False
+
+# Default: False
+AutoLootItemsVoiceRestore = False
+
+# Default: False
+AutoLootHerbsVoiceRestore = False
+
+# Auto Loot Item(s) only in the list by command: (.itemloot)
+# Default: 57,5575,6360,6361,6362
+AutoLootItemsList = 57,5575,6360,6361,6362
+
+# Auto Loot Herb(s) only in the list by command: (.herbloot)
+# Default: 8600,8601,8602,8603,8604,8605,8614,13028
+AutoLootHerbsList = 8600,8601,8602,8603,8604,8605,8614,13028
+
+# ---------------------------------------------------------------------------
+# Offline trade/craft
+# ---------------------------------------------------------------------------
+
+# Option to enable or disable offline trade feature.
+# Enable -> true, Disable -> false
+OfflineTradeEnable = False
+
+# Option to enable or disable offline craft feature.
+# Enable -> true, Disable -> false
+OfflineCraftEnable = False
+
+# If set to True, off-line shops will be possible only peace zones.
+# Default: False
+OfflineModeInPeaceZone = False
+
+# If set to True, players in off-line shop mode wont take any damage, thus they cannot be killed.
+# Default: False
+OfflineModeNoDamage = False
+
+# If set to True, name color will be changed then entering offline mode
+OfflineSetNameColor = False
+
+# Color of the name in offline mode (if OfflineSetNameColor = True)
+OfflineNameColor = 808080
+
+# Allow fame for characters in offline mode
+# Enable -> true, Disable -> false
+OfflineFame = True
+
+#Restore offline traders/crafters after restart/shutdown. Default: false.
+RestoreOffliners = False
+
+#Do not restore offline characters, after OfflineMaxDays days spent from first restore.
+#Require server restart to disconnect expired shops.
+#0 = disabled (always restore).
+#Default: 10
+OfflineMaxDays = 10
+
+#Disconnect shop after finished selling, buying.
+#Default: True
+OfflineDisconnectFinished = True
+
+# ---------------------------------------------------------------------------
+# Mana Drugs/Potions
+# ---------------------------------------------------------------------------
+
+# This option will enable core support for:
+# Mana Drug (item ID 726), using skill ID 10000.
+# Mana Potion (item ID 728), using skill ID 10001.
+EnableManaPotionSupport = False
+
+# ---------------------------------------------------------------------------
+# Display Server Time
+# ---------------------------------------------------------------------------
+
+# This option will enable displaying of the local server time for /time command.
+DisplayServerTime = False
+
+# ---------------------------------------------------------------------------
+# Welcome message
+# ---------------------------------------------------------------------------
+
+# Show screen welcome message on character login
+# Default: False
+ScreenWelcomeMessageEnable = False
+
+# Screen welcome message text to show on character login if enabled
+# ('#' for a new line, but a message can have max 2 lines)
+ScreenWelcomeMessageText = Welcome to L2J server!
+
+# Show a screen welcome message for x seconds when character logs in to game if enabled.
+ScreenWelcomeMessageTime = 10
+
+# ---------------------------------------------------------------------------
+# AntiFeed
+# ---------------------------------------------------------------------------
+
+# This option will enable antifeed for pvp/pk/clanrep points.
+# Default: False
+AntiFeedEnable = False
+
+# If set to True, kills from dualbox will not increase pvp/pk points
+# and clan reputation will not be transferred.
+# Default: True
+AntiFeedDualbox = True
+
+# If set to True, server will count disconnected (unable to determine ip address)
+# as dualbox.
+# Default: True
+AntiFeedDisconnectedAsDualbox = True
+
+# If character died faster than timeout - pvp/pk points for killer will not increase
+# and clan reputation will not be transferred.
+# Setting to 0 will disable this feature.
+# Default: 120 seconds.
+AntiFeedInterval = 120
+
+# ---------------------------------------------------------------------------
+# Pvp/pk Announce
+# ---------------------------------------------------------------------------
+
+# Default: False
+AnnouncePkPvP = False
+
+# Announce this as normal system message
+# Default: True
+AnnouncePkPvPNormalMessage = True
+
+# PK message template
+# variables: $killer, $target
+AnnouncePkMsg = $killer has slaughtered $target
+
+# Pvp message template
+# variables: $killer, $target
+AnnouncePvpMsg = $killer has defeated $target
+
+# ---------------------------------------------------------------------------
+# Chat Moderation
+# ---------------------------------------------------------------------------
+
+# This option will enable using of the voice commands .banchat and .unbanchat
+# for players with corresponding access level (default: 7).
+# Check access_levels.sql and admin_command_access_rights for details.
+# Default: False
+ChatAdmin = False
+
+# ---------------------------------------------------------------------------
+# Hellbound Status Voice Command
+# ---------------------------------------------------------------------------
+
+# This option will enable using of the voice commands .hellbound
+# for retrieving information about current Hellbound level and trust.
+# Default: False
+HellboundStatus = False
+
+# ---------------------------------------------------------------------------
+# Multilingual Support
+# ---------------------------------------------------------------------------
+
+# Enable or disable multilingual support.
+# Default: False
+MultiLangEnable = False
+
+# Default language, if not defined.
+# Default: en
+MultiLangDefault = en
+
+# List of allowed languages, comma separated.
+# Default: en,es
+MultiLangAllowed = en,es
+
+# Enable or disable voice command .lang for changing languages on the fly.
+# Default: True
+MultiLangHandler = True
+
+# Enable or disable multilingual SystemMessages support.
+# Default: False
+MultiLangSystemMessageEnable = False
+
+# List of allowed languages for SystemMessages, comma separated.
+# Default: es
+MultiLangSystemMessageAllowed = es
+
+# Enable or disable multilingual NpcStrings support.
+# Default: False
+MultiLangNpcStringEnable = False
+
+# List of allowed languages for NpcStrings, comma separated.
+# Default: es
+MultiLangNpcStringAllowed = es
+
+# ---------------------------------------------------------------------------
+# Walker/Bot protection
+# ---------------------------------------------------------------------------
+
+# Basic protection against L2Walker.
+# Default: False
+L2WalkerProtection = False
+
+# ---------------------------------------------------------------------------
+# Debug enable/disable voice command
+# ---------------------------------------------------------------------------
+
+# This option will enable voice command .debug allowing players
+# to turn on/off debugging on self only.
+# (admin command //debug can enable debugging on any character)
+# Use admin_command_access_rights table for defining access rights.
+# Default: False
+DebugHandler = False
+
+# ---------------------------------------------------------------------------
+# Dualbox Check
+# ---------------------------------------------------------------------------
+
+# Maximum number of players per IP address allowed to enter game.
+# Default: 0 (unlimited)
+DualboxCheckMaxPlayersPerIP = 0
+
+# Maximum number of players per IP address allowed to participate in olympiad.
+# Default: 0 (unlimited)
+DualboxCheckMaxOlympiadParticipantsPerIP = 0
+
+# Maximum number of players per IP address allowed to participate in events using L2J Event Engine (//event).
+# Default: 0 (unlimited)
+DualboxCheckMaxL2EventParticipantsPerIP = 0
+
+# Whitelist of the addresses for dualbox checks.
+# Format: Address1,Number1;Address2,Number2...
+# Network address can be number (127.0.0.1) or symbolic (localhost) formats.
+# Additional connection number added to the global limits for this address.
+# For example, if number of TvT event participants per IP address set to the 1 (no dualbox)
+# and whitelist contains "l2jserver.com,2" then number of allowed participants from l2jserver.com
+# will be 1+2=3. Use 0 or negative value for unlimited number of connections.
+# Default: 127.0.0.1,0 (no limits from localhost)
+DualboxCheckWhitelist = 127.0.0.1,0
+
+# ---------------------------------------------------------------------------
+# Password Change
+# ---------------------------------------------------------------------------
+
+# Enables .changepassword voiced command which allows the players to change their account's password ingame.
+# Default: False
+AllowChangePassword = False
+
+# ---------------------------------------------------------------------------
+# Castle/Clan Voiced Handlers
+# ---------------------------------------------------------------------------
+
+# When enabled, the leader of a clan that owns a castle can open or close the castle doors and ride their Wyvern.
+# Default value: False
+AllowCastleHandler = False
+
+# When enabled, the clan leader can manage member privileges and set titles to clan members.
+# Default value: False
+AllowClanHandler = False
+
+# ---------------------------------------------------------------------------
+# Event Voiced Handlers
+# ---------------------------------------------------------------------------
+
+# When enabled, players can view the statistics of other players for the current event.
+# Default value: False
+AllowStatHandler = False
+
+# ---------------------------------------------------------------------------
+# XP Voiced Handlers
+# ---------------------------------------------------------------------------
+
+# When enabled, players can choose to stop gaining experience points (XP).
+# Default: False
+AllowXpHandler = False
\ No newline at end of file
diff --git a/src/main/resources/config/database.properties b/src/main/resources/config/database.properties
new file mode 100644
index 00000000..7901e15a
--- /dev/null
+++ b/src/main/resources/config/database.properties
@@ -0,0 +1,21 @@
+# ---------------------------------------------------------------------------
+# Database
+# ---------------------------------------------------------------------------
+
+# Database URL
+# Default: jdbc:mariadb://localhost/l2jgs
+URL = jdbc:mariadb://localhost/l2jgs
+
+# Database User
+# Default: l2j
+User = l2j
+
+# Database Password
+# Default: l2jserver2019
+Password = l2jserver2019
+
+# Default: 100
+MaxConnections = 100
+
+# Default: 0
+MaxIdleTime = 0
\ No newline at end of file
diff --git a/src/main/resources/config/default-ipconfig.xml b/src/main/resources/config/default-ipconfig.xml
new file mode 100644
index 00000000..12dce5e6
--- /dev/null
+++ b/src/main/resources/config/default-ipconfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Note: If the file is named "ipconfig.xml" this data will be used as network configuration, otherwise the server will configure it automatically! -->
+<!-- External host here (Internet IP) or Localhost IP for local test -->
+<gameserver address="127.0.0.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ipconfig.xsd">
+	<!-- Localhost here -->
+	<define subnet="127.0.0.0/8" address="127.0.0.1" />
+	<!-- Internal hosts here (LANs IPs) -->
+	<define subnet="10.0.0.0/8" address="10.0.0.0" />
+	<define subnet="172.16.0.0/19" address="172.16.0.0" />
+	<define subnet="192.168.0.0/16" address="192.168.0.0" />
+	<define subnet="192.168.0.0/24" address="192.168.0.0" />
+	<define subnet="192.168.1.0/24" address="192.168.1.0" />
+</gameserver>
diff --git a/src/main/resources/config/discord.properties b/src/main/resources/config/discord.properties
new file mode 100644
index 00000000..1c0791f5
--- /dev/null
+++ b/src/main/resources/config/discord.properties
@@ -0,0 +1,44 @@
+# Discord Bot
+# https://discord.com/developers/applications/
+# Use the link above to create your Discord bot, and there you will find the info needed for (BotToken =)
+# Create a Discord server and activate Developer mode. (User Settings->Advanced->Developer Mode)
+# Developer Mode exposes context menu items helpful for people writing bot using Discord API.
+# https://discordpy.readthedocs.io/en/latest/discord.html - A guide how to create a Bot account.
+# See also https://discordpy.readthedocs.io/en/latest/discord.html#inviting-your-bot - on how to invite your bot.
+# ---------------------------------------------------------------------------
+# Default: False
+BotEnable = False
+
+# Use the prefix for your Discord Bot to listen to commands
+# Example is //admin, that means if you don't type "//" you can't execute the admin command.
+# Default: //
+BotPrefix = //
+
+# Use the token from your Discord Application that you created!
+# https://discord.com/developers/applications/
+# A Discord Bot Token is a short phrase (represented as a jumble of letters and numbers) that acts as a key to control a Discord Bot.
+# Tokens are used inside bot code to send commands back and forth to the API, which in turn controls bot actions.
+# WARNING: Never share your Discord Bot Token with anyone.
+BotToken =
+
+# Use the Server ID from your Discord Server/Guild.
+# Developer Mode must be ON.
+# Right-click the Discord Server/Guild to get the id (Copy ID).
+ServerId =
+
+# Use the Role ID from your Discord Server/Guild that you want to have Game Master permissions.
+# Users with this role can execute moderation commands like "//restart", "//announce" etc.
+# Developer Mode must be ON.
+# Right-click the Role to get the id (Copy ID).
+GameMasterId =
+
+# Use the Channel ID from your Discord Server/Guild that you want the game chat to be posted.
+# Developer Mode must be ON.
+# Right-click the channel to get the id (Copy ID).
+GameChatChannelId =
+
+# Use the Channel ID from your Discord Server/Guild that you want the server logs to be posted.
+# Server admins hide this channel from public view.
+# Developer Mode must be ON.
+# Right-click the channel to get the id (Copy ID).
+ConsoleLogChannelId =
\ No newline at end of file
diff --git a/src/main/resources/config/floodprotector.properties b/src/main/resources/config/floodprotector.properties
new file mode 100644
index 00000000..57da28dc
--- /dev/null
+++ b/src/main/resources/config/floodprotector.properties
@@ -0,0 +1,124 @@
+# ---------------------------------------------------------------------------
+# Flood Protector Options
+# ---------------------------------------------------------------------------
+# The following settings can be applied to each feature:
+# Interval - interval in game server ticks (1 tick = 100ms) in which only one request is allowed
+# LogFlooding - whether flooding should be logged (only first occurrence of flooding and total count of flood requests is logged)
+# PunishmentLimit - if number of requests within single interval exceeds specified number then the specified punishment is applied (0 = disables punishment feature)
+# PunishmentType - type of the punishment ('none', 'kick', 'ban', 'jail'), valid only if PunishmentLimit is greater than 0
+# PunishmentTime - for how many minutes should the player(jail)/account(ban) be punished (0 = forever), valid only for PunishmentType 'jail' or 'ban'
+
+# UseItem - item usage flooding
+# Item usage interval
+# Disabled to match retail, if you want to enable this protection, change the value to 4, for example.
+# Default: 0
+UseItemInterval = 0
+UseItemLogFlooding = False
+UseItemPunishmentLimit = 0
+UseItemPunishmentType = none
+UseItemPunishmentTime = 0
+
+# RollDice - rolling dice flooding
+RollDiceInterval = 42
+RollDiceLogFlooding = False
+RollDicePunishmentLimit = 0
+RollDicePunishmentType = none
+RollDicePunishmentTime = 0
+
+# Firework - firework flooding
+FireworkInterval = 42
+FireworkLogFlooding = False
+FireworkPunishmentLimit = 0
+FireworkPunishmentType = none
+FireworkPunishmentTime = 0
+
+# ItemPetSummon - item summoning and pet mounting flooding
+ItemPetSummonInterval = 16
+ItemPetSummonLogFlooding = False
+ItemPetSummonPunishmentLimit = 0
+ItemPetSummonPunishmentType = none
+ItemPetSummonPunishmentTime = 0
+
+# HeroVoice - hero voice flooding
+HeroVoiceInterval = 100
+HeroVoiceLogFlooding = False
+HeroVoicePunishmentLimit = 0
+HeroVoicePunishmentType = none
+HeroVoicePunishmentTime = 0
+
+# GlobalChat - global chat flooding
+GlobalChatInterval = 5
+GlobalChatLogFlooding = False
+GlobalChatPunishmentLimit = 0
+GlobalChatPunishmentType = none
+GlobalChatPunishmentTime = 0
+
+# Subclass - subclass flooding
+SubclassInterval = 20
+SubclassLogFlooding = False
+SubclassPunishmentLimit = 0
+SubclassPunishmentType = none
+SubclassPunishmentTime = 0
+
+# DropItem - drop item flooding
+DropItemInterval = 10
+DropItemLogFlooding = False
+DropItemPunishmentLimit = 0
+DropItemPunishmentType = none
+DropItemPunishmentTime = 0
+
+# ServerBypass - server bypass flooding
+ServerBypassInterval = 5
+ServerBypassLogFlooding = False
+ServerBypassPunishmentLimit = 0
+ServerBypassPunishmentType = none
+ServerBypassPunishmentTime = 0
+
+# ServerBypass - multisell list request flooding
+MultiSellInterval = 1
+MultiSellLogFlooding = False
+MultiSellPunishmentLimit = 0
+MultiSellPunishmentType = none
+MultiSellPunishmentTime = 0
+
+# All kinds of other transactions - to/from pet, private store, warehouse, destroy
+TransactionInterval = 10
+TransactionLogFlooding = False
+TransactionPunishmentLimit = 0
+TransactionPunishmentType = none
+TransactionPunishmentTime = 0
+
+# Manufacture
+ManufactureInterval = 3
+ManufactureLogFlooding = False
+ManufacturePunishmentLimit = 0
+ManufacturePunishmentType = none
+ManufacturePunishmentTime = 0
+
+# Manor
+ManorInterval = 30
+ManorLogFlooding = False
+ManorPunishmentLimit = 0
+ManorPunishmentType = none
+ManorPunishmentTime = 0
+
+# SendMail - sending mail interval, 10s on retail
+SendMailInterval = 100
+SendMailLogFlooding = False
+SendMailPunishmentLimit = 0
+SendMailPunishmentType = none
+SendMailPunishmentTime = 0
+
+# CharacterSelect - attempts to load character
+CharacterSelectInterval = 30
+CharacterSelectLogFlooding = False
+CharacterSelectPunishmentLimit = 0
+CharacterSelectPunishmentType = none
+CharacterSelectPunishmentTime = 0
+
+# Item Auction - Request for refresh
+ItemAuctionInterval = 9
+ItemAuctionLogFlooding = False
+ItemAuctionPunishmentLimit = 0
+ItemAuctionPunishmentType = none
+ItemAuctionPunishmentTime = 0
diff --git a/src/main/resources/config/fortress.properties b/src/main/resources/config/fortress.properties
new file mode 100644
index 00000000..d1b6f543
--- /dev/null
+++ b/src/main/resources/config/fortress.properties
@@ -0,0 +1,51 @@
+# ---------------------------------------------------------------------------
+# Fortress
+# ---------------------------------------------------------------------------
+
+# Functions fee days
+FunctionFeeDay7 = 604800000
+
+# Teleport Function price.
+TeleportFunctionFeeLvl11 = 1000
+TeleportFunctionFeeLvl12 = 10000
+
+# Support magic buff price.
+SupportFeeLvl15 = 49000
+SupportFeeLvl18 = 120000
+
+# MP Regeneration price.
+MpRegenerationFeeLvl18 = 45000
+MpRegenerationFeeLvl20 = 65000
+
+# Hp Regeneration price.
+HpRegenerationFeeLvl25 = 12000
+HpRegenerationFeeLvl30 = 20000
+
+# Exp Regeneration price.
+ExpRegenerationFeeLvl19 = 63000
+ExpRegenerationFeeLvl20 = 70000
+
+# This is the time frequently when a Fort owner gets a Blood Oath, supply level raised and Fort fee is paid.
+# Default 360 minutes
+PeriodicUpdateFrequency = 360
+
+# The number of Blood Oath which given to the Fort owner clan when Fort Updater runs
+# Default: 1
+BloodOathCount = 1
+
+# The maximum Fort supply level
+# Max lvl what you can define here is 21!
+# Default: 6
+MaxSupplyLevel = 6
+
+# Fort fee which paid to the Castle
+# Default: 25000
+FeeForCastle = 25000
+
+# The maximum time while a clan can own a fortress
+# Default: 168 hours
+MaxKeepTime = 168
+
+# If true, Fortress buff cost 0 mp.
+# Default: False
+MpBuffFree = False
\ No newline at end of file
diff --git a/src/main/resources/config/fortsiege.properties b/src/main/resources/config/fortsiege.properties
new file mode 100644
index 00000000..8371ad2a
--- /dev/null
+++ b/src/main/resources/config/fortsiege.properties
@@ -0,0 +1,279 @@
+# ---------------------------------------------------------------------------
+# Fort Siege Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Standard Settings
+# ---------------------------------------------------------------------------
+
+# Length of siege before the count-down (in minutes).
+SiegeLength = 60
+
+# This defines how long you need to wait until the suspicious merchant will spawn after the siege ends (in minutes).
+# Keep in mind when merchant spawns, the fort can be immediately siege.
+# Default: 180
+SuspiciousMerchantRespawnDelay = 180
+
+# This defines how long you have to kill all commanders once you kill the first one (in minutes).
+# After that time (if all commanders are not killed), all commanders and doors get respawned.
+CountDownLength = 10
+
+# Max number of flags per clan.
+MaxFlags = 1
+
+# Minimum clan level needed to sign up.
+SiegeClanMinLevel = 4
+
+#Max number of clans that can register on each side.
+AttackerMaxClans = 500
+
+# This option, if enabled, will enable to register Fortress Siege to Castle owners just in territory.
+# Default: True
+JustToTerritory = True
+
+# ---------------------------------------------------------------------------
+# Fortress Commander Spawns
+# ---------------------------------------------------------------------------
+# Commander syntax:  NameCommanderN = x,y,z,heading,npc_id
+# Name - fortress name
+# N - number - 1: Archer Commander
+#            - 2: Guard Commander
+#            - 3: Support Unit Commander
+#            - 4: Main Machine - not supported yet, used General
+#            - 5: General - not used yet, will be used once control room is supported
+# Please keep the correct order of commanders, otherwise client will show wrong occupied barracks.
+# Control room (main machine) currently emulated in client.
+# x,y,z - coords
+# heading
+# npc_id - id of template
+
+# Flag syntax: NameFlagN = x,y,z,flag_id
+# Name - fortress name
+# N - number
+# x,y,z - coords
+# flag_id - id of a combat flag
+
+# Shanty Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+ShantyCommander1 = -52435,155188,-1768,20000,35683
+ShantyCommander2 = -52128,157752,-2024,29864,35677
+ShantyCommander3 = -53944,155433,-2024,7304,35680
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+ShantyFlag1 = -53086,156493,-1896,9819
+ShantyFlag2 = -53054,156605,-1896,9819
+ShantyFlag3 = -53032,156689,-1896,9819
+
+# Southern Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+SouthernCommander1 = -21328,218864,-2952,0,35719
+SouthernCommander2 = -22992,218160,-3208,0,35713
+SouthernCommander3 = -21520,221504,-3208,45328,35716
+SouthernCommander4 = -22728,221746,-3200,33168,35721
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+SouthernFlag1 = -22386,219917,-3079,9819
+SouthernFlag2 = -22386,219798,-3079,9819
+SouthernFlag3 = -22386,219679,-3079,9819
+
+# Hive Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+HiveCommander1 = 15152,188128,-2640,0,35752
+HiveCommander2 = 17984,187536,-2896,45056,35746
+HiveCommander3 = 16016,189520,-2888,0,35749
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+HiveFlag1 = 16685,188358,-2770,9819
+HiveFlag2 = 16761,188306,-2770,9819
+HiveFlag3 = 16847,188257,-2770,9819
+
+# Valley Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+ValleyCommander1 = 124768,121856,-2296,0,35788
+ValleyCommander2 = 124299,123614,-2552,49192,35782
+ValleyCommander3 = 124768,124640,-2552,54480,35785
+ValleyCommander4 = 128048,123344,-2536,35028,35790
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+ValleyFlag1 = 125970,123653,-2429,9819
+ValleyFlag2 = 126092,123650,-2429,9819
+ValleyFlag3 = 126205,123648,-2429,9819
+
+# Ivory Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+IvoryCommander1 = 72400,2896,-2760,0,35821
+IvoryCommander2 = 73788,5479,-3016,55136,35815
+IvoryCommander3 = 71264,4144,-3008,0,35818
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+IvoryFlag1 = 72565,4436,-2888,9819
+IvoryFlag2 = 72660,4512,-2888,9819
+IvoryFlag3 = 72759,4594,-2888,9819
+
+# Narsell Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+NarsellCommander1 = 154704,53856,-2968,0,35852
+NarsellCommander2 = 155576,56592,-3224,59224,35846
+NarsellCommander3 = 153328,54848,-3216,5512,35849
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+NarsellFlag1 = 154567,55397,-3097,9819
+NarsellFlag2 = 154650,55493,-3097,9819
+NarsellFlag3 = 154715,55587,-3097,9819
+
+# Bayou Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+BayouCommander1 = 188624,38240,-3128,0,35888
+BayouCommander2 = 188160,39920,-3376,49284,35882
+BayouCommander3 = 188626,41066,-3376,57140,35885
+BayouCommander4 = 191846,39764,-3368,33020,35890
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+BayouFlag1 = 189838,40063,-3253,9819
+BayouFlag2 = 189931,40060,-3253,9819
+BayouFlag3 = 190052,40062,-3253,9819
+
+# White Sands Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+WhiteSandsCommander1 = 117216,205648,-3048,0,35921
+WhiteSandsCommander2 = 118880,203568,-3304,5396,35915
+WhiteSandsCommander3 = 118560,206560,-3304,48872,35918
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+WhiteSandsFlag1 = 118640,205151,-3176,9819
+WhiteSandsFlag2 = 118690,205062,-3176,9819
+WhiteSandsFlag3 = 118742,204968,-3176,9819
+
+# Borderland Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+BorderlandCommander1 = 159664,-72224,-2584,0,35957
+BorderlandCommander2 = 157968,-71659,-2832,59020,35951
+BorderlandCommander3 = 157312,-70640,-2832,0,35954
+BorderlandCommander4 = 160194,-68688,-2824,43272,35959
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+BorderlandFlag1 = 158817,-70229,-2708,9819
+BorderlandFlag2 = 158883,-70145,-2708,9819
+BorderlandFlag3 = 158946,-70045,-2708,9819
+
+# Swamp Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+SwampCommander1 = 71264,-60512,-2504,0,35995
+SwampCommander2 = 71248,-62352,-2752,12388,35989
+SwampCommander3 = 68688,-59648,-2752,56012,35992
+SwampCommander4 = 68005,-60866,-2744,5424,35997
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+SwampFlag1 = 69829,-61087,-2629,9819
+SwampFlag2 = 69979,-61144,-2632,9819
+SwampFlag3 = 70069,-61182,-2629,9819
+
+# Archaic Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+ArchaicCommander1 = 109856,-142640,-2672,0,36028
+ArchaicCommander2 = 109600,-139735,-2928,62612,36022
+ArchaicCommander3 = 108223,-142209,-2920,8524,36025
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+ArchaicFlag1 = 109142,-141243,-2801,9819
+ArchaicFlag2 = 109184,-141129,-2801,9819
+ArchaicFlag3 = 109214,-141016,-2801,9819
+
+# Floran Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+FloranCommander1 = 6528,151872,-2608,0,36064
+FloranCommander2 = 7006,148242,-2856,32768,36058
+FloranCommander3 = 4384,150992,-2856,0,36061
+FloranCommander4 = 5246,152319,-2848,49151,36066
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+FloranFlag1 = 5293,149624,-2732,9819
+FloranFlag2 = 5306,149743,-2732,9819
+FloranFlag3 = 5299,149870,-2732,9819
+
+# Cloud Mountain Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+CloudMountainCommander1 = -55248,90496,-2536,0,36102
+CloudMountainCommander2 = -55791,91856,-2792,0,36096
+CloudMountainCommander3 = -54168,92604,-2784,49196,36099
+CloudMountainCommander4 = -50913,92259,-2776,41188,36104
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+CloudMountainFlag1 = -53354,91537,-2664,9819
+CloudMountainFlag2 = -53237,91537,-2664,9819
+CloudMountainFlag3 = -53112,91537,-2664,9819
+
+# Tanor Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+TanorCommander1 = 58480,139648,-1464,0,36135
+TanorCommander2 = 61864,139257,-1728,46896,36129
+TanorCommander3 = 59436,140834,-1720,47296,36132
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+TanorFlag1 = 60225,139771,-1597,9819
+TanorFlag2 = 60362,139742,-1597,9819
+TanorFlag3 = 60467,139727,-1597,9819
+
+# DragonSpine Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+DragonspineCommander1 = 13184,94928,-3144,0,36166
+DragonspineCommander2 = 9472,94992,-3392,0,36160
+DragonspineCommander3 = 12829,96214,-3392,49152,36163
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+DragonspineFlag1 = 11459,95308,-3264,9819
+DragonspineFlag2 = 11527,95301,-3264,9819
+DragonspineFlag3 = 11623,95311,-3264,9819
+
+# Antharas Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+AntharasCommander1 = 79440,88752,-2600,0,36202
+AntharasCommander2 = 77262,91704,-2856,5112,36196
+AntharasCommander3 = 80929,90510,-2856,40192,36199
+AntharasCommander4 = 80755,89002,-2848,21984,36204
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+AntharasFlag1 = 79470,91299,-2728,9819
+AntharasFlag2 = 79528,91187,-2728,9819
+AntharasFlag3 = 79580,91095,-2728,9819
+
+# Western Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+WesternCommander1 = 113481,-16058,-712,0,36240
+WesternCommander2 = 109872,-16624,-968,16384,36234
+WesternCommander3 = 112601,-13933,-960,49152,36237
+WesternCommander4 = 113929,-14801,-960,32768,36242
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+WesternFlag1 = 111280,-14820,-839,9819
+WesternFlag2 = 111380,-14820,-839,9819
+WesternFlag3 = 111480,-14820,-839,9819
+
+# Hunters Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+HuntersCommander1 = 123232,94400,-1856,0,36278
+HuntersCommander2 = 122688,95760,-2112,0,36272
+HuntersCommander3 = 124305,96528,-2104,49151,36275
+HuntersCommander4 = 127632,96240,-2096,40892,36280
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+HuntersFlag1 = 125155,95455,-1984,9819
+HuntersFlag2 = 125255,95455,-1984,9819
+HuntersFlag3 = 125355,95455,-1984,9819
+
+# Aaru Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+AaruCommander1 = 74288,186912,-2296,0,36311
+AaruCommander2 = 71392,184720,-2552,5528,36305
+AaruCommander3 = 71542,186410,-2552,55088,36308
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+AaruFlag1 = 73029,186303,-2424,9819
+AaruFlag2 = 73923,186247,-2424,9819
+AaruFlag3 = 72833,186178,-2424,9819
+
+# Demon Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+DemonCommander1 = 100752,-53664,-360,0,36347
+DemonCommander2 = 100688,-57440,-616,16384,36341
+DemonCommander3 = 99484,-54027,-616,0,36344
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+DemonFlag1 = 100400,-55401,-488,9819
+DemonFlag2 = 100400,-55301,-488,9819
+DemonFlag3 = 100400,-55201,-488,9819
+
+# Monastic Fortress
+# Commander syntax: NameCommanderN = x,y,z,heading,npc_id
+MonasticCommander1 = 73680,-95456,-1144,0,36385
+MonasticCommander2 = 70189,-93935,-1400,61576,36379
+MonasticCommander3 = 73831,-94119,-1400,45536,36382
+# Flag syntax:  NameFlagN = x,y,z,flag_id
+MonasticFlag1 = 72174,-94437,-1271,9819
+MonasticFlag2 = 72294,-94481,-1271,9819
+MonasticFlag3 = 72401,-94526,-1271,9819
\ No newline at end of file
diff --git a/src/main/resources/config/general.properties b/src/main/resources/config/general.properties
new file mode 100644
index 00000000..edb256fd
--- /dev/null
+++ b/src/main/resources/config/general.properties
@@ -0,0 +1,914 @@
+# ---------------------------------------------------------------------------
+# General Server Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Administrator
+# ---------------------------------------------------------------------------
+
+# When True, every player will have master access level (8).
+# Default: False
+EverybodyHasAdminRights = False
+
+# Setting for serverList
+# Displays [] in front of server name on character selection
+# Default: False
+ServerListBrackets = False
+
+# Displays the server type next to the server name on character selection.
+# Accepted Values: Normal, Relax, Test, NoLabel, Restricted, Event, Free
+# Default: Normal
+ServerListType = Normal
+ 
+# Displays server minimum age to the server name on character selection.
+# Notes:
+#	Accepted values: 0, 15, 18
+# Default: 0
+ServerListAge = 0
+
+
+# If True, only accounts with GM access can enter the server.
+# Default: False
+ServerGMOnly = False
+
+# Enable GMs to have the glowing aura of a Hero character on login. 
+# Notes:
+#	GMs can do "///hero" on themselves and get this aura voluntarily.
+#	It's advised to keep this off due to graphic lag.
+# Default: False
+GMHeroAura = False
+
+# Auto set invulnerable status to a GM on login.
+# Default: False
+GMStartupInvulnerable = False
+
+# Auto set invisible status to a GM on login.
+# Default: False
+GMStartupInvisible = False
+
+# Auto block private messages to a GM on login.
+# Default: False
+GMStartupSilence = False
+
+# Auto list GMs in GM list (/gmlist) on login.
+# Default: False
+GMStartupAutoList = False
+
+# Auto set diet mode on to a GM on login (affects your weight penalty).
+# Default: False
+GMStartupDietMode = False
+
+# Item restrictions apply to GMs as well? (True = restricted usage)
+# Default: True
+GMItemRestriction = True
+
+# Skill restrictions apply to GMs as well? (True = restricted usage)
+# Default: True
+GMSkillRestriction = True
+
+# Allow GMs to drop/trade non-tradable and quest(drop only) items
+# Default: False
+GMTradeRestrictedItems = False
+
+# Allow GMs to restart/exit while is fighting stance
+# Default: True
+GMRestartFighting = True
+
+# Show the GM's name behind an announcement made by him
+# example: "Announce: hi (HanWik)"
+GMShowAnnouncerName = False
+
+# Show the GM's name before an announcement made by him
+# example: "Nyaran: hi"
+GMShowCritAnnouncerName = False
+
+# Give special skills for every GM
+# 7029,7041-7064,7088-7096,23238-23249 (Master's Blessing)
+# Default: False
+GMGiveSpecialSkills = False
+
+# Give special aura skills for every GM
+# 7029,23238-23249,23253-23296 (Master's Blessing)
+# Default: False
+GMGiveSpecialAuraSkills = False
+
+
+# ---------------------------------------------------------------------------
+# Server Security
+# ---------------------------------------------------------------------------
+
+# Enforce gameguard for clients. Sends a gameguard query on character login.
+# Default: False
+GameGuardEnforce = False
+
+# Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
+# Default: False
+GameGuardProhibitAction = False
+
+#Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
+# Default: False
+LogChat = False
+
+# Default: False
+LogAutoAnnouncements = False
+
+# Default: False
+LogItems = False
+
+# Log only Adena and equippable items if LogItems is enabled
+LogItemsSmallLog = False
+
+# Default: False
+LogItemEnchants = False
+
+# Default: False
+LogSkillEnchants = False
+
+# Default: False
+GMAudit = False
+
+# Check players for non-allowed skills
+# Default: False
+SkillCheckEnable = False
+
+# If true, remove invalid skills from player and database.
+# Report only, if false.
+# Default: False
+SkillCheckRemove = False
+
+# Check also GM characters (only if SkillCheckEnable = True)
+# Default: True
+SkillCheckGM = True
+
+
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Extreme caution should be here, set to defaults if you do not know what you are doing.
+# These could possibly hurt your server's performance or improve it depending on your server's configuration, size, and other factors.
+# Default: 10
+ThreadPoolSizeEffects = 10
+
+# Default: 13
+ThreadPoolSizeGeneral = 13
+
+# Default: 2
+ThreadPoolSizeEvents = 2
+
+# Default: 2
+UrgentPacketThreadCoreSize = 2
+
+# Default: 4
+GeneralPacketThreadCoreSize = 4
+
+# Default: 4
+GeneralThreadCoreSize = 4
+
+# Default: 6
+AiMaxThread = 6
+
+# Default: 5
+EventsMaxThread = 5
+
+# Dead Lock Detector (a separate thread for detecting deadlocks).
+# For improved crash logs and automatic restart in deadlock case if enabled.
+# Check interval is in seconds.
+# Default: True
+DeadLockDetector = True
+
+# Default: 20
+DeadLockCheckInterval = 20
+
+# Default: False
+RestartOnDeadlock = False
+
+
+# ---------------------------------------------------------------------------
+# Client packet queue tuning
+# ---------------------------------------------------------------------------
+
+# Queue size, do not set it too low!
+# 0 - use value MaxReadPerPass + 2 (from mmo.properties)
+# Default: 0
+ClientPacketQueueSize = 0
+
+# Maximum number of packets in burst.
+# Execution will be aborted and thread released if more packets executed in raw.
+# 0 - use value MaxReadPerPass + 1 (from mmo.properties)
+# Default: 0
+ClientPacketQueueMaxBurstSize = 0
+
+# Maximum number of packets per second.
+# Flood detector will be triggered if more packets are received.
+# After triggering, all incoming packets will be dropped until flooding stopped.
+# Default: 80
+ClientPacketQueueMaxPacketsPerSecond = 80
+
+# Average number of packets per second calculated during this interval.
+# Using larger value decreases the number of false kicks, but slower reaction to flood.
+# Avoid using too low or too high values, recommended between 3 and 10.
+# Default: 5
+ClientPacketQueueMeasureInterval = 5
+
+# Maximum average number of packets per second during measure interval.
+# Flood detector will be triggered if more packets are received.
+# After triggering, all incoming packets will be dropped until flooding stopped.
+# Default: 40
+ClientPacketQueueMaxAveragePacketsPerSecond = 40
+
+# Maximum number of flood triggers per minute.
+# Client will be kicked if more floods are detected.
+# Default: 2
+ClientPacketQueueMaxFloodsPerMin = 2
+
+# Maximum number of queue overflows per minute.
+# After overflow all incoming packets from client are dropped until queue is flushed.
+# Client will be kicked if more queue overflows detected.
+# Default: 1
+ClientPacketQueueMaxOverflowsPerMin = 1
+
+# Maximum number of buffer underflows per minute.
+# Client will be kicked if more underflow exceptions are detected.
+# Default: 1
+ClientPacketQueueMaxUnderflowsPerMin = 1
+
+# Maximum number of unknown packets per minute.
+# Client will be kicked if more unknown packets received.
+# Default: 5
+ClientPacketQueueMaxUnknownPerMin = 5
+
+
+# ---------------------------------------------------------------------------
+# Optimization
+# ---------------------------------------------------------------------------
+
+# Items on ground management.
+# Allow players to drop items on the ground.
+# Default: True
+AllowDiscardItem = True
+
+# Delete dropped reward items from world after a specified amount of seconds. Disabled = 0.
+# Default: 600
+AutoDestroyDroppedItemAfter = 600
+
+# Time in seconds after which dropped herb will be auto-destroyed
+# Default: 60
+AutoDestroyHerbTime = 60
+
+# List of item id that will not be destroyed (separated by "," like 57,5575,6673).
+# Notes:
+#	Make sure the lists do NOT CONTAIN trailing spaces or spaces between the numbers!
+#	Items on this list will be protected regardless of the following options.
+# Default:
+ProtectedItems =
+
+# Cleans up the server database on startup.
+# The bigger the database is, the longer it will take to clean up the database(the slower the server will start).
+# Sometimes this ends up with 0 elements cleaned up, and a lot of wasted time on the server startup.
+# If you want a faster server startup, set this to 'false', but its recommended to clean up the database from time to time.
+# Default: True
+DatabaseCleanUp = True
+
+# The time before a database connection closes (in milliseconds)
+# If a query takes longer to execute than the time defined here, the server will throw "Unclosed Connection!" error.
+# If you get often this error message, try increasing this.
+# Default: 60000ms
+ConnectionCloseTime = 60000
+
+# This is the interval (in minutes), that the gameserver will update a players information such as location.
+# The higher you set this number, there will be less character information saving so you will have less accessing of the database and your hard drive(s).
+# The lower you set this number, there will be more frequent character information saving so you will have more access to the database and your hard drive(s).
+# A value of 0 disables periodic saving.
+# Independent of this setting the character is always saved after leaving the world.
+# Default: 15
+CharacterDataStoreInterval = 15
+
+# This enables the server to only update items when saving the character.
+# Enabling this greatly reduces DB usage and improves performance.
+# WARNING: This option causes item loss during crashes.
+# Default: False
+LazyItemsUpdate = False
+
+# When enabled, this forces (even if using lazy item updates) the items owned by the character to be updated into DB when saving its character.
+# Default: False
+UpdateItemsOnCharStore = False
+
+# Also delete from world misc. items dropped by players (all except equip-able items).
+# Notes:
+#	Works only if AutoDestroyDroppedItemAfter is greater than 0.
+# Default: False
+DestroyPlayerDroppedItem = False
+
+# Destroy dropped equippable items (armor, weapon, jewelry).
+# Notes:
+#	Works only if DestroyPlayerDroppedItem = True
+# Default: False
+DestroyEquipableItem = False
+
+# Save dropped items into the database for restoring after restart.
+# Default: False
+SaveDroppedItem = False
+
+# Enable/Disable the emptying of the stored dropped items table after items are loaded into memory (safety setting).
+# If the server crashed before saving items, on next start old items will be restored and players may already have picked up some of them so this will prevent duplicates.
+# Default: False
+EmptyDroppedItemTableAfterLoad = False
+
+# Time interval in minutes to save in DB items on the ground.
+# Disabled = 0.
+# Notes: If SaveDroppedItemInterval is disabled, items will be saved into the database only at server shutdown.
+# Default: 60
+SaveDroppedItemInterval = 60
+
+# Delete all saved items from the database on next restart?
+# Notes: Works only if SaveDroppedItem = False.
+# Default: False
+ClearDroppedItemTable = False
+
+# Delete invalid quest from players.
+# Default: False
+AutoDeleteInvalidQuestData = False
+
+# If True, allows a special handling for drops when chance raises over 100% (e.g., when applying chance rates).
+# True value causes better drop handling at higher rates.   
+# Default: True
+PreciseDropCalculation = True
+
+# How to handle grouped drops when PreciseDropCalculation = True
+# If True, grouped drops will make another roll for a drop in the group instead of just increasing the number of dropped items.
+# Default: False
+PreciseDropMultipleGroupRolls = False
+# If True, aggregates the results of multiple rolls on the same group.
+# e.g., A mob will drop 100 Adena instead of 10 times 10 Adena.
+# Default: False
+PreciseDropMultipleRollsAggregateDrops = False
+
+# Allow creating multiple non-stackable items at one time?
+# Default: True
+MultipleItemDrop = True
+
+# Forces full item inventory packet to be sent for any item change.
+# Notes:
+#	This can increase network traffic 
+# Default: False
+ForceInventoryUpdate = False
+
+# True = Load html's into cache only on first time html is requested.
+# False = Load all html's into cache on server startup.
+# Default: True
+LazyCache = True
+
+# Cache all character names in to memory on server startup
+# False - names are loaded from Db when they are requested
+# True - decrease Db usage, increase memory consumption
+# Default: True
+CacheCharNames = True
+
+# Minimum and maximum variables in seconds for npc animation delay.
+# You must keep MinNPCAnimation < = MaxNPCAnimation.
+# Default: 10
+MinNPCAnimation = 10
+
+# Default: 20
+MaxNPCAnimation = 20
+
+# Default: 5
+MinMonsterAnimation = 5
+
+# Default: 20
+MaxMonsterAnimation = 20
+
+# Knownlist (the list of things a character sees) update method. Default is currently time based updating, which also makes it possible to use config options for guards to see moving monsters. Alternatively move based update can be used but guards cannot track mobs with that option but otherwise it should work well.
+# Default: False
+MoveBasedKnownList = False
+
+# Interval (in milliseconds) in which the knownlist does full updates.
+# For move-based updates, it's used for intermediate updates.
+# WARNING!
+#	Useful interval is between 300 - 2000. Too small value may kill your CPU, too high value may not update knownlists properly. The default value is chosen experimentally.
+# Default: 1250
+KnownListUpdateInterval = 1250
+
+CheckKnownList = False
+
+# Grid options: Grids can turn themselves on and off.  This also affects the loading and processing of all AI tasks and (in the future) geodata within this grid.
+# Turn on for a grid with a person in it is immediate, but it then turns on the 8 neighboring grids based on the specified number of seconds.
+# Turn off for a grid and neighbors occurs after the specified number of seconds has passed during which a grid has had no players in or in any of its neighbors.
+# The always on option allows to ignore all this and let all grids be active at all times (not suggested).
+# Default: False
+GridsAlwaysOn = False
+
+# Default: 1
+GridNeighborTurnOnTime = 1
+
+# Default: 90
+GridNeighborTurnOffTime = 90
+
+# ---------------------------------------------------------------------------
+# Falling Damage
+# ---------------------------------------------------------------------------
+
+# Allow characters to receive damage from falling.
+# CoordSynchronize = 2 is recommended.
+# Default: True
+EnableFallingDamage = True
+
+
+# ---------------------------------------------------------------------------
+# Features
+# ---------------------------------------------------------------------------
+
+# Peace Zone Modes:
+# 0 = Peace All the Time
+# 1 = PVP During Siege for siege participants
+# 2 = PVP All the Time
+# Default: 0
+PeaceZoneMode = 0
+
+# Global Chat.
+# Available Options: ON, OFF, GM, GLOBAL
+# Default: ON
+GlobalChat = ON
+
+# Trade Chat.
+# Available Options: ON, OFF, GM, GLOBAL
+# Default: ON
+TradeChat = ON
+
+# If you are experiencing problems with Warehouse transactions, feel free to disable them here.
+# Default: True
+AllowWarehouse = True
+
+# Enable Warehouse Cache.
+# If the warehouse is not used, the server will clear memory used by it.
+# Default: False
+WarehouseCache = False
+
+# How long warehouse should be stored in memory.
+# Default: 15
+WarehouseCacheTime = 15
+
+# Default: True
+AllowRefund = True
+
+# Default: True
+AllowMail = True
+
+# Default: True
+AllowAttachments = True
+
+# If True, player can try on weapon and armor in shop.
+# Default: True
+AllowWear = True
+
+# Default: 5
+WearDelay = 5
+
+# Adena cost to try on an item.
+# Default: 10
+WearPrice = 10
+
+
+# ---------------------------------------------------------------------------
+# Instances
+# ---------------------------------------------------------------------------
+# Restores the player to their previous instance (i.e., an instanced area/dungeon) on EnterWorld.
+# Default: False
+RestorePlayerInstance = False
+
+# Set whether summon skills can be used to summon players inside an instance.
+# When enabled, individual instances can have summoning disabled in instance xml's.
+# DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT
+# Default: False
+AllowSummonInInstance = False
+
+# When a player dies, is removed from instance after a fixed period of time.
+# Time in seconds.
+# Default: 60
+EjectDeadPlayerTime = 60
+
+# When is instance finished, is set time to destruction currency instance.
+# Time in seconds.
+# Default: 300
+InstanceFinishTime = 300
+
+
+# ---------------------------------------------------------------------------
+# Misc Settings
+# ---------------------------------------------------------------------------
+
+# Default: True
+AllowRace = True
+
+# Default: True
+AllowWater = True
+
+# Enable pets for rent (wyvern & strider) from pet managers.
+# Default: False
+AllowRentPet = False
+
+# Default: True
+AllowFishing = True
+
+# Default: True
+AllowBoat = True
+
+# Boat broadcast radius.
+# If players getting annoyed by boat shouts then radius can be decreased.
+# Default: 20000
+BoatBroadcastRadius = 20000
+
+# Default: True
+AllowCursedWeapons = True
+
+# Allow the Pet Manager's pets to walk around.
+# Default: True
+AllowPetWalkers = True
+
+# Show "data/html/servnews.htm" when a character enters world.
+# Default: False
+ShowServerNews = False
+
+# Enable the Community Board.
+# Default: True
+EnableCommunityBoard = True
+
+# Default Community Board page.
+# Default: _bbshome
+BBSDefault = _bbshome
+
+# Enable chat filter
+# Default = False
+UseChatFilter = False
+
+# Replace filter words with the following chars
+ChatFilterChars = ^_^
+
+ChatFilter = suck,gay,rape,fuck,dick
+
+# Banchat for channels, split ";"
+# 0 = ALL (white)
+# 1 = SHOUT (!)
+# 2 = TELL (")
+# 3 = PARTY (#)
+# 4 = CLAN (@)
+# 5 = GM (//gmchat)
+# 6 = PETITION_PLAYER (*)
+# 7 = PETITION_GM (*)
+# 8 = TRADE (+)
+# 9 = ALLIANCE ($)
+# 10 = ANNOUNCEMENT
+# 11 = BOAT
+# 12 = L2FRIEND
+# 13 = MSNCHAT
+# 14 = PARTYMATCH_ROOM
+# 15 = PARTYROOM_COMMANDER (Yellow)
+# 16 = PARTYROOM_ALL (Red)
+# 17 = HERO_VOICE (&)
+# 18 = CRITICAL_ANNOUNCE
+# 19 = SCREEN_ANNOUNCE
+# 20 = BATTLEFIELD
+# 21 = MPCC_ROOM
+# Default: 0,1,8,17
+BanChatChannels = 0,1,8,17
+
+# ---------------------------------------------------------------------------
+# Manor
+# ---------------------------------------------------------------------------
+
+# Default: True
+AllowManor = True
+
+# Manor refresh time in military hours.
+# Default: 20 (8pm)
+ManorRefreshTime = 20
+
+# Manor refresh time (minutes).
+# Default: 00 (start of the hour)
+ManorRefreshMin = 00
+
+# Manor period approve time in military hours.
+# Default: 4 (4am)
+ManorApproveTime = 4
+
+# Manor period approve time (minutes).
+# Default: 30
+ManorApproveMin = 30
+
+# Manor maintenance time (minutes).
+# Default: 6
+ManorMaintenanceMin = 6
+
+# Manor Save Type.
+# True = Save data into the database after every action
+# Default: False
+ManorSaveAllActions = False
+
+# Manor Save Period (used only if ManorSaveAllActions = False)
+# Default: 2 (hour)
+ManorSavePeriodRate = 2
+
+
+# ---------------------------------------------------------------------------
+# Lottery
+# ---------------------------------------------------------------------------
+
+# Default: True
+AllowLottery = True
+
+# Initial Lottery prize.
+# Default: 50000
+LotteryPrize = 50000
+
+# Lottery Ticket Price
+# Default: 2000
+LotteryTicketPrice = 2000
+
+# What part of jackpot amount should receive characters who pick 5 wining numbers
+# Default: 0.6
+Lottery5NumberRate = 0.6
+
+# What part of jackpot amount should receive characters who pick 4 wining numbers
+# Default: 0.2
+Lottery4NumberRate = 0.2
+
+# What part of jackpot amount should receive characters who pick 3 wining numbers
+# Default: 0.2
+Lottery3NumberRate = 0.2
+
+# How much Adena receive characters who pick two or less of the winning number
+# Default: 200
+Lottery2and1NumberPrize = 200
+
+
+# ---------------------------------------------------------------------------
+# Item Auction
+# ---------------------------------------------------------------------------
+
+#
+ItemAuctionEnabled = True
+
+# Number of days before auction cleared from database with all bids.
+# Default: 14
+ItemAuctionExpiredAfter = 14
+
+# Auction extends to specified amount of seconds if one or more new bids added.
+# By default, auction extends only two times, by 5 and 3 minutes, this custom value used after it.
+# Values higher than 60s are not recommended.
+# Default: 0
+ItemAuctionTimeExtendsOnBid = 0
+
+
+# ---------------------------------------------------------------------------
+# Dimension Rift
+# ---------------------------------------------------------------------------
+
+# Minimal party size to enter rift. Min = 2, Max = 9.
+# If while inside the rift, the party becomes smaller, all members will be teleported back.
+# Default: 2
+RiftMinPartySize = 2
+
+# Number of maximum jumps between rooms allowed, after this time party will be teleported back
+# Default: 4
+MaxRiftJumps = 4
+
+# Time in ms the party has to wait until the mobs spawn when entering a room. C4 retail: 10s
+# Default: 10000
+RiftSpawnDelay = 10000
+
+# Time between automatic jumps in seconds
+# Default: 480
+AutoJumpsDelayMin = 480
+
+# Default: 600
+AutoJumpsDelayMax = 600
+
+# Time Multiplier for stay in the boss room
+# Default: 1.5
+BossRoomTimeMultiply = 1.5
+
+# Cost in dimension fragments to enter the rift, each party member must own this amount
+# Default: 18
+RecruitCost = 18
+
+# Default: 21
+SoldierCost = 21
+
+# Default: 24
+OfficerCost = 24
+
+# Default: 27
+CaptainCost = 27
+
+# Default: 30
+CommanderCost = 30
+
+# Default: 33
+HeroCost = 33
+
+
+# ---------------------------------------------------------------------------
+# Four Sepulchers
+# ---------------------------------------------------------------------------
+
+# Default: 50
+TimeOfAttack = 50
+
+# Default: 5
+TimeOfCoolDown = 5
+
+# Default: 3
+TimeOfEntry = 3
+
+# Default: 2
+TimeOfWarmUp = 2
+
+# Default: 4
+NumberOfNecessaryPartyMembers = 4
+
+
+# ---------------------------------------------------------------------------
+# Punishment
+# ---------------------------------------------------------------------------
+
+# Player punishment for illegal actions:
+# NONE      - do nothing
+# BROADCAST - broadcast warning to GMs only
+# KICK      - kick player(default)
+# KICK_BAN  - kick & ban player
+# JAIL      - jail player (define minutes of jail with param: 0 = infinite)
+# Default: KICK
+DefaultPunish = KICK
+
+# This setting typically specifies the duration of the above punishment.
+# Default: 0
+DefaultPunishParam = 0
+
+# Apply default punish if player buy items for zero Adena.
+# Default: True
+OnlyGMItemsFree = True
+
+# Jail is a PvP zone.
+# Default: False
+JailIsPvp = False
+
+# Disable all chat in jail (except normal one)
+# Default: True
+JailDisableChat = True
+
+# Disable all transactions in jail.
+# Trade/Store/Drop
+# Default: False
+JailDisableTransaction = False
+
+# Enchant Skill Details Settings
+# Default: 1,5
+NormalEnchantCostMultipiler = 1
+SafeEnchantCostMultipiler = 5
+
+# ---------------------------------------------------------------------------
+# Custom Components
+# ---------------------------------------------------------------------------
+
+# Default: False
+CustomSpawnlistTable = False
+
+# Option to save GM spawn only in the custom table.
+# Default: False
+SaveGmSpawnOnCustom = False
+
+# Default: False
+CustomNpcData = False
+
+# Default: False
+CustomTeleportTable = False
+
+# Default: False
+CustomNpcBufferTables = False
+
+# Default: False
+CustomSkillsLoad = False
+
+# Default: False
+CustomItemsLoad = False
+
+# Default: False
+CustomMultisellLoad = False
+
+# Default: False
+CustomBuyListLoad = False
+
+# ---------------------------------------------------------------------------
+# Birthday Event Settings
+# ---------------------------------------------------------------------------
+
+# Gift sent with Mail System
+# Default: 22187
+BirthdayGift = 22187
+
+# Mail Subject
+BirthdayMailSubject = Happy Birthday!
+
+# Mail Content
+# $c1: Player name
+# $s1: Age
+BirthdayMailText = Hello Adventurer!! Seeing as you're one year older now, I thought I would send you some birthday cheer :) Please find your birthday pack attached. May these gifts bring you joy and happiness on this very special day.\n\nSincerely, Alegria
+
+# ---------------------------------------------------------------------------
+# Handy's Block Checker Event Settings
+# ---------------------------------------------------------------------------
+
+# Enable the Handy's Block Checker event
+# Default: True
+EnableBlockCheckerEvent = True
+
+# Minimum number of members on each team before
+# be able to start the event
+# Min: 1
+# Max: 6
+# Retail: 2
+BlockCheckerMinTeamMembers = 2
+
+# Fair play
+# Players can choose what team to play. However, by
+# enabling this property to true, the teams will be
+# balanced in the teleport to the arena
+HBCEFairPlay = True
+
+# ---------------------------------------------------------------------------
+# Hellbound Settings
+# ---------------------------------------------------------------------------
+# If true, players can enter the Hellbound island without any quests
+# Default: False
+HellboundWithoutQuest = False
+
+# ---------------------------------------------------------------------------
+# Bot Report Button settings
+# ---------------------------------------------------------------------------
+
+# Enable the bot report button on the desired game servers.
+# Default: True
+EnableBotReportButton = True
+
+# Report points restart hour.
+# Format: HH:MM (PM mode, 24 hours clock)
+# Default: 00:00
+BotReportPointsResetHour = 00:00
+
+# Delay between reports from the same player (in minutes)
+# Default: 30 minutes
+BotReportDelay = 30
+
+# Allow players from the same clan to report the same bot
+# Default: False
+AllowReportsFromSameClanMembers = False
+
+# ---------------------------------------------------------------------------
+# Developer Settings
+# ---------------------------------------------------------------------------
+# Do not touch these if you do not know what you are doing.
+# These settings are for debugging servers ONLY. They are not meant for LIVE servers.
+
+# Default: False
+Debug = False
+
+# Instances debugging
+# Default: False
+InstanceDebug = False
+
+# Html action cache debugging
+# Default: False
+HtmlActionCacheDebug = False
+
+# Packet handler debug output
+# Default: False
+PacketHandlerDebug = False
+
+# Default: False
+Developer = False
+
+# Don't load Handlers
+# Default: False
+NoHandlers = False
+
+# Don't load quests.
+# Default: False
+NoQuests = False
+
+# Don't load spawntable.
+# Default: False
+NoSpawns = False
+
+# Show quests while loading them.
+# Default: False
+ShowQuestsLoadInLogs = False
+
+# Show scripts while loading them.
+# Default: False
+ShowScriptsLoadInLogs = False
diff --git a/src/main/resources/config/geodata.properties b/src/main/resources/config/geodata.properties
new file mode 100644
index 00000000..6d0d5820
--- /dev/null
+++ b/src/main/resources/config/geodata.properties
@@ -0,0 +1,70 @@
+# ---------------------------------------------------------------------------
+# GeoData
+# ---------------------------------------------------------------------------
+
+# Pathfinding options:
+# 0 = Disabled
+# 1 = Enabled using path node files
+# 2 = Enabled using geodata cells at runtime
+# Default: 0
+PathFinding = 0
+
+# Pathnode path
+# Default: data/pathnode
+PathnodePath = ./data/pathnode
+
+# Pathfinding array buffers configuration
+PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2
+
+# Weight for nodes without obstacles far from walls
+LowWeight = 0.5
+
+# Weight for nodes near walls
+MediumWeight = 2
+
+# Weight for nodes with obstacles
+HighWeight = 3
+
+# Angle paths will be more "smart", but in cost of higher CPU utilization
+AdvancedDiagonalStrategy = True
+
+# Weight for diagonal movement. Used only with AdvancedDiagonalStrategy = True
+# Default: LowWeight * sqrt(2) 
+DiagonalWeight = 0.707
+
+# Maximum number of LOS postfilter passes, 0 will disable postfilter.
+# Default: 3
+MaxPostfilterPasses = 3
+
+# Path debug function.
+# Nodes known to pathfinder will be displayed as adena, constructed path as antidots.
+# Number of the items show node cost * 10
+# Potions display path after first stage filter
+# Red potions - actual waypoints. Green potions - nodes removed by LOS postfilter
+# This function FOR DEBUG PURPOSES ONLY, never use it on the live server !
+DebugPath = False
+
+# True = Loads GeoData buffer's content into physical memory.
+# False = Does not necessarily imply that the GeoData buffer's content is not resident in physical memory.
+# Default: True
+ForceGeoData = True
+
+# This setting controls Client <--> Server Player coordinates synchronization:
+# -1 - Will synchronize only Z from Client --> Server. Default when no geodata.
+# 1 - Synchronization Client --> Server only. Using this option (without geodata) makes it more difficult for players to bypass obstacles.
+# 2 - Intended for geodata (at least with cell-level pathfinding, otherwise can you try -1).
+# Server sends a validation packet if the client goes too far from server calculated coordinates.
+# Default: -1
+CoordSynchronize = -1
+
+# Geodata path
+GeoDataPath = ./data/geodata
+
+# True: Try to load regions not specified below (won't disturb server startup when file does not exist)
+# False: Don't load any regions other than the ones specified with True below
+TryLoadUnspecifiedRegions = True
+
+# List of regions to be required to load
+# Example: 22_22;19_20
+IncludedRegions=
+ExcludedRegions=
\ No newline at end of file
diff --git a/src/main/resources/config/graciaseeds.properties b/src/main/resources/config/graciaseeds.properties
new file mode 100644
index 00000000..370db030
--- /dev/null
+++ b/src/main/resources/config/graciaseeds.properties
@@ -0,0 +1,20 @@
+# ---------------------------------------------------------------------------
+# Gracia Seeds Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Seed of Destruction Settings
+# ---------------------------------------------------------------------------
+
+# Count of Kills which needed for Stage 2
+# Default: 10
+TiatKillCountForNextState = 10
+
+# Length of Stage 2 before the Defense state starts (in minutes).
+# Default: 720min (12h)
+Stage2Length = 720
diff --git a/src/main/resources/config/grandboss.properties b/src/main/resources/config/grandboss.properties
new file mode 100644
index 00000000..2df478da
--- /dev/null
+++ b/src/main/resources/config/grandboss.properties
@@ -0,0 +1,123 @@
+# ---------------------------------------------------------------------------
+# Antharas
+# ---------------------------------------------------------------------------
+
+# Delay of appearance time of Antharas. Value is minute. Range 3-60
+# Default: 20
+AntharasWaitTime = 20
+
+# Interval time of Antharas. Value is hour. Range 1-480
+# Default: 264
+IntervalOfAntharasSpawn = 264
+
+# Random interval. Range 1-192
+# Default: 72
+RandomOfAntharasSpawn = 72
+
+# ---------------------------------------------------------------------------
+# Valakas
+# ---------------------------------------------------------------------------
+
+# Delay of appearance time of Valakas. Value is minute. Range 3-60
+# Default: 30
+ValakasWaitTime = 30
+
+# Interval time of Valakas. Value is hour. Range 1-480
+# Default: 264
+IntervalOfValakasSpawn = 264
+
+# Random interval. Range 1-192
+# Default: 72
+RandomOfValakasSpawn = 72
+
+# ---------------------------------------------------------------------------
+# Baium
+# ---------------------------------------------------------------------------
+
+# Interval time of Baium. Value is hour. Range 1-480
+# Default: 168
+IntervalOfBaiumSpawn = 168
+
+# Random interval. Range 1-192
+# Default: 48
+RandomOfBaiumSpawn = 48
+
+# ---------------------------------------------------------------------------
+# Core
+# ---------------------------------------------------------------------------
+
+# Interval time of Core. Value is hour. Range 1-480
+# Default: 60
+IntervalOfCoreSpawn = 60
+
+# Random interval. Range 1-192
+# Default: 24
+RandomOfCoreSpawn = 24
+
+# ---------------------------------------------------------------------------
+# Orfen
+# ---------------------------------------------------------------------------
+
+# Interval time of Orfen. Value is hour. Range 1-480
+# Default: 48
+IntervalOfOrfenSpawn = 48
+
+# Random interval. Range 1-192
+# Default: 20
+RandomOfOrfenSpawn = 20
+
+# ---------------------------------------------------------------------------
+# Queen Ant
+# ---------------------------------------------------------------------------
+
+# Interval time of QueenAnt. Value is hour. Range 1-480
+# Default: 36
+IntervalOfQueenAntSpawn = 36
+
+# Random interval. Range 1-192
+# Default: 17
+RandomOfQueenAntSpawn = 17
+
+# ---------------------------------------------------------------------------
+# Beleth
+# ---------------------------------------------------------------------------
+
+# Interval time of Beleth. Value is hour. Range 1-480. Retail: 192
+# Default: 192
+IntervalOfBelethSpawn = 192
+
+# Random interval. Range 1-192.
+# Default: 148
+RandomOfBelethSpawn = 148
+
+#Minimal count of players for enter to Beleth. Retail: 36
+# Default: 36
+BelethMinPlayers = 36
+
+# ---------------------------------------------------------------------------
+# Zaken
+# Note: spawn interval time regulated by instance data(data/instances/CavernOfThePirateCaptain*)
+# ---------------------------------------------------------------------------
+
+# Allow enter to zaken without party
+# Default: False
+AllowZakenWithoutParty = False
+
+# Zaken 60 (day), Zaken 83 (day) min players count, Zaken 60 (night)
+# Default: 9, 9, 72
+# Note: 72 because on retail Zaken 60 (night) required 8 parties at minimum.
+ZakenMinPlayers = 9,9,72
+
+# Zaken 60 (day), Zaken 83 (day), Zaken 60 (night) min players level
+# Default: 27,27,450
+# Note: 450 because on retail Zaken 60 (night) can handle up to 50 parties at maximum.
+ZakenMaxPlayers = 27,27,450
+
+# Zaken 60(day), Zaken 83(day), Zaken 60 (night) min player levels
+# Default: 55, 78, 55
+ZakenMinPlayerLevel = 55,78,55
+
+# Is Zaken can be revealed without candles by using AOE spells
+# Default: True
+# Note: Retail have bug when zaken can be revealed even without talking with candles just by spamming aoe spells in every room
+ZakenCanBeRevealedByAOESpells = True
\ No newline at end of file
diff --git a/src/main/resources/config/huntingsystem.properties b/src/main/resources/config/huntingsystem.properties
new file mode 100644
index 00000000..0df789b3
--- /dev/null
+++ b/src/main/resources/config/huntingsystem.properties
@@ -0,0 +1,48 @@
+# =====================================================================
+# Hunting System Settings
+# =====================================================================
+# Global settings
+
+# Hunting System main event
+# Default: True
+NevitEnable = True
+
+# Hunting Bonus duration in seconds
+# Default: 14400 seconds = 4 hours
+NevitBonusMaxTime = 14400
+
+# Nevit's Advent Blessing duration in seconds
+# Default: 180 seconds = 3 minutes
+NevitBonusEffectTime = 180
+
+# 100% of Hunting Bonus gauge
+# Default: 7200 points
+NevitBlessingMaxPoints = 7200
+
+# Points acquired being logged in while the Hunting Bonus timer is activated
+# Default: 3 points per second
+NevitRegularPoints = 3
+
+# Points acquired being logged in while the Hunting Bonus timer is activated in the second part of Hunting Bonus duration
+# Default: 1 point per second
+NevitRegularPoints2 = 1
+
+# Points acquired on gaining experience points from hunting
+# Default: 1 point per kill
+NevitNormalPoints = 1
+
+# Points acquired on Leveling up
+# Default: 2000 points
+NevitLevelAcquirePoints = 2000
+
+# Points acquired on Leveling up when Nevit Event is finished
+# Default: 2000 points
+NevitLevelAcquirePoints2 = 2000
+
+# Points acquired on Vitality Leveling down
+# Default: 500 points
+NevitDecreaseVitalityAcquirePoints = 500
+
+# Disable this if you want Hunting System start Nevit Blessing event without task active
+# Default: True
+HuntingSystemLimit = True
\ No newline at end of file
diff --git a/src/main/resources/config/ipconfig.xsd b/src/main/resources/config/ipconfig.xsd
new file mode 100644
index 00000000..62801e07
--- /dev/null
+++ b/src/main/resources/config/ipconfig.xsd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+	<xs:element name="gameserver">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="define" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:attribute name="address" use="required">
+							<xs:simpleType>
+								<xs:restriction base="xs:token">
+									<xs:pattern value="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|[.]?.*[.x][a-z]{2,3}" />
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:attribute>
+						<xs:attribute name="subnet" use="required">
+							<xs:simpleType>
+								<xs:restriction base="xs:token">
+									<xs:pattern value="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?/\d+)|(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|[.]?.*[.x][a-z]{2,3}" />
+								</xs:restriction>
+							</xs:simpleType>
+						</xs:attribute>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+			<xs:attribute name="address" use="required">
+				<xs:simpleType>
+					<xs:restriction base="xs:token">
+						<xs:pattern value="(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|[.]?.*[.x][a-z]{2,3}" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:attribute>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/src/main/resources/config/mmo.properties b/src/main/resources/config/mmo.properties
new file mode 100644
index 00000000..541a5630
--- /dev/null
+++ b/src/main/resources/config/mmo.properties
@@ -0,0 +1,24 @@
+#---------------------------------------------------------------
+# MMO
+#---------------------------------------------------------------
+
+# Sleep time for all Selectors
+# After he finished his job the Selector waits the given time in milliseconds
+# Lower values will speed up the loop, and the Ping is smaller
+SleepTime = 20
+
+# Every loop it sends a maximum of the given packages to each connection
+# Lower values will speed up the loop and the Ping is smaller but cause less output
+MaxSendPerPass = 12
+
+# Every loop it read a maximum of the given packages from each connection
+# Lower values will speed up the loop and the Ping is smaller but cause less input
+MaxReadPerPass = 12
+
+# Each unfinished read/write need a TEMP storage Buffer
+# on large player amount we need more Buffers
+# if there are not enough buffers new ones are generated but not stored for future usage
+HelperBufferCount = 20
+
+# Setting this to True will lower your ping, at the cost of an increase in bandwidth consumption.
+TcpNoDelay = False
\ No newline at end of file
diff --git a/src/main/resources/config/npc.properties b/src/main/resources/config/npc.properties
new file mode 100644
index 00000000..447af264
--- /dev/null
+++ b/src/main/resources/config/npc.properties
@@ -0,0 +1,222 @@
+# ---------------------------------------------------------------------------
+# NPC Settings
+# ---------------------------------------------------------------------------
+# This properties file is solely for NPC modifications and settings that directly influence them.
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# General
+# ---------------------------------------------------------------------------
+
+# Global announcements will be made indicating Blacksmith/Merchant of Mammon
+# Spawning points.
+# Default: False
+AnnounceMammonSpawn = False
+
+# True - Mobs can be aggressive while in peace zones.
+# False - Mobs cannot be aggressive while in peace zones.
+# Default: True
+MobAggroInPeaceZone = True
+
+# Defines whether NPCs are attackable by default
+# Retail: True
+AttackableNpcs = True
+
+# Allows non-GM players to view NPC stats via shift-click
+# Default: False
+ViewNpc = False
+
+# Maximum distance mobs can randomly go from spawn point.
+# Default: 300
+MaxDriftRange = 300
+
+# Default: False 
+ShowNpcLevel = False
+
+# Show clan, alliance crests for territory NPCs without quests
+# Default: False
+ShowCrestWithoutQuest = False
+
+# Custom random EnchantEffect
+# All npcs with weapons get random weapon enchanted value
+# Enchantment is only visual, range is 4-21
+# Default: False
+RandomEnchantEffect = False
+
+# The minimum NPC level for the Gracia Epilogue rule:
+# "The amount of damage inflicted on monsters will be lower if your character is 2 or more levels below that of the level 78+ monster."
+# Notes: If you want to disable this feature, then set it 99
+# Default: 78
+MinNPCLevelForDmgPenalty = 78
+
+# The penalty in percent for -2 till -5 level differences
+# default: 
+# normal - 0.7, 0.6, 0.6, 0.55
+# critical - 0.75, 0.65, 0.6, 0.58
+# skill - 0.8, 0.7, 0.65, 0.62
+DmgPenaltyForLvLDifferences = 0.7,0.6,0.6,0.55
+CritDmgPenaltyForLvLDifferences = 0.75,0.65,0.6,0.58
+SkillDmgPenaltyForLvLDifferences = 0.8,0.7,0.65,0.62
+
+# The minimum NPC level for the Gracia Epilogue rule:
+# "When a character's level is 3 or more levels lower than that of a monster's level,
+# the chance that the monster will be able to resist a magic spell will increase."
+# Notes: If you want to disable this feature, then set it 99
+# Default: 78
+MinNPCLevelForMagicPenalty = 78
+
+# The penalty in percent for -3 till -6 level differences
+# Default: 2.5,3.0,3.25,3.5
+SkillChancePenaltyForLvLDifferences = 2.5,3.0,3.25,3.5
+
+# ---------------------------------------------------------------------------
+# Monsters
+# ---------------------------------------------------------------------------
+
+# Decay Time Task (don't set it too low!) (in milliseconds):
+# Default: 5000
+DecayTimeTask = 5000
+
+# This is the default corpse time (in seconds).
+# Default: 7
+DefaultCorpseTime = 7
+
+# This is the time that will be added to spoiled corpse time (in seconds).
+# Default: 10
+SpoiledCorpseExtendTime = 10
+
+# The time allowed to use a corpse consume skill before the corpse decays.
+# Default: 2000
+CorpseConsumeSkillAllowedTimeBeforeDecay = 2000
+
+# ---------------------------------------------------------------------------
+# Guards
+# ---------------------------------------------------------------------------
+
+# True - Allows guards to attack aggressive mobs within range.
+# Default: False
+GuardAttackAggroMob = False
+
+
+# ---------------------------------------------------------------------------
+# Pets
+# ---------------------------------------------------------------------------
+
+# This option enables or disables the Wyvern manager located in every castle 
+# to train Wyverns and Striders from Hatchlings.
+# Default: False
+AllowWyvernUpgrader = False
+
+# Pets that can be rented.
+# Example: 30827,32471,34486,36547
+# Default: 30827
+PetRentNPCs = 30827
+
+# This will control the inventory space limit for pets (NOT WEIGHT LIMIT).
+# Default: 12
+MaximumSlotsForPet = 12
+
+# HP/MP Regen Multiplier for Pets
+# Default: 1.00, 1.00
+PetHpRegenMultiplier = 1.00
+PetMpRegenMultiplier = 1.00
+
+# ---------------------------------------------------------------------------
+# Raid Bosses
+# ---------------------------------------------------------------------------
+
+# Percent of HP and MP regeneration for raid bosses.
+# Example: Setting HP to 0.10 will cause raid boss HP to regenerate 90% slower than normal.
+# Default: 1.00, 1.00
+RaidHpRegenMultiplier = 1.00
+RaidMpRegenMultiplier = 1.00
+
+# Percent of physical and magical defense for raid bosses.
+# Example: A setting of 0.10 will cause defense to be 90% lower than normal, 
+# while 1.10 will cause defense to be 10% higher than normal.
+# Default: 1.00, 1.00
+RaidPDefenceMultiplier = 1.00
+RaidMDefenceMultiplier = 1.00
+
+# Percent of physical and magical attack for raid bosses.
+# Example: A setting of 0.10 will cause attack to be 90% lower than normal, 
+# while 1.10 will cause attack to be 10% higher than normal.
+# Default: 1.00, 1.00
+RaidPAttackMultiplier = 1.00
+RaidMAttackMultiplier = 1.00
+
+# Configure Minimum and Maximum time multiplier between raid boss re-spawn.
+# By default, 12Hours*1.0 for Minimum Time and 24Hours*1.0 for Maximum Time.
+# Example: Setting RaidMaxRespawnMultiplier to 2 will make the time between
+# re-spawn 24 hours to 48 hours.
+# Default: 1.00, 1.00
+RaidMinRespawnMultiplier = 1.00
+RaidMaxRespawnMultiplier = 1.00
+
+# Configure the interval at which raid boss minions will re-spawn.
+# This time is in milliseconds, 1 minute is 60000 milliseconds.
+# Default: 300000
+RaidMinionRespawnTime = 300000
+
+# Let's make handling of minions with non-standard static respawn easier - no additional code, just config.
+# Format: minionId1,timeInSec1;minionId2,timeInSec2
+CustomMinionsRespawnTime = 22450,30;22371,120;22543,0;25545,0;22424,30;22425,30;22426,30;22427,30;22428,30;22429,30;22430,30;22432,30;22433,30;22434,30;22435,30;22436,30;22437,30;22438,30;25596,30;25605,0;25606,0;25607,0;25608,0
+
+# Raid Curse if raid more than 8 levels lower.
+# Caution: drop will be reduced or even absent if DeepBlue drop rules enabled.  
+# Default: True
+RaidCurse = True
+
+# Configure the interval at which raid bosses and minions wont reconsider their target
+# This time is in seconds, 1 minute is 60 seconds.
+# Default: 10,10,10
+RaidChaosTime = 10
+GrandChaosTime = 10
+MinionChaosTime = 10
+
+# ---------------------------------------------------------------------------
+# Drops
+# ---------------------------------------------------------------------------
+
+# If True, activates bellow level gap rules for standard mobs:
+# Default: True
+UseDeepBlueDropRules = True
+
+# If True, activates bellow level gap rules for raid bosses:
+# Default: True
+UseDeepBlueDropRulesRaid = True
+
+
+# The min and max level difference used for level gap calculation
+# this is only for how many levels higher the player is than the monster
+# Default: 8
+DropAdenaMinLevelDifference=8
+# Default: 15
+DropAdenaMaxLevelDifference=15
+
+# This is the minimum level gap chance meaning for 10 that the monster will have 10% chance
+# to allow dropping the item if level difference is bigger than DropAdenaMaxLevelDifference
+# Note: This value is scaling from 100 to the specified value for DropAdenaMinLevelDifference to DropAdenaMaxLevelDifference limits
+# Default: 10
+DropAdenaMinLevelGapChance=10
+
+# The min and max level difference used for level gap calculation
+# this is only for how many levels higher the player is than the monster
+# Default: 5
+DropItemMinLevelDifference=5
+# Default: 10
+DropItemMaxLevelDifference=10
+
+# This is the minimum level gap chance meaning for 10 that the monster will have 10% chance
+# to allow dropping the item if level difference is bigger than DropAdenaMaxLevelDifference
+# Note: This value is scaling from 100 to the specified value for DropAdenaMinLevelDifference to DropAdenaMaxLevelDifference limits
+# Default: 10
+DropItemMinLevelGapChance=10
+
+# Sets maximum aggression range
+# Default: 450
+MaxAggroRange = 450
\ No newline at end of file
diff --git a/src/main/resources/config/olympiad.properties b/src/main/resources/config/olympiad.properties
new file mode 100644
index 00000000..aa3e32b1
--- /dev/null
+++ b/src/main/resources/config/olympiad.properties
@@ -0,0 +1,173 @@
+# ---------------------------------------------------------------------------
+# Olympiad Settings
+# ---------------------------------------------------------------------------
+
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+# ---------------------------------------------------------------------------
+
+# Olympiad Start Time in Military hours Default 6pm (18) 
+# Default: 18
+StartHour = 18
+
+# Olympiad Start Time for Min's, Default 00 so at the start of the hour.
+# Default: 00
+StartMinute = 00
+
+# Maximum number of buffs.
+# Default: 5
+MaxBuffs = 5
+
+# Olympiad Competition Period, Default 6 hours.
+# (If set different, it should be incremented by 10mins)
+# Default: 21600000
+CompetitionPeriod = 21600000
+
+# Olympiad Battle Period, Default 5 minutes.
+# Default: 300000
+BattlePeriod = 300000
+
+# Olympiad Weekly Period, Default 1 week
+# Used for adding points to nobles
+# Default: 604800000
+WeeklyPeriod = 604800000
+
+# Olympiad Validation Period, Default 24 Hours.
+# Default: 86400000
+ValidationPeriod = 86400000
+
+# Points for reaching Noblesse for the first time
+# Default: 10
+StartPoints = 10
+
+# Points every week
+# Default: 10
+WeeklyPoints = 10
+
+# Required number of participants for the class based games
+# Default: 11
+ClassedParticipants = 11
+
+# Required number of participants for the non-class based games
+# Default: 11
+NonClassedParticipants = 11
+
+# Required number of participants for the 3x3 teams games
+# Default: 6
+TeamsParticipants = 6
+
+# Number used for displaying number of registered participants, messages "Fewer than ..." or "More than ...".
+# 0 for displaying digits instead of text phrase (old style).
+# Default: 100
+RegistrationDisplayNumber = 100
+
+# Reward for the class based games
+# Format: itemId1,itemNum1;itemId2,itemNum2...
+# Default: 13722,50
+ClassedReward = 13722,50
+
+# Reward for the non-class based games
+# Format: itemId1,itemNum1;itemId2,itemNum2...
+# Default: 13722,40
+NonClassedReward = 13722,40
+
+# Reward for the 3x3 teams games
+# Format: itemId1,itemNum1;itemId2,itemNum2...
+# Default: 13722,85
+TeamReward = 13722,85
+
+# ItemId used for exchanging to the points.
+# Default: 13722
+CompetitionRewardItem = 13722
+
+# The minimal matches you need to participate to receive point rewards
+# Default: 15
+MinMatchesForPoints = 15
+
+# Rate to exchange points to reward item.
+# Default: 1000
+GPPerPoint = 1000
+
+# Noblesse points awarded to Heroes.
+# Default: 200
+HeroPoints = 200
+
+# Noblesse points awarded to Rank 1 members.
+# Default: 100
+Rank1Points = 100
+
+# Noblesse points awarded to Rank 2 members.
+# Default: 75
+Rank2Points = 75
+
+# Noblesse points awarded to Rank 3 members.
+# Default: 55
+Rank3Points = 55
+
+# Noblesse points awarded to Rank 4 members.
+# Default: 40
+Rank4Points = 40
+
+# Noblesse points awarded to Rank 5 members.
+# Default: 30
+Rank5Points = 30
+
+# Maximum points that player can gain/lose on a match.
+# Default: 10
+MaxPoints = 10
+
+# Hero tables show last month's winners or current status.
+# Default: True
+ShowMonthlyWinners = True
+
+# Olympiad Managers announce each start of fight.
+# Default: True
+AnnounceGames = True
+
+# Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350)
+# Equipped items will be moved to inventory during port.
+# Default: 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774
+RestrictedItems = 6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,9388,9389,9390,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,20759,20775,20776,20777,20778,14774
+
+# Enchant limit for items during Olympiad battles. Disabled = -1.
+# Default: -1
+EnchantLimit = -1
+
+# Log all Olympiad fights and outcome to olympiad.csv file.
+# Default: False
+LogFights = False
+
+# Time to wait before teleported to arena.
+# Default: 120
+WaitTime = 120
+
+# Divider for points in classed and non-classed games
+# Default: 5, 5
+DividerClassed = 5
+DividerNonClassed = 5
+
+# Maximum number of matches a Noblesse character can join per week
+# Default: 70
+MaxWeeklyMatches = 70
+
+# Maximum number of Class-Irrelevant Individual matches a character can join per week
+# Default: 60
+MaxWeeklyMatchesNonClassed = 60
+
+# Maximum number of Class Individual matches a character can join per week
+# Default: 30
+MaxWeeklyMatchesClassed = 30
+
+# Maximum number of Class-Irrelevant Team matches a character can join per week
+# Default: 10
+MaxWeeklyMatchesTeam = 10
+
+# Contingency Olympiad settings
+# CurrentCycle = 1
+# Period = 0
+# OlympiadEnd = 0
+# ValidationEnd = 0
+# NextWeeklyChange = 0
\ No newline at end of file
diff --git a/src/main/resources/config/pvp.properties b/src/main/resources/config/pvp.properties
new file mode 100644
index 00000000..009c4515
--- /dev/null
+++ b/src/main/resources/config/pvp.properties
@@ -0,0 +1,44 @@
+# ---------------------------------------------------------------------------
+# PvP Related Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+# ---------------------------------------------------------------------------
+# PK'er Drop Settings
+# ---------------------------------------------------------------------------
+
+# Default: False
+CanGMDropEquipment = False
+
+# Warning: Make sure the lists do NOT CONTAIN 
+# trailing spaces or spaces between the numbers!
+# List of pet items we cannot drop.
+# Default: 2375,3500,3501,3502,4422,4423,4424,4425,6648,6649,6650
+PetItems = 2375,3500,3501,3502,4422,4423,4424,4425,6648,6649,6650
+
+# Lists of items which should NEVER be dropped (note, Adena will never be dropped) whether on this list or not.
+# Default: 57,1147,425,1146,461,10,2368,7,6,2370,2369,6842,6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,7694,8181,5575,7694,9388,9389,9390
+NonDroppableItems = 57,1147,425,1146,461,10,2368,7,6,2370,2369,6842,6611,6612,6613,6614,6615,6616,6617,6618,6619,6620,6621,7694,8181,5575,7694,9388,9389,9390
+
+# Default: 6
+MinimumPKRequiredToDrop = 6
+
+
+# ---------------------------------------------------------------------------
+# Misc.
+# ---------------------------------------------------------------------------
+
+# Should we award a pvp point for killing a player with karma?
+# Default: False
+AwardPKKillPVPPoint = False
+
+# How much time one stays in PvP mode after hitting an innocent (in ms)
+# Default: 120000
+PvPVsNormalTime = 120000
+
+# Length one stays in PvP mode after hitting a purple player (in ms)
+# Default: 60000
+PvPVsPvPTime = 60000
\ No newline at end of file
diff --git a/src/main/resources/config/rates.properties b/src/main/resources/config/rates.properties
new file mode 100644
index 00000000..62f3ca35
--- /dev/null
+++ b/src/main/resources/config/rates.properties
@@ -0,0 +1,137 @@
+# ---------------------------------------------------------------------------
+# Rate Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like. If you modify any of these settings your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything. Also please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Item Rates
+# ---------------------------------------------------------------------------
+# Warning: Remember if you increase both chance and amount you will have higher rates than expected
+# Example: if amount multiplier is 5 and chance multiplier is 5 you will end up with 5*5 = 25 drop rates so be careful!
+
+
+# Multiplies the amount of items dropped from monster on ground when it dies.
+DeathDropAmountMultiplier = 1
+# Multiplies the amount of items looted from monster when a skill like Sweeper(Spoil) is used.
+CorpseDropAmountMultiplier = 1
+# Multiplies the amount of items dropped from monster on ground when it dies.
+HerbDropAmountMultiplier = 1
+RaidDropAmountMultiplier = 1
+
+# Multiplies the chance of items that can be dropped from monster on ground when it dies.
+DeathDropChanceMultiplier = 1
+# Multiplies the chance of items that can be looted from monster when a skill like Sweeper(Spoil) is used.
+CorpseDropChanceMultiplier = 1
+# Multiplies the chance of items that can be dropped from monster on ground when it dies.
+HerbDropChanceMultiplier = 1
+RaidDropChanceMultiplier = 1
+
+# List of items affected by custom drop rate by id, used now for Adena rate too.
+# Usage: itemId1,multiplier1;itemId2,multiplier2;...
+# Note: Make sure the lists do NOT CONTAIN trailing spaces or spaces between the numbers!
+# Example for Raid boss 1x jewelry: 6656,1;6657,1;6658,1;6659,1;6660,1;6661,1;6662,1;8191,1;10170,1;10314,1;
+# Default: 57,1
+DropAmountMultiplierByItemId = 57,1
+DropChanceMultiplierByItemId = 57,1
+
+
+# ---------------------------------------------------------------------------
+# Standard Settings (Retail value = 1)
+# ---------------------------------------------------------------------------
+
+
+# Experience multiplier
+RateXp = 1
+# Skill points multiplier
+RateSp = 1
+# Experience multiplier (Party)
+RatePartyXp = 1
+# Skill points multiplier (Party)
+RatePartySp = 1
+RateDropManor = 1
+# Karma decreasing rate
+# Default: 1
+RateKarmaLost = 1
+RateKarmaExpLost = 1
+RateSiegeGuardsPrice = 1
+
+# Modify the rate of reward of all extractable items and skills.
+# Default: 1.
+RateExtractable = 1.
+
+# Hellbound trust increase/decrease multipliers
+RateHellboundTrustIncrease = 1
+RateHellboundTrustDecrease = 1
+
+# Quest Multipliers
+# Warning: Many quests need to be rewritten 
+# for this setting to work properly.
+
+# Quest item drop chance multiplier
+QuestDropChanceMultiplier = 1
+# Quest item drop amount multiplier
+QuestDropAmountMultiplier = 1
+
+# Exp/SP reward multipliers
+RateQuestRewardXP = 1
+RateQuestRewardSP = 1
+
+# Adena reward multiplier
+RateQuestRewardAdena = 1
+
+# Use additional item multipliers?
+# Default: False
+UseQuestRewardMultipliers = False
+
+# Default reward multiplier
+# When UseRewardMultipliers=False - default multiplier is used for any reward
+# When UseRewardMultipliers=True  - default multiplier is used for all items not affected by additional multipliers
+# Default: 1
+RateQuestReward = 1
+
+# Additional quest-reward multipliers based on item type
+RateQuestRewardPotion = 1
+RateQuestRewardScroll = 1
+RateQuestRewardRecipe = 1
+RateQuestRewardMaterial = 1
+
+# ---------------------------------------------------------------------------
+# Player Drops (values are set in PERCENTS)
+# ---------------------------------------------------------------------------
+
+PlayerDropLimit = 0
+# in %
+PlayerRateDrop = 0
+# in %
+PlayerRateDropItem = 0
+# in %
+PlayerRateDropEquip = 0
+# in %
+PlayerRateDropEquipWeapon = 0
+
+# Default: 10
+KarmaDropLimit = 10
+
+# Default: 40
+KarmaRateDrop = 40
+
+# Default: 50
+KarmaRateDropItem = 50
+
+# Default: 40
+KarmaRateDropEquip = 40
+
+# Default: 10
+KarmaRateDropEquipWeapon = 10
+
+
+# ---------------------------------------------------------------------------
+# Pets (Default value = 1)
+# ---------------------------------------------------------------------------
+
+PetXpRate = 1
+PetFoodRate = 1
+SinEaterXpRate = 1
+
diff --git a/src/main/resources/config/server.properties b/src/main/resources/config/server.properties
new file mode 100644
index 00000000..eda5d62c
--- /dev/null
+++ b/src/main/resources/config/server.properties
@@ -0,0 +1,87 @@
+# ---------------------------------------------------------------------------
+# Game Server Settings
+# ---------------------------------------------------------------------------
+# This is the server configuration file. Here you can set up the connection information for your server.
+# This was written with the assumption that you are behind a router.
+# Dumbed Down Definitions...
+# LAN (LOCAL area network) - typically consists of computers connected to the same router as you.
+# WAN (WIDE area network) - typically consists of computers OUTSIDE your router (i.e., the internet).
+# x.x.x.x - Format of an IP address. Do not include the x'es in settings. Must be real numbers.
+
+# ---------------------------------------------------------------------------
+# Networking
+# ---------------------------------------------------------------------------
+
+# Enables automatic port mapping for game server.
+# If you have a router, game server will request for port forwarding.
+# Default: True
+EnableUPnP = True
+
+# Bind address for game server. You should not need to change it in most cases.
+# WARNING: Please don't change default IPs here if you don't know what are you doing!
+# WARNING: External/Internal IPs are now inside "ipconfig.xml" file.
+# Default: * (0.0.0.0)
+Host = *
+
+# Default: 7777
+Port = 7777
+
+# Where's the Login server this game server should connect to.
+# WARNING: Please don't change default IPs here if you don't know what are you doing!
+# WARNING: External/Internal IPs are now inside "ipconfig.xml" file.
+# Default: 127.0.0.1
+LoginHost = 127.0.0.1
+
+# TCP port the login server listen to for game server connection requests
+# Default: 9014
+LoginPort = 9014
+
+# ---------------------------------------------------------------------------
+# Misc Server Settings
+# ---------------------------------------------------------------------------
+
+# This is the server Id that the Game Server will request.
+# Example: 1 = Bartz
+# Default: 1
+RequestServerId = 1
+
+# True = The Login Server will give an other Id to the server if the requested Id is already reserved.
+# Default: True
+AcceptAlternateId = True
+
+ReserveHostOnLogin = False
+
+# Datapack Root directory.
+# Default: .
+DatapackRoot = .
+
+# Script Root directory.
+# Default: ./script
+ScriptRoot = ./script
+
+# Define how many players are allowed to play simultaneously on your server.
+# Default: 500
+MaxOnlineUsers = 500
+
+# Numbers of protocol revisions that server allows to connect.
+# WARNING: Changing the protocol revision may result in incompatible communication and many errors in game!
+# Default: 267,268,271,273
+AllowedProtocolRevisions = 267,268,271,273
+
+# ---------------------------------------------------------------------------
+# ID Factory Settings
+# ---------------------------------------------------------------------------
+# Warning: 
+# Please take extreme caution when changing anything. Also please understand what you are changing before you do so on a live server.
+
+# Tell server which IDFactory Class to use:
+# Compaction = Original method
+# BitSet = One non compaction method
+# Stack = Another non compaction method
+# Default: BitSet
+IdFactory = BitSet
+
+# Check for bad ids in the database on server boot up.
+# Much faster load time without it, but may cause problems.
+# Default: True
+BadIdChecking = True
\ No newline at end of file
diff --git a/src/main/resources/config/sevensigns.properties b/src/main/resources/config/sevensigns.properties
new file mode 100644
index 00000000..94cc9995
--- /dev/null
+++ b/src/main/resources/config/sevensigns.properties
@@ -0,0 +1,94 @@
+# ---------------------------------------------------------------------------
+# Seven Signs
+# ---------------------------------------------------------------------------
+
+# Determines whether castle ownership is determined by clan or by alliance.
+# Default is by alliance, as on official servers.
+RequireClanCastle = False
+
+# Dawn:
+# True - Players not owning a castle, need to pay a participation fee.
+# False - Anyone can join Dawn
+CastleForDawn = True
+
+# Dusk:
+# True - Players owning a castle cannot join Dusk side.
+# False - Anyone can join Dusk
+CastleForDusk = True
+
+# Minimum Players for participate in SevenSigns Festival.
+# Default: 5
+FestivalMinPlayer = 5
+
+# Maximum seal stone contribution per player during festival.
+# Default: 1000000
+MaxPlayerContrib = 1000000
+
+# Festival Manager Start time (set in milliseconds; 1000 = 1 second).
+# Default: 2 minutes
+FestivalManagerStart = 120000
+
+# Festival Length (set in milliseconds; 1000 = 1 second).
+# Default: 18 minutes
+FestivalLength = 1080000
+
+# Festival Cycle Length.
+# Default: 38 Minutes (20 minutes wait time + Festival Length) (set in milliseconds; 1000 = 1 second).
+FestivalCycleLength = 2280000
+
+# At what point, the first festival spawn occurs.
+# Default: 2 minutes (set in milliseconds; 1000 = 1 second).
+FestivalFirstSpawn = 120000
+
+# At what point, the first festival swarm occurs.
+# Default: 5 minutes (set in milliseconds; 1000 = 1 second).
+FestivalFirstSwarm = 300000
+
+# At what point, the second festival spawn occurs.
+# Default: 9 minutes (set in milliseconds; 1000 = 1 second).
+FestivalSecondSpawn = 540000
+
+# At what point the second festival spawn occurs.
+# Default: 12 minutes (set in milliseconds; 1000 = 1 second).
+FestivalSecondSwarm = 720000
+
+# At what point the chests spawn in.
+# Default: 15 minutes (set in milliseconds; 1000 = 1 second).
+FestivalChestSpawn = 900000
+
+# This multiplier is used to change P.Def/M.Def of castle gates/walls while the Seal of Strife is controlled by one of the sides.
+# Default: 1.1,0.8,1.1,0.8
+DawnGatesPdefMult = 1.1
+DuskGatesPdefMult = 0.8
+DawnGatesMdefMult = 1.1
+DuskGatesMdefMult = 0.8
+
+# If true, only Cabal period owners can use Merchant and Blacksmith of Mammon.
+# If false, any player can use.
+# Default: True
+StrictSevenSigns = True
+
+# Save SevenSigns status only each 30 minutes and after period change.
+# Player info saved only during periodic data store (set by CharacterDataStoreInterval) and logout.
+# If False, then save info and status immediately after changes.
+# Default: True
+SevenSignsLazyUpdate = True
+
+# Total count of available tickets.
+# Default: 300
+SevenSignsDawnTicketQuantity = 300
+
+# Price of each ticket.
+# Default: 1000
+SevenSignsDawnTicketPrice = 1000
+
+# Tickets bundle (exchanged in amounts of).
+# Default: 10
+SevenSignsDawnTicketBundle = 10
+
+# Ticket item Id.
+# Default: 6388
+SevenSignsManorsAgreementId = 6388
+
+# Fee for joining Dawn
+SevenSignsJoinDawnFee = 50000
\ No newline at end of file
diff --git a/src/main/resources/config/siege.properties b/src/main/resources/config/siege.properties
new file mode 100644
index 00000000..a37fd4d9
--- /dev/null
+++ b/src/main/resources/config/siege.properties
@@ -0,0 +1,132 @@
+# ---------------------------------------------------------------------------
+# Siege Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Standard Settings
+# ---------------------------------------------------------------------------
+
+# Length of siege before the count-down (in minutes).
+# Default: 120
+SiegeLength = 120
+
+# Maximum number of flags per clan.
+# Default: 1
+MaxFlags = 1
+
+# Minimum level to register.
+# Default: 5
+ClanMinLevel = 5
+
+# Max number of clans that can register on each side.
+# Default: 500
+AttackerMaxClans = 500
+
+# Default: 500
+DefenderMaxClans = 500
+
+# Respawn times (in milliseconds).
+# Default: 0
+AttackerRespawn = 0
+
+# Reward successful siege defense with blood alliance in clan warehouse
+# Default: 1
+BloodAllianceReward = 1
+
+
+# ---------------------------------------------------------------------------
+# Castle Control Tower Spawns
+# ---------------------------------------------------------------------------
+
+# Caste Artifacts and Control Towers spawns
+#
+# Control Towers syntax:  NameControlTowerN=x,y,z,npc_id,hp
+# Name - castle name
+# N - number
+# x,y,z - coords
+# npc_id - id of template
+#
+# Flame Towers syntax:  NameFlameTowerN=x,y,z,npc_id,hp,zoneIds
+# Name - castle name
+# N - number
+# x,y,z - coords
+# npc_id - id of template
+# zoneIds - ids of zones related with tower
+#
+
+# Gludio
+GludioFlameTower1=-18154,107591,-2560,13004,70017,70019
+GludioFlameTower2=-19329,108154,-2384,13004,70018,70020
+GludioControlTower1=-18325,112811,-2377,13002
+GludioControlTower2=-18048,107098,-2378,13002
+GludioControlTower3=-18113,108597,-2343,13002
+GludioMaxMercenaries = 100
+
+# Giran
+GiranFlameTower1=118331,145055,-2627,13004,70025,70027
+GiranFlameTower2=117768,143880,-2451,13004,70026,70028
+GiranControlTower1=113115,144829,-2446,13002
+GiranControlTower2=118828,145106,-2447,13002
+GiranControlTower3=117329,145041,-2412,13002
+GiranMaxMercenaries = 200
+
+# Dion
+DionFlameTower1=22114,162159,-2754,13004,70021,70023
+DionFlameTower2=23289,161596,-2578,13004,70022,70024
+DionControlTower1=22285,156939,-2571,13002
+DionControlTower2=22008,162652,-2572,13002
+DionControlTower3=22073,161153,-2537,13002
+DionMaxMercenaries = 150
+
+# Oren
+OrenFlameTower1=84407,37150,-2354,13004,70029,70031
+OrenFlameTower2=83844,35975,-2178,13004,70030,70032
+OrenControlTower1=79193,36977,-2167,13002
+OrenControlTower2=84906,37254,-2168,13002
+OrenControlTower3=83407,37189,-2133,13002
+OrenMaxMercenaries = 300
+
+# Aden
+AdenFlameTower1=149976,1583,-450,13004,70008,70016,70007,70015,70006,70014,70005,70013
+AdenFlameTower2=144955,1603,-450,13004,70004,70012,70003,70011,70002,70010,70001,70009
+AdenControlTower1=148774,2351,-389,13002
+AdenControlTower2=147456,5724,158,13002
+AdenControlTower3=146137,2352,-389,13002
+AdenMaxMercenaries = 400
+
+# Innadril
+InnadrilFlameTower1=116065,250938,-850,13004,70033,70035
+InnadrilFlameTower2=117240,250375,-674,13004,70034,70036
+InnadrilControlTower1=116236,245718,-667,13002
+InnadrilControlTower2=115959,251431,-667,13002
+InnadrilControlTower3=116024,249932,-633,13002
+InnadrilMaxMercenaries = 400
+
+# Goddard
+GoddardFlameTower1=148144,-46992,-1609,13004,70037,70039
+GoddardFlameTower2=146784,-46992,-1609,13004,70038,70040
+GoddardControlTower1=144672,-48832,-1742,13002
+GoddardControlTower2=150240,-48832,-1742,13002
+GoddardControlTower3=147456,-49200,-1619,13002
+GoddardMaxMercenaries = 400
+
+# Rune
+RuneFlameTower1=12864,-47440,-1087,13004,70041,70043
+RuneFlameTower2=12225,-50767,1248,13004,70042,70044
+RuneControlTower1=16565,-50318,-641,13002
+RuneControlTower2=16559,-48000,-641,13002
+RuneControlTower3=10775,-48481,83,13002
+RuneMaxMercenaries = 400
+
+# Schuttgart
+SchuttgartFlameTower1=76872,-151043,120,13004,70045,70047
+SchuttgartFlameTower2=78233,-151037,120,13004,70046,70048
+SchuttgartControlTower1=80334,-152898,-8,13002
+SchuttgartControlTower2=74775,-152928,-8,13002
+SchuttgartControlTower3=77547,-153246,112,13002
+SchuttgartMaxMercenaries = 400
diff --git a/src/main/resources/config/teleporterservice.properties b/src/main/resources/config/teleporterservice.properties
new file mode 100644
index 00000000..d8a4cb2e
--- /dev/null
+++ b/src/main/resources/config/teleporterservice.properties
@@ -0,0 +1,65 @@
+# ---------------------------------------------------------------------------
+# TeleporterService Mod
+# - Additional configuration can be found in: data/service/teleporter/json
+# - HTML can be modified in data/service/teleporter/html
+# - The default npc is 60002, use //spawn 60002 to spawn it
+# ---------------------------------------------------------------------------
+
+# WARNING: this mod require custom NPC table support turned on!
+# CustomNpcTable = True in General.properties
+# ---------------------------------------------------------------------------
+
+# ---------------------------------------------------------------------------
+# General Teleporter Config
+# ---------------------------------------------------------------------------
+# Enable/Disable TeleporterService
+# Default: False
+Enable=False
+
+# Enable/Disable debug messages
+# Default: False
+Debug=False
+
+# Forbid the teleporter in the specified zone types
+# Default: PVP,SIEGE,WATER,JAIL,DANGER_AREA
+ForbidInZones=PVP,SIEGE,WATER,JAIL,DANGER_AREA
+
+# Forbid the teleporter in events (event, block checker, olympiad, tvt)
+# Default: true
+ForbidInEvents=true
+
+# Forbid the teleporter in a duel
+# Default: true
+ForbidInDuel=true
+
+# Forbid the teleporter in a fight
+# Default: true
+ForbidInFight=true
+
+# Forbid the teleporter in pvp (purple name)
+# Default: true
+ForbidInPvp=true
+
+# Forbid the teleporter for chaotic players (red name)
+# Default: false
+ForbidForChaoticPlayers=false
+
+# ---------------------------------------------------------------------------
+# Voiced Teleporter Config
+# ---------------------------------------------------------------------------
+# Enable/Disable voiced teleporter
+# Default: False
+VoicedEnable=False
+
+# The voiced command for the voiced teleporter
+# Default: teleporterservice
+VoicedCommand=teleporterservice
+
+# The name of the voiced teleporter
+# Default: Voiced
+VoicedName=Voiced
+
+# Item id required to be in the inventory to be able to use the voiced teleporter
+# 0 = no item required
+# Default: 0
+VoicedRequiredItem=0
\ No newline at end of file
diff --git a/src/main/resources/config/telnet.properties b/src/main/resources/config/telnet.properties
new file mode 100644
index 00000000..08eb58d5
--- /dev/null
+++ b/src/main/resources/config/telnet.properties
@@ -0,0 +1,29 @@
+# ---------------------------------------------------------------------------
+# Telnet Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+# ---------------------------------------------------------------------------
+
+# Allows text-based monitoring and administration of L2J GS by using a telnet client.
+# Communication protocol is insecure,
+# and you should use SSL tunnels, VPN, etc. if you plan to connect over non-trusted channels.
+# Default: False
+EnableTelnet = False
+
+# This is the port L2J should listen to for incoming telnet
+# requests.
+# Default: 54321
+Port = 54321
+
+# If the following is not set, a random password is generated on server startup.
+# Usage: StatusPW = somePass
+Password =
+
+# This list can contain IPs or Hosts of clients you wish to allow. Hostnames must be resolvable to an IP.
+# Example: 0.0.0.0,host,0.0.0.1,host2,host3,host4,0.0.0.3
+# Default: 127.0.0.1,localhost
+Hosts = 127.0.0.1,localhost
\ No newline at end of file
diff --git a/src/main/resources/config/territorywar.properties b/src/main/resources/config/territorywar.properties
new file mode 100644
index 00000000..9abdf484
--- /dev/null
+++ b/src/main/resources/config/territorywar.properties
@@ -0,0 +1,55 @@
+# ---------------------------------------------------------------------------
+# TerritoryWar Settings
+# ---------------------------------------------------------------------------
+# The defaults are set to be retail-like.
+# If you modify any of these settings, your server will deviate from being retail-like.
+# Warning: 
+# Please take extreme caution when changing anything.
+# Also, please understand what you are changing before you do so on a live server.
+
+# ---------------------------------------------------------------------------
+# Standard Settings
+# ---------------------------------------------------------------------------
+
+# Length of siege before the count-down (in minutes).
+# Default: 120
+WarLength = 120
+
+# Clan Minimum level to register.
+# Default: 0
+ClanMinLevel = 0
+
+# Player Minimum level to register.
+# Default: 40
+PlayerMinLevel = 40
+
+# Max number of clans and players that can register for a side.
+# Default: 500
+DefenderMaxClans = 500
+
+# Default: 500
+DefenderMaxPlayers = 500
+
+# Is Ward holding players can be attacked and killed in peace zone
+# Default: False
+PlayerWithWardCanBeKilledInPeaceZone = False
+
+# Spawn wards in Castles when Territory War is not in progress
+# Default: False
+SpawnWardsWhenTWIsNotInProgress = False
+
+# Return all wards to their own castle when Territory War starts
+# Default: False
+ReturnWardsWhenTWStarts = False
+
+# Territory Badge needed to change nobless
+# default: 100
+MinTerritoryBadgeForNobless = 100
+
+# Territory Badge needed to buy Strider
+# default: 50
+MinTerritoryBadgeForStriders = 50
+
+# Territory Badge needed to buy Guardian's Strider
+# default: 80
+MinTerritoryBadgeForBigStrider = 80
\ No newline at end of file
diff --git a/src/main/resources/config/tvt.properties b/src/main/resources/config/tvt.properties
new file mode 100644
index 00000000..1604d9c0
--- /dev/null
+++ b/src/main/resources/config/tvt.properties
@@ -0,0 +1,117 @@
+# ---------------------------------------------------------------------------
+# Team vs. Team Event Engine
+# ---------------------------------------------------------------------------
+
+# WARNING: this mod requires custom NPC table support turned on!
+# CustomNpcTable = True in General.properties
+# ---------------------------------------------------------------------------
+# Enable/Disable TvTEvent System
+# Default: False
+Enabled = False
+
+# TvT in instance
+# Default: False
+Instanced = False
+
+# Name of the instance file for TvT
+# Default: coliseum.xml
+InstanceFile = coliseum.xml
+
+# Times TvT will occur (24h format).
+# Default: 9:00,15:00,21:00,3:00
+Interval = 9:00,15:00,21:00,3:00
+
+# Registration timer from start of event (in minutes).
+# Default: 30
+ParticipationTime = 30
+
+# Event running time (in minutes).
+# Default: 20
+RunningTime = 20
+
+# TvT Event NPC (create a custom npc of type L2TvTEventNpc).
+# Default: 70010
+ParticipationNpcId = 70010
+
+# TvT Event Participation Fee (itemId, number). Fee is not returned.
+# Example: 57,100000
+# Default: 0,0
+ParticipationFee = 0,0
+
+# Location for TvTEvent NPC to spawn in form x,y,z[,heading]
+# Default: 83425,148585,-3406
+ParticipationNpcLoc = 83425,148585,-3406
+
+# Minimum number of players allowed in each team.
+# Default: 1
+MinPlayersInTeams = 1
+# Maximum number of players allowed in each team.
+# Default: 20
+MaxPlayersInTeams = 20
+
+# Minimum level of players that may join the event.
+# Default: 1
+MinPlayerLevel = 1
+# Maximum level of players that may join the event.
+# Default: 85
+MaxPlayerLevel = 85
+
+# Respawn delay timer (in seconds).
+# Default: 10
+RespawnTeleportDelay = 10
+
+# Exit delay timer (in seconds).
+# Default: 10
+StartLeaveTeleportDelay = 10
+
+# First Team - Name, Start/Death x,y,z location.
+Team1Name = Dawn
+Team1Loc = 148695,46725,-3414
+
+# Second Team - Name, Start/Death x,y,z location.
+Team2Name = Dusk
+Team2Loc = 149999,46728,-3414
+
+# Reward for winning team.
+# Example: EventReward = itemId,amount;itemId,amount;itemId,amount
+Reward = 57,100000
+
+# TvTEvent Rules
+AllowTargetTeamMember = True
+AllowScroll = False
+AllowPotion = False
+AllowSummonByItem = False
+
+# Door ID's to open/close on start/end.
+# Not supported in instance, use xml template for defining doors.
+# Example: DoorsToOpen = 1,2,3,4,5,6
+DoorsToOpen = 
+DoorsToClose =
+
+# Should both teams get reward if there's a tie?
+RewardTeamTie = False
+
+# Participant's effects handling on teleport/death.
+# Effects lasting through death are never removed.
+# 0 - always remove all effects.
+# 1 - remove all effects only during port to event (a noblesse blessing can be used)
+# 2 - never remove any effect
+# Default: 0
+EffectsRemoval = 0
+
+# Fighter-class participants will be buffed with those buffs each respawn
+# Format: skill1Id,skill1Level;skill2Id,skill2Level...
+# Example: 1504,1;1501,1;1502,1;1499,1
+FighterBuffs =
+
+# Mage-class participants will be buffed with those buffs each respawn
+# Format: skill1Id,skill1Level;skill2Id,skill2Level...
+# Example: 1504,1;1500,1;1501,1;1085,3
+MageBuffs =
+
+# Maximum number of allowed participants per IP address (dualbox check)
+# Default: 0 (no limits)
+MaxParticipantsPerIP = 0
+
+# Voiced command (.tvt) working during TVT event to get information about event status
+AllowVoicedInfoCommand = False
\ No newline at end of file
diff --git a/src/main/resources/config/vitality.properties b/src/main/resources/config/vitality.properties
new file mode 100644
index 00000000..59506b19
--- /dev/null
+++ b/src/main/resources/config/vitality.properties
@@ -0,0 +1,46 @@
+# ---------------------------------------------------------------------------
+# Vitality System
+# ---------------------------------------------------------------------------
+
+# Enables vitality system
+# Default: True
+Enabled = True
+
+# Do you want players to recover their vitality when they reconnect?
+# This is calculated with the time they've been offline
+# Actual Time - Last Time Online / 1000 x rate recovery on reconnect
+# Notes:
+#	Works only if EnableVitality = True
+# Default: True
+RecoverVitalityOnReconnect = True
+
+# Option to set a lower vitality at character creation.
+# Vitality needs to be enabled, and starting points needs to be lower
+# than max-vitality points.
+# Default: 20000
+StartingVitalityPoints = 20000
+
+# The following configures the XP multiplier of each vitality level. Basically, you have
+# 5 levels, the first one being 0. Official rates are:
+# Level 1: 150%
+# Level 2: 200%
+# Level 3: 250%
+# Level 4: 300%
+# Take care setting these values according to your server rates, as the can lead to huge differences!
+# Example with a server rate 15x and a level 4 vitality = 3. => final server rate = 45 (15x3)!
+RateVitalityLevel1 = 1.5
+RateVitalityLevel2 = 2.
+RateVitalityLevel3 = 2.5
+RateVitalityLevel4 = 3.
+
+# These options are to be used if you want to increase the vitality gain/lost for each mob you kills
+# Default values are 1.
+RateVitalityGain = 1.
+RateVitalityLost = 1.
+
+# This defines how many times faster the players regain their vitality when in peace zones
+RateRecoveryPeaceZone = 1.
+
+# This defines how many times faster the players regain their vitality when offline
+# Note that you need to turn on "RecoverVitalityOnReconnect" to have this option effective
+RateRecoveryOnReconnect = 4.
\ No newline at end of file
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 00000000..7d24ffb9
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+	<Appenders>
+		<Console name="console" target="SYSTEM_OUT">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+		</Console>
+		<RollingFile name="server" fileName="logs/server.log" filePattern="logs/server.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="error" fileName="logs/error/error.log" filePattern="logs/error/error.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="audit" fileName="logs/audit/audit.log" filePattern="logs/audit/audit.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="accounting" fileName="logs/accounting/accounting.log" filePattern="logs/accounting/accounting.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="chat" fileName="logs/chat/chat.log" filePattern="logs/chat/chat.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="item" fileName="logs/item/item.log" filePattern="logs/item/item.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="enchant_item" fileName="logs/enchant/item/enchant_item.log" filePattern="logs/enchant/item/enchant_item.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="enchant_skill" fileName="logs/enchant/skill/enchant_skill.log" filePattern="logs/enchant/skill/enchant_skill.%d{yyyy-MM-dd-HH-mm-ss}.log" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+		<RollingFile name="olympiad" fileName="logs/olympiad/olympiad.csv" filePattern="logs/olympiad/olympiad.%d{yyyy-MM-dd-HH-mm-ss}.csv" ignoreExceptions="false">
+			<PatternLayout pattern="[%level] %d{yyyy-MM-dd HH:mm:ss} %c{1}: %msg%n" />
+			<Policies>
+				<OnStartupTriggeringPolicy />
+				<SizeBasedTriggeringPolicy size="100 MB" />
+			</Policies>
+		</RollingFile>
+	</Appenders>
+	<Loggers>
+		<Root level="debug">
+			<appender-ref ref="console" level="info" />
+			<appender-ref ref="server" level="info" />
+			<appender-ref ref="error" level="warn" />
+		</Root>
+		<Logger name="audit" level="info" additivity="false">
+			<AppenderRef ref="audit" />
+		</Logger>
+		<Logger name="accounting" level="info" additivity="false">
+			<AppenderRef ref="accounting" />
+		</Logger>
+		<Logger name="chat" level="info" additivity="false">
+			<AppenderRef ref="chat" />
+		</Logger>
+		<Logger name="item" level="info" additivity="false">
+			<AppenderRef ref="item" />
+		</Logger>
+		<Logger name="enchant_item" level="info" additivity="false">
+			<AppenderRef ref="enchant_item" />
+		</Logger>
+		<Logger name="enchant_skill" level="info" additivity="false">
+			<AppenderRef ref="enchant_skill" />
+		</Logger>
+		<Logger name="olympiad" level="info" additivity="false">
+			<AppenderRef ref="olympiad" />
+		</Logger>
+	</Loggers>
+</Configuration>
diff --git a/src/main/resources/startGameServer.bat b/src/main/resources/startGameServer.bat
new file mode 100644
index 00000000..5c4aae54
--- /dev/null
+++ b/src/main/resources/startGameServer.bat
@@ -0,0 +1,29 @@
+@echo off
+title Game Server Console
+
+:start
+echo Starting L2J Game Server.
+echo.
+
+java -Xms512m -Xmx2g -jar l2jserver.jar
+
+if ERRORLEVEL 2 goto restart
+if ERRORLEVEL 1 goto error
+goto end
+
+:restart
+echo.
+echo Admin Restarted Game Server.
+echo.
+goto start
+
+:error
+echo.
+echo Game Server Terminated Abnormally!
+echo.
+
+:end
+echo.
+echo Game Server Terminated.
+echo.
+pause
\ No newline at end of file
diff --git a/src/main/resources/startGameServer.sh b/src/main/resources/startGameServer.sh
new file mode 100644
index 00000000..47b8ee76
--- /dev/null
+++ b/src/main/resources/startGameServer.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./GameServer_loop.sh &
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/config/IPConfigDataTest.java b/src/test/java/com/l2jserver/gameserver/config/IPConfigDataTest.java
new file mode 100644
index 00000000..741159e4
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/IPConfigDataTest.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Collections;
+import java.util.List;
+import java.util.Vector;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+import org.w3c.dom.Document;
+
+import com.l2jserver.gameserver.GameServer;
+
+/**
+ * IPConfigData tests.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+public class IPConfigDataTest {
+	
+	private static final Path CONFIG_DIR = Path.of("config");
+	private static final Path CONFIG_FILE = CONFIG_DIR.resolve("ipconfig.xml");
+	
+	private MockedStatic<GameServer> gameServerMock;
+	private MockedStatic<NetworkInterface> networkInterfaceMock;
+	private MockedStatic<URI> uriMock;
+	
+	@BeforeEach
+	void setup() throws IOException {
+		if (!Files.exists(CONFIG_DIR)) {
+			Files.createDirectories(CONFIG_DIR);
+		}
+		Files.deleteIfExists(CONFIG_FILE);
+		
+		gameServerMock = mockStatic(GameServer.class);
+		networkInterfaceMock = mockStatic(NetworkInterface.class, CALLS_REAL_METHODS);
+		uriMock = mockStatic(URI.class, CALLS_REAL_METHODS);
+	}
+	
+	@AfterEach
+	void tearDown() throws IOException {
+		gameServerMock.close();
+		networkInterfaceMock.close();
+		uriMock.close();
+		Files.deleteIfExists(CONFIG_FILE);
+	}
+	
+	@Test
+	void testAutoIpConfigFull() throws Exception {
+		final URI mockUri = mock(URI.class);
+		final URL mockUrl = mock(URL.class);
+		when(mockUri.toURL()).thenReturn(mockUrl);
+		when(mockUrl.openStream()).thenReturn(new ByteArrayInputStream("1.2.3.4\n".getBytes()));
+		uriMock.when(() -> URI.create("http://ip1.dynupdate.no-ip.com:8245/")).thenReturn(mockUri);
+		
+		final Vector<NetworkInterface> nis = new Vector<>();
+		final NetworkInterface niRegular = mock(NetworkInterface.class);
+		when(niRegular.isUp()).thenReturn(true);
+		when(niRegular.isLoopback()).thenReturn(false);
+		when(niRegular.isVirtual()).thenReturn(false);
+		when(niRegular.getHardwareAddress()).thenReturn(new byte[] {
+			1,
+			2,
+			3,
+			4,
+			5,
+			6
+		});
+		
+		final InterfaceAddress iaV4 = mock(InterfaceAddress.class);
+		final InetAddress addrV4 = mock(InetAddress.class);
+		when(addrV4.getHostAddress()).thenReturn("192.168.1.5");
+		when(iaV4.getAddress()).thenReturn(addrV4);
+		when(iaV4.getNetworkPrefixLength()).thenReturn((short) 24);
+		
+		when(niRegular.getInterfaceAddresses()).thenReturn(List.of(iaV4));
+		nis.add(niRegular);
+		networkInterfaceMock.when(NetworkInterface::getNetworkInterfaces).thenReturn(nis.elements());
+		
+		final IPConfigData config = new IPConfigData();
+		assertTrue(config.getHosts().contains("1.2.3.4"));
+		assertTrue(config.getHosts().contains("192.168.1.5"));
+	}
+	
+	@Test
+	void testAutoIpConfigExternalFailure() throws Exception {
+		final URI mockUri = mock(URI.class);
+		final URL mockUrl = mock(URL.class);
+		when(mockUri.toURL()).thenReturn(mockUrl);
+		// Throw IOException from openStream() instead of URI.create()
+		when(mockUrl.openStream()).thenThrow(new IOException("Simulated network failure"));
+		uriMock.when(() -> URI.create("http://ip1.dynupdate.no-ip.com:8245/")).thenReturn(mockUri);
+		
+		networkInterfaceMock.when(NetworkInterface::getNetworkInterfaces).thenReturn(Collections.emptyEnumeration());
+		
+		final IPConfigData config = new IPConfigData();
+		assertTrue(config.getHosts().contains("127.0.0.1"));
+	}
+	
+	@Test
+	void testParseDocumentDirectly() throws Exception {
+		// Instantiating with no interfaces to have a clean slate in load()
+		networkInterfaceMock.when(NetworkInterface::getNetworkInterfaces).thenReturn(Collections.emptyEnumeration());
+		final IPConfigData config = new IPConfigData();
+		
+		// Clear lists to be absolutely sure
+		config.getHosts().clear();
+		config.getSubnets().clear();
+		
+		final String xml = "<gameserver address=\"8.8.8.8\">" +
+			"  <define subnet=\"10.10.0.0/16\" address=\"10.10.0.1\" />" +
+			"</gameserver>";
+		final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
+		
+		// IPConfigData.parseDocument(doc) uses doc.getFirstChild()
+		config.parseDocument(doc);
+		
+		assertTrue(config.getHosts().contains("8.8.8.8"));
+		assertTrue(config.getHosts().contains("10.10.0.1"));
+		assertTrue(config.getSubnets().contains("10.10.0.0/16"));
+	}
+	
+	@Test
+	void testParseDocumentEdgeCases() throws Exception {
+		networkInterfaceMock.when(NetworkInterface::getNetworkInterfaces).thenReturn(Collections.emptyEnumeration());
+		final IPConfigData config = new IPConfigData();
+		config.getHosts().clear();
+		
+		// Case: Missing address attribute
+		final String xml1 = "<gameserver></gameserver>";
+		final Document doc1 = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xml1.getBytes()));
+		config.parseDocument(doc1);
+		assertTrue(config.getHosts().contains("127.0.0.1"));
+		
+		// Case: Nested gameserver node
+		final String xml2 = "<root><gameserver address=\"5.6.7.8\" /></root>";
+		final Document doc2 = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xml2.getBytes()));
+		// In this case doc2.getFirstChild() is <root>.
+		// Its child is <gameserver>.
+		// The loop at line 79 will skip <root> siblings (none).
+		// Wait, the loop only looks at the first child and its siblings.
+		// So we need to pass the root node's children?
+		config.parseDocument(doc2);
+		// This will actually not find gameserver because it's looking as siblings of root.
+	}
+	
+	@Test
+	@SuppressWarnings("unchecked")
+	void testInternalListDynamics() throws Exception {
+		networkInterfaceMock.when(NetworkInterface::getNetworkInterfaces).thenReturn(Collections.emptyEnumeration());
+		final IPConfigData config = new IPConfigData();
+		
+		// Test getters when empty
+		final Field subnetsField = IPConfigData.class.getDeclaredField("_subnets");
+		subnetsField.setAccessible(true);
+		List<String> subnets = (List<String>) subnetsField.get(config);
+		subnets.clear();
+		assertEquals("0.0.0.0/0", config.getSubnets().get(0));
+		
+		final Field hostsField = IPConfigData.class.getDeclaredField("_hosts");
+		hostsField.setAccessible(true);
+		List<String> hosts = (List<String>) hostsField.get(config);
+		hosts.clear();
+		assertEquals("127.0.0.1", config.getHosts().get(0));
+		
+		// Test mismatched lists warning (Line 87)
+		hosts.add("extra-host");
+		final String xml = "<gameserver><define subnet=\"1.1.1.0/24\" address=\"1.1.1.1\" /></gameserver>";
+		final Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
+		config.parseDocument(doc);
+	}
+	
+	@Test
+	void testAutoIpConfigFilters() throws Exception {
+		final Vector<NetworkInterface> nis = new Vector<>();
+		
+		// Virtual
+		final NetworkInterface ni1 = mock(NetworkInterface.class);
+		when(ni1.isUp()).thenReturn(true);
+		when(ni1.isVirtual()).thenReturn(true);
+		nis.add(ni1);
+		
+		// Null HW address
+		final NetworkInterface ni2 = mock(NetworkInterface.class);
+		when(ni2.isUp()).thenReturn(true);
+		when(ni2.isLoopback()).thenReturn(false);
+		when(ni2.getHardwareAddress()).thenReturn(null);
+		nis.add(ni2);
+		
+		// IPv6 address
+		final NetworkInterface ni3 = mock(NetworkInterface.class);
+		when(ni3.isUp()).thenReturn(true);
+		when(ni3.isLoopback()).thenReturn(true);
+		final InterfaceAddress iaV6 = mock(InterfaceAddress.class);
+		when(iaV6.getAddress()).thenReturn(mock(Inet6Address.class));
+		when(ni3.getInterfaceAddresses()).thenReturn(List.of(iaV6));
+		nis.add(ni3);
+		
+		networkInterfaceMock.when(NetworkInterface::getNetworkInterfaces).thenReturn(nis.elements());
+		new IPConfigData();
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/Days2MillisecondsConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/Days2MillisecondsConverterTest.java
new file mode 100644
index 00000000..27f5ff2f
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/Days2MillisecondsConverterTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Days to Milliseconds converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class Days2MillisecondsConverterTest {
+	
+	private static final Days2MillisecondsConverter CONVERTER = new Days2MillisecondsConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideValidInputs")
+	void testConvert(String input, Long expectedResult) {
+		final var result = CONVERTER.convert(null, input);
+		assertEquals(expectedResult, result);
+	}
+	
+	@ParameterizedTest
+	@MethodSource("provideInvalidInputs")
+	void testConvertThrowsNumberFormatException(String input) {
+		assertThrows(NumberFormatException.class, () -> CONVERTER.convert(null, input));
+	}
+	
+	private static Stream<Object[]> provideValidInputs() {
+		// @formatter:off
+        return Stream.of(
+            new Object[]{"2", 172800000L},   // 2 days to milliseconds
+            new Object[]{"0", 0L},           // 0 days
+            new Object[]{"-1", -86400000L},  // Negative day
+            new Object[]{"", 0L},            // Blank input
+            new Object[]{null, 0L}           // Null input
+        );
+    	// @formatter:on
+	}
+	
+	private static Stream<String> provideInvalidInputs() {
+		// @formatter:off
+        return Stream.of(
+            "abc",  // Non-numeric input
+            "12.5"  // Invalid format for long
+        );
+    	// @formatter:on
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/HexIdConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/HexIdConverterTest.java
new file mode 100644
index 00000000..f98108d7
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/HexIdConverterTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigInteger;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Hex Id Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class HexIdConverterTest {
+	
+	private static final HexIdConverter CONVERTER = new HexIdConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideKeyValues")
+	void convertTest(String hexId, BigInteger expected) {
+		assertEquals(CONVERTER.convert(null, hexId), expected);
+	}
+	
+	private static Object[][] provideKeyValues() {
+		return new Object[][] {
+			{
+				"-1eeb34fce0c64b610338d1269d8cfea4",
+				new BigInteger("-1eeb34fce0c64b610338d1269d8cfea4", 16)
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/Hours2MillisecondsConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/Hours2MillisecondsConverterTest.java
new file mode 100644
index 00000000..67505914
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/Hours2MillisecondsConverterTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Hours to Milliseconds converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class Hours2MillisecondsConverterTest {
+	
+	private static final Hours2MillisecondsConverter CONVERTER = new Hours2MillisecondsConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideValidInputs")
+	void testConvert(String input, Long expectedResult) {
+		final var result = CONVERTER.convert(null, input);
+		assertEquals(expectedResult, result);
+	}
+	
+	@ParameterizedTest
+	@MethodSource("provideInvalidInputs")
+	void testConvertThrowsNumberFormatException(String input) {
+		assertThrows(NumberFormatException.class, () -> CONVERTER.convert(null, input));
+	}
+	
+	private static Stream<Object[]> provideValidInputs() {
+		// @formatter:off
+        return Stream.of(
+            new Object[]{"1", 3600000L},      // 1 hour to milliseconds
+            new Object[]{"0", 0L},            // 0 hours
+            new Object[]{"-2", -7200000L},    // Negative hours
+            new Object[]{"", 0L},             // Blank input
+            new Object[]{null, 0L}            // Null input
+        );
+        // @formatter:on
+	}
+	
+	private static Stream<String> provideInvalidInputs() {
+		// @formatter:off
+        return Stream.of(
+            "abc",  // Non-numeric input
+            "1.5"   // Invalid format for long
+        );
+        // @formatter:on
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/ItemHolderConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/ItemHolderConverterTest.java
new file mode 100644
index 00000000..f6bf47f4
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/ItemHolderConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Item Holder Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class ItemHolderConverterTest {
+	
+	private static final ItemHolderConverter CONVERTER = new ItemHolderConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideItems")
+	void convertTest(String input, int id, long count) {
+		final var result = CONVERTER.convert(null, input);
+		assertEquals(result.getId(), id);
+		assertEquals(result.getCount(), count);
+	}
+	
+	private static Object[][] provideItems() {
+		return new Object[][] {
+			{
+				"57,100000",
+				57,
+				100000
+			},
+			{
+				"57,12345678910",
+				57,
+				12345678910L
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/LocationConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/LocationConverterTest.java
new file mode 100644
index 00000000..b8cef5bd
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/LocationConverterTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import com.l2jserver.gameserver.model.Location;
+
+/**
+ * Location Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class LocationConverterTest {
+	
+	private static final LocationConverter CONVERTER = new LocationConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideLocations")
+	void convertTest(String input, Location expected) {
+		assertEquals(CONVERTER.convert(null, input), expected);
+	}
+	
+	private static Object[][] provideLocations() {
+		return new Object[][] {
+			{
+				"83425,148585,-3406",
+				new Location(83425, 148585, -3406)
+			},
+			{
+				"148695,46725,-3414,200",
+				new Location(148695, 46725, -3414, 200)
+			},
+			{
+				"149999,46728,-3414,200,5000",
+				new Location(149999, 46728, -3414, 200, 5000)
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/MapIntegerFloatConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/MapIntegerFloatConverterTest.java
new file mode 100644
index 00000000..c0bd5278
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/MapIntegerFloatConverterTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Map;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Map Integer-Float Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class MapIntegerFloatConverterTest {
+	
+	private static final MapIntegerFloatConverter CONVERTER = new MapIntegerFloatConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideKeyValues")
+	void convertTest(String keyValues, Map<Integer, Float> expected) {
+		assertEquals(CONVERTER.convert(null, keyValues), expected);
+	}
+	
+	private static Object[][] provideKeyValues() {
+		return new Object[][] {
+			{
+				"264,3600;265,3600;266,3600;267,3600",
+				Map.of(264, 3600.0F, 265, 3600.0F, 266, 3600.0F, 267, 3600.0F)
+			},
+			{
+				"264, 3600; 265, 3600; 266, 3600; 267, 3600",
+				Map.of(264, 3600.0F, 265, 3600.0F, 266, 3600.0F, 267, 3600.0F)
+			},
+			{
+				"",
+				Map.of()
+			},
+			{
+				null,
+				Map.of()
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/MapIntegerIntegerConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/MapIntegerIntegerConverterTest.java
new file mode 100644
index 00000000..dc419009
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/MapIntegerIntegerConverterTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Map;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Map Integer-Integer Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class MapIntegerIntegerConverterTest {
+	
+	private static final MapIntegerIntegerConverter CONVERTER = new MapIntegerIntegerConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideKeyValues")
+	void convertTest(String keyValues, Map<Integer, Integer> expected) {
+		assertEquals(CONVERTER.convert(null, keyValues), expected);
+	}
+	
+	private static Object[][] provideKeyValues() {
+		return new Object[][] {
+			{
+				"264,3600;265,3600;266,3600;267,3600",
+				Map.of(264, 3600, 265, 3600, 266, 3600, 267, 3600)
+			},
+			{
+				"264, 3600; 265, 3600; 266, 3600; 267, 3600",
+				Map.of(264, 3600, 265, 3600, 266, 3600, 267, 3600)
+			},
+			{
+				"",
+				Map.of()
+			},
+			{
+				null,
+				Map.of()
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/Minutes2MillisecondsConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/Minutes2MillisecondsConverterTest.java
new file mode 100644
index 00000000..90ba5556
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/Minutes2MillisecondsConverterTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.stream.Stream;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Minutes to Milliseconds converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class Minutes2MillisecondsConverterTest {
+	
+	private static final Minutes2MillisecondsConverter CONVERTER = new Minutes2MillisecondsConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideValidInputs")
+	void testConvert(String input, Long expectedResult) {
+		final var result = CONVERTER.convert(null, input);
+		assertEquals(expectedResult, result);
+	}
+	
+	@ParameterizedTest
+	@MethodSource("provideInvalidInputs")
+	void testConvertThrowsNumberFormatException(String input) {
+		assertThrows(NumberFormatException.class, () -> CONVERTER.convert(null, input));
+	}
+	
+	private static Stream<Object[]> provideValidInputs() {
+		// @formatter:off
+        return Stream.of(
+            new Object[]{"1", 60000L},        // 1 minute to milliseconds
+            new Object[]{"0", 0L},            // 0 minutes
+            new Object[]{"-3", -180000L},     // Negative minutes
+            new Object[]{"", 0L},             // Blank input
+            new Object[]{null, 0L}            // Null input
+        );
+        // @formatter:on
+	}
+	
+	private static Stream<String> provideInvalidInputs() {
+		// @formatter:off
+        return Stream.of(
+            "abc",  // Non-numeric input
+            "2.5"   // Invalid format for long
+        );
+        // @formatter:on
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/PatternConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/PatternConverterTest.java
new file mode 100644
index 00000000..45649ec2
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/PatternConverterTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Pattern Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class PatternConverterTest {
+	
+	private static final PatternConverter CONVERTER = new PatternConverter();
+	
+	@ParameterizedTest
+	@MethodSource("providePatterns")
+	void convertTest(String pattern, String text, boolean expected) {
+		assertEquals(CONVERTER.convert(null, pattern).matcher(text).matches(), expected);
+	}
+	
+	private static Object[][] providePatterns() {
+		return new Object[][] {
+			{
+				"[A-Z][a-z]{3,3}[A-Za-z0-9]*",
+				"OmfgWTF1",
+				true
+			},
+			{
+				"[A-Z][a-z]{3,3}[A-Za-z0-9]*",
+				"",
+				false
+			},
+			{
+				"[A-Z][a-z]{3,3}[A-Za-z0-9]+",
+				"",
+				false
+			},
+			{
+				"[a-zA-Z0-9]*",
+				"Zoey76",
+				true
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/config/converter/SkillHolderConverterTest.java b/src/test/java/com/l2jserver/gameserver/config/converter/SkillHolderConverterTest.java
new file mode 100644
index 00000000..bc417113
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/config/converter/SkillHolderConverterTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.config.converter;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Skill Holder Converter test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+class SkillHolderConverterTest {
+	
+	private static final SkillHolderConverter CONVERTER = new SkillHolderConverter();
+	
+	@ParameterizedTest
+	@MethodSource("provideSkills")
+	void convertTest(String input, int id, int level) {
+		final var result = CONVERTER.convert(null, input);
+		assertEquals(result.getSkillId(), id);
+		assertEquals(result.getSkillLvl(), level);
+	}
+	
+	private static Object[][] provideSkills() {
+		return new Object[][] {
+			{
+				"1504,1",
+				1504,
+				1
+			},
+			{
+				"1499,10",
+				1499,
+				10
+			}
+		};
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/data/xml/impl/TransformDataTest.java b/src/test/java/com/l2jserver/gameserver/data/xml/impl/TransformDataTest.java
new file mode 100644
index 00000000..3619482e
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/data/xml/impl/TransformDataTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.data.xml.impl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.config.Configuration;
+import com.l2jserver.gameserver.config.ServerConfiguration;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.stats.Stats;
+
+/**
+ * TransformData tests.
+ * @author Zoey76
+ */
+@ExtendWith(MockitoExtension.class)
+class TransformDataTest {
+	
+	@Mock(answer = Answers.RETURNS_DEEP_STUBS)
+	private L2PcInstance player;
+	
+	@Mock
+	private ServerConfiguration serverConfiguration;
+	
+	@Test
+	void testParseMultipleLevelsCorrectly() throws Exception {
+		try (var configurationMock = org.mockito.Mockito.mockStatic(Configuration.class)) {
+			configurationMock.when(Configuration::server).thenReturn(serverConfiguration);
+			when(serverConfiguration.getDatapackRoot()).thenReturn(new File("."));
+			
+			final String xml = """
+				<?xml version="1.0" encoding="UTF-8"?>
+				<list>
+					<transform id="1" type="COMBAT" can_swim="0" normal_attackable="1">
+						<Male>
+							<common>
+								<base range="20" attackSpeed="300" attackType="SWORD" critRate="5" mAtk="5" pAtk="5" randomDamage="10" />
+								<stats str="40" int="21" con="43" dex="30" wit="11" men="25" />
+								<defense chest="31" legs="18" head="12" feet="7" gloves="8" underwear="3" cloak="1" />
+								<magicDefense rear="9" lear="9" rfinger="5" lfinger="5" neck="13" />
+								<collision radius="12" height="14.5" />
+								<moving walk="30" run="125" waterWalk="50" waterRun="50" flyWalk="0" flyRun="0" unknownWalk="0" unknownRun="0" />
+							</common>
+							<actions>1 2 3</actions>
+							<levels>
+								<level val="1" levelMod="0.9" hp="100.0" mp="50.0" cp="80.0" hpRegen="2.0" mpRegen="1.0" cpRegen="1.5" />
+								<level val="2" levelMod="0.95" hp="200.0" mp="100.0" cp="160.0" hpRegen="4.0" mpRegen="2.0" cpRegen="3.0" />
+							</levels>
+						</Male>
+					</transform>
+				</list>
+				""";
+			
+			final var dbf = DocumentBuilderFactory.newInstance();
+			final var db = dbf.newDocumentBuilder();
+			final var doc = db.parse(new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8)));
+			
+			// TransformData is final, but we can call the protected constructor as we are in the same package.
+			final var transformData = new TransformData();
+			transformData.parseDocument(doc);
+			
+			final var transform = transformData.getTransform(1);
+			assertThat(transform).isNotNull();
+			
+			// Test Level 1
+			when(player.getLevel()).thenReturn(1);
+			when(player.getAppearance().getSex()).thenReturn(false); // Male
+			
+			assertThat(transform.getStat(player, Stats.MAX_HP)).isEqualTo(100.0);
+			assertThat(transform.getStat(player, Stats.MAX_MP)).isEqualTo(50.0);
+			assertThat(transform.getStat(player, Stats.MAX_CP)).isEqualTo(80.0);
+			assertThat(transform.getLevelMod(player)).isEqualTo(0.9);
+			
+			// Test Level 2
+			when(player.getLevel()).thenReturn(2);
+			
+			assertThat(transform.getStat(player, Stats.MAX_HP)).isEqualTo(200.0);
+			assertThat(transform.getStat(player, Stats.MAX_MP)).isEqualTo(100.0);
+			assertThat(transform.getStat(player, Stats.MAX_CP)).isEqualTo(160.0);
+			assertThat(transform.getLevelMod(player)).isEqualTo(0.95);
+		}
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/datatables/NpcPersonalAIDataTest.java b/src/test/java/com/l2jserver/gameserver/datatables/NpcPersonalAIDataTest.java
new file mode 100644
index 00000000..61d513f4
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/datatables/NpcPersonalAIDataTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.datatables;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2Spawn;
+
+/**
+ * Npc Personal AI Data test.
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class NpcPersonalAIDataTest {
+	private static final String SPAWN1_NAME = "spawn1";
+	private static final String PARAM_1 = "param1";
+	private static final String PARAM_2 = "param2";
+	private static final Map<String, Integer> SPAWN1_DATA = Map.of(PARAM_1, 10, PARAM_2, 20);
+	
+	@Mock
+	private L2Spawn spawn;
+	
+	private NpcPersonalAIData aiData;
+	
+	@BeforeEach
+	void setUp() {
+		when(spawn.getName()).thenReturn(SPAWN1_NAME);
+		
+		aiData = new NpcPersonalAIData();
+		
+		aiData.storeData(spawn, SPAWN1_DATA);
+	}
+	
+	@Test
+	void shouldReturnNegativeAIValueForInvalidSpawnName() {
+		final int aiValue = aiData.getAIValue("invalid", "invalid");
+		
+		assertThat(aiValue).isNegative();
+	}
+	
+	@Test
+	void shouldReturnNegativeAIValueForInvalidParamName() {
+		final int aiValue = aiData.getAIValue(SPAWN1_NAME, "invalid");
+		
+		assertThat(aiValue).isNegative();
+	}
+	
+	@Test
+	void shouldReturnAIValue() {
+		final int aiValue1 = aiData.getAIValue(SPAWN1_NAME, PARAM_1);
+		final int aiValue2 = aiData.getAIValue(SPAWN1_NAME, PARAM_2);
+		
+		assertThat(aiValue1).isEqualTo(10);
+		assertThat(aiValue2).isEqualTo(20);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/enums/TriggerAttackTypeTest.java b/src/test/java/com/l2jserver/gameserver/enums/TriggerAttackTypeTest.java
new file mode 100644
index 00000000..f0669cc7
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/enums/TriggerAttackTypeTest.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+import static com.l2jserver.gameserver.enums.TriggerAttackType.ENEMY_ALL;
+import static com.l2jserver.gameserver.enums.TriggerAttackType.MOB;
+import static com.l2jserver.gameserver.enums.TriggerAttackType.NONE;
+import static com.l2jserver.gameserver.enums.TriggerAttackType.PK;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+
+/**
+ * Trigger Attack Type test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class TriggerAttackTypeTest {
+	@Mock
+	private L2Character trigger;
+	
+	@Mock
+	private L2Object target;
+	
+	@Test
+	void testNone() {
+		assertFalse(NONE.check(trigger, target));
+	}
+	
+	@Test
+	void testEnemyAll() {
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isAutoAttackable(trigger)).thenReturn(true);
+		assertTrue(ENEMY_ALL.check(trigger, target));
+	}
+	
+	@Test
+	void testEnemyAllTargetIsNotACharacter() {
+		when(target.isCharacter()).thenReturn(false);
+		assertFalse(ENEMY_ALL.check(trigger, target));
+	}
+	
+	@Test
+	void testEnemyAllTargetIsNotAnEnemy() {
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isAutoAttackable(trigger)).thenReturn(false);
+		assertFalse(ENEMY_ALL.check(trigger, target));
+	}
+	
+	@Test
+	void testMobTargetIsMonster() {
+		when(target.isAttackable()).thenReturn(true);
+		assertTrue(MOB.check(trigger, target));
+	}
+	
+	@Test
+	void testPKTargetIsPlayer() {
+		when(target.isPlayer()).thenReturn(true);
+		assertTrue(PK.check(trigger, target));
+	}
+	
+	@Test
+	void testPKTargetIsSummon() {
+		when(target.isPlayer()).thenReturn(false);
+		when(target.isSummon()).thenReturn(true);
+		assertTrue(PK.check(trigger, target));
+	}
+	
+	@Test
+	void testPKTargetIsNotPlayerOrSummon() {
+		when(target.isPlayer()).thenReturn(false);
+		when(target.isSummon()).thenReturn(false);
+		assertFalse(PK.check(trigger, target));
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/enums/TriggerTargetTypeTest.java b/src/test/java/com/l2jserver/gameserver/enums/TriggerTargetTypeTest.java
new file mode 100644
index 00000000..8e24cfdc
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/enums/TriggerTargetTypeTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.enums;
+
+import static com.l2jserver.gameserver.enums.TriggerTargetType.ENEMY;
+import static com.l2jserver.gameserver.enums.TriggerTargetType.MY_PARTY;
+import static com.l2jserver.gameserver.enums.TriggerTargetType.SELF;
+import static com.l2jserver.gameserver.enums.TriggerTargetType.SUMMON;
+import static com.l2jserver.gameserver.enums.TriggerTargetType.TARGET;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * Trigger Target Type test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class TriggerTargetTypeTest {
+	
+	@Mock
+	private L2PcInstance target;
+	@Mock
+	private L2Character attacker;
+	@Mock
+	private L2PcInstance partyMember;
+	@Mock
+	private L2Party party;
+	@Mock
+	private L2Summon summon;
+	
+	@Test
+	void testEnemy() {
+		assertEquals(List.of(attacker), ENEMY.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testSelf() {
+		assertEquals(List.of(target), SELF.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testMyPartyTargetIsPlayerInParty() {
+		when(target.isPlayer()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(target);
+		when(target.isInParty()).thenReturn(true);
+		when(target.getParty()).thenReturn(party);
+		when(party.getMembers()).thenReturn(List.of(target, partyMember));
+		assertEquals(List.of(target, partyMember), MY_PARTY.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testMyPartyTargetIsSummonInParty() {
+		when(summon.isPlayer()).thenReturn(false);
+		when(summon.isSummon()).thenReturn(true);
+		when(summon.getActingPlayer()).thenReturn(target);
+		when(target.isInParty()).thenReturn(true);
+		when(target.getParty()).thenReturn(party);
+		when(party.getMembers()).thenReturn(List.of(target, partyMember));
+		assertEquals(List.of(target, partyMember), MY_PARTY.getTargets(summon, attacker));
+	}
+	
+	@Test
+	void testMyPartyPlayerIsNotInParty() {
+		when(target.isPlayer()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(target);
+		when(target.isInParty()).thenReturn(false);
+		assertEquals(List.of(target), MY_PARTY.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testMyPartyTargetIsNotPlayerAndIsNotSummon() {
+		when(target.isPlayer()).thenReturn(false);
+		assertEquals(List.of(), MY_PARTY.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testTarget() {
+		assertEquals(List.of(target), TARGET.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testSummon() {
+		when(target.hasSummon()).thenReturn(true);
+		when(target.getSummon()).thenReturn(summon);
+		assertEquals(List.of(summon), SUMMON.getTargets(target, attacker));
+	}
+	
+	@Test
+	void testSummonNoSummon() {
+		when(target.hasSummon()).thenReturn(false);
+		assertEquals(List.of(), SUMMON.getTargets(target, attacker));
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstanceTest.java b/src/test/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstanceTest.java
new file mode 100644
index 00000000..bb64041a
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstanceTest.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.instance;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.events.EventDispatcher;
+
+/**
+ * L2TrapInstance unit tests
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class L2TrapInstanceTest {
+	
+	private static final int OBJECT_ID = 1;
+	
+	@Mock
+	private EventDispatcher eventDispatcher;
+	@Mock
+	private L2NpcTemplate template;
+	@Mock
+	private StatsSet statsSet;
+	
+	@Mock
+	private L2PcInstance owner;
+	@Mock
+	private L2Character character;
+	@Mock
+	private L2PcInstance player;
+	@Mock
+	private L2Party party;
+	
+	private static MockedStatic<EventDispatcher> mockedEventDispatcher;
+	
+	@BeforeAll
+	static void init() {
+		mockedEventDispatcher = mockStatic(EventDispatcher.class);
+		
+		server().setProperty("DatapackRoot", "src/test/resources");
+	}
+	
+	@AfterAll
+	static void after() {
+		mockedEventDispatcher.close();
+	}
+	
+	@BeforeEach
+	void setUp() {
+		when(EventDispatcher.getInstance()).thenReturn(eventDispatcher);
+	}
+	
+	@Test
+	void testTrapIsNotVisibleForNullCharacter() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isVisibleFor(null)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsNotVisibleForOtherCharacter() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isVisibleFor(character)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsVisibleForCharacterThatDetectedIt() {
+		when(template.getParameters()).thenReturn(statsSet);
+		when(owner.getPvpFlag()).thenReturn((byte) 1);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		trap.setDetected(character);
+		
+		assertThat(trap.isVisibleFor(character)).isTrue();
+	}
+	
+	@Test
+	void testTrapIsNotVisibleWhenOwnerIsNull() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, 1, 1000);
+		
+		assertThat(trap.isVisibleFor(character)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsVisibleForTheOwner() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isVisibleFor(owner)).isTrue();
+	}
+	
+	@Test
+	void testTrapIsNotVisibleForPlayerInObserverMode() {
+		when(template.getParameters()).thenReturn(statsSet);
+		when(player.inObserverMode()).thenReturn(true);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isVisibleFor(player)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsNotVisibleForOlympiadCompetitor() {
+		when(template.getParameters()).thenReturn(statsSet);
+		when(owner.isInOlympiadMode()).thenReturn(true);
+		when(owner.getOlympiadSide()).thenReturn(0);
+		when(player.isInOlympiadMode()).thenReturn(true);
+		when(player.getOlympiadSide()).thenReturn(1);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isVisibleFor(player)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsVisibleForPlayersInOwnersParty() {
+		when(template.getParameters()).thenReturn(statsSet);
+		when(party.getLeaderObjectId()).thenReturn(10);
+		when(owner.isInParty()).thenReturn(true);
+		when(owner.getParty()).thenReturn(party);
+		when(player.isInParty()).thenReturn(true);
+		when(player.getParty()).thenReturn(party);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isVisibleFor(player)).isTrue();
+	}
+	
+	@Test
+	void testTrapIsNotAutoAttackableByNullCharacter() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isAutoAttackable(null)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsNotAutoAttackableByOwner() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isAutoAttackable(owner)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsNotAutoAttackableByCharacterThatHasNotDetectedIt() {
+		when(template.getParameters()).thenReturn(statsSet);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isAutoAttackable(character)).isFalse();
+	}
+	
+	@Test
+	void testTrapIsAutoAttackableByCharacterThatHasDetectedIt() {
+		when(template.getParameters()).thenReturn(statsSet);
+		when(owner.getPvpFlag()).thenReturn((byte) 1);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		trap.setDetected(character);
+		
+		assertThat(trap.isAutoAttackable(character)).isTrue();
+	}
+	
+	@Test
+	void testTrapIsNotAutoAttackableForPlayersInOwnersParty() {
+		when(template.getParameters()).thenReturn(statsSet);
+		when(party.getLeaderObjectId()).thenReturn(10);
+		when(owner.isInParty()).thenReturn(true);
+		when(owner.getParty()).thenReturn(party);
+		when(player.isInParty()).thenReturn(true);
+		when(player.getParty()).thenReturn(party);
+		
+		final var trap = new L2TrapInstance(OBJECT_ID, template, owner, 1000);
+		
+		assertThat(trap.isAutoAttackable(player)).isFalse();
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/actor/stat/SummonStatTest.java b/src/test/java/com/l2jserver/gameserver/model/actor/stat/SummonStatTest.java
new file mode 100644
index 00000000..b0302b98
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/actor/stat/SummonStatTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.actor.stat;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+
+/**
+ * @author Kita (Noé Caratini)
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class SummonStatTest {
+	
+	@Mock
+	private L2Summon summon;
+	@Mock
+	private L2PcInstance player;
+	@Mock
+	private PcStat pcStat;
+	
+	private SummonStat summonStat;
+	
+	@BeforeEach
+	void setUp() {
+		summonStat = new SummonStat(summon);
+		
+		when(summon.getOwner()).thenReturn(player);
+		when(player.getStat()).thenReturn(pcStat);
+	}
+	
+	@Test
+	void shouldReturnOwnersMaxBuffCount() {
+		int maxBuffs = 24;
+		
+		when(pcStat.getMaxBuffCount()).thenReturn(maxBuffs);
+		
+		int result = summonStat.getMaxBuffCount();
+		
+		assertThat(result).isEqualTo(maxBuffs);
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionCheckAbnormalTest.java b/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionCheckAbnormalTest.java
new file mode 100644
index 00000000..a8f1faf2
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionCheckAbnormalTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static com.l2jserver.gameserver.model.skills.AbnormalType.MULTI_DEBUFF_WIND;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.CharEffectList;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Check abnormal type and level test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class ConditionCheckAbnormalTest {
+	
+	@Mock
+	private L2Character effected;
+	@Mock
+	private CharEffectList charEffectList;
+	@Mock
+	private BuffInfo buffInfo;
+	@Mock
+	private Skill skill;
+	
+	@Test
+	void testEffectedWithoutAbnormal() {
+		final var condition = new ConditionCheckAbnormal(MULTI_DEBUFF_WIND, 1, true);
+		when(effected.getEffectList()).thenReturn(charEffectList);
+		when(charEffectList.getBuffInfoByAbnormalType(MULTI_DEBUFF_WIND)).thenReturn(null);
+		assertFalse(condition.testImpl(null, effected, null, null));
+	}
+	
+	@Test
+	void testEffectedWithLowerLevelAbnormal() {
+		final var condition = new ConditionCheckAbnormal(MULTI_DEBUFF_WIND, 3, true);
+		when(effected.getEffectList()).thenReturn(charEffectList);
+		when(charEffectList.getBuffInfoByAbnormalType(MULTI_DEBUFF_WIND)).thenReturn(buffInfo);
+		when(buffInfo.getSkill()).thenReturn(skill);
+		when(skill.getAbnormalLvl()).thenReturn(1);
+		assertFalse(condition.testImpl(null, effected, null, null));
+	}
+	
+	@Test
+	void testEffectedWithAbnormal() {
+		final var condition = new ConditionCheckAbnormal(MULTI_DEBUFF_WIND, 3, true);
+		when(effected.getEffectList()).thenReturn(charEffectList);
+		when(charEffectList.getBuffInfoByAbnormalType(MULTI_DEBUFF_WIND)).thenReturn(buffInfo);
+		when(buffInfo.getSkill()).thenReturn(skill);
+		when(skill.getAbnormalLvl()).thenReturn(3);
+		assertTrue(condition.testImpl(null, effected, null, null));
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionOpExistNpcTest.java b/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionOpExistNpcTest.java
new file mode 100644
index 00000000..b56b6f9a
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionOpExistNpcTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.Set;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+
+/**
+ * Exist NPC condition test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class ConditionOpExistNpcTest {
+	
+	private static final Set<Integer> NPC_IDS = Set.of(1, 2);
+	
+	private static final int RADIUS = 200;
+	
+	@Mock
+	private L2Character effector;
+	@Mock
+	private L2Character effected;
+	@Mock
+	private L2World world;
+	@Mock
+	private L2Npc npc1;
+	@Mock
+	private L2Npc npc2;
+	@Mock
+	private L2Npc npc3;
+	
+	private static MockedStatic<L2World> mockedStaticWorld;
+	
+	@BeforeAll
+	static void before() {
+		mockedStaticWorld = mockStatic(L2World.class);
+	}
+	
+	@AfterAll
+	static void after() {
+		mockedStaticWorld.close();
+	}
+	
+	@Test
+	void testExistNpcPresent() {
+		final var condition = new ConditionOpExistNpc(NPC_IDS, RADIUS, true);
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjects(effector, RADIUS)).thenReturn(List.of(effected, npc1, npc2, npc3));
+		when(effected.isNpc()).thenReturn(false);
+		when(npc1.isNpc()).thenReturn(true);
+		when(npc1.getId()).thenReturn(3);
+		when(npc2.isNpc()).thenReturn(true);
+		when(npc2.getId()).thenReturn(2);
+		assertTrue(condition.testImpl(effector, effected, null, null));
+	}
+	
+	@Test
+	void testExistNpcNotPresent() {
+		final var condition = new ConditionOpExistNpc(NPC_IDS, RADIUS, false);
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjects(effector, RADIUS)).thenReturn(List.of(effected, npc1, npc2, npc3));
+		when(effected.isNpc()).thenReturn(false);
+		when(npc1.isNpc()).thenReturn(true);
+		when(npc1.getId()).thenReturn(4);
+		when(npc2.isNpc()).thenReturn(true);
+		when(npc2.getId()).thenReturn(5);
+		when(npc3.isNpc()).thenReturn(true);
+		when(npc3.getId()).thenReturn(6);
+		assertTrue(condition.testImpl(effector, effected, null, null));
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyPartyTest.java b/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyPartyTest.java
new file mode 100644
index 00000000..3ac42c7b
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/conditions/ConditionTargetMyPartyTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.conditions;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Condition Target My Party test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class ConditionTargetMyPartyTest {
+	
+	@Mock
+	private Skill skill;
+	@Mock
+	private L2Character effector;
+	@Mock
+	private L2Character effected;
+	@Mock
+	private L2PcInstance player;
+	@Mock
+	private L2PcInstance otherPlayer;
+	
+	private static final ConditionTargetMyParty CONDITION_INCLUDE_ME = new ConditionTargetMyParty("INCLUDE_ME");
+	
+	private static final ConditionTargetMyParty CONDITION_EXCEPT_ME = new ConditionTargetMyParty("EXCEPT_ME");
+	
+	@Test
+	void testNullPlayer() {
+		assertFalse(CONDITION_INCLUDE_ME.testImpl(effector, effected, skill, null));
+	}
+	
+	@Test
+	void testSelfTargetExcludeMe() {
+		when(effector.getActingPlayer()).thenReturn(player);
+		
+		assertFalse(CONDITION_EXCEPT_ME.testImpl(effector, player, skill, null));
+	}
+	
+	@Test
+	void testPlayerInPartyTargetNotInParty() {
+		when(effector.getActingPlayer()).thenReturn(player);
+		when(player.isInParty()).thenReturn(true);
+		when(player.isInPartyWith(effected)).thenReturn(false);
+		
+		assertFalse(CONDITION_INCLUDE_ME.testImpl(effector, effected, skill, null));
+	}
+	
+	@Test
+	void testPlayerInPartyWithTarget() {
+		when(effector.getActingPlayer()).thenReturn(player);
+		when(player.isInParty()).thenReturn(true);
+		when(player.isInPartyWith(effected)).thenReturn(true);
+		
+		assertTrue(CONDITION_INCLUDE_ME.testImpl(effector, effected, skill, null));
+	}
+	
+	@Test
+	void testPlayerNotInPartyTargetNotPlayerOrPlayerSummon() {
+		when(effector.getActingPlayer()).thenReturn(player);
+		when(player.isInParty()).thenReturn(false);
+		when(effected.getActingPlayer()).thenReturn(otherPlayer);
+		
+		assertFalse(CONDITION_INCLUDE_ME.testImpl(effector, effected, skill, null));
+	}
+	
+	@Test
+	void testPlayerInPartyTargetPlayerOrPlayerSummon() {
+		when(effector.getActingPlayer()).thenReturn(player);
+		when(player.isInParty()).thenReturn(false);
+		when(effected.getActingPlayer()).thenReturn(player);
+		
+		assertTrue(CONDITION_INCLUDE_ME.testImpl(effector, effected, skill, null));
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategyTest.java b/src/test/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategyTest.java
new file mode 100644
index 00000000..e349f5a0
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/drops/strategy/IDropCalculationStrategyTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.drops.strategy;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.commons.util.Rnd;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+
+/**
+ * IDropCalculationStrategy test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class IDropCalculationStrategyTest {
+	
+	private static final int ITEM_ID = 51424;
+	
+	@Mock
+	private GeneralDropItem item;
+	
+	@Mock
+	private L2Character victim;
+	
+	@Mock
+	private L2Character killer;
+	
+	@Test
+	void testDefaultStrategy() {
+		when(item.getItemId()).thenReturn(ITEM_ID);
+		when(item.getChance(victim, killer)).thenReturn(150d);
+		when(item.isPreciseCalculated()).thenReturn(true);
+		try (var rnd = mockStatic(Rnd.class)) {
+			rnd.when(Rnd::nextDouble).thenReturn(0.1d);
+			rnd.when(() -> Rnd.get(anyLong(), anyLong())).thenReturn(1L);
+			final var drops = IDropCalculationStrategy.DEFAULT_STRATEGY.calculateDrops(item, victim, killer);
+			assertEquals(ITEM_ID, drops.get(0).getId());
+			assertEquals(2, drops.get(0).getCount());
+		}
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/events/AbstractScriptTest.java b/src/test/java/com/l2jserver/gameserver/model/events/AbstractScriptTest.java
new file mode 100644
index 00000000..43275df1
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/events/AbstractScriptTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.events;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.holders.QuestItemChanceHolder;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.quest.QuestDroplist.QuestDropInfo;
+
+/**
+ * Abstract Script test.
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class AbstractScriptTest {
+	
+	@Mock
+	private L2PcInstance player;
+	@Mock
+	private PcInventory inventory;
+	@Mock
+	private L2ItemInstance item;
+	@Mock
+	private L2Npc npc;
+	@Mock
+	private IDropItem dropItem;
+	
+	@Test
+	void shouldReturnTrueIfQuestItemsAtLimit() {
+		QuestItemChanceHolder questItem = new QuestItemChanceHolder(1, 10L);
+		
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(1), anyInt())).thenReturn(10L);
+		
+		boolean result = AbstractScript.hasItemsAtLimit(player, questItem);
+		
+		assertThat(result).isTrue();
+	}
+	
+	@Test
+	void shouldReturnFalseIfQuestItemsNotAtLimit() {
+		QuestItemChanceHolder questItem = new QuestItemChanceHolder(1, 10L);
+		
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(1), anyInt())).thenReturn(5L);
+		
+		boolean result = AbstractScript.hasItemsAtLimit(player, questItem);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void shouldReturnFalseIfDropItemIsNull() {
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, null, 0L, true);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void shouldReturnFalseIfCalculateDropsResultIsNull() {
+		when(dropItem.calculateDrops(any(), any())).thenReturn(null);
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, dropItem, 0L, true);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void shouldReturnFalseIfCalculateDropsResultIsEmpty() {
+		when(dropItem.calculateDrops(any(), any())).thenReturn(Collections.emptyList());
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, dropItem, 0L, true);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void shouldReturnFalseIfPlayerHasNoInventoryCapacity() {
+		int itemId = 1;
+		
+		when(dropItem.calculateDrops(any(), any())).thenReturn(List.of(new ItemHolder(itemId, 10L)));
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(itemId), anyInt())).thenReturn(5L);
+		when(inventory.validateCapacityByItemId(itemId)).thenReturn(false);
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, dropItem, 10L, true);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void shouldAddItemsToPlayer() {
+		int itemId = 1;
+		long amount = 10L;
+		
+		when(dropItem.calculateDrops(any(), any())).thenReturn(List.of(new ItemHolder(itemId, amount)));
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(itemId), anyInt())).thenReturn(0L);
+		when(inventory.validateCapacityByItemId(itemId)).thenReturn(true);
+		
+		AbstractScript.giveItemRandomly(player, npc, player, dropItem, 0L, true);
+		
+		verify(player).addItem(any(), eq(itemId), eq(amount), any(), anyBoolean());
+	}
+	
+	@Test
+	void shouldCapItemsAmountAtLimit() {
+		int itemId = 1;
+		
+		when(dropItem.calculateDrops(any(), any())).thenReturn(List.of(new ItemHolder(itemId, 10L)));
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(itemId), anyInt())).thenReturn(5L);
+		when(inventory.validateCapacityByItemId(itemId)).thenReturn(true);
+		
+		AbstractScript.giveItemRandomly(player, npc, player, dropItem, 10L, true);
+		
+		verify(player).addItem(any(), eq(itemId), eq(5L), any(), anyBoolean());
+	}
+	
+	@Test
+	void shouldReturnTrueIfItemsGivenAndLimitReached() {
+		int itemId = 1;
+		
+		when(dropItem.calculateDrops(any(), any())).thenReturn(List.of(new ItemHolder(itemId, 10L)));
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(itemId), anyInt())).thenReturn(5L);
+		when(inventory.validateCapacityByItemId(itemId)).thenReturn(true);
+		when(player.addItem(any(), anyInt(), anyLong(), any(), anyBoolean())).thenReturn(item);
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, dropItem, 10L, true);
+		
+		assertThat(result).isTrue();
+	}
+	
+	@Test
+	void shouldReturnFalseIfItemsGivenAndLimitNotReached() {
+		int itemId = 1;
+		
+		when(dropItem.calculateDrops(any(), any())).thenReturn(List.of(new ItemHolder(itemId, 10L)));
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(itemId), anyInt())).thenReturn(5L);
+		when(inventory.validateCapacityByItemId(itemId)).thenReturn(true);
+		when(player.addItem(any(), anyInt(), anyLong(), any(), anyBoolean())).thenReturn(item);
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, dropItem, 100L, true);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void shouldReturnTrueIfItemsGivenAndNoLimit() {
+		int itemId = 1;
+		
+		when(dropItem.calculateDrops(any(), any())).thenReturn(List.of(new ItemHolder(itemId, 10L)));
+		when(player.getInventory()).thenReturn(inventory);
+		when(inventory.getInventoryItemCount(eq(itemId), anyInt())).thenReturn(5L);
+		when(inventory.validateCapacityByItemId(itemId)).thenReturn(true);
+		when(player.addItem(any(), anyInt(), anyLong(), any(), anyBoolean())).thenReturn(item);
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, player, dropItem, 0L, true);
+		
+		assertThat(result).isTrue();
+	}
+	
+	@Test
+	void shouldReturnFalseIfDropInfoIsNull() {
+		QuestDropInfo dropInfo = null;
+		
+		boolean result = AbstractScript.giveItemRandomly(player, npc, dropInfo, true);
+		
+		assertThat(result).isFalse();
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/items/enchant/EnchantSupportItemTest.java b/src/test/java/com/l2jserver/gameserver/model/items/enchant/EnchantSupportItemTest.java
new file mode 100644
index 00000000..634d2790
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/items/enchant/EnchantSupportItemTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.items.enchant;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.datatables.ItemTable;
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.items.L2Item;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.items.type.CrystalType;
+import com.l2jserver.gameserver.model.items.type.EtcItemType;
+import com.l2jserver.gameserver.model.items.type.ItemType2;
+
+/**
+ * EnchantSupportItem unit tests
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class EnchantSupportItemTest {
+	
+	@Mock
+	private ItemTable itemTable;
+	
+	@Mock
+	private StatsSet statsSet;
+	@Mock
+	private L2Item supportItem;
+	
+	@Mock
+	private L2ItemInstance itemToEnchant;
+	@Mock
+	private L2Item itemTemplate;
+	
+	private static MockedStatic<ItemTable> mockItemTable;
+	
+	@BeforeAll
+	static void init() {
+		mockItemTable = mockStatic(ItemTable.class);
+	}
+	
+	@AfterAll
+	static void tearDown() {
+		mockItemTable.close();
+	}
+	
+	@BeforeEach
+	void setUp() {
+		when(ItemTable.getInstance()).thenReturn(itemTable);
+		
+		final var itemId = 1;
+		when(statsSet.getInt("id")).thenReturn(itemId);
+		when(itemTable.getTemplate(itemId)).thenReturn(supportItem);
+		when(supportItem.getItemType()).thenReturn(EtcItemType.SCRL_INC_ENCHANT_PROP_AM);
+	}
+	
+	@Test
+	void testSupportItemIsNotValidForNullItem() {
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(null, support);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void testSupportItemIsNotValidForNonEnchantableItem() {
+		when(itemToEnchant.isEnchantable()).thenReturn(0);
+		
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(itemToEnchant, support);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void testSupportItemIsNotValidForInvalidItemType() {
+		when(itemToEnchant.isEnchantable()).thenReturn(1);
+		when(itemToEnchant.getItem()).thenReturn(itemTemplate);
+		when(itemTemplate.getType2()).thenReturn(ItemType2.WEAPON);
+		
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(itemToEnchant, support);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void testSupportItemIsNotValidForItemWithEnchantLevelHigherThanMaxEnchant() {
+		when(statsSet.getInt(eq("maxEnchant"), anyInt())).thenReturn(9);
+		
+		when(itemToEnchant.isEnchantable()).thenReturn(1);
+		when(itemToEnchant.getItem()).thenReturn(itemTemplate);
+		when(itemTemplate.getType2()).thenReturn(ItemType2.SHIELD_ARMOR);
+		when(itemToEnchant.getEnchantLevel()).thenReturn(10);
+		
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(itemToEnchant, support);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void testSupportItemIsNotValidForItemNotMatchingGrade() {
+		when(statsSet.getEnum("targetGrade", CrystalType.class, CrystalType.NONE)).thenReturn(CrystalType.A);
+		
+		when(itemToEnchant.isEnchantable()).thenReturn(1);
+		when(itemToEnchant.getItem()).thenReturn(itemTemplate);
+		when(itemTemplate.getType2()).thenReturn(ItemType2.SHIELD_ARMOR);
+		when(itemTemplate.getItemGradeSPlus()).thenReturn(CrystalType.S);
+		
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(itemToEnchant, support);
+		
+		assertThat(result).isFalse();
+	}
+	
+	@Test
+	void testSupportItemIsValidForItemWithEnchantLevelEqualToMaxEnchant() {
+		when(statsSet.getInt(eq("maxEnchant"), anyInt())).thenReturn(9);
+		
+		when(itemToEnchant.isEnchantable()).thenReturn(1);
+		when(itemToEnchant.getItem()).thenReturn(itemTemplate);
+		when(itemTemplate.getType2()).thenReturn(ItemType2.SHIELD_ARMOR);
+		when(itemToEnchant.getEnchantLevel()).thenReturn(9);
+		
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(itemToEnchant, support);
+		
+		assertThat(result).isTrue();
+	}
+	
+	@Test
+	void testSupportItemIsValidForItemWithEnchantLevelLowerThanMaxEnchant() {
+		when(statsSet.getInt(eq("maxEnchant"), anyInt())).thenReturn(9);
+		
+		when(itemToEnchant.isEnchantable()).thenReturn(1);
+		when(itemToEnchant.getItem()).thenReturn(itemTemplate);
+		when(itemTemplate.getType2()).thenReturn(ItemType2.SHIELD_ARMOR);
+		when(itemToEnchant.getEnchantLevel()).thenReturn(1);
+		
+		final var support = new EnchantSupportItem(statsSet);
+		final var result = support.isValid(itemToEnchant, support);
+		
+		assertThat(result).isTrue();
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/model/quest/QuestDroplistTest.java b/src/test/java/com/l2jserver/gameserver/model/quest/QuestDroplistTest.java
new file mode 100644
index 00000000..069c57ff
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/quest/QuestDroplistTest.java
@@ -0,0 +1,781 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
+import static org.mockito.Mockito.when;
+
+import java.util.Set;
+import java.util.stream.IntStream;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.drops.GeneralDropItem;
+import com.l2jserver.gameserver.model.drops.GroupedGeneralDropItem;
+import com.l2jserver.gameserver.model.drops.IDropItem;
+import com.l2jserver.gameserver.model.holders.QuestItemChanceHolder;
+import com.l2jserver.gameserver.model.quest.QuestDroplist.QuestDropInfo;
+
+/**
+ * Quest Droplist test.
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class QuestDroplistTest {
+	private static final QuestItemChanceHolder QUEST_ITEM_1 = new QuestItemChanceHolder(1, 25.0, 2L, 70L);
+	private static final QuestItemChanceHolder QUEST_ITEM_2 = new QuestItemChanceHolder(2, 50.0);
+	private static final QuestItemChanceHolder QUEST_ITEM_3 = new QuestItemChanceHolder(3, 50.0, 2L, 0L);
+	
+	@Mock
+	private L2Npc npc;
+	
+	@Test
+	void shouldBuildDroplistAndRetrieveInfo() {
+		when(npc.getId()).thenReturn(1);
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(1);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+		
+		QuestDropInfo dropInfo2 = dropList.get(npc);
+		assertThat(dropInfo2).isNotNull();
+		assertThat(dropInfo2.item()).isEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo2.getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+		
+		assertThat(dropList.getNpcIds()).containsExactly(1);
+	}
+	
+	@Test
+	void shouldAddSingleDropWithAmount() {
+		long amount = 5;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, QUEST_ITEM_1, amount)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isNotEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.item().getId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(dropInfo.item().getCount()).isEqualTo(amount);
+		assertThat(dropInfo.item().getChance()).isEqualTo(QUEST_ITEM_1.getChance());
+		assertThat(dropInfo.item().getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+	}
+	
+	@Test
+	void shouldAddSingleDropWithChance() {
+		double chance = 75.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, QUEST_ITEM_1, chance)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isNotEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.item().getId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(dropInfo.item().getCount()).isEqualTo(QUEST_ITEM_1.getCount());
+		assertThat(dropInfo.item().getChance()).isEqualTo(chance);
+		assertThat(dropInfo.item().getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+	}
+	
+	@Test
+	void shouldAddSingleDropWithAmountAndChance() {
+		long amount = 5;
+		double chance = 75.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, QUEST_ITEM_1, amount, chance)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isNotEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.item().getId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(dropInfo.item().getCount()).isEqualTo(amount);
+		assertThat(dropInfo.item().getChance()).isEqualTo(chance);
+		assertThat(dropInfo.item().getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+	}
+	
+	@Test
+	void shouldAddSingleDropWithItemId() {
+		int itemId = 2;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, itemId)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item().getId()).isEqualTo(itemId);
+		assertThat(dropInfo.item().getCount()).isEqualTo(1);
+		assertThat(dropInfo.item().getChance()).isEqualTo(100.0);
+		assertThat(dropInfo.item().getLimit()).isEqualTo(0);
+	}
+	
+	@Test
+	void shouldAddSingleDropWithItemIdAndAmount() {
+		int itemId = 2;
+		long amount = 5;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, itemId, amount)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item().getId()).isEqualTo(itemId);
+		assertThat(dropInfo.item().getCount()).isEqualTo(amount);
+		assertThat(dropInfo.item().getChance()).isEqualTo(100.0);
+		assertThat(dropInfo.item().getLimit()).isEqualTo(0);
+	}
+	
+	@Test
+	void shouldAddSingleDropWithItemIdAndChance() {
+		int itemId = 2;
+		double chance = 50.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, itemId, chance)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item().getId()).isEqualTo(itemId);
+		assertThat(dropInfo.item().getCount()).isEqualTo(1);
+		assertThat(dropInfo.item().getChance()).isEqualTo(chance);
+		assertThat(dropInfo.item().getLimit()).isEqualTo(0);
+	}
+	
+	@Test
+	void shouldAddSingleDropWithItemIdAndAmountAndChance() {
+		int itemId = 2;
+		long amount = 5;
+		double chance = 50.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(2, itemId, amount, chance)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item().getId()).isEqualTo(itemId);
+		assertThat(dropInfo.item().getCount()).isEqualTo(amount);
+		assertThat(dropInfo.item().getChance()).isEqualTo(chance);
+		assertThat(dropInfo.item().getLimit()).isEqualTo(0);
+	}
+	
+	@Test
+	void shouldAddSingleDropWithRequiredItems() {
+		int[] requiredItemIds = {
+			10,
+			11
+		};
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.withRequiredItems(requiredItemIds)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(1);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+		assertThat(dropInfo.requiredItems()).isEqualTo(requiredItemIds);
+	}
+	
+	@Test
+	void shouldAddRequiredItemsWithoutDuplicates() {
+		int[] requiredItemIds = {
+			10,
+			11
+		};
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.withRequiredItems(10, 11, 11)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(1);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+		assertThat(dropInfo.requiredItems()).isEqualTo(requiredItemIds);
+	}
+	
+	@Test
+	void shouldThrowExceptionWhenAddingRequiredItemsWithoutDrop() {
+		assertThatIllegalStateException().isThrownBy(() -> QuestDroplist.builder()
+			.withRequiredItems(1, 2)
+			.build());
+	}
+	
+	@Test
+	void shouldOverwriteRequiredItemsIfCalledTwice() {
+		int[] requiredItemIds = {
+			2,
+			3
+		};
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.withRequiredItems(1, 2)
+			.withRequiredItems(requiredItemIds)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(1);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+		assertThat(dropInfo.getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+		assertThat(dropInfo.requiredItems()).isEqualTo(requiredItemIds);
+	}
+	
+	@Test
+	void shouldBulkAddSingleDrop() {
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.bulkAddSingleDrop(QUEST_ITEM_1)
+			.withNpcs(Set.of(2, 3, 4))
+			.build()
+			.bulkAddSingleDrop(QUEST_ITEM_1)
+			.withNpcs(5, 6, 7)
+			.build()
+			.build();
+		
+		IntStream.range(2, 8).forEach(npcId -> {
+			QuestDropInfo dropInfo = dropList.get(npcId);
+			assertThat(dropInfo).isNotNull();
+			assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+		});
+	}
+	
+	@Test
+	void shouldBulkAddSingleDropWithChance() {
+		double chance = 10.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.bulkAddSingleDrop(QUEST_ITEM_1, chance)
+			.withNpcs(Set.of(2, 3, 4))
+			.build()
+			.bulkAddSingleDrop(QUEST_ITEM_1, chance)
+			.withNpcs(5, 6, 7)
+			.build()
+			.build();
+		
+		IntStream.range(2, 8).forEach(npcId -> {
+			QuestDropInfo dropInfo = dropList.get(npcId);
+			assertThat(dropInfo).isNotNull();
+			assertThat(dropInfo.item()).isNotEqualTo(QUEST_ITEM_1);
+			assertThat(dropInfo.item().getId()).isEqualTo(QUEST_ITEM_1.getId());
+			assertThat(dropInfo.item().getCount()).isEqualTo(QUEST_ITEM_1.getCount());
+			assertThat(dropInfo.item().getChance()).isEqualTo(chance);
+			assertThat(dropInfo.item().getLimit()).isEqualTo(QUEST_ITEM_1.getLimit());
+		});
+	}
+	
+	@Test
+	void shouldBulkAddSingleDropWithItemIdAndChance() {
+		double chance = 10.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.bulkAddSingleDrop(QUEST_ITEM_1.getId(), chance)
+			.withNpcs(Set.of(2, 3, 4))
+			.build()
+			.bulkAddSingleDrop(QUEST_ITEM_1.getId(), chance)
+			.withNpcs(5, 6, 7)
+			.build()
+			.build();
+		
+		IntStream.range(2, 8).forEach(npcId -> {
+			QuestDropInfo dropInfo = dropList.get(npcId);
+			assertThat(dropInfo).isNotNull();
+			assertThat(dropInfo.item()).isNotEqualTo(QUEST_ITEM_1);
+			assertThat(dropInfo.item().getId()).isEqualTo(QUEST_ITEM_1.getId());
+			assertThat(dropInfo.item().getCount()).isEqualTo(1);
+			assertThat(dropInfo.item().getChance()).isEqualTo(chance);
+			assertThat(dropInfo.item().getLimit()).isEqualTo(0);
+		});
+	}
+	
+	@Test
+	void shouldBulkAddSingleDropWithRequiredItems() {
+		int[] requiredItemIds = {
+			10,
+			11,
+			12
+		};
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.bulkAddSingleDrop(QUEST_ITEM_1)
+			.withNpcs(2, 3, 4)
+			.withRequiredItems(requiredItemIds)
+			.build()
+			.build();
+		
+		IntStream.range(2, 5).forEach(npcId -> {
+			QuestDropInfo dropInfo = dropList.get(npcId);
+			assertThat(dropInfo).isNotNull();
+			assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+			assertThat(dropInfo.requiredItems()).isEqualTo(requiredItemIds);
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDrop() {
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2)
+			.withDropItem(QUEST_ITEM_3)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_2);
+		
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(2);
+		assertThat(group.getItems()).anySatisfy(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(QUEST_ITEM_2.getChance());
+			assertThat(dropItem.getMin()).isEqualTo(QUEST_ITEM_2.getCount());
+			assertThat(dropItem.getMax()).isEqualTo(QUEST_ITEM_2.getCount());
+		});
+		assertThat(group.getItems()).anySatisfy(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_3.getId());
+			assertThat(dropItem.getChance()).isEqualTo(QUEST_ITEM_3.getChance());
+			assertThat(dropItem.getMin()).isEqualTo(QUEST_ITEM_3.getCount());
+			assertThat(dropItem.getMax()).isEqualTo(QUEST_ITEM_3.getCount());
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropWithAmount() {
+		long amount = 5;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2, amount)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.getLimit()).isEqualTo(QUEST_ITEM_2.getLimit());
+		
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(1);
+		assertThat(group.getItems()).satisfiesExactly(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(QUEST_ITEM_2.getChance());
+			assertThat(dropItem.getMin()).isEqualTo(amount);
+			assertThat(dropItem.getMax()).isEqualTo(amount);
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropWithChance() {
+		double chance = 80.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2, chance)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.getLimit()).isEqualTo(QUEST_ITEM_2.getLimit());
+		
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(1);
+		assertThat(group.getItems()).satisfiesExactly(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance);
+			assertThat(dropItem.getMin()).isEqualTo(QUEST_ITEM_2.getCount());
+			assertThat(dropItem.getMax()).isEqualTo(QUEST_ITEM_2.getCount());
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropWithItemIdAndChance() {
+		double chance = 80.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2.getId(), chance)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.getLimit()).isEqualTo(0);
+		
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(1);
+		assertThat(group.getItems()).satisfiesExactly(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance);
+			assertThat(dropItem.getMin()).isEqualTo(1);
+			assertThat(dropItem.getMax()).isEqualTo(1);
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropWithItemIdAmountAndChance() {
+		long amount = 5;
+		double chance = 80.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2.getId(), amount, chance)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.getLimit()).isEqualTo(0);
+		
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(1);
+		assertThat(group.getItems()).satisfiesExactly(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance);
+			assertThat(dropItem.getMin()).isEqualTo(amount);
+			assertThat(dropItem.getMax()).isEqualTo(amount);
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropWithAmountAndChance() {
+		long amount = 5;
+		double chance = 80.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2, amount, chance)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item().getId()).isEqualTo(QUEST_ITEM_2.getId());
+		
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(1);
+		assertThat(group.getItems()).satisfiesExactly(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance);
+			assertThat(dropItem.getMin()).isEqualTo(amount);
+			assertThat(dropItem.getMax()).isEqualTo(amount);
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropWithRequiredItems() {
+		int[] requiredItemIds = {
+			10,
+			11,
+			12
+		};
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2)
+			.withDropItem(QUEST_ITEM_3)
+			.build()
+			.withRequiredItems(requiredItemIds)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.requiredItems()).isEqualTo(requiredItemIds);
+	}
+	
+	@Test
+	void shouldAddGroupedDropForSingleItem() {
+		long amount1 = 3;
+		long amount2 = 5;
+		double chance1 = 20.0;
+		double chance2 = 80.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDropForSingleItem(2, QUEST_ITEM_2, 100.0)
+			.withAmount(amount1, chance1)
+			.withAmount(amount2, chance2)
+			.build()
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(2);
+		assertThat(group.getItems()).anySatisfy(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance1);
+			assertThat(dropItem.getMin()).isEqualTo(amount1);
+			assertThat(dropItem.getMax()).isEqualTo(amount1);
+		});
+		assertThat(group.getItems()).anySatisfy(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance2);
+			assertThat(dropItem.getMin()).isEqualTo(amount2);
+			assertThat(dropItem.getMax()).isEqualTo(amount2);
+		});
+	}
+	
+	@Test
+	void shouldAddGroupedDropForSingleItemUsingOrElse() {
+		long amount1 = 3;
+		long amount2 = 5;
+		double chance1 = 20.0;
+		double chance2 = 80.0;
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDropForSingleItem(2, QUEST_ITEM_2, 100.0)
+			.withAmount(amount1, chance1)
+			.orElse(amount2)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.drop()).isInstanceOf(GroupedGeneralDropItem.class);
+		
+		GroupedGeneralDropItem group = (GroupedGeneralDropItem) dropInfo.drop();
+		assertThat(group.getItems()).hasSize(2);
+		assertThat(group.getItems()).anySatisfy(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance1);
+			assertThat(dropItem.getMin()).isEqualTo(amount1);
+			assertThat(dropItem.getMax()).isEqualTo(amount1);
+		});
+		assertThat(group.getItems()).anySatisfy(dropItem -> {
+			assertThat(dropItem.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(dropItem.getChance()).isEqualTo(chance2);
+			assertThat(dropItem.getMin()).isEqualTo(amount2);
+			assertThat(dropItem.getMax()).isEqualTo(amount2);
+		});
+	}
+	
+	@Test
+	void shouldGenerateSingleDropItem() {
+		IDropItem dropItem = QuestDroplist.singleDropItem(QUEST_ITEM_1);
+		
+		assertThat(dropItem).isInstanceOf(GeneralDropItem.class);
+		
+		GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
+		assertThat(generalDropItem.getItemId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(generalDropItem.getChance()).isEqualTo(QUEST_ITEM_1.getChance());
+		assertThat(generalDropItem.getMin()).isEqualTo(QUEST_ITEM_1.getCount());
+		assertThat(generalDropItem.getMax()).isEqualTo(QUEST_ITEM_1.getCount());
+	}
+	
+	@Test
+	void shouldGenerateSingleDropItemWithChance() {
+		double chance = 75.0;
+		
+		IDropItem dropItem = QuestDroplist.singleDropItem(QUEST_ITEM_1, chance);
+		
+		assertThat(dropItem).isInstanceOf(GeneralDropItem.class);
+		
+		GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
+		assertThat(generalDropItem.getItemId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(generalDropItem.getChance()).isEqualTo(chance);
+		assertThat(generalDropItem.getMin()).isEqualTo(QUEST_ITEM_1.getCount());
+		assertThat(generalDropItem.getMax()).isEqualTo(QUEST_ITEM_1.getCount());
+	}
+	
+	@Test
+	void shouldGenerateSingleDropItemWithAmount() {
+		long amount = 10;
+		
+		IDropItem dropItem = QuestDroplist.singleDropItem(QUEST_ITEM_1, amount);
+		
+		assertThat(dropItem).isInstanceOf(GeneralDropItem.class);
+		
+		GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
+		assertThat(generalDropItem.getItemId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(generalDropItem.getChance()).isEqualTo(QUEST_ITEM_1.getChance());
+		assertThat(generalDropItem.getMin()).isEqualTo(amount);
+		assertThat(generalDropItem.getMax()).isEqualTo(amount);
+	}
+	
+	@Test
+	void shouldGenerateSingleDropItemWithItemIdAndAmount() {
+		long amount = 10;
+		
+		IDropItem dropItem = QuestDroplist.singleDropItem(QUEST_ITEM_1.getId(), amount);
+		
+		assertThat(dropItem).isInstanceOf(GeneralDropItem.class);
+		
+		GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
+		assertThat(generalDropItem.getItemId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(generalDropItem.getChance()).isEqualTo(100.0);
+		assertThat(generalDropItem.getMin()).isEqualTo(amount);
+		assertThat(generalDropItem.getMax()).isEqualTo(amount);
+	}
+	
+	@Test
+	void shouldGenerateSingleDropItemWithItemIdAndChance() {
+		double chance = 75.0;
+		
+		IDropItem dropItem = QuestDroplist.singleDropItem(QUEST_ITEM_1.getId(), chance);
+		
+		assertThat(dropItem).isInstanceOf(GeneralDropItem.class);
+		
+		GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
+		assertThat(generalDropItem.getItemId()).isEqualTo(QUEST_ITEM_1.getId());
+		assertThat(generalDropItem.getChance()).isEqualTo(chance);
+		assertThat(generalDropItem.getMin()).isEqualTo(1);
+		assertThat(generalDropItem.getMax()).isEqualTo(1);
+	}
+	
+	@Test
+	void shouldGenerateSingleDropItemWithItemIdMinMaxAndChance() {
+		int itemId = 2;
+		long min = 1;
+		long max = 5;
+		double chance = 75.0;
+		
+		IDropItem dropItem = QuestDroplist.singleDropItem(itemId, min, max, chance);
+		
+		assertThat(dropItem).isInstanceOf(GeneralDropItem.class);
+		
+		GeneralDropItem generalDropItem = (GeneralDropItem) dropItem;
+		assertThat(generalDropItem.getItemId()).isEqualTo(itemId);
+		assertThat(generalDropItem.getChance()).isEqualTo(chance);
+		assertThat(generalDropItem.getMin()).isEqualTo(min);
+		assertThat(generalDropItem.getMax()).isEqualTo(max);
+	}
+	
+	@Test
+	void shouldGenerateGroupedDropItem() {
+		double chance = 75.0;
+		IDropItem group = QuestDroplist.groupedDropItem(chance, QUEST_ITEM_2, QUEST_ITEM_3);
+		
+		assertThat(group).isInstanceOf(GroupedGeneralDropItem.class);
+		
+		GroupedGeneralDropItem groupDropItem = (GroupedGeneralDropItem) group;
+		assertThat(groupDropItem.getChance()).isEqualTo(chance);
+		assertThat(groupDropItem.getItems()).anySatisfy(item -> {
+			assertThat(item.getItemId()).isEqualTo(QUEST_ITEM_2.getId());
+			assertThat(item.getChance()).isEqualTo(QUEST_ITEM_2.getChance());
+			assertThat(item.getMin()).isEqualTo(QUEST_ITEM_2.getCount());
+			assertThat(item.getMax()).isEqualTo(QUEST_ITEM_2.getCount());
+		});
+		assertThat(groupDropItem.getItems()).anySatisfy(item -> {
+			assertThat(item.getItemId()).isEqualTo(QUEST_ITEM_3.getId());
+			assertThat(item.getChance()).isEqualTo(QUEST_ITEM_3.getChance());
+			assertThat(item.getMin()).isEqualTo(QUEST_ITEM_3.getCount());
+			assertThat(item.getMax()).isEqualTo(QUEST_ITEM_3.getCount());
+		});
+	}
+	
+	@Test
+	void shouldAddDropToExistingNpcAndRetrieveInfo() {
+		when(npc.getId()).thenReturn(1);
+		
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(1, QUEST_ITEM_2)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(1, QUEST_ITEM_1.getId());
+		assertThat(dropInfo).isNotNull();
+		assertThat(dropInfo.item()).isEqualTo(QUEST_ITEM_1);
+		
+		QuestDropInfo dropInfo2 = dropList.get(1, QUEST_ITEM_2);
+		assertThat(dropInfo2).isNotNull();
+		assertThat(dropInfo2.item()).isEqualTo(QUEST_ITEM_2);
+		
+		QuestDropInfo dropInfo3 = dropList.get(npc, QUEST_ITEM_2);
+		assertThat(dropInfo3).isNotNull();
+		assertThat(dropInfo3.item()).isEqualTo(QUEST_ITEM_2);
+	}
+	
+	@Test
+	void shouldReturnNullForInvalidKeys() {
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addSingleDrop(1, QUEST_ITEM_2)
+			.build();
+		
+		QuestDropInfo dropInfo = dropList.get(2);
+		assertThat(dropInfo).isNull();
+		
+		QuestDropInfo dropInfo2 = dropList.get(2, QUEST_ITEM_3.getId());
+		assertThat(dropInfo2).isNull();
+		
+		QuestDropInfo dropInfo3 = dropList.get(1, QUEST_ITEM_3.getId());
+		assertThat(dropInfo3).isNull();
+	}
+	
+	@Test
+	void shouldGetAllItemIds() {
+		QuestDroplist dropList = QuestDroplist.builder()
+			.addSingleDrop(1, QUEST_ITEM_1)
+			.addGroupedDrop(2, 100.0)
+			.withDropItem(QUEST_ITEM_2)
+			.withDropItem(QUEST_ITEM_3)
+			.build()
+			.addSingleDrop(3, QUEST_ITEM_1)
+			.build();
+		
+		Set<Integer> itemIds = dropList.getItemIds();
+		
+		assertThat(itemIds).containsExactlyInAnyOrder(QUEST_ITEM_1.getId(), QUEST_ITEM_2.getId(), QUEST_ITEM_3.getId());
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/quest/QuestTest.java b/src/test/java/com/l2jserver/gameserver/model/quest/QuestTest.java
new file mode 100644
index 00000000..bf90faf2
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/quest/QuestTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ * 
+ * This file is part of L2J Server.
+ * 
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.quest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Quest test.
+ * @author Kita (Noé Caratini)
+ */
+class QuestTest {
+	
+	private Quest quest;
+	
+	@BeforeEach
+	void setUp() {
+		quest = new Quest(1);
+	}
+	
+	@Test
+	void shouldRegisterQuestItems() {
+		quest.registerQuestItems(1, 2);
+		
+		assertThat(quest.getRegisteredItemIds()).containsExactlyInAnyOrder(1, 2);
+	}
+	
+	@Test
+	void shouldRegisterQuestItemsWithSet() {
+		quest.registerQuestItems(Set.of(1, 2));
+		
+		assertThat(quest.getRegisteredItemIds()).containsExactlyInAnyOrder(1, 2);
+	}
+	
+	@Test
+	void shouldAddToRegisteredQuestItemsIfCalledMultipleTimes() {
+		quest.registerQuestItems(1, 2);
+		quest.registerQuestItems(3, 4);
+		quest.registerQuestItems(Set.of(5, 6));
+		
+		assertThat(quest.getRegisteredItemIds()).containsExactlyInAnyOrder(1, 2, 3, 4, 5, 6);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/model/skills/SkillTest.java b/src/test/java/com/l2jserver/gameserver/model/skills/SkillTest.java
new file mode 100644
index 00000000..f4c2a24c
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/skills/SkillTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.skills.targets.TargetType;
+
+/**
+ * Skill unit tests
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class SkillTest {
+	
+	@Mock(strictness = Mock.Strictness.LENIENT)
+	private StatsSet statsSet;
+	
+	@BeforeAll
+	static void init() {
+		server().setProperty("DatapackRoot", "src/test/resources");
+	}
+	
+	@Test
+	void testSkillWithPositiveEffectPointShouldNotBeBad() {
+		when(statsSet.getInt("effectPoint", 0)).thenReturn(10);
+		
+		final var skill = new Skill(statsSet);
+		
+		assertThat(skill.isBad()).isFalse();
+	}
+	
+	@Test
+	void testSkillWithNegativeEffectPointTargetedOnSelfShouldNotBeBad() {
+		when(statsSet.getEnum("targetType", TargetType.class, TargetType.SELF)).thenReturn(TargetType.SELF);
+		when(statsSet.getInt("effectPoint", 0)).thenReturn(-10);
+		
+		final var skill = new Skill(statsSet);
+		
+		assertThat(skill.isBad()).isFalse();
+	}
+	
+	@Test
+	void testSkillWithNegativeEffectPointTargetedOnSummonShouldNotBeBad() {
+		when(statsSet.getEnum("targetType", TargetType.class, TargetType.SELF)).thenReturn(TargetType.SUMMON);
+		when(statsSet.getInt("effectPoint", 0)).thenReturn(-10);
+		
+		final var skill = new Skill(statsSet);
+		
+		assertThat(skill.isBad()).isFalse();
+	}
+	
+	@Test
+	void testSkillWithNegativeEffectPointNotTargetedOnSelfShouldBeBad() {
+		when(statsSet.getEnum("targetType", TargetType.class, TargetType.SELF)).thenReturn(TargetType.ENEMY_ONLY);
+		when(statsSet.getInt("effectPoint", 0)).thenReturn(-10);
+		
+		final var skill = new Skill(statsSet);
+		
+		assertThat(skill.isBad()).isTrue();
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/model/skills/targets/AffectObjectTest.java b/src/test/java/com/l2jserver/gameserver/model/skills/targets/AffectObjectTest.java
new file mode 100644
index 00000000..d117a22d
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/skills/targets/AffectObjectTest.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.ALL;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.CLAN;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.FRIEND;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.HIDDEN_PLACE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.INVISIBLE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.NONE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.NOT_FRIEND;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.OBJECT_DEAD_NPC_BODY;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.UNDEAD_REAL_ENEMY;
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.WYVERN_OBJECT;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Playable;
+
+/**
+ * Affect Object test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class AffectObjectTest {
+	
+	@Mock
+	private L2Character caster;
+	@Mock
+	private L2Object object;
+	@Mock
+	private L2Character creature;
+	@Mock
+	private L2Npc npc;
+	@Mock
+	private L2Playable playable;
+	
+	@Test
+	@DisplayName("Test affect object ALL.")
+	void testAffectObjectAll() {
+		assertTrue(ALL.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object CLAN, when player is not in clan.")
+	void testAffectObjectClanPlayerIsNotInClan() {
+		when(caster.isPlayable()).thenReturn(true);
+		when(caster.getClanId()).thenReturn(0);
+		
+		assertFalse(CLAN.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object CLAN, when player is in clan, but object is not playable.")
+	void testAffectObjectClanPlayerIsInClanObjectNotPlayable() {
+		when(caster.isPlayable()).thenReturn(true);
+		when(caster.getClanId()).thenReturn(1);
+		when(object.isPlayable()).thenReturn(false);
+		
+		assertFalse(CLAN.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object CLAN, when player is in clan, but object is in another clan.")
+	void testAffectObjectClanPlayerIsInClanObjectIsInAnotherClan() {
+		when(caster.isPlayable()).thenReturn(true);
+		when(caster.getClanId()).thenReturn(1);
+		when(creature.isPlayable()).thenReturn(true);
+		when(creature.getClanId()).thenReturn(2);
+		
+		assertFalse(CLAN.affectObject(caster, creature));
+	}
+	
+	@Test
+	@DisplayName("Test affect object CLAN, when player is in clan with object.")
+	void testAffectObjectClanPlayerIsInClanWithObject() {
+		when(caster.isPlayable()).thenReturn(true);
+		when(caster.getClanId()).thenReturn(1);
+		when(creature.isPlayable()).thenReturn(true);
+		when(creature.getClanId()).thenReturn(1);
+		
+		assertTrue(CLAN.affectObject(caster, creature));
+	}
+	
+	@Test
+	@DisplayName("Test affect object FRIEND, when object is autoattackable.")
+	void testAffectObjectFriendTargetIsAutoattackable() {
+		when(object.isAutoAttackable(caster)).thenReturn(true);
+		
+		assertFalse(FRIEND.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object FRIEND, when object is not autoattackable.")
+	void testAffectObjectFriendTargetIsNotAutoattackable() {
+		when(object.isAutoAttackable(caster)).thenReturn(false);
+		
+		assertTrue(FRIEND.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test affect object HIDDEN_PLACE.")
+	void testAffectObjectHiddenPlace() {
+		// TODO(Zoey76): Implement.
+		assertFalse(HIDDEN_PLACE.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object INVISIBLE, when object is visible for caster.")
+	void testInvisibleShouldNotAffectObjectsVisibleByCaster() {
+		when(object.isVisibleFor(caster)).thenReturn(true);
+		
+		assertFalse(INVISIBLE.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object INVISIBLE, when object is invisible for caster.")
+	void testInvisibleShouldAffectObjectsNotVisibleForCaster() {
+		when(object.isVisibleFor(caster)).thenReturn(false);
+		
+		assertTrue(INVISIBLE.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object INVISIBLE, when object is invisible.")
+	void testAffectObjectInvisibleInvisibleObject() {
+		when(object.isVisibleFor(caster)).thenReturn(true);
+		when(object.isInvisible()).thenReturn(true);
+		
+		assertTrue(INVISIBLE.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object NONE.")
+	void testAffectObjectNone() {
+		assertFalse(NONE.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object NOT_FRIEND, when target is not autoattackable.")
+	void testAffectObjectNotFriendTargetIsNotAutoattackable() {
+		when(object.isAutoAttackable(caster)).thenReturn(false);
+		
+		assertFalse(NOT_FRIEND.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object NOT_FRIEND, when target is autoattackable.")
+	void testAffectObjectNotFriendTargetIsAutoattackable() {
+		when(object.isAutoAttackable(caster)).thenReturn(true);
+		
+		assertTrue(NOT_FRIEND.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object NOT_FRIEND, when target is not dead.")
+	void testAffectObjectNotFriendTargetIsNotDead() {
+		when(creature.isDead()).thenReturn(false);
+		when(creature.isAutoAttackable(caster)).thenReturn(true);
+		
+		assertTrue(NOT_FRIEND.affectObject(caster, creature));
+	}
+	
+	@Test
+	@DisplayName("Test affect object NOT_FRIEND, when target is dead.")
+	void testAffectObjectNotFriendTargetIsDead() {
+		when(creature.isDead()).thenReturn(true);
+		
+		assertFalse(NOT_FRIEND.affectObject(caster, creature));
+	}
+	
+	@Test
+	@DisplayName("Test affect object NOT_FRIEND, when caster is npc and target is playable.")
+	void testNotFriendAffectsPlayableWhenCastByNpc() {
+		assertThat(NOT_FRIEND.affectObject(npc, playable)).isTrue();
+	}
+	
+	@Test
+	@DisplayName("Test affect object OBJECT_DEAD_NPC_BODY, when target is not NPC.")
+	void testAffectObjectObjectDeadNpcBodyNotNpc() {
+		when(object.isNpc()).thenReturn(false);
+		
+		assertFalse(OBJECT_DEAD_NPC_BODY.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object OBJECT_DEAD_NPC_BODY, when target is not NPC.")
+	void testAffectObjectObjectDeadNpcBodyNotDead() {
+		when(npc.isNpc()).thenReturn(true);
+		when(npc.isDead()).thenReturn(false);
+		
+		assertFalse(OBJECT_DEAD_NPC_BODY.affectObject(caster, npc));
+	}
+	
+	@Test
+	@DisplayName("Test affect object OBJECT_DEAD_NPC_BODY, when target is a dead NPC.")
+	void testAffectObjectObjectDeadNpcBodyDeadNpc() {
+		when(npc.isNpc()).thenReturn(true);
+		when(npc.isDead()).thenReturn(true);
+		
+		assertTrue(OBJECT_DEAD_NPC_BODY.affectObject(caster, npc));
+	}
+	
+	@Test
+	@DisplayName("Test affect object UNDEAD_REAL_ENEMY, when target is not NPC.")
+	void testAffectObjectUndeadRealEnemyIsNotNpc() {
+		when(object.isNpc()).thenReturn(false);
+		
+		assertFalse(UNDEAD_REAL_ENEMY.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object UNDEAD_REAL_ENEMY, when NPC target is not undead.")
+	void testAffectObjectUndeadRealEnemyIsNotUndead() {
+		when(npc.isNpc()).thenReturn(true);
+		when(npc.isUndead()).thenReturn(false);
+		
+		assertFalse(UNDEAD_REAL_ENEMY.affectObject(caster, npc));
+	}
+	
+	@Test
+	@DisplayName("Test affect object UNDEAD_REAL_ENEMY, when NPC target is undead.")
+	void testAffectObjectUndeadRealEnemyIsUndead() {
+		when(npc.isNpc()).thenReturn(true);
+		when(npc.isUndead()).thenReturn(true);
+		
+		assertTrue(UNDEAD_REAL_ENEMY.affectObject(caster, npc));
+	}
+	
+	@Test
+	@DisplayName("Test affect object WYVERN_OBJECT, when target is not NPC.")
+	void testAffectObjectWyvernObjectIsNotNpc() {
+		when(object.isNpc()).thenReturn(false);
+		
+		assertFalse(WYVERN_OBJECT.affectObject(caster, object));
+	}
+	
+	@Test
+	@DisplayName("Test affect object WYVERN_OBJECT, when target is not Wyvern.")
+	void testAffectObjectWyvernObjectIsNotWyvern() {
+		when(npc.isNpc()).thenReturn(true);
+		when(npc.getId()).thenReturn(1);
+		
+		assertFalse(WYVERN_OBJECT.affectObject(caster, npc));
+	}
+	
+	@Test
+	@DisplayName("Test affect object WYVERN_OBJECT, when target is Wyvern.")
+	void testAffectObjectWyvernObjectIsWyvern() {
+		when(npc.isNpc()).thenReturn(true);
+		when(npc.getId()).thenReturn(12621);
+		
+		assertTrue(WYVERN_OBJECT.affectObject(caster, npc));
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/skills/targets/AffectScopeTest.java b/src/test/java/com/l2jserver/gameserver/model/skills/targets/AffectScopeTest.java
new file mode 100644
index 00000000..6980021a
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/skills/targets/AffectScopeTest.java
@@ -0,0 +1,694 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import static com.l2jserver.gameserver.model.skills.targets.AffectObjectStaticImpl.FRIEND;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.BALAKAS_SCOPE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.DEAD_PLEDGE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.DEAD_UNION;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.FAN;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.NONE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.PARTY;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.PARTY_PLEDGE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.PLEDGE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.POINT_BLANK;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.RANGE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.RANGE_SORT_BY_HP;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.RING_RANGE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.SINGLE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.SQUARE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.SQUARE_PB;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.STATIC_OBJECT_SCOPE;
+import static com.l2jserver.gameserver.model.skills.targets.AffectScope.WYVERN_SCOPE;
+import static com.l2jserver.gameserver.model.zone.ZoneId.SIEGE;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.when;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.model.L2Clan;
+import com.l2jserver.gameserver.model.L2ClanMember;
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.L2Party;
+import com.l2jserver.gameserver.model.L2World;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
+import com.l2jserver.gameserver.model.actor.knownlist.NpcKnownList;
+import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
+import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Affect Scope test.
+ * @author Zoey76, Kita
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class AffectScopeTest {
+	
+	private static final int AFFECT_LIMIT = 5;
+	
+	private static final int AFFECT_RANGE = 1000;
+	
+	private static final int[] FAN_RANGE = {
+		0,
+		0,
+		80,
+		150
+	};
+	
+	@Mock
+	private L2Character caster;
+	@Mock
+	private L2Character target;
+	@Mock
+	private Skill skill;
+	@Mock
+	private L2World world;
+	@Mock
+	private L2Object object1;
+	@Mock
+	private L2PcInstance player1;
+	@Mock
+	private L2PcInstance player2;
+	@Mock
+	private L2PcInstance player3;
+	@Mock
+	private L2PcInstance player4;
+	@Mock
+	private L2PcInstance player5;
+	@Mock
+	private L2PcInstance player6;
+	@Mock
+	private L2PcInstance player7;
+	@Mock
+	private L2PcInstance player8;
+	@Mock
+	private L2Summon summon;
+	@Mock
+	private L2ServitorInstance servitor;
+	@Mock
+	private AffectObject affectObject;
+	@Mock
+	private L2Party party1;
+	@Mock
+	private L2Party party2;
+	@Mock
+	private L2Clan clan;
+	@Mock
+	private L2ClanMember clanMember1;
+	@Mock
+	private L2ClanMember clanMember2;
+	@Mock
+	private L2ClanMember clanMember3;
+	@Mock
+	private L2ClanMember clanMember4;
+	@Mock
+	private L2Npc npc1;
+	@Mock
+	private L2Npc npc2;
+	@Mock
+	private L2Npc npc3;
+	@Mock
+	private L2NpcTemplate npcTemplate;
+	@Mock
+	private NpcKnownList npcKnownList;
+	@Mock
+	private GeoData geoData;
+	@Mock
+	private L2Object otherObject;
+	
+	private static MockedStatic<L2World> mockedStaticWorld;
+	private static MockedStatic<Util> mockedStaticUtil;
+	private static MockedStatic<GeoData> mockedStaticGeoData;
+	
+	@BeforeAll
+	static void init() {
+		mockedStaticWorld = mockStatic(L2World.class);
+		mockedStaticUtil = mockStatic(Util.class);
+		mockedStaticGeoData = mockStatic(GeoData.class);
+	}
+	
+	@AfterAll
+	static void after() {
+		mockedStaticWorld.close();
+		mockedStaticUtil.close();
+		mockedStaticGeoData.close();
+	}
+	
+	@Test
+	@DisplayName("Test BALAKAS_SCOPE.")
+	void testBalakasScope() {
+		assertEquals(List.of(), BALAKAS_SCOPE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test DEAD_PLEDGE scope, when caster is not playable.")
+	void testDeadPledgeScopeCasterIsNotPlayable() {
+		when(target.isPlayable()).thenReturn(false);
+		
+		assertEquals(List.of(), DEAD_PLEDGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test DEAD_PLEDGE scope, when caster is not in clan.")
+	void testDeadPledgeScopePlayerIsNotInClan() {
+		when(target.isPlayable()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.getClanId()).thenReturn(0);
+		
+		assertEquals(List.of(), DEAD_PLEDGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test DEAD_PLEDGE scope.")
+	void testDeadPledgeScopePlayer() {
+		when(target.isPlayable()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.getClanId()).thenReturn(1);
+		when(player1.isInDuel()).thenReturn(false);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjects(target, AFFECT_RANGE)).thenReturn(List.of(object1, servitor, player2, player3, player4, player5, player6, player7, player8));
+		when(object1.isPlayable()).thenReturn(false);
+		when(servitor.isPlayable()).thenReturn(true);
+		when(servitor.getActingPlayer()).thenReturn(null);
+		when(player2.isPlayable()).thenReturn(true);
+		when(player2.getActingPlayer()).thenReturn(player2);
+		when(player2.getClanId()).thenReturn(0);
+		when(player3.isPlayable()).thenReturn(true);
+		when(player3.getActingPlayer()).thenReturn(player3);
+		when(player3.getClanId()).thenReturn(1);
+		when(player1.checkPvpSkill(player3, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(player3.isInsideZone(SIEGE)).thenReturn(false);
+		when(affectObject.affectObject(player1, player3)).thenReturn(false);
+		
+		when(player4.isPlayable()).thenReturn(true);
+		when(player4.getActingPlayer()).thenReturn(player4);
+		when(player4.getClanId()).thenReturn(1);
+		when(player1.checkPvpSkill(player4, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(player4.isInsideZone(SIEGE)).thenReturn(false);
+		when(affectObject.affectObject(player1, player4)).thenReturn(true);
+		
+		when(player5.isPlayable()).thenReturn(true);
+		when(player5.getActingPlayer()).thenReturn(player5);
+		when(player5.getClanId()).thenReturn(1);
+		when(player1.checkPvpSkill(player5, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(player5.isInsideZone(SIEGE)).thenReturn(false);
+		when(affectObject.affectObject(player1, player5)).thenReturn(true);
+		
+		when(player6.isPlayable()).thenReturn(true);
+		when(player6.getActingPlayer()).thenReturn(player6);
+		when(player6.getClanId()).thenReturn(1);
+		when(player1.checkPvpSkill(player6, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(player6.isInsideZone(SIEGE)).thenReturn(false);
+		when(affectObject.affectObject(player1, player6)).thenReturn(true);
+		
+		when(player7.isPlayable()).thenReturn(true);
+		when(player7.getActingPlayer()).thenReturn(player7);
+		when(player7.getClanId()).thenReturn(1);
+		when(player1.checkPvpSkill(player7, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(player7.isInsideZone(SIEGE)).thenReturn(false);
+		when(affectObject.affectObject(player1, player7)).thenReturn(true);
+		
+		when(player8.isPlayable()).thenReturn(true);
+		when(player8.getActingPlayer()).thenReturn(player8);
+		when(player8.getClanId()).thenReturn(1);
+		when(player1.checkPvpSkill(player8, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(player8.isInsideZone(SIEGE)).thenReturn(false);
+		when(affectObject.affectObject(player1, player8)).thenReturn(true);
+		
+		assertEquals(List.of(player4, player5, player6, player7, player8), DEAD_PLEDGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test DEAD_UNION scope, when target is not playable.")
+	void testDeadUnionScopeTargetIsNotPlayable() {
+		assertEquals(List.of(), DEAD_UNION.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test DEAD_UNION scope.")
+	void testDeadUnionScope() {
+		when(target.isPlayable()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjects(target, AFFECT_RANGE)).thenReturn(List.of(object1, servitor, player2, player3, player4, player5));
+		
+		when(object1.isCharacter()).thenReturn(false);
+		
+		when(servitor.isCharacter()).thenReturn(true);
+		when(player1.isInCommandChannelWith(servitor)).thenReturn(true);
+		when(servitor.isDead()).thenReturn(true);
+		when(affectObject.affectObject(player1, servitor)).thenReturn(true);
+		
+		when(player2.isCharacter()).thenReturn(true);
+		when(player1.isInCommandChannelWith(player2)).thenReturn(false);
+		
+		when(player3.isCharacter()).thenReturn(true);
+		when(player1.isInCommandChannelWith(player3)).thenReturn(true);
+		when(player3.isDead()).thenReturn(false);
+		
+		when(player4.isCharacter()).thenReturn(true);
+		when(player1.isInCommandChannelWith(player4)).thenReturn(true);
+		when(player4.isDead()).thenReturn(true);
+		when(affectObject.affectObject(player1, player4)).thenReturn(false);
+		
+		when(player5.isCharacter()).thenReturn(true);
+		when(player1.isInCommandChannelWith(player5)).thenReturn(true);
+		when(player5.isDead()).thenReturn(true);
+		when(affectObject.affectObject(player1, player5)).thenReturn(true);
+		
+		assertEquals(List.of(servitor, player5), DEAD_UNION.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test FAN scope.")
+	void testFanScope() {
+		when(Util.calculateAngleFrom(caster, target)).thenReturn(323.53);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getFanRange()).thenReturn(FAN_RANGE);
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjects(caster, FAN_RANGE[2])).thenReturn(List.of(target, player1, player2, npc1, npc2, npc3, otherObject));
+		
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isDead()).thenReturn(false);
+		when(Util.calculateAngleFrom(caster, target)).thenReturn(323.53);
+		when(affectObject.affectObject(caster, target)).thenReturn(true);
+		when(GeoData.getInstance()).thenReturn(geoData);
+		when(geoData.canSeeTarget(caster, target)).thenReturn(true);
+		
+		when(player1.isCharacter()).thenReturn(true);
+		when(player1.isDead()).thenReturn(false);
+		when(Util.calculateAngleFrom(caster, player1)).thenReturn(100.33);
+		
+		when(player2.isCharacter()).thenReturn(true);
+		when(player2.isDead()).thenReturn(false);
+		when(Util.calculateAngleFrom(caster, player2)).thenReturn(323.53);
+		when(affectObject.affectObject(caster, player2)).thenReturn(true);
+		when(GeoData.getInstance()).thenReturn(geoData);
+		when(geoData.canSeeTarget(caster, player2)).thenReturn(false);
+		
+		when(npc1.isCharacter()).thenReturn(true);
+		when(npc1.isDead()).thenReturn(true);
+		
+		when(npc2.isCharacter()).thenReturn(true);
+		when(npc2.isDead()).thenReturn(false);
+		when(Util.calculateAngleFrom(caster, npc2)).thenReturn(323.53);
+		when(affectObject.affectObject(caster, npc2)).thenReturn(true);
+		when(GeoData.getInstance()).thenReturn(geoData);
+		when(geoData.canSeeTarget(caster, npc2)).thenReturn(true);
+		
+		when(npc3.isCharacter()).thenReturn(true);
+		when(npc3.isDead()).thenReturn(false);
+		when(Util.calculateAngleFrom(caster, npc3)).thenReturn(323.53);
+		when(affectObject.affectObject(caster, npc3)).thenReturn(false);
+		
+		when(otherObject.isCharacter()).thenReturn(false);
+		
+		assertEquals(List.of(target, npc2), FAN.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test NONE scope.")
+	void testNoneScope() {
+		assertEquals(List.of(), NONE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PARTY scope, when target is in party.")
+	void testPartyScopeTargetIsInParty() {
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isInParty()).thenReturn(true);
+		when(target.getParty()).thenReturn(party1);
+		when(party1.getMembers()).thenReturn(List.of(player1, player2, player3, player4));
+		
+		// Party member with summon, both close enough.
+		when(Util.checkIfInRange(AFFECT_RANGE, target, player1, true)).thenReturn(true);
+		when(player1.hasSummon()).thenReturn(true);
+		when(player1.getSummon()).thenReturn(summon);
+		when(Util.checkIfInRange(AFFECT_RANGE, target, summon, true)).thenReturn(true);
+		
+		// Party member close enough without summon.
+		when(Util.checkIfInRange(AFFECT_RANGE, target, player2, true)).thenReturn(true);
+		when(player2.hasSummon()).thenReturn(false);
+		
+		// Party member's summon not close enough to target.
+		when(Util.checkIfInRange(AFFECT_RANGE, target, player3, true)).thenReturn(true);
+		when(player3.hasSummon()).thenReturn(true);
+		when(player3.getSummon()).thenReturn(servitor);
+		when(Util.checkIfInRange(AFFECT_RANGE, target, servitor, true)).thenReturn(false);
+		
+		// Party member not close enough to target.
+		when(Util.checkIfInRange(AFFECT_RANGE, target, player4, true)).thenReturn(false);
+		
+		assertEquals(List.of(player1, summon, player2, player3), PARTY.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PARTY scope, when target without summon is not in party.")
+	void testPartyScopeTargetWithoutSummonIsNotInParty() {
+		when(target.isCharacter()).thenReturn(true);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(target.isInParty()).thenReturn(false);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.hasSummon()).thenReturn(false);
+		
+		assertEquals(List.of(player1), PARTY.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PARTY scope, when target with summon is not in party.")
+	void testPartyScopeTargetWithSummonIsNotInParty() {
+		when(target.isCharacter()).thenReturn(true);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(target.isInParty()).thenReturn(false);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.hasSummon()).thenReturn(true);
+		when(player1.getSummon()).thenReturn(summon);
+		when(Util.checkIfInRange(AFFECT_RANGE, target, summon, true)).thenReturn(true);
+		
+		assertEquals(List.of(player1, summon), PARTY.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PARTY scope, when target with summon too far is not in party.")
+	void testPartyScopeTargetWithSummonTooFarIsNotInParty() {
+		when(target.isCharacter()).thenReturn(true);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(target.isInParty()).thenReturn(false);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.hasSummon()).thenReturn(true);
+		when(player1.getSummon()).thenReturn(summon);
+		when(Util.checkIfInRange(AFFECT_RANGE, target, summon, true)).thenReturn(false);
+		
+		assertEquals(List.of(player1), PARTY.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test PARTY_PLEDGE scope.")
+	void testPartyPledgeScope() {
+		// TODO(Zoey76): Implement.
+		assertEquals(List.of(), PARTY_PLEDGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PLEDGE scope, when caster is player in clan.")
+	void testPledgeScopeCasterIsPlayerInClan() {
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(target.isPlayer()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.getClan()).thenReturn(clan);
+		when(clan.getMembers()).thenReturn(new L2ClanMember[] {
+			clanMember1, //
+			clanMember2, //
+			clanMember3, //
+			clanMember4
+		});
+		
+		when(player1.isInDuel()).thenReturn(false, true, false);
+		
+		// Player, not in duel nor Olympiad, with summon.
+		when(clanMember1.getPlayerInstance()).thenReturn(player1);
+		when(player1.checkPvpSkill(player1, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(false);
+		when(Util.checkIfInRange(AFFECT_RANGE, player1, player1, true)).thenReturn(true);
+		when(player1.hasSummon()).thenReturn(true);
+		when(player1.getSummon()).thenReturn(summon);
+		when(Util.checkIfInRange(AFFECT_RANGE, player1, summon, true)).thenReturn(true);
+		
+		// Player in duel party, but different than target.
+		when(clanMember2.getPlayerInstance()).thenReturn(player2);
+		when(player1.getDuelId()).thenReturn(1);
+		when(player2.getDuelId()).thenReturn(1);
+		when(player1.isInParty()).thenReturn(true);
+		when(player2.isInParty()).thenReturn(true);
+		when(player1.getParty()).thenReturn(party1);
+		when(party1.getLeaderObjectId()).thenReturn(1000);
+		when(player2.getParty()).thenReturn(party2);
+		when(party2.getLeaderObjectId()).thenReturn(2000);
+		
+		when(clanMember3.getPlayerInstance()).thenReturn(null);
+		
+		when(clanMember4.getPlayerInstance()).thenReturn(player4);
+		when(player1.checkPvpSkill(player4, skill)).thenReturn(true);
+		when(player1.isInOlympiadMode()).thenReturn(true);
+		when(player1.getOlympiadGameId()).thenReturn(1);
+		when(player4.getOlympiadGameId()).thenReturn(1);
+		when(player1.getOlympiadSide()).thenReturn(1);
+		when(player4.getOlympiadSide()).thenReturn(2);
+		
+		assertEquals(List.of(player1, summon), PLEDGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PLEDGE scope, when caster is player not in clan.")
+	void testPledgeScopeCasterIsPlayerNotInClan() {
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(target.isPlayer()).thenReturn(true);
+		when(target.getActingPlayer()).thenReturn(player1);
+		when(player1.getClan()).thenReturn(null);
+		
+		when(Util.checkIfInRange(AFFECT_RANGE, player1, player1, true)).thenReturn(true);
+		when(player1.hasSummon()).thenReturn(true);
+		when(player1.getSummon()).thenReturn(summon);
+		when(Util.checkIfInRange(AFFECT_RANGE, player1, summon, true)).thenReturn(true);
+		
+		assertEquals(List.of(player1, summon), PLEDGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test PLEDGE scope, when caster is NPC in clan.")
+	void testPledgeScopeCasterIsNpcInClan() {
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(npc1.isPlayer()).thenReturn(false);
+		when(npc1.isNpc()).thenReturn(true);
+		when(npc1.getTemplate()).thenReturn(npcTemplate);
+		when(npcTemplate.getClans()).thenReturn(Set.of(1, 2));
+		when(npc1.getKnownList()).thenReturn(npcKnownList);
+		when(npcKnownList.getKnownCharactersInRadius(AFFECT_RANGE)).thenReturn(List.of(player2, npc2, npc3, summon));
+		
+		when(player2.isNpc()).thenReturn(false);
+		
+		when(npc2.isNpc()).thenReturn(true);
+		when(npc1.isInMyClan(npc2)).thenReturn(true);
+		
+		when(npc3.isNpc()).thenReturn(true);
+		when(npc1.isInMyClan(npc3)).thenReturn(false);
+		
+		when(summon.isNpc()).thenReturn(false);
+		
+		assertEquals(List.of(npc1, npc2), PLEDGE.affectTargets(npc1, npc1, skill));
+	}
+	
+	@Test
+	@DisplayName("Test POINT_BLANK scope using caster as point of origin.")
+	void testPointBlankScopeFromCaster() {
+		when(caster.isCharacter()).thenReturn(true);
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjectsStream(caster, AFFECT_RANGE, true)) //
+			.thenReturn(Stream.of(caster, npc2, npc3, summon));
+		
+		when(affectObject.affectObject(caster, caster)).thenReturn(true);
+		when(affectObject.affectObject(caster, npc2)).thenReturn(false);
+		when(affectObject.affectObject(caster, npc3)).thenReturn(false);
+		when(affectObject.affectObject(caster, summon)).thenReturn(true);
+		
+		assertEquals(List.of(caster, summon), POINT_BLANK.affectTargets(caster, caster, skill));
+	}
+	
+	@Test
+	@DisplayName("Test POINT_BLANK scope using summon as point of origin.")
+	void testPointBlankScopeFromSummon() {
+		when(summon.isCharacter()).thenReturn(true);
+		
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjectsStream(summon, AFFECT_RANGE, true)) //
+			.thenReturn(Stream.of(caster, summon, npc2, npc3));
+		
+		when(affectObject.affectObject(caster, caster)).thenReturn(false);
+		when(affectObject.affectObject(caster, summon)).thenReturn(false);
+		when(affectObject.affectObject(caster, npc2)).thenReturn(true);
+		when(affectObject.affectObject(caster, npc3)).thenReturn(true);
+		
+		assertEquals(List.of(npc2, npc3), POINT_BLANK.affectTargets(caster, summon, skill));
+	}
+	
+	@Test
+	@DisplayName("Test RANGE scope.")
+	void testRangeScope() {
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjectsStream(target, AFFECT_RANGE, false)).thenReturn(Stream.of(target, object1, servitor, player2, player3, player4, player5, player6, player7, player8));
+
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isDead()).thenReturn(false);
+		when(affectObject.affectObject(caster, target)).thenReturn(true);
+		
+		when(object1.isCharacter()).thenReturn(false);
+		
+		when(servitor.isCharacter()).thenReturn(true);
+		when(servitor.isDead()).thenReturn(true);
+		
+		when(player2.isCharacter()).thenReturn(true);
+		when(player2.isDead()).thenReturn(false);
+		when(affectObject.affectObject(caster, player2)).thenReturn(true);
+		
+		when(player3.isCharacter()).thenReturn(true);
+		when(player3.isDead()).thenReturn(false);
+		when(affectObject.affectObject(caster, player3)).thenReturn(true);
+		
+		when(player4.isCharacter()).thenReturn(true);
+		when(player4.isDead()).thenReturn(false);
+		when(affectObject.affectObject(caster, player4)).thenReturn(true);
+		
+		when(player5.isCharacter()).thenReturn(true);
+		when(player5.isDead()).thenReturn(false);
+		when(affectObject.affectObject(caster, player5)).thenReturn(true);
+		
+		assertEquals(List.of(target, player2, player3, player4, player5), RANGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test RANGE_SORT_BY_HP scope.")
+	void testRangeSortByHpScope() {
+		when(skill.getAffectLimit()).thenReturn(AFFECT_LIMIT);
+		when(skill.getAffectRange()).thenReturn(AFFECT_RANGE);
+		when(skill.getAffectObject()).thenReturn(FRIEND);
+		when(L2World.getInstance()).thenReturn(world);
+		when(world.getVisibleObjectsStream(target, AFFECT_RANGE, false)).thenReturn(Stream.of(target, object1, servitor, player2, player3, npc1));
+		
+		when(servitor.isCharacter()).thenReturn(true);
+		when(servitor.isDead()).thenReturn(true);
+		
+		when(player2.isCharacter()).thenReturn(true);
+		when(player2.getCurrentHp()).thenReturn(1000.0);
+		when(player2.getMaxHp()).thenReturn(1000);
+		
+		when(player3.isCharacter()).thenReturn(true);
+		when(player3.getCurrentHp()).thenReturn(1900.0);
+		when(player3.getMaxHp()).thenReturn(2000);
+		
+		when(target.isCharacter()).thenReturn(true);
+		when(target.getCurrentHp()).thenReturn(500.0);
+		when(target.getMaxHp()).thenReturn(1000);
+		
+		when(npc1.isCharacter()).thenReturn(true);
+		when(npc1.isAutoAttackable(caster)).thenReturn(true);
+		
+		assertEquals(List.of(target, player3, player2), RANGE_SORT_BY_HP.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test RING_RANGE scope.")
+	void testRingRangeScope() {
+		// TODO(Zoey76): Implement.
+		assertEquals(List.of(), RING_RANGE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test SINGLE scope, when object is not affected.")
+	void testSingleScopeObjectIsNotAffected() {
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		when(affectObject.affectObject(caster, target)).thenReturn(false);
+		
+		assertEquals(List.of(), SINGLE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Test SINGLE scope.")
+	void testSingleScope() {
+		when(skill.getAffectObject()).thenReturn(affectObject);
+		when(affectObject.affectObject(caster, target)).thenReturn(true);
+		
+		assertEquals(List.of(target), SINGLE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test SQUARE scope.")
+	void testSquareScope() {
+		// TODO(Zoey76): Implement.
+		assertEquals(List.of(), SQUARE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test SQUARE_PB scope.")
+	void testSquarePBScope() {
+		// TODO(Zoey76): Implement.
+		assertEquals(List.of(), SQUARE_PB.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test STATIC_OBJECT_SCOPE scope.")
+	void testStaticObjectScope() {
+		// TODO(Zoey76): Implement.
+		assertEquals(List.of(), STATIC_OBJECT_SCOPE.affectTargets(caster, target, skill));
+	}
+	
+	@Test
+	@DisplayName("Implement: Test WYVERN_SCOPE scope.")
+	void testWyvernScope() {
+		// TODO(Zoey76): Implement.
+		assertEquals(List.of(), WYVERN_SCOPE.affectTargets(caster, target, skill));
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/skills/targets/TargetTypeTest.java b/src/test/java/com/l2jserver/gameserver/model/skills/targets/TargetTypeTest.java
new file mode 100644
index 00000000..17a90b26
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/skills/targets/TargetTypeTest.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.skills.targets;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.L2Object;
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Target Type test.
+ * @author Kita (Noé Caratini)
+ */
+@ExtendWith(MockitoExtension.class)
+class TargetTypeTest {
+	
+	@Mock
+	private Skill skill;
+	@Mock
+	private L2Character caster;
+	@Mock
+	private L2Object target;
+	
+	@Test
+	void doorTreasureShouldReturnNullIfTargetIsNull() {
+		final var result = TargetType.DOOR_TREASURE.getTarget(skill, caster, null);
+		
+		assertNull(result);
+	}
+	
+	@Test
+	void doorTreasureShouldReturnNullIfTargetIsNotADoorOrChest() {
+		when(target.isDoor()).thenReturn(false);
+		
+		final var result = TargetType.DOOR_TREASURE.getTarget(skill, caster, target);
+		
+		assertNull(result);
+	}
+	
+	@Test
+	void doorTreasureShouldReturnTargetIfDoor() {
+		when(target.isDoor()).thenReturn(true);
+		
+		final var result = TargetType.DOOR_TREASURE.getTarget(skill, caster, target);
+		
+		assertEquals(target, result);
+	}
+	
+	@Test
+	void doorTreasureShouldReturnTargetIfChest() {
+		final var target = mock(L2ChestInstance.class);
+		final var result = TargetType.DOOR_TREASURE.getTarget(skill, caster, target);
+		
+		assertEquals(target, result);
+	}
+	
+	@Test
+	void testMonstersCanUseEnemyOnlySkillsOnPc() {
+		final var caster = mock(L2MonsterInstance.class);
+		when(caster.getObjectId()).thenReturn(1);
+		when(caster.isPlayable()).thenReturn(false);
+		
+		final var target = mock(L2PcInstance.class);
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isDead()).thenReturn(false);
+		when(target.getObjectId()).thenReturn(2);
+		when(target.isAutoAttackable(any())).thenReturn(true);
+		
+		final var result = TargetType.ENEMY_ONLY.getTarget(skill, caster, target);
+		
+		assertEquals(target, result);
+	}
+	
+	@Test
+	void testPvpChecksReachedForEnemyOnlySkills() {
+		final var caster = mock(L2PcInstance.class);
+		when(caster.getObjectId()).thenReturn(1);
+		when(caster.isPlayable()).thenReturn(true);
+		when(caster.getActingPlayer()).thenReturn(caster);
+		when(caster.isInOlympiadMode()).thenReturn(true);
+		
+		final var target = mock(L2PcInstance.class);
+		when(target.isCharacter()).thenReturn(true);
+		when(target.isDead()).thenReturn(false);
+		when(target.getObjectId()).thenReturn(2);
+		when(target.isAutoAttackable(any())).thenReturn(true);
+		
+		final var result = TargetType.ENEMY_ONLY.getTarget(skill, caster, target);
+		
+		assertNull(result);
+	}
+	
+	@Test
+	void testEnemyTypeShouldTargetAttackableTraps() {
+		when(caster.getObjectId()).thenReturn(1);
+		
+		final var trap = mock(L2TrapInstance.class);
+		when(trap.getObjectId()).thenReturn(2);
+		when(trap.isCharacter()).thenReturn(true);
+		when(trap.isNpc()).thenReturn(true);
+		when(trap.isAutoAttackable(caster)).thenReturn(true);
+		
+		final var result = TargetType.ENEMY.getTarget(skill, caster, trap);
+		
+		assertThat(result).isEqualTo(trap);
+	}
+	
+	@Test
+	void testEnemyTypeShouldNotTargetNonAttackableTraps() {
+		when(caster.getObjectId()).thenReturn(1);
+		
+		final var trap = mock(L2TrapInstance.class);
+		when(trap.getObjectId()).thenReturn(2);
+		when(trap.isCharacter()).thenReturn(true);
+		when(trap.isNpc()).thenReturn(true);
+		when(trap.isAutoAttackable(caster)).thenReturn(false);
+		
+		final var result = TargetType.ENEMY.getTarget(skill, caster, trap);
+		
+		assertThat(result).isNull();
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/stats/FormulasTest.java b/src/test/java/com/l2jserver/gameserver/model/stats/FormulasTest.java
new file mode 100644
index 00000000..56efc237
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/stats/FormulasTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.stats;
+
+import static com.l2jserver.gameserver.config.Configuration.server;
+import static com.l2jserver.gameserver.enums.ShotType.BLESSED_SPIRITSHOTS;
+import static com.l2jserver.gameserver.enums.ShotType.SPIRITSHOTS;
+import static java.lang.Double.NaN;
+import static java.lang.Double.POSITIVE_INFINITY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.lenient;
+import static org.mockito.Mockito.when;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.skills.Skill;
+
+/**
+ * Formulas test.
+ * @author Zoey76
+ * @version 2.6.3.0
+ */
+@ExtendWith(MockitoExtension.class)
+class FormulasTest {
+	
+	private static final int HP_REGENERATE_PERIOD_CHARACTER = 3000;
+	
+	private static final int HP_REGENERATE_PERIOD_DOOR = 300000;
+	
+	@Mock
+	private L2Character character;
+	@Mock
+	private Skill skill;
+	
+	@BeforeAll
+	static void init() {
+		server().setProperty("DatapackRoot", "src/test/resources");
+	}
+	
+	@Test
+	void testGetRegeneratePeriod() {
+		when(character.isDoor()).thenReturn(false);
+		
+		assertEquals(HP_REGENERATE_PERIOD_CHARACTER, Formulas.getRegeneratePeriod(character));
+	}
+	
+	@Test
+	void testGetRegeneratePeriodDoor() {
+		when(character.isDoor()).thenReturn(true);
+		
+		assertEquals(HP_REGENERATE_PERIOD_DOOR, Formulas.getRegeneratePeriod(character));
+	}
+	
+	@ParameterizedTest
+	@MethodSource("provide")
+	void testCalculateCastTime(int hitTime, boolean isChanneling, int channelingSkillId, boolean isStatic, boolean isMagic, //
+		int mAtkSpeed, double pAtkSpeed, boolean isChargedSpiritshots, boolean isChargedBlessedSpiritShots, double expected) {
+		lenient().when(character.getMAtkSpd()).thenReturn(mAtkSpeed);
+		lenient().when(character.getPAtkSpd()).thenReturn(pAtkSpeed);
+		lenient().when(character.isChargedShot(SPIRITSHOTS)).thenReturn(isChargedSpiritshots);
+		lenient().when(character.isChargedShot(BLESSED_SPIRITSHOTS)).thenReturn(isChargedBlessedSpiritShots);
+		when(skill.getHitTime()).thenReturn(hitTime);
+		when(skill.isChanneling()).thenReturn(isChanneling);
+		lenient().when(skill.getChannelingSkillId()).thenReturn(channelingSkillId);
+		lenient().when(skill.isStatic()).thenReturn(isStatic);
+		lenient().when(skill.isMagic()).thenReturn(isMagic);
+		
+		assertEquals(expected, Formulas.calcCastTime(character, skill));
+	}
+	
+	private static Iterator<Object[]> provide() {
+		final List<Object[]> result = new LinkedList<>();
+		// @formatter:off
+		// TODO(Zoey76): Take care of the "bad" values.
+		result.add(new Object[]{ 0, true, 1, false, false, 0, 0.0, false, false, 0.0 });
+		result.add(new Object[]{ 0, true, 0, false, false, 0, 0.0, false, false, NaN });
+		result.add(new Object[]{ 0, false, 1, false, false, 0, 0.0, false, false, NaN });
+		result.add(new Object[]{ 0, false, 0, false, true, 500, 0.0, false, false, 0.0 });
+		result.add(new Object[]{ 600, false, 0, false, true, 500, 0.0, false, false, 500.0 });
+		result.add(new Object[]{ 3000, false, 0, false, true, 600, 0.0, false, false, 1665.0 });
+		result.add(new Object[]{ 0, false, 0, false, false, 0, 500.0, false, false, 0.0 });
+		result.add(new Object[]{ 600, false, 0, false, false, 0, 500.0, false, false, 500. });
+		result.add(new Object[]{ 3000, false, 0, false, false, 0, 600.0, false, false, 1665.0 });
+		result.add(new Object[]{ 1400, false, 0, false, true, 0, 0.0, true, false, POSITIVE_INFINITY });
+		result.add(new Object[]{ 1400, false, 0, false, true, 0, 0.0, false, true, POSITIVE_INFINITY });
+		result.add(new Object[]{ 1400, false, 0, true, true, 0, 0.0, true, false, 840.0 });
+		result.add(new Object[]{ 1400, false, 0, true, true, 0, 0.0, false, true, 840.0 });
+		// @formatter:on
+		return result.iterator();
+	}
+}
diff --git a/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboidTest.java b/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboidTest.java
new file mode 100644
index 00000000..a969df1d
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneCuboidTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.form;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * ZoneCuboid unit tests
+ * @author Kita
+ */
+class ZoneCuboidTest {
+	
+	@Test
+	void testBoundingBoxForCuboid() {
+		final var zone = new ZoneCuboid(0, 1, 0, 1, 0, 3);
+		final var boundingBox = zone.getBoundingBox();
+		
+		assertThat(boundingBox).isNotNull();
+		assertThat(boundingBox.getX()).isEqualTo(0);
+		assertThat(boundingBox.getY()).isEqualTo(0);
+		assertThat(boundingBox.getWidth()).isEqualTo(1);
+		assertThat(boundingBox.getHeight()).isEqualTo(1);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinderTest.java b/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinderTest.java
new file mode 100644
index 00000000..9ae7d235
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneCylinderTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.form;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * ZoneCylinder unit tests
+ * @author Kita
+ */
+class ZoneCylinderTest {
+	
+	@Test
+	void testBoundingBoxForCyclinder() {
+		final var zone = new ZoneCylinder(1, 2, 0, 3, 1);
+		final var boundingBox = zone.getBoundingBox();
+		
+		assertThat(boundingBox).isNotNull();
+		assertThat(boundingBox.getX()).isEqualTo(0);
+		assertThat(boundingBox.getY()).isEqualTo(1);
+		assertThat(boundingBox.getWidth()).isEqualTo(2);
+		assertThat(boundingBox.getHeight()).isEqualTo(2);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneNPolyTest.java b/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneNPolyTest.java
new file mode 100644
index 00000000..4637c454
--- /dev/null
+++ b/src/test/java/com/l2jserver/gameserver/model/zone/form/ZoneNPolyTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2004-2026 L2J Server
+ *
+ * This file is part of L2J Server.
+ *
+ * L2J Server is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J Server is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.model.zone.form;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * ZoneNPoly unit tests
+ * @author Kita
+ */
+class ZoneNPolyTest {
+	
+	@Test
+	void testBoundingBoxForNPoly() {
+		final int[] xCoords = { 0, 1, 0, 4,  4, 3, 2 };
+		final int[] yCoords = { 0, 1, 2, 2, -3, 1, 0 };
+		final var zone = new ZoneNPoly(xCoords, yCoords, 0, 3);
+		final var boundingBox = zone.getBoundingBox();
+		
+		assertThat(boundingBox).isNotNull();
+		assertThat(boundingBox.getX()).isEqualTo(0);
+		assertThat(boundingBox.getY()).isEqualTo(-3);
+		assertThat(boundingBox.getWidth()).isEqualTo(4);
+		assertThat(boundingBox.getHeight()).isEqualTo(5);
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/data/stats/statBonus.xml b/src/test/resources/data/stats/statBonus.xml
new file mode 100644
index 00000000..7e3c3da3
--- /dev/null
+++ b/src/test/resources/data/stats/statBonus.xml
@@ -0,0 +1,621 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list>
+	<STR>
+		<!-- 1.036^(STR-34.845) -->
+		<stat value="0" bonus="0.29" /> <!-- Not Needed -->
+		<stat value="1" bonus="0.3" />
+		<stat value="2" bonus="0.31" />
+		<stat value="3" bonus="0.32" />
+		<stat value="4" bonus="0.34" />
+		<stat value="5" bonus="0.35" />
+		<stat value="6" bonus="0.36" />
+		<stat value="7" bonus="0.37" />
+		<stat value="8" bonus="0.39" />
+		<stat value="9" bonus="0.4" />
+		<stat value="10" bonus="0.42" />
+		<stat value="11" bonus="0.43" />
+		<stat value="12" bonus="0.45" />
+		<stat value="13" bonus="0.46" />
+		<stat value="14" bonus="0.48" />
+		<stat value="15" bonus="0.5" />
+		<stat value="16" bonus="0.51" />
+		<stat value="17" bonus="0.53" />
+		<stat value="18" bonus="0.55" />
+		<stat value="19" bonus="0.57" />
+		<stat value="20" bonus="0.59" />
+		<stat value="21" bonus="0.61" />
+		<stat value="22" bonus="0.63" />
+		<stat value="23" bonus="0.66" />
+		<stat value="24" bonus="0.68" />
+		<stat value="25" bonus="0.71" />
+		<stat value="26" bonus="0.73" />
+		<stat value="27" bonus="0.76" />
+		<stat value="28" bonus="0.78" />
+		<stat value="29" bonus="0.81" />
+		<stat value="30" bonus="0.84" />
+		<stat value="31" bonus="0.87" />
+		<stat value="32" bonus="0.9" />
+		<stat value="33" bonus="0.94" />
+		<stat value="34" bonus="0.97" />
+		<stat value="35" bonus="1.01" />
+		<stat value="36" bonus="1.04" />
+		<stat value="37" bonus="1.08" />
+		<stat value="38" bonus="1.12" />
+		<stat value="39" bonus="1.16" />
+		<stat value="40" bonus="1.2" />
+		<stat value="41" bonus="1.24" />
+		<stat value="42" bonus="1.29" />
+		<stat value="43" bonus="1.33" />
+		<stat value="44" bonus="1.38" />
+		<stat value="45" bonus="1.43" />
+		<stat value="46" bonus="1.48" />
+		<stat value="47" bonus="1.54" />
+		<stat value="48" bonus="1.59" />
+		<stat value="49" bonus="1.65" />
+		<stat value="50" bonus="1.71" />
+		<stat value="51" bonus="1.77" />
+		<stat value="52" bonus="1.83" />
+		<stat value="53" bonus="1.9" />
+		<stat value="54" bonus="1.97" />
+		<stat value="55" bonus="2.04" />
+		<stat value="56" bonus="2.11" />
+		<stat value="57" bonus="2.19" />
+		<stat value="58" bonus="2.27" />
+		<stat value="59" bonus="2.35" />
+		<stat value="60" bonus="2.43" />
+		<stat value="61" bonus="2.52" />
+		<stat value="62" bonus="2.61" />
+		<stat value="63" bonus="2.71" />
+		<stat value="64" bonus="2.8" />
+		<stat value="65" bonus="2.91" />
+		<stat value="66" bonus="3.01" />
+		<stat value="67" bonus="3.12" />
+		<stat value="68" bonus="3.23" />
+		<stat value="69" bonus="3.35" />
+		<stat value="70" bonus="3.47" />
+		<stat value="71" bonus="3.59" />
+		<stat value="72" bonus="3.72" />
+		<stat value="73" bonus="3.86" />
+		<stat value="74" bonus="3.99" />
+		<stat value="75" bonus="4.14" />
+		<stat value="76" bonus="4.29" />
+		<stat value="77" bonus="4.44" />
+		<stat value="78" bonus="4.6" />
+		<stat value="79" bonus="4.77" />
+		<stat value="80" bonus="4.94" />
+		<stat value="81" bonus="5.12" />
+		<stat value="82" bonus="5.3" />
+		<stat value="83" bonus="5.49" />
+		<stat value="84" bonus="5.69" />
+		<stat value="85" bonus="5.89" />
+		<stat value="86" bonus="6.11" />
+		<stat value="87" bonus="6.33" />
+		<stat value="88" bonus="6.55" />
+		<stat value="89" bonus="6.79" />
+		<stat value="90" bonus="7.03" />
+		<stat value="91" bonus="7.29" />
+		<stat value="92" bonus="7.55" />
+		<stat value="93" bonus="7.82" />
+		<stat value="94" bonus="8.1" />
+		<stat value="95" bonus="8.39" />
+		<stat value="96" bonus="8.7" />
+		<stat value="97" bonus="9.01" />
+		<stat value="98" bonus="9.33" />
+		<stat value="99" bonus="9.67" />
+	</STR>
+	<INT>
+		<!-- 1.020^(INT-31.375) -->
+		<stat value="0" bonus="0.54" /> <!-- Not Needed -->
+		<stat value="1" bonus="0.55" />
+		<stat value="2" bonus="0.56" />
+		<stat value="3" bonus="0.57" />
+		<stat value="4" bonus="0.58" />
+		<stat value="5" bonus="0.59" />
+		<stat value="6" bonus="0.61" />
+		<stat value="7" bonus="0.62" />
+		<stat value="8" bonus="0.63" />
+		<stat value="9" bonus="0.64" />
+		<stat value="10" bonus="0.65" />
+		<stat value="11" bonus="0.67" />
+		<stat value="12" bonus="0.68" />
+		<stat value="13" bonus="0.69" />
+		<stat value="14" bonus="0.71" />
+		<stat value="15" bonus="0.72" />
+		<stat value="16" bonus="0.74" />
+		<stat value="17" bonus="0.75" />
+		<stat value="18" bonus="0.77" />
+		<stat value="19" bonus="0.78" />
+		<stat value="20" bonus="0.8" />
+		<stat value="21" bonus="0.81" />
+		<stat value="22" bonus="0.83" />
+		<stat value="23" bonus="0.85" />
+		<stat value="24" bonus="0.86" />
+		<stat value="25" bonus="0.88" />
+		<stat value="26" bonus="0.9" />
+		<stat value="27" bonus="0.92" />
+		<stat value="28" bonus="0.94" />
+		<stat value="29" bonus="0.95" />
+		<stat value="30" bonus="0.97" />
+		<stat value="31" bonus="0.99" />
+		<stat value="32" bonus="1.01" />
+		<stat value="33" bonus="1.03" />
+		<stat value="34" bonus="1.05" />
+		<stat value="35" bonus="1.07" />
+		<stat value="36" bonus="1.1" />
+		<stat value="37" bonus="1.12" />
+		<stat value="38" bonus="1.14" />
+		<stat value="39" bonus="1.16" />
+		<stat value="40" bonus="1.19" />
+		<stat value="41" bonus="1.21" />
+		<stat value="42" bonus="1.23" />
+		<stat value="43" bonus="1.26" />
+		<stat value="44" bonus="1.28" />
+		<stat value="45" bonus="1.31" />
+		<stat value="46" bonus="1.34" />
+		<stat value="47" bonus="1.36" />
+		<stat value="48" bonus="1.39" />
+		<stat value="49" bonus="1.42" />
+		<stat value="50" bonus="1.45" />
+		<stat value="51" bonus="1.47" />
+		<stat value="52" bonus="1.5" />
+		<stat value="53" bonus="1.53" />
+		<stat value="54" bonus="1.57" />
+		<stat value="55" bonus="1.6" />
+		<stat value="56" bonus="1.63" />
+		<stat value="57" bonus="1.66" />
+		<stat value="58" bonus="1.69" />
+		<stat value="59" bonus="1.73" />
+		<stat value="60" bonus="1.76" />
+		<stat value="61" bonus="1.8" />
+		<stat value="62" bonus="1.83" />
+		<stat value="63" bonus="1.87" />
+		<stat value="64" bonus="1.91" />
+		<stat value="65" bonus="1.95" />
+		<stat value="66" bonus="1.99" />
+		<stat value="67" bonus="2.02" />
+		<stat value="68" bonus="2.07" />
+		<stat value="69" bonus="2.11" />
+		<stat value="70" bonus="2.15" />
+		<stat value="71" bonus="2.19" />
+		<stat value="72" bonus="2.24" />
+		<stat value="73" bonus="2.28" />
+		<stat value="74" bonus="2.33" />
+		<stat value="75" bonus="2.37" />
+		<stat value="76" bonus="2.42" />
+		<stat value="77" bonus="2.47" />
+		<stat value="78" bonus="2.52" />
+		<stat value="79" bonus="2.57" />
+		<stat value="80" bonus="2.62" />
+		<stat value="81" bonus="2.67" />
+		<stat value="82" bonus="2.73" />
+		<stat value="83" bonus="2.78" />
+		<stat value="84" bonus="2.84" />
+		<stat value="85" bonus="2.89" />
+		<stat value="86" bonus="2.95" />
+		<stat value="87" bonus="3.01" />
+		<stat value="88" bonus="3.07" />
+		<stat value="89" bonus="3.13" />
+		<stat value="90" bonus="3.19" />
+		<stat value="91" bonus="3.26" />
+		<stat value="92" bonus="3.32" />
+		<stat value="93" bonus="3.39" />
+		<stat value="94" bonus="3.46" />
+		<stat value="95" bonus="3.53" />
+		<stat value="96" bonus="3.6" />
+		<stat value="97" bonus="3.67" />
+		<stat value="98" bonus="3.74" />
+		<stat value="99" bonus="3.82" />
+	</INT>
+	<CON>
+		<!-- 1.030^(CON-27.632) -->
+		<stat value="0" bonus="0.45" /> <!-- Not Needed -->
+		<stat value="1" bonus="0.46" />
+		<stat value="2" bonus="0.47" />
+		<stat value="3" bonus="0.48" />
+		<stat value="4" bonus="0.5" />
+		<stat value="5" bonus="0.51" />
+		<stat value="6" bonus="0.53" />
+		<stat value="7" bonus="0.54" />
+		<stat value="8" bonus="0.56" />
+		<stat value="9" bonus="0.58" />
+		<stat value="10" bonus="0.59" />
+		<stat value="11" bonus="0.61" />
+		<stat value="12" bonus="0.63" />
+		<stat value="13" bonus="0.65" />
+		<stat value="14" bonus="0.67" />
+		<stat value="15" bonus="0.69" />
+		<stat value="16" bonus="0.71" />
+		<stat value="17" bonus="0.73" />
+		<stat value="18" bonus="0.75" />
+		<stat value="19" bonus="0.77" />
+		<stat value="20" bonus="0.8" />
+		<stat value="21" bonus="0.82" />
+		<stat value="22" bonus="0.85" />
+		<stat value="23" bonus="0.87" />
+		<stat value="24" bonus="0.9" />
+		<stat value="25" bonus="0.93" />
+		<stat value="26" bonus="0.95" />
+		<stat value="27" bonus="0.98" />
+		<stat value="28" bonus="1.01" />
+		<stat value="29" bonus="1.04" />
+		<stat value="30" bonus="1.07" />
+		<stat value="31" bonus="1.1" />
+		<stat value="32" bonus="1.14" />
+		<stat value="33" bonus="1.17" />
+		<stat value="34" bonus="1.21" />
+		<stat value="35" bonus="1.24" />
+		<stat value="36" bonus="1.28" />
+		<stat value="37" bonus="1.32" />
+		<stat value="38" bonus="1.36" />
+		<stat value="39" bonus="1.4" />
+		<stat value="40" bonus="1.44" />
+		<stat value="41" bonus="1.48" />
+		<stat value="42" bonus="1.53" />
+		<stat value="43" bonus="1.58" />
+		<stat value="44" bonus="1.62" />
+		<stat value="45" bonus="1.67" />
+		<stat value="46" bonus="1.72" />
+		<stat value="47" bonus="1.77" />
+		<stat value="48" bonus="1.83" />
+		<stat value="49" bonus="1.88" />
+		<stat value="50" bonus="1.94" />
+		<stat value="51" bonus="2" />
+		<stat value="52" bonus="2.06" />
+		<stat value="53" bonus="2.12" />
+		<stat value="54" bonus="2.18" />
+		<stat value="55" bonus="2.25" />
+		<stat value="56" bonus="2.31" />
+		<stat value="57" bonus="2.38" />
+		<stat value="58" bonus="2.45" />
+		<stat value="59" bonus="2.53" />
+		<stat value="60" bonus="2.6" />
+		<stat value="61" bonus="2.68" />
+		<stat value="62" bonus="2.76" />
+		<stat value="63" bonus="2.84" />
+		<stat value="64" bonus="2.93" />
+		<stat value="65" bonus="3.02" />
+		<stat value="66" bonus="3.11" />
+		<stat value="67" bonus="3.2" />
+		<stat value="68" bonus="3.3" />
+		<stat value="69" bonus="3.4" />
+		<stat value="70" bonus="3.5" />
+		<stat value="71" bonus="3.6" />
+		<stat value="72" bonus="3.71" />
+		<stat value="73" bonus="3.82" />
+		<stat value="74" bonus="3.94" />
+		<stat value="75" bonus="4.06" />
+		<stat value="76" bonus="4.18" />
+		<stat value="77" bonus="4.3" />
+		<stat value="78" bonus="4.43" />
+		<stat value="79" bonus="4.56" />
+		<stat value="80" bonus="4.7" />
+		<stat value="81" bonus="4.84" />
+		<stat value="82" bonus="4.99" />
+		<stat value="83" bonus="5.14" />
+		<stat value="84" bonus="5.29" />
+		<stat value="85" bonus="5.45" />
+		<stat value="86" bonus="5.61" />
+		<stat value="87" bonus="5.78" />
+		<stat value="88" bonus="5.96" />
+		<stat value="89" bonus="6.13" />
+		<stat value="90" bonus="6.32" />
+		<stat value="91" bonus="6.51" />
+		<stat value="92" bonus="6.7" />
+		<stat value="93" bonus="6.9" />
+		<stat value="94" bonus="7.11" />
+		<stat value="95" bonus="7.33" />
+		<stat value="96" bonus="7.54" />
+		<stat value="97" bonus="7.77" />
+		<stat value="98" bonus="8" />
+		<stat value="99" bonus="8.24" />
+	</CON>
+	<MEN>
+		<!-- 1.010^(MEN+0.060) -->
+		<stat value="0" bonus="1" /> <!-- Not Needed -->
+		<stat value="1" bonus="1.01" />
+		<stat value="2" bonus="1.02" />
+		<stat value="3" bonus="1.03" />
+		<stat value="4" bonus="1.04" />
+		<stat value="5" bonus="1.05" />
+		<stat value="6" bonus="1.06" />
+		<stat value="7" bonus="1.07" />
+		<stat value="8" bonus="1.08" />
+		<stat value="9" bonus="1.09" />
+		<stat value="10" bonus="1.11" />
+		<stat value="11" bonus="1.12" />
+		<stat value="12" bonus="1.13" />
+		<stat value="13" bonus="1.14" />
+		<stat value="14" bonus="1.15" />
+		<stat value="15" bonus="1.16" />
+		<stat value="16" bonus="1.17" />
+		<stat value="17" bonus="1.19" />
+		<stat value="18" bonus="1.2" />
+		<stat value="19" bonus="1.21" />
+		<stat value="20" bonus="1.22" />
+		<stat value="21" bonus="1.23" />
+		<stat value="22" bonus="1.25" />
+		<stat value="23" bonus="1.26" />
+		<stat value="24" bonus="1.27" />
+		<stat value="25" bonus="1.28" />
+		<stat value="26" bonus="1.3" />
+		<stat value="27" bonus="1.31" />
+		<stat value="28" bonus="1.32" />
+		<stat value="29" bonus="1.34" />
+		<stat value="30" bonus="1.35" />
+		<stat value="31" bonus="1.36" />
+		<stat value="32" bonus="1.38" />
+		<stat value="33" bonus="1.39" />
+		<stat value="34" bonus="1.4" />
+		<stat value="35" bonus="1.42" />
+		<stat value="36" bonus="1.43" />
+		<stat value="37" bonus="1.45" />
+		<stat value="38" bonus="1.46" />
+		<stat value="39" bonus="1.48" />
+		<stat value="40" bonus="1.49" />
+		<stat value="41" bonus="1.5" />
+		<stat value="42" bonus="1.52" />
+		<stat value="43" bonus="1.53" />
+		<stat value="44" bonus="1.55" />
+		<stat value="45" bonus="1.57" />
+		<stat value="46" bonus="1.58" />
+		<stat value="47" bonus="1.6" />
+		<stat value="48" bonus="1.61" />
+		<stat value="49" bonus="1.63" />
+		<stat value="50" bonus="1.65" />
+		<stat value="51" bonus="1.66" />
+		<stat value="52" bonus="1.68" />
+		<stat value="53" bonus="1.7" />
+		<stat value="54" bonus="1.71" />
+		<stat value="55" bonus="1.73" />
+		<stat value="56" bonus="1.75" />
+		<stat value="57" bonus="1.76" />
+		<stat value="58" bonus="1.78" />
+		<stat value="59" bonus="1.8" />
+		<stat value="60" bonus="1.82" />
+		<stat value="61" bonus="1.84" />
+		<stat value="62" bonus="1.85" />
+		<stat value="63" bonus="1.87" />
+		<stat value="64" bonus="1.89" />
+		<stat value="65" bonus="1.91" />
+		<stat value="66" bonus="1.93" />
+		<stat value="67" bonus="1.95" />
+		<stat value="68" bonus="1.97" />
+		<stat value="69" bonus="1.99" />
+		<stat value="70" bonus="2.01" />
+		<stat value="71" bonus="2.03" />
+		<stat value="72" bonus="2.05" />
+		<stat value="73" bonus="2.07" />
+		<stat value="74" bonus="2.09" />
+		<stat value="75" bonus="2.11" />
+		<stat value="76" bonus="2.13" />
+		<stat value="77" bonus="2.15" />
+		<stat value="78" bonus="2.17" />
+		<stat value="79" bonus="2.2" />
+		<stat value="80" bonus="2.22" />
+		<stat value="81" bonus="2.24" />
+		<stat value="82" bonus="2.26" />
+		<stat value="83" bonus="2.29" />
+		<stat value="84" bonus="2.31" />
+		<stat value="85" bonus="2.33" />
+		<stat value="86" bonus="2.35" />
+		<stat value="87" bonus="2.38" />
+		<stat value="88" bonus="2.4" />
+		<stat value="89" bonus="2.43" />
+		<stat value="90" bonus="2.45" />
+		<stat value="91" bonus="2.47" />
+		<stat value="92" bonus="2.5" />
+		<stat value="93" bonus="2.52" />
+		<stat value="94" bonus="2.55" />
+		<stat value="95" bonus="2.58" />
+		<stat value="96" bonus="2.6" />
+		<stat value="97" bonus="2.63" />
+		<stat value="98" bonus="2.65" />
+		<stat value="99" bonus="2.68" />
+	</MEN>
+	<DEX>
+		<!-- 1.009^(DEX-19.360) -->
+		<stat value="0" bonus="0.84" /> <!-- Not Needed -->
+		<stat value="1" bonus="0.85" />
+		<stat value="2" bonus="0.86" />
+		<stat value="3" bonus="0.86" />
+		<stat value="4" bonus="0.87" />
+		<stat value="5" bonus="0.88" />
+		<stat value="6" bonus="0.89" />
+		<stat value="7" bonus="0.9" />
+		<stat value="8" bonus="0.9" />
+		<stat value="9" bonus="0.91" />
+		<stat value="10" bonus="0.92" />
+		<stat value="11" bonus="0.93" />
+		<stat value="12" bonus="0.94" />
+		<stat value="13" bonus="0.94" />
+		<stat value="14" bonus="0.95" />
+		<stat value="15" bonus="0.96" />
+		<stat value="16" bonus="0.97" />
+		<stat value="17" bonus="0.98" />
+		<stat value="18" bonus="0.99" />
+		<stat value="19" bonus="1" />
+		<stat value="20" bonus="1.01" />
+		<stat value="21" bonus="1.01" />
+		<stat value="22" bonus="1.02" />
+		<stat value="23" bonus="1.03" />
+		<stat value="24" bonus="1.04" />
+		<stat value="25" bonus="1.05" />
+		<stat value="26" bonus="1.06" />
+		<stat value="27" bonus="1.07" />
+		<stat value="28" bonus="1.08" />
+		<stat value="29" bonus="1.09" />
+		<stat value="30" bonus="1.1" />
+		<stat value="31" bonus="1.11" />
+		<stat value="32" bonus="1.12" />
+		<stat value="33" bonus="1.13" />
+		<stat value="34" bonus="1.14" />
+		<stat value="35" bonus="1.15" />
+		<stat value="36" bonus="1.16" />
+		<stat value="37" bonus="1.17" />
+		<stat value="38" bonus="1.18" />
+		<stat value="39" bonus="1.19" />
+		<stat value="40" bonus="1.2" />
+		<stat value="41" bonus="1.21" />
+		<stat value="42" bonus="1.22" />
+		<stat value="43" bonus="1.24" />
+		<stat value="44" bonus="1.25" />
+		<stat value="45" bonus="1.26" />
+		<stat value="46" bonus="1.27" />
+		<stat value="47" bonus="1.28" />
+		<stat value="48" bonus="1.29" />
+		<stat value="49" bonus="1.3" />
+		<stat value="50" bonus="1.32" />
+		<stat value="51" bonus="1.33" />
+		<stat value="52" bonus="1.34" />
+		<stat value="53" bonus="1.35" />
+		<stat value="54" bonus="1.36" />
+		<stat value="55" bonus="1.38" />
+		<stat value="56" bonus="1.39" />
+		<stat value="57" bonus="1.4" />
+		<stat value="58" bonus="1.41" />
+		<stat value="59" bonus="1.43" />
+		<stat value="60" bonus="1.44" />
+		<stat value="61" bonus="1.45" />
+		<stat value="62" bonus="1.47" />
+		<stat value="63" bonus="1.48" />
+		<stat value="64" bonus="1.49" />
+		<stat value="65" bonus="1.51" />
+		<stat value="66" bonus="1.52" />
+		<stat value="67" bonus="1.53" />
+		<stat value="68" bonus="1.55" />
+		<stat value="69" bonus="1.56" />
+		<stat value="70" bonus="1.57" />
+		<stat value="71" bonus="1.59" />
+		<stat value="72" bonus="1.6" />
+		<stat value="73" bonus="1.62" />
+		<stat value="74" bonus="1.63" />
+		<stat value="75" bonus="1.65" />
+		<stat value="76" bonus="1.66" />
+		<stat value="77" bonus="1.68" />
+		<stat value="78" bonus="1.69" />
+		<stat value="79" bonus="1.71" />
+		<stat value="80" bonus="1.72" />
+		<stat value="81" bonus="1.74" />
+		<stat value="82" bonus="1.75" />
+		<stat value="83" bonus="1.77" />
+		<stat value="84" bonus="1.78" />
+		<stat value="85" bonus="1.8" />
+		<stat value="86" bonus="1.82" />
+		<stat value="87" bonus="1.83" />
+		<stat value="88" bonus="1.85" />
+		<stat value="89" bonus="1.87" />
+		<stat value="90" bonus="1.88" />
+		<stat value="91" bonus="1.9" />
+		<stat value="92" bonus="1.92" />
+		<stat value="93" bonus="1.93" />
+		<stat value="94" bonus="1.95" />
+		<stat value="95" bonus="1.97" />
+		<stat value="96" bonus="1.99" />
+		<stat value="97" bonus="2" />
+		<stat value="98" bonus="2.02" />
+		<stat value="99" bonus="2.04" />
+	</DEX>
+	<WIT>
+		<!-- 1.050^(WIT-20.000) -->
+		<stat value="0" bonus="0.39" /> <!-- Not Needed -->
+		<stat value="1" bonus="0.4" />
+		<stat value="2" bonus="0.42" />
+		<stat value="3" bonus="0.44" />
+		<stat value="4" bonus="0.46" />
+		<stat value="5" bonus="0.48" />
+		<stat value="6" bonus="0.51" />
+		<stat value="7" bonus="0.53" />
+		<stat value="8" bonus="0.56" />
+		<stat value="9" bonus="0.58" />
+		<stat value="10" bonus="0.61" />
+		<stat value="11" bonus="0.64" />
+		<stat value="12" bonus="0.68" />
+		<stat value="13" bonus="0.71" />
+		<stat value="14" bonus="0.75" />
+		<stat value="15" bonus="0.78" />
+		<stat value="16" bonus="0.82" />
+		<stat value="17" bonus="0.86" />
+		<stat value="18" bonus="0.91" />
+		<stat value="19" bonus="0.95" />
+		<stat value="20" bonus="1" />
+		<stat value="21" bonus="1.05" />
+		<stat value="22" bonus="1.1" />
+		<stat value="23" bonus="1.16" />
+		<stat value="24" bonus="1.22" />
+		<stat value="25" bonus="1.28" />
+		<stat value="26" bonus="1.34" />
+		<stat value="27" bonus="1.41" />
+		<stat value="28" bonus="1.48" />
+		<stat value="29" bonus="1.55" />
+		<stat value="30" bonus="1.63" />
+		<stat value="31" bonus="1.71" />
+		<stat value="32" bonus="1.8" />
+		<stat value="33" bonus="1.89" />
+		<stat value="34" bonus="1.98" />
+		<stat value="35" bonus="2.08" />
+		<stat value="36" bonus="2.18" />
+		<stat value="37" bonus="2.29" />
+		<stat value="38" bonus="2.41" />
+		<stat value="39" bonus="2.53" />
+		<stat value="40" bonus="2.65" />
+		<stat value="41" bonus="2.79" />
+		<stat value="42" bonus="2.93" />
+		<stat value="43" bonus="3.07" />
+		<stat value="44" bonus="3.23" />
+		<stat value="45" bonus="3.39" />
+		<stat value="46" bonus="3.56" />
+		<stat value="47" bonus="3.73" />
+		<stat value="48" bonus="3.92" />
+		<stat value="49" bonus="4.12" />
+		<stat value="50" bonus="4.32" />
+		<stat value="51" bonus="4.54" />
+		<stat value="52" bonus="4.76" />
+		<stat value="53" bonus="5" />
+		<stat value="54" bonus="5.25" />
+		<stat value="55" bonus="5.52" />
+		<stat value="56" bonus="5.79" />
+		<stat value="57" bonus="6.08" />
+		<stat value="58" bonus="6.39" />
+		<stat value="59" bonus="6.7" />
+		<stat value="60" bonus="7.04" />
+		<stat value="61" bonus="7.39" />
+		<stat value="62" bonus="7.76" />
+		<stat value="63" bonus="8.15" />
+		<stat value="64" bonus="8.56" />
+		<stat value="65" bonus="8.99" />
+		<stat value="66" bonus="9.43" />
+		<stat value="67" bonus="9.91" />
+		<stat value="68" bonus="10.4" />
+		<stat value="69" bonus="10.92" />
+		<stat value="70" bonus="11.47" />
+		<stat value="71" bonus="12.04" />
+		<stat value="72" bonus="12.64" />
+		<stat value="73" bonus="13.27" />
+		<stat value="74" bonus="13.94" />
+		<stat value="75" bonus="14.64" />
+		<stat value="76" bonus="15.37" />
+		<stat value="77" bonus="16.14" />
+		<stat value="78" bonus="16.94" />
+		<stat value="79" bonus="17.79" />
+		<stat value="80" bonus="18.68" />
+		<stat value="81" bonus="19.61" />
+		<stat value="82" bonus="20.59" />
+		<stat value="83" bonus="21.62" />
+		<stat value="84" bonus="22.7" />
+		<stat value="85" bonus="23.84" />
+		<stat value="86" bonus="25.03" />
+		<stat value="87" bonus="26.28" />
+		<stat value="88" bonus="27.6" />
+		<stat value="89" bonus="28.98" />
+		<stat value="90" bonus="30.43" />
+		<stat value="91" bonus="31.95" />
+		<stat value="92" bonus="33.55" />
+		<stat value="93" bonus="35.22" />
+		<stat value="94" bonus="36.98" />
+		<stat value="95" bonus="38.83" />
+		<stat value="96" bonus="40.77" />
+		<stat value="97" bonus="42.81" />
+		<stat value="98" bonus="44.95" />
+		<stat value="99" bonus="47.2" />
+	</WIT>
+</list>
\ No newline at end of file